over-zero 0.0.35 → 0.0.37

package/dist/cjs/createUseQuery.native.js

@@ -25,8 +25,7 @@ __export(createUseQuery_exports, {
   createUseQuery: () => createUseQuery
 });
 module.exports = __toCommonJS(createUseQuery_exports);
-var import_zero = require("@rocicorp/zero"),
-  import_react = require("@rocicorp/zero/react"),
+var import_react = require("@rocicorp/zero/react"),
   import_react2 = require("react"),
   import_useZeroDebug = require("./helpers/useZeroDebug.native.js"),
   import_queryRegistry = require("./queryRegistry.native.js");
@@ -37,49 +36,37 @@ function _type_of(obj) {
 }
 function createUseQuery(param) {
   var {
-      DisabledContext,
-      disableInlineQueries = !1
-    } = param,
-    queryCache = /* @__PURE__ */new Map(),
-    parseAny = function (x) {
-      return [x[0]];
-    };
+    DisabledContext,
+    customQueries
+  } = param;
   function useQuery() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) args[_key] = arguments[_key];
     var disabled = (0, import_react2.use)(DisabledContext),
-      [queryOrFn, paramsOrOptions, optionsArg] = args,
-      isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn),
+      [fn, paramsOrOptions, optionsArg] = args,
       {
-        actualQuery,
+        queryRequest,
         options
       } = (0, import_react2.useMemo)(function () {
-        if (!isPlainFunction) return {
-          actualQuery: queryOrFn,
-          options: paramsOrOptions
-        };
-        var fn = queryOrFn,
+        var _customQueries_namespace,
           queryName = (0, import_queryRegistry.getQueryName)(fn);
-        if (!queryName) throw new Error("No query name?");
+        if (!queryName) {
+          var fnName = fn?.name || "anonymous";
+          throw new Error(`Query function '${fnName}' not registered. Ensure it is exported from a queries file and passed to createZeroClient via groupedQueries.`);
+        }
         var 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 = (0, import_zero.syncedQuery)(queryName, parseAny, function (arg) {
-          return fn(arg);
-        }), queryCache.set(queryName, synced));
-        var query = params !== void 0 ? synced(params) : synced;
+          [namespace, name] = queryName.split(".", 2),
+          customQuery = (_customQueries_namespace = customQueries[namespace]) === null || _customQueries_namespace === void 0 ? void 0 : _customQueries_namespace[name];
+        if (!customQuery) throw new Error(`CustomQuery '${queryName}' not found. Check that the query is exported and the namespace/name matches.`);
+        var queryRequest2 = params !== void 0 ? customQuery(params) : customQuery();
         return {
-          actualQuery: query,
+          queryRequest: queryRequest2,
           options: opts
         };
-      }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]);
-    console.info("running", {
-      actualQuery,
-      options,
-      queryOrFn
-    });
-    var out = (0, import_react.useQuery)(actualQuery, options);
-    return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(actualQuery, options, out), disabled ? [null, {
+      }, [fn, paramsOrOptions, optionsArg]),
+      out = (0, import_react.useQuery)(queryRequest, options);
+    return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(queryRequest, options, out), disabled ? [null, {
       type: "unknown"
     }] : out;
   }

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createUseQuery_exports","__export","createUseQuery","module","exports","import_zero","require","import_react","import_react2","import_useZeroDebug","import_queryRegistry","_type_of","obj","Symbol","constructor","param","DisabledContext","disableInlineQueries","queryCache","Map","parseAny","x","useQuery","_len","arguments","length","args","Array","_key","disabled","use","queryOrFn","paramsOrOptions","optionsArg","isPlainFunction","actualQuery","options","useMemo","fn","queryName","getQueryName","Error","hasParams","params","opts","synced","get","syncedQuery","arg"],"sources":["../../src/createUseQuery.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA4B,CAAAK,sBAC5B;AA6DO,IAAAK,WAAS,GAAAC,OAGd;EAAAC,YAAA,GAAAD,OAAA;EAAAE,aAAA,GAAAF,OAAA;EAAAG,mBAAA,GAAAH,OAAA;EAAAI,oBAAA,GAAAJ,OAAA;AAAA,SACAK,SAAAC,GAAA;EACA,uBAAuB;;EACzB,OAGwCA,GAAA,WAAAC,MAAA,UAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AACtC;AAGA,SAAAV,cAAqBA,CAAAa,KAAkB;EACrC;MAAAC,eAAM;MAAWC,oBAAI;IAAA,IAAAF,KAAe;IAC9BG,UAAC,GAAW,eAAiB,IAAAC,GAAA;IAAUC,QAAI,GAG3C,SAAAA,CAAAC,CAAA;MAGJ,OAAK,CAEHA,CAAA,IAAO;IACQ;EACJ,SACXC,SAAA;IAGF,SAAMC,IAAK,GAAAC,SACL,CAAAC,MAAA,EAAAC,IAAA,GAAY,IAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAaL,IAAE,EAAAK,IAAA,IAEjCF,IAAI,CAACE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IACH,IAAAC,QAAM,GAAI,IAAArB,aAAM,CAAAsB,GAAgB,EAAAd,eAAA;MAAA,CAAAe,SAAA,EAAAC,eAAA,EAAAC,UAAA,IAAAP,IAAA;MAAAQ,eAAA,UAAAH,SAAA,mCAAAA,SAAA;MAAA;QAAAI,WAAA;QAAAC;MAAA,QAAA5B,aAAA,CAAA6B,OAAA;QAIlC,KAAAH,eACE,EASF,OAAI;UACJC,WAAK,EAAAJ,SACH;UAUAK,OAAA,EAAWJ;QAEf;QAEA,IAAMM,EAAA,GAAAP,SAAM;UAAAQ,SAAA,OAAA7B,oBAA0B,CAAO8B,YAAA,EAAAF,EAAA;QAO7C,KALIC,SAAQ,EAUd,UAAAE,KAAA;QAEA,IAAOC,SAAA,GAAAT,UAAA,eAAAD,eAAA,YAAAA,eAAA,uBAAArB,QAAA,CAAAqB,eAAA,kCAAAA,eAAA,gBAAAA,eAAA;UAAAW,MAAA,GAAAD,SAAA,GAAAV,eAAA;UAAAY,IAAA,GAAAF,SAAA,GAAAT,UAAA,GAAAD,eAAA;UAAAa,MAAA,GAAA3B,UAAA,CAAA4B,GAAA,CAAAP,SAAA;QACTM,MAAA,KAAAA,MAAA,OAAAxC,WAAA,CAAA0C,WAAA,EAAAR,SAAA,EAAAnB,QAAA,YAAA4B,GAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createUseQuery_exports","__export","createUseQuery","module","exports","import_react","require","import_react2","import_useZeroDebug","import_queryRegistry","_type_of","obj","Symbol","constructor","param","DisabledContext","customQueries","useQuery","_len","arguments","length","args","Array","_key","disabled","use","fn","paramsOrOptions","optionsArg","queryRequest","options","useMemo","_customQueries_namespace","queryName","getQueryName","fnName","name","Error","hasParams","params","opts","namespace","split","customQuery","queryRequest2"],"sources":["../../src/createUseQuery.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAyC,CAAAK,sBACzC;AAwCO,IAAAK,YAAS,GAAAC,OAA0C;EAAAC,aAAA,GAAAD,OAAA;EAAAE,mBAAA,GAAAF,OAAA;EAAAG,oBAAA,GAAAH,OAAA;AAAA,SACxDI,SAAAC,GAAA;EACA;;EACF,OAGyBA,GAAA,WAAAC,MAAA,UAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AACvB;AACE,SAAAT,cAAMA,CAAAY,KAAW;EAIf;IAAAC,eAAM;IAAAC;EAAY,IAAAF,KAAA;EAClB,SAAKG,SAAA,EAAW;IACd,SAAAC,IAAM,GAAAC,SAAa,CAAAC,MAAQ,EAAAC,IAAA,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA,IAC3BF,IAAA,CAAAE,IAAM,IAAIJ,SAAA,CAAAI,IAAA;IAAA,IAAAC,QACR,OAAAjB,aAAyB,CAAAkB,GAAA,EAAAV,eAAA;MAAA,CAAAW,EAAA,EAAAC,eAAA,EAAAC,UAAA,IAAAP,IAAA;MAAA;QAAAQ,YAAA;QAAAC;MAAA,QAAAvB,aAAA,CAAAwB,OAAA;QAAA,IAE3BC,wBAAA;UAAAC,SAAA,OAAAxB,oBAAA,CAAAyB,YAAA,EAAAR,EAAA;QACF,KAAAO,SAAA;UAGA,IAAME,MAAA,GAAAT,EAAA,EACJU,IAAA,eAAe;UAcjB,MAAK,IAAAC,KAAA,oBAAAF,MAAA;QACH;QAAU,IACRG,SAAA,GAAAV,UAAgB,KAAS,UAAAD,eAAA,YAAAA,eAAA,uBAAAjB,QAAA,CAAAiB,eAAA,kCAAAA,eAAA,gBAAAA,eAAA;UAAAY,MAAA,GAAAD,SAAA,GAAAX,eAAA;UAAAa,IAAA,GAAAF,SAAA,GAAAV,UAAA,GAAAD,eAAA;UAAA,CAAAc,SAAA,EAAAL,IAAA,IAAAH,SAAA,CAAAS,KAAA;UAAAC,WAAA,IAAAX,wBAAA,GAAAhB,aAAA,CAAAyB,SAAA,eAAAT,wBAAA,uBAAAA,wBAAA,CAAAI,IAAA;QAAA,IAE3B,CAAAO,WAAA,EAKF,MAAO,IAAEN,KAAA,iBAFuBJ,SAAY,+EAEP;QACvC,IAAIW,aAAI,GAAAL,MAAiB,UAAW,CAE9B,GAAAI,WAAM,CAAAJ,MAAA,IAAAI,WAAa;QAOzB,OALI;UAUNd,YAAA,EAAAe,aAAA;UAEAd,OAAO,EAAAU;QACT","ignoreList":[]}

