openapi-typesafe 1.0.0-rc.1 → 1.0.0-rc.3

package/dist/adapters/redocly-loader/ref-resolution-steps.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ref-resolution-steps.cjs","sources":["../../../src/adapters/redocly-loader/ref-resolution-steps.ts"],"sourcesContent":["import type { Document, normalizeTypes } from \"@redocly/openapi-core\";\nimport { parseRefPointer } from \"../../domain/openapi/json-pointer.js\";\n\n/**\n * The pieces of Redocly 1.34's `$ref` resolution (`lib/resolve.js`, `lib/ref-utils.js`, MIT) that\n * the resolution check (`ref-resolution-check.ts`, ADR-031) walks with, kept as Redocly has them.\n */\n\ntype RedoclyTypes = ReturnType<typeof normalizeTypes>;\nexport type WalkType = RedoclyTypes[string];\ntype PropTypeOrFunction = WalkType[\"properties\"][string] | WalkType[\"additionalProperties\"];\n/** The type of a property or array item, after Redocly called a type function. */\nexport type PropType = Exclude<PropTypeOrFunction, (...args: never[]) => unknown>;\n\n/** Redocly's own placeholders: a node of no known type, and a scalar that is a `$ref`. */\nexport const UNKNOWN_TYPE: WalkType = { name: \"unknown\", properties: {} };\nexport const RESOLVABLE_SCALAR_TYPE: WalkType = { name: \"scalar\", properties: {} };\n\n/** Redocly's test for an anchor reference (`#name`), which waits for the whole document walk. */\nexport const ANCHOR_REF = /^#[A-Za-z][A-Za-z0-9\\-_:.]*$/;\n\n/** Redocly throws a plain Error with this message for a `$ref` chain that points back to itself. */\nexport const REF_CYCLE_MESSAGE = \"Self-referencing circular pointer\";\n\nexport interface RefStack {\n  readonly prev: RefStack | null;\n  readonly node: unknown;\n}\n\nexport interface ResolvedRef {\n  readonly resolved: boolean;\n  readonly node?: unknown;\n  readonly document?: Document;\n  readonly nodePointer?: string;\n}\n\nexport type Ref = { readonly $ref: string };\n\nexport function isNamedType(type: PropType): type is WalkType {\n  return typeof (type as { name?: unknown } | null | undefined)?.name === \"string\";\n}\n\nexport function joinPointer(base: string, key: string | number): string {\n  const start = base === \"\" ? \"#/\" : base;\n  return start.endsWith(\"/\") ? `${start}${key}` : `${start}/${key}`;\n}\n\nexport function escapePointer(fragment: string): string {\n  return fragment.replaceAll(\"~\", \"~0\").replaceAll(\"/\", \"~1\");\n}\n\n/** Redocly's `parseRef`: the document part (null for a local ref) and the unescaped segments. */\nexport function parseRef(ref: string): { uri: string | null; pointer: string[] } {\n  const [uri = \"\"] = ref.split(\"#/\");\n  return {\n    uri: (uri.endsWith(\"#\") ? uri.slice(0, -1) : uri) || null,\n    pointer: parseRefPointer(ref),\n  };\n}\n\nexport function hasRef(head: RefStack | null, node: unknown): boolean {\n  for (let entry = head; entry !== null; entry = entry.prev) {\n    if (entry.node === node) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function isExternalValue(node: object): node is { externalValue: string } {\n  return typeof (node as { externalValue?: unknown }).externalValue === \"string\";\n}\n\n/** Wait one macrotask, as Redocly does before it reads the anchors of a document. */\nexport function nextTick(): Promise<void> {\n  return new Promise((resolve) => setTimeout(resolve));\n}\n\n/**\n * The type Redocly gives one property value, and the value to walk (a `directResolveAs` string\n * becomes a `$ref`). A value whose type has no name is not walked.\n */\nexport function propertyType(\n  type: WalkType,\n  name: string,\n  value: unknown,\n  specExtension: WalkType,\n): [PropType, unknown] {\n  // `properties[name]` also finds `Object.prototype` members, as in Redocly; for `valueOf` and the\n  // like the call below throws the TypeError that the loader turns into SCHEMA_KEY_UNSUPPORTED.\n  let declared: PropTypeOrFunction = type.properties[name];\n  if (declared === undefined) {\n    declared = type.additionalProperties;\n  }\n  let propType: PropType = typeof declared === \"function\" ? declared(value, name) : declared;\n  if (propType === undefined) {\n    propType = UNKNOWN_TYPE;\n  }\n  if (\n    type.extensionsPrefix &&\n    name.startsWith(type.extensionsPrefix) &&\n    propType === UNKNOWN_TYPE\n  ) {\n    return [specExtension, value];\n  }\n  if (!isNamedType(propType) && propType?.directResolveAs) {\n    return [propType.directResolveAs, { $ref: value }];\n  }\n  if (propType && !isNamedType(propType) && propType.resolvable !== false) {\n    return [RESOLVABLE_SCALAR_TYPE, value];\n  }\n  return [propType, value];\n}\n"],"names":["parseRefPointer"],"mappings":"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"}

package/dist/adapters/redocly-loader/ref-resolution-steps.mjs

@@ -0,0 +1,60 @@
+import { parseRefPointer } from '../../domain/openapi/json-pointer.mjs';
+
+const UNKNOWN_TYPE = { name: "unknown", properties: {} };
+const RESOLVABLE_SCALAR_TYPE = { name: "scalar", properties: {} };
+const ANCHOR_REF = /^#[A-Za-z][A-Za-z0-9\-_:.]*$/;
+const REF_CYCLE_MESSAGE = "Self-referencing circular pointer";
+function isNamedType(type) {
+  return typeof type?.name === "string";
+}
+function joinPointer(base, key) {
+  const start = base === "" ? "#/" : base;
+  return start.endsWith("/") ? `${start}${key}` : `${start}/${key}`;
+}
+function escapePointer(fragment) {
+  return fragment.replaceAll("~", "~0").replaceAll("/", "~1");
+}
+function parseRef(ref) {
+  const [uri = ""] = ref.split("#/");
+  return {
+    uri: (uri.endsWith("#") ? uri.slice(0, -1) : uri) || null,
+    pointer: parseRefPointer(ref)
+  };
+}
+function hasRef(head, node) {
+  for (let entry = head; entry !== null; entry = entry.prev) {
+    if (entry.node === node) {
+      return true;
+    }
+  }
+  return false;
+}
+function isExternalValue(node) {
+  return typeof node.externalValue === "string";
+}
+function nextTick() {
+  return new Promise((resolve) => setTimeout(resolve));
+}
+function propertyType(type, name, value, specExtension) {
+  let declared = type.properties[name];
+  if (declared === void 0) {
+    declared = type.additionalProperties;
+  }
+  let propType = typeof declared === "function" ? declared(value, name) : declared;
+  if (propType === void 0) {
+    propType = UNKNOWN_TYPE;
+  }
+  if (type.extensionsPrefix && name.startsWith(type.extensionsPrefix) && propType === UNKNOWN_TYPE) {
+    return [specExtension, value];
+  }
+  if (!isNamedType(propType) && propType?.directResolveAs) {
+    return [propType.directResolveAs, { $ref: value }];
+  }
+  if (propType && !isNamedType(propType) && propType.resolvable !== false) {
+    return [RESOLVABLE_SCALAR_TYPE, value];
+  }
+  return [propType, value];
+}
+
+export { ANCHOR_REF, REF_CYCLE_MESSAGE, RESOLVABLE_SCALAR_TYPE, UNKNOWN_TYPE, escapePointer, hasRef, isExternalValue, isNamedType, joinPointer, nextTick, parseRef, propertyType };
+//# sourceMappingURL=ref-resolution-steps.mjs.map

