package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "workspaces": [
     "packages/*"
   ],
@@ -43,8 +43,8 @@
     "@babel/core": "^7.21.3",
     "@babel/preset-env": "^7.20.2",
     "@dcloudio/types": "3.3.2",
-    "@dcloudio/uni-api": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-app": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-api": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-app": "3.0.0-alpha-3080520230615001",
     "@jest/types": "^29.0.3",
     "@microsoft/api-extractor": "^7.34.5",
     "@rollup/plugin-alias": "^4.0.2",

packages/size-check/package.json

@@ -1,17 +1,17 @@
 {
   "private": true,
   "name": "@dcloudio/size-check",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "dependencies": {
-    "@dcloudio/uni-app": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-h5": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-app": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-h5": "3.0.0-alpha-3080520230615001",
     "vue": "3.2.47",
     "vue-i18n": "9.1.9",
     "vuex": "^4.1.0"
   },
   "devDependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-components": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3080520230612002"
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-components": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3080520230615001"
   }
 }

packages/uni-api/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@dcloudio/uni-api",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "description": "@dcloudio/uni-api",
   "sideEffects": false,
   "module": "src/index.ts",
@@ -18,6 +18,6 @@
     "@vue/shared": "3.2.47"
   },
   "devDependencies": {
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612002"
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001"
   }
 }

packages/uni-app-plus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "description": "@dcloudio/uni-app-plus",
   "files": [
     "dist",
@@ -29,20 +29,20 @@
     "main": "dist/uni.compiler.js"
   },
   "dependencies": {
-    "@dcloudio/uni-app-uts": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-app-vite": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-app-vue": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-app-uts": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-app-vite": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-app-vue": "3.0.0-alpha-3080520230615001",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.0",
     "licia": "^1.29.0",
     "postcss-selector-parser": "^6.0.6"
   },
   "devDependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-components": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-h5": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-components": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-h5": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001",
     "@types/pako": "1.0.2",
     "@vue/compiler-sfc": "3.2.47",
     "autoprefixer": "^10.4.14",

packages/uni-app-uts/__tests__/codegen.spec.ts

