@sisense/sdk-ui 1.30.0 → 1.32.0

package/dist/{widget-composer-Ch2kYMok.js → widget-composer-4bEKHitq.js}

@@ -1,92 +1,107 @@
-var K = Object.defineProperty;
-var w = Object.getOwnPropertySymbols;
-var Y = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
-var C = (e, t, r) => t in e ? K(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, y = (e, t) => {
+var V = Object.defineProperty, H = Object.defineProperties;
+var X = Object.getOwnPropertyDescriptors;
+var W = Object.getOwnPropertySymbols;
+var Z = Object.prototype.hasOwnProperty, G = Object.prototype.propertyIsEnumerable;
+var q = (e, t, r) => t in e ? V(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, u = (e, t) => {
   for (var r in t || (t = {}))
-    Y.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]);
+    Z.call(t, r) && q(e, r, t[r]);
+  if (W)
+    for (var r of W(t))
+      G.call(t, r) && q(e, r, t[r]);
   return e;
-};
-import { cK as q, h as P, M as x, T as u, cL as J, cM as S, cN as L, ae as V, Z, ag as H, m as M, cO as X, P as G, B as ee, aW as D } from "./derive-chart-family-B2J2kMs6.js";
-class Q extends q {
+}, v = (e, t) => H(e, X(t));
+import { dA as Q, p as ee, M as w, T as p, dB as te, dC as h, dD as A, aH as re, aq as ie, aN as ae, m as C, dE as se, ax as D, aj as ne, a3 as oe, bx as P } from "./derive-chart-family-CVwj-7u5.js";
+class B extends Q {
   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;
+    var i;
+    super((i = t.jaql.title) !== null && i !== void 0 ? i : "", 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 = ee(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 le = {
+  text: w.TextAttribute,
+  numeric: w.NumericAttribute,
+  datetime: w.DateLevel
 };
-function j(e) {
+function k(e) {
   var t;
-  return new Q(e, (t = te[e.jaql.datatype]) !== null && t !== void 0 ? t : "numeric");
+  return new B(e, (t = le[e.jaql.datatype]) !== null && t !== void 0 ? t : "numeric");
 }
-const je = {
-  jaql: { datasource: { title: "" }, metadata: [] },
-  widgetProps: void 0,
+const _e = {
+  jaql: {
+    datasource: {
+      title: ""
+    },
+    metadata: []
+  },
   queryTitle: "",
   chartRecommendations: {}
-}, ke = {
+}, Re = {
   model: "",
   metadata: [],
   chart: {},
   queryTitle: ""
-}, Ae = (e) => "widgetProps" in e, re = (e) => "dashboardOid" in e && "widgetOid" in e;
-function ae(e) {
+}, ze = (e) => "widgetProps" in e, de = (e) => "dashboardOid" in e && "widgetOid" in e;
+function ue(e) {
   return e.replace(/\s+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
-function Fe(e) {
+function Ke(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 Ye(e) {
   if (e)
     if (e.metadata) {
       if (!e.model)
-        throw new u("errors.missingModelTitle");
+        throw new p("errors.missingModelTitle");
     } else
-      throw new u("errors.missingMetadata");
+      throw new p("errors.missingMetadata");
   else
-    throw new u("errors.emptyModel");
+    throw new p("errors.emptyModel");
   return e;
 }
-function ie(e) {
+function ce(e) {
   return !e || !e.jaql.datasource.title || !e.jaql.metadata.length;
 }
-function k(e) {
-  if (![...J, "pivot", "pivot2"].includes(e))
-    throw new u("errors.chartTypeNotSupported", { chartType: e });
+function F(e) {
+  if (![
+    ...te,
+    "pivot",
+    "pivot2"
+  ].includes(e))
+    throw new p("errors.chartTypeNotSupported", {
+      chartType: e
+    });
 }
-function se(e) {
+function me(e) {
   return "widgetType" in e && e.widgetType === "pivot";
 }
-function A(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;
+function y(e) {
+  var t;
+  return "column" in e && ((t = e.column) == null ? void 0 : t.expression) && /\(.*\)/.test(e.column.expression);
 }
-function m(e) {
+function N(e) {
+  const t = "measures" in e && o(e.measures) || "values" in e && o(e.values);
+  return me(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((i) => y(i)) : e.chartType === "boxplot" ? !1 : e.chartType === "scatter" ? "x" in e.dataOptions && e.dataOptions.x !== void 0 && y(e.dataOptions.x) || "y" in e.dataOptions && e.dataOptions.y !== void 0 && y(e.dataOptions.y) || "size" in e.dataOptions && e.dataOptions.size !== void 0 : e.chartType === "scattermap" ? "colorBy" in e.dataOptions && e.dataOptions.colorBy !== void 0 && y(e.dataOptions.colorBy) || "details" in e.dataOptions && e.dataOptions.details !== void 0 && y(e.dataOptions.details) || "size" in e.dataOptions && e.dataOptions.size !== void 0 && y(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 o(e) {
   return Array.isArray(e) && e.length > 0;
 }
-function oe(e) {
+function pe(e) {
   const t = e.split(`
 `);
   for (let r = 0; r < t.length - 1; r++)
     if (t[r].trim() === "") {
-      const a = t[r + 1].trim();
-      if (a.startsWith("import *") || a.startsWith("import {")) {
+      const i = t[r + 1].trim();
+      if (i.startsWith("import *") || i.startsWith("import {")) {
         t.splice(r, 1);
         break;
       }
@@ -94,7 +109,7 @@ function oe(e) {
   return t.join(`
 `);
 }
-const ne = {
+const ge = {
   react: {
     baseChartTmpl: `import { {{componentString}} } from '@sisense/sdk-ui';
 {{extraImportsString}}
@@ -108,6 +123,8 @@ export default function CodeExample() {
       chartType={'{{chartTypeString}}'}
       dataOptions={ {{dataOptionsString}} }
       filters={ {{filtersString}} }
+      styleOptions={ {{styleOptionsString}} }
+      drilldownOptions={ {{drilldownOptionsString}} }
     />
   );
 }`,
@@ -183,6 +200,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 +208,7 @@ const CodeExample = () => {
       dataSource: DM.DataSource,
       rows: {{rowsString}},
       values: {{valuesString}},
+      filters: {{filtersString}},
     }
 
     const { data, isLoading, isError, error } = useExecutePivotQuery(pivotQueryProps);
@@ -219,25 +238,29 @@ export default function CodeExample() {
       title={'{{titleString}}'}
       dataSource={DM.DataSource}
       dataOptions={ {{dataOptionsString}} }
+      filters={ {{filtersString}} }
+      styleOptions={ {{styleOptionsString}} }
     />
   );
 }`
   },
   angular: {
     baseChartTmpl: `import { Component } from '@angular/core';
-import { SdkUiModule, type ChartDataOptions } from '@sisense/sdk-ui-angular';
+import { type ChartDataOptions, type ChartStyleOptions } 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
+        [title]="'{{titleString}}'"
         chartType='{{chartTypeString}}'
         [dataSource]='DM.DataSource'
         [dataOptions]='dataOptions'
         [filters]='filters'
+        [styleOptions]='styleOptions'
+        [drilldownOptions]='drilldownOptions'
       />
     \`
 })
@@ -245,15 +268,15 @@ export class CodeExample {
     DM = DM;
     dataOptions: ChartDataOptions = {{dataOptionsString}};
     filters = {{filtersString}};
+    styleOptions: ChartStyleOptions = {{styleOptionsString}};
+    drilldownOptions = {{drilldownOptionsString}};
 }`,
     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"
@@ -269,13 +292,11 @@ 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>
@@ -305,7 +326,6 @@ 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
@@ -313,7 +333,6 @@ 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>
@@ -353,12 +372,14 @@ export class CodeExample {
   vue: {
     baseChartTmpl: `<script setup lang="ts">
   import { ref } from 'vue';
-  import { {{componentString}} } from '@sisense/sdk-ui-vue';
+  import { {{componentString}}, type ChartStyleOptions } from '@sisense/sdk-ui-vue';
   {{extraImportsString}}
   import * as DM from './{{dataSourceString}}'; // generated with @sisense/sdk-cli
 
   const dataOptions = ref({{dataOptionsString}});
   const filters = ref({{filtersString}});
+  const styleOptions = ref<ChartStyleOptions>({{styleOptionsString}});
+  const drilldownOptions = ref({{drilldownOptionsString}});
 <\/script>
 
 <template>
@@ -366,6 +387,8 @@ export class CodeExample {
     chartType="{{chartTypeString}}"
     :dataOptions="dataOptions"
     :filters="filters"
+    :styleOptions="styleOptions"
+    :drilldownOptions="drilldownOptions"
     :dataSource="DM.DataSource"
     title="{{titleString}}" />
 </template>`,
@@ -376,8 +399,8 @@ import { WidgetById } from '@sisense/sdk-ui-vue';
 <\/script>
 <template>
   <WidgetById
-    :widgetOid="{{widgetOid}}"
-    :dashboardOid="{{dashboardOid}}"
+    :widgetOid="'{{widgetOid}}'"
+    :dashboardOid="'{{dashboardOid}}'"
   />
 </template>
 `,
@@ -421,136 +444,131 @@ const { data, isLoading, isError, error } = useExecuteQuery(queryProps);
     executePivotQueryTmpl: "Not implemented yet",
     pivotTableWidgetTmpl: "Not implemented yet"
   }
-}, F = (e, t) => ne[t][e].replace(
-  /{{(.*?)Tmpl}}/g,
-  (a, s) => F(`${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)), E = (e, t, r = "react") => {
-  const a = F(e, r);
-  return oe(le(a, t));
-}, h = `
-`, b = "UNKNOWN", de = (e, t) => {
+}, _ = (e, t) => ge[t][e].replace(/{{(.*?)Tmpl}}/g, (i, a) => _(`${a}Tmpl`, t)), ye = (e, t) => e.replace(/{{(.*?)}}/g, (r, i) => i in t ? t[i] : (console.warn(`Placeholder ${i} not found in data`), r)), I = (e, t, r = "react") => {
+  const i = _(e, r);
+  return pe(ye(i, 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 || b,
-      s.column || b,
-      void 0,
-      "DM"
-    );
-    r += " ".repeat(t), r += `    '${a.slice(1, -1)}': ${i},
+`, Object.entries(e.context).forEach(([i, a]) => {
+    const s = A(a.table || M, a.column || M, void 0, "DM");
+    r += " ".repeat(t), r += `    '${i.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;
+}, he = (e) => {
+  const { level: t, table: r, column: i, agg: a, title: s } = e;
   let n;
-  return a && s && (n = L(a, s, r, "DM")), i && a && s && l && (n = `measureFactory.${V.aggregationFromJAQL(
-    i
-  )}(${n}, '${S(l)}')`), o && (n = `{column: ${n}, sortType: '${P(o)}'}`), n ? `${" ".repeat(t)}${n}` : b;
-}, 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) => {
+  return r && i && (n = A(r, i, t, "DM")), a && r && i && s && (n = `measureFactory.${re.aggregationFromJAQL(a)}(${n}, '${h(s)}')`), n || M;
+}, Oe = (e, t) => {
+  const r = e.jaql(!1).jaql;
+  return "formula" in r ? fe(r, t) : he(r);
+}, d = (e, t = 0, r = !1) => {
   if (!e)
     return "";
   if (typeof e == "string")
-    return `'${S(e)}'`;
+    return `'${h(e)}'`;
+  if (e instanceof B)
+    return Oe(e, t);
   if (e instanceof Q)
-    return ce(e, t);
-  if (e instanceof q)
     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}`;
-  }), a += " ".repeat(t), a += "}"), a;
-};
-function me(e) {
-  return p(e, 2);
+  let i = "";
+  return Array.isArray(e) ? i += `[${e.map((a) => d(a, t + 2))}${e.length ? x + " ".repeat(t + 2) : ""}]` : (i += `{${x}`, Object.entries(e).forEach(([a, s]) => {
+    r && (a = `'${h(a)}'`), i += " ".repeat(t + 2), Array.isArray(s) ? i += `${a}: [${s.map((n) => d(n, t + 4, r))}${s.length ? x + " ".repeat(t + 2) : ""}]` : typeof s == "object" && s !== null ? i += `${a}: ${d(s, t + 2, r)}` : [
+      "number",
+      "boolean",
+      "undefined"
+    ].includes(typeof s) || s === null ? i += `${a}: ${s}` : i += `${a}: '${h(s)}'`, i += `,${x}`;
+  }), i += " ".repeat(t), i += "}"), i;
+}, E = 6;
+function Se(e) {
+  return d(e, E);
 }
-function N(e) {
+function R(e) {
   if (!e)
-    throw new u("errors.undefinedDataSource");
+    throw new p("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, ue(t);
 }
-function B(e, t = !0) {
+function z(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 W = `
-`, pe = (e, t) => {
+const L = `
+`, Te = (e, t) => {
   if (e.composeCode)
-    return `${W}${" ".repeat(t)}${e.composeCode}`;
+    return `${L}${" ".repeat(t)}${e.composeCode}`;
   const r = e.jaql().jaql;
-  return `${W}${" ".repeat(t)}filterFactory.customFilter(${p(
-    r,
-    t,
-    !0
-  )})`;
-}, ge = (e, t = 0) => {
+  return `${L}${" ".repeat(t)}filterFactory.customFilter(${d(r, 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((i) => Te(i, t + 2))}${e.length ? `
 ` + " ".repeat(t + 2) : ""}]`, r;
-}, fe = (e) => {
+}, K = (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 = A(e), s = {
+    return ve(e, 6);
+  throw new p("errors.filterRelationsNotSupported");
+}, xe = [
+  "executeQueryByWidgetIdTmpl",
+  "widgetByIdTmpl"
+], Ee = "chartWidgetTmpl", be = "pivotTableWidgetTmpl", we = (e) => e, Ce = (e, t, r) => {
+  const i = N(e), a = {
     titleString: e.title,
-    dataSourceString: N(e.dataSource),
-    chartTypeString: Te(e.chartType),
-    dataOptionsString: me(e.dataOptions),
-    filtersString: fe(e.filters),
+    dataSourceString: R(e.dataSource),
+    chartTypeString: we(e.chartType),
+    dataOptionsString: Se(e.dataOptions),
+    filtersString: K(e.filters),
     componentString: "ChartWidget",
-    extraImportsString: B(e.filters || [], a)
+    extraImportsString: z(e.filters || [], i),
+    styleOptionsString: d(e.styleOptions || {}, E),
+    drilldownOptionsString: d(e.drilldownOptions || {}, E)
   };
-  return E(r, s, t);
-}, Oe = (e, t, r) => {
-  const a = A(e), s = {
+  return I(r, a, t);
+}, De = (e, t, r) => {
+  const i = N(e), a = {
     titleString: e.title,
-    dataSourceString: N(e.dataSource),
-    dataOptionsString: p(e.dataOptions),
+    dataSourceString: R(e.dataSource),
+    dataOptionsString: d(e.dataOptions),
+    filtersString: K(e.filters),
     componentString: "PivotTableWidget",
-    extraImportsString: B(e.filters || [], a)
+    extraImportsString: z(e.filters || [], i),
+    styleOptionsString: d(e.styleOptions || {}, E)
   };
-  return E(r, s, t);
-}, xe = ({
-  dashboardOid: e,
-  widgetOid: t,
-  uiFramework: r = "react",
-  chartType: a = "table",
-  includeChart: s = !0
-}) => {
-  k(a);
-  const i = { dashboardOid: e, widgetOid: t }, o = ye[Number(s)];
-  return E(o, i, r);
-}, be = ({
-  widgetProps: e,
-  uiFramework: t = "react"
-}) => {
-  if (Z(e))
-    return k(e.chartType), ve(e, t, he);
-  if (H(e))
-    return Oe(e, t, Se);
-  throw new u("errors.otherWidgetTypesNotSupported");
-}, Ee = (e) => ({
-  dataOptions: { columns: e.map(j) }
-}), we = Object.freeze({
+  return I(r, a, t);
+}, Me = ({ dashboardOid: e, widgetOid: t, uiFramework: r = "react", chartType: i = "table", includeChart: a = !0 }) => {
+  F(i);
+  const s = {
+    dashboardOid: e,
+    widgetOid: t
+  }, n = xe[Number(a)];
+  return I(n, s, r);
+}, Ie = ({ widgetProps: e, uiFramework: t = "react" }) => {
+  if (ie(e))
+    return F(e.chartType), Ce(e, t, Ee);
+  if (ae(e))
+    return De(e, t, be);
+  throw new p("errors.otherWidgetTypesNotSupported");
+}, We = (e) => ({
+  dataOptions: {
+    columns: e.map(k)
+  }
+}), qe = Object.freeze({
   convolution: {
     enabled: !0,
     selectedConvolutionType: "bySlicesCount",
     independentSlicesCount: 7
   },
-  lineWidth: { width: "bold" },
+  lineWidth: {
+    width: "bold"
+  },
   markers: {
     enabled: !1
   },
@@ -563,164 +581,162 @@ const W = `
   xAxis: {
     gridLines: !1
   }
-}), $ = Object.freeze({
+}), j = 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")
+}), Pe = (e, t, r) => {
+  const i = e.reduce((s, n) => (s[n.jaql.title] = n, s), {}), a = Object.entries(r).reduce((s, n) => {
+    const [c, f] = n;
+    return s[`${c}`] = Array.isArray(f) ? f.map((b) => {
+      var O, S;
+      const l = D(b);
+      delete l.enabled;
+      const m = i[l.column.name];
+      if (!m)
         return {
-          column: c,
-          sortType: "sortNone"
+          column: {
+            type: "",
+            name: l.column.name
+          }
         };
-      if (G(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
-          };
+      const g = k(m);
+      if (m.panel === "measures")
+        return v(u({}, l), {
+          column: g
+        });
+      if (ne(g.type)) {
+        const T = (S = (O = m.format) == null ? void 0 : O.mask) == null ? void 0 : S[m.jaql.level];
+        if (T)
+          return v(u({}, l), {
+            column: g,
+            dateFormat: T
+          });
       }
-      return c;
-    }) : g, o;
+      return v(u({}, l), {
+        column: g
+      });
+    }) : f, s;
   }, {});
-  switch (a) {
+  switch (t) {
     case "cartesian":
-      return y({
+      return u({
         category: [],
         value: [],
         breakBy: []
-      }, i);
+      }, a);
     case "categorical":
-      return y({
+      return u({
         category: [],
         value: []
-      }, i);
+      }, a);
     case "scatter":
-      return Object.keys(i).forEach((o) => {
-        i[`${o}`] = i[`${o}`][0];
-      }), i;
+      return Object.keys(a).forEach((s) => {
+        a[`${s}`] = a[`${s}`][0];
+      }), a;
     case "scattermap":
-      return Object.keys(i).forEach((o) => {
-        o !== "geo" && (i[`${o}`] = i[`${o}`][0]);
-      }), i;
+      return Object.keys(a).forEach((s) => {
+        s !== "geo" && (a[`${s}`] = a[`${s}`][0]);
+      }), a;
     case "table":
-      return Object.keys(i).length === 0 ? Ee(e).dataOptions : i;
+      return Object.keys(a).length === 0 ? We(e).dataOptions : a;
     case "boxplot":
     case "areamap":
     case "indicator":
     default:
-      return i;
+      return a;
   }
-}, 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(", ");
-}, Me = (e, t, r = !0) => {
-  const a = Ce(e, t);
-  let s;
-  return r && t.chartType in $ ? s = M(
-    M(we, {
-      subtype: $[t.chartType]
-    }),
-    {
-      legend: {
+}, $ = (e, t) => {
+  var r, i, a, s;
+  return t === "x" ? (i = (r = e.axesMapping.category) != null ? r : e.axesMapping.x) == null ? void 0 : i.map((n) => D(n).column.name).join(", ") : (s = (a = e.axesMapping.value) != null ? a : e.axesMapping.y) == null ? void 0 : s.map((n) => D(n).column.name).join(", ");
+}, Le = (e, t, r = !0) => {
+  const { chartFamily: i, axesMapping: a = {}, styleOptions: s = {} } = t, n = Pe(e, i, a);
+  let c;
+  return r && t.chartType in j ? c = C(C(qe, {
+    subtype: j[t.chartType]
+  }), {
+    legend: {
+      enabled: !0,
+      position: "right"
+    },
+    yAxis: {
+      title: {
         enabled: !0,
-        position: "right"
-      },
-      yAxis: {
-        title: {
-          enabled: !0,
-          text: I(t, "y")
-        }
-      },
-      xAxis: {
-        title: {
-          enabled: !0,
-          text: I(t, "x")
-        }
+        text: $(t, "y")
+      }
+    },
+    xAxis: {
+      title: {
+        enabled: !0,
+        text: $(t, "x")
       }
     }
-  ) : s = X(), {
-    dataOptions: a,
-    chartStyleOptions: s
+  }, s) : c = C(se(), s), {
+    dataOptions: n,
+    chartStyleOptions: c
   };
-}, De = (e) => "chartType" in e ? e : {
+}, je = (e) => "chartType" in e ? e : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, We = (e) => e.map((t) => ee(t.jaql)), $e = (e) => e.reduce(
-  (t, r) => {
-    if ((r.panel === "scope" || r.jaql.filter) && t.metadataFilters.push(D(r)), r.panel !== "scope") {
-      const a = D(r);
-      delete a.jaql.filter, t.metadataColumns.push(a);
-    }
-    return t;
-  },
-  { metadataColumns: [], metadataFilters: [] }
-), Ie = (e, t) => {
-  if (!ie(e))
+}, $e = (e) => e.map((t) => oe(t.jaql)), Qe = (e) => e.reduce((t, r) => {
+  if ((r.panel === "scope" || r.jaql.filter) && t.metadataFilters.push(P(r)), r.panel !== "scope") {
+    const i = P(r);
+    delete i.jaql.filter, t.metadataColumns.push(i);
+  }
+  return t;
+}, {
+  metadataColumns: [],
+  metadataFilters: []
+}), Ae = (e, t) => {
+  if (!ce(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 = De(s), d = f.chartType.toLowerCase(), c = {
+      const { useCustomizedStyleOptions: r = !1 } = t || {}, { jaql: i, chartRecommendations: a, queryTitle: s } = e, { metadata: n, datasource: { title: c, id: f, type: b = "elasticube" } } = i, l = je(a), m = l.chartType.toLowerCase(), g = {
         cornerRadius: "Small",
         header: {
           // remove info button and render empty toolbar instead
           renderToolbar: () => null
         }
-      }, { metadataColumns: T, metadataFilters: v } = $e(o), O = We(v), { dataOptions: _, chartStyleOptions: R } = Me(
-        T,
-        f,
-        r
-      ), U = y(y({}, R), c);
+      }, { metadataColumns: O, metadataFilters: S } = Qe(n), T = $e(S), { dataOptions: U, chartStyleOptions: Y } = Le(O, l, r), J = u(u({}, Y), g);
       return {
         widgetType: "chart",
-        id: i,
-        title: i,
-        chartType: d,
+        id: s,
+        title: s,
+        chartType: m,
         dataSource: {
-          title: l,
-          id: n,
-          type: g
+          title: c,
+          id: f,
+          type: b
         },
-        dataOptions: _,
-        filters: O,
-        styleOptions: U
+        dataOptions: U,
+        filters: T,
+        styleOptions: J
       };
     } catch (r) {
       console.error(r);
       return;
     }
-}, qe = (e, t) => Ie(e, t), Pe = (e) => re(e) ? xe(e) : be(e), _e = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Be = (e, t) => Ae(e, t), ke = (e) => de(e) ? Me(e) : Ie(e), Je = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  toWidgetCode: Pe,
-  toWidgetProps: qe
+  toWidgetCode: ke,
+  toWidgetProps: Be
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  ke as E,
+  Re as E,
   N as a,
-  p as b,
-  Fe as c,
-  fe as d,
-  B as e,
-  A as f,
-  E as g,
-  je as h,
-  Ae as i,
-  re as j,
-  le as p,
-  Ne as s,
-  qe as t,
-  Be as v,
-  _e as w
+  R as b,
+  Ke as c,
+  d,
+  K as e,
+  z as f,
+  I as g,
+  _e as h,
+  ze as i,
+  de as j,
+  ye as p,
+  Ue as s,
+  Be as t,
+  Ye as v,
+  Je as w
 };