update typescript

Author: jfrconley

package.json

@@ -67,8 +67,8 @@
     "jest": "^29.7.0",
     "jest-html-reporters": "^3.1.5",
     "jest-junit": "^16.0.0",
-    "ts-patch": "^3.1.1",
-    "typescript": "^5.3.3"
+    "ts-patch": "^3.1.2",
+    "typescript": "^5.4.2"
   },
   "tsp": {
     "name": "ts-json-schema-transformer",

pnpm-lock.yaml

@@ -1,4 +1,5 @@
 import { createFormatter, createParser, SchemaGenerator } from "ts-json-schema-generator";
+import { ts as schemaGeneratorTs } from "ts-json-schema-generator";
 import * as ts from "typescript";
 import { AJV_DEFAULTS, AJVOptions, IOptions, IProject, SCHEMA_DEFAULTS, SchemaConfig } from "./project.js";
 import { FileTransformer } from "./transformers/file-transformer.js";
@@ -39,22 +40,27 @@ export default function transform(program: ts.Program, options: IOptions = {}):
     allErrors: allErrors || AJV_DEFAULTS.allErrors,
   };
 
-  const nodeParser = createParser(program, {
+  const nodeParser = createParser(program as schemaGeneratorTs.Program, {
     ...schemaConfig,
   });
   const typeFormatter = createFormatter({
     ...schemaConfig,
   });
 
-  const schemaGenerator = new SchemaGenerator(program, nodeParser, typeFormatter, schemaConfig);
+  const schemaGenerator = new SchemaGenerator(
+    program as schemaGeneratorTs.Program,
+    nodeParser,
+    typeFormatter,
+    schemaConfig,
+  );
   const project: IProject = {
     checker: program.getTypeChecker(),
     options: {
       schema: schemaConfig,
       validation: validationConfig,
     },
     program,
-    nodeParser: createParser(program, schemaConfig),
+    nodeParser: createParser(program as schemaGeneratorTs.Program, schemaConfig),
     schemaGenerator,
     typeFormatter: createFormatter(schemaConfig),
   };

src/transform.ts

@@ -1,3 +1,4 @@
+import { ts as schemaGeneratorTs } from "ts-json-schema-generator";
 import * as ts from "typescript";
 import { IProject } from "../project.js";
 import { schemaToValidator } from "../transformer-utils.js";
@@ -14,7 +15,7 @@ export abstract class AssertValidTransformer {
         `Error on getSchema: non-specified generic argument.`,
       );
     }
-    const schema = project.schemaGenerator.createSchemaFromNodes([node]);
+    const schema = project.schemaGenerator.createSchemaFromNodes([node as schemaGeneratorTs.Node]);
     const validatorCallExp = schemaToValidator(schema, project.options.validation);
     const validationAssertionIdentifier = FileTransformer.getOrCreateImport(
       expression.getSourceFile(),

src/transformers/assert-valid-transformer.ts

@@ -28,7 +28,6 @@ export abstract class FileTransformer {
       file.libReferenceDirectives,
     );
 
-    FileTransformer.FILE_NODE_MAP.delete(file.fileName);
     FileTransformer.IMPORT_MAP.delete(file.fileName);
     return updated;
   }

src/transformers/file-transformer.ts

@@ -1,6 +1,7 @@
 import { JSONSchema7 } from "json-schema";
 
 const { JSONSchemaFaker: jsf } = require("json-schema-faker");
+import { ts as schemaGeneratorTs } from "ts-json-schema-generator";
 import * as ts from "typescript";
 import { IProject } from "../project.js";
 import { addFormatsJsf, convertValueToExpression, derefJSONSchemaRoot, getGenericArg } from "./utils.js";
@@ -17,7 +18,7 @@ export abstract class GetMockObjectTransformer {
       );
     }
 
-    const schema = derefJSONSchemaRoot(project.schemaGenerator.createSchemaFromNodes([node]));
+    const schema = derefJSONSchemaRoot(project.schemaGenerator.createSchemaFromNodes([node as schemaGeneratorTs.Node]));
 
     return convertValueToExpression(jsf.generate(schema as JSONSchema7));
   }

src/transformers/get-mock-object-transformer.ts

@@ -1,3 +1,4 @@
+import { ts as schemaGeneratorTs } from "ts-json-schema-generator";
 import * as ts from "typescript";
 import { IProject } from "../project.js";
 import { convertObjectToLiteralExpression, getGenericArg } from "./utils.js";
@@ -12,7 +13,7 @@ export abstract class GetSchemaTransformer {
       );
     }
 
-    const schema = project.schemaGenerator.createSchemaFromNodes([node]);
+    const schema = project.schemaGenerator.createSchemaFromNodes([node as schemaGeneratorTs.Node]);
     return convertObjectToLiteralExpression(schema as Record<string, unknown>);
   }
 }

src/transformers/get-schema-transformer.ts

@@ -1,3 +1,4 @@
+import { ts as schemaGeneratorTs } from "ts-json-schema-generator";
 import * as ts from "typescript";
 import { IProject } from "../project.js";
 import { schemaToValidator } from "../transformer-utils";
@@ -17,7 +18,7 @@ export abstract class ValidateTransformer {
       );
     }
 
-    const schema = project.schemaGenerator.createSchemaFromNodes([node]);
+    const schema = project.schemaGenerator.createSchemaFromNodes([node as schemaGeneratorTs.Node]);
 
     return schemaToValidator(schema, project.options.validation);
   }