wip(x-android): tsc

packages/uni-uts-v1/__tests__/tsc/android/basic/__snapshots__/index.spec.ts.snap

@@ -31,13 +31,6 @@ const __sfc__ = defineComponent({
             dNum: 1,
         };
     },
-    setup(props) {
-        computed((): boolean => {
-            return props.bool;
-        });
-        const count = ref(0);
-        watch(count, (count, _oldValue, _onCleanup): any => { });
-    },
 });
 function render(this: InstanceType<typeof __sfc__>): any | null {
     const _ctx = this;

packages/uni-uts-v1/__tests__/tsc/android/basic/dist/index.uts

@@ -28,13 +28,6 @@ const __sfc__ = defineComponent({
             dNum: 1,
         };
     },
-    setup(props) {
-        computed((): boolean => {
-            return props.bool;
-        });
-        const count = ref(0);
-        watch(count, (count, _oldValue, _onCleanup): any => { });
-    },
 });
 function render(this: InstanceType<typeof __sfc__>): any | null {
     const _ctx = this;

packages/uni-uts-v1/__tests__/tsc/android/basic/src/index.ts

@@ -28,13 +28,6 @@ const __sfc__ = defineComponent({
       dNum: 1,
     }
   },
-  setup(props) {
-    computed((): boolean => {
-      return props.bool
-    })
-    const count = ref(0)
-    watch(count, (count) => {})
-  },
 })
 function render(this: InstanceType<typeof __sfc__>): any | null {
   const _ctx = this

packages/uni-uts-v1/__tests__/tsc/android/plugin/__snapshots__/index.spec.ts.snap

@@ -5,7 +5,7 @@ exports[`android plugin 1`] = `
 export function main() {
     const app = createApp({});
     app.use({
-        install(app, _options): any {
+        install(app) {
             app.config.globalProperties.plugin1 = '';
         },
     });

packages/uni-uts-v1/__tests__/tsc/android/plugin/dist/index.uts

@@ -2,7 +2,7 @@ import { createApp } from 'vue';
 export function main() {
     const app = createApp({});
     app.use({
-        install(app, _options): any {
+        install(app) {
             app.config.globalProperties.plugin1 = '';
         },
     });

packages/uni-uts-v1/__tests__/tsc/android/watch/__snapshots__/index.spec.ts.snap

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`android watch 1`] = `
+"import { defineComponent, ref, watch, watchEffect, watchPostEffect, watchSyncEffect, } from 'vue';
+defineComponent({
+    setup() {
+        const count = ref(0);
+        watch(count, () => { });
+        watchEffect(() => count.value);
+        watchPostEffect(() => count.value);
+        watchSyncEffect(() => count.value);
+    },
+});
+"
+`;

packages/uni-uts-v1/__tests__/tsc/android/watch/dist/index.uts

@@ -0,0 +1,10 @@
+import { defineComponent, ref, watch, watchEffect, watchPostEffect, watchSyncEffect, } from 'vue';
+defineComponent({
+    setup() {
+        const count = ref(0);
+        watch(count, () => { });
+        watchEffect(() => count.value);
+        watchPostEffect(() => count.value);
+        watchSyncEffect(() => count.value);
+    },
+});

packages/uni-uts-v1/__tests__/tsc/android/watch/index.spec.ts

@@ -0,0 +1,3 @@
+import { runAndroid } from '../../utils'
+
+runAndroid('watch')

packages/uni-uts-v1/__tests__/tsc/android/watch/src/index.ts

@@ -0,0 +1,17 @@
+import {
+  defineComponent,
+  ref,
+  watch,
+  watchEffect,
+  watchPostEffect,
+  watchSyncEffect,
+} from 'vue'
+defineComponent({
+  setup() {
+    const count = ref(0)
+    watch(count, () => {})
+    watchEffect(() => count.value)
+    watchPostEffect(() => count.value)
+    watchSyncEffect(() => count.value)
+  },
+})

packages/uni-uts-v1/lib/uts/types/@vue/runtime-core/dist/runtime-core.d.ts

@@ -656,7 +656,7 @@ type InjectToObject<T extends ComponentInjectOptions> = T extends string[] ? {
 interface LegacyOptions<Props, D, C extends ComputedOptions, M extends MethodOptions, Mixin extends ComponentOptionsMixin, Extends extends ComponentOptionsMixin, I extends ComponentInjectOptions, II extends string> {
     compatConfig?: CompatConfig;
     [key: string]: any;
-    data?: (this: CreateComponentPublicInstance<Props, {}, {}, {}, MethodOptions, Mixin, Extends>) => D;
+    data?: (this: CreateComponentPublicInstance<Props, {}, {}, {}, MethodOptions, Mixin, Extends>, vm: CreateComponentPublicInstance<Props, {}, {}, {}, MethodOptions, Mixin, Extends>) => D;
     computed?: C;
     methods?: M;
     watch?: ComponentWatchOptions;

packages/uni-uts-v1/src/tsc/kotlin/index.ts

@@ -203,6 +203,9 @@ export function runUTS2Kotlin(
               return false
             }
           }
+          if (isVueWatchCallback(ts, node)) {
+            return false
+          }
           return true
         },
       },
@@ -215,6 +218,9 @@ export function runUTS2Kotlin(
               return false
             }
           }
+          if (isVueWatchCallback(ts, node)) {
+            return false
+          }
           return true
         },
       },
@@ -296,3 +302,22 @@ function resolvePlatformDeclarationFiles(
   )
   return sync([`${platformDeclarationDir}/**/*.d.ts`], { absolute: true })
 }
+
+function isVueWatchCallback(ts: typeof tsTypes, node: tsTypes.Node) {
+  if (
+    node.parent &&
+    ts.isCallExpression(node.parent) &&
+    ts.isIdentifier(node.parent.expression)
+  ) {
+    const name = node.parent.expression.getText()
+    if (
+      name === 'watch' ||
+      name === 'watchEffect' ||
+      name === 'watchPostEffect' ||
+      name === 'watchSyncEffect'
+    ) {
+      return true
+    }
+  }
+  return false
+}