@qrvey/formula-lang 0.11.3 → 0.11.5
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/CHANGELOG.md +21 -0
- package/dist/cjs/functions/mid.js +19 -9
- package/dist/cjs/functions/mid.js.map +1 -1
- package/dist/cjs/utils/elasticsearch/scripts.js +11 -6
- package/dist/cjs/utils/elasticsearch/scripts.js.map +1 -1
- package/dist/module/functions/mid.js +19 -9
- package/dist/module/functions/mid.js.map +1 -1
- package/dist/module/utils/elasticsearch/scripts.js +11 -6
- package/dist/module/utils/elasticsearch/scripts.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,24 @@
|
|
|
1
|
+
<a name="0.11.5"></a>
|
|
2
|
+
## [0.11.5](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.11.4...v0.11.5) (2023-06-20)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Bug Fixes
|
|
6
|
+
|
|
7
|
+
* **midfunction:** fix mid function for ES when length is negative RB-1278 ([ceae6fc](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/ceae6fc))
|
|
8
|
+
* **midfunction:** improve mid function with AC RB-1278 ([8886b29](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/8886b29))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
<a name="0.11.4"></a>
|
|
13
|
+
## [0.11.4](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.11.3...v0.11.4) (2023-06-20)
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
* **midfunction:** set 3rd argument as required RB-1285 ([5994518](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/5994518))
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
1
22
|
<a name="0.11.3"></a>
|
|
2
23
|
## [0.11.3](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.11.2...v0.11.3) (2023-06-20)
|
|
3
24
|
|
|
@@ -22,7 +22,7 @@ exports.MID = {
|
|
|
22
22
|
},
|
|
23
23
|
{
|
|
24
24
|
identifier: 'EXTRACT_LENGTH',
|
|
25
|
-
optional:
|
|
25
|
+
optional: false,
|
|
26
26
|
validator: [utils_1.isNumberParam, greaterThanZero],
|
|
27
27
|
},
|
|
28
28
|
],
|
|
@@ -50,7 +50,7 @@ function greaterThanReference(param, arg, compareReference) {
|
|
|
50
50
|
function getNumericValueFromArgument(param, argument) {
|
|
51
51
|
if (typeof param === 'number')
|
|
52
52
|
return param;
|
|
53
|
-
const isUnaryExpression = argument.type === constants_1.AST_TYPES.unaryExpression;
|
|
53
|
+
const isUnaryExpression = argument.type === constants_1.AST_TYPES.unaryExpression; // Negative numbers arrive as unary expression
|
|
54
54
|
if (isUnaryExpression) {
|
|
55
55
|
const unaryExp = argument.node;
|
|
56
56
|
const isNegative = unaryExp.operator === '-';
|
|
@@ -66,15 +66,25 @@ function compareValueWithReference(value, reference) {
|
|
|
66
66
|
return value >= reference;
|
|
67
67
|
}
|
|
68
68
|
function elasticsearch(current, start, length) {
|
|
69
|
-
|
|
70
|
-
return `${constants_1.ELASTICSEARCH_SCRIPT_NAMES.subString}(${current}, ${start}${optional})`;
|
|
71
|
-
}
|
|
72
|
-
function SQL(current, start, length) {
|
|
73
|
-
const optional = length ? `, ${length}` : '';
|
|
74
|
-
return `SUBSTRING(${current}, ${start}${optional})`;
|
|
69
|
+
return `${constants_1.ELASTICSEARCH_SCRIPT_NAMES.subString}(${current}, ${start}, ${length})`;
|
|
75
70
|
}
|
|
76
71
|
function snowflake(current, start, length) {
|
|
77
|
-
return
|
|
72
|
+
return `SUBSTRING(${current}, ${start}, ${length})`;
|
|
73
|
+
}
|
|
74
|
+
function SQL(current, start, length) {
|
|
75
|
+
return `
|
|
76
|
+
(case
|
|
77
|
+
when (${length} < 0) OR (${start} * -1) > LENGTH(${current}) then ''
|
|
78
|
+
else
|
|
79
|
+
SUBSTRING(${current},
|
|
80
|
+
(case
|
|
81
|
+
when ${start} < 0 then (LENGTH(${current}) + ${start} + 1)
|
|
82
|
+
when ${start} = 0 then 1
|
|
83
|
+
else ${start}
|
|
84
|
+
end),
|
|
85
|
+
${length})
|
|
86
|
+
end
|
|
87
|
+
)`.trim();
|
|
78
88
|
}
|
|
79
89
|
function redshift(current, start, length) {
|
|
80
90
|
return SQL(current, start, length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AAStB,qDAAoE;AACpE,oCAAwD;AAExD;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,gBAAgB;YAC5B,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,13 +30,18 @@ String ${constants_1.ELASTICSEARCH_SCRIPT_NAMES.dateFormat}(def date_value, Stri
|
|
|
30
30
|
}
|
|
31
31
|
`;
|
|
32
32
|
exports.subStringScript = `
|
|
33
|
-
String ${constants_1.ELASTICSEARCH_SCRIPT_NAMES.subString}(String text, int start) {
|
|
34
|
-
return ${constants_1.ELASTICSEARCH_SCRIPT_NAMES.subString}(text, start, text.length());
|
|
35
|
-
}
|
|
36
|
-
|
|
37
33
|
String ${constants_1.ELASTICSEARCH_SCRIPT_NAMES.subString}(String text, int start, int end) {
|
|
38
|
-
int first =
|
|
39
|
-
|
|
34
|
+
int first = 0;
|
|
35
|
+
if (end < 0 || (start * -1 > text.length())) return "";
|
|
36
|
+
if (start < 0) {
|
|
37
|
+
first = (int) Math.max(text.length() + start, 0);
|
|
38
|
+
} else if (start == 0) {
|
|
39
|
+
first = 0;
|
|
40
|
+
} else {
|
|
41
|
+
first = (int) Math.min(start - 1, text.length())
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
int last = (int) Math.min(first + end, text.length());
|
|
40
45
|
return text.substring(first, last);
|
|
41
46
|
}
|
|
42
47
|
`;
|
|
@@ -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
|
|
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"}
|
|
@@ -19,7 +19,7 @@ export const MID = {
|
|
|
19
19
|
},
|
|
20
20
|
{
|
|
21
21
|
identifier: 'EXTRACT_LENGTH',
|
|
22
|
-
optional:
|
|
22
|
+
optional: false,
|
|
23
23
|
validator: [isNumberParam, greaterThanZero],
|
|
24
24
|
},
|
|
25
25
|
],
|
|
@@ -47,7 +47,7 @@ function greaterThanReference(param, arg, compareReference) {
|
|
|
47
47
|
function getNumericValueFromArgument(param, argument) {
|
|
48
48
|
if (typeof param === 'number')
|
|
49
49
|
return param;
|
|
50
|
-
const isUnaryExpression = argument.type === AST_TYPES.unaryExpression;
|
|
50
|
+
const isUnaryExpression = argument.type === AST_TYPES.unaryExpression; // Negative numbers arrive as unary expression
|
|
51
51
|
if (isUnaryExpression) {
|
|
52
52
|
const unaryExp = argument.node;
|
|
53
53
|
const isNegative = unaryExp.operator === '-';
|
|
@@ -63,15 +63,25 @@ function compareValueWithReference(value, reference) {
|
|
|
63
63
|
return value >= reference;
|
|
64
64
|
}
|
|
65
65
|
function elasticsearch(current, start, length) {
|
|
66
|
-
|
|
67
|
-
return `${ELASTICSEARCH_SCRIPT_NAMES.subString}(${current}, ${start}${optional})`;
|
|
68
|
-
}
|
|
69
|
-
function SQL(current, start, length) {
|
|
70
|
-
const optional = length ? `, ${length}` : '';
|
|
71
|
-
return `SUBSTRING(${current}, ${start}${optional})`;
|
|
66
|
+
return `${ELASTICSEARCH_SCRIPT_NAMES.subString}(${current}, ${start}, ${length})`;
|
|
72
67
|
}
|
|
73
68
|
function snowflake(current, start, length) {
|
|
74
|
-
return
|
|
69
|
+
return `SUBSTRING(${current}, ${start}, ${length})`;
|
|
70
|
+
}
|
|
71
|
+
function SQL(current, start, length) {
|
|
72
|
+
return `
|
|
73
|
+
(case
|
|
74
|
+
when (${length} < 0) OR (${start} * -1) > LENGTH(${current}) then ''
|
|
75
|
+
else
|
|
76
|
+
SUBSTRING(${current},
|
|
77
|
+
(case
|
|
78
|
+
when ${start} < 0 then (LENGTH(${current}) + ${start} + 1)
|
|
79
|
+
when ${start} = 0 then 1
|
|
80
|
+
else ${start}
|
|
81
|
+
end),
|
|
82
|
+
${length})
|
|
83
|
+
end
|
|
84
|
+
)`.trim();
|
|
75
85
|
}
|
|
76
86
|
function redshift(current, start, length) {
|
|
77
87
|
return SQL(current, start, length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,cAAc,EACd,SAAS,EACT,0BAA0B,GAE7B,MAAM,cAAc,CAAC;AAStB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,gBAAgB;YAC5B,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,13 +26,18 @@ String ${SCRIPT_NAMES.dateFormat}(def date_value, String format) {
|
|
|
26
26
|
}
|
|
27
27
|
`;
|
|
28
28
|
export const subStringScript = `
|
|
29
|
-
String ${SCRIPT_NAMES.subString}(String text, int start) {
|
|
30
|
-
return ${SCRIPT_NAMES.subString}(text, start, text.length());
|
|
31
|
-
}
|
|
32
|
-
|
|
33
29
|
String ${SCRIPT_NAMES.subString}(String text, int start, int end) {
|
|
34
|
-
int first =
|
|
35
|
-
|
|
30
|
+
int first = 0;
|
|
31
|
+
if (end < 0 || (start * -1 > text.length())) return "";
|
|
32
|
+
if (start < 0) {
|
|
33
|
+
first = (int) Math.max(text.length() + start, 0);
|
|
34
|
+
} else if (start == 0) {
|
|
35
|
+
first = 0;
|
|
36
|
+
} else {
|
|
37
|
+
first = (int) Math.min(start - 1, text.length())
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
int last = (int) Math.min(first + end, text.length());
|
|
36
41
|
return text.substring(first, last);
|
|
37
42
|
}
|
|
38
43
|
`;
|
|
@@ -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
|
|
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"}
|