on-zero 0.16.16 → 0.16.17

package/dist/cjs/mutations.native.js

@@ -27,8 +27,8 @@ __export(mutations_exports, {
   mutations: () => mutations
 });
 module.exports = __toCommonJS(mutations_exports);
-var import_platform = require("./helpers/platform.native.js");
 var import_modelRegistry = require("./modelRegistry.native.js");
+var import_state = require("./state.native.js");
 function mutationRegistry() {
   var _global;
   var global = globalThis;
@@ -40,7 +40,14 @@ function proxyRegistry() {
   return (_global = global).__onZeroProxyRegistry__ || (_global.__onZeroProxyRegistry__ = /* @__PURE__ */new Map());
 }
 function getOrCreateMutationProxy(tableName, implementations) {
+  var crud = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
   var prior = mutationRegistry().get(tableName);
+  if (prior && !crud) {
+    for (var _i = 0, _iter = ["insert", "update", "delete", "upsert"]; _i < _iter.length; _i++) {
+      var action = _iter[_i];
+      if (!(action in implementations)) delete prior[action];
+    }
+  }
   mutationRegistry().set(tableName, prior ? {
     ...prior,
     ...implementations
@@ -76,24 +83,50 @@ function getOrCreateMutationProxy(tableName, implementations) {
   proxyRegistry().set(tableName, proxy);
   return proxy;
 }
-function mutations(table, permissions, mutations2) {
+function mutations(table, permissions, mutations2, options) {
   if (permissions) {
     var tableName = typeof table === "string" ? table : table.schema.name;
+    (0, import_modelRegistry.setMutationsPermissions)(tableName, permissions);
+    if ((options === null || options === void 0 ? void 0 : options.crud) === false) {
+      return getOrCreateMutationProxy(tableName, mutations2 !== null && mutations2 !== void 0 ? mutations2 : {}, false);
+    }
     var createCRUDMutation = function createCRUDMutation2(action) {
       var customMutation = mutations2 === null || mutations2 === void 0 ? void 0 : mutations2[action];
       if (customMutation) return customMutation;
       return async function (ctx, obj) {
-        var runServerPermissionCheck = async function runServerPermissionCheck2() {
-          if (import_platform.IS_SERVER_RUNTIME) {
+        if (action === "upsert" && ctx.environment === "server") {
+          var existing = (0, import_state.getZQL)()[tableName];
+          var _iteratorNormalCompletion = true,
+            _didIteratorError = false,
+            _iteratorError = void 0;
+          try {
+            for (var _iterator = (0, import_state.getSchema)().tables[tableName].primaryKey[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+              var key = _step.value;
+              existing = existing.where(key, obj[key]);
+            }
+          } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+              }
+            } finally {
+              if (_didIteratorError) {
+                throw _iteratorError;
+              }
+            }
+          }
+          if (await ctx.tx.run(existing.one())) {
             await ctx.can(permissions, obj);
           }
-        };
-        if (action !== "insert" && action !== "upsert") {
-          await runServerPermissionCheck();
+        } else if (action === "update" || action === "delete") {
+          await ctx.can(permissions, obj);
         }
         await ctx.tx.mutate[tableName][action](obj);
-        if (action === "insert" || action === "upsert") {
-          await runServerPermissionCheck();
+        if (action !== "delete") {
+          await ctx.can(permissions, obj);
         }
       };
     };
@@ -108,7 +141,6 @@ function mutations(table, permissions, mutations2) {
       // generated CRUD fills missing operations; custom CRUD runs as-is
       ...crudMutations
     };
-    (0, import_modelRegistry.setMutationsPermissions)(tableName, permissions);
     return getOrCreateMutationProxy(tableName, finalMutations);
   }
   return table;

package/dist/cjs/mutations.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mutations_exports","__export","mutations","module","exports","import_platform","require","import_modelRegistry","mutationRegistry","_global","global","globalThis","__onZeroMutationRegistry__","Map","proxyRegistry","__onZeroProxyRegistry__","getOrCreateMutationProxy","tableName","implementations","prior","get","set","existing","proxy","Proxy","_","key","_mutationRegistry_get","ownKeys","current","Object","keys","getOwnPropertyDescriptor","enumerable","configurable","has","table","permissions","mutations2","schema","name","createCRUDMutation","createCRUDMutation2","action","customMutation","ctx","obj","runServerPermissionCheck","runServerPermissionCheck2","IS_SERVER_RUNTIME","can","tx","mutate","crudMutations","insert","update","delete","upsert","finalMutations"],"sources":["../../src/mutations.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mutations_exports","__export","mutations","module","exports","import_modelRegistry","require","import_state","mutationRegistry","_global","global","globalThis","__onZeroMutationRegistry__","Map","proxyRegistry","__onZeroProxyRegistry__","getOrCreateMutationProxy","tableName","implementations","crud","arguments","length","prior","get","_i","_iter","action","set","existing","proxy","Proxy","_","key","_mutationRegistry_get","ownKeys","current","Object","keys","getOwnPropertyDescriptor","enumerable","configurable","has","table","permissions","mutations2","options","schema","name","setMutationsPermissions","createCRUDMutation","createCRUDMutation2","customMutation","ctx","obj","environment","getZQL","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","getSchema","tables","primaryKey","Symbol","iterator","_step","next","done","where","err","return"],"sources":["../../src/mutations.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/mutations.test.cjs

@@ -1,7 +1,63 @@
+var import_node_async_hooks = require("node:async_hooks");
+var import_node_sqlite = require("node:sqlite");
+var import_zero = require("@rocicorp/zero");
+var import_orez_lite = require("orez-lite");
+var import_query_compiler = require("orez-lite/cloudflare/query-compiler");
+var import_transaction_query = require("orez-lite/cloudflare/transaction-query");
 var import_vitest = require("vitest");
+var import_server = require("./server.cjs");
+var import_modelRegistry = require("./modelRegistry.cjs");
 var import_mutations = require("./mutations.cjs");
 var import_serverWhere = require("./serverWhere.cjs");
+const previousEnvironment = import_vitest.vi.hoisted(() => {
+  const previous = process.env.VITE_ENVIRONMENT;
+  process.env.VITE_ENVIRONMENT = "client";
+  return previous;
+});
+(0, import_vitest.afterAll)(() => {
+  if (previousEnvironment === void 0) delete process.env.VITE_ENVIRONMENT;else process.env.VITE_ENVIRONMENT = previousEnvironment;
+});
 (0, import_vitest.describe)("mutations registry", () => {
+  (0, import_vitest.test)("explicit opt-out removes generated CRUD from existing proxies and retains permissions", async () => {
+    const record = (0, import_zero.table)("closedRecord").columns({
+      id: (0, import_zero.string)()
+    }).primaryKey("id");
+    const permission = (0, import_serverWhere.serverWhere)("closedRecord", () => true);
+    const first = (0, import_mutations.mutations)(record, permission);
+    (0, import_vitest.expect)(Object.keys(first).sort()).toEqual(["delete", "insert", "update", "upsert"]);
+    const custom = import_vitest.vi.fn(async () => {});
+    const closed = (0, import_mutations.mutations)(record, permission, {
+      custom
+    }, {
+      crud: false
+    });
+    (0, import_vitest.expect)(closed).toBe(first);
+    (0, import_vitest.expect)(Object.keys(closed)).toEqual(["custom"]);
+    (0, import_vitest.expect)("insert" in closed).toBe(false);
+    (0, import_vitest.expect)(Reflect.get(closed, "upsert")).toBeUndefined();
+    (0, import_vitest.expect)((0, import_modelRegistry.getMutationsPermissions)("closedRecord")).toBe(permission);
+    await closed.custom();
+    (0, import_vitest.expect)(custom).toHaveBeenCalledOnce();
+    const reopened = (0, import_mutations.mutations)(record, permission, {}, {
+      crud: true
+    });
+    (0, import_vitest.expect)(Object.keys(reopened).sort()).toEqual(["custom", "delete", "insert", "update", "upsert"]);
+  });
+  (0, import_vitest.test)("opt-out preserves explicitly declared CRUD handlers", async () => {
+    const record = (0, import_zero.table)("customRecord").columns({
+      id: (0, import_zero.string)()
+    }).primaryKey("id");
+    const permission = (0, import_serverWhere.serverWhere)("customRecord", () => true);
+    const insert = import_vitest.vi.fn(async () => {});
+    const custom = (0, import_mutations.mutations)(record, permission, {
+      insert
+    }, {
+      crud: false
+    });
+    (0, import_vitest.expect)(Object.keys(custom)).toEqual(["insert"]);
+    await custom.insert();
+    (0, import_vitest.expect)(insert).toHaveBeenCalledOnce();
+  });
   (0, import_vitest.test)("re-registering a handler replaces it per key (HMR)", () => {
     const permissions = (0, import_serverWhere.serverWhere)("post", () => true);
     const v1 = async () => {};
@@ -14,4 +70,176 @@ var import_serverWhere = require("./serverWhere.cjs");
     });
     (0, import_vitest.expect)(proxy.custom).toBe(v2);
   });
+});
+(0, import_vitest.describe)("generated CRUD authorization", () => {
+  (0, import_vitest.test)("authorizes both sides of composite-key writes through the server executor", async () => {
+    (0, import_server.setupAsyncLocalStorage)(import_node_async_hooks.AsyncLocalStorage);
+    const document = (0, import_zero.table)("document").columns({
+      workspace: (0, import_zero.string)(),
+      id: (0, import_zero.string)(),
+      ownerId: (0, import_zero.string)(),
+      title: (0, import_zero.string)()
+    }).primaryKey("workspace", "id");
+    const schema = (0, import_zero.createSchema)({
+      tables: [document],
+      relationships: [],
+      enableLegacyQueries: true
+    });
+    const sqlite = new import_node_sqlite.DatabaseSync(":memory:");
+    sqlite.exec("CREATE TABLE document (workspace TEXT, id TEXT, ownerId TEXT, title TEXT, PRIMARY KEY (workspace, id))");
+    const compile = (0, import_query_compiler.createQueryCompiler)(schema);
+    const query = async (sql, params = []) => sqlite.prepare(sql).all(...params.map(value => value));
+    const tx = {
+      query,
+      exec: async (sql, params = []) => ({
+        changes: Number(sqlite.prepare(sql).run(...params.map(value => value)).changes)
+      }),
+      queryAst: async (ast, format, queryName) => (0, import_transaction_query.executeTransactionQueryPlan)(compile(ast, format), (sql, params) => sqlite.prepare(sql).all(...params.map(value => value)), {
+        queryName
+      })
+    };
+    const database = (0, import_orez_lite.createSQLiteApplicationDatabase)({
+      query,
+      transaction: async work => {
+        sqlite.exec("BEGIN");
+        try {
+          const result = await work(tx);
+          sqlite.exec("COMMIT");
+          return result;
+        } catch (error) {
+          sqlite.exec("ROLLBACK");
+          throw error;
+        }
+      }
+    });
+    const permission = (0, import_serverWhere.serverWhere)("document", (eb, auth2) => eb.cmp("ownerId", auth2 && "id" in auth2 && typeof auth2.id === "string" ? auth2.id : ""));
+    const bindings = (0, import_server.createZeroServerBindings)({
+      schema,
+      models: {
+        document: {
+          mutate: (0, import_mutations.mutations)(document, permission)
+        }
+      },
+      createServerActions: () => ({})
+    });
+    const executor = (0, import_orez_lite.createSyncExecutor)({
+      database,
+      schema,
+      mutators: bindings.mutators,
+      effects: {
+        runBackground: promise => promise,
+        report: error => {
+          throw error;
+        }
+      }
+    });
+    const server = bindings.server(executor);
+    const auth = {
+      authData: {
+        id: "alice"
+      }
+    };
+    const own = {
+      workspace: "a",
+      id: "same",
+      ownerId: "alice",
+      title: "own"
+    };
+    const foreign = {
+      workspace: "b",
+      id: "same",
+      ownerId: "bob",
+      title: "foreign"
+    };
+    try {
+      await server.mutate.document.insert(own, auth);
+      await server.mutate.document.insert(foreign, {
+        authData: {
+          id: "bob"
+        }
+      });
+      await (0, import_vitest.expect)(server.mutate.document.insert({
+        ...foreign,
+        id: "forbidden"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.upsert({
+        ...foreign,
+        ownerId: "alice"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.update({
+        ...own,
+        ownerId: "bob"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.upsert({
+        ...own,
+        ownerId: "bob"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.upsert({
+        ...foreign,
+        id: "missing"
+      }, auth)).rejects.toThrow();
+      await server.mutate.document.upsert({
+        ...own,
+        title: "updated"
+      }, auth);
+      await server.mutate.document.upsert({
+        ...own,
+        title: "updated"
+      }, auth);
+      await server.mutate.document.upsert({
+        ...own,
+        id: "new"
+      }, auth);
+      (0, import_vitest.expect)(sqlite.prepare("SELECT * FROM document ORDER BY workspace, id").all()).toEqual([{
+        ...own,
+        id: "new"
+      }, {
+        ...own,
+        title: "updated"
+      }, foreign]);
+      const closedBindings = (0, import_server.createZeroServerBindings)({
+        schema,
+        models: {
+          document: {
+            mutate: (0, import_mutations.mutations)(document, permission, {
+              rename: async (ctx, input) => {
+                await ctx.can(permission, input);
+                await ctx.tx.mutate.document.update(input);
+              }
+            }, {
+              crud: false
+            })
+          }
+        },
+        createServerActions: () => ({})
+      });
+      (0, import_vitest.expect)(Object.keys(closedBindings.mutators)).toEqual(["document|rename"]);
+      const closedExecutor = (0, import_orez_lite.createSyncExecutor)({
+        database,
+        schema,
+        mutators: closedBindings.mutators,
+        effects: {
+          runBackground: promise => promise,
+          report: error => {
+            throw error;
+          }
+        }
+      });
+      for (const action of ["insert", "update", "delete", "upsert"]) {
+        await (0, import_vitest.expect)(closedExecutor.execute(`document|${action}`, own, {
+          userID: "alice"
+        })).rejects.toThrow(`unknown mutator: document|${action}`);
+      }
+      await closedBindings.server(closedExecutor).mutate.document.rename({
+        workspace: "a",
+        id: "same",
+        title: "renamed"
+      }, auth);
+      (0, import_vitest.expect)(sqlite.prepare("SELECT title FROM document WHERE workspace = ? AND id = ?").get("a", "same")).toEqual({
+        title: "renamed"
+      });
+    } finally {
+      sqlite.close();
+    }
+  });
 });

package/dist/cjs/mutations.test.native.js

@@ -1,9 +1,69 @@
 "use strict";
 
+var import_async_hooks = require("async_hooks");
+var import_node_sqlite = require("node:sqlite");
+var import_zero = require("@rocicorp/zero");
+var import_orez_lite = require("orez-lite");
+var import_query_compiler = require("orez-lite/cloudflare/query-compiler");
+var import_transaction_query = require("orez-lite/cloudflare/transaction-query");
 var import_vitest = require("vitest");
+var import_server = require("./server.native.js");
+var import_modelRegistry = require("./modelRegistry.native.js");
 var import_mutations = require("./mutations.native.js");
 var import_serverWhere = require("./serverWhere.native.js");
+var previousEnvironment = import_vitest.vi.hoisted(function () {
+  var previous = process.env.VITE_ENVIRONMENT;
+  process.env.VITE_ENVIRONMENT = "client";
+  return previous;
+});
+(0, import_vitest.afterAll)(function () {
+  if (previousEnvironment === void 0) delete process.env.VITE_ENVIRONMENT;else process.env.VITE_ENVIRONMENT = previousEnvironment;
+});
 (0, import_vitest.describe)("mutations registry", function () {
+  (0, import_vitest.test)("explicit opt-out removes generated CRUD from existing proxies and retains permissions", async function () {
+    var record = (0, import_zero.table)("closedRecord").columns({
+      id: (0, import_zero.string)()
+    }).primaryKey("id");
+    var permission = (0, import_serverWhere.serverWhere)("closedRecord", function () {
+      return true;
+    });
+    var first = (0, import_mutations.mutations)(record, permission);
+    (0, import_vitest.expect)(Object.keys(first).sort()).toEqual(["delete", "insert", "update", "upsert"]);
+    var custom = import_vitest.vi.fn(async function () {});
+    var closed = (0, import_mutations.mutations)(record, permission, {
+      custom
+    }, {
+      crud: false
+    });
+    (0, import_vitest.expect)(closed).toBe(first);
+    (0, import_vitest.expect)(Object.keys(closed)).toEqual(["custom"]);
+    (0, import_vitest.expect)("insert" in closed).toBe(false);
+    (0, import_vitest.expect)(Reflect.get(closed, "upsert")).toBeUndefined();
+    (0, import_vitest.expect)((0, import_modelRegistry.getMutationsPermissions)("closedRecord")).toBe(permission);
+    await closed.custom();
+    (0, import_vitest.expect)(custom).toHaveBeenCalledOnce();
+    var reopened = (0, import_mutations.mutations)(record, permission, {}, {
+      crud: true
+    });
+    (0, import_vitest.expect)(Object.keys(reopened).sort()).toEqual(["custom", "delete", "insert", "update", "upsert"]);
+  });
+  (0, import_vitest.test)("opt-out preserves explicitly declared CRUD handlers", async function () {
+    var record = (0, import_zero.table)("customRecord").columns({
+      id: (0, import_zero.string)()
+    }).primaryKey("id");
+    var permission = (0, import_serverWhere.serverWhere)("customRecord", function () {
+      return true;
+    });
+    var insert = import_vitest.vi.fn(async function () {});
+    var custom = (0, import_mutations.mutations)(record, permission, {
+      insert
+    }, {
+      crud: false
+    });
+    (0, import_vitest.expect)(Object.keys(custom)).toEqual(["insert"]);
+    await custom.insert();
+    (0, import_vitest.expect)(insert).toHaveBeenCalledOnce();
+  });
   (0, import_vitest.test)("re-registering a handler replaces it per key (HMR)", function () {
     var permissions = (0, import_serverWhere.serverWhere)("post", function () {
       return true;
@@ -19,4 +79,203 @@ var import_serverWhere = require("./serverWhere.native.js");
     (0, import_vitest.expect)(proxy.custom).toBe(v2);
   });
 });
+(0, import_vitest.describe)("generated CRUD authorization", function () {
+  (0, import_vitest.test)("authorizes both sides of composite-key writes through the server executor", async function () {
+    (0, import_server.setupAsyncLocalStorage)(import_async_hooks.AsyncLocalStorage);
+    var document = (0, import_zero.table)("document").columns({
+      workspace: (0, import_zero.string)(),
+      id: (0, import_zero.string)(),
+      ownerId: (0, import_zero.string)(),
+      title: (0, import_zero.string)()
+    }).primaryKey("workspace", "id");
+    var schema = (0, import_zero.createSchema)({
+      tables: [document],
+      relationships: [],
+      enableLegacyQueries: true
+    });
+    var sqlite = new import_node_sqlite.DatabaseSync(":memory:");
+    sqlite.exec("CREATE TABLE document (workspace TEXT, id TEXT, ownerId TEXT, title TEXT, PRIMARY KEY (workspace, id))");
+    var compile = (0, import_query_compiler.createQueryCompiler)(schema);
+    var query = async function query2(sql) {
+      var params = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
+      return sqlite.prepare(sql).all(...params.map(function (value) {
+        return value;
+      }));
+    };
+    var tx = {
+      query,
+      exec: async function exec(sql) {
+        var params = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
+        return {
+          changes: Number(sqlite.prepare(sql).run(...params.map(function (value) {
+            return value;
+          })).changes)
+        };
+      },
+      queryAst: async function queryAst(ast, format, queryName) {
+        return (0, import_transaction_query.executeTransactionQueryPlan)(compile(ast, format), function (sql, params) {
+          return sqlite.prepare(sql).all(...params.map(function (value) {
+            return value;
+          }));
+        }, {
+          queryName
+        });
+      }
+    };
+    var database = (0, import_orez_lite.createSQLiteApplicationDatabase)({
+      query,
+      transaction: async function transaction(work) {
+        sqlite.exec("BEGIN");
+        try {
+          var result = await work(tx);
+          sqlite.exec("COMMIT");
+          return result;
+        } catch (error) {
+          sqlite.exec("ROLLBACK");
+          throw error;
+        }
+      }
+    });
+    var permission = (0, import_serverWhere.serverWhere)("document", function (eb, auth2) {
+      return eb.cmp("ownerId", auth2 && "id" in auth2 && typeof auth2.id === "string" ? auth2.id : "");
+    });
+    var bindings = (0, import_server.createZeroServerBindings)({
+      schema,
+      models: {
+        document: {
+          mutate: (0, import_mutations.mutations)(document, permission)
+        }
+      },
+      createServerActions: function createServerActions() {
+        return {};
+      }
+    });
+    var executor = (0, import_orez_lite.createSyncExecutor)({
+      database,
+      schema,
+      mutators: bindings.mutators,
+      effects: {
+        runBackground: function runBackground(promise) {
+          return promise;
+        },
+        report: function report(error) {
+          throw error;
+        }
+      }
+    });
+    var server = bindings.server(executor);
+    var auth = {
+      authData: {
+        id: "alice"
+      }
+    };
+    var own = {
+      workspace: "a",
+      id: "same",
+      ownerId: "alice",
+      title: "own"
+    };
+    var foreign = {
+      workspace: "b",
+      id: "same",
+      ownerId: "bob",
+      title: "foreign"
+    };
+    try {
+      await server.mutate.document.insert(own, auth);
+      await server.mutate.document.insert(foreign, {
+        authData: {
+          id: "bob"
+        }
+      });
+      await (0, import_vitest.expect)(server.mutate.document.insert({
+        ...foreign,
+        id: "forbidden"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.upsert({
+        ...foreign,
+        ownerId: "alice"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.update({
+        ...own,
+        ownerId: "bob"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.upsert({
+        ...own,
+        ownerId: "bob"
+      }, auth)).rejects.toThrow();
+      await (0, import_vitest.expect)(server.mutate.document.upsert({
+        ...foreign,
+        id: "missing"
+      }, auth)).rejects.toThrow();
+      await server.mutate.document.upsert({
+        ...own,
+        title: "updated"
+      }, auth);
+      await server.mutate.document.upsert({
+        ...own,
+        title: "updated"
+      }, auth);
+      await server.mutate.document.upsert({
+        ...own,
+        id: "new"
+      }, auth);
+      (0, import_vitest.expect)(sqlite.prepare("SELECT * FROM document ORDER BY workspace, id").all()).toEqual([{
+        ...own,
+        id: "new"
+      }, {
+        ...own,
+        title: "updated"
+      }, foreign]);
+      var closedBindings = (0, import_server.createZeroServerBindings)({
+        schema,
+        models: {
+          document: {
+            mutate: (0, import_mutations.mutations)(document, permission, {
+              rename: async function rename(ctx, input) {
+                await ctx.can(permission, input);
+                await ctx.tx.mutate.document.update(input);
+              }
+            }, {
+              crud: false
+            })
+          }
+        },
+        createServerActions: function createServerActions() {
+          return {};
+        }
+      });
+      (0, import_vitest.expect)(Object.keys(closedBindings.mutators)).toEqual(["document|rename"]);
+      var closedExecutor = (0, import_orez_lite.createSyncExecutor)({
+        database,
+        schema,
+        mutators: closedBindings.mutators,
+        effects: {
+          runBackground: function runBackground(promise) {
+            return promise;
+          },
+          report: function report(error) {
+            throw error;
+          }
+        }
+      });
+      for (var _i = 0, _iter = ["insert", "update", "delete", "upsert"]; _i < _iter.length; _i++) {
+        var action = _iter[_i];
+        await (0, import_vitest.expect)(closedExecutor.execute(`document|${action}`, own, {
+          userID: "alice"
+        })).rejects.toThrow(`unknown mutator: document|${action}`);
+      }
+      await closedBindings.server(closedExecutor).mutate.document.rename({
+        workspace: "a",
+        id: "same",
+        title: "renamed"
+      }, auth);
+      (0, import_vitest.expect)(sqlite.prepare("SELECT title FROM document WHERE workspace = ? AND id = ?").get("a", "same")).toEqual({
+        title: "renamed"
+      });
+    } finally {
+      sqlite.close();
+    }
+  });
+});
 //# sourceMappingURL=mutations.test.native.js.map

package/dist/cjs/mutations.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_vitest","require","import_mutations","import_serverWhere","describe","test","permissions","serverWhere","v1","v12","v2","v22","mutations","custom"],"sources":["../../src/mutations.test.ts"],"sourcesContent":[null],"mappings":"AAAA;;AAEA,IAAAA,aAAA,GAAAC,OAA0B;AAC1B,IAAAC,gBAAA,GAAAD,OAA4B;AAAA,IAE5BE,kBAAA,GAAAF,OAAS;AACP,IAAAD,aAAA,CAAAI,QAAK;EACH,IAAAJ,aAAM,CAAAK,IAAA,sDAA4C;IAClD,IAAAC,WAAW,OAAAH,kBAAY,CAAAI,WAAA;MAAC;IACxB;IAAwB,IAAAC,EAAA,kBAAAC,IAAA,GACxB;IACA,IAAAC,EAAM,kBAAQC,IAAA,GAGd;IACD,IAAAT,gBAAA,CAAAU,SAAA,UAAAN,WAAA;MACFO,MAAA,EAAAL","ignoreList":[]}
+{"version":3,"names":["import_async_hooks","require","import_node_sqlite","import_zero","import_orez_lite","import_query_compiler","import_transaction_query","import_vitest","import_server","import_modelRegistry","import_mutations","import_serverWhere","previousEnvironment","vi","hoisted","previous","process","env","VITE_ENVIRONMENT","afterAll","describe","test","record","table","columns","id","string","primaryKey","permission","serverWhere","first","mutations","expect","Object","keys","sort","toEqual","custom","fn","closed","crud","toBe","Reflect","get","toBeUndefined","getMutationsPermissions","toHaveBeenCalledOnce","reopened","insert","permissions","v1","v12","v2","v22","proxy","setupAsyncLocalStorage","AsyncLocalStorage","document","workspace","ownerId","title","schema","createSchema","tables","relationships","enableLegacyQueries","sqlite","DatabaseSync","exec","compile","createQueryCompiler","query","query2","sql","params","arguments","length","prepare","all","map","value","tx","changes","Number","run","queryAst","ast","format","queryName","executeTransactionQueryPlan","database","createSQLiteApplicationDatabase","transaction","work","result","error","eb","auth2","cmp","bindings","createZeroServerBindings","models","mutate","createServerActions","executor","createSyncExecutor","mutators","effects","runBackground","promise","report","server","auth","authData","own","foreign"],"sources":["../../src/mutations.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createZeroClient.httpAuth.test.mjs

@@ -99,9 +99,11 @@ test("warm headless client refreshes an expired bearer and reconnects", async ()
     refreshAuth
   });
   try {
-    await eventually(() => expect(connection.zero.connection.state.current.name).toBe("connected"));
-    expect(refreshAuth).toHaveBeenCalledTimes(1);
-    expect(authorizations).toEqual(["Bearer expired-token", "Bearer fresh-token"]);
+    await eventually(() => {
+      expect(refreshAuth).toHaveBeenCalledTimes(1);
+      expect(authorizations).toEqual(["Bearer expired-token", "Bearer fresh-token"]);
+      expect(connection.zero.connection.state.current.name).toBe("connected");
+    });
   } finally {
     await connection.close();
   }