@sisense/sdk-ui 1.29.0 → 1.31.0

package/dist/{widget-composer-G4mPX-JO.js → widget-composer-BrQ6SrZ6.js}

@@ -1,86 +1,90 @@
-var Y = Object.defineProperty;
-var w = Object.getOwnPropertySymbols;
-var U = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var C = (e, t, r) => t in e ? Y(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
+var J = Object.defineProperty, V = Object.defineProperties;
+var Z = Object.getOwnPropertyDescriptors;
+var W = Object.getOwnPropertySymbols;
+var H = Object.prototype.hasOwnProperty, X = Object.prototype.propertyIsEnumerable;
+var I = (e, t, r) => t in e ? J(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, d = (e, t) => {
   for (var r in t || (t = {}))
-    U.call(t, r) && C(e, r, t[r]);
-  if (w)
-    for (var r of w(t))
-      z.call(t, r) && C(e, r, t[r]);
+    H.call(t, r) && I(e, r, t[r]);
+  if (W)
+    for (var r of W(t))
+      X.call(t, r) && I(e, r, t[r]);
   return e;
-};
-import { cF as q, q as P, M as x, T as u, cG as J, cH as S, cI as L, ad as V, Y as H, af as G, p as D, cJ as X, P as Z, F as ee, aT as M } from "./derive-chart-family-Cy3hlluo.js";
-class Q extends q {
+}, T = (e, t) => V(e, Z(t));
+import { cM as $, h as G, M as E, T as m, cN as ee, cO as h, cP as j, ae as te, Z as re, ag as ae, m as C, cQ as ie, a4 as w, P as se, B as ne, aW as q } from "./derive-chart-family-D3iN--j2.js";
+class k extends $ {
   constructor(t, r) {
     var a;
-    super((a = t.jaql.title) !== null && a !== void 0 ? a : "", r), this.expression = t.jaql.dim || t.jaql.formula, this.metadataItem = t, t.jaql.agg ? this.aggregation = t.jaql.agg : delete this.aggregation, t.jaql.formula ? this.formula = t.jaql.formula : delete this.formula, t.jaql.sort ? this.sortType = P(t.jaql.sort) : delete this.sortType, this.skipValidation = !0;
+    super((a = t.jaql.title) !== null && a !== void 0 ? a : "", r), this.expression = t.jaql.dim || t.jaql.formula, this.metadataItem = t, t.jaql.agg ? this.aggregation = t.jaql.agg : delete this.aggregation, t.jaql.formula ? this.formula = t.jaql.formula : delete this.formula, t.jaql.sort ? this.sortType = G(t.jaql.sort) : delete this.sortType, this.skipValidation = !0;
   }
   get id() {
     return this.expression;
   }
-  jaql() {
-    return this.metadataItem;
+  jaql(t) {
+    return t === !0 ? this.metadataItem.jaql : this.metadataItem;
   }
 }
-const te = {
-  text: x.TextAttribute,
-  numeric: x.NumericAttribute,
-  datetime: x.DateLevel
+const oe = {
+  text: E.TextAttribute,
+  numeric: E.NumericAttribute,
+  datetime: E.DateLevel
 };
-function j(e) {
+function A(e) {
   var t;
-  return new Q(e, (t = te[e.jaql.datatype]) !== null && t !== void 0 ? t : "numeric");
+  return new k(e, (t = oe[e.jaql.datatype]) !== null && t !== void 0 ? t : "numeric");
 }
-const je = {
+const Ne = {
   jaql: { datasource: { title: "" }, metadata: [] },
-  widgetProps: void 0,
   queryTitle: "",
   chartRecommendations: {}
-}, Ae = {
+}, _e = {
   model: "",
   metadata: [],
   chart: {},
   queryTitle: ""
-}, Fe = (e) => "widgetProps" in e, re = (e) => "dashboardOid" in e && "widgetOid" in e;
-function ae(e) {
+}, Re = (e) => "widgetProps" in e, le = (e) => "dashboardOid" in e && "widgetOid" in e;
+function de(e) {
   return e.replace(/\s+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
-function ke(e) {
+function ze(e) {
   return e.charAt(0).toUpperCase() + e.slice(1);
 }
-function Ne(e) {
+function Ue(e) {
   const t = /\[(.+?)\s\(Calendar\)\]/;
   return e.replace(t, "[$1]").trim();
 }
-function Be(e) {
+function Ke(e) {
   if (e)
     if (e.metadata) {
       if (!e.model)
-        throw new u("errors.missingModelTitle");
+        throw new m("errors.missingModelTitle");
     } else
-      throw new u("errors.missingMetadata");
+      throw new m("errors.missingMetadata");
   else
-    throw new u("errors.emptyModel");
+    throw new m("errors.emptyModel");
   return e;
 }
-function ie(e) {
+function ue(e) {
   return !e || !e.jaql.datasource.title || !e.jaql.metadata.length;
 }
-function A(e) {
-  if (![...J, "pivot", "pivot2"].includes(e))
-    throw new u("errors.chartTypeNotSupported", { chartType: e });
+function B(e) {
+  if (![...ee, "pivot", "pivot2"].includes(e))
+    throw new m("errors.chartTypeNotSupported", { chartType: e });
 }
-function se(e) {
+function ce(e) {
   return "widgetType" in e && e.widgetType === "pivot";
 }
+function p(e) {
+  var t;
+  return "column" in e && ((t = e.column) == null ? void 0 : t.expression) && /\(.*\)/.test(e.column.expression);
+}
 function F(e) {
-  const t = "measures" in e && m(e.measures) || "values" in e && m(e.values);
-  return se(e) ? "values" in e.dataOptions && m(e.dataOptions.values) : "chartType" in e ? e.chartType === "scatter" ? "x" in e.dataOptions && "y" in e.dataOptions && (e.dataOptions.x !== void 0 || e.dataOptions.y !== void 0) : e.chartType === "scattermap" ? "geo" in e.dataOptions && m(e.dataOptions.geo) : "value" in e.dataOptions && m(e.dataOptions.value) : t;
+  const t = "measures" in e && o(e.measures) || "values" in e && o(e.values);
+  return ce(e) ? "values" in e.dataOptions && o(e.dataOptions.values) : "chartType" in e ? e.chartType === "indicator" ? "value" in e.dataOptions && o(e.dataOptions.value) || "secondary" in e.dataOptions && o(e.dataOptions.secondary) : e.chartType === "table" ? !("columns" in e.dataOptions) || !o(e.dataOptions.columns) ? !1 : e.dataOptions.columns.some((a) => p(a)) : e.chartType === "boxplot" ? !1 : e.chartType === "scatter" ? "x" in e.dataOptions && e.dataOptions.x !== void 0 && p(e.dataOptions.x) || "y" in e.dataOptions && e.dataOptions.y !== void 0 && p(e.dataOptions.y) || "size" in e.dataOptions && e.dataOptions.size !== void 0 : e.chartType === "scattermap" ? "colorBy" in e.dataOptions && e.dataOptions.colorBy !== void 0 && p(e.dataOptions.colorBy) || "details" in e.dataOptions && e.dataOptions.details !== void 0 && p(e.dataOptions.details) || "size" in e.dataOptions && e.dataOptions.size !== void 0 && p(e.dataOptions.size) : e.chartType === "areamap" ? "geo" in e.dataOptions && o(e.dataOptions.geo) && "color" in e.dataOptions && o(e.dataOptions.color) : "value" in e.dataOptions && o(e.dataOptions.value) : t;
 }
-function m(e) {
+function o(e) {
   return Array.isArray(e) && e.length > 0;
 }
-function oe(e) {
+function me(e) {
   const t = e.split(`
 `);
   for (let r = 0; r < t.length - 1; r++)
@@ -94,7 +98,7 @@ function oe(e) {
   return t.join(`
 `);
 }
-const ne = {
+const ge = {
   react: {
     baseChartTmpl: `import { {{componentString}} } from '@sisense/sdk-ui';
 {{extraImportsString}}
@@ -183,6 +187,7 @@ const CodeExample = () => {
 export default CodeExample;
 `,
     executePivotQueryTmpl: `import { useExecutePivotQuery, ExecutePivotQueryParams } from '@sisense/sdk-ui';
+{{extraImportsString}}
 import * as DM from './{{dataSourceString}}'; // generated with @sisense/sdk-cli
 
 const CodeExample = () => {
@@ -190,6 +195,7 @@ const CodeExample = () => {
       dataSource: DM.DataSource,
       rows: {{rowsString}},
       values: {{valuesString}},
+      filters: {{filtersString}},
     }
 
     const { data, isLoading, isError, error } = useExecutePivotQuery(pivotQueryProps);
@@ -201,7 +207,7 @@ const CodeExample = () => {
       return <div>Error: {error.message}</div>;
     }
     if (data) {
-      return <div>Total Rows: {data.rows.length}</div>;
+      return <div>Total Rows: {data.table.rows.length}</div>;
     }
 
     return null;
@@ -219,17 +225,20 @@ export default function CodeExample() {
       title={'{{titleString}}'}
       dataSource={DM.DataSource}
       dataOptions={ {{dataOptionsString}} }
+      filters={ {{filtersString}} }
     />
   );
 }`
   },
   angular: {
     baseChartTmpl: `import { Component } from '@angular/core';
+import { SdkUiModule, type ChartDataOptions } from '@sisense/sdk-ui-angular';
 {{extraImportsString}}
 import * as DM from './{{dataSourceString}}'; // generated with @sisense/sdk-cli
 
 @Component({
     selector: 'code-example',
+    imports: [SdkUiModule],
     template: \`
       <csdk-chart-widget
         chartType='{{chartTypeString}}'
@@ -241,15 +250,17 @@ import * as DM from './{{dataSourceString}}'; // generated with @sisense/sdk-cli
 })
 export class CodeExample {
     DM = DM;
-    dataOptions = {{dataOptionsString}};
+    dataOptions: ChartDataOptions = {{dataOptionsString}};
     filters = {{filtersString}};
 }`,
     chartTmpl: "{{baseChartTmpl}}",
     chartWidgetTmpl: "{{baseChartTmpl}}",
     widgetByIdTmpl: `import { Component } from '@angular/core';
+import { SdkUiModule } from '@sisense/sdk-ui-angular';
 
 @Component({
   selector: 'code-example',
+  imports: [SdkUiModule],
   template: \`
     <csdk-widget-by-id
       [widgetOid]="widgetOid"
@@ -265,11 +276,13 @@ export class CodeExample {
   includeDashboardFilters = true;
 }`,
     executeQueryByWidgetIdTmpl: `import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
 import { QueryService } from '@sisense/sdk-ui-angular';
 import { type QueryResultData } from '@sisense/sdk-data';
 
 @Component({
   selector: 'code-example',
+  imports: [CommonModule],
   template: \`<div>
     <div *ngIf="errorMessage">Error: {{ errorMessage }}</div>
     <div *ngIf="!errorMessage">Total Rows: {{ queryResult.rows.length }}</div>
@@ -299,6 +312,7 @@ export class CodeExample {
 }
 `,
     executeQueryTmpl: `import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
 {{extraImportsString}}
 import { type QueryResultData } from '@sisense/sdk-data';
 import * as DM from './{{dataSourceString}}'; // generated with @sisense/sdk-cli
@@ -306,6 +320,7 @@ import { QueryService } from '@sisense/sdk-ui-angular';
 
 @Component({
   selector: 'code-example',
+  imports: [CommonModule],
   template: \`<div>
     <div *ngIf="errorMessage">Error: {{ errorMessage }}</div>
     <div *ngIf="!errorMessage">Total Rows: {{ queryResult.rows.length }}</div>
@@ -413,130 +428,131 @@ const { data, isLoading, isError, error } = useExecuteQuery(queryProps);
     executePivotQueryTmpl: "Not implemented yet",
     pivotTableWidgetTmpl: "Not implemented yet"
   }
-}, k = (e, t) => ne[t][e].replace(
+}, N = (e, t) => ge[t][e].replace(
   /{{(.*?)Tmpl}}/g,
-  (a, s) => k(`${s}Tmpl`, t)
-), le = (e, t) => e.replace(/{{(.*?)}}/g, (r, a) => a in t ? t[a] : (console.warn(`Placeholder ${a} not found in data`), r)), b = (e, t, r = "react") => {
-  const a = k(e, r);
-  return oe(le(a, t));
-}, h = `
-`, E = "UNKNOWN", de = (e, t) => {
+  (a, i) => N(`${i}Tmpl`, t)
+), pe = (e, t) => e.replace(/{{(.*?)}}/g, (r, a) => a in t ? t[a] : (console.warn(`Placeholder ${a} not found in data`), r)), D = (e, t, r = "react") => {
+  const a = N(e, r);
+  return me(pe(a, t));
+}, x = `
+`, M = "UNKNOWN", fe = (e, t) => {
   let r = "";
   return r += `measureFactory.customFormula(
-`, r += " ".repeat(t), r += `  '${S(e.title)}',
+`, r += " ".repeat(t), r += `  '${h(e.title)}',
 `, r += " ".repeat(t), r += `  '${e.formula}',
 `, r += " ".repeat(t), r += `  {
-`, Object.entries(e.context).forEach(([a, s]) => {
-    const i = L(
-      s.table || E,
-      s.column || E,
+`, Object.entries(e.context).forEach(([a, i]) => {
+    const s = j(
+      i.table || M,
+      i.column || M,
       void 0,
       "DM"
     );
-    r += " ".repeat(t), r += `    '${a.slice(1, -1)}': ${i},
+    r += " ".repeat(t), r += `    '${a.slice(1, -1)}': ${s},
 `;
   }), r += " ".repeat(t), r += `  }
 `, r += " ".repeat(t), r += ")", r;
-}, ue = (e, t) => {
-  const { level: r, table: a, column: s, agg: i, sort: o, title: l } = e;
+}, ye = (e) => {
+  const { level: t, table: r, column: a, agg: i, title: s } = e;
   let n;
-  return a && s && (n = L(a, s, r, "DM")), i && a && s && l && (n = `measureFactory.${V.aggregationFromJAQL(
+  return r && a && (n = j(r, a, t, "DM")), i && r && a && s && (n = `measureFactory.${te.aggregationFromJAQL(
     i
-  )}(${n}, '${S(l)}')`), o && (n = `{column: ${n}, sortType: '${P(o)}'}`), n ? `${" ".repeat(t)}${n}` : E;
-}, ce = (e, t) => {
-  const r = e.jaql().jaql;
-  return "formula" in r ? de(r, t) : h + ue(r, t);
-}, p = (e, t = 0, r = !1) => {
+  )}(${n}, '${h(s)}')`), n || M;
+}, he = (e, t) => {
+  const r = e.jaql(!1).jaql;
+  return "formula" in r ? fe(r, t) : ye(r);
+}, f = (e, t = 0, r = !1) => {
   if (!e)
     return "";
   if (typeof e == "string")
-    return `'${S(e)}'`;
-  if (e instanceof Q)
-    return ce(e, t);
-  if (e instanceof q)
+    return `'${h(e)}'`;
+  if (e instanceof k)
+    return he(e, t);
+  if (e instanceof $)
     return e.composeCode || "";
   let a = "";
-  return Array.isArray(e) ? a += `[${e.map((s) => p(s, t + 2))}${e.length ? h + " ".repeat(t + 2) : ""}]` : (a += `{${h}`, Object.entries(e).forEach(([s, i]) => {
-    r && (s = `'${S(s)}'`), a += " ".repeat(t + 2), Array.isArray(i) ? a += `${s}: [${i.map((o) => p(o, t + 4, r))}${i.length ? h + " ".repeat(t + 2) : ""}]` : typeof i == "object" ? a += `${s}: ${p(i, t + 2, r)}` : ["number", "boolean", "undefined", null].includes(typeof i) ? a += `${s}: ${i}` : a += `${s}: '${S(i)}'`, a += `,${h}`;
+  return Array.isArray(e) ? a += `[${e.map((i) => f(i, t + 2))}${e.length ? x + " ".repeat(t + 2) : ""}]` : (a += `{${x}`, Object.entries(e).forEach(([i, s]) => {
+    r && (i = `'${h(i)}'`), a += " ".repeat(t + 2), Array.isArray(s) ? a += `${i}: [${s.map((n) => f(n, t + 4, r))}${s.length ? x + " ".repeat(t + 2) : ""}]` : typeof s == "object" ? a += `${i}: ${f(s, t + 2, r)}` : ["number", "boolean", "undefined", null].includes(typeof s) ? a += `${i}: ${s}` : a += `${i}: '${h(s)}'`, a += `,${x}`;
   }), a += " ".repeat(t), a += "}"), a;
 };
-function me(e) {
-  return p(e, 2);
+function Se(e) {
+  return f(e, 6);
 }
-function N(e) {
+function _(e) {
   if (!e)
-    throw new u("errors.undefinedDataSource");
+    throw new m("errors.undefinedDataSource");
   let t;
-  return typeof e == "object" && "title" in e ? t = e.title : t = e, ae(t);
+  return typeof e == "object" && "title" in e ? t = e.title : t = e, de(t);
 }
-function B(e, t = !0) {
+function R(e, t = !0) {
   const r = [];
-  return t && r.push("measureFactory"), m(e) && r.push("filterFactory"), r.length > 0 ? `import { ${r.join(", ")} } from '@sisense/sdk-data';` : "";
+  return t && r.push("measureFactory"), o(e) && r.push("filterFactory"), r.length > 0 ? `import { ${r.join(", ")} } from '@sisense/sdk-data';` : "";
 }
-const I = `
-`, pe = (e, t) => {
+const P = `
+`, Oe = (e, t) => {
   if (e.composeCode)
-    return `${I}${" ".repeat(t)}${e.composeCode}`;
+    return `${P}${" ".repeat(t)}${e.composeCode}`;
   const r = e.jaql().jaql;
-  return `${I}${" ".repeat(t)}filterFactory.customFilter(${p(
+  return `${P}${" ".repeat(t)}filterFactory.customFilter(${f(
     r,
     t,
     !0
   )})`;
-}, ge = (e, t = 0) => {
+}, ve = (e, t = 0) => {
   if (!e)
     return "";
   let r = "";
-  return r += `[${e.map((a) => pe(a, t + 2))}${e.length ? `
+  return r += `[${e.map((a) => Oe(a, t + 2))}${e.length ? `
 ` + " ".repeat(t + 2) : ""}]`, r;
-}, fe = (e) => {
+}, z = (e) => {
   if (!e)
     return "";
   if (Array.isArray(e))
-    return ge(e, 2);
-  throw new u("errors.filterRelationsNotSupported");
-}, ye = ["executeQueryByWidgetIdTmpl", "widgetByIdTmpl"], he = "chartWidgetTmpl", Se = "pivotTableWidgetTmpl", Te = (e) => e, ve = (e, t, r) => {
-  const a = F(e), s = {
+    return ve(e, 6);
+  throw new m("errors.filterRelationsNotSupported");
+}, Te = ["executeQueryByWidgetIdTmpl", "widgetByIdTmpl"], xe = "chartWidgetTmpl", be = "pivotTableWidgetTmpl", Ee = (e) => e, Ce = (e, t, r) => {
+  const a = F(e), i = {
     titleString: e.title,
-    dataSourceString: N(e.dataSource),
-    chartTypeString: Te(e.chartType),
-    dataOptionsString: me(e.dataOptions),
-    filtersString: fe(e.filters),
+    dataSourceString: _(e.dataSource),
+    chartTypeString: Ee(e.chartType),
+    dataOptionsString: Se(e.dataOptions),
+    filtersString: z(e.filters),
     componentString: "ChartWidget",
-    extraImportsString: B(e.filters || [], a)
+    extraImportsString: R(e.filters || [], a)
   };
-  return b(r, s, t);
-}, Oe = (e, t, r) => {
-  const a = F(e), s = {
+  return D(r, i, t);
+}, we = (e, t, r) => {
+  const a = F(e), i = {
     titleString: e.title,
-    dataSourceString: N(e.dataSource),
-    dataOptionsString: p(e.dataOptions),
+    dataSourceString: _(e.dataSource),
+    dataOptionsString: f(e.dataOptions),
+    filtersString: z(e.filters),
     componentString: "PivotTableWidget",
-    extraImportsString: B(e.filters || [], a)
+    extraImportsString: R(e.filters || [], a)
   };
-  return b(r, s, t);
-}, xe = ({
+  return D(r, i, t);
+}, Me = ({
   dashboardOid: e,
   widgetOid: t,
   uiFramework: r = "react",
   chartType: a = "table",
-  includeChart: s = !0
+  includeChart: i = !0
 }) => {
-  A(a);
-  const i = { dashboardOid: e, widgetOid: t }, o = ye[Number(s)];
-  return b(o, i, r);
-}, Ee = ({
+  B(a);
+  const s = { dashboardOid: e, widgetOid: t }, n = Te[Number(i)];
+  return D(n, s, r);
+}, De = ({
   widgetProps: e,
   uiFramework: t = "react"
 }) => {
-  if (H(e))
-    return A(e.chartType), ve(e, t, he);
-  if (G(e))
-    return Oe(e, t, Se);
-  throw new u("errors.otherWidgetTypesNotSupported");
-}, be = (e) => ({
-  dataOptions: { columns: e.map(j) }
-}), we = Object.freeze({
+  if (re(e))
+    return B(e.chartType), Ce(e, t, xe);
+  if (ae(e))
+    return we(e, t, be);
+  throw new m("errors.otherWidgetTypesNotSupported");
+}, We = (e) => ({
+  dataOptions: { columns: e.map(A) }
+}), Ie = Object.freeze({
   convolution: {
     enabled: !0,
     selectedConvolutionType: "bySlicesCount",
@@ -555,73 +571,74 @@ const I = `
   xAxis: {
     gridLines: !1
   }
-}), W = Object.freeze({
+}), L = Object.freeze({
   line: "line/spline",
   pie: "pie/donut",
   bar: "bar/stacked",
   column: "column/stackedcolumn"
-}), Ce = (e, t) => {
-  const { axesMapping: r = {}, chartFamily: a } = t, s = e.reduce((o, l) => (o[l.jaql.title] = l, o), {}), i = Object.entries(r).reduce((o, l) => {
-    const [n, g] = l;
-    return o[`${n}`] = Array.isArray(g) ? g.map((f) => {
-      var T, v;
-      const d = s[f.name];
-      if (!d)
-        return { column: { type: "", name: f.name } };
-      const c = j(d);
-      if (d.panel === "measures")
-        return {
-          column: c,
-          sortType: "sortNone"
-        };
-      if (Z(c.type)) {
-        const O = (v = (T = d.format) == null ? void 0 : T.mask) == null ? void 0 : v[d.jaql.level];
-        if (O)
-          return {
-            column: c,
-            dateFormat: O
-          };
+}), qe = (e, t, r) => {
+  const a = e.reduce((s, n) => (s[n.jaql.title] = n, s), {}), i = Object.entries(r).reduce((s, n) => {
+    const [u, y] = n;
+    return s[`${u}`] = Array.isArray(y) ? y.map((b) => {
+      var S, O;
+      const l = w(b);
+      delete l.enabled;
+      const c = a[l.column.name];
+      if (!c)
+        return { column: { type: "", name: l.column.name } };
+      const g = A(c);
+      if (c.panel === "measures")
+        return T(d({}, l), {
+          column: g
+        });
+      if (se(g.type)) {
+        const v = (O = (S = c.format) == null ? void 0 : S.mask) == null ? void 0 : O[c.jaql.level];
+        if (v)
+          return T(d({}, l), {
+            column: g,
+            dateFormat: v
+          });
       }
-      return c;
-    }) : g, o;
+      return T(d({}, l), { column: g });
+    }) : y, s;
   }, {});
-  switch (a) {
+  switch (t) {
     case "cartesian":
-      return y({
+      return d({
         category: [],
         value: [],
         breakBy: []
       }, i);
     case "categorical":
-      return y({
+      return d({
         category: [],
         value: []
       }, i);
     case "scatter":
-      return Object.keys(i).forEach((o) => {
-        i[`${o}`] = i[`${o}`][0];
+      return Object.keys(i).forEach((s) => {
+        i[`${s}`] = i[`${s}`][0];
       }), i;
     case "scattermap":
-      return Object.keys(i).forEach((o) => {
-        o !== "geo" && (i[`${o}`] = i[`${o}`][0]);
+      return Object.keys(i).forEach((s) => {
+        s !== "geo" && (i[`${s}`] = i[`${s}`][0]);
       }), i;
     case "table":
-      return Object.keys(i).length === 0 ? be(e).dataOptions : i;
+      return Object.keys(i).length === 0 ? We(e).dataOptions : i;
     case "boxplot":
     case "areamap":
     case "indicator":
     default:
       return i;
   }
-}, $ = (e, t) => {
-  var r, a, s, i;
-  return t === "x" ? (a = (r = e.axesMapping.category) != null ? r : e.axesMapping.x) == null ? void 0 : a.map((o) => o.name).join(", ") : (i = (s = e.axesMapping.value) != null ? s : e.axesMapping.y) == null ? void 0 : i.map((o) => o.name).join(", ");
-}, De = (e, t, r = !0) => {
-  const a = Ce(e, t);
-  let s;
-  return r && t.chartType in W ? s = D(
-    D(we, {
-      subtype: W[t.chartType]
+}, Q = (e, t) => {
+  var r, a, i, s;
+  return t === "x" ? (a = (r = e.axesMapping.category) != null ? r : e.axesMapping.x) == null ? void 0 : a.map((n) => w(n).column.name).join(", ") : (s = (i = e.axesMapping.value) != null ? i : e.axesMapping.y) == null ? void 0 : s.map((n) => w(n).column.name).join(", ");
+}, Pe = (e, t, r = !0) => {
+  const { chartFamily: a, axesMapping: i = {}, styleOptions: s = {} } = t, n = qe(e, a, i);
+  let u;
+  return r && t.chartType in L ? u = C(
+    C(Ie, {
+      subtype: L[t.chartType]
     }),
     {
       legend: {
@@ -631,88 +648,89 @@ const I = `
       yAxis: {
         title: {
           enabled: !0,
-          text: $(t, "y")
+          text: Q(t, "y")
         }
       },
       xAxis: {
         title: {
           enabled: !0,
-          text: $(t, "x")
+          text: Q(t, "x")
         }
       }
-    }
-  ) : s = X(), {
-    dataOptions: a,
-    chartStyleOptions: s
+    },
+    s
+  ) : u = C(ie(), s), {
+    dataOptions: n,
+    chartStyleOptions: u
   };
-}, Me = (e) => "chartType" in e ? e : {
+}, Le = (e) => "chartType" in e ? e : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, Ie = (e) => e.map((t) => ee(t.jaql)), We = (e) => e.reduce(
+}, Qe = (e) => e.map((t) => ne(t.jaql)), $e = (e) => e.reduce(
   (t, r) => {
-    if ((r.panel === "scope" || r.jaql.filter) && t.metadataFilters.push(M(r)), r.panel !== "scope") {
-      const a = M(r);
+    if ((r.panel === "scope" || r.jaql.filter) && t.metadataFilters.push(q(r)), r.panel !== "scope") {
+      const a = q(r);
       delete a.jaql.filter, t.metadataColumns.push(a);
     }
     return t;
   },
   { metadataColumns: [], metadataFilters: [] }
-), $e = (e, t) => {
-  if (!ie(e))
+), je = (e, t) => {
+  if (!ue(e))
     try {
-      const { useCustomizedStyleOptions: r = !1 } = t || {}, { jaql: a, chartRecommendations: s, queryTitle: i } = e, {
-        metadata: o,
-        datasource: { title: l, id: n, type: g = "elasticube" }
-      } = a, f = Me(s), d = f.chartType.toLowerCase(), c = {
+      const { useCustomizedStyleOptions: r = !1 } = t || {}, { jaql: a, chartRecommendations: i, queryTitle: s } = e, {
+        metadata: n,
+        datasource: { title: u, id: y, type: b = "elasticube" }
+      } = a, l = Le(i), c = l.chartType.toLowerCase(), g = {
         cornerRadius: "Small",
         header: {
           // remove info button and render empty toolbar instead
           renderToolbar: () => null
         }
-      }, { metadataColumns: T, metadataFilters: v } = We(o), O = Ie(v), { dataOptions: _, chartStyleOptions: R } = De(
-        T,
-        f,
+      }, { metadataColumns: S, metadataFilters: O } = $e(n), v = Qe(O), { dataOptions: U, chartStyleOptions: K } = Pe(
+        S,
+        l,
         r
-      ), K = y(y({}, R), c);
+      ), Y = d(d({}, K), g);
       return {
         widgetType: "chart",
-        id: i,
-        title: i,
-        chartType: d,
+        id: s,
+        title: s,
+        chartType: c,
         dataSource: {
-          title: l,
-          id: n,
-          type: g
+          title: u,
+          id: y,
+          type: b
         },
-        dataOptions: _,
-        filters: O,
-        styleOptions: K
+        dataOptions: U,
+        filters: v,
+        styleOptions: Y
       };
     } catch (r) {
       console.error(r);
       return;
     }
-}, qe = (e, t) => $e(e, t), Pe = (e) => re(e) ? xe(e) : Ee(e), _e = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ke = (e, t) => je(e, t), Ae = (e) => le(e) ? Me(e) : De(e), Ye = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  toWidgetCode: Pe,
-  toWidgetProps: qe
+  toWidgetCode: Ae,
+  toWidgetProps: ke
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  Ae as E,
-  N as a,
-  p as b,
-  ke as c,
-  fe as d,
-  B as e,
-  F as f,
-  b as g,
-  je as h,
-  Fe as i,
-  re as j,
-  le as p,
-  Ne as s,
-  qe as t,
-  Be as v,
-  _e as w
+  _e as E,
+  F as a,
+  _ as b,
+  ze as c,
+  f as d,
+  z as e,
+  R as f,
+  D as g,
+  Ne as h,
+  Re as i,
+  le as j,
+  pe as p,
+  Ue as s,
+  ke as t,
+  Ke as v,
+  Ye as w
 };