ts-json-schema-generator 2.5.0-next.9 → 2.5.0
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/dist/factory/parser.js +3 -0
- package/dist/factory/parser.js.map +1 -1
- package/dist/factory/program.js +6 -3
- package/dist/factory/program.js.map +1 -1
- package/dist/package.json +28 -33
- package/dist/src/AnnotationsReader/BasicAnnotationsReader.js +6 -0
- package/dist/src/AnnotationsReader/BasicAnnotationsReader.js.map +1 -1
- package/dist/src/AnnotationsReader/ExtendedAnnotationsReader.d.ts +4 -0
- package/dist/src/AnnotationsReader/ExtendedAnnotationsReader.js +7 -0
- package/dist/src/AnnotationsReader/ExtendedAnnotationsReader.js.map +1 -1
- package/dist/src/Config.d.ts +99 -0
- package/dist/src/Error/BaseError.d.ts +6 -1
- package/dist/src/Error/BaseError.js +8 -2
- package/dist/src/Error/BaseError.js.map +1 -1
- package/dist/src/Error/Errors.d.ts +3 -0
- package/dist/src/Error/Errors.js +5 -0
- package/dist/src/Error/Errors.js.map +1 -1
- package/dist/src/NodeParser/AnnotatedNodeParser.js +5 -0
- package/dist/src/NodeParser/AnnotatedNodeParser.js.map +1 -1
- package/dist/src/NodeParser/ArrayNodeParser.js +1 -0
- package/dist/src/NodeParser/ArrayNodeParser.js.map +1 -1
- package/dist/src/NodeParser/AsExpressionNodeParser.js +1 -0
- package/dist/src/NodeParser/AsExpressionNodeParser.js.map +1 -1
- package/dist/src/NodeParser/BinaryExpressionNodeParser.d.ts +13 -0
- package/dist/src/NodeParser/BinaryExpressionNodeParser.js +84 -0
- package/dist/src/NodeParser/BinaryExpressionNodeParser.js.map +1 -0
- package/dist/src/NodeParser/CallExpressionParser.js +6 -0
- package/dist/src/NodeParser/CallExpressionParser.js.map +1 -1
- package/dist/src/NodeParser/ConditionalTypeNodeParser.d.ts +16 -0
- package/dist/src/NodeParser/ConditionalTypeNodeParser.js +22 -0
- package/dist/src/NodeParser/ConditionalTypeNodeParser.js.map +1 -1
- package/dist/src/NodeParser/FunctionNodeParser.js +1 -0
- package/dist/src/NodeParser/FunctionNodeParser.js.map +1 -1
- package/dist/src/NodeParser/IdentifierNodeParser.d.ts +3 -0
- package/dist/src/NodeParser/IdentifierNodeParser.js +3 -0
- package/dist/src/NodeParser/IdentifierNodeParser.js.map +1 -1
- package/dist/src/NodeParser/IndexedAccessTypeNodeParser.js +4 -1
- package/dist/src/NodeParser/IndexedAccessTypeNodeParser.js.map +1 -1
- package/dist/src/NodeParser/InterfaceAndClassNodeParser.d.ts +7 -0
- package/dist/src/NodeParser/InterfaceAndClassNodeParser.js +10 -0
- package/dist/src/NodeParser/InterfaceAndClassNodeParser.js.map +1 -1
- package/dist/src/NodeParser/IntersectionNodeParser.d.ts +4 -0
- package/dist/src/NodeParser/IntersectionNodeParser.js +8 -0
- package/dist/src/NodeParser/IntersectionNodeParser.js.map +1 -1
- package/dist/src/NodeParser/MappedTypeNodeParser.js +12 -5
- package/dist/src/NodeParser/MappedTypeNodeParser.js.map +1 -1
- package/dist/src/NodeParser/ObjectLiteralExpressionNodeParser.js +1 -0
- package/dist/src/NodeParser/ObjectLiteralExpressionNodeParser.js.map +1 -1
- package/dist/src/NodeParser/PrefixUnaryExpressionNodeParser.js +1 -0
- package/dist/src/NodeParser/PrefixUnaryExpressionNodeParser.js.map +1 -1
- package/dist/src/NodeParser/PromiseNodeParser.d.ts +3 -0
- package/dist/src/NodeParser/PromiseNodeParser.js +19 -1
- package/dist/src/NodeParser/PromiseNodeParser.js.map +1 -1
- package/dist/src/NodeParser/SpreadElementNodeParser.d.ts +4 -0
- package/dist/src/NodeParser/SpreadElementNodeParser.js +4 -0
- package/dist/src/NodeParser/SpreadElementNodeParser.js.map +1 -1
- package/dist/src/NodeParser/TypeLiteralNodeParser.js +5 -0
- package/dist/src/NodeParser/TypeLiteralNodeParser.js.map +1 -1
- package/dist/src/NodeParser/TypeOperatorNodeParser.js +1 -0
- package/dist/src/NodeParser/TypeOperatorNodeParser.js.map +1 -1
- package/dist/src/NodeParser/TypeReferenceNodeParser.js +6 -0
- package/dist/src/NodeParser/TypeReferenceNodeParser.js.map +1 -1
- package/dist/src/NodeParser/TypeofNodeParser.js +1 -0
- package/dist/src/NodeParser/TypeofNodeParser.js.map +1 -1
- package/dist/src/SchemaGenerator.js +28 -1
- package/dist/src/SchemaGenerator.js.map +1 -1
- package/dist/src/Type/AnnotatedType.d.ts +1 -3
- package/dist/src/Type/AnnotatedType.js.map +1 -1
- package/dist/src/Type/BaseType.d.ts +3 -0
- package/dist/src/Type/BaseType.js +3 -0
- package/dist/src/Type/BaseType.js.map +1 -1
- package/dist/src/Type/ObjectType.js +3 -1
- package/dist/src/Type/ObjectType.js.map +1 -1
- package/dist/src/Type/UnionType.d.ts +3 -0
- package/dist/src/Type/UnionType.js +3 -0
- package/dist/src/Type/UnionType.js.map +1 -1
- package/dist/src/Type/UnknownType.d.ts +11 -1
- package/dist/src/Type/UnknownType.js +8 -1
- package/dist/src/Type/UnknownType.js.map +1 -1
- package/dist/src/TypeFormatter/AnnotatedTypeFormatter.js +2 -1
- package/dist/src/TypeFormatter/AnnotatedTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/EnumTypeFormatter.d.ts +3 -0
- package/dist/src/TypeFormatter/EnumTypeFormatter.js +7 -0
- package/dist/src/TypeFormatter/EnumTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/IntersectionTypeFormatter.js +3 -0
- package/dist/src/TypeFormatter/IntersectionTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/LiteralUnionTypeFormatter.js +7 -0
- package/dist/src/TypeFormatter/LiteralUnionTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/ReferenceTypeFormatter.js +6 -0
- package/dist/src/TypeFormatter/ReferenceTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/TupleTypeFormatter.js +12 -5
- package/dist/src/TypeFormatter/TupleTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/UnionTypeFormatter.js +1 -0
- package/dist/src/TypeFormatter/UnionTypeFormatter.js.map +1 -1
- package/dist/src/Utils/allOfDefinition.js +5 -0
- package/dist/src/Utils/allOfDefinition.js.map +1 -1
- package/dist/src/Utils/deepMerge.d.ts +8 -0
- package/dist/src/Utils/deepMerge.js +9 -0
- package/dist/src/Utils/deepMerge.js.map +1 -1
- package/dist/src/Utils/derefType.d.ts +6 -0
- package/dist/src/Utils/derefType.js +6 -0
- package/dist/src/Utils/derefType.js.map +1 -1
- package/dist/src/Utils/intersectionOfArrays.js +1 -0
- package/dist/src/Utils/intersectionOfArrays.js.map +1 -1
- package/dist/src/Utils/isAssignableTo.d.ts +12 -0
- package/dist/src/Utils/isAssignableTo.js +54 -0
- package/dist/src/Utils/isAssignableTo.js.map +1 -1
- package/dist/src/Utils/modifiers.d.ts +19 -0
- package/dist/src/Utils/modifiers.js +19 -0
- package/dist/src/Utils/modifiers.js.map +1 -1
- package/dist/src/Utils/narrowType.d.ts +12 -0
- package/dist/src/Utils/narrowType.js +15 -0
- package/dist/src/Utils/narrowType.js.map +1 -1
- package/dist/src/Utils/nodeKey.d.ts +1 -1
- package/dist/src/Utils/nodeKey.js +7 -1
- package/dist/src/Utils/nodeKey.js.map +1 -1
- package/dist/src/Utils/preserveAnnotation.d.ts +6 -0
- package/dist/src/Utils/preserveAnnotation.js +6 -0
- package/dist/src/Utils/preserveAnnotation.js.map +1 -1
- package/dist/src/Utils/removeUndefined.d.ts +3 -0
- package/dist/src/Utils/removeUndefined.js +3 -0
- package/dist/src/Utils/removeUndefined.js.map +1 -1
- package/dist/src/Utils/removeUnreachable.js +1 -0
- package/dist/src/Utils/removeUnreachable.js.map +1 -1
- package/dist/src/Utils/symbolAtNode.js +1 -0
- package/dist/src/Utils/symbolAtNode.js.map +1 -1
- package/dist/src/Utils/typeKeys.js +1 -0
- package/dist/src/Utils/typeKeys.js.map +1 -1
- package/dist/ts-json-schema-generator.js +4 -0
- package/dist/ts-json-schema-generator.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/factory/parser.ts +2 -0
- package/factory/program.ts +8 -4
- package/package.json +28 -33
- package/src/Error/BaseError.ts +1 -3
- package/src/NodeParser/BinaryExpressionNodeParser.ts +99 -0
- package/src/NodeParser/IndexedAccessTypeNodeParser.ts +4 -1
- package/src/NodeParser/MappedTypeNodeParser.ts +12 -8
- package/src/SchemaGenerator.ts +18 -3
- package/src/Type/AnnotatedType.ts +1 -3
- package/src/Type/UnknownType.ts +1 -1
- package/src/TypeFormatter/AnnotatedTypeFormatter.ts +2 -2
- package/src/Utils/narrowType.ts +1 -6
- package/src/Utils/nodeKey.ts +3 -1
|
@@ -8,6 +8,9 @@ const NodeParser_js_1 = require("../NodeParser.js");
|
|
|
8
8
|
const AliasType_js_1 = require("../Type/AliasType.js");
|
|
9
9
|
const DefinitionType_js_1 = require("../Type/DefinitionType.js");
|
|
10
10
|
const nodeKey_js_1 = require("../Utils/nodeKey.js");
|
|
11
|
+
/**
|
|
12
|
+
* Needs to be registered before 261, 260, 230, 262 node kinds
|
|
13
|
+
*/
|
|
11
14
|
class PromiseNodeParser {
|
|
12
15
|
typeChecker;
|
|
13
16
|
childNodeParser;
|
|
@@ -16,20 +19,32 @@ class PromiseNodeParser {
|
|
|
16
19
|
this.childNodeParser = childNodeParser;
|
|
17
20
|
}
|
|
18
21
|
supportsNode(node) {
|
|
19
|
-
if (
|
|
22
|
+
if (
|
|
23
|
+
// 261 interface PromiseInterface extends Promise<T>
|
|
24
|
+
!typescript_1.default.isInterfaceDeclaration(node) &&
|
|
25
|
+
// 260 class PromiseClass implements Promise<T>
|
|
20
26
|
!typescript_1.default.isClassDeclaration(node) &&
|
|
27
|
+
// 230 Promise<T>
|
|
21
28
|
!typescript_1.default.isExpressionWithTypeArguments(node) &&
|
|
29
|
+
// 262 type PromiseAlias = Promise<T>;
|
|
22
30
|
!typescript_1.default.isTypeAliasDeclaration(node)) {
|
|
23
31
|
return false;
|
|
24
32
|
}
|
|
25
33
|
const type = this.typeChecker.getTypeAtLocation(node);
|
|
26
34
|
const awaitedType = this.typeChecker.getAwaitedType(type);
|
|
35
|
+
// ignores non awaitable types
|
|
27
36
|
if (!awaitedType) {
|
|
28
37
|
return false;
|
|
29
38
|
}
|
|
39
|
+
// If the awaited type differs from the original type, the type extends promise
|
|
40
|
+
// Awaited<Promise<T>> -> T (Promise<T> !== T)
|
|
41
|
+
// Awaited<Y> -> Y (Y === Y)
|
|
30
42
|
if (awaitedType === type) {
|
|
31
43
|
return false;
|
|
32
44
|
}
|
|
45
|
+
// In types like: A<T> = T, type C = A<1>, C has the same type as A<1> and 1,
|
|
46
|
+
// the awaitedType is NOT the same reference as the type, so a assignability
|
|
47
|
+
// check is needed
|
|
33
48
|
return (!this.typeChecker.isTypeAssignableTo(type, awaitedType) &&
|
|
34
49
|
!this.typeChecker.isTypeAssignableTo(awaitedType, type));
|
|
35
50
|
}
|
|
@@ -42,6 +57,9 @@ class PromiseNodeParser {
|
|
|
42
57
|
}
|
|
43
58
|
const baseNode = this.childNodeParser.createType(awaitedNode, new NodeParser_js_1.Context(node));
|
|
44
59
|
const name = this.getNodeName(node);
|
|
60
|
+
// Nodes without name should just be their awaited type
|
|
61
|
+
// export class extends Promise<T> {} -> T
|
|
62
|
+
// export class A extends Promise<T> {} -> A (ref to T)
|
|
45
63
|
if (!name) {
|
|
46
64
|
return baseNode;
|
|
47
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromiseNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/PromiseNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAC5B,kDAA4D;AAC5D,oDAA4D;AAE5D,uDAAiD;AAEjD,iEAA2D;AAC3D,oDAA6C;
|
|
1
|
+
{"version":3,"file":"PromiseNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/PromiseNodeParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,10 @@ import ts from "typescript";
|
|
|
2
2
|
import type { Context, NodeParser } from "../NodeParser.js";
|
|
3
3
|
import type { SubNodeParser } from "../SubNodeParser.js";
|
|
4
4
|
import { RestType } from "../Type/RestType.js";
|
|
5
|
+
/**
|
|
6
|
+
* Handles `...expr` inside an ArrayLiteralExpression.
|
|
7
|
+
* Turns it into RestType so TupleTypeFormatter can emit correct JSON-Schema.
|
|
8
|
+
*/
|
|
5
9
|
export declare class SpreadElementNodeParser implements SubNodeParser {
|
|
6
10
|
private readonly childNodeParser;
|
|
7
11
|
constructor(childNodeParser: NodeParser);
|
|
@@ -4,6 +4,10 @@ exports.SpreadElementNodeParser = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
6
|
const RestType_js_1 = require("../Type/RestType.js");
|
|
7
|
+
/**
|
|
8
|
+
* Handles `...expr` inside an ArrayLiteralExpression.
|
|
9
|
+
* Turns it into RestType so TupleTypeFormatter can emit correct JSON-Schema.
|
|
10
|
+
*/
|
|
7
11
|
class SpreadElementNodeParser {
|
|
8
12
|
childNodeParser;
|
|
9
13
|
constructor(childNodeParser) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpreadElementNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/SpreadElementNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAM5B,qDAA+C;
|
|
1
|
+
{"version":3,"file":"SpreadElementNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/SpreadElementNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAM5B,qDAA+C;AAE/C;;;GAGG;AACH,MAAa,uBAAuB;IACH;IAA7B,YAA6B,eAA2B;QAA3B,oBAAe,GAAf,eAAe,CAAY;IAAG,CAAC;IAE5D,YAAY,CAAC,IAAsB;QAC/B,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IACrD,CAAC;IAED,UAAU,CAAC,IAAsB,EAAE,OAAgB;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAsC,CAAC;QAE7G,OAAO,IAAI,sBAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACJ;AAZD,0DAYC"}
|
|
@@ -70,6 +70,11 @@ class TypeLiteralNodeParser {
|
|
|
70
70
|
return propertyName.getText();
|
|
71
71
|
}
|
|
72
72
|
catch {
|
|
73
|
+
// When propertyName was programmatically created, it doesn't have a source file.
|
|
74
|
+
// Then, getText() will throw an error. But, for programmatically created nodes,`
|
|
75
|
+
// `escapedText` or `text` is available.
|
|
76
|
+
// Only `text` will be available when propertyName contains strange characters and it cannot be escaped
|
|
77
|
+
// or if it is a number.
|
|
73
78
|
return propertyName.escapedText ?? propertyName.text;
|
|
74
79
|
}
|
|
75
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeLiteralNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeLiteralNodeParser.ts"],"names":[],"mappings":";;;;AACA,oEAA4B;AAI5B,uDAAiD;AACjD,yDAAmE;AAEnE,sDAAoD;AACpD,oDAA6C;AAE7C,MAAa,qBAAqB;IAEhB;IACA;IACS;IAHvB,YACc,WAA2B,EAC3B,eAA2B,EAClB,oBAA6B;QAFtC,gBAAW,GAAX,WAAW,CAAgB;QAC3B,oBAAe,GAAf,eAAe,CAAY;QAClB,yBAAoB,GAApB,oBAAoB,CAAS;IACjD,CAAC;IAEG,YAAY,CAAC,IAAwB;QACxC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC;IACnD,CAAC;IACM,UAAU,CAAC,IAAwB,EAAE,OAAgB,EAAE,SAAyB;QACnF,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAI,SAAS,EAAE,CAAC;YACZ,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACpB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAErD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,IAAI,wBAAS,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO,IAAI,0BAAU,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3F,CAAC;IAES,aAAa,CAAC,IAAwB,EAAE,OAAgB;QAC9D,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO;aAC1B,MAAM,CACH,CAAC,OAAO,EAAkD,EAAE,CACxD,oBAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,oBAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CACvE;aACA,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,IAAA,0BAAY,EAAC,YAAY,CAAC,CAAC;aACrD,GAAG,CACA,CAAC,YAAY,EAAE,EAAE,CACb,IAAI,8BAAc,CACd,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,EACvC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,IAAK,EAAE,OAAO,CAAC,EAC5D,CAAC,YAAY,CAAC,aAAa,CAC9B,CACR;aACA,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;gBACjD,gBAAgB,GAAG,IAAI,CAAC;YAC5B,CAAC;YACD,OAAO,CAAC,CAAC,IAAI,YAAY,wBAAS,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEP,IAAI,gBAAgB,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,uBAAuB,CAAC,IAAwB,EAAE,OAAgB;QACxE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAE,CAAC,2BAA2B,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,oBAAoB,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC;IACtG,CAAC;IAES,SAAS,CAAC,IAAa,EAAE,OAAgB;QAC/C,OAAO,aAAa,IAAA,mBAAM,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;IAChD,CAAC;IAES,eAAe,CAAC,YAA6B;QACnD,IAAI,YAAY,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;YAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAElE,IAAI,MAAM,EAAE,CAAC;gBACT,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;YAC5B,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACD,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"TypeLiteralNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeLiteralNodeParser.ts"],"names":[],"mappings":";;;;AACA,oEAA4B;AAI5B,uDAAiD;AACjD,yDAAmE;AAEnE,sDAAoD;AACpD,oDAA6C;AAE7C,MAAa,qBAAqB;IAEhB;IACA;IACS;IAHvB,YACc,WAA2B,EAC3B,eAA2B,EAClB,oBAA6B;QAFtC,gBAAW,GAAX,WAAW,CAAgB;QAC3B,oBAAe,GAAf,eAAe,CAAY;QAClB,yBAAoB,GAApB,oBAAoB,CAAS;IACjD,CAAC;IAEG,YAAY,CAAC,IAAwB;QACxC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC;IACnD,CAAC;IACM,UAAU,CAAC,IAAwB,EAAE,OAAgB,EAAE,SAAyB;QACnF,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAI,SAAS,EAAE,CAAC;YACZ,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACpB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAErD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,IAAI,wBAAS,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO,IAAI,0BAAU,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3F,CAAC;IAES,aAAa,CAAC,IAAwB,EAAE,OAAgB;QAC9D,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO;aAC1B,MAAM,CACH,CAAC,OAAO,EAAkD,EAAE,CACxD,oBAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,oBAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CACvE;aACA,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,IAAA,0BAAY,EAAC,YAAY,CAAC,CAAC;aACrD,GAAG,CACA,CAAC,YAAY,EAAE,EAAE,CACb,IAAI,8BAAc,CACd,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,EACvC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,IAAK,EAAE,OAAO,CAAC,EAC5D,CAAC,YAAY,CAAC,aAAa,CAC9B,CACR;aACA,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;gBACjD,gBAAgB,GAAG,IAAI,CAAC;YAC5B,CAAC;YACD,OAAO,CAAC,CAAC,IAAI,YAAY,wBAAS,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEP,IAAI,gBAAgB,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,uBAAuB,CAAC,IAAwB,EAAE,OAAgB;QACxE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAE,CAAC,2BAA2B,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,oBAAoB,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC;IACtG,CAAC;IAES,SAAS,CAAC,IAAa,EAAE,OAAgB;QAC/C,OAAO,aAAa,IAAA,mBAAM,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;IAChD,CAAC;IAES,eAAe,CAAC,YAA6B;QACnD,IAAI,YAAY,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;YAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAElE,IAAI,MAAM,EAAE,CAAC;gBACT,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;YAC5B,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACD,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACL,iFAAiF;YACjF,iFAAiF;YACjF,wCAAwC;YACxC,uGAAuG;YACvG,wBAAwB;YACxB,OAAS,YAA8B,CAAC,WAAsB,IAAK,YAAiC,CAAC,IAAI,CAAC;QAC9G,CAAC;IACL,CAAC;CACJ;AA3FD,sDA2FC"}
|
|
@@ -22,6 +22,7 @@ class TypeOperatorNodeParser {
|
|
|
22
22
|
createType(node, context) {
|
|
23
23
|
const type = this.childNodeParser.createType(node.type, context);
|
|
24
24
|
const derefed = (0, derefType_js_1.derefType)(type);
|
|
25
|
+
// Remove readonly modifier from type
|
|
25
26
|
if (node.operator === typescript_1.default.SyntaxKind.ReadonlyKeyword && derefed) {
|
|
26
27
|
return derefed;
|
|
27
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeOperatorNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeOperatorNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAG5B,uDAAiD;AACjD,qDAA+C;AAC/C,yDAAmD;AACnD,yDAAmD;AACnD,yDAAmD;AACnD,uDAAiD;AACjD,wDAAkD;AAClD,sDAAmD;AAEnD,MAAa,sBAAsB;IACF;IAA7B,YAA6B,eAA2B;QAA3B,oBAAe,GAAf,eAAe,CAAY;IAAG,CAAC;IAErD,YAAY,CAAC,IAAyB;QACzC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,YAAY,CAAC;IACpD,CAAC;IAEM,UAAU,CAAC,IAAyB,EAAE,OAAgB;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"TypeOperatorNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeOperatorNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAG5B,uDAAiD;AACjD,qDAA+C;AAC/C,yDAAmD;AACnD,yDAAmD;AACnD,yDAAmD;AACnD,uDAAiD;AACjD,wDAAkD;AAClD,sDAAmD;AAEnD,MAAa,sBAAsB;IACF;IAA7B,YAA6B,eAA2B;QAA3B,oBAAe,GAAf,eAAe,CAAY;IAAG,CAAC;IAErD,YAAY,CAAC,IAAyB;QACzC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,YAAY,CAAC;IACpD,CAAC;IAEM,UAAU,CAAC,IAAyB,EAAE,OAAgB;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,CAAC;QAChC,qCAAqC;QACrC,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAE,CAAC,UAAU,CAAC,eAAe,IAAI,OAAO,EAAE,CAAC;YAC7D,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,IAAI,OAAO,YAAY,wBAAS,EAAE,CAAC;YAC/B,OAAO,IAAI,0BAAU,EAAE,CAAC;QAC5B,CAAC;QACD,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,OAAO,YAAY,0BAAU,IAAI,OAAO,CAAC,uBAAuB,EAAE,YAAY,sBAAQ,EAAE,CAAC;YACzF,OAAO,IAAI,wBAAS,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,0BAAU,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,wBAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;CACJ;AA5BD,wDA4BC"}
|
|
@@ -26,11 +26,15 @@ class TypeReferenceNodeParser {
|
|
|
26
26
|
}
|
|
27
27
|
createType(node, context) {
|
|
28
28
|
const typeSymbol = this.typeChecker.getSymbolAtLocation(node.typeName) ??
|
|
29
|
+
// When the node doesn't have a valid source file, its position is -1, so we can't
|
|
30
|
+
// search for a symbol based on its location. In that case, the ts.factory defines a symbol
|
|
31
|
+
// property on the node itself.
|
|
29
32
|
(0, symbolAtNode_js_1.symbolAtNode)(node.typeName);
|
|
30
33
|
if (typeSymbol.flags & typescript_1.default.SymbolFlags.Alias) {
|
|
31
34
|
const aliasedSymbol = this.typeChecker.getAliasedSymbol(typeSymbol);
|
|
32
35
|
const declaration = aliasedSymbol.declarations?.filter((n) => !invalidTypes[n.kind])[0];
|
|
33
36
|
if (!declaration) {
|
|
37
|
+
// fallback for bun.sh
|
|
34
38
|
return new AnyType_js_1.AnyType();
|
|
35
39
|
}
|
|
36
40
|
return this.childNodeParser.createType(declaration, this.createSubContext(node, context));
|
|
@@ -38,7 +42,9 @@ class TypeReferenceNodeParser {
|
|
|
38
42
|
if (typeSymbol.flags & typescript_1.default.SymbolFlags.TypeParameter) {
|
|
39
43
|
return context.getArgument(typeSymbol.name) ?? new UnknownType_js_1.UnknownType(true);
|
|
40
44
|
}
|
|
45
|
+
// Wraps promise type to avoid resolving to a empty Object type.
|
|
41
46
|
if (typeSymbol.name === "Promise" || typeSymbol.name === "PromiseLike") {
|
|
47
|
+
// Promise without type resolves to Promise<any>
|
|
42
48
|
if (!node.typeArguments || node.typeArguments.length === 0) {
|
|
43
49
|
return new AnyType_js_1.AnyType();
|
|
44
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeReferenceNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeReferenceNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAC5B,oDAA4D;AAE5D,+DAAyD;AACzD,mDAA6C;AAC7C,uDAAiD;AAEjD,yDAAmD;AACnD,2DAAqD;AACrD,8DAAwD;AAExD,MAAM,YAAY,GAA4B;IAC1C,CAAC,oBAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,IAAI;IACvC,CAAC,oBAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,IAAI;CAC5C,CAAC;AAEF,MAAa,uBAAuB;IAElB;IACA;IAFd,YACc,WAA2B,EAC3B,eAA2B;QAD3B,gBAAW,GAAX,WAAW,CAAgB;QAC3B,oBAAe,GAAf,eAAe,CAAY;IACtC,CAAC;IAEG,YAAY,CAAC,IAA0B;QAC1C,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IACrD,CAAC;IAEM,UAAU,CAAC,IAA0B,EAAE,OAAgB;QAC1D,MAAM,UAAU,GACZ,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"TypeReferenceNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeReferenceNodeParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ class TypeofNodeParser {
|
|
|
27
27
|
const valueDec = symbol.valueDeclaration;
|
|
28
28
|
if (!valueDec) {
|
|
29
29
|
if (symbol.name === "globalThis") {
|
|
30
|
+
// avoids crashes on globalThis but we really shoulodn't try to make a schema for globalThis
|
|
30
31
|
return new NeverType_js_1.NeverType();
|
|
31
32
|
}
|
|
32
33
|
throw new Errors_js_1.LogicError(node, `No value declaration found for symbol "${symbol.name}"`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeofNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeofNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAI5B,yDAAmE;AAEnE,oDAA6C;AAC7C,2DAAqD;AACrD,uDAAiD;AACjD,6DAAuD;AACvD,kDAAgD;AAEhD,MAAa,gBAAgB;IAEX;IACA;IAFd,YACc,WAA2B,EAC3B,eAA2B;QAD3B,gBAAW,GAAX,WAAW,CAAgB;QAC3B,oBAAe,GAAf,eAAe,CAAY;IACtC,CAAC;IAEG,YAAY,CAAC,IAAsB;QACtC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC;IACjD,CAAC;IAEM,UAAU,CAAC,IAAsB,EAAE,OAAgB,EAAE,SAAyB;QACjF,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC;QAClE,IAAI,MAAM,CAAC,KAAK,GAAG,oBAAE,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"TypeofNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeofNodeParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
|
6
6
|
const Errors_js_1 = require("./Error/Errors.js");
|
|
7
7
|
const NodeParser_js_1 = require("./NodeParser.js");
|
|
8
8
|
const DefinitionType_js_1 = require("./Type/DefinitionType.js");
|
|
9
|
+
const AnnotatedType_js_1 = require("./Type/AnnotatedType.js");
|
|
9
10
|
const hasJsDocTag_js_1 = require("./Utils/hasJsDocTag.js");
|
|
10
11
|
const removeUnreachable_js_1 = require("./Utils/removeUnreachable.js");
|
|
11
12
|
const castArray_js_1 = require("./Utils/castArray.js");
|
|
@@ -50,6 +51,7 @@ class SchemaGenerator {
|
|
|
50
51
|
};
|
|
51
52
|
}
|
|
52
53
|
getRootNodes(fullNames) {
|
|
54
|
+
// ["*"] means generate everything.
|
|
53
55
|
if (fullNames && fullNames.includes("*") && fullNames.length > 1) {
|
|
54
56
|
throw new Error("Cannot mix '*' with specific type names");
|
|
55
57
|
}
|
|
@@ -100,14 +102,30 @@ class SchemaGenerator {
|
|
|
100
102
|
return false;
|
|
101
103
|
});
|
|
102
104
|
const ids = new Map();
|
|
105
|
+
const baseIds = new Map();
|
|
103
106
|
for (const child of children) {
|
|
104
107
|
const name = child.getName();
|
|
105
108
|
const previousId = ids.get(name);
|
|
109
|
+
// Strip def- prefixes from IDs. DefinitionType.getId() returns "def-{innerType.getId()}"
|
|
110
|
+
// and for generic types, nested DefinitionTypes also add def- prefixes. Stripping all
|
|
111
|
+
// of them normalizes the comparison for types that may be wrapped differently.
|
|
106
112
|
const childId = child.getId().replace(/def-/g, "");
|
|
113
|
+
// Also track the base type ID (without AnnotatedType wrapper) to handle cases where
|
|
114
|
+
// the same type appears with different annotations (e.g., a discriminated union type
|
|
115
|
+
// referenced directly vs from a property - one has @discriminator annotation, one doesn't)
|
|
116
|
+
const innerType = child.getType();
|
|
117
|
+
const baseChildId = (innerType instanceof AnnotatedType_js_1.AnnotatedType ? innerType.getType() : innerType).getId();
|
|
118
|
+
const previousBaseId = baseIds.get(name);
|
|
107
119
|
if (previousId && childId !== previousId) {
|
|
108
|
-
|
|
120
|
+
// Check if the base type (without annotations) matches - if so, it's just
|
|
121
|
+
// annotation differences, not truly different types
|
|
122
|
+
if (previousBaseId === baseChildId) {
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
throw new Errors_js_1.MultipleDefinitionsError(name, child, children.find((c) => c.getId().replace(/def-/g, "") === previousId));
|
|
109
126
|
}
|
|
110
127
|
ids.set(name, childId);
|
|
128
|
+
baseIds.set(name, baseChildId);
|
|
111
129
|
}
|
|
112
130
|
children.reduce((definitions, child) => {
|
|
113
131
|
const name = child.getName();
|
|
@@ -162,12 +180,14 @@ class SchemaGenerator {
|
|
|
162
180
|
if (symbol?.declarations?.length === 1) {
|
|
163
181
|
const declaration = symbol.declarations[0];
|
|
164
182
|
if (typescript_1.default.isImportSpecifier(declaration)) {
|
|
183
|
+
// Handling the `Foo` in `import { Foo } from "./lib"; export { Foo };`
|
|
165
184
|
const type = typeChecker.getTypeAtLocation(declaration);
|
|
166
185
|
if (type.symbol?.declarations?.length === 1) {
|
|
167
186
|
this.inspectNode(type.symbol.declarations[0], typeChecker, allTypes);
|
|
168
187
|
}
|
|
169
188
|
}
|
|
170
189
|
else {
|
|
190
|
+
// Handling the `Bar` in `export { Bar } from './lib';`
|
|
171
191
|
this.inspectNode(declaration, typeChecker, allTypes);
|
|
172
192
|
}
|
|
173
193
|
}
|
|
@@ -178,16 +198,21 @@ class SchemaGenerator {
|
|
|
178
198
|
return;
|
|
179
199
|
}
|
|
180
200
|
if (node.exportClause) {
|
|
201
|
+
// export { Foo } from './lib' or export { Foo };
|
|
202
|
+
// export * as Foo from './lib' should not import all exports
|
|
181
203
|
typescript_1.default.forEachChild(node.exportClause, (subnode) => this.inspectNode(subnode, typeChecker, allTypes));
|
|
182
204
|
return;
|
|
183
205
|
}
|
|
184
206
|
if (!node.moduleSpecifier) {
|
|
185
207
|
return;
|
|
186
208
|
}
|
|
209
|
+
// export * from './lib'
|
|
187
210
|
const symbol = typeChecker.getSymbolAtLocation(node.moduleSpecifier);
|
|
211
|
+
// should never hit this (maybe type error in user's code)
|
|
188
212
|
if (!symbol || !symbol.declarations) {
|
|
189
213
|
return;
|
|
190
214
|
}
|
|
215
|
+
// module augmentation can result in more than one source file
|
|
191
216
|
for (const source of symbol.declarations) {
|
|
192
217
|
const sourceSymbol = typeChecker.getSymbolAtLocation(source);
|
|
193
218
|
if (!sourceSymbol) {
|
|
@@ -197,6 +222,7 @@ class SchemaGenerator {
|
|
|
197
222
|
for (const moduleExport of moduleExports) {
|
|
198
223
|
const nodes = moduleExport.declarations ||
|
|
199
224
|
(!!moduleExport.valueDeclaration && [moduleExport.valueDeclaration]);
|
|
225
|
+
// should never hit this (maybe type error in user's code)
|
|
200
226
|
if (!nodes) {
|
|
201
227
|
return;
|
|
202
228
|
}
|
|
@@ -213,6 +239,7 @@ class SchemaGenerator {
|
|
|
213
239
|
if (this.config?.jsDoc !== "none" && (0, hasJsDocTag_js_1.hasJsDocTag)(node, "internal")) {
|
|
214
240
|
return false;
|
|
215
241
|
}
|
|
242
|
+
//@ts-expect-error - internal typescript API
|
|
216
243
|
return !!node.localSymbol?.exportSymbol;
|
|
217
244
|
}
|
|
218
245
|
isGenericType(node) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaGenerator.js","sourceRoot":"","sources":["../../src/SchemaGenerator.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAE5B,iDAA4F;AAC5F,mDAA2D;AAI3D,gEAA0D;AAG1D,2DAAqD;AACrD,uEAAiE;AACjE,uDAAiD;AACjD,6DAAuD;AAEvD,MAAa,eAAe;IAED;IACA;IACA;IACA;IAJvB,YACuB,OAAmB,EACnB,UAAsB,EACtB,aAA4B,EAC5B,MAAe;QAHf,YAAO,GAAP,OAAO,CAAY;QACnB,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAS;IACnC,CAAC;IAEG,YAAY,CAAC,SAA6B;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAA,wBAAS,EAAC,SAAS,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAEM,qBAAqB,CAAC,SAAoB;QAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACvC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,uBAAO,EAAE,CAAC;SAChE,CAAC,CAAC,CAAC;QAEJ,MAAM,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1G,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACjG,MAAM,WAAW,GAA0B,EAAE,CAAC;QAE9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC;gBACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAChE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,0BAAc,CAAC,IAAI,CACrB,wDAAwD,EACxD,IAAI,CAAC,QAAQ,EACb,KAAK,CACR,CAAC;YACN,CAAC;QACL,CAAC;QAED,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,MAAM,CACnD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,IAAA,wCAAiB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,EACrE,EAAE,CACL,CAAC;QAEF,OAAO;YACH,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,OAAO,EAAE,yCAAyC;YAClD,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;YAC7B,WAAW,EAAE,oBAAoB;SACpC,CAAC;IACN,CAAC;IAES,YAAY,CAAC,SAA+B;
|
|
1
|
+
{"version":3,"file":"SchemaGenerator.js","sourceRoot":"","sources":["../../src/SchemaGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotatedType.js","sourceRoot":"","sources":["../../../src/Type/AnnotatedType.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AACzC,oDAA2C;
|
|
1
|
+
{"version":3,"file":"AnnotatedType.js","sourceRoot":"","sources":["../../../src/Type/AnnotatedType.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AACzC,oDAA2C;AAI3C,MAAa,aAAc,SAAQ,sBAAQ;IAE3B;IACA;IACA;IAHZ,YACY,IAAc,EACd,WAAwB,EACxB,QAAiB;QAEzB,KAAK,EAAE,CAAC;QAJA,SAAI,GAAJ,IAAI,CAAU;QACd,gBAAW,GAAX,WAAW,CAAa;QACxB,aAAQ,GAAR,QAAQ,CAAS;IAG7B,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAA,iBAAI,EAAC,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3E,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACM,cAAc;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACM,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAtBD,sCAsBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseType.js","sourceRoot":"","sources":["../../../src/Type/BaseType.ts"],"names":[],"mappings":";;;AAAA,MAAsB,QAAQ;
|
|
1
|
+
{"version":3,"file":"BaseType.js","sourceRoot":"","sources":["../../../src/Type/BaseType.ts"],"names":[],"mappings":";;;AAAA,MAAsB,QAAQ;IAG1B;;OAEG;IACI,OAAO;QACV,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACJ;AATD,4BASC"}
|
|
@@ -29,7 +29,9 @@ class ObjectType extends BaseType_js_1.BaseType {
|
|
|
29
29
|
properties;
|
|
30
30
|
additionalProperties;
|
|
31
31
|
nonPrimitive;
|
|
32
|
-
constructor(id, baseTypes, properties, additionalProperties,
|
|
32
|
+
constructor(id, baseTypes, properties, additionalProperties,
|
|
33
|
+
// whether the object is `object`
|
|
34
|
+
nonPrimitive = false) {
|
|
33
35
|
super();
|
|
34
36
|
this.id = id;
|
|
35
37
|
this.baseTypes = baseTypes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../../src/Type/ObjectType.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AACzC,kDAA2C;AAE3C,MAAa,cAAc;IAEX;IACA;IACA;IAHZ,YACY,IAAY,EACZ,IAAc,EACd,QAAiB;QAFjB,SAAI,GAAJ,IAAI,CAAQ;QACZ,SAAI,GAAJ,IAAI,CAAU;QACd,aAAQ,GAAR,QAAQ,CAAS;IAC1B,CAAC;IAEG,OAAO;QACV,OAAO,IAAA,iBAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACM,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAhBD,wCAgBC;AAED,MAAa,UAAW,SAAQ,sBAAQ;IAExB;IACA;IACA;IACA;IAEA;IANZ,YACY,EAAU,EACV,SAA8B,EAC9B,UAAqC,EACrC,oBAAwC,
|
|
1
|
+
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../../src/Type/ObjectType.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AACzC,kDAA2C;AAE3C,MAAa,cAAc;IAEX;IACA;IACA;IAHZ,YACY,IAAY,EACZ,IAAc,EACd,QAAiB;QAFjB,SAAI,GAAJ,IAAI,CAAQ;QACZ,SAAI,GAAJ,IAAI,CAAU;QACd,aAAQ,GAAR,QAAQ,CAAS;IAC1B,CAAC;IAEG,OAAO;QACV,OAAO,IAAA,iBAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACM,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAhBD,wCAgBC;AAED,MAAa,UAAW,SAAQ,sBAAQ;IAExB;IACA;IACA;IACA;IAEA;IANZ,YACY,EAAU,EACV,SAA8B,EAC9B,UAAqC,EACrC,oBAAwC;IAChD,iCAAiC;IACzB,eAAwB,KAAK;QAErC,KAAK,EAAE,CAAC;QAPA,OAAE,GAAF,EAAE,CAAQ;QACV,cAAS,GAAT,SAAS,CAAqB;QAC9B,eAAU,GAAV,UAAU,CAA2B;QACrC,yBAAoB,GAApB,oBAAoB,CAAoB;QAExC,iBAAY,GAAZ,YAAY,CAAiB;IAGzC,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,aAAa;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACM,uBAAuB;QAC1B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IACM,eAAe;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ;AA5BD,gCA4BC"}
|
|
@@ -52,6 +52,9 @@ class UnionType extends BaseType_js_1.BaseType {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
+
/**
|
|
56
|
+
* Get the types in this union as a flat list.
|
|
57
|
+
*/
|
|
55
58
|
getFlattenedTypes(deref = derefType_js_1.derefAliasedType) {
|
|
56
59
|
return this.getTypes()
|
|
57
60
|
.filter((t) => !(0, derefType_js_1.isHiddenType)(t))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../../src/Type/UnionType.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AACzC,oEAA8D;AAC9D,iDAA2C;AAC3C,wDAAkF;AAElF,MAAa,SAAU,SAAQ,sBAAQ;IAClB,KAAK,CAAa;IAC3B,aAAa,GAAY,SAAS,CAAC;IAE3C,YAAmB,KAA0B;QACzC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,IAAA,oCAAe,EACxB,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;YAC7B,IAAI,IAAI,YAAY,SAAS,EAAE,CAAC;gBAC5B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvC,CAAC;iBAAM,IAAI,CAAC,CAAC,IAAI,YAAY,wBAAS,CAAC,EAAE,CAAC;gBACtC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC,EAAE,EAAgB,CAAC,CACvB,CAAC;IACN,CAAC;IAEM,gBAAgB,CAAC,aAAqB;QACzC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACnE,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACrE,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAEM,SAAS;QACZ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,wBAAS,EAAE,CAAC;QAC3B,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAA,wBAAS,EAAC,IAAI,CAAC,YAAY,wBAAS,CAAC,CAAC,CAAC,CAAC;YAElG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACJ,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;YAC7B,CAAC;QACL,CAAC;IACL,CAAC;
|
|
1
|
+
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../../src/Type/UnionType.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AACzC,oEAA8D;AAC9D,iDAA2C;AAC3C,wDAAkF;AAElF,MAAa,SAAU,SAAQ,sBAAQ;IAClB,KAAK,CAAa;IAC3B,aAAa,GAAY,SAAS,CAAC;IAE3C,YAAmB,KAA0B;QACzC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,IAAA,oCAAe,EACxB,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;YAC7B,IAAI,IAAI,YAAY,SAAS,EAAE,CAAC;gBAC5B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvC,CAAC;iBAAM,IAAI,CAAC,CAAC,IAAI,YAAY,wBAAS,CAAC,EAAE,CAAC;gBACtC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC,EAAE,EAAgB,CAAC,CACvB,CAAC;IACN,CAAC;IAEM,gBAAgB,CAAC,aAAqB;QACzC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACnE,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACrE,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAEM,SAAS;QACZ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,wBAAS,EAAE,CAAC;QAC3B,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAA,wBAAS,EAAC,IAAI,CAAC,YAAY,wBAAS,CAAC,CAAC,CAAC,CAAC;YAElG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACJ,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;YAC7B,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,QAAsC,+BAAgB;QAC3E,OAAO,IAAI,CAAC,QAAQ,EAAE;aACjB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,2BAAY,EAAC,CAAC,CAAC,CAAC;aAC/B,GAAG,CAAC,KAAK,CAAC;aACV,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;gBACzB,OAAO,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;IACX,CAAC;CACJ;AApED,8BAoEC"}
|
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
import { BaseType } from "./BaseType.js";
|
|
2
2
|
export declare class UnknownType extends BaseType {
|
|
3
|
+
/**
|
|
4
|
+
* If the source for this UnknownType was from a failed operation than to an actual `unknown` type present in the source code.
|
|
5
|
+
*/
|
|
3
6
|
readonly erroredSource: boolean;
|
|
4
|
-
constructor(
|
|
7
|
+
constructor(
|
|
8
|
+
/**
|
|
9
|
+
* If the source for this UnknownType was from a failed operation than to an actual `unknown` type present in the source code.
|
|
10
|
+
*/
|
|
11
|
+
erroredSource?: boolean);
|
|
5
12
|
getId(): string;
|
|
6
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Checks for an UnknownType with an errored source.
|
|
16
|
+
*/
|
|
7
17
|
export declare function isErroredUnknownType(type: BaseType): type is UnknownType;
|
|
@@ -5,7 +5,11 @@ exports.isErroredUnknownType = isErroredUnknownType;
|
|
|
5
5
|
const BaseType_js_1 = require("./BaseType.js");
|
|
6
6
|
class UnknownType extends BaseType_js_1.BaseType {
|
|
7
7
|
erroredSource;
|
|
8
|
-
constructor(
|
|
8
|
+
constructor(
|
|
9
|
+
/**
|
|
10
|
+
* If the source for this UnknownType was from a failed operation than to an actual `unknown` type present in the source code.
|
|
11
|
+
*/
|
|
12
|
+
erroredSource = false) {
|
|
9
13
|
super();
|
|
10
14
|
this.erroredSource = erroredSource;
|
|
11
15
|
}
|
|
@@ -14,6 +18,9 @@ class UnknownType extends BaseType_js_1.BaseType {
|
|
|
14
18
|
}
|
|
15
19
|
}
|
|
16
20
|
exports.UnknownType = UnknownType;
|
|
21
|
+
/**
|
|
22
|
+
* Checks for an UnknownType with an errored source.
|
|
23
|
+
*/
|
|
17
24
|
function isErroredUnknownType(type) {
|
|
18
25
|
return type instanceof UnknownType && type.erroredSource;
|
|
19
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnknownType.js","sourceRoot":"","sources":["../../../src/Type/UnknownType.ts"],"names":[],"mappings":";;;AAoBA,oDAEC;AAtBD,+CAAyC;AAEzC,MAAa,WAAY,SAAQ,sBAAQ;IAKxB;IAJb,
|
|
1
|
+
{"version":3,"file":"UnknownType.js","sourceRoot":"","sources":["../../../src/Type/UnknownType.ts"],"names":[],"mappings":";;;AAoBA,oDAEC;AAtBD,+CAAyC;AAEzC,MAAa,WAAY,SAAQ,sBAAQ;IAKxB;IAJb;IACI;;OAEG;IACM,gBAAgB,KAAK;QAE9B,KAAK,EAAE,CAAC;QAFC,kBAAa,GAAb,aAAa,CAAQ;IAGlC,CAAC;IAEM,KAAK;QACR,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAbD,kCAaC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,IAAc;IAC/C,OAAO,IAAI,YAAY,WAAW,IAAI,IAAI,CAAC,aAAa,CAAC;AAC7D,CAAC"}
|
|
@@ -7,7 +7,7 @@ const AnnotatedType_js_1 = require("../Type/AnnotatedType.js");
|
|
|
7
7
|
const UnionType_js_1 = require("../Type/UnionType.js");
|
|
8
8
|
const derefType_js_1 = require("../Utils/derefType.js");
|
|
9
9
|
function makeNullable(def) {
|
|
10
|
-
const union = def.oneOf || def.anyOf;
|
|
10
|
+
const union = (def.oneOf || def.anyOf);
|
|
11
11
|
if (union && union.filter((d) => d.type === "null").length === 0) {
|
|
12
12
|
union.push({ type: "null" });
|
|
13
13
|
}
|
|
@@ -20,6 +20,7 @@ function makeNullable(def) {
|
|
|
20
20
|
else if (def.type !== "null") {
|
|
21
21
|
def.type = [def.type, "null"];
|
|
22
22
|
}
|
|
23
|
+
// enums need null as an option
|
|
23
24
|
if (def.enum && def.enum.indexOf(null) === -1) {
|
|
24
25
|
def.enum.push(null);
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotatedTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/AnnotatedTypeFormatter.ts"],"names":[],"mappings":";;;AASA,oCAqCC;AA9CD,kDAAmD;AAGnD,+DAAyD;AAEzD,uDAAiD;AAEjD,wDAAkD;AAElD,SAAgB,YAAY,CAAC,GAAe;IACxC,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"AnnotatedTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/AnnotatedTypeFormatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,4 +8,7 @@ export declare class EnumTypeFormatter implements SubTypeFormatter {
|
|
|
8
8
|
getDefinition(type: EnumType): Definition;
|
|
9
9
|
getChildren(type: EnumType): BaseType[];
|
|
10
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* Unwraps the array if it contains only one type.
|
|
13
|
+
*/
|
|
11
14
|
export declare function toEnumType(types: JSONSchema7TypeName[]): JSONSchema7TypeName | JSONSchema7TypeName[];
|
|
@@ -12,6 +12,10 @@ class EnumTypeFormatter {
|
|
|
12
12
|
getDefinition(type) {
|
|
13
13
|
const values = (0, uniqueArray_js_1.uniqueArray)(type.getValues());
|
|
14
14
|
const types = (0, uniqueArray_js_1.uniqueArray)(values.map(typeName_js_1.typeName));
|
|
15
|
+
// NOTE: We want to use "const" when referencing an enum member.
|
|
16
|
+
// However, this formatter is used both for enum members and enum types,
|
|
17
|
+
// so the side effect is that an enum type that contains just a single
|
|
18
|
+
// value is represented as "const" too.
|
|
15
19
|
return values.length === 1 ? { type: types[0], const: values[0] } : { type: toEnumType(types), enum: values };
|
|
16
20
|
}
|
|
17
21
|
getChildren(type) {
|
|
@@ -19,6 +23,9 @@ class EnumTypeFormatter {
|
|
|
19
23
|
}
|
|
20
24
|
}
|
|
21
25
|
exports.EnumTypeFormatter = EnumTypeFormatter;
|
|
26
|
+
/**
|
|
27
|
+
* Unwraps the array if it contains only one type.
|
|
28
|
+
*/
|
|
22
29
|
function toEnumType(types) {
|
|
23
30
|
if (types.length === 1) {
|
|
24
31
|
return types[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnumTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/EnumTypeFormatter.ts"],"names":[],"mappings":";;;AA8BA,gCAMC;AAhCD,qDAA+C;AAC/C,sDAAgD;AAChD,4DAAsD;AAEtD,MAAa,iBAAiB;IACnB,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,sBAAQ,CAAC;IACpC,CAAC;IACM,aAAa,CAAC,IAAc;QAC/B,MAAM,MAAM,GAAG,IAAA,4BAAW,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAA,4BAAW,EAAC,MAAM,CAAC,GAAG,CAAC,sBAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"EnumTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/EnumTypeFormatter.ts"],"names":[],"mappings":";;;AA8BA,gCAMC;AAhCD,qDAA+C;AAC/C,sDAAgD;AAChD,4DAAsD;AAEtD,MAAa,iBAAiB;IACnB,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,sBAAQ,CAAC;IACpC,CAAC;IACM,aAAa,CAAC,IAAc;QAC/B,MAAM,MAAM,GAAG,IAAA,4BAAW,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAA,4BAAW,EAAC,MAAM,CAAC,GAAG,CAAC,sBAAQ,CAAC,CAAC,CAAC;QAEhD,gEAAgE;QAChE,wEAAwE;QACxE,sEAAsE;QACtE,uCAAuC;QACvC,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAClH,CAAC;IACM,WAAW,CAAC,IAAc;QAC7B,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAjBD,8CAiBC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,KAA4B;IACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -18,6 +18,8 @@ class IntersectionTypeFormatter {
|
|
|
18
18
|
const dependencies = [];
|
|
19
19
|
const nonArrayLikeTypes = [];
|
|
20
20
|
for (const t of type.getTypes()) {
|
|
21
|
+
// Filter out Array like definitions that cannot be
|
|
22
|
+
// easily mergeable into a single json-schema object
|
|
21
23
|
if (t instanceof ArrayType_js_1.ArrayType || t instanceof TupleType_js_1.TupleType) {
|
|
22
24
|
dependencies.push(this.childTypeFormatter.getDefinition(t));
|
|
23
25
|
}
|
|
@@ -26,6 +28,7 @@ class IntersectionTypeFormatter {
|
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
30
|
if (nonArrayLikeTypes.length) {
|
|
31
|
+
// There are non array (mergeable requirements)
|
|
29
32
|
dependencies.push(nonArrayLikeTypes.reduce((0, allOfDefinition_js_1.getAllOfDefinitionReducer)(this.childTypeFormatter), {
|
|
30
33
|
type: "object",
|
|
31
34
|
additionalProperties: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IntersectionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/IntersectionTypeFormatter.ts"],"names":[],"mappings":";;;AAEA,uDAAiD;AAEjD,qEAA+D;AAC/D,uDAAiD;AAEjD,oEAAwE;AACxE,4DAAsD;AAEtD,MAAa,yBAAyB;IACL;IAA7B,YAA6B,kBAAiC;QAAjC,uBAAkB,GAAlB,kBAAkB,CAAe;IAAG,CAAC;IAE3D,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,sCAAgB,CAAC;IAC5C,CAAC;IAEM,aAAa,CAAC,IAAsB;QACvC,MAAM,YAAY,GAAiB,EAAE,CAAC;QACtC,MAAM,iBAAiB,GAAe,EAAE,CAAC;QAEzC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"IntersectionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/IntersectionTypeFormatter.ts"],"names":[],"mappings":";;;AAEA,uDAAiD;AAEjD,qEAA+D;AAC/D,uDAAiD;AAEjD,oEAAwE;AACxE,4DAAsD;AAEtD,MAAa,yBAAyB;IACL;IAA7B,YAA6B,kBAAiC;QAAjC,uBAAkB,GAAlB,kBAAkB,CAAe;IAAG,CAAC;IAE3D,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,sCAAgB,CAAC;IAC5C,CAAC;IAEM,aAAa,CAAC,IAAsB;QACvC,MAAM,YAAY,GAAiB,EAAE,CAAC;QACtC,MAAM,iBAAiB,GAAe,EAAE,CAAC;QAEzC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC9B,mDAAmD;YACnD,oDAAoD;YACpD,IAAI,CAAC,YAAY,wBAAS,IAAI,CAAC,YAAY,wBAAS,EAAE,CAAC;gBACnD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,CAAC;iBAAM,CAAC;gBACJ,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QAED,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;YAC3B,+CAA+C;YAC/C,YAAY,CAAC,IAAI,CACb,iBAAiB,CAAC,MAAM,CAAC,IAAA,8CAAyB,EAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBACzE,IAAI,EAAE,QAAQ;gBACd,oBAAoB,EAAE,KAAK;aAC9B,CAAC,CACL,CAAC;QACN,CAAC;QAED,OAAO,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IACjF,CAAC;IAEM,WAAW,CAAC,IAAsB;QACrC,OAAO,IAAA,4BAAW,EACd,IAAI;aACC,QAAQ,EAAE;aACV,MAAM,CAAC,CAAC,MAAkB,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAC3G,CAAC;IACN,CAAC;CACJ;AAzCD,8DAyCC"}
|