@tsofist/schema-forge 1.30.0 → 1.31.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/lib/fake-generator.d.ts +1 -1
- package/lib/fake-generator.d.ts.map +1 -1
- package/lib/fake-generator.js +42 -42
- package/lib/fake-generator.js.map +1 -1
- package/lib/fake-generator.spec.js +3 -2
- package/lib/fake-generator.spec.js.map +1 -1
- package/lib/generator/schema-generator.d.ts +11 -1
- package/lib/generator/schema-generator.d.ts.map +1 -1
- package/lib/generator/schema-generator.js +29 -81
- package/lib/generator/schema-generator.js.map +1 -1
- package/lib/generator/types-generator.d.ts.map +1 -1
- package/lib/generator/types-generator.js +83 -125
- package/lib/generator/types-generator.js.map +1 -1
- package/lib/generator/types.d.ts +2 -1
- package/lib/generator/types.d.ts.map +1 -1
- package/lib/generator/types.js +1 -0
- package/lib/generator/types.js.map +1 -1
- package/lib/generator.d.ts.map +1 -1
- package/lib/generator.js +6 -2
- package/lib/generator.js.map +1 -1
- package/lib/generator.spec.js +63 -20
- package/lib/generator.spec.js.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/types.d.ts +1 -1
- package/lib/types.d.ts.map +1 -1
- package/lib/util/format.error.d.ts +2 -0
- package/lib/util/format.error.d.ts.map +1 -0
- package/lib/util/format.error.js +16 -0
- package/lib/util/format.error.js.map +1 -0
- package/lib/util/patch.extended-annotations-reader.d.ts +2 -0
- package/lib/util/patch.extended-annotations-reader.d.ts.map +1 -0
- package/lib/util/patch.extended-annotations-reader.js +50 -0
- package/lib/util/patch.extended-annotations-reader.js.map +1 -0
- package/lib/util/sort-properties.d.ts +3 -0
- package/lib/util/sort-properties.d.ts.map +1 -0
- package/lib/util/sort-properties.js +41 -0
- package/lib/util/sort-properties.js.map +1 -0
- package/lib/util/tsc.d.ts +8 -0
- package/lib/util/tsc.d.ts.map +1 -0
- package/lib/util/tsc.js +73 -0
- package/lib/util/tsc.js.map +1 -0
- package/lib/validator.d.ts.map +1 -1
- package/lib/validator.js +2 -1
- package/lib/validator.js.map +1 -1
- package/package.json +12 -10
package/lib/fake-generator.d.ts
CHANGED
|
@@ -10,5 +10,5 @@ export interface FakeGeneratorOptions extends JSONSchemaFakerOptions {
|
|
|
10
10
|
locale?: ArrayMay<FakeGeneratorLocaleName>;
|
|
11
11
|
setupFakerModules?: SetupFakerModules[];
|
|
12
12
|
}
|
|
13
|
-
export declare function generateFakeData<T = unknown>(validator: SchemaForgeValidator, source: SchemaForgeDefinitionRef, options?: FakeGeneratorOptions):
|
|
13
|
+
export declare function generateFakeData<T = unknown>(validator: SchemaForgeValidator, source: SchemaForgeDefinitionRef, options?: FakeGeneratorOptions): T;
|
|
14
14
|
//# sourceMappingURL=fake-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake-generator.d.ts","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"fake-generator.d.ts","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAMzC,OAAO,EAAmB,sBAAsB,EAAuB,MAAM,mBAAmB,CAAC;AAEjG,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAWnD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC;AACrE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtF,MAAM,MAAM,uBAAuB,GAAG,MAAM,OAAO,WAAW,CAAC,UAAU,CAAC;AAC1E,MAAM,WAAW,oBAAqB,SAAQ,sBAAsB;IAChE,MAAM,CAAC,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAC3C,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC3C;AAED,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,OAAO,EACxC,SAAS,EAAE,oBAAoB,EAC/B,MAAM,EAAE,wBAAwB,EAChC,OAAO,GAAE,oBAAyB,GACnC,CAAC,CA0DH"}
|
package/lib/fake-generator.js
CHANGED
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generateFakeData = generateFakeData;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fakerModule = require("@faker-js/faker");
|
|
6
|
-
const stem_1 = require("@tsofist/stem");
|
|
7
6
|
const as_array_1 = require("@tsofist/stem/lib/as-array");
|
|
7
|
+
const has_own_1 = require("@tsofist/stem/lib/object/has-own");
|
|
8
8
|
const substr_1 = require("@tsofist/stem/lib/string/substr");
|
|
9
9
|
const json_schema_faker_1 = require("json-schema-faker");
|
|
10
10
|
const types_1 = require("./generator/types");
|
|
@@ -14,49 +14,47 @@ const PRUNE_PROPS = Array.from(new Set([
|
|
|
14
14
|
//
|
|
15
15
|
...(types_1.SG_CONFIG_DEFAULTS.extraTags || []),
|
|
16
16
|
]));
|
|
17
|
-
function generateFakeData(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
refs[`#/definitions/${def.name}`] = schema;
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
refs[def.ref] = schema;
|
|
31
|
-
}
|
|
17
|
+
function generateFakeData(validator, source, options = {}) {
|
|
18
|
+
const refs = {};
|
|
19
|
+
{
|
|
20
|
+
const rootSchemaId = (0, substr_1.substr)(source, 0, '#');
|
|
21
|
+
for (const def of validator.listDefinitions()) {
|
|
22
|
+
let schema = validator.getSchema(def.ref);
|
|
23
|
+
// todo: fix this
|
|
24
|
+
schema = fixJSONSchemaFakerQuirks(schema);
|
|
25
|
+
if (rootSchemaId === def.schemaId) {
|
|
26
|
+
refs[`#/definitions/${def.name}`] = schema;
|
|
32
27
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
locale: (0, as_array_1.asArray)(options.locale || ['en']).map((name) => fakerModule.allLocales[name]),
|
|
36
|
-
});
|
|
37
|
-
const generator = json_schema_faker_1.JSONSchemaFaker.extend('faker', () => {
|
|
38
|
-
Object.assign(faker, {
|
|
39
|
-
date: proxyFakerDateModule(faker.date),
|
|
40
|
-
});
|
|
41
|
-
for (const item of [
|
|
42
|
-
//
|
|
43
|
-
...EmbeddedModules,
|
|
44
|
-
...(options.setupFakerModules || []),
|
|
45
|
-
]) {
|
|
46
|
-
const modules = item(faker);
|
|
47
|
-
Object.assign(faker, modules);
|
|
28
|
+
else {
|
|
29
|
+
refs[def.ref] = schema;
|
|
48
30
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
const faker = new fakerModule.Faker({
|
|
34
|
+
locale: (0, as_array_1.asArray)(options.locale || ['en']).map((name) => fakerModule.allLocales[name]),
|
|
35
|
+
});
|
|
36
|
+
const generator = json_schema_faker_1.JSONSchemaFaker.extend('faker', () => {
|
|
37
|
+
Object.assign(faker, {
|
|
38
|
+
date: proxyFakerDateModule(faker.date),
|
|
54
39
|
});
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
40
|
+
for (const item of [
|
|
41
|
+
//
|
|
42
|
+
...EmbeddedModules,
|
|
43
|
+
...(options.setupFakerModules || []),
|
|
44
|
+
]) {
|
|
45
|
+
const modules = item(faker);
|
|
46
|
+
Object.assign(faker, modules);
|
|
47
|
+
}
|
|
48
|
+
return faker;
|
|
49
|
+
});
|
|
50
|
+
generator.option(Object.assign(Object.assign({ alwaysFakeOptionals: true, refDepthMax: 1000 }, options), { resolveJsonPath: false, pruneProperties: PRUNE_PROPS }));
|
|
51
|
+
generator.format('iso-time', () => {
|
|
52
|
+
return (0, substr_1.substr)(faker.date.anytime(), 'T', '.');
|
|
59
53
|
});
|
|
54
|
+
const schema = validator.getSchema(source);
|
|
55
|
+
if (schema == null)
|
|
56
|
+
throw new Error(`Schema not found: ${source}`);
|
|
57
|
+
return generator.generate(schema, refs);
|
|
60
58
|
}
|
|
61
59
|
const EmbeddedModules = [
|
|
62
60
|
(faker) => ({
|
|
@@ -91,7 +89,8 @@ function fixJSONSchemaFakerQuirks(schema) {
|
|
|
91
89
|
if (schema.$ref) {
|
|
92
90
|
const { description, examples } = schema, rest = tslib_1.__rest(schema, ["description", "examples"]);
|
|
93
91
|
for (const key in rest) {
|
|
94
|
-
if (
|
|
92
|
+
if ((0, has_own_1.hasOwn)(rest, key)) {
|
|
93
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
95
94
|
rest[key] = fixJSONSchemaFakerQuirks(rest[key]);
|
|
96
95
|
}
|
|
97
96
|
}
|
|
@@ -102,7 +101,8 @@ function fixJSONSchemaFakerQuirks(schema) {
|
|
|
102
101
|
}
|
|
103
102
|
const result = {};
|
|
104
103
|
for (const key in schema) {
|
|
105
|
-
if (
|
|
104
|
+
if ((0, has_own_1.hasOwn)(schema, key)) {
|
|
105
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
106
106
|
result[key] = fixJSONSchemaFakerQuirks(schema[key]);
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake-generator.js","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fake-generator.js","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const guards_1 = require("@tsofist/stem/lib/number/guards");
|
|
5
5
|
const fake_generator_1 = require("./fake-generator");
|
|
6
6
|
const validator_1 = require("./validator");
|
|
7
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
|
|
7
8
|
describe('generateFakeData', () => {
|
|
8
9
|
const testSchema1 = {
|
|
9
10
|
$schema: 'http://json-schema.org/draft-07/schema#',
|
|
@@ -133,9 +134,9 @@ describe('generateFakeData', () => {
|
|
|
133
134
|
},
|
|
134
135
|
};
|
|
135
136
|
let validator;
|
|
136
|
-
beforeEach(() =>
|
|
137
|
+
beforeEach(() => {
|
|
137
138
|
validator = (0, validator_1.createSchemaForgeValidator)({ schemas: [testSchema1, testSchema2, testSchema3] }, true);
|
|
138
|
-
})
|
|
139
|
+
});
|
|
139
140
|
it('default behavior', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
140
141
|
{
|
|
141
142
|
const data = yield (0, fake_generator_1.generateFakeData)(validator, 'test-1#/definitions/Int');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake-generator.spec.js","sourceRoot":"","sources":["../src/fake-generator.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fake-generator.spec.js","sourceRoot":"","sources":["../src/fake-generator.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import '../util/patch.extended-annotations-reader';
|
|
1
2
|
import { SchemaObject } from 'ajv';
|
|
2
|
-
import { CompletedConfig } from 'ts-json-schema-generator';
|
|
3
|
+
import { ChainNodeParser, CompletedConfig, Context, SubNodeParser, TupleType } from 'ts-json-schema-generator';
|
|
4
|
+
import { Node, TupleTypeNode } from 'typescript';
|
|
3
5
|
import { TypeExposeKind } from './types';
|
|
4
6
|
interface Options {
|
|
5
7
|
tsconfig: string;
|
|
@@ -11,7 +13,15 @@ interface Options {
|
|
|
11
13
|
expose?: TypeExposeKind;
|
|
12
14
|
openAPI?: boolean;
|
|
13
15
|
sortObjectProperties?: boolean;
|
|
16
|
+
allowUseFallbackDescription?: boolean;
|
|
14
17
|
}
|
|
15
18
|
export declare function generateSchemaByDraftTypes(options: Options): Promise<SchemaObject>;
|
|
19
|
+
export declare class TupleTypeParser implements SubNodeParser {
|
|
20
|
+
protected readonly childNodeParser: ChainNodeParser;
|
|
21
|
+
protected readonly allowUseFallbackDescription: boolean | undefined;
|
|
22
|
+
constructor(childNodeParser: ChainNodeParser, allowUseFallbackDescription: boolean | undefined);
|
|
23
|
+
supportsNode(node: Node): boolean;
|
|
24
|
+
createType(node: TupleTypeNode, context: Context): TupleType;
|
|
25
|
+
}
|
|
16
26
|
export {};
|
|
17
27
|
//# sourceMappingURL=schema-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-generator.d.ts","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema-generator.d.ts","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"AAAA,OAAO,2CAA2C,CAAC;AAGnD,OAAY,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AACxC,OAAO,EAEH,eAAe,EACf,eAAe,EACf,OAAO,EAUP,aAAa,EACb,SAAS,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAIH,IAAI,EAEJ,aAAa,EAGhB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAA6D,cAAc,EAAE,MAAM,SAAS,CAAC;AAEpG,UAAU,OAAO;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,EAAE,MAAM,CAAC;IAChC,2BAA2B,EAAE,eAAe,CAAC;IAC7C,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAsDxF;AAED,qBAAa,eAAgB,YAAW,aAAa;IAE7C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACnD,SAAS,CAAC,QAAQ,CAAC,2BAA2B,EAAE,OAAO,GAAG,SAAS;gBADhD,eAAe,EAAE,eAAe,EAChC,2BAA2B,EAAE,OAAO,GAAG,SAAS;IAGvE,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIjC,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO;CAgBnD"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TupleTypeParser = void 0;
|
|
3
4
|
exports.generateSchemaByDraftTypes = generateSchemaByDraftTypes;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
6
|
+
require("../util/patch.extended-annotations-reader");
|
|
5
7
|
const error_1 = require("@tsofist/stem/lib/error");
|
|
6
|
-
const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
|
|
7
|
-
const compare_1 = require("@tsofist/stem/lib/string/compare");
|
|
8
8
|
const ajv_1 = require("ajv");
|
|
9
9
|
const ts_json_schema_generator_1 = require("ts-json-schema-generator");
|
|
10
10
|
const typescript_1 = require("typescript");
|
|
11
|
+
const sort_properties_1 = require("../util/sort-properties");
|
|
12
|
+
const tsc_1 = require("../util/tsc");
|
|
11
13
|
const types_1 = require("./types");
|
|
12
14
|
function generateSchemaByDraftTypes(options) {
|
|
13
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -20,10 +22,12 @@ function generateSchemaByDraftTypes(options) {
|
|
|
20
22
|
seen.add(name);
|
|
21
23
|
}
|
|
22
24
|
}
|
|
25
|
+
const allowUseFallbackDescription = options.allowUseFallbackDescription;
|
|
23
26
|
const generatorConfig = Object.assign(Object.assign(Object.assign(Object.assign({}, ts_json_schema_generator_1.DEFAULT_CONFIG), types_1.SG_CONFIG_DEFAULTS), { expose: (_a = options.expose) !== null && _a !== void 0 ? _a : types_1.SG_CONFIG_DEFAULTS.expose, path: `${options.sourcesDirectoryPattern}/*${types_1.TMP_FILES_SUFFIX}.ts`, tsconfig: options.tsconfig, discriminatorType: options.openAPI ? 'open-api' : ts_json_schema_generator_1.DEFAULT_CONFIG.discriminatorType }), types_1.SG_CONFIG_MANDATORY);
|
|
24
27
|
const generatorProgram = (0, ts_json_schema_generator_1.createProgram)(generatorConfig);
|
|
25
28
|
const typeChecker = generatorProgram.getTypeChecker();
|
|
26
29
|
const parser = (0, ts_json_schema_generator_1.createParser)(generatorProgram, options.sourcesTypesGeneratorConfig, (parser) => {
|
|
30
|
+
parser.addNodeParser(new TupleTypeParser(parser, allowUseFallbackDescription));
|
|
27
31
|
parser.addNodeParser(new ArrayLiteralExpressionIdentifierParser(typeChecker));
|
|
28
32
|
});
|
|
29
33
|
const formatter = (0, ts_json_schema_generator_1.createFormatter)(options.sourcesTypesGeneratorConfig);
|
|
@@ -38,9 +42,9 @@ function generateSchemaByDraftTypes(options) {
|
|
|
38
42
|
const schema = generator.createSchema(definitionName);
|
|
39
43
|
Object.assign(result.definitions, schema.definitions);
|
|
40
44
|
}
|
|
41
|
-
result.definitions = Object.fromEntries(Object.entries(result.definitions || {}).sort());
|
|
45
|
+
result.definitions = Object.fromEntries(Object.entries((result.definitions || {})).sort());
|
|
42
46
|
if (options.sortObjectProperties)
|
|
43
|
-
sortProperties(result.definitions);
|
|
47
|
+
(0, sort_properties_1.sortProperties)(result.definitions);
|
|
44
48
|
yield new ajv_1.default({
|
|
45
49
|
strict: true,
|
|
46
50
|
allErrors: true,
|
|
@@ -48,41 +52,30 @@ function generateSchemaByDraftTypes(options) {
|
|
|
48
52
|
return result;
|
|
49
53
|
});
|
|
50
54
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
if (isTarget(item)) {
|
|
71
|
-
item.properties = Object.fromEntries(Object.entries(item.properties).sort(([a], [b]) => (0, compare_1.compareStringsAsc)(a, b)));
|
|
72
|
-
if ((_a = item.required) === null || _a === void 0 ? void 0 : _a.length)
|
|
73
|
-
item.required.sort(compare_1.compareStringsAsc);
|
|
74
|
-
}
|
|
75
|
-
if (typeof item === 'object') {
|
|
76
|
-
stack.push(...Object.values(item));
|
|
55
|
+
class TupleTypeParser {
|
|
56
|
+
constructor(childNodeParser, allowUseFallbackDescription) {
|
|
57
|
+
this.childNodeParser = childNodeParser;
|
|
58
|
+
this.allowUseFallbackDescription = allowUseFallbackDescription;
|
|
59
|
+
}
|
|
60
|
+
supportsNode(node) {
|
|
61
|
+
return (0, typescript_1.isTupleTypeNode)(node);
|
|
62
|
+
}
|
|
63
|
+
createType(node, context) {
|
|
64
|
+
const items = node.elements.map((element) => {
|
|
65
|
+
const type = this.childNodeParser.createType(element, context);
|
|
66
|
+
if ((0, typescript_1.isNamedTupleMember)(element)) {
|
|
67
|
+
const description = (0, tsc_1.readJSDocDescription)(element, this.allowUseFallbackDescription);
|
|
68
|
+
const nullable = type instanceof ts_json_schema_generator_1.AnnotatedType ? type.isNullable() : false;
|
|
69
|
+
if (nullable)
|
|
70
|
+
console.log(description, nullable);
|
|
71
|
+
return description ? new ts_json_schema_generator_1.AnnotatedType(type, { description }, nullable) : type;
|
|
77
72
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
while (stack.length) {
|
|
82
|
-
process(stack.pop());
|
|
73
|
+
return type;
|
|
74
|
+
});
|
|
75
|
+
return new ts_json_schema_generator_1.TupleType(items);
|
|
83
76
|
}
|
|
84
|
-
return schema;
|
|
85
77
|
}
|
|
78
|
+
exports.TupleTypeParser = TupleTypeParser;
|
|
86
79
|
class ArrayLiteralExpressionIdentifierParser {
|
|
87
80
|
constructor(checker) {
|
|
88
81
|
this.checker = checker;
|
|
@@ -118,49 +111,4 @@ function getIdentifierLiteralValue(node, checker) {
|
|
|
118
111
|
}
|
|
119
112
|
return undefined;
|
|
120
113
|
}
|
|
121
|
-
function hasInheritDocTag(node) {
|
|
122
|
-
return ((0, typescript_1.getAllJSDocTags)(node, (tag) => {
|
|
123
|
-
return tag.tagName.text === 'inheritDoc';
|
|
124
|
-
}).length > 0);
|
|
125
|
-
}
|
|
126
|
-
{
|
|
127
|
-
// Support for @inheritDoc tag to enforce inheritance of annotations
|
|
128
|
-
const getAnnotations = ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations;
|
|
129
|
-
ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations = function getAnnotationsWithInheritance(node) {
|
|
130
|
-
var _a;
|
|
131
|
-
if (!hasInheritDocTag(node))
|
|
132
|
-
return getAnnotations.call(this, node);
|
|
133
|
-
const checker = this.typeChecker || (0, error_1.raise)('TypeChecker is not available');
|
|
134
|
-
const result = {};
|
|
135
|
-
if (!('ref' in result) &&
|
|
136
|
-
!('$ref' in result) &&
|
|
137
|
-
//
|
|
138
|
-
(0, typescript_1.isTypeAliasDeclaration)(node) &&
|
|
139
|
-
//
|
|
140
|
-
(0, typescript_1.isTypeReferenceNode)(node.type) &&
|
|
141
|
-
(0, typescript_1.isIdentifier)(node.type.typeName) &&
|
|
142
|
-
!(0, typescript_1.isUnionTypeNode)(node.type) &&
|
|
143
|
-
!(0, typescript_1.isIntersectionTypeNode)(node.type)) {
|
|
144
|
-
const alias = checker.getSymbolAtLocation(node.type.typeName);
|
|
145
|
-
const symbol = alias && typescript_1.SymbolFlags.Alias & alias.flags
|
|
146
|
-
? checker.getAliasedSymbol(alias)
|
|
147
|
-
: undefined;
|
|
148
|
-
const inheritedAnn = {};
|
|
149
|
-
if (symbol && ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
150
|
-
for (const declaration of symbol.declarations) {
|
|
151
|
-
const ann = getAnnotations.call(this, declaration);
|
|
152
|
-
if (ann)
|
|
153
|
-
Object.assign(inheritedAnn, ann);
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
Object.assign(result, inheritedAnn);
|
|
157
|
-
}
|
|
158
|
-
{
|
|
159
|
-
const ann = getAnnotations.call(this, node);
|
|
160
|
-
if (ann)
|
|
161
|
-
Object.assign(result, ann);
|
|
162
|
-
}
|
|
163
|
-
return (0, is_empty_1.isEmptyObject)(result) ? undefined : result;
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
114
|
//# sourceMappingURL=schema-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-generator.js","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema-generator.js","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types-generator.d.ts","sourceRoot":"","sources":["../../src/generator/types-generator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAkB,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"types-generator.d.ts","sourceRoot":"","sources":["../../src/generator/types-generator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAkB,MAAM,0CAA0C,CAAC;AAyC3F,OAAO,EACH,sBAAsB,EAIzB,MAAM,SAAS,CAAC;AAEjB,UAAU,OAAQ,SAAQ,sBAAsB;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B;AAaD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,OAAO;;;;;GAmH5D"}
|