@goast/typescript 0.2.19 → 0.3.0

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

@@ -64,7 +64,7 @@ class TsClass extends node_1.TsNode {
     }
 }
 exports.TsClass = TsClass;
-const createClass = (name, options) => new TsClass(Object.assign(Object.assign({}, options), { name }));
+const createClass = (name, options) => new TsClass({ ...options, name });
 exports.tsClass = Object.assign(createClass, {
     write: write_ts_nodes_1.writeTsNodes,
 });

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

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

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

@@ -25,7 +25,7 @@ class TsDecorator extends node_1.TsNode {
     }
 }
 exports.TsDecorator = TsDecorator;
-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 = (0, core_1.toArray)(nodes).filter(core_1.notNullish);
     builder.forEach(filteredNodes, (b, d) => {

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

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

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

@@ -40,7 +40,7 @@ class TsEnum extends node_1.TsNode {
     }
 }
 exports.TsEnum = TsEnum;
-const createEnum = (name, options) => new TsEnum(Object.assign(Object.assign({}, options), { name }));
+const createEnum = (name, options) => new TsEnum({ ...options, name });
 exports.tsEnum = Object.assign(createEnum, {
     write: write_ts_nodes_1.writeTsNodes,
 });

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

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

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

@@ -54,7 +54,7 @@ class TsFunction extends node_1.TsNode {
     }
 }
 exports.TsFunction = TsFunction;
-const createFunction = (name, options) => new TsFunction(Object.assign(Object.assign({}, options), { name }));
+const createFunction = (name, options) => new TsFunction({ ...options, name });
 exports.tsFunction = Object.assign(createFunction, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/generic-parameter.js

@@ -34,7 +34,7 @@ class TsGenericParameter extends node_1.TsNode {
     }
 }
 exports.TsGenericParameter = TsGenericParameter;
-const createGenericParameter = (name, options) => new TsGenericParameter(Object.assign(Object.assign({}, options), { name }));
+const createGenericParameter = (name, options) => new TsGenericParameter({ ...options, name });
 exports.tsGenericParameter = Object.assign(createGenericParameter, {
     write: write_ts_generic_parameters_1.writeTsGenericParameters,
 });

package/cjs/lib/ast/nodes/indexer.js

@@ -26,7 +26,7 @@ class TsIndexer extends node_1.TsNode {
     }
 }
 exports.TsIndexer = TsIndexer;
-const createIndexer = (keyType, valueType, options) => new TsIndexer(Object.assign(Object.assign({}, options), { keyType, valueType }));
+const createIndexer = (keyType, valueType, options) => new TsIndexer({ ...options, keyType, valueType });
 exports.tsIndexer = Object.assign(createIndexer, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/interface.js

@@ -54,7 +54,7 @@ class TsInterface extends node_1.TsNode {
     }
 }
 exports.TsInterface = TsInterface;
-const createInterface = (name, options) => new TsInterface(Object.assign(Object.assign({}, options), { name }));
+const createInterface = (name, options) => new TsInterface({ ...options, name });
 exports.tsInterface = Object.assign(createInterface, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/intersection-type.js

@@ -26,7 +26,7 @@ class TsIntersectionType extends node_1.TsNode {
     }
 }
 exports.TsIntersectionType = TsIntersectionType;
-const createIntersectionType = (types, options) => new TsIntersectionType(Object.assign(Object.assign({}, options), { types }));
+const createIntersectionType = (types, options) => new TsIntersectionType({ ...options, types });
 exports.tsIntersectionType = Object.assign(createIntersectionType, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/lookup-type.js

@@ -24,7 +24,7 @@ class TsLookupType extends node_1.TsNode {
     }
 }
 exports.TsLookupType = TsLookupType;
-const createLookupType = (type, index, options) => new TsLookupType(Object.assign(Object.assign({}, options), { type, index }));
+const createLookupType = (type, index, options) => new TsLookupType({ ...options, type, index });
 exports.tsLookupType = Object.assign(createLookupType, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/method.js

@@ -75,7 +75,7 @@ class TsMethod extends node_1.TsNode {
     }
 }
 exports.TsMethod = TsMethod;
