@goast/typescript 0.2.4 → 0.2.6

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

@@ -41,7 +41,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             content.values.push(this.getEnum(ctx));
         }
         else if (ctx.schema.discriminator && Object.keys(ctx.schema.discriminator.mapping).length > 0) {
-            content.values.push(ast_1.ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ast_1.ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ast_1.ts.string(x)))), ast_1.ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, true)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
+            content.values.push(ast_1.ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ast_1.ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ast_1.ts.string(x)))), ast_1.ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, { skipSchemas: true })) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
         }
         else {
             content.values.push(this.getTypeAlias(ctx, ctx.schema));
@@ -65,7 +65,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
     getTypeAlias(ctx, schema) {
         var _a;
         const isDiscriminated = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
-        const result = ast_1.ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, true))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        const result = ast_1.ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             export: true,
             doc: ast_1.ts.doc({ description: schema.description }),
         });
@@ -94,14 +94,14 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             });
         });
     }
-    getType(ctx, schema, skipSchemas = false) {
+    getType(ctx, schema, options) {
         if (!schema)
             return this.getAnyType(ctx);
         schema = (0, core_1.getSchemaReference)(schema, ['description']);
-        if (ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
+        if ((options === null || options === void 0 ? void 0 : options.useBaseType) && ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
             return ast_1.ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema));
         }
-        if (!skipSchemas && this.shouldGenerateTypeDeclaration(ctx, schema)) {
+        if (!(options === null || options === void 0 ? void 0 : options.skipSchemas) && this.shouldGenerateTypeDeclaration(ctx, schema)) {
             if (schema.id === ctx.schema.id) {
                 return null;
             }
@@ -178,9 +178,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         if (schema.allOf.length === 0 && schema.anyOf.length === 0) {
             return this.getAnyType(ctx);
         }
+        const useBaseType = schema.id === ctx.schema.id;
         return ast_1.ts.intersectionType([
-            ...schema.allOf.map((x) => this.getType(ctx, x)),
-            ...schema.anyOf.map((x) => ast_1.ts.reference('Partial', null, { generics: [this.getType(ctx, x)] })),
+            ...schema.allOf.map((x) => this.getType(ctx, x, { useBaseType })),
+            ...schema.anyOf.map((x) => ast_1.ts.reference('Partial', null, { generics: [this.getType(ctx, x, { useBaseType })] })),
         ]);
     }
     getOneOfType(ctx, schema) {

package/cjs/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -9,7 +9,6 @@ const file_generator_1 = require("../../file-generator");
 class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptFileGenerator {
     generate(ctx) {
         const result = {};
-        let builder;
         if (this.shouldGenerateInterface(ctx)) {
             const filePath = this.getInterfaceFilePath(ctx);
             const name = this.getInterfaceName(ctx);
@@ -19,7 +18,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
                 options: ctx.config,
                 generator: (b) => b.append(this.getInterfaceFileContent(ctx)),
             });
-            result.interface = { filePath, component: name, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            result.interface = { filePath, component: name };
         }
         if (this.shouldGenerateClass(ctx)) {
             const filePath = this.getClassFilePath(ctx);
@@ -30,7 +29,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
                 options: ctx.config,
                 generator: (b) => b.append(this.getClassFileContent(ctx)),
             });
-            result.class = { filePath, component: name, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            result.class = { filePath, component: name };
         }
         return result;
     }

package/cjs/lib/generators/services/fetch-clients/fetch-clients-generator.js

@@ -7,8 +7,8 @@ const core_1 = require("@goast/core");
 const fetch_client_generator_1 = require("./fetch-client-generator");
 const models_1 = require("./models");
 const refs_1 = require("./refs");
+const ast_1 = require("../../../ast");
 const file_builder_1 = require("../../../file-builder");
-const import_collection_1 = require("../../../import-collection");
 class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProviderBase {
     constructor(clientGeneratorFactory) {
         super();
@@ -43,37 +43,23 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
         ctx.output.clients[service.id] = result;
     }
     generateIndexFile(ctx) {
-        if (!this.shouldGenerateIndexFile(ctx)) {
-            return undefined;
-        }
         const filePath = this.getIndexFilePath(ctx);
-        console.log(`Generating index file to ${filePath}...`);
-        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
-        const builder = new file_builder_1.TypeScriptFileBuilder(filePath, ctx.config);
-        this.generateIndexFileContent(ctx, builder);
-        (0, fs_extra_1.writeFileSync)(filePath, builder.toString());
+        file_builder_1.TypeScriptFileBuilder.tryGenerate({
+            logName: 'clients index file',
+            filePath,
+            options: ctx.config,
+            generator: (b) => b.append(this.getIndexFileContent(ctx)),
+        });
         return filePath;
     }
     getIndexFilePath(ctx) {
-        var _a;
-        return (0, path_1.resolve)(ctx.config.outputDir, (_a = ctx.config.indexFilePath) !== null && _a !== void 0 ? _a : 'clients.ts');
+        return ctx.config.indexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.indexFilePath) : null;
     }
-    shouldGenerateIndexFile(ctx) {
-        return ctx.config.indexFilePath !== null;
-    }
-    generateIndexFileContent(ctx, builder) {
-        var _a, _b;
-        const exports = new import_collection_1.ImportExportCollection();
-        for (const clientId in ctx.output.clients) {
-            const client = ctx.output.clients[clientId];
-            if ((_a = client.class) === null || _a === void 0 ? void 0 : _a.filePath) {
-                exports.addExport(client.class.component, client.class.filePath);
-            }
-            if ((_b = client.interface) === null || _b === void 0 ? void 0 : _b.filePath) {
-                exports.addExport(client.interface.component, client.interface.filePath);
-            }
-        }
-        exports.writeTo(builder);
+    getIndexFileContent(ctx) {
+        return (0, core_1.appendValueGroup)(Object.values(ctx.output.clients)
+            .flatMap((c) => [c.class, c.interface])
+            .filter(core_1.notNullish)
+            .map((x) => ast_1.ts.export(x.component, x.filePath)));
     }
     copyUtilsFiles(ctx) {
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/typescript')), '../assets/client/fetch');

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

@@ -38,7 +38,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             content.values.push(this.getEnum(ctx));
         }
         else if (ctx.schema.discriminator && Object.keys(ctx.schema.discriminator.mapping).length > 0) {
-            content.values.push(ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ts.string(x)))), ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, true)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
+            content.values.push(ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ts.string(x)))), ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, { skipSchemas: true })) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
         }
         else {
             content.values.push(this.getTypeAlias(ctx, ctx.schema));
@@ -62,7 +62,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     getTypeAlias(ctx, schema) {
         var _a;
         const isDiscriminated = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
-        const result = ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, true))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        const result = ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             export: true,
             doc: ts.doc({ description: schema.description }),
         });
