fix: deduplicate destructuring import statement

opentiny · Feb 5, 2025 · a1e8832 · a1e8832
1 parent d685aef
commit a1e8832
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 30 deletions.
diff --git a/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js b/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
@@ -270,18 +270,7 @@ export const genSFCWithDefaultPlugin = (schema, componentsMap, config = {}, next
   }
 
   // 兼容单独调用的场景，单独调用时，这里会默认加上 builtInComponents
-  const compsMapWithBuiltIn = [...componentsMap]
-
-  for (const builtInComp of BUILTIN_COMPONENTS_MAP) {
-    if (
-      !compsMapWithBuiltIn.find(
-        ({ componentName, package: packageName }) =>
-          componentName === builtInComp.componentName && packageName === builtInComp.package
-      )
-    ) {
-      compsMapWithBuiltIn.push(builtInComp)
-    }
-  }
+  const compsMapWithBuiltIn = [...componentsMap, ...BUILTIN_COMPONENTS_MAP]
 
   return generateSFCFile(schema, compsMapWithBuiltIn, newConfig, nextPage)
 }

diff --git a/packages/vue-generator/src/plugins/parseSchemaPlugin.js b/packages/vue-generator/src/plugins/parseSchemaPlugin.js
@@ -15,16 +15,7 @@ function parseSchema() {
       const pagesMap = {}
       const resPageTree = []
 
-      for (const builtInComp of BUILTIN_COMPONENTS_MAP) {
-        if (
-          !schema.componentsMap.find(
-            ({ componentName, package: packageName }) =>
-              componentName === builtInComp.componentName && packageName === builtInComp.package
-          )
-        ) {
-          schema.componentsMap.push(builtInComp)
-        }
-      }
+      schema.componentsMap = [...schema.componentsMap, ...BUILTIN_COMPONENTS_MAP]
 
       for (const componentItem of pageSchema) {
         pagesMap[componentItem.meta.id] = componentItem

diff --git a/packages/vue-generator/src/utils/generateImportStatement.js b/packages/vue-generator/src/utils/generateImportStatement.js
@@ -17,16 +17,31 @@ export function generateImportStatement(config) {
 
 export function generateImportByPkgName(config) {
   const { pkgName, imports } = config
-
+  const seen = new Set()
   const importStatements = imports
     .filter(({ destructuring }) => destructuring)
     .map(({ componentName, exportName }) => {
       if (componentName === exportName) {
-        return componentName
+        if (!seen.has(componentName)) {
+          seen.add(componentName)
+
+          return componentName
+        }
+
+        return ''
+      }
+
+      const alias = `${exportName} as ${componentName}`
+
+      if (!seen.has(alias)) {
+        seen.add(alias)
+
+        return alias
       }
 
-      return `${exportName} as ${componentName}`
+      return ''
     })
+    .filter((item) => Boolean(item))
 
   // 默认导出如果存在，应该只有一个
   let defaultImports = imports.find(({ destructuring }) => !destructuring)

diff --git a/packages/vue-generator/test/testcases/generator/mockData.js b/packages/vue-generator/test/testcases/generator/mockData.js
@@ -2043,11 +2043,7 @@ export const appSchemaDemo01 = {
         isDefault: false,
         occupier: {
           id: 86,
-          username: '开发者',
-          email: '[email protected]',
-          resetPasswordToken: 'developer',
-          confirmationToken: 'dfb2c162-351f-4f44-ad5f-8998',
-          is_admin: true
+          username: '开发者'
         },
         isHome: false
       }