-const createMethod = (name, options) => new TsMethod(Object.assign(Object.assign({}, options), { name }));
+const createMethod = (name, options) => new TsMethod({ ...options, name });
 exports.createMethod = createMethod;
 exports.tsMethod = Object.assign(exports.createMethod, {
     write: write_ts_nodes_1.writeTsNodes,

package/cjs/lib/ast/nodes/parameter.js

@@ -39,7 +39,7 @@ class TsParameter extends node_1.TsNode {
     }
 }
 exports.TsParameter = TsParameter;
-const createParameter = (name, options) => new TsParameter(Object.assign(Object.assign({}, options), { name }));
+const createParameter = (name, options) => new TsParameter({ ...options, name });
 exports.tsParameter = Object.assign(createParameter, {
     write: write_ts_parameters_1.writeTsParameters,
 });

package/cjs/lib/ast/nodes/property.js

@@ -108,9 +108,9 @@ class TsAccessorProperty extends TsProperty {
 exports.TsAccessorProperty = TsAccessorProperty;
 const createProperty = (name, options) => {
     if (options && ('get' in options || 'set' in options)) {
-        return new TsAccessorProperty(Object.assign(Object.assign({}, options), { name }));
+        return new TsAccessorProperty({ ...options, name });
     }
-    return new TsSimpleProperty(Object.assign(Object.assign({}, options), { name }));
+    return new TsSimpleProperty({ ...options, name });
 };
 exports.tsProperty = Object.assign(createProperty, {
     write: write_ts_nodes_1.writeTsNodes,

package/cjs/lib/ast/nodes/reference.js

@@ -36,7 +36,7 @@ TsReference.addImportHandlers = [
         handler: (builder, reference) => builder.addImport(reference.name, reference.moduleNameOrfilePath),
     },
 ];
-const createReference = (name, moduleNameOrfilePath, options) => new TsReference(Object.assign(Object.assign({}, options), { name, moduleNameOrfilePath }));
+const createReference = (name, moduleNameOrfilePath, options) => new TsReference({ ...options, name, moduleNameOrfilePath });
 function _createFactory(name, moduleNameOrfilePath) {
     return Object.assign(() => createReference(name, moduleNameOrfilePath), {
         refName: name,

package/cjs/lib/ast/nodes/string.js

@@ -24,7 +24,7 @@ class TsString extends node_1.TsNode {
     }
 }
 exports.TsString = TsString;
-const createString = (value, options) => new TsString(Object.assign(Object.assign({}, options), { value }));
+const createString = (value, options) => new TsString({ ...options, value });
 exports.tsString = Object.assign(createString, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/tuple.js

@@ -27,7 +27,7 @@ class TsTuple extends node_1.TsNode {
     }
 }
 exports.TsTuple = TsTuple;
-const createTuple = (elements, options) => new TsTuple(Object.assign(Object.assign({}, options), { elements }));
+const createTuple = (elements, options) => new TsTuple({ ...options, elements });
 exports.tsTuple = Object.assign(createTuple, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/type-alias.js

@@ -32,7 +32,7 @@ class TsTypeAlias extends node_1.TsNode {
     }
 }
 exports.TsTypeAlias = TsTypeAlias;
-const createTypeAlias = (name, type, options) => new TsTypeAlias(Object.assign(Object.assign({}, options), { name, type }));
+const createTypeAlias = (name, type, options) => new TsTypeAlias({ ...options, name, type });
 exports.tsTypeAlias = Object.assign(createTypeAlias, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/typeof.js

@@ -16,7 +16,7 @@ class TsTypeof extends node_1.TsNode {
     }
 }
 exports.TsTypeof = TsTypeof;
-const createTypeof = (value, options) => new TsTypeof(Object.assign(Object.assign({}, options), { value }));
+const createTypeof = (value, options) => new TsTypeof({ ...options, value });
 exports.createTypeof = createTypeof;
 exports.tsTypeof = Object.assign(exports.createTypeof, {
     write: write_ts_nodes_1.writeTsNodes,

package/cjs/lib/ast/nodes/union-type.js

@@ -26,7 +26,7 @@ class TsUnionType extends node_1.TsNode {
     }
 }
 exports.TsUnionType = TsUnionType;
-const createUnionType = (types, options) => new TsUnionType(Object.assign(Object.assign({}, options), { types }));
+const createUnionType = (types, options) => new TsUnionType({ ...options, types });
 exports.tsUnionType = Object.assign(createUnionType, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/nodes/variable.js

@@ -34,7 +34,7 @@ class TsVariable extends node_1.TsNode {
     }
 }
 exports.TsVariable = TsVariable;
-const createVariable = (name, options) => new TsVariable(Object.assign(Object.assign({}, options), { name }));
+const createVariable = (name, options) => new TsVariable({ ...options, name });
 exports.tsVariable = Object.assign(createVariable, {
     write: write_ts_nodes_1.writeTsNodes,
 });

package/cjs/lib/ast/utils/get-type-script-builder-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypeScriptBuilderOptions = void 0;
+exports.getTypeScriptBuilderOptions = getTypeScriptBuilderOptions;
 const core_1 = require("@goast/core");
 const config_1 = require("../../config");
 const file_builder_1 = require("../../file-builder");
@@ -12,8 +12,7 @@ function getTypeScriptBuilderOptions(builder) {
     if (tsConfigSymbol in builder.options) {
         return builder.options[tsConfigSymbol];
     }
-    const options = Object.assign(Object.assign(Object.assign({}, core_1.defaultOpenApiGeneratorConfig), config_1.defaultTypeScriptGeneratorConfig), builder.options);
+    const options = { ...core_1.defaultOpenApiGeneratorConfig, ...config_1.defaultTypeScriptGeneratorConfig, ...builder.options };
     builder[tsConfigSymbol] = options;
     return options;
 }
-exports.getTypeScriptBuilderOptions = getTypeScriptBuilderOptions;

package/cjs/lib/ast/utils/to-ts-node.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toTsNode = void 0;
+exports.toTsNode = toTsNode;
 const object_1 = require("../nodes/object");
 const property_1 = require("../nodes/property");
 const string_1 = require("../nodes/string");
@@ -21,4 +21,3 @@ function toTsNode(value) {
     }
     return (0, string_1.tsString)(String(value));
 }
-exports.toTsNode = toTsNode;

package/cjs/lib/ast/utils/write-ts-generic-parameters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeTsGenericParameters = void 0;
+exports.writeTsGenericParameters = writeTsGenericParameters;
 const core_1 = require("@goast/core");
 const write_ts_nodes_1 = require("./write-ts-nodes");
 function writeTsGenericParameters(builder, nodes) {
@@ -8,4 +8,3 @@ function writeTsGenericParameters(builder, nodes) {
     const multiline = filteredNodes.length > 2;
     builder.parenthesizeIf(filteredNodes.length > 0, '<>', (b) => (0, write_ts_nodes_1.writeTsNodes)(b, filteredNodes, { separator: multiline ? ',\n' : ', ' }), { multiline });
 }
-exports.writeTsGenericParameters = writeTsGenericParameters;

package/cjs/lib/ast/utils/write-ts-members.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeTsMembers = void 0;
+exports.writeTsMembers = writeTsMembers;
 const core_1 = require("@goast/core");
 const write_ts_nodes_1 = require("./write-ts-nodes");
 const doc_1 = require("../nodes/doc");
@@ -15,4 +15,3 @@ function writeTsMembers(builder, members, options) {
         .append((b) => (0, write_ts_nodes_1.writeTsNode)(b, m))
         .if(i < filteredMembers.length - 1, (b) => b.ensurePreviousLineEmpty()), (b) => b.append((b) => (0, write_ts_nodes_1.writeTsNode)(b, m)).ensureCurrentLineEmpty()));
 }
-exports.writeTsMembers = writeTsMembers;

package/cjs/lib/ast/utils/write-ts-nodes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeTsNodes = exports.writeTsNode = void 0;
+exports.writeTsNode = writeTsNode;
+exports.writeTsNodes = writeTsNodes;
 const core_1 = require("@goast/core");
 const node_1 = require("../node");
 function writeTsNode(builder, node) {
@@ -11,7 +12,6 @@ function writeTsNode(builder, node) {
         builder.append(node);
     }
 }
-exports.writeTsNode = writeTsNode;
 function writeTsNodes(builder, nodes, options) {
     const filteredNodes = (0, core_1.toArray)(nodes).filter(core_1.notNullish);
     if (filteredNodes.length === 1) {
@@ -21,4 +21,3 @@ function writeTsNodes(builder, nodes, options) {
         builder.forEach(filteredNodes, writeTsNode, { separator: options === null || options === void 0 ? void 0 : options.separator });
     }
 }
-exports.writeTsNodes = writeTsNodes;

package/cjs/lib/ast/utils/write-ts-parameters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeTsParameters = void 0;
+exports.writeTsParameters = writeTsParameters;
 const core_1 = require("@goast/core");
 const write_ts_nodes_1 = require("./write-ts-nodes");
 function writeTsParameters(builder, nodes) {
@@ -11,4 +11,3 @@ function writeTsParameters(builder, nodes) {
         multiline,
     });
 }
-exports.writeTsParameters = writeTsParameters;

package/cjs/lib/file-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptFileBuilder = exports.isTypeScriptAppendValue = void 0;
+exports.TypeScriptFileBuilder = void 0;
+exports.isTypeScriptAppendValue = isTypeScriptAppendValue;
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const core_1 = require("@goast/core");
@@ -10,7 +11,6 @@ const import_collection_1 = require("./import-collection");
 function isTypeScriptAppendValue(value) {
     return (0, core_1.isAppendValue)(value) || value instanceof node_1.TsNode;
 }
-exports.isTypeScriptAppendValue = isTypeScriptAppendValue;
 class TypeScriptFileBuilder extends core_1.SourceBuilder {
     get options() {
         return super.options;

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);
@@ -321,7 +330,8 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             .filter((item, index, self) => self.indexOf(item) === index);
     }
     getFilePath(ctx, schema) {
-        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.modelsDirPath, `${(0, core_1.toCasing)(schema.name, ctx.config.fileNameCasing)}.ts`);
+        var _a;
+        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.modelsDir, `${(0, core_1.toCasing)(schema.name, (_a = ctx.config.modelFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.ts`);
     }
 }
 exports.DefaultTypeScriptModelGenerator = DefaultTypeScriptModelGenerator;

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

@@ -14,8 +14,10 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
     }
     initResult() {
         return {
-            models: {},
-            indexFiles: { models: undefined },
+            typescript: {
+                models: {},
+                indexFiles: { models: undefined },
+            },
         };
     }
     buildContext(context, config) {
@@ -23,15 +25,18 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
     }
     onGenerate(ctx) {
         const output = super.onGenerate(ctx);
-        output.indexFiles.models = this.generateIndexFile(ctx);
+        output.typescript.indexFiles.models = this.generateIndexFile(ctx);
         return output;
     }
     generateSchema(ctx, schema) {
         const modelGenerator = this._modelGeneratorFactory.create();
-        return modelGenerator.generate(Object.assign(Object.assign({}, ctx), { schema }));
+        return modelGenerator.generate({
+            ...ctx,
+            schema,
+        });
     }
     addSchemaResult(ctx, schema, result) {
-        ctx.output.models[schema.id] = result;
+        ctx.output.typescript.models[schema.id] = result;
     }
     generateIndexFile(ctx) {
         const filePath = this.getIndexFilePath(ctx);
@@ -44,10 +49,16 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
         return filePath;
     }
     getIndexFilePath(ctx) {
-        return ctx.config.indexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.indexFilePath) : null;
+        return ctx.config.modelsIndexFile ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.modelsIndexFile) : 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.typescript.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/cjs/lib/generators/models/models.js

