@qrvey/formula-lang 3.1.0-rc.795 → 3.1.0-rc.800
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4,17 +4,19 @@ exports.aggregateFunction = void 0;
|
|
|
4
4
|
const _1 = require(".");
|
|
5
5
|
const constants_1 = require("../constants");
|
|
6
6
|
const isAggregate_1 = require("./isAggregate");
|
|
7
|
+
const TOTAL_AGGREGATE_NAME = 'TOTAL';
|
|
8
|
+
const AGGREGATE_NAME = 'AGGREGATE';
|
|
7
9
|
const AGGREGATE_DEFINITIONS = {
|
|
8
|
-
SUM: { engineName: 'SUM', scope:
|
|
9
|
-
AVG: { engineName: 'AVG', scope:
|
|
10
|
-
MED: { engineName: 'MEDIAN', scope:
|
|
11
|
-
MINVAL: { engineName: 'MIN', scope:
|
|
12
|
-
MAXVAL: { engineName: 'MAX', scope:
|
|
13
|
-
COUNT: { engineName: 'COUNT', scope:
|
|
14
|
-
DISTCOUNT: { engineName: 'DISTINCTCOUNT', scope:
|
|
15
|
-
AGG_COUNT: { engineName: 'COUNT', scope:
|
|
16
|
-
AGG_MAXVAL: { engineName: 'MAX', scope:
|
|
17
|
-
AGG_SUM: { engineName: 'SUM', scope:
|
|
10
|
+
SUM: { engineName: 'SUM', scope: AGGREGATE_NAME },
|
|
11
|
+
AVG: { engineName: 'AVG', scope: AGGREGATE_NAME },
|
|
12
|
+
MED: { engineName: 'MEDIAN', scope: AGGREGATE_NAME },
|
|
13
|
+
MINVAL: { engineName: 'MIN', scope: AGGREGATE_NAME },
|
|
14
|
+
MAXVAL: { engineName: 'MAX', scope: AGGREGATE_NAME },
|
|
15
|
+
COUNT: { engineName: 'COUNT', scope: AGGREGATE_NAME },
|
|
16
|
+
DISTCOUNT: { engineName: 'DISTINCTCOUNT', scope: AGGREGATE_NAME },
|
|
17
|
+
AGG_COUNT: { engineName: 'COUNT', scope: TOTAL_AGGREGATE_NAME },
|
|
18
|
+
AGG_MAXVAL: { engineName: 'MAX', scope: TOTAL_AGGREGATE_NAME },
|
|
19
|
+
AGG_SUM: { engineName: 'SUM', scope: TOTAL_AGGREGATE_NAME },
|
|
18
20
|
};
|
|
19
21
|
function aggregateFunction(engine, aggregatedMap, node) {
|
|
20
22
|
switch (engine) {
|
|
@@ -38,7 +40,9 @@ function aggregateFunctionsES(currentMap, node) {
|
|
|
38
40
|
const alias = (0, _1.replaceDotByUnderscore)(((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '');
|
|
39
41
|
const aggregate = getAggregateName(node.name);
|
|
40
42
|
const scope = getScope(node.name);
|
|
41
|
-
const key =
|
|
43
|
+
const key = scope === TOTAL_AGGREGATE_NAME
|
|
44
|
+
? `${TOTAL_AGGREGATE_NAME}_${aggregate}_${alias}`
|
|
45
|
+
: `${aggregate}_${alias}`;
|
|
42
46
|
// if (params.property) key += `::${params.property}`; //TODO where is this information?
|
|
43
47
|
if (currentMap.has(key))
|
|
44
48
|
return currentMap;
|
|
@@ -56,6 +60,6 @@ function getAggregateName(name) {
|
|
|
56
60
|
}
|
|
57
61
|
function getScope(name) {
|
|
58
62
|
var _a;
|
|
59
|
-
return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.scope) ||
|
|
63
|
+
return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.scope) || AGGREGATE_NAME;
|
|
60
64
|
}
|
|
61
65
|
//# sourceMappingURL=aggregatedFunctions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":";;;AAAA,wBAA2C;AAC3C,4CAAkD;AAMlD,+CAAoD;
|
|
1
|
+
{"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
import { replaceDotByUnderscore } from '.';
|
|
2
2
|
import { AST_TYPES, ENGINES } from '../constants';
|
|
3
3
|
import { isAggregateFunction } from './isAggregate';
|
|
4
|
+
const TOTAL_AGGREGATE_NAME = 'TOTAL';
|
|
5
|
+
const AGGREGATE_NAME = 'AGGREGATE';
|
|
4
6
|
const AGGREGATE_DEFINITIONS = {
|
|
5
|
-
SUM: { engineName: 'SUM', scope:
|
|
6
|
-
AVG: { engineName: 'AVG', scope:
|
|
7
|
-
MED: { engineName: 'MEDIAN', scope:
|
|
8
|
-
MINVAL: { engineName: 'MIN', scope:
|
|
9
|
-
MAXVAL: { engineName: 'MAX', scope:
|
|
10
|
-
COUNT: { engineName: 'COUNT', scope:
|
|
11
|
-
DISTCOUNT: { engineName: 'DISTINCTCOUNT', scope:
|
|
12
|
-
AGG_COUNT: { engineName: 'COUNT', scope:
|
|
13
|
-
AGG_MAXVAL: { engineName: 'MAX', scope:
|
|
14
|
-
AGG_SUM: { engineName: 'SUM', scope:
|
|
7
|
+
SUM: { engineName: 'SUM', scope: AGGREGATE_NAME },
|
|
8
|
+
AVG: { engineName: 'AVG', scope: AGGREGATE_NAME },
|
|
9
|
+
MED: { engineName: 'MEDIAN', scope: AGGREGATE_NAME },
|
|
10
|
+
MINVAL: { engineName: 'MIN', scope: AGGREGATE_NAME },
|
|
11
|
+
MAXVAL: { engineName: 'MAX', scope: AGGREGATE_NAME },
|
|
12
|
+
COUNT: { engineName: 'COUNT', scope: AGGREGATE_NAME },
|
|
13
|
+
DISTCOUNT: { engineName: 'DISTINCTCOUNT', scope: AGGREGATE_NAME },
|
|
14
|
+
AGG_COUNT: { engineName: 'COUNT', scope: TOTAL_AGGREGATE_NAME },
|
|
15
|
+
AGG_MAXVAL: { engineName: 'MAX', scope: TOTAL_AGGREGATE_NAME },
|
|
16
|
+
AGG_SUM: { engineName: 'SUM', scope: TOTAL_AGGREGATE_NAME },
|
|
15
17
|
};
|
|
16
18
|
export function aggregateFunction(engine, aggregatedMap, node) {
|
|
17
19
|
switch (engine) {
|
|
@@ -34,7 +36,9 @@ function aggregateFunctionsES(currentMap, node) {
|
|
|
34
36
|
const alias = replaceDotByUnderscore(((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '');
|
|
35
37
|
const aggregate = getAggregateName(node.name);
|
|
36
38
|
const scope = getScope(node.name);
|
|
37
|
-
const key =
|
|
39
|
+
const key = scope === TOTAL_AGGREGATE_NAME
|
|
40
|
+
? `${TOTAL_AGGREGATE_NAME}_${aggregate}_${alias}`
|
|
41
|
+
: `${aggregate}_${alias}`;
|
|
38
42
|
// if (params.property) key += `::${params.property}`; //TODO where is this information?
|
|
39
43
|
if (currentMap.has(key))
|
|
40
44
|
return currentMap;
|
|
@@ -52,6 +56,6 @@ function getAggregateName(name) {
|
|
|
52
56
|
}
|
|
53
57
|
function getScope(name) {
|
|
54
58
|
var _a;
|
|
55
|
-
return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.scope) ||
|
|
59
|
+
return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.scope) || AGGREGATE_NAME;
|
|
56
60
|
}
|
|
57
61
|
//# sourceMappingURL=aggregatedFunctions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,GAAG,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAMlD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"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"}
|