@goast/typescript 0.2.19 → 0.2.20

package/cjs/lib/generators/models/model-generator.js

@@ -11,13 +11,22 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
             const name = this.getDeclarationTypeName(ctx, ctx.schema);
             const filePath = this.getFilePath(ctx, ctx.schema);
+            const fileContent = this.getFileContent(ctx);
             file_builder_1.TypeScriptFileBuilder.generate({
                 logName: `model ${name}`,
                 filePath,
                 options: ctx.config,
-                generator: (b) => b.append(this.getFileContent(ctx)),
+                generator: (b) => b.append(fileContent),
             });
-            return { component: name, filePath, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            return {
+                component: name,
+                filePath,
+                imports: [{ kind: 'file', name, modulePath: filePath }],
+                additionalExports: fileContent.values
+                    .filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x)
+                    .filter((x) => x.name !== name)
+                    .map((x) => x.name),
+            };
         }
         else {
             const builder = new file_builder_1.TypeScriptFileBuilder(undefined, ctx.config);

package/cjs/lib/generators/models/models-generator.js

@@ -47,7 +47,13 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
         return ctx.config.indexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.indexFilePath) : null;
     }
     getIndexFileContent(ctx) {
-        return (0, core_1.appendValueGroup)(Object.values(ctx.output.models).map((x) => (x.filePath ? ast_1.ts.export(x.component, x.filePath) : null)));
+        return (0, core_1.appendValueGroup)(Object.values(ctx.output.models).flatMap((x) => {
+            var _a, _b;
+            const { filePath } = x;
+            if (!filePath)
+                return [];
+            return [ast_1.ts.export(x.component, filePath), ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => ast_1.ts.export(e, filePath))) !== null && _b !== void 0 ? _b : [])];
+        }));
     }
 }
 exports.TypeScriptModelsGenerator = TypeScriptModelsGenerator;

package/esm/lib/generators/models/model-generator.js

@@ -8,13 +8,22 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
             const name = this.getDeclarationTypeName(ctx, ctx.schema);
             const filePath = this.getFilePath(ctx, ctx.schema);
+            const fileContent = this.getFileContent(ctx);
             TypeScriptFileBuilder.generate({
                 logName: `model ${name}`,
                 filePath,
                 options: ctx.config,
-                generator: (b) => b.append(this.getFileContent(ctx)),
+                generator: (b) => b.append(fileContent),
             });
-            return { component: name, filePath, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            return {
+                component: name,
+                filePath,
+                imports: [{ kind: 'file', name, modulePath: filePath }],
+                additionalExports: fileContent.values
+                    .filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x)
+                    .filter((x) => x.name !== name)
+                    .map((x) => x.name),
+            };
         }
         else {
             const builder = new TypeScriptFileBuilder(undefined, ctx.config);

package/esm/lib/generators/models/models-generator.js

@@ -44,6 +44,12 @@ export class TypeScriptModelsGenerator extends OpenApiSchemasGenerationProviderB
         return ctx.config.indexFilePath ? resolve(ctx.config.outputDir, ctx.config.indexFilePath) : null;
     }
     getIndexFileContent(ctx) {
-        return appendValueGroup(Object.values(ctx.output.models).map((x) => (x.filePath ? ts.export(x.component, x.filePath) : null)));
+        return appendValueGroup(Object.values(ctx.output.models).flatMap((x) => {
+            var _a, _b;
+            const { filePath } = x;
+            if (!filePath)
+                return [];
+            return [ts.export(x.component, filePath), ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => ts.export(e, filePath))) !== null && _b !== void 0 ? _b : [])];
+        }));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -9,7 +9,11 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@goast/core": "0.2.2"
+    "fs-extra": "^11.2.0",
+    "node-fetch": "^2.7.0",
+    "yaml": "^2.4.1",
+    "@goast/core": "0.2.2",
+    "tslib": "2.6.2"
   },
   "module": "./esm/index.js",
   "main": "./cjs/index.js",

package/types/lib/common-results.d.ts

@@ -2,6 +2,7 @@ export type TypeScriptComponentOutput = {
     component: string;
     filePath?: string;
     imports: TypeScriptImport[];
+    additionalExports?: string[];
 };
 export type TypeScriptExportOutput = {
     component: string;