@goast/typescript 0.2.19 → 0.3.0

package/cjs/lib/generators/services/angular-services/models.js

@@ -2,12 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTypeScriptAngularServicesGeneratorConfig = void 0;
 const config_1 = require("../../../config");
-exports.defaultTypeScriptAngularServicesGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultTypeScriptGeneratorConfig), { fileNameCasing: { casing: 'kebab', suffix: '.service' }, responseModelFileNameCasing: { casing: 'kebab', suffix: '-responses.model' }, provideKind: 'provide-fn', strictResponseTypes: true, defaultStatusCodeResponseTypes: {
+exports.defaultTypeScriptAngularServicesGeneratorConfig = {
+    ...config_1.defaultTypeScriptGeneratorConfig,
+    provideKind: 'provide-fn',
+    domainName: undefined,
+    strictResponseTypes: true,
+    defaultStatusCodeResponseTypes: {
         401: null,
         403: null,
         500: null,
-    }, possibleStatusCodes: [
+    },
+    possibleStatusCodes: [
         100, 101, 102, 103, 200, 201, 202, 203, 204, 205, 206, 207, 208, 226, 300, 301, 302, 303, 304, 305, 306, 307, 308,
         400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 421, 422, 423, 424, 425,
         426, 428, 429, 431, 451, 500, 501, 502, 503, 504, 505, 506, 507, 508, 510, 511,
-    ], servicesDirPath: 'services', servicesIndexFilePath: 'services.ts', responseModelsDirPath: 'models/responses', responseModelsIndexFilePath: 'responses.ts', utilsDirPath: 'utils' });
+    ],
+    rootUrl: undefined,
+    pathModifier: undefined,
+    servicesDir: 'services',
+    serviceFileNameCasing: { casing: 'kebab', suffix: '.service' },
+    servicesIndexFile: 'services.ts',
+    responseModelsDir: 'models/responses',
+    responseModelFileNameCasing: { casing: 'kebab', suffix: '-responses.model' },
+    responseModelsIndexFile: 'responses.ts',
+    utilsDir: 'utils',
+};

