@visactor/vtable 1.19.1 → 1.19.2

package/es/ts-types/dataset/aggregation.js

@@ -7,8 +7,9 @@ export const registeredAggregators = {};
 export class Aggregator {
     constructor(config) {
         var _a;
-        this.isAggregator = !0, this.isRecord = !0, this.records = [], this.key = config.key, 
-        this.field = config.field, this.formatFun = config.formatFun, this.isRecord = null !== (_a = config.isRecord) && void 0 !== _a ? _a : this.isRecord;
+        this.isAggregator = !0, this.isRecord = !0, this.records = [], this.children = [], 
+        this.key = config.key, this.field = config.field, this.formatFun = config.formatFun, 
+        this.isRecord = null !== (_a = config.isRecord) && void 0 !== _a ? _a : this.isRecord;
     }
     clearCacheValue() {
         this._formatedValue = void 0;
@@ -18,7 +19,7 @@ export class Aggregator {
         this._formatedValue;
     }
     reset() {
-        this.records = [], this.clearCacheValue();
+        this.records = [], this.changedValue = void 0, this.children = [], this.clearCacheValue();
     }
 }
 
@@ -28,21 +29,24 @@ export class RecordAggregator extends Aggregator {
     }
     push(record) {
         record && this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        this.clearCacheValue();
+        record.isAggregator && this.children && this.children.push(record), this.clearCacheValue();
     }
     deleteRecord(record) {
-        record && this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record.isAggregator && this.children && (this.children = this.children.filter((item => item !== record)))), 
         this.clearCacheValue();
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
         this.clearCacheValue());
     }
     value() {
-        return this.records;
+        var _a;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : this.records;
     }
     reset() {
-        this.records = [];
+        this.children = [], this.changedValue = void 0, this.records = [];
     }
     recalculate() {}
 }
@@ -52,24 +56,27 @@ export class NoneAggregator extends Aggregator {
         super(...arguments), this.type = AggregationType.NONE, this.isRecord = !0;
     }
     push(record) {
-        record && (this.isRecord && (this.records = [ record ]), this.field && (this.fieldValue = record[this.field])), 
-        this.clearCacheValue();
+        record && (this.isRecord && (this.records = [ record ]), record.isAggregator && this.children && (this.children = [ record ]), 
+        this.field && (this.fieldValue = record[this.field])), this.clearCacheValue();
     }
     deleteRecord(record) {
         record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record.isAggregator && this.children && (this.children = this.children.filter((item => item !== record))), 
         this.field && this.records.length && (this.fieldValue = this.records[this.records.length - 1][this.field])), 
         this.clearCacheValue();
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
         this.field && this.records.length && (this.fieldValue = this.records[this.records.length - 1][this.field]), 
         this.clearCacheValue());
     }
     value() {
-        return this.fieldValue;
+        var _a;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : this.fieldValue;
     }
     reset() {
-        this.records = [], this.fieldValue = void 0;
+        this.children = [], this.changedValue = void 0, this.records = [], this.fieldValue = void 0;
     }
     recalculate() {}
 }
@@ -81,25 +88,28 @@ export class CustomAggregator extends Aggregator {
     }
     push(record) {
         record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        this.field && this.values.push(record[this.field])), this.clearCacheValue();
+        record.isAggregator && this.children && this.children.push(record), this.field && this.values.push(record[this.field])), 
+        this.clearCacheValue();
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
         this.field && this.records.length && (this.values = this.records.map((item => item[this.field]))), 
         this.clearCacheValue());
     }
     deleteRecord(record) {
         record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record.isAggregator && this.children && (this.children = this.children.filter((item => item !== record))), 
         this.field && this.records.length && (this.values = this.records.map((item => item[this.field])))), 
         this.clearCacheValue();
     }
     value() {
-        var _a;
+        var _a, _b;
         return this.fieldValue || (this.fieldValue = null === (_a = this.aggregationFun) || void 0 === _a ? void 0 : _a.call(this, this.values, this.records, this.field)), 
-        this.fieldValue;
+        null !== (_b = this.changedValue) && void 0 !== _b ? _b : this.fieldValue;
     }
     reset() {
-        this.records = [], this.fieldValue = void 0;
+        this.records = [], this.children = [], this.changedValue = void 0, this.fieldValue = void 0;
     }
     recalculate() {
         this.fieldValue = void 0, this._formatedValue = void 0;
@@ -113,26 +123,28 @@ export class RecalculateAggregator extends Aggregator {
     }
     push(record) {
         record && this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        this.clearCacheValue();
+        this.children && record.isAggregator && this.children.push(record), this.clearCacheValue();
     }
     deleteRecord(record) {
-        record && this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record.isAggregator && this.children && (this.children = this.children.filter((item => item !== record)))), 
         this.clearCacheValue();
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
         this.clearCacheValue());
     }
     value() {
-        var _a;
+        var _a, _b;
         if (!this.fieldValue) {
             const aggregatorValue = _getDependAggregatorValues(this.dependAggregators, this.dependIndicatorKeys);
             this.fieldValue = null === (_a = this.calculateFun) || void 0 === _a ? void 0 : _a.call(this, aggregatorValue, this.records, this.field);
         }
-        return this.fieldValue;
+        return null !== (_b = this.changedValue) && void 0 !== _b ? _b : this.fieldValue;
     }
     reset() {
-        this.records = [], this.fieldValue = void 0;
+        this.records = [], this.children = [], this.changedValue = void 0, this.fieldValue = void 0;
     }
     recalculate() {}
 }
