ts-openapi-codegen 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/core/{utils/writeClient.js → WriteClient.js}

@@ -1,42 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WriteClient = void 0;
-const Enums_1 = require("../../common/Enums");
-const Logger_1 = require("../../common/Logger");
-const pathHelpers_1 = require("../utils/pathHelpers");
-const fileSystem_1 = require("./fileSystem");
-const unique_1 = require("./unique");
-const writeClientCore_1 = require("./writeClientCore");
-const writeClientIndex_1 = require("./writeClientIndex");
-const writeClientModels_1 = require("./writeClientModels");
-const writeClientSchemas_1 = require("./writeClientSchemas");
-const writeClientServices_1 = require("./writeClientServices");
-function sortModelByName(a, b) {
-    if (a.name > b.name) {
-        return 1;
-    }
-    if (a.name < b.name) {
-        return -1;
-    }
-    return 0;
-}
-function prepareAlias(models) {
-    let modelPrevious = undefined;
-    let index = 1;
-    for (const model of models) {
-        if (modelPrevious && model.name === modelPrevious.name) {
-            model.alias = `${model.name}$${index}`;
-            if (!modelPrevious.alias) {
-                modelPrevious.alias = `${modelPrevious.name}$${index - 1}`;
-            }
-            index++;
-        }
-        else if (modelPrevious && model.name !== modelPrevious.name) {
-            index = 1;
-        }
-        modelPrevious = model;
-    }
-}
+const Enums_1 = require("../common/Enums");
+const Logger_1 = require("../common/Logger");
+const fileSystem_1 = require("./utils/fileSystem");
+const pathHelpers_1 = require("./utils/pathHelpers");
+const prepareAlias_1 = require("./utils/prepareAlias");
+const sortModelByName_1 = require("./utils/sortModelByName");
+const unique_1 = require("./utils/unique");
+const writeClientCore_1 = require("./utils/writeClientCore");
+const writeClientIndex_1 = require("./utils/writeClientIndex");
+const writeClientModels_1 = require("./utils/writeClientModels");
+const writeClientSchemas_1 = require("./utils/writeClientSchemas");
+const writeClientServices_1 = require("./utils/writeClientServices");
 /**
  * The client which is writing all items and keep the parameters to write index file
  */
