typia 3.4.21 → 3.4.22
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.
|
@@ -39,6 +39,7 @@ var application_schema = function (options) {
|
|
|
39
39
|
return function (blockNever) {
|
|
40
40
|
return function (meta, attribute) {
|
|
41
41
|
var e_1, _a, e_2, _b, e_3, _c, e_4, _d, e_5, _e, e_6, _f;
|
|
42
|
+
var _g;
|
|
42
43
|
if (meta.any === true)
|
|
43
44
|
return {};
|
|
44
45
|
else if (meta.nullable && meta.empty())
|
|
@@ -52,8 +53,8 @@ var application_schema = function (options) {
|
|
|
52
53
|
if (meta.templates.length && AtomicPredicator_1.AtomicPredicator.template(meta))
|
|
53
54
|
union.push((0, application_templates_1.application_templates)(meta, attribute));
|
|
54
55
|
try {
|
|
55
|
-
for (var
|
|
56
|
-
var constant =
|
|
56
|
+
for (var _h = __values(meta.constants), _j = _h.next(); !_j.done; _j = _h.next()) {
|
|
57
|
+
var constant = _j.value;
|
|
57
58
|
if (constant.type === "bigint")
|
|
58
59
|
throw new Error(NO_BIGINT);
|
|
59
60
|
else if ((constant.type === "string" && meta.templates.length) ||
|
|
@@ -65,13 +66,13 @@ var application_schema = function (options) {
|
|
|
65
66
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
66
67
|
finally {
|
|
67
68
|
try {
|
|
68
|
-
if (
|
|
69
|
+
if (_j && !_j.done && (_a = _h.return)) _a.call(_h);
|
|
69
70
|
}
|
|
70
71
|
finally { if (e_1) throw e_1.error; }
|
|
71
72
|
}
|
|
72
73
|
try {
|
|
73
|
-
for (var
|
|
74
|
-
var type =
|
|
74
|
+
for (var _k = __values(meta.atomics), _l = _k.next(); !_l.done; _l = _k.next()) {
|
|
75
|
+
var type = _l.value;
|
|
75
76
|
if (type === "bigint")
|
|
76
77
|
throw new Error(NO_BIGINT);
|
|
77
78
|
union.push(type === "string"
|
|
@@ -84,32 +85,33 @@ var application_schema = function (options) {
|
|
|
84
85
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
85
86
|
finally {
|
|
86
87
|
try {
|
|
87
|
-
if (
|
|
88
|
+
if (_l && !_l.done && (_b = _k.return)) _b.call(_k);
|
|
88
89
|
}
|
|
89
90
|
finally { if (e_2) throw e_2.error; }
|
|
90
91
|
}
|
|
91
92
|
try {
|
|
92
|
-
for (var
|
|
93
|
-
var schema =
|
|
93
|
+
for (var _m = __values(meta.arrays.values()), _o = _m.next(); !_o.done; _o = _m.next()) {
|
|
94
|
+
var schema = _o.value;
|
|
94
95
|
union.push((0, application_array_1.application_array)(options)(components)()(schema, meta.nullable, attribute));
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
98
99
|
finally {
|
|
99
100
|
try {
|
|
100
|
-
if (
|
|
101
|
+
if (_o && !_o.done && (_c = _m.return)) _c.call(_m);
|
|
101
102
|
}
|
|
102
103
|
finally { if (e_3) throw e_3.error; }
|
|
103
104
|
}
|
|
104
105
|
try {
|
|
105
|
-
for (var
|
|
106
|
-
var items =
|
|
106
|
+
for (var _p = __values(meta.tuples), _q = _p.next(); !_q.done; _q = _p.next()) {
|
|
107
|
+
var items = _q.value;
|
|
107
108
|
var tuple = (0, application_tuple_1.application_tuple)(options)(components)(items, meta.nullable, attribute);
|
|
108
|
-
if (options.purpose === "
|
|
109
|
+
if (options.purpose === "swagger" && items.length === 0)
|
|
110
|
+
throw new Error("Error on typia.application(): swagger does not support zero length tuple type.");
|
|
111
|
+
else if (options.purpose === "ajv" &&
|
|
112
|
+
!((_g = items[items.length - 1]) === null || _g === void 0 ? void 0 : _g.rest))
|
|
109
113
|
union.push(tuple);
|
|
110
114
|
else {
|
|
111
|
-
if (items.length === 0)
|
|
112
|
-
throw new Error("Error on typia.application(): swagger does not support zero length tuple type.");
|
|
113
115
|
var merged = items.reduce(function (x, y) {
|
|
114
116
|
return Metadata_1.Metadata.merge(x, y);
|
|
115
117
|
});
|
|
@@ -120,20 +122,20 @@ var application_schema = function (options) {
|
|
|
120
122
|
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
121
123
|
finally {
|
|
122
124
|
try {
|
|
123
|
-
if (
|
|
125
|
+
if (_q && !_q.done && (_d = _p.return)) _d.call(_p);
|
|
124
126
|
}
|
|
125
127
|
finally { if (e_4) throw e_4.error; }
|
|
126
128
|
}
|
|
127
129
|
try {
|
|
128
|
-
for (var
|
|
129
|
-
var native =
|
|
130
|
+
for (var _r = __values(meta.natives), _s = _r.next(); !_s.done; _s = _r.next()) {
|
|
131
|
+
var native = _s.value;
|
|
130
132
|
union.push((0, application_native_1.application_native)(options)(components)(native)(meta.nullable, attribute));
|
|
131
133
|
}
|
|
132
134
|
}
|
|
133
135
|
catch (e_5_1) { e_5 = { error: e_5_1 }; }
|
|
134
136
|
finally {
|
|
135
137
|
try {
|
|
136
|
-
if (
|
|
138
|
+
if (_s && !_s.done && (_e = _r.return)) _e.call(_r);
|
|
137
139
|
}
|
|
138
140
|
finally { if (e_5) throw e_5.error; }
|
|
139
141
|
}
|
|
@@ -142,8 +144,8 @@ var application_schema = function (options) {
|
|
|
142
144
|
if (meta.maps.length)
|
|
143
145
|
union.push((0, application_native_1.application_native)(options)(components)("Map")(meta.nullable, attribute));
|
|
144
146
|
try {
|
|
145
|
-
for (var
|
|
146
|
-
var obj =
|
|
147
|
+
for (var _t = __values(meta.objects), _u = _t.next(); !_u.done; _u = _t.next()) {
|
|
148
|
+
var obj = _u.value;
|
|
147
149
|
var key = obj.name + (meta.nullable ? ".Nullable" : "");
|
|
148
150
|
(0, application_object_1.application_object)(options)(components)(key, obj, meta.nullable);
|
|
149
151
|
union.push((options.purpose === "ajv" && obj.recursive
|
|
@@ -154,7 +156,7 @@ var application_schema = function (options) {
|
|
|
154
156
|
catch (e_6_1) { e_6 = { error: e_6_1 }; }
|
|
155
157
|
finally {
|
|
156
158
|
try {
|
|
157
|
-
if (
|
|
159
|
+
if (_u && !_u.done && (_f = _t.return)) _f.call(_t);
|
|
158
160
|
}
|
|
159
161
|
finally { if (e_6) throw e_6.error; }
|
|
160
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application_schema.js","sourceRoot":"","sources":["../../../src/programmers/internal/application_schema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAmD;AAKnD,gEAA+D;AAC/D,yDAAwD;AACxD,6DAA4D;AAC5D,+DAA8D;AAC9D,2DAA0D;AAC1D,2DAA0D;AAC1D,2DAA0D;AAC1D,2DAA0D;AAC1D,iEAAgE;AAChE,yDAAwD;AAKjD,IAAM,kBAAkB,GAC3B,UAAC,OAAuC;IACxC,OAAA,UAAC,UAA2B;QAC5B,OAAA,UAA6B,UAAsB;YACnD,OAAA,UACI,IAAc,EACd,SAAiC
|
|
1
|
+
{"version":3,"file":"application_schema.js","sourceRoot":"","sources":["../../../src/programmers/internal/application_schema.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -83,13 +83,16 @@ export const application_schema =
|
|
|
83
83
|
const tuple: IJsonSchema.ITuple = application_tuple(options)(
|
|
84
84
|
components,
|
|
85
85
|
)(items, meta.nullable, attribute);
|
|
86
|
-
if (options.purpose === "
|
|
86
|
+
if (options.purpose === "swagger" && items.length === 0)
|
|
87
|
+
throw new Error(
|
|
88
|
+
"Error on typia.application(): swagger does not support zero length tuple type.",
|
|
89
|
+
);
|
|
90
|
+
else if (
|
|
91
|
+
options.purpose === "ajv" &&
|
|
92
|
+
!items[items.length - 1]?.rest
|
|
93
|
+
)
|
|
94
|
+
union.push(tuple);
|
|
87
95
|
else {
|
|
88
|
-
if (items.length === 0)
|
|
89
|
-
throw new Error(
|
|
90
|
-
"Error on typia.application(): swagger does not support zero length tuple type.",
|
|
91
|
-
);
|
|
92
|
-
|
|
93
96
|
// SWAGGER DOES NOT SUPPORT TUPLE TYPE YET
|
|
94
97
|
const merged: Metadata = items.reduce((x, y) =>
|
|
95
98
|
Metadata.merge(x, y),
|