@gisce/ooui 2.13.0 → 2.13.2

package/dist/helpers/attributeParser.d.ts

@@ -1,9 +1,10 @@
 export declare const isTrue: (value?: string | boolean | number) => boolean;
 declare const replaceEntities: (string: string) => string;
-export declare const parseJsonAttributes: ({ attrs, values, fields, }: {
+export declare const parseJsonAttributes: ({ attrs, values, fields, widgetType, }: {
     attrs: string;
     values: any;
     fields: any;
+    widgetType?: string | undefined;
 }) => Record<string, boolean>;
 declare const evaluateAttributes: ({ tagAttributes, values, fields, widgetType, fallbackMode, }: {
     tagAttributes: any;

package/dist/helpers/attributeParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attributeParser.d.ts","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,MAAM,WAAW,MAAM,GAAG,OAAO,GAAG,MAAM,YAGtD,CAAC;AAuDF,QAAA,MAAM,eAAe,WAAY,MAAM,KAAG,MAEzC,CAAC;AAoHF,eAAO,MAAM,mBAAmB;WAKvB,MAAM;YACL,GAAG;YACH,GAAG;6BAsCZ,CAAC;AAEF,QAAA,MAAM,kBAAkB;mBAOP,GAAG;YACV,GAAG;YACH,GAAG;;;SAuCZ,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"attributeParser.d.ts","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,MAAM,WAAW,MAAM,GAAG,OAAO,GAAG,MAAM,YAGtD,CAAC;AAuDF,QAAA,MAAM,eAAe,WAAY,MAAM,KAAG,MAEzC,CAAC;AAoHF,eAAO,MAAM,mBAAmB;WAMvB,MAAM;YACL,GAAG;YACH,GAAG;;6BAkDZ,CAAC;AAEF,QAAA,MAAM,kBAAkB;mBAOP,GAAG;YACV,GAAG;YACH,GAAG;;;SAwCZ,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC"}

package/dist/ooui.es.js

@@ -177,41 +177,44 @@ const ge = (i = !1) => (i = JSON.parse(i.toString().toLowerCase()), +i > 0), me
   fields: e,
   widgetType: s
 }) => {
-  const u = i.replace(/\(/g, "[").replace(/\)/g, "]").replace(/'/g, '"').replace(/True/g, "true").replace(/False/g, "false"), _ = b(u), h = JSON.parse(_), d = {};
-  for (const f of Object.keys(h)) {
-    const x = h[f].map((y) => me({ entry: y, values: t, fields: e })).every((y) => y);
+  const h = i.replace(/\(/g, "[").replace(/\)/g, "]").replace(/'/g, '"').replace(/True/g, "true").replace(/False/g, "false"), _ = b(h), u = JSON.parse(_), d = {};
+  for (const f of Object.keys(u)) {
+    const x = u[f].map((y) => me({ entry: y, values: t, fields: e })).every((y) => y);
     x ? d[f] = !0 : f === "readonly" && !x && s === "button" && (d[f] = !1);
   }
   return d;
 }, ye = ({
   attrs: i,
   values: t,
-  fields: e
+  fields: e,
+  widgetType: s
 }) => {
   try {
-    const s = b(i), r = JSON.parse(
-      s.replace(/'/g, '"')
-    ), a = {};
-    for (const l of Object.keys(r))
-      a[l] = fe({
+    const r = b(i), a = JSON.parse(
+      r.replace(/'/g, '"')
+    ), l = {};
+    for (const o of Object.keys(a)) {
+      const h = fe({
         object: t,
-        condition: r[l],
+        condition: a[o],
         evaluateFieldComparison: ({
-          fieldName: o,
+          fieldName: _,
           valueInObject: u,
-          expectedValue: _
+          expectedValue: d
         }) => q({
-          fieldName: o,
+          fieldName: _,
           valueInObject: u,
-          expectedValue: _,
+          expectedValue: d,
           fields: e
         })
       });
-    return a;
-  } catch (s) {
-    throw console.error(s), s instanceof SyntaxError ? new Error(
+      h ? l[o] = !0 : o === "readonly" && !h && s === "button" && (l[o] = !1);
+    }
+    return l;
+  } catch (r) {
+    throw console.error(r), r instanceof SyntaxError ? new Error(
       "Error parsing new json_attrs. Original string: " + i
-    ) : s;
+    ) : r;
   }
 }, xe = ({
   tagAttributes: i,
@@ -231,7 +234,8 @@ const ge = (i = !1) => (i = JSON.parse(i.toString().toLowerCase()), +i > 0), me
       a = ye({
         attrs: i.json_attrs,
         values: t,
-        fields: e
+        fields: e,
+        widgetType: s
       });
     } catch (o) {
       if (r && i.attrs)
@@ -1523,15 +1527,15 @@ const He = ({
   const r = {}, a = {};
   for (const o of Object.keys(s))
     if (t.state === o) {
-      const u = s[o];
-      for (const _ of u) {
-        const [h, d] = _;
-        a[h] || (a[h] = []), a[h].push(d);
+      const h = s[o];
+      for (const _ of h) {
+        const [u, d] = _;
+        a[u] || (a[u] = []), a[u].push(d);
       }
     }
   for (const o of Object.keys(a)) {
-    const u = a[o];
-    r[o] = u.some((_) => _);
+    const h = a[o];
+    r[o] = h.some((_) => _);
   }
   return r;
 }, Qe = ({
@@ -1728,14 +1732,14 @@ class Ft {
   }
   parse(t, e) {
     var o;
-    const { values: s = {}, readOnly: r = !1 } = e || {}, a = Y.parse(t).filter((u) => u.tagName === "form")[0];
+    const { values: s = {}, readOnly: r = !1 } = e || {}, a = Y.parse(t).filter((h) => h.tagName === "form")[0];
     this._string = ((o = a.attributes) == null ? void 0 : o.string) || null, this._string && (this._string = b(this._string)), this._readOnly = r, this._context = s.id ? { active_id: s.id, active_ids: [s.id] } : {}, this._invisibleFields = [], this.parseNode({
       fields: a.children,
       container: this._container,
       values: s
-    }), Ke(this._container._rows).forEach((u) => {
-      const _ = u;
-      _._id && _._context && (this._contextForFields[_._id] = u._context);
+    }), Ke(this._container._rows).forEach((h) => {
+      const _ = h;
+      _._id && _._context && (this._contextForFields[_._id] = h._context);
     });
   }
   parseNode({
@@ -1746,8 +1750,8 @@ class Ft {
     const r = new G();
     t.filter((a) => typeof a == "object").forEach((a) => {
       var w, F;
-      const { tagName: l, attributes: o, children: u } = a;
-      let _ = l, h = o;
+      const { tagName: l, attributes: o, children: h } = a;
+      let _ = l, u = o;
       if (l === "field") {
         const { name: v, widget: I } = o;
         if (I)
@@ -1759,37 +1763,37 @@ class Ft {
             );
           _ = this._fields[v].type;
         }
-        h = {
+        u = {
           ...this._fields[v],
           ...o,
           fieldsWidgetType: this._fields[v].type
         };
       }
       const d = xe({
-        tagAttributes: h,
+        tagAttributes: u,
         values: s,
         fields: this._fields,
         widgetType: l
       });
       let f;
-      l === "button" && h.states ? f = Qe({
-        states: h.states,
+      l === "button" && u.states ? f = Qe({
+        states: u.states,
         values: s
       }) : f = He({
-        fieldName: h.name,
+        fieldName: u.name,
         values: s,
         fields: this._fields
       });
       const c = Z({
-        context: h.context || ((w = this._fields[h.name]) == null ? void 0 : w.context),
+        context: u.context || ((w = this._fields[u.name]) == null ? void 0 : w.context),
         values: s,
         fields: this._fields
       });
-      h.on_change && (this._onChangeFields[h.name] = Ue(
-        h.on_change
+      u.on_change && (this._onChangeFields[u.name] = Ue(
+        u.on_change
       ));
       let m;
-      R(h.domain) && (m = h.domain), R((F = this._fields[h.name]) == null ? void 0 : F.domain) && (m = this._fields[h.name].domain), this._keyIdx = this._keyIdx + 1;
+      R(u.domain) ? m = u.domain : R((F = this._fields[u.name]) == null ? void 0 : F.domain) && (m = this._fields[u.name].domain), this._keyIdx = this._keyIdx + 1;
       const x = {
         ...d,
         ...f,
@@ -1800,7 +1804,7 @@ class Ft {
       e.readOnly && (x.readonly = !0);
       const y = r.createWidget(_, x);
       y.invisible && y instanceof g && this._invisibleFields.push(x.name), y instanceof p && this.parseNode({
-        fields: u,
+        fields: h,
         container: y.container,
         values: s
       }), y instanceof Q && y.readOnly !== void 0 || (y.readOnly = y.readOnly || this.readOnly), e.addWidget(y);
@@ -1889,27 +1893,27 @@ class Ct {
       const { tagName: a, attributes: l } = r;
       let o = null;
       if (a === "field") {
-        const { name: u, widget: _ } = l;
-        let h = l;
-        if (u) {
-          if (!this._fields[u])
-            throw new Error(`Field ${u} doesn't exist in fields defintion`);
-          const d = this._fields[u];
+        const { name: h, widget: _ } = l;
+        let u = l;
+        if (h) {
+          if (!this._fields[h])
+            throw new Error(`Field ${h} doesn't exist in fields defintion`);
+          const d = this._fields[h];
           o = d.type, (Array.isArray(d == null ? void 0 : d.domain) && (d == null ? void 0 : d.domain.length) === 0 || (d == null ? void 0 : d.domain) === !1) && l.domain && l.domain.length > 0 && delete d.domain;
           const f = Z({
             context: l.context || d.context,
             values: {},
             fields: this._fields
           });
-          h = {
+          u = {
             ...d,
             ...l,
             fieldsWidgetType: d == null ? void 0 : d.type,
             context: f
-          }, this._contextForFields[u] = f;
+          }, this._contextForFields[h] = f;
         }
-        if (_ && (o = _), !h.invisible) {
-          const d = s.createWidget(o, h);
+        if (_ && (o = _), !u.invisible) {
+          const d = s.createWidget(o, u);
           this._columns.push(d);
         }
       }
@@ -2004,11 +2008,11 @@ const Ot = ({
     if (!Array.isArray(s))
       return;
     const [r, a, l] = s;
-    let o, u;
-    r.indexOf(".") !== -1 ? (o = r.substr(0, r.indexOf(".")), u = r.substr(
+    let o, h;
+    r.indexOf(".") !== -1 ? (o = r.substr(0, r.indexOf(".")), h = r.substr(
       r.indexOf(".") + 1,
       r.length - 1
-    )) : (o = r, u = "id"), o === t && e.push([u, a, l]);
+    )) : (o = r, h = "id"), o === t && e.push([h, a, l]);
   }), e;
 }, Tt = (i) => typeof i != "string" ? [] : i.replace(/[()[\]]/g, "").split(",").map((t) => t.trim()).filter((t) => !t.includes("'"));
 class et {
@@ -2122,7 +2126,7 @@ const st = (i) => {
   let e;
   if (i.forEach((s) => {
     if (s.tagName === "field") {
-      const r = s.attributes.axis, a = s.attributes.operator, l = s.attributes.name, o = s.attributes.label || void 0, u = s.attributes.stacked || void 0;
+      const r = s.attributes.axis, a = s.attributes.operator, l = s.attributes.name, o = s.attributes.label || void 0, h = s.attributes.stacked || void 0;
       if (!r)
         throw new Error(`Field ${l} doesn't have an axis`);
       if (!l)
@@ -2134,7 +2138,7 @@ const st = (i) => {
           name: l,
           operator: a,
           label: o,
-          stacked: u
+          stacked: h
         })
       );
     }
@@ -2272,12 +2276,12 @@ function ct({
     groupBy: "type-stacked"
   }), a = `${t}s`;
   return Object.keys(r).forEach((o) => {
-    const u = r[o];
-    for (let _ = 0; _ < u.length; _++) {
-      const h = u[_];
-      if (s.push(h), _ === u.length - 1)
+    const h = r[o];
+    for (let _ = 0; _ < h.length; _++) {
+      const u = h[_];
+      if (s.push(u), _ === h.length - 1)
         return;
-      const d = h.x, f = u[_ + 1].x;
+      const d = u.x, f = h[_ + 1].x;
       if (!re([d, f], a)) {
         const c = dt({
           dates: [d, f],
@@ -2288,13 +2292,13 @@ function ct({
           c.map((m) => ({
             x: m,
             value: 0,
-            type: h.type,
-            stacked: h.stacked
+            type: u.type,
+            stacked: u.stacked
           }))
         );
       }
     }
-  }), s.sort((o, u) => o.x < u.x ? -1 : o.x > u.x ? 1 : 0);
+  }), s.sort((o, h) => o.x < h.x ? -1 : o.x > h.x ? 1 : 0);
 }
 function dt({
   dates: i,
@@ -2306,13 +2310,13 @@ function dt({
     return i;
   const a = i.sort((l, o) => l < o ? -1 : l > o ? 1 : 0);
   for (let l = 0; l < a.length - 1; l++) {
-    const o = a[l], u = a[l + 1];
-    if (!re([o, u], r)) {
+    const o = a[l], h = a[l + 1];
+    if (!re([o, h], r)) {
       const _ = P(o, S(r)).add(
         e,
         r
-      ), h = P(u, S(r));
-      for (; _.isBefore(h); )
+      ), u = P(h, S(r));
+      for (; _.isBefore(u); )
         s.push(_.format(S(r))), _.add(e, r);
     }
   }
@@ -2330,13 +2334,13 @@ function ut({
     groupBy: "all"
   });
   return Object.keys(r).forEach((a) => {
-    const l = r[a], o = l[0].operator === "count" ? "+" : l[0].operator, u = V({
+    const l = r[a], o = l[0].operator === "count" ? "+" : l[0].operator, h = V({
       values: l.map((_) => _.value),
       operator: o
     });
     s.push({
       ...l[0],
-      value: u
+      value: h
     });
   }), s;
 }
@@ -2493,16 +2497,16 @@ const gt = {
   const l = i.y.some((c) => c.label !== void 0), o = i.y.some((c) => c.stacked !== void 0);
   let _ = [...a.sort((c, m) => c.x < m.x ? -1 : c.x > m.x ? 1 : 0)];
   o && i.y.filter((c) => c.stacked !== void 0).length > 1 && (_ = _.map((c) => ({ ...c, type: `${c.type} - ${c.stacked}` })));
-  let h = [..._];
-  i.type === "pie" && h.some((c) => c.x === !1) ? h = h.map((c) => c.x === !1 ? { ...c, x: (s == null ? void 0 : s.uninformedString) || "Not informed" } : c) : _.some((c) => c.x === !1) && (h = h.filter(
+  let u = [..._];
+  i.type === "pie" && u.some((c) => c.x === !1) ? u = u.map((c) => c.x === !1 ? { ...c, x: (s == null ? void 0 : s.uninformedString) || "Not informed" } : c) : _.some((c) => c.x === !1) && (u = u.filter(
     (c) => c.x !== !1
   ));
-  let d = h;
+  let d = u;
   i.timerange ? d = ot({
     values: d,
     timerange: i.timerange,
     interval: i.interval
-  }) : i.type == "pie" && (d = h.sort((c, m) => m.value - c.value));
+  }) : i.type == "pie" && (d = u.sort((c, m) => m.value - c.value));
   const f = {
     data: d,
     isGroup: o || l,