fix(toImport): handle comma-separated declaration exports (#491)

cernymatej · web-flow · commit e908b928f122 · 2026-01-07T10:58:33.000+09:00
* fix(toImport): handle comma-separated declaration exports

* chore: disable lint in `playground/`
diff --git a/eslint.config.js b/eslint.config.js
@@ -5,6 +5,7 @@ export default antfu(
     pnpm: true,
     ignores: [
       'test/cases',
+      'playground',
     ],
   },
 )
diff --git a/playground/composables/comma-separated.ts b/playground/composables/comma-separated.ts
@@ -0,0 +1 @@
+export const FOO='foo',BAR='bar'
diff --git a/src/node/scan-dirs.ts b/src/node/scan-dirs.ts
@@ -138,10 +138,10 @@ export async function scanExports(filepath: string, includeTypes: boolean, seen
           imports.push({ name, as: name, from: filepath, ...additional })
       }
       else if (exp.type === 'declaration') {
-        if (exp.name) {
-          imports.push({ name: exp.name, as: exp.name, from: filepath, ...additional })
+        for (const name of exp.names) {
+          imports.push({ name, as: name, from: filepath, ...additional })
           if (exp.declarationType === 'enum' || exp.declarationType === 'const enum' || exp.declarationType === 'class') {
-            imports.push({ name: exp.name, as: exp.name, from: filepath, type: true, declarationType: exp.declarationType, ...additional })
+            imports.push({ name, as: name, from: filepath, type: true, declarationType: exp.declarationType, ...additional })
           }
         }
       }
diff --git a/test/dts.test.ts b/test/dts.test.ts
@@ -68,7 +68,9 @@ it('dts', async () => {
       "export {}
       declare global {
         const $: typeof import('jquery').$
+        const BAR: typeof import('<root>/playground/composables/comma-separated').BAR
         const CustomEnum: typeof import('<root>/playground/composables/index').CustomEnum
+        const FOO: typeof import('<root>/playground/composables/comma-separated').FOO
         const PascalCased: typeof import('<root>/playground/composables/PascalCased').PascalCased
         const THREE: typeof import('three')
         const bar: typeof import('<root>/playground/composables/nested/bar/index').bar
diff --git a/test/scan-dirs.test.ts b/test/scan-dirs.test.ts
@@ -14,6 +14,11 @@ describe('scan-dirs', () => {
     )
       .toMatchInlineSnapshot(`
         [
+          {
+            "as": "BAR",
+            "from": "comma-separated.ts",
+            "name": "BAR",
+          },
           {
             "as": "bump",
             "from": "index.ts",
@@ -48,6 +53,11 @@ describe('scan-dirs', () => {
             "from": "foo.ts",
             "name": "default",
           },
+          {
+            "as": "FOO",
+            "from": "comma-separated.ts",
+            "name": "FOO",
+          },
           {
             "as": "localA",
             "from": "index.ts",

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ export default antfu(`
`5`	`5`	`pnpm: true,`
`6`	`6`	`ignores: [`
`7`	`7`	`'test/cases',`
	`8`	`+ 'playground',`
`8`	`9`	`],`
`9`	`10`	`},`
`10`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,10 @@ export async function scanExports(filepath: string, includeTypes: boolean, seen`
`138`	`138`	`imports.push({ name, as: name, from: filepath, ...additional })`
`139`	`139`	`}`
`140`	`140`	`else if (exp.type === 'declaration') {`
`141`		`- if (exp.name) {`
`142`		`- imports.push({ name: exp.name, as: exp.name, from: filepath, ...additional })`
	`141`	`+ for (const name of exp.names) {`
	`142`	`+ imports.push({ name, as: name, from: filepath, ...additional })`
`143`	`143`	`if (exp.declarationType === 'enum' \|\| exp.declarationType === 'const enum' \|\| exp.declarationType === 'class') {`
`144`		`- imports.push({ name: exp.name, as: exp.name, from: filepath, type: true, declarationType: exp.declarationType, ...additional })`
	`144`	`+ imports.push({ name, as: name, from: filepath, type: true, declarationType: exp.declarationType, ...additional })`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ describe('scan-dirs', () => {`
`14`	`14`	`)`
`15`	`15`	.toMatchInlineSnapshot(`
`16`	`16`	`[`
	`17`	`+ {`
	`18`	`+ "as": "BAR",`
	`19`	`+ "from": "comma-separated.ts",`
	`20`	`+ "name": "BAR",`
	`21`	`+ },`
`17`	`22`	`{`
`18`	`23`	`"as": "bump",`
`19`	`24`	`"from": "index.ts",`
`@@ -48,6 +53,11 @@ describe('scan-dirs', () => {`
`48`	`53`	`"from": "foo.ts",`
`49`	`54`	`"name": "default",`
`50`	`55`	`},`
	`56`	`+ {`
	`57`	`+ "as": "FOO",`
	`58`	`+ "from": "comma-separated.ts",`
	`59`	`+ "name": "FOO",`
	`60`	`+ },`
`51`	`61`	`{`
`52`	`62`	`"as": "localA",`
`53`	`63`	`"from": "index.ts",`