openapi-typesafe 1.0.0-rc.2 → 1.0.0-rc.4

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 { 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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"}
+{"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 { redactUnparsedUrl, redactUrlSecrets } from \"../../domain/url-secrets.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\n/** A source string starts with a URL scheme but does not parse as a URL. */\nexport function urlInvalidError(text: string): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message: `The string ${redactUnparsedUrl(text)} starts like a URL but is not a valid URL`,\n    details: { reason: \"url\", received: \"string\" },\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/** Where document text that is only a YAML string came from. */\nexport type TextOrigin = \"string\" | \"stream\";\n\nconst LOAD_FILE_ADVICE =\n  \"To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.\";\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. Text read from a\n * stream (stdin in the CLI) is named as such; `details.text` lets the CLI give its own advice.\n */\nexport function pathStringError(text: string, origin: TextOrigin): OpenAPITypesafeError {\n  const shown =\n    text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}…` : text;\n  const message =\n    origin === \"string\"\n      ? `The string \"${shown}\" was parsed as YAML text, not loaded as a file. ${LOAD_FILE_ADVICE}`\n      : `The stream held only the YAML string \"${shown}\", not an OpenAPI document. ` +\n        LOAD_FILE_ADVICE;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message,\n    details: { reason: \"path\", received: origin, text: shown },\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: redactUrlSecrets(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: redactUrlSecrets(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(redactUrlSecrets) },\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  | { readonly reason: \"remote-document-too-large\"; readonly maxDocumentBytes: number }\n  | { readonly reason: \"remote-documents-too-large\"; readonly maxTotalBytes: number }\n  | { readonly reason: \"remote-documents-too-many-nodes\"; readonly maxNodes: number };\n\nconst BYTES_PER_MEBIBYTE = 1024 * 1024;\n\n/** A byte count in MiB, as the limits are chosen: `256 MiB`; a smaller limit in bytes. */\nfunction sizeText(bytes: number): string {\n  return bytes % BYTES_PER_MEBIBYTE === 0 ? `${bytes / BYTES_PER_MEBIBYTE} MiB` : `${bytes} bytes`;\n}\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    case \"remote-document-too-large\":\n      return `its body is larger than ${sizeText(details.maxDocumentBytes)} once decoded`;\n    case \"remote-documents-too-large\": {\n      const limit = sizeText(details.maxTotalBytes);\n      return `the remote documents of this run are larger than ${limit} together once decoded`;\n    }\n    case \"remote-documents-too-many-nodes\": {\n      const limit = details.maxNodes;\n      return `the remote documents of this run parse into more than ${limit} nodes together`;\n    }\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 or too large 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: redactUrlSecrets(ref), ...details },\n  });\n}\n"],"names":["OpenAPITypesafeError","ERROR_CODES","redactUnparsedUrl","redactUrlSecrets","assertNever"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { assertNever } from '../../domain/assert-never.mjs';
 import { OpenAPITypesafeError, ERROR_CODES } from '../../domain/errors.mjs';
-import { redactUrlCredentials } from '../../domain/url-credentials.mjs';
+import { redactUrlSecrets, redactUnparsedUrl } from '../../domain/url-secrets.mjs';
 
 function sourceEmptyError(message) {
   return new OpenAPITypesafeError({ code: ERROR_CODES.SCHEMA_SOURCE_EMPTY, message });
@@ -13,23 +13,32 @@ function sourceInvalidError(source) {
     details: { received }
   });
 }
+function urlInvalidError(text) {
+  return new OpenAPITypesafeError({
+    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,
+    message: `The string ${redactUnparsedUrl(text)} starts like a URL but is not a valid URL`,
+    details: { reason: "url", received: "string" }
+  });
+}
 function causeMessage(cause) {
   return cause instanceof Error ? cause.message : String(cause);
 }
 const SOURCE_TEXT_IN_MESSAGE = 200;
-function pathStringError(text) {
+const LOAD_FILE_ADVICE = "To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.";
+function pathStringError(text, origin) {
   const shown = text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}\u2026` : text;
+  const message = origin === "string" ? `The string "${shown}" was parsed as YAML text, not loaded as a file. ${LOAD_FILE_ADVICE}` : `The stream held only the YAML string "${shown}", not an OpenAPI document. ` + LOAD_FILE_ADVICE;
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_SOURCE_INVALID,
-    message: `The string "${shown}" was parsed as YAML text, not loaded as a file. To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.`,
-    details: { reason: "path", received: "string" }
+    message,
+    details: { reason: "path", received: origin, text: shown }
   });
 }
 function loadFailedError(absoluteRef, cause) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_LOAD_FAILED,
     message: causeMessage(cause),
-    details: { source: redactUrlCredentials(absoluteRef) },
+    details: { source: redactUrlSecrets(absoluteRef) },
     cause
   });
 }
@@ -37,7 +46,7 @@ function parseFailedError(format, absoluteRef, cause) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_PARSE_FAILED,
     message: causeMessage(cause),
-    details: { format, source: redactUrlCredentials(absoluteRef) },
+    details: { format, source: redactUrlSecrets(absoluteRef) },
     cause
   });
 }
@@ -52,7 +61,7 @@ function schemaInvalidError(problems) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_INVALID,
     message: problems.at(-1) ?? "",
-    details: { problems: problems.map(redactUrlCredentials) }
+    details: { problems: problems.map(redactUrlSecrets) }
   });
 }
 function refCycleError(cause) {
@@ -66,6 +75,10 @@ function refCycleError(cause) {
 function hostListText(hosts) {
   return hosts.length === 0 ? "none" : hosts.join(", ");
 }
+const BYTES_PER_MEBIBYTE = 1024 * 1024;
+function sizeText(bytes) {
+  return bytes % BYTES_PER_MEBIBYTE === 0 ? `${bytes / BYTES_PER_MEBIBYTE} MiB` : `${bytes} bytes`;
+}
 function limitText(details) {
   switch (details.reason) {
     case "outside-local-root":
@@ -78,6 +91,16 @@ function limitText(details) {
       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`;
+    case "remote-document-too-large":
+      return `its body is larger than ${sizeText(details.maxDocumentBytes)} once decoded`;
+    case "remote-documents-too-large": {
+      const limit = sizeText(details.maxTotalBytes);
+      return `the remote documents of this run are larger than ${limit} together once decoded`;
+    }
+    case "remote-documents-too-many-nodes": {
+      const limit = details.maxNodes;
+      return `the remote documents of this run parse into more than ${limit} nodes together`;
+    }
     default:
       return assertNever(details);
   }
@@ -87,9 +110,9 @@ function refForbiddenError(ref, details) {
   return new OpenAPITypesafeError({
     code: ERROR_CODES.SCHEMA_REF_FORBIDDEN,
     message: `Refused to load ${ref}: ${limit}`,
-    details: { ref: redactUrlCredentials(ref), ...details }
+    details: { ref: redactUrlSecrets(ref), ...details }
   });
 }
 
-export { loadFailedError, parseFailedError, pathStringError, refCycleError, refForbiddenError, schemaInvalidError, sourceEmptyError, sourceInvalidError, versionUnsupportedError };
+export { loadFailedError, parseFailedError, pathStringError, refCycleError, refForbiddenError, schemaInvalidError, sourceEmptyError, sourceInvalidError, urlInvalidError, versionUnsupportedError };
 //# sourceMappingURL=schema-load-errors.mjs.map

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 { 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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"}
+{"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 { redactUnparsedUrl, redactUrlSecrets } from \"../../domain/url-secrets.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\n/** A source string starts with a URL scheme but does not parse as a URL. */\nexport function urlInvalidError(text: string): OpenAPITypesafeError {\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message: `The string ${redactUnparsedUrl(text)} starts like a URL but is not a valid URL`,\n    details: { reason: \"url\", received: \"string\" },\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/** Where document text that is only a YAML string came from. */\nexport type TextOrigin = \"string\" | \"stream\";\n\nconst LOAD_FILE_ADVICE =\n  \"To load a file, pass a URL: openapiTS(pathToFileURL(path)) from node:url.\";\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. Text read from a\n * stream (stdin in the CLI) is named as such; `details.text` lets the CLI give its own advice.\n */\nexport function pathStringError(text: string, origin: TextOrigin): OpenAPITypesafeError {\n  const shown =\n    text.length > SOURCE_TEXT_IN_MESSAGE ? `${text.slice(0, SOURCE_TEXT_IN_MESSAGE)}…` : text;\n  const message =\n    origin === \"string\"\n      ? `The string \"${shown}\" was parsed as YAML text, not loaded as a file. ${LOAD_FILE_ADVICE}`\n      : `The stream held only the YAML string \"${shown}\", not an OpenAPI document. ` +\n        LOAD_FILE_ADVICE;\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_SOURCE_INVALID,\n    message,\n    details: { reason: \"path\", received: origin, text: shown },\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: redactUrlSecrets(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: redactUrlSecrets(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(redactUrlSecrets) },\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  | { readonly reason: \"remote-document-too-large\"; readonly maxDocumentBytes: number }\n  | { readonly reason: \"remote-documents-too-large\"; readonly maxTotalBytes: number }\n  | { readonly reason: \"remote-documents-too-many-nodes\"; readonly maxNodes: number };\n\nconst BYTES_PER_MEBIBYTE = 1024 * 1024;\n\n/** A byte count in MiB, as the limits are chosen: `256 MiB`; a smaller limit in bytes. */\nfunction sizeText(bytes: number): string {\n  return bytes % BYTES_PER_MEBIBYTE === 0 ? `${bytes / BYTES_PER_MEBIBYTE} MiB` : `${bytes} bytes`;\n}\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    case \"remote-document-too-large\":\n      return `its body is larger than ${sizeText(details.maxDocumentBytes)} once decoded`;\n    case \"remote-documents-too-large\": {\n      const limit = sizeText(details.maxTotalBytes);\n      return `the remote documents of this run are larger than ${limit} together once decoded`;\n    }\n    case \"remote-documents-too-many-nodes\": {\n      const limit = details.maxNodes;\n      return `the remote documents of this run parse into more than ${limit} nodes together`;\n    }\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 or too large 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: redactUrlSecrets(ref), ...details },\n  });\n}\n"],"names":[],"mappings":"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"}

package/dist/adapters/redocly-loader/schema-source.cjs

@@ -19,14 +19,17 @@ async function readStream(stream, absoluteRef) {
     throw schemaLoadErrors.loadFailedError(absoluteRef, error);
   }
 }
