zodvex 0.7.1 → 0.7.2-beta.0

package/dist/cli/index.js

@@ -3,6 +3,7 @@ import fs2, { readFileSync, writeFileSync, existsSync } from 'fs';
 import path3, { resolve, relative, join } from 'path';
 import { Project, SyntaxKind } from 'ts-morph';
 import { globSync } from 'tinyglobby';
+import { pathToFileURL } from 'url';
 import { z } from 'zod';
 import { $ZodCodec, $ZodNumber, $ZodCustom, $ZodType, $ZodOptional, $ZodNullable, $ZodObject, $ZodUnion, $ZodArray, $ZodRecord, $ZodTuple, clone, $ZodString, $ZodBoolean, $ZodNull, $ZodUndefined, $ZodAny, $ZodEnum, $ZodLiteral, $ZodDiscriminatedUnion } from 'zod/v4/core';
 import 'convex/values';
@@ -318,7 +319,7 @@ function getMethodName(call) {
   if (expr.getKind() !== SyntaxKind.PropertyAccessExpression) return null;
   return expr.getName();
 }
-function transformWrappers(file) {
+function transformWrappers(file, typeChecker) {
   let count = 0;
   const calls = file.getDescendantsOfKind(SyntaxKind.CallExpression).reverse();
   for (const call of calls) {
@@ -328,6 +329,18 @@ function transformWrappers(file) {
     if (call.getArguments().length > 0) continue;
     const obj = getCallObject(call);
     if (!obj) continue;
+    if (isNamespaceCall(obj)) continue;
+    let isSchema;
+    if (typeChecker) {
+      const typeResult = isZodSchemaByType(call, typeChecker);
+      isSchema = typeResult === true || typeResult === null && isLikelySchemaExpr(obj);
+    } else {
+      isSchema = isLikelySchemaExpr(obj);
+    }
+    if (!isSchema && isSchemaVariable(call, obj.trim())) {
+      isSchema = true;
+    }
+    if (!isSchema) continue;
     call.replaceWithText(`z.${method}(${obj})`);
     count++;
   }
@@ -337,8 +350,9 @@ function isNamespaceCall(obj) {
   return NAMESPACE_IDENTIFIERS.has(obj.trim());
 }
 function isLikelySchemaExpr(obj) {
-  if (obj.match(/^z\.\w+\(/)) return true;
-  if (obj.match(/^zx\.\w+\(/)) return true;
+  const normalized = obj.trim().replace(/^\(+/, "").replace(/\s+as\s+[\w$<>,\s|&[\]]+\)*\s*$/, "").trim();
+  if (normalized.match(/^z\.\w+\(/)) return true;
+  if (normalized.match(/^zx\.\w+\(/)) return true;
   return false;
 }
 function isSchemaVariable(call, varName) {
@@ -561,6 +575,17 @@ function findObjectOnlyMethods(file) {
   }
   return results;
 }
+function ensureZImport(file) {
+  const text = file.getFullText();
+  if (!/\bz\./.test(text)) return;
+  const hasZImport = file.getImportDeclarations().some((imp) => imp.getNamedImports().some((n) => n.getName() === "z"));
+  if (hasZImport) return;
+  if (/^\s*(?:const|let|var)\s+z\s*[=:]/m.test(text)) return;
+  file.addImportDeclaration({
+    moduleSpecifier: "zod/mini",
+    namedImports: [{ name: "z" }]
+  });
+}
 function transformImports(file) {
   let count = 0;
   const imports = file.getImportDeclarations();
@@ -708,7 +733,7 @@ function transformFile(file, typeChecker) {
   let propertyAccessors = 0;
   for (let i = 0; i < 10; i++) {
     const cr = transformConstructorReplacements(file);
-    const w = transformWrappers(file);
+    const w = transformWrappers(file, typeChecker);
     const c = transformChecks(file);
     const m = transformMethods(file, typeChecker);
     const pa = transformPropertyAccessors(file, typeChecker);
@@ -722,6 +747,7 @@ function transformFile(file, typeChecker) {
   const classRefs = transformClassRefs(file);
   const objectOnlyWarnings = findObjectOnlyMethods(file);
   const propertyAccessWarnings = findInternalPropertyAccess(file, typeChecker);
+  ensureZImport(file);
   const imports = 0;
   return {
     filePath,
@@ -1368,6 +1394,7 @@ function findCodec(schema) {
 }
 
 // src/public/codegen/discover.ts
+var discoveryRunCounter = 0;
 function walkSchemaRecursive(schema, accessPath, visited, seenCodecs, results) {
   if (visited.has(schema)) return;
   visited.add(schema);
@@ -1505,7 +1532,7 @@ function walkFunctionCodecs(functions) {
   }
   return found;
 }
-async function discoverModules(convexDir2) {
+async function discoverModules(convexDir2, options) {
   const models = [];
   const functions = [];
   const codecs = [];
@@ -1528,13 +1555,19 @@ async function discoverModules(convexDir2) {
       "crons.ts",
       "crons.js"
     ]
-  });
+  }).sort();
+  let cacheKey = null;
+  if (options?.freshImports) {
+    discoveryRunCounter += 1;
+    cacheKey = `${process.pid}-${discoveryRunCounter}`;
+  }
   try {
     for (const file of files) {
       const absPath = path3.resolve(convexDir2, file);
+      const importUrl = cacheKey ? `${pathToFileURL(absPath).href}?t=${cacheKey}` : absPath;
       let moduleExports;
       try {
-        moduleExports = await import(absPath);
+        moduleExports = await import(importUrl);
       } catch (err) {
         console.warn(`[zodvex] Warning: Failed to import ${file}:`, err.message);
         continue;
@@ -1689,7 +1722,32 @@ var HEADER = `// AUTO-GENERATED by zodvex \u2014 do not edit
 `;
 function fingerprintCodec(schema) {
   if (!(schema instanceof $ZodCodec)) return "";
-  return `${zodToSource(schema._zod.def.in)}|${zodToSource(schema._zod.def.out)}`;
+  return `${fingerprintLeaf(schema._zod.def.in)}|${fingerprintLeaf(schema._zod.def.out)}`;
+}
+function fingerprintLeaf(schema) {
+  return `${zodToSource(schema)}#${fingerprintChecks(schema)}`;
+}
+function fingerprintChecks(schema) {
+  const checks = schema?._zod?.def?.checks;
+  if (!Array.isArray(checks) || checks.length === 0) return "";
+  const parts = [];
+  for (const check of checks) {
+    const def = check?._zod?.def;
+    if (!def) continue;
+    const checkType = def.check ?? def.type ?? "check";
+    const data = {};
+    for (const [k, v7] of Object.entries(def)) {
+      if (k === "check" || k === "type" || k === "error" || k === "message") continue;
+      const t = typeof v7;
+      if (t === "string" || t === "number" || t === "boolean" || v7 === null) {
+        data[k] = v7;
+      } else if (v7 instanceof RegExp) {
+        data[k] = v7.source;
+      }
+    }
+    parts.push(`${checkType}(${JSON.stringify(data)})`);
+  }
+  return parts.sort().join("&");
 }
 function generateSchemaFile(models) {
   const exports$1 = models.map((m) => {
@@ -1776,6 +1834,30 @@ function deriveCodecVarName(modelExportName, accessPath) {
   return `_${prefix}${fieldPart[0].toUpperCase() + fieldPart.slice(1)}`;
 }
 function generateApiFile(functions, models, codecs, modelCodecs, functionCodecs, options) {
+  const sortedModels = [...models].sort(
+    (a, b) => `${a.sourceFile}|${a.exportName}`.localeCompare(`${b.sourceFile}|${b.exportName}`)
+  );
+  const sortedFunctions = [...functions].sort(
+    (a, b) => a.functionPath.localeCompare(b.functionPath)
+  );
+  const sortedCodecs = codecs ? [...codecs].sort(
+    (a, b) => `${a.sourceFile}|${a.exportName}`.localeCompare(`${b.sourceFile}|${b.exportName}`)
+  ) : void 0;
+  const sortedModelCodecs = modelCodecs ? [...modelCodecs].sort(
+    (a, b) => `${a.modelSourceFile}|${a.modelExportName}|${a.schemaKey}|${a.accessPath}`.localeCompare(
+      `${b.modelSourceFile}|${b.modelExportName}|${b.schemaKey}|${b.accessPath}`
+    )
+  ) : void 0;
+  const sortedFunctionCodecs = functionCodecs ? [...functionCodecs].sort(
+    (a, b) => `${a.functionSourceFile}|${a.functionExportName}|${a.schemaSource}|${a.accessPath}`.localeCompare(
+      `${b.functionSourceFile}|${b.functionExportName}|${b.schemaSource}|${b.accessPath}`
+    )
+  ) : void 0;
+  models = sortedModels;
+  functions = sortedFunctions;
+  codecs = sortedCodecs;
+  modelCodecs = sortedModelCodecs;
+  functionCodecs = sortedFunctionCodecs;
   const identityMap = /* @__PURE__ */ new Map();
   const neededModelImports = /* @__PURE__ */ new Set();
   for (const model of models) {
@@ -1859,20 +1941,49 @@ function generateApiFile(functions, models, codecs, modelCodecs, functionCodecs,
   }
   if (functionCodecs) {
     const fingerprintMap = /* @__PURE__ */ new Map();
+    const codecSchemaToSourceFile = /* @__PURE__ */ new Map();
+    for (const c of codecs ?? []) {
+      codecSchemaToSourceFile.set(c.schema, c.sourceFile);
+    }
+    for (const mc of modelCodecs ?? []) {
+      codecSchemaToSourceFile.set(mc.codec, mc.modelSourceFile);
+    }
     for (const [codecSchema, ref] of codecMap) {
       const fp = fingerprintCodec(codecSchema);
-      if (fp) fingerprintMap.set(fp, ref);
+      if (!fp) continue;
+      const sourceFile = codecSchemaToSourceFile.get(codecSchema);
+      const existing = fingerprintMap.get(fp);
+      if (existing) {
+        existing.push({ ref, sourceFile });
+      } else {
+        fingerprintMap.set(fp, [{ ref, sourceFile }]);
+      }
     }
     for (const fc of functionCodecs) {
       if (codecMap.has(fc.codec)) continue;
       const fp = fingerprintCodec(fc.codec);
-      const matchingRef = fp ? fingerprintMap.get(fp) : void 0;
-      if (matchingRef) {
-        codecMap.set(fc.codec, matchingRef);
-      } else {
+      const candidates = fp ? fingerprintMap.get(fp) : void 0;
+      if (!candidates || candidates.length === 0) {
         console.warn(
           `[zodvex] Warning: Codec in ${fc.functionExportName}() (${fc.accessPath}) has no matching model or exported codec. Export it standalone for full client-side codec support.`
         );
+        continue;
+      }
+      let chosen;
+      if (candidates.length === 1) {
+        chosen = candidates[0].ref;
+      } else {
+        const sameFile = candidates.filter((c) => c.sourceFile === fc.functionSourceFile);
+        if (sameFile.length === 1) {
+          chosen = sameFile[0].ref;
+        } else {
+          console.warn(
+            `[zodvex] Warning: Codec in ${fc.functionExportName}() (${fc.accessPath}) matches ${candidates.length} candidates with the same fingerprint (${candidates.map((c) => c.ref.exportName).join(", ")}). Cannot pick a canonical reference \u2014 emitting inline. Export the codec standalone to disambiguate.`
+          );
+        }
+      }
+      if (chosen) {
+        codecMap.set(fc.codec, chosen);
       }
     }
   }
@@ -1932,15 +2043,17 @@ function generateApiFile(functions, models, codecs, modelCodecs, functionCodecs,
   if (coreImports.length > 0) {
     imports.push(`import { ${coreImports.join(", ")} } from '${zodvexImport}'`);
   }
-  for (const exportName of neededModelImports) {
+  for (const exportName of [...neededModelImports].sort()) {
     const model = models.find((m) => m.exportName === exportName);
     if (model) {
       const importPath = `../${model.sourceFile.replace(/\.ts$/, ".js")}`;
       imports.push(`import { ${exportName} } from '${importPath}'`);
     }
   }
-  for (const [importPath, exportNames] of zodToSourceCtx.neededCodecImports) {
+  const sortedCodecImportPaths = [...zodToSourceCtx.neededCodecImports.keys()].sort();
+  for (const importPath of sortedCodecImportPaths) {
     if (importPath === MODEL_CODEC_SENTINEL) continue;
+    const exportNames = zodToSourceCtx.neededCodecImports.get(importPath) ?? /* @__PURE__ */ new Set();
     const names = Array.from(exportNames).sort().join(", ");
     imports.push(`import { ${names} } from '${importPath}'`);
   }
@@ -2043,7 +2156,7 @@ async function generate(convexDir2, options) {
   const resolved = resolveConvexDir(convexDir2);
   const zodvexDir = path3.join(resolved, "_zodvex");
   writeStubApi(zodvexDir);
-  const result = await discoverModules(resolved);
+  const result = await discoverModules(resolved, { freshImports: options?.freshImports });
   const schemaContent = generateSchemaFile(result.models);
   const apiContent = generateApiFile(
     result.functions,
@@ -2083,7 +2196,7 @@ async function dev(convexDir2, options) {
     debounceTimer = setTimeout(async () => {
       console.log("[zodvex] Regenerating...");
       try {
-        await generate(resolved, options);
+        await generate(resolved, { ...options, freshImports: true });
       } catch (err) {
         console.error("[zodvex] Generation failed:", err.message);
       }