ts-json-schema-generator 2.4.1-next.1 → 2.5.0--canary.76e1a68.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 +11 -2
- package/dist/factory/parser.js.map +1 -1
- package/dist/package.json +23 -22
- 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/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/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/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 +17 -2
- package/package.json +23 -22
- package/src/AnnotationsReader/ExtendedAnnotationsReader.ts +25 -10
- package/src/Config.ts +124 -2
- 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/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/ts-json-schema-generator.ts +12 -3
|
@@ -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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"}
|
|
@@ -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"}
|
|
@@ -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) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-json-schema-generator.js","sourceRoot":"","sources":["../ts-json-schema-generator.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAC5C,qCAAmD;AACnD,yCAAoC;AACpC,0FAAoD;AACpD,2CAA0D;AAC1D,yDAAyD;AAEzD,2DAAqD;AAErD,0EAAiC;AAEjC,MAAM,IAAI,GAAG,IAAI,mBAAO,EAAE;KACrB,MAAM,CAAC,mBAAmB,EAAE,kBAAkB,CAAC;KAC/C,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ts-json-schema-generator.js","sourceRoot":"","sources":["../ts-json-schema-generator.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAC5C,qCAAmD;AACnD,yCAAoC;AACpC,0FAAoD;AACpD,2CAA0D;AAC1D,yDAAyD;AAEzD,2DAAqD;AAErD,0EAAiC;AAEjC,MAAM,IAAI,GAAG,IAAI,mBAAO,EAAE;KACrB,MAAM,CAAC,mBAAmB,EAAE,kBAAkB,CAAC;KAC/C,MAAM,CAAC,sBAAsB,EAAE,cAAc,CAAC;KAC9C,MAAM,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;KACrD,MAAM,CAAC,uBAAuB,EAAE,2BAA2B,CAAC;KAC5D,SAAS,CACN,IAAI,kBAAM,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC5G;KACA,SAAS,CACN,IAAI,kBAAM,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;KACzD,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;KACtC,OAAO,CAAC,UAAU,CAAC,CAC3B;KACA,SAAS,CACN,IAAI,kBAAM,CAAC,wBAAwB,EAAE,8DAA8D,CAAC,CAAC,OAAO,CAAC;IACzG,KAAK,EAAE,UAAU;CACpB,CAAC,CACL;KACA,SAAS,CACN,IAAI,kBAAM,CACN,oBAAoB,EACpB,wEAAwE,CAC3E,CAAC,OAAO,CAAC;IACN,KAAK,EAAE,UAAU;CACpB,CAAC,CACL;KACA,SAAS,CACN,IAAI,kBAAM,CACN,yBAAyB,EAEzB,mJAAmJ,CACtJ;KACI,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;KACpC,OAAO,CAAC,SAAS,CAAC,CAC1B;KACA,MAAM,CAAC,UAAU,EAAE,yBAAyB,EAAE,KAAK,CAAC;KACpD,MAAM,CAAC,YAAY,EAAE,wBAAwB,CAAC;KAC9C,MAAM,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;KACpE,MAAM,CAAC,cAAc,EAAE,2CAA2C,CAAC;KACnE,MAAM,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;KACpE,MAAM,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;KACrD,MAAM,CAAC,kBAAkB,EAAE,uCAAuC,CAAC;KACnE,MAAM,CACH,+BAA+B,EAC/B,mDAAmD,EACnD,CAAC,KAAa,EAAE,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EACrD,EAAE,CACL;KACA,MAAM,CAAC,yBAAyB,EAAE,iEAAiE,EAAE,KAAK,CAAC;KAC3G,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;KACnB,IAAI,EAAE,CAAC;AAEZ,MAAM,MAAM,GAAW;IACnB,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,QAAQ,EACJ,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,2BAAc,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACjH,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,QAAQ,EAAE,IAAI,CAAC,EAAE;IACjB,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,KAAK,EAAE,IAAI,CAAC,KAAK;IACjB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;IAC7C,eAAe,EAAE,IAAI,CAAC,eAAe;IACrC,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ;IACzB,YAAY,EAAE,IAAI,CAAC,YAAY;IAC/B,aAAa,EAAE,CAAC,IAAI,CAAC,SAAS;IAC9B,UAAU,EAAE,IAAI,CAAC,SAAS;IAC1B,SAAS,EAAE,IAAI,CAAC,kBAAkB;IAClC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;IAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;CAC5B,CAAC;AAEF,IAAI,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,8BAAe,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEjE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,+BAAe,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAEtE,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAW,CAAC;IAEhG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAEX,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,IAAA,mBAAS,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,IAAA,uBAAa,EAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QAEJ,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,IAAI,CAAC,CAAC;IACrC,CAAC;AACL,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACb,IAAI,KAAK,YAAY,wBAAS,EAAE,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAE9B,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;aAAM,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAGD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACzB,CAAC;SAAM,CAAC;QACJ,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC"}
|