@gisce/ooui 2.3.0 → 2.4.0

package/dist/Graph/Graph.d.ts

@@ -7,6 +7,8 @@ export declare class Graph {
     get type(): GraphType | undefined;
     _timerange: string | null;
     get timerange(): string | null;
+    _interval: number;
+    get interval(): number;
     constructor(element: ParsedNode);
 }
 //# sourceMappingURL=Graph.d.ts.map

package/dist/Graph/Graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Graph.d.ts","sourceRoot":"","sources":["../../src/Graph/Graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,gBAAgB,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAEhF,qBAAa,KAAK;IAChB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC9B,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,IAAI,IAAI,IAAI,SAAS,GAAG,SAAS,CAEhC;IAED,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IACjC,IAAI,SAAS,IAAI,MAAM,GAAG,IAAI,CAE7B;gBAEW,OAAO,EAAE,UAAU;CAIhC"}
+{"version":3,"file":"Graph.d.ts","sourceRoot":"","sources":["../../src/Graph/Graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,gBAAgB,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAEhF,qBAAa,KAAK;IAChB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC9B,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,IAAI,IAAI,IAAI,SAAS,GAAG,SAAS,CAEhC;IAED,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IACjC,IAAI,SAAS,IAAI,MAAM,GAAG,IAAI,CAE7B;IAED,SAAS,EAAE,MAAM,CAAK;IACtB,IAAI,QAAQ,IAAI,MAAM,CAErB;gBAEW,OAAO,EAAE,UAAU;CAOhC"}

package/dist/Graph/processor/graphProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphProcessor.d.ts","sourceRoot":"","sources":["../../../src/Graph/processor/graphProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAItD,MAAM,MAAM,aAAa,GAAG,MAAM,CAChC,MAAM,EACN;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;CAAE,CACvD,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;CAQ7B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,gBAAgB;UAMrB,UAAU;YACR,MAAM,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1B,OAAO,MAAM,EAAE,GAAG,CAAC;;;;;;CAoJ5B,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,SAAS,EACT,MAAM,GACP,EAAE;IACD,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,SAYA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,CAAC;CACf,UAsCA;AAMD,wBAAgB,uBAAuB,CAAC,EACtC,SAAS,EACT,MAAM,EACN,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,iBAkBA;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,aAAa,SAOlE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,KAAK,EACL,MAAM,GACP,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,OAUA"}
+{"version":3,"file":"graphProcessor.d.ts","sourceRoot":"","sources":["../../../src/Graph/processor/graphProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAItD,MAAM,MAAM,aAAa,GAAG,MAAM,CAChC,MAAM,EACN;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;CAAE,CACvD,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;CAQ7B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,gBAAgB;UAMrB,UAAU;YACR,MAAM,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1B,OAAO,MAAM,EAAE,GAAG,CAAC;;;;;;CAqJ5B,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,SAAS,EACT,MAAM,GACP,EAAE;IACD,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,SAYA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,CAAC;CACf,UAsCA;AAMD,wBAAgB,uBAAuB,CAAC,EACtC,SAAS,EACT,MAAM,EACN,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,iBAkBA;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,aAAa,SAOlE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,KAAK,EACL,MAAM,GACP,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B,OAUA"}

package/dist/Graph/processor/timerangeHelper.d.ts

@@ -1,14 +1,17 @@
-export declare function processTimerangeData({ values, timerange, }: {
+export declare function processTimerangeData({ values, timerange, interval, }: {
     values: any[];
     timerange: string;
+    interval?: number;
 }): any[];
-export declare function fillGapsInTimerangeData({ values, timerange, }: {
+export declare function fillGapsInTimerangeData({ values, timerange, interval, }: {
     values: any[];
     timerange: string;
+    interval?: number;
 }): any[];
-export declare function getMissingConsecutiveDates({ dates, timerange, }: {
+export declare function getMissingConsecutiveDates({ dates, timerange, interval, }: {
     dates: string[];
     timerange: string;
+    interval?: number;
 }): string[];
 export declare function combineValuesForTimerange({ values, timerange, }: {
     values: any[];

package/dist/Graph/processor/timerangeHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timerangeHelper.d.ts","sourceRoot":"","sources":["../../../src/Graph/processor/timerangeHelper.ts"],"names":[],"mappings":"AAGA,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,SAaA;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,SAqDA;AAED,wBAAgB,0BAA0B,CAAC,EACzC,KAAK,EACL,SAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,YAiCA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,SA6BA;AAED,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,SAUA;AAED,wBAAgB,8BAA8B,CAAC,EAC7C,IAAI,EACJ,SAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,UA0BA;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,wCAEzC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,WAyBtD;AAED,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,OAAO,GACR,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,OAAO,EAAE,KAAK,GAAG,cAAc,CAAC;CACjC,uBAcA;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,sEAmB9C"}
+{"version":3,"file":"timerangeHelper.d.ts","sourceRoot":"","sources":["../../../src/Graph/processor/timerangeHelper.ts"],"names":[],"mappings":"AAGA,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,SAAS,EACT,QAAY,GACb,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,SAcA;AAED,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,SAAS,EACT,QAAY,GACb,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,SAsDA;AAED,wBAAgB,0BAA0B,CAAC,EACzC,KAAK,EACL,SAAS,EACT,QAAY,GACb,EAAE;IACD,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,YAoCA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,SA6BA;AAED,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,SAAS,GACV,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,SAUA;AAED,wBAAgB,8BAA8B,CAAC,EAC7C,IAAI,EACJ,SAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,UA0BA;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,wCAEzC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,WAyBtD;AAED,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,OAAO,GACR,EAAE;IACD,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,OAAO,EAAE,KAAK,GAAG,cAAc,CAAC;CACjC,uBAcA;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,sEAmB9C"}

package/dist/ooui.es.js

@@ -170,12 +170,12 @@ const he = (s = !1) => (s = JSON.parse(s.toString().toLowerCase()), +s > 0), _e
   fields: e,
   widgetType: i
 }) => {
-  const h = s.replace(/\(/g, "[").replace(/\)/g, "]").replace(/'/g, '"').replace(/True/g, "true").replace(/False/g, "false"), _ = b(h), u = JSON.parse(_), d = {};
-  for (const c of Object.keys(u)) {
-    const y = u[c].map((m) => _e({ entry: m, values: t, fields: e })).every((m) => m);
-    y ? d[c] = !0 : c === "readonly" && !y && i === "button" && (d[c] = !1);
+  const h = s.replace(/\(/g, "[").replace(/\)/g, "]").replace(/'/g, '"').replace(/True/g, "true").replace(/False/g, "false"), _ = b(h), d = JSON.parse(_), u = {};
+  for (const c of Object.keys(d)) {
+    const p = d[c].map((m) => _e({ entry: m, values: t, fields: e })).every((m) => m);
+    p ? u[c] = !0 : c === "readonly" && !p && i === "button" && (u[c] = !1);
   }
-  return d;
+  return u;
 }, ge = ({
   attrs: s,
   values: t,
@@ -1445,8 +1445,8 @@ const $e = ({
     if (t.state === o) {
       const h = i[o];
       for (const _ of h) {
-        const [u, d] = _;
-        a[u] || (a[u] = []), a[u].push(d);
+        const [d, u] = _;
+        a[d] || (a[d] = []), a[d].push(u);
       }
     }
   for (const o of Object.keys(a)) {
@@ -1487,16 +1487,16 @@ const Je = ({
       return i;
     if (s.trim().length === 0)
       return;
-    const d = s.replace(/"/g, "'").replace(/\s/g, "").replace(/True/g, "true").replace(/False/g, "false").replace(/\{/g, "").replace(/\}/g, "").split(",").map((f) => f.split(":")), c = {};
-    return d.forEach((f) => {
-      const p = f[1];
+    const u = s.replace(/"/g, "'").replace(/\s/g, "").replace(/True/g, "true").replace(/False/g, "false").replace(/\{/g, "").replace(/\}/g, "").split(",").map((f) => f.split(":")), c = {};
+    return u.forEach((f) => {
+      const y = f[1];
       if (!f[1].includes("'") && f[1] !== "true" && f[1] !== "false") {
-        const y = qe({
+        const p = qe({
           values: t,
           fields: e,
-          fieldName: p === "active_id" ? "id" : p
+          fieldName: y === "active_id" ? "id" : y
         });
-        c[f[0].replace(/'/g, "")] = y || void 0;
+        c[f[0].replace(/'/g, "")] = p || void 0;
       } else
         f[1] === "true" ? c[f[0].replace(/'/g, "")] = !0 : f[1] === "false" ? c[f[0].replace(/'/g, "")] = !1 : c[f[0].replace(/'/g, "")] = f[1].replace(
           /'/g,
@@ -1509,8 +1509,8 @@ const Je = ({
 }, yt = (s) => {
   const t = [];
   try {
-    return !s || ee(s) || typeof s != "string" ? t : Z(s) !== null ? [] : (s.trim().length === 0 || s.replace(/"/g, "'").replace(/\s/g, "").replace(/True/g, "true").replace(/False/g, "false").replace(/\{/g, "").replace(/\}/g, "").split(",").map((d) => d.split(":")).forEach((d) => {
-      !d[1].includes("'") && d[1] !== "true" && d[1] !== "false" && t.push(d[1].replace(/'/g, ""));
+    return !s || ee(s) || typeof s != "string" ? t : Z(s) !== null ? [] : (s.trim().length === 0 || s.replace(/"/g, "'").replace(/\s/g, "").replace(/True/g, "true").replace(/False/g, "false").replace(/\{/g, "").replace(/\}/g, "").split(",").map((u) => u.split(":")).forEach((u) => {
+      !u[1].includes("'") && u[1] !== "true" && u[1] !== "false" && t.push(u[1].replace(/'/g, ""));
     }), t);
   } catch {
   }
@@ -1642,7 +1642,7 @@ class pt {
     t.filter((a) => typeof a == "object").forEach((a) => {
       var w, P;
       const { tagName: l, attributes: o, children: h } = a;
-      let _ = l, u = o;
+      let _ = l, d = o;
       if (l === "field") {
         const { name: x, widget: z } = o;
         if (z)
@@ -1654,47 +1654,47 @@ class pt {
             );
           _ = this._fields[x].type;
         }
-        u = {
+        d = {
           ...this._fields[x],
           ...o,
           fieldsWidgetType: this._fields[x].type
         };
       }
-      const d = me({
-        tagAttributes: u,
+      const u = me({
+        tagAttributes: d,
         values: i,
         fields: this._fields,
         widgetType: l
       });
       let c;
-      l === "button" && u.states ? c = Re({
-        states: u.states,
+      l === "button" && d.states ? c = Re({
+        states: d.states,
         values: i
       }) : c = $e({
-        fieldName: u.name,
+        fieldName: d.name,
         values: i,
         fields: this._fields
       });
       const f = Je({
-        context: u.context || ((w = this._fields[u.name]) == null ? void 0 : w.context),
+        context: d.context || ((w = this._fields[d.name]) == null ? void 0 : w.context),
         values: i,
         fields: this._fields
       });
-      u.on_change && (this._onChangeFields[u.name] = He(
-        u.on_change
+      d.on_change && (this._onChangeFields[d.name] = He(
+        d.on_change
       ));
-      let p;
-      R(u.domain) && (p = u.domain), R((P = this._fields[u.name]) == null ? void 0 : P.domain) && (p = this._fields[u.name].domain), this._keyIdx = this._keyIdx + 1;
-      const y = {
-        ...d,
+      let y;
+      R(d.domain) && (y = d.domain), R((P = this._fields[d.name]) == null ? void 0 : P.domain) && (y = this._fields[d.name].domain), this._keyIdx = this._keyIdx + 1;
+      const p = {
+        ...u,
         ...c,
         context: f,
-        domain: p,
+        domain: y,
         key: `${this._keyIdx}`
       };
-      e.readOnly && (y.readonly = !0);
-      const m = r.createWidget(_, y);
-      m.invisible && m instanceof g && this._invisibleFields.push(y.name), m instanceof C && this.parseNode({
+      e.readOnly && (p.readonly = !0);
+      const m = r.createWidget(_, p);
+      m.invisible && m instanceof g && this._invisibleFields.push(p.name), m instanceof C && this.parseNode({
         fields: h,
         container: m.container,
         values: i
@@ -1765,20 +1765,20 @@ class xt {
       let o = null;
       if (a === "field") {
         const { name: h, widget: _ } = l;
-        let u = l;
+        let d = 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, u = {
-            ...d,
+          const u = this._fields[h];
+          o = u.type, (Array.isArray(u == null ? void 0 : u.domain) && (u == null ? void 0 : u.domain.length) === 0 || (u == null ? void 0 : u.domain) === !1) && l.domain && l.domain.length > 0 && delete u.domain, d = {
+            ...u,
             ...l,
-            fieldsWidgetType: d == null ? void 0 : d.type
+            fieldsWidgetType: u == null ? void 0 : u.type
           };
         }
-        if (_ && (o = _), !u.invisible) {
-          const d = i.createWidget(o, u);
-          this._columns.push(d);
+        if (_ && (o = _), !d.invisible) {
+          const u = i.createWidget(o, d);
+          this._columns.push(u);
         }
       }
     });
@@ -1915,7 +1915,8 @@ class te {
     n(this, "_string", null);
     n(this, "_type");
     n(this, "_timerange", null);
-    this._string = t.attributes.string || null, this._timerange = t.attributes.timerange || null;
+    n(this, "_interval", 1);
+    this._string = t.attributes.string || null, this._timerange = t.attributes.timerange || null, t.attributes.interval && (this._interval = parseInt(t.attributes.interval));
   }
   get string() {
     return this._string;
@@ -1926,6 +1927,9 @@ class te {
   get timerange() {
     return this._timerange;
   }
+  get interval() {
+    return this._interval;
+  }
 }
 const Ue = (s) => s === 1 || s === "1" || s === !0 || s === "True";
 class se extends te {
@@ -2105,67 +2109,75 @@ const Ot = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
 }, Symbol.toStringTag, { value: "Module" }));
 function nt({
   values: s,
-  timerange: t
+  timerange: t,
+  interval: e = 1
 }) {
-  const e = lt({
+  const i = lt({
     values: s,
     timerange: t
   });
   return rt({
-    values: e,
-    timerange: t
+    values: i,
+    timerange: t,
+    interval: e
   });
 }
 function rt({
   values: s,
-  timerange: t
+  timerange: t,
+  interval: e = 1
 }) {
-  let e = [];
-  const i = re({
+  let i = [];
+  const r = re({
     values: s,
     groupBy: "type-stacked"
-  }), r = `${t}s`;
-  return Object.keys(i).forEach((l) => {
-    const o = i[l];
-    for (let h = 0; h < o.length; h++) {
-      const _ = o[h];
-      if (e.push(_), h === o.length - 1)
+  }), a = `${t}s`;
+  return Object.keys(r).forEach((o) => {
+    const h = r[o];
+    for (let _ = 0; _ < h.length; _++) {
+      const d = h[_];
+      if (i.push(d), _ === h.length - 1)
         return;
-      const u = _.x, d = o[h + 1].x;
-      if (!ne([u, d], r)) {
-        const c = at({
-          dates: [u, d],
-          timerange: t
+      const u = d.x, c = h[_ + 1].x;
+      if (!ne([u, c], a)) {
+        const f = at({
+          dates: [u, c],
+          timerange: t,
+          interval: e
         });
-        e = e.concat(
-          c.map((f) => ({
-            x: f,
+        i = i.concat(
+          f.map((y) => ({
+            x: y,
             value: 0,
-            type: _.type,
-            stacked: _.stacked
+            type: d.type,
+            stacked: d.stacked
           }))
         );
       }
     }
-  }), e.sort((l, o) => l.x < o.x ? -1 : l.x > o.x ? 1 : 0);
+  }), i.sort((o, h) => o.x < h.x ? -1 : o.x > h.x ? 1 : 0);
 }
 function at({
   dates: s,
-  timerange: t
+  timerange: t,
+  interval: e = 1
 }) {
-  const e = [], i = `${t}s`;
+  const i = [], r = `${t}s`;
   if (s.length === 1)
     return s;
-  const r = s.sort((a, l) => a < l ? -1 : a > l ? 1 : 0);
-  for (let a = 0; a < r.length - 1; a++) {
-    const l = r[a], o = r[a + 1];
-    if (!ne([l, o], i)) {
-      const h = E(l, I(i)).add(1, i), _ = E(o, I(i));
-      for (; h.isBefore(_); )
-        e.push(h.format(I(i))), h.add(1, i);
+  const a = s.sort((l, o) => l < o ? -1 : l > o ? 1 : 0);
+  for (let l = 0; l < a.length - 1; l++) {
+    const o = a[l], h = a[l + 1];
+    if (!ne([o, h], r)) {
+      const _ = E(o, I(r)).add(
+        e,
+        r
+      ), d = E(h, I(r));
+      for (; _.isBefore(d); )
+        i.push(_.format(I(r))), _.add(e, r);
     }
   }
-  return e;
+  return i;
 }
 function lt({
   values: s,
@@ -2293,11 +2305,11 @@ const ut = {
   }), a = [];
   s.y.forEach((c) => {
     Object.keys(r).forEach((f) => {
-      const p = r[f].label, y = r[f].entries;
+      const y = r[f].label, p = r[f].entries;
       if (c.label) {
         const m = A({
           fieldName: c.label,
-          values: y,
+          values: p,
           fields: e
         });
         Object.keys(m).forEach((w) => {
@@ -2310,7 +2322,7 @@ const ut = {
             operator: c.operator
           });
           a.push({
-            x: p || !1,
+            x: y || !1,
             value: le,
             type: x,
             operator: c.operator,
@@ -2319,7 +2331,7 @@ const ut = {
         });
       } else {
         const m = N({
-          entries: y,
+          entries: p,
           fields: e,
           fieldName: c.name
         }), w = V({
@@ -2327,7 +2339,7 @@ const ut = {
           operator: c.operator
         });
         a.push({
-          x: p || !1,
+          x: y || !1,
           value: w,
           type: ae({
             yAxis: c,
@@ -2342,16 +2354,17 @@ const ut = {
   const l = s.y.some((c) => c.label !== void 0), o = s.y.some((c) => c.stacked !== void 0);
   let _ = [...a.sort((c, f) => c.x < f.x ? -1 : c.x > f.x ? 1 : 0)];
   o && s.y.filter((c) => c.stacked !== void 0).length > 1 && (_ = _.map((c) => ({ ...c, type: `${c.type} - ${c.stacked}` })));
-  let u = [..._];
-  s.type === "pie" && u.some((c) => c.x === !1) ? u = u.map((c) => c.x === !1 ? { ...c, x: (i == null ? void 0 : i.uninformedString) || "Not informed" } : c) : _.some((c) => c.x === !1) && (u = u.filter(
+  let d = [..._];
+  s.type === "pie" && d.some((c) => c.x === !1) ? d = d.map((c) => c.x === !1 ? { ...c, x: (i == null ? void 0 : i.uninformedString) || "Not informed" } : c) : _.some((c) => c.x === !1) && (d = d.filter(
     (c) => c.x !== !1
   ));
-  let d = u;
-  return s.timerange ? d = nt({
-    values: d,
-    timerange: s.timerange
-  }) : s.type == "pie" && (d = u.sort((c, f) => f.value - c.value)), {
-    data: d,
+  let u = d;
+  return s.timerange ? u = nt({
+    values: u,
+    timerange: s.timerange,
+    interval: s.interval
+  }) : s.type == "pie" && (u = d.sort((c, f) => f.value - c.value)), {
+    data: u,
     isGroup: o || l,
     isStack: o
   };