ts-openapi-codegen 1.0.0-beta.3 → 1.0.0-beta.5

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

@@ -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)({

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":""}

package/dist/core/utils/__tests__/sortByRequiredExtended.test.js

@@ -0,0 +1,145 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const createOperationParameter_1 = require("../__mocks__/createOperationParameter");
+const sortByRequiredExtended_1 = require("../sortByRequiredExtended");
+(0, node_test_1.describe)('sortByRequiredExtended', () => {
+    // Тесты для сравнения между разными группами
+    (0, node_test_1.test)('@unit: должна сортировать группы в порядке: required, required-with-default, optional, optional-with-default', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('optional', { isRequired: false }), // Группа 2
+            (0, createOperationParameter_1.createOperationParameter)('required', { isRequired: true }), // Группа 0
+            (0, createOperationParameter_1.createOperationParameter)('optional-with-default', { isRequired: false, default: 'def' }), // Группа 3
+            (0, createOperationParameter_1.createOperationParameter)('required-with-default', { isRequired: true, default: 'def' }) // Группа 1
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, [
+            'required',
+            'required-with-default',
+            'optional',
+            'optional-with-default'
+        ]);
+    });
+    // Тесты для сравнения внутри групп
+    (0, node_test_1.test)('@unit: должна сортировать по имени внутри группы required', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('Beta', { isRequired: true }),
+            (0, createOperationParameter_1.createOperationParameter)('Alpha', { isRequired: true }),
+            (0, createOperationParameter_1.createOperationParameter)('Gamma', { isRequired: true })
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, ['Alpha', 'Beta', 'Gamma']);
+    });
+    (0, node_test_1.test)('@unit: должна сортировать по имени внутри группы required-with-default', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('Zeta', { isRequired: true, default: 'def' }),
+            (0, createOperationParameter_1.createOperationParameter)('Beta', { isRequired: true, default: 'def' }),
+            (0, createOperationParameter_1.createOperationParameter)('Alpha', { isRequired: true, default: 'def' })
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, ['Alpha', 'Beta', 'Zeta']);
+    });
+    (0, node_test_1.test)('@unit: должна сортировать по имени внутри группы optional', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('Second', { isRequired: false }),
+            (0, createOperationParameter_1.createOperationParameter)('First', { isRequired: false }),
+            (0, createOperationParameter_1.createOperationParameter)('Third', { isRequired: false })
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, ['First', 'Second', 'Third']);
+    });
+    (0, node_test_1.test)('@unit: должна сортировать по имени внутри группы optional-with-default', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('Dog', { isRequired: false, default: 'def' }),
+            (0, createOperationParameter_1.createOperationParameter)('Cat', { isRequired: false, default: 'def' }),
+            (0, createOperationParameter_1.createOperationParameter)('Bird', { isRequired: false, default: 'def' })
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, ['Bird', 'Cat', 'Dog']);
+    });
+    // Тесты для всех возможных пар групп
+    const groupPairs = [
+        ['required', 'required-with-default'],
+        ['required', 'optional'],
+        ['required', 'optional-with-default'],
+        ['required-with-default', 'optional'],
+        ['required-with-default', 'optional-with-default'],
+        ['optional', 'optional-with-default']
+    ];
+    for (const [groupA, groupB] of groupPairs) {
+        (0, node_test_1.test)(`@unit: должна помещать "${groupA}" перед "${groupB}"`, () => {
+            const paramA = (0, createOperationParameter_1.createOperationParameter)('A', createOptionsForGroup(groupA));
+            const paramB = (0, createOperationParameter_1.createOperationParameter)('B', createOptionsForGroup(groupB));
+            // A должен идти перед B
+            node_assert_1.default.ok((0, sortByRequiredExtended_1.sortByRequiredExtended)(paramA, paramB) < 0);
+            // B должен идти после A
+            node_assert_1.default.ok((0, sortByRequiredExtended_1.sortByRequiredExtended)(paramB, paramA) > 0);
+        });
+    }
+    // Вспомогательная функция для создания параметров по группе
+    function createOptionsForGroup(group) {
+        switch (group) {
+            case 'required':
+                return { isRequired: true };
+            case 'required-with-default':
+                return { isRequired: true, default: 'default' };
+            case 'optional':
+                return { isRequired: false };
+            case 'optional-with-default':
+                return { isRequired: false, default: 'default' };
+        }
+    }
+    // Тесты на равные группы
+    (0, node_test_1.test)('@unit: должна возвращать 0 для одинаковых параметров', () => {
+        const param1 = (0, createOperationParameter_1.createOperationParameter)('Test', { isRequired: true });
+        const param2 = (0, createOperationParameter_1.createOperationParameter)('Test', { isRequired: true });
+        node_assert_1.default.strictEqual((0, sortByRequiredExtended_1.sortByRequiredExtended)(param1, param2), 0);
+    });
+    // Тест на обработку параметров с одинаковыми именами
+    (0, node_test_1.test)('@unit: должна возвращать 0 для параметров с одинаковыми именами в одной группе', () => {
+        const param1 = (0, createOperationParameter_1.createOperationParameter)('Same', { isRequired: false, default: 'def' });
+        const param2 = (0, createOperationParameter_1.createOperationParameter)('Same', { isRequired: false, default: 'def' });
+        node_assert_1.default.strictEqual((0, sortByRequiredExtended_1.sortByRequiredExtended)(param1, param2), 0);
+    });
+    // Тест на смешанные группы с одинаковыми приоритетами
+    (0, node_test_1.test)('@unit: должна сортировать только по имени при одинаковых группах', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('Beta', { isRequired: false }), // optional
+            (0, createOperationParameter_1.createOperationParameter)('Alpha', { isRequired: true }), // required
+            (0, createOperationParameter_1.createOperationParameter)('Gamma', { isRequired: false }), // optional
+            (0, createOperationParameter_1.createOperationParameter)('Delta', { isRequired: true, default: 'def' }), // required-with-default
+            (0, createOperationParameter_1.createOperationParameter)('Epsilon', { isRequired: false, default: 'def' }), // optional-with-default
+            (0, createOperationParameter_1.createOperationParameter)('Alpha2', { isRequired: true }) // required
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, [
+            'Alpha', // required
+            'Alpha2', // required
+            'Delta', // required-with-default
+            'Beta', // optional
+            'Gamma', // optional
+            'Epsilon' // optional-with-default
+        ]);
+    });
+    // Тест на пограничные случаи
+    (0, node_test_1.test)('@unit: должна корректно обрабатывать пустые имена', () => {
+        const params = [
+            (0, createOperationParameter_1.createOperationParameter)('', { isRequired: true }),
+            (0, createOperationParameter_1.createOperationParameter)('B', { isRequired: true }),
+            (0, createOperationParameter_1.createOperationParameter)('A', { isRequired: true })
+        ];
+        params.sort(sortByRequiredExtended_1.sortByRequiredExtended);
+        const sortedNames = params.map(p => p.name);
+        node_assert_1.default.deepStrictEqual(sortedNames, ['', 'A', 'B']);
+    });
+});

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

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

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

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

