@kubb/adapter-oas 5.5.4 → 5.5.6

package/dist/index.js

@@ -429,7 +429,7 @@ async function resolveSource(sourcePath) {
 * its parse error instead.
 */
 async function assertInputExists(input) {
-	if (URL.canParse(input)) return;
+	if (urlRegExp.test(input)) return;
 	if (!await exists(input)) throw new Diagnostics.Error({
 		code: Diagnostics.code.inputNotFound,
 		severity: "error",
@@ -518,7 +518,7 @@ async function parseDocument(pathOrApi) {
 */
 async function parseFromConfig(source) {
 	if (source.type === "data") return parseDocument(typeof source.data === "string" ? parse(source.data) : structuredClone(source.data));
-	if (URL.canParse(source.path)) return parseDocument(source.path);
+	if (urlRegExp.test(source.path)) return parseDocument(source.path);
 	const resolved = path.resolve(path.dirname(source.path), source.path);
 	await assertInputExists(resolved);
 	return parseDocument(resolved);
@@ -1335,6 +1335,68 @@ function convertAnnotatedEnum(context) {
 //#endregion
 //#region src/emit/converters/composition.ts
 /**
+* Collects property schemas from all `allOf` members and outer schema properties,
+* recursively resolving `$ref` pointers.
+*/
+function collectSiblingProperties(allOfMembers, refs, outerProperties) {
+	const properties = { ...outerProperties };
+	const visited = /* @__PURE__ */ new Set();
+	function collectFrom(item) {
+		if (!item) return;
+		if (isReference(item)) {
+			if (visited.has(item.$ref)) return;
+			visited.add(item.$ref);
+			const resolved = refs.resolve(item.$ref, { report: false });
+			if (resolved && !isReference(resolved)) collectFrom(resolved);
+			return;
+		}
+		if (item.properties) Object.assign(properties, item.properties);
+		if (Array.isArray(item.allOf)) for (const member of item.allOf) collectFrom(member);
+	}
+	for (const item of allOfMembers) collectFrom(item);
+	return properties;
+}
+/**
+* Enriches union members that declare `required` properties without declaring corresponding
+* property schemas, populating the missing property definitions from available sibling schemas
+* (or an empty schema falling back to the configured emptySchemaType).
+*/
+function resolveUnionMembers(members, siblingProperties) {
+	return members.map((member) => {
+		if (!member || typeof member !== "object" || isReference(member)) return member;
+		const obj = member;
+		if (!Array.isArray(obj.required) || obj.required.length === 0) return member;
+		const existingProps = obj.properties ?? {};
+		const missingKeys = obj.required.filter((key) => !Object.prototype.hasOwnProperty.call(existingProps, key));
+		if (missingKeys.length === 0) return member;
+		const newProperties = { ...existingProps };
+		for (const key of missingKeys) {
+			const value = Object.prototype.hasOwnProperty.call(siblingProperties, key) ? siblingProperties[key] : {};
+			Object.defineProperty(newProperties, key, {
+				value,
+				enumerable: true,
+				writable: true,
+				configurable: true
+			});
+		}
+		return {
+			type: obj.type ?? "object",
+			...obj,
+			properties: newProperties
+		};
+	});
+}
+/**
+* Enriches any `oneOf` or `anyOf` branches on a schema object with properties from sibling schemas.
+*/
+function resolveUnionSchema(schema, siblingProperties) {
+	if (!schema.oneOf && !schema.anyOf) return schema;
+	const next = { ...resolveUnionMembers([schema], siblingProperties)[0] ?? schema };
+	if (schema.oneOf) next.oneOf = resolveUnionMembers(schema.oneOf, siblingProperties);
+	if (schema.anyOf) next.anyOf = resolveUnionMembers(schema.anyOf, siblingProperties);
+	return next;
+}
+/**
 * Converts a `$ref` schema into a `RefSchemaNode`.
 *
 * The resolved schema is stored in `node.schema`. Usage-site sibling fields
@@ -1394,7 +1456,8 @@ function convertAllOf({ schema, name, nullable, defaultValue, rawOptions, parse,
 		name,
 		refs
 	});
-	const allOfMembers = discriminatedAllOf.map((s) => parse({
+	const siblingProperties = collectSiblingProperties(schema.allOf, refs, schema.properties);
+	const allOfMembers = discriminatedAllOf.map((s) => isReference(s) ? s : resolveUnionSchema(s, siblingProperties)).map((s) => parse({
 		schema: s,
 		name
 	}, rawOptions));
@@ -1455,7 +1518,7 @@ function convertUnion(context) {
 		nullable,
 		defaultValue
 	};
-	const unionMembers = [...schema.oneOf ?? [], ...schema.anyOf ?? []];
+	const unionMembers = resolveUnionMembers([...schema.oneOf ?? [], ...schema.anyOf ?? []], schema.properties ?? {});
 	const strategy = schema.oneOf ? "one" : "any";
 	const explicitDiscriminatorPropertyName = isDiscriminator(schema) ? schema.discriminator.propertyName : void 0;
 	const discriminator = isDiscriminator(schema) ? schema.discriminator : void 0;
@@ -1993,7 +2056,7 @@ function walkPointer(document, $ref) {
 		applicable: false,
 		value: null
 	};
-	const pointer = globalThis.decodeURIComponent(trimmed.substring(1));
+	const pointer = trimmed.substring(1);
 	let docCache = _refCache.get(document);
 	if (!docCache) {
 		docCache = /* @__PURE__ */ new Map();
@@ -2003,7 +2066,7 @@ function walkPointer(document, $ref) {
 		applicable: true,
 		value: docCache.get(pointer)
 	};
-	const current = pointer.split("/").filter(Boolean).reduce((obj, key) => obj?.[key], document);
+	const current = pointer.split("/").filter(Boolean).map((token) => globalThis.decodeURIComponent(token).replaceAll("~1", "/").replaceAll("~0", "~")).reduce((obj, key) => obj?.[key], document);
 	if (current) docCache.set(pointer, current);
 	return {
 		applicable: true,
@@ -2312,13 +2375,7 @@ function createSchemaParser(ctx) {
 		};
 		for (const rule of schemaRules) if (rule.match(context)) return rule.convert(context);
 		const emptyType = options.emptySchemaType;
-		return ast.factory.createSchema({
-			type: emptyType,
-			name,
-			title: schema.title,
-			description: schema.description,
-			format: schema.format
-		});
+		return createNode(context, { type: emptyType });
 	}
 	/**
 	* Converts a dereferenced OAS parameter object into a `ParameterNode`.