zodvex 0.7.1-beta.7 → 0.7.1-beta.8

package/dist/cli/index.js

@@ -250,9 +250,22 @@ function isNamespaceCall(obj) {
 function isLikelySchemaExpr(obj) {
   if (obj.match(/^z\.\w+\(/)) return true;
   if (obj.match(/^zx\.\w+\(/)) return true;
-  if (obj.match(/^z\.(optional|nullable)\(/)) return true;
   return false;
 }
+function isSchemaVariable(call, varName) {
+  const file = call.getSourceFile();
+  const varDecls = file.getDescendantsOfKind(SyntaxKind.VariableDeclaration);
+  let closestDecl;
+  for (const decl of varDecls) {
+    if (decl.getName() !== varName) continue;
+    if (decl.getStart() >= call.getStart()) continue;
+    closestDecl = decl;
+  }
+  if (!closestDecl) return false;
+  const init2 = closestDecl.getInitializer();
+  if (!init2) return false;
+  return isLikelySchemaExpr(init2.getText());
+}
 function isZodSchemaByType(call, typeChecker) {
   const expr = call.getExpression();
   if (expr.getKind() !== SyntaxKind.PropertyAccessExpression) return false;
@@ -322,6 +335,9 @@ function transformMethods(file, typeChecker) {
       } else {
         isSchema = isLikelySchemaExpr(obj);
       }
+      if (!isSchema && isSchemaVariable(call, obj.trim())) {
+        isSchema = true;
+      }
       if (!isSchema) continue;
       const argsStr = args.length > 0 ? `, ${args.join(", ")}` : "";
       call.replaceWithText(`z.${method}(${obj}${argsStr})`);
@@ -508,6 +524,38 @@ function transformClassRefs(file) {
       count++;
     }
   }
+  const importTypes = file.getDescendantsOfKind(SyntaxKind.ImportType);
+  for (const itn of importTypes) {
+    if (itn.wasForgotten()) continue;
+    const arg = itn.getArgument();
+    if (!arg) continue;
+    const argText = arg.getText();
+    const moduleSpec = argText.replace(/^['"]|['"]$/g, "");
+    if (moduleSpec !== "zod" && moduleSpec !== "zodvex/core") continue;
+    const qualifier = itn.getQualifier();
+    if (!qualifier) continue;
+    const qualText = qualifier.getText();
+    const miniKey = `z.${qualText}`;
+    const miniReplacement = MINI_CLASS_RENAMES[miniKey];
+    if (miniReplacement) {
+      const newQualifier = miniReplacement.replace("z.", "");
+      const typeArgs = itn.getTypeArguments();
+      const typeArgsStr = typeArgs.length > 0 ? `<${typeArgs.map((a) => a.getText()).join(", ")}>` : "";
+      itn.replaceWithText(`import('zod/mini').${newQualifier}${typeArgsStr}`);
+      count++;
+      continue;
+    }
+    const coreReplacement = CORE_CLASS_RENAMES[miniKey];
+    if (coreReplacement) {
+      const typeArgs = itn.getTypeArguments();
+      const typeArgsStr = typeArgs.length > 0 ? `<${typeArgs.map((a) => a.getText()).join(", ")}>` : "";
+      itn.replaceWithText(`import('zod/v4/core').${coreReplacement}${typeArgsStr}`);
+      count++;
+      continue;
+    }
+    itn.replaceWithText(`import('zod/mini').${qualText}${itn.getTypeArguments().length > 0 ? `<${itn.getTypeArguments().map((a) => a.getText()).join(", ")}>` : ""}`);
+    count++;
+  }
   for (const name of runtimeCoreImports) {
     typeOnlyCoreImports.delete(name);
   }