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

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

@@ -5,70 +5,72 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
+const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
-const fileSystem_1 = require("../fileSystem");
-(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 = async (path, content) => {
-        writeFileCalls.push([path, content]);
-    };
-    const models = [
-        {
-            export: 'interface',
-            name: 'MyModel',
-            alias: '',
-            path: 'MyModel',
-            type: 'MyModel',
-            base: 'MyModel',
-            template: null,
-            link: null,
-            description: null,
-            isDefinition: true,
-            isReadOnly: false,
-            isRequired: false,
-            isNullable: false,
-            imports: [],
-            enum: [],
-            enums: [],
-            properties: [],
-        },
-    ];
-    const templates = {
-        indexes: {
-            full: () => 'fullIndex',
-            simple: () => 'simpleIndex',
-            core: () => 'coreIndex',
-            models: () => 'modelsIndex',
-            schemas: () => 'schemasIndex',
-            services: () => 'servicesIndex',
-        },
-        exports: {
-            model: () => 'model',
-            schema: () => 'schema',
-            service: () => 'service',
-        },
-        core: {
-            settings: () => 'settings',
-            apiError: () => 'apiError',
-            apiRequestOptions: () => 'apiRequestOptions',
-            apiResult: () => 'apiResult',
-            request: () => 'request',
-            cancelablePromise: () => 'cancelablePromise',
-            httpStatusCode: () => 'httpStatusCode',
-        },
-    };
-    const writeClient = new WriteClient_1.WriteClient();
-    await writeClient.writeClientSchemas({
-        models,
-        templates,
-        outputSchemasPath: '/',
-        httpClient: HttpClient_enum_1.HttpClient.FETCH,
-        useUnionTypes: false,
+(0, node_test_1.describe)('@unit: writeClientSchemas', () => {
+    (0, node_test_1.test)('writes to filesystem', async () => {
+        const writeFileCalls = [];
+        // Re-assigning the function manually with a mock
+        const originalWriteFile = fileSystemHelpers_1.fileSystemHelpers.writeFile;
+        fileSystemHelpers_1.fileSystemHelpers.writeFile = async (path, content) => {
+            writeFileCalls.push([path, content]);
+        };
+        const models = [
+            {
+                export: 'interface',
+                name: 'MyModel',
+                alias: '',
+                path: 'MyModel',
+                type: 'MyModel',
+                base: 'MyModel',
+                template: null,
+                link: null,
+                description: null,
+                isDefinition: true,
+                isReadOnly: false,
+                isRequired: false,
+                isNullable: false,
+                imports: [],
+                enum: [],
+                enums: [],
+                properties: [],
+            },
+        ];
+        const templates = {
+            indexes: {
+                full: () => 'fullIndex',
+                simple: () => 'simpleIndex',
+                core: () => 'coreIndex',
+                models: () => 'modelsIndex',
+                schemas: () => 'schemasIndex',
+                services: () => 'servicesIndex',
+            },
+            exports: {
+                model: () => 'model',
+                schema: () => 'schema',
+                service: () => 'service',
+            },
+            core: {
+                settings: () => 'settings',
+                apiError: () => 'apiError',
+                apiRequestOptions: () => 'apiRequestOptions',
+                apiResult: () => 'apiResult',
+                request: () => 'request',
+                cancelablePromise: () => 'cancelablePromise',
+                httpStatusCode: () => 'httpStatusCode',
+            },
+        };
+        const writeClient = new WriteClient_1.WriteClient();
+        await writeClient.writeClientSchemas({
+            models,
+            templates,
+            outputSchemasPath: '/',
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            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
+        fileSystemHelpers_1.fileSystemHelpers.writeFile = originalWriteFile;
     });
-    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

@@ -5,65 +5,67 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
+const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
-const fileSystem_1 = require("../fileSystem");
-(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 = async (path, content) => {
-        writeFileCalls.push([path, content]);
-    };
-    const services = [
-        {
-            name: 'MyService',
-            originName: 'MyService',
-            operations: [],
-            imports: [],
-        },
-    ];
-    const templates = {
-        indexes: {
-            full: () => 'fullIndex',
-            simple: () => 'simpleIndex',
-            core: () => 'coreIndex',
-            models: () => 'modelsIndex',
-            schemas: () => 'schemasIndex',
-            services: () => 'servicesIndex',
-        },
-        exports: {
-            model: () => 'model',
-            schema: () => 'schema',
-            service: () => 'service',
-        },
-        core: {
-            settings: () => 'settings',
-            apiError: () => 'apiError',
-            apiRequestOptions: () => 'apiRequestOptions',
-            apiResult: () => 'apiResult',
-            request: () => 'request',
-            cancelablePromise: () => 'cancelablePromise',
-            httpStatusCode: () => 'httpStatusCode',
-        },
-    };
-    const writeClient = new WriteClient_1.WriteClient();
-    await writeClient.writeClientServices({
-        services,
-        templates,
-        outputPaths: {
-            outputCore: '/',
-            outputModels: '/',
-            outputServices: '/',
-        },
-        httpClient: HttpClient_enum_1.HttpClient.FETCH,
-        useUnionTypes: false,
-        useOptions: false,
-        useCancelableRequest: false,
+(0, node_test_1.describe)('@unit: writeClientServices', () => {
+    (0, node_test_1.test)('writes to filesystem', async () => {
+        const writeFileCalls = [];
+        // Re-assigning the function manually with a mock
+        const originalWriteFile = fileSystemHelpers_1.fileSystemHelpers.writeFile;
+        fileSystemHelpers_1.fileSystemHelpers.writeFile = async (path, content) => {
+            writeFileCalls.push([path, content]);
+        };
+        const services = [
+            {
+                name: 'MyService',
+                originName: 'MyService',
+                operations: [],
+                imports: [],
+            },
+        ];
+        const templates = {
+            indexes: {
+                full: () => 'fullIndex',
+                simple: () => 'simpleIndex',
+                core: () => 'coreIndex',
+                models: () => 'modelsIndex',
+                schemas: () => 'schemasIndex',
+                services: () => 'servicesIndex',
+            },
+            exports: {
+                model: () => 'model',
+                schema: () => 'schema',
+                service: () => 'service',
+            },
+            core: {
+                settings: () => 'settings',
+                apiError: () => 'apiError',
+                apiRequestOptions: () => 'apiRequestOptions',
+                apiResult: () => 'apiResult',
+                request: () => 'request',
+                cancelablePromise: () => 'cancelablePromise',
+                httpStatusCode: () => 'httpStatusCode',
+            },
+        };
+        const writeClient = new WriteClient_1.WriteClient();
+        await writeClient.writeClientServices({
+            services,
+            templates,
+            outputPaths: {
+                outputCore: '/',
+                outputModels: '/',
+                outputServices: '/',
+            },
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            useUnionTypes: false,
+            useOptions: false,
+            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
+        fileSystemHelpers_1.fileSystemHelpers.writeFile = originalWriteFile;
     });
-    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/appendUniqueLinesToFile.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appendUniqueLinesToFile = appendUniqueLinesToFile;
-const fileSystem_1 = require("./fileSystem");
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 async function appendUniqueLinesToFile(filePath, data) {
     try {
         let existingContent = '';
-        const fileExists = await fileSystem_1.fileSystem.exists(filePath);
+        const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(filePath);
         if (fileExists) {
-            existingContent = await fileSystem_1.fileSystem.readFile(filePath, "utf8");
+            existingContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(filePath, "utf8");
         }
         const existingLines = existingContent.split(/\r?\n/).filter(Boolean);
         const dataLines = data.split(/\r?\n/).filter(Boolean);
@@ -16,7 +16,7 @@ async function appendUniqueLinesToFile(filePath, data) {
             return;
         }
         const updatedContent = existingContent + linesToAdd.join('\n') + '\n';
-        await fileSystem_1.fileSystem.writeFile(filePath, updatedContent);
+        await fileSystemHelpers_1.fileSystemHelpers.writeFile(filePath, updatedContent);
     }
     catch (error) {
         throw new Error(`Error when writing to a file: ${error?.message}`);

package/dist/core/utils/createNormalizedRef.js

@@ -9,11 +9,11 @@ const parseRef_1 = require("./parseRef");
 function createNormalizedRef(parsedRef, resolvedPath) {
     switch (parsedRef.type) {
         case parseRef_1.RefType.LOCAL_FRAGMENT:
-            return `${resolvedPath}${parsedRef.fragment ?? ''}`;
+            return `${resolvedPath}${parsedRef.fragment}`;
         case parseRef_1.RefType.EXTERNAL_FILE:
             return resolvedPath;
         case parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT:
-            return `${resolvedPath}${parsedRef.fragment ?? ''}`;
+            return `${resolvedPath}${parsedRef.fragment}`;
         case parseRef_1.RefType.ABSOLUTE_PATH:
             return parsedRef.fragment ? `${resolvedPath}${parsedRef.fragment}` : resolvedPath;
         case parseRef_1.RefType.HTTP_URL:

package/dist/core/utils/getAbsolutePath.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAbsolutePath = getAbsolutePath;
-const pathHelpers_1 = require("../utils/pathHelpers");
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 function getAbsolutePath(definitionRef, parentRef) {
     // If the definition Ref is missing
     if (!definitionRef) {
@@ -23,9 +23,9 @@ function getAbsolutePath(definitionRef, parentRef) {
     // If definitionRef already has its own fragment and/or relative path
     if (definitionRef.includes('#')) {
         const [defPath, defFrag] = definitionRef.split('#');
-        const absPath = defPath ? (0, pathHelpers_1.join)((0, pathHelpers_1.dirName)(parentBase), defPath) : parentBase;
+        const absPath = defPath ? (0, pathHelpers_1.joinHelper)((0, pathHelpers_1.dirNameHelper)(parentBase), defPath) : parentBase;
         return defFrag ? `${absPath}#${defFrag}` : absPath;
     }
     // Plain relative path → resolve against parent base directory
-    return (0, pathHelpers_1.join)((0, pathHelpers_1.dirName)(parentBase), definitionRef);
+    return (0, pathHelpers_1.joinHelper)((0, pathHelpers_1.dirNameHelper)(parentBase), definitionRef);
 }

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

@@ -0,0 +1,3 @@
+import { PrefixArtifacts } from 'core/types/base/PrefixArtifacts.model';
+export declare function getModelNameWithPrefix(originalName: string, definition: any, prefixes: PrefixArtifacts): string;
+//# sourceMappingURL=getModelNameWithPrefix.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getModelNameWithPrefix.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getModelNameWithPrefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,UAUtG"}

package/dist/core/utils/getModelNameWithPrefix.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getModelNameWithPrefix = getModelNameWithPrefix;
+function getModelNameWithPrefix(originalName, definition, prefixes) {
+    if (definition.enum && definition !== 'boolean') {
+        return `${prefixes.enum}${originalName}`;
+    }
+    else if (definition.oneOf || definition.anyOf || definition.allOf || ['string', 'number', 'integer', 'boolean', 'array'].includes(definition.type)) {
+        return `${prefixes.type}${originalName}`;
+    }
+    else if (definition.type === 'object') {
+        return `${prefixes.interface}${originalName}`;
+    }
+    return originalName;
+}

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":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAMpE;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B5F"}
+{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAIpE;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B5F"}

package/dist/core/utils/getOpenApiSpec.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOpenApiSpec = getOpenApiSpec;
 const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
-const pathHelpers_1 = require("../utils/pathHelpers");
-const fileSystem_1 = require("./fileSystem");
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const normalizeAllRefs_1 = require("./normalizeAllRefs");
 /**
  * Load and parse te open api spec. If the file extension is ".yml" or ".yaml"
@@ -15,11 +15,11 @@ const normalizeAllRefs_1 = require("./normalizeAllRefs");
  * @param input
  */
 async function getOpenApiSpec(context, input) {
-    const absoluteInput = (0, pathHelpers_1.resolve)(process.cwd(), input);
+    const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
     if (!input) {
         throw new Error(`Could not find OpenApi spec: "${absoluteInput}"`);
     }
-    const fileExists = await fileSystem_1.fileSystem.exists(absoluteInput);
+    const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(absoluteInput);
     if (!fileExists) {
         throw new Error(`Could not read OpenApi spec: "${absoluteInput}"`);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"getOutputPaths.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOutputPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAI9D,eAAO,MAAM,cAAc,GAAI,sEAM5B;IACC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,KAAG,WA+BH,CAAC"}
+{"version":3,"file":"getOutputPaths.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOutputPaths.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,eAAO,MAAM,cAAc,GAAI,sEAM5B;IACC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,KAAG,WA+BH,CAAC"}

package/dist/core/utils/getOutputPaths.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputPaths = void 0;
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const isSubdirectory_1 = require("../utils/isSubdirectory");
-const pathHelpers_1 = require("./pathHelpers");
 const getOutputPaths = ({ output, outputCore, outputModels, outputSchemas, outputServices, }) => {
     const rootPath = process.cwd();
     if (!(0, isSubdirectory_1.isSubDirectory)(rootPath, output)) {
@@ -20,11 +20,11 @@ const getOutputPaths = ({ output, outputCore, outputModels, outputSchemas, outpu
     if (outputServices && !(0, isSubdirectory_1.isSubDirectory)(rootPath, outputServices)) {
         throw new Error(`Output folder(services) is not a subdirectory of the current working directory`);
     }
-    const outputPath = (0, pathHelpers_1.resolve)(rootPath, output);
-    const outputPathCore = outputCore ? (0, pathHelpers_1.resolve)(rootPath, outputCore) : (0, pathHelpers_1.resolve)(outputPath, 'core');
-    const outputPathModels = outputModels ? (0, pathHelpers_1.resolve)(rootPath, outputModels) : (0, pathHelpers_1.resolve)(outputPath, 'models');
-    const outputPathSchemas = outputSchemas ? (0, pathHelpers_1.resolve)(rootPath, outputSchemas) : (0, pathHelpers_1.resolve)(outputPath, 'schemas');
-    const outputPathServices = outputServices ? (0, pathHelpers_1.resolve)(rootPath, outputServices) : (0, pathHelpers_1.resolve)(outputPath, 'services');
+    const outputPath = (0, pathHelpers_1.resolveHelper)(rootPath, output);
+    const outputPathCore = outputCore ? (0, pathHelpers_1.resolveHelper)(rootPath, outputCore) : (0, pathHelpers_1.resolveHelper)(outputPath, 'core');
+    const outputPathModels = outputModels ? (0, pathHelpers_1.resolveHelper)(rootPath, outputModels) : (0, pathHelpers_1.resolveHelper)(outputPath, 'models');
+    const outputPathSchemas = outputSchemas ? (0, pathHelpers_1.resolveHelper)(rootPath, outputSchemas) : (0, pathHelpers_1.resolveHelper)(outputPath, 'schemas');
+    const outputPathServices = outputServices ? (0, pathHelpers_1.resolveHelper)(rootPath, outputServices) : (0, pathHelpers_1.resolveHelper)(outputPath, 'services');
     return {
         output: outputPath,
         outputCore: outputPathCore,

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

@@ -1 +1 @@
-{"version":3,"file":"getPattern.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getPattern.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D"}
+{"version":3,"file":"getPattern.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getPattern.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D"}

package/dist/core/utils/getPattern.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPattern = getPattern;
+const Consts_1 = require("../types/Consts");
 /**
  * The spec generates a pattern like this '^\d{3}-\d{2}-\d{4}$'
  * However, to use it in HTML or inside new RegExp() we need to
@@ -9,5 +10,5 @@ exports.getPattern = getPattern;
  * @param pattern
  */
 function getPattern(pattern) {
-    return pattern?.replace(/\\/g, '\\\\');
+    return pattern?.replace(Consts_1.REGEX_BACKSLASH, '\\\\');
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getRelativeModelPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getRelativeModelPath.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,iBAAiB,EAAE,MAAM,UA6B7F"}
+{"version":3,"file":"getRelativeModelPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getRelativeModelPath.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,iBAAiB,EAAE,MAAM,UA2B7F"}

package/dist/core/utils/getRelativeModelPath.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelativeModelPath = getRelativeModelPath;
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const getTypeName_1 = require("./getTypeName");
 const isInsideDirectory_1 = require("./isInsideDirectory");
-const pathHelpers_1 = require("./pathHelpers");
-const replaceString_1 = require("./replaceString");
-const stripNamespace_1 = require("./stripNamespace");
 /**
  * The function calculates the relative path to the model.
  * Removes the transition to the directory with a level above.
@@ -31,11 +29,9 @@ function getRelativeModelPath(folderPath, relativeModelPath) {
         }
         modelPath = pathArray.join(pathSep);
     }
-    const resolvedPath = (0, pathHelpers_1.resolve)(folderPath, modelPath);
+    const resolvedPath = (0, pathHelpers_1.resolveHelper)(folderPath, modelPath);
     if ((0, isInsideDirectory_1.isInsideDirectory)(resolvedPath, folderPath)) {
         mappedPaths = modelPath;
     }
-    const normalizedValue = (0, replaceString_1.replaceString)(mappedPaths);
-    mappedPaths = (0, stripNamespace_1.stripNamespace)(normalizedValue || '');
     return mappedPaths;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"isSubdirectory.d.ts","sourceRoot":"","sources":["../../../src/core/utils/isSubdirectory.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAK3D"}
+{"version":3,"file":"isSubdirectory.d.ts","sourceRoot":"","sources":["../../../src/core/utils/isSubdirectory.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAK3D"}

package/dist/core/utils/isSubdirectory.js

@@ -5,14 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSubDirectory = isSubDirectory;
 const path_1 = __importDefault(require("path"));
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
  * Checks whether `child` is a subdirectory of `parent`
  * @param parent Parent directory (absolute path)
  * @param child Child directory (absolute or relative path)
  */
 function isSubDirectory(parent, child) {
-    const parentNormalized = path_1.default.resolve(parent);
-    const childNormalized = path_1.default.resolve(parentNormalized, child);
-    const relative = path_1.default.relative(parentNormalized, childNormalized);
+    const parentNormalized = (0, pathHelpers_1.resolveHelper)(parent);
+    const childNormalized = (0, pathHelpers_1.resolveHelper)(parentNormalized, child);
+    const relative = (0, pathHelpers_1.relativeHelper)(parentNormalized, childNormalized);
     return relative !== '' && !relative.startsWith('..') && !path_1.default.isAbsolute(relative);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"mapPathToTargetDirSafe.d.ts","sourceRoot":"","sources":["../../../src/core/utils/mapPathToTargetDirSafe.ts"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CA0CrG"}
+{"version":3,"file":"mapPathToTargetDirSafe.d.ts","sourceRoot":"","sources":["../../../src/core/utils/mapPathToTargetDirSafe.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CA0CrG"}

package/dist/core/utils/mapPathToTargetDirSafe.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapPathToTargetDirSafe = mapPathToTargetDirSafe;
-const path_1 = require("path");
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const findCommonParent_1 = require("./findCommonParent");
 const getRelativeModelPath_1 = require("./getRelativeModelPath");
-const pathHelpers_1 = require("./pathHelpers");
 /**
  * Safely muppit the path from SourceDir → targetDir
  * Works even if the file is outside SourceDir, but in a common parent
@@ -15,34 +14,34 @@ const pathHelpers_1 = require("./pathHelpers");
  */
 function mapPathToTargetDirSafe(filePath, sourceDir, targetDir) {
     const pathSep = '/';
-    const absFile = (0, pathHelpers_1.resolve)(filePath);
-    const absSource = (0, pathHelpers_1.resolve)(sourceDir);
-    const absTarget = (0, pathHelpers_1.resolve)(targetDir);
+    const absFile = (0, pathHelpers_1.resolveHelper)(filePath);
+    const absSource = (0, pathHelpers_1.resolveHelper)(sourceDir);
+    const absTarget = (0, pathHelpers_1.resolveHelper)(targetDir);
     const sourceWithSep = absSource.endsWith(pathSep) ? absSource : absSource + pathSep;
     // 1. The file inside SourceDir → mapim as usual
     if (absFile.startsWith(sourceWithSep)) {
-        const rel = (0, path_1.relative)(absSource, absFile);
-        return (0, pathHelpers_1.resolve)(absTarget, rel);
+        const rel = (0, pathHelpers_1.relativeHelper)(absSource, absFile);
+        return (0, pathHelpers_1.resolveHelper)(absTarget, rel);
     }
     // 2. The file is outside SourceDir, but in a common parent
     const commonParent = (0, findCommonParent_1.findCommonParent)(absSource, absFile);
     if (commonParent) {
         // Path from commonParent → file
-        const fileRelToCommon = (0, path_1.relative)(commonParent, absFile);
+        const fileRelToCommon = (0, pathHelpers_1.relativeHelper)(commonParent, absFile);
         // Path from targetDir → commonParent
-        const targetToCommon = (0, path_1.relative)(absTarget, commonParent);
+        const targetToCommon = (0, pathHelpers_1.relativeHelper)(absTarget, commonParent);
         if (targetToCommon.includes('..')) {
             // targetDir is higher than commonParent → we can't map
             if (filePath) {
-                const relativePath = (0, path_1.relative)(absSource, absFile);
+                const relativePath = (0, pathHelpers_1.relativeHelper)(absSource, absFile);
                 return (0, getRelativeModelPath_1.getRelativeModelPath)(targetDir, relativePath);
             }
             return filePath;
         }
         // Collecting: targetDir → commonParent → file
-        const pathFromTargetToCommon = (0, path_1.relative)(absTarget, commonParent);
+        const pathFromTargetToCommon = (0, pathHelpers_1.relativeHelper)(absTarget, commonParent);
         const pathFromCommonToFile = fileRelToCommon;
-        return (0, pathHelpers_1.resolve)(absTarget, pathFromTargetToCommon, pathFromCommonToFile);
+        return (0, pathHelpers_1.resolveHelper)(absTarget, pathFromTargetToCommon, pathFromCommonToFile);
     }
     // 3. There is no common parent → return as is
     return filePath;

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

@@ -1 +1 @@
-{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CAyBrF"}
+{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA+BrF"}

package/dist/core/utils/modelHelpers.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setDuplicateModelAliases = setDuplicateModelAliases;
 exports.resolveModelImports = resolveModelImports;
-const path_1 = require("path");
+const path_1 = __importDefault(require("path"));
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
  * Assigns alias to models with the same name.
  * Modifies objects of in-place models and returns an array.
@@ -57,11 +61,19 @@ function resolveModelImports(models, outputModelsDir) {
             const importAlias = importModel?.alias ?? imprt.alias;
             let importPath = imprt.path;
             if (importModel) {
-                const fromDir = (0, path_1.dirname)((0, path_1.resolve)(outputModelsDir, model.path));
-                const toDir = (0, path_1.dirname)((0, path_1.resolve)(outputModelsDir, importModel.path));
-                const file = (0, path_1.basename)(importModel.name);
-                const relativePath = (0, path_1.relative)(fromDir, toDir);
-                importPath = relativePath === '' ? `./${file}` : `${relativePath.replace(/\\/g, '/')}/${file}`;
+                const fromDir = (0, pathHelpers_1.dirNameHelper)((0, pathHelpers_1.resolveHelper)(outputModelsDir, model.path));
+                const toDir = (0, pathHelpers_1.dirNameHelper)((0, pathHelpers_1.resolveHelper)(outputModelsDir, importModel.path));
+                const file = path_1.default.basename(importModel.path);
+                const relativePath = (0, pathHelpers_1.relativeHelper)(fromDir, toDir);
+                if (relativePath === '') {
+                    importPath = `./${file}`;
+                }
+                else if (relativePath.startsWith('./')) {
+                    importPath = `${relativePath}${file}`;
+                }
+                else {
+                    importPath = `${relativePath}/${file}`;
+                }
             }
             return Object.assign(imprt, {
                 alias: importAlias,

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

@@ -0,0 +1,2 @@
+export declare function normalizeString(value?: string): string | null | undefined;
+//# sourceMappingURL=normalizeString.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeString.d.ts","sourceRoot":"","sources":["../../../src/core/utils/normalizeString.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAUzE"}