@qrvey/formula-lang 0.10.0 → 0.11.1
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 +10 -0
- package/dist/cjs/constants/index.d.ts +2 -1
- package/dist/cjs/constants/index.js +1 -0
- package/dist/cjs/constants/index.js.map +1 -1
- package/dist/cjs/constants/interfaces.d.ts +18 -8
- package/dist/cjs/errors/analyzer/index.js +1 -1
- package/dist/cjs/errors/analyzer/index.js.map +1 -1
- package/dist/cjs/errors/definitions.d.ts +8 -1
- package/dist/cjs/errors/definitions.js +17 -2
- package/dist/cjs/errors/definitions.js.map +1 -1
- package/dist/cjs/errors/dictionary.d.ts +3 -1
- package/dist/cjs/errors/dictionary.js +10 -0
- package/dist/cjs/errors/dictionary.js.map +1 -1
- package/dist/cjs/errors/index.d.ts +1 -0
- package/dist/cjs/errors/index.js +1 -0
- package/dist/cjs/errors/index.js.map +1 -1
- package/dist/cjs/errors/mismatch.d.ts +33 -0
- package/dist/cjs/errors/mismatch.js +67 -0
- package/dist/cjs/errors/mismatch.js.map +1 -0
- package/dist/cjs/functions/abs.js +0 -2
- package/dist/cjs/functions/abs.js.map +1 -1
- package/dist/cjs/functions/datedif.js +7 -7
- package/dist/cjs/functions/datedif.js.map +1 -1
- package/dist/cjs/functions/day.js +0 -2
- package/dist/cjs/functions/day.js.map +1 -1
- package/dist/cjs/functions/hour.js +0 -2
- package/dist/cjs/functions/hour.js.map +1 -1
- package/dist/cjs/functions/if.js +4 -9
- package/dist/cjs/functions/if.js.map +1 -1
- package/dist/cjs/functions/ifs.js +3 -8
- package/dist/cjs/functions/ifs.js.map +1 -1
- package/dist/cjs/functions/isNull.js +3 -10
- package/dist/cjs/functions/isNull.js.map +1 -1
- package/dist/cjs/functions/mid.js +0 -4
- package/dist/cjs/functions/mid.js.map +1 -1
- package/dist/cjs/functions/minute.js +0 -2
- package/dist/cjs/functions/minute.js.map +1 -1
- package/dist/cjs/functions/month.js +0 -2
- package/dist/cjs/functions/month.js.map +1 -1
- package/dist/cjs/functions/second.js +0 -2
- package/dist/cjs/functions/second.js.map +1 -1
- package/dist/cjs/functions/year.js +0 -2
- package/dist/cjs/functions/year.js.map +1 -1
- package/dist/cjs/grammar/generated/qformula.lang.d.ts +2 -9
- package/dist/cjs/grammar/generated/qformula.lang.js +50 -27
- package/dist/cjs/grammar/generated/qformula.lang.js.map +1 -1
- package/dist/cjs/grammar/generated/qformula.lang.terms.d.ts +4 -3
- package/dist/cjs/grammar/generated/qformula.lang.terms.js +2 -2
- package/dist/cjs/grammar/generated/qformula.lang.terms.js.map +1 -1
- package/dist/cjs/grammar/tokens.d.ts +2 -0
- package/dist/cjs/grammar/tokens.js +26 -0
- package/dist/cjs/grammar/tokens.js.map +1 -0
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/parser/formula-parser.d.ts +2 -1
- package/dist/cjs/parser/formula-parser.js +11 -12
- package/dist/cjs/parser/formula-parser.js.map +1 -1
- package/dist/cjs/parser/json-parser.js +48 -19
- package/dist/cjs/parser/json-parser.js.map +1 -1
- package/dist/cjs/transpiler/columnTranspilation.d.ts +1 -1
- package/dist/cjs/transpiler/columnTranspilation.js +14 -3
- package/dist/cjs/transpiler/columnTranspilation.js.map +1 -1
- package/dist/cjs/transpiler/index.js +93 -14
- package/dist/cjs/transpiler/index.js.map +1 -1
- package/dist/cjs/transpiler/validateFuncStructure.d.ts +1 -1
- package/dist/cjs/transpiler/validateFuncStructure.js +60 -8
- package/dist/cjs/transpiler/validateFuncStructure.js.map +1 -1
- package/dist/module/constants/index.d.ts +2 -1
- package/dist/module/constants/index.js +1 -0
- package/dist/module/constants/index.js.map +1 -1
- package/dist/module/constants/interfaces.d.ts +18 -8
- package/dist/module/errors/analyzer/index.js +1 -1
- package/dist/module/errors/analyzer/index.js.map +1 -1
- package/dist/module/errors/definitions.d.ts +8 -1
- package/dist/module/errors/definitions.js +15 -1
- package/dist/module/errors/definitions.js.map +1 -1
- package/dist/module/errors/dictionary.d.ts +3 -1
- package/dist/module/errors/dictionary.js +10 -0
- package/dist/module/errors/dictionary.js.map +1 -1
- package/dist/module/errors/index.d.ts +1 -0
- package/dist/module/errors/index.js +1 -0
- package/dist/module/errors/index.js.map +1 -1
- package/dist/module/errors/mismatch.d.ts +33 -0
- package/dist/module/errors/mismatch.js +62 -0
- package/dist/module/errors/mismatch.js.map +1 -0
- package/dist/module/functions/abs.js +0 -2
- package/dist/module/functions/abs.js.map +1 -1
- package/dist/module/functions/datedif.js +7 -7
- package/dist/module/functions/datedif.js.map +1 -1
- package/dist/module/functions/day.js +0 -2
- package/dist/module/functions/day.js.map +1 -1
- package/dist/module/functions/hour.js +0 -2
- package/dist/module/functions/hour.js.map +1 -1
- package/dist/module/functions/if.js +4 -9
- package/dist/module/functions/if.js.map +1 -1
- package/dist/module/functions/ifs.js +3 -8
- package/dist/module/functions/ifs.js.map +1 -1
- package/dist/module/functions/isNull.js +3 -10
- package/dist/module/functions/isNull.js.map +1 -1
- package/dist/module/functions/mid.js +0 -4
- package/dist/module/functions/mid.js.map +1 -1
- package/dist/module/functions/minute.js +0 -2
- package/dist/module/functions/minute.js.map +1 -1
- package/dist/module/functions/month.js +0 -2
- package/dist/module/functions/month.js.map +1 -1
- package/dist/module/functions/second.js +0 -2
- package/dist/module/functions/second.js.map +1 -1
- package/dist/module/functions/year.js +0 -2
- package/dist/module/functions/year.js.map +1 -1
- package/dist/module/grammar/generated/qformula.lang.d.ts +2 -9
- package/dist/module/grammar/generated/qformula.lang.js +50 -27
- package/dist/module/grammar/generated/qformula.lang.js.map +1 -1
- package/dist/module/grammar/generated/qformula.lang.terms.d.ts +4 -3
- package/dist/module/grammar/generated/qformula.lang.terms.js +1 -1
- package/dist/module/grammar/generated/qformula.lang.terms.js.map +1 -1
- package/dist/module/grammar/tokens.d.ts +2 -0
- package/dist/module/grammar/tokens.js +23 -0
- package/dist/module/grammar/tokens.js.map +1 -0
- package/dist/module/index.d.ts +1 -1
- package/dist/module/index.js +1 -1
- package/dist/module/index.js.map +1 -1
- package/dist/module/parser/formula-parser.d.ts +2 -1
- package/dist/module/parser/formula-parser.js +9 -11
- package/dist/module/parser/formula-parser.js.map +1 -1
- package/dist/module/parser/json-parser.js +50 -21
- package/dist/module/parser/json-parser.js.map +1 -1
- package/dist/module/transpiler/columnTranspilation.d.ts +1 -1
- package/dist/module/transpiler/columnTranspilation.js +14 -3
- package/dist/module/transpiler/columnTranspilation.js.map +1 -1
- package/dist/module/transpiler/index.js +93 -14
- package/dist/module/transpiler/index.js.map +1 -1
- package/dist/module/transpiler/validateFuncStructure.d.ts +1 -1
- package/dist/module/transpiler/validateFuncStructure.js +60 -8
- package/dist/module/transpiler/validateFuncStructure.js.map +1 -1
- package/package.json +1 -1
|
@@ -80,9 +80,33 @@ function transformNode(program, node, inference, context) {
|
|
|
80
80
|
inference.flatBody.push(resultNode);
|
|
81
81
|
return resultNode;
|
|
82
82
|
}
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
83
|
+
const VALID_OPERATIONS_BY_TYPE = {
|
|
84
|
+
[constants_1.AST_PRIMITIVES.NUMBER]: [
|
|
85
|
+
'+',
|
|
86
|
+
'-',
|
|
87
|
+
'*',
|
|
88
|
+
'/',
|
|
89
|
+
'<',
|
|
90
|
+
'<=',
|
|
91
|
+
'>',
|
|
92
|
+
'>=',
|
|
93
|
+
'=',
|
|
94
|
+
'<>',
|
|
95
|
+
],
|
|
96
|
+
[constants_1.AST_PRIMITIVES.STRING]: ['=', '<>'],
|
|
97
|
+
[constants_1.AST_PRIMITIVES.DATE]: ['=', '<>'],
|
|
98
|
+
[constants_1.AST_PRIMITIVES.BOOLEAN]: [],
|
|
99
|
+
[constants_1.AST_PRIMITIVES.UNKNOWN]: [],
|
|
100
|
+
};
|
|
101
|
+
function operatorIsValidForOperation(operator, leftPrimitive, rightPrimitive) {
|
|
102
|
+
const allowedOperators = calculateValidOperatorsByType(leftPrimitive, rightPrimitive);
|
|
103
|
+
return allowedOperators.includes(operator);
|
|
104
|
+
}
|
|
105
|
+
function calculateValidOperatorsByType(leftPrimitive, rightPrimitive) {
|
|
106
|
+
if (leftPrimitive === rightPrimitive && !Array.isArray(leftPrimitive)) {
|
|
107
|
+
return VALID_OPERATIONS_BY_TYPE[leftPrimitive];
|
|
108
|
+
}
|
|
109
|
+
return [];
|
|
86
110
|
}
|
|
87
111
|
function calculateBinaryElements(program, node, left, right) {
|
|
88
112
|
const leftPrimitive = left === null || left === void 0 ? void 0 : left.primitive;
|
|
@@ -91,23 +115,17 @@ function calculateBinaryElements(program, node, left, right) {
|
|
|
91
115
|
const arithOperator = node.getChild('ArithOp');
|
|
92
116
|
const leftIsAValidNumber = leftPrimitive === constants_1.AST_PRIMITIVES.NUMBER;
|
|
93
117
|
const rightIsAValidNumber = rightPrimitive === constants_1.AST_PRIMITIVES.NUMBER;
|
|
94
|
-
const leftIsAValidString = leftPrimitive === constants_1.AST_PRIMITIVES.STRING;
|
|
95
|
-
const rightIsAValidString = rightPrimitive === constants_1.AST_PRIMITIVES.STRING;
|
|
96
|
-
const leftIsAValidDate = leftPrimitive === constants_1.AST_PRIMITIVES.DATE;
|
|
97
|
-
const rightIsAValidDate = rightPrimitive === constants_1.AST_PRIMITIVES.DATE;
|
|
98
118
|
const operatorNode = (logicOperator !== null && logicOperator !== void 0 ? logicOperator : arithOperator);
|
|
99
119
|
const operator = (0, utils_1.getNodeValue)(program, operatorNode);
|
|
120
|
+
const operatorPosition = !operatorNode
|
|
121
|
+
? undefined
|
|
122
|
+
: (0, formula_parser_1.createPositionASTFromSyntaxNode)(operatorNode);
|
|
123
|
+
const validOperators = calculateValidOperatorsByType(leftPrimitive, rightPrimitive);
|
|
100
124
|
// primitive is number if arithOperator is not null and both left and right are numbers
|
|
101
125
|
// primitive is boolean if logicOperator is not null and both left and right are booleans
|
|
102
126
|
let primitive = constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
103
127
|
if (logicOperator) {
|
|
104
|
-
if ((leftPrimitive
|
|
105
|
-
!leftIsAValidString &&
|
|
106
|
-
!leftIsAValidDate) ||
|
|
107
|
-
(((leftIsAValidString && rightIsAValidString) ||
|
|
108
|
-
(leftIsAValidDate && rightIsAValidDate)) &&
|
|
109
|
-
// string and date operation only with allowed operators
|
|
110
|
-
isValidStringDateBinaryOperation(operator))) {
|
|
128
|
+
if (operatorIsValidForOperation(operator, leftPrimitive, rightPrimitive)) {
|
|
111
129
|
primitive = constants_1.AST_PRIMITIVES.BOOLEAN;
|
|
112
130
|
}
|
|
113
131
|
}
|
|
@@ -122,25 +140,29 @@ function calculateBinaryElements(program, node, left, right) {
|
|
|
122
140
|
return {
|
|
123
141
|
primitive,
|
|
124
142
|
operator,
|
|
143
|
+
operatorNode: operatorPosition,
|
|
125
144
|
hasInvalidError,
|
|
145
|
+
validOperators,
|
|
126
146
|
};
|
|
127
147
|
}
|
|
128
148
|
function transformBinaryExpression(program, node, inference, context) {
|
|
129
149
|
const [leftNode, rightNode] = node.getChildren('Expression');
|
|
130
150
|
const left = transformNode(program, leftNode, inference, context);
|
|
131
151
|
const right = transformNode(program, rightNode, inference, context);
|
|
132
|
-
const { primitive, operator, hasInvalidError } = calculateBinaryElements(program, node, left, right);
|
|
152
|
+
const { primitive, operator, operatorNode, hasInvalidError, validOperators, } = calculateBinaryElements(program, node, left, right);
|
|
133
153
|
const binaryAST = {
|
|
134
154
|
operator,
|
|
155
|
+
operatorNode,
|
|
135
156
|
type: constants_1.AST_TYPES.binaryExpression,
|
|
136
157
|
left,
|
|
137
158
|
right,
|
|
138
159
|
from: node.from,
|
|
139
160
|
to: node.to,
|
|
140
161
|
primitive,
|
|
162
|
+
validOperators,
|
|
141
163
|
};
|
|
142
164
|
if (hasInvalidError) {
|
|
143
|
-
inference.errorList.push(new errors_1.
|
|
165
|
+
inference.errorList.push(new errors_1.NotAllowedOperationError(binaryAST));
|
|
144
166
|
}
|
|
145
167
|
return binaryAST;
|
|
146
168
|
}
|
|
@@ -151,16 +173,19 @@ function transformUnaryExpression(program, node, inference, context) {
|
|
|
151
173
|
const primitive = (0, primitiveFunctions_1.primitiveIsIncluded)(right === null || right === void 0 ? void 0 : right.primitive, constants_1.AST_PRIMITIVES.NUMBER, constants_1.AST_PRIMITIVES.BOOLEAN)
|
|
152
174
|
? right.primitive
|
|
153
175
|
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
176
|
+
const validOperators = (right === null || right === void 0 ? void 0 : right.primitive) === constants_1.AST_PRIMITIVES.NUMBER ? ['+', '-'] : [];
|
|
154
177
|
const unaryAST = {
|
|
155
178
|
operator: (0, utils_1.getNodeValue)(program, operator),
|
|
179
|
+
operatorNode: (0, formula_parser_1.createPositionASTFromSyntaxNode)(operator),
|
|
156
180
|
type: constants_1.AST_TYPES.unaryExpression,
|
|
157
181
|
right,
|
|
158
182
|
from: node.from,
|
|
159
183
|
to: node.to,
|
|
160
184
|
primitive,
|
|
185
|
+
validOperators,
|
|
161
186
|
};
|
|
162
187
|
if (!rightNode) {
|
|
163
|
-
inference.errorList.push(new errors_1.
|
|
188
|
+
inference.errorList.push(new errors_1.NotAllowedOperationError(unaryAST));
|
|
164
189
|
}
|
|
165
190
|
return unaryAST;
|
|
166
191
|
}
|
|
@@ -171,10 +196,14 @@ function transformParenthesizedExpression(program, node, inference, context) {
|
|
|
171
196
|
const parenthesisEnd = node.getChild('ParenthesisEnd');
|
|
172
197
|
const resultNode = transformNode(program, expressionNode, inference, context);
|
|
173
198
|
if (!parenthesisStart || !parenthesisEnd) {
|
|
199
|
+
const [from, to] = [
|
|
200
|
+
!parenthesisStart ? node.from : parenthesisStart.from,
|
|
201
|
+
!parenthesisStart ? node.to : parenthesisStart.to,
|
|
202
|
+
];
|
|
174
203
|
inference.errorList.push(new errors_1.MissingParenthesisError({
|
|
175
204
|
type: constants_1.AST_TYPES.parenthesisExpression,
|
|
176
|
-
from
|
|
177
|
-
to
|
|
205
|
+
from,
|
|
206
|
+
to,
|
|
178
207
|
primitive: (_a = resultNode === null || resultNode === void 0 ? void 0 : resultNode.primitive) !== null && _a !== void 0 ? _a : constants_1.AST_PRIMITIVES.UNKNOWN,
|
|
179
208
|
}));
|
|
180
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ENGINES } from '../constants';
|
|
2
2
|
import { ProcessNodeResult, VariableAST, FormulaContext } from '../constants/interfaces';
|
|
3
|
-
export declare function columnTranspilation(engine: ENGINES,
|
|
3
|
+
export declare function columnTranspilation(engine: ENGINES, expression: VariableAST, globalContext?: FormulaContext): ProcessNodeResult;
|
|
@@ -2,9 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.columnTranspilation = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
|
-
function columnTranspilation(engine,
|
|
5
|
+
function columnTranspilation(engine, expression, globalContext) {
|
|
6
|
+
const { value, context } = expression;
|
|
6
7
|
if (!context || !context.replacement)
|
|
7
|
-
return {
|
|
8
|
+
return {
|
|
9
|
+
value,
|
|
10
|
+
type: constants_1.AST_TYPES.column,
|
|
11
|
+
dataType: constants_1.AST_PRIMITIVES.UNKNOWN,
|
|
12
|
+
node: expression,
|
|
13
|
+
};
|
|
8
14
|
const columnForEngine = {
|
|
9
15
|
[constants_1.ENGINES.ELASTICSEARCH]: elasticsearch,
|
|
10
16
|
[constants_1.ENGINES.SNOWFLAKE]: sql,
|
|
@@ -12,7 +18,12 @@ function columnTranspilation(engine, { value, context }, globalContext) {
|
|
|
12
18
|
[constants_1.ENGINES.POSTGRESQL]: sql,
|
|
13
19
|
};
|
|
14
20
|
const result = columnForEngine[engine](context, globalContext);
|
|
15
|
-
return {
|
|
21
|
+
return {
|
|
22
|
+
value: result,
|
|
23
|
+
dataType: context.type,
|
|
24
|
+
type: constants_1.AST_TYPES.column,
|
|
25
|
+
node: expression,
|
|
26
|
+
};
|
|
16
27
|
}
|
|
17
28
|
exports.columnTranspilation = columnTranspilation;
|
|
18
29
|
function elasticsearch(context, globalContext) {
|
|
@@ -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,EAAE,KAAK,EAAE,OAAO,
|
|
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,OAAO,IAAI,OAAO,CAAC,WAAW,GAAG,CAAC;AACtC,CAAC"}
|
|
@@ -10,6 +10,7 @@ const columnTranspilation_1 = require("./columnTranspilation");
|
|
|
10
10
|
const unshiftCustomFunctions_1 = require("./unshiftCustomFunctions");
|
|
11
11
|
const formulaErrorList_1 = require("./formulaErrorList");
|
|
12
12
|
const scripts_1 = require("../utils/elasticsearch/scripts");
|
|
13
|
+
const dictionary_1 = require("../errors/dictionary");
|
|
13
14
|
class Transpiler {
|
|
14
15
|
constructor(ast, engine, globalContext) {
|
|
15
16
|
this.ast = ast;
|
|
@@ -50,7 +51,12 @@ class Transpiler {
|
|
|
50
51
|
[constants_1.AST_TYPES.functionCall]: this.functionCall,
|
|
51
52
|
};
|
|
52
53
|
if (!nodes[type])
|
|
53
|
-
return {
|
|
54
|
+
return {
|
|
55
|
+
value: null,
|
|
56
|
+
type,
|
|
57
|
+
dataType: constants_1.AST_PRIMITIVES.UNKNOWN,
|
|
58
|
+
node: expression,
|
|
59
|
+
};
|
|
54
60
|
return nodes[type].call(this, expression);
|
|
55
61
|
}
|
|
56
62
|
catch (error) {
|
|
@@ -59,6 +65,7 @@ class Transpiler {
|
|
|
59
65
|
value: '',
|
|
60
66
|
type: constants_1.AST_TYPES.unknown,
|
|
61
67
|
dataType: constants_1.AST_PRIMITIVES.UNKNOWN,
|
|
68
|
+
node: expression,
|
|
62
69
|
};
|
|
63
70
|
}
|
|
64
71
|
}
|
|
@@ -79,9 +86,11 @@ class Transpiler {
|
|
|
79
86
|
}
|
|
80
87
|
return (0, columnTranspilation_1.columnTranspilation)(this.engine, data, this.globalContext);
|
|
81
88
|
}
|
|
82
|
-
literal(
|
|
89
|
+
literal(expression) {
|
|
90
|
+
const { dataType, type } = expression;
|
|
91
|
+
let { value } = expression;
|
|
83
92
|
if (value === 'null')
|
|
84
|
-
return { value, dataType, type };
|
|
93
|
+
return { value, dataType, type, node: expression };
|
|
85
94
|
if (dataType === constants_1.AST_PRIMITIVES.DATE)
|
|
86
95
|
value = (0, utils_1.customDateCast)(this.engine)(value);
|
|
87
96
|
if (dataType === constants_1.AST_PRIMITIVES.STRING)
|
|
@@ -90,24 +99,44 @@ class Transpiler {
|
|
|
90
99
|
dataType === constants_1.AST_PRIMITIVES.NUMBER;
|
|
91
100
|
if (isElasticsearchNumber && (0, utils_1.isLongNumber)(value))
|
|
92
101
|
value = `${value}L`;
|
|
93
|
-
return { value, dataType, type };
|
|
102
|
+
return { value, dataType, type, node: expression };
|
|
94
103
|
}
|
|
95
104
|
unaryExpression(expression) {
|
|
96
105
|
if (!expression.right)
|
|
97
|
-
return {
|
|
106
|
+
return {
|
|
107
|
+
value: '',
|
|
108
|
+
type: expression.type,
|
|
109
|
+
dataType: constants_1.AST_PRIMITIVES.STRING,
|
|
110
|
+
node: expression,
|
|
111
|
+
};
|
|
98
112
|
const { value: rightResult } = this.processNode(expression.right);
|
|
99
113
|
const value = `(${expression.operator} ${rightResult})`;
|
|
100
|
-
return {
|
|
114
|
+
return {
|
|
115
|
+
value,
|
|
116
|
+
dataType: expression.primitive,
|
|
117
|
+
type: expression.type,
|
|
118
|
+
node: expression,
|
|
119
|
+
};
|
|
101
120
|
}
|
|
102
121
|
binaryExpression(expression) {
|
|
103
122
|
var _a, _b;
|
|
104
123
|
const { left, operator, right, type } = expression;
|
|
105
124
|
if (!left || !right)
|
|
106
|
-
return {
|
|
125
|
+
return {
|
|
126
|
+
value: '',
|
|
127
|
+
type,
|
|
128
|
+
dataType: constants_1.AST_PRIMITIVES.STRING,
|
|
129
|
+
node: expression,
|
|
130
|
+
};
|
|
107
131
|
const { value: leftResult } = this.processNode(left);
|
|
108
132
|
const { value: rightResult } = this.processNode(right);
|
|
109
133
|
const value = `(${leftResult} ${(_b = (_a = constants_1.CustomOperators[this.engine]) === null || _a === void 0 ? void 0 : _a[operator]) !== null && _b !== void 0 ? _b : operator} ${rightResult})`;
|
|
110
|
-
return {
|
|
134
|
+
return {
|
|
135
|
+
value,
|
|
136
|
+
dataType: expression.primitive,
|
|
137
|
+
type,
|
|
138
|
+
node: expression,
|
|
139
|
+
};
|
|
111
140
|
}
|
|
112
141
|
functionCall(node) {
|
|
113
142
|
const { name, arguments: args } = node;
|
|
@@ -119,23 +148,73 @@ class Transpiler {
|
|
|
119
148
|
this.customFunctionList.add(customFunction);
|
|
120
149
|
const parameters = args.map((param) => this.processNode(param));
|
|
121
150
|
const value = this.executer(func, parameters, node);
|
|
122
|
-
return { value, dataType: node.primitive, type: node.type };
|
|
151
|
+
return { value, dataType: node.primitive, type: node.type, node };
|
|
123
152
|
}
|
|
124
153
|
executer(func, args, node) {
|
|
125
|
-
(0, validateFuncStructure_1.validateFuncStructure)(
|
|
154
|
+
(0, validateFuncStructure_1.validateFuncStructure)(func, args, node);
|
|
126
155
|
args = args.map((item) => item.value);
|
|
127
156
|
return func.transpiler[this.engine](...args);
|
|
128
157
|
}
|
|
129
158
|
}
|
|
130
159
|
exports.Transpiler = Transpiler;
|
|
131
160
|
function TranspileAST(ast, engine, context) {
|
|
132
|
-
var _a, _b
|
|
161
|
+
var _a, _b;
|
|
133
162
|
const hasSyntaxErrors = ((_b = (_a = ast.errors) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
|
|
134
163
|
const transpiler = new Transpiler(ast, engine, context);
|
|
135
164
|
const transpileResult = transpiler.get();
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
: undefined });
|
|
165
|
+
const errors = postTranspileErrors(transpileResult.errors, ast.errors);
|
|
166
|
+
return Object.assign(Object.assign({}, transpileResult), { valid: transpileResult.valid && !hasSyntaxErrors, errors });
|
|
139
167
|
}
|
|
140
168
|
exports.TranspileAST = TranspileAST;
|
|
169
|
+
function postTranspileErrors(transpiledErrors, astErrors) {
|
|
170
|
+
const baseErrors = joinErrors(transpiledErrors, astErrors);
|
|
171
|
+
if (!baseErrors)
|
|
172
|
+
return undefined;
|
|
173
|
+
const postProcessedErrors = postProcessErrors(baseErrors);
|
|
174
|
+
const errors = removeOverlappingErrors(postProcessedErrors);
|
|
175
|
+
return errors;
|
|
176
|
+
}
|
|
177
|
+
function joinErrors(transpiledErrors, astErrors) {
|
|
178
|
+
return transpiledErrors || (astErrors && (astErrors === null || astErrors === void 0 ? void 0 : astErrors.length) > 0)
|
|
179
|
+
? [...(transpiledErrors !== null && transpiledErrors !== void 0 ? transpiledErrors : []), ...(astErrors !== null && astErrors !== void 0 ? astErrors : [])]
|
|
180
|
+
: undefined;
|
|
181
|
+
}
|
|
182
|
+
function postProcessErrors(errors) {
|
|
183
|
+
const resultErrors = [];
|
|
184
|
+
errors.forEach((error) => {
|
|
185
|
+
var _a;
|
|
186
|
+
if (!error.node)
|
|
187
|
+
return; // clean those errors without node
|
|
188
|
+
if (((_a = error.node) === null || _a === void 0 ? void 0 : _a.type) === constants_1.AST_TYPES.functionCall &&
|
|
189
|
+
error.node.functionIdentifier) {
|
|
190
|
+
const functionIdentifier = error.node
|
|
191
|
+
.functionIdentifier;
|
|
192
|
+
error.node.from = functionIdentifier.from;
|
|
193
|
+
error.node.to = functionIdentifier.to;
|
|
194
|
+
}
|
|
195
|
+
else if (error.code === dictionary_1.ERROR_DICTIONARY.notAllowedOperation.code) {
|
|
196
|
+
const nodePosition = error.node
|
|
197
|
+
.operatorNode;
|
|
198
|
+
if (nodePosition) {
|
|
199
|
+
error.node.from = nodePosition.from;
|
|
200
|
+
error.node.to = nodePosition.to;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
resultErrors.push(error);
|
|
204
|
+
});
|
|
205
|
+
return resultErrors;
|
|
206
|
+
}
|
|
207
|
+
function removeOverlappingErrors(baseErrors) {
|
|
208
|
+
const errors = [];
|
|
209
|
+
for (const baseError of baseErrors) {
|
|
210
|
+
const existError = errors.some((error) => error.node &&
|
|
211
|
+
baseError.node &&
|
|
212
|
+
error.node.from >= baseError.node.from &&
|
|
213
|
+
error.node.to <= baseError.node.to);
|
|
214
|
+
if (!existError) {
|
|
215
|
+
errors.push(baseError);
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
return errors;
|
|
219
|
+
}
|
|
141
220
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AActB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { FunctionCallAST, FunctionDefinition, ProcessNodeResult } from '../constants/interfaces';
|
|
2
|
-
export declare function validateFuncStructure(
|
|
2
|
+
export declare function validateFuncStructure(definition: FunctionDefinition, args: Array<ProcessNodeResult>, node: FunctionCallAST): boolean;
|
|
@@ -1,10 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateFuncStructure = void 0;
|
|
4
|
-
const errors_1 = require("../errors");
|
|
5
4
|
const isNull_1 = require("../utils/isNull");
|
|
6
|
-
|
|
5
|
+
const errors_1 = require("../errors");
|
|
6
|
+
const dictionary_1 = require("../errors/dictionary");
|
|
7
|
+
const constants_1 = require("../constants");
|
|
8
|
+
const primitiveFunctions_1 = require("../utils/primitiveFunctions");
|
|
9
|
+
function validateFuncStructure(definition, args, node) {
|
|
7
10
|
var _a;
|
|
11
|
+
const commonArgs = args.map((arg) => arg.node);
|
|
12
|
+
const primitive = (0, primitiveFunctions_1.getFunctionPrimitive)(definition, commonArgs);
|
|
13
|
+
const singlePrimitive = Array.isArray(primitive) ? undefined : primitive;
|
|
14
|
+
if (!(0, isNull_1.isNull)(definition.maxPrimitiveValues)) {
|
|
15
|
+
const isPrimitiveAllowed = typeof primitive === 'string' ||
|
|
16
|
+
(Array.isArray(primitive) &&
|
|
17
|
+
primitive.length === definition.maxPrimitiveValues);
|
|
18
|
+
if (!isPrimitiveAllowed) {
|
|
19
|
+
const validator = Object.assign({ valid: false, source: constants_1.RESPONSE_LEVEL.function }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.inferredPrimitive]);
|
|
20
|
+
const { expected, received } = (0, errors_1.validateParameters)(definition, args, singlePrimitive);
|
|
21
|
+
throw new errors_1.FunctionArgumentsMismatch({
|
|
22
|
+
node,
|
|
23
|
+
validator,
|
|
24
|
+
expected,
|
|
25
|
+
received,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
}
|
|
8
29
|
let parameterIndex = 0;
|
|
9
30
|
let argumentIndex = 0;
|
|
10
31
|
const parameters = definition.parameters || [];
|
|
@@ -19,13 +40,36 @@ function validateFuncStructure(node, definition, args) {
|
|
|
19
40
|
incrementCounter();
|
|
20
41
|
continue;
|
|
21
42
|
}
|
|
22
|
-
if ((0, isNull_1.isNull)(value) && !parameter.optional)
|
|
23
|
-
|
|
43
|
+
if ((0, isNull_1.isNull)(value) && !parameter.optional) {
|
|
44
|
+
const validator = Object.assign({ valid: false, source: constants_1.RESPONSE_LEVEL.function }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingArg]);
|
|
45
|
+
const { expected, received } = (0, errors_1.validateParameters)(definition, args, singlePrimitive);
|
|
46
|
+
throw new errors_1.FunctionArgumentsMismatch({
|
|
47
|
+
node,
|
|
48
|
+
parameter,
|
|
49
|
+
validator,
|
|
50
|
+
expected,
|
|
51
|
+
received,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
24
54
|
parameter.validator.forEach((validatorFunction) => {
|
|
25
55
|
var _a;
|
|
26
56
|
const validator = validatorFunction(value, dataType, (_a = args[argumentIndex]) !== null && _a !== void 0 ? _a : {});
|
|
27
|
-
if (!validator.valid)
|
|
28
|
-
|
|
57
|
+
if (!validator.valid) {
|
|
58
|
+
const { expected, received } = (0, errors_1.validateParameters)(definition, args, singlePrimitive);
|
|
59
|
+
const customExpectedType = validator.customExpectedType;
|
|
60
|
+
if (customExpectedType && expected[parameterIndex]) {
|
|
61
|
+
expected[parameterIndex].custom = true;
|
|
62
|
+
expected[parameterIndex].primitive = customExpectedType;
|
|
63
|
+
}
|
|
64
|
+
validator.source = constants_1.RESPONSE_LEVEL.function;
|
|
65
|
+
throw new errors_1.FunctionArgumentsMismatch({
|
|
66
|
+
node,
|
|
67
|
+
parameter,
|
|
68
|
+
validator,
|
|
69
|
+
expected,
|
|
70
|
+
received,
|
|
71
|
+
});
|
|
72
|
+
}
|
|
29
73
|
});
|
|
30
74
|
incrementCounter();
|
|
31
75
|
const hasMoreArguments = parameterIndex === parameters.length &&
|
|
@@ -35,8 +79,16 @@ function validateFuncStructure(node, definition, args) {
|
|
|
35
79
|
parameterIndex = definition.recursiveStartIn;
|
|
36
80
|
}
|
|
37
81
|
}
|
|
38
|
-
if (argumentIndex < args.length)
|
|
39
|
-
|
|
82
|
+
if (argumentIndex < args.length) {
|
|
83
|
+
const validator = Object.assign({ valid: false, source: constants_1.RESPONSE_LEVEL.function }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.tooManyArguments]);
|
|
84
|
+
const { expected, received } = (0, errors_1.validateParameters)(definition, args, singlePrimitive);
|
|
85
|
+
throw new errors_1.FunctionArgumentsMismatch({
|
|
86
|
+
node,
|
|
87
|
+
validator,
|
|
88
|
+
expected,
|
|
89
|
+
received,
|
|
90
|
+
});
|
|
91
|
+
}
|
|
40
92
|
return true;
|
|
41
93
|
}
|
|
42
94
|
exports.validateFuncStructure = validateFuncStructure;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/constants/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,OAKX;AALD,WAAY,OAAO;IACf,0CAA+B,CAAA;IAC/B,kCAAuB,CAAA;IACvB,gCAAqB,CAAA;IACrB,oCAAyB,CAAA;AAC7B,CAAC,EALW,OAAO,KAAP,OAAO,QAKlB;AAED,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/constants/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,OAKX;AALD,WAAY,OAAO;IACf,0CAA+B,CAAA;IAC/B,kCAAuB,CAAA;IACvB,gCAAqB,CAAA;IACrB,oCAAyB,CAAA;AAC7B,CAAC,EALW,OAAO,KAAP,OAAO,QAKlB;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,qCAAmB,CAAA;IACnB,uCAAqB,CAAA;AACzB,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,SAWX;AAXD,WAAY,SAAS;IACjB,gCAAmB,CAAA;IACnB,4DAA+C,CAAA;IAC/C,kDAAqC,CAAA;IACrC,gDAAmC,CAAA;IACnC,0CAA6B,CAAA;IAC7B,kCAAqB,CAAA;IACrB,8BAAiB,CAAA;IACjB,4BAAe,CAAA;IACf,gCAAmB,CAAA;IACnB,gCAAmB,CAAA;AACvB,CAAC,EAXW,SAAS,KAAT,SAAS,QAWpB;AAED,MAAM,CAAN,IAAY,cAMX;AAND,WAAY,cAAc;IACtB,mCAAiB,CAAA;IACjB,+BAAa,CAAA;IACb,mCAAiB,CAAA;IACjB,qCAAmB,CAAA;IACnB,qCAAmB,CAAA;AACvB,CAAC,EANW,cAAc,KAAd,cAAc,QAMzB;AAQD,MAAM,CAAC,MAAM,eAAe,GAA0B;IAClD,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACrB,GAAG,EAAE,IAAI;QACT,IAAI,EAAE,IAAI;KACb;CACJ,CAAC;AAEF,MAAM,CAAN,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IAClC,+DAAiC,CAAA;IACjC,iEAAmC,CAAA;IACnC,4DAA8B,CAAA;AAClC,CAAC,EAJW,0BAA0B,KAA1B,0BAA0B,QAIrC"}
|