@qrvey/formula-lang 2.0.1-rc.411 → 2.0.1-rc.415

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/cjs/utils/elasticsearch/scripts.d.ts +2 -2
  2. package/dist/cjs/utils/elasticsearch/scripts.js +8 -8
  3. package/dist/module/utils/elasticsearch/scripts.d.ts +2 -2
  4. package/dist/module/utils/elasticsearch/scripts.js +8 -8
  5. package/package.json +1 -1
package/dist/cjs/utils/elasticsearch/scripts.d.ts CHANGED
@@ -13,8 +13,8 @@ export declare function dateDif(start: any, end: any, unit: DateDifUnitParam): s
13
13
  export declare const getValueScript = "def GET_VALUE(def c){return (c.empty ? null : c.value)}";
14
14
  export declare const isNullScript = "def IS_NULL_SCRIPT(def value, def replacement) { return value ?: replacement; }";
15
15
  export declare const properScript = "String PROPER_STRING(String input) {\n if (input == null) return null;\n def str = input.toLowerCase();\n def builder = new StringBuilder(str);\n \n def chartLists = [\" \", \"!\", \"\\\"\", \"#\", \"$\", \"%\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \"-\", \".\", \"/\", \":\", \";\", \"<\", \"=\", \">\", \"?\", \"@\", \"[\", \"\\\\\", \"]\", \"^\", \"_\", \"`\", \"{\", \"|\", \"}\", \"~\"];\n \n boolean flag = true;\n \n for(int i = 0; i < builder.length(); i++) {\n String ch = builder.charAt(i).toString();\n if (flag) { \n builder.replace(i, i + 1, ch.toUpperCase());\n flag = false;\n }\n flag = chartLists.contains(ch);\n }\n return builder.toString();\n }";
16
- export declare const greatestScript = "def GREATEST(def numbers) {\n def max;\n if (numbers[0] instanceof ZonedDateTime) {\n max = numbers[0].toInstant().toEpochMilli();\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i].toInstant().toEpochMilli();\n if (current > max) {\n max = current;\n }\n }\n return LocalDateTime.ofInstant(Instant.ofEpochMilli(max), ZoneId.systemDefault()) ;\n } else {\n max = numbers[0];\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] > max) {\n max = numbers[i];\n }\n }\n return max;\n }\n}";
17
- export declare const leastScript = "def LEAST(def numbers) {\n def min;\n if (numbers[0] instanceof ZonedDateTime) {\n min = numbers[0].toInstant().toEpochMilli();\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i].toInstant().toEpochMilli();\n if (current < min) {\n min = current;\n }\n }\n return LocalDateTime.ofInstant(Instant.ofEpochMilli(min), ZoneId.systemDefault()) ;\n } else {\n min = numbers[0];\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] < min) {\n min = numbers[i];\n }\n }\n return min;\n }\n}";
16
+ export declare const greatestScript = "def GREATEST(def numbers) {\n def max;\n if (numbers[0] instanceof ZonedDateTime) {\n max = numbers[0];\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i];\n if (current.isAfter(max)) {\n max = current;\n }\n }\n return max;\n } else {\n max = numbers[0];\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] > max) {\n max = numbers[i];\n }\n }\n return max;\n }\n}";
17
+ export declare const leastScript = "def LEAST(def numbers) {\n def min;\n if (numbers[0] instanceof ZonedDateTime) {\n min = numbers[0];\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i];\n if (current.isBefore(min)) {\n min = current;\n }\n }\n return min;\n } else {\n min = numbers[0];\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] < min) {\n min = numbers[i];\n }\n }\n return min;\n }\n}";
18
18
  export declare const lengthScript = "def LENGTH(def str){return str != null ? str.length() : 0}";
19
19
  export declare const sqrtScript = "def SQRT(def num){return num == null || num < 0 ? null : Math.sqrt(num) }";
20
20
  export declare const expScript = "def EXP(def num){return num != null ? Math.exp(num) : null}";
