over-zero 0.0.10 → 0.0.13

package/dist/cjs/cli.native.js

@@ -0,0 +1,386 @@
+#!/usr/bin/env node
+"use strict";
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf,
+  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+    get: () => from[key],
+    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+  });
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: !0
+}) : target, mod));
+var import_model = require("@sinclair/typebox-codegen/model"),
+  import_typescript = require("@sinclair/typebox-codegen/typescript"),
+  import_citty = require("citty"),
+  import_fs = require("fs"),
+  import_path = require("path"),
+  ts = __toESM(require("typescript"), 1),
+  generateQueries = (0, import_citty.defineCommand)({
+    meta: {
+      name: "generate-queries",
+      description: "Generate server-side query validators from TypeScript query functions"
+    },
+    args: {
+      dir: {
+        type: "positional",
+        description: "Directory containing query files",
+        required: !1,
+        default: "."
+      }
+    },
+    async run(param) {
+      var {
+          args
+        } = param,
+        dir = (0, import_path.resolve)(args.dir),
+        {
+          readdirSync: readdirSync2,
+          writeFileSync: writeFileSync2
+        } = await import("fs"),
+        files = readdirSync2(dir).filter(function (f) {
+          return f.endsWith(".ts");
+        }),
+        allQueries = [],
+        results = await Promise.all(files.map(async function (file) {
+          var filePath = (0, import_path.resolve)(dir, file),
+            queries = [];
+          try {
+            var content = (0, import_fs.readFileSync)(filePath, "utf-8"),
+              sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, !0);
+            ts.forEachChild(sourceFile, function (node) {
+              if (ts.isVariableStatement(node)) {
+                var _node_modifiers,
+                  exportModifier = (_node_modifiers = node.modifiers) === null || _node_modifiers === void 0 ? void 0 : _node_modifiers.find(function (m) {
+                    return m.kind === ts.SyntaxKind.ExportKeyword;
+                  });
+                if (!exportModifier) return;
+                var declaration = node.declarationList.declarations[0];
+                if (!declaration || !ts.isVariableDeclaration(declaration)) return;
+                var name = declaration.name.getText(sourceFile);
+                if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
+                  var params = declaration.initializer.parameters,
+                    paramType = "void";
+                  if (params.length > 0) {
+                    var _param_type,
+                      _$param = params[0];
+                    paramType = ((_param_type = _$param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile)) || "unknown";
+                  }
+                  try {
+                    var typeString = `type QueryParams = ${paramType}`,
+                      model = import_typescript.TypeScriptToModel.Generate(typeString),
+                      valibotCode = import_model.ModelToValibot.Generate(model);
+                    queries.push({
+                      name,
+                      params: paramType,
+                      valibotCode
+                    });
+                  } catch (err) {
+                    console.error(`\u2717 ${name}: ${err}`);
+                  }
+                }
+              }
+            });
+          } catch (err) {
+            console.error(`Error processing ${file}:`, err);
+          }
+          return queries;
+        }));
+      allQueries.push(...results.flat()), console.info(`\u2713 ${allQueries.length} query validators`);
+    }
+  });
+var generate = (0, import_citty.defineCommand)({
+  meta: {
+    name: "generate",
+    description: "Generate models, types, tables, and query validators"
+  },
+  args: {
+    dir: {
+      type: "positional",
+      description: "Base directory (defaults to src/data)",
+      required: !1,
+      default: "src/data"
+    },
+    watch: {
+      type: "boolean",
+      description: "Watch for changes and regenerate",
+      required: !1,
+      default: !1
+    },
+    after: {
+      type: "string",
+      description: "Command to run after generation completes",
+      required: !1
+    }
+  },
+  async run(param) {
+    var {
+        args
+      } = param,
+      baseDir = (0, import_path.resolve)(args.dir),
+      modelsDir = (0, import_path.resolve)(baseDir, "models"),
+      generatedDir = (0, import_path.resolve)(baseDir, "generated"),
+      queriesDir = (0, import_path.resolve)(baseDir, "queries"),
+      runGenerate = async function () {
+        (0, import_fs.existsSync)(generatedDir) || (0, import_fs.mkdirSync)(generatedDir, {
+          recursive: !0
+        });
+        var allModelFiles = (0, import_fs.readdirSync)(modelsDir).filter(function (f) {
+            return f.endsWith(".ts");
+          }).sort(),
+          schemaChecks = await Promise.all(allModelFiles.map(async function (f) {
+            return {
+              file: f,
+              hasSchema: (0, import_fs.readFileSync)((0, import_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(")
+            };
+          })),
+          filesWithSchema = schemaChecks.filter(function (c) {
+            return c.hasSchema;
+          }).map(function (c) {
+            return c.file;
+          }),
+          [modelsOutput, typesOutput, tablesOutput] = await Promise.all([Promise.resolve(generateModelsFile(allModelFiles)), Promise.resolve(generateTypesFile(filesWithSchema)), Promise.resolve(generateTablesFile(filesWithSchema))]);
+        if (await Promise.all([Promise.resolve((0, import_fs.writeFileSync)((0, import_path.resolve)(generatedDir, "models.ts"), modelsOutput, "utf-8")), Promise.resolve((0, import_fs.writeFileSync)((0, import_path.resolve)(generatedDir, "types.ts"), typesOutput, "utf-8")), Promise.resolve((0, import_fs.writeFileSync)((0, import_path.resolve)(generatedDir, "tables.ts"), tablesOutput, "utf-8"))]), (0, import_fs.existsSync)(queriesDir)) {
+          var queryFiles = (0, import_fs.readdirSync)(queriesDir).filter(function (f) {
+              return f.endsWith(".ts");
+            }),
+            queryResults = await Promise.all(queryFiles.map(async function (file) {
+              var filePath = (0, import_path.resolve)(queriesDir, file),
+                fileBaseName = (0, import_path.basename)(file, ".ts"),
+                queries = [];
+              try {
+                var content = (0, import_fs.readFileSync)(filePath, "utf-8"),
+                  sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, !0);
+                ts.forEachChild(sourceFile, function (node) {
+                  if (ts.isVariableStatement(node)) {
+                    var _node_modifiers,
+                      exportModifier = (_node_modifiers = node.modifiers) === null || _node_modifiers === void 0 ? void 0 : _node_modifiers.find(function (m) {
+                        return m.kind === ts.SyntaxKind.ExportKeyword;
+                      });
+                    if (!exportModifier) return;
+                    var declaration = node.declarationList.declarations[0];
+                    if (!declaration || !ts.isVariableDeclaration(declaration)) return;
+                    var name = declaration.name.getText(sourceFile);
+                    if (name === "permission") return;
+                    if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
+                      var params = declaration.initializer.parameters,
+                        paramType = "void";
+                      if (params.length > 0) {
+                        var _param_type,
+                          _$param = params[0];
+                        paramType = ((_param_type = _$param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile)) || "unknown";
+                      }
+                      try {
+                        var typeString = `type QueryParams = ${paramType}`,
+                          model = import_typescript.TypeScriptToModel.Generate(typeString),
+                          valibotCode = import_model.ModelToValibot.Generate(model);
+                        queries.push({
+                          name,
+                          params: paramType,
+                          valibotCode,
+                          sourceFile: fileBaseName
+                        });
+                      } catch (err) {
+                        console.error(`\u2717 ${name}: ${err}`);
+                      }
+                    }
+                  }
+                });
+              } catch (err) {
+                console.error(`Error processing ${file}:`, err);
+              }
+              return queries;
+            })),
+            allQueries = queryResults.flat(),
+            queriesOutput = generateQueriesFile(allQueries);
+          (0, import_fs.writeFileSync)((0, import_path.resolve)(generatedDir, "queries.ts"), queriesOutput, "utf-8"), console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas), ${allQueries.length} queries`);
+        } else console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas)`);
+        if (args.after) try {
+          var {
+            execSync
+          } = await import("child_process");
+          execSync(args.after, {
+            stdio: "inherit"
+          });
+        } catch (err) {
+          console.error(`Error running after command: ${err}`);
+        }
+      };
+    if (await runGenerate(), args.watch) {
+      console.info(`
+\u{1F440} watching...
+`);
+      var chokidar = await import("chokidar"),
+        debounceTimer = null,
+        debouncedRegenerate = function (path, event) {
+          debounceTimer && clearTimeout(debounceTimer), console.info(`
+${event} ${path}`), debounceTimer = setTimeout(function () {
+            runGenerate();
+          }, 1e3);
+        },
+        watcher = chokidar.watch([modelsDir, queriesDir], {
+          persistent: !0,
+          ignoreInitial: !0
+        });
+      watcher.on("change", function (path) {
+        return debouncedRegenerate(path, "\u{1F4DD}");
+      }), watcher.on("add", function (path) {
+        return debouncedRegenerate(path, "\u2795");
+      }), watcher.on("unlink", function (path) {
+        return debouncedRegenerate(path, "\u{1F5D1}\uFE0F ");
+      }), await new Promise(function () {});
+    }
+  }
+});
+function generateModelsFile(modelFiles) {
+  var modelNames = modelFiles.map(function (f) {
+      return (0, import_path.basename)(f, ".ts");
+    }).sort(),
+    getImportName = function (name) {
+      return name === "user" ? "userPublic" : name;
+    },
+    imports = modelNames.map(function (name) {
+      var importName = getImportName(name);
+      return `import * as ${importName} from '~/data/models/${name}'`;
+    }).join(`
+`),
+    sortedByImportName = [...modelNames].sort(function (a, b) {
+      return getImportName(a).localeCompare(getImportName(b));
+    }),
+    modelsObj = `export const models = {
+${sortedByImportName.map(function (name) {
+      return `  ${getImportName(name)},`;
+    }).join(`
+`)}
+}`;
+  return `// auto-generated by: over-zero generate
+${imports}
+
+${modelsObj}
+`;
+}
+function generateTypesFile(modelFiles) {
+  var modelNames = modelFiles.map(function (f) {
+      return (0, import_path.basename)(f, ".ts");
+    }).sort(),
+    getSchemaName = function (name) {
+      return name === "user" ? "userPublic" : name;
+    },
+    typeExports = modelNames.map(function (name) {
+      var pascalName = name.charAt(0).toUpperCase() + name.slice(1),
+        schemaName = getSchemaName(name);
+      return `export type ${pascalName} = TableInsertRow<typeof schema.${schemaName}>
+export type ${pascalName}Update = TableUpdateRow<typeof schema.${schemaName}>`;
+    }).join(`
+
+`);
+  return `import type { TableInsertRow, TableUpdateRow } from 'over-zero'
+import type * as schema from '../tables'
+
+${typeExports}
+`;
+}
+function generateTablesFile(modelFiles) {
+  var modelNames = modelFiles.map(function (f) {
+      return (0, import_path.basename)(f, ".ts");
+    }).sort(),
+    getExportName = function (name) {
+      return name === "user" ? "userPublic" : name;
+    },
+    exports = modelNames.map(function (name) {
+      return `export { schema as ${getExportName(name)} } from '~/data/models/${name}'`;
+    }).join(`
+`);
+  return `// auto-generated by: over-zero generate
+// this is separate from models as otherwise you end up with circular types :/
+
+${exports}
+`;
+}
+function generateQueriesFile(queries) {
+  var sortedQueries = [...queries].sort(function (a, b) {
+      return a.name.localeCompare(b.name);
+    }),
+    queryByFile = /* @__PURE__ */new Map(),
+    _iteratorNormalCompletion = !0,
+    _didIteratorError = !1,
+    _iteratorError = void 0;
+  try {
+    for (var _iterator = sortedQueries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+      var q = _step.value;
+      queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
+    }
+  } catch (err) {
+    _didIteratorError = !0, _iteratorError = err;
+  } finally {
+    try {
+      !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+    } finally {
+      if (_didIteratorError) throw _iteratorError;
+    }
+  }
+  var queryImports = Array.from(queryByFile.keys()).sort().map(function (file) {
+      return `import * as ${file}Queries from '../queries/${file}'`;
+    }).join(`
+`),
+    imports = `import * as v from 'valibot'
+import { syncedQuery } from '@rocicorp/zero'
+${queryImports}
+`,
+    syncedQueries = sortedQueries.map(function (q2) {
+      var lines = q2.valibotCode.split(`
+`).filter(function (l) {
+          return l.trim();
+        }),
+        schemaLineIndex = lines.findIndex(function (l) {
+          return l.startsWith("export const QueryParams");
+        }),
+        validatorDef = "v.void()";
+      if (schemaLineIndex !== -1) {
+        for (var schemaLines = [], openBraces = 0, started = !1, i = schemaLineIndex; i < lines.length; i++) {
+          var line = lines[i],
+            cleaned = started ? line : line.replace("export const QueryParams = ", "");
+          if (schemaLines.push(cleaned), started = !0, openBraces += (cleaned.match(/\{/g) || []).length, openBraces -= (cleaned.match(/\}/g) || []).length, openBraces += (cleaned.match(/\(/g) || []).length, openBraces -= (cleaned.match(/\)/g) || []).length, openBraces === 0 && schemaLines.length > 0) break;
+        }
+        validatorDef = schemaLines.join(`
+`);
+      }
+      var wrappedValidator = validatorDef === "v.void()" ? "v.parser(v.tuple([]))" : `v.parser(v.tuple([${validatorDef}]))`,
+        queryFn = validatorDef === "v.void()" ? `() => {
+  return ${q2.sourceFile}Queries.${q2.name}()
+}` : `(arg) => {
+  return ${q2.sourceFile}Queries.${q2.name}(arg)
+}`;
+      return `export const ${q2.name} = syncedQuery('${q2.name}', ${wrappedValidator}, ${queryFn})`;
+    }).join(`
+
+`);
+  return imports + `
+` + syncedQueries + `
+`;
+}
+var main = (0, import_citty.defineCommand)({
+  meta: {
+    name: "over-zero",
+    description: "Over-zero CLI tools"
+  },
+  subCommands: {
+    generate,
+    "generate-queries": generateQueries
+  }
+});
+(0, import_citty.runMain)(main);
+//# sourceMappingURL=cli.native.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["import_model","require","import_typescript","import_citty","import_fs","import_path","ts","__toESM","generateQueries","defineCommand","meta","name","description","args","dir","type","required","default","run","param","resolve","readdirSync","readdirSync2","writeFileSync","writeFileSync2","files","filter","f","endsWith","allQueries","results","Promise","all","map","file","filePath","queries","content","readFileSync","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","TypeScriptToModel","Generate","valibotCode","ModelToValibot","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","existsSync","mkdirSync","recursive","allModelFiles","sort","schemaChecks","hasSchema","includes","filesWithSchema","c","modelsOutput","typesOutput","tablesOutput","generateModelsFile","generateTypesFile","generateTablesFile","queryFiles","queryResults","fileBaseName","basename","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":";;;;;;;;;;;;;;;;;;;;;;;;gBACA;AAOA,IAAAA,YAAM,GAAAC,OAAA,kCAAgC;EAAAC,iBAAA,GAAAD,OAAA;EAAAE,YAAA,GAAAF,OAAA;EAAAG,SAAA,GAAAH,OAAA;EAAAI,WAAA,GAAAJ,OAAA;EAAAK,EAAA,GAAAC,OAAA,CAAAN,OAAA;EAAAO,eAAA,OAAAL,YAAA,CAAAM,aAAA;IACpCC,IAAA,EAAM;MACJC,IAAA,EAAM;MACNC,WAAA,EAAa;IACf;IACAC,IAAA,EAAM;MACJC,GAAA,EAAK;QACHC,IAAA,EAAM;QACNH,WAAA,EAAa;QACbI,QAAA,EAAU;QACVC,OAAA,EAAS;MACX;IACF;IACA,MAAMC,IAAIC,KAAE,EAAK;MACf;UAAMN;QAAA,IAAAM,KAAM;QAAAL,GAAA,OAAAT,WAAQ,CAAAe,OAAQ,EAEtBP,IAAE,CAAAC,GAAA;QAAA;UAAAO,WAAA,EAAAC,YAAa;UAAAC,aAAA,EAAAC;QAAwB,UAAO,MAAS,KAEvD;QAAAC,KAAQ,GAAAH,YAAiB,CAAAR,GAAA,EAAAY,MAAQ,WAAQC,CAAA,EAAS;UAMtD,OAAMA,CAAA,CAAAC,QAAW;QACf;QAAAC,UAAM;QAAAC,OAAW,SAAAC,OAAA,CAAAC,GAAA,CAAAP,KAAQ,CAAAQ,GAAK,iBACMC,IAAA;UAEpC,IAAAC,QAAI,OAAA9B,WAAA,CAAAe,OAAA,EAAAN,GAAA,EAAAoB,IAAA;YAAAE,OAAA;UACF;YAEsB,IACpBC,OAAA,OAAAjC,SAAA,CAAAkC,YAAA,EAAAH,QAAA;cAAAI,UAAA,GAAAjC,EAAA,CAAAkC,gBAAA,CAAAL,QAAA,EAAAE,OAAA,EAAA/B,EAAA,CAAAmC,YAAA,CAAAC,MAAA;YAAApC,EAAA,CAAAqC,YACA,CAAAJ,UAAA,YAAAK,IAAA;cAAA,IACAtC,EAAG,CAAAuC,mBAAa,CAAAD,IAAA;gBAChB,IAAAE,eAAA;kBAAAC,cAAA,IAAAD,eAAA,GAAAF,IAAA,CAAAI,SAAA,cAAAF,eAAA,uBAAAA,eAAA,CAAAG,IAAA,WAAAC,CAAA;oBACF,OAAAA,CAAA,CAAAC,IAAA,KAAA7C,EAAA,CAAA8C,UAAA,CAAAC,aAAA;kBAEA,CAAG;gBACD,IAAI,CAAAN,cAAG;gBAIL,IAAAO,WAH4B,GAAAV,IAAA,CAAWW,eAAA,CAAAC,YAAA;gBAAA,IACrC,CAACF,WAAQ,KAAAhD,EAAS,CAAAmD,qBAAc,CAAAH,WAAA;gBAAA,IAEb3C,IAAA,GAAA2C,WAAA,CAAA3C,IAAA,CAAA+C,OAAA,CAAAnB,UAAA;gBAErB,IAAAe,WAAM,CAAAK,WAAmB,IAAArD,EAAA,CAAAsD,eAAgB,CAAAN,WAAc,CAAAK,WAAA;kBACvD,IAAIE,MAAC,GAAAP,WAAmB,CAAAK,WAAA,CAAAG,UAAsB;oBAAAC,SAAW,GAAG;kBAE5D,IAAAF,MAAM,CAAAG,MAAO;oBAEb,IACEC,WAAY;sBAAAC,OAAA,GAAAL,MACT;oBAEHE,SAAM,KAAAE,WAAS,GAAYC,OAAA,CAAAnD,IAAY,cAAAkD,WAAA,uBAAAA,WAAA,CAAAP,OAAA,CAAAnB,UAAA;kBACvC;kBAEA,IAAI;oBAKJ,IAAI4B,UAAA,yBAAAJ,SAAA;sBAAAK,KAAA,GAAAlE,iBAAA,CAAAmE,iBAAA,CAAAC,QAAA,CAAAH,UAAA;sBAAAI,WAAA,GAAAvE,YAAA,CAAAwE,cAAA,CAAAF,QAAA,CAAAF,KAAA;oBACFhC,OAAA,CAAMqC,IAAA;sBAIN9D,IAAA;sBACFkD,MAAA,EAASE,SAAK;sBACZQ;oBACF;kBACF,SAAAG,GAAA;oBACFC,OAAA,CAAAC,KAAA,WAAAjE,IAAA,KAAA+D,GAAA;kBACD;gBACH;cACE;YACF;UAEA,SAAOA,GAAA;YACRC,OAAA,CAAAC,KAAA,qBAAA1C,IAAA,KAAAwC,GAAA;UACH;UAEA,OAAAtC,OAAgB;QAElB;MACDP,UAAA,CAAA4C,IAAA,IAAA3C,OAAA,CAAA+C,IAAA,KAAAF,OAAA,CAAAG,IAAA,WAAAjD,UAAA,CAAAmC,MAAA;IAoDD;EAA+B,EAC7B;AAAM,IACJe,QAAM,OAAA5E,YAAA,CAAAM,aAAA;EAAAC,IACN;IACFC,IAAA;IACAC,WAAM;EAAA;EACCC,IACH;IAAMC,GACN;MACAC,IAAA,cAAU;MACVH,WAAS;MACXI,QAAA;MACAC,OAAO;IAAA;IACC+D,KACN;MACAjE,IAAA,WAAU;MACVH,WAAS;MACXI,QAAA;MACAC,OAAO;IAAA;IACCgE,KACN;MACAlE,IAAA,UAAU;MACZH,WAAA;MACFI,QAAA;IACA;EACE;EAOE,MAAAE,GAAKA,CAAAC,KAAA;IAKL;QAAAN;MAAM,IAAAM,KAAA;MAAA+D,OAAgB,OAAA7E,WAAA,CAAAe,OAAA,EAAYP,IAAA,CAAAC,GAAS;MACxCqE,SAAQ,IAAM,GAAE9E,WAAS,CAAAe,OACzB,EAAK8D,OAWF;MAAAE,YATqB,IAAQ,GAAA/E,WAAA,CAAAe,OAAA,EAAA8D,OAAA;MAAAG,UAAA,OAAAhF,WAAA,CAAAe,OAAA,EAAA8D,OAAA;MAAAI,WAAA,kBAAAA,CAAA;QAAA,EACjC,EAAAlF,SAAA,CAAAmF,UAAkB,EAAAH,YAAc,SAAAhF,SAAA,CAAAoF,SAAA,EAAAJ,YAAA;UAAAK,SACxB;QAAA;QACkD,IAAAC,aACtD,OAAAtF,SAAA,CAAAiB,WAAA,EAAA8D,SAAA,EAAAzD,MAAA,WAAAC,CAAA;YAAA,OACFA,CAAA,CAAAC,QAAA;UAAA,EACF,CAAA+D,IAAE;UAAAC,YAAA,SAAA7D,OAAA,CAAAC,GAAA,CAAA0D,aAAA,CAAAzD,GAAA,iBAAAN,CAAA;YACJ,OAEqC;cAInCO,IAAA,EAAQP,CAAA;cACRkE,SAAQ,MAAQzF,SAAA,CAAAkC,YAAkB,MAAAjC,WAAgB,CAAAe,OAAA,EAAA+D,SAAA,EAAAxD,CAAA,YAAAmE,QAAA;YAClD;UACF,CAAC;UAAAC,eAAA,GAAAH,YAAA,CAAAlE,MAAA,WAAAsE,CAAA;YAgBD,OAbAA,CAAM,CAAAH,SAAQ;UAAI,EAChB,CAAA5D,GAAA,WAAQ+D,CAAA;YAAA,OACNA,CAAA,CAAA9D,IAAA;UAAuE,EACzE;UAAA,CAAA+D,YAAA,EAAAC,WAAA,EAAAC,YAAA,UAAApE,OAAA,CAAAC,GAAA,EACAD,OAAA,CAAQX,OAAA,CAAAgF,kBAAA,CAAAV,aAAA,IAAA3D,OACN,CAAAX,OAAA,CAAAiF,iBAAA,CAAAN,eAAc,IAChBhE,OAAA,CAAAX,OAAA,CAAAkF,kBAAA,CAAAP,eAAA,IACA;QAAQ,UACNhE,OAAA,CAAAC,GAAA,EACFD,OAAA,CAAAX,OAAA,KAAAhB,SAAA,CAAAmB,aAAA,MAAAlB,WAAA,CAAAe,OAAA,EAAAgE,YAAA,gBAAAa,YAAA,aACDlE,OAGG,CAAAX,OAAA,KAAAhB,SAAA,CAAAmB,aAAqB,GAAG,GAAAlB,WAAA,CAAAe,OAAA,EAAAgE,YAAA,eAAAc,WAAA,aAC1BnE,OAAM,CAAAX,OAAA,KAAAhB,SAAa,CAAAmB,aAAA,MAAAlB,WAAY,CAAUe,OAAE,EAAOgE,YAAS,aAAe,GA4EpEe,YAAA,EAzEe,OAAM,GAAQ,GACjC,IAAA/F,SAAW,CAAAmF,UAAW,EAAAF,UAAS;UAC7B,IAAAkB,UAAM,OAAAnG,SAAW,CAAAiB,WAAA,EAAAgE,UAAQ,EAAA3D,MAAA,CAAY,UAC/BC,CAAA;cAQN,OAAIA,CAAA,CAAAC,QAAA;YACF;YAAA4E,YAAM,SAAAzE,OAAU,CAAAC,GAAA,CAAAuE,UAAA,CAAAtE,GAAA,iBAAuBC,IAAA,EAAO;cAExB,IAAAC,QACpB,OAAA9B,WAAA,CAAAe,OAAA,EAAAiE,UAAA,EAAAnD,IAAA;gBAAAuE,YAAA,OAAApG,WAAA,CAAAqG,QAAA,EAAAxE,IAAA;gBAAAE,OAAA;cAAA;gBACA,IACAC,OAAG,OAAAjC,SAAa,CAAAkC,YAAA,EAAAH,QAAA;kBAAAI,UAAA,GAAAjC,EAAA,CAAAkC,gBAAA,CAAAL,QAAA,EAAAE,OAAA,EAAA/B,EAAA,CAAAmC,YAAA,CAAAC,MAAA;gBAAApC,EAAA,CAAAqC,YAChB,CAAAJ,UAAA,YAAAK,IAAA;kBACF,IAAAtC,EAAA,CAAAuC,mBAAA,CAAAD,IAAA;oBAEA,IAAGE,eAAa;sBAAAC,cAAa,GAAS,CAAAD,eAAA,GAAAF,IAAA,CAAAI,SAAA,cAAAF,eAAA,uBAAAA,eAAA,CAAAG,IAAA,WAAAC,CAAA;wBACpC,OAAOA,CAAA,CAAAC,IAAA,KAAA7C,EAAA,CAAA8C,UAAwB,CAAGC,aAAA;sBAIhC;oBAHuC,IACrC,CAACN,cAAQ;oBAAuB,IAEbO,WAAA,GAAAV,IAAA,CAAAW,eAAA,CAAAC,YAAA;oBAErB,KAAAF,WAAM,KAAAhD,EAAc,CAAAmD,qBAAqB,CAAAH,WAAc;oBACvD,IAAA3C,IAAK,GAAA2C,WAAe,CAAC3C,IAAG,CAAA+C,OAAA,CAAAnB,UAAA;oBAExB,IAAA5B,IAAM,iBAAO,EAAY;oBAGzB,IAAA2C,WAAa,CAAAK,WAAA,IAAcrD,EAAA,CAAAsD,eAAA,CAAAN,WAAA,CAAAK,WAAA;sBAE3B,IACEE,MAAA,GAAAP,WAAY,CAAAK,WACT,CAAAG,UAAA;wBAAAC,SAAgB,SAAY;sBAE/B,IAAAF,MAAM,CAAAG,MAAS;wBACf,IAAIC,WAAA;0BAAYC,OAAA,GAAAL,MAAA;wBAEZE,SAAO,KAAAE,WAET,GAAAC,OADc,CAAAnD,IAAA,MACI,IAAM,IAAAkD,WAAQ,KAAU,KAAK,aAAAA,WAAA,CAAAP,OAAA,CAAAnB,UAAA;sBAGjD;sBACE;wBAIA,IAAA4B,UAAQ,GAAK,sBAAAJ,SAAA;0BAAAK,KAAA,GAAAlE,iBAAA,CAAAmE,iBAAA,CAAAC,QAAA,CAAAH,UAAA;0BAAAI,WAAA,GAAAvE,YAAA,CAAAwE,cAAA,CAAAF,QAAA,CAAAF,KAAA;wBAAAhC,OACX,CAAAqC,IAAA;0BAAA9D,IACA;0BAAQkD,MACR,EAAAE,SAAA;0BAAAQ,WACA;0BACFhC,UAAC,EAAAkE;wBACH;sBACE,SAAA/B,GAAQ;wBACVC,OAAA,CAAAC,KAAA,WAAAjE,IAAA,KAAA+D,GAAA;sBACF;oBACF;kBACF;gBACF;cACE,SAAAA,GAAQ;gBACVC,OAAA,CAAAC,KAAA,qBAAA1C,IAAA,KAAAwC,GAAA;cAEA;cACF,OAACtC,OAAA;YACH,GAEgC;YAAAP,UAC1B,GAAA2E,YAAgB,CAAA3B,IAAA;YAAA8B,aAAoB,GAAAC,mBAAU,CAAA/E,UAAA;UACpD,IAAAzB,SAAA,CAAAmB,aAAA,MAAAlB,WAAc,CAAAe,OAAA,EAAAgE,YAAQ,cAAc,GAAAuB,aAAe,YAAehC,OAAO,CAAAG,IAEzE,WAAQY,aAAA,CAAA1B,MAAA,YAAA+B,eAAA,CAAA/B,MAAA,cAAAnC,UAAA,CAAAmC,MAAA;QAAA,OAERW,OAAA,CAAAG,IAAA,WAAAY,aAAA,CAAA1B,MAAA,YAAA+B,eAAA,CAAA/B,MAAA;QACF,IAAAnD,IAAA,CAAAoE,KAAA,EACE;UACE;YAAA4B;UAAK,UAAc,MAAM,gBAAY;UACvCA,QAAA,CAAAhG,IAAA,CAAAoE,KAAA;YAIE6B,KAAK;UACP,EAAI;QACF,SAAMpC,GAAE;UACRC,OAAA,CAAAC,KAAS,CAAK,gCAA2BF,GAAA;QAC3C;MACE;IAAmD,IACrD,MAAAY,WAAA,IAAAzE,IAAA,CAAAmE,KAAA;MAEJL,OAAA,CAAAG,IAAA;AAMA;AACE;MAAa,IAAAiC,QAAA;QAAAC,aAAA;QAAAC,mBAAA,YAAAA,CAAAC,IAAA,EAAAC,KAAA;UAAoBH,aAAA,IAAAI,YAAA,CAAAJ,aAAA,GAAArC,OAAA,CAAAG,IAAA;AACjC,EAAAqC,KAAA,IAAAD,IAAM,KAAAF,aAAiB,GAAOK,UAAU;YAEpC/B,WAAA;UAEJ,MAAM;QACJ;QAAIgC,OAAA,GAAAP,QACF,CAAA/B,KAAA,EAGqBG,SAAU,EAG/BE,UAAA,CAAY,EACd;UACFkC,UAEM,EAAU;UACdC,aAAY;QAAA,EACZ;MACFF,OAAC,CAAAG,EAAA,qBAAAP,IAAA;QAED,OAAQD,mBAAc,CAAAC,IAAS;MAKN,CAAC,GAAAI,OAAA,CAAAG,EAAA,kBAAAP,IAAA;QAC5B,OAAAD,mBAAA,CAAAC,IAAA;MACF,IAAAI,OAAA,CAAAG,EAAA,qBAAAP,IAAA;QACD,OAAAD,mBAAA,CAAAC,IAAA;MAED,IAAS,UAAAnF,OAAA,CAAmB,aAC1B,EAAM;IAiBA;EAHqB;AAAgB;AACM,SAEqBqE,kBAAcA,CAAAsB,UAAc;EAAoB,IAAAC,UAAA,GAAAD,UAAA,CAAAzF,GAAA,WAAAN,CAAA;MAAA,WAAAtB,WAAA,CAAAqG,QAAA,EAAA/E,CAAA;IAEtH,GAAAgE,IAAO;IAAAiC,aAAA,YAAAA,CAAAjH,IAAA;MAA6C,OAAOA,IAAA,6BAAAA,IAAA;IAAA;IAAAkH,OAAA,GAAAF,UAAA,CAAA1F,GAAA,WAAAtB,IAAA;MAAO,IAAAmH,UAAS,GAAAF,aAAA,CAAAjH,IAAA;MAAA,sBAAAmH,UAAA,wBAAAnH,IAAA;IAC7E,GAAAoH,IAAA;AAEA;IAAAC,kBAAS,IACP,GAAAL,UAAM,CAcN,CAAAhC,IAAA,CAAO,UAAAsC,CAAA,EAAAC,CAAA;MAAA,OAAAN,aAAA,CAAAK,CAAA,EAAAE,aAAA,CAAAP,aAAA,CAAAM,CAAA;IAAA;IAAAE,SAAA;AAAA,EARaJ,kBACZ,CAAA/F,GAAA,WAAStB,IAAA;MACb,OAAM,KAAAiH,aAAkB,CAAAjH,IAAA,CAAO,GAAG;IAElC,GAAAoH,IAAA;AAA6E;AAA+E,EAC9J;EACM;AAAA,EAE0HF,OAAA;AAAA;AACpI,EAAAO,SAAA;AAEA;AACE;AAYA,SAAO/B,kBAAAqB,UAAA;EAAA,IAAAC,UAAA,GAAAD,UAAA,CAAAzF,GAAA,WAAAN,CAAA;MAAA,WAAAtB,WAAA,CAAAqG,QAAA,EAAA/E,CAAA;IANS,GAAAgE,IAAA;IACb0C,aAAA,YAAAA,CAAA1H,IAAA;MACC,OAACA,IAAS,0BAAsB,GAAAA,IAAA;IAClC;IACC2H,WAAK,GAAAX,UAAA,CAAA1F,GAAA,WAAAtB,IAAA;MAEqI,IAAA4H,UAAA,GAAA5H,IAAA,CAAA6H,MAAA,IAAAC,WAAA,KAAA9H,IAAA,CAAA+H,KAAA;QAAAC,UAAA,GAAAN,aAAA,CAAA1H,IAAA;MAAA,sBAAA4H,UAAA,mCAAAI,UAAA;AAC/I,cAAAJ,UAAA,yCAAAI,UAAA;IAEA,GAAAZ,IAAS;AASP;AAIA;EACE,OAAK;AAYP;AAAgB;AAAA,EALKO,WAAW;AAGxB,CAAI;AAIA;AAMR,SAAAhC,kBAAgBA,CAAAoB,UAAkB;EAAI,IAAEC,UAAQ,GAAQD,UAClD,CAAAzF,GAAA,WAAAN,CAAA,EAAkB;MAAM,OAAW,EACvC,EAAEtB,WAAW,CAAAqG,QAAA,EAAA/E,CAAA;IAA0B,EACzC,CAAAgE,IAAA;IAAAiD,aAAA,YAAAA,CAAAjI,IAAA;MAEA,OAAIA,IAAA,WAAe,kBAAAA,IAAA;IACnB;IAAAkI,OAAI,GAAAlB,UAAA,CAAA1F,GAAoB,WAAItB,IAAA;MAC1B,6BAA+BiI,aAAA,CAAAjI,IAAA,2BAAAA,IAAA;IAC/B,GAAAoH,IAAA,CAAI;AAGJ;EACE;AAUA;AACE;AAAA,EAAAc,OAEJ;AACA;AAAgC;AAAI,SACtCjC,oBAAAxE,OAAA;EAGA,IAAA0G,aAAM,IAQA,GAAA1G,OACC,CAA2B,CAAAuD,IAE5B,WAAAsC,CAAA,EAAAC,CAAA;MAAA,OACDD,CAAA,CAAEtH,IAAA,CAAAwH,aAAU,CAAAD,CAAA,CAAWvH,IAAE;IAAI;IAAAoI,WAAA,sBAAAC,GAAA;IAAAC,yBAAA;IAAAC,iBAAA;IAAAC,cAAA;EAGlC;IACD,KACA,IAAKC,SAAA,GAAAN,aAAA,CAAAO,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAAA,IAAAS,CAAA,GAAAH,KAAA,CAAAI,KAAA;MAAMZ,WAAA,CAAAa,GAAA,CAAAF,CAAA,CAAAnH,UAAA,KAAAwG,WAAA,CAAAc,GAAA,CAAAH,CAAA,CAAAnH,UAAA,OAAAwG,WAAA,CAAAe,GAAA,CAAAJ,CAAA,CAAAnH,UAAA,EAAAkC,IAAA,CAAAiF,CAAA;IAEd;EAAiB,EAAO,OAAAhF,GAAA;IAAgBwE,iBAAA,OAAAC,cAAA,GAAAzE,GAAA;EAC1C;IAEA,IAAM;MACJ,CAAAuE,yBAAM,IAAAG,SAAA,CAAAW,MAAA,YAAAX,SAAA,CAAAW,MAAA;IACJ,UAAM;MACN,IAAAb,iBAAa,EACf,MAAAC,cAAA;IACA;EAAa;EACX,IACAa,YAAA,GAAAC,KAAoB,CAAAC,IAAA,CAAAnB,WAAA,CAAAoB,IAAA,IAAAxE,IAAA,GAAA1D,GAAA,WAAAC,IAAA;MACtB,sBAAAA,IAAA,4BAAAA,IAAA;IACD,GAAA6F,IAAA;AAAA;IAEDF,OAAA","ignoreList":[]}

