ts-json-schema-generator 2.4.1-next.1 → 2.5.0--canary.2413.011011e.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/README.md +22 -21
- package/dist/factory/generator.js +1 -1
- package/dist/factory/generator.js.map +1 -1
- package/dist/factory/parser.js +13 -2
- package/dist/factory/parser.js.map +1 -1
- package/dist/factory/program.js +5 -2
- package/dist/factory/program.js.map +1 -1
- package/dist/package.json +31 -31
- package/dist/src/AnnotationsReader/ExtendedAnnotationsReader.d.ts +2 -1
- package/dist/src/AnnotationsReader/ExtendedAnnotationsReader.js +22 -10
- package/dist/src/AnnotationsReader/ExtendedAnnotationsReader.js.map +1 -1
- package/dist/src/Config.d.ts +5 -2
- package/dist/src/Config.js +1 -0
- package/dist/src/Config.js.map +1 -1
- package/dist/src/Error/BaseError.d.ts +1 -1
- package/dist/src/Error/BaseError.js +1 -2
- package/dist/src/Error/BaseError.js.map +1 -1
- package/dist/src/NodeParser/BinaryExpressionNodeParser.d.ts +13 -0
- package/dist/src/NodeParser/BinaryExpressionNodeParser.js +79 -0
- package/dist/src/NodeParser/BinaryExpressionNodeParser.js.map +1 -0
- package/dist/src/NodeParser/IdentifierNodeParser.d.ts +11 -0
- package/dist/src/NodeParser/IdentifierNodeParser.js +33 -0
- package/dist/src/NodeParser/IdentifierNodeParser.js.map +1 -0
- package/dist/src/NodeParser/MappedTypeNodeParser.js +1 -1
- package/dist/src/NodeParser/MappedTypeNodeParser.js.map +1 -1
- package/dist/src/NodeParser/NewExpressionParser.d.ts +13 -0
- package/dist/src/NodeParser/NewExpressionParser.js +41 -0
- package/dist/src/NodeParser/NewExpressionParser.js.map +1 -0
- package/dist/src/NodeParser/SpreadElementNodeParser.d.ts +10 -0
- package/dist/src/NodeParser/SpreadElementNodeParser.js +21 -0
- package/dist/src/NodeParser/SpreadElementNodeParser.js.map +1 -0
- package/dist/src/NodeParser/TypeOperatorNodeParser.d.ts +1 -1
- package/dist/src/NodeParser/TypeOperatorNodeParser.js +2 -1
- package/dist/src/NodeParser/TypeOperatorNodeParser.js.map +1 -1
- package/dist/src/NodeParser/TypeReferenceNodeParser.js +1 -1
- package/dist/src/NodeParser/TypeReferenceNodeParser.js.map +1 -1
- package/dist/src/SchemaGenerator.d.ts +2 -2
- package/dist/src/SchemaGenerator.js +17 -7
- 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/UnknownType.d.ts +1 -1
- package/dist/src/Type/UnknownType.js +1 -1
- package/dist/src/Type/UnknownType.js.map +1 -1
- package/dist/src/TypeFormatter/AnnotatedTypeFormatter.js +1 -1
- package/dist/src/TypeFormatter/AnnotatedTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/LiteralUnionTypeFormatter.js +10 -5
- package/dist/src/TypeFormatter/LiteralUnionTypeFormatter.js.map +1 -1
- package/dist/src/TypeFormatter/PrimitiveUnionTypeFormatter.js +6 -2
- package/dist/src/TypeFormatter/PrimitiveUnionTypeFormatter.js.map +1 -1
- package/dist/src/Utils/castArray.d.ts +1 -0
- package/dist/src/Utils/castArray.js +10 -0
- package/dist/src/Utils/castArray.js.map +1 -0
- package/dist/src/Utils/getFullDescription.d.ts +2 -0
- package/dist/src/Utils/getFullDescription.js +33 -0
- package/dist/src/Utils/getFullDescription.js.map +1 -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.map +1 -1
- package/dist/ts-json-schema-generator.js +7 -3
- package/dist/ts-json-schema-generator.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/factory/generator.ts +1 -1
- package/factory/parser.ts +19 -2
- package/factory/program.ts +7 -3
- package/package.json +31 -31
- package/src/AnnotationsReader/ExtendedAnnotationsReader.ts +25 -10
- package/src/Config.ts +124 -2
- package/src/Error/BaseError.ts +1 -3
- package/src/NodeParser/BinaryExpressionNodeParser.ts +99 -0
- package/src/NodeParser/IdentifierNodeParser.ts +38 -0
- package/src/NodeParser/MappedTypeNodeParser.ts +1 -1
- package/src/NodeParser/NewExpressionParser.ts +46 -0
- package/src/NodeParser/SpreadElementNodeParser.ts +25 -0
- package/src/NodeParser/TypeOperatorNodeParser.ts +2 -2
- package/src/NodeParser/TypeReferenceNodeParser.ts +1 -1
- package/src/SchemaGenerator.ts +26 -9
- package/src/Type/AnnotatedType.ts +1 -3
- package/src/Type/UnknownType.ts +1 -1
- package/src/TypeFormatter/AnnotatedTypeFormatter.ts +2 -2
- package/src/TypeFormatter/LiteralUnionTypeFormatter.ts +12 -6
- package/src/TypeFormatter/PrimitiveUnionTypeFormatter.ts +9 -2
- package/src/Utils/castArray.ts +7 -0
- package/src/Utils/getFullDescription.ts +39 -0
- package/src/Utils/narrowType.ts +1 -6
- package/src/Utils/nodeKey.ts +3 -1
- package/ts-json-schema-generator.ts +12 -3
|
@@ -48,7 +48,7 @@ class MappedTypeNodeParser {
|
|
|
48
48
|
const type = this.childNodeParser.createType(node.type, this.createSubContext(node, keyListType, context));
|
|
49
49
|
return type instanceof NeverType_js_1.NeverType ? new NeverType_js_1.NeverType() : new ArrayType_js_1.ArrayType(type);
|
|
50
50
|
}
|
|
51
|
-
const type = this.childNodeParser.createType(node.type, context);
|
|
51
|
+
const type = this.childNodeParser.createType(node.type, this.createSubContext(node, keyListType, context));
|
|
52
52
|
const resultType = new ObjectType_js_1.ObjectType(id, [], [], type);
|
|
53
53
|
if (resultType) {
|
|
54
54
|
let annotations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MappedTypeNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/MappedTypeNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAC5B,kDAA4D;AAE5D,oDAA2C;AAE3C,+DAAyD;AACzD,uDAAiD;AAEjD,iEAA2D;AAE3D,qDAA+C;AAC/C,2DAAqD;AACrD,uDAAiD;AACjD,yDAAmD;AACnD,yDAAmE;AACnE,yDAAmD;AACnD,yDAAmD;AACnD,uDAAiD;AACjD,wDAA0F;AAC1F,oDAA6C;AAC7C,0EAAoE;AACpE,oEAA8D;AAC9D,oEAA8D;AAE9D,MAAa,oBAAoB;IAEf;IACS;IAFvB,YACc,eAA2B,EAClB,oBAA6B;QADtC,oBAAe,GAAf,eAAe,CAAY;QAClB,yBAAoB,GAApB,oBAAoB,CAAS;IACjD,CAAC;IAEG,YAAY,CAAC,IAAuB;QACvC,OAAO,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAClD,CAAC;IAEM,UAAU,CAAC,IAAuB,EAAE,OAAgB;QACvD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,UAAW,EAAE,OAAO,CAAC,CAAC;QAChG,MAAM,WAAW,GAAG,IAAA,wBAAS,EAAC,cAAc,CAAC,CAAC;QAC9C,MAAM,EAAE,GAAG,gBAAgB,IAAA,mBAAM,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAEnD,IAAI,WAAW,YAAY,wBAAS,EAAE,CAAC;YAEnC,OAAO,IAAI,0BAAU,CACjB,EAAE,EACF,EAAE,EACF,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAC9C,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAC3D,CAAC;QACN,CAAC;QAED,IAAI,WAAW,YAAY,4BAAW,EAAE,CAAC;YAErC,OAAO,IAAI,0BAAU,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,wBAAS,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1G,CAAC;QAED,IACI,WAAW,YAAY,0BAAU;YACjC,WAAW,YAAY,0BAAU;YACjC,WAAW,YAAY,0BAAU,EACnC,CAAC;YACC,IAAI,cAAc,EAAE,KAAK,EAAE,KAAK,QAAQ,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CACxC,IAAI,CAAC,IAAK,EACV,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CACpD,CAAC;gBACF,OAAO,IAAI,YAAY,wBAAS,CAAC,CAAC,CAAC,IAAI,wBAAS,EAAE,CAAC,CAAC,CAAC,IAAI,wBAAS,CAAC,IAAI,CAAC,CAAC;YAC7E,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAK,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MappedTypeNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/MappedTypeNodeParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
import type { NodeParser } from "../NodeParser.js";
|
|
3
|
+
import { Context } from "../NodeParser.js";
|
|
4
|
+
import type { SubNodeParser } from "../SubNodeParser.js";
|
|
5
|
+
import type { BaseType } from "../Type/BaseType.js";
|
|
6
|
+
export declare class NewExpressionParser implements SubNodeParser {
|
|
7
|
+
protected typeChecker: ts.TypeChecker;
|
|
8
|
+
protected childNodeParser: NodeParser;
|
|
9
|
+
constructor(typeChecker: ts.TypeChecker, childNodeParser: NodeParser);
|
|
10
|
+
supportsNode(node: ts.NewExpression): boolean;
|
|
11
|
+
createType(node: ts.NewExpression, context: Context): BaseType;
|
|
12
|
+
protected createSubContext(node: ts.NewExpression, parentContext: Context): Context;
|
|
13
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NewExpressionParser = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
|
+
const NodeParser_js_1 = require("../NodeParser.js");
|
|
7
|
+
const Errors_js_1 = require("../Error/Errors.js");
|
|
8
|
+
class NewExpressionParser {
|
|
9
|
+
typeChecker;
|
|
10
|
+
childNodeParser;
|
|
11
|
+
constructor(typeChecker, childNodeParser) {
|
|
12
|
+
this.typeChecker = typeChecker;
|
|
13
|
+
this.childNodeParser = childNodeParser;
|
|
14
|
+
}
|
|
15
|
+
supportsNode(node) {
|
|
16
|
+
return node.kind === typescript_1.default.SyntaxKind.NewExpression;
|
|
17
|
+
}
|
|
18
|
+
createType(node, context) {
|
|
19
|
+
const type = this.typeChecker.getTypeAtLocation(node);
|
|
20
|
+
const symbol = type.symbol || type.aliasSymbol;
|
|
21
|
+
const decl = this.typeChecker.typeToTypeNode(type, node, typescript_1.default.NodeBuilderFlags.IgnoreErrors) ||
|
|
22
|
+
symbol?.valueDeclaration ||
|
|
23
|
+
symbol?.declarations?.[0];
|
|
24
|
+
if (!decl) {
|
|
25
|
+
throw new Errors_js_1.UnknownNodeError(node);
|
|
26
|
+
}
|
|
27
|
+
return this.childNodeParser.createType(decl, this.createSubContext(node, context));
|
|
28
|
+
}
|
|
29
|
+
createSubContext(node, parentContext) {
|
|
30
|
+
const subContext = new NodeParser_js_1.Context(node);
|
|
31
|
+
if (node.arguments) {
|
|
32
|
+
for (const arg of node.arguments) {
|
|
33
|
+
const type = this.childNodeParser.createType(arg, parentContext);
|
|
34
|
+
subContext.pushArgument(type);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return subContext;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
exports.NewExpressionParser = NewExpressionParser;
|
|
41
|
+
//# sourceMappingURL=NewExpressionParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NewExpressionParser.js","sourceRoot":"","sources":["../../../src/NodeParser/NewExpressionParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAE5B,oDAA2C;AAG3C,kDAAsD;AAEtD,MAAa,mBAAmB;IAEd;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,aAAa,CAAC;IACrD,CAAC;IAEM,UAAU,CAAC,IAAsB,EAAE,OAAgB;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC;QAE/C,MAAM,IAAI,GACN,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,oBAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC7E,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,4BAAgB,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACvF,CAAC;IAES,gBAAgB,CAAC,IAAsB,EAAE,aAAsB;QACrE,MAAM,UAAU,GAAG,IAAI,uBAAO,CAAC,IAAI,CAAC,CAAC;QAErC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;gBACjE,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AAtCD,kDAsCC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
import type { Context, NodeParser } from "../NodeParser.js";
|
|
3
|
+
import type { SubNodeParser } from "../SubNodeParser.js";
|
|
4
|
+
import { RestType } from "../Type/RestType.js";
|
|
5
|
+
export declare class SpreadElementNodeParser implements SubNodeParser {
|
|
6
|
+
private readonly childNodeParser;
|
|
7
|
+
constructor(childNodeParser: NodeParser);
|
|
8
|
+
supportsNode(node: ts.SpreadElement): boolean;
|
|
9
|
+
createType(node: ts.SpreadElement, context: Context): RestType;
|
|
10
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SpreadElementNodeParser = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
|
+
const RestType_js_1 = require("../Type/RestType.js");
|
|
7
|
+
class SpreadElementNodeParser {
|
|
8
|
+
childNodeParser;
|
|
9
|
+
constructor(childNodeParser) {
|
|
10
|
+
this.childNodeParser = childNodeParser;
|
|
11
|
+
}
|
|
12
|
+
supportsNode(node) {
|
|
13
|
+
return node.kind === typescript_1.default.SyntaxKind.SpreadElement;
|
|
14
|
+
}
|
|
15
|
+
createType(node, context) {
|
|
16
|
+
const inner = this.childNodeParser.createType(node.expression, context);
|
|
17
|
+
return new RestType_js_1.RestType(inner);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
exports.SpreadElementNodeParser = SpreadElementNodeParser;
|
|
21
|
+
//# sourceMappingURL=SpreadElementNodeParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SpreadElementNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/SpreadElementNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAM5B,qDAA+C;AAM/C,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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import type { Context, NodeParser } from "../NodeParser.js";
|
|
3
3
|
import type { SubNodeParser } from "../SubNodeParser.js";
|
|
4
|
-
import
|
|
4
|
+
import { BaseType } from "../Type/BaseType.js";
|
|
5
5
|
export declare class TypeOperatorNodeParser implements SubNodeParser {
|
|
6
6
|
protected childNodeParser: NodeParser;
|
|
7
7
|
constructor(childNodeParser: NodeParser);
|
|
@@ -4,6 +4,7 @@ exports.TypeOperatorNodeParser = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
6
|
const ArrayType_js_1 = require("../Type/ArrayType.js");
|
|
7
|
+
const BaseType_js_1 = require("../Type/BaseType.js");
|
|
7
8
|
const NumberType_js_1 = require("../Type/NumberType.js");
|
|
8
9
|
const ObjectType_js_1 = require("../Type/ObjectType.js");
|
|
9
10
|
const StringType_js_1 = require("../Type/StringType.js");
|
|
@@ -28,7 +29,7 @@ class TypeOperatorNodeParser {
|
|
|
28
29
|
return new NumberType_js_1.NumberType();
|
|
29
30
|
}
|
|
30
31
|
const keys = (0, typeKeys_js_1.getTypeKeys)(type);
|
|
31
|
-
if (derefed instanceof ObjectType_js_1.ObjectType && derefed.getAdditionalProperties()) {
|
|
32
|
+
if (derefed instanceof ObjectType_js_1.ObjectType && derefed.getAdditionalProperties() instanceof BaseType_js_1.BaseType) {
|
|
32
33
|
return new UnionType_js_1.UnionType([...keys, new StringType_js_1.StringType()]);
|
|
33
34
|
}
|
|
34
35
|
if (keys.length === 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeOperatorNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeOperatorNodeParser.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAG5B,uDAAiD;
|
|
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;QAEhC,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"}
|
|
@@ -42,7 +42,7 @@ class TypeReferenceNodeParser {
|
|
|
42
42
|
if (!node.typeArguments || node.typeArguments.length === 0) {
|
|
43
43
|
return new AnyType_js_1.AnyType();
|
|
44
44
|
}
|
|
45
|
-
return this.childNodeParser.createType(node.typeArguments[0],
|
|
45
|
+
return this.childNodeParser.createType(node.typeArguments[0], context);
|
|
46
46
|
}
|
|
47
47
|
if (typeSymbol.name === "Array" || typeSymbol.name === "ReadonlyArray") {
|
|
48
48
|
const type = this.createSubContext(node, context).getArguments()[0];
|
|
@@ -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;YAInD,IAAA,8BAAY,EAAC,IAAI,CAAC,QAAQ,CAAE,CAAC;QAEjC,IAAI,UAAU,CAAC,KAAK,GAAG,oBAAE,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAEpE,MAAM,WAAW,GAAG,aAAa,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAExG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEf,OAAO,IAAI,oBAAO,EAAE,CAAC;YACzB,CAAC;YAED,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAC9F,CAAC;QAED,IAAI,UAAU,CAAC,KAAK,GAAG,oBAAE,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,4BAAW,CAAC,IAAI,CAAC,CAAC;QACzE,CAAC;QAGD,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YAErE,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzD,OAAO,IAAI,oBAAO,EAAE,CAAC;YACzB,CAAC;YAED,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"TypeReferenceNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/TypeReferenceNodeParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,9 @@ export declare class SchemaGenerator {
|
|
|
12
12
|
protected readonly typeFormatter: TypeFormatter;
|
|
13
13
|
protected readonly config?: Config | undefined;
|
|
14
14
|
constructor(program: ts.Program, nodeParser: NodeParser, typeFormatter: TypeFormatter, config?: Config | undefined);
|
|
15
|
-
createSchema(
|
|
15
|
+
createSchema(fullNames?: string | string[]): Schema;
|
|
16
16
|
createSchemaFromNodes(rootNodes: ts.Node[]): Schema;
|
|
17
|
-
protected getRootNodes(
|
|
17
|
+
protected getRootNodes(fullNames: string[] | undefined): ts.Node[];
|
|
18
18
|
protected findNamedNode(fullName: string): ts.Node;
|
|
19
19
|
protected getRootTypeDefinition(rootType: BaseType, rootNode: ts.Node): Definition;
|
|
20
20
|
protected appendRootChildDefinitions(rootType: BaseType, childDefinitions: StringMap<Definition>): void;
|
|
@@ -8,6 +8,7 @@ const NodeParser_js_1 = require("./NodeParser.js");
|
|
|
8
8
|
const DefinitionType_js_1 = require("./Type/DefinitionType.js");
|
|
9
9
|
const hasJsDocTag_js_1 = require("./Utils/hasJsDocTag.js");
|
|
10
10
|
const removeUnreachable_js_1 = require("./Utils/removeUnreachable.js");
|
|
11
|
+
const castArray_js_1 = require("./Utils/castArray.js");
|
|
11
12
|
const symbolAtNode_js_1 = require("./Utils/symbolAtNode.js");
|
|
12
13
|
class SchemaGenerator {
|
|
13
14
|
program;
|
|
@@ -20,8 +21,8 @@ class SchemaGenerator {
|
|
|
20
21
|
this.typeFormatter = typeFormatter;
|
|
21
22
|
this.config = config;
|
|
22
23
|
}
|
|
23
|
-
createSchema(
|
|
24
|
-
const rootNodes = this.getRootNodes(
|
|
24
|
+
createSchema(fullNames) {
|
|
25
|
+
const rootNodes = this.getRootNodes((0, castArray_js_1.castArray)(fullNames));
|
|
25
26
|
return this.createSchemaFromNodes(rootNodes);
|
|
26
27
|
}
|
|
27
28
|
createSchemaFromNodes(rootNodes) {
|
|
@@ -29,7 +30,8 @@ class SchemaGenerator {
|
|
|
29
30
|
rootNode: rootNode,
|
|
30
31
|
rootType: this.nodeParser.createType(rootNode, new NodeParser_js_1.Context()),
|
|
31
32
|
}));
|
|
32
|
-
const
|
|
33
|
+
const rootTypeDefinitions = roots.map((root) => this.getRootTypeDefinition(root.rootType, root.rootNode));
|
|
34
|
+
const rootTypeDefinition = rootTypeDefinitions.length === 1 ? rootTypeDefinitions[0] : undefined;
|
|
33
35
|
const definitions = {};
|
|
34
36
|
for (const root of roots) {
|
|
35
37
|
try {
|
|
@@ -39,7 +41,7 @@ class SchemaGenerator {
|
|
|
39
41
|
throw Errors_js_1.UnhandledError.from("Unhandled error while appending Child Type Definition.", root.rootNode, error);
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
|
-
const reachableDefinitions = (0, removeUnreachable_js_1.removeUnreachable)(
|
|
44
|
+
const reachableDefinitions = rootTypeDefinitions.reduce((acc, def) => Object.assign(acc, (0, removeUnreachable_js_1.removeUnreachable)(def, definitions)), {});
|
|
43
45
|
return {
|
|
44
46
|
...(this.config?.schemaId ? { $id: this.config.schemaId } : {}),
|
|
45
47
|
$schema: "http://json-schema.org/draft-07/schema#",
|
|
@@ -47,9 +49,13 @@ class SchemaGenerator {
|
|
|
47
49
|
definitions: reachableDefinitions,
|
|
48
50
|
};
|
|
49
51
|
}
|
|
50
|
-
getRootNodes(
|
|
51
|
-
if (
|
|
52
|
-
|
|
52
|
+
getRootNodes(fullNames) {
|
|
53
|
+
if (fullNames && fullNames.includes("*") && fullNames.length > 1) {
|
|
54
|
+
throw new Error("Cannot mix '*' with specific type names");
|
|
55
|
+
}
|
|
56
|
+
const generateAll = !fullNames || fullNames.length === 0 || (fullNames.length === 1 && fullNames[0] === "*");
|
|
57
|
+
if (!generateAll) {
|
|
58
|
+
return fullNames.map((name) => this.findNamedNode(name));
|
|
53
59
|
}
|
|
54
60
|
const rootFileNames = this.program.getRootFileNames();
|
|
55
61
|
const rootSourceFiles = this.program
|
|
@@ -171,6 +177,10 @@ class SchemaGenerator {
|
|
|
171
177
|
if (!typescript_1.default.isExportDeclaration(node)) {
|
|
172
178
|
return;
|
|
173
179
|
}
|
|
180
|
+
if (node.exportClause) {
|
|
181
|
+
typescript_1.default.forEachChild(node.exportClause, (subnode) => this.inspectNode(subnode, typeChecker, allTypes));
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
174
184
|
if (!node.moduleSpecifier) {
|
|
175
185
|
return;
|
|
176
186
|
}
|
|
@@ -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,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,
|
|
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,7 +1,7 @@
|
|
|
1
1
|
import { BaseType } from "./BaseType.js";
|
|
2
2
|
export declare class UnknownType extends BaseType {
|
|
3
3
|
readonly erroredSource: boolean;
|
|
4
|
-
constructor(erroredSource
|
|
4
|
+
constructor(erroredSource?: boolean);
|
|
5
5
|
getId(): string;
|
|
6
6
|
}
|
|
7
7
|
export declare function isErroredUnknownType(type: BaseType): type is UnknownType;
|
|
@@ -5,7 +5,7 @@ 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(erroredSource) {
|
|
8
|
+
constructor(erroredSource = false) {
|
|
9
9
|
super();
|
|
10
10
|
this.erroredSource = erroredSource;
|
|
11
11
|
}
|
|
@@ -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,YAIa,
|
|
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,YAIa,gBAAgB,KAAK;QAE9B,KAAK,EAAE,CAAC;QAFC,kBAAa,GAAb,aAAa,CAAQ;IAGlC,CAAC;IAEM,KAAK;QACR,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAbD,kCAaC;AAKD,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
|
}
|
|
@@ -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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"}
|
|
@@ -43,11 +43,16 @@ class LiteralUnionTypeFormatter {
|
|
|
43
43
|
appendTypeNames(type, typeNames);
|
|
44
44
|
appendTypeValues(type, typeValues);
|
|
45
45
|
}
|
|
46
|
-
const schema =
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
46
|
+
const schema = typeNames.size === 1 && typeValues.size === 1
|
|
47
|
+
? {
|
|
48
|
+
type: (0, EnumTypeFormatter_js_1.toEnumType)(Array.from(typeNames)),
|
|
49
|
+
const: Array.from(typeValues)[0],
|
|
50
|
+
}
|
|
51
|
+
: {
|
|
52
|
+
type: (0, EnumTypeFormatter_js_1.toEnumType)(Array.from(typeNames)),
|
|
53
|
+
enum: Array.from(typeValues),
|
|
54
|
+
};
|
|
55
|
+
return hasString ? { anyOf: [{ type: "string" }, schema] } : schema;
|
|
51
56
|
}
|
|
52
57
|
getChildren() {
|
|
53
58
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiteralUnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/LiteralUnionTypeFormatter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"LiteralUnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/LiteralUnionTypeFormatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ const Errors_js_1 = require("../Error/Errors.js");
|
|
|
5
5
|
const BooleanType_js_1 = require("../Type/BooleanType.js");
|
|
6
6
|
const NullType_js_1 = require("../Type/NullType.js");
|
|
7
7
|
const NumberType_js_1 = require("../Type/NumberType.js");
|
|
8
|
-
const PrimitiveType_js_1 = require("../Type/PrimitiveType.js");
|
|
9
8
|
const StringType_js_1 = require("../Type/StringType.js");
|
|
10
9
|
const UnionType_js_1 = require("../Type/UnionType.js");
|
|
11
10
|
const uniqueArray_js_1 = require("../Utils/uniqueArray.js");
|
|
@@ -22,7 +21,12 @@ class PrimitiveUnionTypeFormatter {
|
|
|
22
21
|
return [];
|
|
23
22
|
}
|
|
24
23
|
isPrimitiveUnion(type) {
|
|
25
|
-
return type
|
|
24
|
+
return type
|
|
25
|
+
.getTypes()
|
|
26
|
+
.every((item) => item instanceof StringType_js_1.StringType ||
|
|
27
|
+
item instanceof NumberType_js_1.NumberType ||
|
|
28
|
+
item instanceof BooleanType_js_1.BooleanType ||
|
|
29
|
+
item instanceof NullType_js_1.NullType);
|
|
26
30
|
}
|
|
27
31
|
getPrimitiveType(item) {
|
|
28
32
|
if (item instanceof StringType_js_1.StringType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrimitiveUnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/PrimitiveUnionTypeFormatter.ts"],"names":[],"mappings":";;;AAAA,kDAAmD;AAKnD,2DAAqD;AACrD,qDAA+C;AAC/C,yDAAmD;AACnD
|
|
1
|
+
{"version":3,"file":"PrimitiveUnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/PrimitiveUnionTypeFormatter.ts"],"names":[],"mappings":";;;AAAA,kDAAmD;AAKnD,2DAAqD;AACrD,qDAA+C;AAC/C,yDAAmD;AACnD,yDAAmD;AACnD,uDAAiD;AACjD,4DAAsD;AAEtD,MAAa,2BAA2B;IAC7B,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,wBAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClG,CAAC;IACM,aAAa,CAAC,IAAe;QAChC,OAAO;YACH,IAAI,EAAE,IAAA,4BAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;SAChF,CAAC;IACN,CAAC;IACM,WAAW,CAAC,IAAe;QAC9B,OAAO,EAAE,CAAC;IACd,CAAC;IAES,gBAAgB,CAAC,IAAe;QACtC,OAAO,IAAI;aACN,QAAQ,EAAE;aACV,KAAK,CACF,CAAC,IAAI,EAAE,EAAE,CACL,IAAI,YAAY,0BAAU;YAC1B,IAAI,YAAY,0BAAU;YAC1B,IAAI,YAAY,4BAAW;YAC3B,IAAI,YAAY,sBAAQ,CAC/B,CAAC;IACV,CAAC;IAES,gBAAgB,CAAC,IAAc;QACrC,IAAI,IAAI,YAAY,0BAAU,EAAE,CAAC;YAC7B,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,IAAI,YAAY,0BAAU,EAAE,CAAC;YAC7B,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,IAAI,YAAY,4BAAW,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,IAAI,IAAI,YAAY,sBAAQ,EAAE,CAAC;YAC3B,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,MAAM,IAAI,yBAAa,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;CACJ;AA5CD,kEA4CC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function castArray<T>(input: undefined | T | T[]): undefined | T[];
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.castArray = castArray;
|
|
4
|
+
function castArray(input) {
|
|
5
|
+
if (input === undefined) {
|
|
6
|
+
return undefined;
|
|
7
|
+
}
|
|
8
|
+
return Array.isArray(input) ? input : [input];
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=castArray.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"castArray.js","sourceRoot":"","sources":["../../../src/Utils/castArray.ts"],"names":[],"mappings":";;AAAA,8BAMC;AAND,SAAgB,SAAS,CAAI,KAA0B;IACnD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getFullDescription = getFullDescription;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
|
+
function getFullDescription(node) {
|
|
7
|
+
const sourceFile = node.getSourceFile();
|
|
8
|
+
const jsDocNodes = typescript_1.default.getJSDocCommentsAndTags(node);
|
|
9
|
+
if (!jsDocNodes || jsDocNodes.length === 0) {
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
12
|
+
let rawText = "";
|
|
13
|
+
for (const jsDoc of jsDocNodes) {
|
|
14
|
+
rawText += jsDoc.getFullText(sourceFile) + "\n";
|
|
15
|
+
}
|
|
16
|
+
rawText = rawText.trim();
|
|
17
|
+
return getTextWithoutStars(rawText).trim();
|
|
18
|
+
}
|
|
19
|
+
function getTextWithoutStars(inputText) {
|
|
20
|
+
const innerTextWithStars = inputText.replace(/^\/\*\*[^\S\n]*\n?/, "").replace(/(\r?\n)?[^\S\n]*\*\/$/, "");
|
|
21
|
+
return innerTextWithStars
|
|
22
|
+
.split(/\n/)
|
|
23
|
+
.map((line) => {
|
|
24
|
+
const trimmedLine = line.trimStart();
|
|
25
|
+
if (trimmedLine[0] !== "*") {
|
|
26
|
+
return line;
|
|
27
|
+
}
|
|
28
|
+
const textStartPos = trimmedLine[1] === " " ? 2 : 1;
|
|
29
|
+
return trimmedLine.substring(textStartPos);
|
|
30
|
+
})
|
|
31
|
+
.join("\n");
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=getFullDescription.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getFullDescription.js","sourceRoot":"","sources":["../../../src/Utils/getFullDescription.ts"],"names":[],"mappings":";;AAEA,gDAiBC;;AAnBD,oEAA4B;AAE5B,SAAgB,kBAAkB,CAAC,IAAa;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACxC,MAAM,UAAU,GAAG,oBAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAEpD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,GAAG,EAAE,CAAC;IAEjB,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC7B,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IACpD,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAEzB,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,mBAAmB,CAAC,SAAiB;IAC1C,MAAM,kBAAkB,GAAG,SAAS,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAE5G,OAAO,kBAAkB;SACpB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACV,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAErC,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpD,OAAO,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC/C,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"narrowType.js","sourceRoot":"","sources":["../../../src/Utils/narrowType.ts"],"names":[],"mappings":";;AAkBA,
|
|
1
|
+
{"version":3,"file":"narrowType.js","sourceRoot":"","sources":["../../../src/Utils/narrowType.ts"],"names":[],"mappings":";;AAkBA,gCAoCC;AArDD,qDAA+C;AAC/C,uDAAiD;AACjD,uDAAiD;AACjD,iDAA2C;AAc3C,SAAgB,UAAU,CAAC,IAAc,EAAE,SAAsC;IAC7E,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,CAAC;IAChC,IAAI,OAAO,YAAY,wBAAS,IAAI,OAAO,YAAY,sBAAQ,EAAE,CAAC;QAC9D,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,KAAK,GAAe,EAAE,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAC,GAAG,CAAC,CAAC;YAGlC,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACnD,IAAI,CAAC,CAAC,QAAQ,YAAY,wBAAS,CAAC,EAAE,CAAC;gBACnC,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;oBAC1B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACJ,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACrB,OAAO,GAAG,IAAI,CAAC;gBACnB,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC;YACnB,CAAC;QACL,CAAC;QAID,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,IAAI,wBAAS,EAAE,CAAC;YAC3B,CAAC;iBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,OAAO,IAAI,wBAAS,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,wBAAS,EAAE,CAAC;AACvD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Node } from "typescript";
|
|
2
2
|
import type { Context } from "../NodeParser.js";
|
|
3
|
-
export declare function hash(a: string | boolean | number | (string | boolean | number)[] |
|
|
3
|
+
export declare function hash(a: string | boolean | number | (string | boolean | number | Record<string, unknown>)[] | Record<string, unknown>): string | number;
|
|
4
4
|
export declare function getKey(node: Node, context: Context): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeKey.js","sourceRoot":"","sources":["../../../src/Utils/nodeKey.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"nodeKey.js","sourceRoot":"","sources":["../../../src/Utils/nodeKey.ts"],"names":[],"mappings":";;AAIA,oBA4BC;AAED,wBAuBC;;AAzDD,0FAA8C;AAI9C,SAAgB,IAAI,CAChB,CAAgH;IAEhH,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC;IACb,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,+BAAS,EAAC,CAAC,CAAC,CAAC;IAGrD,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC;IACf,CAAC;IAGD,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACxB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;IAGD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACR,OAAO,CAAC,CAAC,CAAC;IACd,CAAC;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AAED,SAAgB,MAAM,CAAC,IAAU,EAAE,OAAgB;IAC/C,MAAM,GAAG,GAAwB,EAAE,CAAC;IAEpC,OAAO,IAAI,EAAE,CAAC;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAKpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACzF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAEpC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACpF,CAAC"}
|
|
@@ -11,15 +11,18 @@ const BaseError_js_1 = require("./src/Error/BaseError.js");
|
|
|
11
11
|
const package_json_1 = tslib_1.__importDefault(require("./package.json"));
|
|
12
12
|
const args = new commander_1.Command()
|
|
13
13
|
.option("-p, --path <path>", "Source file path")
|
|
14
|
-
.option("-t, --type <name
|
|
14
|
+
.option("-t, --type <name...>", "Type name(s)")
|
|
15
15
|
.option("-i, --id <name>", "$id for generated schema")
|
|
16
16
|
.option("-f, --tsconfig <path>", "Custom tsconfig.json path")
|
|
17
17
|
.addOption(new commander_1.Option("-e, --expose <expose>", "Type exposing").choices(["all", "none", "export"]).default("export"))
|
|
18
|
-
.addOption(new commander_1.Option("-j, --jsDoc <extended>", "Read
|
|
18
|
+
.addOption(new commander_1.Option("-j, --jsDoc <extended>", "Read JSDoc annotations")
|
|
19
19
|
.choices(["none", "basic", "extended"])
|
|
20
20
|
.default("extended"))
|
|
21
21
|
.addOption(new commander_1.Option("--markdown-description", "Generate `markdownDescription` in addition to `description`.").implies({
|
|
22
22
|
jsDoc: "extended",
|
|
23
|
+
}))
|
|
24
|
+
.addOption(new commander_1.Option("--full-description", "Include the full raw JSDoc comment as `fullDescription` in the schema.").implies({
|
|
25
|
+
jsDoc: "extended",
|
|
23
26
|
}))
|
|
24
27
|
.addOption(new commander_1.Option("--functions <functions>", "How to handle functions. `fail` will throw an error. `comment` will add a comment. `hide` will treat the function like a NeverType or HiddenType.")
|
|
25
28
|
.choices(["fail", "comment", "hide"])
|
|
@@ -46,6 +49,7 @@ const config = {
|
|
|
46
49
|
topRef: args.topRef,
|
|
47
50
|
jsDoc: args.jsDoc,
|
|
48
51
|
markdownDescription: args.markdownDescription,
|
|
52
|
+
fullDescription: args.fullDescription,
|
|
49
53
|
sortProps: !args.unstable,
|
|
50
54
|
strictTuples: args.strictTuples,
|
|
51
55
|
skipTypeCheck: !args.typeCheck,
|
|
@@ -55,7 +59,7 @@ const config = {
|
|
|
55
59
|
functions: args.functions,
|
|
56
60
|
};
|
|
57
61
|
try {
|
|
58
|
-
const schema = (0, generator_js_1.createGenerator)(config).createSchema(
|
|
62
|
+
const schema = (0, generator_js_1.createGenerator)(config).createSchema(config.type);
|
|
59
63
|
const stringify = config.sortProps ? safe_stable_stringify_1.default : JSON.stringify;
|
|
60
64
|
const schemaString = (config.minify ? stringify(schema) : stringify(schema, null, 2));
|
|
61
65
|
if (args.out) {
|