klass generator nonstatic

asarazan · Apr 29, 2024 · 8806339 · 8806339
1 parent e3886c4
commit 8806339
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/martok/declarations/DeclarationGenerator.ts b/src/martok/declarations/DeclarationGenerator.ts
@@ -19,7 +19,7 @@ export class DeclarationGenerator {
 
   private generateDeclaration(node: Statement): (Klass | string)[] {
     try {
-      if (!KlassGenerator.isSupportedDeclaration(node)) {
+      if (!this.klasses.isSupportedDeclaration(node)) {
         return [];
       }
       const result = [this.klasses.generate(node)];

diff --git a/src/martok/declarations/KlassGenerator.ts b/src/martok/declarations/KlassGenerator.ts
@@ -54,9 +54,7 @@ export class KlassGenerator {
     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 @@ export class KlassGenerator {
     }
     try {
       let name = options?.forceName;
-      if (!name && KlassGenerator.isSupportedDeclaration(node)) {
+      if (!name && this.isSupportedDeclaration(node)) {
         name = node.name.escapedText.toString()!;
       }
       if (!name) {
@@ -250,7 +248,7 @@ export class KlassGenerator {
       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}`);

diff --git a/src/martok/processing/ZodProcessor.ts b/src/martok/processing/ZodProcessor.ts
@@ -1,4 +1,4 @@
-import ts from "typescript";
+import ts, { isVariableStatement } from "typescript";
 import { Martok } from "../Martok";
 
 export class ZodProcessor {
@@ -8,7 +8,7 @@ export class ZodProcessor {
     return file.fileName.includes("/martok/node_modules/zod/lib/");
   }
 
-  public isZodDeclaration(): boolean {
-    return true;
+  public isZodStatement(node: ts.Node): boolean {
+    return true; // TODO
   }
 }