ts-json-schema-generator 2.4.1--canary.2413.5de5588.0 → 2.4.1--canary.2417.760dd15.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 +6 -1
- package/dist/factory/parser.js.map +1 -1
- package/dist/factory/program.js +2 -5
- package/dist/factory/program.js.map +1 -1
- package/dist/package.json +31 -29
- package/dist/src/Config.d.ts +1 -1
- package/dist/src/Error/BaseError.d.ts +1 -1
- package/dist/src/Error/BaseError.js +2 -1
- 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/SchemaGenerator.d.ts +2 -2
- package/dist/src/SchemaGenerator.js +10 -5
- package/dist/src/SchemaGenerator.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/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/narrowType.js.map +1 -1
- package/dist/ts-json-schema-generator.js +3 -3
- package/dist/ts-json-schema-generator.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/factory/parser.ts +7 -1
- package/factory/program.ts +3 -7
- package/package.json +31 -29
- package/src/Config.ts +2 -2
- package/src/Error/BaseError.ts +3 -1
- package/src/NodeParser/BinaryExpressionNodeParser.ts +99 -0
- package/src/SchemaGenerator.ts +12 -5
- package/src/Type/UnknownType.ts +1 -1
- package/src/TypeFormatter/AnnotatedTypeFormatter.ts +1 -1
- package/src/Utils/castArray.ts +7 -0
- package/src/Utils/narrowType.ts +1 -6
- package/ts-json-schema-generator.ts +3 -3
package/dist/factory/parser.js
CHANGED
|
@@ -11,6 +11,7 @@ const AnyTypeNodeParser_js_1 = require("../src/NodeParser/AnyTypeNodeParser.js")
|
|
|
11
11
|
const ArrayLiteralExpressionNodeParser_js_1 = require("../src/NodeParser/ArrayLiteralExpressionNodeParser.js");
|
|
12
12
|
const ArrayNodeParser_js_1 = require("../src/NodeParser/ArrayNodeParser.js");
|
|
13
13
|
const AsExpressionNodeParser_js_1 = require("../src/NodeParser/AsExpressionNodeParser.js");
|
|
14
|
+
const BinaryExpressionNodeParser_js_1 = require("../src/NodeParser/BinaryExpressionNodeParser.js");
|
|
14
15
|
const BooleanLiteralNodeParser_js_1 = require("../src/NodeParser/BooleanLiteralNodeParser.js");
|
|
15
16
|
const BooleanTypeNodeParser_js_1 = require("../src/NodeParser/BooleanTypeNodeParser.js");
|
|
16
17
|
const CallExpressionParser_js_1 = require("../src/NodeParser/CallExpressionParser.js");
|
|
@@ -60,6 +61,7 @@ const SatisfiesNodeParser_js_1 = require("../src/NodeParser/SatisfiesNodeParser.
|
|
|
60
61
|
const PromiseNodeParser_js_1 = require("../src/NodeParser/PromiseNodeParser.js");
|
|
61
62
|
const SpreadElementNodeParser_js_1 = require("../src/NodeParser/SpreadElementNodeParser.js");
|
|
62
63
|
const IdentifierNodeParser_js_1 = require("../src/NodeParser/IdentifierNodeParser.js");
|
|
64
|
+
const castArray_js_1 = require("../src/Utils/castArray.js");
|
|
63
65
|
function createParser(program, config, augmentor) {
|
|
64
66
|
const typeChecker = program.getTypeChecker();
|
|
65
67
|
const chainNodeParser = new ChainNodeParser_js_1.ChainNodeParser(typeChecker, []);
|
|
@@ -67,7 +69,9 @@ function createParser(program, config, augmentor) {
|
|
|
67
69
|
return new ExposeNodeParser_js_1.ExposeNodeParser(typeChecker, nodeParser, config.expose, config.jsDoc);
|
|
68
70
|
}
|
|
69
71
|
function withTopRef(nodeParser) {
|
|
70
|
-
|
|
72
|
+
const typeArr = (0, castArray_js_1.castArray)(config.type);
|
|
73
|
+
const topRefFullName = typeArr && typeArr.length === 1 ? typeArr[0] : undefined;
|
|
74
|
+
return new TopRefNodeParser_js_1.TopRefNodeParser(chainNodeParser, topRefFullName, config.topRef);
|
|
71
75
|
}
|
|
72
76
|
function withJsDoc(nodeParser) {
|
|
73
77
|
const extraTags = new Set(config.extraTags);
|
|
@@ -100,6 +104,7 @@ function createParser(program, config, augmentor) {
|
|
|
100
104
|
.addNodeParser(new NeverTypeNodeParser_js_1.NeverTypeNodeParser())
|
|
101
105
|
.addNodeParser(new ObjectTypeNodeParser_js_1.ObjectTypeNodeParser())
|
|
102
106
|
.addNodeParser(new AsExpressionNodeParser_js_1.AsExpressionNodeParser(chainNodeParser))
|
|
107
|
+
.addNodeParser(new BinaryExpressionNodeParser_js_1.BinaryExpressionNodeParser(chainNodeParser))
|
|
103
108
|
.addNodeParser(new SatisfiesNodeParser_js_1.SatisfiesNodeParser(chainNodeParser))
|
|
104
109
|
.addNodeParser(withJsDoc(new ParameterParser_js_1.ParameterParser(chainNodeParser)))
|
|
105
110
|
.addNodeParser(new StringLiteralNodeParser_js_1.StringLiteralNodeParser())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../factory/parser.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../factory/parser.ts"],"names":[],"mappings":"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"}
|
package/dist/factory/program.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createProgram = createProgram;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const glob_1 = require("glob");
|
|
6
5
|
const path = tslib_1.__importStar(require("node:path"));
|
|
7
6
|
const normalize_path_1 = tslib_1.__importDefault(require("normalize-path"));
|
|
8
7
|
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
9
8
|
const Errors_js_1 = require("../src/Error/Errors.js");
|
|
9
|
+
const glob_1 = require("glob");
|
|
10
10
|
function loadTsConfigFile(configFile) {
|
|
11
11
|
const raw = typescript_1.default.sys.readFile(configFile);
|
|
12
12
|
if (!raw) {
|
|
@@ -43,12 +43,9 @@ function getTsConfig(config) {
|
|
|
43
43
|
noEmit: true,
|
|
44
44
|
emitDecoratorMetadata: true,
|
|
45
45
|
experimentalDecorators: true,
|
|
46
|
-
target: typescript_1.default.ScriptTarget.
|
|
46
|
+
target: typescript_1.default.ScriptTarget.ES5,
|
|
47
47
|
module: typescript_1.default.ModuleKind.CommonJS,
|
|
48
48
|
strictNullChecks: false,
|
|
49
|
-
skipLibCheck: true,
|
|
50
|
-
skipDefaultLibCheck: true,
|
|
51
|
-
esModuleInterop: true,
|
|
52
49
|
},
|
|
53
50
|
};
|
|
54
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program.js","sourceRoot":"","sources":["../../factory/program.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"program.js","sourceRoot":"","sources":["../../factory/program.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ts-json-schema-generator",
|
|
3
|
-
"version": "2.4.1--canary.
|
|
3
|
+
"version": "2.4.1--canary.2417.760dd15.0",
|
|
4
4
|
"description": "Generate JSON schema from your Typescript sources",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ts",
|
|
@@ -49,51 +49,53 @@
|
|
|
49
49
|
"prepublishOnly": "npm run build",
|
|
50
50
|
"release": "npm run build && auto shipit",
|
|
51
51
|
"run": "tsx ts-json-schema-generator.ts",
|
|
52
|
-
"test": "
|
|
53
|
-
"test:
|
|
54
|
-
"test:
|
|
55
|
-
"test:
|
|
52
|
+
"test": "jest test/ --verbose",
|
|
53
|
+
"test:debug": "node --inspect-brk node_modules/.bin/jest test/ --verbose --runInBand",
|
|
54
|
+
"test:coverage": "npm run jest -- test/ --collectCoverage=true",
|
|
55
|
+
"test:fast": "cross-env FAST_TEST=1 jest test/ --verbose",
|
|
56
|
+
"test:update": "cross-env UPDATE_SCHEMA=true npm run test:fast",
|
|
56
57
|
"watch": "tsc -w"
|
|
57
58
|
},
|
|
58
59
|
"dependencies": {
|
|
59
60
|
"@types/json-schema": "^7.0.15",
|
|
60
|
-
"
|
|
61
|
-
"commander": "^14.0.0",
|
|
61
|
+
"commander": "^14.0.2",
|
|
62
62
|
"glob": "^13.0.0",
|
|
63
63
|
"json5": "^2.2.3",
|
|
64
64
|
"normalize-path": "^3.0.0",
|
|
65
65
|
"safe-stable-stringify": "^2.5.0",
|
|
66
66
|
"tslib": "^2.8.1",
|
|
67
|
-
"typescript": "^5.
|
|
67
|
+
"typescript": "^5.9.3",
|
|
68
|
+
"@typescript/vfs": "1.6.2"
|
|
68
69
|
},
|
|
69
70
|
"devDependencies": {
|
|
70
|
-
"@auto-it/conventional-commits": "^11.3.
|
|
71
|
-
"@auto-it/first-time-contributor": "^11.3.
|
|
72
|
-
"@babel/core": "^7.28.
|
|
73
|
-
"@babel/preset-env": "^7.28.
|
|
74
|
-
"@babel/preset-typescript": "^7.
|
|
75
|
-
"@eslint/js": "^9.
|
|
71
|
+
"@auto-it/conventional-commits": "^11.3.6",
|
|
72
|
+
"@auto-it/first-time-contributor": "^11.3.6",
|
|
73
|
+
"@babel/core": "^7.28.5",
|
|
74
|
+
"@babel/preset-env": "^7.28.5",
|
|
75
|
+
"@babel/preset-typescript": "^7.28.5",
|
|
76
|
+
"@eslint/js": "^9.39.1",
|
|
76
77
|
"@types/eslint": "^9.6.1",
|
|
77
|
-
"@types/
|
|
78
|
+
"@types/jest": "^30.0.0",
|
|
79
|
+
"@types/node": "^24.10.1",
|
|
78
80
|
"@types/normalize-path": "^3.0.2",
|
|
79
81
|
"ajv": "^8.17.1",
|
|
80
82
|
"ajv-formats": "^3.0.1",
|
|
81
|
-
"auto": "^11.3.
|
|
82
|
-
"
|
|
83
|
-
"
|
|
84
|
-
"cross-env": "^10.0.0",
|
|
83
|
+
"auto": "^11.3.6",
|
|
84
|
+
"chai": "^6.2.1",
|
|
85
|
+
"cross-env": "^10.1.0",
|
|
85
86
|
"eslint": "9.39.1",
|
|
86
|
-
"eslint-config-prettier": "^10.1.
|
|
87
|
-
"eslint-plugin-prettier": "^5.5.
|
|
88
|
-
"globals": "^16.
|
|
89
|
-
"
|
|
90
|
-
"
|
|
91
|
-
"
|
|
92
|
-
"
|
|
93
|
-
"
|
|
94
|
-
"vega
|
|
87
|
+
"eslint-config-prettier": "^10.1.8",
|
|
88
|
+
"eslint-plugin-prettier": "^5.5.4",
|
|
89
|
+
"globals": "^16.5.0",
|
|
90
|
+
"jest": "^30.2.0",
|
|
91
|
+
"jest-junit": "^16.0.0",
|
|
92
|
+
"prettier": "^3.7.3",
|
|
93
|
+
"tsx": "^4.21.0",
|
|
94
|
+
"typescript-eslint": "^8.48.0",
|
|
95
|
+
"vega": "^6.2.0",
|
|
96
|
+
"vega-lite": "^6.4.1"
|
|
95
97
|
},
|
|
96
|
-
"packageManager": "npm@11.4
|
|
98
|
+
"packageManager": "npm@11.6.4",
|
|
97
99
|
"engines": {
|
|
98
100
|
"node": ">=18.0.0"
|
|
99
101
|
}
|
package/dist/src/Config.d.ts
CHANGED
|
@@ -10,5 +10,5 @@ export declare abstract class BaseError extends Error {
|
|
|
10
10
|
readonly diagnostic: ts.Diagnostic;
|
|
11
11
|
constructor(diagnostic: PartialDiagnostic);
|
|
12
12
|
static createDiagnostic(diagnostic: PartialDiagnostic): ts.Diagnostic;
|
|
13
|
-
format(
|
|
13
|
+
format(): string;
|
|
14
14
|
}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseError = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
|
+
const isTTY = process.env.TTY || process.stdout.isTTY;
|
|
6
7
|
class BaseError extends Error {
|
|
7
8
|
diagnostic;
|
|
8
9
|
constructor(diagnostic) {
|
|
@@ -24,7 +25,7 @@ class BaseError extends Error {
|
|
|
24
25
|
start: 0,
|
|
25
26
|
}, diagnostic);
|
|
26
27
|
}
|
|
27
|
-
format(
|
|
28
|
+
format() {
|
|
28
29
|
const formatter = isTTY ? typescript_1.default.formatDiagnosticsWithColorAndContext : typescript_1.default.formatDiagnostics;
|
|
29
30
|
return formatter([this.diagnostic], {
|
|
30
31
|
getCanonicalFileName: (fileName) => fileName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseError.js","sourceRoot":"","sources":["../../../src/Error/BaseError.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;
|
|
1
|
+
{"version":3,"file":"BaseError.js","sourceRoot":"","sources":["../../../src/Error/BaseError.ts"],"names":[],"mappings":";;;;AAAA,oEAA4B;AAc5B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;AAKtD,MAAsB,SAAU,SAAQ,KAAK;IAChC,UAAU,CAAgB;IAEnC,YAAY,UAA6B;QACrC,KAAK,CAAC,oBAAE,CAAC,4BAA4B,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,UAA6B;QAGjD,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YAChD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAClD,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9C,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE/C,UAAU,CAAC,IAAI,GAAG,SAAS,CAAC;QAChC,CAAC;QAID,UAAU,CAAC,IAAI,GAAG,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;QAE3C,OAAO,MAAM,CAAC,MAAM,CAChB;YACI,QAAQ,EAAE,oBAAE,CAAC,kBAAkB,CAAC,KAAK;YACrC,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC;SACX,EACD,UAAU,CACb,CAAC;IACN,CAAC;IAED,MAAM;QACF,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,oBAAE,CAAC,oCAAoC,CAAC,CAAC,CAAC,oBAAE,CAAC,iBAAiB,CAAC;QAEzF,OAAO,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAChC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ;YAC5C,mBAAmB,EAAE,GAAG,EAAE,CAAC,EAAE;YAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;SACzB,CAAC,CAAC;IACP,CAAC;CACJ;AA3CD,8BA2CC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
import type { Context, NodeParser } from "../NodeParser.js";
|
|
3
|
+
import type { SubNodeParser } from "../SubNodeParser.js";
|
|
4
|
+
import type { BaseType } from "../Type/BaseType.js";
|
|
5
|
+
export declare class BinaryExpressionNodeParser implements SubNodeParser {
|
|
6
|
+
protected childNodeParser: NodeParser;
|
|
7
|
+
constructor(childNodeParser: NodeParser);
|
|
8
|
+
supportsNode(node: ts.Node): boolean;
|
|
9
|
+
createType(node: ts.BinaryExpression, context: Context): BaseType;
|
|
10
|
+
private isStringLike;
|
|
11
|
+
private isBooleanLike;
|
|
12
|
+
private isDefinitelyNumberLike;
|
|
13
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BinaryExpressionNodeParser = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const typescript_1 = tslib_1.__importDefault(require("typescript"));
|
|
6
|
+
const AnyType_js_1 = require("../Type/AnyType.js");
|
|
7
|
+
const BooleanType_js_1 = require("../Type/BooleanType.js");
|
|
8
|
+
const LiteralType_js_1 = require("../Type/LiteralType.js");
|
|
9
|
+
const NumberType_js_1 = require("../Type/NumberType.js");
|
|
10
|
+
const StringType_js_1 = require("../Type/StringType.js");
|
|
11
|
+
const UnionType_js_1 = require("../Type/UnionType.js");
|
|
12
|
+
const AliasType_js_1 = require("../Type/AliasType.js");
|
|
13
|
+
class BinaryExpressionNodeParser {
|
|
14
|
+
childNodeParser;
|
|
15
|
+
constructor(childNodeParser) {
|
|
16
|
+
this.childNodeParser = childNodeParser;
|
|
17
|
+
}
|
|
18
|
+
supportsNode(node) {
|
|
19
|
+
return node.kind === typescript_1.default.SyntaxKind.BinaryExpression;
|
|
20
|
+
}
|
|
21
|
+
createType(node, context) {
|
|
22
|
+
const leftType = this.childNodeParser.createType(node.left, context);
|
|
23
|
+
const rightType = this.childNodeParser.createType(node.right, context);
|
|
24
|
+
if (leftType instanceof AnyType_js_1.AnyType || rightType instanceof AnyType_js_1.AnyType) {
|
|
25
|
+
return new AnyType_js_1.AnyType();
|
|
26
|
+
}
|
|
27
|
+
if (this.isStringLike(leftType) || this.isStringLike(rightType)) {
|
|
28
|
+
return new StringType_js_1.StringType();
|
|
29
|
+
}
|
|
30
|
+
if (this.isDefinitelyNumberLike(leftType) && this.isDefinitelyNumberLike(rightType)) {
|
|
31
|
+
return new NumberType_js_1.NumberType();
|
|
32
|
+
}
|
|
33
|
+
if (this.isBooleanLike(leftType) && this.isBooleanLike(rightType)) {
|
|
34
|
+
return new BooleanType_js_1.BooleanType();
|
|
35
|
+
}
|
|
36
|
+
return new StringType_js_1.StringType();
|
|
37
|
+
}
|
|
38
|
+
isStringLike(type) {
|
|
39
|
+
if (type instanceof AliasType_js_1.AliasType) {
|
|
40
|
+
return this.isStringLike(type.getType());
|
|
41
|
+
}
|
|
42
|
+
if (type instanceof StringType_js_1.StringType) {
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
if (type instanceof LiteralType_js_1.LiteralType && type.isString()) {
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
if (type instanceof UnionType_js_1.UnionType) {
|
|
49
|
+
return type.getTypes().some((t) => this.isStringLike(t));
|
|
50
|
+
}
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
isBooleanLike(type) {
|
|
54
|
+
if (type instanceof BooleanType_js_1.BooleanType) {
|
|
55
|
+
return true;
|
|
56
|
+
}
|
|
57
|
+
if (type instanceof LiteralType_js_1.LiteralType && typeof type.getValue() === "boolean") {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
isDefinitelyNumberLike(type) {
|
|
63
|
+
if (type instanceof AliasType_js_1.AliasType) {
|
|
64
|
+
return this.isDefinitelyNumberLike(type.getType());
|
|
65
|
+
}
|
|
66
|
+
if (type instanceof NumberType_js_1.NumberType) {
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
69
|
+
if (type instanceof LiteralType_js_1.LiteralType && typeof type.getValue() === "number") {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
if (type instanceof UnionType_js_1.UnionType) {
|
|
73
|
+
return type.getTypes().every((t) => this.isDefinitelyNumberLike(t));
|
|
74
|
+
}
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
exports.BinaryExpressionNodeParser = BinaryExpressionNodeParser;
|
|
79
|
+
//# sourceMappingURL=BinaryExpressionNodeParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BinaryExpressionNodeParser.js","sourceRoot":"","sources":["../../../src/NodeParser/BinaryExpressionNodeParser.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) {
|
|
@@ -48,9 +49,13 @@ class SchemaGenerator {
|
|
|
48
49
|
definitions: reachableDefinitions,
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
|
-
getRootNodes(
|
|
52
|
-
if (
|
|
53
|
-
|
|
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));
|
|
54
59
|
}
|
|
55
60
|
const rootFileNames = this.program.getRootFileNames();
|
|
56
61
|
const rootSourceFiles = this.program
|
|
@@ -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,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) {
|
|
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,aAAsB;QAE/B,KAAK,EAAE,CAAC;QAFC,kBAAa,GAAb,aAAa,CAAS;IAGnC,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 =
|
|
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":";;;AASA,oCAqCC;AA9CD,kDAAmD;AAGnD,+DAAyD;AAEzD,uDAAiD;AAEjD,wDAAkD;AAElD,SAAgB,YAAY,CAAC,GAAe;IACxC,MAAM,KAAK,GAA8B,GAAG,CAAC,KAAsB,IAAI,GAAG,CAAC,KAAK,CAAC;IACjF,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3E,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBAClC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,CAAC;QACL,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC7B,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClC,CAAC;QAGD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,MAAM,MAAM,GAAe,EAAE,CAAC;QAE9B,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;YACjB,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAqB,EAAE,CAAC;gBACxC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,OAAO,GAAG,CAAC;gBACf,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAyB,EAAE,CAAC;YACzD,IAAI,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC/D,MAAc,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAQ,CAAC;gBACvC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACL,CAAC;QACD,GAAG,CAAC,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,MAAa,sBAAsB;IACF;IAA7B,YAA6B,kBAAiC;QAAjC,uBAAkB,GAAlB,kBAAkB,CAAe;IAAG,CAAC;IAE3D,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,gCAAa,CAAC;IACzC,CAAC;IACM,aAAa,CAAC,IAAmB;QACpC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,eAAe,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxC,IAAI,KAAK,YAAY,wBAAS,EAAE,CAAC;gBAC7B,KAAK,CAAC,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;gBAClD,OAAO,WAAW,CAAC,aAAa,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,yBAAa,CACnB,4CAA4C,KAAK,CAAC,OAAO,EAAE,iDAAiD,EAC5G,KAAK,CACR,CAAC;YACN,CAAC;QACL,CAAC;QAED,MAAM,GAAG,GAAe;YACpB,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACxD,GAAG,IAAI,CAAC,cAAc,EAAE;SAC3B,CAAC;QAEF,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;YACjC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YACpB,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IACM,WAAW,CAAC,IAAmB;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC;CACJ;AAxCD,wDAwCC"}
|
|
@@ -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"}
|
|
@@ -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"}
|
|
@@ -11,11 +11,11 @@ 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({
|
|
@@ -59,7 +59,7 @@ const config = {
|
|
|
59
59
|
functions: args.functions,
|
|
60
60
|
};
|
|
61
61
|
try {
|
|
62
|
-
const schema = (0, generator_js_1.createGenerator)(config).createSchema(
|
|
62
|
+
const schema = (0, generator_js_1.createGenerator)(config).createSchema(config.type);
|
|
63
63
|
const stringify = config.sortProps ? safe_stable_stringify_1.default : JSON.stringify;
|
|
64
64
|
const schemaString = (config.minify ? stringify(schema) : stringify(schema, null, 2));
|
|
65
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":"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"}
|