@@ -2,5 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTypeScriptModelsGeneratorConfig = exports.defaultTypeScriptModelGeneratorConfig = void 0;
 const config_1 = require("../../config");
-exports.defaultTypeScriptModelGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultTypeScriptGeneratorConfig), { enumGeneration: 'union', immutableTypes: false, inlineUnnamedSchemas: true, modelsDirPath: 'models', typeDeclaration: 'type' });
-exports.defaultTypeScriptModelsGeneratorConfig = Object.assign(Object.assign({}, exports.defaultTypeScriptModelGeneratorConfig), { indexFilePath: 'models.ts' });
+exports.defaultTypeScriptModelGeneratorConfig = {
+    ...config_1.defaultTypeScriptGeneratorConfig,
+    enumGeneration: 'union',
+    immutableTypes: false,
+    inlineUnnamedSchemas: true,
+    modelsDir: 'models',
+    modelFileNameCasing: undefined,
+    typeDeclaration: 'type',
+};
+exports.defaultTypeScriptModelsGeneratorConfig = {
+    ...exports.defaultTypeScriptModelGeneratorConfig,
+    modelsIndexFile: 'models.ts',
+};

package/cjs/lib/generators/services/angular-services/angular-service-generator.js

@@ -102,7 +102,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                         parser: (_a = value === null || value === void 0 ? void 0 : value.parser) !== null && _a !== void 0 ? _a : 'text',
                         type: typeof (value === null || value === void 0 ? void 0 : value.type) === 'function'
                             ? this.getSchemaType(ctx, value.type(ctx.data.schemas))
