fix(openapi-typescript): redundant nested unions from type arrays with anyOf/allOf by sovrin-tio · Pull Request #2855 · openapi-ts/openapi-typescript · GitHub
Skip to content

fix(openapi-typescript): redundant nested unions from type arrays with anyOf/allOf #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sovrin-tio wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(openapi-typescript): redundant nested unions from type arrays with anyOf/allOf #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffbfebb
fix(openapi-typescript): don't stack anyOf/allOf transforms in type-a…
sovrin-tio Aug 26, 2026
f1420f6
fix(openapi-typescript): extend anyOf/allOf guard to the oneOf branch
sovrin-tio Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/eager-moles-wash.md
View file
Open in desktop
2 changes: 1 addition & 1 deletion packages/openapi-typescript/examples/github-api-next.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35615,7 +35615,7 @@ export interface components {
* @description User-defined metadata to store domain-specific information limited to 8 keys with scalar values.
*/
metadata: {
[key: string]: (null | (string | number | boolean) | (number | string | boolean) | (boolean | string | number)) | string | number | boolean;
[key: string]: (null | string | number | boolean) | string | number | boolean;
};
dependency: {
/**
Expand Down
31 changes: 18 additions & 13 deletions packages/openapi-typescript/src/transform/schema-object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,22 @@ function transformSchemaObjectCore(schemaObject: SchemaObject, options: Transfor
if (Array.isArray(schemaObject.type) && !Array.isArray(schemaObject)) {
// skip any primitive types that appear in oneOf as well
const uniqueTypes: ts.TypeNode[] = [];
// The caller transforms the sibling composition keywords itself, so drop them here
// or each type member re-applies them. 'type' alone fully describes a primitive
// member; object/array members keep anyOf/allOf, because there the composition is
// what carries the shape and stripping it leaves Record<string, never> / unknown[].
const transformTypeMember = (t: string) => {
const stackable = t === "object" || t === "array";
return transformSchemaObject(
{
...schemaObject,
type: t,
oneOf: undefined,
...(stackable ? {} : { anyOf: undefined, allOf: undefined }),
} as SchemaObject,
options,
);
};
if (Array.isArray(schemaObject.oneOf)) {
for (const t of schemaObject.type) {
if (
Expand All @@ -475,22 +491,11 @@ function transformSchemaObjectCore(schemaObject: SchemaObject, options: Transfor
) {
continue;
}
uniqueTypes.push(
t === "null" || t === null
? NULL
: transformSchemaObject(
{ ...schemaObject, type: t, oneOf: undefined } as SchemaObject, // don’t stack oneOf transforms
options,
),
);
uniqueTypes.push(t === "null" || t === null ? NULL : transformTypeMember(t));
}
} else {
for (const t of schemaObject.type) {
if (t === "null" || t === null) {
uniqueTypes.push(NULL);
} else {
uniqueTypes.push(transformSchemaObject({ ...schemaObject, type: t } as SchemaObject, options));
}
uniqueTypes.push(t === "null" || t === null ? NULL : transformTypeMember(t));
}
}
return tsUnion(uniqueTypes);
Expand Down
78 changes: 78 additions & 0 deletions packages/openapi-typescript/test/transform/schema-object/composition.test.ts
View file
Open in desktop
Loading