package/dist/adapters/redocly-loader/ref-resolution-steps.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ref-resolution-steps.mjs","sources":["../../../src/adapters/redocly-loader/ref-resolution-steps.ts"],"sourcesContent":["import type { Document, normalizeTypes } from \"@redocly/openapi-core\";\nimport { parseRefPointer } from \"../../domain/openapi/json-pointer.js\";\n\n/**\n * The pieces of Redocly 1.34's `$ref` resolution (`lib/resolve.js`, `lib/ref-utils.js`, MIT) that\n * the resolution check (`ref-resolution-check.ts`, ADR-031) walks with, kept as Redocly has them.\n */\n\ntype RedoclyTypes = ReturnType<typeof normalizeTypes>;\nexport type WalkType = RedoclyTypes[string];\ntype PropTypeOrFunction = WalkType[\"properties\"][string] | WalkType[\"additionalProperties\"];\n/** The type of a property or array item, after Redocly called a type function. */\nexport type PropType = Exclude<PropTypeOrFunction, (...args: never[]) => unknown>;\n\n/** Redocly's own placeholders: a node of no known type, and a scalar that is a `$ref`. */\nexport const UNKNOWN_TYPE: WalkType = { name: \"unknown\", properties: {} };\nexport const RESOLVABLE_SCALAR_TYPE: WalkType = { name: \"scalar\", properties: {} };\n\n/** Redocly's test for an anchor reference (`#name`), which waits for the whole document walk. */\nexport const ANCHOR_REF = /^#[A-Za-z][A-Za-z0-9\\-_:.]*$/;\n\n/** Redocly throws a plain Error with this message for a `$ref` chain that points back to itself. */\nexport const REF_CYCLE_MESSAGE = \"Self-referencing circular pointer\";\n\nexport interface RefStack {\n  readonly prev: RefStack | null;\n  readonly node: unknown;\n}\n\nexport interface ResolvedRef {\n  readonly resolved: boolean;\n  readonly node?: unknown;\n  readonly document?: Document;\n  readonly nodePointer?: string;\n}\n\nexport type Ref = { readonly $ref: string };\n\nexport function isNamedType(type: PropType): type is WalkType {\n  return typeof (type as { name?: unknown } | null | undefined)?.name === \"string\";\n}\n\nexport function joinPointer(base: string, key: string | number): string {\n  const start = base === \"\" ? \"#/\" : base;\n  return start.endsWith(\"/\") ? `${start}${key}` : `${start}/${key}`;\n}\n\nexport function escapePointer(fragment: string): string {\n  return fragment.replaceAll(\"~\", \"~0\").replaceAll(\"/\", \"~1\");\n}\n\n/** Redocly's `parseRef`: the document part (null for a local ref) and the unescaped segments. */\nexport function parseRef(ref: string): { uri: string | null; pointer: string[] } {\n  const [uri = \"\"] = ref.split(\"#/\");\n  return {\n    uri: (uri.endsWith(\"#\") ? uri.slice(0, -1) : uri) || null,\n    pointer: parseRefPointer(ref),\n  };\n}\n\nexport function hasRef(head: RefStack | null, node: unknown): boolean {\n  for (let entry = head; entry !== null; entry = entry.prev) {\n    if (entry.node === node) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function isExternalValue(node: object): node is { externalValue: string } {\n  return typeof (node as { externalValue?: unknown }).externalValue === \"string\";\n}\n\n/** Wait one macrotask, as Redocly does before it reads the anchors of a document. */\nexport function nextTick(): Promise<void> {\n  return new Promise((resolve) => setTimeout(resolve));\n}\n\n/**\n * The type Redocly gives one property value, and the value to walk (a `directResolveAs` string\n * becomes a `$ref`). A value whose type has no name is not walked.\n */\nexport function propertyType(\n  type: WalkType,\n  name: string,\n  value: unknown,\n  specExtension: WalkType,\n): [PropType, unknown] {\n  // `properties[name]` also finds `Object.prototype` members, as in Redocly; for `valueOf` and the\n  // like the call below throws the TypeError that the loader turns into SCHEMA_KEY_UNSUPPORTED.\n  let declared: PropTypeOrFunction = type.properties[name];\n  if (declared === undefined) {\n    declared = type.additionalProperties;\n  }\n  let propType: PropType = typeof declared === \"function\" ? declared(value, name) : declared;\n  if (propType === undefined) {\n    propType = UNKNOWN_TYPE;\n  }\n  if (\n    type.extensionsPrefix &&\n    name.startsWith(type.extensionsPrefix) &&\n    propType === UNKNOWN_TYPE\n  ) {\n    return [specExtension, value];\n  }\n  if (!isNamedType(propType) && propType?.directResolveAs) {\n    return [propType.directResolveAs, { $ref: value }];\n  }\n  if (propType && !isNamedType(propType) && propType.resolvable !== false) {\n    return [RESOLVABLE_SCALAR_TYPE, value];\n  }\n  return [propType, value];\n}\n"],"names":[],"mappings":";;AAeO,MAAM,eAAyB,EAAE,IAAA,EAAM,SAAA,EAAW,UAAA,EAAY,EAAC;AAC/D,MAAM,yBAAmC,EAAE,IAAA,EAAM,QAAA,EAAU,UAAA,EAAY,EAAC;AAGxE,MAAM,UAAA,GAAa;AAGnB,MAAM,iBAAA,GAAoB;AAgB1B,SAAS,YAAY,IAAA,EAAkC;AAC5D,EAAA,OAAO,OAAQ,MAAgD,IAAA,KAAS,QAAA;AAC1E;AAEO,SAAS,WAAA,CAAY,MAAc,GAAA,EAA8B;AACtE,EAAA,MAAM,KAAA,GAAQ,IAAA,KAAS,EAAA,GAAK,IAAA,GAAO,IAAA;AACnC,EAAA,OAAO,KAAA,CAAM,QAAA,CAAS,GAAG,CAAA,GAAI,CAAA,EAAG,KAAK,CAAA,EAAG,GAAG,CAAA,CAAA,GAAK,CAAA,EAAG,KAAK,CAAA,CAAA,EAAI,GAAG,CAAA,CAAA;AACjE;AAEO,SAAS,cAAc,QAAA,EAA0B;AACtD,EAAA,OAAO,SAAS,UAAA,CAAW,GAAA,EAAK,IAAI,CAAA,CAAE,UAAA,CAAW,KAAK,IAAI,CAAA;AAC5D;AAGO,SAAS,SAAS,GAAA,EAAwD;AAC/E,EAAA,MAAM,CAAC,GAAA,GAAM,EAAE,CAAA,GAAI,GAAA,CAAI,MAAM,IAAI,CAAA;AACjC,EAAA,OAAO;AAAA,IACL,GAAA,EAAA,CAAM,GAAA,CAAI,QAAA,CAAS,GAAG,CAAA,GAAI,IAAI,KAAA,CAAM,CAAA,EAAG,EAAE,CAAA,GAAI,GAAA,KAAQ,IAAA;AAAA,IACrD,OAAA,EAAS,gBAAgB,GAAG;AAAA,GAC9B;AACF;AAEO,SAAS,MAAA,CAAO,MAAuB,IAAA,EAAwB;AACpE,EAAA,KAAA,IAAS,QAAQ,IAAA,EAAM,KAAA,KAAU,IAAA,EAAM,KAAA,GAAQ,MAAM,IAAA,EAAM;AACzD,IAAA,IAAI,KAAA,CAAM,SAAS,IAAA,EAAM;AACvB,MAAA,OAAO,IAAA;AAAA,IACT;AAAA,EACF;AACA,EAAA,OAAO,KAAA;AACT;AAEO,SAAS,gBAAgB,IAAA,EAAiD;AAC/E,EAAA,OAAO,OAAQ,KAAqC,aAAA,KAAkB,QAAA;AACxE;AAGO,SAAS,QAAA,GAA0B;AACxC,EAAA,OAAO,IAAI,OAAA,CAAQ,CAAC,OAAA,KAAY,UAAA,CAAW,OAAO,CAAC,CAAA;AACrD;AAMO,SAAS,YAAA,CACd,IAAA,EACA,IAAA,EACA,KAAA,EACA,aAAA,EACqB;AAGrB,EAAA,IAAI,QAAA,GAA+B,IAAA,CAAK,UAAA,CAAW,IAAI,CAAA;AACvD,EAAA,IAAI,aAAa,MAAA,EAAW;AAC1B,IAAA,QAAA,GAAW,IAAA,CAAK,oBAAA;AAAA,EAClB;AACA,EAAA,IAAI,WAAqB,OAAO,QAAA,KAAa,aAAa,QAAA,CAAS,KAAA,EAAO,IAAI,CAAA,GAAI,QAAA;AAClF,EAAA,IAAI,aAAa,MAAA,EAAW;AAC1B,IAAA,QAAA,GAAW,YAAA;AAAA,EACb;AACA,EAAA,IACE,IAAA,CAAK,oBACL,IAAA,CAAK,UAAA,CAAW,KAAK,gBAAgB,CAAA,IACrC,aAAa,YAAA,EACb;AACA,IAAA,OAAO,CAAC,eAAe,KAAK,CAAA;AAAA,EAC9B;AACA,EAAA,IAAI,CAAC,WAAA,CAAY,QAAQ,CAAA,IAAK,UAAU,eAAA,EAAiB;AACvD,IAAA,OAAO,CAAC,QAAA,CAAS,eAAA,EAAiB,EAAE,IAAA,EAAM,OAAO,CAAA;AAAA,EACnD;AACA,EAAA,IAAI,YAAY,CAAC,WAAA,CAAY,QAAQ,CAAA,IAAK,QAAA,CAAS,eAAe,KAAA,EAAO;AACvE,IAAA,OAAO,CAAC,wBAAwB,KAAK,CAAA;AAAA,EACvC;AACA,EAAA,OAAO,CAAC,UAAU,KAAK,CAAA;AACzB;;"}

package/dist/adapters/redocly-loader/remote-fetch.cjs

@@ -1,9 +1,10 @@
 'use strict';
 
 const allowedHosts = require('./allowed-hosts.cjs');
+const configuredHeaders = require('./configured-headers.cjs');
 const schemaLoadErrors = require('./schema-load-errors.cjs');
 
-const MAX_CHECKED_REDIRECTS = 5;
+const MAX_REDIRECTS = 20;
 const REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([101, 103, 204, 205, 304]);
 async function bufferedResponse(response) {
@@ -26,35 +27,61 @@ function fetchWithTimeout(timeoutMs) {
     }
   };
 }
