typia 5.1.5 → 5.1.6-dev.20231005
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.
|
@@ -32,7 +32,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
32
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
33
|
exports.emplace_metadata_object = void 0;
|
|
34
34
|
var typescript_1 = __importDefault(require("typescript"));
|
|
35
|
-
var Metadata_1 = require("../../../schemas/metadata/Metadata");
|
|
36
35
|
var MetadataProperty_1 = require("../../../schemas/metadata/MetadataProperty");
|
|
37
36
|
var Writable_1 = require("../../../typings/Writable");
|
|
38
37
|
var ArrayUtil_1 = require("../../../utils/ArrayUtil");
|
|
@@ -103,16 +102,8 @@ var emplace_metadata_object = function (checker) {
|
|
|
103
102
|
escaped: false,
|
|
104
103
|
aliased: false,
|
|
105
104
|
});
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (valueType === undefined || isOptional(valueType) === true)
|
|
109
|
-
(0, Writable_1.Writable)(value).optional = true;
|
|
110
|
-
}
|
|
111
|
-
else if (!!node && value.isRequired() === true) {
|
|
112
|
-
var valueType = checker.getTypeOfPropertyOfType(parent, prop.name);
|
|
113
|
-
if (valueType && isOptional(valueType) === true)
|
|
114
|
-
(0, Writable_1.Writable)(value).optional = true;
|
|
115
|
-
}
|
|
105
|
+
(0, Writable_1.Writable)(value).optional =
|
|
106
|
+
(prop.flags & typescript_1.default.SymbolFlags.Optional) !== 0;
|
|
116
107
|
insert(key)(value)(prop);
|
|
117
108
|
};
|
|
118
109
|
try {
|
|
@@ -168,11 +159,6 @@ var isProperty = function (node) {
|
|
|
168
159
|
typescript_1.default.isPropertySignature(node) ||
|
|
169
160
|
typescript_1.default.isTypeLiteralNode(node);
|
|
170
161
|
};
|
|
171
|
-
var isOptional = function (type) {
|
|
172
|
-
var meta = Metadata_1.Metadata.initialize();
|
|
173
|
-
iterate_optional_coalesce(meta, type);
|
|
174
|
-
return !meta.isRequired();
|
|
175
|
-
};
|
|
176
162
|
var iterate_optional_coalesce = function (meta, type) {
|
|
177
163
|
if (type.isUnionOrIntersection())
|
|
178
164
|
type.types.forEach(function (child) { return iterate_optional_coalesce(meta, child); });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emplace_metadata_object.js","sourceRoot":"","sources":["../../../../src/factories/internal/metadata/emplace_metadata_object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;
|
|
1
|
+
{"version":3,"file":"emplace_metadata_object.js","sourceRoot":"","sources":["../../../../src/factories/internal/metadata/emplace_metadata_object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAI5B,+EAA8E;AAE9E,sDAAqD;AAErD,sDAAqD;AAErD,uDAAsD;AAGtD,mDAAkD;AAClD,uDAAsD;AACtD,yEAAwE;AAEjE,IAAM,uBAAuB,GAChC,UAAC,OAAuB;IACxB,OAAA,UAAC,OAAiC;QAClC,OAAA,UAAC,UAA8B;YAC/B,OAAA,UAAC,MAAgC;gBACjC,OAAA,UAAC,MAAe,EAAE,QAAiB;;;oBAEzB,IAAA,KAAA,OAAgB,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,IAAA,EAAlD,GAAG,QAAA,EAAE,MAAM,QAAuC,CAAC;oBAC1D,qBAAS,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAC,IAAI,IAAK,OAAA,IAAI,KAAK,QAAQ,EAAjB,CAAiB,CAAC,CAAC;oBAEpE,IAAI,MAAM,KAAK,KAAK;wBAAE,OAAO,GAAG,CAAC;oBAGjC,IAAM,OAAO,GAAY,MAAM,CAAC,OAAO,EAAE,CAAC;oBAC1C,IAAM,IAAI,GAAsC,OAAO;wBACnD,CAAC,CAAC,UAAC,IAAI;;4BACD,IAAM,IAAI,GAA8B,MAAA,MAAA,IAAI;iCACvC,WAAW,EAAE,CAAC,CAAC,CAAC,0CACf,WAAW,GAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;4BAC7B,OAAO,CACH,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,cAAc;gCACrC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,gBAAgB;gCACvC,CAAC,oBAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAC7C,CAAC;wBACN,CAAC;wBACH,CAAC,CAAC,UAAC,IAAI,IAAK,OAAA,UAAU,CAAC,IAAI,CAAC,EAAhB,CAAgB,CAAC;oBAEjC,IAAM,MAAM,GACR,UAAC,GAAa;wBACd,OAAA,UAAC,KAAe;4BAChB,OAAA,UACI,MAA6B,EAC7B,MAA0C;;gCAG1C,IAAM,WAAW,GAAkB,MAAM;oCACrC,CAAC,CAAC,MAAA,+BAAc,CAAC,WAAW,CAAC,MAAM,CAAC,mCAAI,IAAI;oCAC5C,CAAC,CAAC,IAAI,CAAC;gCACX,IAAM,SAAS,GAAsB,CACjC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,EAAE,mCAAI,EAAE,CAC/B,CAAC,MAAM,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,CAAC,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,CAAC,CAAC;gCAGjC,IAAM,QAAQ,GAAG,mCAAgB,CAAC,MAAM,CAAC;oCACrC,GAAG,KAAA;oCACH,KAAK,OAAA;oCACL,WAAW,aAAA;oCACX,SAAS,WAAA;iCACZ,CAAC,CAAC;gCACH,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gCAC9B,OAAO,QAAQ,CAAC;4BACpB,CAAC;wBArBD,CAqBC;oBAtBD,CAsBC,CAAC;4CAKK,IAAI;wBAEX,IACI,CAAC,MAAA,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC,CAAC,IAAI,CACnC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,IAAI,KAAK,UAAU,EAAvB,CAAuB,CACnC,KAAK,SAAS;8CAEN;wBAGP,IAAA,KAAA,OAAe,CAAC;;4BAClB,IAAM,IAAI,GAAG,MAAA,IAAI,CAAC,eAAe,EAAE,0CAAG,CAAC,CAExB,CAAC;4BAChB,IAAM,IAAI,GAAwB,IAAI;gCAClC,CAAC,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,CAAC;gCAC/C,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;4BACzD,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBACxB,CAAC,CAAC,EAAE,IAAA,EARG,IAAI,QAAA,EAAE,IAAI,QAQb,CAAC;wBACL,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,IAAI,KAAK,SAAS;8CAAW;wBAGnE,IAAM,GAAG,GAAa,+BAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACpE,IAAM,KAAK,GAAa,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CACtD,UAAU,CACb,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE;4BACZ,GAAG,EAAE,KAAK;4BACV,MAAM,EAAE,GAAG;4BACX,QAAQ,EAAE,IAAI,CAAC,IAAI;4BACnB,MAAM,EAAE,IAAI;4BACZ,OAAO,EAAE,KAAK;4BACd,OAAO,EAAE,KAAK;yBACjB,CAAC,CAAC;wBACH,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC,QAAQ;4BACpB,CAAC,IAAI,CAAC,KAAK,GAAG,oBAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBACjD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;;;wBAnC7B,KAAmB,IAAA,KAAA,SAAA,MAAM,CAAC,qBAAqB,EAAE,CAAA,gBAAA;4BAA5C,IAAM,IAAI,WAAA;oCAAJ,IAAI;yBAoCd;;;;;;;;;;wBAKD,KAAoB,IAAA,KAAA,SAAA,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA,gBAAA,4BAAE;4BAApD,IAAM,KAAK,WAAA;4BAEZ,IAAM,QAAQ,GAAG,UAAC,IAAa,IAAK,OAAA,UAAC,QAAmB;gCACpD,OAAA,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE;oCACzD,GAAG,EAAE,KAAK;oCACV,MAAM,EAAE,GAAG;oCACX,QAAQ,UAAA;oCACR,MAAM,EAAE,IAAI;oCACZ,OAAO,EAAE,KAAK;oCACd,OAAO,EAAE,KAAK;iCACjB,CAAC;4BAPF,CAOE,EAR8B,CAQ9B,CAAC;4BACP,IAAM,GAAG,GAAa,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;4BACpD,IAAM,KAAK,GAAa,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;4BAGjD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CACd,CAAA,MAAA,KAAK,CAAC,WAAW,0CAAE,MAAM;gCACrB,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;gCACvD,CAAC,CAAC,SAAS,EACf,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,IAAI,KAAK,SAAS,EAAtB,CAAsB,CAClC,CAAC;yBACL;;;;;;;;;oBACD,OAAO,GAAG,CAAC;gBACf,CAAC;YAnHD,CAmHC;QApHD,CAoHC;IArHD,CAqHC;AAtHD,CAsHC,CAAC;AAxHO,QAAA,uBAAuB,2BAwH9B;AAEN,IAAM,UAAU,GAAG,UAAC,IAAoB;IACpC,OAAA,oBAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;QAC9B,oBAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC;QAC7B,oBAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAC5B,oBAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;AAH1B,CAG0B,CAAC;AAE/B,IAAM,yBAAyB,GAAG,UAAC,IAAc,EAAE,IAAa;IAC5D,IAAI,IAAI,CAAC,qBAAqB,EAAE;QAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,yBAAyB,CAAC,IAAI,EAAE,KAAK,CAAC,EAAtC,CAAsC,CAAC,CAAC;;QACrE,IAAA,qDAAyB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -104,23 +104,8 @@ export const emplace_metadata_object =
|
|
|
104
104
|
escaped: false,
|
|
105
105
|
aliased: false,
|
|
106
106
|
});
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
if (node?.questionToken) {
|
|
110
|
-
const valueType = checker.getTypeOfPropertyOfType(
|
|
111
|
-
parent,
|
|
112
|
-
prop.name,
|
|
113
|
-
);
|
|
114
|
-
if (valueType === undefined || isOptional(valueType) === true)
|
|
115
|
-
Writable(value).optional = true;
|
|
116
|
-
} else if (!!node && value.isRequired() === true) {
|
|
117
|
-
const valueType = checker.getTypeOfPropertyOfType(
|
|
118
|
-
parent,
|
|
119
|
-
prop.name,
|
|
120
|
-
);
|
|
121
|
-
if (valueType && isOptional(valueType) === true)
|
|
122
|
-
Writable(value).optional = true;
|
|
123
|
-
}
|
|
107
|
+
Writable(value).optional =
|
|
108
|
+
(prop.flags & ts.SymbolFlags.Optional) !== 0;
|
|
124
109
|
insert(key)(value)(prop);
|
|
125
110
|
}
|
|
126
111
|
|
|
@@ -149,7 +134,6 @@ export const emplace_metadata_object =
|
|
|
149
134
|
(doc) => doc.name !== "default",
|
|
150
135
|
);
|
|
151
136
|
}
|
|
152
|
-
|
|
153
137
|
return obj;
|
|
154
138
|
};
|
|
155
139
|
|
|
@@ -159,12 +143,6 @@ const isProperty = (node: ts.Declaration) =>
|
|
|
159
143
|
ts.isPropertySignature(node) ||
|
|
160
144
|
ts.isTypeLiteralNode(node);
|
|
161
145
|
|
|
162
|
-
const isOptional = (type: ts.Type): boolean => {
|
|
163
|
-
const meta: Metadata = Metadata.initialize();
|
|
164
|
-
iterate_optional_coalesce(meta, type);
|
|
165
|
-
return !meta.isRequired();
|
|
166
|
-
};
|
|
167
|
-
|
|
168
146
|
const iterate_optional_coalesce = (meta: Metadata, type: ts.Type): void => {
|
|
169
147
|
if (type.isUnionOrIntersection())
|
|
170
148
|
type.types.forEach((child) => iterate_optional_coalesce(meta, child));
|