on-zero 0.4.3 → 0.4.4

package/dist/esm/createZeroServer.mjs

@@ -26,118 +26,146 @@ function createZeroServer({
   defaultAllowAdminRole = "all",
   defaultMutateAuthData = {}
 }) {
-  setSchema(schema), setEnvironment("server");
+  setSchema(schema);
+  setEnvironment("server");
   let pool;
-  if (externalPool) pool = externalPool;else {
-    const dbString = assertString(database, 'createZeroServer "database"'),
-      pgPool = new Pool({
-        connectionString: dbString,
-        // handle self-signed certificates in production
-        ssl: dbString.includes("sslmode=require") ? {
-          rejectUnauthorized: !1
-        } : void 0
-      });
+  if (externalPool) {
+    pool = externalPool;
+  } else {
+    const dbString = assertString(database, `createZeroServer "database"`);
+    const pgPool = new Pool({
+      connectionString: dbString,
+      // handle self-signed certificates in production
+      ssl: dbString.includes("sslmode=require") ? {
+        rejectUnauthorized: false
+      } : void 0
+    });
     pgPool.on("error", error => {
-      console.error("[on-zero] pool error", error.message);
-    }), pgPool.on("connect", client => {
+      console.error(`[on-zero] pool error`, error.message);
+    });
+    pgPool.on("connect", client => {
       client.on("error", error => {
-        console.error("[on-zero] client error", error.message);
+        console.error(`[on-zero] client error`, error.message);
       });
-    }), pool = pgPool;
+    });
+    pool = pgPool;
   }