-function fetchWithCheckedRedirects(fetchImpl, hosts) {
+function fetchWithCheckedRedirects(fetchImpl, policy) {
   return async (input, init = {}) => {
-    const firstOrigin = new URL(input).origin;
     let url = new URL(input);
-    for (let hop = 0; hop <= MAX_CHECKED_REDIRECTS; hop += 1) {
-      if (hop > 0 && !allowedHosts.isHostAllowed(url, hosts)) {
-        throw schemaLoadErrors.refForbiddenError(url.href, { reason: "host-not-allowed", allowedHosts: [...hosts] });
+    for (let hop = 0; hop <= MAX_REDIRECTS; hop += 1) {
+      if (hop > 0 && policy.hosts !== void 0 && !allowedHosts.isHostAllowed(url, policy.hosts)) {
+        throw schemaLoadErrors.refForbiddenError(url.href, {
+          reason: "host-not-allowed",
+          allowedHosts: [...policy.hosts]
+        });
       }
-      const { headers, ...rest } = init;
-      const hopInit = url.origin === firstOrigin && headers !== void 0 ? { ...rest, headers } : rest;
-      const response = await fetchImpl(url.href, { ...hopInit, redirect: "manual" });
+      const headers = await configuredHeaders.headersFor(url, policy.headers);
+      const response = await fetchImpl(url.href, { ...init, headers, redirect: "manual" });
       const location = response.headers.get("location");
       if (!REDIRECT_STATUSES.has(response.status) || location === null) {
         return response;
       }
       url = new URL(location, url);
     }
-    throw new Error(`More than ${MAX_CHECKED_REDIRECTS} redirects loading ${input}`);
+    throw new Error(`More than ${MAX_REDIRECTS} redirects loading ${input}`);
+  };
+}
+function fetchWithConcurrencyLimit(fetchImpl, limit) {
+  let running = 0;
+  const waiting = [];
+  return async (input, init) => {
+    if (running < limit) {
+      running += 1;
+    } else {
+      await new Promise((resolve) => waiting.push(resolve));
+    }
+    try {
+      return await fetchImpl(input, init);
+    } finally {
+      const next = waiting.shift();
+      if (next === void 0) {
+        running -= 1;
+      } else {
+        next();
+      }
+    }
   };
 }
 function resolveConfigWithAccess(resolve, options) {
   const configured = resolve.http.customFetch;
   const base = configured ?? fetchWithTimeout(options.timeoutMs);
-  const hosts = options.access.remoteHosts;
-  const customFetch = hosts === void 0 ? base : fetchWithCheckedRedirects(base, hosts);
-  return { ...resolve, http: { ...resolve.http, customFetch } };
+  const checked = fetchWithCheckedRedirects(base, {
+    headers: resolve.http.headers,
+    hosts: options.access.remoteHosts
+  });
+  const customFetch = fetchWithConcurrencyLimit(checked, options.maxParallelFetches);
+  return { ...resolve, http: { ...resolve.http, headers: [], customFetch } };
 }
 
-exports.MAX_CHECKED_REDIRECTS = MAX_CHECKED_REDIRECTS;
+exports.MAX_REDIRECTS = MAX_REDIRECTS;
 exports.fetchWithCheckedRedirects = fetchWithCheckedRedirects;
+exports.fetchWithConcurrencyLimit = fetchWithConcurrencyLimit;
 exports.resolveConfigWithAccess = resolveConfigWithAccess;
 //# sourceMappingURL=remote-fetch.cjs.map

package/dist/adapters/redocly-loader/remote-fetch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"remote-fetch.cjs","sources":["../../../src/adapters/redocly-loader/remote-fetch.ts"],"sourcesContent":["import type { Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport type { RefAccess } from \"../../application/ports/schema-loader.js\";\nimport { isHostAllowed } from \"./allowed-hosts.js\";\nimport { refForbiddenError } from \"./schema-load-errors.js\";\n\n/** How the loader fetches remote documents: a time limit, and the host limit on redirects. */\n\ntype ResolveConfig = RedoclyConfig[\"resolve\"];\n\n/** The fetch Redocly calls for a remote document (`resolve.http.customFetch`). */\nexport type RemoteFetch = (input: string, init?: RequestInit) => Promise<Response>;\n\n/**\n * Redirects followed for a remote `$ref` when hosts are limited. Each hop is checked, so fetch\n * cannot follow them on its own; 5 covers http → https plus a moved file, and a loop stops early.\n */\nexport const MAX_CHECKED_REDIRECTS = 5;\n\nconst REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);\n\n/** Statuses whose responses have no body; `new Response()` refuses a body for them. */\nconst NULL_BODY_STATUSES = new Set([101, 103, 204, 205, 304]);\n\n/** A response whose body is already read, so that reading it again cannot wait or fail. */\nasync function bufferedResponse(response: Response): Promise<Response> {\n  const body = await response.arrayBuffer();\n  const { status, statusText, headers } = response;\n  return new Response(NULL_BODY_STATUSES.has(status) ? null : body, {\n    status,\n    statusText,\n    headers,\n  });\n}\n\n/**\n * Fetch with a time limit for the whole response, body included: Node's own fetch waits five\n * minutes for a server that never answers, and a server that sends its body one byte at a time\n * never finishes. The body is read here, inside the limit; when Redocly read it, the abort\n * surfaced as a `DOMException` whose read-only `message` Redocly tried to change, which gave\n * \"Cannot set property message of  which has only a getter\" instead of the time limit.\n */\nfunction fetchWithTimeout(timeoutMs: number): RemoteFetch {\n  return async (input, init = {}) => {\n    try {\n      const response = await fetch(input, { ...init, signal: AbortSignal.timeout(timeoutMs) });\n      return await bufferedResponse(response);\n    } catch (cause) {\n      const isTimeout = cause instanceof Error && cause.name === \"TimeoutError\";\n      throw isTimeout ? new Error(`Timed out after ${timeoutMs} ms loading ${input}`) : cause;\n    }\n  };\n}\n\n/**\n * Follow redirects one by one, and refuse a redirect to a host that is not listed. The first URL\n * was checked by the resolver (or is the root document). As fetch does, the configured headers\n * (often credentials) are not sent on to another origin.\n */\nexport function fetchWithCheckedRedirects(\n  fetchImpl: RemoteFetch,\n  hosts: readonly string[],\n): RemoteFetch {\n  return async (input, init = {}) => {\n    const firstOrigin = new URL(input).origin;\n    let url = new URL(input);\n    for (let hop = 0; hop <= MAX_CHECKED_REDIRECTS; hop += 1) {\n      if (hop > 0 && !isHostAllowed(url, hosts)) {\n        throw refForbiddenError(url.href, { reason: \"host-not-allowed\", allowedHosts: [...hosts] });\n      }\n      const { headers, ...rest } = init;\n      const hopInit: RequestInit =\n        url.origin === firstOrigin && headers !== undefined ? { ...rest, headers } : rest;\n      const response = await fetchImpl(url.href, { ...hopInit, redirect: \"manual\" });\n      const location = response.headers.get(\"location\");\n      if (!REDIRECT_STATUSES.has(response.status) || location === null) {\n        return response;\n      }\n      url = new URL(location, url);\n    }\n    throw new Error(`More than ${MAX_CHECKED_REDIRECTS} redirects loading ${input}`);\n  };\n}\n\nexport interface RemoteFetchOptions {\n  /** Time limit of one fetch and its body, unless the Redocly config has its own `customFetch`. */\n  readonly timeoutMs: number;\n  readonly access: RefAccess;\n}\n\n/**\n * The resolve config with the fetch the loader uses. A `customFetch` of the Redocly config is\n * kept; with a host limit, it is wrapped so that each redirect is checked.\n */\nexport function resolveConfigWithAccess(\n  resolve: ResolveConfig,\n  options: RemoteFetchOptions,\n): ResolveConfig {\n  // Redocly types `customFetch` as `Function`; it is called as fetch is.\n  const configured = resolve.http.customFetch as RemoteFetch | undefined;\n  const base = configured ?? fetchWithTimeout(options.timeoutMs);\n  const hosts = options.access.remoteHosts;\n  const customFetch = hosts === undefined ? base : fetchWithCheckedRedirects(base, hosts);\n  return { ...resolve, http: { ...resolve.http, customFetch } };\n}\n"],"names":["isHostAllowed","refForbiddenError"],"mappings":"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"}
+{"version":3,"file":"remote-fetch.cjs","sources":["../../../src/adapters/redocly-loader/remote-fetch.ts"],"sourcesContent":["import type { Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport type { RefAccess } from \"../../application/ports/schema-loader.js\";\nimport { isHostAllowed } from \"./allowed-hosts.js\";\nimport { type ConfiguredHeader, headersFor } from \"./configured-headers.js\";\nimport { refForbiddenError } from \"./schema-load-errors.js\";\n\n/**\n * How the loader fetches remote documents: a time limit, the host limit and the configured headers\n * checked on every redirect.\n */\n\ntype ResolveConfig = RedoclyConfig[\"resolve\"];\n\n/** The fetch Redocly calls for a remote document (`resolve.http.customFetch`). */\nexport type RemoteFetch = (input: string, init?: RequestInit) => Promise<Response>;\n\n/**\n * Redirects followed for one remote document. The loader follows them itself, so that each hop is\n * checked; 20 is the limit of the Fetch standard, which fetch applied before.\n */\nexport const MAX_REDIRECTS = 20;\n\nconst REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);\n\n/** Statuses whose responses have no body; `new Response()` refuses a body for them. */\nconst NULL_BODY_STATUSES = new Set([101, 103, 204, 205, 304]);\n\n/** A response whose body is already read, so that reading it again cannot wait or fail. */\nasync function bufferedResponse(response: Response): Promise<Response> {\n  const body = await response.arrayBuffer();\n  const { status, statusText, headers } = response;\n  return new Response(NULL_BODY_STATUSES.has(status) ? null : body, {\n    status,\n    statusText,\n    headers,\n  });\n}\n\n/**\n * Fetch with a time limit for the whole response, body included: Node's own fetch waits five\n * minutes for a server that never answers, and a server that sends its body one byte at a time\n * never finishes. The body is read here, inside the limit; when Redocly read it, the abort\n * surfaced as a `DOMException` whose read-only `message` Redocly tried to change, which gave\n * \"Cannot set property message of  which has only a getter\" instead of the time limit.\n */\nfunction fetchWithTimeout(timeoutMs: number): RemoteFetch {\n  return async (input, init = {}) => {\n    try {\n      const response = await fetch(input, { ...init, signal: AbortSignal.timeout(timeoutMs) });\n      return await bufferedResponse(response);\n    } catch (cause) {\n      const isTimeout = cause instanceof Error && cause.name === \"TimeoutError\";\n      throw isTimeout ? new Error(`Timed out after ${timeoutMs} ms loading ${input}`) : cause;\n    }\n  };\n}\n\n/** What every hop of a remote fetch is checked against. */\nexport interface RedirectPolicy {\n  /** `resolve.http.headers` of the Redocly config; chosen again for the URL of every hop. */\n  readonly headers: readonly ConfiguredHeader[];\n  /** `--remote-ref-hosts`; undefined allows every host. */\n  readonly hosts: readonly string[] | undefined;\n}\n\n/**\n * Follow redirects one by one. Fetch drops only `Authorization`, `Cookie` and\n * `Proxy-Authorization` on a redirect to another origin and keeps every other header (an\n * `X-Api-Key`), so the configured headers are chosen for each hop's own URL instead, and a hop to\n * a host that is not listed is refused before it is fetched. The first URL was checked by the\n * resolver (or is the root document). Redocly passes only the configured headers in `init`, and\n * it gets an empty list of them (`resolveConfigWithAccess`), so `init.headers` is replaced.\n */\nexport function fetchWithCheckedRedirects(\n  fetchImpl: RemoteFetch,\n  policy: RedirectPolicy,\n): RemoteFetch {\n  return async (input, init = {}) => {\n    let url = new URL(input);\n    for (let hop = 0; hop <= MAX_REDIRECTS; hop += 1) {\n      if (hop > 0 && policy.hosts !== undefined && !isHostAllowed(url, policy.hosts)) {\n        throw refForbiddenError(url.href, {\n          reason: \"host-not-allowed\",\n          allowedHosts: [...policy.hosts],\n        });\n      }\n      const headers = await headersFor(url, policy.headers);\n      const response = await fetchImpl(url.href, { ...init, headers, redirect: \"manual\" });\n      const location = response.headers.get(\"location\");\n      if (!REDIRECT_STATUSES.has(response.status) || location === null) {\n        return response;\n      }\n      url = new URL(location, url);\n    }\n    throw new Error(`More than ${MAX_REDIRECTS} redirects loading ${input}`);\n  };\n}\n\n/** Bounds on the remote documents of one load (threat model T2, ADR-033). */\nexport interface RemoteDocumentLimits {\n  /** Remote documents one load may fetch, the root included; one more is refused. */\n  readonly maxDocuments: number;\n  /** Remote documents fetched at the same time; the others wait for a free slot. */\n  readonly maxParallelFetches: number;\n}\n\n/**\n * At most `limit` calls of the fetch run at once; the others wait in order. A finished call hands\n * its slot to the next waiting one.\n */\nexport function fetchWithConcurrencyLimit(fetchImpl: RemoteFetch, limit: number): RemoteFetch {\n  let running = 0;\n  const waiting: (() => void)[] = [];\n  return async (input, init) => {\n    if (running < limit) {\n      running += 1;\n    } else {\n      await new Promise<void>((resolve) => waiting.push(resolve));\n    }\n    try {\n      return await fetchImpl(input, init);\n    } finally {\n      const next = waiting.shift();\n      if (next === undefined) {\n        running -= 1;\n      } else {\n        next();\n      }\n    }\n  };\n}\n\nexport interface RemoteFetchOptions {\n  /** Time limit of one fetch and its body, unless the Redocly config has its own `customFetch`. */\n  readonly timeoutMs: number;\n  readonly access: RefAccess;\n  readonly maxParallelFetches: number;\n}\n\n/**\n * The resolve config with the fetch the loader uses. A `customFetch` of the Redocly config is\n * kept and wrapped, so that each redirect is checked and only a few documents load at once. The\n * configured headers move into that wrapper: Redocly would match them against the raw URL and\n * send them on through redirects.\n */\nexport function resolveConfigWithAccess(\n  resolve: ResolveConfig,\n  options: RemoteFetchOptions,\n): ResolveConfig {\n  // Redocly types `customFetch` as `Function`; it is called as fetch is.\n  const configured = resolve.http.customFetch as RemoteFetch | undefined;\n  const base = configured ?? fetchWithTimeout(options.timeoutMs);\n  const checked = fetchWithCheckedRedirects(base, {\n    headers: resolve.http.headers,\n    hosts: options.access.remoteHosts,\n  });\n  // The limit is outside the redirects, so all hops of one document share one slot.\n  const customFetch = fetchWithConcurrencyLimit(checked, options.maxParallelFetches);\n  return { ...resolve, http: { ...resolve.http, headers: [], customFetch } };\n}\n"],"names":["isHostAllowed","refForbiddenError","headersFor"],"mappings":"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"}

package/dist/adapters/redocly-loader/remote-fetch.mjs

@@ -1,7 +1,8 @@
 import { isHostAllowed } from './allowed-hosts.mjs';
+import { headersFor } from './configured-headers.mjs';
 import { refForbiddenError } from './schema-load-errors.mjs';
 
-const MAX_CHECKED_REDIRECTS = 5;
+const MAX_REDIRECTS = 20;
 const REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([101, 103, 204, 205, 304]);
 async function bufferedResponse(response) {
@@ -24,33 +25,58 @@ function fetchWithTimeout(timeoutMs) {
     }
   };
 }
-function fetchWithCheckedRedirects(fetchImpl, hosts) {
+function fetchWithCheckedRedirects(fetchImpl, policy) {
   return async (input, init = {}) => {
-    const firstOrigin = new URL(input).origin;
     let url = new URL(input);
-    for (let hop = 0; hop <= MAX_CHECKED_REDIRECTS; hop += 1) {
-      if (hop > 0 && !isHostAllowed(url, hosts)) {
-        throw refForbiddenError(url.href, { reason: "host-not-allowed", allowedHosts: [...hosts] });
+    for (let hop = 0; hop <= MAX_REDIRECTS; hop += 1) {
+      if (hop > 0 && policy.hosts !== void 0 && !isHostAllowed(url, policy.hosts)) {
+        throw refForbiddenError(url.href, {
+          reason: "host-not-allowed",
+          allowedHosts: [...policy.hosts]
+        });
       }
-      const { headers, ...rest } = init;
-      const hopInit = url.origin === firstOrigin && headers !== void 0 ? { ...rest, headers } : rest;
-      const response = await fetchImpl(url.href, { ...hopInit, redirect: "manual" });
+      const headers = await headersFor(url, policy.headers);
+      const response = await fetchImpl(url.href, { ...init, headers, redirect: "manual" });
       const location = response.headers.get("location");
       if (!REDIRECT_STATUSES.has(response.status) || location === null) {
         return response;
       }
       url = new URL(location, url);
     }
-    throw new Error(`More than ${MAX_CHECKED_REDIRECTS} redirects loading ${input}`);
+    throw new Error(`More than ${MAX_REDIRECTS} redirects loading ${input}`);
+  };
+}
+function fetchWithConcurrencyLimit(fetchImpl, limit) {
+  let running = 0;
+  const waiting = [];
+  return async (input, init) => {
+    if (running < limit) {
+      running += 1;
+    } else {
+      await new Promise((resolve) => waiting.push(resolve));
+    }
+    try {
+      return await fetchImpl(input, init);
+    } finally {
+      const next = waiting.shift();
+      if (next === void 0) {
+        running -= 1;
+      } else {
+        next();
+      }
+    }
   };
 }
 function resolveConfigWithAccess(resolve, options) {
   const configured = resolve.http.customFetch;
   const base = configured ?? fetchWithTimeout(options.timeoutMs);
-  const hosts = options.access.remoteHosts;
-  const customFetch = hosts === void 0 ? base : fetchWithCheckedRedirects(base, hosts);
-  return { ...resolve, http: { ...resolve.http, customFetch } };
+  const checked = fetchWithCheckedRedirects(base, {
+    headers: resolve.http.headers,
+    hosts: options.access.remoteHosts
+  });
+  const customFetch = fetchWithConcurrencyLimit(checked, options.maxParallelFetches);
+  return { ...resolve, http: { ...resolve.http, headers: [], customFetch } };
 }
 
-export { MAX_CHECKED_REDIRECTS, fetchWithCheckedRedirects, resolveConfigWithAccess };
+export { MAX_REDIRECTS, fetchWithCheckedRedirects, fetchWithConcurrencyLimit, resolveConfigWithAccess };
 //# sourceMappingURL=remote-fetch.mjs.map

package/dist/adapters/redocly-loader/remote-fetch.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"remote-fetch.mjs","sources":["../../../src/adapters/redocly-loader/remote-fetch.ts"],"sourcesContent":["import type { Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport type { RefAccess } from \"../../application/ports/schema-loader.js\";\nimport { isHostAllowed } from \"./allowed-hosts.js\";\nimport { refForbiddenError } from \"./schema-load-errors.js\";\n\n/** How the loader fetches remote documents: a time limit, and the host limit on redirects. */\n\ntype ResolveConfig = RedoclyConfig[\"resolve\"];\n\n/** The fetch Redocly calls for a remote document (`resolve.http.customFetch`). */\nexport type RemoteFetch = (input: string, init?: RequestInit) => Promise<Response>;\n\n/**\n * Redirects followed for a remote `$ref` when hosts are limited. Each hop is checked, so fetch\n * cannot follow them on its own; 5 covers http → https plus a moved file, and a loop stops early.\n */\nexport const MAX_CHECKED_REDIRECTS = 5;\n\nconst REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);\n\n/** Statuses whose responses have no body; `new Response()` refuses a body for them. */\nconst NULL_BODY_STATUSES = new Set([101, 103, 204, 205, 304]);\n\n/** A response whose body is already read, so that reading it again cannot wait or fail. */\nasync function bufferedResponse(response: Response): Promise<Response> {\n  const body = await response.arrayBuffer();\n  const { status, statusText, headers } = response;\n  return new Response(NULL_BODY_STATUSES.has(status) ? null : body, {\n    status,\n    statusText,\n    headers,\n  });\n}\n\n/**\n * Fetch with a time limit for the whole response, body included: Node's own fetch waits five\n * minutes for a server that never answers, and a server that sends its body one byte at a time\n * never finishes. The body is read here, inside the limit; when Redocly read it, the abort\n * surfaced as a `DOMException` whose read-only `message` Redocly tried to change, which gave\n * \"Cannot set property message of  which has only a getter\" instead of the time limit.\n */\nfunction fetchWithTimeout(timeoutMs: number): RemoteFetch {\n  return async (input, init = {}) => {\n    try {\n      const response = await fetch(input, { ...init, signal: AbortSignal.timeout(timeoutMs) });\n      return await bufferedResponse(response);\n    } catch (cause) {\n      const isTimeout = cause instanceof Error && cause.name === \"TimeoutError\";\n      throw isTimeout ? new Error(`Timed out after ${timeoutMs} ms loading ${input}`) : cause;\n    }\n  };\n}\n\n/**\n * Follow redirects one by one, and refuse a redirect to a host that is not listed. The first URL\n * was checked by the resolver (or is the root document). As fetch does, the configured headers\n * (often credentials) are not sent on to another origin.\n */\nexport function fetchWithCheckedRedirects(\n  fetchImpl: RemoteFetch,\n  hosts: readonly string[],\n): RemoteFetch {\n  return async (input, init = {}) => {\n    const firstOrigin = new URL(input).origin;\n    let url = new URL(input);\n    for (let hop = 0; hop <= MAX_CHECKED_REDIRECTS; hop += 1) {\n      if (hop > 0 && !isHostAllowed(url, hosts)) {\n        throw refForbiddenError(url.href, { reason: \"host-not-allowed\", allowedHosts: [...hosts] });\n      }\n      const { headers, ...rest } = init;\n      const hopInit: RequestInit =\n        url.origin === firstOrigin && headers !== undefined ? { ...rest, headers } : rest;\n      const response = await fetchImpl(url.href, { ...hopInit, redirect: \"manual\" });\n      const location = response.headers.get(\"location\");\n      if (!REDIRECT_STATUSES.has(response.status) || location === null) {\n        return response;\n      }\n      url = new URL(location, url);\n    }\n    throw new Error(`More than ${MAX_CHECKED_REDIRECTS} redirects loading ${input}`);\n  };\n}\n\nexport interface RemoteFetchOptions {\n  /** Time limit of one fetch and its body, unless the Redocly config has its own `customFetch`. */\n  readonly timeoutMs: number;\n  readonly access: RefAccess;\n}\n\n/**\n * The resolve config with the fetch the loader uses. A `customFetch` of the Redocly config is\n * kept; with a host limit, it is wrapped so that each redirect is checked.\n */\nexport function resolveConfigWithAccess(\n  resolve: ResolveConfig,\n  options: RemoteFetchOptions,\n): ResolveConfig {\n  // Redocly types `customFetch` as `Function`; it is called as fetch is.\n  const configured = resolve.http.customFetch as RemoteFetch | undefined;\n  const base = configured ?? fetchWithTimeout(options.timeoutMs);\n  const hosts = options.access.remoteHosts;\n  const customFetch = hosts === undefined ? base : fetchWithCheckedRedirects(base, hosts);\n  return { ...resolve, http: { ...resolve.http, customFetch } };\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote-fetch.mjs","sources":["../../../src/adapters/redocly-loader/remote-fetch.ts"],"sourcesContent":["import type { Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport type { RefAccess } from \"../../application/ports/schema-loader.js\";\nimport { isHostAllowed } from \"./allowed-hosts.js\";\nimport { type ConfiguredHeader, headersFor } from \"./configured-headers.js\";\nimport { refForbiddenError } from \"./schema-load-errors.js\";\n\n/**\n * How the loader fetches remote documents: a time limit, the host limit and the configured headers\n * checked on every redirect.\n */\n\ntype ResolveConfig = RedoclyConfig[\"resolve\"];\n\n/** The fetch Redocly calls for a remote document (`resolve.http.customFetch`). */\nexport type RemoteFetch = (input: string, init?: RequestInit) => Promise<Response>;\n\n/**\n * Redirects followed for one remote document. The loader follows them itself, so that each hop is\n * checked; 20 is the limit of the Fetch standard, which fetch applied before.\n */\nexport const MAX_REDIRECTS = 20;\n\nconst REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);\n\n/** Statuses whose responses have no body; `new Response()` refuses a body for them. */\nconst NULL_BODY_STATUSES = new Set([101, 103, 204, 205, 304]);\n\n/** A response whose body is already read, so that reading it again cannot wait or fail. */\nasync function bufferedResponse(response: Response): Promise<Response> {\n  const body = await response.arrayBuffer();\n  const { status, statusText, headers } = response;\n  return new Response(NULL_BODY_STATUSES.has(status) ? null : body, {\n    status,\n    statusText,\n    headers,\n  });\n}\n\n/**\n * Fetch with a time limit for the whole response, body included: Node's own fetch waits five\n * minutes for a server that never answers, and a server that sends its body one byte at a time\n * never finishes. The body is read here, inside the limit; when Redocly read it, the abort\n * surfaced as a `DOMException` whose read-only `message` Redocly tried to change, which gave\n * \"Cannot set property message of  which has only a getter\" instead of the time limit.\n */\nfunction fetchWithTimeout(timeoutMs: number): RemoteFetch {\n  return async (input, init = {}) => {\n    try {\n      const response = await fetch(input, { ...init, signal: AbortSignal.timeout(timeoutMs) });\n      return await bufferedResponse(response);\n    } catch (cause) {\n      const isTimeout = cause instanceof Error && cause.name === \"TimeoutError\";\n      throw isTimeout ? new Error(`Timed out after ${timeoutMs} ms loading ${input}`) : cause;\n    }\n  };\n}\n\n/** What every hop of a remote fetch is checked against. */\nexport interface RedirectPolicy {\n  /** `resolve.http.headers` of the Redocly config; chosen again for the URL of every hop. */\n  readonly headers: readonly ConfiguredHeader[];\n  /** `--remote-ref-hosts`; undefined allows every host. */\n  readonly hosts: readonly string[] | undefined;\n}\n\n/**\n * Follow redirects one by one. Fetch drops only `Authorization`, `Cookie` and\n * `Proxy-Authorization` on a redirect to another origin and keeps every other header (an\n * `X-Api-Key`), so the configured headers are chosen for each hop's own URL instead, and a hop to\n * a host that is not listed is refused before it is fetched. The first URL was checked by the\n * resolver (or is the root document). Redocly passes only the configured headers in `init`, and\n * it gets an empty list of them (`resolveConfigWithAccess`), so `init.headers` is replaced.\n */\nexport function fetchWithCheckedRedirects(\n  fetchImpl: RemoteFetch,\n  policy: RedirectPolicy,\n): RemoteFetch {\n  return async (input, init = {}) => {\n    let url = new URL(input);\n    for (let hop = 0; hop <= MAX_REDIRECTS; hop += 1) {\n      if (hop > 0 && policy.hosts !== undefined && !isHostAllowed(url, policy.hosts)) {\n        throw refForbiddenError(url.href, {\n          reason: \"host-not-allowed\",\n          allowedHosts: [...policy.hosts],\n        });\n      }\n      const headers = await headersFor(url, policy.headers);\n      const response = await fetchImpl(url.href, { ...init, headers, redirect: \"manual\" });\n      const location = response.headers.get(\"location\");\n      if (!REDIRECT_STATUSES.has(response.status) || location === null) {\n        return response;\n      }\n      url = new URL(location, url);\n    }\n    throw new Error(`More than ${MAX_REDIRECTS} redirects loading ${input}`);\n  };\n}\n\n/** Bounds on the remote documents of one load (threat model T2, ADR-033). */\nexport interface RemoteDocumentLimits {\n  /** Remote documents one load may fetch, the root included; one more is refused. */\n  readonly maxDocuments: number;\n  /** Remote documents fetched at the same time; the others wait for a free slot. */\n  readonly maxParallelFetches: number;\n}\n\n/**\n * At most `limit` calls of the fetch run at once; the others wait in order. A finished call hands\n * its slot to the next waiting one.\n */\nexport function fetchWithConcurrencyLimit(fetchImpl: RemoteFetch, limit: number): RemoteFetch {\n  let running = 0;\n  const waiting: (() => void)[] = [];\n  return async (input, init) => {\n    if (running < limit) {\n      running += 1;\n    } else {\n      await new Promise<void>((resolve) => waiting.push(resolve));\n    }\n    try {\n      return await fetchImpl(input, init);\n    } finally {\n      const next = waiting.shift();\n      if (next === undefined) {\n        running -= 1;\n      } else {\n        next();\n      }\n    }\n  };\n}\n\nexport interface RemoteFetchOptions {\n  /** Time limit of one fetch and its body, unless the Redocly config has its own `customFetch`. */\n  readonly timeoutMs: number;\n  readonly access: RefAccess;\n  readonly maxParallelFetches: number;\n}\n\n/**\n * The resolve config with the fetch the loader uses. A `customFetch` of the Redocly config is\n * kept and wrapped, so that each redirect is checked and only a few documents load at once. The\n * configured headers move into that wrapper: Redocly would match them against the raw URL and\n * send them on through redirects.\n */\nexport function resolveConfigWithAccess(\n  resolve: ResolveConfig,\n  options: RemoteFetchOptions,\n): ResolveConfig {\n  // Redocly types `customFetch` as `Function`; it is called as fetch is.\n  const configured = resolve.http.customFetch as RemoteFetch | undefined;\n  const base = configured ?? fetchWithTimeout(options.timeoutMs);\n  const checked = fetchWithCheckedRedirects(base, {\n    headers: resolve.http.headers,\n    hosts: options.access.remoteHosts,\n  });\n  // The limit is outside the redirects, so all hops of one document share one slot.\n  const customFetch = fetchWithConcurrencyLimit(checked, options.maxParallelFetches);\n  return { ...resolve, http: { ...resolve.http, headers: [], customFetch } };\n}\n"],"names":[],"mappings":"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"}

package/dist/adapters/redocly-loader/schema-load-errors.cjs

@@ -1,6 +1,8 @@
 'use strict';
 
+const assertNever = require('../../domain/assert-never.cjs');
 const errors = require('../../domain/errors.cjs');
+const urlCredentials = require('../../domain/url-credentials.cjs');
 
 function sourceEmptyError(message) {
   return new errors.OpenAPITypesafeError({ code: errors.ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });
@@ -29,7 +31,7 @@ function loadFailedError(absoluteRef, cause) {
   return new errors.OpenAPITypesafeError({
     code: errors.ERROR_CODES.SCHEMA_LOAD_FAILED,
     message: causeMessage(cause),
-    details: { source: absoluteRef },
+    details: { source: urlCredentials.redactUrlCredentials(absoluteRef) },
     cause
   });
 }
@@ -37,7 +39,7 @@ function parseFailedError(format, absoluteRef, cause) {
   return new errors.OpenAPITypesafeError({
     code: errors.ERROR_CODES.SCHEMA_PARSE_FAILED,
     message: causeMessage(cause),
-    details: { format, source: absoluteRef },
+    details: { format, source: urlCredentials.redactUrlCredentials(absoluteRef) },
     cause
   });
 }
@@ -52,7 +54,7 @@ function schemaInvalidError(problems) {
   return new errors.OpenAPITypesafeError({
     code: errors.ERROR_CODES.SCHEMA_INVALID,
     message: problems.at(-1) ?? "",
-    details: { problems: [...problems] }
+    details: { problems: problems.map(urlCredentials.redactUrlCredentials) }
   });
 }
 function refCycleError(cause) {
@@ -66,12 +68,28 @@ function refCycleError(cause) {
 function hostListText(hosts) {
   return hosts.length === 0 ? "none" : hosts.join(", ");
 }
+function limitText(details) {
+  switch (details.reason) {
+    case "outside-local-root":
+      return `it is outside the local $ref root ${details.localRoot}`;
+    case "host-not-allowed": {
+      const hosts = hostListText(details.allowedHosts);
+      return `its host is not in the allowed remote $ref hosts (${hosts})`;
+    }
+    case "local-ref-from-remote":
+      return `it is not an http(s) URL, and the $ref is in the remote document ${details.base}`;
+    case "too-many-remote-documents":
+      return `the document refers to more than ${details.maxDocuments} remote documents`;
+    default:
+      return assertNever.assertNever(details);
+  }
+}
 function refForbiddenError(ref, details) {
-  const limit = details.reason === "outside-local-root" ? `it is outside the local $ref root ${details.localRoot}` : `its host is not in the allowed remote $ref hosts (${hostListText(details.allowedHosts)})`;
+  const limit = limitText(details);
   return new errors.OpenAPITypesafeError({
     code: errors.ERROR_CODES.SCHEMA_REF_FORBIDDEN,
     message: `Refused to load ${ref}: ${limit}`,
-    details: { ref, ...details }
+    details: { ref: urlCredentials.redactUrlCredentials(ref), ...details }
   });
 }
 

package/dist/adapters/redocly-loader/schema-load-errors.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema-load-errors.cjs","sources":["../../../src/adapters/redocly-loader/schema-load-errors.ts"],"sourcesContent":["import { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\n\n/**\n * The typed errors of loading, validating and bundling a document (ADR-011). Messages are the\n * original messages, so Node API users who match on them keep working.\n */\n\n/** No source was given, or the source is empty. */\nexport function sourceEmptyError(message: string): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({ code: ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });\n}\n\n/** The source is neither a URL, text, buffer, stream nor plain object. */\nexport function sourceInvalidError(source: unknown): OpenAPITypesafeError {\n  const received = Array.isArray(source) ? \"Array\" : typeof source;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message: `Expected string, object, or Buffer. Got ${received}`,\n    details: { received },\n  });\n}\n\nfunction causeMessage(cause: unknown): string {\n  return cause instanceof Error ? cause.message : String(cause);\n}\n\n/** Enough of a source string to recognise it in the message. */\nconst SOURCE_TEXT_IN_MESSAGE = 200;\n\n/**\n * A string source is document text, so a file path parses as a YAML string scalar, not as a\n * document (docs/node.md). The message says how to load the file instead.\n */\nexport function pathStringError(text: string): OpenAPITypesafeError {\n  const shown =\n    text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}…` : text;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message:\n      `The string \"${shown}\" was parsed as YAML text, not loaded as a file. ` +\n      \"To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.\",\n    details: { reason: \"path\", received: \"string\" },\n  });\n}\n\n/** Reading the document from a file or URL failed; the message is the reader's message. */\nexport function loadFailedError(absoluteRef: string, cause: unknown): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_LOAD_FAILED,\n    message: causeMessage(cause),\n    details: { source: absoluteRef },\n    cause,\n  });\n}\n\n/** The document text is not valid JSON or YAML; the message is the parser's message. */\nexport function parseFailedError(\n  format: \"json\" | \"yaml\",\n  absoluteRef: string,\n  cause: unknown,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_PARSE_FAILED,\n    message: causeMessage(cause),\n    details: { format, source: absoluteRef },\n    cause,\n  });\n}\n\n/** The document is not OpenAPI 3.x. */\nexport function versionUnsupportedError(\n  message: string,\n  parsed: Readonly<Record<string, unknown>>,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_VERSION_UNSUPPORTED,\n    message,\n    details: { openapi: parsed.openapi, swagger: parsed.swagger },\n  });\n}\n\n/**\n * Linting or bundling found errors. The message is the last error, as in the original; all error\n * messages are in `details.problems`.\n */\nexport function schemaInvalidError(problems: readonly string[]): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_INVALID,\n    message: problems.at(-1) ?? \"\",\n    details: { problems: [...problems] },\n  });\n}\n\n/** A `$ref` chain points back to itself with no schema in between (`A: $ref B`, `B: $ref A`). */\nexport function refCycleError(cause: Error): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_INVALID,\n    message: cause.message,\n    details: { reason: \"cycle\" },\n    cause,\n  });\n}\n\nfunction hostListText(hosts: readonly string[]): string {\n  return hosts.length === 0 ? \"none\" : hosts.join(\", \");\n}\n\n/** Why a `$ref` document was refused, with the limit it broke (ADR-017). */\nexport type RefRefusalDetails =\n  | { readonly reason: \"outside-local-root\"; readonly localRoot: string }\n  | { readonly reason: \"host-not-allowed\"; readonly allowedHosts: readonly string[] };\n\n/** A `$ref` is outside the local root, or its host is not allowed (threat model R1, R2). */\nexport function refForbiddenError(ref: string, details: RefRefusalDetails): OpenAPITypesafeError {\n  const limit =\n    details.reason === \"outside-local-root\"\n      ? `it is outside the local $ref root ${details.localRoot}`\n      : `its host is not in the allowed remote $ref hosts (${hostListText(details.allowedHosts)})`;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_FORBIDDEN,\n    message: `Refused to load ${ref}: ${limit}`,\n    details: { ref, ...details },\n  });\n}\n"],"names":["OpenAPITypesafeError","ERROR_CODES"],"mappings":"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"}
+{"version":3,"file":"schema-load-errors.cjs","sources":["../../../src/adapters/redocly-loader/schema-load-errors.ts"],"sourcesContent":["import { assertNever } from \"../../domain/assert-never.js\";\nimport { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\nimport { redactUrlCredentials } from \"../../domain/url-credentials.js\";\n\n/**\n * The typed errors of loading, validating and bundling a document (ADR-011). Messages are the\n * original messages, so Node API users who match on them keep working; URLs in them and in the\n * details never show user info.\n */\n\n/** No source was given, or the source is empty. */\nexport function sourceEmptyError(message: string): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({ code: ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });\n}\n\n/** The source is neither a URL, text, buffer, stream nor plain object. */\nexport function sourceInvalidError(source: unknown): OpenAPITypesafeError {\n  const received = Array.isArray(source) ? \"Array\" : typeof source;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message: `Expected string, object, or Buffer. Got ${received}`,\n    details: { received },\n  });\n}\n\nfunction causeMessage(cause: unknown): string {\n  return cause instanceof Error ? cause.message : String(cause);\n}\n\n/** Enough of a source string to recognise it in the message. */\nconst SOURCE_TEXT_IN_MESSAGE = 200;\n\n/**\n * A string source is document text, so a file path parses as a YAML string scalar, not as a\n * document (docs/node.md). The message says how to load the file instead.\n */\nexport function pathStringError(text: string): OpenAPITypesafeError {\n  const shown =\n    text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}…` : text;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message:\n      `The string \"${shown}\" was parsed as YAML text, not loaded as a file. ` +\n      \"To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.\",\n    details: { reason: \"path\", received: \"string\" },\n  });\n}\n\n/** Reading the document from a file or URL failed; the message is the reader's message. */\nexport function loadFailedError(absoluteRef: string, cause: unknown): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_LOAD_FAILED,\n    message: causeMessage(cause),\n    details: { source: redactUrlCredentials(absoluteRef) },\n    cause,\n  });\n}\n\n/** The document text is not valid JSON or YAML; the message is the parser's message. */\nexport function parseFailedError(\n  format: \"json\" | \"yaml\",\n  absoluteRef: string,\n  cause: unknown,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_PARSE_FAILED,\n    message: causeMessage(cause),\n    details: { format, source: redactUrlCredentials(absoluteRef) },\n    cause,\n  });\n}\n\n/** The document is not OpenAPI 3.x. */\nexport function versionUnsupportedError(\n  message: string,\n  parsed: Readonly<Record<string, unknown>>,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_VERSION_UNSUPPORTED,\n    message,\n    details: { openapi: parsed.openapi, swagger: parsed.swagger },\n  });\n}\n\n/**\n * Linting or bundling found errors. The message is the last error, as in the original; all error\n * messages are in `details.problems`.\n */\nexport function schemaInvalidError(problems: readonly string[]): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_INVALID,\n    message: problems.at(-1) ?? \"\",\n    details: { problems: problems.map(redactUrlCredentials) },\n  });\n}\n\n/** A `$ref` chain points back to itself with no schema in between (`A: $ref B`, `B: $ref A`). */\nexport function refCycleError(cause: Error): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_INVALID,\n    message: cause.message,\n    details: { reason: \"cycle\" },\n    cause,\n  });\n}\n\nfunction hostListText(hosts: readonly string[]): string {\n  return hosts.length === 0 ? \"none\" : hosts.join(\", \");\n}\n\n/** Why a `$ref` document was refused, with the limit it broke (ADR-017). */\nexport type RefRefusalDetails =\n  | { readonly reason: \"outside-local-root\"; readonly localRoot: string }\n  | { readonly reason: \"host-not-allowed\"; readonly allowedHosts: readonly string[] }\n  | { readonly reason: \"local-ref-from-remote\"; readonly base: string }\n  | { readonly reason: \"too-many-remote-documents\"; readonly maxDocuments: number };\n\nfunction limitText(details: RefRefusalDetails): string {\n  switch (details.reason) {\n    case \"outside-local-root\":\n      return `it is outside the local $ref root ${details.localRoot}`;\n    case \"host-not-allowed\": {\n      const hosts = hostListText(details.allowedHosts);\n      return `its host is not in the allowed remote $ref hosts (${hosts})`;\n    }\n    case \"local-ref-from-remote\":\n      return `it is not an http(s) URL, and the $ref is in the remote document ${details.base}`;\n    case \"too-many-remote-documents\":\n      return `the document refers to more than ${details.maxDocuments} remote documents`;\n    default:\n      return assertNever(details);\n  }\n}\n\n/**\n * A `$ref` is outside the local root, its host is not allowed (threat model R1, R2), a remote\n * document refers to a local file (T3), or there are too many remote documents (T2).\n */\nexport function refForbiddenError(ref: string, details: RefRefusalDetails): OpenAPITypesafeError {\n  const limit = limitText(details);\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_FORBIDDEN,\n    message: `Refused to load ${ref}: ${limit}`,\n    details: { ref: redactUrlCredentials(ref), ...details },\n  });\n}\n"],"names":["OpenAPITypesafeError","ERROR_CODES","redactUrlCredentials","assertNever"],"mappings":"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"}

package/dist/adapters/redocly-loader/schema-load-errors.mjs

@@ -1,4 +1,6 @@
+import { assertNever } from '../../domain/assert-never.mjs';
 import { OpenAPITypesafeError, ERROR_CODES } from '../../domain/errors.mjs';
+import { redactUrlCredentials } from '../../domain/url-credentials.mjs';
 
 function sourceEmptyError(message) {
   return new OpenAPITypesafeError({ code: ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });
@@ -27,7 +29,7 @@ function loadFailedError(absoluteRef, cause) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_LOAD_FAILED,
     message: causeMessage(cause),
-    details: { source: absoluteRef },
+    details: { source: redactUrlCredentials(absoluteRef) },
     cause
   });
 }
@@ -35,7 +37,7 @@ function parseFailedError(format, absoluteRef, cause) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_PARSE_FAILED,
     message: causeMessage(cause),
-    details: { format, source: absoluteRef },
+    details: { format, source: redactUrlCredentials(absoluteRef) },
     cause
   });
 }
@@ -50,7 +52,7 @@ function schemaInvalidError(problems) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_INVALID,
     message: problems.at(-1) ?? "",
-    details: { problems: [...problems] }
+    details: { problems: problems.map(redactUrlCredentials) }
   });
 }
 function refCycleError(cause) {
@@ -64,12 +66,28 @@ function refCycleError(cause) {
 function hostListText(hosts) {
   return hosts.length === 0 ? "none" : hosts.join(", ");
 }
+function limitText(details) {
+  switch (details.reason) {
+    case "outside-local-root":
+      return `it is outside the local $ref root ${details.localRoot}`;
+    case "host-not-allowed": {
+      const hosts = hostListText(details.allowedHosts);
+      return `its host is not in the allowed remote $ref hosts (${hosts})`;
+    }
+    case "local-ref-from-remote":
+      return `it is not an http(s) URL, and the $ref is in the remote document ${details.base}`;
+    case "too-many-remote-documents":
+      return `the document refers to more than ${details.maxDocuments} remote documents`;
+    default:
+      return assertNever(details);
+  }
+}
 function refForbiddenError(ref, details) {
-  const limit = details.reason === "outside-local-root" ? `it is outside the local $ref root ${details.localRoot}` : `its host is not in the allowed remote $ref hosts (${hostListText(details.allowedHosts)})`;
+  const limit = limitText(details);
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_REF_FORBIDDEN,
     message: `Refused to load ${ref}: ${limit}`,
-    details: { ref, ...details }
+    details: { ref: redactUrlCredentials(ref), ...details }
   });
 }
 

