@kubb/adapter-oas 5.0.0-beta.17 → 5.0.0-beta.19

package/dist/index.js

@@ -168,11 +168,14 @@ function buildDiscriminatorChildMap(schemas) {
 			const enumValues = enumNode.enumValues.filter((v) => v !== null);
 			if (!enumValues.length) continue;
 			const existing = childMap.get(refNode.name);
-			if (existing) existing.enumValues.push(...enumValues);
-			else childMap.set(refNode.name, {
-				propertyName: discriminatorPropertyName,
-				enumValues: [...enumValues]
-			});
+			if (!existing) {
+				childMap.set(refNode.name, {
+					propertyName: discriminatorPropertyName,
+					enumValues: [...enumValues]
+				});
+				continue;
+			}
+			existing.enumValues.push(...enumValues);
 		}
 	}
 	return childMap;
@@ -755,8 +758,8 @@ function resolveRef(document, $ref) {
 	const origRef = $ref;
 	$ref = $ref.trim();
 	if ($ref === "") return null;
-	if ($ref.startsWith("#")) $ref = globalThis.decodeURIComponent($ref.substring(1));
-	else return null;
+	if (!$ref.startsWith("#")) return null;
+	$ref = globalThis.decodeURIComponent($ref.substring(1));
 	let docCache = _refCache.get(document);
 	if (!docCache) {
 		docCache = /* @__PURE__ */ new Map();
@@ -987,12 +990,14 @@ function* collectRefs(schema) {
 	}
 	if (schema && typeof schema === "object") for (const key in schema) {
 		const value = schema[key];
-		if (key === "$ref" && typeof value === "string") {
-			if (value.startsWith("#/components/schemas/")) {
-				const name = value.slice(21);
-				if (name) yield name;
-			}
-		} else yield* collectRefs(value);
+		if (!(key === "$ref" && typeof value === "string")) {
+			yield* collectRefs(value);
+			continue;
+		}
+		if (value.startsWith("#/components/schemas/")) {
+			const name = value.slice(21);
+			if (name) yield name;
+		}
 	}
 }
 /**
@@ -1144,7 +1149,8 @@ function buildSchemaNode(schema, name, nullable, defaultValue) {
 		readOnly: schema.readOnly,
 		writeOnly: schema.writeOnly,
 		default: defaultValue,
-		example: schema.example
+		example: schema.example,
+		format: schema.format
 	};
 }
 /**
@@ -1227,17 +1233,19 @@ function createSchemaParser(ctx) {
 	function convertRef({ schema, name, nullable, defaultValue, rawOptions }) {
 		let resolvedSchema;
 		const refPath = schema.$ref;
-		if (refPath && !resolvingRefs.has(refPath)) if (resolvedRefCache.has(refPath)) resolvedSchema = resolvedRefCache.get(refPath);
-		else {
-			try {
-				const referenced = resolveRef(document, refPath);
-				if (referenced) {
-					resolvingRefs.add(refPath);
-					resolvedSchema = parseSchema({ schema: referenced }, rawOptions);
-					resolvingRefs.delete(refPath);
-				}
-			} catch {}
-			resolvedRefCache.set(refPath, resolvedSchema);
+		if (refPath && !resolvingRefs.has(refPath)) {
+			if (!resolvedRefCache.has(refPath)) {
+				try {
+					const referenced = resolveRef(document, refPath);
+					if (referenced) {
+						resolvingRefs.add(refPath);
+						resolvedSchema = parseSchema({ schema: referenced }, rawOptions);
+						resolvingRefs.delete(refPath);
+					}
+				} catch {}
+				resolvedRefCache.set(refPath, resolvedSchema);
+			}
+			resolvedSchema = resolvedRefCache.get(refPath);
 		}
 		return ast.createSchema({
 			...buildSchemaNode(schema, name, nullable, defaultValue),
@@ -1271,7 +1279,8 @@ function createSchemaParser(ctx) {
 				writeOnly: schema.writeOnly ?? memberNode.writeOnly,
 				default: mergedDefault,
 				example: schema.example ?? memberNode.example,
-				pattern: schema.pattern ?? ("pattern" in memberNode ? memberNode.pattern : void 0)
+				pattern: schema.pattern ?? ("pattern" in memberNode ? memberNode.pattern : void 0),
+				format: schema.format ?? memberNode.format
 			});
 		}
 		const filteredDiscriminantValues = [];
@@ -1403,7 +1412,8 @@ function createSchemaParser(ctx) {
 			name,
 			title: schema.title,
 			description: schema.description,
-			deprecated: schema.deprecated
+			deprecated: schema.deprecated,
+			format: schema.format
 		});
 		const constPrimitive = getPrimitiveType(typeof constValue === "number" ? "number" : typeof constValue === "boolean" ? "boolean" : "string");
 		return ast.createSchema({
@@ -1507,7 +1517,8 @@ function createSchemaParser(ctx) {
 			readOnly: schema.readOnly,
 			writeOnly: schema.writeOnly,
 			default: enumDefault,
-			example: schema.example
+			example: schema.example,
+			format: schema.format
 		};
 		const extensionKey = enumExtensionKeys.find((key) => key in schema);
 		if (extensionKey || enumPrimitive === "number" || enumPrimitive === "integer" || enumPrimitive === "boolean") {
@@ -1546,15 +1557,18 @@ function createSchemaParser(ctx) {
 				schema: resolvedPropSchema,
 				name: ast.childName(name, propName)
 			}, rawOptions);
-			let schemaNode = ast.setEnumName(propNode, name, propName, options.enumSuffix);
-			const tupleNode = ast.narrowSchema(schemaNode, "tuple");
-			if (tupleNode?.items) {
-				const namedItems = tupleNode.items.map((item) => ast.setEnumName(item, name, propName, options.enumSuffix));
-				if (namedItems.some((item, i) => item !== tupleNode.items[i])) schemaNode = {
-					...tupleNode,
-					items: namedItems
-				};
-			}
+			const schemaNode = (() => {
+				const node = ast.setEnumName(propNode, name, propName, options.enumSuffix);
+				const tupleNode = ast.narrowSchema(node, "tuple");
+				if (tupleNode?.items) {
+					const namedItems = tupleNode.items.map((item) => ast.setEnumName(item, name, propName, options.enumSuffix));
+					if (namedItems.some((item, i) => item !== tupleNode.items[i])) return {
+						...tupleNode,
+						items: namedItems
+					};
+				}
+				return node;
+			})();
 			return ast.createProperty({
 				name: propName,
 				schema: {
@@ -1565,11 +1579,12 @@ function createSchemaParser(ctx) {
 			});
 		}) : [];
 		const additionalProperties = schema.additionalProperties;
-		let additionalPropertiesNode;
-		if (additionalProperties === true) additionalPropertiesNode = true;
-		else if (additionalProperties && Object.keys(additionalProperties).length > 0) additionalPropertiesNode = parseSchema({ schema: additionalProperties }, rawOptions);
-		else if (additionalProperties === false) additionalPropertiesNode = false;
-		else if (additionalProperties) additionalPropertiesNode = ast.createSchema({ type: typeOptionMap.get(options.unknownType) });
+		const additionalPropertiesNode = (() => {
+			if (additionalProperties === true) return true;
+			if (additionalProperties === false) return false;
+			if (additionalProperties && Object.keys(additionalProperties).length > 0) return parseSchema({ schema: additionalProperties }, rawOptions);
+			if (additionalProperties) return ast.createSchema({ type: typeOptionMap.get(options.unknownType) });
+		})();
 		const rawPatternProperties = "patternProperties" in schema ? schema.patternProperties : void 0;
 		const patternProperties = rawPatternProperties ? Object.fromEntries(Object.entries(rawPatternProperties).map(([pattern, patternSchema]) => [pattern, patternSchema === true || typeof patternSchema === "object" && Object.keys(patternSchema).length === 0 ? ast.createSchema({ type: typeOptionMap.get(options.unknownType) }) : parseSchema({ schema: patternSchema }, rawOptions)])) : void 0;
 		const objectNode = ast.createSchema({
@@ -1680,7 +1695,8 @@ function createSchemaParser(ctx) {
 			title: schema.title,
 			description: schema.description,
 			deprecated: schema.deprecated,
-			nullable
+			nullable,
+			format: schema.format
 		});
 	}
 	/**
@@ -1758,7 +1774,8 @@ function createSchemaParser(ctx) {
 			type: emptyType,
 			name,
 			title: schema.title,
-			description: schema.description
+			description: schema.description,
+			format: schema.format
 		});
 	}
 	/**
@@ -1948,6 +1965,8 @@ const adapterOas = createAdapter((options) => {
 	let nameMapping = /* @__PURE__ */ new Map();
 	let parsedDocument = null;
 	let schemaObjects = null;
+	let baseOasInstance = null;
+	let schemaParserInstance = null;
 	function resolveBaseURL(document) {
 		const server = serverIndex !== void 0 ? document.servers?.at(serverIndex) : void 0;
 		return server?.url ? resolveServerUrl(server, serverVariables) : void 0;
@@ -1967,6 +1986,17 @@ const adapterOas = createAdapter((options) => {
 		}
 		return schemaObjects;
 	}
+	function ensureBaseOas(document) {
+		if (!baseOasInstance) baseOasInstance = new BaseOas(document);
+		return baseOasInstance;
+	}
+	function ensureSchemaParser(document) {
+		if (!schemaParserInstance) schemaParserInstance = createSchemaParser({
+			document,
+			contentType
+		});
+		return schemaParserInstance;
+	}
 	return {
 		name: "oas",
 		get options() {
@@ -2029,7 +2059,7 @@ const adapterOas = createAdapter((options) => {
 		async count(source) {
 			const document = await ensureDocument(source);
 			const schemas = await ensureSchemas(document);
-			const baseOas = new BaseOas(document);
+			const baseOas = ensureBaseOas(document);
 			const operationCount = Object.values(baseOas.getPaths()).flatMap(Object.values).filter(Boolean).length;
 			return {
 				schemas: Object.keys(schemas).length,
@@ -2039,43 +2069,33 @@ const adapterOas = createAdapter((options) => {
 		async stream(source) {
 			const document = await ensureDocument(source);
 			const schemas = await ensureSchemas(document);
-			let discriminatorChildMap = null;
-			if (discriminator === "inherit") {
-				const { parseSchema: _preParser } = createSchemaParser({
-					document,
-					contentType
-				});
+			const discriminatorChildMap = (() => {
+				if (discriminator !== "inherit") return null;
+				const { parseSchema: _preParser } = ensureSchemaParser(document);
 				const parentNodes = [];
 				for (const [name, schema] of Object.entries(schemas)) if ((schema.oneOf ?? schema.anyOf) && schema.discriminator?.propertyName) parentNodes.push(_preParser({
 					schema,
 					name
 				}, parserOptions));
-				if (parentNodes.length > 0) discriminatorChildMap = buildDiscriminatorChildMap(parentNodes);
-			}
+				return parentNodes.length > 0 ? buildDiscriminatorChildMap(parentNodes) : null;
+			})();
 			const schemasIterable = { [Symbol.asyncIterator]() {
 				return (async function* () {
-					const { parseSchema: _parseSchema } = createSchemaParser({
-						document,
-						contentType
-					});
+					const { parseSchema: _parseSchema } = ensureSchemaParser(document);
 					for (const [name, schema] of Object.entries(schemas)) {
-						let node = _parseSchema({
+						const parsedNode = _parseSchema({
 							schema,
 							name
 						}, parserOptions);
 						const entry = discriminatorChildMap?.get(name);
-						if (entry) node = patchDiscriminatorNode(node, entry);
-						yield node;
+						yield entry ? patchDiscriminatorNode(parsedNode, entry) : parsedNode;
 					}
 				})();
 			} };
 			const operationsIterable = { [Symbol.asyncIterator]() {
 				return (async function* () {
-					const { parseOperation: _parseOperation } = createSchemaParser({
-						document,
-						contentType
-					});
-					const paths = new BaseOas(document).getPaths();
+					const { parseOperation: _parseOperation } = ensureSchemaParser(document);
+					const paths = ensureBaseOas(document).getPaths();
 					for (const methods of Object.values(paths)) for (const operation of Object.values(methods)) {
 						if (!operation) continue;
 						const node = _parseOperation(parserOptions, operation);