fix(compiler-sfc): handle type modifier in import specifiers (#5498)

zhmushan · web-flow · commit 8e29ef6019d1 · 2022-04-13T22:10:26.000-04:00
diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -1351,6 +1351,22 @@ return {  }
 })"
 `;
 
+exports[`SFC compile <script setup> with TypeScript import type 1`] = `
+"import { defineComponent as _defineComponent } from 'vue'
+import type { Foo } from './main.ts'
+        import { type Bar, Baz } from './main.ts'
+        
+export default /*#__PURE__*/_defineComponent({
+  setup(__props, { expose }) {
+  expose();
+
+        
+return { Baz }
+}
+
+})"
+`;
+
 exports[`SFC compile <script setup> with TypeScript runtime Enum 1`] = `
 "import { defineComponent as _defineComponent } from 'vue'
 enum Foo { A = 123 }
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -1103,6 +1103,17 @@ const emit = defineEmits(['a', 'b'])
         Foo: BindingTypes.SETUP_CONST
       })
     })
+
+    test('import type', () => {
+      const { content } = compile(
+        `<script setup lang="ts">
+        import type { Foo } from './main.ts'
+        import { type Bar, Baz } from './main.ts'
+        </script>`
+      )
+      expect(content).toMatch(`return { Baz }`)
+      assertCode(content)
+    })
   })
 
   describe('async/await detection', () => {
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
@@ -802,7 +802,9 @@ export function compileScript(
             node.source.value,
             specifier.local.name,
             imported,
-            node.importKind === 'type',
+            node.importKind === 'type' ||
+              (specifier.type === 'ImportSpecifier' &&
+                specifier.importKind === 'type'),
             false
           )
         }
@@ -979,7 +981,9 @@ export function compileScript(
             source,
             local,
             imported,
-            node.importKind === 'type',
+            node.importKind === 'type' ||
+              (specifier.type === 'ImportSpecifier' &&
+                specifier.importKind === 'type'),
             true
           )
         }

Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,9 @@ export function compileScript(`
`802`	`802`	`node.source.value,`
`803`	`803`	`specifier.local.name,`
`804`	`804`	`imported,`
`805`		`- node.importKind === 'type',`
	`805`	`+ node.importKind === 'type' \|\|`
	`806`	`+ (specifier.type === 'ImportSpecifier' &&`
	`807`	`+ specifier.importKind === 'type'),`
`806`	`808`	`false`
`807`	`809`	`)`
`808`	`810`	`}`
`@@ -979,7 +981,9 @@ export function compileScript(`
`979`	`981`	`source,`
`980`	`982`	`local,`
`981`	`983`	`imported,`
`982`		`- node.importKind === 'type',`
	`984`	`+ node.importKind === 'type' \|\|`
	`985`	`+ (specifier.type === 'ImportSpecifier' &&`
	`986`	`+ specifier.importKind === 'type'),`
`983`	`987`	`true`
`984`	`988`	`)`
`985`	`989`	`}`