on-zero 0.4.35 → 0.4.37

package/dist/esm/run.mjs

@@ -1,6 +1,7 @@
 import { getInstanceForQueryFn } from "./instanceRegistry.mjs";
 import { resolveQuery } from "./resolveQuery.mjs";
-import { getRunner } from "./zeroRunner.mjs";
+import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext.mjs";
+import { getAmbientRunner, getRunner } from "./zeroRunner.mjs";
 let customQueriesRef = null;
 function setCustomQueries(queries) {
   customQueriesRef = queries;
@@ -21,6 +22,10 @@ function run(queryOrFn, paramsOrMode, modeArg) {
   if (queryOrFn && queryOrFn["ast"]) {
     return getRunner()(queryOrFn, options);
   }
+  const inMutation = isInZeroMutation();
+  if (inMutation && mutatorContext().environment === "server") {
+    throw new Error("run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.");
+  }
   const instance = getInstanceForQueryFn(queryOrFn);
   const customQueries = instance?.customQueries ?? getCustomQueries();
   const queryRequest = resolveQuery({
@@ -28,7 +33,7 @@ function run(queryOrFn, paramsOrMode, modeArg) {
     fn: queryOrFn,
     params
   });
-  return getRunner(instance)(queryRequest, options);
+  return getAmbientRunner(instance)(queryRequest, options);
 }
 export { run, setCustomQueries };
 //# sourceMappingURL=run.mjs.map

package/dist/esm/run.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getInstanceForQueryFn","resolveQuery","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","instance","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,SAAA,QAAiB;AAS1B,IAAIC,gBAAA,GAA4C;AAEzC,SAASC,iBAAiBC,OAAA,EAA2B;EAC1DF,gBAAA,GAAmBE,OAAA;AACrB;AAEA,SAASC,iBAAA,EAAqC;EAC5C,IAAI,CAACH,gBAAA,EAAkB;IACrB,MAAM,IAAII,KAAA,CACR,8FACF;EACF;EACA,OAAOJ,gBAAA;AACT;AAiCO,SAASK,IACdC,SAAA,EACAC,YAAA,EACAC,OAAA,EACc;EACd,MAAMC,SAAA,GAAYD,OAAA,KAAY,UAAcD,YAAA,IAAgBA,YAAA,KAAiB;EAC7E,MAAMG,MAAA,GAASD,SAAA,GAAYF,YAAA,GAAe;EAC1C,MAAMI,IAAA,GAAOF,SAAA,GAAYD,OAAA,GAAUD,YAAA;EACnC,MAAMK,OAAA,GACJD,IAAA,KAAS,aACJ;IACCE,IAAA,EAAM;EACR,IACA;EAEN,IAAIP,SAAA,IAAaA,SAAA,CAAU,KAAK,GAAG;IAEjC,OAAOP,SAAA,CAAU,EAAEO,SAAA,EAAWM,OAAO;EACvC;EAIA,MAAME,QAAA,GAAWjB,qBAAA,CAAsBS,SAAS;EAChD,MAAMS,aAAA,GAAgBD,QAAA,EAAUC,aAAA,IAAiBZ,gBAAA,CAAiB;EAClE,MAAMa,YAAA,GAAelB,YAAA,CAAa;IAAEiB,aAAA;IAAeE,EAAA,EAAIX,SAAA;IAAWI;EAAO,CAAC;EAE1E,OAAOX,SAAA,CAAUe,QAAQ,EAAEE,YAAA,EAAqBJ,OAAO;AACzD","ignoreList":[]}
+{"version":3,"names":["getInstanceForQueryFn","resolveQuery","isInZeroMutation","mutatorContext","getAmbientRunner","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","inMutation","environment","instance","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,gBAAA,EAAkBC,cAAA,QAAsB;AACjD,SAASC,gBAAA,EAAkBC,SAAA,QAAiB;AAS5C,IAAIC,gBAAA,GAA4C;AAEzC,SAASC,iBAAiBC,OAAA,EAA2B;EAC1DF,gBAAA,GAAmBE,OAAA;AACrB;AAEA,SAASC,iBAAA,EAAqC;EAC5C,IAAI,CAACH,gBAAA,EAAkB;IACrB,MAAM,IAAII,KAAA,CACR,8FACF;EACF;EACA,OAAOJ,gBAAA;AACT;AAiCO,SAASK,IACdC,SAAA,EACAC,YAAA,EACAC,OAAA,EACc;EACd,MAAMC,SAAA,GAAYD,OAAA,KAAY,UAAcD,YAAA,IAAgBA,YAAA,KAAiB;EAC7E,MAAMG,MAAA,GAASD,SAAA,GAAYF,YAAA,GAAe;EAC1C,MAAMI,IAAA,GAAOF,SAAA,GAAYD,OAAA,GAAUD,YAAA;EACnC,MAAMK,OAAA,GACJD,IAAA,KAAS,aACJ;IACCE,IAAA,EAAM;EACR,IACA;EAEN,IAAIP,SAAA,IAAaA,SAAA,CAAU,KAAK,GAAG;IAEjC,OAAOP,SAAA,CAAU,EAAEO,SAAA,EAAWM,OAAO;EACvC;EAEA,MAAME,UAAA,GAAalB,gBAAA,CAAiB;EACpC,IAAIkB,UAAA,IAAcjB,cAAA,CAAe,EAAEkB,WAAA,KAAgB,UAAU;IAC3D,MAAM,IAAIX,KAAA,CACR,6GACF;EACF;EAIA,MAAMY,QAAA,GAAWtB,qBAAA,CAAsBY,SAAS;EAChD,MAAMW,aAAA,GAAgBD,QAAA,EAAUC,aAAA,IAAiBd,gBAAA,CAAiB;EAClE,MAAMe,YAAA,GAAevB,YAAA,CAAa;IAAEsB,aAAA;IAAeE,EAAA,EAAIb,SAAA;IAAWI;EAAO,CAAC;EAE1E,OAAOZ,gBAAA,CAAiBkB,QAAQ,EAAEE,YAAA,EAAqBN,OAAO;AAChE","ignoreList":[]}

package/dist/esm/run.native.js

@@ -1,6 +1,7 @@
 import { getInstanceForQueryFn } from "./instanceRegistry.native.js";
 import { resolveQuery } from "./resolveQuery.native.js";
-import { getRunner } from "./zeroRunner.native.js";
+import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext.native.js";
+import { getAmbientRunner, getRunner } from "./zeroRunner.native.js";
 var customQueriesRef = null;
 function setCustomQueries(queries) {
   customQueriesRef = queries;
@@ -21,6 +22,10 @@ function run(queryOrFn, paramsOrMode, modeArg) {
   if (queryOrFn && queryOrFn["ast"]) {
     return getRunner()(queryOrFn, options);
   }
+  var inMutation = isInZeroMutation();
+  if (inMutation && mutatorContext().environment === "server") {
+    throw new Error("run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.");
+  }
   var instance = getInstanceForQueryFn(queryOrFn);
   var _instance_customQueries;
   var customQueries = (_instance_customQueries = instance === null || instance === void 0 ? void 0 : instance.customQueries) !== null && _instance_customQueries !== void 0 ? _instance_customQueries : getCustomQueries();
@@ -29,7 +34,7 @@ function run(queryOrFn, paramsOrMode, modeArg) {
     fn: queryOrFn,
     params
   });
-  return getRunner(instance)(queryRequest, options);
+  return getAmbientRunner(instance)(queryRequest, options);
 }
 export { run, setCustomQueries };
 //# sourceMappingURL=run.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["getInstanceForQueryFn","resolveQuery","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","instance","_instance_customQueries","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,SAAA,QAAiB;AAS1B,IAAIC,gBAAA,GAA4C;AAEzC,SAASC,iBAAiBC,OAAA,EAA2B;EAC1DF,gBAAA,GAAmBE,OAAA;AACrB;AAEA,SAASC,iBAAA,EAAqC;EAC5C,IAAI,CAACH,gBAAA,EAAkB;IACrB,MAAM,IAAII,KAAA;EAAA;EACR,OACFJ,gBAAA;AAAA;AAEF,SAAOK,IAAAC,SAAA,EAAAC,YAAA,EAAAC,OAAA;EACT,IAAAC,SAAA,GAAAD,OAAA,eAAAD,YAAA,IAAAA,YAAA;EAiCO,IAAAG,MAAS,GACdD,SACA,GAAAF,YACA,QACc;EACd,IAAAI,IAAM,GAAAF,SAAY,GAAAD,OAAY,GAAAD,YAAc;EAC5C,IAAAK,OAAM,GAAAD,IAAS,eAAY;IAC3BE,IAAM;EACN,SAAM;EAEC,IACCP,SAAM,IAAAA,SAAA;IACR,OACAP,SAAA,GAAAO,SAAA,EAAAM,OAAA;EAEN;EAEE,IAAAE,QAAO,GAAAjB,qBAAuB,CAAAS,SAAO;EACvC,IAAAS,uBAAA;EAIA,IAAAC,aAAiB,IAAAD,uBAAsB,GAAAD,QAAS,aAAAA,QAAA,uBAAAA,QAAA,CAAAE,aAAA,cAAAD,uBAAA,cAAAA,uBAAA,GAAAZ,gBAAA;EAChD,IAAAc,YAAM,GAAAnB,YAAgB,CAAU;IAChCkB,aAAM;IAENE,EAAA,EAAAZ,SAAO;IACTI","ignoreList":[]}
+{"version":3,"names":["getInstanceForQueryFn","resolveQuery","isInZeroMutation","mutatorContext","getAmbientRunner","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","inMutation","environment","instance","_instance_customQueries","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,gBAAA,EAAkBC,cAAA,QAAsB;AACjD,SAASC,gBAAA,EAAkBC,SAAA,QAAiB;AAS5C,IAAIC,gBAAA,GAA4C;AAEzC,SAASC,iBAAiBC,OAAA,EAA2B;EAC1DF,gBAAA,GAAmBE,OAAA;AACrB;AAEA,SAASC,iBAAA,EAAqC;EAC5C,IAAI,CAACH,gBAAA,EAAkB;IACrB,MAAM,IAAII,KAAA;EAAA;EACR,OACFJ,gBAAA;AAAA;AAEF,SAAOK,IAAAC,SAAA,EAAAC,YAAA,EAAAC,OAAA;EACT,IAAAC,SAAA,GAAAD,OAAA,eAAAD,YAAA,IAAAA,YAAA;EAiCO,IAAAG,MAAS,GACdD,SACA,GAAAF,YACA,QACc;EACd,IAAAI,IAAM,GAAAF,SAAY,GAAAD,OAAY,GAAAD,YAAc;EAC5C,IAAAK,OAAM,GAAAD,IAAS,eAAY;IAC3BE,IAAM;EACN,SAAM;EAEC,IACCP,SAAM,IAAAA,SAAA;IACR,OACAP,SAAA,GAAAO,SAAA,EAAAM,OAAA;EAEN;EAEE,IAAAE,UAAO,GAAAlB,gBAAuB;EAChC,IAAAkB,UAAA,IAAAjB,cAAA,GAAAkB,WAAA;IAEA,MAAM,IAAAX,KAAA,8GAA8B;EACpC;EACE,IAAAY,QAAU,GAAAtB,qBAAA,CAAAY,SAAA;EAAA,IACRW,uBAAA;EAAA,IACFC,aAAA,IAAAD,uBAAA,GAAAD,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAE,aAAA,cAAAD,uBAAA,cAAAA,uBAAA,GAAAd,gBAAA;EACF,IAAAgB,YAAA,GAAAxB,YAAA;IAIAuB,aAAM;IACNE,EAAA,EAAMd,SAAA;IACNI;EAEA;EACF,OAAAZ,gBAAA,CAAAkB,QAAA,EAAAG,YAAA,EAAAP,OAAA","ignoreList":[]}

package/dist/esm/testSetup.mjs

@@ -0,0 +1,27 @@
+if (typeof globalThis.localStorage?.getItem !== "function") {
+  const store = /* @__PURE__ */new Map();
+  Object.defineProperty(globalThis, "localStorage", {
+    configurable: true,
+    value: {
+      get length() {
+        return store.size;
+      },
+      clear() {
+        store.clear();
+      },
+      getItem(key) {
+        return store.get(String(key)) ?? null;
+      },
+      key(index) {
+        return Array.from(store.keys())[index] ?? null;
+      },
+      removeItem(key) {
+        store.delete(String(key));
+      },
+      setItem(key, value) {
+        store.set(String(key), String(value));
+      }
+    }
+  });
+}
+//# sourceMappingURL=testSetup.mjs.map

package/dist/esm/testSetup.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["globalThis","localStorage","getItem","store","Map","Object","defineProperty","configurable","value","length","size","clear","key","get","String","index","Array","from","keys","removeItem","delete","setItem","set"],"sources":["../../src/testSetup.ts"],"sourcesContent":[null],"mappings":"AAAA,IAAI,OAAOA,UAAA,CAAWC,YAAA,EAAcC,OAAA,KAAY,YAAY;EAC1D,MAAMC,KAAA,GAAQ,mBAAIC,GAAA,CAAoB;EACtCC,MAAA,CAAOC,cAAA,CAAeN,UAAA,EAAY,gBAAgB;IAChDO,YAAA,EAAc;IACdC,KAAA,EAAO;MACL,IAAIC,OAAA,EAAS;QACX,OAAON,KAAA,CAAMO,IAAA;MACf;MACAC,MAAA,EAAQ;QACNR,KAAA,CAAMQ,KAAA,CAAM;MACd;MACAT,QAAQU,GAAA,EAAa;QACnB,OAAOT,KAAA,CAAMU,GAAA,CAAIC,MAAA,CAAOF,GAAG,CAAC,KAAK;MACnC;MACAA,IAAIG,KAAA,EAAe;QACjB,OAAOC,KAAA,CAAMC,IAAA,CAAKd,KAAA,CAAMe,IAAA,CAAK,CAAC,EAAEH,KAAK,KAAK;MAC5C;MACAI,WAAWP,GAAA,EAAa;QACtBT,KAAA,CAAMiB,MAAA,CAAON,MAAA,CAAOF,GAAG,CAAC;MAC1B;MACAS,QAAQT,GAAA,EAAaJ,KAAA,EAAe;QAClCL,KAAA,CAAMmB,GAAA,CAAIR,MAAA,CAAOF,GAAG,GAAGE,MAAA,CAAON,KAAK,CAAC;MACtC;IACF;EACF,CAAC;AACH","ignoreList":[]}

package/dist/esm/testSetup.native.js

@@ -0,0 +1,30 @@
+var _globalThis_localStorage;
+if (typeof ((_globalThis_localStorage = globalThis.localStorage) === null || _globalThis_localStorage === void 0 ? void 0 : _globalThis_localStorage.getItem) !== "function") {
+  var store = /* @__PURE__ */new Map();
+  Object.defineProperty(globalThis, "localStorage", {
+    configurable: true,
+    value: {
+      get length() {
+        return store.size;
+      },
+      clear() {
+        store.clear();
+      },
+      getItem(key) {
+        var _store_get;
+        return (_store_get = store.get(String(key))) !== null && _store_get !== void 0 ? _store_get : null;
+      },
+      key(index) {
+        var _Array_from_index;
+        return (_Array_from_index = Array.from(store.keys())[index]) !== null && _Array_from_index !== void 0 ? _Array_from_index : null;
+      },
+      removeItem(key) {
+        store.delete(String(key));
+      },
+      setItem(key, value) {
+        store.set(String(key), String(value));
+      }
+    }
+  });
+}
+//# sourceMappingURL=testSetup.native.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_globalThis_localStorage","globalThis","localStorage","getItem","store","Map","Object","defineProperty","configurable","value","length","size","clear","key","_store_get","get","String","index","_Array_from_index","Array","from","keys","removeItem","delete","setItem","set"],"sources":["../../src/testSetup.ts"],"sourcesContent":[null],"mappings":"AAAA,IAAIA,wBAAkB;AACpB,YAAM,CAAAA,wBAAY,GAAoBC,UAAA,CAAAC,YAAA,cAAAF,wBAAA,uBAAAA,wBAAA,CAAAG,OAAA;EACtC,IAAAC,KAAO,kBAAe,IAAAC,GAAY;EAAgBC,MAChD,CAAAC,cAAc,CAAAN,UAAA;IACdO,YAAO;IAAAC,KACL,EAAI;MACF,IAAAC,MAAOA,CAAA;QACT,OAAAN,KAAA,CAAAO,IAAA;MACA;MACEC,MAAA,EAAM;QACRR,KAAA,CAAAQ,KAAA;MACA;MACET,QAAAU,GAAO;QACT,IAAAC,UAAA;QACA,OAAI,CAAAA,UAAe,GAAAV,KAAA,CAAAW,GAAA,CAAAC,MAAA,CAAAH,GAAA,gBAAAC,UAAA,cAAAA,UAAA;MACjB;MACFD,IAAAI,KAAA;QACA,IAAAC,iBAAwB;QACtB,OAAM,CAAAA,iBAAkB,GAAAC,KAAA,CAAAC,IAAA,CAAAhB,KAAA,CAAAiB,IAAA,IAAAJ,KAAA,eAAAC,iBAAA,cAAAA,iBAAA;MAC1B;MACAI,UAAQA,CAAAT,GAAa;QACnBT,KAAA,CAAMmB,MAAI,CAAAP,MAAO,CAAGH,GAAG;MACzB;MACFW,QAAAX,GAAA,EAAAJ,KAAA;QACDL,KAAA,CAAAqB,GAAA,CAAAT,MAAA,CAAAH,GAAA,GAAAG,MAAA,CAAAP,KAAA;MACH","ignoreList":[]}

package/dist/esm/zeroRunner.mjs

@@ -7,6 +7,9 @@ function getRunner(instance) {
   if (isInZeroMutation()) {
     return (q, o) => mutatorContext().tx.run(q, o);
   }
+  return getAmbientRunner(instance);
+}
+function getAmbientRunner(instance) {
   if (instance?.runner) {
     return instance.runner;
   }
@@ -15,5 +18,5 @@ function getRunner(instance) {
   }
   return runner;
 }
-export { getRunner, setRunner };
+export { getAmbientRunner, getRunner, setRunner };
 //# sourceMappingURL=zeroRunner.mjs.map

package/dist/esm/zeroRunner.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,CAACO,CAAA,EAAGC,CAAA,KAAMP,cAAA,CAAe,EAAEQ,EAAA,CAAGC,GAAA,CAAIH,CAAA,EAAGC,CAAC;EAC/C;EAIA,IAAIF,QAAA,EAAUJ,MAAA,EAAQ;IACpB,OAAOI,QAAA,CAASJ,MAAA;EAClB;EAEA,IAAI,CAACA,MAAA,EAAQ;IACX,MAAM,IAAIS,KAAA,CACR,6GACF;EACF;EAEA,OAAOT,MAAA;AACT","ignoreList":[]}
+{"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,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,CAACO,CAAA,EAAGC,CAAA,KAAMP,cAAA,CAAe,EAAEQ,EAAA,CAAGC,GAAA,CAAIH,CAAA,EAAGC,CAAC;EAC/C;EAEA,OAAOG,gBAAA,CAAiBL,QAAQ;AAClC;AAEO,SAASK,iBAAiBL,QAAA,EAAsD;EAGrF,IAAIA,QAAA,EAAUJ,MAAA,EAAQ;IACpB,OAAOI,QAAA,CAASJ,MAAA;EAClB;EAEA,IAAI,CAACA,MAAA,EAAQ;IACX,MAAM,IAAIU,KAAA,CACR,6GACF;EACF;EAEA,OAAOV,MAAA;AACT","ignoreList":[]}

package/dist/esm/zeroRunner.native.js

@@ -9,6 +9,9 @@ function getRunner(instance) {
       return mutatorContext().tx.run(q, o);
     };
   }
+  return getAmbientRunner(instance);
+}
+function getAmbientRunner(instance) {
   if (instance === null || instance === void 0 ? void 0 : instance.runner) {
     return instance.runner;
   }
@@ -17,5 +20,5 @@ function getRunner(instance) {
   }
   return runner;
 }
-export { getRunner, setRunner };
+export { getAmbientRunner, getRunner, setRunner };
 //# sourceMappingURL=zeroRunner.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIO,CAAM,EAAAC,CAAA;MACnB,OAAAP,cAAA,GAAAQ,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;IAIA;EACE;EACF,IAAAF,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAJ,MAAA;IAEA,OAAKI,QAAQ,CAAAJ,MAAA;EACX;EAAU,IACR,CAAAA,MAAA;IACF,UAAAS,KAAA;EACF;EAEA,OAAOT,MAAA;AACT","ignoreList":[]}
+{"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,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,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":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.4.35",
+  "version": "0.4.37",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
   "source": "src/index.ts",
@@ -65,6 +65,12 @@
       "import": "./dist/esm/vite-plugin.mjs",
       "require": "./dist/cjs/vite-plugin.cjs"
     },
+    "./multi": {
+      "react-native": "./dist/esm/multi.native.js",
+      "types": "./types/multi.d.ts",
+      "import": "./dist/esm/multi.mjs",
+      "require": "./dist/cjs/multi.cjs"
+    },
     "./drizzle": {
       "types": "./types/createSchemaFromDrizzle.d.ts",
       "import": "./dist/esm/createSchemaFromDrizzle.mjs",
@@ -77,7 +83,7 @@
     }
   },
   "dependencies": {
-    "@take-out/helpers": "0.4.35",
+    "@take-out/helpers": "0.4.37",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
     "valibot": "^1.1.0"

package/readme.md

@@ -526,9 +526,10 @@ exactly one instance — duplicate claims throw at create time. then combine
 them into one consumer surface:
 
 ```tsx
-import { combineZeroClients, createZeroClient } from 'on-zero'
+import { createZeroClient } from 'on-zero'
+import { combineZeroClients, createZeroClientWithDirectQueries } from 'on-zero/multi'
 
-const control = createZeroClient({
+const control = createZeroClientWithDirectQueries({
   schema,
   models: controlModels,
   groupedQueries: controlQueries,
@@ -551,8 +552,8 @@ export const { useQuery, zero, run, preload, getQuery, zeroEvents } =
 // client passed to combineZeroClients (or the `inner` option) must be the
 // INNERMOST provider — zero-react's useQuery resolves the nearest provider's
 // instance from context, so only the inner instance rides that path. all
-// other instances' useQuery/usePermission go through a context-free direct
-// materialize on their own mounted zero.
+// other instances must opt into the context-free direct adapter through
+// createZeroClientWithDirectQueries.
 ;<control.ProvideZero server={controlUrl} userID={user.id}>
   <project.ProvideZero server={projectUrl} userID={`${user.id}:${projectId}`}>
     <App />
@@ -565,11 +566,12 @@ constraints:
 - each instance needs its own client-group identity (separate `userID` /
   storage key / server url) — never swap the backing namespace under a live
   instance.
+- most apps should use plain `createZeroClient`; the `on-zero/multi` entrypoint
+  is only for this nested-provider edge case.
 - give the INNER slot to the instance owning the bulk of the subscriptions —
-  inner queries keep zero-react's viewStore dedup + ttl. outer instances use
-  the direct path, which has no cross-component view dedup (each hook
-  materializes its own view), so keep outer instances on bounded, tiny
-  queries (current user, settings, directories).
+  inner queries use zero-react's native context path. outer instances use the
+  direct adapter on their own mounted zero, so keep those instances on bounded,
+  low-fanout queries (current user, settings, directories).
 - a mutator may only read/write tables owned by its own instance. its
   transaction runs on that instance alone; cross-instance writes are not
   detectable at registration and will silently miss the other store.

package/src/combineZeroClients.tsx

@@ -19,12 +19,10 @@ import type { ReactNode } from 'react'
 // provider is mounted INNERMOST — may use the upstream context path. by
 // default that is the LAST client passed here (override via the `inner`
 // option); the first client is primary and its provider is expected OUTER.
-// the inner instance's queries ride zero-react's useQuery unchanged, keeping
-// viewStore dedup + ttl — give that slot to the instance owning the bulk of
-// the subscriptions. every other instance's useQuery/usePermission route
-// through the context-free direct hooks (useQueryDirect), which materialize
-// on the owning instance but skip view dedup — keep those instances on
-// bounded, tiny queries.
+// the inner instance's queries ride zero-react's useQuery unchanged. every
+// other instance must be created through `createZeroClientWithDirectQueries`
+// from `on-zero/multi`, which opts into the context-free adapter for this
+// nested-provider edge case. keep those non-inner instances bounded.
 
 type ControlQueriesProps = {
   children: ReactNode

package/src/createUseQuery.tsx

@@ -1,13 +1,5 @@
 import { useQuery as zeroUseQuery } from '@rocicorp/zero/react'
-import { useEmitterValue, type Emitter } from '@take-out/helpers'
-import {
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useSyncExternalStore,
-  type Context,
-} from 'react'
+import { useContext, useMemo, useRef, type Context } from 'react'
 
 import { useZeroDebug } from './helpers/useZeroDebug'
 import { resolveQuery, type PlainQueryFn } from './resolveQuery'
@@ -50,7 +42,7 @@ export type UseQueryHook<Schema extends ZeroSchema> = {
 const EMPTY_RESPONSE = [null, { type: 'unknown' }] as never
 
 // determine if useQuery-style args are (fn, params, options) or (fn, options)
-function parseUseQueryArgs(paramsOrOptions: any, optionsArg: any) {
+export function parseUseQueryArgs(paramsOrOptions: any, optionsArg: any) {
   const hasParams =
     optionsArg !== undefined ||
     (paramsOrOptions &&
@@ -105,182 +97,3 @@ export function createUseQuery<Schema extends ZeroSchema>({
 
   return useQuery as UseQueryHook<Schema>
 }
-
-// --- direct (context-free) query path -------------------------------------
-
-// zero-react's useQuery resolves its zero instance via useZero() → react
-// context, i.e. the NEAREST mounted ZeroProvider. with multiple client
-// instances nested on one page, every context-path query would materialize
-// against the innermost provider's instance regardless of which instance owns
-// the query. this hook is the context-free counterpart: it materializes the
-// resolved query directly on the owning instance's mounted zero.
-//
-// tradeoffs vs the context path (acceptable for the bounded, tiny queries the
-// non-inner instances own — see combineZeroClients):
-//  - no cross-component view dedup (zero-react's viewStore): each hook
-//    instance materializes its own view.
-//  - no strict-mode double-render protection: a discarded render's view is
-//    not destroyed until the owning zero closes.
-
-const DISABLED_SUBSCRIBE = () => () => {}
-// upstream zero-react returns [undefined, {type:'unknown'}] when disabled
-const DISABLED_SNAPSHOT: readonly [undefined, { type: 'unknown' }] = [
-  undefined,
-  { type: 'unknown' },
-]
-const getDisabledSnapshot = () => DISABLED_SNAPSHOT
-
-type DirectView = {
-  subscribe: (notify: () => void) => () => void
-  getSnapshot: () => readonly [unknown, { type: string }]
-  destroy: () => void
-}
-
-// method syntax for bivariant param checks — the real Zero['materialize']
-// generic signature must remain assignable to this structural slice. ttl is
-// untyped pass-through here, matching the context path (zeroUseQuery's
-// options are equally unchecked against upstream's TTL type).
-type MaterializableZero = {
-  materialize(
-    query: any,
-    options?: { ttl?: any },
-  ): {
-    addListener(cb: (data: any, resultType: string) => void): void
-    destroy(): void
-  }
-}
-
-function createDirectView(
-  getZero: () => MaterializableZero | null,
-  queryRequest: unknown,
-  ttl: UseQueryOptions['ttl'],
-): DirectView {
-  let snapshot: readonly [unknown, { type: string }] = DISABLED_SNAPSHOT
-  const listeners = new Set<() => void>()
-  let view: { destroy(): void } | null = null
-
-  const materialize = () => {
-    const zero = getZero()
-    if (!zero) return
-    // zero.materialize accepts a QueryRequest (it applies the instance context
-    // itself) — the same public api the upstream ViewWrapper uses
-    const next = zero.materialize(queryRequest, ttl === undefined ? undefined : { ttl })
-    view = next
-
-    // addListener fires immediately with current data, so the snapshot is
-    // populated before react's first getSnapshot. data must be cloned: the
-    // underlying view mutates it in place, and useSyncExternalStore requires
-    // immutable snapshots to detect changes.
-    next.addListener((data, resultType) => {
-      snapshot = [
-        data === undefined ? undefined : structuredClone(data),
-        { type: resultType },
-      ]
-      for (const listener of listeners) {
-        listener()
-      }
-    })
-  }
-
-  // eager: snapshot is warm before react's first getSnapshot
-  materialize()
-
-  return {
-    subscribe: (notify) => {
-      listeners.add(notify)
-      // react runs effect cleanup + re-setup with unchanged deps under
-      // StrictMode double-invoke and suspense hide/reveal — the cleanup
-      // destroyed the view while this memoized store survived, so the
-      // resubscribe must re-materialize or the snapshot freezes forever
-      if (view === null) {
-        materialize()
-      }
-      return () => listeners.delete(notify)
-    },
-    getSnapshot: () => snapshot,
-    destroy: () => {
-      const current = view
-      view = null
-      if (!current) return
-      // identity rotation closes the owning zero before react runs this
-      // cleanup (the version bump that swaps the view is post-commit) — the
-      // closed instance already removed the view's ttl connection record, so
-      // zero's destroy asserts ("Connection not found"). destroy-after-close
-      // is semantically a no-op; swallow it instead of killing the route.
-      try {
-        current.destroy()
-      } catch {
-        // instance closed first — nothing left to tear down
-      }
-    },
-  }
-}
-
-export function createUseQueryDirect<Schema extends ZeroSchema>({
-  DisabledContext,
-  customQueries,
-  getZero,
-  zeroVersion,
-}: {
-  DisabledContext: Context<QueryControlMode>
-  customQueries: AnyQueryRegistry
-  // the owning instance's mounted zero (null before its provider mounts)
-  getZero: () => MaterializableZero | null
-  // bumps after commit whenever the mounted zero changes (mount, rotation)
-  zeroVersion: Emitter<number>
-}): UseQueryHook<Schema> {
-  function useQueryDirect(...args: any[]): any {
-    const disableMode = useContext(DisabledContext)
-    const lastRef = useRef<any>(EMPTY_RESPONSE)
-    const [fn, paramsOrOptions, optionsArg] = args
-
-    const version = useEmitterValue(zeroVersion)
-    const { params, options } = parseUseQueryArgs(paramsOrOptions, optionsArg)
-
-    let enabled = true
-    let ttl: UseQueryOptions['ttl']
-    if (typeof options === 'boolean') {
-      enabled = options
-    } else if (options) {
-      enabled = options.enabled !== false
-      ttl = options.ttl
-    }
-
-    // key the view by VALUE (serialized params), not params object identity —
-    // there is no view dedup on this path, so an unstable inline params object
-    // must not re-materialize every render
-    const paramsKey = params === undefined ? '' : JSON.stringify(params)
-
-    const view = useMemo((): DirectView | null => {
-      if (!enabled || !getZero()) return null
-      const queryRequest = resolveQuery({ customQueries, fn, params })
-      return createDirectView(getZero, queryRequest, ttl)
-      // params is keyed by paramsKey; version re-materializes on a new zero
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [fn, paramsKey, enabled, ttl, version])
-
-    useEffect(() => {
-      if (!view) return
-      return () => view.destroy()
-    }, [view])
-
-    const out = useSyncExternalStore(
-      view ? view.subscribe : DISABLED_SUBSCRIBE,
-      view ? view.getSnapshot : getDisabledSnapshot,
-      view ? view.getSnapshot : getDisabledSnapshot,
-    )
-
-    if (!disableMode) {
-      lastRef.current = out
-      return out
-    }
-
-    if (disableMode === 'last-value') {
-      return lastRef.current
-    }
-
-    return EMPTY_RESPONSE
-  }
-
-  return useQueryDirect as UseQueryHook<Schema>
-}