over-zero 0.0.9 → 0.0.11

package/dist/esm/createZeroClient.mjs

@@ -1,18 +1,20 @@
+import { syncedQuery } from "@rocicorp/zero";
 import { useZero, ZeroProvider, useQuery as zeroUseQuery } from "@rocicorp/zero/react";
 import { createEmitter, mapObject } from "@vxrn/helpers";
 import { createContext, use, useMemo } from "react";
 import { createPermissions } from "./createPermissions.mjs";
-import { context } from "./helpers/context.mjs";
 import { createMutators } from "./helpers/createMutators.mjs";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery.mjs";
 import { useZeroDebug } from "./helpers/useZeroDebug.mjs";
+import { setAuthData, setSchema } from "./state.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
 function createZeroClient({
   schema,
   models,
   disable
 }) {
-  const modelPermissions = mapObject(models, val => val.permissions);
+  setSchema(schema);
+  const modelWritePermissions = mapObject(models, val => val.permissions);
   let latestZeroInstance = null;
   const zero = new Proxy({}, {
       get(_, key) {
@@ -21,20 +23,17 @@ function createZeroClient({
     }),
     permissionsHelpers = createPermissions({
       schema,
-      models,
-      getContext: context,
       environment: "client"
     }),
     zeroEvents = createEmitter("zero", null),
     AuthDataContext = createContext({}),
     useAuthData = () => use(AuthDataContext);
-  function usePermission(table, action, objOrId, enabled = typeof objOrId < "u", debug = !1) {
-    const key = `${`${String(table)}${action}`}${typeof objOrId == "string" ? objOrId : JSON.stringify(objOrId)}`,
-      authData = useAuthData(),
-      permission = modelPermissions[table],
+  function usePermission(table, objOrId, enabled = typeof objOrId < "u", debug = !1) {
+    const authData = useAuthData(),
+      permission = modelWritePermissions[table],
       query = (() => {
         let baseQuery = zero.query[table].one();
-        return !enabled || !permission ? baseQuery : baseQuery.where(eb => permissionsHelpers.buildPermissionQuery(authData, eb, permission, action, objOrId));
+        return !enabled || !permission ? baseQuery : baseQuery.where(eb => permissionsHelpers.buildPermissionQuery(authData, eb, permission, objOrId));
       })(),
       [data, status] = useQuery(query, {
         enabled: !!(enabled && permission && authData && objOrId)
@@ -42,31 +41,52 @@ function createZeroClient({
     debug && console.info("usePermission()", {
       data,
       status,
-      action,
       authData,
       permission
     }, prettyFormatZeroQuery(query));
     const allowed = !!data;
     return objOrId ? allowed : !1;
   }
-  const useQuery = (query, options) => {
-      if (disable) return [null, {
-        type: "unknown"
-      }];
-      const out = zeroUseQuery(query, options);
-      return process.env.NODE_ENV === "development" && useZeroDebug(query, options, out), out;
-    },
-    ProvideZero = ({
+  const queryCache = /* @__PURE__ */new Map(),
+    parseAny = x => [x[0]];
+  function useQuery(...args) {
+    const [queryOrFn, paramsOrOptions, optionsArg] = args,
+      isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn),
+      {
+        actualQuery,
+        options
+      } = useMemo(() => {
+        if (!isPlainFunction) return {
+          actualQuery: queryOrFn,
+          options: paramsOrOptions
+        };
+        const fn = queryOrFn,
+          queryName = fn.name || "anonymousQuery",
+          hasParams = optionsArg !== void 0 || paramsOrOptions && typeof paramsOrOptions == "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions),
+          params = hasParams ? paramsOrOptions : void 0,
+          opts = hasParams ? optionsArg : paramsOrOptions;
+        let synced = queryCache.get(queryName);
+        return synced || (synced = syncedQuery(queryName, parseAny, arg => fn(arg)), queryCache.set(queryName, synced)), {
+          actualQuery: params !== void 0 ? synced(params) : synced,
+          options: opts
+        };
+      }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]),
+      out = zeroUseQuery(actualQuery, options);
+    return process.env.NODE_ENV === "development" && useZeroDebug(actualQuery, options, out), disable ? [null, {
+      type: "unknown"
+    }] : out;
+  }
+  const ProvideZero = ({
       children,
       authData,
       ...props
     }) => {
-      const mutators = useMemo(() => createMutators({
+      const mutators = useMemo(() => (setAuthData(authData), createMutators({
         models,
         environment: "client",
         authData,
         can: permissionsHelpers.can
-      }), [models, authData]);
+      })), [models, authData]);
       return disable ? children : /* @__PURE__ */jsx(AuthDataContext.Provider, {
         value: authData,
         children: /* @__PURE__ */jsxs(ZeroProvider, {

package/dist/esm/createZeroClient.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useZero","ZeroProvider","useQuery","zeroUseQuery","createEmitter","mapObject","createContext","use","useMemo","createPermissions","context","createMutators","prettyFormatZeroQuery","useZeroDebug","jsx","jsxs","createZeroClient","schema","models","disable","modelPermissions","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Reflect","permissionsHelpers","getContext","environment","zeroEvents","AuthDataContext","useAuthData","usePermission","table","action","objOrId","enabled","debug","String","JSON","stringify","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","console","info","allowed","options","type","out","process","env","NODE_ENV","ProvideZero","children","props","mutators","can","Provider","value","kvStore","onError","error","emit","message","SetZeroInstance","zero2"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["syncedQuery","useZero","ZeroProvider","useQuery","zeroUseQuery","createEmitter","mapObject","createContext","use","useMemo","createPermissions","createMutators","prettyFormatZeroQuery","useZeroDebug","setAuthData","setSchema","jsx","jsxs","createZeroClient","schema","models","disable","modelWritePermissions","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Reflect","permissionsHelpers","environment","zeroEvents","AuthDataContext","useAuthData","usePermission","table","objOrId","enabled","debug","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","console","info","allowed","queryCache","Map","parseAny","x","args","queryOrFn","paramsOrOptions","optionsArg","isPlainFunction","actualQuery","options","fn","queryName","name","hasParams","params","opts","synced","arg","set","out","process","env","NODE_ENV","type","ProvideZero","children","props","mutators","can","Provider","value","kvStore","onError","error","emit","message","SetZeroInstance","zero2"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createZeroClient.native.js

@@ -1,19 +1,26 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { syncedQuery } from "@rocicorp/zero";
 import { useZero, ZeroProvider, useQuery as zeroUseQuery } from "@rocicorp/zero/react";
 import { createEmitter, mapObject } from "@vxrn/helpers";
 import { createContext, use, useMemo } from "react";
 import { createPermissions } from "./createPermissions.native.js";
-import { context } from "./helpers/context.native.js";
 import { createMutators } from "./helpers/createMutators.native.js";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery.native.js";
 import { useZeroDebug } from "./helpers/useZeroDebug.native.js";
+import { setAuthData, setSchema } from "./state.native.js";
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+
+  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function createZeroClient(param) {
   var {
-      schema,
-      models,
-      disable
-    } = param,
-    modelPermissions = mapObject(models, function (val) {
+    schema,
+    models,
+    disable
+  } = param;
+  setSchema(schema);
+  var modelWritePermissions = mapObject(models, function (val) {
       return val.permissions;
     }),
     latestZeroInstance = null,
@@ -24,8 +31,6 @@ function createZeroClient(param) {
     }),
     permissionsHelpers = createPermissions({
       schema,
-      models,
-      getContext: context,
       environment: "client"
     }),
     zeroEvents = createEmitter("zero", null),
@@ -33,17 +38,15 @@ function createZeroClient(param) {
     useAuthData = function () {
       return use(AuthDataContext);
     };
-  function usePermission(table, action, objOrId) {
-    var enabled = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : typeof objOrId < "u",
-      debug = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !1,
-      keyBase = `${String(table)}${action}`,
-      key = `${keyBase}${typeof objOrId == "string" ? objOrId : JSON.stringify(objOrId)}`,
+  function usePermission(table, objOrId) {
+    var enabled = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : typeof objOrId < "u",
+      debug = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1,
       authData = useAuthData(),
-      permission = modelPermissions[table],
+      permission = modelWritePermissions[table],
       query = function () {
         var baseQuery = zero.query[table].one();
         return !enabled || !permission ? baseQuery : baseQuery.where(function (eb) {
-          return permissionsHelpers.buildPermissionQuery(authData, eb, permission, action, objOrId);
+          return permissionsHelpers.buildPermissionQuery(authData, eb, permission, objOrId);
         });
       }(),
       [data, status] = useQuery(query, {
@@ -52,7 +55,6 @@ function createZeroClient(param) {
     debug && console.info("usePermission()", {
       data,
       status,
-      action,
       authData,
       permission
     }, prettyFormatZeroQuery(query));
@@ -60,21 +62,50 @@ function createZeroClient(param) {
       allowed = !!result;
     return objOrId ? allowed : !1;
   }
-  var useQuery = function (query, options) {
-      if (disable) return [null, {
-        type: "unknown"
-      }];
-      var out = zeroUseQuery(query, options);
-      return process.env.NODE_ENV === "development" && useZeroDebug(query, options, out), out;
-    },
-    ProvideZero = function (param2) {
+  var queryCache = /* @__PURE__ */new Map(),
+    parseAny = function (x) {
+      return [x[0]];
+    };
+  function useQuery() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) args[_key] = arguments[_key];
+    var [queryOrFn, paramsOrOptions, optionsArg] = args,
+      isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn),
+      {
+        actualQuery,
+        options
+      } = useMemo(function () {
+        if (!isPlainFunction) return {
+          actualQuery: queryOrFn,
+          options: paramsOrOptions
+        };
+        var fn = queryOrFn,
+          queryName = fn.name || "anonymousQuery",
+          hasParams = optionsArg !== void 0 || paramsOrOptions && (typeof paramsOrOptions > "u" ? "undefined" : _type_of(paramsOrOptions)) === "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions),
+          params = hasParams ? paramsOrOptions : void 0,
+          opts = hasParams ? optionsArg : paramsOrOptions,
+          synced = queryCache.get(queryName);
+        synced || (synced = syncedQuery(queryName, parseAny, function (arg) {
+          return fn(arg);
+        }), queryCache.set(queryName, synced));
+        var query = params !== void 0 ? synced(params) : synced;
+        return {
+          actualQuery: query,
+          options: opts
+        };
+      }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]),
+      out = zeroUseQuery(actualQuery, options);
+    return process.env.NODE_ENV === "development" && useZeroDebug(actualQuery, options, out), disable ? [null, {
+      type: "unknown"
+    }] : out;
+  }
+  var ProvideZero = function (param2) {
       var {
           children,
           authData,
           ...props
         } = param2,
         mutators = useMemo(function () {
-          return createMutators({
+          return setAuthData(authData), createMutators({
             models,
             environment: "client",
             authData,

package/dist/esm/createZeroClient.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","useZero","ZeroProvider","useQuery","zeroUseQuery","createEmitter","mapObject","createContext","use","useMemo","createPermissions","context","createMutators","prettyFormatZeroQuery","useZeroDebug","createZeroClient","param","schema","models","disable","modelPermissions","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Reflect","permissionsHelpers","getContext","environment","zeroEvents","AuthDataContext","useAuthData","usePermission","table","action","objOrId","enabled","arguments","length","debug","keyBase","String","JSON","stringify","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","console","info","result","allowed","options","type","out","process","env","NODE_ENV","ProvideZero","param2","children","props","mutators","can","Provider","value","kvStore","onError","error","emit","message","SetZeroInstance","zero2"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","syncedQuery","useZero","ZeroProvider","useQuery","zeroUseQuery","createEmitter","mapObject","createContext","use","useMemo","createPermissions","createMutators","prettyFormatZeroQuery","useZeroDebug","setAuthData","setSchema","_type_of","obj","Symbol","constructor","createZeroClient","param","schema","models","disable","modelWritePermissions","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Reflect","permissionsHelpers","environment","zeroEvents","AuthDataContext","useAuthData","usePermission","table","objOrId","enabled","arguments","length","debug","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","console","info","result","allowed","queryCache","Map","parseAny","x","_len","args","Array","_key","queryOrFn","paramsOrOptions","optionsArg","isPlainFunction","actualQuery","options","fn","queryName","name","hasParams","params","opts","synced","arg","set","out","process","env","NODE_ENV","type","ProvideZero","param2","children","props","mutators","can","Provider","value"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"AAUA,SAASA,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAmBC,KAAA;AAC5B,SAASC,WAAS,wBAA0B;AAC5C,SAASC,OAAA,EAAAC,YAAe,EAAAC,QAAA,IAAiBC,YAAA;AACzC,SAASC,aAAA,EAAeC,SAAK,uBAA+B;AAC5D,SAASC,aAAA,EAAAC,GAAA,EAAAC,OAAyB;AAClC,SAASC,iBAAA,QAAsB;AAC/B,SAASC,cAAA,4CAA6B;AACtC,SAASC,qBAAoB;AAC7B,SAASC,YAAA,QAAa,kCAAiB;AAwN/B,SAaEC,WAbF,EAAAC,SAAA;AArND,SAASC,SAAAC,GAAA;EAQd,uBAAgB;;EAEhB,OAAMA,GAAA,WAAAC,MAAA,GAAwB,OAAAD,GAAU,CAAAE,WAAS,KAAQD,MAAI,WAAW,UAAAD,GAAA;AAIxE;AAIA,SAAMG,gBAA+BA,CAACC,KAAY;EAAA,IAChD;IAAIC,MAAG;IAAKC,MAAA;IAAAC;EAAA,IAAAH,KAAA;EACVN,SAAA,CAAAO,MAAO;EAAwD,IACjEG,qBAAA,GAAAnB,SAAA,CAAAiB,MAAA,YAAAG,GAAA;MACD,OAEKA,GAAA,CAAAC,WAAA;IAA+C,EACnD;IAAAC,kBAAA;IAAAC,IAAA,OAAAC,KAAA;MACAC,IAAAC,CAAA,EAAAC,GAAA;QAOI,OAAAC,OAAa,CAAAH,GAAA,CAAAH,kBAAwC,EAAIK,GAEzD,EAAAL,kBAAkB;MAOxB;IAOE;IAAAO,kBAAiB,GAAAzB,iBACX;MAGJY,MAAI;MAEJc,WAAK;IAKuB;IAAAC,UACxB,GAAAhC,aAAA;IAAAiC,eAAA,kBAAA/B,aAAA;IAAAgC,WAAA,YAAAA,CAAA;MAAA,OACA/B,GAAA,CAAA8B,eAAA;IAAA;EACA,SACAE,cAAAC,KAAA,EAAAC,OAAA;IAAA,IAEHC,OAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,aAAAF,OAAA;MAAAI,KAAA,GAAAF,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;MAAAG,QAAA,GAAAR,WAAA;MAAAS,UAAA,GAAAvB,qBAAA,CAAAgB,KAAA;MAAAQ,KAAA;QACH,IAEMC,SAAO,GAAArB,IAAM,CAAIoB,KAAA,CAAAR,KAAS,EAAAU,GAAO;QACrC,QAAAR,OAAiB,KAAAK,UAAW,GAAAE,SAAc,GAAAA,SAAY,CAAAE,KAAA,WAAAC,EAAA;UACvD,OAAAlB,kBAAA,CAAAmB,oBAAA,CAAAP,QAAA,EAAAM,EAAA,EAAAL,UAAA,EAAAN,OAAA;QAEG;MACM,EACN;MAAA,CAAAa,IAAA,EAAAC,MAAA,IAAArD,QAAA,CAAA8C,KAAA;QACAN,OAAE,EAAM,GAAAA,OAAQ,IAAAK,UAAU,IAAWD,QAAA,IAAAL,OAAA;MAAA,EACrC;IACFI,KAAA,IAAAW,OAAA,CAAAC,IAAA;MAKFH,IAAM;MAENC,MAAK;MAKPT,QAAA;MAeAC;IA0BA,GAAApC,qBAAqB,CAAkBqC,KAAA;IACrC,IAAAU,MAAO,GAAAJ,IAAA;MAAWK,OAAA,KAAAD,MAAiB;IAMjC,OAAKjB,OAAA,GAAAkB,OAAA;EAEH;EAAO,IAAAC,UACL,kBAAa,IAAAC,GAAA;IAAAC,QAAA,YAAAA,CAAAC,CAAA;MAAA,OACb,CAASA,CAAA,CACX,GAGF;IAcA;EACA,SAAA7D,QAAKA,CAAA;IAWP,KAAI,IAAA8D,IAAA,GAAWrB,SAAA,CAAAC,MAAiB,EAAAqB,IAAA,OAAYC,KAAA,CAAAF,IAAA,GAAAG,IAAgB,GAEtD,GAAAA,IAAM,GAAAH,IAAA,EAAAG,IAAa,IAOzBF,IAAA,CALIE,IAAA,IAAQxB,SAAI,CAAAwB,IAAA;IAUlB,KAAAC,SAAA,EAAAC,eAAA,EAAAC,UAAA,IAAAL,IAAA;MAAAM,eAAA,UAAAH,SAAA,mCAAAA,SAAA;MAAA;QAAAI,WAAA;QAAAC;MAAA,IAAAjE,OAAA;QAEA,IAAM,CAAA+D,eAAe,EACnB;UACAC,WAAA,EAAAJ,SAAA;UACGK,OAAA,EAAAJ;QAIC;QACJ,IAAMK,EAAA,GAAAN,SAAW;UAAAO,SAAQ,GACvBD,EAAA,CAAAE,IAAA,IAAY,gBAEL;UAAAC,SAAe,GAAAP,UAAA,eAAAD,eAAA,YAAAA,eAAA,uBAAAtD,QAAA,CAAAsD,eAAA,kCAAAA,eAAA,gBAAAA,eAAA;UAAAS,MAAA,GAAAD,SAAA,GAAAR,eAAA;UAAAU,IAAA,GAAAF,SAAA,GAAAP,UAAA,GAAAD,eAAA;UAAAW,MAAA,GAAApB,UAAA,CAAA9B,GAAA,CAAA6C,SAAA;QACpBK,MAAA,KAAAA,MAAA,GAAAjF,WAAA,CAAA4E,SAAA,EAAAb,QAAA,YAAAmB,GAAA;UACA,OAAAP,EAAA,CAAAO,GAAa;QACb,IAAArB,UAAA,CAAAsB,GAAA,CAAAP,SAAA,EAAAK,MAAA;QACA,IAAAhC,KAAK,GAAA8B,MAAA,UAAmB,IAAAE,MAAA,CAAAF,MAAA,IAAAE,MAAA;QACzB,OACC;UAEJR,WAAI,EACKxB,KAAA;UAKJyB,OAAA,EAAAM;QAAA;MAAA,IACCX,SACA,EAAQC,eACE,EACRC,UAAA,EACgBC,eACR;MAAAY,GAAA,GACNhF,YAAS,CAAAqE,WAAA,EAAAC,OAAA;IAAA,OACVW,OAAA,CAAAC,GAAA,CAAAC,QAAA,sBAAA1E,YAAA,CAAA4D,WAAA,EAAAC,OAAA,EAAAU,GAAA,GAAA5D,OAAA,QACH;MAECgE,IAAG;IAAA,EAEJ,GAAAJ,GAAA;EAAiB;EAChB,IAAAK,WAAA,YAAAA,CAAAC,MAAA;MAAA;UAAAC,QAAA;UAAA5C,QAAA;UAAA,GAAA6C;QAAA,IAAAF,MAAA;QAAAG,QAAA,GAAApF,OAAA;UACH,OACFK,WAAA,CAAAiC,QAAA,GAAApC,cAAA;YAIEY,MAAA;YACJa,WAAa,UAA8B;YAQ3CW,QAAI;YAKN+C,GAAA,EAAA3D,kBAAA,CAAA2D;UAEA;QACE,IACAvE,MAAA,EACAwB,QAAA,CACA;MACA,OAAAvB,OAAA,GAAAmE,QAAA,kBAAA9F,IAAA,CAAAyC,eAAA,CAAAyD,QAAA;QACFC,KAAA,EAAAjD,QAAA;QACF4C,QAAA,iBAAA5F,KAAA,CAAAG,YAAA","ignoreList":[]}

package/dist/esm/createZeroServer.js

@@ -1,28 +1,28 @@
-import { PostgresJSConnection, PushProcessor } from "@rocicorp/zero/pg";
-import { ZQLDatabase } from "@rocicorp/zero/server";
+import { handleGetQueriesRequest, PushProcessor } from "@rocicorp/zero/pg";
+import { zeroNodePg } from "@rocicorp/zero/server/adapters/pg";
 import { assertString, randomId } from "@vxrn/helpers";
-import postgres from "postgres";
+import { Pool } from "pg";
 import { createPermissions } from "./createPermissions";
-import { context, isInZeroMutation } from "./helpers/context";
 import { createMutators } from "./helpers/createMutators";
+import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext";
+import { setAuthData, setSchema } from "./state";
 function createZeroServer({
   createServerActions,
   database,
   schema,
-  models
+  models,
+  queries
 }) {
-  const dbString = assertString(database, '"database" prop'), db = postgres(dbString), zeroServerDatabase = new ZQLDatabase(
-    new PostgresJSConnection(
-      // TODO if you have duplicate postgres due to zero having its own in node_modules TS types break
-      db
-    ),
-    schema
+  setSchema(schema);
+  const dbString = assertString(database, 'createZeroServer "database"'), zeroDb = zeroNodePg(
+    schema,
+    new Pool({
+      connectionString: dbString
+    })
   ), permissions = createPermissions({
     environment: "server",
-    schema,
-    models,
-    getContext: context
-  }), processor = new PushProcessor(zeroServerDatabase), handleMutationRequest = async ({
+    schema
+  }), processor = new PushProcessor(zeroDb), handleMutationRequest = async ({
     authData,
     request,
     skipAsyncTasks
@@ -47,6 +47,22 @@ function createZeroServer({
       response,
       asyncTasks
     };
+  }, handleQueryRequest = async ({
+    authData,
+    request
+  }) => {
+    function getQuery(name, args) {
+      const q = queries?.[name];
+      if (!q)
+        throw new Error(`No such query: ${name}`);
+      return {
+        // @ts-expect-error zero bug atm
+        query: q(...args)
+      };
+    }
+    return setAuthData(authData || {}), {
+      response: await handleGetQueriesRequest(getQuery, schema, request)
+    };
   }, mutate = async (run, authData) => {
     const asyncTasks = [], mutators = createMutators({
       models,
@@ -68,16 +84,16 @@ function createZeroServer({
   async function transaction(query2) {
     try {
       if (isInZeroMutation()) {
-        const { tx } = context();
+        const { tx } = mutatorContext();
         return await query2(tx);
       }
-      return await zeroServerDatabase.transaction(query2, dummyTransactionInput);
+      return await zeroDb.transaction(query2, dummyTransactionInput);
     } catch (err) {
       throw console.error(`Error running transaction(): ${err}`), err;
     }
   }
-  async function query(cb) {
-    return await transaction(async (tx) => await cb(tx.query));
+  function query(cb) {
+    return transaction(async (tx) => cb(tx.query));
   }
   const dummyTransactionInput = {
     clientGroupID: "unused",
@@ -87,6 +103,7 @@ function createZeroServer({
   };
   return {
     handleMutationRequest,
+    handleQueryRequest,
     transaction,
     mutate,
     query

package/dist/esm/createZeroServer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createZeroServer.ts"],
-  "mappings": "AAEA,SAAS,sBAAsB,qBAAqB;AACpD,SAAS,mBAAmB;AAC5B,SAAS,cAAc,gBAAgB;AACvC,OAAO,cAAc;AACrB,SAAS,yBAAyB;AAClC,SAAS,SAAS,wBAAwB;AAC1C,SAAS,sBAAsB;AASxB,SAAS,iBAId;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAQG;AACD,QAAM,WAAW,aAAa,UAAU,iBAAiB,GACnD,KAAK,SAAS,QAAQ,GAEtB,qBAAqB,IAAI;AAAA,IAC7B,IAAI;AAAA;AAAA,MAEF;AAAA,IACF;AAAA,IACA;AAAA,EACF,GAEM,cAAc,kBAA0B;AAAA,IAC5C,aAAa;AAAA,IACb;AAAA,IACA;AAAA,IACA,YAAY;AAAA,EACd,CAAC,GAEK,YAAY,IAAI,cAAc,kBAAkB,GAEhD,wBAAwB,OAAO;AAAA,IACnC;AAAA,IACA;AAAA,IACA;AAAA,EACF,MAIM;AAEJ,UAAM,aAA4B,CAAC,GAE7B,WAAW,eAAe;AAAA,MAC9B;AAAA,MACA,KAAK,YAAY;AAAA,MACjB;AAAA,MACA,aAAa;AAAA,MACb;AAAA,MACA;AAAA,IACF,CAAC,GAGK,WAAW,MAAM,UAAU,QAAQ,UAAU,OAAO;AAG1D,QAAI,CAAC,kBAAkB,WAAW,QAAQ;AACxC,YAAM,KAAK,SAAS;AACpB,cAAQ,KAAK,wCAAwC,WAAW,MAAM,OAAO,EAAE,EAAE,GACjF,QAAQ,IAAI,WAAW,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,EACzC,KAAK,MAAM;AACV,gBAAQ,KAAK,+BAA+B,EAAE,EAAE;AAAA,MAClD,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,gBAAQ,MAAM,8CAAuC,GAAG;AAAA,MAC1D,CAAC;AAAA,IACL;AAEA,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,GAEM,SAAS,OACb,KACA,aACG;AACH,UAAM,aAAyC,CAAC,GAE1C,WAAW,eAAe;AAAA,MAC9B;AAAA,MACA,aAAa;AAAA,MACb;AAAA,MACA,UAAU;AAAA,QACR,IAAI;AAAA,QACJ,OAAO;AAAA,QACP,MAAM;AAAA,QACN,GAAG;AAAA,MACL;AAAA,MACA;AAAA,MACA,KAAK,YAAY;AAAA,IACnB,CAAC;AAED,UAAM,YAAY,OAAO,OAAO;AAC9B,YAAM,IAAI,IAAI,QAAQ;AAAA,IACxB,CAAC,GAED,MAAM,QAAQ,IAAI,WAAW,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AAAA,EAC9C;AAEA,iBAAe,YAGbA,QAA6B;AAC7B,QAAI;AACF,UAAI,iBAAiB,GAAG;AACtB,cAAM,EAAE,GAAG,IAAI,QAAQ;AACvB,eAAO,MAAMA,OAAM,EAAE;AAAA,MACvB;AAGA,aADe,MAAM,mBAAmB,YAAYA,QAAO,qBAAqB;AAAA,IAElF,SAAS,KAAK;AACZ,oBAAQ,MAAM,gCAAgC,GAAG,EAAE,GAC7C;AAAA,IACR;AAAA,EACF;AAMA,iBAAe,MACb,IAC+B;AAC/B,WAAO,MAAM,YAAY,OAAO,OACvB,MAAM,GAAG,GAAG,KAAK,CACzB;AAAA,EACH;AAGA,QAAM,wBAAkD;AAAA,IACtD,eAAe;AAAA,IACf,UAAU;AAAA,IACV,YAAY;AAAA,IACZ,gBAAgB;AAAA,EAClB;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
+  "mappings": "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",
   "names": ["query"]
 }

package/dist/esm/createZeroServer.mjs

@@ -1,28 +1,28 @@
-import { PostgresJSConnection, PushProcessor } from "@rocicorp/zero/pg";
-import { ZQLDatabase } from "@rocicorp/zero/server";
+import { handleGetQueriesRequest, PushProcessor } from "@rocicorp/zero/pg";
+import { zeroNodePg } from "@rocicorp/zero/server/adapters/pg";
 import { assertString, randomId } from "@vxrn/helpers";
-import postgres from "postgres";
+import { Pool } from "pg";
 import { createPermissions } from "./createPermissions.mjs";
-import { context, isInZeroMutation } from "./helpers/context.mjs";
 import { createMutators } from "./helpers/createMutators.mjs";
+import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext.mjs";
+import { setAuthData, setSchema } from "./state.mjs";
 function createZeroServer({
   createServerActions,
   database,
   schema,
-  models
+  models,
+  queries
 }) {
-  const dbString = assertString(database, '"database" prop'),
-    db = postgres(dbString),
-    zeroServerDatabase = new ZQLDatabase(new PostgresJSConnection(
-    // TODO if you have duplicate postgres due to zero having its own in node_modules TS types break
-    db), schema),
+  setSchema(schema);
+  const dbString = assertString(database, 'createZeroServer "database"'),
+    zeroDb = zeroNodePg(schema, new Pool({
+      connectionString: dbString
+    })),
     permissions = createPermissions({
       environment: "server",
-      schema,
-      models,
-      getContext: context
+      schema
     }),
-    processor = new PushProcessor(zeroServerDatabase),
+    processor = new PushProcessor(zeroDb),
     handleMutationRequest = async ({
       authData,
       request,
@@ -51,6 +51,22 @@ function createZeroServer({
         asyncTasks
       };
     },
+    handleQueryRequest = async ({
+      authData,
+      request
+    }) => {
+      function getQuery(name, args) {
+        const q = queries?.[name];
+        if (!q) throw new Error(`No such query: ${name}`);
+        return {
+          // @ts-expect-error zero bug atm
+          query: q(...args)
+        };
+      }
+      return setAuthData(authData || {}), {
+        response: await handleGetQueriesRequest(getQuery, schema, request)
+      };
+    },
     mutate = async (run, authData) => {
       const asyncTasks = [],
         mutators = createMutators({
@@ -75,16 +91,16 @@ function createZeroServer({
       if (isInZeroMutation()) {
         const {
           tx
-        } = context();
+        } = mutatorContext();
         return await query2(tx);
       }
-      return await zeroServerDatabase.transaction(query2, dummyTransactionInput);
+      return await zeroDb.transaction(query2, dummyTransactionInput);
     } catch (err) {
       throw console.error(`Error running transaction(): ${err}`), err;
     }
   }
-  async function query(cb) {
-    return await transaction(async tx => await cb(tx.query));
+  function query(cb) {
+    return transaction(async tx => cb(tx.query));
   }
   const dummyTransactionInput = {
     clientGroupID: "unused",
@@ -94,6 +110,7 @@ function createZeroServer({
   };
   return {
     handleMutationRequest,
+    handleQueryRequest,
     transaction,
     mutate,
     query

package/dist/esm/createZeroServer.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["PostgresJSConnection","PushProcessor","ZQLDatabase","assertString","randomId","postgres","createPermissions","context","isInZeroMutation","createMutators","createZeroServer","createServerActions","database","schema","models","dbString","db","zeroServerDatabase","permissions","environment","getContext","processor","handleMutationRequest","authData","request","skipAsyncTasks","asyncTasks","mutators","can","response","process","length","id","console","info","Promise","all","map","task","then","catch","err","error","mutate","run","email","role","transaction","tx","t","query2","dummyTransactionInput","query","cb","clientGroupID","clientID","mutationID","upstreamSchema"],"sources":["../../src/createZeroServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["handleGetQueriesRequest","PushProcessor","zeroNodePg","assertString","randomId","Pool","createPermissions","createMutators","isInZeroMutation","mutatorContext","setAuthData","setSchema","createZeroServer","createServerActions","database","schema","models","queries","dbString","zeroDb","connectionString","permissions","environment","processor","handleMutationRequest","authData","request","skipAsyncTasks","asyncTasks","mutators","can","response","process","length","id","console","info","Promise","all","map","task","then","catch","err","error","handleQueryRequest","getQuery","name","args","q","Error","query","mutate","run","email","role","transaction","tx","t","query2","dummyTransactionInput","cb","clientGroupID","clientID","mutationID","upstreamSchema"],"sources":["../../src/createZeroServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}