on-zero 0.4.23 → 0.4.24

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

@@ -0,0 +1,385 @@
+import { createSchema, string, table } from "@rocicorp/zero";
+import { createEmitter } from "@take-out/helpers";
+import { describe, expect, test, vi } from "vitest";
+import { combineZeroClients } from "./combineZeroClients.native.js";
+import { createZeroClient } from "./createZeroClient.native.js";
+import { getInstanceForNamespace, registerClientInstance } from "./instanceRegistry.native.js";
+import { registerQuery } from "./queryRegistry.native.js";
+import { run } from "./run.native.js";
+import { setRunner } from "./zeroRunner.native.js";
+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 makeQueryFn = function () {
+  return function (args) {
+    return args;
+  };
+};
+function makeClient(instanceName, namespace) {
+  var byId = makeQueryFn();
+  return {
+    byId,
+    client: createZeroClient({
+      schema,
+      models: {},
+      groupedQueries: {
+        [namespace]: {
+          byId
+        }
+      },
+      instanceName
+    })
+  };
+}
+function fakeClient(name, namespaces, zeroStub) {
+  registerClientInstance({
+    name,
+    namespaces,
+    // boundary stub: dispatch tests never resolve queries through it
+    customQueries: {}
+  });
+  return {
+    instanceName: name,
+    useQuery: vi.fn(function () {
+      return `${name}-useQuery`;
+    }),
+    useQueryDirect: vi.fn(function () {
+      return `${name}-useQueryDirect`;
+    }),
+    usePermission: vi.fn(function () {
+      return `${name}-usePermission`;
+    }),
+    usePermissionDirect: vi.fn(function () {
+      return `${name}-usePermissionDirect`;
+    }),
+    zero: zeroStub,
+    preload: vi.fn(function () {
+      return `${name}-preload`;
+    }),
+    getQuery: vi.fn(function () {
+      return `${name}-getQuery`;
+    }),
+    zeroEvents: createEmitter(`zero:test-${name}`, null),
+    ControlQueries: function (param) {
+      var {
+        children
+      } = param;
+      return children;
+    }
+  };
+}
+describe("multi-instance namespace dispatch", function () {
+  test("run() dispatches named queries to the owning instance runner", async function () {
+    var control = makeClient("run-control", "runUser");
+    var project = makeClient("run-project", "runTask");
+    var controlRunner = vi.fn(async function () {
+      for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+        _args[_key] = arguments[_key];
+      }
+      return {
+        from: "control"
+      };
+    });
+    var projectRunner = vi.fn(async function () {
+      for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+        _args[_key] = arguments[_key];
+      }
+      return {
+        from: "project"
+      };
+    });
+    getInstanceForNamespace("runUser").runner = controlRunner;
+    getInstanceForNamespace("runTask").runner = projectRunner;
+    var ambientRunner = vi.fn(async function () {
+      for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+        _args[_key] = arguments[_key];
+      }
+      return {
+        from: "ambient"
+      };
+    });
+    setRunner(ambientRunner);
+    await expect(run(control.byId, {
+      id: "1"
+    })).resolves.toEqual({
+      from: "control"
+    });
+    await expect(run(project.byId, {
+      id: "2"
+    })).resolves.toEqual({
+      from: "project"
+    });
+    expect(ambientRunner).not.toHaveBeenCalled();
+    var request = controlRunner.mock.calls[0][0];
+    expect(request.query.queryName).toBe("runUser.byId");
+  });
+  test("a claimed namespace with an unmounted instance uses the ambient runner (server path)", async function () {
+    var {
+      byId
+    } = makeClient("srv-instance", "srvThing");
+    var ambient = vi.fn(async function () {
+      for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+        _args[_key] = arguments[_key];
+      }
+      return {
+        from: "ambient"
+      };
+    });
+    setRunner(ambient);
+    await expect(run(byId, {
+      id: "1"
+    })).resolves.toEqual({
+      from: "ambient"
+    });
+    expect(ambient).toHaveBeenCalledTimes(1);
+  });
+  test("duplicate namespace claim throws at create time", function () {
+    makeClient("dup-a", "dupNs");
+    expect(function () {
+      return makeClient("dup-b", "dupNs");
+    }).toThrow(/already claimed/);
+  });
+  test("re-creating an instance under the same name re-claims without throwing (hmr)", function () {
+    var _getInstanceForNamespace;
+    makeClient("hmr", "hmrNs");
+    expect(function () {
+      return makeClient("hmr", "hmrNs");
+    }).not.toThrow();
+    expect((_getInstanceForNamespace = getInstanceForNamespace("hmrNs")) === null || _getInstanceForNamespace === void 0 ? void 0 : _getInstanceForNamespace.name).toBe("hmr");
+  });
+  test("model namespaces are claimed too", function () {
+    var _getInstanceForNamespace;
+    var models = {
+      mdlThing: {
+        mutate: {
+          insert: async function () {}
+        }
+      }
+    };
+    createZeroClient({
+      schema,
+      models,
+      groupedQueries: {},
+      instanceName: "mdl-a"
+    });
+    expect((_getInstanceForNamespace = getInstanceForNamespace("mdlThing")) === null || _getInstanceForNamespace === void 0 ? void 0 : _getInstanceForNamespace.name).toBe("mdl-a");
+    expect(function () {
+      return createZeroClient({
+        schema,
+        models,
+        groupedQueries: {},
+        instanceName: "mdl-b"
+      });
+    }).toThrow(/already claimed/);
+  });
+});
+describe("multi-instance isolation", function () {
+  test("each instance has an isolated zeroEvents emitter", function () {
+    var _a_zeroEvents_options, _b_zeroEvents_options;
+    var {
+      client: a
+    } = makeClient("emit-a", "emitA");
+    var {
+      client: b
+    } = makeClient("emit-b", "emitB");
+    expect(a.zeroEvents).not.toBe(b.zeroEvents);
+    expect((_a_zeroEvents_options = a.zeroEvents.options) === null || _a_zeroEvents_options === void 0 ? void 0 : _a_zeroEvents_options.name).toBe("zero:emit-a");
+    expect((_b_zeroEvents_options = b.zeroEvents.options) === null || _b_zeroEvents_options === void 0 ? void 0 : _b_zeroEvents_options.name).toBe("zero:emit-b");
+    var seenByB = [];
+    b.zeroEvents.listen(function (event) {
+      return seenByB.push(event);
+    });
+    a.zeroEvents.emit({
+      type: "error",
+      message: "a-only"
+    });
+    expect(seenByB).toEqual([]);
+    expect(a.zeroEvents.value).toEqual({
+      type: "error",
+      message: "a-only"
+    });
+    expect(b.zeroEvents.value).toBe(null);
+  });
+  test("the default instance keeps the legacy emitter name", function () {
+    var _client_zeroEvents_options;
+    var {
+      client
+    } = makeClient("default", "defaultNs");
+    expect((_client_zeroEvents_options = client.zeroEvents.options) === null || _client_zeroEvents_options === void 0 ? void 0 : _client_zeroEvents_options.name).toBe("zero");
+  });
+  test("each instance has its own unmounted zero proxy", function () {
+    var {
+      client: a
+    } = makeClient("proxy-a", "proxyA");
+    var {
+      client: b
+    } = makeClient("proxy-b", "proxyB");
+    expect(a.zero === b.zero).toBe(false);
+    expect(function () {
+      return a.zero.clientID;
+    }).toThrow(/not initialized/);
+    expect(function () {
+      return b.zero.clientID;
+    }).toThrow(/not initialized/);
+  });
+});
+describe("combineZeroClients facade", function () {
+  test("zero.mutate dispatches by model namespace, rest forwards to primary", function () {
+    var insertSpy = vi.fn();
+    var updateSpy = vi.fn();
+    var control = fakeClient("fz-control", ["fzUser"], {
+      mutate: {
+        fzUser: {
+          insert: insertSpy
+        }
+      },
+      userID: "primary-user"
+    });
+    var project = fakeClient("fz-project", ["fzTask"], {
+      mutate: {
+        fzTask: {
+          update: updateSpy
+        }
+      },
+      userID: "project-user"
+    });
+    var combined = combineZeroClients(control, project);
+    var zero = combined.zero;
+    zero.mutate.fzUser.insert({
+      id: "1"
+    });
+    zero.mutate.fzTask.update({
+      id: "2"
+    });
+    expect(insertSpy).toHaveBeenCalledWith({
+      id: "1"
+    });
+    expect(updateSpy).toHaveBeenCalledWith({
+      id: "2"
+    });
+    expect(zero.userID).toBe("primary-user");
+    expect(zero.mutate.unknownNs).toBe(void 0);
+  });
+  test("useQuery/preload/getQuery/usePermission dispatch by namespace", function () {
+    var control = fakeClient("fq-control", ["fqUser"], {});
+    var project = fakeClient("fq-project", ["fqTask"], {});
+    var userQuery = makeQueryFn();
+    var taskQuery = makeQueryFn();
+    registerQuery(userQuery, "fqUser.byId");
+    registerQuery(taskQuery, "fqTask.byId");
+    var combined = combineZeroClients(control, project);
+    var useQuery = combined.useQuery;
+    var preload = combined.preload;
+    var getQuery = combined.getQuery;
+    var usePermission = combined.usePermission;
+    useQuery(userQuery, {
+      id: "1"
+    });
+    expect(control.useQueryDirect).toHaveBeenCalledWith(userQuery, {
+      id: "1"
+    });
+    expect(control.useQuery).not.toHaveBeenCalled();
+    expect(project.useQuery).not.toHaveBeenCalled();
+    useQuery(taskQuery, {
+      id: "2"
+    });
+    expect(project.useQuery).toHaveBeenCalledWith(taskQuery, {
+      id: "2"
+    });
+    expect(project.useQueryDirect).not.toHaveBeenCalled();
+    preload(taskQuery, {
+      id: "3"
+    });
+    expect(project.preload).toHaveBeenCalledWith(taskQuery, {
+      id: "3"
+    });
+    expect(control.preload).not.toHaveBeenCalled();
+    getQuery(userQuery, {
+      id: "4"
+    });
+    expect(control.getQuery).toHaveBeenCalledWith(userQuery, {
+      id: "4"
+    });
+    expect(project.getQuery).not.toHaveBeenCalled();
+    var anonymous = makeQueryFn();
+    useQuery(anonymous, {
+      id: "5"
+    });
+    expect(control.useQueryDirect).toHaveBeenCalledWith(anonymous, {
+      id: "5"
+    });
+    usePermission("fqTask", "row-1");
+    expect(project.usePermission).toHaveBeenCalledWith("fqTask", "row-1");
+    expect(project.usePermissionDirect).not.toHaveBeenCalled();
+    usePermission("fqUser", "row-2");
+    expect(control.usePermissionDirect).toHaveBeenCalledWith("fqUser", "row-2");
+    expect(control.usePermission).not.toHaveBeenCalled();
+  });
+  test("the inner option overrides which client uses the context path", function () {
+    var a = fakeClient("inner-a", ["innerA"], {});
+    var b = fakeClient("inner-b", ["innerB"], {});
+    var aQuery = makeQueryFn();
+    var bQuery = makeQueryFn();
+    registerQuery(aQuery, "innerA.byId");
+    registerQuery(bQuery, "innerB.byId");
+    var combined = combineZeroClients(a, b, {
+      inner: "inner-a"
+    });
+    var useQuery = combined.useQuery;
+    useQuery(aQuery, {
+      id: "1"
+    });
+    expect(a.useQuery).toHaveBeenCalledWith(aQuery, {
+      id: "1"
+    });
+    expect(a.useQueryDirect).not.toHaveBeenCalled();
+    useQuery(bQuery, {
+      id: "2"
+    });
+    expect(b.useQueryDirect).toHaveBeenCalledWith(bQuery, {
+      id: "2"
+    });
+    expect(b.useQuery).not.toHaveBeenCalled();
+    expect(function () {
+      return combineZeroClients(a, b, {
+        inner: "nope"
+      });
+    }).toThrow(/not one of the passed clients/);
+  });
+  test("combined zeroEvents relays every instance", function () {
+    var _a_zeroEvents_value, _b_zeroEvents_value;
+    var {
+      client: a
+    } = makeClient("relay-a", "relayA");
+    var {
+      client: b
+    } = makeClient("relay-b", "relayB");
+    var combined = combineZeroClients(a, b);
+    var seen = [];
+    combined.zeroEvents.listen(function (event) {
+      return seen.push(event);
+    });
+    a.zeroEvents.emit({
+      type: "error",
+      message: "from-a"
+    });
+    b.zeroEvents.emit({
+      type: "error",
+      message: "from-b"
+    });
+    expect(seen.map(function (event) {
+      return event === null || event === void 0 ? void 0 : event.message;
+    })).toEqual(["from-a", "from-b"]);
+    expect((_a_zeroEvents_value = a.zeroEvents.value) === null || _a_zeroEvents_value === void 0 ? void 0 : _a_zeroEvents_value.message).toBe("from-a");
+    expect((_b_zeroEvents_value = b.zeroEvents.value) === null || _b_zeroEvents_value === void 0 ? void 0 : _b_zeroEvents_value.message).toBe("from-b");
+  });
+});
+//# sourceMappingURL=multiInstance.test.native.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["createSchema","string","table","createEmitter","describe","expect","test","vi","combineZeroClients","createZeroClient","getInstanceForNamespace","registerClientInstance","registerQuery","run","setRunner","userTable","columns","id","name","primaryKey","taskTable","title","schema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","models","groupedQueries","fakeClient","namespaces","zeroStub","customQueries","useQuery","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","ControlQueries","param","children","control","project","controlRunner","_len","arguments","length","_args","Array","_key","from","projectRunner","runner","ambientRunner","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","ambient","toHaveBeenCalledTimes","toThrow","_getInstanceForNamespace","mdlThing","mutate","insert","_a_zeroEvents_options","_b_zeroEvents_options","a","b","options","seenByB","listen","event","push","emit","type","message","value","_client_zeroEvents_options"],"sources":["../../src/multiInstance.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/multiInstanceNested.test.mjs

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

package/dist/esm/multiInstanceNested.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["createSchema","string","table","act","createRoot","afterEach","beforeEach","expect","test","combineZeroClients","createZeroClient","zql","jsx","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","useQuery","seedControl","zero","client","seedProject","ProvideZero","server","userID","children","toBe","App","showInner"],"sources":["../../src/multiInstanceNested.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}