package/dist/cjs/createPermissions.cjs

@@ -3,8 +3,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
+    for (var name2 in all) __defProp(target, name2, {
+      get: all[name2],
       enumerable: !0
     });
   },
@@ -23,58 +23,46 @@ __export(createPermissions_exports, {
   createPermissions: () => createPermissions
 });
 module.exports = __toCommonJS(createPermissions_exports);
-var import_zero = require("@rocicorp/zero"),
-  import_helpers = require("@vxrn/helpers"),
-  import_context = require("./helpers/context.cjs"),
+var import_helpers = require("@vxrn/helpers"),
   import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck.cjs"),
+  import_mutatorContext = require("./helpers/mutatorContext.cjs"),
   import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery.cjs"),
   import_where = require("./where.cjs");
 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 = (0, import_where.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 = (0, import_where.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), (0, import_didRunPermissionCheck.setDidRunPermissionCheck)(ctx));
+  const can = async (where, obj) => {
+    if (environment === "server") {
+      const ctx = (0, import_mutatorContext.mutatorContext)(),
+        tableName = (0, import_where.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), (0, import_didRunPermissionCheck.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(), (0, import_helpers.ensure)(await query);
+      query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await query);
     } catch (err) {
       const errorTitle = `${name} with auth id: ${authData?.id}`;
       if (err instanceof import_helpers.EnsureError) {
@@ -86,30 +74,8 @@ function createPermissions({
 ${err}`);
     }
   }
-  const readPermissions = (0, import_zero.definePermissions)(schema, async () => {
-    const permissionsEntries = await Promise.all((0, import_helpers.objectEntries)(models).filter(([_, model]) => !!model.permissions).map(async ([key, model]) => await (0, import_context.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: import_zero.ANYONE_CAN,
-        update: import_zero.ANYONE_CAN,
-        delete: import_zero.ANYONE_CAN
-      }
-    }])));
-    return Object.fromEntries(permissionsEntries);
-  });
   return {
     can,
-    buildPermissionQuery,
-    readPermissions
+    buildPermissionQuery
   };
 }

package/dist/cjs/createPermissions.js

@@ -3,8 +3,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: !0 });
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: !0 });
 }, __copyProps = (to, from, except, desc) => {
   if (from && typeof from == "object" || typeof from == "function")
     for (let key of __getOwnPropNames(from))
@@ -17,61 +17,47 @@ __export(createPermissions_exports, {
   createPermissions: () => createPermissions
 });
 module.exports = __toCommonJS(createPermissions_exports);
-var import_zero = require("@rocicorp/zero"), import_helpers = require("@vxrn/helpers"), import_context = require("./helpers/context"), import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_where = require("./where");
+var import_helpers = require("@vxrn/helpers"), import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck"), import_mutatorContext = require("./helpers/mutatorContext"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_where = require("./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 = (0, import_where.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 = (0, import_where.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
-    ), (0, import_didRunPermissionCheck.setDidRunPermissionCheck)(ctx));
+  const can = async (where, obj) => {
+    if (environment === "server") {
+      const ctx = (0, import_mutatorContext.mutatorContext)(), tableName = (0, import_where.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), (0, import_didRunPermissionCheck.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(), (0, import_helpers.ensure)(await query);
+      query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await query);
     } catch (err) {
       const errorTitle = `${name} with auth id: ${authData?.id}`;
       if (err instanceof import_helpers.EnsureError) {
@@ -83,37 +69,9 @@ function createPermissions({
 ${err}`);
     }
   }
-  const readPermissions = (0, import_zero.definePermissions)(schema, async () => {
-    const permissionsEntries = await Promise.all(
-      (0, import_helpers.objectEntries)(models).filter(([_, model]) => !!model.permissions).map(async ([key, model]) => await (0, import_context.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: import_zero.ANYONE_CAN,
-              update: import_zero.ANYONE_CAN,
-              delete: import_zero.ANYONE_CAN
-            }
-          }
-        ]
-      ))
-    );
-    return Object.fromEntries(permissionsEntries);
-  });
   return {
     can,
-    buildPermissionQuery,
-    readPermissions
+    buildPermissionQuery
   };
 }
 //# sourceMappingURL=createPermissions.js.map