@qrvey/formula-lang 0.11.1 → 0.11.3
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/interfaces.d.ts +15 -6
- package/dist/cjs/errors/definitions.d.ts +19 -17
- package/dist/cjs/errors/definitions.js +31 -26
- package/dist/cjs/errors/definitions.js.map +1 -1
- package/dist/cjs/errors/dictionary.d.ts +1 -4
- package/dist/cjs/errors/dictionary.js +4 -19
- package/dist/cjs/errors/dictionary.js.map +1 -1
- package/dist/cjs/errors/mismatch.d.ts +12 -11
- package/dist/cjs/errors/mismatch.js +33 -15
- package/dist/cjs/errors/mismatch.js.map +1 -1
- package/dist/cjs/functions/datedif.js +3 -3
- package/dist/cjs/functions/datedif.js.map +1 -1
- package/dist/cjs/functions/if.js +26 -3
- package/dist/cjs/functions/if.js.map +1 -1
- package/dist/cjs/functions/ifs.js +35 -9
- package/dist/cjs/functions/ifs.js.map +1 -1
- package/dist/cjs/functions/isNull.js +56 -4
- package/dist/cjs/functions/isNull.js.map +1 -1
- package/dist/cjs/functions/mid.js +33 -1
- package/dist/cjs/functions/mid.js.map +1 -1
- package/dist/cjs/grammar/generated/qformula.lang.js +14 -12
- package/dist/cjs/grammar/generated/qformula.lang.js.map +1 -1
- package/dist/cjs/grammar/generated/qformula.lang.terms.d.ts +20 -20
- package/dist/cjs/grammar/generated/qformula.lang.terms.js +1 -1
- package/dist/cjs/grammar/generated/qformula.lang.terms.js.map +1 -1
- package/dist/cjs/parser/json-parser.js +7 -5
- package/dist/cjs/parser/json-parser.js.map +1 -1
- package/dist/cjs/transpiler/validateFuncStructure.d.ts +1 -1
- package/dist/cjs/transpiler/validateFuncStructure.js +54 -58
- package/dist/cjs/transpiler/validateFuncStructure.js.map +1 -1
- package/dist/cjs/utils/isAColumn.d.ts +2 -3
- package/dist/cjs/utils/isAColumn.js +2 -6
- package/dist/cjs/utils/isAColumn.js.map +1 -1
- package/dist/cjs/utils/isALiteral.d.ts +2 -0
- package/dist/cjs/utils/isALiteral.js +9 -0
- package/dist/cjs/utils/isALiteral.js.map +1 -0
- package/dist/cjs/utils/isBooleanExpression.d.ts +1 -1
- package/dist/cjs/utils/isBooleanExpression.js +9 -5
- package/dist/cjs/utils/isBooleanExpression.js.map +1 -1
- package/dist/cjs/utils/isDateParam.js +8 -2
- package/dist/cjs/utils/isDateParam.js.map +1 -1
- package/dist/cjs/utils/isNumberParam.js +8 -2
- package/dist/cjs/utils/isNumberParam.js.map +1 -1
- package/dist/cjs/utils/isStringParam.js +8 -2
- package/dist/cjs/utils/isStringParam.js.map +1 -1
- package/dist/cjs/utils/primitiveFunctions.d.ts +1 -0
- package/dist/cjs/utils/primitiveFunctions.js +5 -1
- package/dist/cjs/utils/primitiveFunctions.js.map +1 -1
- package/dist/module/constants/interfaces.d.ts +15 -6
- package/dist/module/errors/definitions.d.ts +19 -17
- package/dist/module/errors/definitions.js +27 -22
- package/dist/module/errors/definitions.js.map +1 -1
- package/dist/module/errors/dictionary.d.ts +1 -4
- package/dist/module/errors/dictionary.js +4 -19
- package/dist/module/errors/dictionary.js.map +1 -1
- package/dist/module/errors/mismatch.d.ts +12 -11
- package/dist/module/errors/mismatch.js +35 -17
- package/dist/module/errors/mismatch.js.map +1 -1
- package/dist/module/functions/datedif.js +3 -3
- package/dist/module/functions/datedif.js.map +1 -1
- package/dist/module/functions/if.js +27 -4
- package/dist/module/functions/if.js.map +1 -1
- package/dist/module/functions/ifs.js +36 -10
- package/dist/module/functions/ifs.js.map +1 -1
- package/dist/module/functions/isNull.js +57 -5
- package/dist/module/functions/isNull.js.map +1 -1
- package/dist/module/functions/mid.js +34 -2
- package/dist/module/functions/mid.js.map +1 -1
- package/dist/module/grammar/generated/qformula.lang.js +14 -12
- package/dist/module/grammar/generated/qformula.lang.js.map +1 -1
- package/dist/module/grammar/generated/qformula.lang.terms.d.ts +20 -20
- 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/parser/json-parser.js +7 -5
- package/dist/module/parser/json-parser.js.map +1 -1
- package/dist/module/transpiler/validateFuncStructure.d.ts +1 -1
- package/dist/module/transpiler/validateFuncStructure.js +55 -59
- package/dist/module/transpiler/validateFuncStructure.js.map +1 -1
- package/dist/module/utils/isAColumn.d.ts +2 -3
- package/dist/module/utils/isAColumn.js +2 -6
- package/dist/module/utils/isAColumn.js.map +1 -1
- package/dist/module/utils/isALiteral.d.ts +2 -0
- package/dist/module/utils/isALiteral.js +5 -0
- package/dist/module/utils/isALiteral.js.map +1 -0
- package/dist/module/utils/isBooleanExpression.d.ts +1 -1
- package/dist/module/utils/isBooleanExpression.js +9 -5
- package/dist/module/utils/isBooleanExpression.js.map +1 -1
- package/dist/module/utils/isDateParam.js +8 -2
- package/dist/module/utils/isDateParam.js.map +1 -1
- package/dist/module/utils/isNumberParam.js +8 -2
- package/dist/module/utils/isNumberParam.js.map +1 -1
- package/dist/module/utils/isStringParam.js +8 -2
- package/dist/module/utils/isStringParam.js.map +1 -1
- package/dist/module/utils/primitiveFunctions.d.ts +1 -0
- package/dist/module/utils/primitiveFunctions.js +3 -0
- package/dist/module/utils/primitiveFunctions.js.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/utils/isNotAColumn.d.ts +0 -3
- package/dist/cjs/utils/isNotAColumn.js +0 -13
- package/dist/cjs/utils/isNotAColumn.js.map +0 -1
- package/dist/module/utils/isNotAColumn.d.ts +0 -3
- package/dist/module/utils/isNotAColumn.js +0 -9
- package/dist/module/utils/isNotAColumn.js.map +0 -1
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.IFS = void 0;
|
|
4
|
+
const constants_1 = require("../constants");
|
|
5
|
+
const dictionary_1 = require("../errors/dictionary");
|
|
4
6
|
const isBooleanExpression_1 = require("../utils/isBooleanExpression");
|
|
5
7
|
const primitiveFunctions_1 = require("../utils/primitiveFunctions");
|
|
6
8
|
/**
|
|
@@ -21,7 +23,7 @@ exports.IFS = {
|
|
|
21
23
|
identifier: 'VALUE_IF_TRUE',
|
|
22
24
|
optional: false,
|
|
23
25
|
generic: true,
|
|
24
|
-
validator: [],
|
|
26
|
+
validator: [sameRecursivePrimitiveType],
|
|
25
27
|
},
|
|
26
28
|
],
|
|
27
29
|
transpiler: {
|
|
@@ -30,17 +32,41 @@ exports.IFS = {
|
|
|
30
32
|
redshift,
|
|
31
33
|
postgresql,
|
|
32
34
|
},
|
|
33
|
-
maxPrimitiveValues: 1,
|
|
34
35
|
primitiveResult(args) {
|
|
35
|
-
|
|
36
|
-
args.forEach((value, index) => {
|
|
37
|
-
if (index % 2 === 1) {
|
|
38
|
-
primitiveArgs.push(value.primitive);
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
|
-
return (0, primitiveFunctions_1.inferPrimitive)(...primitiveArgs);
|
|
36
|
+
return calculateIfsPrimitive(args);
|
|
42
37
|
},
|
|
43
38
|
};
|
|
39
|
+
function sameRecursivePrimitiveType(_param, _dataType, context) {
|
|
40
|
+
const args = context.fnNode.arguments;
|
|
41
|
+
const firstArgsPrimitive = calculateFirstIFSPrimitive(args);
|
|
42
|
+
const ifsPrimitive = calculateIfsPrimitive(args);
|
|
43
|
+
const valid = (0, primitiveFunctions_1.isSinglePrimitive)(ifsPrimitive);
|
|
44
|
+
if (!valid)
|
|
45
|
+
return Object.assign(Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.inferredPrimitive]), { mismatchData: {
|
|
46
|
+
primitive: firstArgsPrimitive,
|
|
47
|
+
} });
|
|
48
|
+
return {
|
|
49
|
+
valid,
|
|
50
|
+
mismatchData: {
|
|
51
|
+
primitive: ifsPrimitive,
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
function calculateIfsPrimitive(args) {
|
|
56
|
+
const primitiveArgs = [];
|
|
57
|
+
args.forEach((value, index) => {
|
|
58
|
+
if (index % 2 === 1) {
|
|
59
|
+
primitiveArgs.push(value.primitive);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
return (0, primitiveFunctions_1.inferPrimitive)(...primitiveArgs);
|
|
63
|
+
}
|
|
64
|
+
function calculateFirstIFSPrimitive(args) {
|
|
65
|
+
var _a, _b;
|
|
66
|
+
return ((_b = (_a = args.find((arg, index) => index % 2 === 1 &&
|
|
67
|
+
(0, primitiveFunctions_1.isSinglePrimitive)(arg.primitive) &&
|
|
68
|
+
arg.primitive !== constants_1.AST_PRIMITIVES.UNKNOWN)) === null || _a === void 0 ? void 0 : _a.primitive) !== null && _b !== void 0 ? _b : constants_1.AST_PRIMITIVES.UNKNOWN);
|
|
69
|
+
}
|
|
44
70
|
function elasticsearch(...args) {
|
|
45
71
|
const _args = [...args];
|
|
46
72
|
const logicalExpression = _args.shift();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ifs.js","sourceRoot":"","sources":["../../../src/functions/ifs.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ifs.js","sourceRoot":"","sources":["../../../src/functions/ifs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ISNULL = void 0;
|
|
4
|
+
const constants_1 = require("../constants");
|
|
5
|
+
const dictionary_1 = require("../errors/dictionary");
|
|
4
6
|
const isAColumn_1 = require("../utils/isAColumn");
|
|
5
|
-
const
|
|
7
|
+
const isALiteral_1 = require("../utils/isALiteral");
|
|
6
8
|
const primitiveFunctions_1 = require("../utils/primitiveFunctions");
|
|
7
9
|
/**
|
|
8
10
|
* `ISNULL` Returns the replacement if the value is a null
|
|
@@ -13,13 +15,13 @@ exports.ISNULL = {
|
|
|
13
15
|
{
|
|
14
16
|
identifier: 'VALUE',
|
|
15
17
|
optional: false,
|
|
16
|
-
validator: [
|
|
18
|
+
validator: [samePrimitiveTypeCol],
|
|
17
19
|
},
|
|
18
20
|
{
|
|
19
21
|
identifier: 'REPLACEMENT',
|
|
20
22
|
optional: false,
|
|
21
23
|
generic: true,
|
|
22
|
-
validator: [
|
|
24
|
+
validator: [samePrimitiveTypeNonCol],
|
|
23
25
|
},
|
|
24
26
|
],
|
|
25
27
|
transpiler: {
|
|
@@ -28,11 +30,61 @@ exports.ISNULL = {
|
|
|
28
30
|
redshift,
|
|
29
31
|
postgresql,
|
|
30
32
|
},
|
|
31
|
-
maxPrimitiveValues: 1,
|
|
32
33
|
primitiveResult(args) {
|
|
33
34
|
return (0, primitiveFunctions_1.inferPrimitive)(...(args || []).map((arg) => arg.primitive));
|
|
34
35
|
},
|
|
35
36
|
};
|
|
37
|
+
function samePrimitiveTypeCol(param, dataType, context) {
|
|
38
|
+
const isColumn = (0, isAColumn_1.isAColumn)(context);
|
|
39
|
+
const baseResult = samePrimitiveType(param, dataType, context);
|
|
40
|
+
const valid = isColumn && baseResult.valid;
|
|
41
|
+
const primitive = baseResult.mismatchData
|
|
42
|
+
? baseResult.mismatchData.primitive
|
|
43
|
+
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
44
|
+
return Object.assign(Object.assign(Object.assign(Object.assign({}, baseResult), { mismatchData: {
|
|
45
|
+
type: constants_1.AST_TYPES.column,
|
|
46
|
+
primitive,
|
|
47
|
+
} }), (!isColumn && Object.assign({}, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingColumnExpression]))), { valid });
|
|
48
|
+
}
|
|
49
|
+
function samePrimitiveTypeNonCol(param, dataType, context) {
|
|
50
|
+
const isLiteral = (0, isALiteral_1.isALiteral)(context);
|
|
51
|
+
const baseResult = samePrimitiveType(param, dataType, context);
|
|
52
|
+
const valid = isLiteral && baseResult.valid;
|
|
53
|
+
const primitive = baseResult.mismatchData
|
|
54
|
+
? baseResult.mismatchData.primitive
|
|
55
|
+
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
56
|
+
return Object.assign(Object.assign(Object.assign(Object.assign({}, baseResult), { mismatchData: {
|
|
57
|
+
type: constants_1.AST_TYPES.literal,
|
|
58
|
+
primitive,
|
|
59
|
+
} }), (!isLiteral && Object.assign({}, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.noColumnExpression]))), { valid });
|
|
60
|
+
}
|
|
61
|
+
function samePrimitiveType(_param, _dataType, context) {
|
|
62
|
+
const firstPrimitive = primitiveArgIndex(context, 0);
|
|
63
|
+
const secondPrimitive = primitiveArgIndex(context, 1);
|
|
64
|
+
const ifPrimitive = calculateIsNullPrimitive(firstPrimitive, secondPrimitive);
|
|
65
|
+
const valid = firstPrimitive === secondPrimitive;
|
|
66
|
+
const baseResult = {
|
|
67
|
+
valid,
|
|
68
|
+
mismatchData: {
|
|
69
|
+
primitive: ifPrimitive,
|
|
70
|
+
},
|
|
71
|
+
};
|
|
72
|
+
if (!valid)
|
|
73
|
+
return Object.assign(Object.assign({}, baseResult), dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.inferredPrimitive]);
|
|
74
|
+
return baseResult;
|
|
75
|
+
}
|
|
76
|
+
function primitiveArgIndex(context, index) {
|
|
77
|
+
var _a, _b;
|
|
78
|
+
const basePrimitive = (_b = (_a = context.fnNode.arguments) === null || _a === void 0 ? void 0 : _a[index]) === null || _b === void 0 ? void 0 : _b.primitive;
|
|
79
|
+
return (0, primitiveFunctions_1.isSinglePrimitive)(basePrimitive)
|
|
80
|
+
? basePrimitive
|
|
81
|
+
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
82
|
+
}
|
|
83
|
+
function calculateIsNullPrimitive(firstPrimitive, secondPrimitive) {
|
|
84
|
+
if (firstPrimitive && firstPrimitive !== constants_1.AST_PRIMITIVES.UNKNOWN)
|
|
85
|
+
return firstPrimitive;
|
|
86
|
+
return secondPrimitive !== null && secondPrimitive !== void 0 ? secondPrimitive : constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
87
|
+
}
|
|
36
88
|
function elasticsearch(value, replacement) {
|
|
37
89
|
return `IS_NULL_SCRIPT(${value}, ${replacement})`;
|
|
38
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isNull.js","sourceRoot":"","sources":["../../../src/functions/isNull.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"isNull.js","sourceRoot":"","sources":["../../../src/functions/isNull.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MID = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
|
+
const dictionary_1 = require("../errors/dictionary");
|
|
5
6
|
const utils_1 = require("../utils");
|
|
6
7
|
/**
|
|
7
8
|
* `MID` Returns a segment of a string.
|
|
@@ -22,7 +23,7 @@ exports.MID = {
|
|
|
22
23
|
{
|
|
23
24
|
identifier: 'EXTRACT_LENGTH',
|
|
24
25
|
optional: true,
|
|
25
|
-
validator: [utils_1.isNumberParam],
|
|
26
|
+
validator: [utils_1.isNumberParam, greaterThanZero],
|
|
26
27
|
},
|
|
27
28
|
],
|
|
28
29
|
transpiler: {
|
|
@@ -33,6 +34,37 @@ exports.MID = {
|
|
|
33
34
|
},
|
|
34
35
|
primitiveResult: constants_1.AST_PRIMITIVES.STRING,
|
|
35
36
|
};
|
|
37
|
+
function greaterThanZero(param, _dataType, context) {
|
|
38
|
+
return greaterThanReference(param, context.argument, 0);
|
|
39
|
+
}
|
|
40
|
+
function greaterThanReference(param, arg, compareReference) {
|
|
41
|
+
const numericValue = getNumericValueFromArgument(param, arg);
|
|
42
|
+
const valid = typeof numericValue !== 'number' ||
|
|
43
|
+
compareValueWithReference(numericValue, compareReference);
|
|
44
|
+
if (!valid)
|
|
45
|
+
return Object.assign(Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.greaterThan]), { info: {
|
|
46
|
+
greaterThan: compareReference,
|
|
47
|
+
} });
|
|
48
|
+
return { valid };
|
|
49
|
+
}
|
|
50
|
+
function getNumericValueFromArgument(param, argument) {
|
|
51
|
+
if (typeof param === 'number')
|
|
52
|
+
return param;
|
|
53
|
+
const isUnaryExpression = argument.type === constants_1.AST_TYPES.unaryExpression;
|
|
54
|
+
if (isUnaryExpression) {
|
|
55
|
+
const unaryExp = argument.node;
|
|
56
|
+
const isNegative = unaryExp.operator === '-';
|
|
57
|
+
const isNumber = unaryExp.right.type === constants_1.AST_TYPES.literal &&
|
|
58
|
+
unaryExp.right.dataType === constants_1.AST_PRIMITIVES.NUMBER;
|
|
59
|
+
if (isNumber)
|
|
60
|
+
return (unaryExp.right.value *
|
|
61
|
+
(isNegative ? -1 : 1));
|
|
62
|
+
}
|
|
63
|
+
return param;
|
|
64
|
+
}
|
|
65
|
+
function compareValueWithReference(value, reference) {
|
|
66
|
+
return value >= reference;
|
|
67
|
+
}
|
|
36
68
|
function elasticsearch(current, start, length) {
|
|
37
69
|
const optional = length ? `, ${length}` : '';
|
|
38
70
|
return `${constants_1.ELASTICSEARCH_SCRIPT_NAMES.subString}(${current}, ${start}${optional})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const lr_1 = require("@lezer/lr");
|
|
|
5
5
|
const language_1 = require("@codemirror/language");
|
|
6
6
|
const highlight_1 = require("@lezer/highlight");
|
|
7
7
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
8
|
-
const noOprt =
|
|
8
|
+
const noOprt = 25;
|
|
9
9
|
const space = [
|
|
10
10
|
9, 10, 11, 12, 13, 32, 133, 160, 5760, 8192, 8193, 8194, 8195, 8196, 8197,
|
|
11
11
|
8198, 8199, 8200, 8201, 8202, 8232, 8233, 8239, 8287, 12288,
|
|
@@ -27,23 +27,23 @@ const noOperator = new lr_1.ExternalTokenizer((input, stack) => {
|
|
|
27
27
|
}
|
|
28
28
|
}, { contextual: true });
|
|
29
29
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
30
|
-
const spec_identifier = { __proto__: null, true:
|
|
30
|
+
const spec_identifier = { __proto__: null, true: 16, false: 16 };
|
|
31
31
|
const parser = lr_1.LRParser.deserialize({
|
|
32
32
|
version: 14,
|
|
33
|
-
states: "%^O]QQOOOOQP'#
|
|
34
|
-
stateData: "%k~
|
|
35
|
-
goto: "#
|
|
36
|
-
nodeNames: "⚠ Program Expression Value Number Date String Boolean ParenthesisEnd Function FunctionIdentifier ParenthesisStart FunctionArguments Variable UnaryExpression ArithOp BinaryExpression ArithOp ArithOp LogicOp LogicOp ParenthesizedExpression",
|
|
33
|
+
states: "%^O]QQOOOOQP'#C`'#C`OOQO'#Cg'#CgOwQQO'#CfO|QSO'#CjO]QQO'#CkQ!RQROOO]QQO'#CrOOQP'#C_'#C_O!gQQO,59QO!nQQO,59UOOQP,59V,59VO]QQO,59XO]QQO,59XO]QQO,59XO]QQO,59XO]QQO,59XO!sQRO,59^O!zQRO'#CzOOQO'#Ci'#CiO#UQQO1G.lOOQP1G.p1G.pOOQP1G.s1G.sO#uQRO1G.sO#|QRO1G.sO$oQRO1G.sO$vQRO1G.sOOQP1G.x1G.xO]QQO'#CsO$}QQO,59fOOQP7+$W7+$WO%VQRO,59_OOQO-E6q-E6q",
|
|
34
|
+
stateData: "%k~OkOSlOSPOS~OTPOUPOVPOWPO[VO`TOmQOqSO~O[XO~OrYO~O`]Ob[Oc[Od^Oe_Oi`O~OXnP~P]OpeO~OXkO~P!ROolOXnX~P!ROXnO~Ob[Oc[OdaieaihaiiaiXaioai~O`ai~P#ZO`]O~P#ZO`]Ob[Oc[Od^OhaiiaiXaioai~Oeai~P$TOe_O~P$TOolOXna~OXgaoga~P!ROUVklkPmPb~",
|
|
35
|
+
goto: "#UoPPPp!`PPPPP!`!lP!x!`!`P!`PPPP!`!{PPPPPP#RQUOQZTQaVQbXQf[Qg]Qh^Qi_Qj`RoleWOTVX[]^_`leROTVX[]^_`lRdXQmbRpmRcX",
|
|
36
|
+
nodeNames: "⚠ LineComment Program Expression Value Number Date String Boolean ParenthesisEnd Function FunctionIdentifier ParenthesisStart FunctionArguments Variable UnaryExpression ArithOp BinaryExpression ArithOp ArithOp LogicOp LogicOp ParenthesizedExpression",
|
|
37
37
|
maxTerm: 34,
|
|
38
38
|
nodeProps: [
|
|
39
|
-
["openedBy",
|
|
40
|
-
["closedBy",
|
|
39
|
+
["openedBy", 9, "ParenthesisStart"],
|
|
40
|
+
["closedBy", 12, "ParenthesisEnd"]
|
|
41
41
|
],
|
|
42
|
-
skippedNodes: [0],
|
|
42
|
+
skippedNodes: [0, 1],
|
|
43
43
|
repeatNodeCount: 1,
|
|
44
|
-
tokenData: "=T~RpXY#VYZ#zZ[#V]^#zpq#Vrs$Pxy7kyz7pz{7u{|7z|}9S}!O7z!O!P9X!P!Q:a!Q![;Q!^!_;n!_!`<O!`!a<T!c!}<]!}#O<y#P#Q=O#R#S8h#T#o<]$f$g#V#BY#BZ#V$IS$I_#V$I|$I}#z$I}$JO#z$JT$JU#V$KV$KW#V&FU&FV#V?HT?HU#V~#[
|
|
44
|
+
tokenData: "=T~RpXY#VYZ#zZ[#V]^#zpq#Vrs$Pxy7kyz7pz{7u{|7z|}9S}!O7z!O!P9X!P!Q:a!Q![;Q!^!_;n!_!`<O!`!a<T!c!}<]!}#O<y#P#Q=O#R#S8h#T#o<]$f$g#V#BY#BZ#V$IS$I_#V$I|$I}#z$I}$JO#z$JT$JU#V$KV$KW#V&FU&FV#V?HT?HU#V~#[Yk~XY#VZ[#Vpq#V$f$g#V#BY#BZ#V$IS$I_#V$JT$JU#V$KV$KW#V&FU&FV#V?HT?HU#V~$POl~~$SZOr$urs%_s!Q$u!Q!R&c!R!S6r!S![6S![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~$xVOr$urs%_s#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~%dOV~~%gRO;'S$u;'S;=`%p;=`O$u~%sWOr$urs%_s#O$u#O#P%d#P;'S$u;'S;=`&];=`<%l$u<%lO$u~&`P;=`<%l$u~&fYOr$urs%_s!P$u!P!Q'U!Q![6S![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~'X]Or$urs%_s!Q$u!Q!R(Q!R!S(Q!S!T(Q!T!U(Q!U![5d![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~(TYOr$urs%_s!P$u!P!Q(s!Q![5d![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~(vXOr$urs%_s!Q$u!Q![)c![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~)fXOr$urs%_s!Q$u!Q![*R![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~*UXOr$urs%_s!Q$u!Q![*q![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~*tXOr$urs%_s!Q$u!Q![+a![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~+dkOX$uX^-X^p$upq-Xqr$urs4gs#O$u#O#P%d#P#y$u#y#z-X#z$f$u$f$g-X$g#BY$u#BY#BZ-X#BZ$IS$u$IS$I_-X$I_$I|$u$I|$JO-X$JO$JT$u$JT$JU-X$JU$KV$u$KV$KW-X$KW&FU$u&FU&FV-X&FV;'S$u;'S;=`&]<%lO$u~-[pOX$uX^-X^p$upq-Xqr$urs%_s!Q$u!Q!R/`!R!S/`!S!T4n!T![0R![#O$u#O#P%d#P#y$u#y#z-X#z$f$u$f$g-X$g#BY$u#BY#BZ-X#BZ$IS$u$IS$I_-X$I_$I|$u$I|$JO-X$JO$JT$u$JT$JU-X$JU$KV$u$KV$KW-X$KW&FU$u&FU&FV-X&FV;'S$u;'S;=`&]<%lO$u~/cYOr$urs%_s!Q$u!Q![0R![!]0q!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~0UXOr$urs%_s![$u![!]0q!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~0tXOr$urs%_s!Q$u!Q!W1a!W#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~1dXOr$urs%_s!Q$u!Q![2P![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~2SXOr$urs%_s![$u![!]2o!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~2rXOr$urs%_s!Q$u!Q!W3_!W#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~3bXOr$urs%_s!Q$u!Q![3}![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~4QVOr$urs4gs#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~4nOU~V~~4qZOr$urs%_s!Q$u!Q!U0R!U![$u![!]0q!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~5gXOr$urs%_s!P$u!P!Q(s!Q#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~6VXOr$urs%_s!P$u!P!Q'U!Q#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~6u[Or$urs%_s!P$u!P!Q'U!Q!R6S!R!S6S!S!T6S!T#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~7pO[~~7uOX~~7zOc~R8RV`PrQ{|8h}!O8h!O!P8h!Q![8h!c!}8h#R#S8h#T#o8hQ8mVrQ{|8h}!O8h!O!P8h!Q![8h!c!}8h#R#S8h#T#o8h~9XOo~R9^VrQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S8h#T#o8hR9zVTPrQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S9s#T#o8h~:fPb~!P!Q:i~:nSP~OY:iZ;'S:i;'S;=`:z<%lO:i~:}P;=`<%l:iR;XVTPrQ{|8h}!O8h!O!P9s!Q![;Q!c!}8h#R#S;Q#T#o8h~;sQd~!_!`;y!`!a<O~<OOd~~<TOe~~<YPd~!_!`;yR<dVrQmP{|8h}!O8h!O!P8h!Q![<]!c!}<]#R#S<]#T#o<]~=OOq~~=TOp~",
|
|
45
45
|
tokenizers: [noOperator, 0, 1],
|
|
46
|
-
topRules: { "Program": [0,
|
|
46
|
+
topRules: { "Program": [0, 2] },
|
|
47
47
|
specialized: [{ term: 29, get: value => spec_identifier[value] || -1 }],
|
|
48
48
|
tokenPrec: 201
|
|
49
49
|
});
|
|
@@ -55,10 +55,12 @@ const QFormulaParser = parser.configure({
|
|
|
55
55
|
Date: highlight_1.tags.string,
|
|
56
56
|
Number: highlight_1.tags.number,
|
|
57
57
|
Variable: highlight_1.tags.variableName,
|
|
58
|
-
|
|
58
|
+
LineComment: highlight_1.tags.lineComment,
|
|
59
59
|
FunctionIdentifier: highlight_1.tags.keyword,
|
|
60
60
|
ParenthesisStart: highlight_1.tags.paren,
|
|
61
61
|
ParenthesisEnd: highlight_1.tags.paren,
|
|
62
|
+
LogicOp: highlight_1.tags.operator,
|
|
63
|
+
ArithOp: highlight_1.tags.operator,
|
|
62
64
|
}),
|
|
63
65
|
],
|
|
64
66
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qformula.lang.js","sourceRoot":"","sources":["../../../../src/grammar/generated/qformula.lang.js"],"names":[],"mappings":";;;AAAA,kCAAwD;AACxD,mDAAmE;AACnE,gDAAmD;AAEnD,8EAA8E;AAC9E,MAAM,MAAM,GAAG,EAAE,CAAC;AAElB,MAAM,KAAK,GAAG;IACV,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IACzE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;CAC9D,CAAC;AACF,MAAM,SAAS,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAC/C,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC5B,MAAM,KAAK,GAAG,EAAE,CAAC;AACjB,MAAM,UAAU,GAAG,IAAI,sBAAiB,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;IACtD,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,KAAK;QACd,OAAO;IACX,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,CAAC;QACV,CAAC,KAAK,CAAC,OAAO;QACd,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACxB,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;KAC7B;AACL,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAEzB,8EAA8E;AAC9E,MAAM,eAAe,GAAG,EAAC,SAAS,EAAC,IAAI,EAAC,IAAI,EAAC,EAAE,EAAE,KAAK,EAAC,EAAE,EAAC,CAAC;AAC3D,MAAM,MAAM,GAAG,aAAQ,CAAC,WAAW,CAAC;IAClC,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,iVAAiV;IACzV,SAAS,EAAE,8NAA8N;IACzO,IAAI,EAAE,gHAAgH;IACtH,SAAS,EAAE
|
|
1
|
+
{"version":3,"file":"qformula.lang.js","sourceRoot":"","sources":["../../../../src/grammar/generated/qformula.lang.js"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
export const noOprt:
|
|
2
|
-
export const spaces:
|
|
3
|
-
export const newline:
|
|
4
|
-
export const lineComment:
|
|
5
|
-
export const Program:
|
|
6
|
-
export const Expression:
|
|
7
|
-
export const Value:
|
|
8
|
-
export const Number:
|
|
9
|
-
export const Date:
|
|
10
|
-
export const String:
|
|
11
|
-
export const ParenthesisEnd:
|
|
12
|
-
export const Function:
|
|
13
|
-
export const FunctionIdentifier:
|
|
14
|
-
export const ParenthesisStart:
|
|
15
|
-
export const FunctionArguments:
|
|
16
|
-
export const Variable:
|
|
17
|
-
export const UnaryExpression:
|
|
18
|
-
export const BinaryExpression:
|
|
19
|
-
export const divide:
|
|
20
|
-
export const ParenthesizedExpression:
|
|
1
|
+
export const noOprt: 25;
|
|
2
|
+
export const spaces: 27;
|
|
3
|
+
export const newline: 28;
|
|
4
|
+
export const lineComment: 1;
|
|
5
|
+
export const Program: 2;
|
|
6
|
+
export const Expression: 3;
|
|
7
|
+
export const Value: 4;
|
|
8
|
+
export const Number: 5;
|
|
9
|
+
export const Date: 6;
|
|
10
|
+
export const String: 7;
|
|
11
|
+
export const ParenthesisEnd: 9;
|
|
12
|
+
export const Function: 10;
|
|
13
|
+
export const FunctionIdentifier: 11;
|
|
14
|
+
export const ParenthesisStart: 12;
|
|
15
|
+
export const FunctionArguments: 13;
|
|
16
|
+
export const Variable: 14;
|
|
17
|
+
export const UnaryExpression: 15;
|
|
18
|
+
export const BinaryExpression: 17;
|
|
19
|
+
export const divide: 18;
|
|
20
|
+
export const ParenthesizedExpression: 22;
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ParenthesizedExpression = exports.divide = exports.BinaryExpression = exports.UnaryExpression = exports.Variable = exports.FunctionArguments = exports.ParenthesisStart = exports.FunctionIdentifier = exports.Function = exports.ParenthesisEnd = exports.String = exports.Date = exports.Number = exports.Value = exports.Expression = exports.Program = exports.lineComment = exports.newline = exports.spaces = exports.noOprt = void 0;
|
|
4
4
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
5
|
-
exports.noOprt =
|
|
5
|
+
exports.noOprt = 25, exports.spaces = 27, exports.newline = 28, exports.lineComment = 1, exports.Program = 2, exports.Expression = 3, exports.Value = 4, exports.Number = 5, exports.Date = 6, exports.String = 7, exports.ParenthesisEnd = 9, exports.Function = 10, exports.FunctionIdentifier = 11, exports.ParenthesisStart = 12, exports.FunctionArguments = 13, exports.Variable = 14, exports.UnaryExpression = 15, exports.BinaryExpression = 17, exports.divide = 18, exports.ParenthesizedExpression = 22;
|
|
6
6
|
//# sourceMappingURL=qformula.lang.terms.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qformula.lang.terms.js","sourceRoot":"","sources":["../../../../src/grammar/generated/qformula.lang.terms.js"],"names":[],"mappings":";;;AAAA,8EAA8E;AAE5E,QAAA,MAAM,GAAG,EAAE,EACX,QAAA,MAAM,GAAG,EAAE,EACX,QAAA,OAAO,GAAG,EAAE,EACZ,QAAA,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"qformula.lang.terms.js","sourceRoot":"","sources":["../../../../src/grammar/generated/qformula.lang.terms.js"],"names":[],"mappings":";;;AAAA,8EAA8E;AAE5E,QAAA,MAAM,GAAG,EAAE,EACX,QAAA,MAAM,GAAG,EAAE,EACX,QAAA,OAAO,GAAG,EAAE,EACZ,QAAA,WAAW,GAAG,CAAC,EACf,QAAA,OAAO,GAAG,CAAC,EACX,QAAA,UAAU,GAAG,CAAC,EACd,QAAA,KAAK,GAAG,CAAC,EACT,QAAA,MAAM,GAAG,CAAC,EACV,QAAA,IAAI,GAAG,CAAC,EACR,QAAA,MAAM,GAAG,CAAC,EACV,QAAA,cAAc,GAAG,CAAC,EAClB,QAAA,QAAQ,GAAG,EAAE,EACb,QAAA,kBAAkB,GAAG,EAAE,EACvB,QAAA,gBAAgB,GAAG,EAAE,EACrB,QAAA,iBAAiB,GAAG,EAAE,EACtB,QAAA,QAAQ,GAAG,EAAE,EACb,QAAA,eAAe,GAAG,EAAE,EACpB,QAAA,gBAAgB,GAAG,EAAE,EACrB,QAAA,MAAM,GAAG,EAAE,EACX,QAAA,uBAAuB,GAAG,EAAE,CAAA"}
|
|
@@ -11,7 +11,8 @@ const PARSER_VERSION = '0.0.0';
|
|
|
11
11
|
const LANG_NAME = 'QrveyLang';
|
|
12
12
|
function calculateAST(program, tree, context) {
|
|
13
13
|
var _a;
|
|
14
|
-
const
|
|
14
|
+
const cursor = tree.cursor();
|
|
15
|
+
const startNode = cursor.node;
|
|
15
16
|
if (!startNode)
|
|
16
17
|
return;
|
|
17
18
|
const syntaxErrors = (0, syntax_errors_1.calculateNodeSyntaxErrors)(program, startNode);
|
|
@@ -21,7 +22,7 @@ function calculateAST(program, tree, context) {
|
|
|
21
22
|
formulaFunctions: [],
|
|
22
23
|
flatBody: [],
|
|
23
24
|
};
|
|
24
|
-
const body = transformNode(program, startNode, inference, context);
|
|
25
|
+
const body = transformNode(program, startNode, inference, context, cursor);
|
|
25
26
|
const { errorList: errors, formulaVariables: variables, formulaFunctions, flatBody, } = inference;
|
|
26
27
|
return {
|
|
27
28
|
type: constants_1.AST_TYPES.program,
|
|
@@ -39,7 +40,8 @@ function calculateAST(program, tree, context) {
|
|
|
39
40
|
};
|
|
40
41
|
}
|
|
41
42
|
exports.calculateAST = calculateAST;
|
|
42
|
-
function transformNode(program,
|
|
43
|
+
function transformNode(program, refNode, inference, context, cursor) {
|
|
44
|
+
const node = refNode !== null && refNode !== void 0 ? refNode : cursor === null || cursor === void 0 ? void 0 : cursor.node;
|
|
43
45
|
if (!node)
|
|
44
46
|
return undefined;
|
|
45
47
|
let resultNode;
|
|
@@ -72,8 +74,8 @@ function transformNode(program, node, inference, context) {
|
|
|
72
74
|
resultNode = transformVariableValue(program, node, inference, context);
|
|
73
75
|
break;
|
|
74
76
|
default:
|
|
75
|
-
return node.firstChild
|
|
76
|
-
? transformNode(program, node.firstChild, inference, context)
|
|
77
|
+
return (cursor === null || cursor === void 0 ? void 0 : cursor.next()) || node.firstChild
|
|
78
|
+
? transformNode(program, node.firstChild, inference, context, cursor)
|
|
77
79
|
: undefined;
|
|
78
80
|
}
|
|
79
81
|
if (resultNode !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":";;;AAaA,4CAAoE;AACpE,oCAMkB;AAClB,mDAA4D;AAC5D,sCAA8E;AAC9E,oEAAkE;AAClE,qDAG0B;AAE1B,MAAM,cAAc,GAAG,OAAO,CAAC;AAC/B,MAAM,SAAS,GAAG,WAAW,CAAC;AAE9B,SAAgB,YAAY,CACxB,OAAe,EACf,IAAU,EACV,OAAwB;;IAExB,MAAM,
|
|
1
|
+
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.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(definition: FunctionDefinition, args: Array<ProcessNodeResult>, node: FunctionCallAST):
|
|
2
|
+
export declare function validateFuncStructure(definition: FunctionDefinition, args: Array<ProcessNodeResult>, node: FunctionCallAST): void;
|