on-zero 0.4.22 → 0.4.24

package/dist/esm/multiInstanceNested.test.native.js

@@ -0,0 +1,252 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createSchema, string, table } from "@rocicorp/zero";
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { combineZeroClients } from "./combineZeroClients.native.js";
+import { createZeroClient } from "./createZeroClient.native.js";
+import { zql } from "./zql.native.js";
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+var userTable = table("user").columns({
+  id: string(),
+  name: string()
+}).primaryKey("id");
+var taskTable = table("task").columns({
+  id: string(),
+  title: string()
+}).primaryKey("id");
+var schema = createSchema({
+  tables: [userTable, taskTable]
+});
+var controlModels = {
+  user: {
+    mutate: {
+      seed: async function (ctx, row) {
+        await ctx.tx.mutate.user.upsert(row);
+      }
+    }
+  }
+};
+var ctlUserById = function (args) {
+  return zql.user.where("id", args.id).one();
+};
+var control = createZeroClient({
+  schema,
+  models: controlModels,
+  groupedQueries: {
+    ctlUser: {
+      byId: ctlUserById
+    }
+  },
+  instanceName: "nested-control"
+});
+var projectModels = {
+  prjSeed: {
+    mutate: {
+      seedUser: async function (ctx, row) {
+        await ctx.tx.mutate.user.upsert(row);
+      }
+    }
+  }
+};
+var prjTaskById = function (args) {
+  return zql.task.where("id", args.id).one();
+};
+var project = createZeroClient({
+  schema,
+  models: projectModels,
+  groupedQueries: {
+    prjTask: {
+      byId: prjTaskById
+    }
+  },
+  instanceName: "nested-project"
+});
+var combined = combineZeroClients(control, project);
+var root;
+var container;
+beforeEach(function () {
+  resetProbe();
+  container = document.createElement("div");
+  document.body.appendChild(container);
+  root = createRoot(container);
+});
+afterEach(async function () {
+  await act(async function () {
+    return root.unmount();
+  });
+  container.remove();
+});
+var render = function (ui) {
+  return act(async function () {
+    return root.render(ui);
+  });
+};
+async function waitFor(condition, what) {
+  for (var i = 0; i < 200; i++) {
+    if (condition()) return;
+    await act(async function () {
+      await new Promise(function (resolve) {
+        return setTimeout(resolve, 5);
+      });
+    });
+  }
+  throw new Error(`timed out waiting for ${what}`);
+}
+var probe = {
+  data: void 0,
+  renders: 0
+};
+function resetProbe() {
+  probe.data = void 0;
+  probe.renders = 0;
+}
+function ControlUserProbe(param) {
+  var {
+    id
+  } = param;
+  var [data] = combined.useQuery(ctlUserById, {
+    id
+  });
+  probe.data = data !== null && data !== void 0 ? data : void 0;
+  probe.renders++;
+  return null;
+}
+var seedControl = async function (row) {
+  await act(async function () {
+    await control.zero.mutate.user.seed(row).client;
+  });
+};
+var seedProject = async function (row) {
+  await act(async function () {
+    await project.zero.mutate.prjSeed.seedUser(row).client;
+  });
+};
+test("outer-instance query reads the OUTER store under nested providers", async function () {
+  var _probe_data;
+  await render(/* @__PURE__ */_jsx(control.ProvideZero, {
+    server: null,
+    userID: "t1-ctl",
+    children: /* @__PURE__ */_jsx(project.ProvideZero, {
+      server: null,
+      userID: "t1-prj",
+      children: /* @__PURE__ */_jsx(ControlUserProbe, {
+        id: "u1"
+      })
+    })
+  }));
+  await waitFor(function () {
+    return probe.renders > 0;
+  }, "probe mount");
+  await seedControl({
+    id: "u1",
+    name: "from-control"
+  });
+  await seedProject({
+    id: "u1",
+    name: "from-project"
+  });
+  await waitFor(function () {
+    return probe.data !== void 0;
+  }, "control row visible");
+  expect((_probe_data = probe.data) === null || _probe_data === void 0 ? void 0 : _probe_data.name).toBe("from-control");
+});
+test("inner provider unmount/remount does not break outer-instance subscriptions", async function () {
+  var App = function (param) {
+    var {
+      showInner
+    } = param;
+    return /* @__PURE__ */_jsx(control.ProvideZero, {
+      server: null,
+      userID: "t2-ctl",
+      children: showInner ? /* @__PURE__ */_jsx(project.ProvideZero, {
+        server: null,
+        userID: "t2-prj",
+        children: /* @__PURE__ */_jsx(ControlUserProbe, {
+          id: "u2"
+        })
+      }) : /* @__PURE__ */_jsx(ControlUserProbe, {
+        id: "u2"
+      })
+    });
+  };
+  await render(/* @__PURE__ */_jsx(App, {
+    showInner: true
+  }));
+  await waitFor(function () {
+    return probe.renders > 0;
+  }, "probe mount");
+  await seedControl({
+    id: "u2",
+    name: "v1"
+  });
+  await waitFor(function () {
+    var _probe_data;
+    return ((_probe_data = probe.data) === null || _probe_data === void 0 ? void 0 : _probe_data.name) === "v1";
+  }, "v1 visible");
+  await render(/* @__PURE__ */_jsx(App, {
+    showInner: false
+  }));
+  await seedControl({
+    id: "u2",
+    name: "v2"
+  });
+  await waitFor(function () {
+    var _probe_data;
+    return ((_probe_data = probe.data) === null || _probe_data === void 0 ? void 0 : _probe_data.name) === "v2";
+  }, "v2 visible after inner unmount");
+  await render(/* @__PURE__ */_jsx(App, {
+    showInner: true
+  }));
+  await seedControl({
+    id: "u2",
+    name: "v3"
+  });
+  await waitFor(function () {
+    var _probe_data;
+    return ((_probe_data = probe.data) === null || _probe_data === void 0 ? void 0 : _probe_data.name) === "v3";
+  }, "v3 visible after inner remount");
+});
+test("direct-path views re-materialize when the owning instance rotates", async function () {
+  var App = function (param) {
+    var {
+      userID
+    } = param;
+    return /* @__PURE__ */_jsx(control.ProvideZero, {
+      server: null,
+      userID,
+      children: /* @__PURE__ */_jsx(ControlUserProbe, {
+        id: "u3"
+      })
+    });
+  };
+  await render(/* @__PURE__ */_jsx(App, {
+    userID: "rot-1"
+  }));
+  await waitFor(function () {
+    return probe.renders > 0;
+  }, "probe mount");
+  await seedControl({
+    id: "u3",
+    name: "before-rotation"
+  });
+  await waitFor(function () {
+    var _probe_data;
+    return ((_probe_data = probe.data) === null || _probe_data === void 0 ? void 0 : _probe_data.name) === "before-rotation";
+  }, "pre-rotation row");
+  await render(/* @__PURE__ */_jsx(App, {
+    userID: "rot-2"
+  }));
+  await waitFor(function () {
+    return probe.data === void 0;
+  }, "view reset to the new empty store");
+  await seedControl({
+    id: "u3",
+    name: "after-rotation"
+  });
+  await waitFor(function () {
+    var _probe_data;
+    return ((_probe_data = probe.data) === null || _probe_data === void 0 ? void 0 : _probe_data.name) === "after-rotation";
+  }, "post-rotation row");
+});
+//# sourceMappingURL=multiInstanceNested.test.native.js.map

