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

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

package/dist/core/utils/normalizeString.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeString = normalizeString;
+const Consts_1 = require("../types/Consts");
+function normalizeString(value) {
+    if (!value) {
+        return value;
+    }
+    return value
+        .replace(Consts_1.REGEX_BACKSLASH, '/')
+        .replace(Consts_1.REGEX_MULTIPLE_SLASHES, '/')
+        .replace(Consts_1.REGEX_DOT_SLASH, '/')
+        .replace(Consts_1.REGEX_LEADING_DOT_SLASH, './');
+}

package/dist/core/utils/normalizedAbsolutePath.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizedAbsolutePath = normalizedAbsolutePath;
-const pathHelpers_1 = require("../utils/pathHelpers");
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
  * Converts the path to an absolute one and normalizes it.
  * @* @param path Value is the value of the path to convert.
  */
 function normalizedAbsolutePath(pathValue) {
-    const absolute = (0, pathHelpers_1.resolve)(pathValue);
-    return (0, pathHelpers_1.normalize)(absolute);
+    const absolute = (0, pathHelpers_1.resolveHelper)(pathValue);
+    return (0, pathHelpers_1.normalizeHelper)(absolute);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"parseRef.d.ts","sourceRoot":"","sources":["../../../src/core/utils/parseRef.ts"],"names":[],"mappings":"AAEA,oBAAY,OAAO;IACf,cAAc,mBAAmB;IACjC,aAAa,kBAAkB;IAC/B,sBAAsB,2BAA2B;IACjD,QAAQ,aAAa;IACrB,aAAa,kBAAkB;CAClC;AAED,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAiD/C"}
+{"version":3,"file":"parseRef.d.ts","sourceRoot":"","sources":["../../../src/core/utils/parseRef.ts"],"names":[],"mappings":"AAEA,oBAAY,OAAO;IACf,cAAc,mBAAmB;IACjC,aAAa,kBAAkB;IAC/B,sBAAsB,2BAA2B;IACjD,QAAQ,aAAa;IACrB,aAAa,kBAAkB;CAClC;AAED,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAgD/C"}

package/dist/core/utils/parseRef.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefType = void 0;
 exports.parseRef = parseRef;