package/dist/cjs/createZeroClient.cjs

@@ -23,8 +23,9 @@ __export(createZeroClient_exports, {
   createZeroClient: () => createZeroClient
 });
 module.exports = __toCommonJS(createZeroClient_exports);
-var import_react = require("@rocicorp/zero/react"),
-  import_helpers = require("@vxrn/helpers"),
+var import_zero = require("@rocicorp/zero"),
+  import_react = require("@rocicorp/zero/react"),
+  import_helpers = require("@take-out/helpers"),
   import_react2 = require("react"),
   import_createPermissions = require("./createPermissions.cjs"),
   import_createUseQuery = require("./createUseQuery.cjs"),
@@ -36,16 +37,23 @@ var import_react = require("@rocicorp/zero/react"),
 function createZeroClient({
   schema,
   models,
-  groupedQueries,
-  disableInlineQueries = !1
+  groupedQueries
 }) {
   (0, import_state.setSchema)(schema);
-  for (const [namespace, queries] of Object.entries(groupedQueries)) for (const [name, fn] of Object.entries(queries)) (0, import_queryRegistry.registerQuery)(fn, `${namespace}.${name}`);
-  const DisabledContext = (0, import_react2.createContext)(!1),
+  const wrappedNamespaces = {};
+  for (const [namespace, queries] of Object.entries(groupedQueries)) {
+    wrappedNamespaces[namespace] = {};
+    for (const [name, fn] of Object.entries(queries)) (0, import_queryRegistry.registerQuery)(fn, `${namespace}.${name}`), wrappedNamespaces[namespace][name] = (0, import_zero.defineQuery)(({
+      args
+    }) => fn(args));
+  }
+  const customQueries = (0, import_zero.defineQueries)(wrappedNamespaces),
+    DisabledContext = (0, import_react2.createContext)(!1),
     modelWritePermissions = (0, import_helpers.mapObject)(models, val => val.permissions);
   let latestZeroInstance = null;
   const zero = new Proxy({}, {
       get(_, key) {
+        if (latestZeroInstance === null) throw new Error("Zero instance not initialized. Ensure ZeroProvider is mounted before accessing 'zero'.");
         return Reflect.get(latestZeroInstance, key, latestZeroInstance);
       }
     }),
@@ -58,7 +66,7 @@ function createZeroClient({
     useAuthData = () => (0, import_react2.use)(AuthDataContext),
     useQuery = (0, import_createUseQuery.createUseQuery)({
       DisabledContext,
-      disableInlineQueries
+      customQueries
     });
   function usePermission(table, objOrId, enabled = typeof objOrId < "u", debug = !1) {
     const disabled = (0, import_react2.use)(DisabledContext),
@@ -68,7 +76,7 @@ function createZeroClient({
         let baseQuery = zero.query[table].one();
         return disabled || !enabled || !permission ? baseQuery : baseQuery.where(eb => permissionsHelpers.buildPermissionQuery(authData, eb, permission, objOrId));
       })(),
-      [data, status] = useQuery(query, {
+      [data, status] = (0, import_react.useQuery)(query, {
         enabled: !!(enabled && permission && authData && objOrId)
       });
     debug && console.info("usePermission()", {
@@ -98,22 +106,36 @@ function createZeroClient({
         children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_react.ZeroProvider, {
           schema,
           kvStore: "mem",
-          onError: error => {
-            console.error("Zero Error:", error), zeroEvents.emit({
-              type: "error",
-              message: error
-            });
-          },
           mutators,
           ...props,
-          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(SetZeroInstance, {}), children]
+          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(SetZeroInstance, {}), /* @__PURE__ */(0, import_jsx_runtime.jsx)(ConnectionMonitor, {
+            zeroEvents
+          }), children]
         })
       });
     },
     SetZeroInstance = () => {
       const zero2 = (0, import_react.useZero)();
       return zero2 !== latestZeroInstance && (latestZeroInstance = zero2), null;
-    };
+    },
+    ConnectionMonitor = (0, import_react2.memo)(({
+      zeroEvents: zeroEvents2
+    }) => {
+      const state = (0, import_react.useConnectionState)(),
+        prevState = (0, import_react2.useRef)(state.name);
+      return (0, import_react2.useEffect)(() => {
+        if (state.name !== prevState.current) {
+          const reason = "reason" in state ? state.reason : "";
+          if (prevState.current = state.name, state.name === "error" || state.name === "needs-auth") {
+            const message = typeof reason == "string" ? reason : state.name;
+            zeroEvents2.emit({
+              type: "error",
+              message
+            });
+          }
+        }
+      }, [state, zeroEvents2]), null;
+    });
   return {
     zeroEvents,
     ProvideZero,

package/dist/cjs/createZeroClient.js

@@ -17,21 +17,29 @@ __export(createZeroClient_exports, {
   createZeroClient: () => createZeroClient
 });
 module.exports = __toCommonJS(createZeroClient_exports);
-var import_react = require("@rocicorp/zero/react"), import_helpers = require("@vxrn/helpers"), import_react2 = require("react"), import_createPermissions = require("./createPermissions"), import_createUseQuery = require("./createUseQuery"), import_createMutators = require("./helpers/createMutators"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_queryRegistry = require("./queryRegistry"), import_state = require("./state"), import_jsx_runtime = require("react/jsx-runtime");
+var import_zero = require("@rocicorp/zero"), import_react = require("@rocicorp/zero/react"), import_helpers = require("@take-out/helpers"), import_react2 = require("react"), import_createPermissions = require("./createPermissions"), import_createUseQuery = require("./createUseQuery"), import_createMutators = require("./helpers/createMutators"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_queryRegistry = require("./queryRegistry"), import_state = require("./state"), import_jsx_runtime = require("react/jsx-runtime");
 function createZeroClient({
   schema,
   models,
-  groupedQueries,
-  disableInlineQueries = !1
+  groupedQueries
 }) {
   (0, import_state.setSchema)(schema);
-  for (const [namespace, queries] of Object.entries(groupedQueries))
+  const wrappedNamespaces = {};
+  for (const [namespace, queries] of Object.entries(groupedQueries)) {
+    wrappedNamespaces[namespace] = {};
     for (const [name, fn] of Object.entries(queries))
-      (0, import_queryRegistry.registerQuery)(fn, `${namespace}.${name}`);
-  const DisabledContext = (0, import_react2.createContext)(!1), modelWritePermissions = (0, import_helpers.mapObject)(models, (val) => val.permissions);
+      (0, import_queryRegistry.registerQuery)(fn, `${namespace}.${name}`), wrappedNamespaces[namespace][name] = (0, import_zero.defineQuery)(
+        ({ args }) => fn(args)
+      );
+  }
+  const customQueries = (0, import_zero.defineQueries)(wrappedNamespaces), DisabledContext = (0, import_react2.createContext)(!1), modelWritePermissions = (0, import_helpers.mapObject)(models, (val) => val.permissions);
   let latestZeroInstance = null;
   const zero = new Proxy({}, {
     get(_, key) {
+      if (latestZeroInstance === null)
+        throw new Error(
+          "Zero instance not initialized. Ensure ZeroProvider is mounted before accessing 'zero'."
+        );
       return Reflect.get(latestZeroInstance, key, latestZeroInstance);
     }
   }), permissionsHelpers = (0, import_createPermissions.createPermissions)({
@@ -39,7 +47,7 @@ function createZeroClient({
     environment: "client"
   }), zeroEvents = (0, import_helpers.createEmitter)("zero", null), AuthDataContext = (0, import_react2.createContext)({}), useAuthData = () => (0, import_react2.use)(AuthDataContext), useQuery = (0, import_createUseQuery.createUseQuery)({
     DisabledContext,
-    disableInlineQueries
+    customQueries
   });
   function usePermission(table, objOrId, enabled = typeof objOrId < "u", debug = !1) {
     const disabled = (0, import_react2.use)(DisabledContext), authData = useAuthData(), permission = modelWritePermissions[table], query = (() => {
@@ -50,7 +58,7 @@ function createZeroClient({
         permission,
         objOrId
       ));
-    })(), [data, status] = useQuery(query, {
+    })(), [data, status] = (0, import_react.useQuery)(query, {
       enabled: !!(enabled && permission && authData && objOrId)
     });
     debug && console.info(
@@ -73,29 +81,33 @@ function createZeroClient({
       authData,
       can: permissionsHelpers.can
     })), [models, authData]);
-    return disable ? children : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AuthDataContext.Provider, { value: authData, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-      import_react.ZeroProvider,
-      {
-        schema,
-        kvStore: "mem",
-        onError: (error) => {
-          console.error("Zero Error:", error), zeroEvents.emit({
-            type: "error",
-            message: error
-          });
-        },
-        mutators,
-        ...props,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SetZeroInstance, {}),
-          children
-        ]
-      }
-    ) });
+    return disable ? children : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AuthDataContext.Provider, { value: authData, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.ZeroProvider, { schema, kvStore: "mem", mutators, ...props, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SetZeroInstance, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConnectionMonitor, { zeroEvents }),
+      children
+    ] }) });
   }, SetZeroInstance = () => {
     const zero2 = (0, import_react.useZero)();
     return zero2 !== latestZeroInstance && (latestZeroInstance = zero2), null;
-  };
+  }, ConnectionMonitor = (0, import_react2.memo)(
+    ({
+      zeroEvents: zeroEvents2
+    }) => {
+      const state = (0, import_react.useConnectionState)(), prevState = (0, import_react2.useRef)(state.name);
+      return (0, import_react2.useEffect)(() => {
+        if (state.name !== prevState.current) {
+          const reason = "reason" in state ? state.reason : "";
+          if (prevState.current = state.name, state.name === "error" || state.name === "needs-auth") {
+            const message = typeof reason == "string" ? reason : state.name;
+            zeroEvents2.emit({
+              type: "error",
+              message
+            });
+          }
+        }
+      }, [state, zeroEvents2]), null;
+    }
+  );
   return {
     zeroEvents,
     ProvideZero,

package/dist/cjs/createZeroClient.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createZeroClient.tsx"],
-  "mappings": "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",
-  "names": ["import_react", "zero"]
+  "mappings": "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",
+  "names": ["import_react", "zeroUseQuery", "zero", "zeroEvents"]
 }

