typia 3.6.6 → 3.6.8
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/executable/TypiaSetupWizard.js +12 -2
- package/lib/executable/TypiaSetupWizard.js.map +1 -1
- package/lib/factories/TypeFactory.js +1 -1
- package/lib/factories/TypeFactory.js.map +1 -1
- package/lib/programmers/internal/application_number.js +20 -14
- package/lib/programmers/internal/application_number.js.map +1 -1
- package/lib/schemas/IJsonSchema.d.ts +4 -10
- package/lib/transformers/features/miscellaneous/CreateRandomGenerator.js +1 -1
- package/lib/transformers/features/miscellaneous/CreateRandomGenerator.js.map +1 -1
- package/lib/transformers/features/miscellaneous/RandomTransformer.js +1 -1
- package/lib/transformers/features/miscellaneous/RandomTransformer.js.map +1 -1
- package/lib/transformers/internal/GenericTransformer.js +2 -2
- package/lib/transformers/internal/GenericTransformer.js.map +1 -1
- package/package.json +2 -2
- package/src/executable/TypiaSetupWizard.ts +16 -6
- package/src/factories/TypeFactory.ts +1 -1
- package/src/programmers/internal/application_number.ts +19 -16
- package/src/schemas/IJsonSchema.ts +4 -10
- package/src/transformers/features/miscellaneous/CreateRandomGenerator.ts +1 -1
- package/src/transformers/features/miscellaneous/RandomTransformer.ts +1 -1
- package/src/transformers/internal/GenericTransformer.ts +2 -2
|
@@ -65,7 +65,7 @@ var TypiaSetupWizard;
|
|
|
65
65
|
return [4, ArgumentParser_1.ArgumentParser.parse(pack)(true)(inquiry)];
|
|
66
66
|
case 2:
|
|
67
67
|
args = _b.sent();
|
|
68
|
-
pack.install({ dev: true, modulo: "typescript" });
|
|
68
|
+
pack.install({ dev: true, modulo: "typescript", version: "4.9.5" });
|
|
69
69
|
(_a = args.project) !== null && _a !== void 0 ? _a : (args.project = (function () {
|
|
70
70
|
CommandExecutor_1.CommandExecutor.run("npx tsc --init", false);
|
|
71
71
|
return (args.project = "tsconfig.json");
|
|
@@ -130,9 +130,19 @@ var TypiaSetupWizard;
|
|
|
130
130
|
return __generator(this, function (_a) {
|
|
131
131
|
switch (_a.label) {
|
|
132
132
|
case 0: return [4, fs_1.default.promises.readdir(process.cwd())];
|
|
133
|
-
case 1: return [4, (_a.sent())
|
|
133
|
+
case 1: return [4, (_a.sent())
|
|
134
|
+
.filter(function (str) {
|
|
134
135
|
return str.substring(0, 8) === "tsconfig" &&
|
|
135
136
|
str.substring(str.length - 5) === ".json";
|
|
137
|
+
})
|
|
138
|
+
.sort(function (x, y) {
|
|
139
|
+
return x === "tsconfig.json"
|
|
140
|
+
? -1
|
|
141
|
+
: y === "tsconfig.json"
|
|
142
|
+
? 1
|
|
143
|
+
: x < y
|
|
144
|
+
? -1
|
|
145
|
+
: 1;
|
|
136
146
|
})];
|
|
137
147
|
case 2:
|
|
138
148
|
fileList = _a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypiaSetupWizard.js","sourceRoot":"","sources":["../../src/executable/TypiaSetupWizard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoB;AACpB,8CAAwB;AAExB,yDAAwD;AACxD,2DAA0D;AAC1D,yDAAwD;AACxD,iEAAgE;AAEhE,IAAiB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"TypiaSetupWizard.js","sourceRoot":"","sources":["../../src/executable/TypiaSetupWizard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoB;AACpB,8CAAwB;AAExB,yDAAwD;AACxD,2DAA0D;AAC1D,yDAAwD;AACxD,iEAAgE;AAEhE,IAAiB,gBAAgB,CAoIhC;AApID,WAAiB,gBAAgB;;IAO7B,SAAsB,KAAK;;;;;;;wBACvB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;wBACxD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;wBACnC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;wBAG3B,WAAM,+BAAc,CAAC,KAAK,EAAE,EAAA;;wBAAnD,IAAI,GAAmB,SAA4B;wBAChC,WAAM,+BAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAC3D,OAAO,CACV,EAAA;;wBAFK,IAAI,GAAe,SAExB;wBAGD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;wBACpE,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,CAAC;4BACd,iCAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;4BAC7C,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,CAAC;wBAC5C,CAAC,CAAC,EAAE,EAAC;wBACL,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;wBAG/C,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;6BAC/C,CAAA,IAAI,CAAC,QAAQ,KAAK,UAAU,CAAA,EAA5B,cAA4B;wBAC5B,WAAM,IAAI,CAAC,IAAI,CAAC,UAAC,IAAI;;gCACjB,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;gCACpB,IACI,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ;oCACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;oCAEvD,IAAI,CAAC,OAAO,CAAC,OAAO;wCAChB,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;;oCACjD,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,kBAAkB,CAAC;4BACnD,CAAC,CAAC,EAAA;;wBATF,SASE,CAAC;wBACH,iCAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;;;wBAIlD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;wBAC9C,WAAM,uCAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAA;;wBAA9C,SAA8C,CAAC;;;;;KAClD;IAtCqB,sBAAK,QAsC1B,CAAA;IAED,IAAM,OAAO,GAAuC,UAChD,IAAI,EACJ,OAAO,EACP,MAAM,EACN,MAAM;;;;YAGN,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;YACxD,OAAO,CAAC,MAAM,CAAC,qBAAqB,EAAE,6BAA6B,CAAC,CAAC;YAG/D,UAAU,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC9B,MAAM,GACR,UAAC,IAAY;gBACb,OAAA,UAAC,OAAe;oBAChB,OAAA,UACI,OAAiB;;;;oCAEjB,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;oCAEpB,WAAM,MAAM,EAAE,CAAC;4CACX,IAAI,EAAE,MAAM;4CACZ,IAAI,EAAE,IAAI;4CACV,OAAO,EAAE,OAAO;4CAChB,OAAO,EAAE,OAAO;yCACnB,CAAC,EAAA;wCANN,WAAO,CACH,SAKE,CACL,CAAC,IAAI,CAAC,EAAC;;;yBACX;gBAZD,CAYC;YAbD,CAaC,CAAC;YACA,SAAS,GAAG;;;;gCAEV,WAAM,YAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAA;gCADjB,WAAM,CAC7B,SAAwC,CAC3C;iCACI,MAAM,CACH,UAAC,GAAG;gCACA,OAAA,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU;oCAClC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,OAAO;4BADzC,CACyC,CAChD;iCACA,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC;gCACP,OAAA,CAAC,KAAK,eAAe;oCACjB,CAAC,CAAC,CAAC,CAAC;oCACJ,CAAC,CAAC,CAAC,KAAK,eAAe;wCACvB,CAAC,CAAC,CAAC;wCACH,CAAC,CAAC,CAAC,GAAG,CAAC;4CACP,CAAC,CAAC,CAAC,CAAC;4CACJ,CAAC,CAAC,CAAC;4BANP,CAMO,CACV,EAAA;;4BAhBC,QAAQ,GAAa,SAgBtB;4BACL,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gCACvB,IAAI,OAAO,CAAC,GAAG,EAAE,KAAK,IAAI,CAAC,SAAS;oCAChC,MAAM,IAAI,KAAK,CAAC,wCAAsC,CAAC,CAAC;gCAC5D,WAAO,IAAI,EAAC;6BACf;iCAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gCAAE,WAAO,QAAQ,CAAC,CAAC,CAAC,EAAC;4BACrD,WAAO,MAAM,CAAC,UAAU,CAAC,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,EAAC;;;iBACzD,CAAC;YAGF,WAAO,MAAM,CAAC,UAAO,OAAO;;;;;;qCACpB,CAAA,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAA,EAA9B,cAA8B;gCAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gCAClC,KAAA,OAAO,CAAA;gCAAY,WAAM,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CACnD,WAAW,CAAC,IAAI,CAAC;wCACb,CAAC,CAAC,CAAC,UAAmB,EAAE,aAAsB,CAAC;wCAC/C,CAAC,CAAC,CAAC,aAAsB,EAAE,UAAmB,CAAC,CACtD,EAAA;;gCAJD,GAAQ,QAAQ,GAAG,SAIlB,CAAC;;;4CAEN,OAAO,CAAC,OAAO;;;;gCAAf,KAAA,OAAO,CAAA;gCAAa,WAAM,MAAM,CAAC,SAAS,CAAC,CAAC,iBAAiB,CAAC,CAAC;wCAC3D,KAAc;wCACd,MAAe;wCACf,MAAe;qCAClB,CAAC,EAAA;;yCAJM,OAAO,GAAK,SAIlB;;;gCAJF,GAIG;gCACH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;4CAC/B,OAAO,CAAC,OAAO;;;;gCAAf,KAAA,OAAO,CAAA;gCAAa,WAAM,SAAS,EAAE,EAAA;;yCAA7B,OAAO,GAAK,SAAiB;;;gCAArC,GAAsC;gCAEtC,IAAI,UAAU,CAAC,KAAK;oCAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gCACtC,WAAO,OAAqB,EAAC;;;qBAChC,CAAC,EAAC;;SACN,CAAC;IAEF,SAAS,WAAW,CAAC,IAAoB;;QACrC,OAAO,CACH,CAAC,OAAO,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,OAAO,0CAAE,KAAK,CAAA,KAAK,QAAQ;YACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YACzD,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAC5D,CAAC;IACN,CAAC;AACL,CAAC,EApIgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAoIhC;AAED,IAAM,oBAAoB,GAAG;IACzB,gFAA4E;IAC5E,EAAE;IACF,+EAA2E;IAC3E,0EAAsE;IACtE,kFAA8E;IAC9E,EAAE;IACF,0EAAsE;IACtE,EAAE;CACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -65,7 +65,7 @@ var TypeFactory;
|
|
|
65
65
|
TypeFactory.getFullName = getFullName;
|
|
66
66
|
function explore_name(name, decl) {
|
|
67
67
|
return typescript_1.default.isModuleBlock(decl)
|
|
68
|
-
? explore_name("".concat(decl.parent.name.
|
|
68
|
+
? explore_name("".concat(decl.parent.name.getFullText().trim(), ".").concat(name), decl.parent.parent)
|
|
69
69
|
: name;
|
|
70
70
|
}
|
|
71
71
|
function get_name(symbol) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeFactory.js","sourceRoot":"","sources":["../../src/factories/TypeFactory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TypeFactory.js","sourceRoot":"","sources":["../../src/factories/TypeFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,10 +37,14 @@ var application_number = function (nullable, attribute) {
|
|
|
37
37
|
output.minimum = tag.value;
|
|
38
38
|
else if (tag.kind === "maximum")
|
|
39
39
|
output.maximum = tag.value;
|
|
40
|
-
else if (tag.kind === "exclusiveMinimum")
|
|
41
|
-
output.
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
else if (tag.kind === "exclusiveMinimum") {
|
|
41
|
+
output.minimum = tag.value;
|
|
42
|
+
output.exclusiveMinimum = true;
|
|
43
|
+
}
|
|
44
|
+
else if (tag.kind === "exclusiveMaximum") {
|
|
45
|
+
output.maximum = tag.value;
|
|
46
|
+
output.exclusiveMaximum = true;
|
|
47
|
+
}
|
|
44
48
|
else if (tag.kind === "multipleOf")
|
|
45
49
|
output.multipleOf = tag.value;
|
|
46
50
|
}
|
|
@@ -54,24 +58,26 @@ var application_number = function (nullable, attribute) {
|
|
|
54
58
|
}
|
|
55
59
|
if (output.type === "integer" &&
|
|
56
60
|
(attribute["x-typia-metaTags"] || []).find(function (tag) { return tag.kind === "type" && tag.value === "uint"; }))
|
|
57
|
-
if (output.minimum === undefined ||
|
|
61
|
+
if (output.minimum === undefined ||
|
|
62
|
+
(output.exclusiveMaximum !== true && output.minimum < 0))
|
|
58
63
|
output.minimum = 0;
|
|
59
|
-
else if (output.exclusiveMinimum
|
|
60
|
-
output.exclusiveMinimum < 0) {
|
|
61
|
-
delete output.exclusiveMinimum;
|
|
64
|
+
else if (output.exclusiveMinimum === true && output.minimum < -1) {
|
|
62
65
|
output.maximum = 0;
|
|
66
|
+
delete output.exclusiveMinimum;
|
|
63
67
|
}
|
|
64
68
|
output.default = (0, application_default_1.application_default)(attribute)(function (str) {
|
|
65
69
|
var value = Number(str);
|
|
66
70
|
var conditions = [!Number.isNaN(value)];
|
|
67
71
|
if (output.minimum !== undefined)
|
|
68
|
-
|
|
72
|
+
if (output.exclusiveMinimum === true)
|
|
73
|
+
conditions.push(value > output.minimum);
|
|
74
|
+
else
|
|
75
|
+
conditions.push(value >= output.minimum);
|
|
69
76
|
if (output.maximum !== undefined)
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
conditions.push(value < output.exclusiveMaximum);
|
|
77
|
+
if (output.exclusiveMaximum === true)
|
|
78
|
+
conditions.push(value < output.maximum);
|
|
79
|
+
else
|
|
80
|
+
conditions.push(value <= output.maximum);
|
|
75
81
|
if (output.multipleOf !== undefined)
|
|
76
82
|
conditions.push(value % output.multipleOf === 0);
|
|
77
83
|
return conditions.every(function (cond) { return cond; });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application_number.js","sourceRoot":"","sources":["../../../src/programmers/internal/application_number.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAA4D;AAKrD,IAAM,kBAAkB,GAAG,UAC9B,QAAiB,EACjB,SAAiC;;IAEjC,IAAM,MAAM,cACR,IAAI,EAAE,QAAgC,EACtC,QAAQ,UAAA,IACL,SAAS,CACf,CAAC;;QACF,KAAkB,IAAA,KAAA,SAAA,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAA,gBAAA,4BAAE;YAAlD,IAAM,GAAG,WAAA;YAEV,IACI,GAAG,CAAC,IAAI,KAAK,MAAM;gBACnB,CAAC,GAAG,CAAC,KAAK,KAAK,KAAK,IAAI,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC;gBAE7C,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;iBAEvB,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;gBAAE,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC;iBACvD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;gBAAE,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC;iBACvD,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB;
|
|
1
|
+
{"version":3,"file":"application_number.js","sourceRoot":"","sources":["../../../src/programmers/internal/application_number.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,8 @@ export declare namespace IJsonSchema {
|
|
|
25
25
|
interface INumber extends IAtomic<"number"> {
|
|
26
26
|
minimum?: number;
|
|
27
27
|
maximum?: number;
|
|
28
|
-
exclusiveMinimum?:
|
|
29
|
-
exclusiveMaximum?:
|
|
28
|
+
exclusiveMinimum?: boolean;
|
|
29
|
+
exclusiveMaximum?: boolean;
|
|
30
30
|
multipleOf?: number;
|
|
31
31
|
}
|
|
32
32
|
interface IInteger extends IAtomic<"integer"> {
|
|
@@ -38,14 +38,8 @@ export declare namespace IJsonSchema {
|
|
|
38
38
|
* @type int
|
|
39
39
|
*/
|
|
40
40
|
maximum?: number;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
*/
|
|
44
|
-
exclusiveMinimum?: number;
|
|
45
|
-
/**
|
|
46
|
-
* @type int
|
|
47
|
-
*/
|
|
48
|
-
exclusiveMaximum?: number;
|
|
41
|
+
exclusiveMinimum?: boolean;
|
|
42
|
+
exclusiveMaximum?: boolean;
|
|
49
43
|
/**
|
|
50
44
|
* @type int
|
|
51
45
|
*/
|
|
@@ -23,7 +23,7 @@ var CreateRandomTransformer;
|
|
|
23
23
|
var type = project.checker.getTypeFromTypeNode(node);
|
|
24
24
|
if (type.isTypeParameter())
|
|
25
25
|
throw new Error("Error on typia.createRandom(): non-specified generic argument.");
|
|
26
|
-
return RandomProgrammer_1.RandomProgrammer.generate(__assign(__assign({}, project), { options: __assign(__assign({}, project.options), { functional: false, numeric: false }) }), modulo)(type, node.
|
|
26
|
+
return RandomProgrammer_1.RandomProgrammer.generate(__assign(__assign({}, project), { options: __assign(__assign({}, project.options), { functional: false, numeric: false }) }), modulo)(type, node.getFullText().trim());
|
|
27
27
|
}
|
|
28
28
|
CreateRandomTransformer.transform = transform;
|
|
29
29
|
})(CreateRandomTransformer = exports.CreateRandomTransformer || (exports.CreateRandomTransformer = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateRandomGenerator.js","sourceRoot":"","sources":["../../../../src/transformers/features/miscellaneous/CreateRandomGenerator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,0EAAyE;AAIzE,IAAiB,uBAAuB,CA8BvC;AA9BD,WAAiB,uBAAuB;IACpC,SAAgB,SAAS,CACrB,OAAiB,EACjB,MAAiC,EACjC,UAA6B;;QAG7B,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,aAAa,0CAAG,CAAC,CAAC,CAAA;YAC9B,MAAM,IAAI,KAAK,qEAA6B,CAAC;QAGjD,IAAM,IAAI,GAAgB,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtD,IAAM,IAAI,GAAY,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEhE,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,MAAM,IAAI,KAAK,kEAAmC,CAAC;QAGvD,OAAO,mCAAgB,CAAC,QAAQ,uBAErB,OAAO,KACV,OAAO,wBACA,OAAO,CAAC,OAAO,KAClB,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,KAAK,QAGtB,MAAM,CACT,CAAC,IAAI,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"CreateRandomGenerator.js","sourceRoot":"","sources":["../../../../src/transformers/features/miscellaneous/CreateRandomGenerator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,0EAAyE;AAIzE,IAAiB,uBAAuB,CA8BvC;AA9BD,WAAiB,uBAAuB;IACpC,SAAgB,SAAS,CACrB,OAAiB,EACjB,MAAiC,EACjC,UAA6B;;QAG7B,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,aAAa,0CAAG,CAAC,CAAC,CAAA;YAC9B,MAAM,IAAI,KAAK,qEAA6B,CAAC;QAGjD,IAAM,IAAI,GAAgB,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtD,IAAM,IAAI,GAAY,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEhE,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,MAAM,IAAI,KAAK,kEAAmC,CAAC;QAGvD,OAAO,mCAAgB,CAAC,QAAQ,uBAErB,OAAO,KACV,OAAO,wBACA,OAAO,CAAC,OAAO,KAClB,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,KAAK,QAGtB,MAAM,CACT,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IACvC,CAAC;IA5Be,iCAAS,YA4BxB,CAAA;AACL,CAAC,EA9BgB,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QA8BvC"}
|
|
@@ -27,7 +27,7 @@ var RandomTransformer;
|
|
|
27
27
|
var type = project.checker.getTypeFromTypeNode(node);
|
|
28
28
|
if (type.isTypeParameter())
|
|
29
29
|
throw new Error("Error on typia.random(): non-specified generic argument.");
|
|
30
|
-
return typescript_1.default.factory.createCallExpression(RandomProgrammer_1.RandomProgrammer.generate(__assign(__assign({}, project), { options: __assign(__assign({}, project.options), { functional: false, numeric: false }) }), modulo)(type, node.
|
|
30
|
+
return typescript_1.default.factory.createCallExpression(RandomProgrammer_1.RandomProgrammer.generate(__assign(__assign({}, project), { options: __assign(__assign({}, project.options), { functional: false, numeric: false }) }), modulo)(type, node.getFullText().trim()), undefined, expression.arguments.length
|
|
31
31
|
? [expression.arguments[0]]
|
|
32
32
|
: undefined);
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RandomTransformer.js","sourceRoot":"","sources":["../../../../src/transformers/features/miscellaneous/RandomTransformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAE5B,0EAAyE;AAIzE,IAAiB,iBAAiB,CAoCjC;AApCD,WAAiB,iBAAiB;IAC9B,SAAgB,SAAS,CACrB,OAAiB,EACjB,MAAiC,EACjC,UAA6B;;QAG7B,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,aAAa,0CAAG,CAAC,CAAC,CAAA;YAC9B,MAAM,IAAI,KAAK,+DAA6B,CAAC;QAGjD,IAAM,IAAI,GAAgB,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtD,IAAM,IAAI,GAAY,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEhE,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,MAAM,IAAI,KAAK,4DAAmC,CAAC;QAGvD,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAClC,mCAAgB,CAAC,QAAQ,uBAEd,OAAO,KACV,OAAO,wBACA,OAAO,CAAC,OAAO,KAClB,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,KAAK,QAGtB,MAAM,CACT,CAAC,IAAI,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"RandomTransformer.js","sourceRoot":"","sources":["../../../../src/transformers/features/miscellaneous/RandomTransformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAE5B,0EAAyE;AAIzE,IAAiB,iBAAiB,CAoCjC;AApCD,WAAiB,iBAAiB;IAC9B,SAAgB,SAAS,CACrB,OAAiB,EACjB,MAAiC,EACjC,UAA6B;;QAG7B,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,aAAa,0CAAG,CAAC,CAAC,CAAA;YAC9B,MAAM,IAAI,KAAK,+DAA6B,CAAC;QAGjD,IAAM,IAAI,GAAgB,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtD,IAAM,IAAI,GAAY,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEhE,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,MAAM,IAAI,KAAK,4DAAmC,CAAC;QAGvD,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAClC,mCAAgB,CAAC,QAAQ,uBAEd,OAAO,KACV,OAAO,wBACA,OAAO,CAAC,OAAO,KAClB,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,KAAK,QAGtB,MAAM,CACT,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAClC,SAAS,EACT,UAAU,CAAC,SAAS,CAAC,MAAM;YACvB,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC;YAC5B,CAAC,CAAC,SAAS,CAClB,CAAC;IACN,CAAC;IAlCe,2BAAS,YAkCxB,CAAA;AACL,CAAC,EApCgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAoCjC"}
|
|
@@ -42,7 +42,7 @@ var GenericTransformer;
|
|
|
42
42
|
if (type.isTypeParameter())
|
|
43
43
|
throw new Error("Error on typia.".concat(method, "(): non-specified generic argument."));
|
|
44
44
|
return typescript_1.default.factory.createCallExpression(programmer(project, modulo)(type, generic
|
|
45
|
-
? node.
|
|
45
|
+
? node.getFullText().trim()
|
|
46
46
|
: name(project.checker)(type)(node)), undefined, [expression.arguments[0]]);
|
|
47
47
|
};
|
|
48
48
|
};
|
|
@@ -57,7 +57,7 @@ var GenericTransformer;
|
|
|
57
57
|
var type = project.checker.getTypeFromTypeNode(node);
|
|
58
58
|
if (type.isTypeParameter())
|
|
59
59
|
throw new Error("Error on typia.".concat(method, "(): non-specified generic argument."));
|
|
60
|
-
return programmer(project, modulo)(type, node.
|
|
60
|
+
return programmer(project, modulo)(type, node.getFullText().trim());
|
|
61
61
|
};
|
|
62
62
|
};
|
|
63
63
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenericTransformer.js","sourceRoot":"","sources":["../../../src/transformers/internal/GenericTransformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAI5B,IAAiB,kBAAkB,CA8FlC;AA9FD,WAAiB,kBAAkB;IAClB,yBAAM,GACf,UAAC,MAAc;QACf,OAAA,UACI,UAGsD;YAE1D,OAAA,UACI,OAAiB,EACjB,MAAiC,EACjC,UAA6B;gBAG7B,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;oBACjC,MAAM,IAAI,KAAK,CAAC,yBAAkB,MAAM,wBAAqB,CAAC,CAAC;gBAG7D,IAAA,KAAA,OACF,UAAU,CAAC,aAAa,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;oBACnD,CAAC,CAAC;wBACI,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAC/B,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAC9B;wBACD,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC3B,IAAI;qBACP;oBACH,CAAC,CAAC;wBACI,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAC7B,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE,CAC3B;wBACD,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE;wBACxB,KAAK;qBACR,IAAA,EAfJ,IAAI,QAAA,EAAE,IAAI,QAAA,EAAE,OAAO,QAef,CAAC;gBACZ,IAAI,IAAI,CAAC,eAAe,EAAE;oBACtB,MAAM,IAAI,KAAK,CACX,yBAAkB,MAAM,wCAAqC,CAChE,CAAC;gBAGN,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAClC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CACvB,IAAI,EACJ,OAAO;oBACH,CAAC,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"GenericTransformer.js","sourceRoot":"","sources":["../../../src/transformers/internal/GenericTransformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAI5B,IAAiB,kBAAkB,CA8FlC;AA9FD,WAAiB,kBAAkB;IAClB,yBAAM,GACf,UAAC,MAAc;QACf,OAAA,UACI,UAGsD;YAE1D,OAAA,UACI,OAAiB,EACjB,MAAiC,EACjC,UAA6B;gBAG7B,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;oBACjC,MAAM,IAAI,KAAK,CAAC,yBAAkB,MAAM,wBAAqB,CAAC,CAAC;gBAG7D,IAAA,KAAA,OACF,UAAU,CAAC,aAAa,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;oBACnD,CAAC,CAAC;wBACI,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAC/B,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAC9B;wBACD,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC3B,IAAI;qBACP;oBACH,CAAC,CAAC;wBACI,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAC7B,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE,CAC3B;wBACD,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE;wBACxB,KAAK;qBACR,IAAA,EAfJ,IAAI,QAAA,EAAE,IAAI,QAAA,EAAE,OAAO,QAef,CAAC;gBACZ,IAAI,IAAI,CAAC,eAAe,EAAE;oBACtB,MAAM,IAAI,KAAK,CACX,yBAAkB,MAAM,wCAAqC,CAChE,CAAC;gBAGN,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAClC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CACvB,IAAI,EACJ,OAAO;oBACH,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE;oBAC3B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAC1C,EACD,SAAS,EACT,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,CAC7B,CAAC;YACN,CAAC;QA1CD,CA0CC;IAhDD,CAgDC,CAAC;IAEO,0BAAO,GAChB,UAAC,MAAc;QACf,OAAA,UACI,UAGsD;YAE1D,OAAA,UACI,OAAiB,EACjB,MAAiC,EACjC,UAA6B;;gBAG7B,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,aAAa,0CAAG,CAAC,CAAC,CAAA;oBAC9B,MAAM,IAAI,KAAK,CACX,yBAAkB,MAAM,2CAAwC,CACnE,CAAC;gBAGN,IAAM,IAAI,GAAgB,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;gBACtD,IAAM,IAAI,GAAY,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBAEhE,IAAI,IAAI,CAAC,eAAe,EAAE;oBACtB,MAAM,IAAI,KAAK,CACX,yBAAkB,MAAM,wCAAqC,CAChE,CAAC;gBAGN,OAAO,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,CAAC;QAtBD,CAsBC;IA5BD,CA4BC,CAAC;IAEN,IAAM,IAAI,GACN,UAAC,OAAuB;QACxB,OAAA,UAAC,IAAa;YACd,OAAA,UAAC,IAAa;gBACV,OAAA,OAAO,CAAC,YAAY,CAChB,IAAI,EACJ,IAAI,EACJ,oBAAE,CAAC,eAAe,CAAC,oBAAoB,CAC1C;YAJD,CAIC;QALL,CAKK;IANL,CAMK,CAAC;AACd,CAAC,EA9FgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QA8FlC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "typia",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.8",
|
|
4
4
|
"description": "Superfast runtime validators with only one line",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
},
|
|
66
66
|
"homepage": "https://github.com/samchon/typia#readme",
|
|
67
67
|
"peerDependencies": {
|
|
68
|
-
"typescript": ">= 4.5.2"
|
|
68
|
+
"typescript": ">= 4.5.2 && < 5.0.0"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
71
|
"@fastify/type-provider-typebox": "^2.3.0",
|
|
@@ -25,7 +25,7 @@ export namespace TypiaSetupWizard {
|
|
|
25
25
|
);
|
|
26
26
|
|
|
27
27
|
// INSTALL TYPESCRIPT
|
|
28
|
-
pack.install({ dev: true, modulo: "typescript" });
|
|
28
|
+
pack.install({ dev: true, modulo: "typescript", version: "4.9.5" });
|
|
29
29
|
args.project ??= (() => {
|
|
30
30
|
CommandExecutor.run("npx tsc --init", false);
|
|
31
31
|
return (args.project = "tsconfig.json");
|
|
@@ -85,11 +85,21 @@ export namespace TypiaSetupWizard {
|
|
|
85
85
|
const configure = async () => {
|
|
86
86
|
const fileList: string[] = await (
|
|
87
87
|
await fs.promises.readdir(process.cwd())
|
|
88
|
-
)
|
|
89
|
-
(
|
|
90
|
-
str
|
|
91
|
-
|
|
92
|
-
|
|
88
|
+
)
|
|
89
|
+
.filter(
|
|
90
|
+
(str) =>
|
|
91
|
+
str.substring(0, 8) === "tsconfig" &&
|
|
92
|
+
str.substring(str.length - 5) === ".json",
|
|
93
|
+
)
|
|
94
|
+
.sort((x, y) =>
|
|
95
|
+
x === "tsconfig.json"
|
|
96
|
+
? -1
|
|
97
|
+
: y === "tsconfig.json"
|
|
98
|
+
? 1
|
|
99
|
+
: x < y
|
|
100
|
+
? -1
|
|
101
|
+
: 1,
|
|
102
|
+
);
|
|
93
103
|
if (fileList.length === 0) {
|
|
94
104
|
if (process.cwd() !== pack.directory)
|
|
95
105
|
throw new Error(`Unable to find "tsconfig.json" file.`);
|
|
@@ -87,7 +87,7 @@ export namespace TypeFactory {
|
|
|
87
87
|
function explore_name(name: string, decl: ts.Node): string {
|
|
88
88
|
return ts.isModuleBlock(decl)
|
|
89
89
|
? explore_name(
|
|
90
|
-
`${decl.parent.name.
|
|
90
|
+
`${decl.parent.name.getFullText().trim()}.${name}`,
|
|
91
91
|
decl.parent.parent,
|
|
92
92
|
)
|
|
93
93
|
: name;
|
|
@@ -23,10 +23,13 @@ export const application_number = (
|
|
|
23
23
|
// RANGE TAG
|
|
24
24
|
else if (tag.kind === "minimum") output.minimum = tag.value;
|
|
25
25
|
else if (tag.kind === "maximum") output.maximum = tag.value;
|
|
26
|
-
else if (tag.kind === "exclusiveMinimum")
|
|
27
|
-
output.
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
else if (tag.kind === "exclusiveMinimum") {
|
|
27
|
+
output.minimum = tag.value;
|
|
28
|
+
output.exclusiveMinimum = true;
|
|
29
|
+
} else if (tag.kind === "exclusiveMaximum") {
|
|
30
|
+
output.maximum = tag.value;
|
|
31
|
+
output.exclusiveMaximum = true;
|
|
32
|
+
}
|
|
30
33
|
// MULTIPLE-OF
|
|
31
34
|
else if (tag.kind === "multipleOf") output.multipleOf = tag.value;
|
|
32
35
|
}
|
|
@@ -38,14 +41,14 @@ export const application_number = (
|
|
|
38
41
|
(tag) => tag.kind === "type" && tag.value === "uint",
|
|
39
42
|
)
|
|
40
43
|
)
|
|
41
|
-
if (
|
|
44
|
+
if (
|
|
45
|
+
output.minimum === undefined ||
|
|
46
|
+
(output.exclusiveMaximum !== true && output.minimum < 0)
|
|
47
|
+
)
|
|
42
48
|
output.minimum = 0;
|
|
43
|
-
else if (
|
|
44
|
-
output.exclusiveMinimum !== undefined &&
|
|
45
|
-
output.exclusiveMinimum < 0
|
|
46
|
-
) {
|
|
47
|
-
delete output.exclusiveMinimum;
|
|
49
|
+
else if (output.exclusiveMinimum === true && output.minimum < -1) {
|
|
48
50
|
output.maximum = 0;
|
|
51
|
+
delete output.exclusiveMinimum;
|
|
49
52
|
}
|
|
50
53
|
|
|
51
54
|
// DEFAULT CONFIGURATION
|
|
@@ -53,13 +56,13 @@ export const application_number = (
|
|
|
53
56
|
const value: number = Number(str);
|
|
54
57
|
const conditions: boolean[] = [!Number.isNaN(value)];
|
|
55
58
|
if (output.minimum !== undefined)
|
|
56
|
-
|
|
59
|
+
if (output.exclusiveMinimum === true)
|
|
60
|
+
conditions.push(value > output.minimum);
|
|
61
|
+
else conditions.push(value >= output.minimum);
|
|
57
62
|
if (output.maximum !== undefined)
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
conditions.push(value
|
|
61
|
-
if (output.exclusiveMaximum !== undefined)
|
|
62
|
-
conditions.push(value < output.exclusiveMaximum);
|
|
63
|
+
if (output.exclusiveMaximum === true)
|
|
64
|
+
conditions.push(value < output.maximum);
|
|
65
|
+
else conditions.push(value <= output.maximum);
|
|
63
66
|
if (output.multipleOf !== undefined)
|
|
64
67
|
conditions.push(value % output.multipleOf === 0);
|
|
65
68
|
return conditions.every((cond) => cond);
|
|
@@ -47,8 +47,8 @@ export namespace IJsonSchema {
|
|
|
47
47
|
export interface INumber extends IAtomic<"number"> {
|
|
48
48
|
minimum?: number;
|
|
49
49
|
maximum?: number;
|
|
50
|
-
exclusiveMinimum?:
|
|
51
|
-
exclusiveMaximum?:
|
|
50
|
+
exclusiveMinimum?: boolean;
|
|
51
|
+
exclusiveMaximum?: boolean;
|
|
52
52
|
multipleOf?: number;
|
|
53
53
|
}
|
|
54
54
|
export interface IInteger extends IAtomic<"integer"> {
|
|
@@ -60,14 +60,8 @@ export namespace IJsonSchema {
|
|
|
60
60
|
* @type int
|
|
61
61
|
*/
|
|
62
62
|
maximum?: number;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
*/
|
|
66
|
-
exclusiveMinimum?: number;
|
|
67
|
-
/**
|
|
68
|
-
* @type int
|
|
69
|
-
*/
|
|
70
|
-
exclusiveMaximum?: number;
|
|
63
|
+
exclusiveMinimum?: boolean;
|
|
64
|
+
exclusiveMaximum?: boolean;
|
|
71
65
|
/**
|
|
72
66
|
* @type int
|
|
73
67
|
*/
|
|
@@ -47,7 +47,7 @@ export namespace GenericTransformer {
|
|
|
47
47
|
programmer(project, modulo)(
|
|
48
48
|
type,
|
|
49
49
|
generic
|
|
50
|
-
? node.
|
|
50
|
+
? node.getFullText().trim()
|
|
51
51
|
: name(project.checker)(type)(node),
|
|
52
52
|
),
|
|
53
53
|
undefined,
|
|
@@ -84,7 +84,7 @@ export namespace GenericTransformer {
|
|
|
84
84
|
);
|
|
85
85
|
|
|
86
86
|
// DO TRANSFORM
|
|
87
|
-
return programmer(project, modulo)(type, node.
|
|
87
|
+
return programmer(project, modulo)(type, node.getFullText().trim());
|
|
88
88
|
};
|
|
89
89
|
|
|
90
90
|
const name =
|