types: support readonly defaultNS #2123
Conversation
|
is this ok @marcalexiei ? |
| @@ -12,4 +12,4 @@ export type $OmitArrayKeys<Arr> = Arr extends readonly any[] ? Omit<Arr, keyof a | |||
|
|
|||
| export type $PreservedValue<Value, Fallback> = [Value] extends [never] ? Fallback : Value; | |||
|
|
|||
| export type $NormalizeIntoArray<T extends unknown | unknown[]> = T extends unknown[] ? T : [T]; | |||
| export type $NormalizeIntoArray<T extends unknown | readonly unknown[]> = T extends readonly unknown[] ? T : [T]; | |||
There was a problem hiding this comment.
With this fix when using a normal array as defaultNS the types won't work.
You can try out removing Readonly<...> from the `CustomTypeOptions.defaultNS.
You have to take into account both array types.
This should do the trick:
| export type $NormalizeIntoArray<T extends unknown | readonly unknown[]> = T extends readonly unknown[] ? T : [T]; | |
| export type $NormalizeIntoArray<T extends unknown | readonly unknown[] | unknown[]> = T extends | |
| | unknown[] | |
| | readonly unknown[] | |
| ? T | |
| : [T]; |
There was a problem hiding this comment.
What version of TS did you test this with? I tested both variants and they seem to work. See this playground https://www.typescriptlang.org/play?#code/C4TwDgpgBAkgzgQQE5IIYgDwBUB8UC8UWUEAHsBAHYAmcUSEq1A9pQDYhQCulA1pcwDulANoBdKAH4owJF2gAuKADNUbOBABQmgMas4weo2oB5dp0IiAjABoATDYDME1HT2UDu-YYFIAtmoEUNb2TmLaoJBQqEHwyGiYkRDMykZMZhw4mgD02VBQAHqSmklQAEaxiCjoGEkpUL4BbFm5+UXaOXkAtD29ff39JeDQWBAGQfE1PPxClHhkFDR0AErGrByTmNMCwnjSsvJQSqrqWq2FkkA
There was a problem hiding this comment.
You are right, sorry.
I tested this on my local branch but probably I had something on my working copy that broke the test 😅
|
@adrai LGTM |
|
thank you both... |
Follow-up of #2121 to also allow defaultNS to be readonly (This is the case when using
as conston the defaultNS definitions and using typeof defaultNS in the types)Checklist
npm run testChecklist (for documentation change)