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

package/dist/common/utils/__tests__/convertArrayToObject.test.js

@@ -7,67 +7,71 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const convertArrayToObject_1 = require("../convertArrayToObject");
 (0, node_test_1.describe)('@unit: convertArrayToObject', () => {
-    (0, node_test_1.test)('Empty array', () => {
-        const input = [];
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        const expected = {
+    (0, node_test_1.test)('returns default shape for null', () => {
+        const result = (0, convertArrayToObject_1.convertArrayToObject)(null);
+        node_assert_1.default.deepStrictEqual(result, {
             items: [],
             excludeCoreServiceFiles: undefined,
             request: undefined,
+            customExecutorPath: undefined,
             useOptions: undefined,
             useCancelableRequest: undefined,
-        };
-        node_assert_1.default.deepStrictEqual(result, expected);
+        });
+    });
+    (0, node_test_1.test)('returns default shape for empty array', () => {
+        const result = (0, convertArrayToObject_1.convertArrayToObject)([]);
+        node_assert_1.default.deepStrictEqual(result, {
+            items: [],
+            excludeCoreServiceFiles: undefined,
+            request: undefined,
+            customExecutorPath: undefined,
+            useOptions: undefined,
+            useCancelableRequest: undefined,
+        });
+    });
+    (0, node_test_1.test)('passes through object config unchanged', () => {
+        const input = { input: './spec.json', output: './generated', httpClient: 'axios' };
+        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
+        node_assert_1.default.strictEqual(result, input);
     });
-    (0, node_test_1.test)('An array with one element', () => {
+    (0, node_test_1.test)('converts legacy array and keeps per-item request/customExecutorPath', () => {
         const input = [
             {
                 input: 'url1',
                 output: 'res1',
-                exportCore: true,
                 request: 'req1',
+                customExecutorPath: 'exec-1',
+                httpClient: 'axios',
+                useOptions: true,
+            },
+            {
+                input: 'url2',
+                output: 'res2',
+                request: 'req2',
+                customExecutorPath: 'exec-2',
+                httpClient: 'axios',
                 useOptions: true,
             },
         ];
-        const expected = {
-            enumPrefix: undefined,
+        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, {
+            httpClient: 'axios',
+            useOptions: true,
+            useUnionTypes: undefined,
             excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
+            includeSchemasFiles: undefined,
             interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
             logLevel: undefined,
             logTarget: undefined,
-            request: 'req1',
             sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: true,
             useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
-    });
-    (0, node_test_1.test)('Multiple elements with the same outer margins', () => {
-        const input = [
-            { input: 'url1', output: 'res1', exportCore: true, request: 'req1', useOptions: true },
-            { input: 'url2', output: 'res2', exportCore: true, request: 'req1', useOptions: true },
-        ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
+            validationLibrary: undefined,
+            emptySchemaStrategy: undefined,
+            request: undefined,
+            customExecutorPath: undefined,
             items: [
                 {
                     input: 'url1',
@@ -76,6 +80,8 @@ const convertArrayToObject_1 = require("../convertArrayToObject");
                     outputServices: undefined,
                     outputModels: undefined,
                     outputSchemas: undefined,
+                    request: 'req1',
+                    customExecutorPath: 'exec-1',
                 },
                 {
                     input: 'url2',
@@ -84,146 +90,35 @@ const convertArrayToObject_1 = require("../convertArrayToObject");
                     outputServices: undefined,
                     outputModels: undefined,
                     outputSchemas: undefined,
+                    request: 'req2',
+                    customExecutorPath: 'exec-2',
                 },
             ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: 'req1',
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: true,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        });
     });
-    (0, node_test_1.test)('Multiple elements with different external margins', () => {
+    (0, node_test_1.test)('promotes request/customExecutorPath to root when they are equal for all items', () => {
         const input = [
-            { input: 'url1', output: 'res1', exportCore: true, request: 'req1', useOptions: true },
-            { input: 'url2', output: 'res2', exportCore: false, request: 'req2', useOptions: false },
+            { input: 'url1', output: 'res1', request: 'req', customExecutorPath: 'exec' },
+            { input: 'url2', output: 'res2', request: 'req', customExecutorPath: 'exec' },
         ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-                {
-                    input: 'url2',
-                    output: 'res2',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: 'req1',
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: true,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
         const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        node_assert_1.default.strictEqual(result.request, 'req');
+        node_assert_1.default.strictEqual(result.customExecutorPath, 'exec');
     });
-    (0, node_test_1.test)('No optional fields', () => {
+    (0, node_test_1.test)('supports legacy "client" alias by normalizing it to httpClient', () => {
         const input = [
-            { input: 'url1', output: 'res1' },
-            { input: 'url2', output: 'res2' },
+            { input: 'url1', output: 'res1', client: 'axios', useOptions: true },
+            { input: 'url2', output: 'res2', client: 'axios', useOptions: true },
         ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-                {
-                    input: 'url2',
-                    output: 'res2',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: undefined,
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: undefined,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
         const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        node_assert_1.default.strictEqual(result.httpClient, 'axios');
+        node_assert_1.default.strictEqual(result.useOptions, true);
     });
-    (0, node_test_1.test)('Mixed presence of optional fields', () => {
+    (0, node_test_1.test)('throws on conflicting root-driven fields', () => {
         const input = [
-            { input: 'url1', output: 'res1', exportCore: true },
-            { input: 'url2', output: 'res2', request: 'req2' },
+            { input: 'url1', output: 'res1', useOptions: true },
+            { input: 'url2', output: 'res2', useOptions: false },
         ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-                {
-                    input: 'url2',
-                    output: 'res2',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: undefined,
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: undefined,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        node_assert_1.default.throws(() => (0, convertArrayToObject_1.convertArrayToObject)(input), /conflicting "useOptions" values/);
     });
 });

package/dist/common/utils/convertArrayToObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertArrayToObject.d.ts","sourceRoot":"","sources":["../../../src/common/utils/convertArrayToObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2DxH"}
+{"version":3,"file":"convertArrayToObject.d.ts","sourceRoot":"","sources":["../../../src/common/utils/convertArrayToObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA6GxH"}

package/dist/common/utils/convertArrayToObject.js

@@ -6,6 +6,7 @@ function convertArrayToObject(optionsArr) {
         items: [],
         excludeCoreServiceFiles: undefined,
         request: undefined,
+        customExecutorPath: undefined,
         useOptions: undefined,
         useCancelableRequest: undefined,
     };
@@ -16,21 +17,12 @@ function convertArrayToObject(optionsArr) {
         if (optionsArr.length === 0) {
             return emptyResult;
         }
-        const items = optionsArr.map(item => ({
-            input: item.input,
-            output: item.output,
-            outputCore: item.outputCore,
-            outputServices: item.outputServices,
-            outputModels: item.outputModels,
-            outputSchemas: item.outputSchemas,
-        }));
-        const firstItem = optionsArr[0];
-        const fieldsToExtract = [
+        const rootDrivenFields = [
             'httpClient',
             'useOptions',
             'useUnionTypes',
             'excludeCoreServiceFiles',
-            'request',
+            'includeSchemasFiles',
             'interfacePrefix',
             'enumPrefix',
             'typePrefix',
@@ -40,13 +32,58 @@ function convertArrayToObject(optionsArr) {
             'sortByRequired',
             'useSeparatedIndexes',
             'validationLibrary',
+            'emptySchemaStrategy',
         ];
-        const extractedFields = fieldsToExtract.reduce((acc, field) => ({
+        const getNormalizedFieldValue = (item, field) => {
+            if (field === 'httpClient') {
+                return item.httpClient ?? item.client;
+            }
+            return item[field];
+        };
+        const getRootValueOrThrow = (field) => {
+            const definedValues = optionsArr
+                .map(item => getNormalizedFieldValue(item, field))
+                .filter(value => value !== undefined);
+            if (definedValues.length === 0) {
+                return undefined;
+            }
+            const firstValue = definedValues[0];
+            const hasConflict = definedValues.some(value => value !== firstValue);
+            if (hasConflict) {
+                throw new Error(`Legacy array config has conflicting "${field}" values. ` +
+                    `This option must have the same value for all array items.`);
+            }
+            return firstValue;
+        };
+        const getCommonOptionalRootValue = (field) => {
+            const definedValues = optionsArr
+                .map(item => item[field])
+                .filter(value => value !== undefined);
+            if (definedValues.length === 0) {
+                return undefined;
+            }
+            const firstValue = definedValues[0];
+            const hasConflict = definedValues.some(value => value !== firstValue);
+            return hasConflict ? undefined : firstValue;
+        };
+        const items = optionsArr.map(item => ({
+            input: item.input,
+            output: item.output,
+            outputCore: item.outputCore,
+            outputServices: item.outputServices,
+            outputModels: item.outputModels,
+            outputSchemas: item.outputSchemas,
+            request: item.request,
+            customExecutorPath: item.customExecutorPath,
+        }));
+        const extractedRootFields = rootDrivenFields.reduce((acc, field) => ({
             ...acc,
-            [field]: firstItem[field],
+            [field]: getRootValueOrThrow(field),
         }), {});
         return {
-            ...extractedFields,
+            ...extractedRootFields,
+            request: getCommonOptionalRootValue('request'),
+            customExecutorPath: getCommonOptionalRootValue('customExecutorPath'),
             items,
         };
     }

package/dist/core/Context.d.ts

@@ -33,28 +33,29 @@ export declare class Context {
     prefix: PrefixArtifacts;
     private _sortByRequired;
     private specRoot;
+    private entryFile?;
     private virtualFiles;
     constructor({ input, output, prefix, sortByRequired }: TContextProps);
     addRefs(refs: RefsLike): Context;
     values(...types: string[]): Record<string, any>;
-    get($ref: string): JSONSchema4Type | JSONSchema6Type | JSONSchema7Type;
+    get($ref: string, parentSourceFile?: string): JSONSchema4Type | JSONSchema6Type | JSONSchema7Type;
     paths(...types: string[]): string[];
-    exists($ref: string): boolean;
+    exists($ref: string, parentSourceFile?: string): boolean;
     fileName(): string;
     get output(): OutputPaths;
     get sortByRequired(): boolean;
     get root(): $Root | undefined;
     private canonicalizeRef;
     private mapSourceToOutput;
-    private registerRef;
-    private walkSchema;
+    private walkSchemaForFragments;
     initializeVirtualFileMap(rootSchema: unknown, entryFile: string): void;
     getVirtualFiles(): VirtualFileMap;
     getAllCanonicalRefs(): string[];
-    resolveCanonicalRef(canonicalRef: string): {
+    resolveCanonicalRef(canonicalRef: string, parentSourceFile?: string): {
         outputFile: string;
         fragment?: string;
     } | undefined;
+    private normalizeRefForLookup;
 }
 export {};
 //# sourceMappingURL=Context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAIhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAKhD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;IAC7E,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACvC,CAAC;AAEF,UAAU,WAAW;IACjB,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAC;IAEnB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAc;IACtB,MAAM,EAAE,eAAe,CAI5B;IAEF,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,YAAY,CAA6B;gBAErC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKhC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAOtE,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO7B,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,gBAKhB;IAED,IAAW,cAAc,YAExB;IAED,IAAW,IAAI,IAAI,KAAK,GAAG,SAAS,CAEnC;IAED,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,UAAU;IAiBX,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAiB/D,eAAe,IAAI,cAAc;IAIjC,mBAAmB,IAAI,MAAM,EAAE;IAgB/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,GACzC;QACI,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACD,SAAS;CAYlB"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAIhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAMhD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;IAC7E,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACvC,CAAC;AAEF,UAAU,WAAW;IACjB,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAC;IAEnB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAc;IACtB,MAAM,EAAE,eAAe,CAI5B;IAEF,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,YAAY,CAA6B;gBAErC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKhC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAQjG,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO;IAQxD,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,gBAKhB;IAED,IAAW,cAAc,YAExB;IAED,IAAW,IAAI,IAAI,KAAK,GAAG,SAAS,CAEnC;IAED,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,sBAAsB;IA+BvB,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAuC/D,eAAe,IAAI,cAAc;IAIjC,mBAAmB,IAAI,MAAM,EAAE;IAgB/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GACpE;QACI,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACD,SAAS;IAef,OAAO,CAAC,qBAAqB;CAyBhC"}

package/dist/core/Context.js

@@ -5,6 +5,7 @@ const path_1 = require("path");
 const pathHelpers_1 = require("../common/utils/pathHelpers");
 const getFileName_1 = require("./utils/getFileName");
 const isString_1 = require("./utils/isString");
+const normalizeRef_1 = require("./utils/normalizeRef");
 const parseRef_1 = require("./utils/parseRef");
 /**
  * A Context wich can share a data between methods
@@ -20,6 +21,7 @@ class Context {
     };
     _sortByRequired = false;
     specRoot;
+    entryFile;
     virtualFiles = new Map();
     constructor({ input, output, prefix, sortByRequired }) {
         this._output = output;
@@ -48,11 +50,12 @@ class Context {
         }
         return this._refs.values(...types);
     }
-    get($ref) {
+    get($ref, parentSourceFile) {
         if (!this._refs) {
             throw new Error('Context must be initialized');
         }
-        return this._refs.get($ref);
+        const normalizedRef = this.normalizeRefForLookup($ref, parentSourceFile);
+        return this._refs.get(normalizedRef);
     }
     paths(...types) {
         if (!this._refs) {
@@ -60,11 +63,12 @@ class Context {
         }
         return this._refs.paths(...types);
     }
-    exists($ref) {
+    exists($ref, parentSourceFile) {
         if (!this._refs) {
             throw new Error('Context must be initialized');
         }
-        return this._refs.exists($ref);
+        const normalizedRef = this.normalizeRefForLookup($ref, parentSourceFile);
+        return this._refs.exists(normalizedRef);
     }
     fileName() {
         if (!this._root) {
@@ -107,38 +111,36 @@ class Context {
         const baseName = (0, path_1.basename)(relative).replace(/\.(yaml|yml|json)$/i, '.ts');
         return (0, pathHelpers_1.resolveHelper)(this.output.outputModels, dir, baseName);
     }
-    registerRef(ref, parentSourceFile) {
-        const { sourceFile, fragment } = this.canonicalizeRef(ref, parentSourceFile);
-        let entry = this.virtualFiles.get(sourceFile);
-        if (!entry) {
-            entry = {
-                sourceFile,
-                outputFile: this.mapSourceToOutput(sourceFile),
-                fragments: new Set(),
-            };
-            this.virtualFiles.set(sourceFile, entry);
-        }
-        if (fragment) {
-            entry.fragments.add(fragment);
-        }
-    }
-    walkSchema(obj, parentSourceFile) {
+    walkSchemaForFragments(obj, parentSourceFile) {
         if (!obj || typeof obj !== 'object')
             return;
         if (typeof obj.$ref === 'string') {
-            this.registerRef(obj.$ref, parentSourceFile);
+            const { sourceFile, fragment } = this.canonicalizeRef(obj.$ref, parentSourceFile);
+            let entry = this.virtualFiles.get(sourceFile);
+            if (!entry) {
+                entry = {
+                    sourceFile,
+                    outputFile: this.mapSourceToOutput(sourceFile),
+                    fragments: new Set(),
+                };
+                this.virtualFiles.set(sourceFile, entry);
+            }
+            if (fragment) {
+                entry.fragments.add(fragment);
+            }
         }
         if (Array.isArray(obj)) {
-            obj.forEach(item => this.walkSchema(item, parentSourceFile));
+            obj.forEach(item => this.walkSchemaForFragments(item, parentSourceFile));
             return;
         }
         for (const value of Object.values(obj)) {
-            this.walkSchema(value, parentSourceFile);
+            this.walkSchemaForFragments(value, parentSourceFile);
         }
     }
     initializeVirtualFileMap(rootSchema, entryFile) {
         this.specRoot = (0, pathHelpers_1.normalizeHelper)((0, pathHelpers_1.dirNameHelper)(entryFile));
         const normalizedEntry = (0, pathHelpers_1.normalizeHelper)(entryFile);
+        this.entryFile = normalizedEntry;
         // Гарантируем, что entry файл тоже есть в карте
         if (!this.virtualFiles.has(normalizedEntry)) {
             this.virtualFiles.set(normalizedEntry, {
@@ -147,7 +149,26 @@ class Context {
                 fragments: new Set(),
             });
         }
-        this.walkSchema(rootSchema, normalizedEntry);
+        // 🔴 Вместо ручного обхода, использовать resolved.paths() от SwaggerParser
+        // это даст нам все файлы, которые парсер разрешил
+        const allPaths = this._refs?.paths() || [];
+        for (const refPath of allPaths) {
+            const normalizedPath = (0, pathHelpers_1.normalizeHelper)(refPath);
+            if (!this.virtualFiles.has(normalizedPath)) {
+                this.virtualFiles.set(normalizedPath, {
+                    sourceFile: normalizedPath,
+                    outputFile: this.mapSourceToOutput(normalizedPath),
+                    fragments: new Set(),
+                });
+            }
+        }
+        // Обходим каждый файл чтобы найти $ref с фрагментами (#)
+        for (const [sourceFile] of this.virtualFiles) {
+            const schema = this._refs?.get(sourceFile);
+            if (schema && typeof schema === 'object') {
+                this.walkSchemaForFragments(schema, sourceFile);
+            }
+        }
     }
     getVirtualFiles() {
         return this.virtualFiles;
@@ -166,8 +187,9 @@ class Context {
         }
         return result;
     }
-    resolveCanonicalRef(canonicalRef) {
-        const parsed = (0, parseRef_1.parseRef)(canonicalRef);
+    resolveCanonicalRef(canonicalRef, parentSourceFile) {
+        const normalizedRef = this.normalizeRefForLookup(canonicalRef, parentSourceFile);
+        const parsed = (0, parseRef_1.parseRef)(normalizedRef);
         const sourceFile = (0, pathHelpers_1.normalizeHelper)(parsed.filePath ?? '');
         const file = this.virtualFiles.get(sourceFile);
         if (!file)
@@ -177,5 +199,26 @@ class Context {
             fragment: parsed.fragment,
         };
     }
+    normalizeRefForLookup(ref, parentSourceFile) {
+        if (!ref)
+            return ref;
+        // Prefer explicit parent if provided
+        if (parentSourceFile) {
+            const normalizedParent = (0, path_1.isAbsolute)(parentSourceFile)
+                ? parentSourceFile
+                : (0, pathHelpers_1.resolveHelper)(this.specRoot, parentSourceFile);
+            return (0, normalizeRef_1.normalizeRef)(ref, normalizedParent);
+        }
+        // If we can fall back to entry file, normalize relative refs against it
+        if (this.entryFile) {
+            const parsed = (0, parseRef_1.parseRef)(ref);
+            if (parsed.type === parseRef_1.RefType.LOCAL_FRAGMENT ||
+                parsed.type === parseRef_1.RefType.EXTERNAL_FILE ||
+                parsed.type === parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT) {
+                return (0, normalizeRef_1.normalizeRef)(ref, this.entryFile);
+            }
+        }
+        return ref;
+    }
 }
 exports.Context = Context;

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

@@ -1 +1 @@
-{"version":3,"file":"OpenApiClient.d.ts","sourceRoot":"","sources":["../../src/core/OpenApiClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,WAAW,EAAsB,MAAM,uBAAuB,CAAC;AAetF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAgDxB,OAAO,CAAC,gBAAgB;YAyBV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAkFtB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}
+{"version":3,"file":"OpenApiClient.d.ts","sourceRoot":"","sources":["../../src/core/OpenApiClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,WAAW,EAAsB,MAAM,uBAAuB,CAAC;AAgBtF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAuDxB,OAAO,CAAC,gBAAgB;YA4BV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAwFtB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}