package/dist/cjs/createZeroClient.native.js

@@ -26,8 +26,9 @@ __export(createZeroClient_exports, {
 });
 module.exports = __toCommonJS(createZeroClient_exports);
 var import_jsx_runtime = require("react/jsx-runtime"),
+  import_zero = require("@rocicorp/zero"),
   import_react = require("@rocicorp/zero/react"),
-  import_helpers = require("@vxrn/helpers"),
+  import_helpers = require("@take-out/helpers"),
   import_react2 = require("react"),
   import_createPermissions = require("./createPermissions.native.js"),
   import_createUseQuery = require("./createUseQuery.native.js"),
@@ -39,24 +40,30 @@ function createZeroClient(param) {
   var {
     schema,
     models,
-    groupedQueries,
-    disableInlineQueries = !1
+    groupedQueries
   } = param;
   (0, import_state.setSchema)(schema);
-  var _iteratorNormalCompletion = !0,
+  var wrappedNamespaces = {},
+    _iteratorNormalCompletion = !0,
     _didIteratorError = !1,
     _iteratorError = void 0;
   try {
     for (var _iterator = Object.entries(groupedQueries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-      var [namespace, queries] = _step.value,
-        _iteratorNormalCompletion1 = !0,
+      var [namespace, queries] = _step.value;
+      wrappedNamespaces[namespace] = {};
+      var _iteratorNormalCompletion1 = !0,
         _didIteratorError1 = !1,
         _iteratorError1 = void 0;
       try {
-        for (var _iterator1 = Object.entries(queries)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
-          var [name, fn] = _step1.value;
-          (0, import_queryRegistry.registerQuery)(fn, `${namespace}.${name}`);
-        }
+        for (var _loop = function () {
+            var [name, fn] = _step1.value;
+            (0, import_queryRegistry.registerQuery)(fn, `${namespace}.${name}`), wrappedNamespaces[namespace][name] = (0, import_zero.defineQuery)(function (param2) {
+              var {
+                args
+              } = param2;
+              return fn(args);
+            });
+          }, _iterator1 = Object.entries(queries)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) _loop();
       } catch (err) {
         _didIteratorError1 = !0, _iteratorError1 = err;
       } finally {
@@ -76,13 +83,15 @@ function createZeroClient(param) {
       if (_didIteratorError) throw _iteratorError;
     }
   }
-  var DisabledContext = /* @__PURE__ */(0, import_react2.createContext)(!1),
+  var customQueries = (0, import_zero.defineQueries)(wrappedNamespaces),
+    DisabledContext = /* @__PURE__ */(0, import_react2.createContext)(!1),
     modelWritePermissions = (0, import_helpers.mapObject)(models, function (val) {
       return val.permissions;
     }),
     latestZeroInstance = null,
     zero = new Proxy({}, {
       get(_, key) {
+        if (latestZeroInstance === null) throw new Error("Zero instance not initialized. Ensure ZeroProvider is mounted before accessing 'zero'.");
         return Reflect.get(latestZeroInstance, key, latestZeroInstance);
       }
     }),
@@ -97,7 +106,7 @@ function createZeroClient(param) {
     },
     useQuery = (0, import_createUseQuery.createUseQuery)({
       DisabledContext,
-      disableInlineQueries
+      customQueries
     });
   function usePermission(table, objOrId) {
     var enabled = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : typeof objOrId < "u",
@@ -111,7 +120,7 @@ function createZeroClient(param) {
           return permissionsHelpers.buildPermissionQuery(authData, eb, permission, objOrId);
         });
       }(),
-      [data, status] = useQuery(query, {
+      [data, status] = (0, import_react.useQuery)(query, {
         enabled: !!(enabled && permission && authData && objOrId)
       });
     debug && console.info("usePermission()", {
@@ -145,22 +154,37 @@ function createZeroClient(param) {
         children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_react.ZeroProvider, {
           schema,
           kvStore: "mem",
-          onError: function (error) {
-            console.error("Zero Error:", error), zeroEvents.emit({
-              type: "error",
-              message: error
-            });
-          },
           mutators,
           ...props,
-          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(SetZeroInstance, {}), children]
+          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(SetZeroInstance, {}), /* @__PURE__ */(0, import_jsx_runtime.jsx)(ConnectionMonitor, {
+            zeroEvents
+          }), children]
         })
       });
     },
     SetZeroInstance = function () {
       var zero2 = (0, import_react.useZero)();
       return zero2 !== latestZeroInstance && (latestZeroInstance = zero2), null;
-    };
+    },
+    ConnectionMonitor = /* @__PURE__ */(0, import_react2.memo)(function (param2) {
+      var {
+          zeroEvents: zeroEvents2
+        } = param2,
+        state = (0, import_react.useConnectionState)(),
+        prevState = (0, import_react2.useRef)(state.name);
+      return (0, import_react2.useEffect)(function () {
+        if (state.name !== prevState.current) {
+          var reason = "reason" in state ? state.reason : "";
+          if (prevState.current = state.name, state.name === "error" || state.name === "needs-auth") {
+            var message = typeof reason == "string" ? reason : state.name;
+            zeroEvents2.emit({
+              type: "error",
+              message
+            });
+          }
+        }
+      }, [state, zeroEvents2]), null;
+    });
   return {
     zeroEvents,
     ProvideZero,

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroClient_exports","__export","createZeroClient","module","exports","import_jsx_runtime","require","import_react","import_helpers","import_react2","import_createPermissions","import_createUseQuery","import_createMutators","import_prettyFormatZeroQuery","import_queryRegistry","import_state","param","schema","models","groupedQueries","disableInlineQueries","setSchema","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","Symbol","iterator","_step","next","done","namespace","queries","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","name","fn","registerQuery","err","return","DisabledContext","createContext","modelWritePermissions","mapObject","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Reflect","permissionsHelpers","createPermissions","environment","zeroEvents","createEmitter","AuthDataContext","useAuthData","use","useQuery","createUseQuery","usePermission","table","objOrId","enabled","arguments","length","debug","disabled","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","console","info","prettyFormatZeroQuery","result","allowed","ProvideZero","param2","children","authDataIn","disable","props","mutators","useMemo","setAuthData","createMutators","can","jsx","Provider","jsxs","ZeroProvider","kvStore","onError","error","emit"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroClient_exports","__export","createZeroClient","module","exports","import_jsx_runtime","require","import_zero","import_react","import_helpers","import_react2","import_createPermissions","import_createUseQuery","import_createMutators","import_prettyFormatZeroQuery","import_queryRegistry","import_state","param","schema","models","groupedQueries","setSchema","wrappedNamespaces","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","Symbol","iterator","_step","next","done","namespace","queries","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_loop","name","fn","_step1","registerQuery","defineQuery","param2","args","_iterator1","err","return","customQueries","defineQueries","DisabledContext","createContext","modelWritePermissions","mapObject","val","permissions","latestZeroInstance","zero","Proxy","get","_","key","Error","Reflect","permissionsHelpers","createPermissions","environment","zeroEvents","createEmitter","AuthDataContext","useAuthData","use","useQuery","createUseQuery","usePermission","table","objOrId","enabled","arguments","length","debug","disabled","authData","permission","query","baseQuery","one","where","eb","buildPermissionQuery","data","status","console","info","prettyFormatZeroQuery","result","allowed","ProvideZero","children","authDataIn","disable","props","mutators","useMemo","setAuthData","createMutators","can","jsx","Provider","jsxs","ZeroProvider","kvStore","SetZeroInstance","ConnectionMonitor"],"sources":["../../src/createZeroClient.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/createZeroServer.cjs

@@ -23,9 +23,11 @@ __export(createZeroServer_exports, {
   createZeroServer: () => createZeroServer
 });
 module.exports = __toCommonJS(createZeroServer_exports);
-var import_pg = require("@rocicorp/zero/pg"),
+var import_zero = require("@rocicorp/zero"),
+  import_pg = require("@rocicorp/zero/pg"),
+  import_server = require("@rocicorp/zero/server"),
   import_pg2 = require("@rocicorp/zero/server/adapters/pg"),
-  import_helpers = require("@vxrn/helpers"),
+  import_helpers = require("@take-out/helpers"),
   import_pg3 = require("pg"),
   import_createPermissions = require("./createPermissions.cjs"),
   import_createMutators = require("./helpers/createMutators.cjs"),
@@ -36,12 +38,16 @@ function createZeroServer({
   database,
   schema,
   models,
-  syncedQueries
+  queries
 }) {
   (0, import_state.setSchema)(schema);
   const dbString = (0, import_helpers.assertString)(database, 'createZeroServer "database"'),
     zeroDb = (0, import_pg2.zeroNodePg)(schema, new import_pg3.Pool({
-      connectionString: dbString
+      connectionString: dbString,
+      // handle self-signed certificates in production
+      ssl: dbString.includes("sslmode=require") ? {
+        rejectUnauthorized: !1
+      } : void 0
     })),
     permissions = (0, import_createPermissions.createPermissions)({
       environment: "server",
@@ -76,22 +82,16 @@ function createZeroServer({
         asyncTasks
       };
     },
-    queryLookup = /* @__PURE__ */new Map();
-  if (syncedQueries) for (const [namespace, queries] of Object.entries(syncedQueries)) for (const [queryName, syncedQuery] of Object.entries(queries)) queryLookup.set(`${namespace}.${queryName}`, syncedQuery);
-  const handleQueryRequest = async ({
+    handleQueryRequest = async ({
       authData,
       request
     }) => {
-      function getQuery(name, args) {
-        const q = queryLookup.get(name);
-        if (!q) throw new Error(`No such query: ${name}`);
-        return {
-          // @ts-expect-error zero bug atm
-          query: q(...args)
-        };
-      }
+      if (!queries) throw new Error("No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option.");
       return (0, import_state.setAuthData)(authData || {}), {
-        response: await (0, import_pg.handleGetQueriesRequest)(getQuery, schema, request)
+        response: await (0, import_server.handleQueryRequest)((name, args) => (0, import_zero.mustGetQuery)(queries, name).fn({
+          args,
+          ctx: authData
+        }), schema, request)
       };
     },
     mutate = async (run, authData) => {

package/dist/cjs/createZeroServer.js

@@ -17,19 +17,21 @@ __export(createZeroServer_exports, {
   createZeroServer: () => createZeroServer
 });
 module.exports = __toCommonJS(createZeroServer_exports);
-var import_pg = require("@rocicorp/zero/pg"), import_pg2 = require("@rocicorp/zero/server/adapters/pg"), import_helpers = require("@vxrn/helpers"), import_pg3 = require("pg"), import_createPermissions = require("./createPermissions"), import_createMutators = require("./helpers/createMutators"), import_mutatorContext = require("./helpers/mutatorContext"), import_state = require("./state");
+var import_zero = require("@rocicorp/zero"), import_pg = require("@rocicorp/zero/pg"), import_server = require("@rocicorp/zero/server"), import_pg2 = require("@rocicorp/zero/server/adapters/pg"), import_helpers = require("@take-out/helpers"), import_pg3 = require("pg"), import_createPermissions = require("./createPermissions"), import_createMutators = require("./helpers/createMutators"), import_mutatorContext = require("./helpers/mutatorContext"), import_state = require("./state");
 function createZeroServer({
   createServerActions,
   database,
   schema,
   models,
-  syncedQueries
+  queries
 }) {
   (0, import_state.setSchema)(schema);
   const dbString = (0, import_helpers.assertString)(database, 'createZeroServer "database"'), zeroDb = (0, import_pg2.zeroNodePg)(
     schema,
     new import_pg3.Pool({
-      connectionString: dbString
+      connectionString: dbString,
+      // handle self-signed certificates in production
+      ssl: dbString.includes("sslmode=require") ? { rejectUnauthorized: !1 } : void 0
     })
   ), permissions = (0, import_createPermissions.createPermissions)({
     environment: "server",
@@ -59,26 +61,20 @@ function createZeroServer({
       response,
       asyncTasks
     };
-  }, queryLookup = /* @__PURE__ */ new Map();
-  if (syncedQueries)
-    for (const [namespace, queries] of Object.entries(syncedQueries))
-      for (const [queryName, syncedQuery] of Object.entries(queries))
-        queryLookup.set(`${namespace}.${queryName}`, syncedQuery);
-  const handleQueryRequest = async ({
+  }, handleQueryRequest = async ({
     authData,
     request
   }) => {
-    function getQuery(name, args) {
-      const q = queryLookup.get(name);
-      if (!q)
-        throw new Error(`No such query: ${name}`);
-      return {
-        // @ts-expect-error zero bug atm
-        query: q(...args)
-      };
-    }
+    if (!queries)
+      throw new Error(
+        "No queries registered with createZeroServer. Pass the syncedQueries registry to createZeroServer via the queries option."
+      );
     return (0, import_state.setAuthData)(authData || {}), {
-      response: await (0, import_pg.handleGetQueriesRequest)(getQuery, schema, request)
+      response: await (0, import_server.handleQueryRequest)(
+        (name, args) => (0, import_zero.mustGetQuery)(queries, name).fn({ args, ctx: authData }),
+        schema,
+        request
+      )
     };
   }, mutate = async (run, authData) => {
     const asyncTasks = [], mutators = (0, import_createMutators.createMutators)({