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

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

@@ -5,16 +5,16 @@ 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 Enums_1 = require("../../types/Enums");
+const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const WriteClient_1 = require("../../WriteClient");
 const fileSystem_1 = require("../fileSystem");
-const writeClientSchemas_1 = require("../writeClientSchemas");
 (0, node_test_1.test)('@unit: writeClientSchemas writes to filesystem', async () => {
     const writeFileCalls = [];
     // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
-    fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
+    fileSystem_1.fileSystem.writeFile = async (path, content) => {
         writeFileCalls.push([path, content]);
-    });
+    };
     const models = [
         {
             export: 'interface',
@@ -37,7 +37,14 @@ const writeClientSchemas_1 = require("../writeClientSchemas");
         },
     ];
     const templates = {
-        index: () => 'index',
+        indexes: {
+            full: () => 'fullIndex',
+            simple: () => 'simpleIndex',
+            core: () => 'coreIndex',
+            models: () => 'modelsIndex',
+            schemas: () => 'schemasIndex',
+            services: () => 'servicesIndex',
+        },
         exports: {
             model: () => 'model',
             schema: () => 'schema',
@@ -53,11 +60,12 @@ const writeClientSchemas_1 = require("../writeClientSchemas");
             httpStatusCode: () => 'httpStatusCode',
         },
     };
