zodvex 0.7.2-beta.0 → 0.7.2-beta.1

package/dist/cli/index.js

@@ -3,7 +3,8 @@ 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 { spawn } from 'child_process';
+import { fileURLToPath } 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';
@@ -1028,6 +1029,20 @@ function readMeta(target) {
   }
   return target[META_KEY];
 }
+var CODEC_BRAND_KEY = "__zodvexCodecBrand";
+function attachCodecBrand(target, brand) {
+  Object.defineProperty(target, CODEC_BRAND_KEY, {
+    value: brand,
+    enumerable: false,
+    writable: false,
+    configurable: false
+  });
+}
+function readCodecBrand(target) {
+  if (target == null || typeof target !== "object") return void 0;
+  const value = target[CODEC_BRAND_KEY];
+  return typeof value === "string" ? value : void 0;
+}
 var metadata = /* @__PURE__ */ new WeakMap();
 var registryHelpers = {
   getMetadata: (type) => metadata.get(type),
@@ -1068,8 +1083,10 @@ function id(tableName) {
   branded._tableName = tableName;
   return branded;
 }
-function codec(wire, runtime, transforms) {
-  return zodvexCodec(wire, runtime, transforms);
+function codec(wire, runtime, transforms, opts) {
+  const built = zodvexCodec(wire, runtime, transforms);
+  if (opts?.brand) attachCodecBrand(built, opts.brand);
+  return built;
 }
 function sharedWeakMap(name) {
   const key = /* @__PURE__ */ Symbol.for(`zodvex.zx.cache.${name}`);
@@ -1394,7 +1411,6 @@ 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);
@@ -1532,7 +1548,7 @@ function walkFunctionCodecs(functions) {
   }
   return found;
 }
-async function discoverModules(convexDir2, options) {
+async function discoverModules(convexDir2) {
   const models = [];
   const functions = [];
   const codecs = [];
@@ -1556,18 +1572,12 @@ async function discoverModules(convexDir2, options) {
       "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(importUrl);
+        moduleExports = await import(absPath);
       } catch (err) {
         console.warn(`[zodvex] Warning: Failed to import ${file}:`, err.message);
         continue;
@@ -1722,7 +1732,10 @@ var HEADER = `// AUTO-GENERATED by zodvex \u2014 do not edit
 `;
 function fingerprintCodec(schema) {
   if (!(schema instanceof $ZodCodec)) return "";
-  return `${fingerprintLeaf(schema._zod.def.in)}|${fingerprintLeaf(schema._zod.def.out)}`;
+  const def = schema._zod.def;
+  const transform = typeof def.transform === "function" ? def.transform.toString() : "";
+  const reverse = typeof def.reverseTransform === "function" ? def.reverseTransform.toString() : "";
+  return `${fingerprintLeaf(def.in)}|${fingerprintLeaf(def.out)}|${transform}|${reverse}`;
 }
 function fingerprintLeaf(schema) {
   return `${zodToSource(schema)}#${fingerprintChecks(schema)}`;
@@ -1941,6 +1954,7 @@ function generateApiFile(functions, models, codecs, modelCodecs, functionCodecs,
   }
   if (functionCodecs) {
     const fingerprintMap = /* @__PURE__ */ new Map();
+    const brandMap = /* @__PURE__ */ new Map();
     const codecSchemaToSourceFile = /* @__PURE__ */ new Map();
     for (const c of codecs ?? []) {
       codecSchemaToSourceFile.set(c.schema, c.sourceFile);
@@ -1949,24 +1963,34 @@ function generateApiFile(functions, models, codecs, modelCodecs, functionCodecs,
       codecSchemaToSourceFile.set(mc.codec, mc.modelSourceFile);
     }
     for (const [codecSchema, ref] of codecMap) {
-      const fp = fingerprintCodec(codecSchema);
-      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 }]);
+      const brand = readCodecBrand(codecSchema);
+      const candidate = { ref, sourceFile, brand };
+      const fp = fingerprintCodec(codecSchema);
+      if (fp) {
+        const existing = fingerprintMap.get(fp);
+        if (existing) existing.push(candidate);
+        else fingerprintMap.set(fp, [candidate]);
+      }
+      if (brand) {
+        const existing = brandMap.get(brand);
+        if (existing) existing.push(candidate);
+        else brandMap.set(brand, [candidate]);
       }
     }
+    const undiscoverable = [];
     for (const fc of functionCodecs) {
       if (codecMap.has(fc.codec)) continue;
-      const fp = fingerprintCodec(fc.codec);
-      const candidates = fp ? fingerprintMap.get(fp) : void 0;
+      const brand = readCodecBrand(fc.codec);
+      let candidates = brand ? brandMap.get(brand) : 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.`
+        const fp = fingerprintCodec(fc.codec);
+        candidates = (fp ? fingerprintMap.get(fp) : void 0)?.filter(
+          (c) => c.brand === void 0 || c.brand === brand
         );
+      }
+      if (!candidates || candidates.length === 0) {
+        undiscoverable.push({ fn: fc.functionExportName, path: fc.accessPath });
         continue;
       }
       let chosen;
@@ -1977,14 +2001,27 @@ function generateApiFile(functions, models, codecs, modelCodecs, functionCodecs,
         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.`
+          const sorted = [...candidates].sort(
+            (a, b) => `${a.sourceFile ?? ""}|${a.ref.exportName}`.localeCompare(
+              `${b.sourceFile ?? ""}|${b.ref.exportName}`
+            )
           );
+          chosen = sorted[0].ref;
+          if (!brand) {
+            console.warn(
+              `[zodvex] Note: Codec in ${fc.functionExportName}() (${fc.accessPath}) matches ${candidates.length} fingerprint-equivalent codecs (${candidates.map((c) => c.ref.exportName).join(", ")}). Referencing '${chosen.exportName}'. Export the codec standalone or give it a brand if you want the reference to be explicit.`
+            );
+          }
         }
       }
-      if (chosen) {
-        codecMap.set(fc.codec, chosen);
-      }
+      codecMap.set(fc.codec, chosen);
+    }
+    if (undiscoverable.length > 0) {
+      const list = undiscoverable.map((u) => `  - ${u.fn}() at ${u.path}`).join("\n");
+      throw new Error(
+        `[zodvex] ${undiscoverable.length} codec(s) in function args/returns have no importable reference (not exported standalone, not embedded in a model). The generated client cannot encode or decode them, which silently breaks the codec boundary. Export each codec standalone (or add it to a model) so codegen can import it:
+${list}`
+      );
     }
   }
   const zodToSourceCtx = {
@@ -2156,7 +2193,7 @@ async function generate(convexDir2, options) {
   const resolved = resolveConvexDir(convexDir2);
   const zodvexDir = path3.join(resolved, "_zodvex");
   writeStubApi(zodvexDir);
-  const result = await discoverModules(resolved, { freshImports: options?.freshImports });
+  const result = await discoverModules(resolved);
   const schemaContent = generateSchemaFile(result.models);
   const apiContent = generateApiFile(
     result.functions,
@@ -2193,13 +2230,9 @@ async function dev(convexDir2, options) {
       return;
     }
     if (debounceTimer) clearTimeout(debounceTimer);
-    debounceTimer = setTimeout(async () => {
+    debounceTimer = setTimeout(() => {
       console.log("[zodvex] Regenerating...");
-      try {
-        await generate(resolved, { ...options, freshImports: true });
-      } catch (err) {
-        console.error("[zodvex] Generation failed:", err.message);
-      }
+      void regenerate(resolved, options);
     }, 300);
   });
   process.on("SIGINT", () => {
@@ -2208,6 +2241,22 @@ async function dev(convexDir2, options) {
     process.exit(0);
   });
 }
+function regenerate(resolved, options) {
+  const cliEntry = fileURLToPath(new URL("./index.js", import.meta.url));
+  const args = [cliEntry, "generate", resolved];
+  if (options?.mini) args.push("--mini");
+  return new Promise((resolve2) => {
+    const child = spawn(process.execPath, args, { stdio: "inherit" });
+    child.on("exit", (code) => {
+      if (code !== 0) console.error(`[zodvex] Regeneration exited with code ${code}`);
+      resolve2();
+    });
+    child.on("error", (err) => {
+      console.error("[zodvex] Failed to spawn regeneration:", err.message);
+      resolve2();
+    });
+  });
+}
 function writeStubApi(zodvexDir) {
   fs2.mkdirSync(zodvexDir, { recursive: true });
   fs2.writeFileSync(