igniteui-angular-core 17.3.1-alpha.0 → 18.1.0

package/esm2015/lib/IDataSeriesAdapterRule_combined.js

@@ -23,6 +23,7 @@ import { SortDescriptionCollection } from "./SortDescriptionCollection";
 import { FilterExpressionCollection } from "./FilterExpressionCollection";
 import { SummaryDescriptionCollection } from "./SummaryDescriptionCollection";
 import { Dictionary$2 } from "./Dictionary$2";
+import { Tuple$2 } from "./Tuple$2";
 import { IDataSource_$type } from "./IDataSource";
 import { AggregatedDataProvider } from "./AggregatedDataProvider";
 import { FlatDataProvider } from "./FlatDataProvider";
@@ -93,7 +94,7 @@ export let DataSeriesAdapterRunContext = /*@__PURE__*/ (() => {
             return this.g.ap(a, b);
         }
         recurseRules(a, b, c) {
-            this.g.ba(this, a, b, c);
+            this.g.bb(this, a, b, c);
         }
         get includedProperties() {
             return this.b;
@@ -211,36 +212,36 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
     class DataSeriesDataProviderAnalyzer extends Base {
         constructor(a) {
             super();
-            this.p = null;
+            this.u = null;
             this.b = null;
             this.a = null;
-            this.s = false;
-            this.r = false;
-            this.ak = new HashSet$1(String_$type, 0);
-            this.am = new List$1(Matcher.$, 0);
-            this.aj = new HashSet$1(String_$type, 0);
-            this.al = new List$1(Matcher.$, 0);
-            this.p = a;
+            this.x = false;
+            this.w = false;
+            this.ap = new HashSet$1(String_$type, 0);
+            this.ar = new List$1(Matcher.$, 0);
+            this.ao = new HashSet$1(String_$type, 0);
+            this.aq = new List$1(Matcher.$, 0);
+            this.u = a;
         }
         get includedProperties() {
             return this.b;
         }
         set includedProperties(a) {
             this.b = a;
-            this.ak.clear();
+            this.ap.clear();
             if (this.b == null) {
-                this.s = false;
+                this.x = false;
             }
             else {
-                this.s = true;
+                this.x = true;
                 let d = this.b;
                 for (let c = 0; c < d.length; c++) {
                     let b = d[c];
                     if (Matcher.a(b)) {
-                        this.am.add(new Matcher(b));
+                        this.ar.add(new Matcher(b));
                     }
                     else {
-                        this.ak.add_1(b);
+                        this.ap.add_1(b);
                     }
                 }
             }
@@ -250,50 +251,50 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
         }
         set excludedProperties(a) {
             this.a = a;
-            this.aj.clear();
+            this.ao.clear();
             if (this.a == null) {
-                this.r = false;
+                this.w = false;
             }
             else {
-                this.r = true;
+                this.w = true;
                 let d = this.a;
                 for (let c = 0; c < d.length; c++) {
                     let b = d[c];
                     if (Matcher.a(b)) {
-                        this.al.add(new Matcher(b));
+                        this.aq.add(new Matcher(b));
                     }
                     else {
-                        this.aj.add_1(b);
+                        this.ao.add_1(b);
                     }
                 }
             }
         }
         getParentTitle() {
-            return this.p.getParentTitle();
+            return this.u.getParentTitle();
         }
         shouldIncludeProperty(a, b) {
             if (!stringIsNullOrEmpty(b)) {
                 a = b + "." + a;
             }
-            if (this.s && !this.ak.contains(a) && !this.y(a)) {
+            if (this.x && !this.ap.contains(a) && !this.ad(a)) {
                 return false;
             }
-            if (this.r && (this.aj.contains(a) || this.u(a))) {
+            if (this.w && (this.ao.contains(a) || this.z(a))) {
                 return false;
             }
             return true;
         }
-        u(a) {
-            for (let b = 0; b < this.al.count; b++) {
-                if (this.al._inner[b].b(a)) {
+        z(a) {
+            for (let b = 0; b < this.aq.count; b++) {
+                if (this.aq._inner[b].b(a)) {
                     return true;
                 }
             }
             return false;
         }
-        y(a) {
-            for (let b = 0; b < this.am.count; b++) {
-                if (this.am._inner[b].b(a)) {
+        ad(a) {
+            for (let b = 0; b < this.ar.count; b++) {
+                if (this.ar._inner[b].b(a)) {
                     return true;
                 }
             }
@@ -342,7 +343,10 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return this.getAllStringProperties().length > 0;
         }
         getAllStringProperties() {
-            return this.n((a) => a == 0, null);
+            return this.s((a) => a == 0, null);
+        }
+        getAllExcludedStringProperties() {
+            return this.r((a) => a == 0, null);
         }
         isCollection(a) {
             if (typeCast(IEnumerable_$type, a) !== null || typeCast(Array_$type, a) !== null) {
@@ -351,20 +355,20 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return false;
         }
         getAllPropertiesWithName(a) {
-            return this.n(null, (b) => b == a);
+            return this.s(null, (b) => b == a);
         }
         getAllNumericProperties() {
-            return this.n(runOn(this, this.ae), null);
+            return this.s(runOn(this, this.aj), null);
         }
         getAllObjectProperties() {
-            return this.n(runOn(this, this.af), null);
+            return this.s(runOn(this, this.ak), null);
         }
         getAllCollectionProperties() {
             let a = this.getAllObjectProperties();
             if (a.length == 0) {
                 return new Array(0);
             }
-            let b = this.p.getCurrentDataSource();
+            let b = this.u.getCurrentDataSource();
             let c = new List$1(String_$type, 0);
             for (let d = 0; d < b.actualCount; d++) {
                 if (this.isCollection(b.getItemAtIndex(d))) {
@@ -383,14 +387,14 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
         hasNumericProperties() {
             return this.getAllNumericProperties().length > 0;
         }
-        ab(a) {
+        ag(a) {
             if (a == 8 || a == 9) {
                 return true;
             }
             return false;
         }
-        q(a) {
-            let b = this.p.getCurrentDataSource();
+        v(a) {
+            let b = this.u.getCurrentDataSource();
             if (b == null) {
                 return 11;
             }
@@ -410,36 +414,59 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             }
             return c.propertyTypes[d];
         }
-        n(a, b) {
-            let c = this.p.getCurrentDataSource();
+        s(a, b) {
+            let c = this.u.getCurrentDataSource();
             let d = c.actualSchema;
             if (d == null) {
                 return new Array(0);
             }
-            let e = this.p.getCurrentPath();
+            let e = this.u.getCurrentPath();
             let f = 0;
             for (let g = 0; g < d.propertyTypes.length; g++) {
-                if ((a == null || a(d.propertyTypes[g])) && (b == null || b(d.propertyNames[g])) && this.ai(d.propertyDataIntents, g) && this.shouldIncludeProperty(d.propertyNames[g], e)) {
+                if ((a == null || a(d.propertyTypes[g])) && (b == null || b(d.propertyNames[g])) && this.an(d.propertyDataIntents, g) && this.shouldIncludeProperty(d.propertyNames[g], e)) {
                     f++;
                 }
             }
             let h = new Array(f);
             f = 0;
             for (let i = 0; i < d.propertyTypes.length; i++) {
-                if ((a == null || a(d.propertyTypes[i])) && (b == null || b(d.propertyNames[i])) && this.ai(d.propertyDataIntents, i) && this.shouldIncludeProperty(d.propertyNames[i], e)) {
+                if ((a == null || a(d.propertyTypes[i])) && (b == null || b(d.propertyNames[i])) && this.an(d.propertyDataIntents, i) && this.shouldIncludeProperty(d.propertyNames[i], e)) {
                     h[f] = d.propertyNames[i];
                     f++;
                 }
             }
             return h;
         }
-        ai(a, b) {
+        r(a, b) {
+            let c = this.u.getCurrentDataSource();
+            let d = c.actualSchema;
+            if (d == null) {
+                return new Array(0);
+            }
+            let e = this.u.getCurrentPath();
+            let f = 0;
+            for (let g = 0; g < d.propertyTypes.length; g++) {
+                if ((a == null || a(d.propertyTypes[g])) && (b == null || b(d.propertyNames[g])) && this.an(d.propertyDataIntents, g) && !this.shouldIncludeProperty(d.propertyNames[g], e)) {
+                    f++;
+                }
+            }
+            let h = new Array(f);
+            f = 0;
+            for (let i = 0; i < d.propertyTypes.length; i++) {
+                if ((a == null || a(d.propertyTypes[i])) && (b == null || b(d.propertyNames[i])) && this.an(d.propertyDataIntents, i) && !this.shouldIncludeProperty(d.propertyNames[i], e)) {
+                    h[f] = d.propertyNames[i];
+                    f++;
+                }
+            }
+            return h;
+        }
+        an(a, b) {
             if (a == null) {
                 return true;
             }
-            return !this.t(a, b, "DontPlot");
+            return !this.y(a, b, "DontPlot");
         }
-        t(a, b, c) {
+        y(a, b, c) {
             if (a == null) {
                 return false;
             }
@@ -452,13 +479,13 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return false;
         }
         getAllPropertiesWithIntent(a) {
-            return this.i(a, false, false);
+            return this.m(a, false, false);
         }
         getAllPropertiesWithValuelessIntent(a) {
-            return this.i(a, true, false);
+            return this.m(a, true, false);
         }
         getPropertyIntentValue(a, b) {
-            let c = this.p.getCurrentDataSource();
+            let c = this.u.getCurrentDataSource();
             if (c == null) {
                 return null;
             }
@@ -484,10 +511,10 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return null;
         }
         getAllPropertiesWithValuedIntent(a) {
-            return this.i(a, false, true);
+            return this.m(a, false, true);
         }
-        i(a, b, c) {
-            let d = this.p.getCurrentDataSource();
+        m(a, b, c) {
+            let d = this.u.getCurrentDataSource();
             if (d == null) {
                 return new Array(0);
             }
@@ -536,7 +563,10 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return l;
         }
         getAllDateTimeProperties() {
-            return this.n(runOn(this, this.ab), null);
+            return this.s(runOn(this, this.ag), null);
+        }
+        getAllExcludedDateTimeProperties() {
+            return this.r(runOn(this, this.ag), null);
         }
         getFirstDateTimeProperty() {
             let a = this.getAllDateTimeProperties();
@@ -555,10 +585,10 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
         hasDateTimeProperties() {
             return this.getAllDateTimeProperties().length > 0;
         }
-        ae(a) {
+        aj(a) {
             return a == 1 || a == 3 || a == 4 || a == 7 || a == 5 || a == 6 || a == 10;
         }
-        af(a) {
+        ak(a) {
             return a == 11;
         }
         isMonotonic(a, b, c) {
@@ -572,8 +602,8 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
                 if (g == 0) {
                     continue;
                 }
-                let h = this.an(a.getItemValue(a.getItemAtIndex(g - 1), b));
-                let i = this.an(a.getItemValue(a.getItemAtIndex(g), b));
+                let h = this.as(a.getItemValue(a.getItemAtIndex(g - 1), b));
+                let i = this.as(a.getItemValue(a.getItemAtIndex(g), b));
                 if (!e && h != i) {
                     d = i > h;
                     e = true;
@@ -590,13 +620,13 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             }
             return true;
         }
-        aw(a, b, c) {
-            let d = this.p.getCurrentDataSource();
+        a1(a, b, c) {
+            let d = this.u.getCurrentDataSource();
             let e = d.actualSchema;
             if (e == null) {
                 return null;
             }
-            let f = this.n(b, null);
+            let f = this.s(b, null);
             if (f.length == 0) {
                 return null;
             }
@@ -604,24 +634,32 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
                 return null;
             }
             for (let g = 0; g < f.length; g++) {
-                if (c(f[g], this.q(f[g]))) {
+                if (c(f[g], this.v(f[g]))) {
                     return f[g];
                 }
             }
             return null;
         }
         getFirstDistinctStringProperty(a) {
-            return this.aw(a, (b) => b == 0, runOn(this, this.ag));
+            return this.a1(a, (b) => b == 0, runOn(this, this.al));
         }
         getFirstDistinctNumericProperty(a) {
-            return this.aw(a, runOn(this, this.ae), runOn(this, this.ad));
+            return this.a1(a, runOn(this, this.aj), runOn(this, this.ai));
         }
         getFirstDistinctMonotonicNumericProperty(a) {
-            let b = this.p.getCurrentDataSource();
-            return this.aw(a, runOn(this, this.ae), (c, d) => this.ad(c, d) && this.isMonotonic(b, c, a));
+            let b = this.u.getCurrentDataSource();
+            return this.a1(a, runOn(this, this.aj), (c, d) => this.ai(c, d) && this.isMonotonic(b, c, a));
+        }
+        getAllDistinctMonotonicNumericProperties(a) {
+            let b = this.u.getCurrentDataSource();
+            return this.s(runOn(this, this.aj), (c) => this.ai(c, this.v(c)) && this.isMonotonic(b, c, a));
+        }
+        getAllExcludedDistinctMonotonicNumericProperties(a) {
+            let b = this.u.getCurrentDataSource();
+            return this.r(runOn(this, this.aj), (c) => this.ai(c, this.v(c)) && this.isMonotonic(b, c, a));
         }
         getFirstDistinctDateTimeProperty(a) {
-            return this.aw(a, runOn(this, this.ab), runOn(this, this.aa));
+            return this.a1(a, runOn(this, this.ag), runOn(this, this.af));
         }
         getFirstStringPropertyPreferringDistinct(a) {
             let b = this.getFirstDistinctStringProperty(a);
@@ -638,7 +676,7 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return this.getTitleStringWithSeparator(a, b, " - ");
         }
         getTitleStringWithSeparator(a, b, c) {
-            let d = this.p.getCurrentDataSource();
+            let d = this.u.getCurrentDataSource();
             let e = null;
             if (e == null && b != null) {
                 let f = null;
@@ -662,7 +700,7 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
                 let i = this.getAllPropertiesWithValuelessIntent(EnumUtil.getName(DataSeriesIntent_$type, (10)));
                 if (i != null && i.length > 0) {
                     e = i[0];
-                    e = this.aq(a, d, e);
+                    e = this.av(a, d, e);
                 }
             }
             if (e == null) {
@@ -679,12 +717,12 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
                     }
                 }
                 if (e != null) {
-                    e = this.aq(a, d, e);
+                    e = this.av(a, d, e);
                 }
             }
             return e;
         }
-        aq(a, b, c) {
+        av(a, b, c) {
             if (a != null) {
                 let d = b.getItemValue(a, c);
                 if (d != null) {
@@ -697,7 +735,7 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             return c;
         }
         getNonNullPropertyValue(a) {
-            let b = this.p.getCurrentDataSource();
+            let b = this.u.getCurrentDataSource();
             for (let c = 0; c < b.actualCount; c++) {
                 let d = b.getItemValue(b.getItemAtIndex(c), a);
                 if (d != null) {
@@ -706,8 +744,8 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        ag(a, b) {
-            let c = this.p.getCurrentDataSource();
+        al(a, b) {
+            let c = this.u.getCurrentDataSource();
             let d = new HashSet$1(String_$type, 0);
             for (let e = 0; e < c.actualCount; e++) {
                 let f = c.getItemValue(c.getItemAtIndex(e), a);
@@ -719,8 +757,8 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             }
             return true;
         }
-        aa(a, b) {
-            let c = this.p.getCurrentDataSource();
+        af(a, b) {
+            let c = this.u.getCurrentDataSource();
             let d = new HashSet$1(Number_$type, 0);
             for (let e = 0; e < c.actualCount; e++) {
                 let f;
@@ -738,11 +776,11 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
             }
             return true;
         }
-        an(value_) {
+        as(value_) {
             return (+value_);
         }
-        ad(a, b) {
-            let c = this.p.getCurrentDataSource();
+        ai(a, b) {
+            let c = this.u.getCurrentDataSource();
             if (b == 4 || b == 1 || b == 3) {
                 let d = new HashSet$1(Number_$type, 0);
                 for (let e = 0; e < c.actualCount; e++) {
@@ -770,7 +808,7 @@ export let DataSeriesDataProviderAnalyzer = /*@__PURE__*/ (() => {
                         j = NaN;
                     }
                     else {
-                        j = this.an(k);
+                        j = this.as(k);
                     }
                     if (h.contains(j)) {
                         return false;
@@ -798,16 +836,16 @@ export let DataSeriesAdapterUpdateNotifier = /*@__PURE__*/ (() => {
             this.b = b;
         }
         notifyClearItems() {
-            this.a.a3(this.b);
+            this.a.a4(this.b);
         }
         notifyInsertItem(a, b) {
-            this.a.a4(this.b, a, b);
+            this.a.a5(this.b, a, b);
         }
         notifyRemoveItem(a, b) {
-            this.a.a5(this.b, a, b);
+            this.a.a6(this.b, a, b);
         }
         notifySetItem(a, b, c) {
-            this.a.a6(this.b, a, b, c);
+            this.a.a7(this.b, a, b, c);
         }
     }
     DataSeriesAdapterUpdateNotifier.$t = markType(DataSeriesAdapterUpdateNotifier, 'DataSeriesAdapterUpdateNotifier', Base.$, [IDataSourceDataProviderUpdateNotifier_$type]);
@@ -900,9 +938,9 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             this.s.n(runOn(this, this.as));
             this.rules = new DataSeriesAdapterRuleCollection();
             this.dataSeries = new DataSeriesCollection();
-            this.a7(this.rules);
+            this.a8(this.rules);
             let a = this.rules;
-            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.bf));
+            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.bg));
         }
         as(a, b) {
             let c = this.ad;
@@ -925,9 +963,9 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        a7(a) {
+        a8(a) {
         }
-        bf(a, b) {
+        bg(a, b) {
             this.refresh();
         }
         get g() {
@@ -940,7 +978,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             let b = this.aj;
             this.aj = a;
             if (b != this.aj) {
-                this.a2("ItemsSource", b, this.aj);
+                this.a3("ItemsSource", b, this.aj);
             }
         }
         get supportedSeriesTypes() {
@@ -950,7 +988,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             let b = this.c;
             this.c = a;
             if (b != this.c) {
-                this.a2("SupportedSeriesTypes", b, this.c);
+                this.a3("SupportedSeriesTypes", b, this.c);
             }
         }
         get includedProperties() {
@@ -960,7 +998,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             let b = this.b;
             this.b = a;
             if (b != this.b) {
-                this.a2("IncludedProperties", b, this.b);
+                this.a3("IncludedProperties", b, this.b);
             }
         }
         get excludedProperties() {
@@ -970,7 +1008,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             let b = this.a;
             this.a = a;
             if (b != this.a) {
-                this.a2("ExcludedProperties", b, this.a);
+                this.a3("ExcludedProperties", b, this.a);
             }
         }
         get sortDescriptions() {
@@ -1003,13 +1041,13 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
         set dataSeries(a) {
             this._dataSeries = a;
         }
-        a2(a, b, c) {
-            this.a8(a, b, c);
+        a3(a, b, c) {
+            this.a9(a, b, c);
             if (this.propertyChanged != null) {
                 this.propertyChanged(this, new PropertyChangedEventArgs(a));
             }
         }
-        a8(a, b, c) {
+        a9(a, b, c) {
             switch (a) {
                 case "ItemsSource":
                     this.refresh();
@@ -1027,7 +1065,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
         }
         refresh() {
             this.ac = true;
-            this.be();
+            this.bf();
             let a = new DataSeriesAdapterRunContext(this);
             let b = this.h(this.itemsSource, true);
             this.at(this.itemsSource, b, null, false);
@@ -1038,12 +1076,43 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             else {
                 a.pushHighlightingDataSource(null);
             }
-            this.bh(a);
-            this.bj(a);
+            this.bi(a);
+            this.bk(a);
             this.au();
             this.ac = false;
         }
-        be() {
+        ay(a, b) {
+            let c = new DataSeriesAdapterRunContext(this);
+            let d = this.h(this.itemsSource, true);
+            c.pushDataSource(d.c);
+            a.clear();
+            let e = new HashSet$1(String_$type, 0);
+            for (let f = 0; f < this.rules.count; f++) {
+                let g = this.rules._inner[f];
+                let h = g.getPrimaryAxisLabelsStrings(c);
+                if (h == null) {
+                    continue;
+                }
+                for (let j = 0; j < h.length; j++) {
+                    let i = h[j];
+                    if (i == null) {
+                        continue;
+                    }
+                    e.add_1(i);
+                    a.add_1(new Tuple$2(String_$type, String_$type, i, c.analyzer.expandCamelCasedWords(i)));
+                }
+            }
+            b.clear();
+            let k = d.c.actualSchema.propertyNames;
+            for (let m = 0; m < k.length; m++) {
+                let l = k[m];
+                if (e.contains(l)) {
+                    continue;
+                }
+                b.add_1(new Tuple$2(String_$type, String_$type, l, c.analyzer.expandCamelCasedWords(l)));
+            }
+        }
+        bf() {
             for (let a of fromEnum(this.ah.keys)) {
                 let b = this.ah.item(a);
                 b.d = false;
@@ -1063,12 +1132,12 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 this.ah.removeItem(e);
             }
         }
-        bj(a) {
+        bk(a) {
+            this.be(a);
             this.bd(a);
-            this.bc(a);
-            this.bi(a);
+            this.bj(a);
         }
-        bd(a) {
+        be(a) {
             let b = true;
             if (this.removingUnsupported != null) {
                 let c = ((() => {
@@ -1095,7 +1164,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 }
             }
         }
-        bi(a) {
+        bj(a) {
             let b = 0;
             for (; b < Math.min(this.dataSeries.count, a.getDataSeriesCount()); b++) {
                 if (!this.dataSeries._inner[b].equals(a.getDataSeriesAt(b))) {
@@ -1111,11 +1180,11 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 b--;
             }
         }
-        bc(a) {
+        bd(a) {
             let b = new Dictionary$2(String_$type, List$1.$.specialize(DataSeries.$), 0);
             for (let c = 0; c < a.getDataSeriesCount(); c++) {
                 let d = a.getDataSeriesAt(c);
-                let e = d.i();
+                let e = d.j();
                 for (let f = 0; f < e.count; f++) {
                     if (e.item(f).intent == 16 || e.item(f).intent == 17) {
                         continue;
@@ -1171,12 +1240,12 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 }
             }
         }
-        bh(a) {
+        bi(a) {
             for (let b = 0; b < this.rules.count; b++) {
-                this.bg(a, this.rules._inner[b]);
+                this.bh(a, this.rules._inner[b]);
             }
         }
-        bg(a, b) {
+        bh(a, b) {
             b.evaluate(a);
         }
         get ad() {
@@ -1217,16 +1286,16 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             }
             if (typeCast(IDataSource_$type, a) !== null) {
                 let h = new AggregatedDataProvider();
-                h.f = a;
-                this.sortDescriptions.o(h.f.sortDescriptions);
-                this.groupDescriptions.o(h.f.groupDescriptions);
-                this.filterExpressions.o(h.f.filterExpressions);
-                this.summaryDescriptions.o(h.f.summaryDescriptions);
+                h.targetDataSource = a;
+                this.sortDescriptions.o(h.targetDataSource.sortDescriptions);
+                this.groupDescriptions.o(h.targetDataSource.groupDescriptions);
+                this.filterExpressions.o(h.targetDataSource.filterExpressions);
+                this.summaryDescriptions.o(h.targetDataSource.summaryDescriptions);
                 c.e.add(() => {
-                    this.sortDescriptions.s(h.f.sortDescriptions);
-                    this.groupDescriptions.s(h.f.groupDescriptions);
-                    this.filterExpressions.s(h.f.filterExpressions);
-                    this.summaryDescriptions.s(h.f.summaryDescriptions);
+                    this.sortDescriptions.s(h.targetDataSource.sortDescriptions);
+                    this.groupDescriptions.s(h.targetDataSource.groupDescriptions);
+                    this.filterExpressions.s(h.targetDataSource.filterExpressions);
+                    this.summaryDescriptions.s(h.targetDataSource.summaryDescriptions);
                 });
                 if (f == 2) {
                     let i = this.q(c, h);
@@ -1243,16 +1312,16 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 let j = this.g.getLocalDataSource(a);
                 j.deferAutoRefresh = true;
                 let k = new AggregatedDataProvider();
-                k.f = j;
-                this.sortDescriptions.o(k.f.sortDescriptions);
-                this.groupDescriptions.o(k.f.groupDescriptions);
-                this.filterExpressions.o(k.f.filterExpressions);
-                this.summaryDescriptions.o(k.f.summaryDescriptions);
+                k.targetDataSource = j;
+                this.sortDescriptions.o(k.targetDataSource.sortDescriptions);
+                this.groupDescriptions.o(k.targetDataSource.groupDescriptions);
+                this.filterExpressions.o(k.targetDataSource.filterExpressions);
+                this.summaryDescriptions.o(k.targetDataSource.summaryDescriptions);
                 c.e.add(() => {
-                    this.sortDescriptions.s(k.f.sortDescriptions);
-                    this.groupDescriptions.s(k.f.groupDescriptions);
-                    this.filterExpressions.s(k.f.filterExpressions);
-                    this.summaryDescriptions.s(k.f.summaryDescriptions);
+                    this.sortDescriptions.s(k.targetDataSource.sortDescriptions);
+                    this.groupDescriptions.s(k.targetDataSource.groupDescriptions);
+                    this.filterExpressions.s(k.targetDataSource.filterExpressions);
+                    this.summaryDescriptions.s(k.targetDataSource.summaryDescriptions);
                 });
                 j.deferAutoRefresh = false;
                 if (f == 2) {
@@ -1280,10 +1349,10 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             }
             if (typeCast(FlatDataProvider.$, a.c) !== null) {
                 let d = a.c;
-                let e = d.m;
+                let e = d.targetDataSource;
                 let f = e.clone();
                 let g = f.dataProvider;
-                let h = g.f;
+                let h = g.targetDataSource;
                 this.highlightFilterExpressions.o(h.filterExpressions);
                 this.groupDescriptions.o(h.groupDescriptions);
                 this.sortDescriptions.o(h.sortDescriptions);
@@ -1296,20 +1365,21 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 });
                 f.flushAutoRefresh();
                 let i = new FlatDataProvider();
-                i.m = e;
-                i.l = f;
-                d.i = 1;
-                d.l = f;
-                d.ah = c;
-                d.ak = c;
-                d.g = 1;
-                i.i = 1;
-                i.l = f;
-                i.ah = c;
-                i.ak = c;
-                i.g = 2;
-                d.s = true;
+                i.targetDataSource = e;
+                i.rightDataSource = f;
+                d.joinType = 1;
+                d.rightDataSource = f;
+                d.leftJoinProperty = c;
+                d.rightJoinProperty = c;
+                d.joinCollisionType = 1;
+                i.joinType = 1;
+                i.rightDataSource = f;
+                i.leftJoinProperty = c;
+                i.rightJoinProperty = c;
+                i.joinCollisionType = 2;
+                d.broadcastChangesToRightDataSource = true;
                 a.c = d;
+                i.flushAutoRefresh();
                 a.b = i;
             }
         }
@@ -1330,9 +1400,9 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             let c = this.g.getLocalDataSource(null);
             c.dataProvider = b;
             let d = new FlatDataProvider();
-            d.m = c;
-            this.postSortDescriptions.o(d.m.sortDescriptions);
-            a.e.add(() => this.postSortDescriptions.s(d.m.sortDescriptions));
+            d.targetDataSource = c;
+            this.postSortDescriptions.o(d.targetDataSource.sortDescriptions);
+            a.e.add(() => this.postSortDescriptions.s(d.targetDataSource.sortDescriptions));
             return d;
         }
         aw(a, b, c) {
@@ -1349,14 +1419,14 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
             }
             let d = a.c;
             d.updateNotifier = null;
-            d.schemaChanged = delegateRemove(d.schemaChanged, runOn(this, this.a9));
+            d.schemaChanged = delegateRemove(d.schemaChanged, runOn(this, this.ba));
             let e = a.b;
             if (e != null) {
                 e.updateNotifier = null;
-                e.schemaChanged = delegateRemove(e.schemaChanged, runOn(this, this.a9));
+                e.schemaChanged = delegateRemove(e.schemaChanged, runOn(this, this.ba));
             }
         }
-        ba(a, b, c, d) {
+        bb(a, b, c, d) {
             let e = this.h(b, false);
             this.at(b, e, a.getCurrentDataSource(), d);
             a.pushDataSource(e.c);
@@ -1367,7 +1437,7 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 a.pushHighlightingDataSource(null);
             }
             a.pushPath(c);
-            this.bh(a);
+            this.bi(a);
             a.popPath();
             a.popDataSource();
             a.popHighlightingDataSource();
@@ -1384,10 +1454,10 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 b.d = true;
                 this.ah.addItem(a, b);
                 let e = b.c;
-                e.schemaChanged = delegateCombine(e.schemaChanged, runOn(this, this.a9));
+                e.schemaChanged = delegateCombine(e.schemaChanged, runOn(this, this.ba));
                 if (b.b != null) {
                     let f = b.b;
-                    f.schemaChanged = delegateCombine(f.schemaChanged, runOn(this, this.a9));
+                    f.schemaChanged = delegateCombine(f.schemaChanged, runOn(this, this.ba));
                 }
                 if (c != null) {
                     let g = new DataSeriesAdapterUpdateNotifier(this, b.c);
@@ -1403,21 +1473,21 @@ export let DataSeriesAdapterImplementation = /*@__PURE__*/ (() => {
                 }
             }
         }
-        a9(a, b) {
+        ba(a, b) {
             if (!this.ac) {
                 this.refresh();
             }
         }
-        a3(a) {
+        a4(a) {
             this.refresh();
         }
-        a4(a, b, c) {
+        a5(a, b, c) {
             this.refresh();
         }
-        a5(a, b, c) {
+        a6(a, b, c) {
             this.refresh();
         }
-        a6(a, b, c, d) {
+        a7(a, b, c, d) {
             this.refresh();
         }
         notifyClearItems(a) {