package/cjs/lib/generators/services/angular-services/refs.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReferenceFactories = void 0;
+exports.getReferenceFactories = getReferenceFactories;
 const path_1 = require("path");
 const core_1 = require("@goast/core");
 const ast_1 = require("../../../ast");
 // See packages/typescript/assets/client/angular for reference
 function getReferenceFactories(options) {
     var _a, _b;
-    const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDirPath);
+    const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDir);
     return {
         // angular-service.utils.ts
         abortablePromise: ast_1.ts.reference.genericFactory('AbortablePromise', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts')),
@@ -24,4 +24,3 @@ function getReferenceFactories(options) {
         provide: ast_1.ts.reference.factory((0, core_1.toCasing)(`provide_${(_b = options.domainName) !== null && _b !== void 0 ? _b : ''}_Api`, options.functionNameCasing), (0, path_1.join)(utilsDirPath, 'provide.ts')),
     };
 }
-exports.getReferenceFactories = getReferenceFactories;

package/cjs/lib/generators/services/easy-network-stub/easy-network-stub-generator.js

@@ -97,22 +97,23 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_1.TypeScr
             ],
             returnType: 'this',
             body: (0, core_1.appendValueGroup)([
-                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
-              ${ast_1.ts.string(endpoint.method.toUpperCase())},
-              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
-              async (request) => {${core_1.builderTemplate.indent `
-                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
-                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
-                }
-                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
-              }`}
+                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
+              ${ast_1.ts.string(endpoint.method.toUpperCase())},
+              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
+              async (request) => {${core_1.builderTemplate.indent `
+                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
+                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
+                }
+                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
+              }`}
             );`,
                 'return this;',
             ], '\n'),
         });
     }
     getStubFilePath(ctx) {
-        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.stubsDirPath, `${(0, core_1.toCasing)(ctx.service.name, ctx.config.fileNameCasing)}.ts`);
+        var _a;
+        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.stubsDir, `${(0, core_1.toCasing)(ctx.service.name, (_a = ctx.config.stubFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.ts`);
     }
     getResponderVariableName(ctx, endpoint) {
         return (0, core_1.toCasing)(endpoint.name + '_Responder', ctx.config.propertyNameCasing);
@@ -137,7 +138,7 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_1.TypeScr
         let path = endpoint.path;
         let isFirstQueryParam = true;
         for (const param of endpoint.parameters) {
-            let type = ((_b = (param.schema && ((_a = ctx.input.models[param.schema.id]) === null || _a === void 0 ? void 0 : _a.component))) !== null && _b !== void 0 ? _b : ast_1.ts.refs.unknown.name).replace(/^readonly /, '');
+            let type = ((_b = (param.schema && ((_a = ctx.input.typescript.models[param.schema.id]) === null || _a === void 0 ? void 0 : _a.component))) !== null && _b !== void 0 ? _b : ast_1.ts.refs.unknown.name).replace(/^readonly /, '');
             const arrayMatch = /^\((.*)\)\[\]$/.exec(type);
             if (arrayMatch !== null) {
                 type = `${arrayMatch[1]}[]`;
@@ -164,7 +165,7 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_1.TypeScr
         ]);
     }
     getSchemaType(ctx, schema, fallback) {
-        const output = schema && ctx.input.models[schema.id];
+        const output = schema && ctx.input.typescript.models[schema.id];
         if (!output)
             return fallback !== null && fallback !== void 0 ? fallback : this.getAnyType(ctx);
         return (b) => b.appendModelUsage(output);

package/cjs/lib/generators/services/easy-network-stub/easy-network-stubs-generator.js

@@ -16,8 +16,10 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
     }
     initResult() {
         return {
-            stubs: {},
-            indexFiles: { stubs: undefined },
+            typescript: {
+                stubs: {},
+                indexFiles: { stubs: undefined },
+            },
         };
     }
     buildContext(context, config) {
@@ -29,19 +31,22 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
     onGenerate(ctx) {
         const output = super.onGenerate(ctx);
         this.generateUtilsFiles(ctx);
-        output.indexFiles = this.generateIndexFiles(ctx);
+        output.typescript.indexFiles = this.generateIndexFiles(ctx);
         return output;
     }
     generateService(ctx, service) {
         const clientGenerator = this._generatorFactory.create();
-        return clientGenerator.generate(Object.assign(Object.assign({}, ctx), { service }));
+        return clientGenerator.generate({
+            ...ctx,
+            service,
+        });
     }
     addServiceResult(ctx, service, result) {
-        ctx.output.stubs[service.id] = result;
+        ctx.output.typescript.stubs[service.id] = result;
     }
     generateUtilsFiles(ctx) {
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/typescript')), '../assets/stubs/easy-network-stub');
-        const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDirPath);
+        const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDir);
         (0, fs_extra_1.ensureDirSync)(targetDir);
         this.copyFile('easy-network-stub utils', sourceDir, targetDir, 'easy-network-stub.utils.ts');
     }
@@ -59,7 +64,7 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
     }
     getStubsIndexFileContent(ctx) {
         return (0, core_1.appendValueGroup)([
-            (0, core_1.appendValueGroup)(Object.values(ctx.output.stubs).map((x) => ast_1.ts.export(x.component, x.filePath))),
+            (0, core_1.appendValueGroup)(Object.values(ctx.output.typescript.stubs).map((x) => ast_1.ts.export(x.component, x.filePath))),
             this.getStubsClass(ctx),
         ], '\n');
     }
@@ -74,7 +79,7 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                     readonly: true,
                     type: ctx.refs.easyNetworkStubWrapper(),
                 }),
-                ...Object.entries(ctx.output.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], fieldCasing), {
+                ...Object.entries(ctx.output.typescript.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], fieldCasing), {
                     accessModifier: 'private',
                     optional: true,
                     type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this']),
@@ -96,7 +101,7 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                         body: (0, core_1.appendValueGroup)(['return this._stubWrapper.requests;'], '\n'),
                     }),
                 }),
-                ...Object.entries(ctx.output.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], ctx.config.propertyNameCasing), {
+                ...Object.entries(ctx.output.typescript.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], ctx.config.propertyNameCasing), {
                     accessModifier: 'public',
                     type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this']),
                     get: ast_1.ts.property.getter({
@@ -109,7 +114,7 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                     accessModifier: 'public',
                     returnType: 'this',
                     body: (0, core_1.appendValueGroup)([
-                        ...Object.keys(ctx.output.stubs).map((id) => `this.${(0, core_1.toCasing)(serviceNames[id], fieldCasing)}?.reset();`),
+                        ...Object.keys(ctx.output.typescript.stubs).map((id) => `this.${(0, core_1.toCasing)(serviceNames[id], fieldCasing)}?.reset();`),
                         'return this;',
                     ], '\n'),
                 }),
@@ -117,7 +122,7 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
         });
     }
     getStubsIndexFilePath(ctx) {
-        return ctx.config.stubsIndexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.stubsIndexFilePath) : null;
+        return ctx.config.stubsIndexFile ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.stubsIndexFile) : null;
     }
     getStubsClassName(ctx) {
         var _a;

package/cjs/lib/generators/services/easy-network-stub/models.js

@@ -3,8 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTypeScriptEasyNetworkStubsGeneratorConfig = void 0;
 const ast_1 = require("../../../ast");
 const config_1 = require("../../../config");
-exports.defaultTypeScriptEasyNetworkStubsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultTypeScriptGeneratorConfig), { fileNameCasing: { casing: 'kebab', suffix: '.stubs' }, defaultStatusCodeResponseTypes: {
+exports.defaultTypeScriptEasyNetworkStubsGeneratorConfig = {
+    ...config_1.defaultTypeScriptGeneratorConfig,
+    domainName: undefined,
+    defaultStatusCodeResponseTypes: {
         401: ast_1.ts.refs.never(),
         403: ast_1.ts.refs.never(),
         500: ast_1.ts.refs.never(),
-    }, stubsDirPath: 'stubs', stubsIndexFilePath: 'stubs.ts', utilsDirPath: 'utils' });
+    },
+    stubsDir: 'stubs',
+    stubFileNameCasing: { casing: 'kebab', suffix: '.stubs' },
+    stubsIndexFile: 'stubs.ts',
+    utilsDir: 'utils',
+};

package/cjs/lib/generators/services/easy-network-stub/refs.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReferenceFactories = void 0;
+exports.getReferenceFactories = getReferenceFactories;
 const path_1 = require("path");
 const ast_1 = require("../../../ast");
 // See packages/typescript/assets/stubs/easy-network-stub for reference
 function getReferenceFactories(options) {
-    const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDirPath);
+    const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDir);
     const easyNetworkStubUtilsPath = (0, path_1.join)(utilsDirPath, 'easy-network-stub.utils.ts');
     return {
         // easy-network-stub.utils.ts
@@ -20,4 +20,3 @@ function getReferenceFactories(options) {
         createEasyNetworkStubGroup: ast_1.ts.reference.genericFactory('createEasyNetworkStubGroup', easyNetworkStubUtilsPath),
     };
 }
-exports.getReferenceFactories = getReferenceFactories;

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

@@ -18,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 };
+            result.clientInterface = { filePath, component: name };
         }
         if (this.shouldGenerateClass(ctx)) {
             const filePath = this.getClassFilePath(ctx);
@@ -29,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 };
+            result.client = { filePath, component: name };
         }
         return result;
     }
@@ -56,7 +56,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
         const params = endpoint.parameters.filter((x) => x.target === 'path' || x.target === 'query');
         const bodySchema = (_b = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) === null || _b === void 0 ? void 0 : _b.schema;
         const responseSchema = this.getResponseSchema(ctx, endpoint);
-        return ast_1.ts.method((0, core_1.toCasing)(endpoint.name, ctx.config.methodCasing), {
+        return ast_1.ts.method((0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing), {
             doc: ast_1.ts.doc({ description: endpoint.description, tags: [endpoint.deprecated ? ast_1.ts.docTag('deprecated') : null] }),
             parameters: [
                 params.length > 0
@@ -132,11 +132,11 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
         });
     }
     getServiceMethod(ctx, endpoint) {
-        var _a, _b;
+        var _a, _b, _c;
         const method = this.getInterfaceEndpointMethod(ctx, endpoint);
         method.accessModifier = 'public';
         method.body = (0, core_1.appendValueGroup)([
-            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
           .withPath(${ast_1.ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -146,7 +146,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
                         b.append((0, core_1.builderTemplate) `\n.withQueryParam(${ast_1.ts.string(p.name)}, params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)})`);
                         break;
                 }
-            })}
+            })}
           .build();`}`,
             (0, core_1.builderTemplate) `const response = (this.options.fetch ?? fetch)(url, ${ast_1.ts.object({
                 members: [
@@ -156,13 +156,13 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
                 ],
             })});`,
             (0, core_1.builderTemplate) `Object.defineProperty(response, 'isVoidResponse', { value: ${this.getResponseSchema(ctx, endpoint) ? 'false' : 'true'} });`,
-            (0, core_1.builderTemplate) `return response as unknown as ${method.returnType};`,
+            (0, core_1.builderTemplate) `return response as unknown as ${(_c = method.returnType) !== null && _c !== void 0 ? _c : 'unknown'};`,
         ], '\n');
         return method;
     }
     // #endregion
     getSchemaType(ctx, schema, fallback) {
-        const output = schema && ctx.input.models[schema.id];
+        const output = schema && ctx.input.typescript.models[schema.id];
         if (!output)
             return fallback !== null && fallback !== void 0 ? fallback : this.getAnyType(ctx);
         return (b) => b.appendModelUsage(output);
@@ -174,23 +174,26 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
         return ctx.config.clientFileKind === 'class' || ctx.config.clientFileKind === 'class-and-interface';
     }
     getInterfaceName(ctx) {
-        return (0, core_1.toCasing)(ctx.service.name, ctx.config.interfaceNameCasing);
+        var _a;
+        return (0, core_1.toCasing)(ctx.service.name, (_a = ctx.config.clientInterfaceNameCasing) !== null && _a !== void 0 ? _a : ctx.config.typeNameCasing);
     }
     getClassName(ctx) {
-        return (0, core_1.toCasing)(ctx.service.name, ctx.config.classNameCasing);
+        var _a;
+        return (0, core_1.toCasing)(ctx.service.name, (_a = ctx.config.clientNameCasing) !== null && _a !== void 0 ? _a : ctx.config.typeNameCasing);
     }
     getDefaultOptionsConstantName(ctx) {
         return (0, core_1.toCasing)(this.getClassName(ctx) + '-default-options', ctx.config.constantNameCasing);
     }
     getInterfaceFilePath(ctx) {
         var _a, _b;
-        return (0, path_1.resolve)(ctx.config.outputDir, (_a = ctx.config.clientInterfaceDirPath) !== null && _a !== void 0 ? _a : ctx.config.clientDirPath, `${(0, core_1.toCasing)(ctx.service.name, (_b = ctx.config.interfaceFileNameCasing) !== null && _b !== void 0 ? _b : ctx.config.fileNameCasing)}.ts`);
+        return (0, path_1.resolve)(ctx.config.outputDir, (_a = ctx.config.clientInterfaceDir) !== null && _a !== void 0 ? _a : ctx.config.clientDir, `${(0, core_1.toCasing)(ctx.service.name, (_b = ctx.config.clientInterfaceFileNameCasing) !== null && _b !== void 0 ? _b : ctx.config.fileNameCasing)}.ts`);
     }
     getClassFilePath(ctx) {
-        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.clientDirPath, `${(0, core_1.toCasing)(ctx.service.name, ctx.config.fileNameCasing)}.ts`);
+        var _a;
+        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.clientDir, `${(0, core_1.toCasing)(ctx.service.name, (_a = ctx.config.clientFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.ts`);
     }
     getUtilPath(ctx, fileName) {
-        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDirPath, fileName);
+        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDir, fileName);
     }
     getResponseSchema(ctx, endpoint) {
         var _a, _b, _c;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptClientsGenerator = void 0;
+exports.TypeScriptFetchClientsGenerator = void 0;
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const core_1 = require("@goast/core");
@@ -9,7 +9,7 @@ const models_1 = require("./models");
 const refs_1 = require("./refs");
 const ast_1 = require("../../../ast");
 const file_builder_1 = require("../../../file-builder");
-class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProviderBase {
+class TypeScriptFetchClientsGenerator extends core_1.OpenApiServicesGenerationProviderBase {
     constructor(clientGeneratorFactory) {
         super();
         this._clientGeneratorFactory =
@@ -17,9 +17,12 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
     }
     initResult() {
         return {
-            clients: {},
-            indexFiles: {
-                clients: undefined,
+            typescript: {
+                clients: {},
+                indexFiles: {
+                    clients: undefined,
+                    clientInterfaces: undefined,
+                },
             },
         };
     }
@@ -32,15 +35,19 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
     onGenerate(ctx) {
         this.copyUtilsFiles(ctx);
         const output = super.onGenerate(ctx);
-        output.indexFiles.clients = this.generateIndexFile(ctx);
+        output.typescript.indexFiles.clients = this.generateIndexFile(ctx);
+        output.typescript.indexFiles.clientInterfaces = this.generateInterfaceIndexFile(ctx);
         return output;
     }
     generateService(ctx, service) {
         const clientGenerator = this._clientGeneratorFactory.create();
-        return clientGenerator.generate(Object.assign(Object.assign({}, ctx), { service }));
+        return clientGenerator.generate({
+            ...ctx,
+            service,
+        });
     }
     addServiceResult(ctx, service, result) {
-        ctx.output.clients[service.id] = result;
+        ctx.output.typescript.clients[service.id] = result;
     }
     generateIndexFile(ctx) {
         const filePath = this.getIndexFilePath(ctx);
@@ -52,18 +59,46 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
         });
         return filePath;
     }
+    generateInterfaceIndexFile(ctx) {
+        const filePath = this.getInterfaceIndexFilePath(ctx);
+        const clientsFilePath = this.getIndexFilePath(ctx);
+        if (filePath && filePath === clientsFilePath) {
+            return clientsFilePath;
+        }
+        file_builder_1.TypeScriptFileBuilder.tryGenerate({
+            logName: 'client interfaces index file',
+            filePath,
+            options: ctx.config,
+            generator: (b) => b.append(this.getInterfaceIndexFileContent(ctx)),
+        });
+        return filePath;
+    }
     getIndexFilePath(ctx) {
-        return ctx.config.indexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.indexFilePath) : null;
+        return ctx.config.clientsIndexFile ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.clientsIndexFile) : null;
+    }
+    getInterfaceIndexFilePath(ctx) {
+        return ctx.config.clientInterfacesIndexFile
+            ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.clientInterfacesIndexFile)
+            : null;
     }
     getIndexFileContent(ctx) {
-        return (0, core_1.appendValueGroup)(Object.values(ctx.output.clients)
-            .flatMap((c) => [c.class, c.interface])
+        const cIndexPath = this.getIndexFilePath(ctx);
+        const iIndexPath = this.getInterfaceIndexFilePath(ctx);
+        return (0, core_1.appendValueGroup)((iIndexPath && iIndexPath === cIndexPath
+            ? Object.values(ctx.output.typescript.clients).flatMap((c) => [c.client, c.clientInterface])
+            : Object.values(ctx.output.typescript.clients).map((c) => c.client))
+            .filter(core_1.notNullish)
+            .map((x) => ast_1.ts.export(x.component, x.filePath)));
+    }
+    getInterfaceIndexFileContent(ctx) {
+        return (0, core_1.appendValueGroup)(Object.values(ctx.output.typescript.clients)
+            .map((c) => c.clientInterface)
             .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');
-        const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDirPath);
+        const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDir);
         (0, fs_extra_1.ensureDirSync)(targetDir);
         const files = (0, fs_extra_1.readdirSync)(sourceDir);
         for (const file of files) {
@@ -71,4 +106,4 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
         }
     }
 }
-exports.TypeScriptClientsGenerator = TypeScriptClientsGenerator;
+exports.TypeScriptFetchClientsGenerator = TypeScriptFetchClientsGenerator;

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

@@ -2,4 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTypeScriptFetchClientsGeneratorConfig = void 0;
 const config_1 = require("../../../config");
-exports.defaultTypeScriptFetchClientsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultTypeScriptGeneratorConfig), { fileNameCasing: { casing: 'kebab', suffix: '-client' }, interfaceFileNameCasing: null, classNameCasing: { casing: 'pascal', suffix: 'Client' }, interfaceNameCasing: { prefix: 'I', casing: 'pascal', suffix: 'Client' }, methodCasing: 'camel', clientFileKind: 'class', clientDirPath: 'clients', clientInterfaceDirPath: 'clients/interfaces', indexFilePath: 'clients.ts', interfaceIndexFilePath: 'clients.ts', utilsDirPath: 'utils' });
+exports.defaultTypeScriptFetchClientsGeneratorConfig = {
+    ...config_1.defaultTypeScriptGeneratorConfig,
+    clientFileNameCasing: { casing: 'kebab', suffix: '-client' },
+    clientInterfaceFileNameCasing: undefined,
+    clientNameCasing: { casing: 'pascal', suffix: 'Client' },
+    clientInterfaceNameCasing: { prefix: 'I', casing: 'pascal', suffix: 'Client' },
+    clientFileKind: 'class',
+    clientDir: 'clients',
+    clientInterfaceDir: 'clients/interfaces',
+    clientsIndexFile: 'clients.ts',
+    clientInterfacesIndexFile: 'clients.ts',
+    utilsDir: 'utils',
+};

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReferenceFactories = void 0;
+exports.getReferenceFactories = getReferenceFactories;
 const path_1 = require("path");
 const ast_1 = require("../../../ast");
 // See packages/typescript/assets/client/fetch for reference
 function getReferenceFactories(options) {
-    const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDirPath);
+    const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDir);
     const fetchClientUtilsPath = (0, path_1.resolve)(utilsDirPath, 'fetch-client.utils.ts');
     return {
         // fetch-client.utils.ts
@@ -14,4 +14,3 @@ function getReferenceFactories(options) {
         urlBuilder: ast_1.ts.reference.factory('UrlBuilder', fetchClientUtilsPath),
     };
 }
-exports.getReferenceFactories = getReferenceFactories;

package/cjs/lib/import-collection.js

@@ -13,7 +13,7 @@ class ImportExportCollection {
     constructor(options) {
         this._imports = new Map();
         this._exports = new Map();
-        this._options = Object.assign(Object.assign({}, exports.defaultImportExportCollectionOptions), options);
+        this._options = { ...exports.defaultImportExportCollectionOptions, ...options };
     }
     get hasImports() {
         return this._imports.size > 0;

package/cjs/lib/utils.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modifyString = exports.getModulePathRelativeToDirectory = exports.getModulePathRelativeToFile = exports.toTypeScriptPropertyName = exports.toTypeScriptStringLiteral = void 0;
+exports.toTypeScriptStringLiteral = toTypeScriptStringLiteral;
+exports.toTypeScriptPropertyName = toTypeScriptPropertyName;
+exports.getModulePathRelativeToFile = getModulePathRelativeToFile;
+exports.getModulePathRelativeToDirectory = getModulePathRelativeToDirectory;
+exports.modifyString = modifyString;
 const path_1 = require("path");
 function doubleQuotedToSingleQuoted(value) {
     return `'${value.slice(1, -1).replace(/'/g, "\\'")}'`;
@@ -8,22 +12,18 @@ function doubleQuotedToSingleQuoted(value) {
 function toTypeScriptStringLiteral(value, useSingleQuotes) {
     return useSingleQuotes ? doubleQuotedToSingleQuoted(JSON.stringify(value)) : JSON.stringify(value);
 }
-exports.toTypeScriptStringLiteral = toTypeScriptStringLiteral;
 function toTypeScriptPropertyName(value, useSingleQuotes) {
     if (value.match(/^[a-zA-Z_$][a-zA-Z_$0-9]*$/)) {
         return value;
     }
     return useSingleQuotes ? doubleQuotedToSingleQuoted(JSON.stringify(value)) : JSON.stringify(value);
 }
-exports.toTypeScriptPropertyName = toTypeScriptPropertyName;
 function getModulePathRelativeToFile(from, to, transformer) {
     return transformModulePath((0, path_1.relative)((0, path_1.dirname)(from), to).replace(/\\/g, '/'), transformer);
 }
-exports.getModulePathRelativeToFile = getModulePathRelativeToFile;
 function getModulePathRelativeToDirectory(from, to, transformer) {
     return transformModulePath((0, path_1.relative)(from, to).replace(/\\/g, '/'), transformer);
 }
-exports.getModulePathRelativeToDirectory = getModulePathRelativeToDirectory;
 function transformModulePath(modulePath, transformer) {
     if (!modulePath.startsWith('.')) {
         modulePath = `./${modulePath}`;
@@ -53,4 +53,3 @@ function modifyString(value, modifier, ...args) {
     }
     return value;
 }
-exports.modifyString = modifyString;

package/esm/index.js

@@ -1,3 +1,4 @@
+export * from './lib/ast';
 export * from './lib/common-results';
 export * from './lib/config';
 export * from './lib/generators';

package/esm/lib/ast/nodes/argument.js

@@ -10,7 +10,7 @@ export class TsArgument extends TsNode {
         writeTsNode(builder, this.value);
     }
 }
-const createArgument = (value, options) => new TsArgument(Object.assign(Object.assign({}, options), { value }));
+const createArgument = (value, options) => new TsArgument({ ...options, value });
 export const tsArgument = Object.assign(createArgument, {
     write: writeTsParameters,
 });

package/esm/lib/ast/nodes/array-type.js

@@ -17,7 +17,7 @@ export class TsArrayType extends TsNode {
         builder.append('[]');
     }
 }
-const createArrayType = (type, options) => new TsArrayType(Object.assign(Object.assign({}, options), { type }));
+const createArrayType = (type, options) => new TsArrayType({ ...options, type });
 export const tsArrayType = Object.assign(createArrayType, {
     write: writeTsNodes,
 });

package/esm/lib/ast/nodes/call.js

@@ -16,7 +16,7 @@ export class TsCall extends TsNode {
         }
     }
 }
-const createCall = (path, args, options) => new TsCall(Object.assign(Object.assign({}, options), { path: Array.isArray(path) ? path : [path], arguments: args }));
+const createCall = (path, args, options) => new TsCall({ ...options, path: Array.isArray(path) ? path : [path], arguments: args });
 export const tsCall = Object.assign(createCall, {
     write: writeTsNodes,
 });

package/esm/lib/ast/nodes/class.js

@@ -60,7 +60,7 @@ export class TsClass extends TsNode {
         builder.appendLine();
     }
 }
-const createClass = (name, options) => new TsClass(Object.assign(Object.assign({}, options), { name }));
+const createClass = (name, options) => new TsClass({ ...options, name });
 export const tsClass = Object.assign(createClass, {
     write: writeTsNodes,
 });

package/esm/lib/ast/nodes/constructor-parameter.js

@@ -36,7 +36,7 @@ export class TsConstructorParameter extends TsParameter {
         }
     }
 }