-    await (0, writeClientSchemas_1.writeClientSchemas)({
+    const writeClient = new WriteClient_1.WriteClient();
+    await writeClient.writeClientSchemas({
         models,
         templates,
         outputSchemasPath: '/',
-        httpClient: Enums_1.HttpClient.FETCH,
+        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');

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

@@ -5,16 +5,16 @@ 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 Enums_1 = require("../../types/Enums");
+const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const WriteClient_1 = require("../../WriteClient");
 const fileSystem_1 = require("../fileSystem");
-const writeClientServices_1 = require("../writeClientServices");
 (0, node_test_1.test)('@unit: writeClientServices  writes to filesystem', async () => {
     const writeFileCalls = [];
     // Re-assigning the function manually with a mock
     const originalWriteFile = fileSystem_1.fileSystem.writeFile;
-    fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
+    fileSystem_1.fileSystem.writeFile = async (path, content) => {
         writeFileCalls.push([path, content]);
-    });
+    };
     const services = [
         {
             name: 'MyService',
@@ -24,7 +24,14 @@ const writeClientServices_1 = require("../writeClientServices");
         },
     ];
     const templates = {
-        index: () => 'index',
+        indexes: {
+            full: () => 'fullIndex',
+            simple: () => 'simpleIndex',
+            core: () => 'coreIndex',
+            models: () => 'modelsIndex',
+            schemas: () => 'schemasIndex',
+            services: () => 'servicesIndex',
+        },
         exports: {
             model: () => 'model',
             schema: () => 'schema',
@@ -40,7 +47,8 @@ const writeClientServices_1 = require("../writeClientServices");
             httpStatusCode: () => 'httpStatusCode',
         },
     };
-    await (0, writeClientServices_1.writeClientServices)({
+    const writeClient = new WriteClient_1.WriteClient();
+    await writeClient.writeClientServices({
         services,
         templates,
         outputPaths: {
@@ -48,7 +56,7 @@ const writeClientServices_1 = require("../writeClientServices");
             outputModels: '/',
             outputServices: '/',
         },
-        httpClient: Enums_1.HttpClient.FETCH,
+        httpClient: HttpClient_enum_1.HttpClient.FETCH,
         useUnionTypes: false,
         useOptions: false,
         useCancelableRequest: false,

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

@@ -0,0 +1,5 @@
+/**
+ * Advanced path deduplication - remove consecutive duplicate segments
+ */
+export declare function advancedDeduplicatePath(path: string): string;
+//# sourceMappingURL=advancedDeduplicatePath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"advancedDeduplicatePath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/advancedDeduplicatePath.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA2B5D"}

package/dist/core/utils/advancedDeduplicatePath.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.advancedDeduplicatePath = advancedDeduplicatePath;
+/**
+ * Advanced path deduplication - remove consecutive duplicate segments
+ */
+function advancedDeduplicatePath(path) {
+    const segments = path.split('/');
+    const result = [];
+    for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i];
+        if (segment === '' || segment === '.') {
+            continue;
+        }
+        if (segment === '..') {
+            if (result.length > 0) {
+                result.pop();
+            }
+            continue;
+        }
+        // Check if this segment is a duplicate of the previous one
+        if (result.length > 0 && result[result.length - 1] === segment) {
+            // Skip duplicate segment
+            continue;
+        }
+        result.push(segment);
+    }
+    return result.length > 0 ? '/' + result.join('/') : '';
+}

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

@@ -0,0 +1,2 @@
+export declare function appendUniqueLinesToFile(filePath: string, data: string): Promise<void>;
+//# sourceMappingURL=appendUniqueLinesToFile.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"appendUniqueLinesToFile.d.ts","sourceRoot":"","sources":["../../../src/core/utils/appendUniqueLinesToFile.ts"],"names":[],"mappings":"AAEA,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAoB3E"}

package/dist/core/utils/appendUniqueLinesToFile.js

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

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

@@ -0,0 +1,7 @@
+import { ParsedRef } from './parseRef';
+/**
+ * Create normalized reference string from parsedRef and resolvedPath.
+ * If resolvedPath is a URL, preserve it.
+ */
+export declare function createNormalizedRef(parsedRef: ParsedRef, resolvedPath: string): string;
+//# sourceMappingURL=createNormalizedRef.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createNormalizedRef.d.ts","sourceRoot":"","sources":["../../../src/core/utils/createNormalizedRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAetF"}

package/dist/core/utils/createNormalizedRef.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNormalizedRef = createNormalizedRef;
+const parseRef_1 = require("./parseRef");
+/**
+ * Create normalized reference string from parsedRef and resolvedPath.
+ * If resolvedPath is a URL, preserve it.
+ */
+function createNormalizedRef(parsedRef, resolvedPath) {
+    switch (parsedRef.type) {
+        case parseRef_1.RefType.LOCAL_FRAGMENT:
+            return `${resolvedPath}${parsedRef.fragment ?? ''}`;
+        case parseRef_1.RefType.EXTERNAL_FILE:
+            return resolvedPath;
+        case parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT:
+            return `${resolvedPath}${parsedRef.fragment ?? ''}`;
+        case parseRef_1.RefType.ABSOLUTE_PATH:
+            return parsedRef.fragment ? `${resolvedPath}${parsedRef.fragment}` : resolvedPath;
+        case parseRef_1.RefType.HTTP_URL:
+            return parsedRef.originalRef;
+        default:
+            return resolvedPath;
+    }
+}

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

@@ -0,0 +1,7 @@
+/**
+ * Finds the common parent directory of two paths
+ * @param path1 The value of the path
+ * @param path2 The value of the path
+ */
+export declare function findCommonParent(path1: string, path2: string): string | null;
+//# sourceMappingURL=findCommonParent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"findCommonParent.d.ts","sourceRoot":"","sources":["../../../src/core/utils/findCommonParent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAa5E"}

package/dist/core/utils/findCommonParent.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findCommonParent = findCommonParent;
+/**
+ * Finds the common parent directory of two paths
+ * @param path1 The value of the path
+ * @param path2 The value of the path
+ */
+function findCommonParent(path1, path2) {
+    const pathSep = '/';
+    const parts1 = path1.split(pathSep).filter(Boolean);
+    const parts2 = path2.split(pathSep).filter(Boolean);
+    let i = 0;
+    while (i < parts1.length && i < parts2.length && parts1[i] === parts2[i]) {
+        i++;
+    }
+    if (i === 0)
+        return null;
+    return pathSep + parts1.slice(0, i).join(pathSep);
+}

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

@@ -1 +1 @@
-{"version":3,"file":"getAbsolutePath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getAbsolutePath.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAkB5F"}
+{"version":3,"file":"getAbsolutePath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getAbsolutePath.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAgC5F"}

package/dist/core/utils/getAbsolutePath.js

@@ -7,14 +7,25 @@ function getAbsolutePath(definitionRef, parentRef) {
     if (!definitionRef) {
         return parentRef.startsWith('#/') ? '' : parentRef;
     }
+    const parentBase = parentRef.split('#')[0] || '';
+    // If definitionRef is an absolute fragment, attach to parent base
     if (definitionRef.startsWith('#/')) {
-        // If definitionRef is an absolute reference (#/), replace the part after # in parentRef.
-        const basePath = parentRef.split('#')[0]; // We take everything up to #
-        return `${basePath}${definitionRef}`;
+        return `${parentBase}${definitionRef}`;
     }
+    // If parentRef is only a fragment, keep definitionRef as is
     if (parentRef.startsWith('#/')) {
-        // If parentRef is an absolute reference, we return definitionRef as it is.
         return definitionRef;
     }
-    return (0, pathHelpers_1.join)((0, pathHelpers_1.dirName)(parentRef), definitionRef);
+    // Full URL or absolute filesystem path → return as is
+    if (/^https?:\/\//i.test(definitionRef) || definitionRef.startsWith('/')) {
+        return definitionRef;
+    }
+    // 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;
+        return defFrag ? `${absPath}#${defFrag}` : absPath;
+    }
+    // Plain relative path → resolve against parent base directory
+    return (0, pathHelpers_1.join)((0, pathHelpers_1.dirName)(parentBase), definitionRef);
 }

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

@@ -1,4 +1,4 @@
 import { Context } from '../Context';
-import { IRefWithtype } from '../types/Models';
-export declare function getGatheringRefs(context: Context, object: Record<string, any>, references?: IRefWithtype[], root?: string, isSchema?: boolean): IRefWithtype[];
+import { RefWithType } from '../types/base/RefWithtype.model';
+export declare function getGatheringRefs(context: Context, object: Record<string, any>, references?: RefWithType[], root?: string, isSchema?: boolean): RefWithType[];
 //# sourceMappingURL=getGatheringRefs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getGatheringRefs.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getGatheringRefs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAY/C,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,GAAE,YAAY,EAAO,EAAE,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,OAAe,GAAG,YAAY,EAAE,CA+C7K"}
+{"version":3,"file":"getGatheringRefs.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getGatheringRefs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAe9D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,GAAE,WAAW,EAAO,EAAE,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,OAAe,GAAG,WAAW,EAAE,CAqD3K"}

package/dist/core/utils/getGatheringRefs.js

@@ -5,8 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGatheringRefs = getGatheringRefs;
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-const Enums_1 = require("../types/Enums");
-const pathHelpers_1 = require("../utils/pathHelpers");
+const TypeRef_enum_1 = require("../types/enums/TypeRef.enum");
+const normalizeRef_1 = require("./normalizeRef");
+const parseRef_1 = require("./parseRef");
+const resolveRefPath_1 = require("./resolveRefPath");
 function includes(references, value) {
     return references.findIndex(item => (0, fast_deep_equal_1.default)(item.value, value)) !== -1;
 }
@@ -20,24 +22,31 @@ function getGatheringRefs(context, object, references = [], root = '', isSchema
         return references;
     }
     if (object.$ref) {
-        const isAbsoluteRef = object.$ref.startsWith('#/');
-        const isHttpRef = object.$ref.startsWith('http://') || object.$ref.startsWith('https://');
-        // Extracting the base path from root
+        // Parse the reference to understand its type
         const baseRoot = extractBasePath(root);
-        let newRef = isHttpRef ? object.$ref : isAbsoluteRef ? (0, pathHelpers_1.join)(baseRoot, object.$ref) : (0, pathHelpers_1.join)((0, pathHelpers_1.dirName)(baseRoot), object.$ref);
-        // Remove the extra '/' before the '#' if there is one.
-        if (newRef.includes('#/')) {
-            newRef = newRef.replace(/\/#/, '#');
-        }
-        if (includes(references, newRef)) {
+        const parsedRef = (0, parseRef_1.parseRef)(object.$ref);
+        // Create normalized reference for context.get
+        const normalizedRef = (0, normalizeRef_1.normalizeRef)(object.$ref, baseRoot);
+        if (includes(references, normalizedRef)) {
             return references;
         }
-        references.push({ value: newRef, type: isSchema ? Enums_1.TypeRef.SCHEMA : Enums_1.TypeRef.OTHERS });
-        const newObject = context.get(newRef);
-        let newRoot = isHttpRef ? '' : isAbsoluteRef ? baseRoot : (0, pathHelpers_1.join)((0, pathHelpers_1.dirName)(baseRoot), object.$ref);
-        // Remove the extra '/' before the '#' if there is one.
-        if (newRoot.includes('#/')) {
-            newRoot = newRoot.replace(/\/#/, '#');
+        references.push({ value: normalizedRef, type: isSchema ? TypeRef_enum_1.TypeRef.SCHEMA : TypeRef_enum_1.TypeRef.OTHERS });
+        const newObject = context.get(normalizedRef);
+        // For recursive processing, determine the correct root path
+        let newRoot;
+        if (parsedRef.type === 'local_fragment') {
+            // For local fragments, keep the same root
+            newRoot = baseRoot;
+        }
+        else if (parsedRef.type === 'external_file' || parsedRef.type === 'external_file_fragment') {
+            // For external files, use the resolved file path
+            const resolvedPath = (0, resolveRefPath_1.resolveRefPath)(parsedRef, baseRoot);
+            newRoot = resolvedPath;
+        }
+        else {
+            // For other types, use the normalized path without fragment
+            const [filePath] = normalizedRef.split('#');
+            newRoot = filePath;
         }
         return getGatheringRefs(context, newObject, references, newRoot, isSchema);
     }

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

@@ -1,4 +1,3 @@
-export declare const TYPE_MAPPINGS: Map<string, string>;
 /**
  * Get mapped type for given type to any basic Typescript/Javascript type.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"getMappedType.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getMappedType.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,qBAsBxB,CAAC;AAEH;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD"}
+{"version":3,"file":"getMappedType.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getMappedType.ts"],"names":[],"mappings":"AAwBA;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD"}

package/dist/core/utils/getMappedType.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TYPE_MAPPINGS = void 0;
 exports.getMappedType = getMappedType;
 exports.hasMappedType = hasMappedType;
-exports.TYPE_MAPPINGS = new Map([
+const TYPE_MAPPINGS = new Map([
     ['File', 'File'],
     ['file', 'File'],
     ['any', 'any'],
@@ -30,8 +29,8 @@ exports.TYPE_MAPPINGS = new Map([
  * Get mapped type for given type to any basic Typescript/Javascript type.
  */
 function getMappedType(type) {
-    return exports.TYPE_MAPPINGS.get(type);
+    return TYPE_MAPPINGS.get(type);
 }
 function hasMappedType(type) {
-    return exports.TYPE_MAPPINGS.has(type);
+    return TYPE_MAPPINGS.has(type);
 }

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

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

package/dist/core/utils/getOpenApiSpec.js

@@ -4,27 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOpenApiSpec = getOpenApiSpec;
-const json_schema_ref_parser_1 = __importDefault(require("@apidevtools/json-schema-ref-parser"));
-const path_1 = require("path");
+const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const pathHelpers_1 = require("../utils/pathHelpers");
 const fileSystem_1 = require("./fileSystem");
-function replaceRef(object, context, parentRef) {
-    if (object.$ref && !(0, path_1.isAbsolute)(object.$ref) && !object.$ref.match(/^(http:\/\/|https:\/\/|#\/)/g)) {
-        object.$ref = (0, pathHelpers_1.join)(parentRef, object.$ref);
-    }
-    else {
-        for (const key of Object.keys(object)) {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            if (object[key] instanceof Object) {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                replaceRef(object[key], context, parentRef);
-            }
-        }
-    }
-    return object;
-}
+const normalizeAllRefs_1 = require("./normalizeAllRefs");
 /**
  * Load and parse te open api spec. If the file extension is ".yml" or ".yaml"
  * we will try to parse the file as a YAML spec, otherwise we will fallback
@@ -40,23 +23,17 @@ async function getOpenApiSpec(context, input) {
     if (!fileExists) {
         throw new Error(`Could not read OpenApi spec: "${absoluteInput}"`);
     }
-    const resolvedRefs = await json_schema_ref_parser_1.default.resolve(absoluteInput);
+    // const isValidated = await SwaggerParser.validate(absoluteInput)
+    const resolvedRefs = await swagger_parser_1.default.resolve(absoluteInput, { validate: false });
+    // Coerce to the loose interface expected by Context
     context.addRefs(resolvedRefs);
     const raw = resolvedRefs.get(absoluteInput);
     if (!raw || typeof raw !== 'object' || Array.isArray(raw) || !('paths' in raw)) {
         throw new Error(`Schema at "${absoluteInput}" is not a valid OpenAPI object`);
     }
     const mainSchema = raw;
-    const newPaths = {};
-    for (const [pathKey, value] of Object.entries(mainSchema.paths)) {
-        const maybeRef = value;
-        if (maybeRef.$ref) {
-            newPaths[pathKey] = replaceRef(context.get(maybeRef.$ref), context, (0, pathHelpers_1.dirName)(maybeRef.$ref));
-        }
-        else {
-            newPaths[pathKey] = value;
-        }
-    }
-    mainSchema.paths = newPaths;
-    return mainSchema;
+    // Normalize all $ref in the entire schema using the new comprehensive resolver
+    const normalizedSchema = (0, normalizeAllRefs_1.normalizeAllRefs)(mainSchema, context, absoluteInput);
+    // The schema is already fully normalized, so we can return it directly
+    return normalizedSchema;
 }

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

@@ -1,9 +1,9 @@
-import { IOutput } from '../types/Models';
+import { OutputPaths } from '../types/base/OutputPaths.model';
 export declare const getOutputPaths: ({ output, outputCore, outputModels, outputSchemas, outputServices, }: {
     output: string;
     outputCore?: string | undefined;
     outputServices?: string | undefined;
     outputModels?: string | undefined;
     outputSchemas?: string | undefined;
-}) => IOutput;
+}) => OutputPaths;
 //# sourceMappingURL=getOutputPaths.d.ts.map

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,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,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,OA+BH,CAAC"}
+{"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"}

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

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

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

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

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

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

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

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

package/dist/core/utils/getRefFromSchema.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRefFromSchema = getRefFromSchema;
-const Enums_1 = require("../types/Enums");
+const TypeRef_enum_1 = require("../types/enums/TypeRef.enum");
 const getGatheringRefs_1 = require("./getGatheringRefs");
 function getRefFromSchema(context, object) {
     const references = (0, getGatheringRefs_1.getGatheringRefs)(context, object);
-    return references.filter(item => item.type === Enums_1.TypeRef.SCHEMA).map(value => value.value);
+    return references.filter(item => item.type === TypeRef_enum_1.TypeRef.SCHEMA).map(value => value.value);
 }

package/dist/core/utils/getRelativeModelImportPath.js

@@ -30,7 +30,7 @@ function getRelativeModelImportPath(rootPath, sourcePath, targetPath) {
         absSourcePath = path_1.default.resolve(absoluteRoot, sourceRelativePath);
     }
     const absSourceDir = normalizedSourcePath ? path_1.default.dirname(absSourcePath) : absoluteRoot;
-    let absTargetPath = path_1.default.resolve(absSourceDir, targetPath);
+    let absTargetPath = path_1.default.isAbsolute(targetPath) ? targetPath : path_1.default.resolve(absSourceDir, targetPath);
     if (!(0, isInsideDirectory_1.isInsideDirectory)(absTargetPath, rootPath)) {
         const targetRelativePath = (0, getRelativeModelPath_1.getRelativeModelPath)(absoluteRoot, targetPath);
         absTargetPath = path_1.default.resolve(absoluteRoot, targetRelativePath);

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":"AAKA;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,iBAAiB,EAAE,MAAM,UAwB7F"}
+{"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"}

package/dist/core/utils/getRelativeModelPath.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelativeModelPath = getRelativeModelPath;
+const getTypeName_1 = require("./getTypeName");
 const isInsideDirectory_1 = require("./isInsideDirectory");
 const pathHelpers_1 = require("./pathHelpers");
 const replaceString_1 = require("./replaceString");
@@ -19,6 +20,10 @@ function getRelativeModelPath(folderPath, relativeModelPath) {
     const pathSep = '/';
     let mappedPaths = '';
     let modelPath = relativeModelPath;
+    // If absolute path (filesystem or URL-like), collapse to type name only
+    if (modelPath.startsWith('/')) {
+        return (0, getTypeName_1.getTypeName)(modelPath);
+    }
     if (modelPath.startsWith('../')) {
         const pathArray = modelPath.split(pathSep).filter(Boolean);
         while (pathArray[0] === '..') {

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

@@ -0,0 +1,2 @@
+export declare function isDirectory(path: string): boolean;
+//# sourceMappingURL=isDirectory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isDirectory.d.ts","sourceRoot":"","sources":["../../../src/core/utils/isDirectory.ts"],"names":[],"mappings":"AAIA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMjD"}

package/dist/core/utils/isDirectory.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDirectory = isDirectory;
+const fs_1 = require("fs");
+const pathHelpers_1 = require("./pathHelpers");
+function isDirectory(path) {
+    try {
+        return (0, fs_1.statSync)((0, pathHelpers_1.normalize)(path)).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}

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

@@ -0,0 +1,7 @@
+/**
+ * Checks if the string is just a file name (with an extension)
+ * @param str - the line to check
+ * @returns true, if this is the file name
+ */
+export declare function isFileName(str: string): boolean;
+//# sourceMappingURL=isFileName.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isFileName.d.ts","sourceRoot":"","sources":["../../../src/core/utils/isFileName.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAmB/C"}