ts-openapi-codegen 1.0.0-beta.8 → 2.0.0-beta.0

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

@@ -1 +1 @@
-{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}
+{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
+const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
 const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
@@ -16,7 +17,7 @@ function getModels(openApi) {
                 openApi: openApi,
                 definition: definition,
                 isDefinition: true,
-                name: definitionType.base,
+                name: (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(definitionType.base, definition, this.context.prefix),
                 path: definitionType.path,
                 parentRef: modelRef,
             });

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAIvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAqF1J"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAIvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAqF1J"}

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationResponse = getOperationResponse;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
 const normalizeRef_1 = require("../../../utils/normalizeRef");
@@ -82,7 +79,7 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
     // fetch and XHR client just support string types.
     if (response.headers) {
         for (const name in response.headers) {
-            if ((0, get_1.default)(response.headers, name, null)) {
+            if ((0, safeHasOwn_1.safeHasOwn)(response.headers, name)) {
                 operationResponse.in = 'header';
                 operationResponse.name = name;
                 operationResponse.type = 'string';

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAsBzI"}
+{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAsBzI"}

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

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationResponses = getOperationResponses;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getOperationResponseCode_1 = require("../../../utils/getOperationResponseCode");
 function getOperationResponses(openApi, responses, parentRef) {
     const operationResponses = [];
     // Iterate over each response code and get the
     // status code and response message (if any).
     for (const code in responses) {
-        if ((0, get_1.default)(responses, code, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(responses, code)) {
             const responseOrReference = responses[code];
             const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);

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

@@ -1 +1 @@
-{"version":3,"file":"getServer.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAUlD"}
+{"version":3,"file":"getServer.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAUlD"}

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

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServer = getServer;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 function getServer(openApi) {
     const server = openApi.servers?.[0];
     const variables = server?.variables || {};
     let url = server?.url || '';
     for (const variable in variables) {
-        if ((0, get_1.default)(variables, variable, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(variables, variable)) {
             url = url.replace(`{${variable}}`, variables[variable].default);
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAgCrE"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAgCrE"}

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServices = getServices;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getClassName_1 = require("../../../utils/getClassName");
 const serviceHelpers_1 = require("../../../utils/serviceHelpers");
 const getServiceName_1 = require("./getServiceName");
@@ -14,7 +11,7 @@ const getServiceName_1 = require("./getServiceName");
 function getServices(openApi) {
     const services = new Map();
     for (const url in openApi.paths) {
-        if ((0, get_1.default)(openApi.paths, url, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(openApi.paths, url)) {
             // Grab path and parse any global path parameters
             const pathByUrl = openApi.paths[url];
             const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref) : pathByUrl);

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

@@ -1 +1 @@
-{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA4C5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAoC5E"}

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
 const getMappedType_1 = require("../../../utils/getMappedType");
 const getTypeName_1 = require("../../../utils/getTypeName");
-const replaceString_1 = require("../../../utils/replaceString");
+const normalizeString_1 = require("../../../utils/normalizeString");
 const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
@@ -12,7 +12,7 @@ const stripNamespace_1 = require("../../../utils/stripNamespace");
  * @param parentRef Reference to a parent model
  */
 function getType(value, parentRef) {
-    const normalizedValue = (0, replaceString_1.replaceString)(value) || '';
+    const normalizedValue = (0, normalizeString_1.normalizeString)(value) || '';
     const result = {
         type: 'any',
         base: 'any',
@@ -37,20 +37,12 @@ function getType(value, parentRef) {
             refValuePath: normalizedValue,
             outputModelsPath: this.context.output?.outputModels,
         });
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean));
-        // Only prefix with "./" when the path is non-empty and does not already
-        // start with "/" (absolute) or "." (relative like "./" or "../").
-        let valueImportPath = valuePath;
-        if (valuePath && !valuePath.startsWith('/') && !valuePath.startsWith('.')) {
-            valueImportPath = `./${valuePath}`;
-        }
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
+        const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;
         result.base = type;
-        // Push import only when we actually have a path (avoid './' for empty)
-        if (valuePath) {
-            result.imports.push({ name: type, alias: '', path: valueImportPath });
-        }
+        result.imports.push({ name: type, alias: '', path: valueImportPath });
     }
     return result;
 }

package/dist/core/index.d.ts

@@ -1,4 +1,4 @@
-import { TMultiOptions, TOptions } from '../common/Options';
+import { TRawOptions } from '../common/TRawOptions';
 export { HttpClient } from './types/enums/HttpClient.enum';
-export declare function generate(options: TOptions | TOptions[] | TMultiOptions): Promise<void>;
+export declare function generate(rawOptions: TRawOptions): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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,+BAA+B,CAAC;AAiH3D,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE"}

package/dist/core/index.js

@@ -1,166 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
-/* istanbul ignore file */
-const path_1 = __importDefault(require("path"));
-const Parser_1 = require("./api/v2/Parser");
-const Parser_2 = require("./api/v3/Parser");
-const Context_1 = require("./Context");
-const HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
-const fileSystem_1 = require("./utils/fileSystem");
-const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
-const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
-const getOutputPaths_1 = require("./utils/getOutputPaths");
-const isInstanceOfMultiOptions_1 = require("./utils/isInstanceOfMultiOptions");
-const isString_1 = require("./utils/isString");
-const postProcessClient_1 = require("./utils/postProcessClient");
-const prepareOptions_1 = require("./utils/prepareOptions");
-const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
-const WriteClient_1 = require("./WriteClient");
-var HttpClient_enum_2 = require("./types/enums/HttpClient.enum");
-Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_2.HttpClient; } });
-/**
- * Generate the OpenAPI client. This method will read the OpenAPI specification and based on the
- * given language it will generate the client, including the typed models, validation schemas,
- * service layer, etc.
- * @param input: The relative location of the OpenAPI spec
- * @param output: The relative location of the output directory
- * @param outputCore: The relative location of the output directory for core
- * @param outputServices: The relative location of the output directory for services
- * @param outputModels: The relative location of the output directory for models
- * @param outputSchemas: The relative location of the output directory for schemas
- * @param httpClient: The selected httpClient (fetch or XHR)
- * @param useOptions: Use options or arguments functions
- * @param useUnionTypes: Use union types instead of enums
- * @param excludeCoreServiceFiles The generation of the core and services is excluded
- * @param includeSchemasFiles The generation of model validation schemes is enabled
- * @param request: Path to custom request file
- * @param write: Write the files to disk (true or false)
- * @param interfacePrefix: Prefix for interface model(I)
- * @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
- * @param useSeparatedIndexes Use separate index files for the core, models, schemas, and services
- */
-async function generateFrom({ input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient = HttpClient_enum_1.HttpClient.FETCH, useOptions = false, useUnionTypes = false, excludeCoreServiceFiles = false, includeSchemasFiles = false, request, write = true, interfacePrefix = 'I', enumPrefix = 'E', typePrefix = 'T', useCancelableRequest = false, sortByRequired = false, useSeparatedIndexes = false, }, writeClient) {
-    const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
-        output,
-        outputCore,
-        outputServices,
-        outputModels,
-        outputSchemas,
-    });
-    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)({
-        httpClient,
-        useUnionTypes,
-        useOptions,
-    });
-    writeClient.logger.info('Defining the version of the openapi specification (2 or 3)');
-    switch (openApiVersion) {
-        case getOpenApiVersion_1.OpenApiVersion.V2: {
-            const client = new Parser_1.Parser(context).parse(openApi);
-            const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
-            if (!write)
-                break;
-            writeClient.logger.info('Write our OpenAPI client version 2 to disk.');
-            await writeClient.writeClient({
-                client: clientFinal,
-                templates,
-                outputPaths,
-                httpClient,
-                useOptions,
-                useUnionTypes,
-                excludeCoreServiceFiles,
-                includeSchemasFiles,
-                request,
-                useCancelableRequest,
-                useSeparatedIndexes,
-            });
-            break;
-        }
-        case getOpenApiVersion_1.OpenApiVersion.V3: {
-            const client = new Parser_2.Parser(context).parse(openApi);
-            const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
-            if (!write)
-                break;
-            writeClient.logger.info('Write our OpenAPI client version 3 to disk.');
-            await writeClient.writeClient({
-                client: clientFinal,
-                templates,
-                outputPaths,
-                httpClient,
-                useOptions,
-                useUnionTypes,
-                excludeCoreServiceFiles,
-                includeSchemasFiles,
-                request,
-                useCancelableRequest,
-                useSeparatedIndexes,
-            });
-            break;
-        }
-    }
-}
-async function generate(options) {
-    let preparedOptions = [];
-    if (Array.isArray(options)) {
-        preparedOptions = options;
-    }
-    else if ((0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(options)) {
-        const { items, ...otherProps } = options;
-        preparedOptions = items.map(item => ({ ...item, ...otherProps }));
-    }
-    else {
-        preparedOptions = Array.of(options);
-    }
-    const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
-    const writeClient = new WriteClient_1.WriteClient();
-    writeClient.logger.forceInfo(`Generation has begun. Total number of specification files: ${optionsFinal.length}`);
-    try {
-        const start = process.hrtime();
-        for (const option of optionsFinal) {
-            if (option.output) {
-                await fileSystem_1.fileSystem.rmdir(option.output);
-            }
-            if (option.outputCore) {
-                await fileSystem_1.fileSystem.rmdir(option.outputCore);
-            }
-            if (option.outputSchemas) {
-                await fileSystem_1.fileSystem.rmdir(option.outputSchemas);
-            }
-            if (option.outputModels) {
-                await fileSystem_1.fileSystem.rmdir(option.outputModels);
-            }
-            if (option.outputServices) {
-                await fileSystem_1.fileSystem.rmdir(option.outputServices);
-            }
-        }
-        for (const option of optionsFinal) {
-            await generateFrom(option, writeClient);
-            writeClient.logger.info(`Generation from "${option.input}" was finished`);
-            writeClient.logger.info(`Output folder: ${path_1.default.resolve(process.cwd(), option.output)}`, true);
-        }
-        if (optionsFinal[0]?.useSeparatedIndexes) {
-            await writeClient.combineAndWrightSimple();
-        }
-        else {
-            await writeClient.combineAndWrite();
-        }
-        writeClient.logger.forceInfo("Generation from has been finished");
-        const [seconds, nanoseconds] = process.hrtime(start);
-        const durationInMs = seconds + nanoseconds / 1e6;
-        writeClient.logger.forceInfo(`Lead time: ${durationInMs.toFixed(2)} sec`);
-    }
-    catch (error) {
-        writeClient.logger.error(error.message);
-    }
-    writeClient.logger.shutdownLogger();
+const OpenApiClient_1 = require("./OpenApiClient");
+var HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
+Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_1.HttpClient; } });
+async function generate(rawOptions) {
+    const openApiClient = new OpenApiClient_1.OpenApiClient();
+    await openApiClient.generate(rawOptions);
 }

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

@@ -1,4 +1,8 @@
-export declare const SEARCH_REGEXP: RegExp;
+export declare const REGEX_BACKSLASH: RegExp;
+export declare const REGEX_MULTIPLE_SLASHES: RegExp;
+export declare const REGEX_DOT_SLASH: RegExp;
+export declare const REGEX_LEADING_DOT_SLASH: RegExp;
+export declare const REGEX_TRAILING_SLASH: RegExp;
 export declare const GROUP_PRIORITY_EXTENDED: {
     readonly required: 0;
     readonly 'required-with-default': 1;

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;AAEnC,eAAO,MAAM,uBAAuB;;;;;CAK1B,CAAC;AAEX,eAAO,MAAM,qBAAqB;;;CAGxB,CAAC"}
+{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../../src/core/types/Consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,QAAQ,CAAC;AAErC,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,eAAO,MAAM,eAAe,QAAe,CAAC;AAE5C,eAAO,MAAM,uBAAuB,QAAc,CAAC;AAEnD,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C,eAAO,MAAM,uBAAuB;;;;;CAK1B,CAAC;AAEX,eAAO,MAAM,qBAAqB;;;CAGxB,CAAC"}

package/dist/core/types/Consts.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GROUP_PRIORITY_SIMPLE = exports.GROUP_PRIORITY_EXTENDED = exports.SEARCH_REGEXP = void 0;
-exports.SEARCH_REGEXP = /\\/g;
+exports.GROUP_PRIORITY_SIMPLE = exports.GROUP_PRIORITY_EXTENDED = exports.REGEX_TRAILING_SLASH = exports.REGEX_LEADING_DOT_SLASH = exports.REGEX_DOT_SLASH = exports.REGEX_MULTIPLE_SLASHES = exports.REGEX_BACKSLASH = void 0;
+exports.REGEX_BACKSLASH = /\\/g;
+exports.REGEX_MULTIPLE_SLASHES = /\/+/g;
+exports.REGEX_DOT_SLASH = /\/(\.\/)+/g;
+exports.REGEX_LEADING_DOT_SLASH = /^(\.\/)+/g;
+exports.REGEX_TRAILING_SLASH = /\/$/g;
 exports.GROUP_PRIORITY_EXTENDED = {
     required: 0,
     'required-with-default': 1,

package/dist/core/types/base/Root.model.d.ts

@@ -1,4 +1,5 @@
 export interface $Root {
+    dirName: string;
     path: string;
     fileName?: string;
 }

package/dist/core/types/base/Root.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Root.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Root.model.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"Root.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Root.model.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB"}

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

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const escapeDescription_1 = require("../escapeDescription");
-(0, node_test_1.describe)('escapeDescription', () => {
-    (0, node_test_1.test)('@unit: should escape', () => {
+(0, node_test_1.describe)('@unit: escapeDescription', () => {
+    (0, node_test_1.test)('should escape', () => {
         node_assert_1.default.strictEqual((0, escapeDescription_1.escapeDescription)('foo `test` bar'), 'foo \\`test\\` bar');
     });
-    (0, node_test_1.test)('@unit: should not escape', () => {
+    (0, node_test_1.test)('should not escape', () => {
         node_assert_1.default.strictEqual((0, escapeDescription_1.escapeDescription)(''), '');
         node_assert_1.default.strictEqual((0, escapeDescription_1.escapeDescription)('fooBar'), 'fooBar');
         node_assert_1.default.strictEqual((0, escapeDescription_1.escapeDescription)('foo \\`test\\` bar'), 'foo \\`test\\` bar');

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const escapeName_1 = require("../escapeName");
-(0, node_test_1.describe)('escapeName', () => {
-    (0, node_test_1.test)('@unit: should escape', () => {
+(0, node_test_1.describe)('@unit: escapeName', () => {
+    (0, node_test_1.test)('should escape', () => {
         node_assert_1.default.strictEqual((0, escapeName_1.escapeName)(''), '');
         node_assert_1.default.strictEqual((0, escapeName_1.escapeName)('fooBar'), 'fooBar');
         node_assert_1.default.strictEqual((0, escapeName_1.escapeName)('Foo Bar'), `'Foo Bar'`);

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const flatMap_1 = require("../flatMap");
-(0, node_test_1.describe)('flatMap', () => {
-    (0, node_test_1.test)('@unit: should produce correct result', () => {
+(0, node_test_1.describe)('@unit: flatMap', () => {
+    (0, node_test_1.test)('should produce correct result', () => {
         node_assert_1.default.deepEqual((0, flatMap_1.flatMap)([1, 2, 3], i => [i]), [1, 2, 3]);
         node_assert_1.default.deepEqual((0, flatMap_1.flatMap)([1, 2, 3], i => [i + 1]), [2, 3, 4]);
         node_assert_1.default.deepEqual((0, flatMap_1.flatMap)([1, 2, 3], () => [1]), [1, 1, 1]);

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

@@ -6,24 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getAbsolutePath_1 = require("../getAbsolutePath");
-(0, node_test_1.describe)('getAbsolutePath', () => {
-    (0, node_test_1.test)('@unit: The absolute reference in the definition Ref replaces the part after the # in the parentRef', () => {
+(0, node_test_1.describe)('@unit: getAbsolutePath', () => {
+    (0, node_test_1.test)('The absolute reference in the definition Ref replaces the part after the # in the parentRef', () => {
         const result = (0, getAbsolutePath_1.getAbsolutePath)('#/components/schemas/ErrorCode', 'models.yaml#/components/schemas/ErrorData');
         node_assert_1.default.strictEqual(result, 'models.yaml#/components/schemas/ErrorCode');
     });
-    (0, node_test_1.test)('@unit: The absolute parentRef reference returns the definition Ref as it is', () => {
+    (0, node_test_1.test)('The absolute parentRef reference returns the definition Ref as it is', () => {
         const result = (0, getAbsolutePath_1.getAbsolutePath)('relative/path', '#/components/schemas/ErrorData');
         node_assert_1.default.strictEqual(result, 'relative/path');
     });
-    (0, node_test_1.test)('@unit: The relative path is combined with the directory', () => {
+    (0, node_test_1.test)('The relative path is combined with the directory', () => {
         const result = (0, getAbsolutePath_1.getAbsolutePath)('relative/path', 'models.yaml#/components/schemas/ErrorData');
         node_assert_1.default.strictEqual(result, 'relative/path');
     });
-    (0, node_test_1.test)('@unit: If definitionRef is missing and parentRef starts with #/, an empty string is returned.', () => {
+    (0, node_test_1.test)('If definitionRef is missing and parentRef starts with #/, an empty string is returned.', () => {
         const result = (0, getAbsolutePath_1.getAbsolutePath)(undefined, '#/components/schemas/ErrorData');
         node_assert_1.default.strictEqual(result, '');
     });
-    (0, node_test_1.test)('@unit: If the definition Ref is missing, parentRef is returned.', () => {
+    (0, node_test_1.test)('If the definition Ref is missing, parentRef is returned.', () => {
         const result = (0, getAbsolutePath_1.getAbsolutePath)(undefined, 'models.yaml#/components/schemas/ErrorData');
         node_assert_1.default.strictEqual(result, 'models.yaml#/components/schemas/ErrorData');
     });

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getClassName_1 = require("../getClassName");
-(0, node_test_1.describe)('getModelNames', () => {
-    (0, node_test_1.test)('@unit: should retur classname', () => {
+(0, node_test_1.describe)('@unit: getModelNames', () => {
+    (0, node_test_1.test)('should retur classname', () => {
         const path = 'path1/path2/file';
         node_assert_1.default.strictEqual((0, getClassName_1.getClassName)(path), 'Path1Path2File');
     });

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

@@ -7,8 +7,8 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const os_1 = require("os");
 const getComment_1 = require("../getComment");
-(0, node_test_1.describe)('getComment', () => {
-    (0, node_test_1.test)('@unit: should parse comments', () => {
+(0, node_test_1.describe)('@unit: getComment', () => {
+    (0, node_test_1.test)('should parse comments', () => {
         const multiline = 'Testing multiline comments.' + os_1.EOL + ' * This must go to the next line.' + os_1.EOL + ' * ' + os_1.EOL + ' * This will contain a break.';
         node_assert_1.default.strictEqual((0, getComment_1.getComment)(''), null);
         node_assert_1.default.strictEqual((0, getComment_1.getComment)('Hello'), 'Hello');

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getEnumFromDescription_1 = require("../getEnumFromDescription");
-(0, node_test_1.describe)('getEnumFromDescription', () => {
-    (0, node_test_1.test)('@unit: should return generic for template type', () => {
+(0, node_test_1.describe)('@unit: getEnumFromDescription', () => {
+    (0, node_test_1.test)('should return generic for template type', () => {
         const template = (0, getEnumFromDescription_1.getEnumFromDescription)('VALUE_1=1,VALUE_2=2');
         node_assert_1.default.deepStrictEqual(template, [
             { name: 'VALUE_1', value: '1', type: 'number', description: null },

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getFileName_1 = require("../getFileName");
-(0, node_test_1.describe)('getFileName', () => {
-    (0, node_test_1.test)('@unit: should return file name', () => {
+(0, node_test_1.describe)('@unit: getFileName', () => {
+    (0, node_test_1.test)('should return file name', () => {
         const path = 'path1/path2/file.json';
         node_assert_1.default.strict((0, getFileName_1.getFileName)(path), 'file');
     });

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

@@ -10,8 +10,8 @@ const getGatheringRefs_1 = require("../getGatheringRefs");
 const ContextMock = {
     get: () => undefined,
 };
-(0, node_test_1.describe)('gatheringRefs', () => {
-    node_test_1.test.skip('@unit: should handle nested $ref structures', () => {
+(0, node_test_1.describe)('@unit: gatheringRefs', () => {
+    node_test_1.test.skip('should handle nested $ref structures', () => {
         node_test_1.mock.method(ContextMock, 'get', (ref) => {
             const mocks = {
                 'models.yaml#/components/requestBodies/SimpleRequestBody': { $ref: '#/components/schemas/SimpleInteger' },

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getMappedType_1 = require("../getMappedType");
-(0, node_test_1.describe)('getMappedType', () => {
-    (0, node_test_1.test)('@unit: should map types to the basics', () => {
+(0, node_test_1.describe)('@unit: getMappedType', () => {
+    (0, node_test_1.test)('should map types to the basics', () => {
         node_assert_1.default.strictEqual((0, getMappedType_1.getMappedType)('File'), 'File');
         node_assert_1.default.strictEqual((0, getMappedType_1.getMappedType)('file'), 'File');
         node_assert_1.default.strictEqual((0, getMappedType_1.getMappedType)('string'), 'string');

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getModelNames_1 = require("../getModelNames");
-(0, node_test_1.describe)('getModelNames', () => {
-    (0, node_test_1.test)('@unit: should return sorted list', () => {
+(0, node_test_1.describe)('@unit: getModelNames', () => {
+    (0, node_test_1.test)('should return sorted list', () => {
         const john = {
             path: '',
             export: 'interface',

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getOpenApiVersion_1 = require("../getOpenApiVersion");
-(0, node_test_1.describe)('getOpenApiVersion', () => {
-    (0, node_test_1.test)('@unit: should read the correct version', () => {
+(0, node_test_1.describe)('@unit: getOpenApiVersion', () => {
+    (0, node_test_1.test)('should read the correct version', () => {
         node_assert_1.default.strictEqual((0, getOpenApiVersion_1.getOpenApiVersion)({ openapi: '2' }), 2);
         node_assert_1.default.strictEqual((0, getOpenApiVersion_1.getOpenApiVersion)({ openapi: '3' }), 3);
         node_assert_1.default.strictEqual((0, getOpenApiVersion_1.getOpenApiVersion)({ openapi: '2.0' }), 2);

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getOperationName_1 = require("../getOperationName");
-(0, node_test_1.describe)('getOperationName', () => {
-    (0, node_test_1.test)('@unit: should produce correct result', () => {
+(0, node_test_1.describe)('@unit: getOperationName', () => {
+    (0, node_test_1.test)('should produce correct result', () => {
         node_assert_1.default.strictEqual((0, getOperationName_1.getOperationName)(''), '');
         node_assert_1.default.strictEqual((0, getOperationName_1.getOperationName)('FooBar'), 'fooBar');
         node_assert_1.default.strictEqual((0, getOperationName_1.getOperationName)('Foo Bar'), 'fooBar');

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getOperationParameterName_1 = require("../getOperationParameterName");
-(0, node_test_1.describe)('getOperationParameterName', () => {
-    (0, node_test_1.test)('@unit: should produce correct result', () => {
+(0, node_test_1.describe)('@unit: getOperationParameterName', () => {
+    (0, node_test_1.test)('should produce correct result', () => {
         node_assert_1.default.strictEqual((0, getOperationParameterName_1.getOperationParameterName)(''), '');
         node_assert_1.default.strictEqual((0, getOperationParameterName_1.getOperationParameterName)('foobar'), 'foobar');
         node_assert_1.default.strictEqual((0, getOperationParameterName_1.getOperationParameterName)('fooBar'), 'fooBar');