package/dist/esm/multiInstanceNested.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["jsx","_jsx","createSchema","string","table","act","createRoot","afterEach","beforeEach","expect","test","combineZeroClients","createZeroClient","zql","globalThis","IS_REACT_ACT_ENVIRONMENT","userTable","columns","id","name","primaryKey","taskTable","title","schema","tables","controlModels","user","mutate","seed","ctx","row","tx","upsert","ctlUserById","args","where","one","control","models","groupedQueries","ctlUser","byId","instanceName","projectModels","prjSeed","seedUser","prjTaskById","task","project","prjTask","combined","root","container","resetProbe","document","createElement","body","appendChild","unmount","remove","render","ui","waitFor","condition","what","i","Promise","resolve","setTimeout","Error","probe","data","renders","ControlUserProbe","param","useQuery","seedControl","zero","client","seedProject"],"sources":["../../src/multiInstanceNested.test.tsx"],"sourcesContent":[null],"mappings":"AAOA,SAASA,GAAA,IAAAC,IAAA,QAAc,mBAAqB;AAC5C,SAASC,YAAW,EAAAC,MAAA,EAAAC,KAAA;AACpB,SAASC,GAAA,eAA6B;AACtC,SAASC,UAAA,QAAW,kBAAoB;AAExC,SAASC,SAAA,EAAAC,UAAA,EAAAC,MAA0B,EAAAC,IAAA;AACnC,SAASC,kBAAA,QAAwB;AACjC,SAASC,gBAAW;AA6HZ,SAAAC,GAAA;AApHRC,UAAA,CAAWC,wBAAA,GAA2B;AAEtC,IAAAC,SAAM,GAAAZ,KAAY,OAAM,EAAMa,OAAE;EAChCC,EAAA,EAAMf,MAAA;EAGNgB,IAAM,EAAAhB,MAAA,CAAS;AAMf,GAAAiB,UAAM;AAAgB,IACpBC,SAAM,GAAAjB,KAAA,SAAAa,OAAA;EAAAC,EACJ,EAAAf,MAAQ;EAAAmB,KACN,EAAAnB,MAAM;AACJ,GAAAiB,UAAA,CAAO,IAAI;AAAiC,IAAAG,MAC9C,GAAArB,YAAA;EAAAsB,MACF,GACFR,SAAA,EACFK,SAAA;AAGA;AAAiC,IAC/BI,aAAA;EACAC,IAAA;IACAC,MAAA;MACAC,IAAA,iBAAAA,CAAcC,GAAA,EAAAC,GAAA;QACf,MAAAD,GAAA,CAAAE,EAAA,CAAAJ,MAAA,CAAAD,IAAA,CAAAM,MAAA,CAAAF,GAAA;MAKK;IACJ;EAAS;AACC;AAEJ,IAAAG,WAAO,GAAI,SAAAA,CAAGC,IAAe,EAAK;EAAU,OAC9CrB,GAAA,CAAAa,IAAA,CAAAS,KAAA,OAAAD,IAAA,CAAAhB,EAAA,EAAAkB,GAAA;AAAA;AACF,IACFC,OAAA,GAAAzB,gBAAA;EACFW,MAAA;EACAe,MAAM,EAAAb,aAAe;EAErBc,cAAgB;IACdC,OAAA;MACAC,IAAQ,EAAAR;IACR;EACA;EACDS,YAAA;AAGD;AAEA,IAAIC,aAAA;EACJC,OAAI;IAEJjB,MAAA,EAAW;MACTkB,QAAW,iBAAAA,CAAAhB,GAAA,EAAAC,GAAA;QACX,MAAYD,GAAA,CAAAE,EAAA,CAAAJ,MAAS,CAAAD,IAAA,CAAAM,MAAc,CAAAF,GAAK;MACxC;IACA;EACD;AAED;AACE,IAAAgB,WAAU,YAAAA,CAAYZ,IAAK;EAC3B,OAAArB,GAAU,CAAAkC,IAAA,CAAAZ,KAAO,OAAAD,IAAA,CAAAhB,EAAA,EAAAkB,GAAA;AACnB,CAAC;AAED,IAAAY,OAAM,GAAApC,gBAAgC;EAEtCW,MAAA;EACEe,MAAA,EAAAK,aAAoB;EAClBJ,cAAI,EAAU;IACdU,OAAM;MACJR,IAAA,EAAMK;IACR;EACF;EACAJ,YAAU;AACZ;AAEA,IAAAQ,QAAM,GAAwDvC,kBAAA,CAAA0B,OAAA,EAAAW,OAAA;AAAA,IAC5DG,IAAM;AAAA,IACNC,SAAS;AACX5C,UAAA;EAIA6C,UAAS;EACPD,SAAM,GAAAE,QAAO,CAAAC,aAAA;EACbD,QAAM,CAAAE,IAAA,CAAAC,WAAU,CAAAL,SAAA;EAClBD,IAAA,GAAA7C,UAAA,CAAA8C,SAAA;AAEA;AACE7C,SAAO,mBAAkB;EACzB,MAAMF,GAAA,mBAAe;IACrB,OAAM8C,IAAA,CAAAO,OAAA;EACN;EACFN,SAAA,CAAAO,MAAA;AAEA;AACE,IAAAC,MAAM,GAAI,SAAAA,CAAAC,EAAY;EACpB,OAAAxD,GAAO,mBAA4B;IACpC,OAAA8C,IAAA,CAAAS,MAAA,CAAAC,EAAA;EACH;AAEA;AACE,eAAUC,QAAAC,SAAY,EAAAC,IAAA;EACpB,SAAOC,CAAA,MAAQA,CAAA,MAAK,EAAAA,CAAA,EAAe;IACpC,IAAAF,SAAA;IACH,MAAA1D,GAAA;MAEK,UAAA6D,OAAA,WAAAC,OAAA;QACG,OAAAC,UAAA,CAAAD,OAAA;MACJ;IAKF;EACA;EAIA,MAAM,IAAAE,KAAA,0BAA8BL,IAAA;AACpC;AAEA,IAAAM,KAAM;EACNC,IAAA,OAAO;EACRC,OAAA;AAED;AACE,SAAMnB,UAASA,CAAA;EAYfiB,KAAA,CAAMC,IAAA,GAAO;EACbD,KAAA,CAAME,OAAA,GAAQ;AAEd;AACA,SAAMC,gBAAcA,CAAAC,KAAM;EAG1B;IAAMxD;EAAA,IAAOwD,KAAA;EACb,KAAAH,IAAM,IAAArB,QAAc,CAAAyB,QAAU,CAAA1C,WAAY;IAC1Cf;EAGA;EACAoD,KAAA,CAAMC,IAAA,GAAAA,IAAA,KAAc,IAAI,IAAMA,IAAA,KAAM,KAAM,IAAAA,IAAA;EAC1CD,KAAA,CAAME,OAAA,EAAQ;EACf;AAED;AACE,IAAAI,WAAa,GAAE,eAAAA,CACb9C,GAAA;EAKF,MAAMzB,GAAA,mBAAO;IACb,MAAMgC,OAAQ,CAAAwC,IAAM,CAAAlD,MAAM,CAAAD,IAAA,CAAAE,IAAU,CAAAE,GAAG,EAAAgD,MAAA;EAEvC;AACA;AAIA,IAAAC,WAAa,kBAAAA,CAAAjD,GAAC;EACd,MAAMzB,GAAA,mBAAoB;IAE1B,MAAM2C,OAAA,CAAA6B,IAAc,CAAAlD,MAAI,CAAAiB,OAAM,CAAMC,QAAA,CAAAf,GAAA,EAAAgD,MAAkB;EACtD;AACF,CAAC","ignoreList":[]}

