Skip to content

fix(types): add support for size and rename fieldtransformers #462

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
Birkbjo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(types): add support for size and rename fieldtransformers #462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eadd20
fix(types): add support for size and rename fieldtransformers
Birkbjo Dec 5, 2024
8b72712
fix: allow complex filters at the end of a filter
Birkbjo Dec 5, 2024
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
51 changes: 49 additions & 2 deletions src/types/generated/pickWithFieldFilters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,36 @@ type MaybeCollection<Model, FullModel> = FullModel extends Array<infer U>
? Model[] | Extract<FullModel, undefined | null>
: Model | Extract<FullModel, undefined | null>

type Rename<T, K extends keyof T, N extends string> = Pick<
T,
Exclude<keyof T, K>
> & { [P in N]: T[K] }

type IsFieldTransformer<S> = S extends `${string}~size`
? true
: S extends `${string}~rename(${string})`
? true
: false

type ResolveTransformer<Model, S> =
S extends `${infer FieldName extends string &
keyof Model}~rename(${infer NewName extends string})${infer Rest}`
? ResolveTransformer<
Pick<Rename<Model, FieldName, NewName>, NewName>,
`${NewName}${Rest}`
>
: S extends `${infer FieldName extends string &
keyof Model}~size${infer Rest}`
? ResolveTransformer<
{ [K in FieldName]: number },
`${FieldName}${Rest}`
>
: Model

type SplitNested<S> = S extends `${infer Nested}],${infer Rest}`
? [`${Nested}]`, Rest]
: [S]

type RecursivePickWithFieldFilter<
Model,
S extends string,
Expand All @@ -38,7 +68,10 @@ type RecursivePickWithFieldFilter<
// create an object with root key, and recursively pick the nested fields
[K in Root]: MaybeCollection<
Prettify<
RecursivePickWithFieldFilter<GetModel<Model[Root]>, Nested>
PickWithFieldFilters<
GetModel<Model[Root]>,
SplitNested<Nested>
>
>,
Model[Root]
>
Expand All @@ -49,7 +82,10 @@ type RecursivePickWithFieldFilter<
? Pick<Model, S>
: S extends ':owner'
? BaseIdentifiableObject
: never //[Model, S] // not a key of Model, ignore
: IsFieldTransformer<S> extends true
? ResolveTransformer<Model, S>
: never
// : never //[Model, S] // not a key of Model, ignore

/**
* From Model, Pick properties (and nested properties) using a field filter-array.
Expand All @@ -75,3 +111,14 @@ export type PickWithFieldFilters<
>
>
>

// type Test = PickWithFieldFilters<

@flaminic flaminic Dec 9, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ANy reason why you want to keep this code in?

// CategoryCombo,
// [
// 'id',
// 'name',
// 'categories[id,displayName,code,categoryOptions[id,displayName],attributeValues~size]',
// 'categoryOptionCombos~size~rename(cocSize)'
// // 'categories~size~rename(K)'
// ]
// >