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

package/README.md

@@ -57,7 +57,7 @@ $ openapi --help
     -os, --outputServices <value> Output directory for services
     -om, --outputModels <value>   Output directory for models
     -osm, --outputSchemas <value> Output directory for schemas
-    -c, --client <value>          HTTP client to generate [fetch, xhr, node] (default: "fetch")
+    -c, --httpClient <value>      HTTP client to generate [fetch, xhr, node] (default: "fetch")
     --useOptions <value>          Use options instead of arguments (default: false)
     --useUnionTypes <value>       Use union types instead of enums (default: false)
     --exportCore <value>          Write core files to disk (default: true)
@@ -69,6 +69,7 @@ $ openapi --help
     --enumPrefix <value>          Prefix for enum model(default: "E")
     --typePrefix <value>          Prefix for type model(default: "T")
     --useCancelableRequest        Use cancelled promise as returned data type in request(default: false)
+    -s, --sortByRequired          Property sorting strategy: simplified or extended
 
   Examples
     $ openapi --input ./spec.json
@@ -389,6 +390,39 @@ const MyForm = () => (
 
 ```
 
+### Cancelable promise `--useCancelableRequest`
+By default, the OpenAPI generator generates services for accessing the API that use non-cancellable requests. Therefore, we have added the ability to switch the generator to generate canceled API requests. To do this, use the flag `--useCancelableRequest`.
+An example of a cancelled request would look like this:
+
+```typescript
+export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> {
+    return new CancelablePromise(async(resolve, reject, onCancel) => {
+        const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);
+        try {
+            if (!onCancel.isCancelled) {
+                const response = await sendRequest(options, url, config, onCancel);
+                const responseBody = await getResponseBody(response);
+                const responseHeader = getResponseHeader(response, options.responseHeader);
+                const result: ApiResult = {
+                    url,
+                    ok: response.ok,
+                    status: response.status,
+                    statusText: response.statusText,
+                    body: responseHeader || responseBody,
+                };
+
+                catchErrors(options, result);
+                resolve(result.body);
+            }
+        } catch (e) {
+            reject(e);
+        }
+    });
+}
+```
+
+### Sorting strategy for function arguments `--sortByRequired`
+By default, the OpenAPI generator sorts the parameters of service functions according to a simplified scheme. If you need a more strict sorting option, then you need to use the sortByRequired flag. The simplified sorting option is similar to the one used in version 0.2.3 of the OpenAPI generator. This flag allows you to upgrade to a new version of the generator if you are "stuck" on version 0.2.3.
 
 ### Enum with custom names and descriptions
 You can use `x-enum-varnames` and `x-enum-descriptions` in your spec to generate enum with custom names and descriptions.

package/dist/cli/index.js

@@ -7,7 +7,7 @@ const runGenerateOpenApi_1 = require("./generate/runGenerateOpenApi");
 const APP_NAME = 'ts-openapi-codegen-cli';
 const APP_VERSION = '1.0.0';
 const program = new commander_1.Command();
-program.version(APP_VERSION).name(APP_NAME).description('Описание').addHelpText('before', 'Дополнительный текст');
+program.version(APP_VERSION).name(APP_NAME).description('Description').addHelpText('before', 'Additional text');
 program
     .command('generate')
     .usage('[options]')
@@ -33,6 +33,7 @@ program
     .option('--useCancelableRequest <value>', 'Use cancelled promise as returned data type in request(default: false)', false)
     .addOption(new commander_1.Option('-l, --logLevel <level>', 'Logging level').choices([...Object.values(Enums_1.ELogLevel)]).default(Enums_1.ELogLevel.ERROR))
     .addOption(new commander_1.Option('-t, --logTarget <target>', 'Target of logging').choices([...Object.values(Enums_1.ELogOutput)]).default(Enums_1.ELogOutput.CONSOLE))
+    .option('-s, --sortByRequired', 'Property sorting strategy: simplified or extended')
     .action(async (options) => {
     await (0, runGenerateOpenApi_1.runGenerateOpenApi)(options);
 });

package/dist/common/Options.d.ts

@@ -20,6 +20,7 @@ export type TOptions = {
     enumPrefix?: string;
     typePrefix?: string;
     useCancelableRequest?: boolean;
+    sortByRequired?: boolean;
 };
 export type TMultiOptions = {
     items: TOptions[];

package/dist/common/Options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/common/Options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACnB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/common/Options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACnB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC"}

package/dist/common/__tests__/mergeObjectSchemas.test.js

@@ -27,7 +27,7 @@ const mergeObjectSchemas_1 = require("../VersionedSchema/Utils/mergeObjectSchema
         };
         const invalidData = {
             input: 'source/path',
-            httpClient: 'invalid-client', // Некорректное значение для httpClient
+            httpClient: 'invalid-client',
         };
         node_assert_1.default.equal(OptionsSchemaV2_1.optionsSchemaV2.validate(validData).error, null, 'Valid data should pass optionsSchemaV2 validation');
         node_assert_1.default.notEqual(OptionsSchemaV2_1.optionsSchemaV2.validate(invalidData).error, null, 'Invalid data should fail optionsSchemaV2 validation');

package/dist/core/Context.d.ts

@@ -1,6 +1,12 @@
 import { JSONSchema4Type, JSONSchema6Type, JSONSchema7Type } from 'json-schema';
 import RefParser from 'json-schema-ref-parser';
 import { IOutput, Prefix } from './types/Models';
+type TContextProps = {
+    input: string | Record<string, any>;
+    output: IOutput;
+    prefix?: Prefix;
+    sortByRequired?: boolean;
+};
 /**
  * A Context wich can share a data between methods
  */
@@ -9,7 +15,8 @@ export declare class Context {
     private _root;
     private _output;
     prefix: Prefix;
-    constructor(input: string | Record<string, any>, output: IOutput, prefix?: Prefix);
+    private _sortByRequired;
+    constructor({ input, output, prefix, sortByRequired }: TContextProps);
     addRefs(refs: RefParser.$Refs): Context;
     values(...types: string[]): Record<string, any>;
     get($ref: string): JSONSchema4Type | JSONSchema6Type | JSONSchema7Type;
@@ -17,5 +24,7 @@ export declare class Context {
     exists($ref: string): boolean;
     fileName(): string;
     get output(): IOutput;
+    get sortByRequired(): boolean;
 }
+export {};
 //# sourceMappingURL=Context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAS,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAKxD;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAU;IAClB,MAAM,EAAE,MAAM,CAInB;gBAEU,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;IAc1E,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,GAAG,OAAO;IAKvC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAOtE,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO7B,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,YAKhB;CACJ"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAS,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAKxD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAU;IAClB,MAAM,EAAE,MAAM,CAInB;IAEF,OAAO,CAAC,eAAe,CAAkB;gBAE7B,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,GAAG,OAAO;IAKvC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAOtE,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO7B,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,YAKhB;IAED,IAAW,cAAc,YAExB;CACJ"}

package/dist/core/Context.js

@@ -16,7 +16,8 @@ class Context {
         enum: 'E',
         type: 'T',
     };
-    constructor(input, output, prefix) {
+    _sortByRequired = false;
+    constructor({ input, output, prefix, sortByRequired }) {
         this._output = output;
         this._refs = {};
         if ((0, isString_1.isString)(input)) {
@@ -28,6 +29,9 @@ class Context {
         if (prefix) {
             this.prefix = prefix;
         }
+        if (sortByRequired !== undefined && sortByRequired !== null) {
+            this._sortByRequired = sortByRequired;
+        }
         return this;
     }
     addRefs(refs) {
@@ -70,5 +74,8 @@ class Context {
         }
         return this._output;
     }
+    get sortByRequired() {
+        return this._sortByRequired;
+    }
 }
 exports.Context = Context;

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

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

package/dist/core/utils/getOpenApiSpec.js

@@ -40,13 +40,7 @@ async function getOpenApiSpec(context, input) {
     if (!fileExists) {
         throw new Error(`Could not read OpenApi spec: "${absoluteInput}"`);
     }
-    // 2. Вызываем статический метод вместо new RefParser()
-    //    resolve() разбирает все $ref, но не разворачивает ссылки
     const resolvedRefs = await json_schema_ref_parser_1.default.resolve(absoluteInput);
-    // Если вам нужны сами ссылки (instances of $Refs), можно сделать так:
-    // const $refs = (await RefParser.parse(absoluteInput)).$refs;
-    // context.addRefs($refs);
-    // В вашем случае — пробрасываем то, что вернул resolve()
     context.addRefs(resolvedRefs);
     const raw = resolvedRefs.get(absoluteInput);
     if (!raw || typeof raw !== 'object' || Array.isArray(raw) || !('paths' in raw)) {
@@ -57,7 +51,6 @@ async function getOpenApiSpec(context, input) {
     for (const [pathKey, value] of Object.entries(mainSchema.paths)) {
         const maybeRef = value;
         if (maybeRef.$ref) {
-            // ваша функция replaceRef возвращает раскрученный объект
             newPaths[pathKey] = replaceRef(context.get(maybeRef.$ref), context, (0, pathHelpers_1.dirName)(maybeRef.$ref));
         }
         else {

package/dist/core/utils/getPropertyGroupExtended.d.ts

@@ -0,0 +1,4 @@
+import { TPropertyGroupExtended } from '../types/Models';
+import { OperationParameter } from '../types/shared/OperationParameter.model';
+export declare function getPropertyGroupExtended(prop: OperationParameter): TPropertyGroupExtended;
+//# sourceMappingURL=getPropertyGroupExtended.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getPropertyGroupExtended.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getPropertyGroupExtended.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,kBAAkB,GAAG,sBAAsB,CAKzF"}

package/dist/core/utils/getPropertyGroupExtended.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPropertyGroupExtended = getPropertyGroupExtended;
+// Auxiliary function for defining a property group
+function getPropertyGroupExtended(prop) {
+    if (prop.isRequired) {
+        return prop.default === undefined ? 'required' : 'required-with-default';
+    }
+    return prop.default === undefined ? 'optional' : 'optional-with-default';
+}

package/dist/core/utils/getPropertyGroupSimple.d.ts

@@ -0,0 +1,3 @@
+import { TPropertyGroupSimple } from '../types/Models';
+export declare function getPropertyGroupSimple(prop: any): TPropertyGroupSimple;
+//# sourceMappingURL=getPropertyGroupSimple.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getPropertyGroupSimple.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getPropertyGroupSimple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGvD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,GAAG,oBAAoB,CAItE"}

package/dist/core/utils/getPropertyGroupSimple.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPropertyGroupSimple = getPropertyGroupSimple;
+// Auxiliary function for defining a property group
+function getPropertyGroupSimple(prop) {
+    return prop.isRequired && prop.default === undefined
+        ? 'requires-value'
+        : 'other';
+}

package/dist/core/utils/precompileTemplates.js

@@ -18,7 +18,7 @@ const header = `// This is an automatically generated file for the hbs template.
 // @ts-nocheck
 export default `;
 /**
- * Фунукция для пре-компеляции шаблонов (hbs) перед дальнейшим использованием
+ * Function for template precompilation (hbs) before further use
  */
 const precompileTemplates = () => {
     const logger = new Logger_1.Logger({

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

@@ -0,0 +1,3 @@
+import { OperationParameter } from '../types/shared/OperationParameter.model';
+export declare function sortByRequiredExtended(a: OperationParameter, b: OperationParameter): number;
+//# sourceMappingURL=sortByRequiredExtended.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sortByRequiredExtended.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sortByRequiredExtended.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAW3F"}

package/dist/core/utils/sortByRequiredExtended.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByRequiredExtended = sortByRequiredExtended;
+const Consts_1 = require("../types/Consts");
+const getPropertyGroupExtended_1 = require("./getPropertyGroupExtended");
+function sortByRequiredExtended(a, b) {
+    const groupA = (0, getPropertyGroupExtended_1.getPropertyGroupExtended)(a);
+    const groupB = (0, getPropertyGroupExtended_1.getPropertyGroupExtended)(b);
+    // If the groups are different, we sort them by priority.
+    if (groupA !== groupB) {
+        return Consts_1.GROUP_PRIORITY_EXTENDED[groupA] - Consts_1.GROUP_PRIORITY_EXTENDED[groupB];
+    }
+    // If the groups are the same, we sort them by name.
+    return a.name.localeCompare(b.name);
+}

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

@@ -0,0 +1,3 @@
+import type { OperationParameter } from '../types/shared/OperationParameter.model';
+export declare function sortByRequiredSimple(a: OperationParameter, b: OperationParameter): number;
+//# sourceMappingURL=sortByRequiredSimple.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sortByRequiredSimple.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sortByRequiredSimple.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAGnF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAKzF"}

package/dist/core/utils/sortByRequiredSimple.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByRequiredSimple = sortByRequiredSimple;
+const Consts_1 = require("../types/Consts");
+const getPropertyGroupSimple_1 = require("./getPropertyGroupSimple");
+function sortByRequiredSimple(a, b) {
+    const groupA = (0, getPropertyGroupSimple_1.getPropertyGroupSimple)(a);
+    const groupB = (0, getPropertyGroupSimple_1.getPropertyGroupSimple)(b);
+    return Consts_1.GROUP_PRIORITY_SIMPLE[groupA] - Consts_1.GROUP_PRIORITY_SIMPLE[groupB];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "Library that generates Typescript clients based on the OpenAPI specification. It bases on openapi-typescript-codegen",
     "author": "Alexey Zverev",
     "homepage": "https://github.com/ozonophore/openapi-codegen.git",

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

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

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

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

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

@@ -1,108 +0,0 @@
-"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 sortByRequired_1 = require("../sortByRequired");
-(0, node_test_1.describe)('sortByRequired', () => {
-    (0, node_test_1.test)('@unit: should sort params', () => {
-        const paramOptional = {
-            in: 'query',
-            prop: 'parameterOptionalStringWithNoDefault',
-            export: 'generic',
-            name: 'parameterOptionalStringWithNoDefault',
-            alias: '',
-            path: '',
-            type: 'string',
-            base: 'string',
-            template: null,
-            link: null,
-            description: '3. This is a optional string with no default',
-            isDefinition: false,
-            isReadOnly: false,
-            isRequired: false,
-            isNullable: false,
-            imports: [],
-            enum: [],
-            enums: [],
-            properties: [],
-            mediaType: null,
-        };
-        const paramOptionalWithDefault = {
-            in: 'query',
-            prop: 'parameterOptionalStringWithNoDefault',
-            export: 'generic',
-            name: 'parameterOptionalStringWithNoDefault',
-            alias: '',
-            path: '',
-            type: 'string',
-            base: 'string',
-            template: null,
-            link: null,
-            description: '3. This is a optional string with no default',
-            isDefinition: false,
-            isReadOnly: false,
-            isRequired: false,
-            isNullable: false,
-            imports: [],
-            enum: [],
-            enums: [],
-            properties: [],
-            mediaType: null,
-            default: 'Hello World!',
-        };
-        const paramRequiredWithDefault = {
-            in: 'query',
-            prop: 'parameterStringWithDefault',
-            export: 'generic',
-            name: 'parameterStringWithDefault',
-            alias: '',
-            path: '',
-            type: 'string',
-            base: 'string',
-            template: null,
-            link: null,
-            description: '2. This is a string with default',
-            isDefinition: false,
-            isReadOnly: false,
-            isRequired: true,
-            isNullable: false,
-            imports: [],
-            enum: [],
-            enums: [],
-            properties: [],
-            mediaType: null,
-            default: 'Hello World!',
-        };
-        const paramRequiredWithoutDefault = {
-            in: 'query',
-            prop: 'parameterStringWithoutDefault',
-            export: 'generic',
-            name: 'parameterStringWithoutDefault',
-            alias: '',
-            path: '',
-            type: 'string',
-            base: 'string',
-            template: null,
-            link: null,
-            description: '1. This is a string without default',
-            isDefinition: false,
-            isReadOnly: false,
-            isRequired: true,
-            isNullable: false,
-            imports: [],
-            enum: [],
-            enums: [],
-            properties: [],
-            mediaType: null,
-        };
-        node_assert_1.default.deepStrictEqual([paramOptionalWithDefault, paramOptional, paramRequiredWithDefault, paramRequiredWithoutDefault].sort(sortByRequired_1.sortByRequired), [
-            paramRequiredWithoutDefault,
-            paramRequiredWithDefault,
-            paramOptionalWithDefault,
-            paramOptional,
-        ]);
-    });
-});

package/dist/core/utils/sortByRequired.d.ts

@@ -1,3 +0,0 @@
-import type { OperationParameter } from '../types/shared/OperationParameter.model';
-export declare function sortByRequired(a: OperationParameter, b: OperationParameter): number;
-//# sourceMappingURL=sortByRequired.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"sortByRequired.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sortByRequired.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAEnF,wBAAgB,cAAc,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAcnF"}

package/dist/core/utils/sortByRequired.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByRequired = sortByRequired;
-function sortByRequired(a, b) {
-    if (!a.isRequired && b.isRequired) {
-        return 1;
-    }
-    if (a.isRequired && !b.isRequired) {
-        return -1;
-    }
-    if ((a.isRequired && a.default === undefined && b.default !== undefined) || (a.isRequired && a.default !== undefined && b.default === undefined)) {
-        return -1;
-    }
-    if ((a.isRequired && a.default !== undefined && b.default === undefined) || (!a.isRequired && a.default === undefined && b.default !== undefined)) {
-        return 1;
-    }
-    return 0;
-}