@goast/core 0.5.0 → 0.5.2

package/esm/src/parse/deref-proxy.js

@@ -57,6 +57,12 @@ class DerefProxyHandler {
         return prop in target || (!isNullish(this._ref) && prop in this._ref);
     }
     ownKeys(target) {
-        return Array.from(new Set([...Object.keys(target), ...(!isNullish(this._ref) ? Object.keys(this._ref) : []), '$ref', '$src']));
+        return Array.from(new Set([
+            ...Object.getOwnPropertyNames(target),
+            ...Object.getOwnPropertySymbols(target),
+            ...(!isNullish(this._ref) ? Object.keys(this._ref) : []),
+            '$ref',
+            '$src',
+        ]));
     }
 }

package/esm/src/parse/parser.d.ts

@@ -13,7 +13,6 @@ export declare class OpenApiParser {
     private loadDocument;
     private getDocumentContent;
     private isUrl;
-    private tryParseJson;
-    private tryParseYaml;
+    private tryParseYamlOrJson;
 }
 //# sourceMappingURL=parser.d.ts.map

package/esm/src/parse/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/src/parse/parser.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAA+B,KAAK,KAAK,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAShG,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAEnC,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAIrC,qBAAqB,CAAC,GAAG,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAMjE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,GAAG,OAAO;YAM/C,WAAW;YAsDX,gBAAgB;YAuBhB,YAAY;YA4CZ,kBAAkB;IAYhC,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,YAAY;CAOrB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/src/parse/parser.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAKzD,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAA+B,KAAK,KAAK,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAShG,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAEnC,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAIrC,qBAAqB,CAAC,GAAG,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAMjE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,GAAG,OAAO;YAM/C,WAAW;YA4DX,gBAAgB;YAuBhB,YAAY;YAgCZ,kBAAkB;IAYhC,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,kBAAkB;CAO3B"}

package/esm/src/parse/parser.js

@@ -2,10 +2,10 @@ import * as dntShim from "../../_dnt.shims.js";
 import path from 'node:path';
 import { cwd } from 'node:process';
 import fs from 'fs-extra';
-import * as YAML from 'yaml';
 import { collectOpenApi } from '../collect/collector.js';
 import { transformOpenApi } from '../transform/transformer.js';
 import { isNullish } from '../utils/common.utils.js';
