Skip to content
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.

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

fix: tupples #66

Merged
merged 1 commit into from
Mar 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/generateTS/factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ export default function (userOptions: TSGenOptions) {

if (field.multiple) {
op = "[]";

if (field.max_instance) {
return ["MaxTuple<", type, ", ", field.max_instance, ">"].join("");
}
}

return type + op;
Expand Down
5 changes: 5 additions & 0 deletions src/generateTS/stack/builtins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ export const defaultInterfaces = (
hasJsonRte?: boolean
) => {
const defaultInterfaces = [
`type BuildTuple<T, N extends number, R extends T[] = []> =
R['length'] extends N ? R : BuildTuple<T, N, [...R, T]>`,
`type TuplePrefixes<T extends any[]> =
T extends [any, ...infer Rest] ? T | TuplePrefixes<Rest extends any[] ? Rest : []> : []`,
`type MaxTuple<T, N extends number> = TuplePrefixes<BuildTuple<T, N>>`,
`export interface ${prefix}PublishDetails {
environment: string;
locale: string;
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/tsgen/group.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ describe("group", () => {
/** Version */
_version: number;
title: string;
multiple_group_max_limit?: {
multiple_group_max_limit?: MaxTuple<{
number?: number | null;
}[];
}, 5>;
multiple_group?: {
single_line?: string;
}[];
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/tsgen/isodate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ describe("builtin isodate field", () => {
date?: string | null;
date_required: string;
date_multiple?: string[] | null;
date_multiple_maxlength?: string[] | null;
date_required_multiple_maxlength: string[];
date_multiple_maxlength?: MaxTuple<string, 5> | null;
date_required_multiple_maxlength: MaxTuple<string, 8>;
}"
`);
});
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/tsgen/number.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ describe("builtin number field", () => {
number?: number | null;
number_required: number;
number_multiple?: number[] | null;
number_multiple_max_limit?: number[] | null;
number_required_multiple_max_limit: number[];
number_multiple_max_limit?: MaxTuple<number, 10> | null;
number_required_multiple_max_limit: MaxTuple<number, 3>;
}"
`);
});
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/tsgen/options.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe("all options", () => {
single_line_textbox_not_required?: string;
single_line_textbox_required: string;
single_line_textbox_multiple?: string[];
single_line_textbox_multiple_max_limit?: string[];
single_line_textbox_multiple_max_limit?: MaxTuple<string, 5>;
}"
`);
});
Expand Down