@@ -25,7 +25,7 @@ describe('compiler:codegen', () => {
   test(`UTSComponents:kotlin`, () => {
     assert(
       `<view><uts-hello/><uts-hello/></view>`,
-      `@Suppress("UNUSED_PARAMETER") function PagesIndexIndexRender(_ctx: PagesIndexIndex): VNode | null {\nconst _component_uts_hello = uts.sdk.modules.utsHello.UtsHelloComponent.name\n\n  return createElementVNode("view", null, [\n    createVNode(_component_uts_hello),\n    createVNode(_component_uts_hello)\n  ])\n}`,
+      `@Suppress("UNUSED_PARAMETER") function PagesIndexIndexRender(_ctx: PagesIndexIndex): VNode | null {\n  return createElementVNode("view", null, [\n    createElementVNode(uts.sdk.modules.utsHello.UtsHelloComponent.name),\n    createElementVNode(uts.sdk.modules.utsHello.UtsHelloComponent.name)\n  ])\n}`,
       {
         targetLanguage: 'kotlin',
         mode: 'function',

packages/uni-app-uts/lib/automator/index.uts

@@ -29,7 +29,7 @@ function send(data: any) {
 function onMessage(msg: string) {
   const json = JSON.parse(msg)!
   const method = json['method'] as string
-  const params = json['params'] as JSONObject
+  const params = json['params'] as UTSJSONObject
   const path = params['path'] !== null ? (params['path'] as string) : ''
   const res = new Map<string, any | null>([['id', json['id'] as string]])
   try {
@@ -43,14 +43,14 @@ function onMessage(msg: string) {
       switch (method) {
         case 'App.callUniMethod':
           const method = params['method'] as string
-          const args = params['args'] as JSONArray
+          const args = (params['args'] as UTSJSONObject).toJSONObject() as JSONArray
           callUniMethod({
             method,
             args,
             callback
           } as CallUniMethodParams)
           break
-          case 'App.captureScreenshot':
+        case 'App.captureScreenshot':
           const id = params['id'] !== null ? (params['id'] as string) : null
           const fullPage = params['fullPage'] !== null ? (params['fullPage'] as boolean) : false
           captureScreenshot({ id, fullPage, path, callback } as CaptureScreenshotParams)
@@ -79,7 +79,7 @@ function onMessage(msg: string) {
           const methodName = params['method'] as string
           const args = params['args'] !== null ? params['args'] as Array<any | null> : [] as Array<any | null>
           args.push(callback)
-          callMethodWithCallback({pageId, methodName, args} as CallMethodWithCallbackParams)
+          callMethodWithCallback({ pageId, methodName, args } as CallMethodWithCallbackParams)
           break;
       }
     }
@@ -93,7 +93,7 @@ export function initAutomator() {
   socketTask = uni.connectSocket({
     url: wsEndpoint
   });
-  socketTask!.onMessage((res) => {onMessage(res.data as string)})
+  socketTask!.onMessage((res) => { onMessage(res.data as string) })
   socketTask!.onOpen((_) => {
     console.warn("automator.onOpen")
   })

packages/uni-app-uts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-uts",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "description": "uni-app-uts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,10 +21,10 @@
   "dependencies": {
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-nvue-styler": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-nvue-styler": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001",
     "@rollup/pluginutils": "^4.2.0",
     "@vue/compiler-core": "3.2.47",
     "@vue/compiler-sfc": "3.2.47",

packages/uni-app-uts/src/plugins/uvue/compiler/codegen.ts

@@ -210,24 +210,14 @@ export function generate(
 
 function genEasyComImports(
   components: string[],
-  {
-    push,
-    newline,
-    matchEasyCom,
-    parseUTSComponent,
-    targetLanguage,
-  }: CodegenContext
+  { push, newline, matchEasyCom, targetLanguage }: CodegenContext
 ) {
   for (let i = 0; i < components.length; i++) {
     let id = components[i]
     const maybeSelfReference = id.endsWith('__self')
     if (maybeSelfReference) {
       id = id.slice(0, -6)
     }
-    const utsComponentOptions = parseUTSComponent(id, targetLanguage)
-    if (utsComponentOptions) {
-      continue
-    }
     const source = matchEasyCom(id, true)
     if (source) {
       const componentId = toValidAssetId(id, 'easycom' as 'component')
@@ -240,16 +230,7 @@ function genEasyComImports(
 function genAssets(
   assets: string[],
   type: 'component' | 'directive',
-  {
-    helper,
-    push,
-    newline,
-    targetLanguage,
-    importEasyComponents,
-    importUTSComponents,
-    matchEasyCom,
-    parseUTSComponent,
-  }: CodegenContext
+  { helper, push, newline, importEasyComponents, matchEasyCom }: CodegenContext
 ) {
   const resolver = helper(
     type === 'component' ? RESOLVE_COMPONENT : RESOLVE_DIRECTIVE
@@ -263,31 +244,18 @@ function genAssets(
     }
     let assetCode = ''
     if (type === 'component') {
-      // 原生UTS组件
-      const utsComponentOptions = parseUTSComponent(id, targetLanguage)
-      if (utsComponentOptions) {
-        assetCode = `const ${toValidAssetId(id, type)} = ${
-          utsComponentOptions.namespace
-        }.${utsComponentOptions.className}.name`
-        const importCode = `import '${utsComponentOptions.source}'`
-        if (!importUTSComponents.includes(importCode)) {
-          importUTSComponents.push(importCode)
-        }
-      }
-      if (!assetCode) {
-        const source = matchEasyCom(id, false)
-        if (source) {
-          const easyComponentId = toValidAssetId(id, 'easycom' as 'component')
-          const componentId = toValidAssetId(id, type)
-          assetCode = `const ${componentId} = ${helper(
-            RESOLVE_EASY_COMPONENT
-          )}(${JSON.stringify(id)},${easyComponentId}${
-            maybeSelfReference ? `, true` : ``
-          })`
-          const importCode = `import ${easyComponentId} from '${source}'`
-          if (!importEasyComponents.includes(importCode)) {
-            importEasyComponents.push(importCode)
-          }
+      const source = matchEasyCom(id, false)
+      if (source) {
+        const easyComponentId = toValidAssetId(id, 'easycom' as 'component')
+        const componentId = toValidAssetId(id, type)
+        assetCode = `const ${componentId} = ${helper(
+          RESOLVE_EASY_COMPONENT
+        )}(${JSON.stringify(id)},${easyComponentId}${
+          maybeSelfReference ? `, true` : ``
+        })`
+        const importCode = `import ${easyComponentId} from '${source}';`
+        if (!importEasyComponents.includes(importCode)) {
+          importEasyComponents.push(importCode)
         }
       }
     }
@@ -479,6 +447,32 @@ function genComment(node: CommentNode, context: CodegenContext) {
   push(`${helper(CREATE_COMMENT)}(${JSON.stringify(node.content)})`, node)
 }
 
+function parseTag(
+  tag: string | symbol | CallExpression,
+  { parseUTSComponent, targetLanguage, importUTSComponents }: CodegenContext
+) {
+  if (isString(tag)) {
+    // 原生UTS组件
+    const utsComponentOptions = parseUTSComponent(
+      tag.slice(1, -1),
+      targetLanguage
+    )
+    if (utsComponentOptions) {
+      const importCode = `import '${utsComponentOptions.source}';`
+      if (!importUTSComponents.includes(importCode)) {
+        importUTSComponents.push(importCode)
+      }
+      return (
+        utsComponentOptions.namespace +
+        '.' +
+        utsComponentOptions.className +
+        '.name'
+      )
+    }
+  }
+  return tag
+}
+
 function genVNodeCall(node: VNodeCall, context: CodegenContext) {
   const { push, helper } = context
   const {
@@ -504,7 +498,13 @@ function genVNodeCall(node: VNodeCall, context: CodegenContext) {
     : getVNodeHelper(false, isComponent)
   push(helper(callHelper) + `(`, node)
   genNodeList(
-    genNullableArgs([tag, props, children, patchFlag, dynamicProps]),
+    genNullableArgs([
+      parseTag(tag, context),
+      props,
+      children,
+      patchFlag,
+      dynamicProps,
+    ]),
     context
   )
   push(`)`)

packages/uni-app-uts/src/plugins/uvue/compiler/index.ts

@@ -63,7 +63,10 @@ export function compile(
 ): CodegenResult {
   const ast = baseParse(template, {
     isNativeTag(tag) {
-      return isAppUVueNativeTag(tag)
+      return (
+        isAppUVueNativeTag(tag) ||
+        !!options.parseUTSComponent?.(tag, options.targetLanguage)
+      )
     },
   })
   const [nodeTransforms, directiveTransforms] = getBaseTransformPreset(

packages/uni-app-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-vite",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "description": "uni-app-vite",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,10 +20,10 @@
   "license": "Apache-2.0",
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-nvue-styler": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-nvue-styler": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001",
     "@rollup/pluginutils": "^4.2.0",
     "@vitejs/plugin-vue": "^4.2.1",
     "@vue/compiler-dom": "3.2.47",

packages/uni-app-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-vue",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "description": "@dcloudio/uni-app-vue",
   "main": "dist/service.runtime.esm.dev.js",
   "module": "dist/service.runtime.esm.dev.js",
@@ -19,6 +19,6 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612002"
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001"
   }
 }

packages/uni-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app",
-  "version": "3.0.0-alpha-3080520230612002",
+  "version": "3.0.0-alpha-3080520230615001",
   "description": "@dcloudio/uni-app",
   "main": "./dist/uni-app.cjs.js",
   "module": "./dist/uni-app.es.js",
@@ -24,12 +24,12 @@
     "main": "dist/uni.compiler.js"
   },
   "dependencies": {
-    "@dcloudio/uni-cloud": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-components": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-push": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612002",
-    "@dcloudio/uni-stat": "3.0.0-alpha-3080520230612002",
+    "@dcloudio/uni-cloud": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-components": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-push": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-stat": "3.0.0-alpha-3080520230615001",
     "@vue/shared": "3.2.47"
   },
   "peerDependencies": {