@qrvey/formula-lang 0.10.0 → 0.11.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 +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.js +30 -8
- 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/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.js +31 -9
- 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/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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,eAAe,EACf,cAAc,GACjB,MAAM,cAAc,CAAC;AActB,OAAO,
|
|
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,7 +1,28 @@
|
|
|
1
|
-
import { InvalidArgumentError, MissingArgumentError, TooManyArgumentsError, } from '../errors';
|
|
2
1
|
import { isNull } from '../utils/isNull';
|
|
3
|
-
|
|
2
|
+
import { validateParameters, FunctionArgumentsMismatch } from '../errors';
|
|
3
|
+
import { ERROR_DICTIONARY, ERROR_LIST } from '../errors/dictionary';
|
|
4
|
+
import { RESPONSE_LEVEL } from '../constants';
|
|
5
|
+
import { getFunctionPrimitive } from '../utils/primitiveFunctions';
|
|
6
|
+
export function validateFuncStructure(definition, args, node) {
|
|
4
7
|
var _a;
|
|
8
|
+
const commonArgs = args.map((arg) => arg.node);
|
|
9
|
+
const primitive = getFunctionPrimitive(definition, commonArgs);
|
|
10
|
+
const singlePrimitive = Array.isArray(primitive) ? undefined : primitive;
|
|
11
|
+
if (!isNull(definition.maxPrimitiveValues)) {
|
|
12
|
+
const isPrimitiveAllowed = typeof primitive === 'string' ||
|
|
13
|
+
(Array.isArray(primitive) &&
|
|
14
|
+
primitive.length === definition.maxPrimitiveValues);
|
|
15
|
+
if (!isPrimitiveAllowed) {
|
|
16
|
+
const validator = Object.assign({ valid: false, source: RESPONSE_LEVEL.function }, ERROR_DICTIONARY[ERROR_LIST.inferredPrimitive]);
|
|
17
|
+
const { expected, received } = validateParameters(definition, args, singlePrimitive);
|
|
18
|
+
throw new FunctionArgumentsMismatch({
|
|
19
|
+
node,
|
|
20
|
+
validator,
|
|
21
|
+
expected,
|
|
22
|
+
received,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
5
26
|
let parameterIndex = 0;
|
|
6
27
|
let argumentIndex = 0;
|
|
7
28
|
const parameters = definition.parameters || [];
|
|
@@ -16,13 +37,36 @@ export function validateFuncStructure(node, definition, args) {
|
|
|
16
37
|
incrementCounter();
|
|
17
38
|
continue;
|
|
18
39
|
}
|
|
19
|
-
if (isNull(value) && !parameter.optional)
|
|
20
|
-
|
|
40
|
+
if (isNull(value) && !parameter.optional) {
|
|
41
|
+
const validator = Object.assign({ valid: false, source: RESPONSE_LEVEL.function }, ERROR_DICTIONARY[ERROR_LIST.missingArg]);
|
|
42
|
+
const { expected, received } = validateParameters(definition, args, singlePrimitive);
|
|
43
|
+
throw new FunctionArgumentsMismatch({
|
|
44
|
+
node,
|
|
45
|
+
parameter,
|
|
46
|
+
validator,
|
|
47
|
+
expected,
|
|
48
|
+
received,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
21
51
|
parameter.validator.forEach((validatorFunction) => {
|
|
22
52
|
var _a;
|
|
23
53
|
const validator = validatorFunction(value, dataType, (_a = args[argumentIndex]) !== null && _a !== void 0 ? _a : {});
|
|
24
|
-
if (!validator.valid)
|
|
25
|
-
|
|
54
|
+
if (!validator.valid) {
|
|
55
|
+
const { expected, received } = validateParameters(definition, args, singlePrimitive);
|
|
56
|
+
const customExpectedType = validator.customExpectedType;
|
|
57
|
+
if (customExpectedType && expected[parameterIndex]) {
|
|
58
|
+
expected[parameterIndex].custom = true;
|
|
59
|
+
expected[parameterIndex].primitive = customExpectedType;
|
|
60
|
+
}
|
|
61
|
+
validator.source = RESPONSE_LEVEL.function;
|
|
62
|
+
throw new FunctionArgumentsMismatch({
|
|
63
|
+
node,
|
|
64
|
+
parameter,
|
|
65
|
+
validator,
|
|
66
|
+
expected,
|
|
67
|
+
received,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
26
70
|
});
|
|
27
71
|
incrementCounter();
|
|
28
72
|
const hasMoreArguments = parameterIndex === parameters.length &&
|
|
@@ -32,8 +76,16 @@ export function validateFuncStructure(node, definition, args) {
|
|
|
32
76
|
parameterIndex = definition.recursiveStartIn;
|
|
33
77
|
}
|
|
34
78
|
}
|
|
35
|
-
if (argumentIndex < args.length)
|
|
36
|
-
|
|
79
|
+
if (argumentIndex < args.length) {
|
|
80
|
+
const validator = Object.assign({ valid: false, source: RESPONSE_LEVEL.function }, ERROR_DICTIONARY[ERROR_LIST.tooManyArguments]);
|
|
81
|
+
const { expected, received } = validateParameters(definition, args, singlePrimitive);
|
|
82
|
+
throw new FunctionArgumentsMismatch({
|
|
83
|
+
node,
|
|
84
|
+
validator,
|
|
85
|
+
expected,
|
|
86
|
+
received,
|
|
87
|
+
});
|
|
88
|
+
}
|
|
37
89
|
return true;
|
|
38
90
|
}
|
|
39
91
|
//# sourceMappingURL=validateFuncStructure.js.map
|
|
@@ -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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"}
|