+import { getLineInfo, parseYamlWithInfo } from '../utils/yaml-info.js';
 import { createDerefProxy } from './deref-proxy.js';
 import { defaultOpenApiParserOptions } from './types.js';
 export class OpenApiParser {
@@ -33,7 +33,7 @@ export class OpenApiParser {
     async parseApi(fileName) {
         const absoluteFilePath = this.isUrl(fileName) ? fileName : path.resolve(cwd(), fileName);
         const doc = await this.loadDocument(absoluteFilePath);
-        return await this.dereference(absoluteFilePath, '/', doc.document);
+        return await this.dereference(absoluteFilePath, [], doc.document);
     }
     transformApis(apis) {
         const collectedData = collectOpenApi(apis);
@@ -41,9 +41,10 @@ export class OpenApiParser {
         return transformedData;
     }
     async dereference(file, path, value) {
+        const openApiPath = `/${path.join('/')}`;
         let existingDocument = this._loadedDocuments.get(file);
         if (existingDocument) {
-            const existingComponent = existingDocument.dereferencedComponents.get(path);
+            const existingComponent = existingDocument.dereferencedComponents.get(openApiPath);
             if (existingComponent) {
                 return existingComponent;
             }
@@ -53,11 +54,12 @@ export class OpenApiParser {
         }
         const result = createDerefProxy(value, {
             file,
-            path,
+            pos: getLineInfo(existingDocument.document, path),
+            path: openApiPath,
             document: existingDocument.dereferencedDocument,
             originalComponent: value,
         });
-        existingDocument.dereferencedComponents.set(path, result);
+        existingDocument.dereferencedComponents.set(openApiPath, result);
         if (value.$ref) {
             // deno-lint-ignore no-explicit-any
             result.$ref = await this.resolveReference(file, value);
@@ -72,7 +74,7 @@ export class OpenApiParser {
                 if (Array.isArray(v)) {
                     result[key] = await Promise.all(v.map(async (v, index) => {
                         if (v && typeof v === 'object') {
-                            return await this.dereference(file, joinPaths(path, key, index), v);
+                            return await this.dereference(file, [...path, key, index], v);
                         }
                         else {
                             return v;
@@ -80,10 +82,10 @@ export class OpenApiParser {
                     }));
                 }
                 else {
-                    result[key] = await this.dereference(file, joinPaths(path, key), v);
+                    result[key] = await this.dereference(file, [...path, key], v);
                 }
             }
-            if (typeof v === 'string' && path.endsWith('/discriminator/mapping')) {
+            if (typeof v === 'string' && openApiPath.endsWith('/discriminator/mapping')) {
                 result[key] = await this.resolveReference(file, { $ref: v });
             }
         }
@@ -101,7 +103,7 @@ export class OpenApiParser {
         const doc = await this.loadDocument(absoluteRefFile);
         const value = refPath ? getDeepProperty(doc.document, refPath.replace(/[/]/g, '.')) : doc.document;
         if (value && typeof value === 'object') {
-            return this.dereference(absoluteRefFile, refPath !== null && refPath !== void 0 ? refPath : '/', value);
+            return this.dereference(absoluteRefFile, refPath.split('/').filter(Boolean), value);
         }
         return undefined;
     }
@@ -111,26 +113,14 @@ export class OpenApiParser {
             return existingDocument;
         }
         const documentContent = await this.getDocumentContent(fileOrUrl);
-        const extname = path.extname(fileOrUrl).toLowerCase();
-        let parsedDocument;
-        if (extname === '.json') {
-            parsedDocument = this.tryParseJson(documentContent);
-        }
-        else if (extname === '.yaml' || extname === '.yml') {
-            parsedDocument = this.tryParseYaml(documentContent);
-        }
-        else {
-            parsedDocument = this.tryParseJson(documentContent);
-            if (parsedDocument !== undefined) {
-                parsedDocument = this.tryParseYaml(documentContent);
-            }
-        }
+        const parsedDocument = this.tryParseYamlOrJson(documentContent);
         if (parsedDocument === undefined) {
             throw new Error(`Unable to parse ${fileOrUrl}`);
         }
         const doc = (parsedDocument !== null && parsedDocument !== void 0 ? parsedDocument : {});
         const deref = createDerefProxy(doc, {
             file: fileOrUrl,
+            pos: { line: 0, col: 0 },
             path: '',
             originalComponent: doc,
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -161,17 +151,9 @@ export class OpenApiParser {
     isUrl(fileOrUrl) {
         return /^https?:\/\//i.test(fileOrUrl);
     }
-    tryParseJson(json) {
-        try {
-            return JSON.parse(json);
-        }
-        catch (_a) {
-            return undefined;
-        }
-    }
-    tryParseYaml(yaml) {
+    tryParseYamlOrJson(yamlOrJson) {
         try {
-            return YAML.parse(yaml);
+            return parseYamlWithInfo(yamlOrJson);
         }
         catch (_a) {
             return undefined;
@@ -193,8 +175,3 @@ function getDeepProperty(value, path) {
     }
     return result;
 }
-function joinPaths(...paths) {
-    return paths
-        .map((p) => String(p).replace(/\/$/, ''))
-        .join('/');
-}

package/esm/src/parse/types.d.ts

@@ -1,7 +1,11 @@
-import type { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 import { type OpenApiTransformerOptions } from '../transform/types.js';
+import type { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 export type DerefSource<T> = {
     file: string;
+    pos: {
+        line: number;
+        col: number;
+    };
     path: string;
     document: Deref<OpenApiDocument>;
     originalComponent: T;

package/esm/src/parse/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/src/parse/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACjH,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEzG,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChD,CAAC;AACF,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,oBAAoB,GAAG,mBAAmB,GAE9E;KACC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,gBAAgB,GAAG,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,GACC;IACA,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AACN,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAE/F,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE7D,eAAO,MAAM,2BAA2B;;CAA0C,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/src/parse/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACzG,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChD,CAAC;AACF,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,oBAAoB,GAAG,mBAAmB,GAE9E;KACC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,gBAAgB,GAAG,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,GACC;IACA,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AACN,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAE/F,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE7D,eAAO,MAAM,2BAA2B;;CAA0C,CAAC"}

package/esm/src/transform/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/src/transform/helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/src/transform/helpers.ts"],"names":[],"mappings":"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"}

package/esm/src/transform/helpers.js

@@ -2,6 +2,7 @@ import { parse as parsePath } from 'node:path';
 import { isOpenApiObjectProperty } from '../internal-utils.js';
 import { isNullish } from '../utils/common.utils.js';
 import { getDeepProperty } from '../utils/object.utils.js';
+import { getLineInfo } from '../utils/yaml-info.js';
 export function determineSchemaKind(ctx, schema) {
     if (schema.oneOf) {
         return 'oneOf';
@@ -50,7 +51,6 @@ export function determineSchemaName(schema, id) {
     if (responseMatch && responseMatch.groups) {
         const { path, method, status } = responseMatch.groups;
         const operation = (_c = (_b = (_a = schema.$src.document.paths) === null || _a === void 0 ? void 0 : _a[path]) === null || _b === void 0 ? void 0 : _b[method]) !== null && _c !== void 0 ? _c : {};
-        console.log('responseMatch', responseMatch.groups, operation);
         return {
             name: `${determineEndpointName({ method, path: `/${path}`, operation })}_${status}_Response`,
             isGenerated: true,
@@ -80,6 +80,7 @@ export function determineSchemaName(schema, id) {
                 : undefined,
             $src: {
                 file: schema.$src.file,
+                pos: getLineInfo(schema.$src.document, parentSchemaMatch[1].split('/').filter(Boolean)),
                 path: parentSchemaMatch[1],
                 document: schema.$src.document,
                 originalComponent: parentSchema,

package/esm/src/utils/yaml-info.d.ts

@@ -0,0 +1,13 @@
+import * as YAML from 'yaml';
+export declare const yamlInfoSymbol: unique symbol;
+export type YamlInfo = {
+    document: YAML.Document.Parsed;
+    lineCounter: YAML.LineCounter;
+};
+export declare function getYamlInfo(obj: unknown): YamlInfo;
+export declare function getLineInfo(obj: unknown, path: unknown[]): {
+    line: number;
+    col: number;
+};
+export declare function parseYamlWithInfo(yamlString: string): unknown;
+//# sourceMappingURL=yaml-info.d.ts.map

package/esm/src/utils/yaml-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"yaml-info.d.ts","sourceRoot":"","sources":["../../../src/src/utils/yaml-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,eAAO,MAAM,cAAc,eAAqB,CAAC;AAMjD,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC/B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC;CAC/B,CAAC;AAEF,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,QAAQ,CAMlD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAiBxF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAO7D"}

package/esm/src/utils/yaml-info.js

@@ -0,0 +1,31 @@
+import * as YAML from 'yaml';
+export const yamlInfoSymbol = Symbol('yamlInfo');
+export function getYamlInfo(obj) {
+    const yamlInfo = obj[yamlInfoSymbol];
+    if (!yamlInfo) {
+        throw new Error('No YAML info found on object');
+    }
+    return yamlInfo;
+}
+export function getLineInfo(obj, path) {
+    var _a;
+    const yamlInfo = getYamlInfo(obj);
+    const node = (_a = yamlInfo.document.getIn(path, true)) !== null && _a !== void 0 ? _a : yamlInfo.document.getIn(path.map((v) => {
+        const num = Number(v);
+        return isNaN(num) ? v : num;
+    }), true);
+    if (!node || typeof node !== 'object' || !('range' in node) || !Array.isArray(node.range) ||
+        typeof node.range[0] !== 'number') {
+        console.warn(`Unable to get line info for path ${path.join('/')}`);
+        return { line: 0, col: 0 };
+    }
+    return yamlInfo.lineCounter.linePos(node.range[0]);
+}
+export function parseYamlWithInfo(yamlString) {
+    const lineCounter = new YAML.LineCounter();
+    const document = YAML.parseDocument(yamlString, { lineCounter });
+    return Object.defineProperty(document.toJS(), yamlInfoSymbol, {
+        value: { document, lineCounter },
+        enumerable: false,
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/core",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "A tool designed to transform OpenAPI specifications into various forms with flexibility and extensibility at its core.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/script/src/parse/deref-proxy.js

@@ -60,6 +60,12 @@ class DerefProxyHandler {
         return prop in target || (!(0, common_utils_js_1.isNullish)(this._ref) && prop in this._ref);
     }
     ownKeys(target) {
-        return Array.from(new Set([...Object.keys(target), ...(!(0, common_utils_js_1.isNullish)(this._ref) ? Object.keys(this._ref) : []), '$ref', '$src']));
+        return Array.from(new Set([
+            ...Object.getOwnPropertyNames(target),
+            ...Object.getOwnPropertySymbols(target),
+            ...(!(0, common_utils_js_1.isNullish)(this._ref) ? Object.keys(this._ref) : []),
+            '$ref',
+            '$src',
+        ]));
     }
 }

package/script/src/parse/parser.d.ts

@@ -13,7 +13,6 @@ export declare class OpenApiParser {
     private loadDocument;
     private getDocumentContent;
     private isUrl;
-    private tryParseJson;
-    private tryParseYaml;
+    private tryParseYamlOrJson;
 }
 //# sourceMappingURL=parser.d.ts.map

package/script/src/parse/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/src/parse/parser.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAA+B,KAAK,KAAK,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAShG,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAEnC,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAIrC,qBAAqB,CAAC,GAAG,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAMjE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,GAAG,OAAO;YAM/C,WAAW;YAsDX,gBAAgB;YAuBhB,YAAY;YA4CZ,kBAAkB;IAYhC,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,YAAY;CAOrB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/src/parse/parser.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAKzD,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAA+B,KAAK,KAAK,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAShG,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAEnC,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAIrC,qBAAqB,CAAC,GAAG,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAMjE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,GAAG,OAAO;YAM/C,WAAW;YA4DX,gBAAgB;YAuBhB,YAAY;YAgCZ,kBAAkB;IAYhC,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,kBAAkB;CAO3B"}

package/script/src/parse/parser.js

@@ -6,10 +6,10 @@ const dntShim = tslib_1.__importStar(require("../../_dnt.shims.js"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const node_process_1 = require("node:process");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const YAML = tslib_1.__importStar(require("yaml"));
 const collector_js_1 = require("../collect/collector.js");
 const transformer_js_1 = require("../transform/transformer.js");
 const common_utils_js_1 = require("../utils/common.utils.js");
+const yaml_info_js_1 = require("../utils/yaml-info.js");
 const deref_proxy_js_1 = require("./deref-proxy.js");
 const types_js_1 = require("./types.js");
 class OpenApiParser {
@@ -37,7 +37,7 @@ class OpenApiParser {
     async parseApi(fileName) {
         const absoluteFilePath = this.isUrl(fileName) ? fileName : node_path_1.default.resolve((0, node_process_1.cwd)(), fileName);
         const doc = await this.loadDocument(absoluteFilePath);
-        return await this.dereference(absoluteFilePath, '/', doc.document);
+        return await this.dereference(absoluteFilePath, [], doc.document);
     }
     transformApis(apis) {
         const collectedData = (0, collector_js_1.collectOpenApi)(apis);
@@ -45,9 +45,10 @@ class OpenApiParser {
         return transformedData;
     }
     async dereference(file, path, value) {
+        const openApiPath = `/${path.join('/')}`;
         let existingDocument = this._loadedDocuments.get(file);
         if (existingDocument) {
-            const existingComponent = existingDocument.dereferencedComponents.get(path);
+            const existingComponent = existingDocument.dereferencedComponents.get(openApiPath);
             if (existingComponent) {
                 return existingComponent;
             }
@@ -57,11 +58,12 @@ class OpenApiParser {
         }
         const result = (0, deref_proxy_js_1.createDerefProxy)(value, {
             file,
-            path,
+            pos: (0, yaml_info_js_1.getLineInfo)(existingDocument.document, path),
+            path: openApiPath,
             document: existingDocument.dereferencedDocument,
             originalComponent: value,
         });
-        existingDocument.dereferencedComponents.set(path, result);
+        existingDocument.dereferencedComponents.set(openApiPath, result);
         if (value.$ref) {
             // deno-lint-ignore no-explicit-any
             result.$ref = await this.resolveReference(file, value);
@@ -76,7 +78,7 @@ class OpenApiParser {
                 if (Array.isArray(v)) {
                     result[key] = await Promise.all(v.map(async (v, index) => {
                         if (v && typeof v === 'object') {
-                            return await this.dereference(file, joinPaths(path, key, index), v);
+                            return await this.dereference(file, [...path, key, index], v);
                         }
                         else {
                             return v;
@@ -84,10 +86,10 @@ class OpenApiParser {
                     }));
                 }
                 else {
-                    result[key] = await this.dereference(file, joinPaths(path, key), v);
+                    result[key] = await this.dereference(file, [...path, key], v);
                 }
             }
-            if (typeof v === 'string' && path.endsWith('/discriminator/mapping')) {
+            if (typeof v === 'string' && openApiPath.endsWith('/discriminator/mapping')) {
                 result[key] = await this.resolveReference(file, { $ref: v });
             }
         }
@@ -105,7 +107,7 @@ class OpenApiParser {
         const doc = await this.loadDocument(absoluteRefFile);
         const value = refPath ? getDeepProperty(doc.document, refPath.replace(/[/]/g, '.')) : doc.document;
         if (value && typeof value === 'object') {
-            return this.dereference(absoluteRefFile, refPath !== null && refPath !== void 0 ? refPath : '/', value);
+            return this.dereference(absoluteRefFile, refPath.split('/').filter(Boolean), value);
         }
         return undefined;
     }
@@ -115,26 +117,14 @@ class OpenApiParser {
             return existingDocument;
         }
         const documentContent = await this.getDocumentContent(fileOrUrl);
-        const extname = node_path_1.default.extname(fileOrUrl).toLowerCase();
-        let parsedDocument;
-        if (extname === '.json') {
-            parsedDocument = this.tryParseJson(documentContent);
-        }
-        else if (extname === '.yaml' || extname === '.yml') {
-            parsedDocument = this.tryParseYaml(documentContent);
-        }
-        else {
-            parsedDocument = this.tryParseJson(documentContent);
-            if (parsedDocument !== undefined) {
-                parsedDocument = this.tryParseYaml(documentContent);
-            }
-        }
+        const parsedDocument = this.tryParseYamlOrJson(documentContent);
         if (parsedDocument === undefined) {
             throw new Error(`Unable to parse ${fileOrUrl}`);
         }
         const doc = (parsedDocument !== null && parsedDocument !== void 0 ? parsedDocument : {});
         const deref = (0, deref_proxy_js_1.createDerefProxy)(doc, {
             file: fileOrUrl,
+            pos: { line: 0, col: 0 },
             path: '',
             originalComponent: doc,
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -165,17 +155,9 @@ class OpenApiParser {
     isUrl(fileOrUrl) {
         return /^https?:\/\//i.test(fileOrUrl);
     }
-    tryParseJson(json) {
-        try {
-            return JSON.parse(json);
-        }
-        catch (_a) {
-            return undefined;
-        }
-    }
-    tryParseYaml(yaml) {
+    tryParseYamlOrJson(yamlOrJson) {
         try {
-            return YAML.parse(yaml);
+            return (0, yaml_info_js_1.parseYamlWithInfo)(yamlOrJson);
         }
         catch (_a) {
             return undefined;
@@ -198,8 +180,3 @@ function getDeepProperty(value, path) {
     }
     return result;
 }
-function joinPaths(...paths) {
-    return paths
-        .map((p) => String(p).replace(/\/$/, ''))
-        .join('/');
-}

package/script/src/parse/types.d.ts

@@ -1,7 +1,11 @@
-import type { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 import { type OpenApiTransformerOptions } from '../transform/types.js';
+import type { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 export type DerefSource<T> = {
     file: string;
+    pos: {
+        line: number;
+        col: number;
+    };
     path: string;
     document: Deref<OpenApiDocument>;
     originalComponent: T;

package/script/src/parse/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/src/parse/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACjH,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEzG,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChD,CAAC;AACF,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,oBAAoB,GAAG,mBAAmB,GAE9E;KACC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,gBAAgB,GAAG,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,GACC;IACA,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AACN,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAE/F,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE7D,eAAO,MAAM,2BAA2B;;CAA0C,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/src/parse/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACzG,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,KAAK,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChD,CAAC;AACF,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,oBAAoB,GAAG,mBAAmB,GAE9E;KACC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,gBAAgB,GAAG,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,GACC;IACA,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AACN,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAE/F,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE7D,eAAO,MAAM,2BAA2B;;CAA0C,CAAC"}

package/script/src/transform/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/src/transform/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAqB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,KAAK,EAAE,SAAS,EAAE,sBAAsB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC1G,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAE5D,wBAAgB,mBAAmB,CACjC,CAAC,SAAS;IACR,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,EACD,GAAG,EAAE,yBAAyB,EAAE,MAAM,EAAE,CAAC,GAAG,aAAa,CA2B1D;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE;IACN,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAC5B,EACD,EAAE,EAAE,MAAM,GACT;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAqExC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE;IACnD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,sBAAsB,CAMzB;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,sBAAsB,EACrC,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GACA,sBAAsB,CAKxB;AAED,KAAK,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;KACpD,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAS7F;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACrC,GAAG,MAAM,CAGT;AAED,wBAAgB,6BAA6B,CAAC,qBAAqB,EACjE,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE;IACN,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAC9C,EACD,eAAe,EAAE,CACf,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,OAAO,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,CAAC,KACxD,SAAS,GACb,OAAO,GAAG,SAAS,GAAG,SAAS,CAIjC;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EACnD,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EACzE,eAAe,EAAE,CAAC,OAAO,EAAE,yBAAyB,EAAE,MAAM,EAAE,WAAW,KAAK,SAAS,GACtF,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAWhC;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAE7C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAKxC;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,UAE3E"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/src/transform/helpers.ts"],"names":[],"mappings":"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"}

package/script/src/transform/helpers.js

@@ -14,6 +14,7 @@ const node_path_1 = require("node:path");
 const internal_utils_js_1 = require("../internal-utils.js");
 const common_utils_js_1 = require("../utils/common.utils.js");
 const object_utils_js_1 = require("../utils/object.utils.js");
+const yaml_info_js_1 = require("../utils/yaml-info.js");
 function determineSchemaKind(ctx, schema) {
     if (schema.oneOf) {
         return 'oneOf';
@@ -62,7 +63,6 @@ function determineSchemaName(schema, id) {
     if (responseMatch && responseMatch.groups) {
         const { path, method, status } = responseMatch.groups;
         const operation = (_c = (_b = (_a = schema.$src.document.paths) === null || _a === void 0 ? void 0 : _a[path]) === null || _b === void 0 ? void 0 : _b[method]) !== null && _c !== void 0 ? _c : {};
-        console.log('responseMatch', responseMatch.groups, operation);
         return {
             name: `${determineEndpointName({ method, path: `/${path}`, operation })}_${status}_Response`,
             isGenerated: true,
@@ -92,6 +92,7 @@ function determineSchemaName(schema, id) {
                 : undefined,
             $src: {
                 file: schema.$src.file,
+                pos: (0, yaml_info_js_1.getLineInfo)(schema.$src.document, parentSchemaMatch[1].split('/').filter(Boolean)),
                 path: parentSchemaMatch[1],
                 document: schema.$src.document,
                 originalComponent: parentSchema,

package/script/src/utils/yaml-info.d.ts

@@ -0,0 +1,13 @@
+import * as YAML from 'yaml';
+export declare const yamlInfoSymbol: unique symbol;
+export type YamlInfo = {
+    document: YAML.Document.Parsed;
+    lineCounter: YAML.LineCounter;
+};
+export declare function getYamlInfo(obj: unknown): YamlInfo;
+export declare function getLineInfo(obj: unknown, path: unknown[]): {
+    line: number;
+    col: number;
+};
+export declare function parseYamlWithInfo(yamlString: string): unknown;
+//# sourceMappingURL=yaml-info.d.ts.map

package/script/src/utils/yaml-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"yaml-info.d.ts","sourceRoot":"","sources":["../../../src/src/utils/yaml-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,eAAO,MAAM,cAAc,eAAqB,CAAC;AAMjD,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC/B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC;CAC/B,CAAC;AAEF,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,QAAQ,CAMlD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAiBxF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAO7D"}

package/script/src/utils/yaml-info.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yamlInfoSymbol = void 0;
+exports.getYamlInfo = getYamlInfo;
+exports.getLineInfo = getLineInfo;
+exports.parseYamlWithInfo = parseYamlWithInfo;
+const tslib_1 = require("tslib");
+const YAML = tslib_1.__importStar(require("yaml"));
+exports.yamlInfoSymbol = Symbol('yamlInfo');
+function getYamlInfo(obj) {
+    const yamlInfo = obj[exports.yamlInfoSymbol];
+    if (!yamlInfo) {
+        throw new Error('No YAML info found on object');
+    }
+    return yamlInfo;
+}
+function getLineInfo(obj, path) {
+    var _a;
+    const yamlInfo = getYamlInfo(obj);
+    const node = (_a = yamlInfo.document.getIn(path, true)) !== null && _a !== void 0 ? _a : yamlInfo.document.getIn(path.map((v) => {
+        const num = Number(v);
+        return isNaN(num) ? v : num;
+    }), true);
+    if (!node || typeof node !== 'object' || !('range' in node) || !Array.isArray(node.range) ||
+        typeof node.range[0] !== 'number') {
+        console.warn(`Unable to get line info for path ${path.join('/')}`);
+        return { line: 0, col: 0 };
+    }
+    return yamlInfo.lineCounter.linePos(node.range[0]);
+}
+function parseYamlWithInfo(yamlString) {
+    const lineCounter = new YAML.LineCounter();
+    const document = YAML.parseDocument(yamlString, { lineCounter });
+    return Object.defineProperty(document.toJS(), exports.yamlInfoSymbol, {
+        value: { document, lineCounter },
+        enumerable: false,
+    });
+}

package/src/src/parse/deref-proxy.ts

@@ -58,7 +58,13 @@ class DerefProxyHandler<T extends OpenApiObject<string>> implements ProxyHandler
 
   public ownKeys(target: T): ArrayLike<string | symbol> {
     return Array.from(
-      new Set([...Object.keys(target), ...(!isNullish(this._ref) ? Object.keys(this._ref) : []), '$ref', '$src']),
+      new Set([
+        ...Object.getOwnPropertyNames(target),
+        ...Object.getOwnPropertySymbols(target),
+        ...(!isNullish(this._ref) ? Object.keys(this._ref) : []),
+        '$ref',
+        '$src',
+      ]),
     );
   }
 }

package/src/src/parse/parser.ts

@@ -4,12 +4,12 @@ import { cwd } from 'node:process';
 
 
 import fs from 'fs-extra';
-import * as YAML from 'yaml';
 
 import { collectOpenApi } from '../collect/collector.js';
 import type { ApiData } from '../transform/api-types.js';
 import { transformOpenApi } from '../transform/transformer.js';
 import { isNullish } from '../utils/common.utils.js';
+import { getLineInfo, parseYamlWithInfo } from '../utils/yaml-info.js';
 import { createDerefProxy } from './deref-proxy.js';
 import type { OpenApiDocument, OpenApiObject, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 import { defaultOpenApiParserOptions, type Deref, type OpenApiParserOptions } from './types.js';
@@ -41,7 +41,7 @@ export class OpenApiParser {
   public async parseApi(fileName: string): Promise<Deref<OpenApiDocument>> {
     const absoluteFilePath = this.isUrl(fileName) ? fileName : path.resolve(cwd(), fileName);
     const doc = await this.loadDocument(absoluteFilePath);
-    return await this.dereference(absoluteFilePath, '/', doc.document);
+    return await this.dereference(absoluteFilePath, [], doc.document);
   }
 
   public transformApis(apis: Deref<OpenApiDocument>[]): ApiData {
@@ -50,10 +50,15 @@ export class OpenApiParser {
     return transformedData;
   }
 
-  private async dereference<T extends OpenApiObject<string>>(file: string, path: string, value: T): Promise<Deref<T>> {
+  private async dereference<T extends OpenApiObject<string>>(
+    file: string,
+    path: unknown[],
+    value: T,
+  ): Promise<Deref<T>> {
+    const openApiPath = `/${path.join('/')}`;
     let existingDocument = this._loadedDocuments.get(file);
     if (existingDocument) {
-      const existingComponent = existingDocument.dereferencedComponents.get(path);
+      const existingComponent = existingDocument.dereferencedComponents.get(openApiPath);
       if (existingComponent) {
         return existingComponent as Deref<T>;
       }
@@ -63,11 +68,12 @@ export class OpenApiParser {
 
     const result = createDerefProxy(value, {
       file,
-      path,
+      pos: getLineInfo(existingDocument.document, path),
+      path: openApiPath,
       document: existingDocument.dereferencedDocument,
       originalComponent: value,
     });
-    existingDocument.dereferencedComponents.set(path, result as Deref<OpenApiObject<string>>);
+    existingDocument.dereferencedComponents.set(openApiPath, result as Deref<OpenApiObject<string>>);
 
     if (value.$ref) {
       // deno-lint-ignore no-explicit-any
@@ -82,7 +88,7 @@ export class OpenApiParser {
           (result as Record<keyof T, unknown>)[key] = await Promise.all(
             v.map(async (v, index) => {
               if (v && typeof v === 'object') {
-                return await this.dereference(file, joinPaths(path, key, index), v);
+                return await this.dereference(file, [...path, key, index], v);
               } else {
                 return v;
               }
@@ -91,12 +97,12 @@ export class OpenApiParser {
         } else {
           (result as Record<keyof T, unknown>)[key] = await this.dereference(
             file,
-            joinPaths(path, key),
+            [...path, key],
             v as Record<string, unknown>,
           );
         }
       }
-      if (typeof v === 'string' && path.endsWith('/discriminator/mapping')) {
+      if (typeof v === 'string' && openApiPath.endsWith('/discriminator/mapping')) {
         (result as Record<keyof T, unknown>)[key] = await this.resolveReference<OpenApiSchema>(file, { $ref: v });
       }
     }
@@ -121,7 +127,7 @@ export class OpenApiParser {
 
     const value = refPath ? getDeepProperty(doc.document, refPath.replace(/[/]/g, '.')) : doc.document;
     if (value && typeof value === 'object') {
-      return this.dereference(absoluteRefFile, refPath ?? '/', value as T);
+      return this.dereference(absoluteRefFile, refPath.split('/').filter(Boolean), value as T);
     }
 
     return undefined;
@@ -134,20 +140,7 @@ export class OpenApiParser {
     }
 
     const documentContent = await this.getDocumentContent(fileOrUrl);
-    const extname = path.extname(fileOrUrl).toLowerCase();
-
-    let parsedDocument: unknown;
-    if (extname === '.json') {
-      parsedDocument = this.tryParseJson(documentContent);
-    } else if (extname === '.yaml' || extname === '.yml') {
-      parsedDocument = this.tryParseYaml(documentContent);
-    } else {
-      parsedDocument = this.tryParseJson(documentContent);
-      if (parsedDocument !== undefined) {
-        parsedDocument = this.tryParseYaml(documentContent);
-      }
-    }
-
+    const parsedDocument = this.tryParseYamlOrJson(documentContent);
     if (parsedDocument === undefined) {
       throw new Error(`Unable to parse ${fileOrUrl}`);
     }
@@ -155,6 +148,7 @@ export class OpenApiParser {
     const doc = (parsedDocument ?? {}) as OpenApiDocument;
     const deref = createDerefProxy(doc, {
       file: fileOrUrl,
+      pos: { line: 0, col: 0 },
       path: '',
       originalComponent: doc,
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -187,17 +181,9 @@ export class OpenApiParser {
     return /^https?:\/\//i.test(fileOrUrl);
   }
 
-  private tryParseJson(json: string): unknown {
-    try {
-      return JSON.parse(json);
-    } catch {
-      return undefined;
-    }
-  }
-
-  private tryParseYaml(yaml: string): unknown {
+  private tryParseYamlOrJson(yamlOrJson: string): unknown {
     try {
-      return YAML.parse(yaml);
+      return parseYamlWithInfo(yamlOrJson);
     } catch {
       return undefined;
     }
@@ -218,9 +204,3 @@ function getDeepProperty(value: Record<string, unknown>, path: string): unknown
 
   return result;
 }
-
-function joinPaths(...paths: unknown[]): string {
-  return paths
-    .map((p) => String(p).replace(/\/$/, ''))
-    .join('/');
-}

package/src/src/parse/types.ts

@@ -1,8 +1,9 @@
-import type { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 import { defaultOpenApiTransformerOptions, type OpenApiTransformerOptions } from '../transform/types.js';
+import type { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types.js';
 
 export type DerefSource<T> = {
   file: string;
+  pos: { line: number; col: number };
   path: string;
   document: Deref<OpenApiDocument>;
   originalComponent: T;

package/src/src/transform/helpers.ts

@@ -4,6 +4,7 @@ import type { OpenApiHttpMethod, OpenApiObject } from '../parse/openapi-types.js
 import type { Deref, DerefSource } from '../parse/types.js';
 import { isNullish } from '../utils/common.utils.js';
 import { getDeepProperty } from '../utils/object.utils.js';
+import { getLineInfo } from '../utils/yaml-info.js';
 import type { ApiSchema, ApiSchemaAccessibility, ApiSchemaKind, ApiSchemaProperty } from './api-types.js';
 import type { OpenApiTransformerContext } from './types.js';
 
@@ -73,7 +74,6 @@ export function determineSchemaName(
   if (responseMatch && responseMatch.groups) {
     const { path, method, status } = responseMatch.groups;
     const operation = schema.$src.document.paths?.[path]?.[method as OpenApiHttpMethod] ?? {};
-    console.log('responseMatch', responseMatch.groups, operation);
     return {
       name: `${determineEndpointName({ method, path: `/${path}`, operation })}_${status}_Response`,
       isGenerated: true,
@@ -107,6 +107,7 @@ export function determineSchemaName(
           : undefined,
         $src: {
           file: schema.$src.file,
+          pos: getLineInfo(schema.$src.document, parentSchemaMatch[1].split('/').filter(Boolean)),
           path: parentSchemaMatch[1],
           document: schema.$src.document,
           originalComponent: parentSchema,

package/src/src/utils/yaml-info.ts

@@ -0,0 +1,48 @@
+import * as YAML from 'yaml';
+
+export const yamlInfoSymbol = Symbol('yamlInfo');
+
+type WithYamlInfo = {
+  [yamlInfoSymbol]?: YamlInfo;
+};
+
+export type YamlInfo = {
+  document: YAML.Document.Parsed;
+  lineCounter: YAML.LineCounter;
+};
+
+export function getYamlInfo(obj: unknown): YamlInfo {
+  const yamlInfo = (obj as WithYamlInfo)[yamlInfoSymbol] as YamlInfo | undefined;
+  if (!yamlInfo) {
+    throw new Error('No YAML info found on object');
+  }
+  return yamlInfo;
+}
+
+export function getLineInfo(obj: unknown, path: unknown[]): { line: number; col: number } {
+  const yamlInfo = getYamlInfo(obj);
+  const node = yamlInfo.document.getIn(path, true) ?? yamlInfo.document.getIn(
+    path.map((v) => {
+      const num = Number(v);
+      return isNaN(num) ? v : num;
+    }),
+    true,
+  );
+  if (
+    !node || typeof node !== 'object' || !('range' in node) || !Array.isArray(node.range) ||
+    typeof node.range[0] !== 'number'
+  ) {
+    console.warn(`Unable to get line info for path ${path.join('/')}`);
+    return { line: 0, col: 0 };
+  }
+  return yamlInfo.lineCounter.linePos(node.range[0]);
+}
+
+export function parseYamlWithInfo(yamlString: string): unknown {
+  const lineCounter = new YAML.LineCounter();
+  const document = YAML.parseDocument(yamlString, { lineCounter });
+  return Object.defineProperty(document.toJS(), yamlInfoSymbol, {
+    value: { document, lineCounter },
+    enumerable: false,
+  });
+}