fix: adapt [email protected]+ setup script

Author: qmhc

example/components/BothScripts.vue

@@ -5,21 +5,31 @@
 </template>
 
 <script lang="ts" setup>
-import { defineProps } from 'vue'
+import { defineProps, ref } from 'vue'
 
 const props = defineProps({
 	tag: {
 		type: String,
 		default: 'div'
-	}
+	},
+	count: {
+    type: Number,
+    default: 0
+  }
 })
+
+const currentCount = ref(props.count)
+
+const inc = () => {
+  currentCount.value++
+}
 </script>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+// do not use defineComponent
 
-export default defineComponent({
+export default {
 	name: 'BothScripts',
 	customOptions: {}
-})
+}
 </script>

example/components/Setup.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, defineEmits, ref } from 'vue'
+import { defineProps, ref } from 'vue'
 import HelloWorld from './HelloWorld.vue'
 
 const props = defineProps({
@@ -24,6 +24,4 @@ const inc = () => {
   currentCount.value++
   emit('on-add', currentCount.value)
 }
-
-defineExpose({})
 </script>

example/vite.config.ts

@@ -30,7 +30,8 @@ export default defineConfig({
       outputDir: 'types',
       exclude: ['src/ignore'],
       staticImport: true,
-      insertTypesEntry: true
+      insertTypesEntry: true,
+      logDiagnostics: true
     }),
     vue()
   ]

package.json

@@ -18,7 +18,7 @@
     "@typescript-eslint/eslint-plugin": "^4.29.2",
     "@typescript-eslint/parser": "^4.29.2",
     "@vitejs/plugin-vue": "^1.4.0",
-    "@vue/compiler-sfc": "^3.2.4",
+    "@vue/compiler-sfc": "^3.2.6",
     "chalk": "^4.1.2",
     "commitizen": "^4.2.4",
     "conventional-changelog-cli": "^2.1.1",
@@ -40,7 +40,7 @@
     "tsup": "^4.14.0",
     "typescript": "4.3.5",
     "vite": "^2.4.3",
-    "vue": "^3.2.4"
+    "vue": "^3.2.6"
   },
   "engines": {
     "node": ">=12.0.0"

src/index.ts

@@ -9,7 +9,8 @@ import {
   normalizeGlob,
   transformDynamicImport,
   transformAliasImport,
-  removePureImport
+  removePureImport,
+  transferSetupPosition
 } from './transform'
 import { isNativeObj, mergeObjects, ensureAbsolute, ensureArray, runParallel } from './utils'
 
@@ -211,10 +212,11 @@ export default (options: PluginOptions = {}): Plugin => {
                   }
 
                   // 不断言会影响 setup 的类型推断
-                  content = content.replace(
-                    '...__default__',
-                    '...(__default__ as Record<string, unknown>)'
-                  )
+                  // content = content.replace(
+                  //   '...__default__',
+                  //   '...(__default__ as Record<string, unknown>)'
+                  // )
+                  content = transferSetupPosition(content)
                   content += '\nexport default _sfc_main\n'
 
                   if (scriptSetup.lang === 'ts') {

src/transform.ts

@@ -113,3 +113,19 @@ const pureImportRE = /import\s?['"][^;\n]+?['"];?\n?/g
 export function removePureImport(content: string) {
   return content.replace(pureImportRE, '')
 }
+
+const setupFunctionRE = /function setup\([\s\S]+\)\s+?\{[\s\S]+return __returned__\n\}/
+
+export function transferSetupPosition(content: string) {
+  const match = content.match(setupFunctionRE)
+
+  if (match) {
+    const setupFunction = match[0]
+
+    return content
+      .replace(setupFunction, '')
+      .replace('setup})', setupFunction.slice('function '.length) + '\n\r})')
+  }
+
+  return content
+}