@@ -138,31 +114,26 @@ class WriteClient {
         }
     }
     async combineAndWrite() {
+        const result = this.buildClientIndexMap();
+        await this.finalizeAndWright(result);
+    }
+    get logger() {
+        return this._logger;
+    }
+    buildClientIndexMap() {
         const result = new Map();
         for (const [key, value] of this.options.entries()) {
             for (const item of value) {
-                const { exportCore, outputPaths, exportModels, exportSchemas, exportServices, client, templates } = item;
-                const outputCore = outputPaths.outputCore ? outputPaths.outputCore : (0, pathHelpers_1.resolve)(key, 'core');
-                const outputModels = outputPaths.outputModels ? outputPaths.outputModels : (0, pathHelpers_1.resolve)(key, 'models');
-                const outputSchemas = outputPaths.outputSchemas ? outputPaths.outputSchemas : (0, pathHelpers_1.resolve)(key, 'schemas');
-                const outputServices = outputPaths.outputServices ? outputPaths.outputServices : (0, pathHelpers_1.resolve)(key, 'services');
-                let clientIndex = result.get(`${key}`);
-                if (!clientIndex) {
-                    clientIndex = {
-                        templates: templates,
-                        outputPath: key,
-                        core: [],
-                        models: [],
-                        schemas: [],
-                        services: [],
-                    };
-                    result.set(`${key}`, clientIndex);
-                }
+                const { exportCore, outputPaths, exportModels, exportSchemas, exportServices, client, templates, useUnionTypes } = item;
+                const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
+                const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
+                const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
+                const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
+                const clientIndex = this.ensureClientIndex(result, key, templates);
                 if (exportCore) {
-                    const relativePath = `${(0, pathHelpers_1.relative)(key, outputCore)}`;
-                    const clientCore = clientIndex.core.find(item => item === relativePath);
-                    if (!clientCore) {
-                        clientIndex.core.push(relativePath);
+                    const rel = (0, pathHelpers_1.relative)(key, outputCore);
+                    if (!clientIndex.core.includes(rel)) {
+                        clientIndex.core.push(rel);
                     }
                 }
                 if (exportModels || exportSchemas) {
@@ -175,24 +146,15 @@ class WriteClient {
                             path: model.path,
                             package: relativePathModel,
                             enum: model.enum && model.enum.length > 0,
-                            useUnionTypes: item.useUnionTypes,
+                            useUnionTypes,
                             enums: model.enums && model.enums.length > 0,
                         };
-                        if (exportModels) {
-                            const value = clientIndex.models.find(item => item.name === modelFinal.name &&
-                                item.path === modelFinal.path &&
-                                item.package === modelFinal.package &&
-                                item.enum === modelFinal.enum &&
-                                item.enums === modelFinal.enums &&
-                                item.useUnionTypes === modelFinal.useUnionTypes);
-                            if (!value) {
-                                clientIndex.models.push(modelFinal);
-                            }
+                        if (exportModels && clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
+                            clientIndex.models.push(modelFinal);
                         }
                         if (exportSchemas) {
                             const schema = { ...modelFinal, package: relativePathSchema };
-                            const indexValue = clientIndex.schemas.find(item => item.name === schema.name && item.path === schema.path && item.package === schema.package);
-                            if (!indexValue) {
+                            if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
                                 clientIndex.schemas.push(schema);
                             }
                         }
@@ -201,8 +163,7 @@ class WriteClient {
                 if (exportServices) {
                     const relativeService = `${(0, pathHelpers_1.relative)(key, outputServices)}`;
                     for (const service of client.services) {
-                        const valueIndex = clientIndex.services.find(item => item.name === service.name && item.package === relativeService);
-                        if (!valueIndex) {
+                        if (!clientIndex.services.some(s => this.isSomeService(s, service.name, relativeService))) {
                             clientIndex.services.push({
                                 name: service.name,
                                 package: relativeService,
@@ -212,16 +173,46 @@ class WriteClient {
                 }
             }
         }
+        return result;
+    }
+    async finalizeAndWright(result) {
         for (const value of result.values()) {
-            value.models = value.models.filter(unique_1.unique).sort(sortModelByName);
-            prepareAlias(value.models);
-            value.schemas = value.schemas.filter(unique_1.unique).sort(sortModelByName);
-            prepareAlias(value.schemas);
+            value.models = value.models.filter(unique_1.unique).sort(sortModelByName_1.sortModelByName);
+            (0, prepareAlias_1.prepareAlias)(value.models);
+            value.schemas = value.schemas.filter(unique_1.unique).sort(sortModelByName_1.sortModelByName);
+            (0, prepareAlias_1.prepareAlias)(value.schemas);
             await (0, writeClientIndex_1.writeClientIndex)(value);
         }
     }
-    get logger() {
-        return this._logger;
+    getOutputPath(output, key, fallback) {
+        return output ? output : (0, pathHelpers_1.resolve)(key, fallback);
+    }
+    ensureClientIndex(map, key, templates) {
+        if (!map.has(key)) {
+            map.set(key, {
+                templates,
+                outputPath: key,
+                core: [],
+                models: [],
+                schemas: [],
+                services: [],
+            });
+        }
+        return map.get(key);
+    }
+    isSameModel(a, b) {
+        return (a.name === b.name &&
+            a.path === b.path &&
+            a.package === b.package &&
+            a.enum === b.enum &&
+            a.enums === b.enums &&
+            a.useUnionTypes === b.useUnionTypes);
+    }
+    isSameShema(a, b) {
+        return a.name === b.name && a.path === b.path && a.package === b.package;
+    }
+    isSomeService(a, name, pkg) {
+        return a.name === name && a.package === pkg;
     }
 }
 exports.WriteClient = WriteClient;

package/dist/core/__tests__/WriteClient.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=WriteClient.test.d.ts.map

package/dist/core/__tests__/WriteClient.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WriteClient.test.d.ts","sourceRoot":"","sources":["../../../src/core/__tests__/WriteClient.test.ts"],"names":[],"mappings":""}

package/dist/core/{utils/__tests__/writeClient.test.js → __tests__/WriteClient.test.js}

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
-const Enums_1 = require("../../types/Enums");
-const fileSystem_1 = require("../fileSystem");
-const getOutputPaths_1 = require("../getOutputPaths");
-const writeClient_1 = require("../writeClient");
+const Enums_1 = require("../types/Enums");
+const fileSystem_1 = require("../utils/fileSystem");
+const getOutputPaths_1 = require("../utils/getOutputPaths");
+const WriteClient_1 = require("../WriteClient");
 (0, node_test_1.test)('@unit: writeClient should write to filesystem', async () => {
     const mkdirCalls = [];
     const writeFileCalls = [];
-    // Сохраняем оригинальные реализации
+    // We keep the original implementations
     const originalMkdir = fileSystem_1.fileSystem.mkdir;
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
-    // Мокаем функции
+    // Mock the functions
     fileSystem_1.fileSystem.mkdir = node_test_1.mock.fn(async (path) => {
         mkdirCalls.push(path);
         return path;
@@ -47,7 +47,7 @@ const writeClient_1 = require("../writeClient");
         },
     };
     const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
-    await new writeClient_1.WriteClient().writeClient({
+    await new WriteClient_1.WriteClient().writeClient({
         client,
         templates,
         outputPaths,
@@ -62,7 +62,7 @@ const writeClient_1 = require("../writeClient");
     });
     strict_1.default.ok(mkdirCalls.length > 0, 'mkdir should be called at least once');
     strict_1.default.ok(writeFileCalls.length > 0, 'writeFile should be called at least once');
-    // Восстанавливаем оригинальные реализации
+    // Restoring the original implementations
     fileSystem_1.fileSystem.mkdir = originalMkdir;
     fileSystem_1.fileSystem.writeFile = originalWriteFile;
 });

package/dist/core/api/v2/parser/__tests__/getType.test.js

@@ -14,7 +14,7 @@ const Parser_1 = require("../../Parser");
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context('test/spec/v3.yml', (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }));
+        const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('int', '');
         node_assert_1.default.strictEqual(type.type, 'number');
@@ -26,7 +26,7 @@ const Parser_1 = require("../../Parser");
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context('test/spec/v3.yml', (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }));
+        const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('schemas/ModelWithString.yml', '');
         node_assert_1.default.strictEqual(type.type, 'IModelWithString');
@@ -53,7 +53,7 @@ const Parser_1 = require("../../Parser");
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context(object, (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }));
+        const context = new Context_1.Context({ input: object, output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve(object));
         const type = new Parser_1.Parser(context).getType('#/components/schemas/someSpecialSchema', '');
         node_assert_1.default.strictEqual(type.type, 'ISomeSpecialSchema');

package/dist/core/api/v2/parser/getOperationParameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CA6D1H"}
+{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAG3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CA+D1H"}

package/dist/core/api/v2/parser/getOperationParameters.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationParameters = getOperationParameters;
-const sortByRequired_1 = require("../../../utils/sortByRequired");
+const sortByRequiredExtended_1 = require("../../../utils/sortByRequiredExtended");
+const sortByRequiredSimple_1 = require("../../../utils/sortByRequiredSimple");
 function getOperationParameters(openApi, parameters) {
     const operationParameters = {
         imports: [],
@@ -49,11 +50,12 @@ function getOperationParameters(openApi, parameters) {
             }
         }
     });
-    operationParameters.parameters = operationParameters.parameters.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersPath = operationParameters.parametersPath.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersQuery = operationParameters.parametersQuery.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersForm = operationParameters.parametersForm.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersCookie = operationParameters.parametersCookie.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersHeader = operationParameters.parametersHeader.sort(sortByRequired_1.sortByRequired);
+    const sortByRequired = this.context.sortByRequired ? sortByRequiredExtended_1.sortByRequiredExtended : sortByRequiredSimple_1.sortByRequiredSimple;
+    operationParameters.parameters = operationParameters.parameters.sort(sortByRequired);
+    operationParameters.parametersPath = operationParameters.parametersPath.sort(sortByRequired);
+    operationParameters.parametersQuery = operationParameters.parametersQuery.sort(sortByRequired);
+    operationParameters.parametersForm = operationParameters.parametersForm.sort(sortByRequired);
+    operationParameters.parametersCookie = operationParameters.parametersCookie.sort(sortByRequired);
+    operationParameters.parametersHeader = operationParameters.parametersHeader.sort(sortByRequired);
     return operationParameters;
 }

package/dist/core/api/v3/parser/__tests__/getType.test.js

@@ -14,7 +14,7 @@ const Parser_1 = require("../../Parser");
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context('test/spec/v3.yml', (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }));
+        const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('int', '');
         node_assert_1.default.strictEqual(type.type, 'number');
@@ -26,7 +26,7 @@ const Parser_1 = require("../../Parser");
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context('test/spec/v3.yml', (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }));
+        const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('schemas/ModelWithString.yml', '');
         node_assert_1.default.strictEqual(type.type, 'IModelWithString');
@@ -53,7 +53,7 @@ const Parser_1 = require("../../Parser");
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context(object, (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }));
+        const context = new Context_1.Context({ input: object, output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve(object));
         const type = new Parser_1.Parser(context).getType('#/components/schemas/someSpecialSchema', '');
         node_assert_1.default.strictEqual(type.type, 'ISomeSpecialSchema');

package/dist/core/api/v3/parser/getOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,GAAG,SAAS,CA+DpL"}
+{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAS3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAgEpL"}

package/dist/core/api/v3/parser/getOperation.js

@@ -7,7 +7,8 @@ const getOperationName_1 = require("../../../utils/getOperationName");
 const getOperationPath_1 = require("../../../utils/getOperationPath");
 const getOperationResponseHeader_1 = require("../../../utils/getOperationResponseHeader");
 const getOperationResults_1 = require("../../../utils/getOperationResults");
-const sortByRequired_1 = require("../../../utils/sortByRequired");
+const sortByRequiredExtended_1 = require("../../../utils/sortByRequiredExtended");
+const sortByRequiredSimple_1 = require("../../../utils/sortByRequiredSimple");
 function getOperation(openApi, url, method, op, pathParams, serviceClassName) {
     const operationNameFallback = `${method}${serviceClassName}`;
     const operationName = (0, getOperationName_1.getOperationName)(op.operationId || operationNameFallback);
@@ -46,11 +47,12 @@ function getOperation(openApi, url, method, op, pathParams, serviceClassName) {
         operation.parametersBody = parameters.parametersBody;
     }
     if (op.requestBody) {
+        const sortByRequired = this.context.sortByRequired ? sortByRequiredExtended_1.sortByRequiredExtended : sortByRequiredSimple_1.sortByRequiredSimple;
         const requestBodyDef = (op.requestBody.$ref ? this.context.get(op.requestBody.$ref) : op.requestBody);
         const requestBody = this.getOperationRequestBody(openApi, requestBodyDef, '');
         operation.imports.push(...requestBody.imports);
         operation.parameters.push(requestBody);
-        operation.parameters = operation.parameters.sort(sortByRequired_1.sortByRequired);
+        operation.parameters = operation.parameters.sort(sortByRequired);
         operation.parametersBody = requestBody;
     }
     // Parse the operation responses.

package/dist/core/api/v3/parser/getOperationParameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CA6D1H"}
+{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAG3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CAgE1H"}

package/dist/core/api/v3/parser/getOperationParameters.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationParameters = getOperationParameters;
-const sortByRequired_1 = require("../../../utils/sortByRequired");
+const sortByRequiredExtended_1 = require("../../../utils/sortByRequiredExtended");
+const sortByRequiredSimple_1 = require("../../../utils/sortByRequiredSimple");
 function getOperationParameters(openApi, parameters) {
     const operationParameters = {
         imports: [],
@@ -49,11 +50,12 @@ function getOperationParameters(openApi, parameters) {
             }
         }
     });
-    operationParameters.parameters = operationParameters.parameters.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersPath = operationParameters.parametersPath.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersQuery = operationParameters.parametersQuery.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersForm = operationParameters.parametersForm.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersCookie = operationParameters.parametersCookie.sort(sortByRequired_1.sortByRequired);
-    operationParameters.parametersHeader = operationParameters.parametersHeader.sort(sortByRequired_1.sortByRequired);
+    const sortByRequired = this.context.sortByRequired ? sortByRequiredExtended_1.sortByRequiredExtended : sortByRequiredSimple_1.sortByRequiredSimple;
+    operationParameters.parameters = operationParameters.parameters.sort(sortByRequired);
+    operationParameters.parametersPath = operationParameters.parametersPath.sort(sortByRequired);
+    operationParameters.parametersQuery = operationParameters.parametersQuery.sort(sortByRequired);
+    operationParameters.parametersForm = operationParameters.parametersForm.sort(sortByRequired);
+    operationParameters.parametersCookie = operationParameters.parametersCookie.sort(sortByRequired);
+    operationParameters.parametersHeader = operationParameters.parametersHeader.sort(sortByRequired);
     return operationParameters;
 }

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAmB5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAsH3C,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAmB5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAyH3C,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5F"}

package/dist/core/index.js

@@ -20,7 +20,7 @@ const isString_1 = require("./utils/isString");
 const postProcessClient_1 = require("./utils/postProcessClient");
 const prepareOptions_1 = require("./utils/prepareOptions");
 const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
-const writeClient_1 = require("./utils/writeClient");
+const WriteClient_1 = require("./WriteClient");
 var Enums_2 = require("./types/Enums");
 Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return Enums_2.HttpClient; } });
 /**
@@ -47,8 +47,9 @@ Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function (
  * @param enumPrefix: Prefix for enum model(E)
  * @param typePrefix: Prefix for type model(T)
  * @param useCancelableRequest Use cancelable request type.
+ * @param sortByRequired Property sorting strategy: simplified or extended
  */
-async function generateFrom({ input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient = Enums_1.HttpClient.FETCH, useOptions = false, useUnionTypes = false, exportCore = true, exportServices = true, exportModels = true, exportSchemas = false, clean = true, request, write = true, interfacePrefix = 'I', enumPrefix = 'E', typePrefix = 'T', useCancelableRequest = false, }, writeClient) {
+async function generateFrom({ input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient = Enums_1.HttpClient.FETCH, useOptions = false, useUnionTypes = false, exportCore = true, exportServices = true, exportModels = true, exportSchemas = false, clean = true, request, write = true, interfacePrefix = 'I', enumPrefix = 'E', typePrefix = 'T', useCancelableRequest = false, sortByRequired = false, }, writeClient) {
     const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
         output,
         outputCore,
@@ -56,7 +57,7 @@ async function generateFrom({ input, output, outputCore, outputServices, outputM
         outputModels,
         outputSchemas,
     });
-    const context = new Context_1.Context(input, outputPaths, { interface: interfacePrefix, enum: enumPrefix, type: typePrefix });
+    const context = new Context_1.Context({ input, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
     const openApi = (0, isString_1.isString)(input) ? await (0, getOpenApiSpec_1.getOpenApiSpec)(context, input) : input;
     const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
     const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
@@ -127,7 +128,7 @@ async function generate(options) {
         preparedOptions = Array.of(options);
     }
     const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
-    const writeClient = new writeClient_1.WriteClient();
+    const writeClient = new WriteClient_1.WriteClient();
     writeClient.logger.forceInfo(`Generation has begun. Total number of specification files: ${optionsFinal.length}`);
     try {
         const start = process.hrtime();

package/dist/core/types/Consts.d.ts

@@ -1,2 +1,12 @@
 export declare const SEARCH_REGEXP: RegExp;
+export declare const GROUP_PRIORITY_EXTENDED: {
+    readonly required: 0;
+    readonly 'required-with-default': 1;
+    readonly optional: 2;
+    readonly 'optional-with-default': 3;
+};
+export declare const GROUP_PRIORITY_SIMPLE: {
+    readonly 'requires-value': 0;
+    readonly other: 1;
+};
 //# sourceMappingURL=Consts.d.ts.map

package/dist/core/types/Consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../../src/core/types/Consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAAQ,CAAC"}
+{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../../src/core/types/Consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAAQ,CAAC;AAEnC,eAAO,MAAM,uBAAuB;;;;;CAK1B,CAAC;AAEX,eAAO,MAAM,qBAAqB;;;CAGxB,CAAC"}

package/dist/core/types/Consts.js

@@ -1,4 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SEARCH_REGEXP = void 0;
+exports.GROUP_PRIORITY_SIMPLE = exports.GROUP_PRIORITY_EXTENDED = exports.SEARCH_REGEXP = void 0;
 exports.SEARCH_REGEXP = /\\/g;
+exports.GROUP_PRIORITY_EXTENDED = {
+    required: 0,
+    'required-with-default': 1,
+    optional: 2,
+    'optional-with-default': 3,
+};
+exports.GROUP_PRIORITY_SIMPLE = {
+    'requires-value': 0,
+    'other': 1
+};

package/dist/core/types/Models.d.ts

@@ -1,3 +1,4 @@
+import { GROUP_PRIORITY_EXTENDED, GROUP_PRIORITY_SIMPLE } from './Consts';
 import { TypeRef } from './Enums';
 /**
  * @param output The relative location of the output directory(or index)
@@ -31,4 +32,6 @@ export interface Prefix {
     enum: string;
     type: string;
 }
+export type TPropertyGroupExtended = keyof typeof GROUP_PRIORITY_EXTENDED;
+export type TPropertyGroupSimple = keyof typeof GROUP_PRIORITY_SIMPLE;
 //# sourceMappingURL=Models.d.ts.map

package/dist/core/types/Models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Models.d.ts","sourceRoot":"","sources":["../../../src/core/types/Models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,MAAM;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"Models.d.ts","sourceRoot":"","sources":["../../../src/core/types/Models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,MAAM;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,uBAAuB,CAAC;AAE1E,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,qBAAqB,CAAC"}

package/dist/core/utils/__mocks__/createOperationParameter.d.ts

@@ -0,0 +1,3 @@
+import { OperationParameter } from '../../types/shared/OperationParameter.model';
+export declare function createOperationParameter(name: string, options?: Partial<Pick<OperationParameter, 'isRequired' | 'default' | 'description'>>): OperationParameter;
+//# sourceMappingURL=createOperationParameter.d.ts.map

package/dist/core/utils/__mocks__/createOperationParameter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createOperationParameter.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/createOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAEjF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,GAAG,SAAS,GAAG,aAAa,CAAC,CAAM,GAAG,kBAAkB,CAwBpK"}

package/dist/core/utils/__mocks__/createOperationParameter.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOperationParameter = createOperationParameter;
+function createOperationParameter(name, options = {}) {
+    return {
+        name,
+        isRequired: options.isRequired ?? false,
+        default: options.default,
+        description: options.description ?? null,
+        in: 'query',
+        prop: '',
+        export: 'reference',
+        alias: '',
+        path: '',
+        type: 'string',
+        base: '',
+        template: null,
+        link: null,
+        isDefinition: false,
+        isReadOnly: false,
+        isNullable: false,
+        imports: [],
+        enum: [],
+        enums: [],
+        properties: [],
+        mediaType: null,
+    };
+}

package/dist/core/utils/__tests__/sortByRequiredExtended.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sortByRequiredExtended.test.d.ts.map

package/dist/core/utils/__tests__/sortByRequiredExtended.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortByRequiredExtended.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/sortByRequiredExtended.test.ts"],"names":[],"mappings":""}