package/dist/core/utils/__tests__/sortByRequiredSimple.test.js

@@ -0,0 +1,80 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const strict_1 = __importDefault(require("node:assert/strict"));
+const node_test_1 = require("node:test");
+const createOperationParameter_1 = require("../__mocks__/createOperationParameter");
+const sortByRequiredSimple_1 = require("../sortByRequiredSimple");
+(0, node_test_1.describe)('sortByRequiredSimple', () => {
+    (0, node_test_1.test)('@unit: должна помещать обязательные параметры без default перед необязательными', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('required', { isRequired: true });
+        const b = (0, createOperationParameter_1.createOperationParameter)('optional', { isRequired: false });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), -1);
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(b, a), 1);
+    });
+    (0, node_test_1.test)('@unit: должна считать равными два обязательных параметра без default', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('A', { isRequired: true });
+        const b = (0, createOperationParameter_1.createOperationParameter)('B', { isRequired: true });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), 0);
+    });
+    (0, node_test_1.test)('@unit: должна считать равными два необязательных параметра', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('A', { isRequired: false });
+        const b = (0, createOperationParameter_1.createOperationParameter)('B', { isRequired: false });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), 0);
+    });
+    (0, node_test_1.test)('@unit: должна помещать обязательные без default перед обязательными с default', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('required', { isRequired: true });
+        const b = (0, createOperationParameter_1.createOperationParameter)('required-with-default', { isRequired: true, default: 'test' });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), -1);
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(b, a), 1);
+    });
+    (0, node_test_1.test)('@unit: должна считать равными два обязательных параметра с default', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('A', { isRequired: true, default: 'a' });
+        const b = (0, createOperationParameter_1.createOperationParameter)('B', { isRequired: true, default: 'b' });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), 0);
+    });
+    (0, node_test_1.test)('@unit: должна помещать обязательные без default перед необязательными с default', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('required', { isRequired: true });
+        const b = (0, createOperationParameter_1.createOperationParameter)('optional-with-default', { isRequired: false, default: 'test' });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), -1);
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(b, a), 1);
+    });
+    (0, node_test_1.test)('@unit: должна считать равными два необязательных параметра с default', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('A', { isRequired: false, default: 'a' });
+        const b = (0, createOperationParameter_1.createOperationParameter)('B', { isRequired: false, default: 'b' });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), 0);
+    });
+    (0, node_test_1.test)('@unit: должна считать равными обязательный с default и необязательный без default', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('required-with-default', { isRequired: true, default: 'test' });
+        const b = (0, createOperationParameter_1.createOperationParameter)('optional', { isRequired: false });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), 0);
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(b, a), 0);
+    });
+    (0, node_test_1.test)('@unit: должна корректно работать с undefined значениями', () => {
+        const a = (0, createOperationParameter_1.createOperationParameter)('required', { isRequired: true });
+        const b = (0, createOperationParameter_1.createOperationParameter)('required-with-default', { isRequired: true, default: undefined });
+        strict_1.default.strictEqual((0, sortByRequiredSimple_1.sortByRequiredSimple)(a, b), 0);
+    });
+    (0, node_test_1.test)('@unit: should sort params', () => {
+        const optionalParameter = (0, createOperationParameter_1.createOperationParameter)('optional', { description: '3. Опциональный параметр без значения по умолчанию', isRequired: false });
+        const optionalParameterWithDefault = (0, createOperationParameter_1.createOperationParameter)('optional-with-default', {
+            description: '4. Опциональный параметр со значением по умолчанию',
+            isRequired: false,
+            default: 'Hello World!',
+        });
+        const requiredParameter = (0, createOperationParameter_1.createOperationParameter)('required', { description: '1. Обязательный параметр без значения по умолчанию', isRequired: true });
+        const requiredParameterWithDefault = (0, createOperationParameter_1.createOperationParameter)('required-with-default', {
+            description: '2. Обязательный параметр со значением по умолчанию',
+            isRequired: true,
+            default: 'Hello World!',
+        });
+        strict_1.default.deepStrictEqual([optionalParameterWithDefault, optionalParameter, requiredParameterWithDefault, requiredParameter].sort(sortByRequiredSimple_1.sortByRequiredSimple), [
+            requiredParameter,
+            optionalParameterWithDefault,
+            optionalParameter,
+            requiredParameterWithDefault,
+        ]);
+    });
+});