-                            : value !== null && value !== void 0 ? value : ast_1.ts.refs.never(),
+                            : (value !== null && value !== void 0 ? value : ast_1.ts.refs.never()),
                     },
                 ];
             }),
@@ -140,7 +140,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                     description: parameter.description,
                     tags: [parameter.deprecated ? ast_1.ts.docTag('deprecated') : null],
                 }),
-                type: schema ? (b) => b.appendModelUsage(ctx.input.models[schema.id]) : this.getAnyType(ctx),
+                type: schema ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id]) : this.getAnyType(ctx),
                 optional: !parameter.required,
             }));
         }
@@ -149,7 +149,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
             const schema = body.content[0].schema;
             type.members.push(ast_1.ts.property('body', {
                 doc: ast_1.ts.doc({ description: body.description }),
-                type: schema ? (b) => b.appendModelUsage(ctx.input.models[schema.id]) : this.getAnyType(ctx),
+                type: schema ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id]) : this.getAnyType(ctx),
                 optional: !body.required,
             }));
         }
@@ -231,13 +231,13 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
-              this.http.request(rb.build({${core_1.builderTemplate.indent `
-                responseType: ${ast_1.ts.string(responseType)},
-                accept: ${ast_1.ts.string(accept)},
-                context,`}
-              })),
-              {${core_1.builderTemplate.indent `
+                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
+              this.http.request(rb.build({${core_1.builderTemplate.indent `
+                responseType: ${ast_1.ts.string(responseType)},
+                accept: ${ast_1.ts.string(accept)},
+                context,`}
+              })),
+              {${core_1.builderTemplate.indent `
                 errorResponseTypes: ${ast_1.ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -246,8 +246,8 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                             return ast_1.ts.property(key, { value: ast_1.ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });
@@ -272,16 +272,18 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         return (0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing);
     }
     getServiceFilePath(ctx) {
-        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.servicesDirPath, `${(0, core_1.toCasing)(ctx.service.name, ctx.config.fileNameCasing)}.ts`);
+        var _a;
+        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.servicesDir, `${(0, core_1.toCasing)(ctx.service.name, (_a = ctx.config.serviceFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.ts`);
     }
     getResponseModelFilePath(ctx) {
-        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.responseModelsDirPath, `${(0, core_1.toCasing)(ctx.service.name, ctx.config.responseModelFileNameCasing)}.ts`);
+        var _a;
+        return (0, path_1.resolve)(ctx.config.outputDir, ctx.config.responseModelsDir, `${(0, core_1.toCasing)(ctx.service.name, (_a = ctx.config.responseModelFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.ts`);
     }
     hasEndpointParams(ctx, endpoint) {
         return endpoint.parameters.length > 0 || endpoint.requestBody !== undefined;
     }
     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/angular-services/angular-services-generator.js

