ts-runtime-validation 1.8.1 → 1.8.3
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 +38 -38
- package/dist/SchemaGenerator.js +37 -3
- package/dist/SchemaGenerator.js.map +1 -1
- package/dist/services/FileDiscovery.js +33 -2
- package/dist/services/FileDiscovery.js.map +1 -1
- package/dist/services/SchemaProcessor.js +77 -1
- package/dist/services/SchemaProcessor.js.map +1 -1
- package/dist/services/SchemaProcessor.test.js +197 -0
- package/dist/services/SchemaProcessor.test.js.map +1 -1
- package/package.json +1 -1
- package/src/SchemaGenerator.ts +44 -7
- package/src/services/FileDiscovery.ts +38 -6
- package/src/services/SchemaProcessor.test.ts +234 -0
- package/src/services/SchemaProcessor.ts +103 -2
|
@@ -353,6 +353,203 @@ describe("SchemaProcessor", () => {
|
|
|
353
353
|
expect(definitionKeys).toEqual(['Type1', 'Type10', 'Type2', 'TypeA']);
|
|
354
354
|
}));
|
|
355
355
|
});
|
|
356
|
+
describe("single-pass processing", () => {
|
|
357
|
+
it("should use single-pass when glob and rootPath are provided with multiple files", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
358
|
+
const file1 = yield createTestFile("user.jsonschema.ts", `
|
|
359
|
+
export interface IUser {
|
|
360
|
+
id: string;
|
|
361
|
+
name: string;
|
|
362
|
+
}
|
|
363
|
+
`);
|
|
364
|
+
const file2 = yield createTestFile("product.jsonschema.ts", `
|
|
365
|
+
export interface IProduct {
|
|
366
|
+
id: string;
|
|
367
|
+
title: string;
|
|
368
|
+
price: number;
|
|
369
|
+
}
|
|
370
|
+
`);
|
|
371
|
+
const processor = new SchemaProcessor_1.SchemaProcessor({
|
|
372
|
+
additionalProperties: false,
|
|
373
|
+
parallel: false,
|
|
374
|
+
verbose: false,
|
|
375
|
+
glob: "*.jsonschema.ts",
|
|
376
|
+
rootPath: testDir
|
|
377
|
+
});
|
|
378
|
+
const files = [
|
|
379
|
+
{ path: file1 },
|
|
380
|
+
{ path: file2 }
|
|
381
|
+
];
|
|
382
|
+
const schemaMap = yield processor.processFiles(files);
|
|
383
|
+
expect(schemaMap.size).toBe(2);
|
|
384
|
+
expect(schemaMap.has(file1)).toBe(true);
|
|
385
|
+
expect(schemaMap.has(file2)).toBe(true);
|
|
386
|
+
// Both files should have all definitions (single-pass partitioning)
|
|
387
|
+
const schema1 = schemaMap.get(file1);
|
|
388
|
+
const schema2 = schemaMap.get(file2);
|
|
389
|
+
expect(schema1.definitions.IUser).toBeDefined();
|
|
390
|
+
expect(schema1.definitions.IProduct).toBeDefined();
|
|
391
|
+
expect(schema2.definitions.IUser).toBeDefined();
|
|
392
|
+
expect(schema2.definitions.IProduct).toBeDefined();
|
|
393
|
+
}));
|
|
394
|
+
it("should fall back to per-file processing when duplicate type names exist", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
395
|
+
const file1 = yield createTestFile("a/types.jsonschema.ts", `
|
|
396
|
+
export interface IDuplicate {
|
|
397
|
+
id: string;
|
|
398
|
+
name: string;
|
|
399
|
+
}
|
|
400
|
+
`);
|
|
401
|
+
const file2 = yield createTestFile("b/types.jsonschema.ts", `
|
|
402
|
+
export interface IDuplicate {
|
|
403
|
+
id: string;
|
|
404
|
+
email: string;
|
|
405
|
+
}
|
|
406
|
+
`);
|
|
407
|
+
const processor = new SchemaProcessor_1.SchemaProcessor({
|
|
408
|
+
additionalProperties: false,
|
|
409
|
+
parallel: false,
|
|
410
|
+
verbose: false,
|
|
411
|
+
glob: "*.jsonschema.ts",
|
|
412
|
+
rootPath: testDir
|
|
413
|
+
});
|
|
414
|
+
const files = [
|
|
415
|
+
{ path: file1 },
|
|
416
|
+
{ path: file2 }
|
|
417
|
+
];
|
|
418
|
+
const schemaMap = yield processor.processFiles(files);
|
|
419
|
+
// Falls back to per-file: each file only has its own definitions
|
|
420
|
+
const schema1 = schemaMap.get(file1);
|
|
421
|
+
const schema2 = schemaMap.get(file2);
|
|
422
|
+
expect(schema1.definitions.IDuplicate).toBeDefined();
|
|
423
|
+
expect(schema2.definitions.IDuplicate).toBeDefined();
|
|
424
|
+
// The schemas should differ (different implementations)
|
|
425
|
+
expect(schema1.definitions.IDuplicate.properties.name).toBeDefined();
|
|
426
|
+
expect(schema2.definitions.IDuplicate.properties.email).toBeDefined();
|
|
427
|
+
}));
|
|
428
|
+
it("should not use single-pass for a single file", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
429
|
+
const file1 = yield createTestFile("user.jsonschema.ts", `
|
|
430
|
+
export interface IUser {
|
|
431
|
+
id: string;
|
|
432
|
+
name: string;
|
|
433
|
+
}
|
|
434
|
+
`);
|
|
435
|
+
const processor = new SchemaProcessor_1.SchemaProcessor({
|
|
436
|
+
additionalProperties: false,
|
|
437
|
+
parallel: false,
|
|
438
|
+
verbose: false,
|
|
439
|
+
glob: "*.jsonschema.ts",
|
|
440
|
+
rootPath: testDir
|
|
441
|
+
});
|
|
442
|
+
const files = [{ path: file1 }];
|
|
443
|
+
const schemaMap = yield processor.processFiles(files);
|
|
444
|
+
expect(schemaMap.size).toBe(1);
|
|
445
|
+
const schema = schemaMap.get(file1);
|
|
446
|
+
expect(schema.definitions.IUser).toBeDefined();
|
|
447
|
+
}));
|
|
448
|
+
it("should not use single-pass when glob is not provided", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
449
|
+
const file1 = yield createTestFile("user.jsonschema.ts", `
|
|
450
|
+
export interface IUser {
|
|
451
|
+
id: string;
|
|
452
|
+
name: string;
|
|
453
|
+
}
|
|
454
|
+
`);
|
|
455
|
+
const file2 = yield createTestFile("product.jsonschema.ts", `
|
|
456
|
+
export interface IProduct {
|
|
457
|
+
id: string;
|
|
458
|
+
title: string;
|
|
459
|
+
}
|
|
460
|
+
`);
|
|
461
|
+
const processor = new SchemaProcessor_1.SchemaProcessor({
|
|
462
|
+
additionalProperties: false,
|
|
463
|
+
parallel: false,
|
|
464
|
+
verbose: false
|
|
465
|
+
// no glob or rootPath
|
|
466
|
+
});
|
|
467
|
+
const files = [
|
|
468
|
+
{ path: file1 },
|
|
469
|
+
{ path: file2 }
|
|
470
|
+
];
|
|
471
|
+
const schemaMap = yield processor.processFiles(files);
|
|
472
|
+
expect(schemaMap.size).toBe(2);
|
|
473
|
+
// Per-file: each file only has its own definitions
|
|
474
|
+
const schema1 = schemaMap.get(file1);
|
|
475
|
+
expect(schema1.definitions.IUser).toBeDefined();
|
|
476
|
+
expect(schema1.definitions.IProduct).toBeUndefined();
|
|
477
|
+
}));
|
|
478
|
+
it("should include referenced types from non-schema files in single-pass output", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
479
|
+
yield createTestFile("shared/BaseType.ts", `
|
|
480
|
+
export interface IBaseType {
|
|
481
|
+
id: string;
|
|
482
|
+
}
|
|
483
|
+
`);
|
|
484
|
+
const file1 = yield createTestFile("a.jsonschema.ts", `
|
|
485
|
+
import { IBaseType } from "./shared/BaseType";
|
|
486
|
+
export interface ITypeA {
|
|
487
|
+
base: IBaseType;
|
|
488
|
+
}
|
|
489
|
+
`);
|
|
490
|
+
const file2 = yield createTestFile("b.jsonschema.ts", `
|
|
491
|
+
import { IBaseType } from "./shared/BaseType";
|
|
492
|
+
export interface ITypeB {
|
|
493
|
+
base: IBaseType;
|
|
494
|
+
}
|
|
495
|
+
`);
|
|
496
|
+
const processor = new SchemaProcessor_1.SchemaProcessor({
|
|
497
|
+
additionalProperties: false,
|
|
498
|
+
parallel: false,
|
|
499
|
+
verbose: false,
|
|
500
|
+
glob: "*.jsonschema.ts",
|
|
501
|
+
rootPath: testDir
|
|
502
|
+
});
|
|
503
|
+
const files = [
|
|
504
|
+
{ path: file1 },
|
|
505
|
+
{ path: file2 }
|
|
506
|
+
];
|
|
507
|
+
const schemaMap = yield processor.processFiles(files);
|
|
508
|
+
const mergedSchema = processor.mergeSchemas(schemaMap);
|
|
509
|
+
// IBaseType should appear in the merged output even though
|
|
510
|
+
// it's not directly in a .jsonschema.ts file
|
|
511
|
+
expect(mergedSchema.definitions.IBaseType).toBeDefined();
|
|
512
|
+
expect(mergedSchema.definitions.ITypeA).toBeDefined();
|
|
513
|
+
expect(mergedSchema.definitions.ITypeB).toBeDefined();
|
|
514
|
+
}));
|
|
515
|
+
it("should produce same merged schema whether using single-pass or per-file", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
516
|
+
const file1 = yield createTestFile("user.jsonschema.ts", `
|
|
517
|
+
export interface IUser {
|
|
518
|
+
id: string;
|
|
519
|
+
name: string;
|
|
520
|
+
}
|
|
521
|
+
`);
|
|
522
|
+
const file2 = yield createTestFile("product.jsonschema.ts", `
|
|
523
|
+
export interface IProduct {
|
|
524
|
+
id: string;
|
|
525
|
+
title: string;
|
|
526
|
+
price: number;
|
|
527
|
+
}
|
|
528
|
+
`);
|
|
529
|
+
const files = [
|
|
530
|
+
{ path: file1 },
|
|
531
|
+
{ path: file2 }
|
|
532
|
+
];
|
|
533
|
+
// Single-pass (with glob/rootPath)
|
|
534
|
+
const singlePassProcessor = new SchemaProcessor_1.SchemaProcessor({
|
|
535
|
+
additionalProperties: false,
|
|
536
|
+
parallel: false,
|
|
537
|
+
glob: "*.jsonschema.ts",
|
|
538
|
+
rootPath: testDir
|
|
539
|
+
});
|
|
540
|
+
const singlePassMap = yield singlePassProcessor.processFiles(files);
|
|
541
|
+
const singlePassMerged = singlePassProcessor.mergeSchemas(singlePassMap);
|
|
542
|
+
// Per-file (without glob/rootPath)
|
|
543
|
+
const perFileProcessor = new SchemaProcessor_1.SchemaProcessor({
|
|
544
|
+
additionalProperties: false,
|
|
545
|
+
parallel: false
|
|
546
|
+
});
|
|
547
|
+
const perFileMap = yield perFileProcessor.processFiles(files);
|
|
548
|
+
const perFileMerged = perFileProcessor.mergeSchemas(perFileMap);
|
|
549
|
+
// Merged schemas should be identical
|
|
550
|
+
expect(singlePassMerged).toStrictEqual(perFileMerged);
|
|
551
|
+
}));
|
|
552
|
+
});
|
|
356
553
|
describe("error handling", () => {
|
|
357
554
|
it("should handle missing files gracefully", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
358
555
|
const processor = new SchemaProcessor_1.SchemaProcessor({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaProcessor.test.js","sourceRoot":"","sources":["../../src/services/SchemaProcessor.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SchemaProcessor.test.js","sourceRoot":"","sources":["../../src/services/SchemaProcessor.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/SchemaGenerator.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { ICommandOptions } from "./ICommandOptions";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import { FileDiscovery } from "./services/FileDiscovery";
|
|
3
|
+
import { FileDiscovery, FileInfo } from "./services/FileDiscovery";
|
|
4
4
|
import { SchemaProcessor } from "./services/SchemaProcessor";
|
|
5
5
|
import { CodeGenerator } from "./services/CodeGenerator";
|
|
6
6
|
import { SchemaWriter } from "./services/SchemaWriter";
|
|
7
7
|
import { ProgressReporter } from "./utils/ProgressReporter";
|
|
8
8
|
import { formatError, isKnownError } from "./errors";
|
|
9
|
+
import { Schema } from "ts-json-schema-generator";
|
|
9
10
|
|
|
10
11
|
const validationSchemaFileName = "validation.schema.json";
|
|
11
12
|
const schemaDefinitionFileName = "SchemaDefinition.ts";
|
|
@@ -37,7 +38,9 @@ export class SchemaGenerator {
|
|
|
37
38
|
additionalProperties: options.additionalProperties,
|
|
38
39
|
tsconfigPath: options.tsconfigPath || undefined,
|
|
39
40
|
parallel: options.parallel !== false,
|
|
40
|
-
verbose: options.verbose || false
|
|
41
|
+
verbose: options.verbose || false,
|
|
42
|
+
glob: options.glob,
|
|
43
|
+
rootPath: options.rootPath
|
|
41
44
|
});
|
|
42
45
|
|
|
43
46
|
this.codeGenerator = new CodeGenerator({
|
|
@@ -67,17 +70,51 @@ export class SchemaGenerator {
|
|
|
67
70
|
// Discover files
|
|
68
71
|
this.progressReporter.update(0, "Discovering files...");
|
|
69
72
|
const files = await this.fileDiscovery.discoverFiles();
|
|
70
|
-
|
|
73
|
+
|
|
71
74
|
if (this.options.verbose) {
|
|
72
75
|
console.log(`Found ${files.length} schema file(s)`);
|
|
73
76
|
files.forEach(file => console.log(` - ${file.path}`));
|
|
74
77
|
}
|
|
75
|
-
|
|
78
|
+
|
|
79
|
+
// Separate changed and unchanged files when caching is enabled
|
|
80
|
+
const cacheEnabled = this.options.cache || false;
|
|
81
|
+
let filesToProcess: FileInfo[];
|
|
82
|
+
const cachedSchemas = new Map<string, Schema>();
|
|
83
|
+
|
|
84
|
+
if (cacheEnabled) {
|
|
85
|
+
filesToProcess = files.filter(f => f.changed !== false);
|
|
86
|
+
const unchangedFiles = files.filter(f => f.changed === false);
|
|
87
|
+
for (const file of unchangedFiles) {
|
|
88
|
+
const cached = this.fileDiscovery.getCachedSchema(file.path);
|
|
89
|
+
if (cached) {
|
|
90
|
+
cachedSchemas.set(file.path, cached as Schema);
|
|
91
|
+
} else {
|
|
92
|
+
// No cached schema available, must reprocess
|
|
93
|
+
filesToProcess.push(file);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (this.options.verbose) {
|
|
97
|
+
console.log(`Cache: ${cachedSchemas.size} unchanged, ${filesToProcess.length} to process`);
|
|
98
|
+
}
|
|
99
|
+
} else {
|
|
100
|
+
filesToProcess = files;
|
|
101
|
+
}
|
|
102
|
+
|
|
76
103
|
// Process schemas
|
|
77
104
|
this.progressReporter.update(1, "Processing TypeScript files...");
|
|
78
|
-
this.progressReporter.options.total =
|
|
79
|
-
|
|
80
|
-
const
|
|
105
|
+
this.progressReporter.options.total = filesToProcess.length + 4; // files + 4 generation steps
|
|
106
|
+
|
|
107
|
+
const processedSchemas = filesToProcess.length > 0
|
|
108
|
+
? await this.schemaProcessor.processFiles(filesToProcess)
|
|
109
|
+
: new Map<string, Schema>();
|
|
110
|
+
|
|
111
|
+
// Merge processed and cached schemas
|
|
112
|
+
const schemaMap = new Map<string, Schema>([...cachedSchemas, ...processedSchemas]);
|
|
113
|
+
|
|
114
|
+
// Save all schemas to cache for next run
|
|
115
|
+
if (cacheEnabled) {
|
|
116
|
+
await this.fileDiscovery.saveSchemasToCache(schemaMap);
|
|
117
|
+
}
|
|
81
118
|
|
|
82
119
|
if (schemaMap.size === 0) {
|
|
83
120
|
console.log("No types found to generate schemas for");
|
|
@@ -16,17 +16,19 @@ export interface FileInfo {
|
|
|
16
16
|
path: string;
|
|
17
17
|
hash?: string;
|
|
18
18
|
lastModified?: Date;
|
|
19
|
+
changed?: boolean;
|
|
19
20
|
}
|
|
20
21
|
|
|
21
22
|
export class FileDiscovery {
|
|
22
23
|
private cacheFile: string;
|
|
24
|
+
private schemaCacheFile: string;
|
|
23
25
|
private fileCache: Map<string, string> = new Map();
|
|
26
|
+
private schemaCache: Map<string, object> = new Map();
|
|
24
27
|
|
|
25
28
|
constructor(private options: FileDiscoveryOptions) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
);
|
|
29
|
+
const cacheDir = options.cachePath || ".ts-runtime-validation-cache";
|
|
30
|
+
this.cacheFile = path.join(cacheDir, "file-hashes.json");
|
|
31
|
+
this.schemaCacheFile = path.join(cacheDir, "schema-cache.json");
|
|
30
32
|
if (options.cacheEnabled) {
|
|
31
33
|
this.loadCache();
|
|
32
34
|
}
|
|
@@ -75,14 +77,16 @@ export class FileDiscovery {
|
|
|
75
77
|
files.map(async (filePath) => {
|
|
76
78
|
const stats = await fs.promises.stat(filePath);
|
|
77
79
|
const hash = await this.getFileHash(filePath);
|
|
80
|
+
const cachedHash = this.fileCache.get(filePath);
|
|
78
81
|
return {
|
|
79
82
|
path: filePath,
|
|
80
83
|
hash,
|
|
81
|
-
lastModified: stats.mtime
|
|
84
|
+
lastModified: stats.mtime,
|
|
85
|
+
changed: cachedHash !== hash
|
|
82
86
|
};
|
|
83
87
|
})
|
|
84
88
|
);
|
|
85
|
-
|
|
89
|
+
|
|
86
90
|
await this.saveCache(enrichedFiles);
|
|
87
91
|
return enrichedFiles;
|
|
88
92
|
}
|
|
@@ -97,6 +101,23 @@ export class FileDiscovery {
|
|
|
97
101
|
return cachedHash !== currentHash;
|
|
98
102
|
}
|
|
99
103
|
|
|
104
|
+
public getCachedSchema(filePath: string): object | undefined {
|
|
105
|
+
return this.schemaCache.get(filePath);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
public async saveSchemasToCache(schemas: Map<string, object>): Promise<void> {
|
|
109
|
+
const cacheDir = path.dirname(this.schemaCacheFile);
|
|
110
|
+
if (!fs.existsSync(cacheDir)) {
|
|
111
|
+
await fs.promises.mkdir(cacheDir, { recursive: true });
|
|
112
|
+
}
|
|
113
|
+
const data: Record<string, object> = {};
|
|
114
|
+
for (const [key, value] of schemas) {
|
|
115
|
+
data[key] = value;
|
|
116
|
+
this.schemaCache.set(key, value);
|
|
117
|
+
}
|
|
118
|
+
await fs.promises.writeFile(this.schemaCacheFile, JSON.stringify(data));
|
|
119
|
+
}
|
|
120
|
+
|
|
100
121
|
private loadCache(): void {
|
|
101
122
|
try {
|
|
102
123
|
if (fs.existsSync(this.cacheFile)) {
|
|
@@ -105,9 +126,16 @@ export class FileDiscovery {
|
|
|
105
126
|
);
|
|
106
127
|
this.fileCache = new Map(Object.entries(cacheData));
|
|
107
128
|
}
|
|
129
|
+
if (fs.existsSync(this.schemaCacheFile)) {
|
|
130
|
+
const schemaData = JSON.parse(
|
|
131
|
+
fs.readFileSync(this.schemaCacheFile, 'utf-8')
|
|
132
|
+
);
|
|
133
|
+
this.schemaCache = new Map(Object.entries(schemaData));
|
|
134
|
+
}
|
|
108
135
|
} catch (error) {
|
|
109
136
|
console.warn('Failed to load cache, starting fresh');
|
|
110
137
|
this.fileCache.clear();
|
|
138
|
+
this.schemaCache.clear();
|
|
111
139
|
}
|
|
112
140
|
}
|
|
113
141
|
|
|
@@ -133,8 +161,12 @@ export class FileDiscovery {
|
|
|
133
161
|
|
|
134
162
|
public clearCache(): void {
|
|
135
163
|
this.fileCache.clear();
|
|
164
|
+
this.schemaCache.clear();
|
|
136
165
|
if (fs.existsSync(this.cacheFile)) {
|
|
137
166
|
fs.unlinkSync(this.cacheFile);
|
|
138
167
|
}
|
|
168
|
+
if (fs.existsSync(this.schemaCacheFile)) {
|
|
169
|
+
fs.unlinkSync(this.schemaCacheFile);
|
|
170
|
+
}
|
|
139
171
|
}
|
|
140
172
|
}
|