@drunkcod/argis 0.0.15 → 0.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Json.d.ts +8 -3
- package/lib/TypeUtils.d.ts +9 -8
- package/lib/cjs/Json.d.ts +8 -3
- package/lib/cjs/TypeUtils.d.ts +9 -8
- package/package.json +1 -1
package/lib/Json.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { IfOptional } from './TypeUtils.js';
|
|
1
2
|
export interface Jsonable<Json> {
|
|
2
3
|
toJSON(): Json;
|
|
3
4
|
}
|
|
@@ -8,9 +9,13 @@ declare const JsonErrorSym: unique symbol;
|
|
|
8
9
|
export type JsonError<T> = {
|
|
9
10
|
[JsonErrorSym]: T;
|
|
10
11
|
};
|
|
12
|
+
type JsonProperty<T, P extends keyof T> = P extends string | number ? (Json<T[P]> extends never ? never : P) : never;
|
|
13
|
+
type JsonObject<T> = {
|
|
14
|
+
[P in keyof T as IfOptional<T, P, never, JsonProperty<T, P>>]: Json<T[P]>;
|
|
15
|
+
} & {
|
|
16
|
+
[P in keyof T as IfOptional<T, P, JsonProperty<T, P>, never>]?: Json<T[P]>;
|
|
17
|
+
};
|
|
11
18
|
export type Json<T, IsRoot = true> = T extends Jsonable<infer J> ? (IsRoot extends true ? Json<J, false> : Json<Omit<T, 'toJSON'>>) : T extends NeverJson ? never : T extends EmptyJson ? Record<string, never> : T extends bigint ? JsonError<'bigint-not-serializeable'> : T extends readonly any[] ? {
|
|
12
19
|
[I in keyof T]: [Json<T[I]>] extends [never] ? null : Json<T[I]>;
|
|
13
|
-
} : T extends object ?
|
|
14
|
-
[P in keyof T as P extends string | number ? Json<T[P]> extends never ? never : P : never]: Json<T[P]>;
|
|
15
|
-
} : T;
|
|
20
|
+
} : T extends object ? JsonObject<T> : T;
|
|
16
21
|
export {};
|
package/lib/TypeUtils.d.ts
CHANGED
|
@@ -10,20 +10,21 @@ type TagOptional = SpecialTag<'?'>;
|
|
|
10
10
|
type TagUnknown = SpecialTag<'unknown'>;
|
|
11
11
|
export type IsAny<T> = 0 extends 1 & T ? true : false;
|
|
12
12
|
export type IsUnknown<T> = unknown extends T ? (IsAny<T> extends true ? false : true) : false;
|
|
13
|
-
export type IsOptional<T, K extends keyof T> =
|
|
13
|
+
export type IsOptional<T, K extends keyof T> = IfOptional<T, K, true, false>;
|
|
14
|
+
export type IfOptional<T, K extends keyof T, True, False> = {
|
|
14
15
|
[P in K]?: T[K];
|
|
15
|
-
} extends Pick<T, K> ?
|
|
16
|
+
} extends Pick<T, K> ? True : False;
|
|
16
17
|
type TagSpecial<T> = {
|
|
17
|
-
[P in keyof T]:
|
|
18
|
+
[P in keyof T]: IfOptional<T, P, TagOptional, never> | (IsAny<T[P]> extends true ? TagAny : IsUnknown<T[P]> extends true ? TagUnknown : T[P]);
|
|
18
19
|
};
|
|
19
|
-
type
|
|
20
|
+
type IfTagged<T, X extends SpecialTag<any>, True, False> = [Extract<T, X>] extends [never] ? False : True;
|
|
20
21
|
type UnwrapOptional<T> = {
|
|
21
|
-
[P in keyof T as
|
|
22
|
+
[P in keyof T as IfTagged<T[P], TagOptional, never, P>]: T[P];
|
|
22
23
|
} & {
|
|
23
|
-
[P in keyof T as
|
|
24
|
+
[P in keyof T as IfTagged<T[P], TagOptional, P, never>]?: Exclude<T[P], TagOptional>;
|
|
24
25
|
};
|
|
25
26
|
type UnwrapTagsCore<T> = {
|
|
26
|
-
[P in keyof T]:
|
|
27
|
+
[P in keyof T]: IfTagged<T[P], TagAny, any, IfTagged<T[P], TagUnknown, unknown, T[P]>>;
|
|
27
28
|
};
|
|
28
29
|
type UnwrapTags<T> = UnwrapTagsCore<UnwrapOptional<T>>;
|
|
29
30
|
type UnionMergeCore<A, B> = {
|
|
@@ -32,6 +33,6 @@ type UnionMergeCore<A, B> = {
|
|
|
32
33
|
export type Assign<Target, Source> = Omit<Target, keyof Source> & Source;
|
|
33
34
|
export type UnionMerge<A, B> = Pretty<UnwrapTags<UnionMergeCore<TagSpecial<A>, TagSpecial<B>>>>;
|
|
34
35
|
export type PickRequired<T> = {
|
|
35
|
-
[P in keyof T as
|
|
36
|
+
[P in keyof T as IfOptional<T, P, never, P>]: T[P];
|
|
36
37
|
};
|
|
37
38
|
export {};
|
package/lib/cjs/Json.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { IfOptional } from './TypeUtils.js';
|
|
1
2
|
export interface Jsonable<Json> {
|
|
2
3
|
toJSON(): Json;
|
|
3
4
|
}
|
|
@@ -8,9 +9,13 @@ declare const JsonErrorSym: unique symbol;
|
|
|
8
9
|
export type JsonError<T> = {
|
|
9
10
|
[JsonErrorSym]: T;
|
|
10
11
|
};
|
|
12
|
+
type JsonProperty<T, P extends keyof T> = P extends string | number ? (Json<T[P]> extends never ? never : P) : never;
|
|
13
|
+
type JsonObject<T> = {
|
|
14
|
+
[P in keyof T as IfOptional<T, P, never, JsonProperty<T, P>>]: Json<T[P]>;
|
|
15
|
+
} & {
|
|
16
|
+
[P in keyof T as IfOptional<T, P, JsonProperty<T, P>, never>]?: Json<T[P]>;
|
|
17
|
+
};
|
|
11
18
|
export type Json<T, IsRoot = true> = T extends Jsonable<infer J> ? (IsRoot extends true ? Json<J, false> : Json<Omit<T, 'toJSON'>>) : T extends NeverJson ? never : T extends EmptyJson ? Record<string, never> : T extends bigint ? JsonError<'bigint-not-serializeable'> : T extends readonly any[] ? {
|
|
12
19
|
[I in keyof T]: [Json<T[I]>] extends [never] ? null : Json<T[I]>;
|
|
13
|
-
} : T extends object ?
|
|
14
|
-
[P in keyof T as P extends string | number ? Json<T[P]> extends never ? never : P : never]: Json<T[P]>;
|
|
15
|
-
} : T;
|
|
20
|
+
} : T extends object ? JsonObject<T> : T;
|
|
16
21
|
export {};
|
package/lib/cjs/TypeUtils.d.ts
CHANGED
|
@@ -10,20 +10,21 @@ type TagOptional = SpecialTag<'?'>;
|
|
|
10
10
|
type TagUnknown = SpecialTag<'unknown'>;
|
|
11
11
|
export type IsAny<T> = 0 extends 1 & T ? true : false;
|
|
12
12
|
export type IsUnknown<T> = unknown extends T ? (IsAny<T> extends true ? false : true) : false;
|
|
13
|
-
export type IsOptional<T, K extends keyof T> =
|
|
13
|
+
export type IsOptional<T, K extends keyof T> = IfOptional<T, K, true, false>;
|
|
14
|
+
export type IfOptional<T, K extends keyof T, True, False> = {
|
|
14
15
|
[P in K]?: T[K];
|
|
15
|
-
} extends Pick<T, K> ?
|
|
16
|
+
} extends Pick<T, K> ? True : False;
|
|
16
17
|
type TagSpecial<T> = {
|
|
17
|
-
[P in keyof T]:
|
|
18
|
+
[P in keyof T]: IfOptional<T, P, TagOptional, never> | (IsAny<T[P]> extends true ? TagAny : IsUnknown<T[P]> extends true ? TagUnknown : T[P]);
|
|
18
19
|
};
|
|
19
|
-
type
|
|
20
|
+
type IfTagged<T, X extends SpecialTag<any>, True, False> = [Extract<T, X>] extends [never] ? False : True;
|
|
20
21
|
type UnwrapOptional<T> = {
|
|
21
|
-
[P in keyof T as
|
|
22
|
+
[P in keyof T as IfTagged<T[P], TagOptional, never, P>]: T[P];
|
|
22
23
|
} & {
|
|
23
|
-
[P in keyof T as
|
|
24
|
+
[P in keyof T as IfTagged<T[P], TagOptional, P, never>]?: Exclude<T[P], TagOptional>;
|
|
24
25
|
};
|
|
25
26
|
type UnwrapTagsCore<T> = {
|
|
26
|
-
[P in keyof T]:
|
|
27
|
+
[P in keyof T]: IfTagged<T[P], TagAny, any, IfTagged<T[P], TagUnknown, unknown, T[P]>>;
|
|
27
28
|
};
|
|
28
29
|
type UnwrapTags<T> = UnwrapTagsCore<UnwrapOptional<T>>;
|
|
29
30
|
type UnionMergeCore<A, B> = {
|
|
@@ -32,6 +33,6 @@ type UnionMergeCore<A, B> = {
|
|
|
32
33
|
export type Assign<Target, Source> = Omit<Target, keyof Source> & Source;
|
|
33
34
|
export type UnionMerge<A, B> = Pretty<UnwrapTags<UnionMergeCore<TagSpecial<A>, TagSpecial<B>>>>;
|
|
34
35
|
export type PickRequired<T> = {
|
|
35
|
-
[P in keyof T as
|
|
36
|
+
[P in keyof T as IfOptional<T, P, never, P>]: T[P];
|
|
36
37
|
};
|
|
37
38
|
export {};
|
package/package.json
CHANGED