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

@@ -173,10 +173,10 @@ export class Martok {
         declarations: [],
       },
     };
+    const statements = [...file.statements];
     base.text.declarations.push(
-      ...this.declarations.generateDeclarations(file)
+      ...this.declarations.generateDeclarations(statements)
     );
-    const statements = [...file.statements];
     const symbols = [...this.externalSymbols];
     const imports = _.uniq([
       ...this.imports.generateImports(statements),

src/martok/declarations/DeclarationGenerator.ts

@@ -11,15 +11,15 @@ export class DeclarationGenerator {
 
   public constructor(private readonly martok: Martok) {}
 
-  public generateDeclarations(file: SourceFile): (Klass | string)[] {
+  public generateDeclarations(statements: Statement[]): (Klass | string)[] {
     return _.compact(
-      file.statements.flatMap((value) => this.generateDeclaration(value))
+      statements.flatMap((value) => this.generateDeclaration(value))
     );
   }
 
   private generateDeclaration(node: Statement): (Klass | string)[] {
     try {
-      if (!KlassGenerator.isSupportedDeclaration(node)) {
+      if (!this.klasses.isSupportedDeclaration(node)) {
         return [];
       }
       const result = [this.klasses.generate(node)];

src/martok/declarations/KlassGenerator.ts

@@ -54,9 +54,7 @@
     this.tagged = new TaggedUnionGenerator(this.martok);
   }
 
-  public static isSupportedDeclaration(
-    node: Node
-  ): node is SupportedDeclaration {
+  public isSupportedDeclaration(node: Node): node is SupportedDeclaration {
     return (
       isTypeAliasDeclaration(node) ||
       isInterfaceDeclaration(node) ||
@@ -96,7 +94,7 @@
     }
     try {
       let name = options?.forceName;
-      if (!name && KlassGenerator.isSupportedDeclaration(node)) {
+      if (!name && this.isSupportedDeclaration(node)) {
         name = node.name.escapedText.toString()!;
       }
       if (!name) {
@@ -250,9 +248,9 @@
       if (isPropertySignature(value)) {
         return this.generateProperty(value);
       }
-      if (KlassGenerator.isSupportedDeclaration(value)) {
+      if (this.isSupportedDeclaration(value)) {
         return this.generate(value) as Klass;
       }
       throw new Error(`Can't handle inner type ${value.kind}`);
     });
   }

src/martok/processing/TypeExpander.ts

@@ -2,6 +2,7 @@
 import { hasTypeArguments } from "../../typescript/utils";
 import { Martok } from "../Martok";
 import { extractJsDocs, insertJsDocs, JsDocProperty } from "./Comments";
+import { ZodProcessor } from "./ZodProcessor";
 
 type ExpandFile = {
   fileName: string;
@@ -15,7 +16,10 @@
 };
 
 export class TypeExpander {
-  public constructor(private martok: Martok) {}
+  private zodProcessor: ZodProcessor;
+  public constructor(private martok: Martok) {
+    this.zodProcessor = new ZodProcessor(martok);
+  }
 
   private shouldIgnore(statement: Statement): boolean {
     return (
@@ -26,6 +30,7 @@
   }
 
   private shouldExpand(statement: Statement): boolean {
+    if (this.zodProcessor.shouldExpand(statement)) return true;
     if (!ts.isTypeAliasDeclaration(statement)) return false;
 
     const hasFlattenTag =
@@ -106,8 +111,11 @@
     if (this.shouldIgnore(statement)) return "";
     if (!this.shouldExpand(statement)) return statement.getFullText();
 
+    const type =
+      this.zodProcessor.getType(statement) ??
+      this.martok.checker.getTypeAtLocation(statement);
     const newExpandedType = this.martok.checker.typeToString(
-      this.martok.checker.getTypeAtLocation(statement),
+      type,
       statement,
       ts.TypeFormatFlags.InTypeAlias |
         ts.TypeFormatFlags.NoTypeReduction |

src/martok/processing/ZodProcessor.ts

@@ -0,0 +1,24 @@
+import ts, { isVariableDeclaration, isVariableStatement } from "typescript";
+import { Martok } from "../Martok";
+
+export class ZodProcessor {
+  public constructor(private martok: Martok) {}
+
+  public getType(statement: ts.Statement): ts.Type | undefined {
+    if (!isVariableStatement(statement)) return undefined;
+    try {
+      const decl = statement.declarationList.declarations[0];
+      if (!isVariableDeclaration(decl)) return undefined;
+      const type = this.martok.checker.getTypeAtLocation(decl);
+      const symbol = type.aliasSymbol ?? type.symbol;
+      return symbol.getEscapedName() === "ZodObject" ? type : undefined;
+    } catch (e: unknown) {
+      console.error(e);
+      return undefined;
+    }
+  }
+
+  public shouldExpand(statement: ts.Statement) {
+    return this.getType(statement) !== undefined;
+  }
+}

tests/comparisons/single/zodStuff.ts

@@ -0,0 +1,19 @@
+import { z } from "zod";
+
+export 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(),
+});
+
+/**
+ * @expand
+ */
+export type FormDataType = typeof FormData.shape;
+
+/**
+ * @expand
+ */
+export type Inferred = z.infer<typeof FormData>;