@@ -145,7 +157,8 @@ export class SumAggregator extends Aggregator {
     }
     push(record) {
         if (record) if (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        record.isAggregator) {
+        record.isAggregator && this.children) {
+            this.children.push(record);
             const value = record.value();
             this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
         } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
@@ -156,7 +169,8 @@ export class SumAggregator extends Aggregator {
     }
     deleteRecord(record) {
         if (record) if (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
-        record.isAggregator) {
+        record.isAggregator && this.children) {
+            this.children = this.children.filter((item => item !== record));
             const value = record.value();
             this.sum -= null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum -= value : value < 0 && (this.nagetiveSum -= value));
         } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
@@ -168,9 +182,11 @@ export class SumAggregator extends Aggregator {
     updateRecord(oldRecord, newRecord) {
         if (oldRecord && newRecord) {
             if (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
-            oldRecord.isAggregator) {
-                const oldValue = oldRecord.value(), newValue = newRecord.value();
-                this.sum += newValue - oldValue, this.needSplitPositiveAndNegativeForSum && (oldValue > 0 ? this.positiveSum -= oldValue : oldValue < 0 && (this.nagetiveSum -= oldValue), 
+            oldRecord.isAggregator && this.children) {
+                const oldValue = oldRecord.value();
+                this.children = this.children.filter((item => item !== oldRecord));
+                const newValue = newRecord.value();
+                this.children.push(newRecord), this.sum += newValue - oldValue, this.needSplitPositiveAndNegativeForSum && (oldValue > 0 ? this.positiveSum -= oldValue : oldValue < 0 && (this.nagetiveSum -= oldValue), 
                 newValue > 0 ? this.positiveSum += newValue : newValue < 0 && (this.nagetiveSum += newValue));
             } else if (this.field && !isNaN(parseFloat(oldRecord[this.field]))) {
                 const oldValue = parseFloat(oldRecord[this.field]), newValue = parseFloat(newRecord[this.field]);
@@ -181,8 +197,8 @@ export class SumAggregator extends Aggregator {
         }
     }
     value() {
-        var _a;
-        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.sum : void 0;
+        var _a, _b;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : (null === (_b = this.records) || void 0 === _b ? void 0 : _b.length) >= 1 ? this.sum : void 0;
     }
     positiveValue() {
         return this.positiveSum;
@@ -194,7 +210,13 @@ export class SumAggregator extends Aggregator {
         super.reset(), this.records = [], this.sum = 0;
     }
     recalculate() {
-        if (this.sum = 0, this._formatedValue = void 0, this.records) for (let i = 0; i < this.records.length; i++) {
+        if (this.sum = 0, this._formatedValue = void 0, this.children && this.children.length > 0) for (let i = 0; i < this.children.length; i++) {
+            const child = this.children[i];
+            if (child.isAggregator) {
+                const value = child.value();
+                this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+            }
+        } else if (this.records) for (let i = 0; i < this.records.length; i++) {
             const record = this.records[i];
             if (record.isAggregator) {
                 const value = record.value();
@@ -213,24 +235,34 @@ export class CountAggregator extends Aggregator {
     }
     push(record) {
         record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        record.isAggregator ? this.count += record.value() : this.count++), this.clearCacheValue();
+        record.isAggregator ? (this.children && this.children.push(record), this.count += record.value()) : this.count++), 
+        this.clearCacheValue();
     }
     deleteRecord(record) {
         record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
-        record.isAggregator ? this.count -= record.value() : this.count--), this.clearCacheValue();
+        record.isAggregator ? (this.children && (this.children = this.children.filter((item => item !== record))), 
+        this.count -= record.value()) : this.count--), this.clearCacheValue();
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
-        oldRecord.isAggregator && (this.count += newRecord.value() - oldRecord.value()));
+        oldRecord.isAggregator && (this.count += newRecord.value() - oldRecord.value()), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))));
     }
     value() {
-        return this.count;
+        var _a;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : this.count;
     }
     reset() {
-        this.records = [], this.count = 0;
+        this.changedValue = void 0, this.children = [], this.records = [], this.count = 0;
     }
     recalculate() {
-        if (this.count = 0, this._formatedValue = void 0, this.records) for (let i = 0; i < this.records.length; i++) {
+        if (this.count = 0, this._formatedValue = void 0, this.children && this.children.length > 0) for (let i = 0; i < this.children.length; i++) {
+            const child = this.children[i];
+            if (child.isAggregator) {
+                const value = child.value();
+                this.count += null != value ? value : 0;
+            } else this.count++;
+        } else if (this.records) for (let i = 0; i < this.records.length; i++) {
             const record = this.records[i];
             record.isAggregator ? this.count += record.value() : this.count++;
         }
@@ -243,31 +275,38 @@ export class AvgAggregator extends Aggregator {
     }
     push(record) {
         record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        record.isAggregator && record.type === AggregationType.AVG ? (this.sum += record.sum, 
-        this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum += parseFloat(record[this.field]), 
+        record.isAggregator && record.type === AggregationType.AVG ? (this.children && this.children.push(record), 
+        this.sum += record.sum, this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum += parseFloat(record[this.field]), 
         this.count++)), this.clearCacheValue();
     }
     deleteRecord(record) {
         record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
-        record.isAggregator && record.type === AggregationType.AVG ? (this.sum -= record.sum, 
-        this.count -= record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum -= parseFloat(record[this.field]), 
+        record.isAggregator && record.type === AggregationType.AVG ? (this.children && (this.children = this.children.filter((item => item !== record))), 
+        this.sum -= record.sum, this.count -= record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum -= parseFloat(record[this.field]), 
         this.count--)), this.clearCacheValue();
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
-        oldRecord.isAggregator && oldRecord.type === AggregationType.AVG ? (this.sum += newRecord.sum - oldRecord.sum, 
-        this.count += newRecord.count - oldRecord.count) : this.field && !isNaN(parseFloat(oldRecord[this.field])) && (this.sum += parseFloat(newRecord[this.field]) - parseFloat(oldRecord[this.field])), 
+        oldRecord.isAggregator && oldRecord.type === AggregationType.AVG ? (this.children && newRecord.isAggregator && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
+        this.sum += newRecord.sum - oldRecord.sum, this.count += newRecord.count - oldRecord.count) : this.field && !isNaN(parseFloat(oldRecord[this.field])) && (this.sum += parseFloat(newRecord[this.field]) - parseFloat(oldRecord[this.field])), 
         this.clearCacheValue());
     }
     value() {
-        var _a;
-        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.sum / this.count : void 0;
+        var _a, _b;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : (null === (_b = this.records) || void 0 === _b ? void 0 : _b.length) >= 1 ? this.sum / this.count : void 0;
     }
     reset() {
-        this.records = [], this.sum = 0, this.count = 0;
+        this.changedValue = void 0, this.children = [], this.records = [], this.sum = 0, 
+        this.count = 0;
     }
     recalculate() {
-        if (this.sum = 0, this.count = 0, this._formatedValue = void 0, this.records) for (let i = 0; i < this.records.length; i++) {
+        if (this.sum = 0, this.count = 0, this._formatedValue = void 0, this.children && this.children.length > 0) for (let i = 0; i < this.children.length; i++) {
+            const child = this.children[i];
+            if (child.isAggregator && child.type === AggregationType.AVG) {
+                const childValue = child.value();
+                this.sum += childValue * child.count, this.count += child.count;
+            }
+        } else if (this.records) for (let i = 0; i < this.records.length; i++) {
             const record = this.records[i];
             record.isAggregator && record.type === AggregationType.AVG ? (this.sum += record.sum, 
             this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum += parseFloat(record[this.field]), 
@@ -282,26 +321,34 @@ export class MaxAggregator extends Aggregator {
     }
     push(record) {
         record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        record.isAggregator ? this.max = record.max > this.max ? record.max : this.max : "number" == typeof record ? this.max = record > this.max ? record : this.max : this.field && "number" == typeof record[this.field] ? this.max = record[this.field] > this.max ? record[this.field] : this.max : this.field && !isNaN(record[this.field]) && (this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max)), 
+        record.isAggregator ? (this.children && this.children.push(record), this.max = record.max > this.max ? record.max : this.max) : "number" == typeof record ? this.max = record > this.max ? record : this.max : this.field && "number" == typeof record[this.field] ? this.max = record[this.field] > this.max ? record[this.field] : this.max : this.field && !isNaN(record[this.field]) && (this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max)), 
         this.clearCacheValue();
     }
     deleteRecord(record) {
         record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record.isAggregator && this.children && (this.children = this.children.filter((item => item !== record))), 
         this.recalculate());
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
         this.recalculate());
     }
     value() {
-        var _a;
-        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.max : void 0;
+        var _a, _b;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : (null === (_b = this.records) || void 0 === _b ? void 0 : _b.length) >= 1 ? this.max : void 0;
     }
     reset() {
-        this.records = [], this.max = Number.MIN_SAFE_INTEGER;
+        this.records = [], this.changedValue = void 0, this.children = [], this.max = Number.MIN_SAFE_INTEGER;
     }
     recalculate() {
-        if (this.max = Number.MIN_SAFE_INTEGER, this._formatedValue = void 0, this.records) for (let i = 0; i < this.records.length; i++) {
+        if (this.max = Number.MIN_SAFE_INTEGER, this._formatedValue = void 0, this.children && this.children.length > 0) for (let i = 0; i < this.children.length; i++) {
+            const child = this.children[i];
+            if (child.isAggregator) {
+                const childValue = child.value();
+                this.max = Math.max(this.max, childValue);
+            }
+        } else if (this.records) for (let i = 0; i < this.records.length; i++) {
             const record = this.records[i];
             record.isAggregator ? this.max = record.max > this.max ? record.max : this.max : "number" == typeof record ? this.max = record > this.max ? record : this.max : this.field && "number" == typeof record[this.field] ? this.max = record[this.field] > this.max ? record[this.field] : this.max : this.field && !isNaN(record[this.field]) && (this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max);
         }
@@ -314,26 +361,34 @@ export class MinAggregator extends Aggregator {
     }
     push(record) {
         record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), 
-        record.isAggregator ? this.min = record.min < this.min ? record.min : this.min : "number" == typeof record ? this.min = record < this.min ? record : this.min : this.field && "number" == typeof record[this.field] ? this.min = record[this.field] < this.min ? record[this.field] : this.min : this.field && !isNaN(record[this.field]) && (this.min = parseFloat(record[this.field]) < this.min ? parseFloat(record[this.field]) : this.min)), 
+        record.isAggregator ? (this.children && this.children.push(record), this.min = record.min < this.min ? record.min : this.min) : "number" == typeof record ? this.min = record < this.min ? record : this.min : this.field && "number" == typeof record[this.field] ? this.min = record[this.field] < this.min ? record[this.field] : this.min : this.field && !isNaN(record[this.field]) && (this.min = parseFloat(record[this.field]) < this.min ? parseFloat(record[this.field]) : this.min)), 
         this.clearCacheValue();
     }
     deleteRecord(record) {
         record && (this.isRecord && this.records && (this.records = this.records.filter((item => item !== record))), 
+        record.isAggregator && this.children && (this.children = this.children.filter((item => item !== record))), 
         this.recalculate());
     }
     updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map((item => item === oldRecord ? newRecord : item))), 
