@reformer/renderer-json 7.0.0 → 9.0.0

package/dist/index.js

@@ -1,9 +1,9 @@
-import { jsx as u, jsxs as M } from "react/jsx-runtime";
-import { useContext as N, createContext as O, useMemo as g, useState as C, useEffect as F } from "react";
-import { createRenderSchema as j, FormRenderer as k } from "@reformer/renderer-react";
-import { i as f, a as R, p as m, b as A } from "./index-BZLcW0SX.js";
+import { jsx as m, jsxs as E } from "react/jsx-runtime";
+import { useContext as J, createContext as O, useMemo as y, useState as F, useEffect as j } from "react";
+import { createRenderSchema as k, FormRenderer as A } from "@reformer/renderer-react";
+import { i as p, a as b, p as d, b as C } from "./index-BZLcW0SX.js";
 import { c as rr, f as er, g as tr, d as nr } from "./index-BZLcW0SX.js";
-class h {
+class l {
   own = /* @__PURE__ */ new Map();
   parent = null;
   get(e) {
@@ -25,52 +25,58 @@ class h {
     this.own.has(e) && console.warn(`[ComponentRegistry] Overwriting entry: ${e}`), this.own.set(e, t);
   }
   static withParent(e, t) {
-    const n = new h();
-    return n.parent = e, t.own.forEach((o, i) => {
-      n.own.set(i, o);
-    }), n;
+    const n = new l(), o = (s) => {
+      if (s instanceof l)
+        s.own.forEach((a, i) => n.own.set(i, a));
+      else
+        for (const a of s.names()) {
+          const i = s.get(a);
+          i && n.own.set(a, i);
+        }
+    };
+    return e instanceof l ? n.parent = e : o(e), o(t), n;
   }
 }
 function K(r) {
-  const e = new h();
+  const e = new l();
   return r({
-    component(n, o, i) {
-      e._set(n, { component: o, type: "component", description: i });
+    component(n, o, s) {
+      e._set(n, { component: o, type: "component", description: s });
     },
-    dataSource(n, o, i) {
-      e._set(n, { component: o, type: "dataSource", description: i });
+    dataSource(n, o, s) {
+      e._set(n, { component: o, type: "dataSource", description: s });
     }
   }), e;
 }
-const v = "$fieldWrapper", w = O({});
+const v = "$fieldWrapper", S = O({});
 function Q({ settings: r, children: e }) {
-  const t = N(w), n = g(() => t.registry && r.registry ? h.withParent(t.registry, r.registry) : r.registry ?? t.registry, [t.registry, r.registry]), o = g(() => {
-    const i = n?.get(v)?.component;
+  const t = J(S), n = y(() => t.registry && r.registry ? l.withParent(t.registry, r.registry) : r.registry ?? t.registry, [t.registry, r.registry]), o = y(() => {
+    const s = n?.get(v)?.component;
     return {
       ...t,
       ...r,
       registry: n,
-      fieldWrapper: r.fieldWrapper ?? i ?? t.fieldWrapper
+      fieldWrapper: r.fieldWrapper ?? s ?? t.fieldWrapper
     };
   }, [t, r, n]);
-  return /* @__PURE__ */ u(w.Provider, { value: o, children: e });
+  return /* @__PURE__ */ m(S.Provider, { value: o, children: e });
 }
 function D() {
-  return N(w);
+  return J(S);
 }
-function $(r) {
+function M(r) {
   const e = r;
-  return f(e.array) && typeof e.item == "object" && e.item !== null && "$template" in e.item;
+  return p(e.array) && typeof e.item == "object" && e.item !== null && "$template" in e.item;
 }
-function E(r) {
-  return f(r.value);
+function N(r) {
+  return p(r.value);
 }
 function W(r) {
-  return R(r.component) && !E(r) && !$(r);
+  return b(r.component) && !N(r) && !M(r);
 }
 function P(r, e) {
   if (!r) return;
-  const t = m(r)?.arg;
+  const t = d(r)?.arg;
   if (!t) throw new Error(`Invalid $component operator: "${r}"`);
   const n = e.get(t);
   if (!n)
@@ -89,73 +95,73 @@ function L(r, e) {
     );
   return t.component;
 }
-function I(r, e) {
+function V(r, e) {
   return e.split(".").reduce((t, n) => t == null ? t : t[n], r);
 }
-function V(r) {
+function q(r) {
   if (r === null || typeof r != "object") return !1;
   const e = r;
-  return f(e.value) || f(e.array) || R(e.component);
+  return p(e.value) || p(e.array) || b(e.component);
 }
-function _(r) {
+function T(r) {
   return r == null ? r : JSON.parse(JSON.stringify(r));
 }
-function b(r, e, t) {
-  if (A(r)) return L(m(r).arg, t);
-  if (R(r)) return P(r, t);
-  if (f(r)) return e.signalAt(m(r).arg);
-  if (V(r)) return p(r, e, t);
-  if (Array.isArray(r)) return r.map((n) => b(n, e, t));
+function R(r, e, t) {
+  if (C(r)) return L(d(r).arg, t);
+  if (b(r)) return P(r, t);
+  if (p(r)) return e.signalAt(d(r).arg);
+  if (q(r)) return g(r, e, t);
+  if (Array.isArray(r)) return r.map((n) => R(n, e, t));
   if (r !== null && typeof r == "object") {
     const n = r, o = {};
-    for (const i of Object.keys(n)) o[i] = b(n[i], e, t);
+    for (const s of Object.keys(n)) o[s] = R(n[s], e, t);
     return o;
   }
   return r;
 }
-function S(r, e, t) {
+function w(r, e, t) {
   if (!r) return;
   const n = {};
-  for (const o of Object.keys(r)) n[o] = b(r[o], e, t);
+  for (const o of Object.keys(r)) n[o] = R(r[o], e, t);
   return n;
 }
-function p(r, e, t) {
-  if ($(r)) {
-    const n = I(e, m(r.array).arg), o = r.item.$template, i = r.initialValue;
+function g(r, e, t) {
+  if (M(r)) {
+    const n = V(e, d(r.array).arg), o = r.item.$template, s = r.initialValue;
     return {
       ...r.selector ? { selector: r.selector } : {},
       array: n,
-      initialValue: () => i ? _(i) : {},
-      item: (y) => p(o, y, t),
-      componentProps: S(r.componentProps, e, t)
+      initialValue: () => s ? T(s) : {},
+      item: (a) => g(o, a, t),
+      componentProps: w(r.componentProps, e, t)
     };
   }
-  if (E(r)) {
-    const n = m(r.value).arg, o = e.signalAt(n);
+  if (N(r)) {
+    const n = d(r.value).arg, o = e.signalAt(n);
     return !o && typeof console < "u" && console.warn(`[JsonRenderer/M1] No model signal for "${n}".`), {
       ...r.selector ? { selector: r.selector } : {},
       value: o,
       component: P(r.component, t),
-      componentProps: S(r.componentProps, e, t)
+      componentProps: w(r.componentProps, e, t)
     };
   }
   if (W(r))
     return {
       ...r.selector ? { selector: r.selector } : {},
       component: P(r.component, t),
-      componentProps: S(r.componentProps, e, t),
-      children: r.children?.map((n) => p(n, e, t))
+      componentProps: w(r.componentProps, e, t),
+      children: r.children?.map((n) => g(n, e, t))
     };
   throw new Error(`Invalid JSON node (M1): ${JSON.stringify(r)}`);
 }
 function U(r, e, t) {
-  return p(r.root, t, e);
+  return g(r.root, t, e);
 }
-function T(r, e, t) {
-  return () => p(r.root, t, e);
+function z(r, e, t) {
+  return () => g(r.root, t, e);
 }
-function q({ errors: r }) {
-  return /* @__PURE__ */ M(
+function I({ errors: r }) {
+  return /* @__PURE__ */ E(
     "div",
     {
       role: "alert",
@@ -169,12 +175,12 @@ function q({ errors: r }) {
         font: "14px/1.5 ui-monospace, SFMono-Regular, Menlo, monospace"
       },
       children: [
-        /* @__PURE__ */ M("strong", { style: { display: "block", marginBottom: 8, fontSize: 15 }, children: [
+        /* @__PURE__ */ E("strong", { style: { display: "block", marginBottom: 8, fontSize: 15 }, children: [
           "Невалидная JSON-схема формы (",
           r.length,
           ")"
         ] }),
-        /* @__PURE__ */ u("ul", { style: { margin: 0, paddingLeft: 20 }, children: r.map((e, t) => /* @__PURE__ */ u("li", { style: { marginBottom: 4 }, children: e }, t)) })
+        /* @__PURE__ */ m("ul", { style: { margin: 0, paddingLeft: 20 }, children: r.map((e, t) => /* @__PURE__ */ m("li", { style: { marginBottom: 4 }, children: e }, t)) })
       ]
     }
   );
@@ -185,56 +191,60 @@ function X({
   onSchemaReady: t,
   validate: n = !1
 }) {
-  const { registry: o, model: i, ...y } = D(), [a, d] = C(
+  const { registry: o, model: s, ...a } = D(), [i, h] = F(
     n ? void 0 : null
   );
-  F(() => {
+  j(() => {
     if (!n) {
-      d(null);
+      h(null);
       return;
     }
-    let l = !1;
-    return d(void 0), import("./validate.js").then(({ validateFormSchema: s }) => {
-      if (l) return;
-      const { valid: J, errors: x } = s(r, { registry: o });
-      d(J ? null : x);
-    }).catch((s) => {
-      l || d([`Schema validator failed to load: ${String(s)}`]);
+    let f = !1;
+    return h(void 0), import("./validate.js").then(({ validateFormSchema: c }) => {
+      if (f) return;
+      const { valid: $, errors: x } = c(r, { registry: o });
+      h($ ? null : x);
+    }).catch((c) => {
+      f || h([`Schema validator failed to load: ${String(c)}`]);
     }), () => {
-      l = !0;
+      f = !0;
     };
   }, [n, r, o]);
-  const c = g(() => {
-    if (!i)
+  const u = y(() => {
+    if (!s)
       throw new Error(
         "JsonFormRenderer: settings.model is required (M1). Pass the FormModel via JsonRendererProvider."
       );
-    if (a !== null) return null;
-    const l = T(r, o, i), s = j(l);
-    return e && e(s), s;
-  }, [r, o, e, i, a]);
-  return g(() => {
-    c && t && t(c);
-  }, [c]), a && a.length > 0 ? /* @__PURE__ */ u(q, { errors: a }) : c ? /* @__PURE__ */ u(k, { render: c, settings: y }) : null;
+    if (i !== null) return null;
+    if (!o)
+      throw new Error(
+        "JsonFormRenderer: settings.registry is required. Pass a ComponentRegistry via JsonRendererProvider."
+      );
+    const f = z(r, o, s), c = k(f);
+    return e && e(c), c;
+  }, [r, o, e, s, i]);
+  return y(() => {
+    u && t && t(u);
+  }, [u]), i && i.length > 0 ? /* @__PURE__ */ m(I, { errors: i }) : u ? /* @__PURE__ */ m(A, { render: u, settings: a }) : null;
 }
 export {
   v as FIELD_WRAPPER,
   X as JsonFormRenderer,
   Q as JsonRendererProvider,
-  q as SchemaErrorPanel,
+  I as SchemaErrorPanel,
   rr as buildFormSchemaMetaSchema,
   U as convertJsonToM1Tree,
-  T as createRenderSchemaFromJsonM1,
+  z as createRenderSchemaFromJsonM1,
   K as defineRegistry,
   er as formSchemaMetaSchema,
   tr as getComponentNames,
   nr as getDataSourceNames,
-  $ as isArrayNode,
-  R as isComponentOp,
+  M as isArrayNode,
+  b as isComponentOp,
   W as isContainerNode,
-  A as isDataSourceOp,
-  E as isFieldNode,
-  f as isModelOp,
-  m as parseOperator,
+  C as isDataSourceOp,
+  N as isFieldNode,
+  p as isModelOp,
+  d as parseOperator,
   D as useJsonRendererSettings
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reformer/renderer-json",
-  "version": "7.0.0",
+  "version": "9.0.0",
   "description": "JSON-based form renderer for @reformer ecosystem",
   "type": "module",
   "main": "./dist/index.js",