package/dist/esm/run.mjs

@@ -1,3 +1,4 @@
+import { getInstanceForQueryFn } from "./instanceRegistry.mjs";
 import { resolveQuery } from "./resolveQuery.mjs";
 import { getRunner } from "./zeroRunner.mjs";
 let customQueriesRef = null;
@@ -14,21 +15,20 @@ function run(queryOrFn, paramsOrMode, modeArg) {
   const hasParams = modeArg !== void 0 || paramsOrMode && paramsOrMode !== "complete";
   const params = hasParams ? paramsOrMode : void 0;
   const mode = hasParams ? modeArg : paramsOrMode;
-  const runner = getRunner();
   const options = mode === "complete" ? {
     type: "complete"
   } : void 0;
   if (queryOrFn && queryOrFn["ast"]) {
-    return runner(queryOrFn, options);
+    return getRunner()(queryOrFn, options);
   }
-  const customQueries = getCustomQueries();
+  const instance = getInstanceForQueryFn(queryOrFn);
+  const customQueries = instance?.customQueries ?? getCustomQueries();
   const queryRequest = resolveQuery({
     customQueries,
     fn: queryOrFn,
     params
   });
-  const out = runner(queryRequest, options);
-  return out;
+  return getRunner(instance)(queryRequest, options);
 }
 export { run, setCustomQueries };
 //# sourceMappingURL=run.mjs.map

