fix(typescript) do not create unions for enums and fix imports (#33)

Signed-off-by: Dan Selman <[email protected]>
accordproject · Jun 6, 2023 · 1200c2c · 1200c2c
1 parent bd7466a
commit 1200c2c
Show file tree

Hide file tree

Showing 2 changed files with 4,583 additions and 4,589 deletions.
diff --git a/lib/codegen/fromcto/typescript/typescriptvisitor.js b/lib/codegen/fromcto/typescript/typescriptvisitor.js
@@ -111,7 +111,7 @@ class TypescriptVisitor {
                         if (!properties.has(typeNamespace)) {
                             properties.set(typeNamespace, new Set());
                         }
-                        properties.get(typeNamespace).add(`I${typeName}`);
+                        properties.get(typeNamespace).add(property.isTypeEnum?.() ? typeName : `I${typeName}`);
                     }
                 });
 
@@ -208,7 +208,7 @@ class TypescriptVisitor {
         const subclasses = classDeclaration.getDirectSubclasses();
         if (subclasses && subclasses.length > 0) {
             parameters.fileWriter.writeLine(0, 'export type ' + classDeclaration.getName() +
-                'Union = ' + subclasses.map(subclass => `I${subclass.getName()}`).join(' | \n') + ';\n');
+                'Union = ' + subclasses.filter(declaration => !declaration.isEnum()).map(subclass => `I${subclass.getName()}`).join(' | \n') + ';\n');
         }
         return null;
     }