@kubb/plugin-ts 5.0.0-beta.74 → 5.0.0-beta.76

package/dist/index.js

@@ -753,24 +753,30 @@ function buildPropertyType(schema, baseType, optionalType, optional) {
 	if ((optional || meta.nullish || meta.optional) && addsUndefined) type = createUnionDeclaration({ nodes: [type, keywordTypeNodes.undefined] });
 	return type;
 }
+const indexSignaturePrinter = ts.createPrinter();
+const indexSignatureSource = ts.createSourceFile("", "", ts.ScriptTarget.Latest);
 /**
-* Creates TypeScript index signatures for `additionalProperties` and `patternProperties` on an object schema node.
+* Creates a TypeScript index signature for `additionalProperties` and `patternProperties` on an
+* object schema node. TypeScript allows only one string index signature and its value must be
+* assignable from every named property, so both keywords collapse into a single signature: the
+* union of all value types (deduplicated), or `unknown` when the object also has fixed properties.
+* The key regex of `patternProperties` cannot be expressed by an index signature and is dropped.
 */
 function buildIndexSignatures(node, propertyCount, print) {
-	const elements = [];
-	if (node.additionalProperties && node.additionalProperties !== true) {
-		const additionalType = print(node.additionalProperties) ?? keywordTypeNodes.unknown;
-		elements.push(createIndexSignature(propertyCount > 0 ? keywordTypeNodes.unknown : additionalType));
-	} else if (node.additionalProperties === true) elements.push(createIndexSignature(keywordTypeNodes.unknown));
-	if (node.patternProperties) {
-		const first = Object.values(node.patternProperties)[0];
-		if (first) {
-			let patternType = print(first) ?? keywordTypeNodes.unknown;
-			if (first.nullable) patternType = createUnionDeclaration({ nodes: [patternType, keywordTypeNodes.null] });
-			elements.push(createIndexSignature(patternType));
-		}
+	const valueTypes = [];
+	if (node.additionalProperties && node.additionalProperties !== true) valueTypes.push(print(node.additionalProperties) ?? keywordTypeNodes.unknown);
+	else if (node.additionalProperties === true) valueTypes.push(keywordTypeNodes.unknown);
+	for (const schema of Object.values(node.patternProperties ?? {})) {
+		const patternType = print(schema) ?? keywordTypeNodes.unknown;
+		valueTypes.push(schema.nullable ? createUnionDeclaration({ nodes: [patternType, keywordTypeNodes.null] }) : patternType);
 	}
-	return elements;
+	if (valueTypes.length === 0) return [];
+	const seen = /* @__PURE__ */ new Set();
+	const distinct = valueTypes.filter((type) => {
+		const key = indexSignaturePrinter.printNode(ts.EmitHint.Unspecified, type, indexSignatureSource);
+		return seen.has(key) ? false : (seen.add(key), true);
+	});
+	return [createIndexSignature(propertyCount > 0 ? keywordTypeNodes.unknown : createUnionDeclaration({ nodes: distinct }))];
 }
 //#endregion
 //#region src/components/Enum.tsx