@ea-lab/reactive-json 2.2.0 → 2.3.0

package/dist/engine/ReactiveJsonRoot.js

@@ -1,116 +1,116 @@
-import { jsx as p, jsxs as H, Fragment as st } from "react/jsx-runtime";
-import { a as G } from "../index-BUPRVmV-.js";
-import { useRef as K, useState as Q, useEffect as N, useMemo as it } from "react";
-import { r as ct } from "../dnd-kit-sortable-tree.esm-Cz1RJyIg.js";
-import { coreComponentsPlugin as X } from "../coreComponentsPlugin.js";
-import { mergeComponentCollections as lt } from "./ComponentCollector.js";
-import { DataStore as pt } from "./DataStore.js";
-import { EventDispatcherProvider as dt } from "./EventDispatcherProvider.js";
-import { GlobalDataContext as ut } from "./GlobalDataContext.js";
-import mt from "./ParsingDebugDisplay/ParsingDebugDisplay.js";
-import { StoreContext as ft } from "./StoreContext.js";
-import { TemplateContext as gt } from "./TemplateContext.js";
-import { dataLocationToPath as ht } from "./TemplateSystem.js";
-import { useReactiveData as Pt } from "./hook/useReactiveData.js";
-import { alterData as yt } from "./utility/alterData.js";
-import { applyDataMapping as Dt } from "./utility/dataMappingSystem.js";
-import { parseRjBuild as wt } from "./utility/parseRjBuild.js";
-import { interpolateSegments as bt } from "./utility/interpolateSegments.js";
-import { stringToBoolean as Ct } from "./utility/stringToBoolean.js";
-import { View as St } from "./View.js";
-const vt = ({ Wrapper: m }) => {
-  const E = Pt("");
-  return /* @__PURE__ */ p(m, { children: JSON.stringify(E, null, "  ") });
-}, xt = ({
-  dataOverride: m,
-  dataFetchMethod: E,
-  dataUrl: L,
-  debugMode: Y,
-  DebugModeContentWrapper: O,
+import { jsx as u, jsxs as Y, Fragment as lt } from "react/jsx-runtime";
+import { a as L } from "../index-BUPRVmV-.js";
+import { useRef as Z, useState as U, useEffect as N, useMemo as pt } from "react";
+import { r as dt } from "../dnd-kit-sortable-tree.esm-Cz1RJyIg.js";
+import { coreComponentsPlugin as F } from "../coreComponentsPlugin.js";
+import { mergeComponentCollections as ut } from "./ComponentCollector.js";
+import { DataStore as mt } from "./DataStore.js";
+import { EventDispatcherProvider as ft } from "./EventDispatcherProvider.js";
+import { GlobalDataContext as gt } from "./GlobalDataContext.js";
+import ht from "./ParsingDebugDisplay/ParsingDebugDisplay.js";
+import { StoreContext as yt } from "./StoreContext.js";
+import { TemplateContext as Pt } from "./TemplateContext.js";
+import { dataLocationToPath as Dt } from "./TemplateSystem.js";
+import { useReactiveData as wt } from "./hook/useReactiveData.js";
+import { alterData as bt } from "./utility/alterData.js";
+import { applyDataMapping as St } from "./utility/dataMappingSystem.js";
+import { parseRjBuild as Ct } from "./utility/parseRjBuild.js";
+import { interpolateSegments as vt } from "./utility/interpolateSegments.js";
+import { stringToBoolean as Et } from "./utility/stringToBoolean.js";
+import { View as xt } from "./View.js";
+const kt = ({ Wrapper: g }) => {
+  const T = wt("");
+  return /* @__PURE__ */ u(g, { children: JSON.stringify(T, null, "  ") });
+}, At = ({
+  dataOverride: g,
+  dataFetchMethod: T,
+  dataUrl: O,
+  debugMode: tt,
+  DebugModeContentWrapper: q,
   DebugModeDataWrapper: z,
-  DebugModeRootWrapper: Z,
+  DebugModeRootWrapper: et,
   headersForData: I,
   headersForRjBuild: s,
   maybeRawAppData: M,
-  maybeRawAppRjBuild: w,
+  maybeRawAppRjBuild: S,
   plugins: R,
-  rjBuildFetchMethod: b,
-  rjBuildUrl: f,
-  upstreamUpdateCallbacks: T
+  rjBuildFetchMethod: C,
+  rjBuildUrl: h,
+  upstreamUpdateCallbacks: $
 }) => {
-  const g = [];
-  E && (g.push({
+  const y = [];
+  T && (y.push({
     deprecatedProperty: "dataFetchMethod",
     newProperty: "rjBuildFetchMethod"
-  }), b = E), L && (g.push({
+  }), C = T), O && (y.push({
     deprecatedProperty: "dataUrl",
     newProperty: "rjBuildUrl"
-  }), f = L), I && (g.push({
+  }), h = O), I && (y.push({
     deprecatedProperty: "headersForData",
     newProperty: "headersForRjBuild"
-  }), s = I), M && (g.push({
+  }), s = I), M && (y.push({
     deprecatedProperty: "maybeRawAppData",
     newProperty: "maybeRawAppRjBuild"
-  }), w = M), g.length > 0 && console.warn(
-    "A ReactiveJsonRoot component got the following deprecated properties that must be replaced: " + g.map((t) => t.deprecatedProperty + " -> " + t.newProperty).join(", ")
+  }), S = M), y.length > 0 && console.warn(
+    "A ReactiveJsonRoot component got the following deprecated properties that must be replaced: " + y.map((t) => t.deprecatedProperty + " -> " + t.newProperty).join(", ")
   );
-  const o = K(new pt({})).current, [u, C] = Q({
+  const o = Z(new mt({})).current, [m, v] = U({
     templates: {},
     renderView: {},
     items: [],
     rawAppRjBuild: null
-  }), [j, W] = Q(null), a = K(null);
+  }), [j, W] = U(null), a = Z(null);
   N(() => () => {
     typeof document < "u" && a.current && a.current.parentNode && (a.current.parentNode.removeChild(a.current), a.current = null);
   }, []);
-  const S = it(
-    () => R ? lt([X, R]) : X,
+  const E = pt(
+    () => R ? ut([F, R]) : F,
     [R]
   );
   N(() => {
-    let t = w;
-    typeof t == "string" || t && (t = JSON.stringify(t)), t && C((r) => ({ ...r, rawAppRjBuild: t }));
-  }, [w]), N(() => {
-    if (!f) return;
+    let t = S;
+    typeof t == "string" || t && (t = JSON.stringify(t)), t && v((r) => ({ ...r, rawAppRjBuild: t }));
+  }, [S]), N(() => {
+    if (!h) return;
     const t = {
-      method: b || "GET",
-      url: f,
+      method: C || "GET",
+      url: h,
       headers: s
     };
-    t.method.toLowerCase() === "post" ? G.post(t.url, {}, { headers: t.headers }).then((r) => {
-      C((i) => ({ ...i, rawAppRjBuild: r.data }));
-    }) : G.get(t.url, { headers: t.headers }).then((r) => {
-      C((i) => ({ ...i, rawAppRjBuild: r.data }));
+    t.method.toLowerCase() === "post" ? L.post(t.url, {}, { headers: t.headers }).then((r) => {
+      v((c) => ({ ...c, rawAppRjBuild: r.data }));
+    }) : L.get(t.url, { headers: t.headers }).then((r) => {
+      v((c) => ({ ...c, rawAppRjBuild: r.data }));
     });
-  }, [f, s, b]), N(() => {
-    if (!u.rawAppRjBuild) return;
-    const t = wt(u.rawAppRjBuild);
+  }, [h, s, C]), N(() => {
+    if (!m.rawAppRjBuild) return;
+    const t = Ct(m.rawAppRjBuild);
     if (!t.success) {
       if (console.group(
         `Tried to load the app's RjBuild but the ${t.format} content could not be parsed.`
       ), console.error(t.error.message), console.debug("Context:", {
-        rjBuildUrl: f,
-        rjBuildFetchMethod: b,
+        rjBuildUrl: h,
+        rjBuildFetchMethod: C,
         headersForRjBuild: s,
-        maybeRawAppRjBuild: w,
-        dataOverride: m
+        maybeRawAppRjBuild: S,
+        dataOverride: g
       }), console.debug("Error details:", t.error), console.groupEnd(), typeof document < "u") {
         let e = document.getElementById("rj-parsing-error-root");
         if (e || (e = document.createElement("div"), e.id = "rj-parsing-error-root", document.body.appendChild(e)), !a.current) {
-          const d = document.createElement("div");
-          e.appendChild(d), a.current = d;
+          const i = document.createElement("div");
+          e.appendChild(i), a.current = i;
         }
         W(
-          ct.createPortal(
-            /* @__PURE__ */ p(
-              mt,
+          dt.createPortal(
+            /* @__PURE__ */ u(
+              ht,
               {
                 processedRjBuild: t,
                 errorContext: {
-                  rjBuildUrl: f,
-                  rjBuildFetchMethod: b,
+                  rjBuildUrl: h,
+                  rjBuildFetchMethod: C,
                   headersForRjBuild: s,
-                  maybeRawAppRjBuild: w
+                  maybeRawAppRjBuild: S
                 }
               }
             ),
@@ -124,165 +124,174 @@ const vt = ({ Wrapper: m }) => {
       return;
     }
     j && (W(null), typeof document < "u" && a.current && a.current.parentNode && (a.current.parentNode.removeChild(a.current), a.current = null));
-    const r = t.data, i = m !== void 0 ? m : r.data;
-    o.set("", i);
+    const r = t.data, c = g !== void 0 ? g : r.data;
+    o.set("", c);
     const n = {
       templates: r.templates ?? r.listForms ?? {},
       renderView: r.renderView ?? {},
       items: Object.keys(r.renderView ?? {}),
-      rawAppRjBuild: u.rawAppRjBuild
-    }, h = r.additionalDataSource;
-    if (!Array.isArray(h) || h.length === 0) {
-      C((e) => ({ ...e, ...n }));
+      rawAppRjBuild: m.rawAppRjBuild
+    }, P = r.additionalDataSource;
+    if (!Array.isArray(P) || P.length === 0) {
+      v((e) => ({ ...e, ...n }));
       return;
     }
-    const v = h.filter((e) => e.blocking === !0), A = h.filter((e) => e.blocking !== !0), _ = (e) => !e || e === "data" ? "" : e.startsWith("data.") ? e.substring(5) : e, $ = async (e, d) => {
-      var P;
+    const x = P.filter((e) => e.blocking === !0), V = P.filter((e) => e.blocking !== !0), _ = (e) => !e || e === "data" ? "" : e.startsWith("data.") ? e.substring(5) : e, J = async (e, i) => {
+      var X;
+      const { fallbackDataSource: D, ...l } = e, K = async (p) => {
+        D ? (console.warn(`additionalDataSource item ${i}: ${p} — trying fallbackDataSource.`), await J(D, i)) : console.warn(`additionalDataSource item ${i}: ${p}.`, l);
+      }, Q = vt(l.src, (p) => o.get(p));
+      if (!Q) {
+        await K("could not resolve 'src'");
+        return;
+      }
+      const w = {
+        method: ((X = l.method) == null ? void 0 : X.toUpperCase()) || "GET",
+        url: Q
+      };
+      s && Object.keys(s).length > 0 && (w.headers = s);
+      let k;
       try {
-        const k = bt(e.src, (c) => o.get(c));
-        if (!k) {
-          console.warn("additionalDataSource item number " + d + ": could not resolve 'src'.", e);
-          return;
-        }
-        const y = {
-          method: ((P = e.method) == null ? void 0 : P.toUpperCase()) || "GET",
-          url: k
-        };
-        s && Object.keys(s).length > 0 && (y.headers = s);
-        const V = await G(y), rt = {
-          url: y.url,
-          method: y.method,
-          headers: y.headers || {},
-          body: y.data
-        }, ot = {
-          headers: V.headers || {},
-          status: V.status,
-          data: V.data
-        }, D = yt({
-          requestContext: rt,
-          responseContext: ot,
-          responseBody: V.data,
+        k = await L(w);
+      } catch (p) {
+        await K(`HTTP request failed (${p.message})`);
+        return;
+      }
+      try {
+        const p = {
+          url: w.url,
+          method: w.method,
+          headers: w.headers || {},
+          body: w.data
+        }, st = {
+          headers: k.headers || {},
+          status: k.status,
+          data: k.data
+        }, b = bt({
+          requestContext: p,
+          responseContext: st,
+          responseBody: k.data,
           // additionalDataSource always processes raw data, not RjBuild.
           isRjBuild: !1,
-          dataProcessors: (S == null ? void 0 : S.dataProcessor) || {}
+          dataProcessors: (E == null ? void 0 : E.dataProcessor) || {}
         });
-        if (e.dataMapping) {
-          const c = {
+        if (l.dataMapping) {
+          const f = {
             headersForRjBuild: s,
-            plugins: S,
+            plugins: E,
             get templateData() {
               return o.get("");
             },
             templatePath: "data",
-            setData: (l) => o.set("", l),
-            updateData: (l, J, at) => {
-              const nt = _(J);
-              o.set(nt, l, at);
+            setData: (d) => o.set("", d),
+            updateData: (d, G, ct) => {
+              const it = _(G);
+              o.set(it, d, ct);
             }
-          }, x = {
+          }, A = {
             get templateData() {
               return o.get("");
             },
             templatePath: "data"
           };
           try {
-            Dt({
-              dataMapping: e.dataMapping,
-              responseData: D,
-              globalDataContext: c,
-              templateContext: x
+            St({
+              dataMapping: l.dataMapping,
+              responseData: b,
+              globalDataContext: f,
+              templateContext: A
             });
             return;
-          } catch (l) {
-            console.error("Error applying dataMapping for additionalDataSource:", l);
+          } catch (d) {
+            console.error("Error applying dataMapping for additionalDataSource:", d);
           }
         }
-        if (!e.path) {
-          if (typeof D != "object" || Array.isArray(D)) {
+        if (!l.path) {
+          if (typeof b != "object" || Array.isArray(b)) {
             console.warn(
               "additionalDataSource data cannot be merged at root - must be an object:",
-              D
+              b
             );
             return;
           }
-          Object.entries(D).forEach(([c, x]) => {
-            o.set(c, x);
+          Object.entries(b).forEach(([f, A]) => {
+            o.set(f, A);
           });
           return;
         }
         try {
-          const c = {
+          const f = {
             templateData: o.get(""),
             // use current snapshot
             templatePath: "data"
-          }, x = {
+          }, A = {
             templateData: o.get(""),
             // use current snapshot
             templatePath: "data"
-          }, l = ht({
-            dataLocation: e.path,
+          }, d = Dt({
+            dataLocation: l.path,
             currentPath: "data",
-            globalDataContext: c,
-            templateContext: x
+            globalDataContext: f,
+            templateContext: A
           });
-          if (typeof l != "string") {
+          if (typeof d != "string") {
             console.warn(
               "additionalDataSource path evaluation did not result in a string:",
-              e.path,
+              l.path,
               "->",
-              l
+              d
             );
             return;
           }
-          const J = _(l);
-          o.set(J, D);
-        } catch (c) {
-          console.error("Error evaluating additionalDataSource path:", e.path, c);
+          const G = _(d);
+          o.set(G, b);
+        } catch (f) {
+          console.error("Error evaluating additionalDataSource path:", l.path, f);
         }
-      } catch (k) {
-        console.error("Error fetching additional data source:", e.src, k);
+      } catch (p) {
+        console.error("Error processing additionalDataSource response:", l.src, p);
       }
     };
     (async () => {
-      if (v.length > 0) {
-        const e = v.map((d, P) => $(d, P));
+      if (x.length > 0) {
+        const e = x.map((i, D) => J(i, D));
         await Promise.allSettled(e);
       }
-      if (C((e) => ({ ...e, ...n })), A.length > 0) {
-        const e = A.map(
-          (d, P) => $(d, v.length + P)
+      if (v((e) => ({ ...e, ...n })), V.length > 0) {
+        const e = V.map(
+          (i, D) => J(i, x.length + D)
         );
         Promise.allSettled(e);
       }
     })();
-  }, [u.rawAppRjBuild, m, o]);
-  function q(t, r, i) {
-    if (!T || T.size === 0)
+  }, [m.rawAppRjBuild, g, o]);
+  function B(t, r, c) {
+    if (!$ || $.size === 0)
       return !1;
-    for (const [n, h] of T)
+    for (const [n, P] of $)
       if (t === n || t.startsWith(n + ".") || n === "") {
-        const v = n === "" ? t : t.substring(n.length + 1);
+        const x = n === "" ? t : t.substring(n.length + 1);
         try {
-          return h(r, v, i), !0;
-        } catch (A) {
-          console.warn("Error during upstream update:", A);
+          return P(r, x, c), !0;
+        } catch (V) {
+          console.warn("Error during upstream update:", V);
           break;
         }
       }
     return !1;
   }
-  const U = (t) => {
-    q("", t, void 0) || o.set("", t);
-  }, F = (t, r, i) => {
+  const rt = (t) => {
+    B("", t, void 0) || o.set("", t);
+  }, ot = (t, r, c) => {
     const n = r.startsWith("data.") ? r.substring(5) : r === "data" ? "" : r;
-    q(n, t, i) || o.set(n, t, i);
-  }, tt = {
-    element: u.templates,
+    B(n, t, c) || o.set(n, t, c);
+  }, at = {
+    element: m.templates,
     headersForRjBuild: s,
-    plugins: S,
-    ReactiveJsonRoot: xt,
-    setData: U,
-    updateData: F,
+    plugins: E,
+    ReactiveJsonRoot: At,
+    setData: rt,
+    updateData: ot,
     // experimental: expose store for advanced usage
     store: o,
     // fallback: get data from store directly (non-reactive access)
@@ -290,30 +299,30 @@ const vt = ({ Wrapper: m }) => {
       return o.get("");
     },
     templatePath: "data"
-  }, B = u.items.map((t) => /* @__PURE__ */ p(
-    St,
+  }, H = m.items.map((t) => /* @__PURE__ */ u(
+    xt,
     {
       datafield: t,
       path: "data." + t,
-      props: u.renderView[t]
+      props: m.renderView[t]
     },
     t
-  )), et = Ct(Y);
-  return /* @__PURE__ */ p(ft.Provider, { value: o, children: /* @__PURE__ */ p(dt, { children: /* @__PURE__ */ p(ut.Provider, { value: tt, children: /* @__PURE__ */ p(gt.Provider, { value: {
+  )), nt = Et(tt);
+  return /* @__PURE__ */ u(yt.Provider, { value: o, children: /* @__PURE__ */ u(ft, { children: /* @__PURE__ */ u(gt.Provider, { value: at, children: /* @__PURE__ */ u(Pt.Provider, { value: {
     // Same here, getter for compatibility, but won't trigger updates
     get templateData() {
       return o.get("");
     },
     templatePath: "data"
-  }, children: et && O ? /* @__PURE__ */ H(Z, { children: [
-    /* @__PURE__ */ p(O, { children: B }),
-    z && /* @__PURE__ */ p(vt, { Wrapper: z }),
+  }, children: nt && q ? /* @__PURE__ */ Y(et, { children: [
+    /* @__PURE__ */ u(q, { children: H }),
+    z && /* @__PURE__ */ u(kt, { Wrapper: z }),
     j
-  ] }) : /* @__PURE__ */ H(st, { children: [
-    B,
+  ] }) : /* @__PURE__ */ Y(lt, { children: [
+    H,
     j
   ] }) }) }) }) });
 };
 export {
-  xt as ReactiveJsonRoot
+  At as ReactiveJsonRoot
 };

package/dist/engine/utility/interpolateSegments.js

@@ -1,12 +1,63 @@
-const e = (r, i) => typeof r == "string" ? r || null : !Array.isArray(r) || r.length === 0 ? null : r.map((t) => {
-  if (typeof t == "string" && t.startsWith("~~.")) {
-    const o = t.substring(3), n = i(o);
-    return n == null ? (console.warn(
-      `interpolateSegments: reference "${t}" resolved to ${n}.`
-    ), "") : String(n);
+const i = (e, l) => {
+  if (typeof e == "string") {
+    let t = null;
+    if (e.startsWith("~~.") ? t = e.substring(3) : e.startsWith("~.") && (t = e.substring(2)), t !== null) {
+      const r = l(t);
+      return r == null ? null : String(r);
+    }
+    return e;
   }
-  return String(t ?? "");
-}).join("");
+  return e == null ? null : String(e);
+}, p = (e, l) => {
+  if (typeof e == "string")
+    return e || null;
+  if (!Array.isArray(e) || e.length === 0)
+    return null;
+  const t = [], r = [];
+  for (const n of e) {
+    if (n !== null && typeof n == "object") {
+      if ("param" in n) {
+        const o = i(n.param, l), s = i(n.value, l);
+        if (!o || !s) {
+          if (n.required)
+            return console.warn(
+              `interpolateSegments: required param "${n.param}" resolved to empty key or value — aborting URL.`
+            ), null;
+          continue;
+        }
+        r.push(
+          `${encodeURIComponent(o)}=${encodeURIComponent(s)}`
+        );
+        continue;
+      }
+      if ("segment" in n) {
+        const o = i(n.segment, l);
+        if (!o) {
+          if (n.required)
+            return console.warn(
+              `interpolateSegments: required segment "${n.segment}" resolved to empty — aborting URL.`
+            ), null;
+          t.push("");
+          continue;
+        }
+        t.push(o);
+        continue;
+      }
+      console.warn("interpolateSegments: unrecognized segment object.", n);
+      continue;
+    }
+    if (typeof n == "string") {
+      const o = i(n, l);
+      o === null ? (console.warn(
+        `interpolateSegments: reference "${n}" resolved to null.`
+      ), t.push("")) : t.push(o);
+      continue;
+    }
+    t.push(String(n ?? ""));
+  }
+  const u = t.join(""), a = r.length > 0 ? "?" + r.join("&") : "";
+  return u + a || null;
+};
 export {
-  e as interpolateSegments
+  p as interpolateSegments
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ea-lab/reactive-json",
   "private": false,
-  "version": "2.2.0",
+  "version": "2.3.0",
   "type": "module",
   "repository": {
     "type": "git",