@@ -91,14 +91,14 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             });
         });
     }
-    getType(ctx, schema, skipSchemas = false) {
+    getType(ctx, schema, options) {
         if (!schema)
             return this.getAnyType(ctx);
         schema = getSchemaReference(schema, ['description']);
-        if (ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
+        if ((options === null || options === void 0 ? void 0 : options.useBaseType) && ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
             return ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema));
         }
-        if (!skipSchemas && this.shouldGenerateTypeDeclaration(ctx, schema)) {
+        if (!(options === null || options === void 0 ? void 0 : options.skipSchemas) && this.shouldGenerateTypeDeclaration(ctx, schema)) {
             if (schema.id === ctx.schema.id) {
                 return null;
             }
@@ -175,9 +175,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         if (schema.allOf.length === 0 && schema.anyOf.length === 0) {
             return this.getAnyType(ctx);
         }
+        const useBaseType = schema.id === ctx.schema.id;
         return ts.intersectionType([
-            ...schema.allOf.map((x) => this.getType(ctx, x)),
-            ...schema.anyOf.map((x) => ts.reference('Partial', null, { generics: [this.getType(ctx, x)] })),
+            ...schema.allOf.map((x) => this.getType(ctx, x, { useBaseType })),
+            ...schema.anyOf.map((x) => ts.reference('Partial', null, { generics: [this.getType(ctx, x, { useBaseType })] })),
         ]);
     }
     getOneOfType(ctx, schema) {

package/esm/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -6,7 +6,6 @@ import { TypeScriptFileGenerator } from '../../file-generator';
 export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerator {
     generate(ctx) {
         const result = {};
-        let builder;
         if (this.shouldGenerateInterface(ctx)) {
             const filePath = this.getInterfaceFilePath(ctx);
             const name = this.getInterfaceName(ctx);
@@ -16,7 +15,7 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
                 options: ctx.config,
                 generator: (b) => b.append(this.getInterfaceFileContent(ctx)),
             });
-            result.interface = { filePath, component: name, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            result.interface = { filePath, component: name };
         }
         if (this.shouldGenerateClass(ctx)) {
             const filePath = this.getClassFilePath(ctx);
@@ -27,7 +26,7 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
                 options: ctx.config,
                 generator: (b) => b.append(this.getClassFileContent(ctx)),
             });
-            result.class = { filePath, component: name, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            result.class = { filePath, component: name };
         }
         return result;
     }

package/esm/lib/generators/services/fetch-clients/fetch-clients-generator.js

@@ -1,11 +1,11 @@
 import { dirname, resolve } from 'path';
-import { ensureDirSync, writeFileSync, copyFileSync, readdirSync } from 'fs-extra';
-import { OpenApiServicesGenerationProviderBase, Factory } from '@goast/core';
+import { ensureDirSync, copyFileSync, readdirSync } from 'fs-extra';
+import { OpenApiServicesGenerationProviderBase, Factory, appendValueGroup, notNullish, } from '@goast/core';
 import { DefaultTypeScriptFetchClientGenerator } from './fetch-client-generator';
 import { defaultTypeScriptFetchClientsGeneratorConfig, } from './models';
 import { getReferenceFactories } from './refs';
+import { ts } from '../../../ast';
 import { TypeScriptFileBuilder } from '../../../file-builder';
-import { ImportExportCollection } from '../../../import-collection';
 export class TypeScriptClientsGenerator extends OpenApiServicesGenerationProviderBase {
     constructor(clientGeneratorFactory) {
         super();
@@ -40,37 +40,23 @@ export class TypeScriptClientsGenerator extends OpenApiServicesGenerationProvide
         ctx.output.clients[service.id] = result;
     }
     generateIndexFile(ctx) {
-        if (!this.shouldGenerateIndexFile(ctx)) {
-            return undefined;
-        }
         const filePath = this.getIndexFilePath(ctx);
-        console.log(`Generating index file to ${filePath}...`);
-        ensureDirSync(dirname(filePath));
-        const builder = new TypeScriptFileBuilder(filePath, ctx.config);
-        this.generateIndexFileContent(ctx, builder);
-        writeFileSync(filePath, builder.toString());
+        TypeScriptFileBuilder.tryGenerate({
+            logName: 'clients index file',
+            filePath,
+            options: ctx.config,
+            generator: (b) => b.append(this.getIndexFileContent(ctx)),
+        });
         return filePath;
     }
     getIndexFilePath(ctx) {
-        var _a;
-        return resolve(ctx.config.outputDir, (_a = ctx.config.indexFilePath) !== null && _a !== void 0 ? _a : 'clients.ts');
+        return ctx.config.indexFilePath ? resolve(ctx.config.outputDir, ctx.config.indexFilePath) : null;
     }
-    shouldGenerateIndexFile(ctx) {
-        return ctx.config.indexFilePath !== null;
-    }
-    generateIndexFileContent(ctx, builder) {
-        var _a, _b;
-        const exports = new ImportExportCollection();
-        for (const clientId in ctx.output.clients) {
-            const client = ctx.output.clients[clientId];
-            if ((_a = client.class) === null || _a === void 0 ? void 0 : _a.filePath) {
-                exports.addExport(client.class.component, client.class.filePath);
-            }
-            if ((_b = client.interface) === null || _b === void 0 ? void 0 : _b.filePath) {
-                exports.addExport(client.interface.component, client.interface.filePath);
-            }
-        }
-        exports.writeTo(builder);
+    getIndexFileContent(ctx) {
+        return appendValueGroup(Object.values(ctx.output.clients)
+            .flatMap((c) => [c.class, c.interface])
+            .filter(notNullish)
+            .map((x) => ts.export(x.component, x.filePath)));
     }
     copyUtilsFiles(ctx) {
         const sourceDir = resolve(dirname(require.resolve('@goast/typescript')), '../assets/client/fetch');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/types/lib/generators/models/model-generator.d.ts

@@ -17,7 +17,10 @@ export declare class DefaultTypeScriptModelGenerator extends TypeScriptFileGener
     protected getTypeAlias(ctx: Context, schema: ApiSchema): ts.TypeAlias<Builder>;
     protected getIndexer(ctx: Context, schema: ObjectLikeApiSchema): ts.Indexer<Builder, never> | null;
     protected getProperties(ctx: Context, schema: ObjectLikeApiSchema): (import("../../ast/nodes/property").TsAccessorProperty<Builder, ""> | import("../../ast/nodes/property").TsSimpleProperty<Builder, "">)[];
-    protected getType(ctx: Context, schema: Nullable<ApiSchema>, skipSchemas?: boolean): ts.Type<Builder> | null;
+    protected getType(ctx: Context, schema: Nullable<ApiSchema>, options?: {
+        skipSchemas?: boolean;
+        useBaseType?: boolean;
+    }): ts.Type<Builder> | null;
     protected getArrayType(ctx: Context, schema: ArrayLikeApiSchema): ts.Type<Builder>;
     protected getObjectType(ctx: Context, schema: ObjectLikeApiSchema): ts.Type<Builder>;
     protected getDiscriminatorType(ctx: Context, schema: ApiSchema): ts.Type<Builder>;

package/types/lib/generators/services/fetch-clients/fetch-clients-generator.d.ts

@@ -1,4 +1,4 @@
-import { ApiService, OpenApiGeneratorContext, OpenApiServicesGenerationProviderBase, Factory } from '@goast/core';
+import { ApiService, OpenApiGeneratorContext, OpenApiServicesGenerationProviderBase, Factory, AppendValueGroup } from '@goast/core';
 import { TypeScriptFetchClientGenerator } from './fetch-client-generator';
 import { TypeScriptFetchClientGeneratorOutput, TypeScriptFetchClientsGeneratorConfig, TypeScriptFetchClientsGeneratorContext, TypeScriptFetchClientsGeneratorInput, TypeScriptFetchClientsGeneratorOutput } from './models';
 import { TypeScriptFileBuilder } from '../../../file-builder';
@@ -15,10 +15,9 @@ export declare class TypeScriptClientsGenerator extends OpenApiServicesGeneratio
     onGenerate(ctx: Context): Output;
     protected generateService(ctx: Context, service: ApiService): ServiceOutput;
     protected addServiceResult(ctx: Context, service: ApiService, result: ServiceOutput): void;
-    protected generateIndexFile(ctx: Context): string | undefined;
-    protected getIndexFilePath(ctx: Context): string;
-    protected shouldGenerateIndexFile(ctx: Context): boolean;
-    protected generateIndexFileContent(ctx: Context, builder: TypeScriptFileBuilder): void;
+    protected generateIndexFile(ctx: Context): string | null;
+    protected getIndexFilePath(ctx: Context): string | null;
+    protected getIndexFileContent(ctx: Context): AppendValueGroup<TypeScriptFileBuilder>;
     private copyUtilsFiles;
 }
 export {};

package/types/lib/generators/services/fetch-clients/models.d.ts

@@ -1,6 +1,6 @@
 import { ApiService, DefaultGenerationProviderConfig, OpenApiServicesGenerationProviderContext, StringCasing, StringCasingWithOptions, Nullable } from '@goast/core';
 import { getReferenceFactories } from './refs';
-import { TypeScriptComponentOutput } from '../../../common-results';
+import { TypeScriptExportOutput } from '../../../common-results';
 import { TypeScriptGeneratorConfig } from '../../../config';
 import { TypeScriptModelsGeneratorOutput } from '../../models/models';
 export type TypeScriptFetchClientsGeneratorConfig = TypeScriptGeneratorConfig & {
@@ -27,8 +27,8 @@ export type TypeScriptFetchClientsGeneratorOutput = {
     };
 };
 export type TypeScriptFetchClientGeneratorOutput = {
-    class?: Omit<TypeScriptComponentOutput, 'additionalImports'>;
-    interface?: Omit<TypeScriptComponentOutput, 'additionalImports'>;
+    class?: TypeScriptExportOutput;
+    interface?: TypeScriptExportOutput;
 };
 export type TypeScriptFetchClientsGeneratorContext = OpenApiServicesGenerationProviderContext<TypeScriptFetchClientsGeneratorInput, TypeScriptFetchClientsGeneratorOutput, TypeScriptFetchClientsGeneratorConfig, TypeScriptFetchClientGeneratorOutput> & {
     refs: ReturnType<typeof getReferenceFactories>;