over-zero 0.0.9 → 0.0.11

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

@@ -0,0 +1 @@
+{"version":3,"names":["ModelToValibot","TypeScriptToModel","defineCommand","runMain","existsSync","mkdirSync","readFileSync","readdirSync","writeFileSync","basename","resolve","ts","generateQueries","meta","name","description","args","dir","type","required","default","run","param","readdirSync2","writeFileSync2","files","filter","f","endsWith","allQueries","results","Promise","all","map","file","filePath","queries","content","sourceFile","createSourceFile","ScriptTarget","Latest","forEachChild","node","isVariableStatement","_node_modifiers","exportModifier","modifiers","find","m","kind","SyntaxKind","ExportKeyword","declaration","declarationList","declarations","isVariableDeclaration","getText","initializer","isArrowFunction","params","parameters","paramType","length","_param_type","_$param","typeString","model","Generate","valibotCode","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","recursive","allModelFiles","sort","schemaChecks","hasSchema","includes","filesWithSchema","c","modelsOutput","typesOutput","tablesOutput","generateModelsFile","generateTypesFile","generateTablesFile","queryFiles","queryResults","fileBaseName","queriesOutput","generateQueriesFile","execSync","stdio","chokidar","debounceTimer","debouncedRegenerate","path","event","clearTimeout","setTimeout","watcher","persistent","ignoreInitial","on","modelFiles","modelNames","getImportName","imports","importName","join","sortedByImportName","a","b","localeCompare","modelsObj","getSchemaName","typeExports","pascalName","charAt","toUpperCase","slice","schemaName","getExportName","exports","sortedQueries","queryByFile","Map","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","q","value","has","set","get","return","queryImports","Array","from","keys"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createPermissions.js

@@ -1,63 +1,48 @@
-import { ANYONE_CAN, definePermissions } from "@rocicorp/zero";
-import { ensure, EnsureError, objectEntries } from "@vxrn/helpers";
-import { runWithContext } from "./helpers/context";
+import { ensure, EnsureError } from "@vxrn/helpers";
 import { setDidRunPermissionCheck } from "./helpers/didRunPermissionCheck";
+import { mutatorContext } from "./helpers/mutatorContext";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery";
 import { getWhereTableName } from "./where";
 function createPermissions({
   environment,
-  schema,
-  models,
-  getContext
+  schema
 }) {
-  const fallbackActions = {
-    select: "read",
-    insert: "write",
-    update: "write",
-    upsert: "write",
-    delete: "write"
-  };
-  function buildPermissionQuery(authData, eb, permissionWhere, action, objOrId) {
+  function buildPermissionQuery(authData, eb, permissionWhere, objOrId) {
     const tableName = getWhereTableName(permissionWhere);
     if (!tableName)
       throw new Error("Must use PermissionWhere for buildPermissionQuery");
     const tableSchema = schema.tables[tableName];
     if (!tableSchema)
       throw new Error("No schema?");
-    const primaryKeys = tableSchema.primaryKey, permissionQueryBuilder = permissionWhere(eb, authData), fallbackAction = fallbackActions[action], permissionCondition = permissionQueryBuilder[action] || (fallbackAction ? permissionQueryBuilder[fallbackAction] : void 0);
-    if (permissionCondition == null)
-      throw new Error(`No permission defined for ${action} (or ${fallbackAction})`);
-    if (permissionCondition === !0)
+    const primaryKeys = tableSchema.primaryKey, permissionReturn = permissionWhere(eb, authData);
+    if (permissionReturn == null)
+      throw new Error(`No permission defined for ${tableName}`);
+    if (permissionReturn === !0)
       return eb.cmpLit(!0, "=", !0);
-    if (permissionCondition === !1)
+    if (permissionReturn === !1)
       return eb.cmpLit(!0, "=", !1);
     const primaryKeyWheres = [];
     for (const key of primaryKeys) {
       const value = typeof objOrId == "string" ? objOrId : objOrId[key];
       primaryKeyWheres.push(eb.cmp(key, value));
     }
-    return eb.and(permissionCondition, ...primaryKeyWheres);
+    return eb.and(permissionReturn, ...primaryKeyWheres);
   }
-  const can = async (where, action, obj) => {
-    const ctx = getContext(), tableName = getWhereTableName(where);
-    if (!tableName)
-      throw new Error("Must use where('table') style where to pass to can()");
-    environment === "server" && (await ensurePermission(
-      ctx.tx,
-      ctx.authData,
-      tableName,
-      where,
-      action,
-      obj
-    ), setDidRunPermissionCheck(ctx));
+  const can = async (where, obj) => {
+    if (environment === "server") {
+      const ctx = mutatorContext(), tableName = getWhereTableName(where);
+      if (!tableName)
+        throw new Error("Must use where('table') style where to pass to can()");
+      await ensurePermission(ctx.tx, ctx.authData, tableName, where, obj), setDidRunPermissionCheck(ctx);
+    }
   };
-  async function ensurePermission(tx, authData, tableName, where, actionIn, obj) {
+  async function ensurePermission(tx, authData, tableName, where, obj) {
     if (authData?.role === "admin")
       return;
-    const action = String(actionIn), name = `${tableName}.${action}`, queryBase = tx.query[tableName];
+    const queryBase = tx.query[tableName];
     let query = null;
     try {
-      query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, action, obj)).one(), ensure(await query);
+      query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, obj)).one(), ensure(await query);
     } catch (err) {
       const errorTitle = `${name} with auth id: ${authData?.id}`;
       if (err instanceof EnsureError) {
@@ -69,37 +54,9 @@ function createPermissions({
 ${err}`);
     }
   }
-  const readPermissions = definePermissions(schema, async () => {
-    const permissionsEntries = await Promise.all(
-      objectEntries(models).filter(([_, model]) => !!model.permissions).map(async ([key, model]) => await runWithContext(
-        {
-          authData: { id: "", role: void 0, email: "" }
-        },
-        () => [
-          key,
-          {
-            row: {
-              select: [
-                (authData, eb) => {
-                  const out = model.permissions(eb, authData).read;
-                  return out === !0 ? eb.and() : out === !1 ? eb.cmpLit(!0, "=", !1) : out;
-                }
-              ],
-              // we have permissions on these through our model system with custom mutators:
-              insert: ANYONE_CAN,
-              update: ANYONE_CAN,
-              delete: ANYONE_CAN
-            }
-          }
-        ]
-      ))
-    );
-    return Object.fromEntries(permissionsEntries);
-  });
   return {
     can,
-    buildPermissionQuery,
-    readPermissions
+    buildPermissionQuery
   };
 }
 export {

package/dist/esm/createPermissions.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createPermissions.ts"],
-  "mappings": "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",
+  "mappings": "AAMA,SAAS,QAAQ,mBAAmB;AACpC,SAAS,gCAAgC;AACzC,SAAS,sBAAsB;AAC/B,SAAS,6BAA6B;AAEtC,SAAS,yBAAyB;AAE3B,SAAS,kBAA6C;AAAA,EAC3D;AAAA,EACA;AACF,GAGG;AAQD,WAAS,qBACP,UACA,IACA,iBAEA,SACA;AACA,UAAM,YAAY,kBAAkB,eAAe;AAEnD,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,mDAAmD;AAGrE,UAAM,cAAc,OAAO,OAAO,SAAS;AAE3C,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,YAAY;AAG9B,UAAM,cAAc,YAAY,YAC1B,mBAAmB,gBAAgB,IAAI,QAAQ;AAErD,QAAI,oBAAoB;AACtB,YAAM,IAAI,MAAM,6BAA6B,SAAS,EAAE;AAG1D,QAAI,qBAAqB;AACvB,aAAO,GAAG,OAAO,IAAM,KAAK,EAAI;AAGlC,QAAI,qBAAqB;AACvB,aAAO,GAAG,OAAO,IAAM,KAAK,EAAK;AAGnC,UAAM,mBAAgC,CAAC;AAEvC,eAAW,OAAO,aAAa;AAC7B,YAAM,QAAQ,OAAO,WAAY,WAAW,UAAU,QAAQ,GAAG;AACjE,uBAAiB,KAAK,GAAG,IAAI,KAAY,KAAK,CAAC;AAAA,IACjD;AAEA,WAAO,GAAG,IAAI,kBAAkB,GAAG,gBAAgB;AAAA,EACrD;AAEA,QAAM,MAAW,OAAO,OAAO,QAAQ;AAErC,QAAI,gBAAgB,UAAU;AAC5B,YAAM,MAAM,eAAe,GACrB,YAAY,kBAAkB,KAAK;AACzC,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,sDAAsD;AAExE,YAAM,iBAAiB,IAAI,IAAI,IAAI,UAAU,WAAW,OAAO,GAAG,GAClE,yBAAyB,GAAG;AAAA,IAC9B;AAAA,EACF;AAEA,iBAAe,iBACb,IACA,UACA,WACA,OACA,KACe;AACf,QAAI,UAAU,SAAS;AAErB;AAGF,UAAM,YAAY,GAAG,MAAM,SAAS;AACpC,QAAI,QAAqC;AAEzC,QAAI;AACF,cAAQ,UACL,MAAM,CAAC,OACC,qBAAqB,UAAU,IAAI,OAAO,GAAG,CACrD,EACA,IAAI,GAEP,OAAO,MAAM,KAAK;AAAA,IACpB,SAAS,KAAK;AACZ,YAAM,aAAa,GAAG,IAAI,kBAAkB,UAAU,EAAE;AAExD,UAAI,eAAe,aAAa;AAC9B,YAAI,MAAM,uCAAgC,UAAU;AACpD,cAAI,QAAQ,IAAI,aAAa,iBAAiB,UAC5C,OAAO;AAAA,GAAM,sBAAsB,KAAK,CAAC,KAErC,IAAI,MAAM,GAAG;AAAA,MACrB;AAEA,YAAM,IAAI,MAAM,4BAA4B,UAAU;AAAA,EAAK,GAAG,EAAE;AAAA,IAClE;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/createPermissions.mjs

@@ -1,55 +1,43 @@
-import { ANYONE_CAN, definePermissions } from "@rocicorp/zero";
-import { ensure, EnsureError, objectEntries } from "@vxrn/helpers";
-import { runWithContext } from "./helpers/context.mjs";
+import { ensure, EnsureError } from "@vxrn/helpers";
 import { setDidRunPermissionCheck } from "./helpers/didRunPermissionCheck.mjs";
+import { mutatorContext } from "./helpers/mutatorContext.mjs";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery.mjs";
 import { getWhereTableName } from "./where.mjs";
 function createPermissions({
   environment,
-  schema,
-  models,
-  getContext
+  schema
 }) {
-  const fallbackActions = {
-    select: "read",
-    insert: "write",
-    update: "write",
-    upsert: "write",
-    delete: "write"
-  };
-  function buildPermissionQuery(authData, eb, permissionWhere, action, objOrId) {
+  function buildPermissionQuery(authData, eb, permissionWhere, objOrId) {
     const tableName = getWhereTableName(permissionWhere);
     if (!tableName) throw new Error("Must use PermissionWhere for buildPermissionQuery");
     const tableSchema = schema.tables[tableName];
     if (!tableSchema) throw new Error("No schema?");
     const primaryKeys = tableSchema.primaryKey,
-      permissionQueryBuilder = permissionWhere(eb, authData),
-      fallbackAction = fallbackActions[action],
-      permissionCondition = permissionQueryBuilder[action] || (fallbackAction ? permissionQueryBuilder[fallbackAction] : void 0);
-    if (permissionCondition == null) throw new Error(`No permission defined for ${action} (or ${fallbackAction})`);
-    if (permissionCondition === !0) return eb.cmpLit(!0, "=", !0);
-    if (permissionCondition === !1) return eb.cmpLit(!0, "=", !1);
+      permissionReturn = permissionWhere(eb, authData);
+    if (permissionReturn == null) throw new Error(`No permission defined for ${tableName}`);
+    if (permissionReturn === !0) return eb.cmpLit(!0, "=", !0);
+    if (permissionReturn === !1) return eb.cmpLit(!0, "=", !1);
     const primaryKeyWheres = [];
     for (const key of primaryKeys) {
       const value = typeof objOrId == "string" ? objOrId : objOrId[key];
       primaryKeyWheres.push(eb.cmp(key, value));
     }
-    return eb.and(permissionCondition, ...primaryKeyWheres);
+    return eb.and(permissionReturn, ...primaryKeyWheres);
   }
-  const can = async (where, action, obj) => {
-    const ctx = getContext(),
-      tableName = getWhereTableName(where);
-    if (!tableName) throw new Error("Must use where('table') style where to pass to can()");
-    environment === "server" && (await ensurePermission(ctx.tx, ctx.authData, tableName, where, action, obj), setDidRunPermissionCheck(ctx));
+  const can = async (where, obj) => {
+    if (environment === "server") {
+      const ctx = mutatorContext(),
+        tableName = getWhereTableName(where);
+      if (!tableName) throw new Error("Must use where('table') style where to pass to can()");
+      await ensurePermission(ctx.tx, ctx.authData, tableName, where, obj), setDidRunPermissionCheck(ctx);
+    }
   };
-  async function ensurePermission(tx, authData, tableName, where, actionIn, obj) {
+  async function ensurePermission(tx, authData, tableName, where, obj) {
     if (authData?.role === "admin") return;
-    const action = String(actionIn),
-      name = `${tableName}.${action}`,
-      queryBase = tx.query[tableName];
+    const queryBase = tx.query[tableName];
     let query = null;
     try {
-      query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, action, obj)).one(), ensure(await query);
+      query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), ensure(await query);
     } catch (err) {
       const errorTitle = `${name} with auth id: ${authData?.id}`;
       if (err instanceof EnsureError) {
@@ -61,31 +49,9 @@ function createPermissions({
 ${err}`);
     }
   }
-  const readPermissions = definePermissions(schema, async () => {
-    const permissionsEntries = await Promise.all(objectEntries(models).filter(([_, model]) => !!model.permissions).map(async ([key, model]) => await runWithContext({
-      authData: {
-        id: "",
-        role: void 0,
-        email: ""
-      }
-    }, () => [key, {
-      row: {
-        select: [(authData, eb) => {
-          const out = model.permissions(eb, authData).read;
-          return out === !0 ? eb.and() : out === !1 ? eb.cmpLit(!0, "=", !1) : out;
-        }],
-        // we have permissions on these through our model system with custom mutators:
-        insert: ANYONE_CAN,
-        update: ANYONE_CAN,
-        delete: ANYONE_CAN
-      }
-    }])));
-    return Object.fromEntries(permissionsEntries);
-  });
   return {
     can,
-    buildPermissionQuery,
-    readPermissions
+    buildPermissionQuery
   };
 }
 export { createPermissions };

package/dist/esm/createPermissions.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["ANYONE_CAN","definePermissions","ensure","EnsureError","objectEntries","runWithContext","setDidRunPermissionCheck","prettyFormatZeroQuery","getWhereTableName","createPermissions","environment","schema","models","getContext","fallbackActions","select","insert","update","upsert","delete","buildPermissionQuery","authData","eb","permissionWhere","action","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionQueryBuilder","fallbackAction","permissionCondition","cmpLit","primaryKeyWheres","key","value","push","cmp","and","can","where","obj","ctx","ensurePermission","tx","actionIn","role","String","name","queryBase","query","one","err","errorTitle","id","msg","process","env","NODE_ENV","readPermissions","permissionsEntries","Promise","all","filter","_","model","permissions","map","email","row","out","read","Object","fromEntries"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ensure","EnsureError","setDidRunPermissionCheck","mutatorContext","prettyFormatZeroQuery","getWhereTableName","createPermissions","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","key","value","push","cmp","and","can","where","obj","ctx","ensurePermission","tx","role","queryBase","query","one","err","errorTitle","name","id","msg","process","env","NODE_ENV"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createPermissions.native.js

@@ -1,35 +1,26 @@
-import { ANYONE_CAN, definePermissions } from "@rocicorp/zero";
-import { ensure, EnsureError, objectEntries } from "@vxrn/helpers";
-import { runWithContext } from "./helpers/context.native.js";
+import { ensure, EnsureError } from "@vxrn/helpers";
 import { setDidRunPermissionCheck } from "./helpers/didRunPermissionCheck.native.js";
+import { mutatorContext } from "./helpers/mutatorContext.native.js";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery.native.js";
 import { getWhereTableName } from "./where.native.js";
+function _instanceof(left, right) {
+  return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
+}
 function createPermissions(param) {
   var {
-      environment,
-      schema,
-      models,
-      getContext
-    } = param,
-    fallbackActions = {
-      select: "read",
-      insert: "write",
-      update: "write",
-      upsert: "write",
-      delete: "write"
-    };
-  function buildPermissionQuery(authData, eb, permissionWhere, action, objOrId) {
+    environment,
+    schema
+  } = param;
+  function buildPermissionQuery(authData, eb, permissionWhere, objOrId) {
     var tableName = getWhereTableName(permissionWhere);
     if (!tableName) throw new Error("Must use PermissionWhere for buildPermissionQuery");
     var tableSchema = schema.tables[tableName];
     if (!tableSchema) throw new Error("No schema?");
     var primaryKeys = tableSchema.primaryKey,
-      permissionQueryBuilder = permissionWhere(eb, authData),
-      fallbackAction = fallbackActions[action],
-      permissionCondition = permissionQueryBuilder[action] || (fallbackAction ? permissionQueryBuilder[fallbackAction] : void 0);
-    if (permissionCondition == null) throw new Error(`No permission defined for ${action} (or ${fallbackAction})`);
-    if (permissionCondition === !0) return eb.cmpLit(!0, "=", !0);
-    if (permissionCondition === !1) return eb.cmpLit(!0, "=", !1);
+      permissionReturn = permissionWhere(eb, authData);
+    if (permissionReturn == null) throw new Error(`No permission defined for ${tableName}`);
+    if (permissionReturn === !0) return eb.cmpLit(!0, "=", !0);
+    if (permissionReturn === !1) return eb.cmpLit(!0, "=", !1);
     var primaryKeyWheres = [],
       _iteratorNormalCompletion = !0,
       _didIteratorError = !1,
@@ -49,27 +40,27 @@ function createPermissions(param) {
         if (_didIteratorError) throw _iteratorError;
       }
     }
-    return eb.and(permissionCondition, ...primaryKeyWheres);
+    return eb.and(permissionReturn, ...primaryKeyWheres);
   }
-  var can = async function (where, action, obj) {
-    var ctx = getContext(),
-      tableName = getWhereTableName(where);
-    if (!tableName) throw new Error("Must use where('table') style where to pass to can()");
-    environment === "server" && (await ensurePermission(ctx.tx, ctx.authData, tableName, where, action, obj), setDidRunPermissionCheck(ctx));
+  var can = async function (where, obj) {
+    if (environment === "server") {
+      var ctx = mutatorContext(),
+        tableName = getWhereTableName(where);
+      if (!tableName) throw new Error("Must use where('table') style where to pass to can()");
+      await ensurePermission(ctx.tx, ctx.authData, tableName, where, obj), setDidRunPermissionCheck(ctx);
+    }
   };
-  async function ensurePermission(tx, authData, tableName, where, actionIn, obj) {
+  async function ensurePermission(tx, authData, tableName, where, obj) {
     if (authData?.role !== "admin") {
-      var action = String(actionIn),
-        name = `${tableName}.${action}`,
-        queryBase = tx.query[tableName],
+      var queryBase = tx.query[tableName],
         query = null;
       try {
         query = queryBase.where(function (eb) {
-          return buildPermissionQuery(authData, eb, where, action, obj);
+          return buildPermissionQuery(authData, eb, where, obj);
         }).one(), ensure(await query);
       } catch (err) {
         var errorTitle = `${name} with auth id: ${authData?.id}`;
-        if (err instanceof EnsureError) {
+        if (_instanceof(err, EnsureError)) {
           var msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
           throw process.env.NODE_ENV === "development" && query && (msg += `
  ${prettyFormatZeroQuery(query)}`), new Error(msg);
@@ -79,40 +70,9 @@ ${err}`);
       }
     }
   }
-  var readPermissions = definePermissions(schema, async function () {
-    var permissionsEntries = await Promise.all(objectEntries(models).filter(function (param2) {
-        var [_, model] = param2;
-        return !!model.permissions;
-      }).map(async function (param2) {
-        var [key, model] = param2;
-        return await runWithContext({
-          authData: {
-            id: "",
-            role: void 0,
-            email: ""
-          }
-        }, function () {
-          return [key, {
-            row: {
-              select: [function (authData, eb) {
-                var out = model.permissions(eb, authData).read;
-                return out === !0 ? eb.and() : out === !1 ? eb.cmpLit(!0, "=", !1) : out;
-              }],
-              // we have permissions on these through our model system with custom mutators:
-              insert: ANYONE_CAN,
-              update: ANYONE_CAN,
-              delete: ANYONE_CAN
-            }
-          }];
-        });
-      })),
-      permissions = Object.fromEntries(permissionsEntries);
-    return permissions;
-  });
   return {
     can,
-    buildPermissionQuery,
-    readPermissions
+    buildPermissionQuery
   };
 }
 export { createPermissions };

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

@@ -1 +1 @@
-{"version":3,"names":["ANYONE_CAN","definePermissions","ensure","EnsureError","objectEntries","runWithContext","setDidRunPermissionCheck","prettyFormatZeroQuery","getWhereTableName","createPermissions","param","environment","schema","models","getContext","fallbackActions","select","insert","update","upsert","delete","buildPermissionQuery","authData","eb","permissionWhere","action","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionQueryBuilder","fallbackAction","permissionCondition","cmpLit","primaryKeyWheres","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","key","value","push","cmp","err","return","and","can","where","obj","ctx","ensurePermission","tx","actionIn","role","String","name","queryBase","query","one","errorTitle","id","msg","process","env","NODE_ENV","readPermissions","permissionsEntries","Promise","all","filter","param2","_","model","permissions","map","email","row","out","read","Object","fromEntries"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ensure","EnsureError","setDidRunPermissionCheck","mutatorContext","prettyFormatZeroQuery","getWhereTableName","_instanceof","left","right","Symbol","hasInstance","createPermissions","param","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","key","value","push","cmp","err","return","and","can","where","obj","ctx","ensurePermission","tx","role","queryBase","query","one","errorTitle","name","id","msg"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createZeroClient.js

@@ -1,14 +1,16 @@
+import { syncedQuery } from "@rocicorp/zero";
 import { useZero, ZeroProvider, useQuery as zeroUseQuery } from "@rocicorp/zero/react";
 import { createEmitter, mapObject } from "@vxrn/helpers";
 import { createContext, use, useMemo } from "react";
 import { createPermissions } from "./createPermissions";
-import { context } from "./helpers/context";
 import { createMutators } from "./helpers/createMutators";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery";
 import { useZeroDebug } from "./helpers/useZeroDebug";
+import { setAuthData, setSchema } from "./state";
 import { jsx, jsxs } from "react/jsx-runtime";
 function createZeroClient({ schema, models, disable }) {
-  const modelPermissions = mapObject(models, (val) => val.permissions);
+  setSchema(schema);
+  const modelWritePermissions = mapObject(models, (val) => val.permissions);
   let latestZeroInstance = null;
   const zero = new Proxy({}, {
     get(_, key) {
@@ -16,18 +18,15 @@ function createZeroClient({ schema, models, disable }) {
     }
   }), permissionsHelpers = createPermissions({
     schema,
-    models,
-    getContext: context,
     environment: "client"
   }), zeroEvents = createEmitter("zero", null), AuthDataContext = createContext({}), useAuthData = () => use(AuthDataContext);
-  function usePermission(table, action, objOrId, enabled = typeof objOrId < "u", debug = !1) {
-    const key = `${`${String(table)}${action}`}${typeof objOrId == "string" ? objOrId : JSON.stringify(objOrId)}`, authData = useAuthData(), permission = modelPermissions[table], query = (() => {
+  function usePermission(table, objOrId, enabled = typeof objOrId < "u", debug = !1) {
+    const authData = useAuthData(), permission = modelWritePermissions[table], query = (() => {
       let baseQuery = zero.query[table].one();
       return !enabled || !permission ? baseQuery : baseQuery.where((eb) => permissionsHelpers.buildPermissionQuery(
         authData,
         eb,
         permission,
-        action,
         objOrId
       ));
     })(), [data, status] = useQuery(query, {
@@ -35,28 +34,37 @@ function createZeroClient({ schema, models, disable }) {
     });
     debug && console.info(
       "usePermission()",
-      { data, status, action, authData, permission },
+      { data, status, authData, permission },
       prettyFormatZeroQuery(query)
     );
     const allowed = !!data;
     return objOrId ? allowed : !1;
   }
-  const useQuery = (query, options) => {
-    if (disable)
-      return [null, { type: "unknown" }];
-    const out = zeroUseQuery(query, options);
-    return process.env.NODE_ENV === "development" && useZeroDebug(query, options, out), out;
-  }, ProvideZero = ({
+  const queryCache = /* @__PURE__ */ new Map(), parseAny = (x) => [x[0]];
+  function useQuery(...args) {
+    const [queryOrFn, paramsOrOptions, optionsArg] = args, isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn), { actualQuery, options } = useMemo(() => {
+      if (!isPlainFunction)
+        return {
+          actualQuery: queryOrFn,
+          options: paramsOrOptions
+        };
+      const fn = queryOrFn, queryName = fn.name || "anonymousQuery", hasParams = optionsArg !== void 0 || paramsOrOptions && typeof paramsOrOptions == "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions), params = hasParams ? paramsOrOptions : void 0, opts = hasParams ? optionsArg : paramsOrOptions;
+      let synced = queryCache.get(queryName);
+      return synced || (synced = syncedQuery(queryName, parseAny, (arg) => fn(arg)), queryCache.set(queryName, synced)), { actualQuery: params !== void 0 ? synced(params) : synced, options: opts };
+    }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]), out = zeroUseQuery(actualQuery, options);
+    return process.env.NODE_ENV === "development" && useZeroDebug(actualQuery, options, out), disable ? [null, { type: "unknown" }] : out;
+  }
+  const ProvideZero = ({
     children,
     authData,
     ...props
   }) => {
-    const mutators = useMemo(() => createMutators({
+    const mutators = useMemo(() => (setAuthData(authData), createMutators({
       models,
       environment: "client",
       authData,
       can: permissionsHelpers.can
-    }), [models, authData]);
+    })), [models, authData]);
     return disable ? children : /* @__PURE__ */ jsx(AuthDataContext.Provider, { value: authData, children: /* @__PURE__ */ jsxs(
       ZeroProvider,
       {

package/dist/esm/createZeroClient.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createZeroClient.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["zero"]
 }