fix: export type

Author: sxzz

src/index.ts

@@ -105,7 +105,7 @@ export function dts(): Plugin {
       for (let node of program.body as (Node & Span)[]) {
         const stmt = node
 
-        if (rewriteImport(s, node)) continue
+        if (rewriteImportExport(s, node)) continue
 
         // remove `export` modifier
         const isDefaultExport = node.type === 'ExportDefaultDeclaration'
@@ -185,7 +185,7 @@ export function dts(): Plugin {
       }
 
       const str = s.toString()
-      console.log(str)
+      // console.log(str)
       return str
     },
 
@@ -354,21 +354,30 @@ function patchImportSource(s: MagicStringAST, node: Node) {
 // fix:
 // - import type { ... } from '...'
 // - import { type ... } from '...'
+// - export type { ... }
+// - export { type ... }
 // - import Foo = require("./bar")
 // - export = Foo
-function rewriteImport(s: MagicStringAST, node: Node) {
-  if (node.type === 'ImportDeclaration') {
+function rewriteImportExport(s: MagicStringAST, node: Node) {
+  if (
+    node.type === 'ImportDeclaration' ||
+    (node.type === 'ExportNamedDeclaration' && !node.declaration)
+  ) {
     for (const specifier of node.specifiers) {
       if (
-        specifier.type === 'ImportSpecifier' &&
-        specifier.importKind === 'type'
+        (specifier.type === 'ImportSpecifier' &&
+          specifier.importKind === 'type') ||
+        (specifier.type === 'ExportSpecifier' &&
+          specifier.exportKind === 'type')
       ) {
         s.overwriteNode(specifier, s.sliceNode(specifier).replace(RE_TYPE, ''))
       }
     }
 
     const firstSpecifier = node.specifiers[0]
-    if (node.importKind === 'type' && firstSpecifier) {
+    const kind =
+      node.type === 'ImportDeclaration' ? node.importKind : node.exportKind
+    if (kind === 'type' && firstSpecifier) {
       s.overwrite(
         node.start,
         firstSpecifier.start,

tests/fixtures/custom-tsconfig/diff.patch …ixtures/custom-tsconfig/known-diff.patchtests/fixtures/custom-tsconfig/diff.patch renamed to tests/fixtures/custom-tsconfig/known-diff.patch tests/fixtures/custom-tsconfig/diff.patch renamed to tests/fixtures/custom-tsconfig/known-diff.patch

@@ -2,7 +2,8 @@ Index: diff.patch
 ===================================================================
 --- diff.patch
 +++ diff.patch
-@@ -1,2 +1,2 @@
+@@ -1,2 +1,3 @@
  // index.d.ts
 -export { Foo } from '@/foo';
-+export {}
++import { Foo } from '@/foo';
++export { Foo };

tests/fixtures/custom-tsconfig/snapshot.d.ts

@@ -1,2 +1,4 @@
 // index.d.ts
-export {}
+import { Foo } from "@/foo";
+
+export { Foo };

tests/fixtures/issue-87/diff.patch tests/fixtures/issue-87/known-diff.patchtests/fixtures/issue-87/diff.patch renamed to tests/fixtures/issue-87/known-diff.patch

@@ -2,7 +2,7 @@ Index: diff.patch
 ===================================================================
 --- diff.patch
 +++ diff.patch
-@@ -1,36 +1,16 @@
+@@ -1,36 +1,28 @@
  // index.d.ts
 -export { default as A } from 'a';
 -export { default as D } from 'd';
@@ -31,23 +31,32 @@ Index: diff.patch
 -export { o as O };
 -interface Foo$1 {}
 +import A from 'a';
++import D from 'd';
++import { B } from 'b';
 +import { E, E as E3 } from 'e';
 +import { G1 } from 'g1';
++import { B as B1 } from 'b1';
 +import { E as E4 } from 'e3';
 +import * as C from 'c';
 +import * as F from 'f';
 +import { G } from 'g';
++import { J } from 'j';
++import { L } from 'l';
 +import { H as H1 } from 'h1';
++import { K as K1 } from 'k1';
++import { M as M1 } from 'm1';
 +import * as I from 'i';
 +export * from 'i1'
++interface Foo {}
  declare class BarType { }
  declare class BarValue { }
 +type index_d_default = E
  interface O {}
--declare class X {}
+ declare class X {}
 -interface Foo {
--  inline: string
--}
++interface Foo$1 {
+   inline: string
+ }
 -export { BarType, BarValue, X };
 -export { Foo$1 as Foo, Foo as FooInlne, O as O1 };
-+export { A, BarType, BarValue, C, C as C1, E3, E4, F, G, G1, H1, I, O as O1, index_d_default as default };
++export { A, B, B1 as B2, B1 as B3, BarType, BarValue, C, C as C1, D, E3 as E2, E3, E4, F, Foo, Foo$1 as FooInlne, G, G1, H1, I, J, K1, L, M1, O as O1, X, index_d_default as default };

…tures/type-only-import-export/diff.patch …type-only-import-export/known-diff.patchtests/fixtures/type-only-import-export/diff.patch renamed to tests/fixtures/type-only-import-export/known-diff.patch tests/fixtures/type-only-import-export/diff.patch renamed to tests/fixtures/type-only-import-export/known-diff.patch

@@ -1,16 +1,27 @@
 // index.d.ts
 import A from "a";
+import D from "d";
+import { B } from "b";
 import { E, E as E3 } from "e";
 import { G1 } from "g1";
+import { B as B1 } from "b1";
 import { E as E4 } from "e3";
 import * as C from "c";
 import * as F from "f";
 import { G } from "g";
+import { J } from "j";
+import { L } from "l";
 import { H as H1 } from "h1";
+import { K as K1 } from "k1";
+import { M as M1 } from "m1";
 import * as I from "i";
 
 export * from "i1"
 
+//#region tests/fixtures/type-only-import-export/foo.d.ts
+interface Foo {}
+
+//#endregion
 //#region tests/fixtures/type-only-import-export/bar.d.ts
 declare class BarType { }
 declare class BarValue { }
@@ -19,6 +30,10 @@ declare class BarValue { }
 //#region tests/fixtures/type-only-import-export/index.d.ts
 type index_d_default = E
 interface O {}
+declare class X {}
+interface Foo$1 {
+  inline: string
+}
 
 //#endregion
-export { A, BarType, BarValue, C, C as C1, E3, E4, F, G, G1, H1, I, O as O1, index_d_default as default };
+export { A, B, B1 as B2, B1 as B3, BarType, BarValue, C, C as C1, D, E3 as E2, E3, E4, F, Foo, Foo$1 as FooInlne, G, G1, H1, I, J, K1, L, M1, O as O1, X, index_d_default as default };