on-zero 0.6.14 → 0.6.16

package/dist/cjs/createZeroServerCore.native.js

@@ -24,129 +24,26 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var createZeroServerCore_exports = {};
 __export(createZeroServerCore_exports, {
-  createZeroServerCore: () => createZeroServerCore,
-  resolveServerQuery: () => resolveServerQuery
+  createZeroServerCore: () => createZeroServerCore
 });
 module.exports = __toCommonJS(createZeroServerCore_exports);
-var import_zero = require("@rocicorp/zero");
 var import_server = require("@rocicorp/zero/server");
-var import_createPermissions = require("./createPermissions.native.js");
+var import_asyncTasks = require("./asyncTasks.native.js");
+var import_createZeroDirectServer = require("./createZeroDirectServer.native.js");
 var import_createMutators = require("./helpers/createMutators.native.js");
 var import_mutatorContext = require("./helpers/mutatorContext.native.js");
 var import_queryContext = require("./helpers/queryContext.native.js");
-var import_modelRegistry = require("./modelRegistry.native.js");
-var import_run = require("./run.native.js");
-var import_state = require("./state.native.js");
-var import_where = require("./where.native.js");
-var import_zeroRunner = require("./zeroRunner.native.js");
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
   return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-function resolveServerQuery(param) {
-  var {
-    authData,
-    name,
-    args,
-    queries,
-    permissions,
-    validateQuery
-  } = param;
-  if (name.startsWith("permission.")) {
-    var table = name.slice("permission.".length);
-    var {
-      objOrId
-    } = args;
-    var permission = (0, import_modelRegistry.getMutationsPermissions)(table);
-    if (!permission) {
-      throw new Error(`[permission] no permission defined for table: ${table}`);
-    }
-    (0, import_where.setEvaluatingPermission)(true);
-    try {
-      return (0, import_state.getZQL)()[table].where(function (eb) {
-        return permissions.buildPermissionQuery(authData, eb, permission, objOrId, table);
-      }).one();
-    } finally {
-      (0, import_where.setEvaluatingPermission)(false);
-    }
-  }
-  if (validateQuery) {
-    validateQuery({
-      authData,
-      queryName: name,
-      params: args
-    });
-  }
-  var query = (0, import_zero.mustGetQuery)(queries, name);
-  return query.fn({
-    args,
-    ctx: authData
-  });
-}
-function createAsyncTaskCollector() {
-  var committed = [];
-  var attempt;
-  var completedAttempt;
-  var current = function () {
-    return attempt !== null && attempt !== void 0 ? attempt : committed;
-  };
-  var queue = new Proxy([], {
-    deleteProperty(_target, property) {
-      return Reflect.deleteProperty(current(), property);
-    },
-    get(_target, property) {
-      var target = current();
-      var value = Reflect.get(target, property, target);
-      return typeof value === "function" ? value.bind(target) : value;
-    },
-    getOwnPropertyDescriptor(_target, property) {
-      return Reflect.getOwnPropertyDescriptor(current(), property);
-    },
-    has(_target, property) {
-      return Reflect.has(current(), property);
-    },
-    ownKeys() {
-      return Reflect.ownKeys(current());
-    },
-    set(_target, property, value) {
-      return Reflect.set(current(), property, value);
-    }
-  });
-  var lifecycle = {
-    beginAttempt() {
-      attempt = [];
-      completedAttempt = void 0;
-    },
-    completeAttempt() {
-      completedAttempt = attempt;
-      attempt = void 0;
-    },
-    rollbackAttempt() {
-      attempt = void 0;
-      completedAttempt = void 0;
-    },
-    commitTransaction() {
-      if (completedAttempt) committed.push(...completedAttempt);
-      completedAttempt = void 0;
-    },
-    rollbackTransaction() {
-      attempt = void 0;
-      completedAttempt = void 0;
-    }
-  };
-  return {
-    committed,
-    lifecycle,
-    queue
-  };
-}
 function createZeroServerCore(param) {
   var {
     createDatabase,
     createServerActions,
     defaultAllowAdminRole = "all",
-    defaultMutateAuthData = {},
+    defaultMutateAuthData,
     models,
     mutations: mutationValidators,
     persistAlreadyProcessed,
@@ -155,12 +52,20 @@ function createZeroServerCore(param) {
     validateMutation,
     validateQuery
   } = param;
-  (0, import_state.setSchema)(schema);
-  (0, import_state.setEnvironment)("server");
-  var permissions = (0, import_createPermissions.createPermissions)({
-    environment: "server",
+  var {
+    permissions,
+    server
+  } = (0, import_createZeroDirectServer.createZeroDirectServerRuntime)({
+    createDatabase,
+    createServerActions,
+    defaultAllowAdminRole,
+    defaultMutateAuthData,
+    models,
+    mutations: mutationValidators,
+    queries,
     schema,
-    adminRoleMode: defaultAllowAdminRole
+    validateMutation,
+    validateQuery
   });
   var handleMutationRequest = async function (param2) {
     var {
@@ -168,10 +73,10 @@ function createZeroServerCore(param) {
       request,
       skipAsyncTasks
     } = param2;
-    var tasks = createAsyncTaskCollector();
+    var tasks = (0, import_createZeroDirectServer.createAsyncTaskCollector)();
     var recoveryRequest = request.clone();
     var mutators = (0, import_createMutators.createMutators)({
-      asyncTasks: tasks.queue,
+      enqueueTask: tasks.enqueueTask,
       can: permissions.can,
       createServerActions,
       environment: "server",
@@ -187,10 +92,18 @@ function createZeroServerCore(param) {
       if (parsed) await persistAlreadyProcessed(parsed);
     }
     if (!skipAsyncTasks && tasks.committed.length) {
-      Promise.all(tasks.committed.map(function (task) {
-        return (0, import_mutatorContext.runWithAuthScope)(authData, task);
-      })).catch(function (err) {
-        console.error("[push] async tasks failed", err);
+      var entries = tasks.committed.map(function (entry) {
+        return {
+          ...entry,
+          task: function () {
+            return (0, import_mutatorContext.runWithAuthScope)(authData, entry.task);
+          }
+        };
+      });
+      await (0, import_asyncTasks.runAsyncTaskEntries)(entries, {
+        background: function () {
+          return void 0;
+        }
       });
     }
     return {
@@ -207,7 +120,7 @@ function createZeroServerCore(param) {
       throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
     }
     var handler = function (name, args) {
-      return resolveServerQuery({
+      return (0, import_createZeroDirectServer.resolveServerQuery)({
         authData,
         name,
         args,
@@ -234,102 +147,10 @@ function createZeroServerCore(param) {
       response
     };
   };
-  async function runTransaction(database, query2) {
-    try {
-      if ((0, import_mutatorContext.isInZeroMutation)()) {
-        var {
-          tx
-        } = (0, import_mutatorContext.mutatorContext)();
-        return await query2(tx);
-      }
-      return await database.transaction(query2, dummyTransactionInput);
-    } catch (err) {
-      if ((err === null || err === void 0 ? void 0 : err.name) !== "PermissionError") {
-        console.error(`Error running transaction(): ${err}`);
-      }
-      throw err;
-    }
-  }
-  async function transaction(query2) {
-    return runTransaction(createDatabase(), query2);
-  }
-  async function runMutate(modelName, mutatorName, mutatorArg, options) {
-    var authData = options === null || options === void 0 ? void 0 : options.authData;
-    if (!authData) {
-      var scoped = (0, import_mutatorContext.getScopedAuthData)();
-      if (scoped) authData = scoped;
-    }
-    var tasks = createAsyncTaskCollector();
-    var mutators = (0, import_createMutators.createMutators)({
-      models,
-      environment: "server",
-      asyncTasks: tasks.queue,
-      authData: {
-        ...defaultMutateAuthData,
-        ...authData
-      },
-      createServerActions,
-      can: permissions.can,
-      validateMutation,
-      mutationValidators
-    });
-    var modelMutators = mutators[modelName];
-    var mutator = modelMutators[mutatorName];
-    await runTransaction(withTransactionLifecycle(createDatabase(), tasks.lifecycle), async function (tx) {
-      await mutator(tx, mutatorArg);
-    });
-    if (tasks.committed.length) {
-      var resolvedAuth = authData !== null && authData !== void 0 ? authData : null;
-      var promise = Promise.all(tasks.committed.map(function (task) {
-        return (0, import_mutatorContext.runWithAuthScope)(resolvedAuth, task);
-      }));
-      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({}, {
-    get(_, modelName) {
-      return new Proxy({}, {
-        get(_2, mutatorName) {
-          return function (arg, options) {
-            return runMutate(modelName, mutatorName, arg, options);
-          };
-        }
-      });
-    }
-  });
-  function query(cb, authData) {
-    var run = function () {
-      return transaction(async function (tx) {
-        return tx.run(cb((0, import_state.getZQL)()));
-      });
-    };
-    if (authData !== void 0) {
-      return (0, import_queryContext.runWithQueryContext)({
-        authData
-      }, run);
-    }
-    return run();
-  }
-  if (queries) {
-    (0, import_run.setCustomQueries)(queries);
-  }
-  (0, import_zeroRunner.setRunner)(function (queryObj) {
-    return transaction(async function (tx) {
-      return tx.run(queryObj);
-    });
-  });
   return {
     handleMutationRequest,
     handleQueryRequest,
-    transaction,
-    mutate,
-    query
+    ...server
   };
 }
 function withTransactionLifecycle(database, lifecycle) {
@@ -380,10 +201,4 @@ function alreadyProcessedMutations(response) {
     return !!id && (typeof id === "undefined" ? "undefined" : _type_of(id)) === "object" && typeof id.clientID === "string" && typeof id.id === "number" && !!result && (typeof result === "undefined" ? "undefined" : _type_of(result)) === "object" && result.error === "alreadyProcessed";
   });
 }
-var dummyTransactionInput = {
-  clientGroupID: "unused",
-  clientID: "unused",
-  mutationID: 42,
-  upstreamSchema: "unused"
-};
 //# sourceMappingURL=createZeroServerCore.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","resolveServerQuery","module","exports","import_zero","require","import_server","import_createPermissions","import_createMutators","import_mutatorContext","import_queryContext","import_modelRegistry","import_run","import_state","import_where","import_zeroRunner","_type_of","obj","Symbol","constructor","param","authData","name","args","queries","permissions","validateQuery","startsWith","table","slice","length","objOrId","permission","getMutationsPermissions","Error","setEvaluatingPermission","getZQL","where","eb","buildPermissionQuery","one","queryName","params","query","mustGetQuery","fn","ctx","createAsyncTaskCollector","committed","attempt","completedAttempt","current","queue","Proxy","deleteProperty","_target","property","Reflect","get","target","bind","getOwnPropertyDescriptor","has","ownKeys","set","lifecycle","beginAttempt","completeAttempt","rollbackAttempt","commitTransaction","push","rollbackTransaction","createDatabase","createServerActions","defaultAllowAdminRole","defaultMutateAuthData","models","mutations","mutationValidators","persistAlreadyProcessed","schema","validateMutation","setSchema","setEnvironment","createPermissions","environment","adminRoleMode","handleMutationRequest","param2","request","skipAsyncTasks","tasks","recoveryRequest","clone","mutators","createMutators","asyncTasks","can","processor","PushProcessor","withTransactionLifecycle","response","process","parsed","parseAlreadyProcessed","Promise","all","map","task","runWithAuthScope","catch","err","console","error","handleQueryRequest","handler","userID","id","runWithQueryContext","runTransaction","database","query2","isInZeroMutation","tx","mutatorContext","transaction","dummyTransactionInput","runMutate","modelName","mutatorName","mutatorArg","options","scoped","getScopedAuthData","modelMutators","mutator","resolvedAuth","promise","awaitEffects","mutate","_","_2","arg","cb","run","setCustomQueries","setRunner","queryObj","callback","input","hooks","result","alreadyProcessedMutations","upstreamSchema","URL","url","searchParams","body","json","clientGroupID","Array","isArray","filter","mutation","clientID","mutationID"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","module","exports","import_server","require","import_asyncTasks","import_createZeroDirectServer","import_createMutators","import_mutatorContext","import_queryContext","_type_of","obj","Symbol","constructor","param","createDatabase","createServerActions","defaultAllowAdminRole","defaultMutateAuthData","models","mutations","mutationValidators","persistAlreadyProcessed","queries","schema","validateMutation","validateQuery","permissions","server","createZeroDirectServerRuntime","handleMutationRequest","param2","authData","request","skipAsyncTasks","tasks","createAsyncTaskCollector","recoveryRequest","clone","mutators","createMutators","enqueueTask","can","environment","processor","PushProcessor","withTransactionLifecycle","lifecycle","response","process","parsed","parseAlreadyProcessed","committed","length","entries","map","entry","task","runWithAuthScope","runAsyncTaskEntries","background","asyncTasks","handleQueryRequest","Error","handler","name","args","resolveServerQuery","userID","id","runWithQueryContext","database","transaction","callback","input","tx","hooks","beginAttempt","result","completeAttempt","error","rollbackAttempt","commitTransaction","rollbackTransaction","alreadyProcessedMutations","upstreamSchema","URL","url","searchParams","get","body","json","clientGroupID","Array","isArray","filter","mutation"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generate.cjs

@@ -43,6 +43,7 @@ var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
 var import_generate_helpers = require("./generate-helpers.cjs");
 const hash = s => (0, import_node_crypto.createHash)("sha256").update(s).digest("hex");
+const GENERATOR_CACHE_VERSION = "1";
 const isGeneratorSourceFile = name => name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
 function hashInputTree(baseDir, generatedDir) {
   const parts = [];
@@ -350,6 +351,11 @@ function extractSchemaColumns(ts, sourceFile, columns, primaryKeys) {
   }
   visit(sourceFile);
 }
+function getInstantiatedPropertyType(checker, parent, name) {
+  const resolveProperty = Reflect.get(checker, "getTypeOfPropertyOfType");
+  if (typeof resolveProperty !== "function") return void 0;
+  return Reflect.apply(resolveProperty, checker, [parent, name]);
+}
 function tsTypeToValibot(ts, checker, type, seen) {
   if (!seen) seen = /* @__PURE__ */new Set();
   const flags = type.getFlags();
@@ -398,7 +404,9 @@ function tsTypeToValibot(ts, checker, type, seen) {
     if (hasUndefined) inner = `v.optional(${inner})`;
     return inner;
   }
-  const resolveSymbolType = prop => {
+  const resolveSymbolType = (parent, prop) => {
+    const instantiated = getInstantiatedPropertyType(checker, parent, prop.getName());
+    if (instantiated) return instantiated;
     if (prop.valueDeclaration) return checker.getTypeOfSymbolAtLocation(prop, prop.valueDeclaration);
     if (prop.declarations?.[0]) return checker.getTypeOfSymbolAtLocation(prop, prop.declarations[0]);
     return checker.getDeclaredTypeOfSymbol(prop);
@@ -410,7 +418,7 @@ function tsTypeToValibot(ts, checker, type, seen) {
     for (const prop of props2) {
       const name = prop.getName();
       if ((0, import_generate_helpers.shouldSkipObjectKey)(name)) continue;
-      const propType = resolveSymbolType(prop);
+      const propType = resolveSymbolType(type, prop);
       const isOptional = !!(prop.getFlags() & ts.SymbolFlags.Optional);
       let val = recurse(propType);
       if (isOptional && !val.startsWith("v.optional(")) {
@@ -443,7 +451,7 @@ function tsTypeToValibot(ts, checker, type, seen) {
     for (const prop of props) {
       const name = prop.getName();
       if ((0, import_generate_helpers.shouldSkipObjectKey)(name)) continue;
-      const propType = resolveSymbolType(prop);
+      const propType = resolveSymbolType(type, prop);
       const isOptional = !!(prop.getFlags() & ts.SymbolFlags.Optional);
       let val = recurse(propType);
       if (isOptional && !val.startsWith("v.optional(")) {
@@ -546,7 +554,8 @@ async function generate(options) {
   const {
     dir,
     after,
-    silent
+    silent,
+    force
   } = options;
   const baseDir = (0, import_node_path.resolve)(dir);
   const mutationsDir = (0, import_node_path.resolve)(baseDir, "mutations");
@@ -562,7 +571,7 @@ async function generate(options) {
   }
   loadCache();
   const inputHash = hashInputTree(baseDir, generatedDir);
-  if (generateCache.__inputHash === inputHash && (0, import_node_fs.existsSync)((0, import_node_path.resolve)(generatedDir, "models.ts"))) {
+  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash && (0, import_node_fs.existsSync)((0, import_node_path.resolve)(generatedDir, "models.ts"))) {
     let counts = {};
     try {
       counts = JSON.parse(generateCache.__counts || "{}");
@@ -759,6 +768,7 @@ async function generate(options) {
       if (!silent) console.error(`Error running after command: ${err}`);
     }
   }
+  generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
     modelCount: allModelFiles.length,

package/dist/cjs/generate.native.js

@@ -47,6 +47,7 @@ var import_generate_helpers = require("./generate-helpers.native.js");
 var hash = function (s) {
   return (0, import_crypto.createHash)("sha256").update(s).digest("hex");
 };
+var GENERATOR_CACHE_VERSION = "1";
 var isGeneratorSourceFile = function (name) {
   return name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
 };
@@ -491,6 +492,11 @@ function extractSchemaColumns(ts, sourceFile, columns, primaryKeys) {
   }
   visit(sourceFile);
 }
+function getInstantiatedPropertyType(checker, parent, name) {
+  var resolveProperty = Reflect.get(checker, "getTypeOfPropertyOfType");
+  if (typeof resolveProperty !== "function") return void 0;
+  return Reflect.apply(resolveProperty, checker, [parent, name]);
+}
 function tsTypeToValibot(ts, checker, type, seen) {
   var _checker_isArrayType, _checker_isArrayLikeType;
   if (!seen) seen = /* @__PURE__ */new Set();
@@ -554,8 +560,10 @@ function tsTypeToValibot(ts, checker, type, seen) {
     if (hasUndefined) inner1 = `v.optional(${inner1})`;
     return inner1;
   }
-  var resolveSymbolType = function (prop2) {
+  var resolveSymbolType = function (parent, prop2) {
     var _prop_declarations;
+    var instantiated = getInstantiatedPropertyType(checker, parent, prop2.getName());
+    if (instantiated) return instantiated;
     if (prop2.valueDeclaration) return checker.getTypeOfSymbolAtLocation(prop2, prop2.valueDeclaration);
     if ((_prop_declarations = prop2.declarations) === null || _prop_declarations === void 0 ? void 0 : _prop_declarations[0]) return checker.getTypeOfSymbolAtLocation(prop2, prop2.declarations[0]);
     return checker.getDeclaredTypeOfSymbol(prop2);
@@ -572,7 +580,7 @@ function tsTypeToValibot(ts, checker, type, seen) {
         var prop = _step.value;
         var name1 = prop.getName();
         if ((0, import_generate_helpers.shouldSkipObjectKey)(name1)) continue;
-        var propType = resolveSymbolType(prop);
+        var propType = resolveSymbolType(type, prop);
         var isOptional = !!(prop.getFlags() & ts.SymbolFlags.Optional);
         var val = recurse(propType);
         if (isOptional && !val.startsWith("v.optional(")) {
@@ -628,7 +636,7 @@ function tsTypeToValibot(ts, checker, type, seen) {
         var prop1 = _step1.value;
         var name3 = prop1.getName();
         if ((0, import_generate_helpers.shouldSkipObjectKey)(name3)) continue;
-        var propType1 = resolveSymbolType(prop1);
+        var propType1 = resolveSymbolType(type, prop1);
         var isOptional1 = !!(prop1.getFlags() & ts.SymbolFlags.Optional);
         var val1 = recurse(propType1);
         if (isOptional1 && !val1.startsWith("v.optional(")) {
@@ -806,7 +814,8 @@ async function generate(options) {
   var {
     dir,
     after,
-    silent
+    silent,
+    force
   } = options;
   var baseDir = (0, import_path.resolve)(dir);
   var mutationsDir = (0, import_path.resolve)(baseDir, "mutations");
@@ -822,7 +831,7 @@ async function generate(options) {
   }
   loadCache();
   var inputHash = hashInputTree(baseDir, generatedDir);
-  if (generateCache.__inputHash === inputHash && (0, import_fs.existsSync)((0, import_path.resolve)(generatedDir, "models.ts"))) {
+  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash && (0, import_fs.existsSync)((0, import_path.resolve)(generatedDir, "models.ts"))) {
     var counts = {};
     try {
       counts = JSON.parse(generateCache.__counts || "{}");
@@ -1136,6 +1145,7 @@ async function generate(options) {
       if (!silent) console.error(`Error running after command: ${err}`);
     }
   }
+  generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
     modelCount: allModelFiles.length,