@@ -18,8 +18,10 @@ class TypeScriptAngularServicesGenerator extends core_1.OpenApiServicesGeneratio
     }
     initResult() {
         return {
-            services: {},
-            indexFiles: { services: undefined, responseModels: undefined },
+            typescript: {
+                services: {},
+                indexFiles: { services: undefined, responseModels: undefined },
+            },
         };
     }
     buildContext(context, config) {
@@ -31,20 +33,23 @@ class TypeScriptAngularServicesGenerator extends core_1.OpenApiServicesGeneratio
     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._clientGeneratorFactory.create();
-        return clientGenerator.generate(Object.assign(Object.assign({}, ctx), { service }));
+        return clientGenerator.generate({
+            ...ctx,
+            service,
+        });
     }
     addServiceResult(ctx, service, result) {
-        ctx.output.services[service.id] = result;
+        ctx.output.typescript.services[service.id] = result;
     }
     // #region Utils
     generateUtilsFiles(ctx) {
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/typescript')), '../assets/client/angular');
-        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('Request Builder', sourceDir, targetDir, 'request-builder.ts');
         this.copyFile('Angular Service Utils', sourceDir, targetDir, 'angular-service.utils.ts');
@@ -149,7 +154,7 @@ class TypeScriptAngularServicesGenerator extends core_1.OpenApiServicesGeneratio
                     'return ',
                     ast_1.ts.tuple([
                         (b) => b.append('config ? { provide: ', ctx.refs.apiConfiguration(), ', useValue: config } : ', ctx.refs.apiConfiguration()),
-                        ...Object.values(ctx.output.services).map((x) => ast_1.ts.reference(x.component, x.filePath)),
+                        ...Object.values(ctx.output.typescript.services).map((x) => ast_1.ts.reference(x.component, x.filePath)),
                     ]),
                     ';',
                 ]),
