@qrvey/formula-lang 2.0.1-rc.668 → 2.0.1-rc.670
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.
- package/dist/cjs/functions/aggAvg.js +2 -1
- package/dist/cjs/functions/aggAvg.js.map +1 -1
- package/dist/cjs/functions/aggCount.js +2 -1
- package/dist/cjs/functions/aggCount.js.map +1 -1
- package/dist/cjs/functions/aggDistcount.js +2 -1
- package/dist/cjs/functions/aggDistcount.js.map +1 -1
- package/dist/cjs/functions/aggMax.js +2 -1
- package/dist/cjs/functions/aggMax.js.map +1 -1
- package/dist/cjs/functions/aggMed.js +2 -1
- package/dist/cjs/functions/aggMed.js.map +1 -1
- package/dist/cjs/functions/aggMin.js +2 -1
- package/dist/cjs/functions/aggMin.js.map +1 -1
- package/dist/cjs/functions/aggSum.js +2 -1
- package/dist/cjs/functions/aggSum.js.map +1 -1
- package/dist/cjs/utils/aggregatedFunctions.js +2 -1
- package/dist/cjs/utils/aggregatedFunctions.js.map +1 -1
- package/dist/cjs/utils/index.d.ts +1 -0
- package/dist/cjs/utils/index.js +3 -1
- package/dist/cjs/utils/index.js.map +1 -1
- package/dist/module/functions/aggAvg.js +3 -2
- package/dist/module/functions/aggAvg.js.map +1 -1
- package/dist/module/functions/aggCount.js +3 -2
- package/dist/module/functions/aggCount.js.map +1 -1
- package/dist/module/functions/aggDistcount.js +3 -2
- package/dist/module/functions/aggDistcount.js.map +1 -1
- package/dist/module/functions/aggMax.js +3 -2
- package/dist/module/functions/aggMax.js.map +1 -1
- package/dist/module/functions/aggMed.js +3 -2
- package/dist/module/functions/aggMed.js.map +1 -1
- package/dist/module/functions/aggMin.js +3 -2
- package/dist/module/functions/aggMin.js.map +1 -1
- package/dist/module/functions/aggSum.js +3 -2
- package/dist/module/functions/aggSum.js.map +1 -1
- package/dist/module/utils/aggregatedFunctions.js +2 -1
- package/dist/module/utils/aggregatedFunctions.js.map +1 -1
- package/dist/module/utils/index.d.ts +1 -0
- package/dist/module/utils/index.js +1 -0
- package/dist/module/utils/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -28,7 +28,8 @@ exports.AVG = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("AVG_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `AVG(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggAvg.js","sourceRoot":"","sources":["../../../src/functions/aggAvg.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggAvg.js","sourceRoot":"","sources":["../../../src/functions/aggAvg.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,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;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -28,7 +28,8 @@ exports.COUNT = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("COUNT_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `COUNT(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggCount.js","sourceRoot":"","sources":["../../../src/functions/aggCount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggCount.js","sourceRoot":"","sources":["../../../src/functions/aggCount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAkE;AAElE;;GAEG;AACU,QAAA,KAAK,GAAuB;IACrC,UAAU,EAAE,OAAO;IACnB,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,sBAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,qBAAqB,MAAM,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,SAAS,KAAK,GAAG,CAAC;AAC7B,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"}
|
|
@@ -28,7 +28,8 @@ exports.DISTCOUNT = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("DISTINCTCOUNT_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `COUNT(DISTINCT ${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.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,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,sBAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,6BAA6B,MAAM,IAAI,CAAC;AACnD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,kBAAkB,KAAK,GAAG,CAAC;AACtC,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"}
|
|
@@ -28,7 +28,8 @@ exports.MAXVAL = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("MAX_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `MAX(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMax.js","sourceRoot":"","sources":["../../../src/functions/aggMax.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggMax.js","sourceRoot":"","sources":["../../../src/functions/aggMax.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,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;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -28,7 +28,8 @@ exports.MED = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("MEDIAN_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `MEDIAN(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,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;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,sBAAsB,MAAM,IAAI,CAAC;AAC5C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,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,8CAA8C,KAAK,GAAG,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -28,7 +28,8 @@ exports.MINVAL = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("MIN_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `MIN(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMin.js","sourceRoot":"","sources":["../../../src/functions/aggMin.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggMin.js","sourceRoot":"","sources":["../../../src/functions/aggMin.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,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;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -28,7 +28,8 @@ exports.SUM = {
|
|
|
28
28
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
29
29
|
};
|
|
30
30
|
function elasticsearch(value) {
|
|
31
|
-
|
|
31
|
+
const _value = (0, utils_1.replaceDotByUnderscore)(value);
|
|
32
|
+
return `params.get("SUM_${_value}")`;
|
|
32
33
|
}
|
|
33
34
|
function SQL(value) {
|
|
34
35
|
return `SUM(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggSum.js","sourceRoot":"","sources":["../../../src/functions/aggSum.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggSum.js","sourceRoot":"","sources":["../../../src/functions/aggSum.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyE;AAEzE;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,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;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.aggregateFunction = void 0;
|
|
4
|
+
const _1 = require(".");
|
|
4
5
|
const constants_1 = require("../constants");
|
|
5
6
|
const isAggregate_1 = require("./isAggregate");
|
|
6
7
|
function aggregateFunction(engine, aggregatedMap, node) {
|
|
@@ -22,7 +23,7 @@ function aggregateFunctionsES(currentMap, node) {
|
|
|
22
23
|
if (arg.type !== constants_1.AST_TYPES.column)
|
|
23
24
|
return false;
|
|
24
25
|
const columnId = ((_a = arg.context) === null || _a === void 0 ? void 0 : _a.id) || '';
|
|
25
|
-
const alias = ((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '';
|
|
26
|
+
const alias = (0, _1.replaceDotByUnderscore)(((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '');
|
|
26
27
|
const aggregate = getAggregateName(node.name);
|
|
27
28
|
const key = `${aggregate}_${alias}`;
|
|
28
29
|
// if (params.property) key += `::${params.property}`; //TODO where is this information?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":";;;AAAA,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,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;
|
|
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"}
|
|
@@ -11,3 +11,4 @@ export * from './isLongLiteralNumber';
|
|
|
11
11
|
export * from './cleanInvalidItemsInContext';
|
|
12
12
|
export { isAColumnParam, isANumericColumnParam } from './isAColumn';
|
|
13
13
|
export declare const removeQuotes: (str: string) => string;
|
|
14
|
+
export declare const replaceDotByUnderscore: (str: string) => string;
|
package/dist/cjs/utils/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.removeQuotes = exports.isANumericColumnParam = exports.isAColumnParam = void 0;
|
|
17
|
+
exports.replaceDotByUnderscore = exports.removeQuotes = exports.isANumericColumnParam = exports.isAColumnParam = void 0;
|
|
18
18
|
__exportStar(require("./customFunctions"), exports);
|
|
19
19
|
__exportStar(require("./aggregatedFunctions"), exports);
|
|
20
20
|
__exportStar(require("./isNumberParam"), exports);
|
|
@@ -31,4 +31,6 @@ Object.defineProperty(exports, "isAColumnParam", { enumerable: true, get: functi
|
|
|
31
31
|
Object.defineProperty(exports, "isANumericColumnParam", { enumerable: true, get: function () { return isAColumn_1.isANumericColumnParam; } });
|
|
32
32
|
const removeQuotes = (str) => str.replace(/^E?'|'$/g, '');
|
|
33
33
|
exports.removeQuotes = removeQuotes;
|
|
34
|
+
const replaceDotByUnderscore = (str) => str.replace(/\./g, '_');
|
|
35
|
+
exports.replaceDotByUnderscore = replaceDotByUnderscore;
|
|
34
36
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,wDAAsC;AACtC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,0DAAwC;AACxC,iDAA+B;AAC/B,oDAAkC;AAClC,wDAAsC;AACtC,+DAA6C;AAC7C,yCAAoE;AAA3D,2GAAA,cAAc,OAAA;AAAE,kHAAA,qBAAqB,OAAA;AAEvC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,wDAAsC;AACtC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,0DAAwC;AACxC,iDAA+B;AAC/B,oDAAkC;AAClC,wDAAsC;AACtC,+DAA6C;AAC7C,yCAAoE;AAA3D,2GAAA,cAAc,OAAA;AAAE,kHAAA,qBAAqB,OAAA;AAEvC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAClE,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAAlE,QAAA,sBAAsB,0BAA4C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isANumericColumnParam } from '../utils';
|
|
2
|
+
import { isANumericColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `AVG` Returns the aggregated SUM of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const AVG = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("AVG_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `AVG(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggAvg.js","sourceRoot":"","sources":["../../../src/functions/aggAvg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggAvg.js","sourceRoot":"","sources":["../../../src/functions/aggAvg.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,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,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;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isAColumnParam } from '../utils';
|
|
2
|
+
import { isAColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `COUNT` Returns the aggregated SUM of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const COUNT = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("COUNT_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `COUNT(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggCount.js","sourceRoot":"","sources":["../../../src/functions/aggCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggCount.js","sourceRoot":"","sources":["../../../src/functions/aggCount.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,KAAK,GAAuB;IACrC,UAAU,EAAE,OAAO;IACnB,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,cAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,qBAAqB,MAAM,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,SAAS,KAAK,GAAG,CAAC;AAC7B,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isAColumnParam } from '../utils';
|
|
2
|
+
import { isAColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `DISTCOUNT` Returns the aggregated SUM of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const DISTCOUNT = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("DISTINCTCOUNT_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `COUNT(DISTINCT ${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.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,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,cAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,6BAA6B,MAAM,IAAI,CAAC;AACnD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,kBAAkB,KAAK,GAAG,CAAC;AACtC,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isANumericColumnParam } from '../utils';
|
|
2
|
+
import { isANumericColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `MAXVAL` Returns the aggregated SUM of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const MAXVAL = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("MAX_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `MAX(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMax.js","sourceRoot":"","sources":["../../../src/functions/aggMax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggMax.js","sourceRoot":"","sources":["../../../src/functions/aggMax.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,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,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;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isANumericColumnParam } from '../utils';
|
|
2
|
+
import { isANumericColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `MED` Returns the aggregated MEDIAN of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const MED = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("MEDIAN_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `MEDIAN(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.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,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,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;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,sBAAsB,MAAM,IAAI,CAAC;AAC5C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,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,8CAA8C,KAAK,GAAG,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isANumericColumnParam } from '../utils';
|
|
2
|
+
import { isANumericColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `MINVAL` Returns the aggregated SUM of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const MINVAL = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("MIN_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `MIN(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMin.js","sourceRoot":"","sources":["../../../src/functions/aggMin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggMin.js","sourceRoot":"","sources":["../../../src/functions/aggMin.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,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,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;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, OPERATION_SCOPE } from '../constants';
|
|
2
|
-
import { isANumericColumnParam } from '../utils';
|
|
2
|
+
import { isANumericColumnParam, replaceDotByUnderscore } from '../utils';
|
|
3
3
|
/**
|
|
4
4
|
* `SUM` Returns the aggregated SUM of a column.
|
|
5
5
|
*/
|
|
@@ -25,7 +25,8 @@ export const SUM = {
|
|
|
25
25
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
26
26
|
};
|
|
27
27
|
function elasticsearch(value) {
|
|
28
|
-
|
|
28
|
+
const _value = replaceDotByUnderscore(value);
|
|
29
|
+
return `params.get("SUM_${_value}")`;
|
|
29
30
|
}
|
|
30
31
|
function SQL(value) {
|
|
31
32
|
return `SUM(${value})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggSum.js","sourceRoot":"","sources":["../../../src/functions/aggSum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"aggSum.js","sourceRoot":"","sources":["../../../src/functions/aggSum.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,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,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;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,mBAAmB,MAAM,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { replaceDotByUnderscore } from '.';
|
|
1
2
|
import { AST_TYPES, ENGINES } from '../constants';
|
|
2
3
|
import { isAggregateFunction } from './isAggregate';
|
|
3
4
|
export function aggregateFunction(engine, aggregatedMap, node) {
|
|
@@ -18,7 +19,7 @@ function aggregateFunctionsES(currentMap, node) {
|
|
|
18
19
|
if (arg.type !== AST_TYPES.column)
|
|
19
20
|
return false;
|
|
20
21
|
const columnId = ((_a = arg.context) === null || _a === void 0 ? void 0 : _a.id) || '';
|
|
21
|
-
const alias = ((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '';
|
|
22
|
+
const alias = replaceDotByUnderscore(((_b = arg.context) === null || _b === void 0 ? void 0 : _b.replacement) || '');
|
|
22
23
|
const aggregate = getAggregateName(node.name);
|
|
23
24
|
const key = `${aggregate}_${alias}`;
|
|
24
25
|
// if (params.property) key += `::${params.property}`; //TODO where is this information?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"AAAA,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,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;
|
|
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"}
|
|
@@ -11,3 +11,4 @@ export * from './isLongLiteralNumber';
|
|
|
11
11
|
export * from './cleanInvalidItemsInContext';
|
|
12
12
|
export { isAColumnParam, isANumericColumnParam } from './isAColumn';
|
|
13
13
|
export declare const removeQuotes: (str: string) => string;
|
|
14
|
+
export declare const replaceDotByUnderscore: (str: string) => string;
|
|
@@ -11,4 +11,5 @@ export * from './isLongLiteralNumber';
|
|
|
11
11
|
export * from './cleanInvalidItemsInContext';
|
|
12
12
|
export { isAColumnParam, isANumericColumnParam } from './isAColumn';
|
|
13
13
|
export const removeQuotes = (str) => str.replace(/^E?'|'$/g, '');
|
|
14
|
+
export const replaceDotByUnderscore = (str) => str.replace(/\./g, '_');
|
|
14
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AACzE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC"}
|