+        oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map((item => item === oldRecord ? newRecord : item))), 
         this.recalculate());
     }
     value() {
-        var _a;
-        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.min : void 0;
+        var _a, _b;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : (null === (_b = this.records) || void 0 === _b ? void 0 : _b.length) >= 1 ? this.min : void 0;
     }
     reset() {
-        this.records = [], this.min = Number.MAX_SAFE_INTEGER;
+        this.records = [], this.changedValue = void 0, this.children = [], this.min = Number.MAX_SAFE_INTEGER;
     }
     recalculate() {
-        if (this.min = Number.MAX_SAFE_INTEGER, this._formatedValue = void 0, this.records) for (let i = 0; i < this.records.length; i++) {
+        if (this.min = Number.MAX_SAFE_INTEGER, this._formatedValue = void 0, this.children && this.children.length > 0) for (let i = 0; i < this.children.length; i++) {
+            const child = this.children[i];
+            if (child.isAggregator) {
+                const childValue = child.value();
+                this.min = Math.min(this.min, childValue);
+            }
+        } else if (this.records) for (let i = 0; i < this.records.length; i++) {
             const record = this.records[i];
             record.isAggregator ? this.min = record.min < this.min ? record.min : this.min : "number" == typeof record ? this.min = record < this.min ? record : this.min : this.field && "number" == typeof record[this.field] ? this.min = record[this.field] < this.min ? record[this.field] : this.min : this.field && !isNaN(record[this.field]) && (this.min = parseFloat(record[this.field]) < this.min ? parseFloat(record[this.field]) : this.min);
         }