@qrvey/formula-lang 0.9.4-001-internal → 0.10.0
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 +11 -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 +3 -8
- package/dist/cjs/errors/analyzer/index.js +2 -0
- package/dist/cjs/errors/analyzer/index.js.map +1 -1
- package/dist/cjs/errors/analyzer/postgresql.d.ts +8 -0
- package/dist/cjs/errors/analyzer/postgresql.js +26 -0
- package/dist/cjs/errors/analyzer/postgresql.js.map +1 -0
- package/dist/cjs/errors/definitions.d.ts +1 -8
- package/dist/cjs/errors/definitions.js +1 -16
- package/dist/cjs/errors/definitions.js.map +1 -1
- package/dist/cjs/errors/dictionary.d.ts +0 -1
- package/dist/cjs/errors/dictionary.js +0 -5
- package/dist/cjs/errors/dictionary.js.map +1 -1
- package/dist/cjs/functions/abs.js +4 -0
- package/dist/cjs/functions/abs.js.map +1 -1
- package/dist/cjs/functions/datedif.js +5 -0
- package/dist/cjs/functions/datedif.js.map +1 -1
- package/dist/cjs/functions/day.js +4 -0
- package/dist/cjs/functions/day.js.map +1 -1
- package/dist/cjs/functions/hour.js +4 -0
- package/dist/cjs/functions/hour.js.map +1 -1
- package/dist/cjs/functions/if.js +8 -1
- package/dist/cjs/functions/if.js.map +1 -1
- package/dist/cjs/functions/ifs.js +9 -2
- package/dist/cjs/functions/ifs.js.map +1 -1
- package/dist/cjs/functions/isNull.js +4 -0
- package/dist/cjs/functions/isNull.js.map +1 -1
- package/dist/cjs/functions/mid.js +4 -0
- package/dist/cjs/functions/mid.js.map +1 -1
- package/dist/cjs/functions/minute.js +4 -0
- package/dist/cjs/functions/minute.js.map +1 -1
- package/dist/cjs/functions/month.js +4 -0
- package/dist/cjs/functions/month.js.map +1 -1
- package/dist/cjs/functions/second.js +4 -0
- package/dist/cjs/functions/second.js.map +1 -1
- package/dist/cjs/functions/year.js +4 -0
- package/dist/cjs/functions/year.js.map +1 -1
- package/dist/cjs/main.js +6 -9
- package/dist/cjs/main.js.map +1 -1
- package/dist/cjs/parser/formula-parser.d.ts +1 -2
- package/dist/cjs/parser/formula-parser.js +2 -8
- package/dist/cjs/parser/formula-parser.js.map +1 -1
- package/dist/cjs/parser/json-parser.js +17 -40
- package/dist/cjs/parser/json-parser.js.map +1 -1
- package/dist/cjs/transpiler/columnTranspilation.js +1 -0
- package/dist/cjs/transpiler/columnTranspilation.js.map +1 -1
- package/dist/cjs/transpiler/index.js +4 -39
- package/dist/cjs/transpiler/index.js.map +1 -1
- package/dist/cjs/utils/customFunctions.js +1 -0
- package/dist/cjs/utils/customFunctions.js.map +1 -1
- package/dist/cjs/utils/sql/scripts.d.ts +1 -0
- package/dist/cjs/utils/sql/scripts.js +18 -6
- package/dist/cjs/utils/sql/scripts.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 +3 -8
- package/dist/module/errors/analyzer/index.js +2 -0
- package/dist/module/errors/analyzer/index.js.map +1 -1
- package/dist/module/errors/analyzer/postgresql.d.ts +8 -0
- package/dist/module/errors/analyzer/postgresql.js +22 -0
- package/dist/module/errors/analyzer/postgresql.js.map +1 -0
- package/dist/module/errors/definitions.d.ts +1 -8
- package/dist/module/errors/definitions.js +0 -14
- package/dist/module/errors/definitions.js.map +1 -1
- package/dist/module/errors/dictionary.d.ts +0 -1
- package/dist/module/errors/dictionary.js +0 -5
- package/dist/module/errors/dictionary.js.map +1 -1
- package/dist/module/functions/abs.js +4 -0
- package/dist/module/functions/abs.js.map +1 -1
- package/dist/module/functions/datedif.js +6 -1
- package/dist/module/functions/datedif.js.map +1 -1
- package/dist/module/functions/day.js +4 -0
- package/dist/module/functions/day.js.map +1 -1
- package/dist/module/functions/hour.js +4 -0
- package/dist/module/functions/hour.js.map +1 -1
- package/dist/module/functions/if.js +8 -1
- package/dist/module/functions/if.js.map +1 -1
- package/dist/module/functions/ifs.js +9 -2
- package/dist/module/functions/ifs.js.map +1 -1
- package/dist/module/functions/isNull.js +4 -0
- package/dist/module/functions/isNull.js.map +1 -1
- package/dist/module/functions/mid.js +4 -0
- package/dist/module/functions/mid.js.map +1 -1
- package/dist/module/functions/minute.js +4 -0
- package/dist/module/functions/minute.js.map +1 -1
- package/dist/module/functions/month.js +4 -0
- package/dist/module/functions/month.js.map +1 -1
- package/dist/module/functions/second.js +4 -0
- package/dist/module/functions/second.js.map +1 -1
- package/dist/module/functions/year.js +4 -0
- package/dist/module/functions/year.js.map +1 -1
- package/dist/module/main.js +6 -9
- package/dist/module/main.js.map +1 -1
- package/dist/module/parser/formula-parser.d.ts +1 -2
- package/dist/module/parser/formula-parser.js +1 -6
- package/dist/module/parser/formula-parser.js.map +1 -1
- package/dist/module/parser/json-parser.js +19 -42
- package/dist/module/parser/json-parser.js.map +1 -1
- package/dist/module/transpiler/columnTranspilation.js +1 -0
- package/dist/module/transpiler/columnTranspilation.js.map +1 -1
- package/dist/module/transpiler/index.js +4 -39
- package/dist/module/transpiler/index.js.map +1 -1
- package/dist/module/utils/customFunctions.js +1 -0
- package/dist/module/utils/customFunctions.js.map +1 -1
- package/dist/module/utils/sql/scripts.d.ts +1 -0
- package/dist/module/utils/sql/scripts.js +16 -5
- package/dist/module/utils/sql/scripts.js.map +1 -1
- package/package.json +1 -1
package/dist/cjs/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;AAAA,wBAA+C;AAC/C,iEAA0D;AAE1D,cAAc,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1D,MAAc,CAAC,cAAc,GAAG;IAC7B,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;AAAA,wBAA+C;AAC/C,iEAA0D;AAE1D,cAAc,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1D,MAAc,CAAC,cAAc,GAAG;IAC7B,MAAM,EAAE,+BAA+B;IACvC,MAAM,EAAE,0CAA0C;IAClD,UAAU,EAAE,uBAAuB;IACnC,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,WAAW;CACrB,CAAC;AAEF,SAAS,IAAI;IACT,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAC3C,8BAA8B,CACjC,CAAC;IACF,IAAI,gBAAgB,EAAE;QACjB,gBAAwB,CAAC,KAAK,GAAG,OAAO,CAAC;QACzC,gBAAwB,CAAC,WAAW,GAAG;YACpC,kBAAkB,EAAE,eAAY;YAChC,kBAAkB,EAAE,eAAY;YAChC,cAAc,EAAE,+BAAY;SAC/B,CAAC;KACL;AACL,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { SyntaxNode } from '@lezer/common';
|
|
2
|
-
import { FormulaContext, FormulaInference, FunctionCallAST
|
|
2
|
+
import { FormulaContext, FormulaInference, FunctionCallAST } from '../constants/interfaces';
|
|
3
3
|
import { TransformNodeFNType } from './interfaces';
|
|
4
4
|
export declare function transformFunctionExpression(program: string, node: SyntaxNode, inference: FormulaInference, context: FormulaContext | undefined, transformNodeFunction: TransformNodeFNType): FunctionCallAST;
|
|
5
|
-
export declare function createPositionASTFromSyntaxNode({ from, to, }: SyntaxNode): ProgramPosition;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.transformFunctionExpression = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
const syntax_errors_1 = require("./syntax-errors");
|
|
6
6
|
const primitiveFunctions_1 = require("../utils/primitiveFunctions");
|
|
@@ -14,7 +14,6 @@ function transformFunctionExpression(program, node, inference, context, transfor
|
|
|
14
14
|
const parenthesisStart = node.getChild('ParenthesisStart');
|
|
15
15
|
const parenthesisEnd = node.getChild('ParenthesisEnd');
|
|
16
16
|
const args = getFunctionArguments(node, parenthesisStart, program, inference, context, transformNodeFunction);
|
|
17
|
-
const functionIdentifier = createPositionASTFromSyntaxNode(fnIdentifier);
|
|
18
17
|
const baseNode = {
|
|
19
18
|
type: constants_1.AST_TYPES.functionCall,
|
|
20
19
|
name: (0, utils_1.getNodeValue)(program, fnIdentifier),
|
|
@@ -23,8 +22,7 @@ function transformFunctionExpression(program, node, inference, context, transfor
|
|
|
23
22
|
to: node.to,
|
|
24
23
|
parenthesisStart: !!parenthesisStart,
|
|
25
24
|
parenthesisEnd: !!parenthesisEnd,
|
|
26
|
-
|
|
27
|
-
functionIdentifier,
|
|
25
|
+
formulaText: fnString,
|
|
28
26
|
};
|
|
29
27
|
const functionExists = functions_1.FUNCTION_LIST.includes(fnName);
|
|
30
28
|
const functionDetail = functionExists
|
|
@@ -95,8 +93,4 @@ function createCommonASTFromNode(program, node, inference, context, transformNod
|
|
|
95
93
|
}
|
|
96
94
|
return transformNodeFunction(program, node, inference, context);
|
|
97
95
|
}
|
|
98
|
-
function createPositionASTFromSyntaxNode({ from, to, }) {
|
|
99
|
-
return { from, to };
|
|
100
|
-
}
|
|
101
|
-
exports.createPositionASTFromSyntaxNode = createPositionASTFromSyntaxNode;
|
|
102
96
|
//# sourceMappingURL=formula-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formula-parser.js","sourceRoot":"","sources":["../../../src/parser/formula-parser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"formula-parser.js","sourceRoot":"","sources":["../../../src/parser/formula-parser.ts"],"names":[],"mappings":";;;AAOA,oCAAwC;AACxC,mDAAqD;AACrD,oEAAmE;AACnE,4CAAyD;AACzD,4CAAgE;AAChE,sCAAoD;AAGpD,SAAgB,2BAA2B,CACvC,OAAe,EACf,IAAgB,EAChB,SAA2B,EAC3B,OAAmC,EACnC,qBAA0C;IAE1C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAe,CAAC;IACvE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAEvD,MAAM,IAAI,GAAG,oBAAoB,CAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,EACP,SAAS,EACT,OAAO,EACP,qBAAqB,CACxB,CAAC;IACF,MAAM,QAAQ,GAAuC;QACjD,IAAI,EAAE,qBAAS,CAAC,YAAY;QAC5B,IAAI,EAAE,IAAA,oBAAY,EAAC,OAAO,EAAE,YAAY,CAAC;QACzC,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;QACpC,cAAc,EAAE,CAAC,CAAC,cAAc;QAChC,WAAW,EAAE,QAAQ;KACxB,CAAC;IACF,MAAM,cAAc,GAAG,yBAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,cAAc;QACjC,CAAC,CAAC,IAAA,6BAAiB,EAAC,MAAM,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,SAAS,CAAC;IACd,IAAI;QACA,SAAS,GAAG,cAAc;YACtB,CAAC,CAAC,IAAA,yCAAoB,EAAC,cAAc,EAAE,QAAQ,CAAC,SAAS,CAAC;YAC1D,CAAC,CAAC,0BAAc,CAAC,OAAO,CAAC;KAChC;IAAC,OAAO,KAAU,EAAE;QACjB,SAAS,GAAG,0BAAc,CAAC,OAAO,CAAC;QACnC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACnC;IAED,MAAM,UAAU,mCAAQ,QAAQ,KAAE,SAAS,GAAE,CAAC;IAC9C,IAAI,cAAc,IAAI,CAAC,CAAC,gBAAgB,IAAI,CAAC,cAAc,CAAC,EAAE;QAC1D,SAAS,CAAC,SAAS,CAAC,IAAI,CACpB,IAAI,gCAAuB,iCACpB,UAAU,KACb,IAAI,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,IAC3D,CACL,CAAC;KACL;IACD,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,UAAU,CAAC;AACtB,CAAC;AAzDD,kEAyDC;AAED,SAAS,oBAAoB,CACzB,MAAkB,EAClB,gBAAmC,EACnC,OAAe,EACf,SAA2B,EAC3B,OAAmC,EACnC,qBAA0C;IAE1C,MAAM,aAAa,GAAgB,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAElD,IAAI,gBAAgB,EAAE;QAClB,aAAa,CAAC,IAAI,CACd,GAAG,yBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAClE,CAAC;KACL;IACD,aAAa,CAAC,IAAI,CACd,GAAG,wBAAwB,CACvB,IAAI,EACJ,MAAM,EACN,OAAO,EACP,SAAS,EACT,OAAO,EACP,qBAAqB,CACxB,CACJ,CAAC;IAEF,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,SAAS,wBAAwB,CAC7B,IAAuB,EACvB,MAAkB,EAClB,OAAe,EACf,SAA2B,EAC3B,OAAmC,EACnC,qBAA0C;IAE1C,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAiB,EAAE,EAAE;QACxD,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACvD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE;gBAAE,OAAO,KAAK,CAAC;YAC7C,MAAM,OAAO,GAAG,uBAAuB,CACnC,OAAO,EACP,OAAO,EACP,SAAS,EACT,OAAO,EACP,qBAAqB,CACxB,CAAC;YACF,IAAI,OAAO;gBAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,KAAK,CAAC;SAChB;IACL,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,yBAAyB,CAC9B,MAAkB,EAClB,OAAe,EACf,gBAA4B;IAE5B,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAiB,EAAE,EAAE;QAC9D,IAAI,WAAW,CAAC,IAAI,KAAK,mBAAmB,EAAE;YAC1C,OAAO,KAAK,CAAC,CAAC,sCAAsC;SACvD;QACD,IACI,WAAW,CAAC,IAAI,CAAC,OAAO;YACxB,IAAA,oBAAY,EAAC,OAAO,EAAE,WAAW,CAAC,KAAK,GAAG;YAC1C,WAAW,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAC1C;YACE,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAC;YACjD,UAAU,CAAC,IAAI,CACX,IAAA,kCAAkB,EAAC;gBACf,IAAI,EAAE,cAAc;gBACpB,EAAE,EAAE,WAAW,CAAC,IAAI;aACvB,CAAC,CACL,CAAC;SACL;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,uBAAuB,CAC5B,OAAe,EACf,IAAgB,EAChB,SAA2B,EAC3B,OAAmC,EACnC,qBAA0C;IAE1C,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACnB,OAAO,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC;KACnC;IACD,OAAO,qBAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -80,33 +80,9 @@ function transformNode(program, node, inference, context) {
|
|
|
80
80
|
inference.flatBody.push(resultNode);
|
|
81
81
|
return resultNode;
|
|
82
82
|
}
|
|
83
|
-
const
|
|
84
|
-
|
|
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 [];
|
|
83
|
+
const VALID_STRING_DATE_BINARY_OPERATORS = ['=', '<>'];
|
|
84
|
+
function isValidStringDateBinaryOperation(logicOperator) {
|
|
85
|
+
return VALID_STRING_DATE_BINARY_OPERATORS.includes(logicOperator);
|
|
110
86
|
}
|
|
111
87
|
function calculateBinaryElements(program, node, left, right) {
|
|
112
88
|
const leftPrimitive = left === null || left === void 0 ? void 0 : left.primitive;
|
|
@@ -115,15 +91,23 @@ function calculateBinaryElements(program, node, left, right) {
|
|
|
115
91
|
const arithOperator = node.getChild('ArithOp');
|
|
116
92
|
const leftIsAValidNumber = leftPrimitive === constants_1.AST_PRIMITIVES.NUMBER;
|
|
117
93
|
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;
|
|
118
98
|
const operatorNode = (logicOperator !== null && logicOperator !== void 0 ? logicOperator : arithOperator);
|
|
119
99
|
const operator = (0, utils_1.getNodeValue)(program, operatorNode);
|
|
120
|
-
const operatorPosition = (0, formula_parser_1.createPositionASTFromSyntaxNode)(operatorNode);
|
|
121
|
-
const validOperators = calculateValidOperatorsByType(leftPrimitive, rightPrimitive);
|
|
122
100
|
// primitive is number if arithOperator is not null and both left and right are numbers
|
|
123
101
|
// primitive is boolean if logicOperator is not null and both left and right are booleans
|
|
124
102
|
let primitive = constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
125
103
|
if (logicOperator) {
|
|
126
|
-
if (
|
|
104
|
+
if ((leftPrimitive === rightPrimitive &&
|
|
105
|
+
!leftIsAValidString &&
|
|
106
|
+
!leftIsAValidDate) ||
|
|
107
|
+
(((leftIsAValidString && rightIsAValidString) ||
|
|
108
|
+
(leftIsAValidDate && rightIsAValidDate)) &&
|
|
109
|
+
// string and date operation only with allowed operators
|
|
110
|
+
isValidStringDateBinaryOperation(operator))) {
|
|
127
111
|
primitive = constants_1.AST_PRIMITIVES.BOOLEAN;
|
|
128
112
|
}
|
|
129
113
|
}
|
|
@@ -138,29 +122,25 @@ function calculateBinaryElements(program, node, left, right) {
|
|
|
138
122
|
return {
|
|
139
123
|
primitive,
|
|
140
124
|
operator,
|
|
141
|
-
operatorNode: operatorPosition,
|
|
142
125
|
hasInvalidError,
|
|
143
|
-
validOperators,
|
|
144
126
|
};
|
|
145
127
|
}
|
|
146
128
|
function transformBinaryExpression(program, node, inference, context) {
|
|
147
129
|
const [leftNode, rightNode] = node.getChildren('Expression');
|
|
148
130
|
const left = transformNode(program, leftNode, inference, context);
|
|
149
131
|
const right = transformNode(program, rightNode, inference, context);
|
|
150
|
-
const { primitive, operator,
|
|
132
|
+
const { primitive, operator, hasInvalidError } = calculateBinaryElements(program, node, left, right);
|
|
151
133
|
const binaryAST = {
|
|
152
134
|
operator,
|
|
153
|
-
operatorNode,
|
|
154
135
|
type: constants_1.AST_TYPES.binaryExpression,
|
|
155
136
|
left,
|
|
156
137
|
right,
|
|
157
138
|
from: node.from,
|
|
158
139
|
to: node.to,
|
|
159
140
|
primitive,
|
|
160
|
-
validOperators,
|
|
161
141
|
};
|
|
162
142
|
if (hasInvalidError) {
|
|
163
|
-
inference.errorList.push(new errors_1.
|
|
143
|
+
inference.errorList.push(new errors_1.NotAllowedExpressionError(binaryAST));
|
|
164
144
|
}
|
|
165
145
|
return binaryAST;
|
|
166
146
|
}
|
|
@@ -171,19 +151,16 @@ function transformUnaryExpression(program, node, inference, context) {
|
|
|
171
151
|
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)
|
|
172
152
|
? right.primitive
|
|
173
153
|
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
174
|
-
const validOperators = (right === null || right === void 0 ? void 0 : right.primitive) === constants_1.AST_PRIMITIVES.NUMBER ? ['+', '-'] : [];
|
|
175
154
|
const unaryAST = {
|
|
176
155
|
operator: (0, utils_1.getNodeValue)(program, operator),
|
|
177
|
-
operatorNode: (0, formula_parser_1.createPositionASTFromSyntaxNode)(operator),
|
|
178
156
|
type: constants_1.AST_TYPES.unaryExpression,
|
|
179
157
|
right,
|
|
180
158
|
from: node.from,
|
|
181
159
|
to: node.to,
|
|
182
160
|
primitive,
|
|
183
|
-
validOperators,
|
|
184
161
|
};
|
|
185
162
|
if (!rightNode) {
|
|
186
|
-
inference.errorList.push(new errors_1.
|
|
163
|
+
inference.errorList.push(new errors_1.NotAllowedExpressionError(unaryAST));
|
|
187
164
|
}
|
|
188
165
|
return unaryAST;
|
|
189
166
|
}
|
|
@@ -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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"}
|
|
@@ -9,6 +9,7 @@ function columnTranspilation(engine, { value, context }, globalContext) {
|
|
|
9
9
|
[constants_1.ENGINES.ELASTICSEARCH]: elasticsearch,
|
|
10
10
|
[constants_1.ENGINES.SNOWFLAKE]: sql,
|
|
11
11
|
[constants_1.ENGINES.REDSHIFT]: sql,
|
|
12
|
+
[constants_1.ENGINES.POSTGRESQL]: sql,
|
|
12
13
|
};
|
|
13
14
|
const result = columnForEngine[engine](context, globalContext);
|
|
14
15
|
return { value: result, dataType: context.type, type: constants_1.AST_TYPES.column };
|
|
@@ -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,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,CAAC;IAC7C,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;
|
|
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,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,CAAC;IAC7C,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,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,CAAC;AAC7E,CAAC;AAfD,kDAeC;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,7 +10,6 @@ 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");
|
|
14
13
|
class Transpiler {
|
|
15
14
|
constructor(ast, engine, globalContext) {
|
|
16
15
|
this.ast = ast;
|
|
@@ -130,47 +129,13 @@ class Transpiler {
|
|
|
130
129
|
}
|
|
131
130
|
exports.Transpiler = Transpiler;
|
|
132
131
|
function TranspileAST(ast, engine, context) {
|
|
133
|
-
var _a, _b;
|
|
132
|
+
var _a, _b, _c, _d, _e;
|
|
134
133
|
const hasSyntaxErrors = ((_b = (_a = ast.errors) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
|
|
135
134
|
const transpiler = new Transpiler(ast, engine, context);
|
|
136
135
|
const transpileResult = transpiler.get();
|
|
137
|
-
|
|
138
|
-
|
|
136
|
+
return Object.assign(Object.assign({}, transpileResult), { valid: transpileResult.valid && !hasSyntaxErrors, errors: transpileResult.errors || (ast.errors && ((_c = ast.errors) === null || _c === void 0 ? void 0 : _c.length) > 0)
|
|
137
|
+
? [...((_d = transpileResult.errors) !== null && _d !== void 0 ? _d : []), ...((_e = ast.errors) !== null && _e !== void 0 ? _e : [])]
|
|
138
|
+
: undefined });
|
|
139
139
|
}
|
|
140
140
|
exports.TranspileAST = TranspileAST;
|
|
141
|
-
function postTranspileErrors(transpiledErrors, astErrors) {
|
|
142
|
-
const baseErrors = joinErrors(transpiledErrors, astErrors);
|
|
143
|
-
if (!baseErrors)
|
|
144
|
-
return undefined;
|
|
145
|
-
const postProcessedErrors = postProcessErrors(baseErrors);
|
|
146
|
-
return postProcessedErrors;
|
|
147
|
-
}
|
|
148
|
-
function joinErrors(transpiledErrors, astErrors) {
|
|
149
|
-
return transpiledErrors || (astErrors && (astErrors === null || astErrors === void 0 ? void 0 : astErrors.length) > 0)
|
|
150
|
-
? [...(transpiledErrors !== null && transpiledErrors !== void 0 ? transpiledErrors : []), ...(astErrors !== null && astErrors !== void 0 ? astErrors : [])]
|
|
151
|
-
: undefined;
|
|
152
|
-
}
|
|
153
|
-
function postProcessErrors(errors) {
|
|
154
|
-
const resultErrors = [];
|
|
155
|
-
errors.forEach((error) => {
|
|
156
|
-
var _a;
|
|
157
|
-
if (!error.node)
|
|
158
|
-
return; // clean those errors without node
|
|
159
|
-
if (((_a = error.node) === null || _a === void 0 ? void 0 : _a.type) === constants_1.AST_TYPES.functionCall &&
|
|
160
|
-
error.node.functionIdentifier) {
|
|
161
|
-
const functionIdentifier = error.node
|
|
162
|
-
.functionIdentifier;
|
|
163
|
-
error.node.from = functionIdentifier.from;
|
|
164
|
-
error.node.to = functionIdentifier.to;
|
|
165
|
-
}
|
|
166
|
-
else if (error.code === dictionary_1.ERROR_DICTIONARY.notAllowedOperation.code) {
|
|
167
|
-
const nodePosition = error.node
|
|
168
|
-
.operatorNode;
|
|
169
|
-
error.node.from = nodePosition.from;
|
|
170
|
-
error.node.to = nodePosition.to;
|
|
171
|
-
}
|
|
172
|
-
resultErrors.push(error);
|
|
173
|
-
});
|
|
174
|
-
return resultErrors;
|
|
175
|
-
}
|
|
176
141
|
//# 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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customFunctions.js","sourceRoot":"","sources":["../../../src/utils/customFunctions.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AACvC,mDAIyB;AACzB,+BAA4C;AAE5C,SAAgB,cAAc,CAAC,MAAe,EAAE,IAAY;IACxD,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,IAAA,mCAAiB,EAAC,IAAI,CAAC,CAAC;QACnC;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAPD,wCAOC;AAED,SAAgB,cAAc,CAAC,MAAe;IAC1C,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,sBAAQ,CAAC;QACpB,KAAK,mBAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,mBAAO,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"customFunctions.js","sourceRoot":"","sources":["../../../src/utils/customFunctions.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AACvC,mDAIyB;AACzB,+BAA4C;AAE5C,SAAgB,cAAc,CAAC,MAAe,EAAE,IAAY;IACxD,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,IAAA,mCAAiB,EAAC,IAAI,CAAC,CAAC;QACnC;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAPD,wCAOC;AAED,SAAgB,cAAc,CAAC,MAAe;IAC1C,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,sBAAQ,CAAC;QACpB,KAAK,mBAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,mBAAO,CAAC,SAAS,CAAC;QACvB,KAAK,mBAAO,CAAC,UAAU;YACnB,OAAO,YAAS,CAAC;KACxB;AACL,CAAC;AATD,wCASC;AAED,SAAgB,cAAc,CAAC,MAAe;IAC1C,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,uCAAU,CAAC;QACtB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAPD,wCAOC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { DateDifUnitParam } from '../../constants/interfaces';
|
|
2
2
|
export declare function toDate(value: string): string;
|
|
3
3
|
export declare function dateDif(start: string, end: string, unit: DateDifUnitParam): string;
|
|
4
|
+
export declare function dateDifPostgres(start: string, end: string, unit: DateDifUnitParam): string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.dateDif = exports.toDate = void 0;
|
|
3
|
+
exports.dateDifPostgres = exports.dateDif = exports.toDate = void 0;
|
|
4
4
|
function toDate(value) {
|
|
5
5
|
return `CAST('${value}' AS TIMESTAMP)`;
|
|
6
6
|
}
|
|
@@ -14,27 +14,39 @@ function generalDateDif(start, end, unit) {
|
|
|
14
14
|
const currentUnit = units[unit];
|
|
15
15
|
return `DATEDIFF('${currentUnit}', ${start}, ${end})`;
|
|
16
16
|
}
|
|
17
|
-
function customDateDifYear(start, end) {
|
|
17
|
+
function customDateDifYear({ start, end, yearDif }) {
|
|
18
18
|
const customFun = (date) => {
|
|
19
19
|
return `EXTRACT(MONTH FROM ${date}) * 100 + EXTRACT(DAY FROM ${date})`;
|
|
20
20
|
};
|
|
21
21
|
const startComparison = customFun(start);
|
|
22
22
|
const endComparison = customFun(end);
|
|
23
|
-
const dateDifYear = generalDateDif(start, end, 'Y');
|
|
24
23
|
const result = `CASE
|
|
25
24
|
WHEN ${startComparison} <= ${endComparison}
|
|
26
|
-
THEN ${
|
|
27
|
-
ELSE ${
|
|
25
|
+
THEN ${yearDif}
|
|
26
|
+
ELSE ${yearDif} - 1
|
|
28
27
|
END`;
|
|
29
28
|
return result;
|
|
30
29
|
}
|
|
30
|
+
function commonSQLDifYear(start, end) {
|
|
31
|
+
const yearDif = generalDateDif(start, end, 'Y');
|
|
32
|
+
return customDateDifYear({ start, end, yearDif });
|
|
33
|
+
}
|
|
31
34
|
function dateDif(start, end, unit) {
|
|
32
35
|
const units = {
|
|
33
|
-
Y:
|
|
36
|
+
Y: commonSQLDifYear,
|
|
34
37
|
M: generalDateDif,
|
|
35
38
|
D: generalDateDif,
|
|
36
39
|
};
|
|
37
40
|
return units[unit](start, end, unit);
|
|
38
41
|
}
|
|
39
42
|
exports.dateDif = dateDif;
|
|
43
|
+
function dateDifPostgres(start, end, unit) {
|
|
44
|
+
if (unit === 'D')
|
|
45
|
+
return `DATE_PART('day', ${end} - ${start})`;
|
|
46
|
+
const yearDif = `DATE_PART('year', ${end}) - DATE_PART('year', ${start})`;
|
|
47
|
+
if (unit === 'M')
|
|
48
|
+
return `(${yearDif}) * 12 + (DATE_PART('month', ${end}) - DATE_PART('month', ${start}))`;
|
|
49
|
+
return customDateDifYear({ start, end, yearDif });
|
|
50
|
+
}
|
|
51
|
+
exports.dateDifPostgres = dateDifPostgres;
|
|
40
52
|
//# sourceMappingURL=scripts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":";;;AAEA,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAFD,wBAEC;AAED,SAAS,cAAc,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;KACX,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,aAAa,WAAW,MAAM,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAED,SAAS,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":";;;AAEA,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAFD,wBAEC;AAED,SAAS,cAAc,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;KACX,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,aAAa,WAAW,MAAM,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAED,SAAS,iBAAiB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAA0B;IACtE,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE;QAC/B,OAAO,sBAAsB,IAAI,8BAA8B,IAAI,GAAG,CAAC;IAC3E,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG;eACJ,eAAe,OAAO,aAAa;mBAC/B,OAAO;eACX,OAAO;QACd,CAAC;IACL,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa,EAAE,GAAW;IAChD,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,OAAO,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,gBAAgB;QACnB,CAAC,EAAE,cAAc;QACjB,CAAC,EAAE,cAAc;KACpB,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAPD,0BAOC;AAED,SAAgB,eAAe,CAC3B,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,oBAAoB,GAAG,MAAM,KAAK,GAAG,CAAC;IAC/D,MAAM,OAAO,GAAG,qBAAqB,GAAG,yBAAyB,KAAK,GAAG,CAAC;IAC1E,IAAI,IAAI,KAAK,GAAG;QACZ,OAAO,IAAI,OAAO,gCAAgC,GAAG,0BAA0B,KAAK,IAAI,CAAC;IAC7F,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AACtD,CAAC;AAVD,0CAUC"}
|
|
@@ -3,6 +3,7 @@ export var ENGINES;
|
|
|
3
3
|
ENGINES["ELASTICSEARCH"] = "elasticsearch";
|
|
4
4
|
ENGINES["SNOWFLAKE"] = "snowflake";
|
|
5
5
|
ENGINES["REDSHIFT"] = "redshift";
|
|
6
|
+
ENGINES["POSTGRESQL"] = "postgresql";
|
|
6
7
|
})(ENGINES || (ENGINES = {}));
|
|
7
8
|
export var RESPONSE_LEVEL;
|
|
8
9
|
(function (RESPONSE_LEVEL) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/constants/index.ts"],"names":[],"mappings":"AAAA,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,cAEX;AAFD,WAAY,cAAc;IACtB,qCAAmB,CAAA;AACvB,CAAC,EAFW,cAAc,KAAd,cAAc,QAEzB;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"}
|
|
@@ -45,12 +45,10 @@ interface TranspilationDetails {
|
|
|
45
45
|
export interface FunctionList {
|
|
46
46
|
[identifier: string]: FunctionDefinition;
|
|
47
47
|
}
|
|
48
|
-
export interface
|
|
48
|
+
export interface CommonAST {
|
|
49
|
+
type: AST_TYPES;
|
|
49
50
|
from: number;
|
|
50
51
|
to: number;
|
|
51
|
-
}
|
|
52
|
-
export interface CommonAST extends ProgramPosition {
|
|
53
|
-
type: AST_TYPES;
|
|
54
52
|
primitive: Primitive;
|
|
55
53
|
}
|
|
56
54
|
export interface ProgramAST extends CommonAST {
|
|
@@ -65,8 +63,6 @@ export interface ProgramAST extends CommonAST {
|
|
|
65
63
|
}
|
|
66
64
|
export interface UnaryExpressionAST extends CommonAST {
|
|
67
65
|
operator: string;
|
|
68
|
-
operatorNode: ProgramPosition;
|
|
69
|
-
validOperators: string[];
|
|
70
66
|
right: CommonAST;
|
|
71
67
|
}
|
|
72
68
|
export interface BinaryExpressionAST extends UnaryExpressionAST {
|
|
@@ -77,8 +73,7 @@ export interface FunctionCallAST extends CommonAST {
|
|
|
77
73
|
arguments: Array<CommonAST>;
|
|
78
74
|
parenthesisStart: boolean;
|
|
79
75
|
parenthesisEnd: boolean;
|
|
80
|
-
|
|
81
|
-
functionIdentifier: ProgramPosition;
|
|
76
|
+
formulaText: string;
|
|
82
77
|
}
|
|
83
78
|
export type ValueASTType = string | boolean | number | CommonAST[] | null | Date;
|
|
84
79
|
export interface CommonValueAST extends CommonAST {
|
|
@@ -3,11 +3,13 @@ import { ERROR_DICTIONARY } from '../dictionary';
|
|
|
3
3
|
import { getInfo as snowflake } from './snowflake';
|
|
4
4
|
import { getInfo as elasticsearch } from './elasticsearch';
|
|
5
5
|
import { getInfo as redshift } from './redshift';
|
|
6
|
+
import { getInfo as postgresql } from './postgresql';
|
|
6
7
|
export function errorAnalyzer(engine, errorObj) {
|
|
7
8
|
const info = {
|
|
8
9
|
[ENGINES.ELASTICSEARCH]: elasticsearch,
|
|
9
10
|
[ENGINES.SNOWFLAKE]: snowflake,
|
|
10
11
|
[ENGINES.REDSHIFT]: redshift,
|
|
12
|
+
[ENGINES.POSTGRESQL]: postgresql,
|
|
11
13
|
};
|
|
12
14
|
const { errorList, messageList } = info[engine](errorObj);
|
|
13
15
|
const currentError = analyzer(messageList, errorList);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/errors/analyzer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAmB,gBAAgB,EAAc,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/errors/analyzer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAmB,gBAAgB,EAAc,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,UAAU,aAAa,CACzB,MAAe,EACf,QAAiB;IAEjB,MAAM,IAAI,GAAoB;QAC1B,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;QAC9B,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ;QAC5B,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU;KACnC,CAAC;IACF,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACtD,uBACI,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,cAAc,CAAC,OAAO,EAC7B,IAAI,EAAE,QAAQ,IACX,YAAY,EACjB;AACN,CAAC;AAED,SAAS,QAAQ,CACb,WAA0B,EAC1B,SAA2B;IAE3B,IAAI,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC;IACtC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC7C,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { ERROR_LIST } from '../dictionary';
|
|
2
|
+
export function getInfo(errorObj) {
|
|
3
|
+
const messageList = [];
|
|
4
|
+
const { hint: message, code } = errorObj;
|
|
5
|
+
messageList.push(message);
|
|
6
|
+
messageList.push(code);
|
|
7
|
+
return {
|
|
8
|
+
errorList,
|
|
9
|
+
messageList,
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
const errorList = [
|
|
13
|
+
{
|
|
14
|
+
regex: /No operator matches the given name and argument type.*/,
|
|
15
|
+
value: ERROR_LIST.unknownToken,
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
regex: /42703/,
|
|
19
|
+
value: ERROR_LIST.unknownToken,
|
|
20
|
+
},
|
|
21
|
+
];
|
|
22
|
+
//# sourceMappingURL=postgresql.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"postgresql.js","sourceRoot":"","sources":["../../../../src/errors/analyzer/postgresql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,UAAU,OAAO,CAAC,QAAa;IACjC,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IACzC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO;QACH,SAAS;QACT,WAAW;KACd,CAAC;AACN,CAAC;AAED,MAAM,SAAS,GAAG;IACd;QACI,KAAK,EAAE,wDAAwD;QAC/D,KAAK,EAAE,UAAU,CAAC,YAAY;KACjC;IACD;QACI,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,UAAU,CAAC,YAAY;KACjC;CACJ,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Primitive } from '../constants';
|
|
1
|
+
import { CommonAST, FunctionCallAST, FunctionParameters, UnknownAST, ValidatorResponse } from '../constants/interfaces';
|
|
3
2
|
export declare class BaseError extends Error {
|
|
4
3
|
code: string;
|
|
5
4
|
message: string;
|
|
@@ -33,12 +32,6 @@ export declare class NotAllowedExpressionError extends BaseError {
|
|
|
33
32
|
node: CommonAST;
|
|
34
33
|
constructor(node: CommonAST);
|
|
35
34
|
}
|
|
36
|
-
export declare class NotAllowedOperationError extends BaseError {
|
|
37
|
-
node: UnaryExpressionAST | BinaryExpressionAST;
|
|
38
|
-
constructor(node: UnaryExpressionAST | BinaryExpressionAST);
|
|
39
|
-
get leftPrimitive(): Primitive | undefined;
|
|
40
|
-
get rightPrimitive(): Primitive | undefined;
|
|
41
|
-
}
|
|
42
35
|
export declare class TooManyArgumentsError extends BaseError {
|
|
43
36
|
node: FunctionCallAST;
|
|
44
37
|
constructor(node: FunctionCallAST);
|
|
@@ -62,20 +62,6 @@ export class NotAllowedExpressionError extends BaseError {
|
|
|
62
62
|
this.node = node;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
export class NotAllowedOperationError extends BaseError {
|
|
66
|
-
constructor(node) {
|
|
67
|
-
super(ERROR_DICTIONARY[ERROR_LIST.notAllowedOperation].code, ERROR_DICTIONARY[ERROR_LIST.notAllowedOperation].message, node);
|
|
68
|
-
this.node = node;
|
|
69
|
-
}
|
|
70
|
-
get leftPrimitive() {
|
|
71
|
-
var _a;
|
|
72
|
-
return (_a = this.node.left) === null || _a === void 0 ? void 0 : _a.primitive;
|
|
73
|
-
}
|
|
74
|
-
get rightPrimitive() {
|
|
75
|
-
var _a;
|
|
76
|
-
return (_a = this.node.right) === null || _a === void 0 ? void 0 : _a.primitive;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
65
|
export class TooManyArgumentsError extends BaseError {
|
|
80
66
|
constructor(node) {
|
|
81
67
|
super(ERROR_DICTIONARY[ERROR_LIST.tooManyArguments].code, ERROR_DICTIONARY[ERROR_LIST.tooManyArguments].message, node);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../../src/errors/definitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../../src/errors/definitions.ts"],"names":[],"mappings":"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"}
|