-  const zeroDb = zeroNodePg(schema, pool),
-    permissions = createPermissions({
+  const zeroDb = zeroNodePg(schema, pool);
+  const permissions = createPermissions({
+    environment: "server",
+    schema,
+    adminRoleMode: defaultAllowAdminRole
+  });
+  const processor = new PushProcessor(zeroDb);
+  const handleMutationRequest = async ({
+    authData,
+    request,
+    skipAsyncTasks
+  }) => {
+    const asyncTasks = [];
+    const mutators = createMutators({
+      asyncTasks,
+      can: permissions.can,
+      createServerActions,
       environment: "server",
-      schema,
-      adminRoleMode: defaultAllowAdminRole
-    }),
-    processor = new PushProcessor(zeroDb),
-    handleMutationRequest = async ({
+      models,
       authData,
-      request,
-      skipAsyncTasks
-    }) => {
-      const asyncTasks = [],
-        mutators = createMutators({
-          asyncTasks,
-          can: permissions.can,
-          createServerActions,
-          environment: "server",
-          models,
+      validateMutation,
+      mutationValidators
+    });
+    const response = await processor.process(mutators, request);
+    if (!skipAsyncTasks && asyncTasks.length) {
+      Promise.all(asyncTasks.map(task => runWithAuthScope(authData, task))).catch(err => {
+        console.error(`[push] async tasks failed`, err);
+      });
+    }
+    return {
+      response,
+      asyncTasks
+    };
+  };
+  const handleQueryRequest = async ({
+    authData,
+    request
+  }) => {
+    if (!queries) {
+      throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
+    }
+    const response = await runWithQueryContext({
+      authData: authData || {}
+    }, () => zeroHandleQueryRequest((name, args) => {
+      if (name.startsWith("permission.")) {
+        const table = name.slice("permission.".length);
+        const {
+          objOrId
+        } = args;
+        const perm = getMutationsPermissions(table);
+        if (!perm) {
+          throw new Error(`[permission] no permission defined for table: ${table}`);
+        }
+        setEvaluatingPermission(true);
+        try {
+          return getZQL()[table].where(eb => {
+            return permissions.buildPermissionQuery(authData, eb, perm, objOrId, table);
+          }).one();
+        } finally {
+          setEvaluatingPermission(false);
+        }
+      }
+      if (validateQuery) {
+        validateQuery({
           authData,
-          validateMutation,
-          mutationValidators
-        }),
-        response = await processor.process(mutators, request);
-      return !skipAsyncTasks && asyncTasks.length && Promise.all(asyncTasks.map(task => runWithAuthScope(authData, task))).catch(err => {
-        console.error("[push] async tasks failed", err);
-      }), {
-        response,
-        asyncTasks
-      };
-    },
-    handleQueryRequest = async ({
-      authData,
-      request
-    }) => {
-      if (!queries) throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
-      return {
-        response: await runWithQueryContext({
-          authData: authData || {}
-        }, () => zeroHandleQueryRequest((name, args) => {
-          if (name.startsWith("permission.")) {
-            const table = name.slice(11),
-              {
-                objOrId
-              } = args,
-              perm = getMutationsPermissions(table);
-            if (!perm) throw new Error(`[permission] no permission defined for table: ${table}`);
-            setEvaluatingPermission(!0);
-            try {
-              return getZQL()[table].where(eb => permissions.buildPermissionQuery(authData, eb, perm, objOrId, table)).one();
-            } finally {
-              setEvaluatingPermission(!1);
-            }
-          }
-          return validateQuery && validateQuery({
-            authData,
-            queryName: name,
-            params: args
-          }), mustGetQuery(queries, name).fn({
-            args,
-            ctx: authData
-          });
-        }, schema, request))
-      };
+          queryName: name,
+          params: args
+        });
+      }
+      const query2 = mustGetQuery(queries, name);
+      return query2.fn({
+        args,
+        ctx: authData
+      });
+    }, schema, request));
+    return {
+      response
     };
+  };
   async function runMutate(modelName, mutatorName, mutatorArg, options) {
     let authData = options?.authData;
     if (!authData) {
       const scoped = getScopedAuthData();
-      scoped && (authData = scoped);
+      if (scoped) {
+        authData = scoped;
+      }
     }
-    const asyncTasks = [],
-      mutator = createMutators({
-        models,
-        environment: "server",
-        asyncTasks,
-        authData: {
-          ...defaultMutateAuthData,
-          ...authData
-        },
-        createServerActions,
-        can: permissions.can,
-        validateMutation,
-        mutationValidators
-      })[modelName][mutatorName];
-    if (await transaction(async tx => {
+    const asyncTasks = [];
+    const mutators = createMutators({
+      models,
+      environment: "server",
+      asyncTasks,
+      authData: {
+        ...defaultMutateAuthData,
+        ...authData
+      },
+      createServerActions,
+      can: permissions.can,
+      validateMutation,
+      mutationValidators
+    });
+    const modelMutators = mutators[modelName];
+    const mutator = modelMutators[mutatorName];
+    await transaction(async tx => {
       await mutator(tx, mutatorArg);
-    }), asyncTasks.length) {
-      const resolvedAuth = authData ?? null,
-        promise = Promise.all(asyncTasks.map(t => runWithAuthScope(resolvedAuth, t)));
-      options?.awaitEffects ? await promise : promise.catch(err => {
-        console.error("[mutate] async tasks failed", err);
-      });
+    });
+    if (asyncTasks.length) {
+      const resolvedAuth = authData ?? null;
+      const promise = Promise.all(asyncTasks.map(t => runWithAuthScope(resolvedAuth, t)));
+      if (options?.awaitEffects) {
+        await promise;
+      } else {
+        promise.catch(err => {
+          console.error(`[mutate] async tasks failed`, err);
+        });
+      }
     }
   }
   const mutate = new Proxy({}, {
@@ -157,18 +185,34 @@ function createZeroServer({
         } = mutatorContext();
         return await query2(tx);
       }
-      return await zeroDb.transaction(query2, dummyTransactionInput);
+      const output = await zeroDb.transaction(query2, dummyTransactionInput);
+      return output;
     } catch (err) {
-      throw err?.name !== "PermissionError" && console.error(`Error running transaction(): ${err}`), err;
+      if (err?.name !== "PermissionError") {
+        console.error(`Error running transaction(): ${err}`);
+      }
+      throw err;
     }
   }
   function query(cb, authData) {
-    const run = () => transaction(async tx => tx.run(cb(getZQL())));
-    return authData !== void 0 ? runWithQueryContext({
-      authData
-    }, run) : run();
+    const run = () => transaction(async tx => {
+      return tx.run(cb(getZQL()));
+    });
+    if (authData !== void 0) {
+      return runWithQueryContext({
+        authData
+      }, run);
+    }
+    return run();
   }
-  queries && setCustomQueries(queries), setRunner(queryObj => transaction(async tx => tx.run(queryObj)));
+  if (queries) {
+    setCustomQueries(queries);
+  }
+  setRunner(queryObj => {
+    return transaction(async tx => {
+      return tx.run(queryObj);
+    });
+  });
   const dummyTransactionInput = {
     clientGroupID: "unused",
     clientID: "unused",

package/dist/esm/createZeroServer.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["mustGetQuery","PushProcessor","handleQueryRequest","zeroHandleQueryRequest","zeroNodePg","assertString","Pool","createPermissions","createMutators","getScopedAuthData","isInZeroMutation","mutatorContext","runWithAuthScope","runWithQueryContext","getMutationsPermissions","setCustomQueries","getZQL","setEnvironment","setSchema","setEvaluatingPermission","setRunner","createZeroServer","createServerActions","database","pool","externalPool","schema","models","queries","mutations","mutationValidators","validateQuery","validateMutation","defaultAllowAdminRole","defaultMutateAuthData","dbString","pgPool","connectionString","ssl","includes","rejectUnauthorized","on","error","console","message","client","zeroDb","permissions","environment","adminRoleMode","processor","handleMutationRequest","authData","request","skipAsyncTasks","asyncTasks","mutators","can","response","process","length","Promise","all","map","task","catch","err","Error","name","args","startsWith","table","slice","objOrId","perm","where","eb","buildPermissionQuery","one","queryName","params","fn","ctx","runMutate","modelName","mutatorName","mutatorArg","options","scoped","mutator","transaction","tx","resolvedAuth","promise","t","awaitEffects","mutate","Proxy","get","_","_2","arg","query2","dummyTransactionInput","query","cb","run","queryObj","clientGroupID","clientID","mutationID","upstreamSchema"],"sources":["../../src/createZeroServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["mustGetQuery","PushProcessor","handleQueryRequest","zeroHandleQueryRequest","zeroNodePg","assertString","Pool","createPermissions","createMutators","getScopedAuthData","isInZeroMutation","mutatorContext","runWithAuthScope","runWithQueryContext","getMutationsPermissions","setCustomQueries","getZQL","setEnvironment","setSchema","setEvaluatingPermission","setRunner","createZeroServer","createServerActions","database","pool","externalPool","schema","models","queries","mutations","mutationValidators","validateQuery","validateMutation","defaultAllowAdminRole","defaultMutateAuthData","dbString","pgPool","connectionString","ssl","includes","rejectUnauthorized","on","error","console","message","client","zeroDb","permissions","environment","adminRoleMode","processor","handleMutationRequest","authData","request","skipAsyncTasks","asyncTasks","mutators","can","response","process","length","Promise","all","map","task","catch","err","Error","name","args","startsWith","table","slice","objOrId","perm","where","eb","buildPermissionQuery","one","queryName","params","query2","fn","ctx","runMutate","modelName","mutatorName","mutatorArg","options","scoped","modelMutators","mutator","transaction","tx","resolvedAuth","promise","t","awaitEffects","mutate","Proxy","get","_","_2","arg","output","dummyTransactionInput","query","cb","run","queryObj","clientGroupID","clientID","mutationID","upstreamSchema"],"sources":["../../src/createZeroServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createZeroServer.native.js

@@ -27,133 +27,154 @@ function createZeroServer(param) {
     defaultAllowAdminRole = "all",
     defaultMutateAuthData = {}
   } = param;
-  setSchema(schema), setEnvironment("server");
+  setSchema(schema);
+  setEnvironment("server");
   var pool;
-  if (externalPool) pool = externalPool;else {
-    var dbString = assertString(database, 'createZeroServer "database"'),
-      pgPool = new Pool({
-        connectionString: dbString,
-        // handle self-signed certificates in production
-        ssl: dbString.includes("sslmode=require") ? {
-          rejectUnauthorized: !1
-        } : void 0
-      });
+  if (externalPool) {
+    pool = externalPool;
+  } else {
+    var dbString = assertString(database, `createZeroServer "database"`);
+    var pgPool = new Pool({
+      connectionString: dbString,
+      // handle self-signed certificates in production
+      ssl: dbString.includes("sslmode=require") ? {
+        rejectUnauthorized: false
+      } : void 0
+    });
     pgPool.on("error", function (error) {
-      console.error("[on-zero] pool error", error.message);
-    }), pgPool.on("connect", function (client) {
+      console.error(`[on-zero] pool error`, error.message);
+    });
+    pgPool.on("connect", function (client) {
       client.on("error", function (error) {
-        console.error("[on-zero] client error", error.message);
+        console.error(`[on-zero] client error`, error.message);
       });
-    }), pool = pgPool;
+    });
+    pool = pgPool;
   }
-  var zeroDb = zeroNodePg(schema, pool),
-    permissions = createPermissions({
+  var zeroDb = zeroNodePg(schema, pool);
+  var permissions = createPermissions({
+    environment: "server",
+    schema,
+    adminRoleMode: defaultAllowAdminRole
+  });
+  var processor = new PushProcessor(zeroDb);
+  var handleMutationRequest = async function (param2) {
+    var {
+      authData,
+      request,
+      skipAsyncTasks
+    } = param2;
+    var asyncTasks = [];
+    var mutators = createMutators({
+      asyncTasks,
+      can: permissions.can,
+      createServerActions,
       environment: "server",
-      schema,
-      adminRoleMode: defaultAllowAdminRole
-    }),
-    processor = new PushProcessor(zeroDb),
-    handleMutationRequest = async function (param2) {
-      var {
-          authData,
-          request,
-          skipAsyncTasks
-        } = param2,
-        asyncTasks = [],
-        mutators = createMutators({
-          asyncTasks,
-          can: permissions.can,
-          createServerActions,
-          environment: "server",
-          models,
-          authData,
-          validateMutation,
-          mutationValidators
-        }),
-        response = await processor.process(mutators, request);
-      return !skipAsyncTasks && asyncTasks.length && Promise.all(asyncTasks.map(function (task) {
+      models,
+      authData,
+      validateMutation,
+      mutationValidators
+    });
+    var response = await processor.process(mutators, request);
+    if (!skipAsyncTasks && asyncTasks.length) {
+      Promise.all(asyncTasks.map(function (task) {
         return runWithAuthScope(authData, task);
       })).catch(function (err) {
-        console.error("[push] async tasks failed", err);
-      }), {
-        response,
-        asyncTasks
-      };
-    },
-    handleQueryRequest = async function (param2) {
-      var {
-        authData,
-        request
-      } = param2;
-      if (!queries) throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
-      var response = await runWithQueryContext({
-        authData: authData || {}
-      }, function () {
-        return zeroHandleQueryRequest(function (name, args) {
-          if (name.startsWith("permission.")) {
-            var table = name.slice(11),
-              {
-                objOrId
-              } = args,
-              perm = getMutationsPermissions(table);
-            if (!perm) throw new Error(`[permission] no permission defined for table: ${table}`);
-            setEvaluatingPermission(!0);
-            try {
-              return getZQL()[table].where(function (eb) {
-                return permissions.buildPermissionQuery(authData, eb, perm, objOrId, table);
-              }).one();
-            } finally {
-              setEvaluatingPermission(!1);
-            }
+        console.error(`[push] async tasks failed`, err);
+      });
+    }
+    return {
+      response,
+      asyncTasks
+    };
+  };
+  var handleQueryRequest = async function (param2) {
+    var {
+      authData,
+      request
+    } = param2;
+    if (!queries) {
+      throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
+    }
+    var response = await runWithQueryContext({
+      authData: authData || {}
+    }, function () {
+      return zeroHandleQueryRequest(function (name, args) {
+        if (name.startsWith("permission.")) {
+          var table = name.slice("permission.".length);
+          var {
+            objOrId
+          } = args;
+          var perm = getMutationsPermissions(table);
+          if (!perm) {
+            throw new Error(`[permission] no permission defined for table: ${table}`);
+          }
+          setEvaluatingPermission(true);
+          try {
+            return getZQL()[table].where(function (eb) {
+              return permissions.buildPermissionQuery(authData, eb, perm, objOrId, table);
+            }).one();
+          } finally {
+            setEvaluatingPermission(false);
           }
-          validateQuery && validateQuery({
+        }
+        if (validateQuery) {
+          validateQuery({
             authData,
             queryName: name,
             params: args
           });
-          var _$query = mustGetQuery(queries, name);
-          return _$query.fn({
-            args,
-            ctx: authData
-          });
-        }, schema, request);
-      });
-      return {
-        response
-      };
+        }
+        var _$query = mustGetQuery(queries, name);
+        return _$query.fn({
+          args,
+          ctx: authData
+        });
+      }, schema, request);
+    });
+    return {
+      response
     };
+  };
   async function runMutate(modelName, mutatorName, mutatorArg, options) {
-    var authData = options?.authData;
+    var authData = options === null || options === void 0 ? void 0 : options.authData;
     if (!authData) {
       var scoped = getScopedAuthData();
-      scoped && (authData = scoped);
+      if (scoped) {
+        authData = scoped;
+      }
     }
-    var asyncTasks = [],
-      mutators = createMutators({
-        models,
-        environment: "server",
-        asyncTasks,
-        authData: {
-          ...defaultMutateAuthData,
-          ...authData
-        },
-        createServerActions,
-        can: permissions.can,
-        validateMutation,
-        mutationValidators
-      }),
-      modelMutators = mutators[modelName],
-      mutator = modelMutators[mutatorName];
-    if (await transaction(async function (tx) {
+    var asyncTasks = [];
+    var mutators = createMutators({
+      models,
+      environment: "server",
+      asyncTasks,
+      authData: {
+        ...defaultMutateAuthData,
+        ...authData
+      },
+      createServerActions,
+      can: permissions.can,
+      validateMutation,
+      mutationValidators
+    });
+    var modelMutators = mutators[modelName];
+    var mutator = modelMutators[mutatorName];
+    await transaction(async function (tx) {
       await mutator(tx, mutatorArg);
-    }), asyncTasks.length) {
-      var resolvedAuth = authData ?? null,
-        promise = Promise.all(asyncTasks.map(function (t) {
-          return runWithAuthScope(resolvedAuth, t);
-        }));
-      options?.awaitEffects ? await promise : promise.catch(function (err) {
-        console.error("[mutate] async tasks failed", err);
-      });
+    });
+    if (asyncTasks.length) {
+      var resolvedAuth = authData !== null && authData !== void 0 ? authData : null;
+      var promise = Promise.all(asyncTasks.map(function (t) {
+        return runWithAuthScope(resolvedAuth, t);
+      }));
+      if (options === null || options === void 0 ? void 0 : options.awaitEffects) {
+        await promise;
+      } else {
+        promise.catch(function (err) {
+          console.error(`[mutate] async tasks failed`, err);
+        });
+      }
     }
   }
   var mutate = new Proxy({}, {
@@ -178,7 +199,10 @@ function createZeroServer(param) {
       var output = await zeroDb.transaction(query2, dummyTransactionInput);
       return output;
     } catch (err) {
-      throw err?.name !== "PermissionError" && console.error(`Error running transaction(): ${err}`), err;
+      if ((err === null || err === void 0 ? void 0 : err.name) !== "PermissionError") {
+        console.error(`Error running transaction(): ${err}`);
+      }
+      throw err;
     }
   }
   function query(cb, authData) {
@@ -187,11 +211,17 @@ function createZeroServer(param) {
         return tx.run(cb(getZQL()));
       });
     };
-    return authData !== void 0 ? runWithQueryContext({
-      authData
-    }, run) : run();
+    if (authData !== void 0) {
+      return runWithQueryContext({
+        authData
+      }, run);
+    }
+    return run();
+  }
+  if (queries) {
+    setCustomQueries(queries);
   }
-  queries && setCustomQueries(queries), setRunner(function (queryObj) {
+  setRunner(function (queryObj) {
     return transaction(async function (tx) {
       return tx.run(queryObj);
     });