@@ -188,20 +193,20 @@ class TypeScriptAngularServicesGenerator extends core_1.OpenApiServicesGeneratio
             ctx.config.provideKind === 'provide-fn'
                 ? ast_1.ts.export(ctx.refs.provide.refName, ctx.refs.provide.moduleNameOrfilePath)
                 : null,
-            ...Object.values(ctx.output.services).map((x) => ast_1.ts.export(x.component, x.filePath)),
+            ...Object.values(ctx.output.typescript.services).map((x) => ast_1.ts.export(x.component, x.filePath)),
         ]);
     }
     getResponseModelsIndexFileContent(ctx) {
-        return (0, core_1.appendValueGroup)(Object.values(ctx.output.services)
+        return (0, core_1.appendValueGroup)(Object.values(ctx.output.typescript.services)
             .flatMap((x) => Object.values(x.responseModels))
             .map((x) => ast_1.ts.export(x.component, x.filePath)));
     }
     getServicesIndexFilePath(ctx) {
-        return ctx.config.servicesIndexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.servicesIndexFilePath) : null;
+        return ctx.config.servicesIndexFile ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.servicesIndexFile) : null;
     }
     getResponseModelsIndexFilePath(ctx) {
-        return ctx.config.responseModelsIndexFilePath
-            ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.responseModelsIndexFilePath)
+        return ctx.config.responseModelsIndexFile
+            ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.responseModelsIndexFile)
             : null;
     }
     // #endregion