package/dist/adapters/redocly-loader/schema-load-errors.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema-load-errors.mjs","sources":["../../../src/adapters/redocly-loader/schema-load-errors.ts"],"sourcesContent":["import { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\n\n/**\n * The typed errors of loading, validating and bundling a document (ADR-011). Messages are the\n * original messages, so Node API users who match on them keep working.\n */\n\n/** No source was given, or the source is empty. */\nexport function sourceEmptyError(message: string): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({ code: ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });\n}\n\n/** The source is neither a URL, text, buffer, stream nor plain object. */\nexport function sourceInvalidError(source: unknown): OpenAPITypesafeError {\n  const received = Array.isArray(source) ? \"Array\" : typeof source;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message: `Expected string, object, or Buffer. Got ${received}`,\n    details: { received },\n  });\n}\n\nfunction causeMessage(cause: unknown): string {\n  return cause instanceof Error ? cause.message : String(cause);\n}\n\n/** Enough of a source string to recognise it in the message. */\nconst SOURCE_TEXT_IN_MESSAGE = 200;\n\n/**\n * A string source is document text, so a file path parses as a YAML string scalar, not as a\n * document (docs/node.md). The message says how to load the file instead.\n */\nexport function pathStringError(text: string): OpenAPITypesafeError {\n  const shown =\n    text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}…` : text;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message:\n      `The string \"${shown}\" was parsed as YAML text, not loaded as a file. ` +\n      \"To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.\",\n    details: { reason: \"path\", received: \"string\" },\n  });\n}\n\n/** Reading the document from a file or URL failed; the message is the reader's message. */\nexport function loadFailedError(absoluteRef: string, cause: unknown): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_LOAD_FAILED,\n    message: causeMessage(cause),\n    details: { source: absoluteRef },\n    cause,\n  });\n}\n\n/** The document text is not valid JSON or YAML; the message is the parser's message. */\nexport function parseFailedError(\n  format: \"json\" | \"yaml\",\n  absoluteRef: string,\n  cause: unknown,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_PARSE_FAILED,\n    message: causeMessage(cause),\n    details: { format, source: absoluteRef },\n    cause,\n  });\n}\n\n/** The document is not OpenAPI 3.x. */\nexport function versionUnsupportedError(\n  message: string,\n  parsed: Readonly<Record<string, unknown>>,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_VERSION_UNSUPPORTED,\n    message,\n    details: { openapi: parsed.openapi, swagger: parsed.swagger },\n  });\n}\n\n/**\n * Linting or bundling found errors. The message is the last error, as in the original; all error\n * messages are in `details.problems`.\n */\nexport function schemaInvalidError(problems: readonly string[]): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_INVALID,\n    message: problems.at(-1) ?? \"\",\n    details: { problems: [...problems] },\n  });\n}\n\n/** A `$ref` chain points back to itself with no schema in between (`A: $ref B`, `B: $ref A`). */\nexport function refCycleError(cause: Error): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_INVALID,\n    message: cause.message,\n    details: { reason: \"cycle\" },\n    cause,\n  });\n}\n\nfunction hostListText(hosts: readonly string[]): string {\n  return hosts.length === 0 ? \"none\" : hosts.join(\", \");\n}\n\n/** Why a `$ref` document was refused, with the limit it broke (ADR-017). */\nexport type RefRefusalDetails =\n  | { readonly reason: \"outside-local-root\"; readonly localRoot: string }\n  | { readonly reason: \"host-not-allowed\"; readonly allowedHosts: readonly string[] };\n\n/** A `$ref` is outside the local root, or its host is not allowed (threat model R1, R2). */\nexport function refForbiddenError(ref: string, details: RefRefusalDetails): OpenAPITypesafeError {\n  const limit =\n    details.reason === \"outside-local-root\"\n      ? `it is outside the local $ref root ${details.localRoot}`\n      : `its host is not in the allowed remote $ref hosts (${hostListText(details.allowedHosts)})`;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_FORBIDDEN,\n    message: `Refused to load ${ref}: ${limit}`,\n    details: { ref, ...details },\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema-load-errors.mjs","sources":["../../../src/adapters/redocly-loader/schema-load-errors.ts"],"sourcesContent":["import { assertNever } from \"../../domain/assert-never.js\";\nimport { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\nimport { redactUrlCredentials } from \"../../domain/url-credentials.js\";\n\n/**\n * The typed errors of loading, validating and bundling a document (ADR-011). Messages are the\n * original messages, so Node API users who match on them keep working; URLs in them and in the\n * details never show user info.\n */\n\n/** No source was given, or the source is empty. */\nexport function sourceEmptyError(message: string): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({ code: ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });\n}\n\n/** The source is neither a URL, text, buffer, stream nor plain object. */\nexport function sourceInvalidError(source: unknown): OpenAPITypesafeError {\n  const received = Array.isArray(source) ? \"Array\" : typeof source;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message: `Expected string, object, or Buffer. Got ${received}`,\n    details: { received },\n  });\n}\n\nfunction causeMessage(cause: unknown): string {\n  return cause instanceof Error ? cause.message : String(cause);\n}\n\n/** Enough of a source string to recognise it in the message. */\nconst SOURCE_TEXT_IN_MESSAGE = 200;\n\n/**\n * A string source is document text, so a file path parses as a YAML string scalar, not as a\n * document (docs/node.md). The message says how to load the file instead.\n */\nexport function pathStringError(text: string): OpenAPITypesafeError {\n  const shown =\n    text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}…` : text;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message:\n      `The string \"${shown}\" was parsed as YAML text, not loaded as a file. ` +\n      \"To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.\",\n    details: { reason: \"path\", received: \"string\" },\n  });\n}\n\n/** Reading the document from a file or URL failed; the message is the reader's message. */\nexport function loadFailedError(absoluteRef: string, cause: unknown): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_LOAD_FAILED,\n    message: causeMessage(cause),\n    details: { source: redactUrlCredentials(absoluteRef) },\n    cause,\n  });\n}\n\n/** The document text is not valid JSON or YAML; the message is the parser's message. */\nexport function parseFailedError(\n  format: \"json\" | \"yaml\",\n  absoluteRef: string,\n  cause: unknown,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_PARSE_FAILED,\n    message: causeMessage(cause),\n    details: { format, source: redactUrlCredentials(absoluteRef) },\n    cause,\n  });\n}\n\n/** The document is not OpenAPI 3.x. */\nexport function versionUnsupportedError(\n  message: string,\n  parsed: Readonly<Record<string, unknown>>,\n): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_VERSION_UNSUPPORTED,\n    message,\n    details: { openapi: parsed.openapi, swagger: parsed.swagger },\n  });\n}\n\n/**\n * Linting or bundling found errors. The message is the last error, as in the original; all error\n * messages are in `details.problems`.\n */\nexport function schemaInvalidError(problems: readonly string[]): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_INVALID,\n    message: problems.at(-1) ?? \"\",\n    details: { problems: problems.map(redactUrlCredentials) },\n  });\n}\n\n/** A `$ref` chain points back to itself with no schema in between (`A: $ref B`, `B: $ref A`). */\nexport function refCycleError(cause: Error): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_INVALID,\n    message: cause.message,\n    details: { reason: \"cycle\" },\n    cause,\n  });\n}\n\nfunction hostListText(hosts: readonly string[]): string {\n  return hosts.length === 0 ? \"none\" : hosts.join(\", \");\n}\n\n/** Why a `$ref` document was refused, with the limit it broke (ADR-017). */\nexport type RefRefusalDetails =\n  | { readonly reason: \"outside-local-root\"; readonly localRoot: string }\n  | { readonly reason: \"host-not-allowed\"; readonly allowedHosts: readonly string[] }\n  | { readonly reason: \"local-ref-from-remote\"; readonly base: string }\n  | { readonly reason: \"too-many-remote-documents\"; readonly maxDocuments: number };\n\nfunction limitText(details: RefRefusalDetails): string {\n  switch (details.reason) {\n    case \"outside-local-root\":\n      return `it is outside the local $ref root ${details.localRoot}`;\n    case \"host-not-allowed\": {\n      const hosts = hostListText(details.allowedHosts);\n      return `its host is not in the allowed remote $ref hosts (${hosts})`;\n    }\n    case \"local-ref-from-remote\":\n      return `it is not an http(s) URL, and the $ref is in the remote document ${details.base}`;\n    case \"too-many-remote-documents\":\n      return `the document refers to more than ${details.maxDocuments} remote documents`;\n    default:\n      return assertNever(details);\n  }\n}\n\n/**\n * A `$ref` is outside the local root, its host is not allowed (threat model R1, R2), a remote\n * document refers to a local file (T3), or there are too many remote documents (T2).\n */\nexport function refForbiddenError(ref: string, details: RefRefusalDetails): OpenAPITypesafeError {\n  const limit = limitText(details);\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_REF_FORBIDDEN,\n    message: `Refused to load ${ref}: ${limit}`,\n    details: { ref: redactUrlCredentials(ref), ...details },\n  });\n}\n"],"names":[],"mappings":"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"}

package/dist/adapters/redocly-loader/unsupported-keys.cjs

@@ -13,6 +13,14 @@ const UNSUPPORTED_KEYS = /* @__PURE__ */ new Set([
   "__lookupGetter__",
   "__lookupSetter__"
 ]);
+const CONSTRUCTOR_KEY = "constructor";
+function isUnsupportedEntry(key, value) {
+  if (UNSUPPORTED_KEYS.has(key)) {
+    return true;
+  }
+  const name = value?.name;
+  return key === CONSTRUCTOR_KEY && typeof value === "object" && typeof name === "string";
+}
 const KEYS_IN_MESSAGE = 5;
 function escapePointerSegment(segment) {
   return segment.replaceAll("~", "~0").replaceAll("/", "~1");
@@ -31,7 +39,7 @@ function unsupportedKeysOf(document) {
   for (let node = pending.pop(); node !== void 0; node = pending.pop()) {
     for (const [key, child] of Object.entries(node.value)) {
       const pointer = `${node.pointer}/${escapePointerSegment(key)}`;
-      if (UNSUPPORTED_KEYS.has(key)) {
+      if (isUnsupportedEntry(key, child)) {
         found.push({ key, pointer, source: document.source });
       }
       enqueue(child, pointer);