progress check-in

package.json

@@ -11,6 +11,7 @@
     "test": "jest",
     "special": "ts-node src/index.ts '../../personal/Tangent-Mobile/api/entities/*.d.ts' -i -t -o ./schema/Tangent",
     "special2": "ts-node src/index.ts 'tests/comparisons/**/*.d.ts' -i -t -o ./schema/Tests/",
+    "zod": "ts-node src/index.ts 'tests/comparisons/single/zodStuff.ts' -i -t -o ./schema/Tests/ZodStuff.kt",
     "lint": "eslint . --ext .ts"
   },
   "author": "[email protected]",
@@ -31,15 +32,16 @@
     "nodemon": "^2.0.19",
     "prettier": "^2.4.1",
     "ts-jest": "^27.0.7",
-    "ts-node": "^10.4.0"
+    "ts-node": "^10.4.0",
+    "zod": "^3.23.4"
   },
   "dependencies": {
     "@typescript/vfs": "^1.4.0",
     "glob": "^7.2.0",
     "indent-string": "^4.0.0",
     "lodash": "^4.17.21",
     "promisify": "^0.0.3",
-    "yargs": "^17.2.1",
-    "typescript": "^4.4.4"
+    "typescript": "^4.4.4",
+    "yargs": "^17.2.1"
   }
 }

src/martok/Martok.ts

@@ -20,12 +20,14 @@ import { processSnakeCase } from "./processing/SnakeCase";
 import { processOldNames, sanitizeName } from "./processing/SanitizeNames";
 import { TypeExpander } from "./processing/TypeExpander";
 import { TsCompiler } from "./TsCompiler";
+import { ZodProcessor } from "./processing/ZodProcessor";
 
 type MartokState = {
   nameScope: string[];
   externalStatements: ts.Symbol[];
   additionalDeclarations: string[];
   typeReplacer: TypeReplacer;
+  zodProcessor: ZodProcessor;
 };
 
 export class Martok {
@@ -52,6 +54,9 @@ export class Martok {
   public get typeReplacer(): TypeReplacer {
     return this.storage.getStore()!.typeReplacer;
   }
+  public get zodProcessor(): ZodProcessor {
+    return this.storage.getStore()!.zodProcessor;
+  }
 
   private readonly storage;
   private readonly formatter;
@@ -116,6 +121,7 @@ export class Martok {
       externalStatements: [],
       additionalDeclarations: [],
       typeReplacer: new TypeReplacer(this),
+      zodProcessor: new ZodProcessor(this),
     };
     return this.storage.run(state, () => {
       const result = _(this.config.files)
@@ -195,7 +201,7 @@ export class Martok {
     let relativePath = path.resolve(path.dirname(file.fileName));
     if (relativePath.startsWith(this.config.sourceRoot)) {
       relativePath = relativePath.slice(this.config.sourceRoot.length);
-    } else {
+    } else if (!this.zodProcessor.isZodImport(file)) {
       throw new Error(
         `${file.fileName} is not within the given source root, it can't be included in this project.`
       );

src/martok/processing/ZodProcessor.ts

@@ -0,0 +1,14 @@
+import ts from "typescript";
+import { Martok } from "../Martok";
+
+export class ZodProcessor {
+  public constructor(private martok: Martok) {}
+
+  public isZodImport(file: ts.SourceFile): boolean {
+    return file.fileName.includes("/martok/node_modules/zod/lib/");
+  }
+
+  public isZodDeclaration(): boolean {
+    return true;
+  }
+}

tests/comparisons/single/zodStuff.ts

@@ -0,0 +1,9 @@
+import { z } from "zod";
+
+const FormData = z.object({
+  firstName: z.string().min(1).max(18),
+  lastName: z.string().min(1).max(18),
+  phone: z.string().min(10).max(14).optional(),
+  email: z.string().email(),
+  url: z.string().url().optional(),
+});