package/dist/core/utils/__tests__/writeClient.test.js

@@ -12,10 +12,10 @@ 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;
@@ -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/utils/__tests__/writeClientCore.test.js

@@ -10,7 +10,7 @@ const fileSystem_1 = require("../fileSystem");
 const writeClientCore_1 = require("../writeClientCore");
 (0, node_test_1.test)('@unit: writeClientCore writes to filesystem', async () => {
     const writeFileCalls = [];
-    // Переприсваиваем функцию вручную с моком
+    // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
     fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
         writeFileCalls.push([path, content]);
@@ -47,6 +47,6 @@ const writeClientCore_1 = require("../writeClientCore");
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('request.ts') && content.toString().includes('request')), 'Expected writeFile to be called with request content for request.ts');
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('CancelablePromise.ts') && content.toString().includes('cancelablePromise')), 'Expected writeFile to be called with cancelablePromise content for CancelablePromise.ts');
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('HttpStatusCode.ts') && content.toString().includes('httpStatusCode')), 'Expected writeFile to be called with httpStatusCode content for HttpStatusCode.ts');
-    // Восстанавливаем оригинальную функцию
+    // Restoring the original function
     fileSystem_1.fileSystem.writeFile = originalWriteFile;
 });

package/dist/core/utils/__tests__/writeClientIndex.test.js