package/dist/esm/run.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["resolveQuery","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","runner","options","type","customQueries","queryRequest","fn","out"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,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,MAAA,GAASb,SAAA,CAAU;EACzB,MAAMc,OAAA,GACJF,IAAA,KAAS,aACJ;IACCG,IAAA,EAAM;EACR,IACA;EAEN,IAAIR,SAAA,IAAaA,SAAA,CAAU,KAAK,GAAG;IAEjC,OAAOM,MAAA,CAAON,SAAA,EAAWO,OAAO;EAClC;EAEA,MAAME,aAAA,GAAgBZ,gBAAA,CAAiB;EACvC,MAAMa,YAAA,GAAelB,YAAA,CAAa;IAAEiB,aAAA;IAAeE,EAAA,EAAIX,SAAA;IAAWI;EAAO,CAAC;EAE1E,MAAMQ,GAAA,GAAMN,MAAA,CAAOI,YAAA,EAAqBH,OAAO;EAE/C,OAAOK,GAAA;AACT","ignoreList":[]}
+{"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":[]}

package/dist/esm/run.native.js

@@ -1,3 +1,4 @@
+import { getInstanceForQueryFn } from "./instanceRegistry.native.js";
 import { resolveQuery } from "./resolveQuery.native.js";
 import { getRunner } from "./zeroRunner.native.js";
 var customQueriesRef = null;
@@ -14,21 +15,21 @@ function run(queryOrFn, paramsOrMode, modeArg) {
   var hasParams = modeArg !== void 0 || paramsOrMode && paramsOrMode !== "complete";
   var params = hasParams ? paramsOrMode : void 0;
   var mode = hasParams ? modeArg : paramsOrMode;
-  var runner = getRunner();
   var options = mode === "complete" ? {
     type: "complete"
   } : void 0;
   if (queryOrFn && queryOrFn["ast"]) {
-    return runner(queryOrFn, options);
+    return getRunner()(queryOrFn, options);
   }
-  var customQueries = getCustomQueries();
+  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();
   var queryRequest = resolveQuery({
     customQueries,
     fn: queryOrFn,
     params
   });
-  var out = runner(queryRequest, options);
-  return out;
+  return getRunner(instance)(queryRequest, options);
 }
 export { run, setCustomQueries };
 //# sourceMappingURL=run.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["resolveQuery","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","runner","options","type","customQueries","queryRequest","fn","out"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,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,MAAM,GAAAb,SAAS;EACf,IAAAc,OAAM,GAAOF,IAAA,eAAY,GAAU;IACnCG,IAAM;EACN,SAAM;EAEC,IACCR,SAAM,IAAAA,SAAA;IACR,OACAM,MAAA,CAAAN,SAAA,EAAAO,OAAA;EAEN;EAEE,IAAAE,aAAc,GAAAZ,gBAAkB;EAClC,IAAAa,YAAA,GAAAlB,YAAA;IAEAiB,aAAM;IACNE,EAAA,EAAMX,SAAA;IAENI;EAEA;EACF,IAAAQ,GAAA,GAAAN,MAAA,CAAAI,YAAA,EAAAH,OAAA","ignoreList":[]}
+{"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":[]}

package/dist/esm/zeroRunner.mjs

@@ -3,10 +3,13 @@ let runner = null;
 function setRunner(r) {
   runner = r;
 }
-function getRunner() {
+function getRunner(instance) {
   if (isInZeroMutation()) {
     return (q, o) => mutatorContext().tx.run(q, o);
   }
+  if (instance?.runner) {
+    return instance.runner;
+  }
   if (!runner) {
     throw new Error("Zero runner not initialized. Ensure ProvideZero is mounted (client) or createZeroServer is called (server).");
   }

package/dist/esm/zeroRunner.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","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,UAAA,EAAwB;EACtC,IAAIL,gBAAA,CAAiB,GAAG;IACtB,OAAO,CAACM,CAAA,EAAGC,CAAA,KAAMN,cAAA,CAAe,EAAEO,EAAA,CAAGC,GAAA,CAAIH,CAAA,EAAGC,CAAC;EAC/C;EAEA,IAAI,CAACL,MAAA,EAAQ;IACX,MAAM,IAAIQ,KAAA,CACR,6GACF;EACF;EAEA,OAAOR,MAAA;AACT","ignoreList":[]}
+{"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":[]}

package/dist/esm/zeroRunner.native.js

@@ -3,12 +3,15 @@ var runner = null;
 function setRunner(r) {
   runner = r;
 }
-function getRunner() {
+function getRunner(instance) {
   if (isInZeroMutation()) {
     return function (q, o) {
       return mutatorContext().tx.run(q, o);
     };
   }
+  if (instance === null || instance === void 0 ? void 0 : instance.runner) {
+    return instance.runner;
+  }
   if (!runner) {
     throw new Error("Zero runner not initialized. Ensure ProvideZero is mounted (client) or createZeroServer is called (server).");
   }

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

@@ -1 +1 @@
-{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","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,UAAA,EAAwB;EACtC,IAAIL,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIM,CAAM,EAAAC,CAAA;MACnB,OAAAN,cAAA,GAAAO,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;IAEA;EACE;EAAU,IACR,CAAAL,MAAA;IACF,UAAAQ,KAAA;EACF;EAEA,OAAOR,MAAA;AACT","ignoreList":[]}
+{"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":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.4.22",
+  "version": "0.4.24",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
   "source": "src/index.ts",
@@ -77,7 +77,7 @@
     }
   },
   "dependencies": {
-    "@take-out/helpers": "0.4.22",
+    "@take-out/helpers": "0.4.24",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
     "valibot": "^1.1.0"
@@ -105,14 +105,16 @@
     }
   },
   "devDependencies": {
-    "drizzle-zero": "1.0.0-beta.0",
     "@tamagui/build": "2.1.0-1780964419737",
     "@types/node": "25.2.0",
     "@types/pg": "^8.11.10",
     "@types/react": "^19.0.0",
+    "drizzle-zero": "1.0.0-beta.0",
+    "jsdom": "29.1.1",
     "oxfmt": "^0.16.0",
     "oxlint": "^1.31.0",
     "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-native": "*",
     "typescript": "^5.9.3",
     "vitest": "^3.1.1"

package/readme.md

@@ -517,6 +517,65 @@ app.post('/api/zero/pull', async (req) => {
 })
 ```
 
+### multiple client instances
+
+one page can run several zero clients (e.g. a global control-plane instance
+plus a per-project instance with its own storage key and sync url). give each
+a unique `instanceName` and split queries/models so every namespace belongs to
+exactly one instance — duplicate claims throw at create time. then combine
+them into one consumer surface:
+
+```tsx
+import { combineZeroClients, createZeroClient } from 'on-zero'
+
+const control = createZeroClient({
+  schema,
+  models: controlModels,
+  groupedQueries: controlQueries,
+  instanceName: 'control',
+})
+const project = createZeroClient({
+  schema,
+  models: projectModels,
+  groupedQueries: projectQueries,
+  instanceName: 'project',
+})
+
+// useQuery/run/preload/getQuery dispatch by the query fn's namespace,
+// zero.mutate.<namespace> dispatches by model namespace; anything unclaimed
+// (and non-mutate zero access like userID) goes to the first client
+export const { useQuery, zero, run, preload, getQuery, zeroEvents } =
+  combineZeroClients(control, project)
+
+// render every instance's provider. NESTING ORDER IS A CONTRACT: the LAST
+// 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.
+;<control.ProvideZero server={controlUrl} userID={user.id}>
+  <project.ProvideZero server={projectUrl} userID={`${user.id}:${projectId}`}>
+    <App />
+  </project.ProvideZero>
+</control.ProvideZero>
+```
+
+constraints:
+
+- each instance needs its own client-group identity (separate `userID` /
+  storage key / server url) — never swap the backing namespace under a live
+  instance.
+- 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).
+- 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.
+- the server stays single: one `createZeroServer` per backend process.
+- omitting `instanceName` keeps the exact single-instance behavior.
+
 ### server validation hooks
 
 add custom validation for all queries and mutations: