@kubb/adapter-oas 5.12.6 → 5.12.7

package/dist/index.d.cts

@@ -1081,6 +1081,10 @@ type SchemaObject$1 = {
   externalDocs?: unknown;
   xml?: unknown;
   $schema?: string;
+  /** JSON Schema definitions that may be referenced from other schema locations. */
+  $defs?: Record<string, SchemaObject$1>;
+  /** Legacy draft-07 name for `$defs`. */
+  definitions?: Record<string, SchemaObject$1>;
   deprecated?: boolean;
   example?: unknown;
   examples?: Array<unknown>;

package/dist/index.d.ts

@@ -1081,6 +1081,10 @@ type SchemaObject$1 = {
   externalDocs?: unknown;
   xml?: unknown;
   $schema?: string;
+  /** JSON Schema definitions that may be referenced from other schema locations. */
+  $defs?: Record<string, SchemaObject$1>;
+  /** Legacy draft-07 name for `$defs`. */
+  definitions?: Record<string, SchemaObject$1>;
   deprecated?: boolean;
   example?: unknown;
   examples?: Array<unknown>;

package/dist/index.js

@@ -14,7 +14,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.12.6";
+var version = "5.12.7";
 //#endregion
 //#region src/constants.ts
 /**
@@ -99,24 +99,35 @@ const numericFormats = /* @__PURE__ */ new Set([
 /**
 * Static map from OAS `format` strings to Kubb `SchemaType` values.
 *
-* Only formats whose AST type differs from the OAS `type` field appear here.
+* Lists formats whose AST type differs from the OAS `type` field, plus string formats that
+* `KUBB_UNSUPPORTED_FORMAT` should not flag.
 * Formats that depend on runtime options (`int64`, `date-time`, `date`, `time`) are handled
-* separately in the parser. `ipv4` and `ipv6` map to their own dedicated schema types. `hostname`
-* and `idn-hostname` map to `'url'` as the closest generic string-format type.
+* separately in the parser. `ipv4` and `ipv6` map to their own dedicated schema types.
+* `uri-reference`, `iri`, `iri-reference`, `hostname` and `idn-hostname` map to `'string'`: a relative
+* reference, a Unicode IRI or a bare host name is not a URL, so a `'url'` validator would reject valid
+* values. `base64url`, `jwt`, `ulid`, `iban` and `duration` map to `'string'` because plugins check
+* them by `format`.
 */
 const formatMap = {
 	uuid: "uuid",
 	email: "email",
 	"idn-email": "email",
 	uri: "url",
-	"uri-reference": "url",
+	"uri-reference": "string",
+	iri: "string",
+	"iri-reference": "string",
 	url: "url",
 	ipv4: "ipv4",
 	ipv6: "ipv6",
-	hostname: "url",
-	"idn-hostname": "url",
+	hostname: "string",
+	"idn-hostname": "string",
 	binary: "blob",
 	byte: "blob",
+	base64url: "string",
+	jwt: "string",
+	ulid: "string",
+	iban: "string",
+	duration: "string",
 	int32: "integer",
 	float: "number",
 	double: "number"
@@ -708,23 +719,73 @@ function extractSchemaFromContent(content, preferredContentType) {
 /**
 * Walks a schema tree and collects the names of all `#/components/schemas/<name>` `$ref`s.
 */
-function* collectRefs(schema) {
+function* collectRefs(schema, renames) {
 	if (Array.isArray(schema)) {
-		for (const item of schema) yield* collectRefs(item);
+		for (const item of schema) yield* collectRefs(item, renames);
 		return;
 	}
 	if (schema && typeof schema === "object") for (const key in schema) {
 		const value = schema[key];
 		if (!(key === "$ref" && typeof value === "string")) {
-			yield* collectRefs(value);
+			yield* collectRefs(value, renames);
 			continue;
 		}
 		if (value.startsWith("#/components/schemas/")) {
-			const name = value.slice(21);
+			const name = renames.get(value) ?? value.slice(21);
 			if (name) yield name;
 		}
 	}
 }
+const schemaChildKeywords = [
+	"additionalProperties",
+	"allOf",
+	"anyOf",
+	"contains",
+	"contentSchema",
+	"else",
+	"if",
+	"items",
+	"not",
+	"oneOf",
+	"patternProperties",
+	"prefixItems",
+	"properties",
+	"propertyNames",
+	"then"
+];
+/** Collects definitions only from schema locations, never from examples/defaults or arbitrary data. */
+function* collectNestedDefinitions(schema, pointer, name) {
+	if (!schema || typeof schema !== "object" || Array.isArray(schema)) return;
+	const value = schema;
+	for (const keyword of ["$defs", "definitions"]) {
+		const definitions = value[keyword];
+		if (!definitions || typeof definitions !== "object" || Array.isArray(definitions)) continue;
+		for (const [key, definition] of Object.entries(definitions)) {
+			if (!definition || typeof definition !== "object" || Array.isArray(definition)) continue;
+			const definitionPointer = `${pointer}/${keyword}/${escapePointerToken(key)}`;
+			const nestedName = `${name}_${key}`;
+			yield {
+				schema: definition,
+				pointer: definitionPointer,
+				originalName: nestedName
+			};
+			yield* collectNestedDefinitions(definition, definitionPointer, nestedName);
+		}
+	}
+	for (const keyword of schemaChildKeywords) {
+		const child = value[keyword];
+		if (!child || typeof child !== "object") continue;
+		if (Array.isArray(child)) {
+			for (const [index, item] of child.entries()) yield* collectNestedDefinitions(item, `${pointer}/${keyword}/${index}`, name);
+			continue;
+		}
+		if (keyword === "properties" || keyword === "patternProperties") {
+			for (const [key, item] of Object.entries(child)) yield* collectNestedDefinitions(item, `${pointer}/${keyword}/${escapePointerToken(key)}`, name);
+			continue;
+		}
+		yield* collectNestedDefinitions(child, `${pointer}/${keyword}`, name);
+	}
+}
 /**
 * Returns a copy of `schemas` topologically sorted by `$ref` dependency.
 *
@@ -737,9 +798,9 @@ function* collectRefs(schema) {
 * // Pet appears before Order when Order.$ref points at Pet
 * ```
 */
-function sortSchemas(schemas) {
+function sortSchemas(schemas, renames) {
 	const deps = /* @__PURE__ */ new Map();
-	for (const [name, schema] of Object.entries(schemas)) deps.set(name, [...new Set(collectRefs(schema))]);
+	for (const [name, schema] of Object.entries(schemas)) deps.set(name, [...new Set(collectRefs(schema, renames))]);
 	const sorted = [];
 	const visited = /* @__PURE__ */ new Set();
 	function visit(name, stack) {
@@ -782,16 +843,25 @@ function getSchemas(document, { contentType }, refs) {
 		const resolved = refs.resolve(schema.$ref);
 		return resolved && !isReference(resolved) ? resolved : schema;
 	}
-	const candidates = [...Object.entries(components?.schemas ?? {}).map(([name, schema]) => ({
-		schema: resolveSchemaRef(schema),
-		source: "schemas",
-		originalName: name
-	})), ...["responses", "requestBodies"].flatMap((source) => Object.entries(components?.[source] ?? {}).flatMap(([name, item]) => {
+	const candidates = [...Object.entries(components?.schemas ?? {}).flatMap(([name, schema]) => {
+		const pointer = `#/components/schemas/${escapePointerToken(name)}`;
+		return [{
+			schema: resolveSchemaRef(schema),
+			source: "schemas",
+			originalName: name,
+			pointer
+		}, ...[...collectNestedDefinitions(schema, pointer, name)].map((nested) => ({
+			...nested,
+			source: "schemas",
+			nested: true
+		}))];
+	}), ...["responses", "requestBodies"].flatMap((source) => Object.entries(components?.[source] ?? {}).flatMap(([name, item]) => {
 		const schema = extractSchemaFromContent(item.content, contentType);
 		return schema ? [{
 			schema: resolveSchemaRef(schema),
 			source,
-			originalName: name
+			originalName: name,
+			pointer: `#/components/${source}/${escapePointerToken(name)}`
 		}] : [];
 	}))];
 	const normalizedNames = /* @__PURE__ */ new Map();
@@ -810,11 +880,11 @@ function getSchemas(document, { contentType }, refs) {
 			const suffix = isSingle ? "" : hasMultipleSources ? semanticSuffixes[item.source] : index ? String(index + 1) : "";
 			const uniqueName = item.originalName + suffix;
 			schemas[uniqueName] = item.schema;
-			if (suffix) renames.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
+			if (suffix || item.nested) renames.set(item.pointer, uniqueName);
 		});
 	}
 	return {
-		schemas: sortSchemas(schemas),
+		schemas: sortSchemas(schemas, renames),
 		renames
 	};
 }
@@ -1746,6 +1816,10 @@ function convertFormat(context) {
 		});
 	}
 	const specialType = formatMap[schema.format];
+	if (specialType === "string") {
+		if (type === "integer" || type === "number") return convertNumeric(context, type);
+		return convertString(context);
+	}
 	const isNumeric = specialType === "number" || specialType === "integer";
 	return createNode(context, {
 		primitive: isNumeric ? specialType : "string",