on-zero 0.16.20 → 0.16.21

package/dist/esm/vite-plugin.native.js

@@ -1,5 +1,5 @@
 import { isAbsolute, relative, resolve } from "path";
-import { generate } from "./generate.native.js";
+import { generate } from "./generate";
 function createOnZeroHmrPlugin() {
   var hmrInclude = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [],
     dataDir = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "src/data";
@@ -42,9 +42,12 @@ function onZeroPlugin() {
   var dir = (_options_dir = options.dir) !== null && _options_dir !== void 0 ? _options_dir : "src/data";
   var dataDir;
   var databaseDir;
+  var tsconfig;
   var runGenerate = function runGenerate2(silent) {
     return generate({
       dir: dataDir,
+      config: options.config,
+      tsconfig,
       after: options.after,
       silent,
       force: options.force
@@ -56,13 +59,19 @@ function onZeroPlugin() {
     configResolved(config) {
       dataDir = resolve(config.root, dir);
       databaseDir = resolve(dataDir, "../database");
+      tsconfig = options.tsconfig ? resolve(config.root, options.tsconfig) : void 0;
     },
     async buildStart() {
       if (!options.disableGenerate) await runGenerate(false);
     },
     configureServer(server) {
       if (options.disableGenerate) return;
+      if (tsconfig) server.watcher.add(tsconfig);
       var handler = async function handler2(file) {
+        if (file === tsconfig) {
+          await runGenerate(false);
+          return;
+        }
         if (!/\.tsx?$/.test(file)) return;
         if (isWithinDirectory(file, dataDir) && !isWithinDirectory(file, resolve(dataDir, "generated")) || isWithinDirectory(file, databaseDir)) {
           await runGenerate(false);
@@ -77,6 +86,7 @@ function onZeroPlugin() {
     apply: "build",
     configResolved(config) {
       dataDir = resolve(config.root, dir);
+      tsconfig = options.tsconfig ? resolve(config.root, options.tsconfig) : void 0;
     },
     async buildStart() {
       if (!options.disableGenerate) await runGenerate(true);

package/dist/esm/vite-plugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isAbsolute","relative","resolve","generate","createOnZeroHmrPlugin","hmrInclude","arguments","length","dataDir","normalizedDataDir","replaceAll","replace","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","transformed","map","isWithinDirectory","file","dir","rel","startsWith","onZeroPlugin","options","_options_dir","databaseDir","runGenerate","runGenerate2","silent","after","force","configResolved","config","root","buildStart","disableGenerate","configureServer","server","handler","handler2","watcher","on"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isAbsolute","relative","resolve","generate","createOnZeroHmrPlugin","hmrInclude","arguments","length","dataDir","normalizedDataDir","replaceAll","replace","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","transformed","map","isWithinDirectory","file","dir","rel","startsWith","onZeroPlugin","options","_options_dir","databaseDir","tsconfig","runGenerate","runGenerate2","silent","config","after","force","configResolved","root","buildStart","disableGenerate","configureServer","server","watcher","add","handler","handler2","on","onZeroHmrPlugin","onZeroHmrPlugin2","include","vite_plugin_default","default"],"sources":["vite-plugin.native.js"],"sourcesContent":["import { isAbsolute, relative, resolve } from \"path\";\nimport { generate } from \"./generate\";\nfunction createOnZeroHmrPlugin() {\n  var hmrInclude = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], dataDir = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : \"src/data\";\n  var normalizedDataDir = `/${dataDir.replaceAll(\"\\\\\", \"/\").replace(/^\\/+|\\/+$/g, \"\")}/`;\n  var hmrPaths = [\n    normalizedDataDir,\n    ...hmrInclude\n  ];\n  return {\n    name: \"on-zero:hmr\",\n    apply: \"serve\",\n    enforce: \"post\",\n    transform(code, id) {\n      if (!hmrPaths.some(function(p) {\n        return id.includes(p);\n      }) || !/\\.tsx?$/.test(id)) return;\n      var transformed = code;\n      if (code.includes(\"import.meta.hot.invalidate\")) {\n        transformed = transformed.replace(/if\\s*\\(invalidateMessage\\)\\s*import\\.meta\\.hot\\.invalidate\\(invalidateMessage\\);?/g, \"/* on-zero: HMR invalidate disabled */\");\n      }\n      if (id.includes(\"/generated/models.\") && !code.includes(\"import.meta.hot.accept\")) {\n        transformed += `\nif (import.meta.hot) {\n  import.meta.hot.accept()\n}\n`;\n      }\n      if (transformed === code) return;\n      return {\n        code: transformed,\n        map: null\n      };\n    }\n  };\n}\nfunction isWithinDirectory(file, dir) {\n  var rel = relative(dir, file);\n  return rel !== \"\" && !rel.startsWith(\"..\") && !isAbsolute(rel);\n}\nfunction onZeroPlugin() {\n  var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};\n  var _options_dir;\n  var dir = (_options_dir = options.dir) !== null && _options_dir !== void 0 ? _options_dir : \"src/data\";\n  var dataDir;\n  var databaseDir;\n  var tsconfig;\n  var runGenerate = function runGenerate2(silent) {\n    return generate({\n      dir: dataDir,\n      config: options.config,\n      tsconfig,\n      after: options.after,\n      silent,\n      force: options.force\n    });\n  };\n  return [\n    {\n      name: \"on-zero:serve\",\n      apply: \"serve\",\n      configResolved(config) {\n        dataDir = resolve(config.root, dir);\n        databaseDir = resolve(dataDir, \"../database\");\n        tsconfig = options.tsconfig ? resolve(config.root, options.tsconfig) : void 0;\n      },\n      async buildStart() {\n        if (!options.disableGenerate) await runGenerate(false);\n      },\n      configureServer(server) {\n        if (options.disableGenerate) return;\n        if (tsconfig) server.watcher.add(tsconfig);\n        var handler = async function handler2(file) {\n          if (file === tsconfig) {\n            await runGenerate(false);\n            return;\n          }\n          if (!/\\.tsx?$/.test(file)) return;\n          if (isWithinDirectory(file, dataDir) && !isWithinDirectory(file, resolve(dataDir, \"generated\")) || isWithinDirectory(file, databaseDir)) {\n            await runGenerate(false);\n          }\n        };\n        server.watcher.on(\"change\", handler);\n        server.watcher.on(\"add\", handler);\n        server.watcher.on(\"unlink\", handler);\n      }\n    },\n    {\n      name: \"on-zero:build\",\n      apply: \"build\",\n      configResolved(config) {\n        dataDir = resolve(config.root, dir);\n        tsconfig = options.tsconfig ? resolve(config.root, options.tsconfig) : void 0;\n      },\n      async buildStart() {\n        if (!options.disableGenerate) await runGenerate(true);\n      }\n    },\n    createOnZeroHmrPlugin(options.hmrInclude, dir)\n  ];\n}\nvar onZeroHmrPlugin = function onZeroHmrPlugin2(options) {\n  return createOnZeroHmrPlugin(options === null || options === void 0 ? void 0 : options.include);\n};\nvar vite_plugin_default = onZeroPlugin;\nexport {\n  vite_plugin_default as default,\n  onZeroHmrPlugin,\n  onZeroPlugin\n};\n//# sourceMappingURL=vite-plugin.js.map\n"],"mappings":"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","ignoreList":[]}

package/dist/esm/where.native.js

@@ -1,6 +1,6 @@
-import { getAuth } from "./helpers/getAuth.native.js";
-import { globalValue } from "./helpers/globalValue.native.js";
-import { getEnvironment } from "./state.native.js";
+import { getAuth } from "./helpers/getAuth";
+import { globalValue } from "./helpers/globalValue";
+import { getEnvironment } from "./state";
 var _evaluatingPermission = false;
 function setEvaluatingPermission(value) {
   _evaluatingPermission = value;

package/dist/esm/where.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["getAuth","globalValue","getEnvironment","_evaluatingPermission","setEvaluatingPermission","value","where","a","b","isServerOnly","arguments","length","whereFn","wrappedWhereFn","wrappedWhereFn2","a2","_$b","and","result","cmpLit","WhereRawBuilderMap","set","WhereTableNameMap","WeakMap","getWhereTableName","where2","get","getRawWhere"],"sources":["../../src/where.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AACxB,SAASC,WAAA,QAAmB;AAC5B,SAASC,cAAA,QAAsB;AAO/B,IAAIC,qBAAA,GAAwB;AAErB,SAASC,wBAAwBC,KAAA,EAAgB;EACtDF,qBAAA,GAAwBE,KAAA;AAC1B;AAYO,SAASC,MACdC,CAAA,EACAC,CAAA,EACA;EAEA,IAAAC,YAAiB,GAAAC,SAAK,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAEtB,IAAAE,OAAM,GAAAJ,CAAA,IAAAD,CAAA;EACJ,IAAAM,cAAI,GAAe,SAAMC,eAAYA,CAAAC,EAAA;IAEnC,IAAAC,GAAA,GAAON,SAAM,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,MAAAV,OAAA;IACf,IAAAE,cAAA,mBAAAO,YAAA,KAAAN,qBAAA;MAEA,OAAMY,EAAA,CAAAE,GAAS;IACf;IACE,IAAAC,MAAI,GAAAN,OAAQ,CAAAG,EAAA,EAAAC,GAAA;IACV,WAAOT,MAAE,KAAO,SAAS;MAC3B,IAAAW,MAAO;QACL,OAAOX,EAAA,CAAEY,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B;QACF,OAAAJ,EAAA,CAAAI,MAAA;MACA;IACF;IAGA,OAAAD,MAAA;EAEA;EACEE,kBAAA,CAAAC,GAAkB,CAAAR,cAAI,EAAAD,OAA0B;EAClD,IAAAJ,CAAA;IAEAc,iBAAO,CAAAD,GAAA,CAAAR,cAAA,EAAAN,CAAA;EACT;EAIA,OAAMM,cAAA;AAAoB;AACxB,IACAS,iBAAM,GAAArB,WAAI,CAA0B;EACtC,0BAAAsB,OAAA;AAEA;AAA2B,IACzBH,kBAAA,GAAAnB,WAAA;EACA,OAAM,mBAAIsB,OAAsB;AAClC;AAEO,SAASC,kBAAkBC,MAAA,EAAc;EAC9C,OAAOH,iBAAA,CAAkBI,GAAA,CAAIpB,MAAK;AACpC;AAGO,SAASqB,YAAYF,MAAA,EAAiC;EAC3D,OAAOL,kBAAA,CAAmBM,GAAA,CAAIpB,MAAK;AACrC","ignoreList":[]}
+{"version":3,"names":["getAuth","globalValue","getEnvironment","_evaluatingPermission","setEvaluatingPermission","value","where","a","b","isServerOnly","arguments","length","whereFn","wrappedWhereFn","wrappedWhereFn2","a2","_$b","and","result","cmpLit","WhereRawBuilderMap","set","WhereTableNameMap","WeakMap","getWhereTableName","where2","get","getRawWhere"],"sources":["where.native.js"],"sourcesContent":["import { getAuth } from \"./helpers/getAuth\";\nimport { globalValue } from \"./helpers/globalValue\";\nimport { getEnvironment } from \"./state\";\nvar _evaluatingPermission = false;\nfunction setEvaluatingPermission(value) {\n  _evaluatingPermission = value;\n}\nfunction where(a, b) {\n  var isServerOnly = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;\n  var whereFn = b || a;\n  var wrappedWhereFn = function wrappedWhereFn2(a2) {\n    var _$b = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : getAuth();\n    if (getEnvironment() !== \"server\" && isServerOnly && !_evaluatingPermission) {\n      return a2.and();\n    }\n    var result = whereFn(a2, _$b);\n    if (typeof result === \"boolean\") {\n      if (result) {\n        return a2.cmpLit(0, \"=\", 0);\n      } else {\n        return a2.cmpLit(1, \"=\", 0);\n      }\n    }\n    return result;\n  };\n  WhereRawBuilderMap.set(wrappedWhereFn, whereFn);\n  if (b) {\n    WhereTableNameMap.set(wrappedWhereFn, a);\n  }\n  return wrappedWhereFn;\n}\nvar WhereTableNameMap = globalValue(`on-zero:where-name`, function() {\n  return /* @__PURE__ */ new WeakMap();\n});\nvar WhereRawBuilderMap = globalValue(`on-zero:where-raw`, function() {\n  return /* @__PURE__ */ new WeakMap();\n});\nfunction getWhereTableName(where2) {\n  return WhereTableNameMap.get(where2);\n}\nfunction getRawWhere(where2) {\n  return WhereRawBuilderMap.get(where2);\n}\nexport {\n  getRawWhere,\n  getWhereTableName,\n  setEvaluatingPermission,\n  where\n};\n//# sourceMappingURL=where.js.map\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,mBAAmB;AAC3C,SAASC,WAAW,QAAQ,uBAAuB;AACnD,SAASC,cAAc,QAAQ,SAAS;AACxC,IAAIC,qBAAqB,GAAG,KAAK;AACjC,SAASC,uBAAuBA,CAACC,KAAK,EAAE;EACtCF,qBAAqB,GAAGE,KAAK;AAC/B;AACA,SAASC,KAAKA,CAACC,CAAC,EAAEC,CAAC,EAAE;EACnB,IAAIC,YAAY,GAAGC,SAAS,CAACC,MAAM,GAAG,CAAC,IAAID,SAAS,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,GAAGA,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK;EACzF,IAAIE,OAAO,GAAGJ,CAAC,IAAID,CAAC;EACpB,IAAIM,cAAc,GAAG,SAASC,eAAeA,CAACC,EAAE,EAAE;IAChD,IAAIC,GAAG,GAAGN,SAAS,CAACC,MAAM,GAAG,CAAC,IAAID,SAAS,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,GAAGA,SAAS,CAAC,CAAC,CAAC,GAAGV,OAAO,CAAC,CAAC;IACpF,IAAIE,cAAc,CAAC,CAAC,KAAK,QAAQ,IAAIO,YAAY,IAAI,CAACN,qBAAqB,EAAE;MAC3E,OAAOY,EAAE,CAACE,GAAG,CAAC,CAAC;IACjB;IACA,IAAIC,MAAM,GAAGN,OAAO,CAACG,EAAE,EAAEC,GAAG,CAAC;IAC7B,IAAI,OAAOE,MAAM,KAAK,SAAS,EAAE;MAC/B,IAAIA,MAAM,EAAE;QACV,OAAOH,EAAE,CAACI,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;MAC7B,CAAC,MAAM;QACL,OAAOJ,EAAE,CAACI,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;MAC7B;IACF;IACA,OAAOD,MAAM;EACf,CAAC;EACDE,kBAAkB,CAACC,GAAG,CAACR,cAAc,EAAED,OAAO,CAAC;EAC/C,IAAIJ,CAAC,EAAE;IACLc,iBAAiB,CAACD,GAAG,CAACR,cAAc,EAAEN,CAAC,CAAC;EAC1C;EACA,OAAOM,cAAc;AACvB;AACA,IAAIS,iBAAiB,GAAGrB,WAAW,CAAC,oBAAoB,EAAE,YAAW;EACnE,OAAO,eAAgB,IAAIsB,OAAO,CAAC,CAAC;AACtC,CAAC,CAAC;AACF,IAAIH,kBAAkB,GAAGnB,WAAW,CAAC,mBAAmB,EAAE,YAAW;EACnE,OAAO,eAAgB,IAAIsB,OAAO,CAAC,CAAC;AACtC,CAAC,CAAC;AACF,SAASC,iBAAiBA,CAACC,MAAM,EAAE;EACjC,OAAOH,iBAAiB,CAACI,GAAG,CAACD,MAAM,CAAC;AACtC;AACA,SAASE,WAAWA,CAACF,MAAM,EAAE;EAC3B,OAAOL,kBAAkB,CAACM,GAAG,CAACD,MAAM,CAAC;AACvC;AACA,SACEE,WAAW,EACXH,iBAAiB,EACjBpB,uBAAuB,EACvBE,KAAK","ignoreList":[]}

package/dist/esm/zeroRunner.native.js

@@ -1,4 +1,4 @@
-import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext.native.js";
+import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext";
 var runner = null;
 function setRunner(r) {
   runner = r;

package/dist/esm/zeroRunner.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","getAmbientRunner","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAsB;EAC9CF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAO9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIO,CAAM,EAAAC,CAAA;MACnB,OAAAP,cAAA,GAAAQ,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;IAEA;EACF;EAEO,OAASG,gBAAA,CAAiBL,QAAA;AAG/B;AACE,SAAAK,gBAAgBA,CAAAL,QAAA;EAClB,IAAAA,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAJ,MAAA;IAEA,OAAKI,QAAQ,CAAAJ,MAAA;EACX;EAAU,IACR,CAAAA,MAAA;IACF,UAAAU,KAAA;EACF;EAEA,OAAOV,MAAA;AACT","ignoreList":[]}
+{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","getAmbientRunner","Error"],"sources":["zeroRunner.native.js"],"sourcesContent":["import { isInZeroMutation, mutatorContext } from \"./helpers/mutatorContext\";\nvar runner = null;\nfunction setRunner(r) {\n  runner = r;\n}\nfunction getRunner(instance) {\n  if (isInZeroMutation()) {\n    return function(q, o) {\n      return mutatorContext().tx.run(q, o);\n    };\n  }\n  return getAmbientRunner(instance);\n}\nfunction getAmbientRunner(instance) {\n  if (instance === null || instance === void 0 ? void 0 : instance.runner) {\n    return instance.runner;\n  }\n  if (!runner) {\n    throw new Error(\"Zero runner not initialized. Ensure ProvideZero is mounted, connectHeadless() was called, or server bindings are active.\");\n  }\n  return runner;\n}\nexport {\n  getAmbientRunner,\n  getRunner,\n  setRunner\n};\n//# sourceMappingURL=zeroRunner.js.map\n"],"mappings":"AAAA,SAASA,gBAAgB,EAAEC,cAAc,QAAQ,0BAA0B;AAC3E,IAAIC,MAAM,GAAG,IAAI;AACjB,SAASC,SAASA,CAACC,CAAC,EAAE;EACpBF,MAAM,GAAGE,CAAC;AACZ;AACA,SAASC,SAASA,CAACC,QAAQ,EAAE;EAC3B,IAAIN,gBAAgB,CAAC,CAAC,EAAE;IACtB,OAAO,UAASO,CAAC,EAAEC,CAAC,EAAE;MACpB,OAAOP,cAAc,CAAC,CAAC,CAACQ,EAAE,CAACC,GAAG,CAACH,CAAC,EAAEC,CAAC,CAAC;IACtC,CAAC;EACH;EACA,OAAOG,gBAAgB,CAACL,QAAQ,CAAC;AACnC;AACA,SAASK,gBAAgBA,CAACL,QAAQ,EAAE;EAClC,IAAIA,QAAQ,KAAK,IAAI,IAAIA,QAAQ,KAAK,KAAK,CAAC,GAAG,KAAK,CAAC,GAAGA,QAAQ,CAACJ,MAAM,EAAE;IACvE,OAAOI,QAAQ,CAACJ,MAAM;EACxB;EACA,IAAI,CAACA,MAAM,EAAE;IACX,MAAM,IAAIU,KAAK,CAAC,0HAA0H,CAAC;EAC7I;EACA,OAAOV,MAAM;AACf;AACA,SACES,gBAAgB,EAChBN,SAAS,EACTF,SAAS","ignoreList":[]}

package/dist/esm/zql.native.js

@@ -1,4 +1,4 @@
-import { getZQL } from "./state.native.js";
+import { getZQL } from "./state";
 var zql = new Proxy({}, {
   get(_target, prop) {
     var b = getZQL();

package/dist/esm/zql.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["getZQL","zql","Proxy","get","_target","prop","b"],"sources":["../../src/zql.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAIhB,IAAAC,GAAM,OAAMC,KAAI,GAAM,EAAC;EAC5BC,IAAIC,OAAA,EAASC,IAAA,EAAM;IACjB,IAAAC,CAAA,GAAMN,MAAI;IACV,OAAQM,CAAA,CAAUD,IAAI;EACxB;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getZQL","zql","Proxy","get","_target","prop","b"],"sources":["zql.native.js"],"sourcesContent":["import { getZQL } from \"./state\";\nvar zql = new Proxy({}, {\n  get(_target, prop) {\n    var b = getZQL();\n    return b[prop];\n  }\n});\nexport {\n  zql\n};\n//# sourceMappingURL=zql.js.map\n"],"mappings":"AAAA,SAASA,MAAM,QAAQ,SAAS;AAChC,IAAIC,GAAG,GAAG,IAAIC,KAAK,CAAC,CAAC,CAAC,EAAE;EACtBC,GAAGA,CAACC,OAAO,EAAEC,IAAI,EAAE;IACjB,IAAIC,CAAC,GAAGN,MAAM,CAAC,CAAC;IAChB,OAAOM,CAAC,CAACD,IAAI,CAAC;EAChB;AACF,CAAC,CAAC;AACF,SACEJ,GAAG","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.16.20",
+  "version": "0.16.21",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
   "files": [
@@ -113,7 +113,7 @@
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
     "dequal": "^2.0.3",
-    "orez-lite": "0.16.20",
+    "orez-lite": "0.16.21",
     "typescript": "7.0.2",
     "valibot": "^1.1.0"
   },
@@ -145,7 +145,7 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-native": "*",
-    "vitest": "^3.1.1"
+    "vitest": "^3.2.7"
   },
-  "releaseSourceCommit": "ea248201d35f2c30b74a6401eda49b9bdd3d2287"
+  "releaseSourceCommit": "692d233ff502256274f2ff23036a5d17c0936b5a"
 }

package/src/cli.ts

@@ -24,6 +24,11 @@ const generateCommand = defineCommand({
       required: false,
       default: false,
     },
+    tsconfig: {
+      type: 'string',
+      description: 'TypeScript project used only for generation',
+      required: false,
+    },
     after: {
       type: 'string',
       description: 'Command to run after generation completes',
@@ -43,6 +48,7 @@ const generateCommand = defineCommand({
     const opts = {
       dir: config ? dirname(config) : target,
       config,
+      tsconfig: args.tsconfig,
       after: args.after,
       force: args.force,
     }

package/src/createUseQuery.tsx

@@ -1,9 +1,10 @@
 import { addContextToQuery, asQueryInternals } from '@rocicorp/zero/bindings'
-import { useQuery as zeroUseQuery } from '@rocicorp/zero/react'
-import { useContext, useMemo, useRef, type Context } from 'react'
+import { useQuery as zeroUseQuery, useZero } from '@rocicorp/zero/react'
+import { useContext, useEffect, useMemo, useRef, type Context } from 'react'
 
 import { IS_SERVER_RUNTIME } from './helpers/platform'
 import { useZeroDebug } from './helpers/useZeroDebug'
+import { QueryErrorRecovery, useQueryFault, type QueryFaults } from './queryErrorRecovery'
 import { serializeQueryParams } from './queryJson'
 import { resolveQuery, type PlainQueryFn } from './resolveQuery'
 
@@ -90,9 +91,11 @@ export function parseUseQueryArgs(paramsOrOptions: any, optionsArg: any) {
 export function createUseQuery<Schema extends ZeroSchema>({
   DisabledContext,
   customQueries,
+  getQueryFaults,
 }: {
   DisabledContext: Context<QueryControlMode>
   customQueries: AnyQueryRegistry
+  getQueryFaults: (zero: object) => QueryFaults | undefined
 }): UseQueryHook<Schema> {
   // SSG: return an inert hook. on-zero's bundled React copy isn't the same
   // one the SSG build's renderer initialises, so hook dispatch returns null.
@@ -156,6 +159,18 @@ export function createUseQuery<Schema extends ZeroSchema>({
       [effectiveEnabled, optionTTL]
     )
     const rawOut = zeroUseQuery(queryRequest, effectiveOptions)
+    const zero = useZero()
+    const faultOut = useQueryFault(
+      effectiveEnabled === false ? undefined : getQueryFaults(zero),
+      queryRequest,
+      rawOut
+    )
+    const recovery = useMemo(() => new QueryErrorRecovery(), [queryRequest])
+    useEffect(() => {
+      if (recovery.changed(rawOut[0], rawOut[1].type) && rawOut[1].type === 'error') {
+        rawOut[1].retry?.()
+      }
+    }, [rawOut, recovery])
 
     // normalize the rare null-data first snapshot for plural queries to []:
     // zero-react's viewStore briefly hands us [null, {type:'unknown'}] when a
@@ -164,11 +179,11 @@ export function createUseQuery<Schema extends ZeroSchema>({
     // callers must never see null here. cheap drop-in: only allocates a new
     // tuple in the (rare) null case; the steady-state pass-through is one
     // identity check per render.
-    let out: any = rawOut
-    if (rawOut?.[0] === null) {
+    let out: any = faultOut
+    if (faultOut?.[0] === null) {
       const fallback = emptyResponseFor(queryRequest)
       if (fallback === EMPTY_RESPONSE_PLURAL) {
-        out = [EMPTY_PLURAL, rawOut[1] ?? RESULT_UNKNOWN]
+        out = [EMPTY_PLURAL, faultOut[1] ?? RESULT_UNKNOWN]
       }
     }
 

package/src/createUseQueryDirect.tsx

@@ -15,6 +15,7 @@ import {
 } from './createUseQuery'
 import { useEmitterValue, type Emitter } from './helpers/emitter'
 import { IS_SERVER_RUNTIME } from './helpers/platform'
+import { QueryErrorRecovery, useQueryFault, type QueryFaults } from './queryErrorRecovery'
 import { serializeQueryParams } from './queryJson'
 import { resolveQuery } from './resolveQuery'
 
@@ -60,6 +61,7 @@ export type CreateUseQueryDirect<Schema extends ZeroSchema> = (props: {
   customQueries: AnyQueryRegistry
   getZero: () => MaterializableZero | null
   zeroVersion: Emitter<number>
+  getQueryFaults: (zero: object) => QueryFaults | undefined
 }) => UseQueryHook<Schema>
 
 type DirectResultType = 'unknown' | 'complete' | 'error'
@@ -134,6 +136,7 @@ class DirectViewWrapper implements DirectView {
   private snapshot: DirectSnapshot
   private readonly listeners = new Set<() => void>()
   private destroyTimer: ReturnType<typeof setTimeout> | undefined
+  private readonly recovery = new QueryErrorRecovery()
 
   constructor(
     private readonly query: any,
@@ -148,6 +151,8 @@ class DirectViewWrapper implements DirectView {
 
   private onData = (data: unknown, resultType: string, error?: DirectQueryError) => {
     const cloned = data === undefined ? undefined : deepClone(data as ReadonlyJSONValue)
+    const retryAfterChange = this.recovery.changed(cloned, resultType)
+    const current = this.view
     this.snapshot = getSnapshot(
       this.singular,
       cloned,
@@ -158,6 +163,11 @@ class DirectViewWrapper implements DirectView {
     for (const listener of this.listeners) {
       listener()
     }
+    if (retryAfterChange) {
+      queueMicrotask(() => {
+        if (this.view === current && this.snapshot[1].type === 'error') this.retry()
+      })
+    }
   }
 
   private retry = () => {
@@ -259,6 +269,7 @@ export function createUseQueryDirect<Schema extends ZeroSchema>({
   customQueries,
   getZero,
   zeroVersion,
+  getQueryFaults,
 }: Parameters<CreateUseQueryDirect<Schema>>[0]): UseQueryHook<Schema> {
   // SSG: return an inert hook — see createUseQuery for the rationale. resolve
   // each call's query shape so singular queries get [undefined, info] and
@@ -334,11 +345,16 @@ export function createUseQueryDirect<Schema extends ZeroSchema>({
     }, [queryRequest, enabled, ttl, zeroInstance])
 
     const getEmpty = () => emptyForQuery as DirectSnapshot
-    const out = useSyncExternalStore(
+    const rawOut = useSyncExternalStore(
       view ? view.subscribe : DISABLED_SUBSCRIBE,
       view ? view.getSnapshot : getEmpty,
       view ? view.getSnapshot : getEmpty
     )
+    const out = useQueryFault(
+      zeroInstance && enabled && !disableMode ? getQueryFaults(zeroInstance) : undefined,
+      queryRequest,
+      rawOut
+    )
 
     if (!disableMode) {
       lastRef.current = out

package/src/createZeroClient.tsx

@@ -51,6 +51,7 @@ import {
 import { observeMutation, reportMutationInvocationError } from './helpers/useMutation'
 import { registerClientInstance } from './instanceRegistry'
 import { getAllMutationsPermissions, getMutationsPermissions } from './modelRegistry'
+import { QueryFaults } from './queryErrorRecovery'
 import { assertQueryJson } from './queryJson'
 import { registerQuery } from './queryRegistry'
 import { resolveQuery, type PlainQueryFn } from './resolveQuery'
@@ -92,7 +93,12 @@ export type GroupedQueries = Record<string, Record<string, (...args: any[]) => a
 export type PermissionStrategy = 'optimistic' | 'optimistic-deny' | 'optimistic-allow'
 
 export type ZeroProviderTransport = {
-  install(serverURL: string): Pick<HttpPullTransport, 'subscribeLifecycle'> | undefined
+  install(
+    serverURL: string
+  ):
+    | (Pick<HttpPullTransport, 'subscribeLifecycle'> &
+        Partial<Pick<HttpPullTransport, 'pull'>>)
+    | undefined
   logClassifications?: {
     benign?: readonly ZeroLogPattern[]
   }
@@ -129,6 +135,7 @@ export type DirectQueryAdapter<Schema extends ZeroSchema> = (props: {
   customQueries: AnyQueryRegistry
   getZero: () => any
   zeroVersion: Emitter<number>
+  getQueryFaults: (zero: object) => QueryFaults | undefined
 }) => UseQueryHook<Schema>
 
 function getZeroProxyValue(instance: object, key: PropertyKey) {
@@ -335,8 +342,9 @@ export function createZeroClientInternal<
   let clientMutators: ReturnType<typeof createMutators> | null = null
   const installedTransports = new WeakMap<
     ZeroInstance,
-    Pick<HttpPullTransport, 'subscribeLifecycle'>
+    ReturnType<ZeroProviderTransport['install']>
   >()
+  const queryFaults = new WeakMap<object, QueryFaults>()
   function getClientMutators() {
     clientMutators ??= createMutators({
       models,
@@ -375,7 +383,7 @@ export function createZeroClientInternal<
     awaitReconnected,
     reload,
   }: ConstructZeroInstanceArgs): ZeroInstance {
-    let installedTransport: Pick<HttpPullTransport, 'subscribeLifecycle'> | undefined
+    let installedTransport: ReturnType<ZeroProviderTransport['install']>
     // install before construction so the instance's first connect goes through
     // HTTP. ensureHttpPullTransport is per-origin idempotent by design (a
     // rotation would otherwise chain shims), so repeat calls reuse.
@@ -433,7 +441,15 @@ export function createZeroClientInternal<
         options.onClientStateNotFound ?? recovery.onClientStateNotFound,
     })
     instanceRef.current = createdInstance
-    if (installedTransport) installedTransports.set(createdInstance, installedTransport)
+    if (installedTransport) {
+      installedTransports.set(createdInstance, installedTransport)
+      queryFaults.set(
+        createdInstance,
+        new QueryFaults(() => {
+          void installedTransport?.pull?.()
+        })
+      )
+    }
     primeGroupCache(recoveryDeps)
     return createdInstance
   }
@@ -600,6 +616,7 @@ export function createZeroClientInternal<
   const useQuery = createUseQuery<Schema>({
     DisabledContext,
     customQueries,
+    getQueryFaults: (zero) => queryFaults.get(zero),
   })
 
   const useQueryDirect = createDirectUseQuery
@@ -608,6 +625,7 @@ export function createZeroClientInternal<
         customQueries,
         getZero: () => zeroRuntime.zero,
         zeroVersion: zeroInstanceVersion!,
+        getQueryFaults: (zero) => queryFaults.get(zero),
       })
     : createUnavailableDirectUseQuery<Schema>()
 
@@ -1244,6 +1262,12 @@ export function createZeroClientInternal<
 
   const ProvideZero = IS_SERVER_RUNTIME ? ProvideZeroServer : ProvideZeroClient
 
+  // committed SetZeroInstance mounts per client. a tree can hold two mounts of
+  // one client at once (a remounted subtree commits before its predecessor
+  // cleans up), and the first cleanup must not clear a facade the second
+  // still owns.
+  const publishedMounts = new Map<ZeroInstance, number>()
+
   const SetZeroInstance = () => {
     const zeroInstance = useZero<Schema, ZeroMutators>()
 
@@ -1256,7 +1280,14 @@ export function createZeroClientInternal<
       // provider actually unmounts, which is the lifecycle boundary that
       // invalidates this generation.
       publishZeroInstance(zeroInstance)
+      publishedMounts.set(zeroInstance, (publishedMounts.get(zeroInstance) ?? 0) + 1)
       return () => {
+        const remaining = publishedMounts.get(zeroInstance)! - 1
+        if (remaining > 0) {
+          publishedMounts.set(zeroInstance, remaining)
+          return
+        }
+        publishedMounts.delete(zeroInstance)
         if (!unpublishZeroInstance(zeroInstance)) return
         mutationLifecycle.fence()
       }
@@ -1405,6 +1436,8 @@ export function createZeroClientInternal<
       ? installedTransport.subscribeLifecycle((event: HttpPullLifecycleEvent) => {
           if (event.type === 'pull' && event.clientID === zeroInstance.clientID) {
             authRefreshAttempts = 0
+            if (event.queryErrors)
+              queryFaults.get(zeroInstance)?.update(event.queryErrors)
           }
         })
       : undefined

package/src/generate.test.ts

@@ -20,6 +20,7 @@ import {
   generateDrizzleSchemaFile,
   generateDrizzleSchemaInputFile,
 } from './generate'
+import { createNativeTypeScriptProject } from './native-typescript'
 
 const testDir = join(tmpdir(), 'on-zero-test-' + Date.now())
 
@@ -38,6 +39,51 @@ afterEach(() => {
 })
 
 describe('generate', () => {
+  test('scopes generation to its project and keeps explicit ambient argument types', async () => {
+    const dataDir = join(testDir, 'data')
+    const sourcePath = join(dataDir, 'post/mutations.ts')
+    const tsconfig = join(testDir, 'tsconfig.generate.json')
+    const ambient = join(testDir, 'ambient.d.ts')
+    const unrelated = join(testDir, 'application.ts')
+    writeFileSync(
+      join(testDir, 'tsconfig.json'),
+      JSON.stringify({ include: ['**/*.ts'] })
+    )
+    writeFileSync(
+      tsconfig,
+      JSON.stringify({
+        extends: './tsconfig.json',
+        include: ['data/**/*.ts', 'ambient.d.ts'],
+      })
+    )
+    writeFileSync(ambient, 'type ScopedArgs = { count: number }')
+    writeFileSync(unrelated, 'export const application = 1')
+    writeFileSync(
+      sourcePath,
+      `
+export const schema = table('post').columns({ id: string() }).primaryKey('id')
+export const mutate = mutations(schema, permission, {
+  publish: async (ctx, args: ScopedArgs) => {},
+})
+`
+    )
+    const project = await createNativeTypeScriptProject(dataDir, [sourcePath], {
+      tsconfig,
+    })
+    const dependencies = await project.sourceFilePaths()
+    await project.close()
+    expect(dependencies).toContain(ambient)
+    expect(dependencies).not.toContain(unrelated)
+
+    await generate({ dir: dataDir, tsconfig, silent: true })
+    const outputPath = join(dataDir, 'generated/syncedMutations.ts')
+    expect(readFileSync(outputPath, 'utf8')).toContain('count: v.number()')
+
+    writeFileSync(ambient, 'type ScopedArgs = { count: string }')
+    await generate({ dir: dataDir, tsconfig, silent: true })
+    expect(readFileSync(outputPath, 'utf8')).toContain('count: v.string()')
+  })
+
   test('runs after command when files change', async () => {
     writeFileSync(
       join(testDir, 'post/mutations.ts'),
@@ -69,6 +115,76 @@ describe('generate', () => {
     expect(second.filesChanged).toBe(0)
   })
 
+  test('refreshes validators when a transitive imported union changes', async () => {
+    const dataDir = join(testDir, 'data')
+    const kindsPath = join(testDir, 'protocol/kinds.ts')
+    writeFileSync(kindsPath, `export type Kind = 'send'`)
+    writeFileSync(
+      join(testDir, 'protocol/index.ts'),
+      `export type { Kind } from './kinds'`
+    )
+    writeFileSync(
+      join(dataDir, 'command/mutations.ts'),
+      `import type { Kind } from '../../protocol'
+export const schema = table('command').columns({ id: string() }).primaryKey('id')
+export const mutate = mutations(schema, permission, {
+  dispatch: async (ctx, args: { kind: Kind }) => {},
+})`
+    )
+    const validator = () => {
+      const context = { v, exports: {} as { mutationValidators?: any } }
+      runInNewContext(
+        readFileSync(join(dataDir, 'generated/syncedMutations.ts'), 'utf8')
+          .replace(/^import .*$/m, '')
+          .replace('export const', 'exports.mutationValidators ='),
+        context
+      )
+      return context.exports.mutationValidators!.command.dispatch
+    }
+
+    await generate({ dir: dataDir, silent: true })
+    expect(v.safeParse(validator(), { kind: 'send' }).success).toBe(true)
+    expect(v.safeParse(validator(), { kind: 'throttle' }).success).toBe(false)
+    expect((await generate({ dir: dataDir, silent: true })).filesChanged).toBe(0)
+
+    writeFileSync(kindsPath, `export type Kind = 'send' | 'throttle'`)
+    await generate({ dir: dataDir, silent: true })
+    expect(v.safeParse(validator(), { kind: 'throttle' }).success).toBe(true)
+    expect(v.safeParse(validator(), { kind: 'unknown' }).success).toBe(false)
+    expect((await generate({ dir: dataDir, silent: true })).filesChanged).toBe(0)
+
+    writeFileSync(kindsPath, `export type Kind = 'throttle'`)
+    await generate({ dir: dataDir, silent: true })
+    expect(v.safeParse(validator(), { kind: 'send' }).success).toBe(false)
+    expect(v.safeParse(validator(), { kind: 'throttle' }).success).toBe(true)
+  })
+
+  test('validates a type reused by siblings and stops at a cycle', async () => {
+    const dataDir = join(testDir, 'data')
+    writeFileSync(
+      join(dataDir, 'command/mutations.ts'),
+      `type Tree = { name: string; children: Tree[] }
+export const schema = table('command').columns({ id: string() }).primaryKey('id')
+export const mutate = mutations(schema, permission, {
+  dispatch: async (ctx, args: { a: string[]; b: string[]; nested: { c: string[] }; tree: Tree }) => {},
+})`
+    )
+    await generate({ dir: dataDir, silent: true })
+    const context = { v, exports: {} as { mutationValidators?: any } }
+    runInNewContext(
+      readFileSync(join(dataDir, 'generated/syncedMutations.ts'), 'utf8')
+        .replace(/^import .*$/m, '')
+        .replace('export const', 'exports.mutationValidators ='),
+      context
+    )
+    const validator = context.exports.mutationValidators!.command.dispatch
+    const tree = { name: 'root', children: [{ name: 'leaf', children: [] }] }
+    const valid = { a: ['x'], b: ['y'], nested: { c: ['z'] }, tree }
+    expect(v.safeParse(validator, valid).success).toBe(true)
+    expect(v.safeParse(validator, { ...valid, b: [1] }).success).toBe(false)
+    expect(v.safeParse(validator, { ...valid, nested: { c: [1] } }).success).toBe(false)
+  })
+
   test('force regenerates without source changes', async () => {
     writeFileSync(
       join(testDir, 'post/mutations.ts'),