-const createConstructorParameter = (name, options) => new TsConstructorParameter(Object.assign(Object.assign({}, options), { name }));
+const createConstructorParameter = (name, options) => new TsConstructorParameter({ ...options, name });
 export const tsConstructorParameter = Object.assign(createConstructorParameter, {
     write: writeTsParameters,
 });

package/esm/lib/ast/nodes/decorator.js

@@ -21,7 +21,7 @@ export class TsDecorator extends TsNode {
         }
     }
 }
-const createDecorator = (fn, args, options) => new TsDecorator(Object.assign(Object.assign({}, options), { function: fn, arguments: args }));
+const createDecorator = (fn, args, options) => new TsDecorator({ ...options, function: fn, arguments: args });
 const writeDecorators = (builder, nodes, options) => {
     const filteredNodes = toArray(nodes).filter(notNullish);
     builder.forEach(filteredNodes, (b, d) => {

package/esm/lib/ast/nodes/enum-value.js

@@ -22,7 +22,7 @@ export class TsEnumValue extends TsNode {
         }
     }
 }
-const createEnumValue = (name, options) => new TsEnumValue(Object.assign(Object.assign({}, options), { name }));
+const createEnumValue = (name, options) => new TsEnumValue({ ...options, name });
 const writeEnumValues = (builder, nodes) => {
     writeTsNodes(builder, nodes, { separator: ',\n' });
 };

package/esm/lib/ast/nodes/enum.js

@@ -36,7 +36,7 @@ export class TsEnum extends TsNode {
         builder.appendLine();
     }
 }
-const createEnum = (name, options) => new TsEnum(Object.assign(Object.assign({}, options), { name }));
+const createEnum = (name, options) => new TsEnum({ ...options, name });
 export const tsEnum = Object.assign(createEnum, {
     write: writeTsNodes,
 });

package/esm/lib/ast/nodes/export.js

@@ -16,7 +16,7 @@ export class TsExport extends TsNode {
         }
     }
 }
-export const createExport = (name, filePath, options) => new TsExport(Object.assign(Object.assign({}, options), { name, filePath }));
+export const createExport = (name, filePath, options) => new TsExport({ ...options, name, filePath });
 export const tsExport = Object.assign(createExport, {
     write: writeTsNodes,
 });

package/esm/lib/ast/nodes/function.js

@@ -50,7 +50,7 @@ export class TsFunction extends TsNode {
         builder.appendLine();
     }
 }
-const createFunction = (name, options) => new TsFunction(Object.assign(Object.assign({}, options), { name }));
+const createFunction = (name, options) => new TsFunction({ ...options, name });
 export const tsFunction = Object.assign(createFunction, {
     write: writeTsNodes,
 });