package/dist/cjs/utils/elasticsearch/scripts.js CHANGED
@@ -94,16 +94,16 @@ exports.properScript = `String PROPER_STRING(String input) {
94
94
  exports.greatestScript = `def GREATEST(def numbers) {
95
95
  def max;
96
96
  if (numbers[0] instanceof ZonedDateTime) {
97
- max = numbers[0].toInstant().toEpochMilli();
97
+ max = numbers[0];
98
98
  if (max === null) return null;
99
99
  for (int i = 1; i < numbers.length; i++) {
100
100
  if (numbers[i] === null) return null;
101
- def current = numbers[i].toInstant().toEpochMilli();
102
- if (current > max) {
101
+ def current = numbers[i];
102
+ if (current.isAfter(max)) {
103
103
  max = current;
104
104
  }
105
105
  }
106
- return LocalDateTime.ofInstant(Instant.ofEpochMilli(max), ZoneId.systemDefault()) ;
106
+ return max;
107
107
  } else {
108
108
  max = numbers[0];
109
109
  if (max === null) return null;
@@ -119,16 +119,16 @@ exports.greatestScript = `def GREATEST(def numbers) {
119
119
  exports.leastScript = `def LEAST(def numbers) {
120
120
  def min;
121
121
  if (numbers[0] instanceof ZonedDateTime) {
122
- min = numbers[0].toInstant().toEpochMilli();
122
+ min = numbers[0];
123
123
  if (min === null) return null;
124
124
  for (int i = 1; i < numbers.length; i++) {
125
125
  if (numbers[i] === null) return null;
126
- def current = numbers[i].toInstant().toEpochMilli();
127
- if (current < min) {
126
+ def current = numbers[i];
127
+ if (current.isBefore(min)) {
128
128
  min = current;
129
129
  }
130
130
  }
131
- return LocalDateTime.ofInstant(Instant.ofEpochMilli(min), ZoneId.systemDefault()) ;
131
+ return min;
132
132
  } else {
133
133
  min = numbers[0];
134
134
  if (min === null) return null;
package/dist/module/utils/elasticsearch/scripts.d.ts CHANGED
@@ -13,8 +13,8 @@ export declare function dateDif(start: any, end: any, unit: DateDifUnitParam): s
13
13
  export declare const getValueScript = "def GET_VALUE(def c){return (c.empty ? null : c.value)}";
14
14
  export declare const isNullScript = "def IS_NULL_SCRIPT(def value, def replacement) { return value ?: replacement; }";
15
15
  export declare const properScript = "String PROPER_STRING(String input) {\n if (input == null) return null;\n def str = input.toLowerCase();\n def builder = new StringBuilder(str);\n \n def chartLists = [\" \", \"!\", \"\\\"\", \"#\", \"$\", \"%\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \"-\", \".\", \"/\", \":\", \";\", \"<\", \"=\", \">\", \"?\", \"@\", \"[\", \"\\\\\", \"]\", \"^\", \"_\", \"`\", \"{\", \"|\", \"}\", \"~\"];\n \n boolean flag = true;\n \n for(int i = 0; i < builder.length(); i++) {\n String ch = builder.charAt(i).toString();\n if (flag) { \n builder.replace(i, i + 1, ch.toUpperCase());\n flag = false;\n }\n flag = chartLists.contains(ch);\n }\n return builder.toString();\n }";
16
- export declare const greatestScript = "def GREATEST(def numbers) {\n def max;\n if (numbers[0] instanceof ZonedDateTime) {\n max = numbers[0].toInstant().toEpochMilli();\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i].toInstant().toEpochMilli();\n if (current > max) {\n max = current;\n }\n }\n return LocalDateTime.ofInstant(Instant.ofEpochMilli(max), ZoneId.systemDefault()) ;\n } else {\n max = numbers[0];\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] > max) {\n max = numbers[i];\n }\n }\n return max;\n }\n}";
17
- export declare const leastScript = "def LEAST(def numbers) {\n def min;\n if (numbers[0] instanceof ZonedDateTime) {\n min = numbers[0].toInstant().toEpochMilli();\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i].toInstant().toEpochMilli();\n if (current < min) {\n min = current;\n }\n }\n return LocalDateTime.ofInstant(Instant.ofEpochMilli(min), ZoneId.systemDefault()) ;\n } else {\n min = numbers[0];\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] < min) {\n min = numbers[i];\n }\n }\n return min;\n }\n}";
16
+ export declare const greatestScript = "def GREATEST(def numbers) {\n def max;\n if (numbers[0] instanceof ZonedDateTime) {\n max = numbers[0];\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i];\n if (current.isAfter(max)) {\n max = current;\n }\n }\n return max;\n } else {\n max = numbers[0];\n if (max === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] > max) {\n max = numbers[i];\n }\n }\n return max;\n }\n}";
17
+ export declare const leastScript = "def LEAST(def numbers) {\n def min;\n if (numbers[0] instanceof ZonedDateTime) {\n min = numbers[0];\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n def current = numbers[i];\n if (current.isBefore(min)) {\n min = current;\n }\n }\n return min;\n } else {\n min = numbers[0];\n if (min === null) return null;\n for (int i = 1; i < numbers.length; i++) {\n if (numbers[i] === null) return null;\n if (numbers[i] < min) {\n min = numbers[i];\n }\n }\n return min;\n }\n}";
18
18
  export declare const lengthScript = "def LENGTH(def str){return str != null ? str.length() : 0}";
19
19
  export declare const sqrtScript = "def SQRT(def num){return num == null || num < 0 ? null : Math.sqrt(num) }";
20
20
  export declare const expScript = "def EXP(def num){return num != null ? Math.exp(num) : null}";
package/dist/module/utils/elasticsearch/scripts.js CHANGED
@@ -83,16 +83,16 @@ export const properScript = `String PROPER_STRING(String input) {
83
83
  export const greatestScript = `def GREATEST(def numbers) {
84
84
  def max;
85
85
  if (numbers[0] instanceof ZonedDateTime) {
86
- max = numbers[0].toInstant().toEpochMilli();
86
+ max = numbers[0];
87
87
  if (max === null) return null;
88
88
  for (int i = 1; i < numbers.length; i++) {
89
89
  if (numbers[i] === null) return null;
90
- def current = numbers[i].toInstant().toEpochMilli();
91
- if (current > max) {
90
+ def current = numbers[i];
91
+ if (current.isAfter(max)) {
92
92
  max = current;
93
93
  }
94
94
  }
95
- return LocalDateTime.ofInstant(Instant.ofEpochMilli(max), ZoneId.systemDefault()) ;
95
+ return max;
96
96
  } else {
97
97
  max = numbers[0];
98
98
  if (max === null) return null;
@@ -108,16 +108,16 @@ export const greatestScript = `def GREATEST(def numbers) {
108
108
  export const leastScript = `def LEAST(def numbers) {
109
109
  def min;
110
110
  if (numbers[0] instanceof ZonedDateTime) {
111
- min = numbers[0].toInstant().toEpochMilli();
111
+ min = numbers[0];
112
112
  if (min === null) return null;
113
113
  for (int i = 1; i < numbers.length; i++) {
114
114
  if (numbers[i] === null) return null;
115
- def current = numbers[i].toInstant().toEpochMilli();
116
- if (current < min) {
115
+ def current = numbers[i];
116
+ if (current.isBefore(min)) {
117
117
  min = current;
118
118
  }
119
119
  }
120
- return LocalDateTime.ofInstant(Instant.ofEpochMilli(min), ZoneId.systemDefault()) ;
120
+ return min;
121
121
  } else {
122
122
  min = numbers[0];
123
123
  if (min === null) return null;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/formula-lang",
3
- "version": "2.0.1-rc.411",
3
+ "version": "2.0.1-rc.415",
4
4
  "description": "QFormula support for qrvey projects",
5
5
  "types": "dist/module/index.d.ts",
6
6
  "main": "dist/module/index.js",