@qrvey/formula-lang 3.1.0-rc.790 → 3.1.0-rc.795

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.
Files changed (19) hide show
  1. package/dist/cjs/constants/interfaces.d.ts +1 -0
  2. package/dist/cjs/functions/totalCount.js +1 -1
  3. package/dist/cjs/functions/totalCount.js.map +1 -1
  4. package/dist/cjs/functions/totalMax.js +1 -1
  5. package/dist/cjs/functions/totalMax.js.map +1 -1
  6. package/dist/cjs/functions/totalSum.js +1 -1
  7. package/dist/cjs/functions/totalSum.js.map +1 -1
  8. package/dist/cjs/utils/aggregatedFunctions.js +20 -10
  9. package/dist/cjs/utils/aggregatedFunctions.js.map +1 -1
  10. package/dist/module/constants/interfaces.d.ts +1 -0
  11. package/dist/module/functions/totalCount.js +1 -1
  12. package/dist/module/functions/totalCount.js.map +1 -1
  13. package/dist/module/functions/totalMax.js +1 -1
  14. package/dist/module/functions/totalMax.js.map +1 -1
  15. package/dist/module/functions/totalSum.js +1 -1
  16. package/dist/module/functions/totalSum.js.map +1 -1
  17. package/dist/module/utils/aggregatedFunctions.js +20 -10
  18. package/dist/module/utils/aggregatedFunctions.js.map +1 -1
  19. package/package.json +1 -1
package/dist/cjs/constants/interfaces.d.ts CHANGED
@@ -63,6 +63,7 @@ export interface AggregatedDefinition {
63
63
  columnId: string;
64
64
  property?: string;
65
65
  aggregate: string;
66
+ scope: string;
66
67
  }
67
68
  export type AggregateMap = Map<string, AggregatedDefinition>;
