@mintlify/common 1.0.804 → 1.0.806

package/dist/openapi/getMatchingOpenApiFile.js

@@ -1,7 +1,8 @@
 import { parseApiTargetFromMetadata } from '../api-reference/parseApiTargetFromMetadata.js';
-import { removeLeadingSlash } from '../fs/removeLeadingSlash.js';
+import { normalizeRelativePath } from '../fs/normalizeRelativePath.js';
 import { isAbsoluteUrl } from '../isAbsoluteUrl.js';
 export const getMatchingOpenApiFile = ({ metadata, refs, files, }) => {
+    var _a, _b;
     const target = parseApiTargetFromMetadata(metadata);
     if (!target || target.type === 'asyncapi') {
         return undefined;
@@ -17,41 +18,36 @@ export const getMatchingOpenApiFile = ({ metadata, refs, files, }) => {
         targetPath = `#/components/schemas/${target.name}`;
     }
     const matchingUuids = findAllMatchingFileUuids({ refs, targetPath });
-    let filename = undefined;
-    let match = undefined;
-    if (target.filename) {
-        const trimmedFilename = isAbsoluteUrl(target.filename)
-            ? target.filename
-            : removeLeadingSlash(target.filename);
-        filename = trimmedFilename;
+    if (!target.filename) {
+        return matchingUuids[0];
     }
-    // match by original file location > filename > first match
-    if (filename) {
-        // try original file location match
-        if (files[filename]) {
-            const matchingUuid = files[filename];
-            if (matchingUuid && matchingUuids.includes(matchingUuid)) {
-                match = matchingUuid;
-            }
+    const filename = isAbsoluteUrl(target.filename)
+        ? target.filename
+        : normalizeRelativePath(target.filename);
+    // exact original file location match
+    const exactFileUuid = files[filename];
+    if (exactFileUuid && matchingUuids.includes(exactFileUuid)) {
+        return exactFileUuid;
+    }
+    // substring original location > exact filename match > substring filename
+    let substringOriginalMatch;
+    let exactFilenameMatch;
+    let substringFilenameMatch;
+    for (const uuid of matchingUuids) {
+        const ref = refs[uuid];
+        if (!ref)
+            continue;
+        if (!substringOriginalMatch && ref.originalFileLocation.includes(filename)) {
+            substringOriginalMatch = uuid;
         }
-        else {
-            // try filename match
-            for (const uuid of matchingUuids) {
-                if (refs[uuid] && refs[uuid].filename === filename) {
-                    match = uuid;
-                    break;
-                }
-            }
-            // filename is just wrong, return first match
-            if (!match) {
-                match = matchingUuids[0];
-            }
+        if (!exactFilenameMatch && ref.filename === filename) {
+            exactFilenameMatch = uuid;
+        }
+        if (!substringFilenameMatch && ref.filename.includes(filename)) {
+            substringFilenameMatch = uuid;
         }
     }
-    else {
-        match = matchingUuids[0];
-    }
-    return match;
+    return (_b = (_a = substringOriginalMatch !== null && substringOriginalMatch !== void 0 ? substringOriginalMatch : exactFilenameMatch) !== null && _a !== void 0 ? _a : substringFilenameMatch) !== null && _b !== void 0 ? _b : matchingUuids[0];
 };
 const findAllMatchingFileUuids = ({ refs, targetPath, }) => {
     const matchingUuids = [];