typia 4.0.3-dev.20230605 → 4.0.3-dev.20230606
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 +3 -1
- package/src/factories/internal/metadata/emplace_metadata_object.ts +2 -4
- package/src/factories/internal/metadata/emplace_metadata_tuple.ts +4 -1
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
|
@@ -58,7 +58,9 @@ type PrimitiveObject<Instance extends object> = Instance extends Array<infer T>
|
|
|
58
58
|
: PrimitiveMain<Instance[P]>;
|
|
59
59
|
};
|
|
60
60
|
|
|
61
|
-
type PrimitiveTuple<T extends readonly any[]> = T extends [
|
|
61
|
+
type PrimitiveTuple<T extends readonly any[]> = T extends []
|
|
62
|
+
? []
|
|
63
|
+
: T extends [infer F]
|
|
62
64
|
? [PrimitiveMain<F>]
|
|
63
65
|
: T extends [infer F, ...infer Rest extends readonly any[]]
|
|
64
66
|
? [PrimitiveMain<F>, ...PrimitiveTuple<Rest>]
|
|
@@ -106,11 +106,9 @@ export const emplace_metadata_object =
|
|
|
106
106
|
collection,
|
|
107
107
|
)(type, false);
|
|
108
108
|
|
|
109
|
-
//
|
|
110
|
-
if (node?.questionToken)
|
|
111
|
-
Writable(value).required = false;
|
|
109
|
+
// OPTIONAL, BUT CAN BE RQUIRED BY `Required<T>` TYPE
|
|
110
|
+
if (node?.questionToken && (value.required === false || value.any))
|
|
112
111
|
Writable(value).optional = true;
|
|
113
|
-
}
|
|
114
112
|
insert(key)(value)(() => `${obj.name}.${prop.name}`)(prop);
|
|
115
113
|
}
|
|
116
114
|
|
|
@@ -35,7 +35,10 @@ export const emplace_metadata_tuple =
|
|
|
35
35
|
|
|
36
36
|
// CHECK OPTIONAL
|
|
37
37
|
const flag: ts.ElementFlags | undefined = flagList[i];
|
|
38
|
-
if (
|
|
38
|
+
if (
|
|
39
|
+
flag === ts.ElementFlags.Optional &&
|
|
40
|
+
(child.required === false || child.any === true)
|
|
41
|
+
)
|
|
39
42
|
Writable(child).optional = true;
|
|
40
43
|
|
|
41
44
|
// REST TYPE
|