@nivaro/react 0.3.33 → 0.3.35

package/dist/shared/lib/request-gate.js

@@ -1,20 +1,20 @@
-import { noteOwnWriteFromCommand as O } from "./own-writes.js";
+import { noteOwnWriteFromCommand as b } from "./own-writes.js";
 import { noteCredentialChanged as z, isIdentityRead as M, claimIdentityCall as $, signedOutError as Z, noteSignedIn as H, isSignedOutError as U, noteUnauthorized as x } from "./signed-out.js";
-function I(t) {
+function G(t) {
   if (!t || typeof t != "object") return "";
-  const s = Object.entries(t).filter(([, o]) => o != null).map(([o, i]) => [o, String(i)]).sort(([o], [i]) => o < i ? -1 : o > i ? 1 : 0);
+  const s = Object.entries(t).filter(([, o]) => o != null).map(([o, a]) => [o, String(a)]).sort(([o], [a]) => o < a ? -1 : o > a ? 1 : 0);
   return s.length ? new URLSearchParams(s).toString() : "";
 }
-function P(t) {
+function I(t) {
   const s = (t._method ?? "GET").toUpperCase(), o = s === "GET" || t._body === void 0 ? "" : JSON.stringify(t._body);
-  return `${s} ${t._path ?? ""} ${I(t._params)} ${o}`;
+  return `${s} ${t._path ?? ""} ${G(t._params)} ${o}`;
 }
-function w(t) {
+function S(t) {
   return (t._method ?? "GET").toUpperCase() === "GET";
 }
-const q = /^\/(widgets-internal\/[^/]+\/render|items\/[^/]+\/[^/]+\/child-summary|items\/[^/]+\/auto-id-preview|config-conformance\/record\/.+\/check|pipelines\/instance\/[^/]+\/owners\/batch|addendums\/summary|at-risk\/evaluate|record-views\/.+\/touch)$/;
+const P = /^\/(widgets-internal\/[^/]+\/render|items\/[^/]+\/[^/]+\/child-summary|items\/[^/]+\/auto-id-preview|config-conformance\/record\/.+\/check|pipelines\/instance\/[^/]+\/owners\/batch|addendums\/summary|at-risk\/evaluate|record-views\/.+\/touch)$/;
 function B(t) {
-  return w(t) ? !0 : (t._method ?? "GET").toUpperCase() !== "POST" ? !1 : q.test((t._path ?? "").split("?")[0]);
+  return S(t) ? !0 : (t._method ?? "GET").toUpperCase() !== "POST" ? !1 : P.test((t._path ?? "").split("?")[0]);
 }
 function T(t) {
   if (t == null || typeof t != "object") return t;
@@ -28,7 +28,7 @@ const N = Symbol("nivaro.coalesced");
 function F(t) {
   return t[N] === !0;
 }
-const b = 20, W = /^\/items\/([A-Za-z_][A-Za-z0-9_]*)(?:\/([^/?#]+))?$/, K = /* @__PURE__ */ new Set(["aggregate", "export", "distinct", "resolve-paths", "batch-read"]), J = /* @__PURE__ */ new Set([
+const R = 20, W = /^\/items\/([A-Za-z_][A-Za-z0-9_]*)(?:\/([^/?#]+))?$/, K = /* @__PURE__ */ new Set(["aggregate", "export", "distinct", "resolve-paths", "batch-read"]), J = /* @__PURE__ */ new Set([
   "fields",
   "filter",
   "sort",
@@ -46,7 +46,7 @@ function Y(t) {
   if ((s._method ?? "GET").toUpperCase() !== "GET") return null;
   const o = W.exec(s._path ?? "");
   if (!o) return null;
-  const [, i, d] = o;
+  const [, a, d] = o;
   if (d !== void 0 && K.has(d)) return null;
   const m = s._params ?? {}, c = {};
   for (const [r, u] of Object.entries(m))
@@ -54,12 +54,12 @@ function Y(t) {
       if (!J.has(r)) return null;
       c[r] = u;
     }
-  return d === void 0 ? { collection: i, query: c } : { collection: i, id: d, query: c };
+  return d === void 0 ? { collection: a, query: c } : { collection: a, id: d, query: c };
 }
 function Q(t) {
   let s = [], o;
-  const i = (c) => t.request(c.command).then(c.resolve, c.reject), d = async (c) => {
-    if (c.length === 1) return i(c[0]);
+  const a = (c) => t.request(c.command).then(c.resolve, c.reject), d = async (c) => {
+    if (c.length === 1) return a(c[0]);
     let r;
     try {
       const u = await t.request({
@@ -81,7 +81,7 @@ function Q(t) {
     c.forEach((u, n) => {
       const e = r == null ? void 0 : r[n];
       if ((e == null ? void 0 : e.status) !== 200 || e === void 0) {
-        i(u);
+        a(u);
         return;
       }
       u.resolve(u.read.id !== void 0 ? { data: e.data } : { data: e.data, ...e.meta ?? {} });
@@ -90,8 +90,8 @@ function Q(t) {
     o = void 0;
     const c = s;
     s = [];
-    for (let r = 0; r < c.length; r += b)
-      d(c.slice(r, r + b));
+    for (let r = 0; r < c.length; r += R)
+      d(c.slice(r, r + R));
   };
   return (c, r) => new Promise((u, n) => {
     s.push({
@@ -102,10 +102,10 @@ function Q(t) {
     }), o === void 0 && (o = setTimeout(m, 0));
   });
 }
-const R = 50, V = 10, X = /^\/collections\/([A-Za-z_][A-Za-z0-9_-]{0,127})$/;
+const k = 50, V = 10, X = /^\/collections\/([A-Za-z_][A-Za-z0-9_-]{0,127})$/;
 function ee(t) {
   const s = t;
-  if ((s._method ?? "GET").toUpperCase() !== "GET" || I(s._params) !== "") return null;
+  if ((s._method ?? "GET").toUpperCase() !== "GET" || G(s._params) !== "") return null;
   const o = X.exec(s._path ?? "");
   return o ? o[1] : null;
 }
@@ -113,11 +113,11 @@ function te() {
   return Object.assign(new Error("Not found"), { status: 404, response: { error: "Not found" } });
 }
 function ne(t) {
-  let s = !0, o = [], i;
+  let s = !0, o = [], a;
   const d = (r) => t.request(r.command).then(r.resolve, r.reject), m = async (r) => {
-    const u = [...new Set(r.map((a) => a.name))];
+    const u = [...new Set(r.map((i) => i.name))];
     if (u.length === 1 || !s) {
-      for (const a of r) d(a);
+      for (const i of r) d(i);
       return;
     }
     let n;
@@ -127,11 +127,11 @@ function ne(t) {
         _path: "/collections",
         _params: { names: u.join(",") }
       });
-    } catch (a) {
-      const h = a == null ? void 0 : a.status;
+    } catch (i) {
+      const h = i == null ? void 0 : i.status;
       if (h === 400 || h === 404 || h === 405) s = !1;
       else if (h === 429 || h !== void 0 && h >= 500) {
-        for (const p of r) p.reject(a);
+        for (const p of r) p.reject(i);
         return;
       }
       n = void 0;
@@ -139,22 +139,22 @@ function ne(t) {
     const e = n == null ? void 0 : n.data;
     if (!e || typeof e != "object" || Array.isArray(e)) {
       Array.isArray(e) && (s = !1);
-      for (const a of r) d(a);
+      for (const i of r) d(i);
       return;
     }
     const l = e, f = new Set(Array.isArray(n == null ? void 0 : n.missing) ? n.missing : []);
-    for (const a of r)
-      Object.hasOwn(l, a.name) ? a.resolve({ data: T(l[a.name]) }) : f.has(a.name) ? a.reject(te()) : d(a);
+    for (const i of r)
+      Object.hasOwn(l, i.name) ? i.resolve({ data: T(l[i.name]) }) : f.has(i.name) ? i.reject(te()) : d(i);
   }, c = () => {
-    i = void 0;
+    a = void 0;
     const r = o;
     o = [];
     const u = [], n = /* @__PURE__ */ new Map();
     for (const e of r) {
       let l = n.get(e.name);
       if (!l) {
-        const f = u[u.length - 1], a = f ? new Set(f.map((h) => h.name)).size : R;
-        l = f && a < R ? f : [], l !== f && u.push(l), n.set(e.name, l);
+        const f = u[u.length - 1], i = f ? new Set(f.map((h) => h.name)).size : k;
+        l = f && i < k ? f : [], l !== f && u.push(l), n.set(e.name, l);
       }
       l.push(e);
     }
@@ -166,17 +166,17 @@ function ne(t) {
       command: r,
       resolve: n,
       reject: e
-    }), i === void 0 && (i = setTimeout(c, V));
+    }), a === void 0 && (a = setTimeout(c, V));
   });
 }
-const k = 3e3, se = /^\/(collections\/[A-Za-z_][A-Za-z0-9_-]*|field-config\/[A-Za-z_][A-Za-z0-9_-]*|collection-layouts(\/active|\/summary\/[A-Za-z_][A-Za-z0-9_-]*)?|chat\/room-types|users\/me)$/, oe = /^\/(record-views|item-locks|drafts|presence|rum|comments|notifications|tasks|field-rules\/evaluate|chat\/(?!room-types)|field-config\/[^/]+\/(evaluate-visibility|evaluate-defaults|evaluate-lock|cascade|project)$|items\/(?!nivaro_|directus_)[^/]+|users\/cards$|files\/verify$)/;
+const q = 3e3, se = /^\/(collections\/[A-Za-z_][A-Za-z0-9_-]*|field-config\/[A-Za-z_][A-Za-z0-9_-]*|collection-layouts(\/active|\/summary\/[A-Za-z_][A-Za-z0-9_-]*)?|chat\/room-types|users\/me)$/, oe = /^\/(record-views|item-locks|drafts|presence|rum|comments|notifications|tasks|field-rules\/evaluate|chat\/(?!room-types)|field-config\/[^/]+\/(evaluate-visibility|evaluate-defaults|evaluate-lock|cascade|project)$|items\/(?!nivaro_|directus_)[^/]+|users\/cards$|files\/verify$)/;
 function re(t) {
   const s = (t._path ?? "").split("?")[0];
-  return (t._method ?? "GET").toUpperCase() === "POST" && q.test(s) ? !0 : oe.test(s);
+  return (t._method ?? "GET").toUpperCase() === "POST" && P.test(s) ? !0 : oe.test(s);
 }
-function ae(t) {
+function ie(t) {
   const s = t;
-  if (!w(s) || !se.test(s._path ?? "")) return !1;
+  if (!S(s) || !se.test(s._path ?? "")) return !1;
   const o = s._params;
   return !(o && o.item != null && /^\/collection-layouts\/active$/.test(s._path ?? ""));
 }
@@ -184,14 +184,14 @@ let y = 0;
 function D() {
   y++;
 }
-let A = 0;
-const ie = 50, ce = /^\/items\//;
-function ue(t, s, o, i) {
-  if (s.epoch !== i) return !1;
+let g = 0;
+const ae = 50, ce = /^\/items\//;
+function ue(t, s, o, a) {
+  if (s.epoch !== a) return !1;
   const d = t._path ?? "";
-  return !ce.test(d) || o - s.at < ie;
+  return !ce.test(d) || o - s.at < ae;
 }
-function G(t, s) {
+function w(t, s) {
   return t.then(
     (o) => (s && H(), o),
     (o) => {
@@ -201,52 +201,54 @@ function G(t, s) {
 }
 function me(t, s = {}) {
   if (F(t)) return t;
-  const o = /* @__PURE__ */ new Map(), i = s.batchReads ? Q(t) : null, d = s.batchCollections === !1 ? null : ne(t), m = /* @__PURE__ */ new Map();
+  const o = /* @__PURE__ */ new Map(), a = s.batchReads ? Q(t) : null, d = s.batchCollections === !1 ? null : ne(t), m = /* @__PURE__ */ new Map();
   let c = y;
   const r = (n, e, l) => {
     if (e !== y) return;
     c !== y && (m.clear(), c = y);
     const f = Date.now();
-    for (const [a, h] of m) f - h.at >= k && m.delete(a);
+    for (const [i, h] of m) f - h.at >= q && m.delete(i);
     m.set(n, { at: f, epoch: e, value: l });
   }, u = (n) => {
     const e = n;
-    if (!w(e)) {
-      O(e._method, e._path, e._body);
+    if (!S(e)) {
+      b(e._method, e._path, e._body);
       const _ = !re(e);
-      _ && D(), A++;
-      const S = G(t.request(n), !1).finally(() => {
-        A++;
+      _ && D(), g++;
+      const C = w(t.request(n), !1).finally(() => {
+        g++;
       });
-      return (_ ? S.finally(D) : S).then((C) => (O(e._method, e._path, e._body, C), C));
+      return (_ ? C.finally(D) : C).then((O) => (b(e._method, e._path, e._body, O), O));
     }
-    const l = P(e), f = ae(e);
+    if (n._signal)
+      return w(t.request(n), !1);
+    const l = I(e), f = ie(e);
     if (f) {
       const _ = m.get(l);
-      if (_ && _.epoch === y && Date.now() - _.at < k)
+      if (_ && _.epoch === y && Date.now() - _.at < q)
         return Promise.resolve(T(_.value));
     }
-    const a = o.get(l);
-    if (a && ue(e, a, Date.now(), A))
-      return a.p.then(T);
+    const i = o.get(l);
+    if (i && ue(e, i, Date.now(), g))
+      return i.p.then(T);
     const h = M(e._method, e._path, e._params);
     if (h && !$()) return Promise.reject(Z());
-    const p = i ? Y(e) : null, E = !p && d ? ee(e) : null, j = G(
-      p && i ? i(n, p) : E && d ? d(n, E) : t.request(n),
+    const p = a ? Y(e) : null, E = !p && d ? ee(e) : null, j = w(
+      p && a ? a(n, p) : E && d ? d(n, E) : t.request(n),
       h
-    ), L = y, g = j.then((_) => (f && r(l, L, T(_)), _)).finally(() => {
+    ), L = y, A = j.then((_) => (f && r(l, L, T(_)), _)).finally(() => {
       var _;
-      ((_ = o.get(l)) == null ? void 0 : _.p) === g && o.delete(l);
+      ((_ = o.get(l)) == null ? void 0 : _.p) === A && o.delete(l);
     });
-    return o.set(l, { p: g, at: Date.now(), epoch: A }), g;
+    return o.set(l, { p: A, at: Date.now(), epoch: g }), A;
   };
   return new Proxy(t, {
     get(n, e, l) {
       if (e === "request") return u;
       if (e === N) return !0;
       if (e === "setToken" && typeof n.setToken == "function")
-        return (a) => {
-          n.setToken(a), z();
+        return (i) => {
+          n.setToken(i), z();
         };
       const f = Reflect.get(n, e, l);
       return typeof f == "function" ? f.bind(n) : f;
@@ -263,7 +265,7 @@ function _e(t) {
   });
 }
 function pe(t, s = {}) {
-  let o = s.open ?? !0, i;
+  let o = s.open ?? !0, a;
   const d = /* @__PURE__ */ new Map(), m = () => {
     const n = [...d.values()];
     d.clear();
@@ -273,29 +275,29 @@ function pe(t, s = {}) {
   }, r = (n) => {
     const e = n;
     if (o || !B(e) || le.test(e._path ?? "")) return t.request(n);
-    const l = P(e), f = d.get(l);
+    const l = I(e), f = d.get(l);
     if (f) return f.promise.then(T);
-    let a = () => {
+    let i = () => {
     };
     const p = new Promise((E) => {
-      a = E;
+      i = E;
     }).then(() => t.request(n));
-    return d.set(l, { promise: p, release: a }), v.add(c), p;
+    return d.set(l, { promise: p, release: i }), v.add(c), p;
   };
   return new Proxy(t, {
     get(n, e, l) {
       if (e === "request") return r;
       if (e === "open") return o;
       if (e === "setOpen")
-        return (a) => {
-          i !== void 0 && (clearTimeout(i), i = void 0);
+        return (i) => {
+          a !== void 0 && (clearTimeout(a), a = void 0);
           const h = o;
-          o = a, a && !h && (v.delete(c), m());
+          o = i, i && !h && (v.delete(c), m());
         };
       if (e === "dispose")
         return () => {
-          i === void 0 && (i = setTimeout(() => {
-            i = void 0, o = !0, v.delete(c), m();
+          a === void 0 && (a = setTimeout(() => {
+            a = void 0, o = !0, v.delete(c), m();
           }, 0));
         };
       const f = Reflect.get(n, e, l);
@@ -304,17 +306,17 @@ function pe(t, s = {}) {
   });
 }
 export {
-  b as BATCH_READ_LIMIT,
-  R as COLLECTION_BATCH_LIMIT,
+  R as BATCH_READ_LIMIT,
+  k as COLLECTION_BATCH_LIMIT,
   V as COLLECTION_BATCH_WINDOW_MS,
-  ie as RECORD_JOIN_MS,
-  k as SETTLED_READ_MS,
+  ae as RECORD_JOIN_MS,
+  q as SETTLED_READ_MS,
   ee as batchableCollectionMeta,
   Y as batchableRead,
   pe as createGatedClient,
   D as forgetSettledReads,
   F as isCoalesced,
-  ae as isSettledRead,
+  ie as isSettledRead,
   ue as mayJoinInflight,
   fe as releaseGatedReads,
   _e as releaseGatedReadsOnSharedFetch,

package/dist/shared/lib/search-text.js

@@ -0,0 +1,111 @@
+function d(o) {
+  return o.normalize("NFKD").replace(/[̀-ͯ]/g, "").toLowerCase();
+}
+function g(o) {
+  let n = "";
+  for (const e of o) n += d(e);
+  return n;
+}
+function k(o) {
+  let n = "";
+  const e = [];
+  let t = 0;
+  for (const s of o) {
+    const i = d(s);
+    for (let r = 0; r < i.length; r++) e.push(t);
+    n += i, t += s.length;
+  }
+  return e.push(t), { folded: n, map: e };
+}
+function S(o) {
+  const n = String(o ?? ""), e = [], t = /"([^"]*)"|(\S+)/g;
+  let s;
+  for (; s = t.exec(n); ) {
+    const i = s[1] !== void 0 ? s[1] : s[2], r = g(i).replace(/\s+/g, " ").trim().replace(/^"+|"+$/g, "");
+    r && !e.includes(r) && e.push(r);
+  }
+  return e;
+}
+function x(o, n) {
+  if (!(n != null && n.length)) return o.map((t) => [t]);
+  const e = n.map((t) => t.map((s) => g(String(s)).trim()).filter(Boolean));
+  return o.map((t) => {
+    const s = [t];
+    for (const i of e)
+      if (i.includes(t))
+        for (const r of i) s.includes(r) || s.push(r);
+    return s;
+  });
+}
+function L(o, n, e = {}) {
+  const t = S(n);
+  if (t.length === 0) return !0;
+  const s = g(String(o ?? ""));
+  return x(t, e.synonyms).every((i) => i.some((r) => s.includes(r)));
+}
+function $(o, n, e = {}) {
+  const t = String(o ?? ""), s = S(n);
+  if (!t || s.length === 0) return t ? [{ text: t, match: !1 }] : [];
+  const { folded: i, map: r } = k(t), a = [];
+  for (const f of x(s, e.synonyms))
+    for (const c of f) {
+      if (!c) continue;
+      let m = 0;
+      for (; ; ) {
+        const p = i.indexOf(c, m);
+        if (p === -1) break;
+        a.push([r[p], r[p + c.length]]), m = p + c.length;
+      }
+    }
+  if (a.length === 0) return [{ text: t, match: !1 }];
+  a.sort((f, c) => f[0] - c[0] || c[1] - f[1]);
+  const l = [];
+  for (const f of a) {
+    const c = l[l.length - 1];
+    c && f[0] <= c[1] ? c[1] = Math.max(c[1], f[1]) : l.push([f[0], f[1]]);
+  }
+  const h = [];
+  let u = 0;
+  for (const [f, c] of l)
+    f > u && h.push({ text: t.slice(u, f), match: !1 }), c > f && h.push({ text: t.slice(f, c), match: !0 }), u = c;
+  return u < t.length && h.push({ text: t.slice(u), match: !1 }), h;
+}
+const w = 5;
+function R(o) {
+  const n = [];
+  for (const e of String(o ?? "").toLowerCase().split(/\s+/))
+    if (e && !n.includes(e) && n.push(e), n.length === w) break;
+  return n;
+}
+function C(o) {
+  return String(o ?? "").replace(/\s+/g, " ").trim();
+}
+const W = (o) => o.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function b(o, n) {
+  var i;
+  const e = C(n).toLowerCase();
+  if (!e) return 5;
+  const t = o.map(
+    (r) => r == null || typeof r == "object" ? "" : String(r).toLowerCase().trimEnd()
+  );
+  if (t[0] === e) return 0;
+  if (t.slice(1).some((r) => r === e)) return 1;
+  if ((i = t[0]) != null && i.startsWith(e)) return 2;
+  if (t.slice(1).some((r) => r.startsWith(e))) return 3;
+  const s = R(n);
+  return s.length > 0 && s.every((r) => {
+    const a = new RegExp(`(^|[^a-z0-9])${W(r)}`);
+    return t.some((l) => a.test(l));
+  }) ? 4 : 5;
+}
+export {
+  w as SEARCH_RANK_MAX_WORDS,
+  x as expandTokens,
+  g as foldSearchText,
+  $ as highlightParts,
+  L as matchesSearch,
+  C as searchRankPhrase,
+  b as searchRankTier,
+  R as searchRankWords,
+  S as tokenize
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nivaro/react",
-  "version": "0.3.33",
+  "version": "0.3.35",
   "description": "React hooks and components for Nivaro CMS forms",
   "type": "module",
   "main": "./dist/index.js",