68
69
  interface TranspilationDetails {
package/dist/cjs/functions/totalCount.js CHANGED
@@ -32,7 +32,7 @@ exports.AGG_COUNT = {
32
32
  };
33
33
  function elasticsearch(value) {
34
34
  const sanitized = (0, utils_1.replaceDotByUnderscore)(value);
35
- return `params.get("AGG_COUNT_${sanitized}")`;
35
+ return `params.get("TOTAL_COUNT_${sanitized}")`;
36
36
  }
37
37
  function SQL(value) {
38
38
  return `(SELECT COUNT(${value}) FROM :formulaTable :formulaWhere)`;
package/dist/cjs/functions/totalCount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"totalCount.js","sourceRoot":"","sources":["../../../src/functions/totalCount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAkE;AAElE;;GAEG;AACU,QAAA,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,yCAAyC;YACzC,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,sBAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAChD,OAAO,yBAAyB,SAAS,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,iBAAiB,KAAK,qCAAqC,CAAC;AACvE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"totalCount.js","sourceRoot":"","sources":["../../../src/functions/totalCount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAkE;AAElE;;GAEG;AACU,QAAA,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,yCAAyC;YACzC,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,sBAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAChD,OAAO,2BAA2B,SAAS,IAAI,CAAC;AACpD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,iBAAiB,KAAK,qCAAqC,CAAC;AACvE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/cjs/functions/totalMax.js CHANGED
@@ -31,7 +31,7 @@ exports.AGG_MAXVAL = {
31
31
  };
32
32
  function elasticsearch(value) {
33
33
  const sanitized = (0, utils_1.replaceDotByUnderscore)(value);
34
- return `params.get("AGG_MAXVAL_${sanitized}")`;
34
+ return `params.get("TOTAL_MAXVAL_${sanitized}")`;
35
35
  }
36
36
  function SQL(value) {
37
37
  return `(SELECT MAX(${value}) FROM :formulaTable :formulaWhere)`;
package/dist/cjs/functions/totalMax.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"totalMax.js","sourceRoot":"","sources":["../../../src/functions/totalMax.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,UAAU,GAAuB;IAC1C,UAAU,EAAE,YAAY;IACxB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAChD,OAAO,0BAA0B,SAAS,IAAI,CAAC;AACnD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"totalMax.js","sourceRoot":"","sources":["../../../src/functions/totalMax.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,UAAU,GAAuB;IAC1C,UAAU,EAAE,YAAY;IACxB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAChD,OAAO,4BAA4B,SAAS,IAAI,CAAC;AACrD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/cjs/functions/totalSum.js CHANGED
@@ -31,7 +31,7 @@ exports.AGG_SUM = {
31
31
  };
32
32
  function elasticsearch(value) {
33
33
  const sanitized = (0, utils_1.replaceDotByUnderscore)(value);
34
- return `params.get("TOT_SUM_${sanitized}")`;
34
+ return `params.get("TOTAL_SUM_${sanitized}")`;
35
35
  }
36
36
  function SQL(value) {
37
37
  return `(SELECT SUM(${value}) FROM :formulaTable :formulaWhere)`;
package/dist/cjs/functions/totalSum.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"totalSum.js","sourceRoot":"","sources":["../../../src/functions/totalSum.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAChD,OAAO,uBAAuB,SAAS,IAAI,CAAC;AAChD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"totalSum.js","sourceRoot":"","sources":["../../../src/functions/totalSum.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAChD,OAAO,yBAAyB,SAAS,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/cjs/utils/aggregatedFunctions.js CHANGED
@@ -4,6 +4,18 @@ 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 AGGREGATE_DEFINITIONS = {
8
+ SUM: { engineName: 'SUM', scope: 'AGGREGATE' },
9
+ AVG: { engineName: 'AVG', scope: 'AGGREGATE' },
10
+ MED: { engineName: 'MEDIAN', scope: 'AGGREGATE' },
11
+ MINVAL: { engineName: 'MIN', scope: 'AGGREGATE' },
12
+ MAXVAL: { engineName: 'MAX', scope: 'AGGREGATE' },
13
+ COUNT: { engineName: 'COUNT', scope: 'AGGREGATE' },
14
+ DISTCOUNT: { engineName: 'DISTINCTCOUNT', scope: 'AGGREGATE' },
15
+ AGG_COUNT: { engineName: 'COUNT', scope: 'TOTAL' },
16
+ AGG_MAXVAL: { engineName: 'MAX', scope: 'TOTAL' },
17
+ AGG_SUM: { engineName: 'SUM', scope: 'TOTAL' },
18
+ };
7
19
  function aggregateFunction(engine, aggregatedMap, node) {
8
20
  switch (engine) {
9
21
  case constants_1.ENGINES.ELASTICSEARCH:
@@ -25,6 +37,7 @@ function aggregateFunctionsES(currentMap, node) {
25
37
  const columnId = ((_a = arg.context) === null || _a === void 0 ? void 0 : _a.id) || '';
26
38
  const alias = (0, _1.replaceDotByUnderscore)(((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '');
27
39
  const aggregate = getAggregateName(node.name);
40
+ const scope = getScope(node.name);
28
41
  const key = `${aggregate}_${alias}`;
29
42
  // if (params.property) key += `::${params.property}`; //TODO where is this information?
30
43
  if (currentMap.has(key))
@@ -33,19 +46,16 @@ function aggregateFunctionsES(currentMap, node) {
33
46
  key,
34
47
  columnId,
35
48
  aggregate,
49
+ scope,
36
50
  });
37
51
  return currentMap;
38
52
  }
39
53
  function getAggregateName(name) {
40
- const definition = {
41
- SUM: 'SUM',
42
- AVG: 'AVG',
43
- MED: 'MEDIAN',
44
- MINVAL: 'MIN',
45
- MAXVAL: 'MAX',
46
- COUNT: 'COUNT',
47
- DISTCOUNT: 'DISTINCTCOUNT',
48
- };
49
- return definition[name] || '';
54
+ var _a;
55
+ return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.engineName) || '';
56
+ }
57
+ function getScope(name) {
58
+ var _a;
59
+ return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.scope) || 'AGGREGATE';
50
60
  }
51
61
  //# sourceMappingURL=aggregatedFunctions.js.map
package/dist/cjs/utils/aggregatedFunctions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":";;;AAAA,wBAA2C;AAC3C,4CAAkD;AAMlD,+CAAoD;AAWpD,SAAgB,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAXD,8CAWC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,CAAC,IAAA,iCAAmB,EAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,IAAA,yBAAsB,EAAC,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC1C,MAAM,UAAU,GAAG;QACf,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,QAAQ;QACb,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,eAAe;KAC7B,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":";;;AAAA,wBAA2C;AAC3C,4CAAkD;AAMlD,+CAAoD;AAcpD,MAAM,qBAAqB,GAGvB;IACA,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE;IAC9C,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE;IAC9C,GAAG,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE;IACjD,MAAM,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE;IACjD,MAAM,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE;IACjD,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE;IAClD,SAAS,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE;IAC9D,SAAS,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;IAClD,UAAU,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE;IACjD,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE;CACjD,CAAC;AAEF,SAAgB,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAXD,8CAWC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,CAAC,IAAA,iCAAmB,EAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,IAAA,yBAAsB,EAAC,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEpD,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;QACT,KAAK;KACR,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;;IAC1C,OAAO,CAAA,MAAA,qBAAqB,CAAC,IAAI,CAAC,0CAAE,UAAU,KAAI,EAAE,CAAC;AACzD,CAAC;AAED,SAAS,QAAQ,CAAC,IAAoB;;IAClC,OAAO,CAAA,MAAA,qBAAqB,CAAC,IAAI,CAAC,0CAAE,KAAK,KAAI,WAAW,CAAC;AAC7D,CAAC"}
package/dist/module/constants/interfaces.d.ts CHANGED
@@ -63,6 +63,7 @@ export interface AggregatedDefinition {
63
63
  columnId: string;
64
64
  property?: string;
65
65
  aggregate: string;
66
+ scope: string;
66
67
  }
67
68
  export type AggregateMap = Map<string, AggregatedDefinition>;
68
69
  interface TranspilationDetails {
package/dist/module/functions/totalCount.js CHANGED
@@ -29,7 +29,7 @@ export const AGG_COUNT = {
29
29
  };
30
30
  function elasticsearch(value) {
31
31
  const sanitized = replaceDotByUnderscore(value);
32
- return `params.get("AGG_COUNT_${sanitized}")`;
32
+ return `params.get("TOTAL_COUNT_${sanitized}")`;
33
33
  }
34
34
  function SQL(value) {
35
35
  return `(SELECT COUNT(${value}) FROM :formulaTable :formulaWhere)`;
package/dist/module/functions/totalCount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"totalCount.js","sourceRoot":"","sources":["../../../src/functions/totalCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,yCAAyC;YACzC,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,cAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,yBAAyB,SAAS,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,iBAAiB,KAAK,qCAAqC,CAAC;AACvE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"totalCount.js","sourceRoot":"","sources":["../../../src/functions/totalCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,yCAAyC;YACzC,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,cAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,2BAA2B,SAAS,IAAI,CAAC;AACpD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,iBAAiB,KAAK,qCAAqC,CAAC;AACvE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/module/functions/totalMax.js CHANGED
@@ -28,7 +28,7 @@ export const AGG_MAXVAL = {
28
28
  };
29
29
  function elasticsearch(value) {
30
30
  const sanitized = replaceDotByUnderscore(value);
31
- return `params.get("AGG_MAXVAL_${sanitized}")`;
31
+ return `params.get("TOTAL_MAXVAL_${sanitized}")`;
32
32
  }
33
33
  function SQL(value) {
34
34
  return `(SELECT MAX(${value}) FROM :formulaTable :formulaWhere)`;
package/dist/module/functions/totalMax.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"totalMax.js","sourceRoot":"","sources":["../../../src/functions/totalMax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAuB;IAC1C,UAAU,EAAE,YAAY;IACxB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,0BAA0B,SAAS,IAAI,CAAC;AACnD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"totalMax.js","sourceRoot":"","sources":["../../../src/functions/totalMax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAuB;IAC1C,UAAU,EAAE,YAAY;IACxB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,4BAA4B,SAAS,IAAI,CAAC;AACrD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/module/functions/totalSum.js CHANGED
@@ -28,7 +28,7 @@ export const AGG_SUM = {
28
28
  };
29
29
  function elasticsearch(value) {
30
30
  const sanitized = replaceDotByUnderscore(value);
31
- return `params.get("TOT_SUM_${sanitized}")`;
31
+ return `params.get("TOTAL_SUM_${sanitized}")`;
32
32
  }
33
33
  function SQL(value) {
34
34
  return `(SELECT SUM(${value}) FROM :formulaTable :formulaWhere)`;
package/dist/module/functions/totalSum.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"totalSum.js","sourceRoot":"","sources":["../../../src/functions/totalSum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,uBAAuB,SAAS,IAAI,CAAC;AAChD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"totalSum.js","sourceRoot":"","sources":["../../../src/functions/totalSum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAChD,OAAO,yBAAyB,SAAS,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,eAAe,KAAK,qCAAqC,CAAC;AACrE,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IACxB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/module/utils/aggregatedFunctions.js CHANGED
@@ -1,6 +1,18 @@
1
1
  import { replaceDotByUnderscore } from '.';
2
2
  import { AST_TYPES, ENGINES } from '../constants';
3
3
  import { isAggregateFunction } from './isAggregate';
4
+ const AGGREGATE_DEFINITIONS = {
5
+ SUM: { engineName: 'SUM', scope: 'AGGREGATE' },
6
+ AVG: { engineName: 'AVG', scope: 'AGGREGATE' },
7
+ MED: { engineName: 'MEDIAN', scope: 'AGGREGATE' },
8
+ MINVAL: { engineName: 'MIN', scope: 'AGGREGATE' },
9
+ MAXVAL: { engineName: 'MAX', scope: 'AGGREGATE' },
10
+ COUNT: { engineName: 'COUNT', scope: 'AGGREGATE' },
11
+ DISTCOUNT: { engineName: 'DISTINCTCOUNT', scope: 'AGGREGATE' },
12
+ AGG_COUNT: { engineName: 'COUNT', scope: 'TOTAL' },
13
+ AGG_MAXVAL: { engineName: 'MAX', scope: 'TOTAL' },
14
+ AGG_SUM: { engineName: 'SUM', scope: 'TOTAL' },
15
+ };
4
16
  export function aggregateFunction(engine, aggregatedMap, node) {
5
17
  switch (engine) {
6
18
  case ENGINES.ELASTICSEARCH:
@@ -21,6 +33,7 @@ function aggregateFunctionsES(currentMap, node) {
21
33
  const columnId = ((_a = arg.context) === null || _a === void 0 ? void 0 : _a.id) || '';
22
34
  const alias = replaceDotByUnderscore(((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '');
23
35
  const aggregate = getAggregateName(node.name);
36
+ const scope = getScope(node.name);
24
37
  const key = `${aggregate}_${alias}`;
25
38
  // if (params.property) key += `::${params.property}`; //TODO where is this information?
26
39
  if (currentMap.has(key))
@@ -29,19 +42,16 @@ function aggregateFunctionsES(currentMap, node) {
29
42
  key,
30
43
  columnId,
31
44
  aggregate,
45
+ scope,
32
46
  });
33
47
  return currentMap;
34
48
  }
35
49
  function getAggregateName(name) {
36
- const definition = {
37
- SUM: 'SUM',
38
- AVG: 'AVG',
39
- MED: 'MEDIAN',
40
- MINVAL: 'MIN',
41
- MAXVAL: 'MAX',
42
- COUNT: 'COUNT',
43
- DISTCOUNT: 'DISTINCTCOUNT',
44
- };
45
- return definition[name] || '';
50
+ var _a;
51
+ return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.engineName) || '';
52
+ }
53
+ function getScope(name) {
54
+ var _a;
55
+ return ((_a = AGGREGATE_DEFINITIONS[name]) === null || _a === void 0 ? void 0 : _a.scope) || 'AGGREGATE';
46
56
  }
47
57
  //# sourceMappingURL=aggregatedFunctions.js.map
package/dist/module/utils/aggregatedFunctions.js.map CHANGED
@@ -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;AAWpD,MAAM,UAAU,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,sBAAsB,CAAC,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC1C,MAAM,UAAU,GAAG;QACf,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,QAAQ;QACb,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,eAAe;KAC7B,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/formula-lang",
3
- "version": "3.1.0-rc.790",
3
+ "version": "3.1.0-rc.795",
4
4
  "description": "QFormula support for qrvey projects",
5
5
  "types": "dist/module/index.d.ts",
6
6
  "main": "dist/module/index.js",