@@ -9,7 +9,7 @@ const fileSystem_1 = require("../fileSystem");
 const writeClientIndex_1 = require("../writeClientIndex");
 (0, node_test_1.test)('@unit: writeClientIndex writes to filesystem', async () => {
     const writeFileCalls = [];
-    // Переприсваиваем функцию вручную с моком
+    // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
     fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
         writeFileCalls.push([path, content]);
@@ -33,6 +33,6 @@ const writeClientIndex_1 = require("../writeClientIndex");
     };
     await (0, writeClientIndex_1.writeClientIndex)({ templates, outputPath: '/', core: [], models: [], schemas: [], services: [] });
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('index.ts') && content.toString().includes('index')), 'Expected writeFile to be called with index content for index.ts');
-    // Восстанавливаем оригинальную функцию
+    // Restoring the original function
     fileSystem_1.fileSystem.writeFile = originalWriteFile;
 });

package/dist/core/utils/__tests__/writeClientModels.test.js

@@ -10,7 +10,7 @@ const fileSystem_1 = require("../fileSystem");
 const writeClientModels_1 = require("../writeClientModels");
 (0, node_test_1.test)('@unit: writeClientModels writes to filesystem', async () => {
     const writeFileCalls = [];
-    // Переприсваиваем функцию вручную с моком
+    // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
     fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
         writeFileCalls.push([path, content]);
@@ -61,6 +61,6 @@ const writeClientModels_1 = require("../writeClientModels");
         useUnionTypes: false,
     });
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyModel.ts') && content.toString().includes('model')), 'Expected writeFile to be called with model content for MyModel.ts');
-    // Восстанавливаем оригинальную функцию
+    // Restoring the original function
     fileSystem_1.fileSystem.writeFile = originalWriteFile;
 });

package/dist/core/utils/__tests__/writeClientSchemas.test.js

@@ -10,7 +10,7 @@ const fileSystem_1 = require("../fileSystem");
 const writeClientSchemas_1 = require("../writeClientSchemas");
 (0, node_test_1.test)('@unit: writeClientSchemas writes to filesystem', async () => {
     const writeFileCalls = [];
-    // Переприсваиваем функцию вручную с моком
+    // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
     fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
         writeFileCalls.push([path, content]);
@@ -61,6 +61,6 @@ const writeClientSchemas_1 = require("../writeClientSchemas");
         useUnionTypes: false,
     });
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyModelSchema.ts') && content.toString().includes('schema')), 'Expected writeFile to be called with schema content for MyModelSchema.ts');
-    // Восстанавливаем оригинальную функцию
+    // Restoring the original function
     fileSystem_1.fileSystem.writeFile = originalWriteFile;
 });

package/dist/core/utils/__tests__/writeClientServices.test.js

@@ -10,7 +10,7 @@ const fileSystem_1 = require("../fileSystem");
 const writeClientServices_1 = require("../writeClientServices");
 (0, node_test_1.test)('@unit: writeClientServices  writes to filesystem', async () => {
     const writeFileCalls = [];
-    // Переприсваиваем функцию вручную с моком
+    // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
     fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
         writeFileCalls.push([path, content]);
@@ -54,7 +54,7 @@ const writeClientServices_1 = require("../writeClientServices");
         useCancelableRequest: false,
     });
     node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyService.ts') && content.toString().includes('service')), 'Expected writeFile to be called with service content for MyService.ts');
-    // Восстанавливаем оригинальную функцию
+    // Restoring the original function
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     fileSystem_1.fileSystem.writeFile = originalWriteFile;

package/dist/core/utils/getOpenApiSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAsBpE;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA2C5F"}
+{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAsBpE;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAmC5F"}