typia 4.0.3-dev.20230605 → 4.0.3
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/Primitive.d.ts +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_object.js +1 -3
- package/lib/factories/internal/metadata/emplace_metadata_object.js.map +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_tuple.js +2 -1
- package/lib/factories/internal/metadata/emplace_metadata_tuple.js.map +1 -1
- package/package.json +1 -1
- package/src/Primitive.ts +125 -123
- package/src/factories/internal/metadata/emplace_metadata_object.ts +140 -142
- package/src/factories/internal/metadata/emplace_metadata_tuple.ts +53 -50
package/lib/Primitive.d.ts
CHANGED
|
@@ -34,7 +34,7 @@ type PrimitiveMain<Instance> = ValueOf<Instance> extends object ? Instance exten
|
|
|
34
34
|
type PrimitiveObject<Instance extends object> = Instance extends Array<infer T> ? IsTuple<Instance> extends true ? PrimitiveTuple<Instance> : PrimitiveMain<T>[] : {
|
|
35
35
|
[P in keyof Instance]: Instance[P] extends Function ? never : PrimitiveMain<Instance[P]>;
|
|
36
36
|
};
|
|
37
|
-
type PrimitiveTuple<T extends readonly any[]> = T extends [infer F] ? [PrimitiveMain<F>] : T extends [infer F, ...infer Rest extends readonly any[]] ? [PrimitiveMain<F>, ...PrimitiveTuple<Rest>] : T extends [(infer F)?] ? [PrimitiveMain<F>?] : T extends [(infer F)?, ...infer Rest extends readonly any[]] ? [PrimitiveMain<F>?, ...PrimitiveTuple<Rest>] : [];
|
|
37
|
+
type PrimitiveTuple<T extends readonly any[]> = T extends [] ? [] : T extends [infer F] ? [PrimitiveMain<F>] : T extends [infer F, ...infer Rest extends readonly any[]] ? [PrimitiveMain<F>, ...PrimitiveTuple<Rest>] : T extends [(infer F)?] ? [PrimitiveMain<F>?] : T extends [(infer F)?, ...infer Rest extends readonly any[]] ? [PrimitiveMain<F>?, ...PrimitiveTuple<Rest>] : [];
|
|
38
38
|
type ValueOf<Instance> = IsValueOf<Instance, Boolean> extends true ? boolean : IsValueOf<Instance, Number> extends true ? number : IsValueOf<Instance, String> extends true ? string : Instance;
|
|
39
39
|
type NativeClass = Set<any> | Map<any, any> | WeakSet<any> | WeakMap<any, any> | Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | BigUint64Array | Int8Array | Int16Array | Int32Array | BigInt64Array | Float32Array | Float64Array | ArrayBuffer | SharedArrayBuffer | DataView;
|
|
40
40
|
type IsTuple<T extends readonly any[] | {
|
|
@@ -101,10 +101,8 @@ var emplace_metadata_object = function (checker) {
|
|
|
101
101
|
return "continue";
|
|
102
102
|
var key = MetadataHelper_1.MetadataHelper.literal_to_metadata(prop.name);
|
|
103
103
|
var value = (0, explore_metadata_1.explore_metadata)(checker)(options)(collection)(type, false);
|
|
104
|
-
if (node === null || node === void 0 ? void 0 : node.questionToken)
|
|
105
|
-
(0, Writable_1.Writable)(value).required = false;
|
|
104
|
+
if ((node === null || node === void 0 ? void 0 : node.questionToken) && (value.required === false || value.any))
|
|
106
105
|
(0, Writable_1.Writable)(value).optional = true;
|
|
107
|
-
}
|
|
108
106
|
insert(key)(value)(function () { return "".concat(obj.name, ".").concat(prop.name); })(prop);
|
|
109
107
|
};
|
|
110
108
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emplace_metadata_object.js","sourceRoot":"","sources":["../../../../src/factories/internal/metadata/emplace_metadata_object.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"emplace_metadata_object.js","sourceRoot":"","sources":["../../../../src/factories/internal/metadata/emplace_metadata_object.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,8 @@ var emplace_metadata_tuple = function (checker) {
|
|
|
40
40
|
.map(function (elem, i) {
|
|
41
41
|
var child = (0, explore_metadata_1.explore_metadata)(checker)(options)(collection)(elem, false, false);
|
|
42
42
|
var flag = flagList[i];
|
|
43
|
-
if (flag === typescript_1.default.ElementFlags.Optional
|
|
43
|
+
if (flag === typescript_1.default.ElementFlags.Optional &&
|
|
44
|
+
(child.required === false || child.any === true))
|
|
44
45
|
(0, Writable_1.Writable)(child).optional = true;
|
|
45
46
|
if (flag !== typescript_1.default.ElementFlags.Rest)
|
|
46
47
|
return child;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emplace_metadata_tuple.js","sourceRoot":"","sources":["../../../../src/factories/internal/metadata/emplace_metadata_tuple.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAE5B,uDAAsD;AAGtD,sDAAqD;AAErD,sDAAqD;AAIrD,uDAAsD;AAE/C,IAAM,sBAAsB,GAC/B,UAAC,OAAuB;IACxB,OAAA,UAAC,OAAiC;QAClC,OAAA,UAAC,UAA8B;YAC/B,OAAA,UAAC,IAAkB,EAAE,QAAiB;;gBAE5B,IAAA,KAAA,OAA2B,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAA,EAAhE,KAAK,QAAA,EAAE,MAAM,QAAA,EAAE,OAAO,QAA0C,CAAC;gBACxE,qBAAS,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACzC,IAAI,MAAM,KAAK,KAAK;oBAAE,OAAO,KAAK,CAAC;gBAGnC,IAAM,QAAQ,GACV,MAAA,MAAA,IAAI,CAAC,YAAY,mCACjB,MAAC,IAAI,CAAC,MAAuB,0CAAE,YAAY,mCAC3C,EAAE,CAAC;gBACP,IAAM,QAAQ,GAAe,OAAO;qBAC/B,gBAAgB,CAAC,IAAwB,CAAC;qBAC1C,GAAG,CAAC,UAAC,IAAI,EAAE,CAAC;oBACT,IAAM,KAAK,GAAa,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CACtD,UAAU,CACb,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;oBAGtB,IAAM,IAAI,GAAgC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACtD,
|
|
1
|
+
{"version":3,"file":"emplace_metadata_tuple.js","sourceRoot":"","sources":["../../../../src/factories/internal/metadata/emplace_metadata_tuple.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAE5B,uDAAsD;AAGtD,sDAAqD;AAErD,sDAAqD;AAIrD,uDAAsD;AAE/C,IAAM,sBAAsB,GAC/B,UAAC,OAAuB;IACxB,OAAA,UAAC,OAAiC;QAClC,OAAA,UAAC,UAA8B;YAC/B,OAAA,UAAC,IAAkB,EAAE,QAAiB;;gBAE5B,IAAA,KAAA,OAA2B,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAA,EAAhE,KAAK,QAAA,EAAE,MAAM,QAAA,EAAE,OAAO,QAA0C,CAAC;gBACxE,qBAAS,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACzC,IAAI,MAAM,KAAK,KAAK;oBAAE,OAAO,KAAK,CAAC;gBAGnC,IAAM,QAAQ,GACV,MAAA,MAAA,IAAI,CAAC,YAAY,mCACjB,MAAC,IAAI,CAAC,MAAuB,0CAAE,YAAY,mCAC3C,EAAE,CAAC;gBACP,IAAM,QAAQ,GAAe,OAAO;qBAC/B,gBAAgB,CAAC,IAAwB,CAAC;qBAC1C,GAAG,CAAC,UAAC,IAAI,EAAE,CAAC;oBACT,IAAM,KAAK,GAAa,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CACtD,UAAU,CACb,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;oBAGtB,IAAM,IAAI,GAAgC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACtD,IACI,IAAI,KAAK,oBAAE,CAAC,YAAY,CAAC,QAAQ;wBACjC,CAAC,KAAK,CAAC,QAAQ,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC;wBAEhD,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAGpC,IAAI,IAAI,KAAK,oBAAE,CAAC,YAAY,CAAC,IAAI;wBAAE,OAAO,KAAK,CAAC;oBAChD,IAAM,OAAO,GAAa,mBAAQ,CAAC,UAAU,EAAE,CAAC;oBAChD,IAAA,mBAAQ,EAAC,OAAO,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC;oBAC/B,OAAO,OAAO,CAAC;gBACnB,CAAC,CAAC,CAAC;gBACP,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAElB,OAAO,KAAK,CAAC;YACjB,CAAC;QAnCD,CAmCC;IApCD,CAoCC;AArCD,CAqCC,CAAC;AAvCO,QAAA,sBAAsB,0BAuC7B"}
|
package/package.json
CHANGED
package/src/Primitive.ts
CHANGED
|
@@ -1,123 +1,125 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Primitive type.
|
|
3
|
-
*
|
|
4
|
-
* `Primitive` is a type of TMP (Type Meta Programming) type who converts its argument as a
|
|
5
|
-
* primitive type.
|
|
6
|
-
*
|
|
7
|
-
* If the target argument is a built-in class who returns its origin primitive type through
|
|
8
|
-
* the `valueOf()` method like the `String` or `Number`, its return type would be the
|
|
9
|
-
* `string` or `number`.
|
|
10
|
-
*
|
|
11
|
-
* Otherwise, the target argument is a type of custom class, all of its custom method would
|
|
12
|
-
* be erased and its prototype would be changed to the primitive `object`. Therefore, return
|
|
13
|
-
* type of the TMP type finally be the primitive object.
|
|
14
|
-
*
|
|
15
|
-
* In addition, if the target argument is a type of custom class and it has a special
|
|
16
|
-
* method `toJSON()`, return type of this `Primitive` would be not `Primitive<Instance>`
|
|
17
|
-
* but `Primitive<ReturnType<Instance.toJSON>>`.
|
|
18
|
-
*
|
|
19
|
-
* Before | After
|
|
20
|
-
* ------------------------|----------------------------------------
|
|
21
|
-
* `Boolean` | `boolean`
|
|
22
|
-
* `Number` | `number`
|
|
23
|
-
* `String` | `string`
|
|
24
|
-
* `Class` | `object`
|
|
25
|
-
* `Class` with `toJSON()` | `Primitive<ReturnType<Class.toJSON>>`
|
|
26
|
-
* Others | No change
|
|
27
|
-
*
|
|
28
|
-
* @template Instance Target argument type.
|
|
29
|
-
* @author Jenogho Nam - https://github.com/samchon
|
|
30
|
-
*/
|
|
31
|
-
export type Primitive<T> = Equal<T, PrimitiveMain<T>> extends true
|
|
32
|
-
? T
|
|
33
|
-
: PrimitiveMain<T>;
|
|
34
|
-
|
|
35
|
-
type Equal<X, Y> = X extends Y ? (Y extends X ? true : false) : false;
|
|
36
|
-
|
|
37
|
-
type PrimitiveMain<Instance> = ValueOf<Instance> extends object
|
|
38
|
-
? Instance extends object
|
|
39
|
-
? Instance extends NativeClass
|
|
40
|
-
? {}
|
|
41
|
-
: Instance extends IJsonable<infer Raw>
|
|
42
|
-
? ValueOf<Raw> extends object
|
|
43
|
-
? Raw extends object
|
|
44
|
-
? PrimitiveObject<Raw> // object would be primitified
|
|
45
|
-
: never // cannot be
|
|
46
|
-
: ValueOf<Raw> // atomic value
|
|
47
|
-
: PrimitiveObject<Instance> // object would be primitified
|
|
48
|
-
: never // cannot be
|
|
49
|
-
: ValueOf<Instance>;
|
|
50
|
-
|
|
51
|
-
type PrimitiveObject<Instance extends object> = Instance extends Array<infer T>
|
|
52
|
-
? IsTuple<Instance> extends true
|
|
53
|
-
? PrimitiveTuple<Instance>
|
|
54
|
-
: PrimitiveMain<T>[]
|
|
55
|
-
: {
|
|
56
|
-
[P in keyof Instance]: Instance[P] extends Function
|
|
57
|
-
? never
|
|
58
|
-
: PrimitiveMain<Instance[P]>;
|
|
59
|
-
};
|
|
60
|
-
|
|
61
|
-
type PrimitiveTuple<T extends readonly any[]> = T extends [
|
|
62
|
-
? [
|
|
63
|
-
: T extends [infer F
|
|
64
|
-
? [PrimitiveMain<F
|
|
65
|
-
: T extends [
|
|
66
|
-
? [PrimitiveMain<F
|
|
67
|
-
: T extends [(infer F)
|
|
68
|
-
? [PrimitiveMain<F
|
|
69
|
-
: []
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
?
|
|
75
|
-
: IsValueOf<Instance,
|
|
76
|
-
?
|
|
77
|
-
: Instance
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
|
83
|
-
|
|
|
84
|
-
|
|
|
85
|
-
|
|
|
86
|
-
|
|
|
87
|
-
|
|
|
88
|
-
|
|
|
89
|
-
|
|
|
90
|
-
|
|
|
91
|
-
|
|
|
92
|
-
|
|
|
93
|
-
|
|
|
94
|
-
|
|
|
95
|
-
|
|
|
96
|
-
|
|
|
97
|
-
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
]
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
?
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Primitive type.
|
|
3
|
+
*
|
|
4
|
+
* `Primitive` is a type of TMP (Type Meta Programming) type who converts its argument as a
|
|
5
|
+
* primitive type.
|
|
6
|
+
*
|
|
7
|
+
* If the target argument is a built-in class who returns its origin primitive type through
|
|
8
|
+
* the `valueOf()` method like the `String` or `Number`, its return type would be the
|
|
9
|
+
* `string` or `number`.
|
|
10
|
+
*
|
|
11
|
+
* Otherwise, the target argument is a type of custom class, all of its custom method would
|
|
12
|
+
* be erased and its prototype would be changed to the primitive `object`. Therefore, return
|
|
13
|
+
* type of the TMP type finally be the primitive object.
|
|
14
|
+
*
|
|
15
|
+
* In addition, if the target argument is a type of custom class and it has a special
|
|
16
|
+
* method `toJSON()`, return type of this `Primitive` would be not `Primitive<Instance>`
|
|
17
|
+
* but `Primitive<ReturnType<Instance.toJSON>>`.
|
|
18
|
+
*
|
|
19
|
+
* Before | After
|
|
20
|
+
* ------------------------|----------------------------------------
|
|
21
|
+
* `Boolean` | `boolean`
|
|
22
|
+
* `Number` | `number`
|
|
23
|
+
* `String` | `string`
|
|
24
|
+
* `Class` | `object`
|
|
25
|
+
* `Class` with `toJSON()` | `Primitive<ReturnType<Class.toJSON>>`
|
|
26
|
+
* Others | No change
|
|
27
|
+
*
|
|
28
|
+
* @template Instance Target argument type.
|
|
29
|
+
* @author Jenogho Nam - https://github.com/samchon
|
|
30
|
+
*/
|
|
31
|
+
export type Primitive<T> = Equal<T, PrimitiveMain<T>> extends true
|
|
32
|
+
? T
|
|
33
|
+
: PrimitiveMain<T>;
|
|
34
|
+
|
|
35
|
+
type Equal<X, Y> = X extends Y ? (Y extends X ? true : false) : false;
|
|
36
|
+
|
|
37
|
+
type PrimitiveMain<Instance> = ValueOf<Instance> extends object
|
|
38
|
+
? Instance extends object
|
|
39
|
+
? Instance extends NativeClass
|
|
40
|
+
? {}
|
|
41
|
+
: Instance extends IJsonable<infer Raw>
|
|
42
|
+
? ValueOf<Raw> extends object
|
|
43
|
+
? Raw extends object
|
|
44
|
+
? PrimitiveObject<Raw> // object would be primitified
|
|
45
|
+
: never // cannot be
|
|
46
|
+
: ValueOf<Raw> // atomic value
|
|
47
|
+
: PrimitiveObject<Instance> // object would be primitified
|
|
48
|
+
: never // cannot be
|
|
49
|
+
: ValueOf<Instance>;
|
|
50
|
+
|
|
51
|
+
type PrimitiveObject<Instance extends object> = Instance extends Array<infer T>
|
|
52
|
+
? IsTuple<Instance> extends true
|
|
53
|
+
? PrimitiveTuple<Instance>
|
|
54
|
+
: PrimitiveMain<T>[]
|
|
55
|
+
: {
|
|
56
|
+
[P in keyof Instance]: Instance[P] extends Function
|
|
57
|
+
? never
|
|
58
|
+
: PrimitiveMain<Instance[P]>;
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
type PrimitiveTuple<T extends readonly any[]> = T extends []
|
|
62
|
+
? []
|
|
63
|
+
: T extends [infer F]
|
|
64
|
+
? [PrimitiveMain<F>]
|
|
65
|
+
: T extends [infer F, ...infer Rest extends readonly any[]]
|
|
66
|
+
? [PrimitiveMain<F>, ...PrimitiveTuple<Rest>]
|
|
67
|
+
: T extends [(infer F)?]
|
|
68
|
+
? [PrimitiveMain<F>?]
|
|
69
|
+
: T extends [(infer F)?, ...infer Rest extends readonly any[]]
|
|
70
|
+
? [PrimitiveMain<F>?, ...PrimitiveTuple<Rest>]
|
|
71
|
+
: [];
|
|
72
|
+
|
|
73
|
+
type ValueOf<Instance> = IsValueOf<Instance, Boolean> extends true
|
|
74
|
+
? boolean
|
|
75
|
+
: IsValueOf<Instance, Number> extends true
|
|
76
|
+
? number
|
|
77
|
+
: IsValueOf<Instance, String> extends true
|
|
78
|
+
? string
|
|
79
|
+
: Instance;
|
|
80
|
+
|
|
81
|
+
type NativeClass =
|
|
82
|
+
| Set<any>
|
|
83
|
+
| Map<any, any>
|
|
84
|
+
| WeakSet<any>
|
|
85
|
+
| WeakMap<any, any>
|
|
86
|
+
| Uint8Array
|
|
87
|
+
| Uint8ClampedArray
|
|
88
|
+
| Uint16Array
|
|
89
|
+
| Uint32Array
|
|
90
|
+
| BigUint64Array
|
|
91
|
+
| Int8Array
|
|
92
|
+
| Int16Array
|
|
93
|
+
| Int32Array
|
|
94
|
+
| BigInt64Array
|
|
95
|
+
| Float32Array
|
|
96
|
+
| Float64Array
|
|
97
|
+
| ArrayBuffer
|
|
98
|
+
| SharedArrayBuffer
|
|
99
|
+
| DataView;
|
|
100
|
+
|
|
101
|
+
type IsTuple<T extends readonly any[] | { length: number }> = [T] extends [
|
|
102
|
+
never,
|
|
103
|
+
]
|
|
104
|
+
? false
|
|
105
|
+
: T extends readonly any[]
|
|
106
|
+
? number extends T["length"]
|
|
107
|
+
? false
|
|
108
|
+
: true
|
|
109
|
+
: false;
|
|
110
|
+
|
|
111
|
+
type IsValueOf<Instance, Object extends IValueOf<any>> = Instance extends Object
|
|
112
|
+
? Object extends IValueOf<infer Primitive>
|
|
113
|
+
? Instance extends Primitive
|
|
114
|
+
? false
|
|
115
|
+
: true // not Primitive, but Object
|
|
116
|
+
: false // cannot be
|
|
117
|
+
: false;
|
|
118
|
+
|
|
119
|
+
interface IValueOf<T> {
|
|
120
|
+
valueOf(): T;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
interface IJsonable<T> {
|
|
124
|
+
toJSON(): T;
|
|
125
|
+
}
|
|
@@ -1,142 +1,140 @@
|
|
|
1
|
-
import ts from "typescript";
|
|
2
|
-
|
|
3
|
-
import { Metadata } from "../../../metadata/Metadata";
|
|
4
|
-
import { MetadataObject } from "../../../metadata/MetadataObject";
|
|
5
|
-
import { MetadataProperty } from "../../../metadata/MetadataProperty";
|
|
6
|
-
|
|
7
|
-
import { Writable } from "../../../typings/Writable";
|
|
8
|
-
|
|
9
|
-
import { ArrayUtil } from "../../../utils/ArrayUtil";
|
|
10
|
-
|
|
11
|
-
import { CommentFactory } from "../../CommentFactory";
|
|
12
|
-
import { MetadataCollection } from "../../MetadataCollection";
|
|
13
|
-
import { MetadataFactory } from "../../MetadataFactory";
|
|
14
|
-
import { MetadataTagFactory } from "../../MetadataTagFactory";
|
|
15
|
-
import { MetadataHelper } from "./MetadataHelper";
|
|
16
|
-
import { explore_metadata } from "./explore_metadata";
|
|
17
|
-
|
|
18
|
-
export const emplace_metadata_object =
|
|
19
|
-
(checker: ts.TypeChecker) =>
|
|
20
|
-
(options: MetadataFactory.IOptions) =>
|
|
21
|
-
(collection: MetadataCollection) =>
|
|
22
|
-
(parent: ts.Type, nullable: boolean): MetadataObject => {
|
|
23
|
-
// EMPLACE OBJECT
|
|
24
|
-
const [obj, newbie] = collection.emplace(checker, parent);
|
|
25
|
-
ArrayUtil.add(obj.nullables, nullable, (elem) => elem === nullable);
|
|
26
|
-
|
|
27
|
-
if (newbie === false) return obj;
|
|
28
|
-
|
|
29
|
-
// PREPARE ASSETS
|
|
30
|
-
const isClass: boolean = parent.isClass();
|
|
31
|
-
const pred: (node: ts.Declaration) => boolean = isClass
|
|
32
|
-
? (node) => {
|
|
33
|
-
const kind: ts.SyntaxKind | undefined = node
|
|
34
|
-
.getChildren()[0]
|
|
35
|
-
?.getChildren()[0]?.kind;
|
|
36
|
-
return (
|
|
37
|
-
kind !== ts.SyntaxKind.PrivateKeyword &&
|
|
38
|
-
kind !== ts.SyntaxKind.ProtectedKeyword &&
|
|
39
|
-
(ts.isParameter(node) || isProperty(node))
|
|
40
|
-
);
|
|
41
|
-
}
|
|
42
|
-
: (node) => isProperty(node);
|
|
43
|
-
|
|
44
|
-
const insert =
|
|
45
|
-
(key: Metadata) =>
|
|
46
|
-
(value: Metadata) =>
|
|
47
|
-
(identifier: () => string) =>
|
|
48
|
-
(
|
|
49
|
-
symbol: ts.Symbol | undefined,
|
|
50
|
-
filter?: (doc: ts.JSDocTagInfo) => boolean,
|
|
51
|
-
): MetadataProperty => {
|
|
52
|
-
// COMMENTS AND TAGS
|
|
53
|
-
const description: string | null = symbol
|
|
54
|
-
? CommentFactory.description(symbol) ?? null
|
|
55
|
-
: null;
|
|
56
|
-
const jsDocTags: ts.JSDocTagInfo[] = (
|
|
57
|
-
symbol?.getJsDocTags() ?? []
|
|
58
|
-
).filter(filter ?? (() => true));
|
|
59
|
-
|
|
60
|
-
// THE PROPERTY
|
|
61
|
-
const property = MetadataProperty.create({
|
|
62
|
-
key,
|
|
63
|
-
value,
|
|
64
|
-
description,
|
|
65
|
-
jsDocTags,
|
|
66
|
-
tags: MetadataTagFactory.generate(value)(jsDocTags)(() =>
|
|
67
|
-
identifier(),
|
|
68
|
-
),
|
|
69
|
-
});
|
|
70
|
-
obj.properties.push(property);
|
|
71
|
-
return property;
|
|
72
|
-
};
|
|
73
|
-
|
|
74
|
-
//----
|
|
75
|
-
// REGULAR PROPERTIES
|
|
76
|
-
//----
|
|
77
|
-
for (const prop of parent.getApparentProperties()) {
|
|
78
|
-
// CHECK INTERNAL TAG
|
|
79
|
-
if (
|
|
80
|
-
(prop.getJsDocTags(checker) ?? []).find(
|
|
81
|
-
(tag) => tag.name === "internal",
|
|
82
|
-
) !== undefined
|
|
83
|
-
)
|
|
84
|
-
continue;
|
|
85
|
-
|
|
86
|
-
// CHECK NODE IS A FORMAL PROPERTY
|
|
87
|
-
const [node, type] = (() => {
|
|
88
|
-
const node = (prop.getDeclarations() ?? [])[0] as
|
|
89
|
-
| ts.PropertyDeclaration
|
|
90
|
-
| undefined;
|
|
91
|
-
const type: ts.Type | undefined = node
|
|
92
|
-
? checker.getTypeOfSymbolAtLocation(prop, node)
|
|
93
|
-
: "getTypeOfPropertyOfType" in checker
|
|
94
|
-
? (checker as any).getTypeOfPropertyOfType(
|
|
95
|
-
parent,
|
|
96
|
-
prop.name,
|
|
97
|
-
)
|
|
98
|
-
: undefined;
|
|
99
|
-
return [node, type];
|
|
100
|
-
})();
|
|
101
|
-
if ((node && pred(node) === false) || type === undefined) continue;
|
|
102
|
-
|
|
103
|
-
// GET EXACT TYPE
|
|
104
|
-
const key: Metadata = MetadataHelper.literal_to_metadata(prop.name);
|
|
105
|
-
const value: Metadata = explore_metadata(checker)(options)(
|
|
106
|
-
collection,
|
|
107
|
-
)(type, false);
|
|
108
|
-
|
|
109
|
-
//
|
|
110
|
-
if (node?.questionToken)
|
|
111
|
-
Writable(value).
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
//----
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
ts.
|
|
140
|
-
ts.
|
|
141
|
-
ts.isPropertySignature(node) ||
|
|
142
|
-
ts.isTypeLiteralNode(node);
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
|
|
3
|
+
import { Metadata } from "../../../metadata/Metadata";
|
|
4
|
+
import { MetadataObject } from "../../../metadata/MetadataObject";
|
|
5
|
+
import { MetadataProperty } from "../../../metadata/MetadataProperty";
|
|
6
|
+
|
|
7
|
+
import { Writable } from "../../../typings/Writable";
|
|
8
|
+
|
|
9
|
+
import { ArrayUtil } from "../../../utils/ArrayUtil";
|
|
10
|
+
|
|
11
|
+
import { CommentFactory } from "../../CommentFactory";
|
|
12
|
+
import { MetadataCollection } from "../../MetadataCollection";
|
|
13
|
+
import { MetadataFactory } from "../../MetadataFactory";
|
|
14
|
+
import { MetadataTagFactory } from "../../MetadataTagFactory";
|
|
15
|
+
import { MetadataHelper } from "./MetadataHelper";
|
|
16
|
+
import { explore_metadata } from "./explore_metadata";
|
|
17
|
+
|
|
18
|
+
export const emplace_metadata_object =
|
|
19
|
+
(checker: ts.TypeChecker) =>
|
|
20
|
+
(options: MetadataFactory.IOptions) =>
|
|
21
|
+
(collection: MetadataCollection) =>
|
|
22
|
+
(parent: ts.Type, nullable: boolean): MetadataObject => {
|
|
23
|
+
// EMPLACE OBJECT
|
|
24
|
+
const [obj, newbie] = collection.emplace(checker, parent);
|
|
25
|
+
ArrayUtil.add(obj.nullables, nullable, (elem) => elem === nullable);
|
|
26
|
+
|
|
27
|
+
if (newbie === false) return obj;
|
|
28
|
+
|
|
29
|
+
// PREPARE ASSETS
|
|
30
|
+
const isClass: boolean = parent.isClass();
|
|
31
|
+
const pred: (node: ts.Declaration) => boolean = isClass
|
|
32
|
+
? (node) => {
|
|
33
|
+
const kind: ts.SyntaxKind | undefined = node
|
|
34
|
+
.getChildren()[0]
|
|
35
|
+
?.getChildren()[0]?.kind;
|
|
36
|
+
return (
|
|
37
|
+
kind !== ts.SyntaxKind.PrivateKeyword &&
|
|
38
|
+
kind !== ts.SyntaxKind.ProtectedKeyword &&
|
|
39
|
+
(ts.isParameter(node) || isProperty(node))
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
: (node) => isProperty(node);
|
|
43
|
+
|
|
44
|
+
const insert =
|
|
45
|
+
(key: Metadata) =>
|
|
46
|
+
(value: Metadata) =>
|
|
47
|
+
(identifier: () => string) =>
|
|
48
|
+
(
|
|
49
|
+
symbol: ts.Symbol | undefined,
|
|
50
|
+
filter?: (doc: ts.JSDocTagInfo) => boolean,
|
|
51
|
+
): MetadataProperty => {
|
|
52
|
+
// COMMENTS AND TAGS
|
|
53
|
+
const description: string | null = symbol
|
|
54
|
+
? CommentFactory.description(symbol) ?? null
|
|
55
|
+
: null;
|
|
56
|
+
const jsDocTags: ts.JSDocTagInfo[] = (
|
|
57
|
+
symbol?.getJsDocTags() ?? []
|
|
58
|
+
).filter(filter ?? (() => true));
|
|
59
|
+
|
|
60
|
+
// THE PROPERTY
|
|
61
|
+
const property = MetadataProperty.create({
|
|
62
|
+
key,
|
|
63
|
+
value,
|
|
64
|
+
description,
|
|
65
|
+
jsDocTags,
|
|
66
|
+
tags: MetadataTagFactory.generate(value)(jsDocTags)(() =>
|
|
67
|
+
identifier(),
|
|
68
|
+
),
|
|
69
|
+
});
|
|
70
|
+
obj.properties.push(property);
|
|
71
|
+
return property;
|
|
72
|
+
};
|
|
73
|
+
|
|
74
|
+
//----
|
|
75
|
+
// REGULAR PROPERTIES
|
|
76
|
+
//----
|
|
77
|
+
for (const prop of parent.getApparentProperties()) {
|
|
78
|
+
// CHECK INTERNAL TAG
|
|
79
|
+
if (
|
|
80
|
+
(prop.getJsDocTags(checker) ?? []).find(
|
|
81
|
+
(tag) => tag.name === "internal",
|
|
82
|
+
) !== undefined
|
|
83
|
+
)
|
|
84
|
+
continue;
|
|
85
|
+
|
|
86
|
+
// CHECK NODE IS A FORMAL PROPERTY
|
|
87
|
+
const [node, type] = (() => {
|
|
88
|
+
const node = (prop.getDeclarations() ?? [])[0] as
|
|
89
|
+
| ts.PropertyDeclaration
|
|
90
|
+
| undefined;
|
|
91
|
+
const type: ts.Type | undefined = node
|
|
92
|
+
? checker.getTypeOfSymbolAtLocation(prop, node)
|
|
93
|
+
: "getTypeOfPropertyOfType" in checker
|
|
94
|
+
? (checker as any).getTypeOfPropertyOfType(
|
|
95
|
+
parent,
|
|
96
|
+
prop.name,
|
|
97
|
+
)
|
|
98
|
+
: undefined;
|
|
99
|
+
return [node, type];
|
|
100
|
+
})();
|
|
101
|
+
if ((node && pred(node) === false) || type === undefined) continue;
|
|
102
|
+
|
|
103
|
+
// GET EXACT TYPE
|
|
104
|
+
const key: Metadata = MetadataHelper.literal_to_metadata(prop.name);
|
|
105
|
+
const value: Metadata = explore_metadata(checker)(options)(
|
|
106
|
+
collection,
|
|
107
|
+
)(type, false);
|
|
108
|
+
|
|
109
|
+
// OPTIONAL, BUT CAN BE RQUIRED BY `Required<T>` TYPE
|
|
110
|
+
if (node?.questionToken && (value.required === false || value.any))
|
|
111
|
+
Writable(value).optional = true;
|
|
112
|
+
insert(key)(value)(() => `${obj.name}.${prop.name}`)(prop);
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
//----
|
|
116
|
+
// DYNAMIC PROPERTIES
|
|
117
|
+
//----
|
|
118
|
+
for (const index of checker.getIndexInfosOfType(parent)) {
|
|
119
|
+
// GET EXACT TYPE
|
|
120
|
+
const analyzer = (type: ts.Type) =>
|
|
121
|
+
explore_metadata(checker)(options)(collection)(type, false);
|
|
122
|
+
const key: Metadata = analyzer(index.keyType);
|
|
123
|
+
const value: Metadata = analyzer(index.type);
|
|
124
|
+
|
|
125
|
+
// INSERT WITH REQUIRED CONFIGURATION
|
|
126
|
+
insert(key)(value)(() => `${obj.name}[${key.getName()}]`)(
|
|
127
|
+
index.declaration?.parent
|
|
128
|
+
? checker.getSymbolAtLocation(index.declaration.parent)
|
|
129
|
+
: undefined,
|
|
130
|
+
(doc) => doc.name !== "default",
|
|
131
|
+
);
|
|
132
|
+
}
|
|
133
|
+
return obj;
|
|
134
|
+
};
|
|
135
|
+
|
|
136
|
+
const isProperty = (node: ts.Declaration) =>
|
|
137
|
+
ts.isPropertyDeclaration(node) ||
|
|
138
|
+
ts.isPropertyAssignment(node) ||
|
|
139
|
+
ts.isPropertySignature(node) ||
|
|
140
|
+
ts.isTypeLiteralNode(node);
|
|
@@ -1,50 +1,53 @@
|
|
|
1
|
-
import ts from "typescript";
|
|
2
|
-
|
|
3
|
-
import { Metadata } from "../../../metadata/Metadata";
|
|
4
|
-
import { MetadataTuple } from "../../../metadata/MetadataTuple";
|
|
5
|
-
|
|
6
|
-
import { Writable } from "../../../typings/Writable";
|
|
7
|
-
|
|
8
|
-
import { ArrayUtil } from "../../../utils/ArrayUtil";
|
|
9
|
-
|
|
10
|
-
import { MetadataCollection } from "../../MetadataCollection";
|
|
11
|
-
import { MetadataFactory } from "../../MetadataFactory";
|
|
12
|
-
import { explore_metadata } from "./explore_metadata";
|
|
13
|
-
|
|
14
|
-
export const emplace_metadata_tuple =
|
|
15
|
-
(checker: ts.TypeChecker) =>
|
|
16
|
-
(options: MetadataFactory.IOptions) =>
|
|
17
|
-
(collection: MetadataCollection) =>
|
|
18
|
-
(type: ts.TupleType, nullable: boolean): MetadataTuple => {
|
|
19
|
-
// CHECK EXISTENCE
|
|
20
|
-
const [tuple, newbie, closure] = collection.emplaceTuple(checker, type);
|
|
21
|
-
ArrayUtil.add(tuple.nullables, nullable);
|
|
22
|
-
if (newbie === false) return tuple;
|
|
23
|
-
|
|
24
|
-
// CONSTRUCT ELEMENT TYPES
|
|
25
|
-
const flagList: readonly ts.ElementFlags[] =
|
|
26
|
-
type.elementFlags ??
|
|
27
|
-
(type.target as ts.TupleType)?.elementFlags ??
|
|
28
|
-
[];
|
|
29
|
-
const elements: Metadata[] = checker
|
|
30
|
-
.getTypeArguments(type as ts.TypeReference)
|
|
31
|
-
.map((elem, i) => {
|
|
32
|
-
const child: Metadata = explore_metadata(checker)(options)(
|
|
33
|
-
collection,
|
|
34
|
-
)(elem, false, false);
|
|
35
|
-
|
|
36
|
-
// CHECK OPTIONAL
|
|
37
|
-
const flag: ts.ElementFlags | undefined = flagList[i];
|
|
38
|
-
if (
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
|
|
3
|
+
import { Metadata } from "../../../metadata/Metadata";
|
|
4
|
+
import { MetadataTuple } from "../../../metadata/MetadataTuple";
|
|
5
|
+
|
|
6
|
+
import { Writable } from "../../../typings/Writable";
|
|
7
|
+
|
|
8
|
+
import { ArrayUtil } from "../../../utils/ArrayUtil";
|
|
9
|
+
|
|
10
|
+
import { MetadataCollection } from "../../MetadataCollection";
|
|
11
|
+
import { MetadataFactory } from "../../MetadataFactory";
|
|
12
|
+
import { explore_metadata } from "./explore_metadata";
|
|
13
|
+
|
|
14
|
+
export const emplace_metadata_tuple =
|
|
15
|
+
(checker: ts.TypeChecker) =>
|
|
16
|
+
(options: MetadataFactory.IOptions) =>
|
|
17
|
+
(collection: MetadataCollection) =>
|
|
18
|
+
(type: ts.TupleType, nullable: boolean): MetadataTuple => {
|
|
19
|
+
// CHECK EXISTENCE
|
|
20
|
+
const [tuple, newbie, closure] = collection.emplaceTuple(checker, type);
|
|
21
|
+
ArrayUtil.add(tuple.nullables, nullable);
|
|
22
|
+
if (newbie === false) return tuple;
|
|
23
|
+
|
|
24
|
+
// CONSTRUCT ELEMENT TYPES
|
|
25
|
+
const flagList: readonly ts.ElementFlags[] =
|
|
26
|
+
type.elementFlags ??
|
|
27
|
+
(type.target as ts.TupleType)?.elementFlags ??
|
|
28
|
+
[];
|
|
29
|
+
const elements: Metadata[] = checker
|
|
30
|
+
.getTypeArguments(type as ts.TypeReference)
|
|
31
|
+
.map((elem, i) => {
|
|
32
|
+
const child: Metadata = explore_metadata(checker)(options)(
|
|
33
|
+
collection,
|
|
34
|
+
)(elem, false, false);
|
|
35
|
+
|
|
36
|
+
// CHECK OPTIONAL
|
|
37
|
+
const flag: ts.ElementFlags | undefined = flagList[i];
|
|
38
|
+
if (
|
|
39
|
+
flag === ts.ElementFlags.Optional &&
|
|
40
|
+
(child.required === false || child.any === true)
|
|
41
|
+
)
|
|
42
|
+
Writable(child).optional = true;
|
|
43
|
+
|
|
44
|
+
// REST TYPE
|
|
45
|
+
if (flag !== ts.ElementFlags.Rest) return child;
|
|
46
|
+
const wrapper: Metadata = Metadata.initialize();
|
|
47
|
+
Writable(wrapper).rest = child;
|
|
48
|
+
return wrapper;
|
|
49
|
+
});
|
|
50
|
+
closure(elements);
|
|
51
|
+
|
|
52
|
+
return tuple;
|
|
53
|
+
};
|