on-zero 0.4.3 → 0.4.4

package/dist/cjs/cli.cjs

@@ -1,48 +1,53 @@
 #!/usr/bin/env node
-var import_node_path = require("node:path"),
-  import_citty = require("citty"),
-  import_generate = require("./generate.cjs");
+var import_node_path = require("node:path");
+var import_citty = require("citty");
+var import_generate = require("./generate.cjs");
 const generateCommand = (0, import_citty.defineCommand)({
-    meta: {
-      name: "generate",
-      description: "Generate models, types, tables, and query validators"
+  meta: {
+    name: "generate",
+    description: "Generate models, types, tables, and query validators"
+  },
+  args: {
+    dir: {
+      type: "positional",
+      description: "Base directory (defaults to src/data)",
+      required: false,
+      default: "src/data"
     },
-    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
-      }
+    watch: {
+      type: "boolean",
+      description: "Watch for changes and regenerate",
+      required: false,
+      default: false
     },
-    async run({
-      args
-    }) {
-      const opts = {
-        dir: (0, import_node_path.resolve)(args.dir),
-        after: args.after
-      };
-      args.watch ? (await (0, import_generate.watch)(opts), await new Promise(() => {})) : await (0, import_generate.generate)(opts);
+    after: {
+      type: "string",
+      description: "Command to run after generation completes",
+      required: false
     }
-  }),
-  main = (0, import_citty.defineCommand)({
-    meta: {
-      name: "on-zero",
-      description: "on-zero CLI tools"
-    },
-    subCommands: {
-      generate: generateCommand
+  },
+  async run({
+    args
+  }) {
+    const opts = {
+      dir: (0, import_node_path.resolve)(args.dir),
+      after: args.after
+    };
+    if (args.watch) {
+      await (0, import_generate.watch)(opts);
+      await new Promise(() => {});
+    } else {
+      await (0, import_generate.generate)(opts);
     }
-  });
+  }
+});
+const main = (0, import_citty.defineCommand)({
+  meta: {
+    name: "on-zero",
+    description: "on-zero CLI tools"
+  },
+  subCommands: {
+    generate: generateCommand
+  }
+});
 (0, import_citty.runMain)(main);

package/dist/cjs/cli.native.js

@@ -1,52 +1,57 @@
 #!/usr/bin/env node
 "use strict";
 
-var import_path = require("path"),
-  import_citty = require("citty"),
-  import_generate = require("./generate.native.js"),
-  generateCommand = (0, import_citty.defineCommand)({
-    meta: {
-      name: "generate",
-      description: "Generate models, types, tables, and query validators"
+var import_path = require("path");
+var import_citty = require("citty");
+var import_generate = require("./generate.native.js");
+var generateCommand = (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: false,
+      default: "src/data"
     },
-    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
-      }
+    watch: {
+      type: "boolean",
+      description: "Watch for changes and regenerate",
+      required: false,
+      default: false
     },
-    async run(param) {
-      var {
-          args
-        } = param,
-        opts = {
-          dir: (0, import_path.resolve)(args.dir),
-          after: args.after
-        };
-      args.watch ? (await (0, import_generate.watch)(opts), await new Promise(function () {})) : await (0, import_generate.generate)(opts);
+    after: {
+      type: "string",
+      description: "Command to run after generation completes",
+      required: false
     }
-  }),
-  main = (0, import_citty.defineCommand)({
-    meta: {
-      name: "on-zero",
-      description: "on-zero CLI tools"
-    },
-    subCommands: {
-      generate: generateCommand
+  },
+  async run(param) {
+    var {
+      args
+    } = param;
+    var opts = {
+      dir: (0, import_path.resolve)(args.dir),
+      after: args.after
+    };
+    if (args.watch) {
+      await (0, import_generate.watch)(opts);
+      await new Promise(function () {});
+    } else {
+      await (0, import_generate.generate)(opts);
     }
-  });
+  }
+});
+var main = (0, import_citty.defineCommand)({
+  meta: {
+    name: "on-zero",
+    description: "on-zero CLI tools"
+  },
+  subCommands: {
+    generate: generateCommand
+  }
+});
 (0, import_citty.runMain)(main);
 //# sourceMappingURL=cli.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["import_path","require","import_citty","import_generate","generateCommand","defineCommand","meta","name","description","args","dir","type","required","default","watch","after","run","param","opts","resolve","Promise","generate","main","subCommands"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":";AACA;;AAMA,IAAAA,WAAM,GAAAC,OAAA,OAAkB;EAAAC,YAAA,GAAAD,OAAc;EAAAE,eAAA,GAAAF,OAAA;EAAAG,eAAA,OAAAF,YAAA,CAAAG,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;MACAC,KAAA,EAAO;QACLH,IAAA,EAAM;QACNH,WAAA,EAAa;QACbI,QAAA,EAAU;QACVC,OAAA,EAAS;MACX;MACAE,KAAA,EAAO;QACLJ,IAAA,EAAM;QACNH,WAAA,EAAa;QACbI,QAAA,EAAU;MACZ;IACF;IAEA,MAAMI,IAAIC,KAAE,EAAK;MACf;UAAMR;QAAA,IAASQ,KAAA;QAAAC,IAAK;UAEhBR,GAAK,MAAAV,WACP,CAAAmB,OAAM,EAAAV,IAAA,CAAAC,GAAA;UACoBK,KAE1B,EAAAN,IAAA,CAAAM;QAEJ;MAGIN,IAAA,CAAAK,KAAA,IAAO,UAAAX,eAAc,CAAAW,KAAA,EAAAI,IAAA,aAAAE,OAAA,cACzB,MAAM,UAAAjB,eAAA,CAAAkB,QAAA,EAAAH,IAAA;IAAA;EACE;EACNI,IAAA,OAAApB,YAAa,CAAAG,aAAA;IACfC,IAAA;MACAC,IAAA,WAAa;MACXC,WAAU;IACZ;IACDe,WAAA;MAEDF,QAAA,EAAAjB","ignoreList":[]}
