fix: get declarations from both <script setup> and <script>, close #104

Author: xiaoxiangmoe

Diff for: src/core/transformScriptSetup.ts

@@ -39,12 +39,12 @@ export function transformScriptSetup(
       || n.type.startsWith('TS'),
   )
 
-  // get all identifiers in `<script setup>`
-  const declarations = [
+  // get all identifiers in `<script setup>` and `<script>`
+  const declarationArray = uniq([
     ...getIdentifierDeclarations(hoisted),
     ...getIdentifierDeclarations(setupBody),
-  ]
-  const declarationArray = uniq(declarations).filter(notNullish)
+    ...getIdentifierDeclarations(script.ast.body),
+  ]).filter(notNullish)
 
   // filter out identifiers that are used in `<template>`
   const returns: ObjectExpression['properties'] = declarationArray

Diff for: test/__snapshots__/transform.test.ts.snap

@@ -262,6 +262,49 @@ export default __sfc_main;
 "
 `;
 
+exports[`transform > fixtures > test/fixtures/ComponentsDirectivesLocal.vue 1`] = `
+"
+<script lang=\\"ts\\">
+import type { ObjectDirective } from '@vue/composition-api'; // enables v-focus in templates
+
+const vFocus: ObjectDirective<HTMLInputElement, null> = {
+  inserted: (el, binding, vnode, oldVnode) => {
+    el.focus();
+  }
+};
+const __sfc_main = {};
+__sfc_main.directives = Object.assign({
+  focus: vFocus
+}, __sfc_main.directives);
+export default __sfc_main;
+</script>
+<template>
+  <input v-focus=\\"null\\">
+</template>
+"
+`;
+
+exports[`transform > fixtures > test/fixtures/ComponentsLocal.vue 1`] = `
+"
+<script lang=\\"tsx\\">
+const HelloComponent = ({
+  name
+}: {
+  name: string;
+}) => <span>Hello, {name}</span>;
+
+const __sfc_main = {};
+__sfc_main.components = Object.assign({
+  HelloComponent
+}, __sfc_main.components);
+export default __sfc_main;
+</script>
+<template>
+  <HelloComponent name=\\"Evan You\\" />
+</template>
+"
+`;
+
 exports[`transform > fixtures > test/fixtures/DynamicStyle.vue 1`] = `
 "<template>
   <div :style=\\"{ color, border: '1px' }\\" />

Diff for: test/fixtures/ComponentsDirectivesLocal.vue

@@ -0,0 +1,13 @@
+<script lang="ts">
+import type { ObjectDirective } from '@vue/composition-api'
+// enables v-focus in templates
+const vFocus: ObjectDirective<HTMLInputElement, null> = {
+  inserted: (el, binding, vnode, oldVnode) => {
+    el.focus()
+  },
+}
+</script>
+<script setup lang="ts"></script>
+<template>
+  <input v-focus="null">
+</template>

Diff for: test/fixtures/ComponentsLocal.vue

@@ -0,0 +1,7 @@
+<script lang="tsx">
+const HelloComponent = ({ name }: { name: string }) => <span>Hello, {name}</span>
+</script>
+<script setup lang="tsx"></script>
+<template>
+  <HelloComponent name="Evan You" />
+</template>

Diff for: tsconfig.json

@@ -7,6 +7,7 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "strict": true,
+    "jsx": "preserve",
     "strictNullChecks": true,
     "isolatedModules": true,
     "resolveJsonModule": true