@qrvey/formula-lang 2.0.1-rc.498 → 2.0.1-rc.506
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/round.js +9 -4
- package/dist/cjs/functions/round.js.map +1 -1
- package/dist/cjs/functions/rounddown.js +8 -3
- package/dist/cjs/functions/rounddown.js.map +1 -1
- package/dist/cjs/functions/roundup.js +8 -3
- package/dist/cjs/functions/roundup.js.map +1 -1
- package/dist/cjs/transpiler/columnTranspilation.js +8 -1
- package/dist/cjs/transpiler/columnTranspilation.js.map +1 -1
- package/dist/cjs/transpiler/index.js +6 -1
- package/dist/cjs/transpiler/index.js.map +1 -1
- package/dist/cjs/utils/addDecimalPointIfNeeded.d.ts +3 -0
- package/dist/cjs/utils/addDecimalPointIfNeeded.js +19 -0
- package/dist/cjs/utils/addDecimalPointIfNeeded.js.map +1 -0
- package/dist/cjs/utils/elasticsearch/scripts.d.ts +2 -2
- package/dist/cjs/utils/elasticsearch/scripts.js +8 -6
- package/dist/cjs/utils/elasticsearch/scripts.js.map +1 -1
- package/dist/cjs/utils/getNumericValueFromArgument.d.ts +1 -0
- package/dist/cjs/utils/getNumericValueFromArgument.js +16 -5
- package/dist/cjs/utils/getNumericValueFromArgument.js.map +1 -1
- package/dist/cjs/utils/isInteger.js +3 -1
- package/dist/cjs/utils/isInteger.js.map +1 -1
- package/dist/module/functions/round.js +9 -4
- package/dist/module/functions/round.js.map +1 -1
- package/dist/module/functions/rounddown.js +8 -3
- package/dist/module/functions/rounddown.js.map +1 -1
- package/dist/module/functions/roundup.js +8 -3
- package/dist/module/functions/roundup.js.map +1 -1
- package/dist/module/transpiler/columnTranspilation.js +8 -1
- package/dist/module/transpiler/columnTranspilation.js.map +1 -1
- package/dist/module/transpiler/index.js +6 -1
- package/dist/module/transpiler/index.js.map +1 -1
- package/dist/module/utils/addDecimalPointIfNeeded.d.ts +3 -0
- package/dist/module/utils/addDecimalPointIfNeeded.js +15 -0
- package/dist/module/utils/addDecimalPointIfNeeded.js.map +1 -0
- package/dist/module/utils/elasticsearch/scripts.d.ts +2 -2
- package/dist/module/utils/elasticsearch/scripts.js +7 -5
- package/dist/module/utils/elasticsearch/scripts.js.map +1 -1
- package/dist/module/utils/getNumericValueFromArgument.d.ts +1 -0
- package/dist/module/utils/getNumericValueFromArgument.js +14 -4
- package/dist/module/utils/getNumericValueFromArgument.js.map +1 -1
- package/dist/module/utils/isInteger.js +3 -1
- package/dist/module/utils/isInteger.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ exports.ROUND = void 0;
|
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
const isBetweenInclusiveRange_1 = require("../utils/isBetweenInclusiveRange");
|
|
7
|
+
const isInteger_1 = require("../utils/isInteger");
|
|
7
8
|
/**
|
|
8
9
|
* `ROUND` Returns a number rounded to the next greatest even integer.
|
|
9
10
|
*/
|
|
@@ -18,7 +19,11 @@ exports.ROUND = {
|
|
|
18
19
|
{
|
|
19
20
|
identifier: 'DIGITS',
|
|
20
21
|
optional: false,
|
|
21
|
-
validator: [
|
|
22
|
+
validator: [
|
|
23
|
+
utils_1.isNumberParam,
|
|
24
|
+
(0, isBetweenInclusiveRange_1.isBetweenInclusiveRange)(0, 10),
|
|
25
|
+
isInteger_1.isInteger,
|
|
26
|
+
],
|
|
22
27
|
},
|
|
23
28
|
],
|
|
24
29
|
transpiler: {
|
|
@@ -30,15 +35,15 @@ exports.ROUND = {
|
|
|
30
35
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
31
36
|
};
|
|
32
37
|
function elasticsearch(value, digits) {
|
|
33
|
-
return `ROUND(${value}, ${digits})`;
|
|
38
|
+
return `ROUND(${value}, ROUNDDOWN(${digits}, 0))`;
|
|
34
39
|
}
|
|
35
40
|
function SQL(value, digits) {
|
|
36
|
-
return `ROUND(${value}, (CASE
|
|
41
|
+
return `ROUND(${value}, TRUNC(CASE
|
|
37
42
|
WHEN ${digits} IS NULL THEN NULL
|
|
38
43
|
WHEN ${digits} > 10 THEN 10
|
|
39
44
|
WHEN ${digits} < 0 THEN 0
|
|
40
45
|
ELSE ${digits}
|
|
41
|
-
END))`;
|
|
46
|
+
END)::INTEGER)`;
|
|
42
47
|
}
|
|
43
48
|
function snowflake(value, digits) {
|
|
44
49
|
return SQL(value, digits);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"round.js","sourceRoot":"","sources":["../../../src/functions/round.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,oCAAyC;AACzC,8EAA2E;
|
|
1
|
+
{"version":3,"file":"round.js","sourceRoot":"","sources":["../../../src/functions/round.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,oCAAyC;AACzC,8EAA2E;AAC3E,kDAA+C;AAE/C;;GAEG;AACU,QAAA,KAAK,GAAuB;IACrC,UAAU,EAAE,OAAO;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE;gBACP,qBAAa;gBACb,IAAA,iDAAuB,EAAC,CAAC,EAAE,EAAE,CAAC;gBAC9B,qBAAS;aACZ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,MAAc;IAChD,OAAO,SAAS,KAAK,eAAe,MAAM,OAAO,CAAC;AACtD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,MAAc;IACtC,OAAO,SAAS,KAAK;eACV,MAAM;eACN,MAAM;eACN,MAAM;eACN,MAAM;mBACF,CAAC;AACpB,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC5C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAC7C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.ROUNDDOWN = void 0;
|
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
const isBetweenInclusiveRange_1 = require("../utils/isBetweenInclusiveRange");
|
|
7
|
+
const isInteger_1 = require("../utils/isInteger");
|
|
7
8
|
/**
|
|
8
9
|
* `ROUNDDOWN` Returns a number rounded to the next greatest even integer.
|
|
9
10
|
*/
|
|
@@ -18,7 +19,11 @@ exports.ROUNDDOWN = {
|
|
|
18
19
|
{
|
|
19
20
|
identifier: 'DIGITS',
|
|
20
21
|
optional: false,
|
|
21
|
-
validator: [
|
|
22
|
+
validator: [
|
|
23
|
+
utils_1.isNumberParam,
|
|
24
|
+
(0, isBetweenInclusiveRange_1.isBetweenInclusiveRange)(0, 10),
|
|
25
|
+
isInteger_1.isInteger,
|
|
26
|
+
],
|
|
22
27
|
},
|
|
23
28
|
],
|
|
24
29
|
transpiler: {
|
|
@@ -30,14 +35,14 @@ exports.ROUNDDOWN = {
|
|
|
30
35
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
31
36
|
};
|
|
32
37
|
function elasticsearch(value, digits) {
|
|
33
|
-
return `ROUNDDOWN(${value}, ${digits})`;
|
|
38
|
+
return `ROUNDDOWN(${value}, ROUNDDOWN(${digits}, 0))`;
|
|
34
39
|
}
|
|
35
40
|
function SQL(value, digits) {
|
|
36
41
|
return `((CASE
|
|
37
42
|
WHEN ${value} IS NULL OR ${digits} IS NULL THEN NULL
|
|
38
43
|
WHEN ${digits} > 10 THEN FLOOR(ABS(${value}) * POWER(10, 10)) / POWER(10, 10)
|
|
39
44
|
WHEN ${digits} < 0 THEN FLOOR(ABS(${value}))
|
|
40
|
-
ELSE FLOOR(ABS(${value}) * POWER(10, ${digits})) / POWER(10, ${digits})
|
|
45
|
+
ELSE FLOOR(ABS(${value}) * POWER(10, TRUNC(${digits})::INTEGER)) / POWER(10, TRUNC(${digits})::INTEGER)
|
|
41
46
|
END) * (CASE WHEN ${value} < 0 THEN -1 ELSE 1 END))`;
|
|
42
47
|
}
|
|
43
48
|
function snowflake(value, digits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rounddown.js","sourceRoot":"","sources":["../../../src/functions/rounddown.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,oCAAyC;AACzC,8EAA2E;
|
|
1
|
+
{"version":3,"file":"rounddown.js","sourceRoot":"","sources":["../../../src/functions/rounddown.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,oCAAyC;AACzC,8EAA2E;AAC3E,kDAA+C;AAE/C;;GAEG;AACU,QAAA,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE;gBACP,qBAAa;gBACb,IAAA,iDAAuB,EAAC,CAAC,EAAE,EAAE,CAAC;gBAC9B,qBAAS;aACZ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,MAAc;IAChD,OAAO,aAAa,KAAK,eAAe,MAAM,OAAO,CAAC;AAC1D,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,MAAc;IACtC,OAAO;eACI,KAAK,eAAe,MAAM;eAC1B,MAAM,wBAAwB,KAAK;eACnC,MAAM,uBAAuB,KAAK;yBACxB,KAAK,uBAAuB,MAAM,kCAAkC,MAAM;wBAC3E,KAAK,2BAA2B,CAAC;AACzD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC5C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAC7C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.ROUNDUP = void 0;
|
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
const isBetweenInclusiveRange_1 = require("../utils/isBetweenInclusiveRange");
|
|
7
|
+
const isInteger_1 = require("../utils/isInteger");
|
|
7
8
|
/**
|
|
8
9
|
* `ROUNDUP` Rounds a number up to a specified number of digits.
|
|
9
10
|
*/
|
|
@@ -18,7 +19,11 @@ exports.ROUNDUP = {
|
|
|
18
19
|
{
|
|
19
20
|
identifier: 'DIGITS',
|
|
20
21
|
optional: false,
|
|
21
|
-
validator: [
|
|
22
|
+
validator: [
|
|
23
|
+
utils_1.isNumberParam,
|
|
24
|
+
(0, isBetweenInclusiveRange_1.isBetweenInclusiveRange)(0, 10),
|
|
25
|
+
isInteger_1.isInteger,
|
|
26
|
+
],
|
|
22
27
|
},
|
|
23
28
|
],
|
|
24
29
|
transpiler: {
|
|
@@ -30,14 +35,14 @@ exports.ROUNDUP = {
|
|
|
30
35
|
primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
|
|
31
36
|
};
|
|
32
37
|
function elasticsearch(value, digits) {
|
|
33
|
-
return `ROUNDUP(${value}, ${digits})`;
|
|
38
|
+
return `ROUNDUP(${value}, ROUNDDOWN(${digits}, 0))`;
|
|
34
39
|
}
|
|
35
40
|
function SQL(value, digits) {
|
|
36
41
|
return `((CASE
|
|
37
42
|
WHEN ${value} IS NULL OR ${digits} IS NULL THEN NULL
|
|
38
43
|
WHEN ${digits} > 10 THEN CEIL(ABS(${value}) * POWER(10, 10)) / POWER(10, 10)
|
|
39
44
|
WHEN ${digits} < 0 THEN CEIL(ABS(${value}))
|
|
40
|
-
ELSE CEIL(ABS(${value}) * POWER(10, ${digits})) / POWER(10, ${digits})
|
|
45
|
+
ELSE CEIL(ABS(${value}) * POWER(10, TRUNC(${digits})::INTEGER)) / POWER(10, TRUNC(${digits})::INTEGER)
|
|
41
46
|
END) * (CASE WHEN ${value} < 0 THEN -1 ELSE 1 END))`;
|
|
42
47
|
}
|
|
43
48
|
function snowflake(value, digits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roundup.js","sourceRoot":"","sources":["../../../src/functions/roundup.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,oCAAyC;AACzC,8EAA2E;
|
|
1
|
+
{"version":3,"file":"roundup.js","sourceRoot":"","sources":["../../../src/functions/roundup.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,oCAAyC;AACzC,8EAA2E;AAC3E,kDAA+C;AAE/C;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE;gBACP,qBAAa;gBACb,IAAA,iDAAuB,EAAC,CAAC,EAAE,EAAE,CAAC;gBAC9B,qBAAS;aACZ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,MAAc;IAChD,OAAO,WAAW,KAAK,eAAe,MAAM,OAAO,CAAC;AACxD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,MAAc;IACtC,OAAO;eACI,KAAK,eAAe,MAAM;eAC1B,MAAM,uBAAuB,KAAK;eAClC,MAAM,sBAAsB,KAAK;wBACxB,KAAK,uBAAuB,MAAM,kCAAkC,MAAM;wBAC1E,KAAK,2BAA2B,CAAC;AACzD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC5C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAC7C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -32,9 +32,16 @@ function elasticsearch(context, globalContext) {
|
|
|
32
32
|
const offset = globalContext === null || globalContext === void 0 ? void 0 : globalContext.timezone.offset;
|
|
33
33
|
return `${constants_1.ELASTICSEARCH_SCRIPT_NAMES.setTimezone}(${value}, '${offset}')`;
|
|
34
34
|
}
|
|
35
|
+
else if ((context === null || context === void 0 ? void 0 : context.type) === constants_1.AST_PRIMITIVES.NUMBER) {
|
|
36
|
+
return `(double) ${value}`;
|
|
37
|
+
}
|
|
35
38
|
return value;
|
|
36
39
|
}
|
|
37
40
|
function sql(context) {
|
|
38
|
-
|
|
41
|
+
const value = `"${context.replacement}"`;
|
|
42
|
+
if ((context === null || context === void 0 ? void 0 : context.type) === constants_1.AST_PRIMITIVES.NUMBER) {
|
|
43
|
+
return `${value}::FLOAT8`;
|
|
44
|
+
}
|
|
45
|
+
return value;
|
|
39
46
|
}
|
|
40
47
|
//# sourceMappingURL=columnTranspilation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AAQtB,SAAgB,mBAAmB,CAC/B,MAAe,EACf,UAAuB,EACvB,aAA8B;IAE9B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO;YACH,KAAK;YACL,IAAI,EAAE,qBAAS,CAAC,MAAM;YACtB,QAAQ,EAAE,0BAAc,CAAC,OAAO;YAChC,IAAI,EAAE,UAAU;SACnB,CAAC;IACN,MAAM,eAAe,GAAG;QACpB,CAAC,mBAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;QACvB,CAAC,mBAAO,CAAC,UAAU,CAAC,EAAE,GAAG;KAC5B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO;QACH,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,OAAO,CAAC,IAAI;QACtB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,IAAI,EAAE,UAAU;KACnB,CAAC;AACN,CAAC;AA1BD,kDA0BC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,kBAAkB,OAAO,CAAC,WAAW,KAAK,CAAC;IACzD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,0BAAc,CAAC,IAAI,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QAClE,MAAM,MAAM,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,MAAM,CAAC;QAC9C,OAAO,GAAG,sCAA0B,CAAC,WAAW,IAAI,KAAK,MAAM,MAAM,IAAI,CAAC;KAC7E;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,
|
|
1
|
+
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AAQtB,SAAgB,mBAAmB,CAC/B,MAAe,EACf,UAAuB,EACvB,aAA8B;IAE9B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO;YACH,KAAK;YACL,IAAI,EAAE,qBAAS,CAAC,MAAM;YACtB,QAAQ,EAAE,0BAAc,CAAC,OAAO;YAChC,IAAI,EAAE,UAAU;SACnB,CAAC;IACN,MAAM,eAAe,GAAG;QACpB,CAAC,mBAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;QACvB,CAAC,mBAAO,CAAC,UAAU,CAAC,EAAE,GAAG;KAC5B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO;QACH,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,OAAO,CAAC,IAAI;QACtB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,IAAI,EAAE,UAAU;KACnB,CAAC;AACN,CAAC;AA1BD,kDA0BC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,kBAAkB,OAAO,CAAC,WAAW,KAAK,CAAC;IACzD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,0BAAc,CAAC,IAAI,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QAClE,MAAM,MAAM,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,MAAM,CAAC;QAC9C,OAAO,GAAG,sCAA0B,CAAC,WAAW,IAAI,KAAK,MAAM,MAAM,IAAI,CAAC;KAC7E;SAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,0BAAc,CAAC,MAAM,EAAE;QAChD,OAAO,YAAY,KAAK,EAAE,CAAC;KAC9B;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,GAAG,CAAC;IACzC,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,0BAAc,CAAC,MAAM,EAAE;QACzC,OAAO,GAAG,KAAK,UAAU,CAAC;KAC7B;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -12,6 +12,7 @@ const formulaErrorList_1 = require("./formulaErrorList");
|
|
|
12
12
|
const scripts_1 = require("../utils/elasticsearch/scripts");
|
|
13
13
|
const dictionary_1 = require("../errors/dictionary");
|
|
14
14
|
const escapeCharacters_1 = require("../utils/escapeCharacters");
|
|
15
|
+
const addDecimalPointIfNeeded_1 = require("../utils/addDecimalPointIfNeeded");
|
|
15
16
|
class Transpiler {
|
|
16
17
|
constructor(ast, engine, globalContext) {
|
|
17
18
|
this.ast = ast;
|
|
@@ -100,8 +101,12 @@ class Transpiler {
|
|
|
100
101
|
}
|
|
101
102
|
const isElasticsearchNumber = this.engine === constants_1.ENGINES.ELASTICSEARCH &&
|
|
102
103
|
dataType === constants_1.AST_PRIMITIVES.NUMBER;
|
|
103
|
-
if (isElasticsearchNumber && (0, utils_1.isLongNumber)(value))
|
|
104
|
+
if (isElasticsearchNumber && (0, utils_1.isLongNumber)(value)) {
|
|
104
105
|
value = `${value}L`;
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
value = (0, addDecimalPointIfNeeded_1.addDecimalPointIfNeeded)(value, this.engine);
|
|
109
|
+
}
|
|
105
110
|
return { value, dataType, type, node: expression };
|
|
106
111
|
}
|
|
107
112
|
unaryExpression(expression) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AActB,uDAAwE;AACxE,4CAA4C;AAC5C,oCAKkB;AAClB,mEAAgE;AAChE,+DAA4D;AAC5D,qEAAkE;AAClE,yDAAsD;AACtD,4DAAgE;AAChE,qDAAwD;AACxD,gEAA6D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AActB,uDAAwE;AACxE,4CAA4C;AAC5C,oCAKkB;AAClB,mEAAgE;AAChE,+DAA4D;AAC5D,qEAAkE;AAClE,yDAAsD;AACtD,4DAAgE;AAChE,qDAAwD;AACxD,gEAA6D;AAC7D,8EAA2E;AAE3E,MAAa,UAAU;IAGnB,YACY,GAAe,EACN,MAAe,EACf,aAA8B;QAFvC,QAAG,GAAH,GAAG,CAAY;QACN,WAAM,GAAN,MAAM,CAAS;QACf,kBAAa,GAAb,aAAa,CAAiB;QAL3C,uBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC5C,qBAAgB,GAAqB,IAAI,mCAAgB,EAAE,CAAC;IAKjE,CAAC;IAEG,GAAG;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,MAAM,UAAU,GAAG,IAAA,+CAAsB,EACrC,IAAI,CAAC,kBAAkB,EACvB,MAAM,CACT,CAAC;QAEF,MAAM,OAAO,GAAG;YACZ,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK;YACrB,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAClE,CAAC;QAEF,OAAO;YACH,KAAK,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,IAAI,IAAI,KAAK,SAAS;YAC7D,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACnC,OAAO;YACP,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS;gBACvC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,UAAU;SACnB,CAAC;IACN,CAAC;IAEO,WAAW,CAAC,UAAqB;;QACrC,IAAI;YACA,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAQ;gBACf,CAAC,qBAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO;gBAC/B,CAAC,qBAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO;gBACjC,CAAC,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,aAAa;oBACjD,CAAC,CAAC,IAAI,CAAC,6BAA6B;oBACpC,CAAC,CAAC,IAAI,CAAC,MAAM;gBACjB,CAAC,qBAAS,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,6BAA6B;gBAC/D,CAAC,qBAAS,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,eAAe;gBACjD,CAAC,qBAAS,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,gBAAgB;gBACnD,CAAC,qBAAS,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY;aAC9C,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACZ,OAAO;oBACH,KAAK,EAAE,IAAI;oBACX,IAAI;oBACJ,QAAQ,EAAE,0BAAc,CAAC,OAAO;oBAChC,IAAI,EAAE,UAAU;iBACnB,CAAC;YACN,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClC,OAAO;gBACH,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,qBAAS,CAAC,OAAO;gBACvB,QAAQ,EAAE,0BAAc,CAAC,OAAO;gBAChC,IAAI,EAAE,UAAU;aACnB,CAAC;SACL;IACL,CAAC;IAEO,6BAA6B,CAAC,IAAiB;;QACnD,MAAM,KAAK,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,UAAU,KAAI,EAAE,CAAC,CAChD,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,EAAE,mCAAI,EAAE,CACzB,CAAC;QACF,OAAO,IAAI,CAAC,OAAO,iCACZ,IAAI,KACP,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EACtC,QAAQ,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,mCAAI,0BAAc,CAAC,MAAM,IACvD,CAAC;IACP,CAAC;IAEO,MAAM,CAAC,IAAiB;;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,mBAAO,CAAC,aAAa;YACrC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,wBAAc,CAAC,CAAC;QAChD,IACI,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,IAAI,MAAK,0BAAc,CAAC,IAAI;aAC3C,MAAA,IAAI,CAAC,aAAa,0CAAE,QAAQ,CAAA,EAC9B;YACE,MAAM,cAAc,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnD,IAAI,cAAc;gBAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACnE;QACD,OAAO,IAAA,yCAAmB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAEO,OAAO,CAAC,UAAsB;QAClC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QACtC,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAE3B,IAAI,KAAK,KAAK,MAAM;YAChB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QACvD,IAAI,QAAQ,KAAK,0BAAc,CAAC,IAAI;YAChC,KAAK,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,0BAAc,CAAC,MAAM,EAAE;YACpC,KAAK,GAAG,IAAA,mCAAgB,EAAC,KAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1D;QAED,MAAM,qBAAqB,GACvB,IAAI,CAAC,MAAM,KAAK,mBAAO,CAAC,aAAa;YACrC,QAAQ,KAAK,0BAAc,CAAC,MAAM,CAAC;QACvC,IAAI,qBAAqB,IAAI,IAAA,oBAAY,EAAC,KAAe,CAAC,EAAE;YACxD,KAAK,GAAG,GAAG,KAAK,GAAG,CAAC;SACvB;aAAM;YACH,KAAK,GAAG,IAAA,iDAAuB,EAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SACvD;QACD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IACvD,CAAC;IAEO,eAAe,CAAC,UAA8B;QAClD,IAAI,CAAC,UAAU,CAAC,KAAK;YACjB,OAAO;gBACH,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,QAAQ,EAAE,0BAAc,CAAC,MAAM;gBAC/B,IAAI,EAAE,UAAU;aACnB,CAAC;QACN,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,IAAI,WAAW,GAAG,CAAC;QACxD,OAAO;YACH,KAAK;YACL,QAAQ,EAAE,UAAU,CAAC,SAAS;YAC9B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,UAAU;SACnB,CAAC;IACN,CAAC;IAEO,gBAAgB,CACpB,UAA+B;;QAE/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QACnD,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK;YACf,OAAO;gBACH,KAAK,EAAE,EAAE;gBACT,IAAI;gBACJ,QAAQ,EAAE,0BAAc,CAAC,MAAM;gBAC/B,IAAI,EAAE,UAAU;aACnB,CAAC;QACN,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,IAAI,UAAU,IACxB,MAAA,MAAA,2BAAe,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,QAAQ,CAAC,mCAAI,QAChD,IAAI,WAAW,GAAG,CAAC;QACnB,OAAO;YACH,KAAK;YACL,QAAQ,EAAE,UAAU,CAAC,SAAS;YAC9B,IAAI;YACJ,IAAI,EAAE,UAAU;SACnB,CAAC;IACN,CAAC;IAEO,YAAY,CAAC,IAAqB;QACtC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACvC,MAAM,IAAI,GAAG,wBAAY,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,kCAAoB,CAAC,IAAI,CAAC,CAAC;QAEhD,MAAM,cAAc,GAAG,IAAA,sBAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,cAAc;YAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEhE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACpD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IACtE,CAAC;IAEO,QAAQ,CACZ,IAAwB,EACxB,IAA8B,EAC9B,IAAqB;QAErB,IAAA,6CAAqB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACxC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACjD,CAAC;CACJ;AAhLD,gCAgLC;AAED,SAAgB,YAAY,CACxB,GAAe,EACf,MAAe,EACf,OAAwB;;IAExB,MAAM,eAAe,GAAG,CAAC,MAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,MAAM,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,mBAAmB,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvE,uCACO,eAAe,KAClB,KAAK,EAAE,eAAe,CAAC,KAAK,IAAI,CAAC,eAAe,EAChD,MAAM,IACR;AACN,CAAC;AAdD,oCAcC;AAED,SAAS,mBAAmB,CACxB,gBAAyC,EACzC,SAAkC;IAElC,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,UAAU,CACf,gBAAyC,EACzC,SAAkC;IAElC,OAAO,gBAAgB,IAAI,CAAC,SAAS,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,IAAG,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,CAAC;QACrD,CAAC,CAAC,SAAS,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAmB;IAC1C,MAAM,YAAY,GAAgB,EAAE,CAAC;IACrC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,OAAO,CAAC,kCAAkC;QAC3D,IACI,CAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,IAAI,MAAK,qBAAS,CAAC,YAAY;YAC1C,KAAK,CAAC,IAAwB,CAAC,kBAAkB,EACpD;YACE,MAAM,kBAAkB,GAAI,KAAK,CAAC,IAAwB;iBACrD,kBAAkB,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,kBAAkB,CAAC,EAAE,CAAC;SACzC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,6BAAgB,CAAC,mBAAmB,CAAC,IAAI,EAAE;YACjE,MAAM,YAAY,GAAI,KAAK,CAAC,IAA2B;iBAClD,YAAY,CAAC;YAClB,IAAI,YAAY,EAAE;gBACd,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;gBACpC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;aACnC;SACJ;QACD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,SAAS,uBAAuB,CAAC,UAAuB;IACpD,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAChC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC1B,CAAC,KAAgB,EAAE,EAAE,CACjB,KAAK,CAAC,IAAI;YACV,SAAS,CAAC,IAAI;YACd,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI;YACtC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CACzC,CAAC;QACF,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC1B;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addDecimalPointIfNeeded = void 0;
|
|
4
|
+
const constants_1 = require("../constants");
|
|
5
|
+
function addDecimalPointIfNeeded(value, engine) {
|
|
6
|
+
if ([
|
|
7
|
+
constants_1.ENGINES.POSTGRESQL,
|
|
8
|
+
constants_1.ENGINES.REDSHIFT,
|
|
9
|
+
constants_1.ENGINES.SNOWFLAKE,
|
|
10
|
+
constants_1.ENGINES.ELASTICSEARCH,
|
|
11
|
+
].includes(engine) &&
|
|
12
|
+
Number.isInteger(value) &&
|
|
13
|
+
!String(value).includes('.')) {
|
|
14
|
+
return `${value}.0`;
|
|
15
|
+
}
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
exports.addDecimalPointIfNeeded = addDecimalPointIfNeeded;
|
|
19
|
+
//# sourceMappingURL=addDecimalPointIfNeeded.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addDecimalPointIfNeeded.js","sourceRoot":"","sources":["../../../src/utils/addDecimalPointIfNeeded.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AAGvC,SAAgB,uBAAuB,CACnC,KAAmB,EACnB,MAAe;IAEf,IACI;QACI,mBAAO,CAAC,UAAU;QAClB,mBAAO,CAAC,QAAQ;QAChB,mBAAO,CAAC,SAAS;QACjB,mBAAO,CAAC,aAAa;KACxB,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;QACvB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9B;QACE,OAAO,GAAG,KAAK,IAAI,CAAC;KACvB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAjBD,0DAiBC"}
|
|
@@ -24,6 +24,6 @@ export declare const evenScript = "def EVEN(def value) {\n if (value == null) r
|
|
|
24
24
|
export declare const logScript = "def LOG(def base, def value) {\n if (base == null || value == null) return null;\n if (base <= 1 || value <= 0) return null;\n return (Math.log(value) / Math.log(base));\n}";
|
|
25
25
|
export declare const oddScript = "def ODD(def value) {\n if (value == null) return null;\n def _value = Math.abs(value);\n def sign = value < 0 ? -1 : 1;\n return ((long) Math.ceil((_value + 1)/ 2.0) * 2 - 1) * sign;\n}";
|
|
26
26
|
export declare const powerScript = "def POWER(def value, def numberToRaise) {\n if (value == null || numberToRaise == null) return null;\n if (value == 0 && numberToRaise < 0) return null;\n return Math.pow(value, numberToRaise);\n}";
|
|
27
|
-
export declare const roundScript = "def ROUND(def value, def places) {\n if (value == null || places == null) return null; \n if (places > 10) places = 10;\n if (places < 0) places = 0;\n def _value = Math.abs(value);\n def sign = value < 0 ? -1 : 1;\n def scale = Math.pow(10, places);\n return (Math.round(_value * scale) / scale) * sign;\n}";
|
|
28
27
|
export declare const roundDownScript = "def ROUNDDOWN(def value, def places) {\n if (value == null || places == null) return null; \n if (places > 10) places = 10;\n if (places < 0) places = 0;\n def _value = Math.abs(value);\n def sign = value < 0 ? -1 : 1;\n def scale = Math.pow(10, places);\n return (Math.floor(_value * scale) / scale) * sign;\n}";
|
|
29
|
-
export declare const
|
|
28
|
+
export declare const roundScript: string;
|
|
29
|
+
export declare const roundUpScript: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.roundUpScript = exports.
|
|
3
|
+
exports.roundUpScript = exports.roundScript = exports.roundDownScript = exports.powerScript = exports.oddScript = exports.logScript = exports.evenScript = exports.includeScript = exports.replaceScript = exports.expScript = exports.sqrtScript = exports.lengthScript = exports.leastScript = exports.greatestScript = exports.properScript = exports.isNullScript = exports.getValueScript = exports.dateDif = exports.secondScript = exports.minuteScript = exports.hourScript = exports.yearScript = exports.monthScript = exports.dayScript = exports.subStringScript = exports.dateFormatScript = exports.setTimezoneToColumnDate = exports.toDate = void 0;
|
|
4
4
|
const constants_1 = require("../../constants");
|
|
5
5
|
function toDate(value) {
|
|
6
6
|
return `ZonedDateTime.parse("${value}")`;
|
|
@@ -172,25 +172,27 @@ exports.powerScript = `def POWER(def value, def numberToRaise) {
|
|
|
172
172
|
if (value == 0 && numberToRaise < 0) return null;
|
|
173
173
|
return Math.pow(value, numberToRaise);
|
|
174
174
|
}`;
|
|
175
|
-
exports.
|
|
175
|
+
exports.roundDownScript = `def ROUNDDOWN(def value, def places) {
|
|
176
176
|
if (value == null || places == null) return null;
|
|
177
177
|
if (places > 10) places = 10;
|
|
178
178
|
if (places < 0) places = 0;
|
|
179
179
|
def _value = Math.abs(value);
|
|
180
180
|
def sign = value < 0 ? -1 : 1;
|
|
181
181
|
def scale = Math.pow(10, places);
|
|
182
|
-
return (Math.
|
|
182
|
+
return (Math.floor(_value * scale) / scale) * sign;
|
|
183
183
|
}`;
|
|
184
|
-
exports.
|
|
184
|
+
exports.roundScript = `${exports.roundDownScript}
|
|
185
|
+
def ROUND(def value, def places) {
|
|
185
186
|
if (value == null || places == null) return null;
|
|
186
187
|
if (places > 10) places = 10;
|
|
187
188
|
if (places < 0) places = 0;
|
|
188
189
|
def _value = Math.abs(value);
|
|
189
190
|
def sign = value < 0 ? -1 : 1;
|
|
190
191
|
def scale = Math.pow(10, places);
|
|
191
|
-
return (Math.
|
|
192
|
+
return (Math.round(_value * scale) / scale) * sign;
|
|
192
193
|
}`;
|
|
193
|
-
exports.roundUpScript =
|
|
194
|
+
exports.roundUpScript = `${exports.roundDownScript}
|
|
195
|
+
def ROUNDUP(def value, def places) {
|
|
194
196
|
if (value == null || places == null) return null;
|
|
195
197
|
if (places > 10) places = 10;
|
|
196
198
|
if (places < 0) places = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":";;;AACA,+CAA6E;AAE7E,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAFD,wBAEC;AAEY,QAAA,uBAAuB,GAAG;MACjC,sCAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEW,QAAA,gBAAgB,GAAG;SACvB,sCAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEW,QAAA,eAAe,GAAG;SACtB,sCAAY,CAAC,SAAS;;;;;;;;;;;;;;CAc9B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,sCAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAEM,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAAzD,QAAA,SAAS,aAAgD;AAE/D,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA3D,QAAA,WAAW,eAAgD;AAEjE,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAA5D,QAAA,UAAU,cAAkD;AAElE,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA1D,QAAA,UAAU,cAAgD;AAEhE,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAElE,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAEzE,SAAgB,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;KACZ,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,cAAc,WAAW,YAAY,KAAK,KAAK,GAAG,GAAG,CAAC;AACjE,CAAC;AARD,0BAQC;AAEY,QAAA,cAAc,GAAG,yDAAyD,CAAC;AAE3E,QAAA,YAAY,GAAG,iFAAiF,CAAC;AAEjG,QAAA,YAAY,GAAG;;;;;;;;;;;;;;;;;;IAkBxB,CAAC;AAEQ,QAAA,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwB5B,CAAC;AAEU,QAAA,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwBzB,CAAC;AAEU,QAAA,YAAY,GAAG,4DAA4D,CAAC;AAE5E,QAAA,UAAU,GAAG,2EAA2E,CAAC;AAEzF,QAAA,SAAS,GAAG,6DAA6D,CAAC;AAE1E,QAAA,aAAa,GAAG;;;;EAI3B,CAAC;AAEU,QAAA,aAAa,GAAG,oIAAoI,CAAC;AAErJ,QAAA,UAAU,GAAG;;;;;EAKxB,CAAC;AAEU,QAAA,SAAS,GAAG;;;;EAIvB,CAAC;AAEU,QAAA,SAAS,GAAG;;;;;EAKvB,CAAC;AAEU,QAAA,WAAW,GAAG;;;;EAIzB,CAAC;AAEU,QAAA,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":";;;AACA,+CAA6E;AAE7E,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAFD,wBAEC;AAEY,QAAA,uBAAuB,GAAG;MACjC,sCAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEW,QAAA,gBAAgB,GAAG;SACvB,sCAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEW,QAAA,eAAe,GAAG;SACtB,sCAAY,CAAC,SAAS;;;;;;;;;;;;;;CAc9B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,sCAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAEM,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAAzD,QAAA,SAAS,aAAgD;AAE/D,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA3D,QAAA,WAAW,eAAgD;AAEjE,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAA5D,QAAA,UAAU,cAAkD;AAElE,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA1D,QAAA,UAAU,cAAgD;AAEhE,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAElE,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAEzE,SAAgB,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;KACZ,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,cAAc,WAAW,YAAY,KAAK,KAAK,GAAG,GAAG,CAAC;AACjE,CAAC;AARD,0BAQC;AAEY,QAAA,cAAc,GAAG,yDAAyD,CAAC;AAE3E,QAAA,YAAY,GAAG,iFAAiF,CAAC;AAEjG,QAAA,YAAY,GAAG;;;;;;;;;;;;;;;;;;IAkBxB,CAAC;AAEQ,QAAA,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwB5B,CAAC;AAEU,QAAA,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwBzB,CAAC;AAEU,QAAA,YAAY,GAAG,4DAA4D,CAAC;AAE5E,QAAA,UAAU,GAAG,2EAA2E,CAAC;AAEzF,QAAA,SAAS,GAAG,6DAA6D,CAAC;AAE1E,QAAA,aAAa,GAAG;;;;EAI3B,CAAC;AAEU,QAAA,aAAa,GAAG,oIAAoI,CAAC;AAErJ,QAAA,UAAU,GAAG;;;;;EAKxB,CAAC;AAEU,QAAA,SAAS,GAAG;;;;EAIvB,CAAC;AAEU,QAAA,SAAS,GAAG;;;;;EAKvB,CAAC;AAEU,QAAA,WAAW,GAAG;;;;EAIzB,CAAC;AAEU,QAAA,eAAe,GAAG;;;;;;;;EAQ7B,CAAC;AAEU,QAAA,WAAW,GAAG,GAAG,uBAAe;;;;;;;;;EAS3C,CAAC;AAEU,QAAA,aAAa,GAAG,GAAG,uBAAe;;;;;;;;;EAS7C,CAAC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { CommonValueAST, ProcessNodeResult } from '../constants/interfaces';
|
|
2
|
+
export declare function getNumberFromLiteral(value: string, argument: ProcessNodeResult | CommonValueAST): number | null;
|
|
2
3
|
export declare function getNumericValueFromArgument(param: string | number, argument: ProcessNodeResult | CommonValueAST): string | number;
|
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNumericValueFromArgument = void 0;
|
|
3
|
+
exports.getNumericValueFromArgument = exports.getNumberFromLiteral = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
|
+
function getNumberFromLiteral(value, argument) {
|
|
6
|
+
if (argument.type === constants_1.AST_TYPES.literal &&
|
|
7
|
+
(argument.dataType === constants_1.AST_PRIMITIVES.NUMBER ||
|
|
8
|
+
argument.primitive === constants_1.AST_PRIMITIVES.NUMBER)) {
|
|
9
|
+
const _value = value.replace('L', '');
|
|
10
|
+
return Number(_value);
|
|
11
|
+
}
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
exports.getNumberFromLiteral = getNumberFromLiteral;
|
|
5
15
|
function getNumericValueFromArgument(param, argument) {
|
|
6
|
-
|
|
7
|
-
|
|
16
|
+
var _a;
|
|
17
|
+
const numberValue = getNumberFromLiteral(String(param), argument);
|
|
18
|
+
if (numberValue !== null)
|
|
19
|
+
return numberValue;
|
|
8
20
|
const isUnaryExpression = argument.type === constants_1.AST_TYPES.unaryExpression; // Negative numbers arrive as unary expression
|
|
9
21
|
if (isUnaryExpression) {
|
|
10
22
|
const unaryExp = ('node' in argument ? argument.node : argument);
|
|
@@ -12,8 +24,7 @@ function getNumericValueFromArgument(param, argument) {
|
|
|
12
24
|
const isNumber = unaryExp.right.type === constants_1.AST_TYPES.literal &&
|
|
13
25
|
unaryExp.right.dataType === constants_1.AST_PRIMITIVES.NUMBER;
|
|
14
26
|
if (isNumber)
|
|
15
|
-
return (unaryExp.right.value *
|
|
16
|
-
(isNegative ? -1 : 1));
|
|
27
|
+
return (((_a = getNumberFromLiteral(String(unaryExp.right.value), unaryExp.right)) !== null && _a !== void 0 ? _a : 0) * (isNegative ? -1 : 1));
|
|
17
28
|
}
|
|
18
29
|
return param;
|
|
19
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNumericValueFromArgument.js","sourceRoot":"","sources":["../../../src/utils/getNumericValueFromArgument.ts"],"names":[],"mappings":";;;AAAA,4CAAyD;AAQzD,SAAgB,
|
|
1
|
+
{"version":3,"file":"getNumericValueFromArgument.js","sourceRoot":"","sources":["../../../src/utils/getNumericValueFromArgument.ts"],"names":[],"mappings":";;;AAAA,4CAAyD;AAQzD,SAAgB,oBAAoB,CAChC,KAAa,EACb,QAA4C;IAE5C,IACI,QAAQ,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO;QACnC,CAAE,QAA8B,CAAC,QAAQ,KAAK,0BAAc,CAAC,MAAM;YAC9D,QAA2B,CAAC,SAAS,KAAK,0BAAc,CAAC,MAAM,CAAC,EACvE;QACE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAbD,oDAaC;AAED,SAAgB,2BAA2B,CACvC,KAAsB,EACtB,QAA4C;;IAE5C,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;IAClE,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO,WAAW,CAAC;IAC7C,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,KAAK,qBAAS,CAAC,eAAe,CAAC,CAAC,8CAA8C;IACrH,IAAI,iBAAiB,EAAE;QACnB,MAAM,QAAQ,GAAG,CACb,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAC1B,CAAC;QACxB,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,KAAK,GAAG,CAAC;QAC7C,MAAM,QAAQ,GACV,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO;YACxC,QAAQ,CAAC,KAAoB,CAAC,QAAQ,KAAK,0BAAc,CAAC,MAAM,CAAC;QAEtE,IAAI,QAAQ;YACR,OAAO,CACH,CAAC,MAAA,oBAAoB,CACjB,MAAM,CAAE,QAAQ,CAAC,KAAoB,CAAC,KAAK,CAAC,EAC5C,QAAQ,CAAC,KAAuB,CACnC,mCAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC;KACT;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAzBD,kEAyBC"}
|
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.isInteger = void 0;
|
|
4
4
|
const dictionary_1 = require("../errors/dictionary");
|
|
5
5
|
const constants_1 = require("../constants");
|
|
6
|
+
const getNumericValueFromArgument_1 = require("./getNumericValueFromArgument");
|
|
6
7
|
function isInteger(param, _dataType, context) {
|
|
7
8
|
const isLiteral = context.argument.type === constants_1.AST_TYPES.literal;
|
|
8
9
|
if (!isLiteral)
|
|
9
10
|
return { valid: true };
|
|
10
|
-
const
|
|
11
|
+
const numberValue = (0, getNumericValueFromArgument_1.getNumberFromLiteral)(String(param), context.argument);
|
|
12
|
+
const valid = numberValue !== null && Number.isInteger(numberValue);
|
|
11
13
|
const baseResponse = {
|
|
12
14
|
valid,
|
|
13
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isInteger.js","sourceRoot":"","sources":["../../../src/utils/isInteger.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AACpE,4CAKsB;
|
|
1
|
+
{"version":3,"file":"isInteger.js","sourceRoot":"","sources":["../../../src/utils/isInteger.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AACpE,4CAKsB;AAKtB,+EAAqE;AAErE,SAAgB,SAAS,CACrB,KAAU,EACV,SAAgC,EAChC,OAAkC;IAElC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO,CAAC;IAC9D,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAEvC,MAAM,WAAW,GAAG,IAAA,kDAAoB,EAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1E,MAAM,KAAK,GAAG,WAAW,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG;QACjB,KAAK;KACR,CAAC;IACF,IAAI,CAAC,KAAK;QACN,qDACO,YAAY,GACZ,6BAAgB,CAAC,uBAAU,CAAC,aAAa,CAAC,KAC7C,YAAY,EAAE;gBACV,SAAS,EAAE,0BAAc,CAAC,MAAM;gBAChC,eAAe,EAAE,4BAAgB,CAAC,OAAO;gBACzC,cAAc,EAAE,4BAAgB,CAAC,OAAO;aAC3C,IACH;IACN,OAAO,YAAY,CAAC;AACxB,CAAC;AAzBD,8BAyBC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AST_PRIMITIVES } from '../constants';
|
|
2
2
|
import { isNumberParam } from '../utils';
|
|
3
3
|
import { isBetweenInclusiveRange } from '../utils/isBetweenInclusiveRange';
|
|
4
|
+
import { isInteger } from '../utils/isInteger';
|
|
4
5
|
/**
|
|
5
6
|
* `ROUND` Returns a number rounded to the next greatest even integer.
|
|
6
7
|
*/
|
|
@@ -15,7 +16,11 @@ export const ROUND = {
|
|
|
15
16
|
{
|
|
16
17
|
identifier: 'DIGITS',
|
|
17
18
|
optional: false,
|
|
18
|
-
validator: [
|
|
19
|
+
validator: [
|
|
20
|
+
isNumberParam,
|
|
21
|
+
isBetweenInclusiveRange(0, 10),
|
|
22
|
+
isInteger,
|
|
23
|
+
],
|
|
19
24
|
},
|
|
20
25
|
],
|
|
21
26
|
transpiler: {
|
|
@@ -27,15 +32,15 @@ export const ROUND = {
|
|
|
27
32
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
28
33
|
};
|
|
29
34
|
function elasticsearch(value, digits) {
|
|
30
|
-
return `ROUND(${value}, ${digits})`;
|
|
35
|
+
return `ROUND(${value}, ROUNDDOWN(${digits}, 0))`;
|
|
31
36
|
}
|
|
32
37
|
function SQL(value, digits) {
|
|
33
|
-
return `ROUND(${value}, (CASE
|
|
38
|
+
return `ROUND(${value}, TRUNC(CASE
|
|
34
39
|
WHEN ${digits} IS NULL THEN NULL
|
|
35
40
|
WHEN ${digits} > 10 THEN 10
|
|
36
41
|
WHEN ${digits} < 0 THEN 0
|
|
37
42
|
ELSE ${digits}
|
|
38
|
-
END))`;
|
|
43
|
+
END)::INTEGER)`;
|
|
39
44
|
}
|
|
40
45
|
function snowflake(value, digits) {
|
|
41
46
|
return SQL(value, digits);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"round.js","sourceRoot":"","sources":["../../../src/functions/round.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"round.js","sourceRoot":"","sources":["../../../src/functions/round.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAuB;IACrC,UAAU,EAAE,OAAO;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE;gBACP,aAAa;gBACb,uBAAuB,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC9B,SAAS;aACZ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,MAAc;IAChD,OAAO,SAAS,KAAK,eAAe,MAAM,OAAO,CAAC;AACtD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,MAAc;IACtC,OAAO,SAAS,KAAK;eACV,MAAM;eACN,MAAM;eACN,MAAM;eACN,MAAM;mBACF,CAAC;AACpB,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC5C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAC7C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AST_PRIMITIVES } from '../constants';
|
|
2
2
|
import { isNumberParam } from '../utils';
|
|
3
3
|
import { isBetweenInclusiveRange } from '../utils/isBetweenInclusiveRange';
|
|
4
|
+
import { isInteger } from '../utils/isInteger';
|
|
4
5
|
/**
|
|
5
6
|
* `ROUNDDOWN` Returns a number rounded to the next greatest even integer.
|
|
6
7
|
*/
|
|
@@ -15,7 +16,11 @@ export const ROUNDDOWN = {
|
|
|
15
16
|
{
|
|
16
17
|
identifier: 'DIGITS',
|
|
17
18
|
optional: false,
|
|
18
|
-
validator: [
|
|
19
|
+
validator: [
|
|
20
|
+
isNumberParam,
|
|
21
|
+
isBetweenInclusiveRange(0, 10),
|
|
22
|
+
isInteger,
|
|
23
|
+
],
|
|
19
24
|
},
|
|
20
25
|
],
|
|
21
26
|
transpiler: {
|
|
@@ -27,14 +32,14 @@ export const ROUNDDOWN = {
|
|
|
27
32
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
28
33
|
};
|
|
29
34
|
function elasticsearch(value, digits) {
|
|
30
|
-
return `ROUNDDOWN(${value}, ${digits})`;
|
|
35
|
+
return `ROUNDDOWN(${value}, ROUNDDOWN(${digits}, 0))`;
|
|
31
36
|
}
|
|
32
37
|
function SQL(value, digits) {
|
|
33
38
|
return `((CASE
|
|
34
39
|
WHEN ${value} IS NULL OR ${digits} IS NULL THEN NULL
|
|
35
40
|
WHEN ${digits} > 10 THEN FLOOR(ABS(${value}) * POWER(10, 10)) / POWER(10, 10)
|
|
36
41
|
WHEN ${digits} < 0 THEN FLOOR(ABS(${value}))
|
|
37
|
-
ELSE FLOOR(ABS(${value}) * POWER(10, ${digits})) / POWER(10, ${digits})
|
|
42
|
+
ELSE FLOOR(ABS(${value}) * POWER(10, TRUNC(${digits})::INTEGER)) / POWER(10, TRUNC(${digits})::INTEGER)
|
|
38
43
|
END) * (CASE WHEN ${value} < 0 THEN -1 ELSE 1 END))`;
|
|
39
44
|
}
|
|
40
45
|
function snowflake(value, digits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rounddown.js","sourceRoot":"","sources":["../../../src/functions/rounddown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"rounddown.js","sourceRoot":"","sources":["../../../src/functions/rounddown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE;gBACP,aAAa;gBACb,uBAAuB,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC9B,SAAS;aACZ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,MAAc;IAChD,OAAO,aAAa,KAAK,eAAe,MAAM,OAAO,CAAC;AAC1D,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,MAAc;IACtC,OAAO;eACI,KAAK,eAAe,MAAM;eAC1B,MAAM,wBAAwB,KAAK;eACnC,MAAM,uBAAuB,KAAK;yBACxB,KAAK,uBAAuB,MAAM,kCAAkC,MAAM;wBAC3E,KAAK,2BAA2B,CAAC;AACzD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC5C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAC7C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AST_PRIMITIVES } from '../constants';
|
|
2
2
|
import { isNumberParam } from '../utils';
|
|
3
3
|
import { isBetweenInclusiveRange } from '../utils/isBetweenInclusiveRange';
|
|
4
|
+
import { isInteger } from '../utils/isInteger';
|
|
4
5
|
/**
|
|
5
6
|
* `ROUNDUP` Rounds a number up to a specified number of digits.
|
|
6
7
|
*/
|
|
@@ -15,7 +16,11 @@ export const ROUNDUP = {
|
|
|
15
16
|
{
|
|
16
17
|
identifier: 'DIGITS',
|
|
17
18
|
optional: false,
|
|
18
|
-
validator: [
|
|
19
|
+
validator: [
|
|
20
|
+
isNumberParam,
|
|
21
|
+
isBetweenInclusiveRange(0, 10),
|
|
22
|
+
isInteger,
|
|
23
|
+
],
|
|
19
24
|
},
|
|
20
25
|
],
|
|
21
26
|
transpiler: {
|
|
@@ -27,14 +32,14 @@ export const ROUNDUP = {
|
|
|
27
32
|
primitiveResult: AST_PRIMITIVES.NUMBER,
|
|
28
33
|
};
|
|
29
34
|
function elasticsearch(value, digits) {
|
|
30
|
-
return `ROUNDUP(${value}, ${digits})`;
|
|
35
|
+
return `ROUNDUP(${value}, ROUNDDOWN(${digits}, 0))`;
|
|
31
36
|
}
|
|
32
37
|
function SQL(value, digits) {
|
|
33
38
|
return `((CASE
|
|
34
39
|
WHEN ${value} IS NULL OR ${digits} IS NULL THEN NULL
|
|
35
40
|
WHEN ${digits} > 10 THEN CEIL(ABS(${value}) * POWER(10, 10)) / POWER(10, 10)
|
|
36
41
|
WHEN ${digits} < 0 THEN CEIL(ABS(${value}))
|
|
37
|
-
ELSE CEIL(ABS(${value}) * POWER(10, ${digits})) / POWER(10, ${digits})
|
|
42
|
+
ELSE CEIL(ABS(${value}) * POWER(10, TRUNC(${digits})::INTEGER)) / POWER(10, TRUNC(${digits})::INTEGER)
|
|
38
43
|
END) * (CASE WHEN ${value} < 0 THEN -1 ELSE 1 END))`;
|
|
39
44
|
}
|
|
40
45
|
function snowflake(value, digits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roundup.js","sourceRoot":"","sources":["../../../src/functions/roundup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"roundup.js","sourceRoot":"","sources":["../../../src/functions/roundup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE;gBACP,aAAa;gBACb,uBAAuB,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC9B,SAAS;aACZ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,MAAc;IAChD,OAAO,WAAW,KAAK,eAAe,MAAM,OAAO,CAAC;AACxD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,MAAc;IACtC,OAAO;eACI,KAAK,eAAe,MAAM;eAC1B,MAAM,uBAAuB,KAAK;eAClC,MAAM,sBAAsB,KAAK;wBACxB,KAAK,uBAAuB,MAAM,kCAAkC,MAAM;wBAC1E,KAAK,2BAA2B,CAAC;AACzD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC5C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAC7C,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -28,9 +28,16 @@ function elasticsearch(context, globalContext) {
|
|
|
28
28
|
const offset = globalContext === null || globalContext === void 0 ? void 0 : globalContext.timezone.offset;
|
|
29
29
|
return `${ELASTICSEARCH_SCRIPT_NAMES.setTimezone}(${value}, '${offset}')`;
|
|
30
30
|
}
|
|
31
|
+
else if ((context === null || context === void 0 ? void 0 : context.type) === AST_PRIMITIVES.NUMBER) {
|
|
32
|
+
return `(double) ${value}`;
|
|
33
|
+
}
|
|
31
34
|
return value;
|
|
32
35
|
}
|
|
33
36
|
function sql(context) {
|
|
34
|
-
|
|
37
|
+
const value = `"${context.replacement}"`;
|
|
38
|
+
if ((context === null || context === void 0 ? void 0 : context.type) === AST_PRIMITIVES.NUMBER) {
|
|
39
|
+
return `${value}::FLOAT8`;
|
|
40
|
+
}
|
|
41
|
+
return value;
|
|
35
42
|
}
|
|
36
43
|
//# sourceMappingURL=columnTranspilation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,0BAA0B,EAC1B,cAAc,EACd,SAAS,EACT,OAAO,GACV,MAAM,cAAc,CAAC;AAQtB,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,UAAuB,EACvB,aAA8B;IAE9B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO;YACH,KAAK;YACL,IAAI,EAAE,SAAS,CAAC,MAAM;YACtB,QAAQ,EAAE,cAAc,CAAC,OAAO;YAChC,IAAI,EAAE,UAAU;SACnB,CAAC;IACN,MAAM,eAAe,GAAG;QACpB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;QACvB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG;KAC5B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO;QACH,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,OAAO,CAAC,IAAI;QACtB,IAAI,EAAE,SAAS,CAAC,MAAM;QACtB,IAAI,EAAE,UAAU;KACnB,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,kBAAkB,OAAO,CAAC,WAAW,KAAK,CAAC;IACzD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,cAAc,CAAC,IAAI,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QAClE,MAAM,MAAM,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,MAAM,CAAC;QAC9C,OAAO,GAAG,0BAA0B,CAAC,WAAW,IAAI,KAAK,MAAM,MAAM,IAAI,CAAC;KAC7E;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,
|
|
1
|
+
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,0BAA0B,EAC1B,cAAc,EACd,SAAS,EACT,OAAO,GACV,MAAM,cAAc,CAAC;AAQtB,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,UAAuB,EACvB,aAA8B;IAE9B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO;YACH,KAAK;YACL,IAAI,EAAE,SAAS,CAAC,MAAM;YACtB,QAAQ,EAAE,cAAc,CAAC,OAAO;YAChC,IAAI,EAAE,UAAU;SACnB,CAAC;IACN,MAAM,eAAe,GAAG;QACpB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;QACvB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG;KAC5B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO;QACH,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,OAAO,CAAC,IAAI;QACtB,IAAI,EAAE,SAAS,CAAC,MAAM;QACtB,IAAI,EAAE,UAAU;KACnB,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,kBAAkB,OAAO,CAAC,WAAW,KAAK,CAAC;IACzD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,cAAc,CAAC,IAAI,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QAClE,MAAM,MAAM,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,MAAM,CAAC;QAC9C,OAAO,GAAG,0BAA0B,CAAC,WAAW,IAAI,KAAK,MAAM,MAAM,IAAI,CAAC;KAC7E;SAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,cAAc,CAAC,MAAM,EAAE;QAChD,OAAO,YAAY,KAAK,EAAE,CAAC;KAC9B;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,GAAG,CAAC;IACzC,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,cAAc,CAAC,MAAM,EAAE;QACzC,OAAO,GAAG,KAAK,UAAU,CAAC;KAC7B;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -9,6 +9,7 @@ import { FormulaErrorList } from './formulaErrorList';
|
|
|
9
9
|
import { getValueScript } from '../utils/elasticsearch/scripts';
|
|
10
10
|
import { ERROR_DICTIONARY } from '../errors/dictionary';
|
|
11
11
|
import { escapeCharacters } from '../utils/escapeCharacters';
|
|
12
|
+
import { addDecimalPointIfNeeded } from '../utils/addDecimalPointIfNeeded';
|
|
12
13
|
export class Transpiler {
|
|
13
14
|
constructor(ast, engine, globalContext) {
|
|
14
15
|
this.ast = ast;
|
|
@@ -97,8 +98,12 @@ export class Transpiler {
|
|
|
97
98
|
}
|
|
98
99
|
const isElasticsearchNumber = this.engine === ENGINES.ELASTICSEARCH &&
|
|
99
100
|
dataType === AST_PRIMITIVES.NUMBER;
|
|
100
|
-
if (isElasticsearchNumber && isLongNumber(value))
|
|
101
|
+
if (isElasticsearchNumber && isLongNumber(value)) {
|
|
101
102
|
value = `${value}L`;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
value = addDecimalPointIfNeeded(value, this.engine);
|
|
106
|
+
}
|
|
102
107
|
return { value, dataType, type, node: expression };
|
|
103
108
|
}
|
|
104
109
|
unaryExpression(expression) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,eAAe,EACf,cAAc,GACjB,MAAM,cAAc,CAAC;AActB,OAAO,EAAa,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EACH,cAAc,IAAI,kBAAkB,EACpC,cAAc,EACd,cAAc,EACd,YAAY,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ENGINES } from '../constants';
|
|
2
|
+
export function addDecimalPointIfNeeded(value, engine) {
|
|
3
|
+
if ([
|
|
4
|
+
ENGINES.POSTGRESQL,
|
|
5
|
+
ENGINES.REDSHIFT,
|
|
6
|
+
ENGINES.SNOWFLAKE,
|
|
7
|
+
ENGINES.ELASTICSEARCH,
|
|
8
|
+
].includes(engine) &&
|
|
9
|
+
Number.isInteger(value) &&
|
|
10
|
+
!String(value).includes('.')) {
|
|
11
|
+
return `${value}.0`;
|
|
12
|
+
}
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=addDecimalPointIfNeeded.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addDecimalPointIfNeeded.js","sourceRoot":"","sources":["../../../src/utils/addDecimalPointIfNeeded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,MAAM,UAAU,uBAAuB,CACnC,KAAmB,EACnB,MAAe;IAEf,IACI;QACI,OAAO,CAAC,UAAU;QAClB,OAAO,CAAC,QAAQ;QAChB,OAAO,CAAC,SAAS;QACjB,OAAO,CAAC,aAAa;KACxB,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;QACvB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC9B;QACE,OAAO,GAAG,KAAK,IAAI,CAAC;KACvB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -24,6 +24,6 @@ export declare const evenScript = "def EVEN(def value) {\n if (value == null) r
|
|
|
24
24
|
export declare const logScript = "def LOG(def base, def value) {\n if (base == null || value == null) return null;\n if (base <= 1 || value <= 0) return null;\n return (Math.log(value) / Math.log(base));\n}";
|
|
25
25
|
export declare const oddScript = "def ODD(def value) {\n if (value == null) return null;\n def _value = Math.abs(value);\n def sign = value < 0 ? -1 : 1;\n return ((long) Math.ceil((_value + 1)/ 2.0) * 2 - 1) * sign;\n}";
|
|
26
26
|
export declare const powerScript = "def POWER(def value, def numberToRaise) {\n if (value == null || numberToRaise == null) return null;\n if (value == 0 && numberToRaise < 0) return null;\n return Math.pow(value, numberToRaise);\n}";
|
|
27
|
-
export declare const roundScript = "def ROUND(def value, def places) {\n if (value == null || places == null) return null; \n if (places > 10) places = 10;\n if (places < 0) places = 0;\n def _value = Math.abs(value);\n def sign = value < 0 ? -1 : 1;\n def scale = Math.pow(10, places);\n return (Math.round(_value * scale) / scale) * sign;\n}";
|
|
28
27
|
export declare const roundDownScript = "def ROUNDDOWN(def value, def places) {\n if (value == null || places == null) return null; \n if (places > 10) places = 10;\n if (places < 0) places = 0;\n def _value = Math.abs(value);\n def sign = value < 0 ? -1 : 1;\n def scale = Math.pow(10, places);\n return (Math.floor(_value * scale) / scale) * sign;\n}";
|
|
29
|
-
export declare const
|
|
28
|
+
export declare const roundScript: string;
|
|
29
|
+
export declare const roundUpScript: string;
|
|
@@ -161,25 +161,27 @@ export const powerScript = `def POWER(def value, def numberToRaise) {
|
|
|
161
161
|
if (value == 0 && numberToRaise < 0) return null;
|
|
162
162
|
return Math.pow(value, numberToRaise);
|
|
163
163
|
}`;
|
|
164
|
-
export const
|
|
164
|
+
export const roundDownScript = `def ROUNDDOWN(def value, def places) {
|
|
165
165
|
if (value == null || places == null) return null;
|
|
166
166
|
if (places > 10) places = 10;
|
|
167
167
|
if (places < 0) places = 0;
|
|
168
168
|
def _value = Math.abs(value);
|
|
169
169
|
def sign = value < 0 ? -1 : 1;
|
|
170
170
|
def scale = Math.pow(10, places);
|
|
171
|
-
return (Math.
|
|
171
|
+
return (Math.floor(_value * scale) / scale) * sign;
|
|
172
172
|
}`;
|
|
173
|
-
export const
|
|
173
|
+
export const roundScript = `${roundDownScript}
|
|
174
|
+
def ROUND(def value, def places) {
|
|
174
175
|
if (value == null || places == null) return null;
|
|
175
176
|
if (places > 10) places = 10;
|
|
176
177
|
if (places < 0) places = 0;
|
|
177
178
|
def _value = Math.abs(value);
|
|
178
179
|
def sign = value < 0 ? -1 : 1;
|
|
179
180
|
def scale = Math.pow(10, places);
|
|
180
|
-
return (Math.
|
|
181
|
+
return (Math.round(_value * scale) / scale) * sign;
|
|
181
182
|
}`;
|
|
182
|
-
export const roundUpScript =
|
|
183
|
+
export const roundUpScript = `${roundDownScript}
|
|
184
|
+
def ROUNDUP(def value, def places) {
|
|
183
185
|
if (value == null || places == null) return null;
|
|
184
186
|
if (places > 10) places = 10;
|
|
185
187
|
if (places < 0) places = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE7E,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;MACjC,YAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;SACvB,YAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG;SACtB,YAAY,CAAC,SAAS;;;;;;;;;;;;;;CAc9B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,YAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,UAAU,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;KACZ,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,cAAc,WAAW,YAAY,KAAK,KAAK,GAAG,GAAG,CAAC;AACjE,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,yDAAyD,CAAC;AAExF,MAAM,CAAC,MAAM,YAAY,GAAG,iFAAiF,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;IAkBxB,CAAC;AAEL,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwB5B,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwBzB,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,4DAA4D,CAAC;AAEzF,MAAM,CAAC,MAAM,UAAU,GAAG,2EAA2E,CAAC;AAEtG,MAAM,CAAC,MAAM,SAAS,GAAG,6DAA6D,CAAC;AAEvF,MAAM,CAAC,MAAM,aAAa,GAAG;;;;EAI3B,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,oIAAoI,CAAC;AAElK,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;EAKxB,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;;;;EAIvB,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;;;;;EAKvB,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG;;;;EAIzB,CAAC;AAEH,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE7E,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;MACjC,YAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;SACvB,YAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG;SACtB,YAAY,CAAC,SAAS;;;;;;;;;;;;;;CAc9B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,YAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,UAAU,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;KACZ,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,cAAc,WAAW,YAAY,KAAK,KAAK,GAAG,GAAG,CAAC;AACjE,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,yDAAyD,CAAC;AAExF,MAAM,CAAC,MAAM,YAAY,GAAG,iFAAiF,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;IAkBxB,CAAC;AAEL,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwB5B,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwBzB,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,4DAA4D,CAAC;AAEzF,MAAM,CAAC,MAAM,UAAU,GAAG,2EAA2E,CAAC;AAEtG,MAAM,CAAC,MAAM,SAAS,GAAG,6DAA6D,CAAC;AAEvF,MAAM,CAAC,MAAM,aAAa,GAAG;;;;EAI3B,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,oIAAoI,CAAC;AAElK,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;EAKxB,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;;;;EAIvB,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;;;;;EAKvB,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG;;;;EAIzB,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG;;;;;;;;EAQ7B,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,eAAe;;;;;;;;;EAS3C,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,eAAe;;;;;;;;;EAS7C,CAAC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { CommonValueAST, ProcessNodeResult } from '../constants/interfaces';
|
|
2
|
+
export declare function getNumberFromLiteral(value: string, argument: ProcessNodeResult | CommonValueAST): number | null;
|
|
2
3
|
export declare function getNumericValueFromArgument(param: string | number, argument: ProcessNodeResult | CommonValueAST): string | number;
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
import { AST_PRIMITIVES, AST_TYPES } from '../constants';
|
|
2
|
+
export function getNumberFromLiteral(value, argument) {
|
|
3
|
+
if (argument.type === AST_TYPES.literal &&
|
|
4
|
+
(argument.dataType === AST_PRIMITIVES.NUMBER ||
|
|
5
|
+
argument.primitive === AST_PRIMITIVES.NUMBER)) {
|
|
6
|
+
const _value = value.replace('L', '');
|
|
7
|
+
return Number(_value);
|
|
8
|
+
}
|
|
9
|
+
return null;
|
|
10
|
+
}
|
|
2
11
|
export function getNumericValueFromArgument(param, argument) {
|
|
3
|
-
|
|
4
|
-
|
|
12
|
+
var _a;
|
|
13
|
+
const numberValue = getNumberFromLiteral(String(param), argument);
|
|
14
|
+
if (numberValue !== null)
|
|
15
|
+
return numberValue;
|
|
5
16
|
const isUnaryExpression = argument.type === AST_TYPES.unaryExpression; // Negative numbers arrive as unary expression
|
|
6
17
|
if (isUnaryExpression) {
|
|
7
18
|
const unaryExp = ('node' in argument ? argument.node : argument);
|
|
@@ -9,8 +20,7 @@ export function getNumericValueFromArgument(param, argument) {
|
|
|
9
20
|
const isNumber = unaryExp.right.type === AST_TYPES.literal &&
|
|
10
21
|
unaryExp.right.dataType === AST_PRIMITIVES.NUMBER;
|
|
11
22
|
if (isNumber)
|
|
12
|
-
return (unaryExp.right.value *
|
|
13
|
-
(isNegative ? -1 : 1));
|
|
23
|
+
return (((_a = getNumberFromLiteral(String(unaryExp.right.value), unaryExp.right)) !== null && _a !== void 0 ? _a : 0) * (isNegative ? -1 : 1));
|
|
14
24
|
}
|
|
15
25
|
return param;
|
|
16
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNumericValueFromArgument.js","sourceRoot":"","sources":["../../../src/utils/getNumericValueFromArgument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQzD,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"getNumericValueFromArgument.js","sourceRoot":"","sources":["../../../src/utils/getNumericValueFromArgument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQzD,MAAM,UAAU,oBAAoB,CAChC,KAAa,EACb,QAA4C;IAE5C,IACI,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO;QACnC,CAAE,QAA8B,CAAC,QAAQ,KAAK,cAAc,CAAC,MAAM;YAC9D,QAA2B,CAAC,SAAS,KAAK,cAAc,CAAC,MAAM,CAAC,EACvE;QACE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACvC,KAAsB,EACtB,QAA4C;;IAE5C,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;IAClE,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO,WAAW,CAAC;IAC7C,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,eAAe,CAAC,CAAC,8CAA8C;IACrH,IAAI,iBAAiB,EAAE;QACnB,MAAM,QAAQ,GAAG,CACb,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAC1B,CAAC;QACxB,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,KAAK,GAAG,CAAC;QAC7C,MAAM,QAAQ,GACV,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO;YACxC,QAAQ,CAAC,KAAoB,CAAC,QAAQ,KAAK,cAAc,CAAC,MAAM,CAAC;QAEtE,IAAI,QAAQ;YACR,OAAO,CACH,CAAC,MAAA,oBAAoB,CACjB,MAAM,CAAE,QAAQ,CAAC,KAAoB,CAAC,KAAK,CAAC,EAC5C,QAAQ,CAAC,KAAuB,CACnC,mCAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC;KACT;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { ERROR_LIST, ERROR_DICTIONARY } from '../errors/dictionary';
|
|
2
2
|
import { AST_PRIMITIVES, AST_TYPES, CUSTOM_PRIMITIVE, } from '../constants';
|
|
3
|
+
import { getNumberFromLiteral } from './getNumericValueFromArgument';
|
|
3
4
|
export function isInteger(param, _dataType, context) {
|
|
4
5
|
const isLiteral = context.argument.type === AST_TYPES.literal;
|
|
5
6
|
if (!isLiteral)
|
|
6
7
|
return { valid: true };
|
|
7
|
-
const
|
|
8
|
+
const numberValue = getNumberFromLiteral(String(param), context.argument);
|
|
9
|
+
const valid = numberValue !== null && Number.isInteger(numberValue);
|
|
8
10
|
const baseResponse = {
|
|
9
11
|
valid,
|
|
10
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isInteger.js","sourceRoot":"","sources":["../../../src/utils/isInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACH,cAAc,EACd,SAAS,EACT,gBAAgB,GAEnB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"isInteger.js","sourceRoot":"","sources":["../../../src/utils/isInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACH,cAAc,EACd,SAAS,EACT,gBAAgB,GAEnB,MAAM,cAAc,CAAC;AAKtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,MAAM,UAAU,SAAS,CACrB,KAAU,EACV,SAAgC,EAChC,OAAkC;IAElC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,CAAC;IAC9D,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAEvC,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1E,MAAM,KAAK,GAAG,WAAW,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG;QACjB,KAAK;KACR,CAAC;IACF,IAAI,CAAC,KAAK;QACN,qDACO,YAAY,GACZ,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC,KAC7C,YAAY,EAAE;gBACV,SAAS,EAAE,cAAc,CAAC,MAAM;gBAChC,eAAe,EAAE,gBAAgB,CAAC,OAAO;gBACzC,cAAc,EAAE,gBAAgB,CAAC,OAAO;aAC3C,IACH;IACN,OAAO,YAAY,CAAC;AACxB,CAAC"}
|