+{"version":3,"names":["import_path","require","import_citty","import_generate","generateCommand","defineCommand","meta","name","description","args","dir","type","required","default","watch","after","run","param","opts","resolve","Promise","generate","main"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":";AACA;;AAEA,IAAAA,WAAA,GAAAC,OAAuC;AAEvC,IAAAC,YAAA,GAAAD,OAAgC;AAEhC,IAAAE,eAAM,GAAAF,OAAkB;AAAc,IACpCG,eAAM,OAAAF,YAAA,CAAAG,aAAA;EAAAC,IACJ;IACAC,IAAA,YAAa;IACfC,WAAA;EACA;EAAMC,IACJ;IAAKC,GACH;MACAC,IAAA,cAAa;MACbH,WAAU;MACVI,QAAA,EAAS;MACXC,OAAA;IACA;IAAOC,KACL;MACAH,IAAA,WAAa;MACbH,WAAU;MACVI,QAAA,EAAS;MACXC,OAAA;IACA;IAAOE,KACL;MACAJ,IAAA,UAAa;MACbH,WAAU;MACZI,QAAA;IACF;EAEA;EACE,MAAAI,GAAMA,CAAAC,KAAO,EAAE;IAEf,IAAI;MAAAR;IAAK,IAAAQ,KAAO;IACd,IAAAC,IAAA;MACAR,GAAA,GAAM,GAAAV,WAAY,CAAAmB,OAAM,EAAAV,IAAA,CAAAC,GAAA;MAACK,KAAC,EAAAN,IAAA,CAAAM;IAC5B;IACE,IAAAN,IAAA,CAAAK,KAAM;MACR,UAAAX,eAAA,CAAAW,KAAA,EAAAI,IAAA;MACF,UAAAE,OAAA,cACD;IAED,OAAM;MACJ,MAAM,IAAAjB,eAAA,CAAAkB,QAAA,EAAAH,IAAA;IACJ;EAAM;AACO,EACf;AAAA,IACAI,IAAA,OAAapB,YAAA,CAAAG,aAAA;EAAAC,IACX;IACFC,IAAA;IACDC,WAAA;EAAA","ignoreList":[]}

package/dist/cjs/constants.cjs

@@ -3,20 +3,22 @@ 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
-    });
-  },
-  __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var constants_exports = {};
 __export(constants_exports, {
@@ -25,5 +27,5 @@ __export(constants_exports, {
 });
 module.exports = __toCommonJS(constants_exports);
 var import_helpers = require("@take-out/helpers");
-const isServer = process.env.VITE_ENVIRONMENT === "ssr" || process.env.VITE_ENVIRONMENT !== "client" && (0, import_helpers.isServerRuntime)(),
-  isBrowser = !isServer;
+const isServer = process.env.VITE_ENVIRONMENT === "ssr" || process.env.VITE_ENVIRONMENT !== "client" && (0, import_helpers.isServerRuntime)();
+const isBrowser = !isServer;

package/dist/cjs/constants.native.js

@@ -5,20 +5,22 @@ 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
-    });
-  },
-  __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var constants_native_exports = {};
 __export(constants_native_exports, {
@@ -26,6 +28,6 @@ __export(constants_native_exports, {
   isServer: () => isServer
 });
 module.exports = __toCommonJS(constants_native_exports);
-var isServer = !1,
-  isBrowser = !0;
+var isServer = false;
+var isBrowser = true;
 //# sourceMappingURL=constants.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["constants_native_exports","__export","isBrowser","isServer","module","exports","__toCommonJS"],"sources":["../../src/constants.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,QAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAN,wBAAA;AAAO,IAAIG,QAAA,GAAW;EACXD,SAAA,GAAY","ignoreList":[]}
+{"version":3,"names":["constants_native_exports","__export","isBrowser","isServer","module","exports","__toCommonJS"],"sources":["../../src/constants.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,QAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAN,wBAAA;AAAO,IAAIG,QAAA,GAAW;AACf,IAAID,SAAA,GAAY","ignoreList":[]}

package/dist/cjs/createPermissions.cjs

@@ -3,20 +3,22 @@ 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
-    });
-  },
-  __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var createPermissions_exports = {};
 __export(createPermissions_exports, {
@@ -24,15 +26,16 @@ __export(createPermissions_exports, {
   createPermissions: () => createPermissions
 });
 module.exports = __toCommonJS(createPermissions_exports);
-var import_helpers = require("@take-out/helpers"),
-  import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck.cjs"),
-  import_mutatorContext = require("./helpers/mutatorContext.cjs"),
-  import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery.cjs"),
-  import_state = require("./state.cjs"),
-  import_where = require("./where.cjs");
+var import_helpers = require("@take-out/helpers");
+var import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck.cjs");
+var import_mutatorContext = require("./helpers/mutatorContext.cjs");
+var import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery.cjs");
+var import_state = require("./state.cjs");
+var import_where = require("./where.cjs");
 class PermissionError extends Error {
   constructor(message) {
-    super(message), this.name = "PermissionError";
+    super(message);
+    this.name = "PermissionError";
   }
 }
 function createPermissions({
@@ -41,48 +44,77 @@ function createPermissions({
   adminRoleMode = "all"
 }) {
   function buildPermissionQuery(authData, eb, permissionWhere, objOrId, tableNameOverride) {
-    if ((adminRoleMode === "all" || adminRoleMode === "queries") && authData?.role === "admin") return eb.cmpLit(!0, "=", !0);
+    const adminBypassQueries = adminRoleMode === "all" || adminRoleMode === "queries";
+    if (adminBypassQueries && authData?.role === "admin") {
+      return eb.cmpLit(true, "=", true);
+    }
     const tableName = tableNameOverride || (0, import_where.getWhereTableName)(permissionWhere);
-    if (!tableName) throw new Error("Must use PermissionWhere for buildPermissionQuery");
+    if (!tableName) {
+      throw new Error(`Must use PermissionWhere for buildPermissionQuery`);
+    }
     const tableSchema = schema.tables[tableName];
-    if (!tableSchema) throw new Error("No schema?");
+    if (!tableSchema) {
+      throw new Error(`No schema?`);
+    }
     const primaryKeys = tableSchema.primaryKey;
     let permissionReturn;
     try {
       permissionReturn = permissionWhere(eb, authData);
     } catch (err) {
-      return process.env.NODE_ENV === "development" && err?.name !== "EnsureError" && console.warn(`[permission] ${tableName} threw:`, err), eb.cmpLit(!0, "=", !1);
+      if (process.env.NODE_ENV === "development" && err?.name !== "EnsureError") {
+        console.warn(`[permission] ${tableName} threw:`, err);
+      }
+      return eb.cmpLit(true, "=", false);
+    }
+    if (permissionReturn == null) {
+      throw new Error(`No permission defined for ${tableName}`);
+    }
+    if (permissionReturn === true) {
+      return eb.cmpLit(true, "=", true);
+    }
+    if (permissionReturn === false) {
+      return eb.cmpLit(true, "=", false);
     }
-    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];
+      const value = typeof objOrId === "string" ? objOrId : objOrId[key];
       primaryKeyWheres.push(eb.cmp(key, value));
     }
     return eb.and(permissionReturn, ...primaryKeyWheres);
   }
   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);
+      const ctx = (0, import_mutatorContext.mutatorContext)();
+      const 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, obj) {
-    if ((adminRoleMode === "all" || adminRoleMode === "mutations") && authData?.role === "admin") return;
-    const queryBase = (0, import_state.getZQL)()[tableName];
+    const adminBypassMutations = adminRoleMode === "all" || adminRoleMode === "mutations";
+    if (adminBypassMutations && authData?.role === "admin") {
+      return;
+    }
+    const zqlBuilder = (0, import_state.getZQL)();
+    const queryBase = zqlBuilder[tableName];
     let query = null;
     try {
-      query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await tx.run(query));
+      query = queryBase.where(eb => {
+        return buildPermissionQuery(authData, eb, where, obj);
+      }).one();
+      (0, import_helpers.ensure)(await tx.run(query));
     } catch (err) {
       const errorTitle = `${tableName} with auth id: ${authData?.id}`;
       if (err?.name === "EnsureError") {
         let msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
-        throw process.env.NODE_ENV === "development" && query && (msg += `
- ${(0, import_prettyFormatZeroQuery.prettyFormatZeroQuery)(query)}`), new PermissionError(msg);
+        if (process.env.NODE_ENV === "development" && query) {
+          msg += `
+ ${(0, import_prettyFormatZeroQuery.prettyFormatZeroQuery)(query)}`;
+        }
+        throw new PermissionError(msg);
       }
       throw new Error(`Error running permission ${errorTitle}
 ${err}`);