fix: parse declaration error (unplugin#450)

ycs77 · web-flow · commit 16e9adaeeab0 · 2022-07-06T11:54:40.000+08:00
diff --git a/src/core/declaration.ts b/src/core/declaration.ts
@@ -12,7 +12,7 @@ const multilineCommentsRE = /\/\*.*?\*\//gms
 const singlelineCommentsRE = /\/\/.*$/gm
 
 function extractImports(code: string) {
-  return Object.fromEntries(Array.from(code.matchAll(/['"]?([\S]+?)['"]?\s*:\s*(.+?)[,;\n]/g)).map(i => [i[1], i[2]]))
+  return Object.fromEntries(Array.from(code.matchAll(/['"]?([^\s'"]+)['"]?\s*:\s*(.+?)[,;\n]/g)).map(i => [i[1], i[2]]))
 }
 
 export function parseDeclaration(code: string): DeclarationImports | undefined {
diff --git a/test/__snapshots__/dts.test.ts.snap b/test/__snapshots__/dts.test.ts.snap
@@ -22,6 +22,43 @@ declare module '@vue/runtime-core' {
 "
 `;
 
+exports[`dts > parseDeclaration - has icon component like <IMdi:diceD12> 1`] = `
+{
+  "component": {
+    "ComponentA": "typeof import('./src/components/ComponentA.vue')['default']",
+    "IMdi:diceD12": "typeof import('~icons/mdi/dice-d12')['default']",
+    "IMdiLightAlarm": "typeof import('~icons/mdi-light/alarm')['default']",
+  },
+  "directive": {},
+}
+`;
+
+exports[`dts > parseDeclaration - with directives 1`] = `
+{
+  "component": {
+    "ComponentA": "typeof import('./src/components/ComponentA.vue')['default']",
+    "IMdi:diceD12": "typeof import('~icons/mdi/dice-d12')['default']",
+    "IMdiLightAlarm": "typeof import('~icons/mdi-light/alarm')['default']",
+  },
+  "directive": {
+    "vDirective": "typeof import('foo')",
+    "vLoading": "typeof import('test/directive/Loading')['default']",
+    "vSome": "typeof import('test/directive/Some')['default']",
+  },
+}
+`;
+
+exports[`dts > parseDeclaration 1`] = `
+{
+  "component": {
+    "ComponentA": "typeof import('./src/components/ComponentA.vue')['default']",
+    "ComponentB": "typeof import('./src/components/ComponentB.vue')['default']",
+    "ComponentC": "typeof import('./src/components/component-c.vue')['default']",
+  },
+  "directive": {},
+}
+`;
+
 exports[`dts > writeDeclaration - keep unused 1`] = `
 "// generated by unplugin-vue-components
 // We suggest you to commit this file into source control
diff --git a/test/dts.test.ts b/test/dts.test.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import { describe, expect, test } from 'vitest'
 import type { ComponentResolver } from '../src'
 import { Context } from '../src/core/context'
-import { getDeclaration } from '../src/core/declaration'
+import { getDeclaration, parseDeclaration } from '../src/core/declaration'
 
 const resolver: ComponentResolver[] = [
   {
@@ -82,4 +82,73 @@ const _directive_loading = _resolveDirective("loading")`
     expect(contents).not.toContain('comment')
     expect(contents).toContain('vSome')
   })
+
+  test('parseDeclaration', async () => {
+    const code = `
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/core/pull/3399
+import '@vue/runtime-core'
+
+export {}
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    ComponentA: typeof import('./src/components/ComponentA.vue')['default']
+    ComponentB: typeof import('./src/components/ComponentB.vue')['default']
+    ComponentC: typeof import('./src/components/component-c.vue')['default']
+  }
+}`
+
+    const imports = parseDeclaration(code)
+    expect(imports).matchSnapshot()
+  })
+
+  test('parseDeclaration - has icon component like <IMdi:diceD12>', async () => {
+    const code = `
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/core/pull/3399
+import '@vue/runtime-core'
+
+export {}
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    ComponentA: typeof import('./src/components/ComponentA.vue')['default']
+    'IMdi:diceD12': typeof import('~icons/mdi/dice-d12')['default']
+    IMdiLightAlarm: typeof import('~icons/mdi-light/alarm')['default']
+  }
+}`
+
+    const imports = parseDeclaration(code)
+    expect(imports).matchSnapshot()
+  })
+
+  test('parseDeclaration - with directives', async () => {
+    const code = `
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/core/pull/3399
+import '@vue/runtime-core'
+
+export {}
+
+declare module '@vue/runtime-core' {
+  export interface GlobalComponents {
+    ComponentA: typeof import('./src/components/ComponentA.vue')['default']
+    'IMdi:diceD12': typeof import('~icons/mdi/dice-d12')['default']
+    IMdiLightAlarm: typeof import('~icons/mdi-light/alarm')['default']
+  }
+
+  export interface ComponentCustomProperties {
+    vDirective: typeof import('foo')
+    vLoading: typeof import('test/directive/Loading')['default']
+    vSome: typeof import('test/directive/Some')['default']
+  }
+}`
+
+    const imports = parseDeclaration(code)
+    expect(imports).matchSnapshot()
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const multilineCommentsRE = /\/\.?\*\//gms`
`12`	`12`	`const singlelineCommentsRE = /\/\/.*$/gm`
`13`	`13`
`14`	`14`	`function extractImports(code: string) {`
`15`		`- return Object.fromEntries(Array.from(code.matchAll(/['"]?([\S]+?)['"]?\s:\s(.+?)[,;\n]/g)).map(i => [i[1], i[2]]))`
	`15`	`+ return Object.fromEntries(Array.from(code.matchAll(/['"]?([^\s'"]+)['"]?\s:\s(.+?)[,;\n]/g)).map(i => [i[1], i[2]]))`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`export function parseDeclaration(code: string): DeclarationImports \| undefined {`