-const URL_PREFIXES = ["http://", "https://", "file://"];
+const URL_PREFIX_RE = /^(?:https?|file):\/\//i;
 function parseSchemaText(schema, options) {
-  if (URL_PREFIXES.some((prefix) => schema.startsWith(prefix))) {
-    const url = new URL(schema);
+  if (URL_PREFIX_RE.test(schema)) {
+    const url = URL.parse(schema);
+    if (url === null) {
+      throw schemaLoadErrors.urlInvalidError(schema);
+    }
     const absoluteRef = url.protocol === "file:" ? node_url.fileURLToPath(url) : url.href;
     return parseSchema(url, { absoluteRef, resolver: options.resolver });
   }
-  return schema[0] === "{" ? parseJsonText(schema, options.absoluteRef) : parseYamlText(schema, options.absoluteRef);
+  return schema[0] === "{" ? parseJsonText(schema, options.absoluteRef) : parseYamlText(schema, options.absoluteRef, options.textOrigin ?? "string");
 }
 function parseJsonText(text2, absoluteRef) {
   try {
@@ -35,7 +38,7 @@ function parseJsonText(text2, absoluteRef) {
     throw schemaLoadErrors.parseFailedError("json", absoluteRef, cause);
   }
 }
-function parseYamlText(text2, absoluteRef) {
+function parseYamlText(text2, absoluteRef, origin) {
   let document;
   try {
     document = openapiCore.makeDocumentFromString(text2, absoluteRef);
@@ -43,7 +46,7 @@ function parseYamlText(text2, absoluteRef) {
     throw schemaLoadErrors.parseFailedError("yaml", absoluteRef, cause);
   }
   if (typeof document.parsed === "string") {
-    throw schemaLoadErrors.pathStringError(text2);
+    throw schemaLoadErrors.pathStringError(text2, origin);
   }
   const failure = aliasLimit.aliasExpansionFailure(document.parsed);
   if (failure !== void 0) {
@@ -89,7 +92,8 @@ async function parseSchema(schema, options) {
     return resolveSchemaURL(options);
   }
   if (schema instanceof node_stream.Readable) {
-    return parseSchema(await readStream(schema, options.absoluteRef), options);
+    const text2 = await readStream(schema, options.absoluteRef);
+    return parseSchema(text2, { ...options, textOrigin: "stream" });
   }
   if (schema instanceof Buffer) {
     return parseSchema(schema.toString("utf8"), options);

package/dist/adapters/redocly-loader/schema-source.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema-source.cjs","sources":["../../../src/adapters/redocly-loader/schema-source.ts"],"sourcesContent":["import { Readable } from \"node:stream\";\nimport { text } from \"node:stream/consumers\";\nimport { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  type Document,\n  makeDocumentFromString,\n  ResolveError,\n  Source,\n  YamlParseError,\n} from \"@redocly/openapi-core\";\nimport parseJson from \"parse-json\";\nimport { aliasExpansionFailure } from \"./alias-limit.js\";\nimport {\n  loadFailedError,\n  parseFailedError,\n  pathStringError,\n  sourceEmptyError,\n  sourceInvalidError,\n} from \"./schema-load-errors.js\";\n\n/** Parse a schema source of any supported type into a Redocly document (ENGINEERING_PLAN 4.5). */\n\nexport interface ParseSchemaOptions {\n  absoluteRef: string;\n  resolver: BaseResolver;\n}\n\n/**\n * Read a stream to the end as UTF-8 text, trimmed. A stream that fails rejects with\n * SCHEMA_LOAD_FAILED; listening only for `data` and `end` left the promise pending forever.\n */\nasync function readStream(stream: Readable, absoluteRef: string): Promise<string> {\n  try {\n    return (await text(stream)).trim();\n  } catch (error) {\n    throw loadFailedError(absoluteRef, error);\n  }\n}\n\nconst URL_PREFIXES = [\"http://\", \"https://\", \"file://\"] as const;\n\n/** A string is a URL, JSON (starts with `{`) or YAML. */\nfunction parseSchemaText(\n  schema: string,\n  options: ParseSchemaOptions,\n): Promise<Document> | Document {\n  if (URL_PREFIXES.some((prefix) => schema.startsWith(prefix))) {\n    const url = new URL(schema);\n    const absoluteRef = url.protocol === \"file:\" ? fileURLToPath(url) : url.href;\n    return parseSchema(url, { absoluteRef, resolver: options.resolver });\n  }\n  return schema[0] === \"{\"\n    ? parseJsonText(schema, options.absoluteRef)\n    : parseYamlText(schema, options.absoluteRef);\n}\n\nfunction parseJsonText(text: string, absoluteRef: string): Document {\n  try {\n    return { source: new Source(absoluteRef, text, \"application/json\"), parsed: parseJson(text) };\n  } catch (cause) {\n    throw parseFailedError(\"json\", absoluteRef, cause);\n  }\n}\n\nfunction parseYamlText(text: string, absoluteRef: string): Document {\n  let document: Document;\n  try {\n    document = makeDocumentFromString(text, absoluteRef);\n  } catch (cause) {\n    throw parseFailedError(\"yaml\", absoluteRef, cause);\n  }\n  // Text that is only a YAML string scalar, such as \"./openapi.yaml\", was meant as a file path.\n  if (typeof document.parsed === \"string\") {\n    throw pathStringError(text);\n  }\n  const failure = aliasExpansionFailure(document.parsed);\n  if (failure !== undefined) {\n    throw parseFailedError(\"yaml\", absoluteRef, failure);\n  }\n  return document;\n}\n\n/** The resolver throws for some failures (a missing file) and returns an error for others. */\nasync function resolveSchemaURL(options: ParseSchemaOptions): Promise<Document> {\n  const result = await options.resolver\n    .resolveDocument(null, options.absoluteRef, true)\n    .catch((cause: unknown) => {\n      throw cause instanceof YamlParseError\n        ? fileParseFailedError(options.absoluteRef, cause)\n        : loadFailedError(options.absoluteRef, readerError(cause));\n    });\n  if (\"parsed\" in result) {\n    return result;\n  }\n  throw loadFailedError(options.absoluteRef, readerError(result));\n}\n\n/**\n * Redocly wraps a failed read in `ResolveError`, which keeps the reader's error in\n * `originalError`, not in `cause`. Unwrapped, the cause keeps the network reason (refused, DNS).\n */\nfunction readerError(error: unknown): unknown {\n  let current = error;\n  while (current instanceof ResolveError) {\n    current = current.originalError;\n  }\n  return current;\n}\n\n/**\n * The resolver parses JSON files with its YAML parser too, so the format comes from the file\n * name. Some parser messages (a second YAML document) do not name the file; the error adds it.\n */\nfunction fileParseFailedError(absoluteRef: string, error: YamlParseError): Error {\n  const format = absoluteRef.toLowerCase().endsWith(\".json\") ? \"json\" : \"yaml\";\n  const cause = error.message.includes(absoluteRef)\n    ? error\n    : new Error(`${error.message} in \"${absoluteRef}\"`, { cause: error });\n  return parseFailedError(format, absoluteRef, cause);\n}\n\nfunction parseSchemaObject(schema: unknown, absoluteRef: string): Document {\n  if (typeof schema === \"object\" && !Array.isArray(schema)) {\n    return {\n      source: new Source(absoluteRef, JSON.stringify(schema), \"application/json\"),\n      parsed: schema,\n    };\n  }\n  throw sourceInvalidError(schema);\n}\n\n/** Parse any supported source: URL, stream, buffer, URL or document text, or a plain object. */\nexport async function parseSchema(schema: unknown, options: ParseSchemaOptions): Promise<Document> {\n  if (!schema) {\n    throw sourceEmptyError(\"Can’t parse empty schema\");\n  }\n  if (schema instanceof URL) {\n    return resolveSchemaURL(options);\n  }\n  if (schema instanceof Readable) {\n    return parseSchema(await readStream(schema, options.absoluteRef), options);\n  }\n  if (schema instanceof Buffer) {\n    return parseSchema(schema.toString(\"utf8\"), options);\n  }\n  if (typeof schema === \"string\") {\n    return parseSchemaText(schema, options);\n  }\n  return parseSchemaObject(schema, options.absoluteRef);\n}\n"],"names":["text","loadFailedError","fileURLToPath","Source","parseJson","parseFailedError","makeDocumentFromString","pathStringError","aliasExpansionFailure","YamlParseError","ResolveError","sourceInvalidError","sourceEmptyError","Readable"],"mappings":"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"}
+{"version":3,"file":"schema-source.cjs","sources":["../../../src/adapters/redocly-loader/schema-source.ts"],"sourcesContent":["import { Readable } from \"node:stream\";\nimport { text } from \"node:stream/consumers\";\nimport { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  type Document,\n  makeDocumentFromString,\n  ResolveError,\n  Source,\n  YamlParseError,\n} from \"@redocly/openapi-core\";\nimport parseJson from \"parse-json\";\nimport { aliasExpansionFailure } from \"./alias-limit.js\";\nimport {\n  loadFailedError,\n  parseFailedError,\n  pathStringError,\n  sourceEmptyError,\n  sourceInvalidError,\n  type TextOrigin,\n  urlInvalidError,\n} from \"./schema-load-errors.js\";\n\n/** Parse a schema source of any supported type into a Redocly document (ENGINEERING_PLAN 4.5). */\n\nexport interface ParseSchemaOptions {\n  absoluteRef: string;\n  resolver: BaseResolver;\n  /** Where document text came from, for the message of text that is only a string. */\n  textOrigin?: TextOrigin;\n}\n\n/**\n * Read a stream to the end as UTF-8 text, trimmed. A stream that fails rejects with\n * SCHEMA_LOAD_FAILED; listening only for `data` and `end` left the promise pending forever.\n */\nasync function readStream(stream: Readable, absoluteRef: string): Promise<string> {\n  try {\n    return (await text(stream)).trim();\n  } catch (error) {\n    throw loadFailedError(absoluteRef, error);\n  }\n}\n\n/** A URL source string; a scheme is the same in any case (RFC 3986, section 3.1). */\nconst URL_PREFIX_RE = /^(?:https?|file):\\/\\//i;\n\n/**\n * A string is a URL, JSON (starts with `{`) or YAML. A string that starts like a URL but does not\n * parse as one fails with `SCHEMA_SOURCE_INVALID`, not the parser's `TypeError`.\n */\nfunction parseSchemaText(\n  schema: string,\n  options: ParseSchemaOptions,\n): Promise<Document> | Document {\n  if (URL_PREFIX_RE.test(schema)) {\n    const url = URL.parse(schema);\n    if (url === null) {\n      throw urlInvalidError(schema);\n    }\n    const absoluteRef = url.protocol === \"file:\" ? fileURLToPath(url) : url.href;\n    return parseSchema(url, { absoluteRef, resolver: options.resolver });\n  }\n  return schema[0] === \"{\"\n    ? parseJsonText(schema, options.absoluteRef)\n    : parseYamlText(schema, options.absoluteRef, options.textOrigin ?? \"string\");\n}\n\nfunction parseJsonText(text: string, absoluteRef: string): Document {\n  try {\n    return { source: new Source(absoluteRef, text, \"application/json\"), parsed: parseJson(text) };\n  } catch (cause) {\n    throw parseFailedError(\"json\", absoluteRef, cause);\n  }\n}\n\nfunction parseYamlText(text: string, absoluteRef: string, origin: TextOrigin): Document {\n  let document: Document;\n  try {\n    document = makeDocumentFromString(text, absoluteRef);\n  } catch (cause) {\n    throw parseFailedError(\"yaml\", absoluteRef, cause);\n  }\n  // Text that is only a YAML string scalar, such as \"./openapi.yaml\", was meant as a file path.\n  if (typeof document.parsed === \"string\") {\n    throw pathStringError(text, origin);\n  }\n  const failure = aliasExpansionFailure(document.parsed);\n  if (failure !== undefined) {\n    throw parseFailedError(\"yaml\", absoluteRef, failure);\n  }\n  return document;\n}\n\n/** The resolver throws for some failures (a missing file) and returns an error for others. */\nasync function resolveSchemaURL(options: ParseSchemaOptions): Promise<Document> {\n  const result = await options.resolver\n    .resolveDocument(null, options.absoluteRef, true)\n    .catch((cause: unknown) => {\n      throw cause instanceof YamlParseError\n        ? fileParseFailedError(options.absoluteRef, cause)\n        : loadFailedError(options.absoluteRef, readerError(cause));\n    });\n  if (\"parsed\" in result) {\n    return result;\n  }\n  throw loadFailedError(options.absoluteRef, readerError(result));\n}\n\n/**\n * Redocly wraps a failed read in `ResolveError`, which keeps the reader's error in\n * `originalError`, not in `cause`. Unwrapped, the cause keeps the network reason (refused, DNS).\n */\nfunction readerError(error: unknown): unknown {\n  let current = error;\n  while (current instanceof ResolveError) {\n    current = current.originalError;\n  }\n  return current;\n}\n\n/**\n * The resolver parses JSON files with its YAML parser too, so the format comes from the file\n * name. Some parser messages (a second YAML document) do not name the file; the error adds it.\n */\nfunction fileParseFailedError(absoluteRef: string, error: YamlParseError): Error {\n  const format = absoluteRef.toLowerCase().endsWith(\".json\") ? \"json\" : \"yaml\";\n  const cause = error.message.includes(absoluteRef)\n    ? error\n    : new Error(`${error.message} in \"${absoluteRef}\"`, { cause: error });\n  return parseFailedError(format, absoluteRef, cause);\n}\n\nfunction parseSchemaObject(schema: unknown, absoluteRef: string): Document {\n  if (typeof schema === \"object\" && !Array.isArray(schema)) {\n    return {\n      source: new Source(absoluteRef, JSON.stringify(schema), \"application/json\"),\n      parsed: schema,\n    };\n  }\n  throw sourceInvalidError(schema);\n}\n\n/** Parse any supported source: URL, stream, buffer, URL or document text, or a plain object. */\nexport async function parseSchema(schema: unknown, options: ParseSchemaOptions): Promise<Document> {\n  if (!schema) {\n    throw sourceEmptyError(\"Can’t parse empty schema\");\n  }\n  if (schema instanceof URL) {\n    return resolveSchemaURL(options);\n  }\n  if (schema instanceof Readable) {\n    const text = await readStream(schema, options.absoluteRef);\n    return parseSchema(text, { ...options, textOrigin: \"stream\" });\n  }\n  if (schema instanceof Buffer) {\n    return parseSchema(schema.toString(\"utf8\"), options);\n  }\n  if (typeof schema === \"string\") {\n    return parseSchemaText(schema, options);\n  }\n  return parseSchemaObject(schema, options.absoluteRef);\n}\n"],"names":["text","loadFailedError","urlInvalidError","fileURLToPath","Source","parseJson","parseFailedError","makeDocumentFromString","pathStringError","aliasExpansionFailure","YamlParseError","ResolveError","sourceInvalidError","sourceEmptyError","Readable"],"mappings":"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"}

package/dist/adapters/redocly-loader/schema-source.mjs

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 import { YamlParseError, Source, ResolveError, makeDocumentFromString } from '@redocly/openapi-core';
 import parseJson from 'parse-json';
 import { aliasExpansionFailure } from './alias-limit.mjs';
-import { sourceEmptyError, loadFailedError, sourceInvalidError, parseFailedError, pathStringError } from './schema-load-errors.mjs';
+import { sourceEmptyError, loadFailedError, urlInvalidError, sourceInvalidError, parseFailedError, pathStringError } from './schema-load-errors.mjs';
 
 async function readStream(stream, absoluteRef) {
   try {
@@ -13,14 +13,17 @@ async function readStream(stream, absoluteRef) {
     throw loadFailedError(absoluteRef, error);
   }
 }
-const URL_PREFIXES = ["http://", "https://", "file://"];
+const URL_PREFIX_RE = /^(?:https?|file):\/\//i;
 function parseSchemaText(schema, options) {
-  if (URL_PREFIXES.some((prefix) => schema.startsWith(prefix))) {
-    const url = new URL(schema);
+  if (URL_PREFIX_RE.test(schema)) {
+    const url = URL.parse(schema);
+    if (url === null) {
+      throw urlInvalidError(schema);
+    }
     const absoluteRef = url.protocol === "file:" ? fileURLToPath(url) : url.href;
     return parseSchema(url, { absoluteRef, resolver: options.resolver });
   }
-  return schema[0] === "{" ? parseJsonText(schema, options.absoluteRef) : parseYamlText(schema, options.absoluteRef);
+  return schema[0] === "{" ? parseJsonText(schema, options.absoluteRef) : parseYamlText(schema, options.absoluteRef, options.textOrigin ?? "string");
 }
 function parseJsonText(text2, absoluteRef) {
   try {
@@ -29,7 +32,7 @@ function parseJsonText(text2, absoluteRef) {
     throw parseFailedError("json", absoluteRef, cause);
   }
 }
-function parseYamlText(text2, absoluteRef) {
+function parseYamlText(text2, absoluteRef, origin) {
   let document;
   try {
     document = makeDocumentFromString(text2, absoluteRef);
@@ -37,7 +40,7 @@ function parseYamlText(text2, absoluteRef) {
     throw parseFailedError("yaml", absoluteRef, cause);
   }
   if (typeof document.parsed === "string") {
-    throw pathStringError(text2);
+    throw pathStringError(text2, origin);
   }
   const failure = aliasExpansionFailure(document.parsed);
   if (failure !== void 0) {
@@ -83,7 +86,8 @@ async function parseSchema(schema, options) {
     return resolveSchemaURL(options);
   }
   if (schema instanceof Readable) {
-    return parseSchema(await readStream(schema, options.absoluteRef), options);
+    const text2 = await readStream(schema, options.absoluteRef);
+    return parseSchema(text2, { ...options, textOrigin: "stream" });
   }
   if (schema instanceof Buffer) {
     return parseSchema(schema.toString("utf8"), options);

package/dist/adapters/redocly-loader/schema-source.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema-source.mjs","sources":["../../../src/adapters/redocly-loader/schema-source.ts"],"sourcesContent":["import { Readable } from \"node:stream\";\nimport { text } from \"node:stream/consumers\";\nimport { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  type Document,\n  makeDocumentFromString,\n  ResolveError,\n  Source,\n  YamlParseError,\n} from \"@redocly/openapi-core\";\nimport parseJson from \"parse-json\";\nimport { aliasExpansionFailure } from \"./alias-limit.js\";\nimport {\n  loadFailedError,\n  parseFailedError,\n  pathStringError,\n  sourceEmptyError,\n  sourceInvalidError,\n} from \"./schema-load-errors.js\";\n\n/** Parse a schema source of any supported type into a Redocly document (ENGINEERING_PLAN 4.5). */\n\nexport interface ParseSchemaOptions {\n  absoluteRef: string;\n  resolver: BaseResolver;\n}\n\n/**\n * Read a stream to the end as UTF-8 text, trimmed. A stream that fails rejects with\n * SCHEMA_LOAD_FAILED; listening only for `data` and `end` left the promise pending forever.\n */\nasync function readStream(stream: Readable, absoluteRef: string): Promise<string> {\n  try {\n    return (await text(stream)).trim();\n  } catch (error) {\n    throw loadFailedError(absoluteRef, error);\n  }\n}\n\nconst URL_PREFIXES = [\"http://\", \"https://\", \"file://\"] as const;\n\n/** A string is a URL, JSON (starts with `{`) or YAML. */\nfunction parseSchemaText(\n  schema: string,\n  options: ParseSchemaOptions,\n): Promise<Document> | Document {\n  if (URL_PREFIXES.some((prefix) => schema.startsWith(prefix))) {\n    const url = new URL(schema);\n    const absoluteRef = url.protocol === \"file:\" ? fileURLToPath(url) : url.href;\n    return parseSchema(url, { absoluteRef, resolver: options.resolver });\n  }\n  return schema[0] === \"{\"\n    ? parseJsonText(schema, options.absoluteRef)\n    : parseYamlText(schema, options.absoluteRef);\n}\n\nfunction parseJsonText(text: string, absoluteRef: string): Document {\n  try {\n    return { source: new Source(absoluteRef, text, \"application/json\"), parsed: parseJson(text) };\n  } catch (cause) {\n    throw parseFailedError(\"json\", absoluteRef, cause);\n  }\n}\n\nfunction parseYamlText(text: string, absoluteRef: string): Document {\n  let document: Document;\n  try {\n    document = makeDocumentFromString(text, absoluteRef);\n  } catch (cause) {\n    throw parseFailedError(\"yaml\", absoluteRef, cause);\n  }\n  // Text that is only a YAML string scalar, such as \"./openapi.yaml\", was meant as a file path.\n  if (typeof document.parsed === \"string\") {\n    throw pathStringError(text);\n  }\n  const failure = aliasExpansionFailure(document.parsed);\n  if (failure !== undefined) {\n    throw parseFailedError(\"yaml\", absoluteRef, failure);\n  }\n  return document;\n}\n\n/** The resolver throws for some failures (a missing file) and returns an error for others. */\nasync function resolveSchemaURL(options: ParseSchemaOptions): Promise<Document> {\n  const result = await options.resolver\n    .resolveDocument(null, options.absoluteRef, true)\n    .catch((cause: unknown) => {\n      throw cause instanceof YamlParseError\n        ? fileParseFailedError(options.absoluteRef, cause)\n        : loadFailedError(options.absoluteRef, readerError(cause));\n    });\n  if (\"parsed\" in result) {\n    return result;\n  }\n  throw loadFailedError(options.absoluteRef, readerError(result));\n}\n\n/**\n * Redocly wraps a failed read in `ResolveError`, which keeps the reader's error in\n * `originalError`, not in `cause`. Unwrapped, the cause keeps the network reason (refused, DNS).\n */\nfunction readerError(error: unknown): unknown {\n  let current = error;\n  while (current instanceof ResolveError) {\n    current = current.originalError;\n  }\n  return current;\n}\n\n/**\n * The resolver parses JSON files with its YAML parser too, so the format comes from the file\n * name. Some parser messages (a second YAML document) do not name the file; the error adds it.\n */\nfunction fileParseFailedError(absoluteRef: string, error: YamlParseError): Error {\n  const format = absoluteRef.toLowerCase().endsWith(\".json\") ? \"json\" : \"yaml\";\n  const cause = error.message.includes(absoluteRef)\n    ? error\n    : new Error(`${error.message} in \"${absoluteRef}\"`, { cause: error });\n  return parseFailedError(format, absoluteRef, cause);\n}\n\nfunction parseSchemaObject(schema: unknown, absoluteRef: string): Document {\n  if (typeof schema === \"object\" && !Array.isArray(schema)) {\n    return {\n      source: new Source(absoluteRef, JSON.stringify(schema), \"application/json\"),\n      parsed: schema,\n    };\n  }\n  throw sourceInvalidError(schema);\n}\n\n/** Parse any supported source: URL, stream, buffer, URL or document text, or a plain object. */\nexport async function parseSchema(schema: unknown, options: ParseSchemaOptions): Promise<Document> {\n  if (!schema) {\n    throw sourceEmptyError(\"Can’t parse empty schema\");\n  }\n  if (schema instanceof URL) {\n    return resolveSchemaURL(options);\n  }\n  if (schema instanceof Readable) {\n    return parseSchema(await readStream(schema, options.absoluteRef), options);\n  }\n  if (schema instanceof Buffer) {\n    return parseSchema(schema.toString(\"utf8\"), options);\n  }\n  if (typeof schema === \"string\") {\n    return parseSchemaText(schema, options);\n  }\n  return parseSchemaObject(schema, options.absoluteRef);\n}\n"],"names":["text"],"mappings":"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"}
+{"version":3,"file":"schema-source.mjs","sources":["../../../src/adapters/redocly-loader/schema-source.ts"],"sourcesContent":["import { Readable } from \"node:stream\";\nimport { text } from \"node:stream/consumers\";\nimport { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  type Document,\n  makeDocumentFromString,\n  ResolveError,\n  Source,\n  YamlParseError,\n} from \"@redocly/openapi-core\";\nimport parseJson from \"parse-json\";\nimport { aliasExpansionFailure } from \"./alias-limit.js\";\nimport {\n  loadFailedError,\n  parseFailedError,\n  pathStringError,\n  sourceEmptyError,\n  sourceInvalidError,\n  type TextOrigin,\n  urlInvalidError,\n} from \"./schema-load-errors.js\";\n\n/** Parse a schema source of any supported type into a Redocly document (ENGINEERING_PLAN 4.5). */\n\nexport interface ParseSchemaOptions {\n  absoluteRef: string;\n  resolver: BaseResolver;\n  /** Where document text came from, for the message of text that is only a string. */\n  textOrigin?: TextOrigin;\n}\n\n/**\n * Read a stream to the end as UTF-8 text, trimmed. A stream that fails rejects with\n * SCHEMA_LOAD_FAILED; listening only for `data` and `end` left the promise pending forever.\n */\nasync function readStream(stream: Readable, absoluteRef: string): Promise<string> {\n  try {\n    return (await text(stream)).trim();\n  } catch (error) {\n    throw loadFailedError(absoluteRef, error);\n  }\n}\n\n/** A URL source string; a scheme is the same in any case (RFC 3986, section 3.1). */\nconst URL_PREFIX_RE = /^(?:https?|file):\\/\\//i;\n\n/**\n * A string is a URL, JSON (starts with `{`) or YAML. A string that starts like a URL but does not\n * parse as one fails with `SCHEMA_SOURCE_INVALID`, not the parser's `TypeError`.\n */\nfunction parseSchemaText(\n  schema: string,\n  options: ParseSchemaOptions,\n): Promise<Document> | Document {\n  if (URL_PREFIX_RE.test(schema)) {\n    const url = URL.parse(schema);\n    if (url === null) {\n      throw urlInvalidError(schema);\n    }\n    const absoluteRef = url.protocol === \"file:\" ? fileURLToPath(url) : url.href;\n    return parseSchema(url, { absoluteRef, resolver: options.resolver });\n  }\n  return schema[0] === \"{\"\n    ? parseJsonText(schema, options.absoluteRef)\n    : parseYamlText(schema, options.absoluteRef, options.textOrigin ?? \"string\");\n}\n\nfunction parseJsonText(text: string, absoluteRef: string): Document {\n  try {\n    return { source: new Source(absoluteRef, text, \"application/json\"), parsed: parseJson(text) };\n  } catch (cause) {\n    throw parseFailedError(\"json\", absoluteRef, cause);\n  }\n}\n\nfunction parseYamlText(text: string, absoluteRef: string, origin: TextOrigin): Document {\n  let document: Document;\n  try {\n    document = makeDocumentFromString(text, absoluteRef);\n  } catch (cause) {\n    throw parseFailedError(\"yaml\", absoluteRef, cause);\n  }\n  // Text that is only a YAML string scalar, such as \"./openapi.yaml\", was meant as a file path.\n  if (typeof document.parsed === \"string\") {\n    throw pathStringError(text, origin);\n  }\n  const failure = aliasExpansionFailure(document.parsed);\n  if (failure !== undefined) {\n    throw parseFailedError(\"yaml\", absoluteRef, failure);\n  }\n  return document;\n}\n\n/** The resolver throws for some failures (a missing file) and returns an error for others. */\nasync function resolveSchemaURL(options: ParseSchemaOptions): Promise<Document> {\n  const result = await options.resolver\n    .resolveDocument(null, options.absoluteRef, true)\n    .catch((cause: unknown) => {\n      throw cause instanceof YamlParseError\n        ? fileParseFailedError(options.absoluteRef, cause)\n        : loadFailedError(options.absoluteRef, readerError(cause));\n    });\n  if (\"parsed\" in result) {\n    return result;\n  }\n  throw loadFailedError(options.absoluteRef, readerError(result));\n}\n\n/**\n * Redocly wraps a failed read in `ResolveError`, which keeps the reader's error in\n * `originalError`, not in `cause`. Unwrapped, the cause keeps the network reason (refused, DNS).\n */\nfunction readerError(error: unknown): unknown {\n  let current = error;\n  while (current instanceof ResolveError) {\n    current = current.originalError;\n  }\n  return current;\n}\n\n/**\n * The resolver parses JSON files with its YAML parser too, so the format comes from the file\n * name. Some parser messages (a second YAML document) do not name the file; the error adds it.\n */\nfunction fileParseFailedError(absoluteRef: string, error: YamlParseError): Error {\n  const format = absoluteRef.toLowerCase().endsWith(\".json\") ? \"json\" : \"yaml\";\n  const cause = error.message.includes(absoluteRef)\n    ? error\n    : new Error(`${error.message} in \"${absoluteRef}\"`, { cause: error });\n  return parseFailedError(format, absoluteRef, cause);\n}\n\nfunction parseSchemaObject(schema: unknown, absoluteRef: string): Document {\n  if (typeof schema === \"object\" && !Array.isArray(schema)) {\n    return {\n      source: new Source(absoluteRef, JSON.stringify(schema), \"application/json\"),\n      parsed: schema,\n    };\n  }\n  throw sourceInvalidError(schema);\n}\n\n/** Parse any supported source: URL, stream, buffer, URL or document text, or a plain object. */\nexport async function parseSchema(schema: unknown, options: ParseSchemaOptions): Promise<Document> {\n  if (!schema) {\n    throw sourceEmptyError(\"Can’t parse empty schema\");\n  }\n  if (schema instanceof URL) {\n    return resolveSchemaURL(options);\n  }\n  if (schema instanceof Readable) {\n    const text = await readStream(schema, options.absoluteRef);\n    return parseSchema(text, { ...options, textOrigin: \"stream\" });\n  }\n  if (schema instanceof Buffer) {\n    return parseSchema(schema.toString(\"utf8\"), options);\n  }\n  if (typeof schema === \"string\") {\n    return parseSchemaText(schema, options);\n  }\n  return parseSchemaObject(schema, options.absoluteRef);\n}\n"],"names":["text"],"mappings":"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"}

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const errors = require('../../domain/errors.cjs');
+const jsonPointer = require('../../domain/openapi/json-pointer.cjs');
 
 const UNSUPPORTED_KEYS = /* @__PURE__ */ new Set([
   "hasOwnProperty",
@@ -22,9 +23,6 @@ function isUnsupportedEntry(key, value) {
   return key === CONSTRUCTOR_KEY && typeof value === "object" && typeof name === "string";
 }
 const KEYS_IN_MESSAGE = 5;
-function escapePointerSegment(segment) {
-  return segment.replaceAll("~", "~0").replaceAll("/", "~1");
-}
 function unsupportedKeysOf(document) {
   const found = [];
   const visited = /* @__PURE__ */ new WeakSet();
@@ -35,10 +33,10 @@ function unsupportedKeysOf(document) {
       pending.push({ value, pointer });
     }
   };
-  enqueue(document.parsed, "#");
+  enqueue(document.parsed, jsonPointer.ROOT_POINTER);
   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)}`;
+      const pointer = jsonPointer.childPointer(node.pointer, key);
       if (isUnsupportedEntry(key, child)) {
         found.push({ key, pointer, source: document.source });
       }

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

@@ -1 +1 @@
-{"version":3,"file":"unsupported-keys.cjs","sources":["../../../src/adapters/redocly-loader/unsupported-keys.ts"],"sourcesContent":["import { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\n\n/**\n * Keys Redocly 1.34 cannot walk. It looks up the type of every key with `type.properties[key]`,\n * which also finds inherited `Object.prototype` members; it then calls a found function with no\n * `this`, and these methods throw a `TypeError` for that. Redocly 2.x looks up own keys only\n * (ADR-005 keeps 1.34). `toString` does not throw, and loads as it should.\n *\n * Redocly does not walk every value (`default` and `const` are data), so a document with such a\n * key is not rejected up front: the loader looks for them only after Redocly threw a `TypeError`.\n */\nexport const UNSUPPORTED_KEYS: ReadonlySet<string> = new Set([\n  \"hasOwnProperty\",\n  \"isPrototypeOf\",\n  \"propertyIsEnumerable\",\n  \"toLocaleString\",\n  \"valueOf\",\n  \"__defineGetter__\",\n  \"__defineSetter__\",\n  \"__lookupGetter__\",\n  \"__lookupSetter__\",\n]);\n\n/**\n * `constructor` finds `Object`, which returns the value it is called with. Redocly then takes the\n * value for a node type when it has a string `name` (a security scheme, a header with a `name`),\n * and fails reading the type's fields. Any other `constructor` key loads.\n */\nconst CONSTRUCTOR_KEY = \"constructor\";\n\nfunction isUnsupportedEntry(key: string, value: unknown): boolean {\n  if (UNSUPPORTED_KEYS.has(key)) {\n    return true;\n  }\n  const name = (value as { name?: unknown } | null | undefined)?.name;\n  return key === CONSTRUCTOR_KEY && typeof value === \"object\" && typeof name === \"string\";\n}\n\n/** Enough found keys in the message to act on; `details.keys` has all of them. */\nconst KEYS_IN_MESSAGE = 5;\n\n/** A parsed document and where it was loaded from. */\nexport interface LoadedDocument {\n  readonly source: string;\n  readonly parsed: unknown;\n}\n\n/** An unsupported key: its JSON pointer and the document that has it. */\nexport interface UnsupportedKey {\n  readonly key: string;\n  readonly pointer: string;\n  readonly source: string;\n}\n\ninterface PendingNode {\n  readonly value: object;\n  readonly pointer: string;\n}\n\n/** RFC 6901: `~` becomes `~0` and `/` becomes `~1`. */\nfunction escapePointerSegment(segment: string): string {\n  return segment.replaceAll(\"~\", \"~0\").replaceAll(\"/\", \"~1\");\n}\n\n/**\n * The unsupported keys of one parsed document. The walk uses its own stack, so a deeply nested\n * document is checked without running out of call stack; nodes shared by YAML aliases are checked\n * once.\n */\nfunction unsupportedKeysOf(document: LoadedDocument): UnsupportedKey[] {\n  const found: UnsupportedKey[] = [];\n  const visited = new WeakSet<object>();\n  const pending: PendingNode[] = [];\n  const enqueue = (value: unknown, pointer: string): void => {\n    if (typeof value === \"object\" && value !== null && !visited.has(value)) {\n      visited.add(value);\n      pending.push({ value, pointer });\n    }\n  };\n  enqueue(document.parsed, \"#\");\n  for (let node = pending.pop(); node !== undefined; node = pending.pop()) {\n    for (const [key, child] of Object.entries(node.value)) {\n      const pointer = `${node.pointer}/${escapePointerSegment(key)}`;\n      if (isUnsupportedEntry(key, child)) {\n        found.push({ key, pointer, source: document.source });\n      }\n      enqueue(child, pointer);\n    }\n  }\n  return found;\n}\n\n/** Every unsupported key of the given documents. */\nexport function findUnsupportedKeys(documents: readonly LoadedDocument[]): UnsupportedKey[] {\n  return documents.flatMap(unsupportedKeysOf);\n}\n\nfunction describeKey(found: UnsupportedKey): string {\n  return `\"${found.key}\" at ${found.pointer} in ${found.source}`;\n}\n\n/** The typed error for the keys the schema loader failed on; `cause` is Redocly's `TypeError`. */\nexport function unsupportedKeysError(\n  keys: readonly UnsupportedKey[],\n  cause: unknown,\n): OpenAPITypesafeError {\n  const listed = keys.slice(0, KEYS_IN_MESSAGE).map(describeKey);\n  const more = keys.length > KEYS_IN_MESSAGE ? ` and ${keys.length - KEYS_IN_MESSAGE} more` : \"\";\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_KEY_UNSUPPORTED,\n    message:\n      \"The schema loader (Redocly 1.x) failed on a key named like a built-in object method. \" +\n      `Rename it: ${listed.join(\", \")}${more}.`,\n    details: { keys: keys.map((found) => ({ ...found })) },\n    cause,\n  });\n}\n"],"names":["OpenAPITypesafeError","ERROR_CODES"],"mappings":"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"}
+{"version":3,"file":"unsupported-keys.cjs","sources":["../../../src/adapters/redocly-loader/unsupported-keys.ts"],"sourcesContent":["import { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\nimport { childPointer, ROOT_POINTER } from \"../../domain/openapi/json-pointer.js\";\n\n/**\n * Keys Redocly 1.34 cannot walk. It looks up the type of every key with `type.properties[key]`,\n * which also finds inherited `Object.prototype` members; it then calls a found function with no\n * `this`, and these methods throw a `TypeError` for that. Redocly 2.x looks up own keys only\n * (ADR-005 keeps 1.34). `toString` does not throw, and loads as it should.\n *\n * Redocly does not walk every value (`default` and `const` are data), so a document with such a\n * key is not rejected up front: the loader looks for them only after Redocly threw a `TypeError`.\n */\nexport const UNSUPPORTED_KEYS: ReadonlySet<string> = new Set([\n  \"hasOwnProperty\",\n  \"isPrototypeOf\",\n  \"propertyIsEnumerable\",\n  \"toLocaleString\",\n  \"valueOf\",\n  \"__defineGetter__\",\n  \"__defineSetter__\",\n  \"__lookupGetter__\",\n  \"__lookupSetter__\",\n]);\n\n/**\n * `constructor` finds `Object`, which returns the value it is called with. Redocly then takes the\n * value for a node type when it has a string `name` (a security scheme, a header with a `name`),\n * and fails reading the type's fields. Any other `constructor` key loads.\n */\nconst CONSTRUCTOR_KEY = \"constructor\";\n\nfunction isUnsupportedEntry(key: string, value: unknown): boolean {\n  if (UNSUPPORTED_KEYS.has(key)) {\n    return true;\n  }\n  const name = (value as { name?: unknown } | null | undefined)?.name;\n  return key === CONSTRUCTOR_KEY && typeof value === \"object\" && typeof name === \"string\";\n}\n\n/** Enough found keys in the message to act on; `details.keys` has all of them. */\nconst KEYS_IN_MESSAGE = 5;\n\n/** A parsed document and where it was loaded from. */\nexport interface LoadedDocument {\n  readonly source: string;\n  readonly parsed: unknown;\n}\n\n/** An unsupported key: its JSON pointer and the document that has it. */\nexport interface UnsupportedKey {\n  readonly key: string;\n  readonly pointer: string;\n  readonly source: string;\n}\n\ninterface PendingNode {\n  readonly value: object;\n  readonly pointer: string;\n}\n\n/**\n * The unsupported keys of one parsed document. The walk uses its own stack, so a deeply nested\n * document is checked without running out of call stack; nodes shared by YAML aliases are checked\n * once.\n */\nfunction unsupportedKeysOf(document: LoadedDocument): UnsupportedKey[] {\n  const found: UnsupportedKey[] = [];\n  const visited = new WeakSet<object>();\n  const pending: PendingNode[] = [];\n  const enqueue = (value: unknown, pointer: string): void => {\n    if (typeof value === \"object\" && value !== null && !visited.has(value)) {\n      visited.add(value);\n      pending.push({ value, pointer });\n    }\n  };\n  enqueue(document.parsed, ROOT_POINTER);\n  for (let node = pending.pop(); node !== undefined; node = pending.pop()) {\n    for (const [key, child] of Object.entries(node.value)) {\n      const pointer = childPointer(node.pointer, key);\n      if (isUnsupportedEntry(key, child)) {\n        found.push({ key, pointer, source: document.source });\n      }\n      enqueue(child, pointer);\n    }\n  }\n  return found;\n}\n\n/** Every unsupported key of the given documents. */\nexport function findUnsupportedKeys(documents: readonly LoadedDocument[]): UnsupportedKey[] {\n  return documents.flatMap(unsupportedKeysOf);\n}\n\nfunction describeKey(found: UnsupportedKey): string {\n  return `\"${found.key}\" at ${found.pointer} in ${found.source}`;\n}\n\n/** The typed error for the keys the schema loader failed on; `cause` is Redocly's `TypeError`. */\nexport function unsupportedKeysError(\n  keys: readonly UnsupportedKey[],\n  cause: unknown,\n): OpenAPITypesafeError {\n  const listed = keys.slice(0, KEYS_IN_MESSAGE).map(describeKey);\n  const more = keys.length > KEYS_IN_MESSAGE ? ` and ${keys.length - KEYS_IN_MESSAGE} more` : \"\";\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_KEY_UNSUPPORTED,\n    message:\n      \"The schema loader (Redocly 1.x) failed on a key named like a built-in object method. \" +\n      `Rename it: ${listed.join(\", \")}${more}.`,\n    details: { keys: keys.map((found) => ({ ...found })) },\n    cause,\n  });\n}\n"],"names":["ROOT_POINTER","childPointer","OpenAPITypesafeError","ERROR_CODES"],"mappings":"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"}

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

@@ -1,4 +1,5 @@
 import { OpenAPITypesafeError, ERROR_CODES } from '../../domain/errors.mjs';
+import { childPointer, ROOT_POINTER } from '../../domain/openapi/json-pointer.mjs';
 
 const UNSUPPORTED_KEYS = /* @__PURE__ */ new Set([
   "hasOwnProperty",
@@ -20,9 +21,6 @@ function isUnsupportedEntry(key, value) {
   return key === CONSTRUCTOR_KEY && typeof value === "object" && typeof name === "string";
 }
 const KEYS_IN_MESSAGE = 5;
-function escapePointerSegment(segment) {
-  return segment.replaceAll("~", "~0").replaceAll("/", "~1");
-}
 function unsupportedKeysOf(document) {
   const found = [];
   const visited = /* @__PURE__ */ new WeakSet();
@@ -33,10 +31,10 @@ function unsupportedKeysOf(document) {
       pending.push({ value, pointer });
     }
   };
-  enqueue(document.parsed, "#");
+  enqueue(document.parsed, ROOT_POINTER);
   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)}`;
+      const pointer = childPointer(node.pointer, key);
       if (isUnsupportedEntry(key, child)) {
         found.push({ key, pointer, source: document.source });
       }

package/dist/adapters/redocly-loader/unsupported-keys.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"unsupported-keys.mjs","sources":["../../../src/adapters/redocly-loader/unsupported-keys.ts"],"sourcesContent":["import { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\n\n/**\n * Keys Redocly 1.34 cannot walk. It looks up the type of every key with `type.properties[key]`,\n * which also finds inherited `Object.prototype` members; it then calls a found function with no\n * `this`, and these methods throw a `TypeError` for that. Redocly 2.x looks up own keys only\n * (ADR-005 keeps 1.34). `toString` does not throw, and loads as it should.\n *\n * Redocly does not walk every value (`default` and `const` are data), so a document with such a\n * key is not rejected up front: the loader looks for them only after Redocly threw a `TypeError`.\n */\nexport const UNSUPPORTED_KEYS: ReadonlySet<string> = new Set([\n  \"hasOwnProperty\",\n  \"isPrototypeOf\",\n  \"propertyIsEnumerable\",\n  \"toLocaleString\",\n  \"valueOf\",\n  \"__defineGetter__\",\n  \"__defineSetter__\",\n  \"__lookupGetter__\",\n  \"__lookupSetter__\",\n]);\n\n/**\n * `constructor` finds `Object`, which returns the value it is called with. Redocly then takes the\n * value for a node type when it has a string `name` (a security scheme, a header with a `name`),\n * and fails reading the type's fields. Any other `constructor` key loads.\n */\nconst CONSTRUCTOR_KEY = \"constructor\";\n\nfunction isUnsupportedEntry(key: string, value: unknown): boolean {\n  if (UNSUPPORTED_KEYS.has(key)) {\n    return true;\n  }\n  const name = (value as { name?: unknown } | null | undefined)?.name;\n  return key === CONSTRUCTOR_KEY && typeof value === \"object\" && typeof name === \"string\";\n}\n\n/** Enough found keys in the message to act on; `details.keys` has all of them. */\nconst KEYS_IN_MESSAGE = 5;\n\n/** A parsed document and where it was loaded from. */\nexport interface LoadedDocument {\n  readonly source: string;\n  readonly parsed: unknown;\n}\n\n/** An unsupported key: its JSON pointer and the document that has it. */\nexport interface UnsupportedKey {\n  readonly key: string;\n  readonly pointer: string;\n  readonly source: string;\n}\n\ninterface PendingNode {\n  readonly value: object;\n  readonly pointer: string;\n}\n\n/** RFC 6901: `~` becomes `~0` and `/` becomes `~1`. */\nfunction escapePointerSegment(segment: string): string {\n  return segment.replaceAll(\"~\", \"~0\").replaceAll(\"/\", \"~1\");\n}\n\n/**\n * The unsupported keys of one parsed document. The walk uses its own stack, so a deeply nested\n * document is checked without running out of call stack; nodes shared by YAML aliases are checked\n * once.\n */\nfunction unsupportedKeysOf(document: LoadedDocument): UnsupportedKey[] {\n  const found: UnsupportedKey[] = [];\n  const visited = new WeakSet<object>();\n  const pending: PendingNode[] = [];\n  const enqueue = (value: unknown, pointer: string): void => {\n    if (typeof value === \"object\" && value !== null && !visited.has(value)) {\n      visited.add(value);\n      pending.push({ value, pointer });\n    }\n  };\n  enqueue(document.parsed, \"#\");\n  for (let node = pending.pop(); node !== undefined; node = pending.pop()) {\n    for (const [key, child] of Object.entries(node.value)) {\n      const pointer = `${node.pointer}/${escapePointerSegment(key)}`;\n      if (isUnsupportedEntry(key, child)) {\n        found.push({ key, pointer, source: document.source });\n      }\n      enqueue(child, pointer);\n    }\n  }\n  return found;\n}\n\n/** Every unsupported key of the given documents. */\nexport function findUnsupportedKeys(documents: readonly LoadedDocument[]): UnsupportedKey[] {\n  return documents.flatMap(unsupportedKeysOf);\n}\n\nfunction describeKey(found: UnsupportedKey): string {\n  return `\"${found.key}\" at ${found.pointer} in ${found.source}`;\n}\n\n/** The typed error for the keys the schema loader failed on; `cause` is Redocly's `TypeError`. */\nexport function unsupportedKeysError(\n  keys: readonly UnsupportedKey[],\n  cause: unknown,\n): OpenAPITypesafeError {\n  const listed = keys.slice(0, KEYS_IN_MESSAGE).map(describeKey);\n  const more = keys.length > KEYS_IN_MESSAGE ? ` and ${keys.length - KEYS_IN_MESSAGE} more` : \"\";\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_KEY_UNSUPPORTED,\n    message:\n      \"The schema loader (Redocly 1.x) failed on a key named like a built-in object method. \" +\n      `Rename it: ${listed.join(\", \")}${more}.`,\n    details: { keys: keys.map((found) => ({ ...found })) },\n    cause,\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"unsupported-keys.mjs","sources":["../../../src/adapters/redocly-loader/unsupported-keys.ts"],"sourcesContent":["import { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\nimport { childPointer, ROOT_POINTER } from \"../../domain/openapi/json-pointer.js\";\n\n/**\n * Keys Redocly 1.34 cannot walk. It looks up the type of every key with `type.properties[key]`,\n * which also finds inherited `Object.prototype` members; it then calls a found function with no\n * `this`, and these methods throw a `TypeError` for that. Redocly 2.x looks up own keys only\n * (ADR-005 keeps 1.34). `toString` does not throw, and loads as it should.\n *\n * Redocly does not walk every value (`default` and `const` are data), so a document with such a\n * key is not rejected up front: the loader looks for them only after Redocly threw a `TypeError`.\n */\nexport const UNSUPPORTED_KEYS: ReadonlySet<string> = new Set([\n  \"hasOwnProperty\",\n  \"isPrototypeOf\",\n  \"propertyIsEnumerable\",\n  \"toLocaleString\",\n  \"valueOf\",\n  \"__defineGetter__\",\n  \"__defineSetter__\",\n  \"__lookupGetter__\",\n  \"__lookupSetter__\",\n]);\n\n/**\n * `constructor` finds `Object`, which returns the value it is called with. Redocly then takes the\n * value for a node type when it has a string `name` (a security scheme, a header with a `name`),\n * and fails reading the type's fields. Any other `constructor` key loads.\n */\nconst CONSTRUCTOR_KEY = \"constructor\";\n\nfunction isUnsupportedEntry(key: string, value: unknown): boolean {\n  if (UNSUPPORTED_KEYS.has(key)) {\n    return true;\n  }\n  const name = (value as { name?: unknown } | null | undefined)?.name;\n  return key === CONSTRUCTOR_KEY && typeof value === \"object\" && typeof name === \"string\";\n}\n\n/** Enough found keys in the message to act on; `details.keys` has all of them. */\nconst KEYS_IN_MESSAGE = 5;\n\n/** A parsed document and where it was loaded from. */\nexport interface LoadedDocument {\n  readonly source: string;\n  readonly parsed: unknown;\n}\n\n/** An unsupported key: its JSON pointer and the document that has it. */\nexport interface UnsupportedKey {\n  readonly key: string;\n  readonly pointer: string;\n  readonly source: string;\n}\n\ninterface PendingNode {\n  readonly value: object;\n  readonly pointer: string;\n}\n\n/**\n * The unsupported keys of one parsed document. The walk uses its own stack, so a deeply nested\n * document is checked without running out of call stack; nodes shared by YAML aliases are checked\n * once.\n */\nfunction unsupportedKeysOf(document: LoadedDocument): UnsupportedKey[] {\n  const found: UnsupportedKey[] = [];\n  const visited = new WeakSet<object>();\n  const pending: PendingNode[] = [];\n  const enqueue = (value: unknown, pointer: string): void => {\n    if (typeof value === \"object\" && value !== null && !visited.has(value)) {\n      visited.add(value);\n      pending.push({ value, pointer });\n    }\n  };\n  enqueue(document.parsed, ROOT_POINTER);\n  for (let node = pending.pop(); node !== undefined; node = pending.pop()) {\n    for (const [key, child] of Object.entries(node.value)) {\n      const pointer = childPointer(node.pointer, key);\n      if (isUnsupportedEntry(key, child)) {\n        found.push({ key, pointer, source: document.source });\n      }\n      enqueue(child, pointer);\n    }\n  }\n  return found;\n}\n\n/** Every unsupported key of the given documents. */\nexport function findUnsupportedKeys(documents: readonly LoadedDocument[]): UnsupportedKey[] {\n  return documents.flatMap(unsupportedKeysOf);\n}\n\nfunction describeKey(found: UnsupportedKey): string {\n  return `\"${found.key}\" at ${found.pointer} in ${found.source}`;\n}\n\n/** The typed error for the keys the schema loader failed on; `cause` is Redocly's `TypeError`. */\nexport function unsupportedKeysError(\n  keys: readonly UnsupportedKey[],\n  cause: unknown,\n): OpenAPITypesafeError {\n  const listed = keys.slice(0, KEYS_IN_MESSAGE).map(describeKey);\n  const more = keys.length > KEYS_IN_MESSAGE ? ` and ${keys.length - KEYS_IN_MESSAGE} more` : \"\";\n  return new OpenAPITypesafeError({\n    code: ERROR_CODES.SCHEMA_KEY_UNSUPPORTED,\n    message:\n      \"The schema loader (Redocly 1.x) failed on a key named like a built-in object method. \" +\n      `Rename it: ${listed.join(\", \")}${more}.`,\n    details: { keys: keys.map((found) => ({ ...found })) },\n    cause,\n  });\n}\n"],"names":[],"mappings":"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"}

package/dist/adapters/terminal-logger/terminal-logger.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const colors = require('ansi-colors');
-const urlCredentials = require('../../domain/url-credentials.cjs');
+const urlSecrets = require('../../domain/url-secrets.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -47,16 +47,18 @@ class TerminalLogger {
     }
     const name = groupColor(this.#palette, group)(`openapi-ts:${group ?? "info"}`);
     const time = durationMs === void 0 ? " " : this.#palette.green(` ${formatDuration(durationMs)} `);
-    const text = urlCredentials.redactUrlCredentials(message);
+    const text = urlSecrets.redactUrlSecrets(message);
     this.#options.sink.debug(`  ${this.#palette.bold(name)}${time}${text}`);
   }
   warn(message) {
     if (!this.#options.silent) {
-      this.#options.sink.warn(this.#palette.yellow(` \u26A0  ${urlCredentials.redactUrlCredentials(message)}`));
+      this.#options.sink.warn(this.#palette.yellow(` \u26A0  ${urlSecrets.redactUrlSecrets(message)}`));
     }
   }
   error(message) {
-    this.#options.sink.error(this.#palette.red(` \u2718  ${urlCredentials.redactUrlCredentials(message)}`));
+    if (!this.#options.silent) {
+      this.#options.sink.error(this.#palette.red(` \u2718  ${urlSecrets.redactUrlSecrets(message)}`));
+    }
   }
 }
 function createTerminalLogger(options) {