typia 5.0.0-dev.20230827 → 5.0.0-dev.20230828
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/TypiaGenerateWizard.js +1 -1
- package/lib/executable/TypiaGenerateWizard.js.map +1 -1
- package/lib/executable/TypiaSetupWizard.js +1 -1
- package/lib/executable/TypiaSetupWizard.js.map +1 -1
- package/lib/executable/setup/PackageManager.js +1 -1
- package/lib/executable/setup/PackageManager.js.map +1 -1
- package/lib/executable/setup/PluginConfigurator.js +2 -2
- package/lib/executable/setup/PluginConfigurator.js.map +1 -1
- package/lib/factories/ExpressionFactory.js +2 -2
- package/lib/factories/ExpressionFactory.js.map +1 -1
- package/lib/factories/JsonMetadataFactory.d.ts +7 -0
- package/lib/factories/JsonMetadataFactory.js +38 -0
- package/lib/factories/JsonMetadataFactory.js.map +1 -0
- package/lib/factories/LiteralFactory.js +1 -1
- package/lib/factories/LiteralFactory.js.map +1 -1
- package/lib/factories/MetadataCollection.js +0 -1
- package/lib/factories/MetadataCollection.js.map +1 -1
- package/lib/factories/MetadataCommentTagFactory.js +129 -118
- package/lib/factories/MetadataCommentTagFactory.js.map +1 -1
- package/lib/factories/MetadataFactory.d.ts +22 -2
- package/lib/factories/MetadataFactory.js +221 -17
- package/lib/factories/MetadataFactory.js.map +1 -1
- package/lib/factories/MetadataTypeTagFactory.d.ts +3 -2
- package/lib/factories/MetadataTypeTagFactory.js +246 -173
- package/lib/factories/MetadataTypeTagFactory.js.map +1 -1
- package/lib/factories/ProtobufFactory.js +73 -68
- package/lib/factories/ProtobufFactory.js.map +1 -1
- package/lib/factories/TypeFactory.d.ts +0 -1
- package/lib/factories/TypeFactory.js +0 -5
- package/lib/factories/TypeFactory.js.map +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_alias.d.ts +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_alias.js +20 -7
- package/lib/factories/internal/metadata/emplace_metadata_alias.js.map +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_array_type.d.ts +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_array_type.js +20 -7
- package/lib/factories/internal/metadata/emplace_metadata_array_type.js.map +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_object.d.ts +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_object.js +100 -84
- package/lib/factories/internal/metadata/emplace_metadata_object.js.map +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_tuple.d.ts +1 -1
- package/lib/factories/internal/metadata/emplace_metadata_tuple.js +34 -21
- package/lib/factories/internal/metadata/emplace_metadata_tuple.js.map +1 -1
- package/lib/factories/internal/metadata/explore_metadata.d.ts +1 -1
- package/lib/factories/internal/metadata/explore_metadata.js +12 -12
- package/lib/factories/internal/metadata/explore_metadata.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata.js +39 -19
- package/lib/factories/internal/metadata/iterate_metadata.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_alias.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_alias.js +12 -10
- package/lib/factories/internal/metadata/iterate_metadata_alias.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_array.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_array.js +11 -9
- package/lib/factories/internal/metadata/iterate_metadata_array.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_collection.d.ts +2 -1
- package/lib/factories/internal/metadata/iterate_metadata_collection.js +47 -45
- package/lib/factories/internal/metadata/iterate_metadata_collection.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_comment_tags.d.ts +2 -1
- package/lib/factories/internal/metadata/iterate_metadata_comment_tags.js +16 -20
- package/lib/factories/internal/metadata/iterate_metadata_comment_tags.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_intersection.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_intersection.js +145 -135
- package/lib/factories/internal/metadata/iterate_metadata_intersection.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_map.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_map.js +28 -15
- package/lib/factories/internal/metadata/iterate_metadata_map.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_object.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_object.js +16 -14
- package/lib/factories/internal/metadata/iterate_metadata_object.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_resolve.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_resolve.js +28 -15
- package/lib/factories/internal/metadata/iterate_metadata_resolve.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_set.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_set.js +24 -11
- package/lib/factories/internal/metadata/iterate_metadata_set.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_template.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_template.js +28 -15
- package/lib/factories/internal/metadata/iterate_metadata_template.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_tuple.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_tuple.js +11 -9
- package/lib/factories/internal/metadata/iterate_metadata_tuple.js.map +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_union.d.ts +1 -1
- package/lib/factories/internal/metadata/iterate_metadata_union.js +20 -7
- package/lib/factories/internal/metadata/iterate_metadata_union.js.map +1 -1
- package/lib/programmers/CheckerProgrammer.js +13 -8
- package/lib/programmers/CheckerProgrammer.js.map +1 -1
- package/lib/programmers/FeatureProgrammer.d.ts +1 -1
- package/lib/programmers/FeatureProgrammer.js +1 -1
- package/lib/programmers/FeatureProgrammer.js.map +1 -1
- package/lib/programmers/IsProgrammer.js +1 -1
- package/lib/programmers/IsProgrammer.js.map +1 -1
- package/lib/programmers/RandomProgrammer.js +9 -4
- package/lib/programmers/RandomProgrammer.js.map +1 -1
- package/lib/programmers/TypiaProgrammer.js +58 -28
- package/lib/programmers/TypiaProgrammer.js.map +1 -1
- package/lib/programmers/internal/application_escaped.d.ts +4 -0
- package/lib/programmers/internal/{application_resolved.js → application_escaped.js} +4 -4
- package/lib/programmers/internal/application_escaped.js.map +1 -0
- package/lib/programmers/internal/application_schema.js +5 -5
- package/lib/programmers/internal/application_schema.js.map +1 -1
- package/lib/programmers/json/JsonApplicationProgrammer.js +5 -1
- package/lib/programmers/json/JsonApplicationProgrammer.js.map +1 -1
- package/lib/programmers/json/JsonAssertParseProgrammer.js +2 -0
- package/lib/programmers/json/JsonAssertParseProgrammer.js.map +1 -1
- package/lib/programmers/json/JsonIsParseProgrammer.js +2 -0
- package/lib/programmers/json/JsonIsParseProgrammer.js.map +1 -1
- package/lib/programmers/json/JsonStringifyProgrammer.js +20 -62
- package/lib/programmers/json/JsonStringifyProgrammer.js.map +1 -1
- package/lib/programmers/json/JsonValidateParseProgrammer.js +2 -0
- package/lib/programmers/json/JsonValidateParseProgrammer.js.map +1 -1
- package/lib/programmers/misc/MiscCloneProgrammer.js +13 -8
- package/lib/programmers/misc/MiscCloneProgrammer.js.map +1 -1
- package/lib/programmers/misc/MiscLiteralsProgrammer.js +10 -5
- package/lib/programmers/misc/MiscLiteralsProgrammer.js.map +1 -1
- package/lib/programmers/misc/MiscPruneProgrammer.js +13 -8
- package/lib/programmers/misc/MiscPruneProgrammer.js.map +1 -1
- package/lib/schemas/metadata/Metadata.js +4 -4
- package/lib/schemas/metadata/Metadata.js.map +1 -1
- package/lib/transform.d.ts +2 -1
- package/lib/transform.js +11 -3
- package/lib/transform.js.map +1 -1
- package/lib/transformers/CallExpressionTransformer.d.ts +1 -1
- package/lib/transformers/CallExpressionTransformer.js +2 -1
- package/lib/transformers/CallExpressionTransformer.js.map +1 -1
- package/lib/transformers/FileTransformer.js +18 -8
- package/lib/transformers/FileTransformer.js.map +1 -1
- package/lib/transformers/IProject.d.ts +3 -0
- package/lib/transformers/NodeTransformer.d.ts +1 -1
- package/lib/transformers/TransformerError.d.ts +12 -0
- package/lib/transformers/TransformerError.js +66 -0
- package/lib/transformers/TransformerError.js.map +1 -0
- package/lib/transformers/features/AssertTransformer.d.ts +1 -0
- package/lib/transformers/features/CreateAssertTransformer.d.ts +1 -0
- package/lib/transformers/features/CreateIsTransformer.d.ts +1 -0
- package/lib/transformers/features/CreateRandomTransformer.js +9 -4
- package/lib/transformers/features/CreateRandomTransformer.js.map +1 -1
- package/lib/transformers/features/CreateValidateTransformer.d.ts +1 -0
- package/lib/transformers/features/IsTransformer.d.ts +1 -0
- package/lib/transformers/features/RandomTransformer.js +9 -4
- package/lib/transformers/features/RandomTransformer.js.map +1 -1
- package/lib/transformers/features/ValidateTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonApplicationTransformer.js +79 -19
- package/lib/transformers/features/json/JsonApplicationTransformer.js.map +1 -1
- package/lib/transformers/features/json/JsonAssertParseTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonAssertStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateAssertParseTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateAssertStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateIsParseTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateIsStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateValidateParseTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonCreateValidateStringifyProgrammer.d.ts +1 -0
- package/lib/transformers/features/json/JsonIsParseTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonIsStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonValidateParseTransformer.d.ts +1 -0
- package/lib/transformers/features/json/JsonValidateStringifyTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MetadataTransformer.js +13 -5
- package/lib/transformers/features/misc/MetadataTransformer.js.map +1 -1
- package/lib/transformers/features/misc/MiscAssertCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscAssertPruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateAssertCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateAssertPruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateIsCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateIsPruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreatePruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateValidateCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscCreateValidatePruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscIsCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscIsPruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscLiteralsTransformer.js +9 -4
- package/lib/transformers/features/misc/MiscLiteralsTransformer.js.map +1 -1
- package/lib/transformers/features/misc/MiscPruneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscValidateCloneTransformer.d.ts +1 -0
- package/lib/transformers/features/misc/MiscValidatePruneTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufAssertDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufAssertEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufIsDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufIsEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufValidateDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/CreateProtobufValidateEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufAssertDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufAssertEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufIsDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufIsEncodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufMessageTransformer.js +9 -2
- package/lib/transformers/features/protobuf/ProtobufMessageTransformer.js.map +1 -1
- package/lib/transformers/features/protobuf/ProtobufValidateDecodeTransformer.d.ts +1 -0
- package/lib/transformers/features/protobuf/ProtobufValidateEncodeTransformer.d.ts +1 -0
- package/lib/transformers/internal/GenericTransformer.js +17 -4
- package/lib/transformers/internal/GenericTransformer.js.map +1 -1
- package/lib/typings/ValidationPipe.d.ts +7 -0
- package/lib/typings/ValidationPipe.js +3 -0
- package/lib/typings/ValidationPipe.js.map +1 -0
- package/package.json +3 -1
- package/src/executable/TypiaGenerateWizard.ts +1 -1
- package/src/executable/TypiaSetupWizard.ts +1 -1
- package/src/executable/setup/PackageManager.ts +1 -1
- package/src/executable/setup/PluginConfigurator.ts +2 -2
- package/src/factories/ExpressionFactory.ts +2 -2
- package/src/factories/JsonMetadataFactory.ts +43 -0
- package/src/factories/LiteralFactory.ts +2 -1
- package/src/factories/MetadataCollection.ts +0 -5
- package/src/factories/MetadataCommentTagFactory.ts +130 -84
- package/src/factories/MetadataFactory.ts +169 -7
- package/src/factories/MetadataTypeTagFactory.ts +191 -141
- package/src/factories/ProtobufFactory.ts +86 -93
- package/src/factories/TypeFactory.ts +0 -5
- package/src/factories/internal/metadata/emplace_metadata_alias.ts +12 -5
- package/src/factories/internal/metadata/emplace_metadata_array_type.ts +12 -5
- package/src/factories/internal/metadata/emplace_metadata_object.ts +20 -5
- package/src/factories/internal/metadata/emplace_metadata_tuple.ts +12 -2
- package/src/factories/internal/metadata/explore_metadata.ts +5 -11
- package/src/factories/internal/metadata/iterate_metadata.ts +44 -24
- package/src/factories/internal/metadata/iterate_metadata_alias.ts +7 -2
- package/src/factories/internal/metadata/iterate_metadata_array.ts +7 -2
- package/src/factories/internal/metadata/iterate_metadata_collection.ts +30 -29
- package/src/factories/internal/metadata/iterate_metadata_comment_tags.ts +21 -22
- package/src/factories/internal/metadata/iterate_metadata_intersection.ts +33 -17
- package/src/factories/internal/metadata/iterate_metadata_map.ts +20 -4
- package/src/factories/internal/metadata/iterate_metadata_object.ts +2 -1
- package/src/factories/internal/metadata/iterate_metadata_resolve.ts +15 -12
- package/src/factories/internal/metadata/iterate_metadata_set.ts +11 -2
- package/src/factories/internal/metadata/iterate_metadata_template.ts +12 -3
- package/src/factories/internal/metadata/iterate_metadata_tuple.ts +7 -2
- package/src/factories/internal/metadata/iterate_metadata_union.ts +10 -7
- package/src/programmers/CheckerProgrammer.ts +8 -2
- package/src/programmers/FeatureProgrammer.ts +4 -1
- package/src/programmers/IsProgrammer.ts +1 -1
- package/src/programmers/RandomProgrammer.ts +18 -17
- package/src/programmers/TypiaProgrammer.ts +27 -2
- package/src/programmers/internal/{application_resolved.ts → application_escaped.ts} +1 -1
- package/src/programmers/internal/application_schema.ts +5 -5
- package/src/programmers/json/JsonApplicationProgrammer.ts +6 -3
- package/src/programmers/json/JsonAssertParseProgrammer.ts +7 -2
- package/src/programmers/json/JsonIsParseProgrammer.ts +7 -2
- package/src/programmers/json/JsonStringifyProgrammer.ts +7 -37
- package/src/programmers/json/JsonValidateParseProgrammer.ts +7 -2
- package/src/programmers/json/JsonValidateStringifyProgrammer.ts +1 -1
- package/src/programmers/misc/MiscCloneProgrammer.ts +14 -11
- package/src/programmers/misc/MiscLiteralsProgrammer.ts +11 -6
- package/src/programmers/misc/MiscPruneProgrammer.ts +8 -2
- package/src/schemas/metadata/Metadata.ts +4 -4
- package/src/transform.ts +13 -5
- package/src/transformers/CallExpressionTransformer.ts +6 -3
- package/src/transformers/FileTransformer.ts +25 -13
- package/src/transformers/IProject.ts +3 -0
- package/src/transformers/NodeTransformer.ts +1 -1
- package/src/transformers/TransformerError.ts +55 -0
- package/src/transformers/features/CreateRandomTransformer.ts +11 -7
- package/src/transformers/features/RandomTransformer.ts +11 -7
- package/src/transformers/features/json/JsonApplicationTransformer.ts +39 -35
- package/src/transformers/features/misc/MetadataTransformer.ts +18 -10
- package/src/transformers/features/misc/MiscLiteralsTransformer.ts +11 -7
- package/src/transformers/features/protobuf/ProtobufMessageTransformer.ts +9 -7
- package/src/transformers/internal/GenericTransformer.ts +17 -10
- package/src/typings/ValidationPipe.ts +9 -0
- package/lib/programmers/internal/application_resolved.d.ts +0 -4
- package/lib/programmers/internal/application_resolved.js.map +0 -1
|
@@ -4,38 +4,39 @@ import { MetadataObject } from "../../../schemas/metadata/MetadataObject";
|
|
|
4
4
|
import { MetadataTupleType } from "../../../schemas/metadata/MetadataTupleType";
|
|
5
5
|
|
|
6
6
|
import { MetadataCollection } from "../../MetadataCollection";
|
|
7
|
+
import { MetadataFactory } from "../../MetadataFactory";
|
|
7
8
|
import { iterate_metadata_comment_tags } from "./iterate_metadata_comment_tags";
|
|
8
9
|
|
|
9
|
-
export const iterate_metadata_collection =
|
|
10
|
-
|
|
11
|
-
): void => {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
10
|
+
export const iterate_metadata_collection =
|
|
11
|
+
(errors: MetadataFactory.IError[]) =>
|
|
12
|
+
(collection: MetadataCollection): void => {
|
|
13
|
+
for (const array of collection.arrays())
|
|
14
|
+
if (array.recursive === null)
|
|
15
|
+
collection.setArrayRecursive(
|
|
16
|
+
array,
|
|
17
|
+
isArrayRecursive(new Set())(array)(array.value),
|
|
18
|
+
);
|
|
19
|
+
for (const tuple of collection.tuples())
|
|
20
|
+
if (tuple.recursive === null) {
|
|
21
|
+
const visited: Set<Metadata> = new Set();
|
|
22
|
+
collection.setTupleRecursive(
|
|
23
|
+
tuple,
|
|
24
|
+
tuple.elements.some(isTupleRecursive(visited)(tuple)),
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
for (const obj of collection.objects()) {
|
|
28
|
+
iterate_metadata_comment_tags(errors)(obj);
|
|
29
|
+
if (obj.recursive === null) {
|
|
30
|
+
const visited: Set<Metadata> = new Set();
|
|
31
|
+
collection.setObjectRecursive(
|
|
32
|
+
obj,
|
|
33
|
+
obj.properties.some((p) =>
|
|
34
|
+
isObjectRecursive(visited)(obj)(p.value),
|
|
35
|
+
),
|
|
36
|
+
);
|
|
37
|
+
}
|
|
36
38
|
}
|
|
37
|
-
}
|
|
38
|
-
};
|
|
39
|
+
};
|
|
39
40
|
|
|
40
41
|
const isArrayRecursive =
|
|
41
42
|
(visited: Set<Metadata>) =>
|
|
@@ -1,27 +1,26 @@
|
|
|
1
1
|
import { MetadataObject } from "../../../schemas/metadata/MetadataObject";
|
|
2
2
|
|
|
3
|
-
import { Escaper } from "../../../utils/Escaper";
|
|
4
|
-
|
|
5
3
|
import { MetadataCommentTagFactory } from "../../MetadataCommentTagFactory";
|
|
4
|
+
import { MetadataFactory } from "../../MetadataFactory";
|
|
6
5
|
|
|
7
|
-
export const iterate_metadata_comment_tags =
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
for (const prop of obj.properties) {
|
|
12
|
-
const key: string = prop.key.getName();
|
|
13
|
-
const variable: string | null =
|
|
14
|
-
key.length >= 3 &&
|
|
15
|
-
key[0] === '"' &&
|
|
16
|
-
key[key.length - 1] === '"' &&
|
|
17
|
-
Escaper.variable(key.slice(1, -1))
|
|
18
|
-
? key.slice(1, -1)
|
|
19
|
-
: null;
|
|
6
|
+
export const iterate_metadata_comment_tags =
|
|
7
|
+
(errors: MetadataFactory.IError[]) => (object: MetadataObject) => {
|
|
8
|
+
if (object.tagged_ === true) return;
|
|
9
|
+
object.tagged_ = true;
|
|
20
10
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
11
|
+
for (const property of object.properties) {
|
|
12
|
+
MetadataCommentTagFactory.analyze(errors)(property.value)(
|
|
13
|
+
property.jsDocTags,
|
|
14
|
+
{
|
|
15
|
+
top: false,
|
|
16
|
+
object,
|
|
17
|
+
property: property.key.isSoleLiteral()
|
|
18
|
+
? property.key.getSoleLiteral()!
|
|
19
|
+
: {},
|
|
20
|
+
nested: null,
|
|
21
|
+
escaped: false,
|
|
22
|
+
aliased: false,
|
|
23
|
+
},
|
|
24
|
+
);
|
|
25
|
+
}
|
|
26
|
+
};
|
|
@@ -17,11 +17,11 @@ export const iterate_metadata_intersection =
|
|
|
17
17
|
(checker: ts.TypeChecker) =>
|
|
18
18
|
(options: MetadataFactory.IOptions) =>
|
|
19
19
|
(collection: MetadataCollection) =>
|
|
20
|
+
(errors: MetadataFactory.IError[]) =>
|
|
20
21
|
(
|
|
21
22
|
meta: Metadata,
|
|
22
23
|
type: ts.Type,
|
|
23
|
-
|
|
24
|
-
aliased: boolean,
|
|
24
|
+
explore: MetadataFactory.IExplore,
|
|
25
25
|
): boolean => {
|
|
26
26
|
if (!type.isIntersection()) return false;
|
|
27
27
|
else if (
|
|
@@ -36,25 +36,32 @@ export const iterate_metadata_intersection =
|
|
|
36
36
|
|
|
37
37
|
// COSTRUCT FAKE METADATA LIST
|
|
38
38
|
const fakeCollection: MetadataCollection = new MetadataCollection();
|
|
39
|
+
const fakeErrors: MetadataFactory.IError[] = [];
|
|
39
40
|
const children: Metadata[] = [
|
|
40
41
|
...new Map(
|
|
41
42
|
type.types.map((t) => {
|
|
42
43
|
const m: Metadata = explore_metadata(checker)({
|
|
43
44
|
...options,
|
|
44
45
|
absorb: true,
|
|
45
|
-
})(fakeCollection)(t,
|
|
46
|
+
})(fakeCollection)(fakeErrors)(t, {
|
|
47
|
+
...explore,
|
|
48
|
+
aliased: false,
|
|
49
|
+
});
|
|
46
50
|
return [m.getName(), m] as const;
|
|
47
51
|
}),
|
|
48
52
|
).values(),
|
|
49
53
|
];
|
|
54
|
+
if (fakeErrors.length) {
|
|
55
|
+
errors.push(...fakeErrors);
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
50
58
|
|
|
51
59
|
// ONLY ONE CHILD AFTER REMOVING DUPLICATES
|
|
52
60
|
if (children.length === 1) {
|
|
53
|
-
iterate_metadata(checker)(options)(collection)(
|
|
61
|
+
iterate_metadata(checker)(options)(collection)(errors)(
|
|
54
62
|
meta,
|
|
55
63
|
type.types[0]!,
|
|
56
|
-
|
|
57
|
-
aliased,
|
|
64
|
+
explore,
|
|
58
65
|
);
|
|
59
66
|
return true;
|
|
60
67
|
} else if (
|
|
@@ -102,9 +109,18 @@ export const iterate_metadata_intersection =
|
|
|
102
109
|
atomics.size + arrays.size > 1 ||
|
|
103
110
|
individuals.length + objects.length + constants.length !==
|
|
104
111
|
children.length
|
|
105
|
-
)
|
|
106
|
-
|
|
107
|
-
|
|
112
|
+
) {
|
|
113
|
+
errors.push({
|
|
114
|
+
name: children.map((c) => c.getName()).join(" & "),
|
|
115
|
+
explore: { ...explore },
|
|
116
|
+
messages: ["nonsensible intersection"],
|
|
117
|
+
});
|
|
118
|
+
return true;
|
|
119
|
+
} else if (
|
|
120
|
+
atomics.size === 0 &&
|
|
121
|
+
arrays.size === 0 &&
|
|
122
|
+
constants.length
|
|
123
|
+
) {
|
|
108
124
|
for (const m of constants) {
|
|
109
125
|
for (const tpl of m.templates)
|
|
110
126
|
ArrayUtil.add(
|
|
@@ -151,11 +167,16 @@ export const iterate_metadata_intersection =
|
|
|
151
167
|
else if (target === "array") {
|
|
152
168
|
const name: string = arrays.values().next().value;
|
|
153
169
|
if (!meta.arrays.some((a) => a.type.name === name)) {
|
|
154
|
-
iterate_metadata_array(checker)(options)(collection)(
|
|
170
|
+
iterate_metadata_array(checker)(options)(collection)(errors)(
|
|
155
171
|
meta,
|
|
156
172
|
type.types[
|
|
157
173
|
individuals.find((i) => i[0].arrays.length === 1)![1]
|
|
158
174
|
]!,
|
|
175
|
+
{
|
|
176
|
+
...explore,
|
|
177
|
+
aliased: false,
|
|
178
|
+
escaped: false,
|
|
179
|
+
},
|
|
159
180
|
);
|
|
160
181
|
}
|
|
161
182
|
}
|
|
@@ -163,8 +184,8 @@ export const iterate_metadata_intersection =
|
|
|
163
184
|
// ASSIGN TAGS
|
|
164
185
|
if (objects.length && target !== "boolean") {
|
|
165
186
|
const tags: IMetadataTypeTag[] = MetadataTypeTagFactory.analyze(
|
|
166
|
-
|
|
167
|
-
)(objects.map((om) => om.objects).flat());
|
|
187
|
+
errors,
|
|
188
|
+
)(target)(objects.map((om) => om.objects).flat(), explore);
|
|
168
189
|
if (tags.length)
|
|
169
190
|
if (target === "array") meta.arrays.at(-1)!.tags.push(tags);
|
|
170
191
|
else
|
|
@@ -174,8 +195,3 @@ export const iterate_metadata_intersection =
|
|
|
174
195
|
}
|
|
175
196
|
return true;
|
|
176
197
|
};
|
|
177
|
-
|
|
178
|
-
const message = (children: Metadata[]) =>
|
|
179
|
-
`Error on typia.MetadataFactory.analyze(): nonsensible intersection type detected - ${children
|
|
180
|
-
.map((c) => c.getName())
|
|
181
|
-
.join(" & ")}.`;
|
|
@@ -13,7 +13,12 @@ export const iterate_metadata_map =
|
|
|
13
13
|
(checker: ts.TypeChecker) =>
|
|
14
14
|
(options: MetadataFactory.IOptions) =>
|
|
15
15
|
(collection: MetadataCollection) =>
|
|
16
|
-
(
|
|
16
|
+
(errors: MetadataFactory.IError[]) =>
|
|
17
|
+
(
|
|
18
|
+
meta: Metadata,
|
|
19
|
+
type: ts.Type,
|
|
20
|
+
explore: MetadataFactory.IExplore,
|
|
21
|
+
): boolean => {
|
|
17
22
|
type = checker.getApparentType(type);
|
|
18
23
|
|
|
19
24
|
const name = TypeFactory.getFullName(checker)(type, type.getSymbol());
|
|
@@ -29,10 +34,21 @@ export const iterate_metadata_map =
|
|
|
29
34
|
ArrayUtil.set(
|
|
30
35
|
meta.maps,
|
|
31
36
|
{
|
|
32
|
-
key: explore_metadata(checker)(options)(collection)(
|
|
33
|
-
|
|
37
|
+
key: explore_metadata(checker)(options)(collection)(errors)(
|
|
38
|
+
key,
|
|
39
|
+
{
|
|
40
|
+
...explore,
|
|
41
|
+
escaped: false,
|
|
42
|
+
aliased: false,
|
|
43
|
+
},
|
|
44
|
+
),
|
|
45
|
+
value: explore_metadata(checker)(options)(collection)(errors)(
|
|
34
46
|
value,
|
|
35
|
-
|
|
47
|
+
{
|
|
48
|
+
...explore,
|
|
49
|
+
escaped: false,
|
|
50
|
+
aliased: false,
|
|
51
|
+
},
|
|
36
52
|
),
|
|
37
53
|
},
|
|
38
54
|
(elem) => `Map<${elem.key.getName()}, ${elem.value.getName()}>`,
|
|
@@ -13,6 +13,7 @@ export const iterate_metadata_object =
|
|
|
13
13
|
(checker: ts.TypeChecker) =>
|
|
14
14
|
(options: MetadataFactory.IOptions) =>
|
|
15
15
|
(collection: MetadataCollection) =>
|
|
16
|
+
(errors: MetadataFactory.IError[]) =>
|
|
16
17
|
(meta: Metadata, type: ts.Type, ensure: boolean = false): boolean => {
|
|
17
18
|
if (ensure === false) {
|
|
18
19
|
const filter = (flag: ts.TypeFlags) =>
|
|
@@ -37,7 +38,7 @@ export const iterate_metadata_object =
|
|
|
37
38
|
|
|
38
39
|
const obj: MetadataObject = emplace_metadata_object(checker)(options)(
|
|
39
40
|
collection,
|
|
40
|
-
)(type, meta.nullable);
|
|
41
|
+
)(errors)(type, meta.nullable);
|
|
41
42
|
ArrayUtil.add(meta.objects, obj, (elem) => elem.name === obj.name);
|
|
42
43
|
return true;
|
|
43
44
|
};
|
|
@@ -10,21 +10,20 @@ import { MetadataFactory } from "../../MetadataFactory";
|
|
|
10
10
|
import { TypeFactory } from "../../TypeFactory";
|
|
11
11
|
import { iterate_metadata } from "./iterate_metadata";
|
|
12
12
|
|
|
13
|
-
// import { iterate_metadata_coalesce } from "./iterate_metadata_coalesce";
|
|
14
|
-
|
|
15
13
|
export const iterate_metadata_resolve =
|
|
16
14
|
(checker: ts.TypeChecker) =>
|
|
17
15
|
(options: MetadataFactory.IOptions) =>
|
|
18
16
|
(collection: MetadataCollection) =>
|
|
17
|
+
(errors: MetadataFactory.IError[]) =>
|
|
19
18
|
(
|
|
20
19
|
meta: Metadata,
|
|
21
20
|
type: ts.Type,
|
|
22
|
-
|
|
23
|
-
aliased: boolean,
|
|
21
|
+
explore: MetadataFactory.IExplore,
|
|
24
22
|
): boolean => {
|
|
25
|
-
if (options.escape === false ||
|
|
23
|
+
if (options.escape === false || explore.escaped === true) return false;
|
|
26
24
|
|
|
27
|
-
const escaped: ts.Type | null =
|
|
25
|
+
const escaped: ts.Type | null =
|
|
26
|
+
TypeFactory.getReturnType(checker)(type)("toJSON");
|
|
28
27
|
if (escaped === null) return false;
|
|
29
28
|
|
|
30
29
|
if (meta.escaped === null) {
|
|
@@ -33,17 +32,21 @@ export const iterate_metadata_resolve =
|
|
|
33
32
|
returns: Metadata.initialize(),
|
|
34
33
|
});
|
|
35
34
|
}
|
|
36
|
-
iterate_metadata(checker)(options)(collection)(
|
|
35
|
+
iterate_metadata(checker)(options)(collection)(errors)(
|
|
37
36
|
meta.escaped!.original,
|
|
38
37
|
type,
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
{
|
|
39
|
+
...explore,
|
|
40
|
+
escaped: true,
|
|
41
|
+
},
|
|
41
42
|
);
|
|
42
|
-
iterate_metadata(checker)(options)(collection)(
|
|
43
|
+
iterate_metadata(checker)(options)(collection)(errors)(
|
|
43
44
|
meta.escaped!.returns,
|
|
44
45
|
escaped,
|
|
45
|
-
|
|
46
|
-
|
|
46
|
+
{
|
|
47
|
+
...explore,
|
|
48
|
+
escaped: true,
|
|
49
|
+
},
|
|
47
50
|
);
|
|
48
51
|
return true;
|
|
49
52
|
};
|
|
@@ -13,7 +13,12 @@ export const iterate_metadata_set =
|
|
|
13
13
|
(checker: ts.TypeChecker) =>
|
|
14
14
|
(options: MetadataFactory.IOptions) =>
|
|
15
15
|
(collection: MetadataCollection) =>
|
|
16
|
-
(
|
|
16
|
+
(errors: MetadataFactory.IError[]) =>
|
|
17
|
+
(
|
|
18
|
+
meta: Metadata,
|
|
19
|
+
type: ts.Type,
|
|
20
|
+
explore: MetadataFactory.IExplore,
|
|
21
|
+
): boolean => {
|
|
17
22
|
type = checker.getApparentType(type);
|
|
18
23
|
|
|
19
24
|
const name = TypeFactory.getFullName(checker)(type, type.getSymbol());
|
|
@@ -26,7 +31,11 @@ export const iterate_metadata_set =
|
|
|
26
31
|
const key: ts.Type = generic[0]!;
|
|
27
32
|
ArrayUtil.set(
|
|
28
33
|
meta.sets,
|
|
29
|
-
explore_metadata(checker)(options)(collection)(key,
|
|
34
|
+
explore_metadata(checker)(options)(collection)(errors)(key, {
|
|
35
|
+
...explore,
|
|
36
|
+
escaped: false,
|
|
37
|
+
aliased: false,
|
|
38
|
+
}),
|
|
30
39
|
(elem) => elem.getName(),
|
|
31
40
|
);
|
|
32
41
|
return true;
|
|
@@ -11,7 +11,12 @@ export const iterate_metadata_template =
|
|
|
11
11
|
(checker: ts.TypeChecker) =>
|
|
12
12
|
(options: MetadataFactory.IOptions) =>
|
|
13
13
|
(collection: MetadataCollection) =>
|
|
14
|
-
(
|
|
14
|
+
(errors: MetadataFactory.IError[]) =>
|
|
15
|
+
(
|
|
16
|
+
meta: Metadata,
|
|
17
|
+
type: ts.Type,
|
|
18
|
+
explore: MetadataFactory.IExplore,
|
|
19
|
+
): boolean => {
|
|
15
20
|
const filter = (flag: ts.TypeFlags) => (type.getFlags() & flag) !== 0;
|
|
16
21
|
if (!filter(ts.TypeFlags.TemplateLiteral)) return false;
|
|
17
22
|
|
|
@@ -26,9 +31,13 @@ export const iterate_metadata_template =
|
|
|
26
31
|
const binded: ts.Type | undefined = template.types[i];
|
|
27
32
|
if (binded)
|
|
28
33
|
row.push(
|
|
29
|
-
explore_metadata(checker)(options)(collection)(
|
|
34
|
+
explore_metadata(checker)(options)(collection)(errors)(
|
|
30
35
|
binded,
|
|
31
|
-
|
|
36
|
+
{
|
|
37
|
+
...explore,
|
|
38
|
+
escaped: false,
|
|
39
|
+
aliased: false,
|
|
40
|
+
},
|
|
32
41
|
),
|
|
33
42
|
);
|
|
34
43
|
});
|
|
@@ -14,12 +14,17 @@ export const iterate_metadata_tuple =
|
|
|
14
14
|
(checker: ts.TypeChecker) =>
|
|
15
15
|
(options: MetadataFactory.IOptions) =>
|
|
16
16
|
(collection: MetadataCollection) =>
|
|
17
|
-
(
|
|
17
|
+
(errors: MetadataFactory.IError[]) =>
|
|
18
|
+
(
|
|
19
|
+
meta: Metadata,
|
|
20
|
+
type: ts.TupleType,
|
|
21
|
+
explore: MetadataFactory.IExplore,
|
|
22
|
+
): boolean => {
|
|
18
23
|
if (!checker.isTupleType(type)) return false;
|
|
19
24
|
|
|
20
25
|
const tupleType: MetadataTupleType = emplace_metadata_tuple(checker)(
|
|
21
26
|
options,
|
|
22
|
-
)(collection)(type, meta.nullable);
|
|
27
|
+
)(collection)(errors)(type, meta.nullable, explore);
|
|
23
28
|
ArrayUtil.add(
|
|
24
29
|
meta.tuples,
|
|
25
30
|
MetadataTuple.create({
|
|
@@ -10,15 +10,18 @@ export const iterate_metadata_union =
|
|
|
10
10
|
(checker: ts.TypeChecker) =>
|
|
11
11
|
(options: MetadataFactory.IOptions) =>
|
|
12
12
|
(collection: MetadataCollection) =>
|
|
13
|
-
(
|
|
13
|
+
(errors: MetadataFactory.IError[]) =>
|
|
14
|
+
(
|
|
15
|
+
meta: Metadata,
|
|
16
|
+
type: ts.Type,
|
|
17
|
+
explore: MetadataFactory.IExplore,
|
|
18
|
+
): boolean => {
|
|
14
19
|
if (!type.isUnion()) return false;
|
|
15
20
|
type.types.forEach((t) =>
|
|
16
|
-
iterate_metadata(checker)(options)(collection)(
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
false,
|
|
21
|
-
),
|
|
21
|
+
iterate_metadata(checker)(options)(collection)(errors)(meta, t, {
|
|
22
|
+
...explore,
|
|
23
|
+
aliased: false,
|
|
24
|
+
}),
|
|
22
25
|
);
|
|
23
26
|
return true;
|
|
24
27
|
};
|
|
@@ -15,6 +15,7 @@ import { MetadataTuple } from "../schemas/metadata/MetadataTuple";
|
|
|
15
15
|
import { MetadataTupleType } from "../schemas/metadata/MetadataTupleType";
|
|
16
16
|
|
|
17
17
|
import { IProject } from "../transformers/IProject";
|
|
18
|
+
import { TransformerError } from "../transformers/TransformerError";
|
|
18
19
|
|
|
19
20
|
import { FeatureProgrammer } from "./FeatureProgrammer";
|
|
20
21
|
import { AtomicPredicator } from "./helpers/AtomicPredicator";
|
|
@@ -208,15 +209,20 @@ export namespace CheckerProgrammer {
|
|
|
208
209
|
prefix: config.prefix,
|
|
209
210
|
initializer:
|
|
210
211
|
({ checker }) =>
|
|
212
|
+
(importer) =>
|
|
211
213
|
(type) => {
|
|
212
214
|
const collection: MetadataCollection =
|
|
213
215
|
new MetadataCollection();
|
|
214
|
-
const
|
|
216
|
+
const result = MetadataFactory.analyze(checker)({
|
|
215
217
|
escape: false,
|
|
216
218
|
constant: true,
|
|
217
219
|
absorb: true,
|
|
218
220
|
})(collection)(type);
|
|
219
|
-
|
|
221
|
+
if (result.success === false)
|
|
222
|
+
throw TransformerError.from(`typia.${importer.method}`)(
|
|
223
|
+
result.errors,
|
|
224
|
+
);
|
|
225
|
+
return [collection, result.data];
|
|
220
226
|
},
|
|
221
227
|
addition: config.addition,
|
|
222
228
|
decoder: () =>
|
|
@@ -47,6 +47,8 @@ export namespace FeatureProgrammer {
|
|
|
47
47
|
*/
|
|
48
48
|
initializer: (
|
|
49
49
|
project: IProject,
|
|
50
|
+
) => (
|
|
51
|
+
importer: FunctionImporter,
|
|
50
52
|
) => (type: ts.Type) => [MetadataCollection, Metadata];
|
|
51
53
|
|
|
52
54
|
/**
|
|
@@ -200,7 +202,8 @@ export namespace FeatureProgrammer {
|
|
|
200
202
|
(config: IConfig) =>
|
|
201
203
|
(importer: FunctionImporter) =>
|
|
202
204
|
(type: ts.Type, name?: string) => {
|
|
203
|
-
const [collection, meta] =
|
|
205
|
+
const [collection, meta] =
|
|
206
|
+
config.initializer(project)(importer)(type);
|
|
204
207
|
|
|
205
208
|
// ITERATE OVER ALL METADATA
|
|
206
209
|
const output: ts.ConciseBody = config.decoder()(
|
|
@@ -23,9 +23,9 @@ export namespace IsProgrammer {
|
|
|
23
23
|
(options?: Partial<CONFIG.IOptions>) =>
|
|
24
24
|
(importer: FunctionImporter): CheckerProgrammer.IConfig => ({
|
|
25
25
|
prefix: "$i",
|
|
26
|
+
equals: !!options?.object,
|
|
26
27
|
trace: false,
|
|
27
28
|
path: false,
|
|
28
|
-
equals: !!options?.object,
|
|
29
29
|
numeric: OptionPredicator.numeric({
|
|
30
30
|
numeric: options?.numeric,
|
|
31
31
|
}),
|
|
@@ -17,6 +17,7 @@ import { MetadataTuple } from "../schemas/metadata/MetadataTuple";
|
|
|
17
17
|
import { MetadataTupleType } from "../schemas/metadata/MetadataTupleType";
|
|
18
18
|
|
|
19
19
|
import { IProject } from "../transformers/IProject";
|
|
20
|
+
import { TransformerError } from "../transformers/TransformerError";
|
|
20
21
|
|
|
21
22
|
import { Escaper } from "../utils/Escaper";
|
|
22
23
|
|
|
@@ -36,23 +37,23 @@ export namespace RandomProgrammer {
|
|
|
36
37
|
return (type: ts.Type, name?: string) => {
|
|
37
38
|
// INITIALIZE METADATA
|
|
38
39
|
const collection: MetadataCollection = new MetadataCollection();
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
throw new Error(
|
|
51
|
-
`Error on ${modulo.getText()}(): WeakMap is not supported.`,
|
|
52
|
-
);
|
|
53
|
-
},
|
|
40
|
+
const result = MetadataFactory.analyze(project.checker)({
|
|
41
|
+
escape: false,
|
|
42
|
+
constant: true,
|
|
43
|
+
absorb: true,
|
|
44
|
+
validate: (meta) => {
|
|
45
|
+
const output: string[] = [];
|
|
46
|
+
if (meta.natives.some((n) => n === "WeakSet"))
|
|
47
|
+
output.push(`WeakSet is not supported.`);
|
|
48
|
+
else if (meta.natives.some((n) => n === "WeakMap"))
|
|
49
|
+
output.push(`WeakMap is not supported.`);
|
|
50
|
+
return output;
|
|
54
51
|
},
|
|
55
|
-
)(collection)(type);
|
|
52
|
+
})(collection)(type);
|
|
53
|
+
if (result.success === false)
|
|
54
|
+
throw TransformerError.from(`typia.${importer.method}`)(
|
|
55
|
+
result.errors,
|
|
56
|
+
);
|
|
56
57
|
|
|
57
58
|
// GENERATE FUNCTION
|
|
58
59
|
const functions = {
|
|
@@ -64,7 +65,7 @@ export namespace RandomProgrammer {
|
|
|
64
65
|
const output: ts.Expression = decode(importer)({
|
|
65
66
|
function: false,
|
|
66
67
|
recursive: false,
|
|
67
|
-
})(
|
|
68
|
+
})(result.data);
|
|
68
69
|
|
|
69
70
|
return ts.factory.createArrowFunction(
|
|
70
71
|
undefined,
|
|
@@ -20,7 +20,7 @@ export namespace TypiaProgrammer {
|
|
|
20
20
|
props.output = path.resolve(props.output);
|
|
21
21
|
|
|
22
22
|
if ((await is_directory(props.input)) === false)
|
|
23
|
-
throw new
|
|
23
|
+
throw new URIError(
|
|
24
24
|
"Error on TypiaGenerator.generate(): input path is not a directory.",
|
|
25
25
|
);
|
|
26
26
|
else if (fs.existsSync(props.output) === false)
|
|
@@ -28,7 +28,7 @@ export namespace TypiaProgrammer {
|
|
|
28
28
|
else if ((await is_directory(props.output)) === false) {
|
|
29
29
|
const parent: string = path.join(props.output, "..");
|
|
30
30
|
if ((await is_directory(parent)) === false)
|
|
31
|
-
throw new
|
|
31
|
+
throw new URIError(
|
|
32
32
|
"Error on TypiaGenerator.generate(): output path is not a directory.",
|
|
33
33
|
);
|
|
34
34
|
await fs.promises.mkdir(props.output);
|
|
@@ -56,6 +56,7 @@ export namespace TypiaProgrammer {
|
|
|
56
56
|
);
|
|
57
57
|
|
|
58
58
|
// DO TRANSFORM
|
|
59
|
+
const diagnostics: ts.Diagnostic[] = [];
|
|
59
60
|
const result: ts.TransformationResult<ts.SourceFile> = ts.transform(
|
|
60
61
|
program
|
|
61
62
|
.getSourceFiles()
|
|
@@ -73,11 +74,35 @@ export namespace TypiaProgrammer {
|
|
|
73
74
|
p.transform === "typia/lib/transform" ||
|
|
74
75
|
p.transform === "../src/transform.ts",
|
|
75
76
|
) ?? {},
|
|
77
|
+
{
|
|
78
|
+
addDiagnostic: (diag) => diagnostics.push(diag),
|
|
79
|
+
},
|
|
76
80
|
),
|
|
77
81
|
],
|
|
78
82
|
program.getCompilerOptions(),
|
|
79
83
|
);
|
|
80
84
|
|
|
85
|
+
// TRACE ERRORS
|
|
86
|
+
for (const diag of diagnostics) {
|
|
87
|
+
const file: string = diag.file
|
|
88
|
+
? path.relative(diag.file.fileName, process.cwd())
|
|
89
|
+
: "(unknown file)";
|
|
90
|
+
const category: string =
|
|
91
|
+
diag.category === ts.DiagnosticCategory.Warning
|
|
92
|
+
? "warning"
|
|
93
|
+
: diag.category === ts.DiagnosticCategory.Error
|
|
94
|
+
? "error"
|
|
95
|
+
: diag.category === ts.DiagnosticCategory.Suggestion
|
|
96
|
+
? "suggestion"
|
|
97
|
+
: diag.category === ts.DiagnosticCategory.Message
|
|
98
|
+
? "message"
|
|
99
|
+
: "unkown";
|
|
100
|
+
console.error(
|
|
101
|
+
`${file}:${diag.start}:${diag.length} - ${category} TS(${diag.code}): ${diag.messageText}`,
|
|
102
|
+
);
|
|
103
|
+
}
|
|
104
|
+
if (diagnostics.length) process.exit(-1);
|
|
105
|
+
|
|
81
106
|
// ARCHIVE TRANSFORMED FILES
|
|
82
107
|
const printer: ts.Printer = ts.createPrinter({
|
|
83
108
|
newLine: ts.NewLineKind.LineFeed,
|
|
@@ -5,7 +5,7 @@ import { IJsonComponents, IJsonSchema } from "../../module";
|
|
|
5
5
|
import { JsonApplicationProgrammer } from "../json/JsonApplicationProgrammer";
|
|
6
6
|
import { application_schema } from "./application_schema";
|
|
7
7
|
|
|
8
|
-
export const
|
|
8
|
+
export const application_escaped =
|
|
9
9
|
(options: JsonApplicationProgrammer.IOptions) =>
|
|
10
10
|
<BlockNever extends boolean>(blockNever: BlockNever) =>
|
|
11
11
|
(components: IJsonComponents) =>
|