feat(import-alias): Code refactored

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>
accordproject · Sep 6, 2024 · 4334ac1 · 4334ac1
1 parent a6d615f
commit 4334ac1
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/lib/codegen/fromcto/typescript/typescriptvisitor.js b/lib/codegen/fromcto/typescript/typescriptvisitor.js
@@ -146,18 +146,23 @@ class TypescriptVisitor {
 
             });
 
-        modelFile.getImports().map(importString => ModelUtil.getNamespace(importString)).filter(namespace => namespace !== modelFile.getNamespace()) // Skip own namespace.
-            .filter((v, i, a) => a.indexOf(v) === i) // Remove any duplicates from direct imports
-            .forEach(namespace => {
-                const propertyTypeNames = properties.get(namespace);
-                if (propertyTypeNames) {
-                    const csvPropertyTypeNames = Array.from(propertyTypeNames).map(type => {
-                        const fqnType = `${namespace}.${type}`;
-                        return aliasedTypesMap.get(fqnType) ? `${type} as ${aliasedTypesMap.get(fqnType)}` : type;
-                    });
-                    parameters.fileWriter.writeLine(0, `import {${csvPropertyTypeNames}} from './${namespace}';`);
-                }
-            });
+        const uniqueNamespaces = new Set(
+            modelFile.getImports()
+                .map(importString => ModelUtil.getNamespace(importString))
+                .filter(namespace => namespace !== modelFile.getNamespace())
+        );
+        uniqueNamespaces.forEach(namespace => {
+            const propertyTypeNames = properties.get(namespace);
+            if (propertyTypeNames) {
+                const csvPropertyTypeNames = Array.from(propertyTypeNames).map(type => {
+                    const fqnType = `${namespace}.${type}`;
+                    return aliasedTypesMap.has(fqnType) ? `${type} as ${aliasedTypesMap.get(fqnType)}` : type;
+                }).join(',');
+
+                parameters.fileWriter.writeLine(0, `import {${csvPropertyTypeNames}} from './${namespace}';`);
+            }
+        });
+
 
         parameters.fileWriter.writeLine(0, '\n// interfaces');
         parameters.aliasedTypesMap = aliasedTypesMap;