@scalar/fastify-api-reference 1.25.80 → 1.25.82

package/dist/index.js

@@ -18466,50 +18466,44 @@ function resolveReferences(input, options, file, errors2) {
   const clonedInput = structuredClone(input);
   const filesystem = makeFilesystem(clonedInput);
   const entrypoint = getEntrypoint(filesystem);
-  resolve2((file == null ? void 0 : file.specification) ?? entrypoint.specification, filesystem, file ?? entrypoint, options == null ? void 0 : options.onDereference);
-  resolve2((file == null ? void 0 : file.specification) ?? entrypoint.specification, filesystem, file ?? entrypoint, options == null ? void 0 : options.onDereference);
+  resolve2((file == null ? void 0 : file.specification) ?? entrypoint.specification, filesystem, file ?? entrypoint);
   errors2 = errors2.filter((error2, index, self) => index === self.findIndex((t) => t.message === error2.message && t.code === error2.code));
   return {
     valid: errors2.length === 0,
     errors: errors2,
     schema: (file ?? getEntrypoint(filesystem)).specification
   };
-  function resolve2(schema2, resolveFilesystem, resolveFile, onResolve) {
-    let result;
-    Object.entries(schema2 ?? {}).forEach(([_, value]) => {
-      if (schema2.$ref !== void 0) {
-        const target = resolveUri(schema2.$ref, options, resolveFile, resolveFilesystem, errors2);
-        if (target === void 0) {
-          return void 0;
-        }
-        onResolve == null ? void 0 : onResolve({ schema: schema2, ref: schema2.$ref });
-        delete schema2.$ref;
-        if (typeof target === "object") {
-          Object.keys(target).forEach((key) => {
-            if (schema2[key] === void 0) {
-              schema2[key] = target[key];
-            }
-          });
+  function resolve2(schema2, resolveFilesystem, resolveFile, resolved = /* @__PURE__ */ new WeakSet()) {
+    var _a;
+    let result = { errors: [] };
+    if (schema2 === null || resolved.has(schema2))
+      return result;
+    resolved.add(schema2);
+    function resolveExternal(externalFile) {
+      resolve2(externalFile.specification, resolveFilesystem, externalFile, resolved);
+      return externalFile;
+    }
+    while (schema2.$ref !== void 0) {
+      const target = resolveUri(schema2.$ref, options, resolveFile, resolveFilesystem, resolveExternal, errors2);
+      if (typeof target !== "object" || target === null)
+        break;
+      (_a = options == null ? void 0 : options.onDereference) == null ? void 0 : _a.call(options, { schema: schema2, ref: schema2.$ref });
+      delete schema2.$ref;
+      for (const key of Object.keys(target)) {
+        if (schema2[key] === void 0) {
+          schema2[key] = target[key];
         }
       }
-      if (typeof value === "object" && !isCircular(value)) {
-        result = resolve2(value, resolveFilesystem, resolveFile, onResolve);
+    }
+    for (const value of Object.values(schema2)) {
+      if (typeof value === "object" && value !== null) {
+        result = resolve2(value, resolveFilesystem, resolveFile, resolved);
       }
-    });
-    return {
-      errors: (result == null ? void 0 : result.errors) ?? []
-    };
-  }
-}
-function isCircular(schema2) {
-  try {
-    JSON.stringify(schema2);
-    return false;
-  } catch (error2) {
-    return true;
+    }
+    return result;
   }
 }
-function resolveUri(uri2, options, file, filesystem, errors2) {
+function resolveUri(uri2, options, file, filesystem, resolve2, errors2) {
   if (typeof uri2 !== "string") {
     if (options == null ? void 0 : options.throwOnError) {
       throw new Error(ERRORS.INVALID_REFERENCE.replace("%s", uri2));
@@ -18536,11 +18530,10 @@ function resolveUri(uri2, options, file, filesystem, errors2) {
       });
       return;
     }
-    const result = resolveReferences(filesystem, options, externalReference, errors2);
     if (path2 === void 0) {
-      return result.schema;
+      return externalReference.specification;
     }
-    return resolveUri(`#${path2}`, options, externalReference, filesystem, errors2);
+    return resolveUri(`#${path2}`, options, resolve2(externalReference), filesystem, resolve2, errors2);
   }
   const segments = getSegmentsFromPath(path2);
   try {