on-zero 0.6.13 → 0.6.15

package/dist/cjs/createZeroServerCore.cjs

@@ -22,120 +22,19 @@ 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.cjs");
+var import_createZeroDirectServer = require("./createZeroDirectServer.cjs");
 var import_createMutators = require("./helpers/createMutators.cjs");
 var import_mutatorContext = require("./helpers/mutatorContext.cjs");
 var import_queryContext = require("./helpers/queryContext.cjs");
-var import_modelRegistry = require("./modelRegistry.cjs");
-var import_run = require("./run.cjs");
-var import_state = require("./state.cjs");
-var import_where = require("./where.cjs");
-var import_zeroRunner = require("./zeroRunner.cjs");
-function resolveServerQuery({
-  authData,
-  name,
-  args,
-  queries,
-  permissions,
-  validateQuery
-}) {
-  if (name.startsWith("permission.")) {
-    const table = name.slice("permission.".length);
-    const {
-      objOrId
-    } = args;
-    const 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(eb => {
-        return permissions.buildPermissionQuery(authData, eb, permission, objOrId, table);
-      }).one();
-    } finally {
-      (0, import_where.setEvaluatingPermission)(false);
-    }
-  }
-  if (validateQuery) {
-    validateQuery({
-      authData,
-      queryName: name,
-      params: args
-    });
-  }
-  const query = (0, import_zero.mustGetQuery)(queries, name);
-  return query.fn({
-    args,
-    ctx: authData
-  });
-}
-function createAsyncTaskCollector() {
-  const committed = [];
-  let attempt;
-  let completedAttempt;
-  const current = () => attempt ?? committed;
-  const queue = new Proxy([], {
-    deleteProperty(_target, property) {
-      return Reflect.deleteProperty(current(), property);
-    },
-    get(_target, property) {
-      const target = current();
-      const 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);
-    }
-  });
-  const 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({
   createDatabase,
   createServerActions,
   defaultAllowAdminRole = "all",
-  defaultMutateAuthData = {},
+  defaultMutateAuthData,
   models,
   mutations: mutationValidators,
   persistAlreadyProcessed,
@@ -144,19 +43,27 @@ function createZeroServerCore({
   validateMutation,
   validateQuery
 }) {
-  (0, import_state.setSchema)(schema);
-  (0, import_state.setEnvironment)("server");
-  const permissions = (0, import_createPermissions.createPermissions)({
-    environment: "server",
+  const {
+    permissions,
+    server
+  } = (0, import_createZeroDirectServer.createZeroDirectServerRuntime)({
+    createDatabase,
+    createServerActions,
+    defaultAllowAdminRole,
+    defaultMutateAuthData,
+    models,
+    mutations: mutationValidators,
+    queries,
     schema,
-    adminRoleMode: defaultAllowAdminRole
+    validateMutation,
+    validateQuery
   });
   const handleMutationRequest = async ({
     authData,
     request,
     skipAsyncTasks
   }) => {
-    const tasks = createAsyncTaskCollector();
+    const tasks = (0, import_createZeroDirectServer.createAsyncTaskCollector)();
     const recoveryRequest = request.clone();
     const mutators = (0, import_createMutators.createMutators)({
       asyncTasks: tasks.queue,
@@ -191,7 +98,7 @@ function createZeroServerCore({
     if (!queries) {
       throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
     }
-    const handler = (name, args) => resolveServerQuery({
+    const handler = (name, args) => (0, import_createZeroDirectServer.resolveServerQuery)({
       authData,
       name,
       args,
@@ -214,96 +121,10 @@ function createZeroServerCore({
       response
     };
   };
-  async function runTransaction(database, query2) {
-    try {
-      if ((0, import_mutatorContext.isInZeroMutation)()) {
-        const {
-          tx
-        } = (0, import_mutatorContext.mutatorContext)();
-        return await query2(tx);
-      }
-      return await database.transaction(query2, dummyTransactionInput);
-    } catch (err) {
-      if (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) {
-    let authData = options?.authData;
-    if (!authData) {
-      const scoped = (0, import_mutatorContext.getScopedAuthData)();
-      if (scoped) authData = scoped;
-    }
-    const tasks = createAsyncTaskCollector();
-    const mutators = (0, import_createMutators.createMutators)({
-      models,
-      environment: "server",
-      asyncTasks: tasks.queue,
-      authData: {
-        ...defaultMutateAuthData,
-        ...authData
-      },
-      createServerActions,
-      can: permissions.can,
-      validateMutation,
-      mutationValidators
-    });
-    const modelMutators = mutators[modelName];
-    const mutator = modelMutators[mutatorName];
-    await runTransaction(withTransactionLifecycle(createDatabase(), tasks.lifecycle), async tx => {
-      await mutator(tx, mutatorArg);
-    });
-    if (tasks.committed.length) {
-      const resolvedAuth = authData ?? null;
-      const promise = Promise.all(tasks.committed.map(task => (0, import_mutatorContext.runWithAuthScope)(resolvedAuth, task)));
-      if (options?.awaitEffects) {
-        await promise;
-      } else {
-        promise.catch(err => {
-          console.error("[mutate] async tasks failed", err);
-        });
-      }
-    }
-  }
-  const mutate = new Proxy({}, {
-    get(_, modelName) {
-      return new Proxy({}, {
-        get(_2, mutatorName) {
-          return (arg, options) => runMutate(modelName, mutatorName, arg, options);
-        }
-      });
-    }
-  });
-  function query(cb, authData) {
-    const run = () => transaction(async 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)(queryObj => {
-    return transaction(async tx => {
-      return tx.run(queryObj);
-    });
-  });
   return {
     handleMutationRequest,
     handleQueryRequest,
-    transaction,
-    mutate,
-    query
+    ...server
   };
 }
 function withTransactionLifecycle(database, lifecycle) {
@@ -353,10 +174,4 @@ function alreadyProcessedMutations(response) {
     const result = mutation.result;
     return !!id && typeof id === "object" && typeof id.clientID === "string" && typeof id.id === "number" && !!result && typeof result === "object" && result.error === "alreadyProcessed";
   });
-}
-const dummyTransactionInput = {
-  clientGroupID: "unused",
-  clientID: "unused",
-  mutationID: 42,
-  upstreamSchema: "unused"
-};
+}

package/dist/cjs/createZeroServerCore.native.js

@@ -24,129 +24,25 @@ 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_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 +51,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,7 +72,7 @@ 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,
@@ -207,7 +111,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 +138,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 +192,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":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,4BAAA;AAAAC,QAAA,CAAAD,4BAAA;EAAAE,oBAAA,EAAAA,CAAA,KAAAA,oBAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAA6B,CAAAK,4BAAA;AAC7B,IAAAM,WAAA,GAAAC,OAGO;AAEP,IAAAC,aAAA,GAAAD,OAAA,wBAAkC;AAClC,IAAAE,wBAA+B,GAAAF,OAAA;AAC/B,IAAAG,qBAAA,GAKOH,OAAA;AACP,IAAAI,qBAAA,GAAoCJ,OAAA;AACpC,IAAAK,mBAAA,GAAAL,OAAwC;AACxC,IAAAM,oBAAiC,GAAAN,OAAA;AACjC,IAAAO,UAAA,GAAAP,OAAkD;AAClD,IAAAQ,YAAA,GAAwCR,OAAA;AACxC,IAAAS,YAAA,GAAAT,OAA0B;AA6EnB,IAAAU,iBAAS,GAAAV,OAAmB;AAAA,SACjCW,SAAAC,GAAA;EACA;;EACA,OAAAA,GAAA,WAAAC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAAA;AACA,SACAhB,mBAAAmB,KAAA;EACA;IAAAC,QAAA;IAAAC,IAAA;IAAAC,IAAA;IAAAC,OAAA;IAAAC,WAAA;IAAAC;EAAA,IAAAN,KAAA;EACF,IAA+BE,IAAA,CAAAK,UAAA;IAC7B,IAAIC,KAAK,GAAAN,IAAA,CAAAO,KAAW,cAAgB,CAAAC,MAAA;IAClC;MAAMC;IAAQ,IAAAR,IAAK;IACnB,IAAAS,UAAQ,GAAQ,IAAIrB,oBAAA,CAAAsB,uBAAA,EAAAL,KAAA;IAGpB,KAAAI,UAAM;MACN,MAAK,IAAAE,KAAY,kDAAAN,KAAA;IACf;IACF,IAAAd,YAAA,CAAAqB,uBAAA;IACA;MACA,OAAI,IAAAtB,YAAA,CAAAuB,MAAA,IAAAR,KAAA,EAAAS,KAAA,WAAAC,EAAA;QACF,OAAAb,WAAQ,CAAAc,oBACL,CAAAlB,QAAO,EAAAiB,EAAA,EAAYN,UAAA,EAAAD,OAAA,EAAAH,KAAA;MAClB,GAAAY,GAAA;IAAmB,UACjB;MAAA,IACA1B,YAAA,CAAAqB,uBAAA;IAAA;EACA;EACA,IAAAT,aACA;IAAAA,aACF;MACFL,QACK;MACToB,SAAE,EAAAnB,IAAA;MACAoB,MAAA,EAAAnB;IACF;EACF;EAEA,IAAIoB,KAAA,OAAAvC,WAAe,CAAAwC,YAAA,EAAApB,OAAA,EAAAF,IAAA;EACjB,OAAAqB,KAAA,CAAAE,EAAA,CAAc;IAChBtB,IAAA;IAEAuB,GAAA,EAAMzB;EACN;AACF;AAgDA,SAAS0B,yBAAA,EAA2B;EAClC,IAAAC,SAAM,KAA2B;EACjC,IAAIC,OAAA;EACJ,IAAIC,gBAAA;EACJ,IAAAC,OAAM,YAAAA,CAAA,EAAgB;IACtB,OAAMF,OAAQ,KAAI,IAAO,IAAoBA,OAAA,cAAAA,OAAA,GAAAD,SAAA;EAAA;EAEzC,IAAAI,KAAA,GAAO,IAAAC,KAAQ;IACjBC,eAAAC,OAAA,EAAAC,QAAA;MACA,OAAIC,OAAS,CAAAH,cAAU,CAAAH,OAAA,IAAAK,QAAA;IACrB;IACAE,IAAAH,OAAM,EAAAC,QAAQ;MACd,IAAAG,MAAO,GAAAR,OAAO;MAChB,IAAAtD,KAAA,GAAA4D,OAAA,CAAAC,GAAA,CAAAC,MAAA,EAAAH,QAAA,EAAAG,MAAA;MACA,cAAA9D,KAAA,KAAyB,UAAS,GAAAA,KAAU,CAAA+D,IAAA,CAAAD,MAAA,IAAA9D,KAAA;IAC1C;IACFgE,yBAAAN,OAAA,EAAAC,QAAA;MACA,OAAIC,OAAS,CAAAI,wBAAU,CAAAV,OAAA,IAAAK,QAAA;IACrB;IACFM,IAAAP,OAAA,EAAAC,QAAA;MACA,OAAAC,OAAU,CAAAK,GAAA,CAAAX,OAAA,IAAAK,QAAA;IACR;IACFO,QAAA;MACA,OAAIN,OAAS,CAAAM,OAAU,CAAAZ,OAAO;IAC5B;IACFa,IAAAT,OAAA,EAAAC,QAAA,EAAA3D,KAAA;MACD,OAAA4D,OAAA,CAAAO,GAAA,CAAAb,OAAA,IAAAK,QAAA,EAAA3D,KAAA;IAED;EAA+C,EAC7C;EACE,IAAAoE,SAAA,GAAW;IACXC,aAAA;MACFjB,OAAA;MACAC,gBAAkB;IAChB;IACAiB,eAAUA,CAAA;MACZjB,gBAAA,GAAAD,OAAA;MACAA,OAAA,SAAkB;IAChB;IACAmB,gBAAA;MACFnB,OAAA;MACAC,gBAAA,GAAoB;IAClB;IACAmB,kBAAA;MACF,IAAAnB,gBAAA,EAAAF,SAAA,CAAAsB,IAAA,IAAApB,gBAAA;MACAA,gBAAA,QAAsB;IACpB;IACAqB,oBAAA,EAAmB;MACrBtB,OAAA;MACFC,gBAAA;IAEA;EACF;EAEO,OAAS;IAKdF,SAAA;IACAiB,SAAA;IACAb;EACA;AAAyB;AACzB,SACApD,oBAAWA,CAAAoB,KAAA;EACX;IAAAoD,cAAA;IAAAC,mBAAA;IAAAC,qBAAA;IAAAC,qBAAA;IAAAC,MAAA;IAAAC,SAAA,EAAAC,kBAAA;IAAAC,uBAAA;IAAAvD,OAAA;IAAAwD,MAAA;IAAAC,gBAAA;IAAAvD;EAAA,IAAAN,KAAA;EACA,IAAAP,YAAA,CAAAqE,SAAA,EAAAF,MAAA;EACA,IAAAnE,YAAA,CAAAsE,cAAA;EACA,IAAA1D,WAAA,OAAAlB,wBAAA,CAAA6E,iBAAA;IACAC,WAAA;IACuDL,MAAA;IACvDM,aAAA,EAAAZ;EACA;EAEA,IAAAa,qBAAoB,kBAAAA,CAAAC,MAAA;IAClB;MAAAnE,QAAa;MAAAoE,OAAA;MAAAC;IAAA,IAAAF,MAAA;IACb,IAAAG,KAAA,GAAA5C,wBAAA;IACA,IAAA6C,eAAe,GAAAH,OAAA,CAAAI,KAAA;IAChB,IAAAC,QAAA,OAAAtF,qBAAA,CAAAuF,cAAA;MAEDC,UAAM,EAAAL,KAAA,CAAAvC,KAAA;MACJ6C,GAAA,EAAAxE,WAAA,CAAAwE,GAAA;MACAxB,mBAAA;MACAY,WAAA;MACFT,MAIM;MACJvD,QAAM;MACN4D,gBAAM;MACNH;IAAgC,EAC9B;IAAkB,IAClBoB,SAAK,OAAY5F,aAAA,CAAA6F,aAAA,CAAAC,wBAAA,CAAA5B,cAAA,IAAAmB,KAAA,CAAA1B,SAAA;IAAA,IACjBoC,QAAA,SAAAH,SAAA,CAAAI,OAAA,CAAAR,QAAA,EAAAL,OAAA;IAAA,IACAV,uBAAa;MACb,IAAAwB,MAAA,SAAAC,qBAAA,CAAAZ,eAAA,EAAAS,QAAA;MACA,IAAAE,MAAA,QAAAxB,uBAAA,CAAAwB,MAAA;IAAA;IACA,IACA,CAAAb,cAAA,IAAAC,KAAA,CAAA3C,SAAA,CAAAlB,MAAA;MACD2E,OAAA,CAAAC,GAAA,CAAAf,KAAA,CAAA3C,SAAA,CAAA2D,GAAA,WAAAC,IAAA;QACD,OAAM,IAAAnG,qBAAgB,CAAAoG,gBAAA,EAAAxF,QAAA,EAAAuF,IAAA;MACpB,IAAAE,KAAA,WAAAC,GAAA;QACFC,OAAA,CAAAC,KAAA,8BAAAF,GAAA;MACA;IAEA;IACE;MACAV,QAAI;MACNL,UAAA,EAAAL,KAAA,CAAA3C;IAEA;EACE;EAA6E,IAAAkE,kBACzD,kBAAAA,CAAA1B,MAAA;IAChB;MAAAnE,QAAQ;MAAAoE;IAAM,IAAAD,MAAA;IAAgC,IAChD,CAAAhE,OAAA;MACF,UAAAU,KAAA;IACF;IAEA,IAAAiF,OAAO,YAAAA,CAAA7F,IAAA,EAAAC,IAAA;MACL,OAAAtB,kBAAA;QACAoB,QAAA;QACFC,IAAA;QACFC,IAAA;QAEMC,OAAA;QACJC,WAAA;QACAC;MACF,EAGM;IACJ;IACE,IAAA0F,MAAM,GAAI,QAAA/F,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAgG,EAAA,iBAAAhG,QAAA,CAAAgG,EAAA;IAAA,IACRhB,QAAA,aAAA3F,mBAAA,CAAA4G,mBAAA;MAEFjG,QAAA,EAAAA,QAAA;IACF;MAEA;QAEI;QACA+F,MAAA,kBAAA9G,aAAA,CAAA4G,kBAAA,EAAAC,OAAA,EAAAnC,MAAA,EAAAS,OAAA,QAAAnF,aAAA,CAAA4G,kBAAA;UACAC,OAAA;UACAnC,MAAA;UACAS,OAAA;UACA2B;QACD;MAAA;IAGH;IAAuB,OACnB;MACFf;IAAA;EAAA;EAIiE,eAAAkB,eAAAC,QAAA,EAAAC,MAAA;IACnE;MAEA,KAAO,GAAAhH,qBAAA,CAAAiH,gBAAA;QACL;UAAAC;QAAA,QAAAlH,qBAAA,CAAAmH,cAAA;QACF,aAAAH,MAAA,CAAAE,EAAA;MACF;MAEA,aAAeH,QAAA,CAAAK,WAGb,CAAAJ,MAA8B,EAAAK,qBAA6B;IAC3D,SAAIf,GAAA;MACF,KAAAA,GAAI,aAAAA,GAAA,uBAAAA,GAAiB,CAAGzF,IAAA;QACtB0F,OAAM,CAAEC,KAAG,iCAAIF,GAAA;MACf;MACF,MAAAA,GAAA;IACA;EAA+D;EAE/D,eAAkBc,WAASA,CAAAJ,MAAA;IACzB,OAAAF,cAAc,CAAA/C,cAAA,IAAAiD,MAAA;EAAqC;EAErD,eAAMM,UAAAC,SAAA,EAAAC,WAAA,EAAAC,UAAA,EAAAC,OAAA;IACR,IAAA9G,QAAA,GAAA8G,OAAA,aAAAA,OAAA,uBAAAA,OAAA,CAAA9G,QAAA;IACF,KAAAA,QAAA;MAEA,IAAA+G,MAAA,GAAe,IAAA3H,qBAGgB,CAAA4H,iBAAA;MAC7B,IAAAD,MAAO,EAAA/G,QAAe,GAAA+G,MAAA;IACxB;IAEA,IAAAzC,KAAA,GAAA5C,wBAEE;IAIA,IAAI+C,QAAA,GAAW,IAAAtF,qBAAS,CAAAuF,cAAA;MACxBnB,MAAK;MACHS,WAAM,UAAS;MACfW,UAAI,EAAQL,KAAA,CAAAvC,KAAW;MACzB/B,QAAA;QAEA,GAAMsD,qBAAQ;QACd,GAAMtD;MACJ;MACAoD,mBAAa;MACbwB,GAAA,EAAAxE,WAAY,CAAAwE,GAAM;MAClBhB,gBAAU;MAAAH;IACL;IACA,IACLwD,aAAA,GAAAxC,QAAA,CAAAkC,SAAA;IAAA,IACAO,OAAA,GAAAD,aAAA,CAAAL,WAAA;IAAA,MACAV,cAAiB,CAAAnB,wBAAA,CAAA5B,cAAA,IAAAmB,KAAA,CAAA1B,SAAA,mBAAA0D,EAAA;MACjB,MAAAY,OAAA,CAAAZ,EAAA,EAAAO,UAAA;IAAA,EACA;IACF,IAACvC,KAAA,CAAA3C,SAAA,CAAAlB,MAAA;MACD,IAAM0G,YAAA,GAAAnH,QAAgB,KAAS,QAAkCA,QAAA,cAAAA,QAAA;MAIjE,IAAMoH,OAAA,GAAUhC,OAAA,CAAAC,GAAA,CAAAf,KAAc,CAAA3C,SAAW,CAAA2D,GAAA,WAAAC,IAAA;QAEzC,OAAM,IAAAnG,qBAAA,CAAAoG,gBAAA,EAAA2B,YAAA,EAAA5B,IAAA;MACJ;MACA,IAAAuB,OAAO,KAAO,QAAAA,OAAA,uBAAAA,OAAA,CAAAO,YAAA;QACZ,MAAMD,OAAA;MACR;QACFA,OAAA,CAAA3B,KAAA,WAAAC,GAAA;UAEIC,OAAM,CAAAC,KAAA,CAAU,6BAAQ,EAAAF,GAAA;QAC1B;MACA;IAAwB;EAC4C;EAEpE,IAAA4B,MAAI,OAAStF,KAAA;IACXK,IAAAkF,CAAA,EAAAZ,SAAM;MACR,OAAO,IAAA3E,KAAA;QACLK,IAAAmF,EAAA,EAAQZ,WAAO;UACb,iBAAca,GAAA,EAAAX,OAAA;YACf,OAAAJ,SAAA,CAAAC,SAAA,EAAAC,WAAA,EAAAa,GAAA,EAAAX,OAAA;UACH;QACF;MACF;IAEA;EAAqD,EACnD;EACE,SAAAxF,KAAOA,CAAIoG,EAAA,EAAA1H,QAAA;IAAA,IACT2H,GAAC,YAAAA,CAAA;MAAA,OACDnB,WAAA,iBAAAF,EAAA;QAAA,OACMA,EAAA,CAAGqB,GAAA,CAAAD,EAAA,KAAAlI,YAAqB,CAAAuB,MAAA;MAC1B;IACgD;IAClD,IACFf,QAAA;MACF,WAAAX,mBAAA,CAAA4G,mBAAA;QACFjG;MACD,GAAA2H,GAAA;IAED;IAIE,OAAMA,GAAA,EAAM;EAER;EAA0B,IAC3BxH,OAAA;IAEH,IAAIZ,UAAA,CAAAqI,gBAAwB,EAAAzH,OAAA;EAC1B;EAA4C,EAC9C,EAAAT,iBAAA,CAAAmI,SAAA,YAAAC,QAAA;IACA,OAAOtB,WAAI,iBAAAF,EAAA;MACb,OAAAA,EAAA,CAAAqB,GAAA,CAAAG,QAAA;IAEA,EAAI;EACF;EACF;IAEA5D,qBAAA;IACE2B,kBAAO;IACLW,WAAO;IACTc,MAAC;IACFhG;EAED;AAAO;AACL,SACAyD,yBAAAoB,QAAA,EAAAvD,SAAA;EAAA,OACA;IACA,MAAA4D,YAAAuB,QAAA,EAAAC,KAAA;MACA;QACF,IAAAxJ,KAAA,SAAA2H,QAAA,CAAAK,WAAA,iBAAAF,EAAA,EAAA2B,KAAA;UACFrF,SAAA,CAAAC,YAAA;UAQS;YAIA,IAAAqF,MAAA,SAAAH,QAAA,CAAAzB,EAAA,EAAA2B,KAAA;YACCrF,SAAA,CAAYE,eAAU,EAAO;YAC7B,OAAAoF,MAAA;UACF,SAAMtC,KAAQ;YACZhD,SAAU,CAAAG,eAAa;YACvB,MAAI6C,KAAA;UACF;QACA,GAAAoC,KAAA;QACApF,SAAA,CAAAI,iBAAO;QAAA,OACTxE,KAAS;MACP,SAAAoH,KAAA,EAAU;QACVhD,SAAA,CAAMM,mBAAA;QAAA,MACR0C,KAAA;MAAA;IAEF;EACA;AAAO;AAEP,eAAAT,qBAAUA,CAAAf,OAAoB,EAAAY,QAAA;EAC9B,IAAAxB,SAAM,GAAA2E,yBAAA,CAAAnD,QAAA;EAAA,IACRxB,SAAA,CAAA/C,MAAA;EAAA,IACF2H,cAAA,OAAAC,GAAA,CAAAjE,OAAA,CAAAkE,GAAA,EAAAC,YAAA,CAAAlG,GAAA;EACF,KAAA+F,cAAA;EACF,IAAAI,IAAA,SAAApE,OAAA,CAAAqE,IAAA;EAEA,WAAAD,IAAe,CAAAE,aAAA,aACb,EACA;EAEA,OAAM;IACNA,aAAc,EAAAF,IAAA,CAAAE,aAAc;IAE5BlF,SAAM;IACN4E;EAEA;AACA;AAEA,SAAOD,0BAAAnD,QAAA;EAAA,IACL,CAAAA,QAAA,IAAe,QAAKA,QAAA,iCAAArF,QAAA,CAAAqF,QAAA;EAAA,IACpBxB,SAAA,GAAAwB,QAAA,CAAAxB,SAAA;EAAA,IACA,CAAAmF,KAAA,CAAAC,OAAA,CAAApF,SAAA;EACF,OAAAA,SAAA,CAAAqF,MAAA,WAAAC,QAAA;IACF,KAAAA,QAAA,YAAAA,QAAA,iCAAAnJ,QAAA,CAAAmJ,QAAA;IAEA,IAAA9C,EAAS,GAAA8C,QAAA,CAAA9C,EAAA;IACP,IAAKkC,MAAA,GAAAY,QAAY,CAAOZ,MAAA;IACxB,OAAM,EAAAlC,EAAA,KAAa,OAAAA,EAAqC,iCAAArG,QAAA,CAAAqG,EAAA,0BAAAA,EAAA,CAAA+C,QAAA,wBAAA/C,EAAA,CAAAA,EAAA,mBAAAkC,MAAA,YAAAA,MAAA,iCAAAvI,QAAA,CAAAuI,MAAA,mBAAAA,MAAA,CAAAtC,KAAA;EACxD;AAEA;AACE,IAAAa,qBAAiB,GAAO;EACxBiC,aAAY,UAA8B;EAC1CK,QAAM,UAAU;EAChBC,UACG,EAAC;EAQNZ,cAAC;AACH","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","module","exports","import_server","require","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","asyncTasks","queue","can","environment","processor","PushProcessor","withTransactionLifecycle","lifecycle","response","process","parsed","parseAlreadyProcessed","committed","length","Promise","all","map","task","runWithAuthScope","catch","err","console","error","handleQueryRequest","Error","handler","name","args","resolveServerQuery","userID","id","runWithQueryContext","database","transaction","callback","input","tx","hooks","beginAttempt","result","completeAttempt","rollbackAttempt","commitTransaction","rollbackTransaction","alreadyProcessedMutations","upstreamSchema","URL","url","searchParams","get","body","json","clientGroupID","Array","isArray","filter","mutation","clientID"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,4BAAA;AAAAC,QAAA,CAAAD,4BAAA;EAAAE,oBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAGO,CAAAK,4BAAA;AAEP,IAAAK,aAAA,GAAAC,OAAA,wBAOO;AACP,IAAAC,6BAA+B,GAAAD,OAAA;AAC/B,IAAAE,qBAAA,GAAiCF,OAAA;AACjC,IAAAG,qBAAA,GAAoCH,OAAA;AAmC7B,IAAAI,mBAAS,GAAAJ,OAId;AAAA,SACAK,SAAAC,GAAA;EACA;;EACA,OAAAA,GAAA,WAAAC,MAAwB,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAAA;AACxB,SACAV,qBAAAa,KAAA;EACA;IAAAC,cAAW;IAAAC,mBAAA;IAAAC,qBAAA;IAAAC,qBAAA;IAAAC,MAAA;IAAAC,SAAA,EAAAC,kBAAA;IAAAC,uBAAA;IAAAC,OAAA;IAAAC,MAAA;IAAAC,gBAAA;IAAAC;EAAA,IAAAZ,KAAA;EACX;IAAAa,WAAA;IAAAC;EAAA,QAAAtB,6BAAA,CAAAuB,6BAAA;IACAd,cAAA;IACAC,mBAAA;IACAC,qBAAA;IACAC,qBAAA;IACuDC,MAAA;IACvDC,SAAQ,EAAAC,kBAAoB;IAC1BE,OAAA;IACAC,MAAA;IACAC,gBAAA;IACAC;EAAA,EACA;EAAA,IACAI,qBAAW,kBAAAA,CAAAC,MAAA;IACX;MAAAC,QAAA;MAAAC,OAAA;MAAAC;IAAA,IAAAH,MAAA;IACA,IAAAI,KAAA,OAAA7B,6BAAA,CAAA8B,wBAAA;IACA,IAAAC,eAAA,GAAAJ,OAAA,CAAAK,KAAA;IACA,IAAAC,QAAA,OAAAhC,qBAAA,CAAAiC,cAAA;MACDC,UAAA,EAAAN,KAAA,CAAAO,KAAA;MAEDC,GAAM,EAAAhB,WAAA,CAAAgB,GAAA;MACJ3B,mBAAA;MACA4B,WAAA;MACAzB,MAAA;MACFa,QAIM;MACJP,gBAAc;MACdJ;IACA;IAAgC,IAC9BwB,SAAA,GAAY,IAAMzC,aAAA,CAAA0C,aAAA,CAAAC,wBAAA,CAAAhC,cAAA,IAAAoB,KAAA,CAAAa,SAAA;IAAA,IAClBC,QAAK,SAAYJ,SAAA,CAAAK,OAAA,CAAAX,QAAA,EAAAN,OAAA;IAAA,IACjBX,uBAAA;MACA,IAAA6B,MAAA,GAAa,MAAAC,qBAAA,CAAAf,eAAA,EAAAY,QAAA;MACb,IAAAE,MAAA,QAAA7B,uBAAA,CAAA6B,MAAA;IAAA;IACA,IACA,CAAAjB,cAAA,IAAAC,KAAA,CAAAkB,SAAA,CAAAC,MAAA;MACAC,OAAA,CAAAC,GAAA,CAAArB,KAAA,CAAAkB,SAAA,CAAAI,GAAA,WAAAC,IAAA;QACD,WAAAlD,qBAAA,CAAAmD,gBAAA,EAAA3B,QAAA,EAAA0B,IAAA;MACD,IAAME,KAAA,WAAYC,GAAI;QACpBC,OAAA,CAAAC,KAAA,4BAA2C,EAAAF,GAAA,CAAM;MACnD;IACA;IAEA,OAAI;MACFZ,QAAM;MACNR,UAAI,EAAQN,KAAA,CAAMkB;IACpB;EAEA;EACE,IAAAW,kBAAkB,kBAAAA,CAAejC,MAAA;IAA4C,IAC3E;MAACC,QAAiB;MAAAC;IAAA,IAAAF,MAAA;IAChB,KAAAR,OAAA,EAAQ;MAAsC,MAChD,IAAA0C,KAAA;IAAA;IAEJ,IAAAC,OAAA,YAAAA,CAAAC,IAAA,EAAAC,IAAA;MAEA,OAAO,IAAA9D,6BAAA,CAAA+D,kBAAA;QACLrC,QAAA;QACAmC,IAAA;QACFC,IAAA;QACF7C,OAAA;QAEMI,WAAA;QACJD;MACA;IACF;IAIE,IAAI4C,MAAC,WAAStC,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAuC,EAAA,iBAAAvC,QAAA,CAAAuC,EAAA;IACZ,IAAAtB,QAAU,aAAAxC,mBAAA,CAAA+D,mBAAA;MAAAxC,QACR,EAAAA,QAAA;IAAA,GAEF;MACF;QAEA;QAEIsC,MAAA,kBAAAlE,aAAA,CAAA4D,kBAAA,EAAAE,OAAA,EAAA1C,MAAA,EAAAS,OAAA,QAAA7B,aAAA,CAAA4D,kBAAA;UACAE,OAAA;UACA1C,MAAA;UACAS,OAAA;UACAqC;QACA;MAAA;IAGJ;IACA,OAAM;MACJrB;IAAyC;EACzC;EAAA,OAEE;IAE+DnB,qBAAA;IACnEkC,kBAAA;IAEA,GAAApC;EACF;AAEA;AAAO,SACLmB,yBAAA0B,QAAA,EAAAzB,SAAA;EAAA,OACA;IACA,MAAG0B,YAAAC,QAAA,EAAAC,KAAA;MACL;QACF,IAAA9E,KAAA,SAAA2E,QAAA,CAAAC,WAAA,iBAAAG,EAAA,EAAAC,KAAA;UAQS9B,SAAA,CAAA+B,YAAA,EACP;UAGO;YACC,IAAAC,MAAY,SAAAL,QAAiB,CAAAE,EAAA,EAAAC,KAAA;YAC7B9B,SAAA,CAAAiC,eAAA;YACF,OAAMD,MAAQ;UACZ,SAAAjB,KAAU;YACVf,SAAI,CAAAkC,eAAA;YACF,MAAMnB,KAAA;UACN;QACA,GAAAa,KAAA;QAAO5B,SACT,CAAAmC,iBAAgB;QACd,OAAArF,KAAA;MACA,SAAAiE,KAAM;QAAAf,SACR,CAAAoC,mBAAA;QACF,MAAGrB,KAAK;MACR;IACA;EAAO;AAEP;AACA,eAAMX,sBAAAnB,OAAA,EAAAgB,QAAA;EAAA,IACR7B,SAAA,GAAAiE,yBAAA,CAAApC,QAAA;EAAA,IACF7B,SAAA,CAAAkC,MAAA;EACF,IAAAgC,cAAA,OAAAC,GAAA,CAAAtD,OAAA,CAAAuD,GAAA,EAAAC,YAAA,CAAAC,GAAA;EACF,KAAAJ,cAAA;EAEA,IAAAK,IAAA,SAAe1D,OAAA,CAAA2D,IAAA;EAIb,WAAMD,IAAA,CAAAE,aAAY,eAA0B;EAC5C,OAAI;IAEJA,aAAM,EAAAF,IAAA,CAAAE,aAAyB;IAC/BzE,SAAK;IAELkE;EACA;AAEA;AAAO,SACLD,yBAAoBA,CAAApC,QAAA;EAAA,IACpB,CAAAA,QAAA,YAAAA,QAAA,iCAAAvC,QAAA,CAAAuC,QAAA;EAAA,IACA7B,SAAA,GAAA6B,QAAA,CAAA7B,SAAA;EACF,KAAA0E,KAAA,CAAAC,OAAA,CAAA3E,SAAA;EACF,OAAAA,SAAA,CAAA4E,MAAA,WAAAC,QAAA;IAEA,KAASA,QAAA,YAAAA,QAA0B,gBAA+C,iBAAAvF,QAAA,CAAAuF,QAAA;IAChF,IAAK1B,EAAA,GAAA0B,QAAY,CAAA1B,EAAA;IACjB,IAAMS,MAAA,GAAAiB,QAAa,CAAAjB,MAAqC;IACxD,OAAK,EAAMT,EAAA,YAAQA,EAAA,KAAY,WAAQ,iBAAA7D,QAAA,CAAA6D,EAAA,0BAAAA,EAAA,CAAA2B,QAAA,wBAAA3B,EAAA,CAAAA,EAAA,mBAAAS,MAAA,YAAAA,MAAA,iCAAAtE,QAAA,CAAAsE,MAAA,mBAAAA,MAAA,CAAAjB,KAAA;EAEvC;AACE","ignoreList":[]}

package/dist/cjs/generate.cjs

@@ -350,6 +350,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 +403,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 +417,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 +450,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(")) {

package/dist/cjs/generate.native.js

@@ -491,6 +491,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 +559,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 +579,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 +635,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(")) {