-const path_1 = __importDefault(require("path"));
+const path_1 = require("path");
 var RefType;
 (function (RefType) {
     RefType["LOCAL_FRAGMENT"] = "local_fragment";
@@ -25,17 +22,17 @@ function parseRef(ref) {
     if (ref.startsWith('http://') || ref.startsWith('https://')) {
         return {
             type: RefType.HTTP_URL,
-            originalRef: ref
+            originalRef: ref,
         };
     }
     // Absolute paths (POSIX/Windows handled by path.isAbsolute)
-    if (path_1.default.isAbsolute(ref)) {
+    if ((0, path_1.isAbsolute)(ref)) {
         const [filePath, fragment] = ref.split('#');
         return {
             type: RefType.ABSOLUTE_PATH,
             filePath,
             fragment: fragment ? `#${fragment}` : undefined,
-            originalRef: ref
+            originalRef: ref,
         };
     }
     // Local fragment
@@ -43,7 +40,7 @@ function parseRef(ref) {
         return {
             type: RefType.LOCAL_FRAGMENT,
             fragment: ref,
-            originalRef: ref
+            originalRef: ref,
         };
     }
     // External file references (may include fragment)
@@ -53,12 +50,12 @@ function parseRef(ref) {
             type: RefType.EXTERNAL_FILE_FRAGMENT,
             filePath,
             fragment: `#${fragment}`,
-            originalRef: ref
+            originalRef: ref,
         };
     }
     return {
         type: RefType.EXTERNAL_FILE,
         filePath,
-        originalRef: ref
+        originalRef: ref,
     };
 }

package/dist/core/utils/precompileTemplates.js

@@ -5,11 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
-const path_1 = __importDefault(require("path"));
+const path_1 = require("path");
 const Enums_1 = require("../../common/Enums");
 const Logger_1 = require("../../common/Logger");
-const templatesDir = path_1.default.resolve(__dirname, '../../templates');
-const compiledDir = path_1.default.resolve(__dirname, '../../templatesCompiled');
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const Consts_1 = require("../../core/types/Consts");
+const templatesDir = (0, pathHelpers_1.resolveHelper)(__dirname, '../../templates');
+const compiledDir = (0, pathHelpers_1.resolveHelper)(__dirname, '../../templatesCompiled');
 const header = `// This is an automatically generated file for the hbs template.
 // You don't need to change it, run npm run build:hbs to update it.
 /* istanbul ignore file */
@@ -36,15 +38,14 @@ const precompileTemplates = () => {
                 if (file.name === '__mocks__') {
                     return;
                 }
-                const filePath = path_1.default.join(dir, file.name);
+                const filePath = (0, pathHelpers_1.joinHelper)(dir, file.name);
                 if (file.isDirectory()) {
                     walk(filePath);
                 }
-                else if (file.isFile() && path_1.default.extname(file.name) === '.hbs') {
-                    const templateName = path_1.default
-                        .relative(templatesDir, filePath)
+                else if (file.isFile() && (0, path_1.extname)(file.name) === '.hbs') {
+                    const templateName = (0, pathHelpers_1.relativeHelper)(templatesDir, filePath)
                         .replace(/\.hbs$/, '')
-                        .replace(/\\/g, '/');
+                        .replace(Consts_1.REGEX_BACKSLASH, '/');
                     const templateContent = fs_1.default.readFileSync(filePath, 'utf8');
                     const precompiled = handlebars_1.default.precompile(templateContent, {
                         strict: true,
@@ -58,11 +59,14 @@ const precompileTemplates = () => {
                             union: true,
                             intersection: true,
                             enumerator: true,
+                            containsSystemName: true,
+                            normalizePath: true,
+                            joinPath: true,
                         },
                     });
                     const tsContent = header + precompiled;
-                    const outputFilePath = path_1.default.join(compiledDir, `${templateName}.ts`);
-                    const outputDir = path_1.default.dirname(outputFilePath);
+                    const outputFilePath = (0, pathHelpers_1.joinHelper)(compiledDir, `${templateName}.ts`);
+                    const outputDir = (0, pathHelpers_1.dirNameHelper)(outputFilePath);
                     if (!fs_1.default.existsSync(outputDir)) {
                         fs_1.default.mkdirSync(outputDir, { recursive: true });
                     }

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAgD5H"}
+{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+E5H"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerHandlebarHelpers = registerHandlebarHelpers;
 const Handlebars = __importStar(require("handlebars/runtime"));
+const Consts_1 = require("../types/Consts");
 const unique_1 = require("./unique");
 function registerHandlebarHelpers(root) {
     Handlebars.registerHelper('equals', function (a, b, options) {
@@ -80,4 +81,27 @@ function registerHandlebarHelpers(root) {
         const hasReservedWords = RESERVED_WORDS.test(value);
         return hasReservedWords ? options.fn(this) : options.inverse(this);
     });
+    Handlebars.registerHelper('normalizePath', function (path) {
+        if (!path || typeof path !== 'string') {
+            return './';
+        }
+        let normalizedPath = path
+            .replace(Consts_1.REGEX_BACKSLASH, '/')
+            .replace(Consts_1.REGEX_MULTIPLE_SLASHES, '/')
+            .replace(Consts_1.REGEX_DOT_SLASH, '/')
+            .replace(Consts_1.REGEX_LEADING_DOT_SLASH, './')
+            .replace(Consts_1.REGEX_TRAILING_SLASH, '');
+        if (!normalizedPath.startsWith('./')) {
+            normalizedPath = `./${normalizedPath}`;
+        }
+        if (normalizedPath === '.') {
+            return './';
+        }
+        return normalizedPath;
+    });
+    Handlebars.registerHelper('joinPath', function (firstPath, secondPath) {
+        const cleanedFirstPath = firstPath.endsWith('./') ? firstPath.slice(0, -2) : firstPath;
+        const cleanedSecondPath = secondPath.startsWith('./') ? secondPath.slice(2) : secondPath;
+        return `${cleanedFirstPath}/${cleanedSecondPath}`.replace(Consts_1.REGEX_BACKSLASH, '/').replace(Consts_1.REGEX_MULTIPLE_SLASHES, '/');
+    });
 }

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

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

package/dist/core/utils/replaceString.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceString = replaceString;
+const Consts_1 = require("../types/Consts");
 function replaceString(value) {
     if (!value) {
         return value;
     }
-    const searchRegExp = /\\/g;
+    const searchRegExp = Consts_1.REGEX_BACKSLASH;
     return value.replace(searchRegExp, '/');
 }

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

@@ -1 +1 @@
-{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAGhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA4BnF"}
+{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA4BnF"}

package/dist/core/utils/resolveRefPath.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRefPath = resolveRefPath;
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const advancedDeduplicatePath_1 = require("./advancedDeduplicatePath");
 const parseRef_1 = require("./parseRef");
-const pathHelpers_1 = require("./pathHelpers");
 /**
  * Resolve a parsed reference to an absolute path (when applicable).
  * parentFilePath is expected to be a file path (absolute or relative).
  */
 function resolveRefPath(parsedRef, parentFilePath) {
     // For correct operation, parentDir must be the path to the directory, not the file.
-    const parentDir = (0, pathHelpers_1.dirName)(parentFilePath.split('#')[0]);
+    const parentDir = (0, pathHelpers_1.dirNameHelper)(parentFilePath.split('#')[0]);
     switch (parsedRef.type) {
         case parseRef_1.RefType.LOCAL_FRAGMENT:
             // For local fragments, use the parent file path
@@ -19,7 +19,7 @@ function resolveRefPath(parsedRef, parentFilePath) {
         case parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT:
             // Resolve relative to parent file directory
             if (parsedRef.filePath) {
-                const resolvedPath = (0, pathHelpers_1.resolve)(parentDir, parsedRef.filePath);
+                const resolvedPath = (0, pathHelpers_1.resolveHelper)(parentDir, parsedRef.filePath);
                 // Clean any duplicate path segments
                 return (0, advancedDeduplicatePath_1.advancedDeduplicatePath)(resolvedPath);
             }

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

@@ -1,7 +1,13 @@
-export declare function resolveRefToImportPath({ mainSpecPath, parentFilePath, refValuePath, outputModelsPath, }: {
+interface IParams {
     mainSpecPath: string;
     parentFilePath: string;
     refValuePath: string;
     outputModelsPath: string;
-}): string;
+}
+/**
+ * Resolves $ref reference to import path for generated code.
+ * Handles HTTP URLs, local fragments, external file fragments, external files, and absolute paths.
+ */
+export declare function resolveRefToImportPath({ mainSpecPath, parentFilePath, refValuePath, outputModelsPath }: IParams): string;
+export {};
 //# sourceMappingURL=resolveRefToImportPath.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"resolveRefToImportPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefToImportPath.ts"],"names":[],"mappings":"AASA,wBAAgB,sBAAsB,CAAC,EACnC,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,gBAAgB,GACnB,EAAE;IACC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,UA+CA"}
+{"version":3,"file":"resolveRefToImportPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefToImportPath.ts"],"names":[],"mappings":"AAQA,UAAU,OAAO;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAyFD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,EAAE,OAAO,UAiE/G"}