@qrvey/formula-lang 2.0.1-rc.638 → 2.0.1-rc.642
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/dist/cjs/constants/interfaces.d.ts +1 -0
- package/dist/cjs/errors/mismatch.js +2 -2
- package/dist/cjs/errors/mismatch.js.map +1 -1
- package/dist/cjs/functions/aggAvg.js +1 -1
- package/dist/cjs/functions/aggAvg.js.map +1 -1
- package/dist/cjs/functions/aggCount.js +1 -1
- package/dist/cjs/functions/aggCount.js.map +1 -1
- package/dist/cjs/functions/aggDistcount.js +1 -1
- package/dist/cjs/functions/aggDistcount.js.map +1 -1
- package/dist/cjs/functions/aggMax.js +1 -1
- package/dist/cjs/functions/aggMax.js.map +1 -1
- package/dist/cjs/functions/aggMed.js +1 -1
- package/dist/cjs/functions/aggMed.js.map +1 -1
- package/dist/cjs/functions/aggMin.js +1 -1
- package/dist/cjs/functions/aggMin.js.map +1 -1
- package/dist/cjs/functions/aggSum.js +1 -1
- package/dist/cjs/functions/aggSum.js.map +1 -1
- package/dist/cjs/functions/if.js +5 -2
- package/dist/cjs/functions/if.js.map +1 -1
- package/dist/cjs/functions/ifs.js +5 -1
- package/dist/cjs/functions/ifs.js.map +1 -1
- package/dist/cjs/parser/json-parser.js +5 -4
- package/dist/cjs/parser/json-parser.js.map +1 -1
- package/dist/cjs/transpiler/index.js +10 -3
- package/dist/cjs/transpiler/index.js.map +1 -1
- package/dist/cjs/transpiler/validateFuncStructure.d.ts +4 -2
- package/dist/cjs/transpiler/validateFuncStructure.js +2 -1
- package/dist/cjs/transpiler/validateFuncStructure.js.map +1 -1
- package/dist/cjs/utils/index.d.ts +1 -1
- package/dist/cjs/utils/index.js +2 -1
- package/dist/cjs/utils/index.js.map +1 -1
- package/dist/cjs/utils/isAColumn.d.ts +2 -1
- package/dist/cjs/utils/isAColumn.js +27 -4
- package/dist/cjs/utils/isAColumn.js.map +1 -1
- package/dist/module/constants/interfaces.d.ts +1 -0
- package/dist/module/errors/mismatch.js +2 -2
- package/dist/module/errors/mismatch.js.map +1 -1
- package/dist/module/functions/aggAvg.js +2 -2
- package/dist/module/functions/aggAvg.js.map +1 -1
- package/dist/module/functions/aggCount.js +2 -2
- package/dist/module/functions/aggCount.js.map +1 -1
- package/dist/module/functions/aggDistcount.js +2 -2
- package/dist/module/functions/aggDistcount.js.map +1 -1
- package/dist/module/functions/aggMax.js +2 -2
- package/dist/module/functions/aggMax.js.map +1 -1
- package/dist/module/functions/aggMed.js +2 -2
- package/dist/module/functions/aggMed.js.map +1 -1
- package/dist/module/functions/aggMin.js +2 -2
- package/dist/module/functions/aggMin.js.map +1 -1
- package/dist/module/functions/aggSum.js +2 -2
- package/dist/module/functions/aggSum.js.map +1 -1
- package/dist/module/functions/if.js +6 -3
- package/dist/module/functions/if.js.map +1 -1
- package/dist/module/functions/ifs.js +6 -2
- package/dist/module/functions/ifs.js.map +1 -1
- package/dist/module/parser/json-parser.js +5 -4
- package/dist/module/parser/json-parser.js.map +1 -1
- package/dist/module/transpiler/index.js +12 -5
- package/dist/module/transpiler/index.js.map +1 -1
- package/dist/module/transpiler/validateFuncStructure.d.ts +4 -2
- package/dist/module/transpiler/validateFuncStructure.js +2 -1
- package/dist/module/transpiler/validateFuncStructure.js.map +1 -1
- package/dist/module/utils/index.d.ts +1 -1
- package/dist/module/utils/index.js +1 -1
- package/dist/module/utils/index.js.map +1 -1
- package/dist/module/utils/isAColumn.d.ts +2 -1
- package/dist/module/utils/isAColumn.js +26 -4
- package/dist/module/utils/isAColumn.js.map +1 -1
- package/package.json +1 -1
|
@@ -29,6 +29,7 @@ export interface ProcessNodeResult {
|
|
|
29
29
|
export interface ValidatorParameterContext {
|
|
30
30
|
fnNode: FunctionCallAST;
|
|
31
31
|
argument: ProcessNodeResult;
|
|
32
|
+
globalContext?: FormulaContext;
|
|
32
33
|
}
|
|
33
34
|
export interface ValidatorFunctionParameter {
|
|
34
35
|
(value: any, dataType: Primitive | undefined, context: ValidatorParameterContext): ValidatorResponse;
|
|
@@ -14,11 +14,11 @@ class FunctionArgumentsMismatch extends definitions_1.FunctionError {
|
|
|
14
14
|
exports.FunctionArgumentsMismatch = FunctionArgumentsMismatch;
|
|
15
15
|
function validateParameters(definition, args, validators = []) {
|
|
16
16
|
const received = args.map((arg) => {
|
|
17
|
-
const { from, to, primitive } = arg.node;
|
|
17
|
+
const { from, to, type, primitive } = arg.node;
|
|
18
18
|
const singlePrimitive = (0, primitiveFunctions_1.isSinglePrimitive)(primitive)
|
|
19
19
|
? primitive
|
|
20
20
|
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
21
|
-
return { from, to, primitive: singlePrimitive };
|
|
21
|
+
return { from, to, type, primitive: singlePrimitive };
|
|
22
22
|
});
|
|
23
23
|
const parameters = definition.parameters || [];
|
|
24
24
|
const expected = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mismatch.js","sourceRoot":"","sources":["../../../src/errors/mismatch.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAU9C,oEAAgE;AAChE,+CAA8C;AAC9C,6CAA4D;AAoB5D,MAAa,yBACT,SAAQ,2BAAa;IAGrB,YAAY,QAAkB;QAC1B,KAAK,CACD,QAAQ,CAAC,IAAI,EACb,6BAAgB,CAAC,uBAAU,CAAC,yBAAyB,CAAC,CACzD,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,yCAAyC;IAC5E,CAAC;CAMJ;AAhBD,8DAgBC;AAED,SAAgB,kBAAkB,CAC9B,UAA8B,EAC9B,IAA8B,EAC9B,aAA2C,EAAE;IAM7C,MAAM,QAAQ,GAAqB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAChD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"mismatch.js","sourceRoot":"","sources":["../../../src/errors/mismatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggAvg.js","sourceRoot":"","sources":["../../../src/functions/aggAvg.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggAvg.js","sourceRoot":"","sources":["../../../src/functions/aggAvg.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAiD;AAEjD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,mBAAmB,KAAK,IAAI,CAAC;AACxC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggCount.js","sourceRoot":"","sources":["../../../src/functions/aggCount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggCount.js","sourceRoot":"","sources":["../../../src/functions/aggCount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAA0C;AAE1C;;GAEG;AACU,QAAA,SAAS,GAAuB;IACzC,UAAU,EAAE,WAAW;IACvB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,sBAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,qBAAqB,KAAK,IAAI,CAAC;AAC1C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,SAAS,KAAK,GAAG,CAAC;AAC7B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAA0C;AAE1C;;GAEG;AACU,QAAA,aAAa,GAAuB;IAC7C,UAAU,EAAE,eAAe;IAC3B,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,sBAAc,CAAC;SAC9B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,6BAA6B,KAAK,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,kBAAkB,KAAK,GAAG,CAAC;AACtC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMax.js","sourceRoot":"","sources":["../../../src/functions/aggMax.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggMax.js","sourceRoot":"","sources":["../../../src/functions/aggMax.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAiD;AAEjD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,mBAAmB,KAAK,IAAI,CAAC;AACxC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAiD;AAEjD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,sBAAsB,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,8CAA8C,KAAK,GAAG,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggMin.js","sourceRoot":"","sources":["../../../src/functions/aggMin.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggMin.js","sourceRoot":"","sources":["../../../src/functions/aggMin.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAiD;AAEjD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,mBAAmB,KAAK,IAAI,CAAC;AACxC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggSum.js","sourceRoot":"","sources":["../../../src/functions/aggSum.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"aggSum.js","sourceRoot":"","sources":["../../../src/functions/aggSum.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAiD;AAEjD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,6BAAqB,CAAC;SACrC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,mBAAmB,KAAK,IAAI,CAAC;AACxC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,OAAO,KAAK,GAAG,CAAC;AAC3B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
|
package/dist/cjs/functions/if.js
CHANGED
|
@@ -49,7 +49,7 @@ exports.IF = {
|
|
|
49
49
|
},
|
|
50
50
|
};
|
|
51
51
|
function samePrimitiveType(_param, _dataType, context) {
|
|
52
|
-
var _a, _b;
|
|
52
|
+
var _a, _b, _c;
|
|
53
53
|
const fPrimitive = (_a = context.fnNode.arguments[1]) === null || _a === void 0 ? void 0 : _a.primitive;
|
|
54
54
|
const firstPrimitive = fPrimitive && (0, primitiveFunctions_1.isSinglePrimitive)(fPrimitive)
|
|
55
55
|
? fPrimitive
|
|
@@ -60,9 +60,12 @@ function samePrimitiveType(_param, _dataType, context) {
|
|
|
60
60
|
: constants_1.AST_PRIMITIVES.UNKNOWN;
|
|
61
61
|
const ifPrimitive = calculateIfPrimitive(firstPrimitive, secondPrimitive);
|
|
62
62
|
const valid = firstPrimitive === secondPrimitive;
|
|
63
|
+
const isAggregate = ((_c = context.globalContext) === null || _c === void 0 ? void 0 : _c.currentInputScope) === constants_1.OPERATION_SCOPE.AGGREGATE;
|
|
63
64
|
if (!valid)
|
|
64
65
|
return Object.assign(Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.inferredPrimitive]), { mismatchData: {
|
|
65
|
-
primitive:
|
|
66
|
+
primitive: isAggregate
|
|
67
|
+
? constants_1.EXPECTED_AGGREGATE_RESULT[0]
|
|
68
|
+
: ifPrimitive,
|
|
66
69
|
} });
|
|
67
70
|
return { valid };
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"if.js","sourceRoot":"","sources":["../../../src/functions/if.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"if.js","sourceRoot":"","sources":["../../../src/functions/if.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,13 +41,17 @@ exports.IFS = {
|
|
|
41
41
|
},
|
|
42
42
|
};
|
|
43
43
|
function sameRecursivePrimitiveType(_param, _dataType, context) {
|
|
44
|
+
var _a;
|
|
44
45
|
const args = context.fnNode.arguments;
|
|
45
46
|
const firstArgsPrimitive = calculateFirstIFSPrimitive(args);
|
|
46
47
|
const ifsPrimitive = calculateIfsPrimitive(args);
|
|
47
48
|
const valid = (0, primitiveFunctions_1.isSinglePrimitive)(ifsPrimitive);
|
|
49
|
+
const isAggregate = ((_a = context.globalContext) === null || _a === void 0 ? void 0 : _a.currentInputScope) === constants_1.OPERATION_SCOPE.AGGREGATE;
|
|
48
50
|
if (!valid)
|
|
49
51
|
return Object.assign(Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.inferredPrimitive]), { mismatchData: {
|
|
50
|
-
primitive:
|
|
52
|
+
primitive: isAggregate
|
|
53
|
+
? constants_1.EXPECTED_AGGREGATE_RESULT[0]
|
|
54
|
+
: firstArgsPrimitive,
|
|
51
55
|
} });
|
|
52
56
|
return {
|
|
53
57
|
valid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ifs.js","sourceRoot":"","sources":["../../../src/functions/ifs.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ifs.js","sourceRoot":"","sources":["../../../src/functions/ifs.ts"],"names":[],"mappings":"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"}
|
|
@@ -325,14 +325,15 @@ function validateProgramScope(currentNode, inference, result, context) {
|
|
|
325
325
|
};
|
|
326
326
|
}
|
|
327
327
|
const isAggregated = (context === null || context === void 0 ? void 0 : context.currentInputScope) === constants_1.OPERATION_SCOPE.AGGREGATE;
|
|
328
|
-
if (isAggregated) {
|
|
328
|
+
if (isAggregated && currentNode) {
|
|
329
329
|
let currentError;
|
|
330
|
-
const programIsAColumn = currentNode.type === constants_1.AST_TYPES.column;
|
|
331
|
-
if (programIsAColumn)
|
|
332
|
-
currentError = new errors_1.AggregatedFunctionRequiredError(currentNode);
|
|
333
330
|
const hasAnExpectedResult = (0, primitiveFunctions_1.primitiveIsIncluded)(result, ...constants_1.EXPECTED_AGGREGATE_RESULT);
|
|
334
331
|
if (!hasAnExpectedResult)
|
|
335
332
|
currentError = new errors_1.AggregatedPrimitiveMismatchError(currentNode);
|
|
333
|
+
const programIsAColumn = currentNode.type === constants_1.AST_TYPES.column ||
|
|
334
|
+
currentNode.type === constants_1.AST_TYPES.externalFormula;
|
|
335
|
+
if (programIsAColumn)
|
|
336
|
+
currentError = new errors_1.AggregatedFunctionRequiredError(currentNode);
|
|
336
337
|
return {
|
|
337
338
|
isValid: hasAnExpectedResult && !programIsAColumn,
|
|
338
339
|
error: currentError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -151,10 +151,15 @@ class Transpiler {
|
|
|
151
151
|
};
|
|
152
152
|
}
|
|
153
153
|
functionCall(node) {
|
|
154
|
+
var _a;
|
|
154
155
|
const { name, arguments: args } = node;
|
|
155
|
-
const
|
|
156
|
-
|
|
156
|
+
const currentFunctionList = ((_a = this.globalContext) === null || _a === void 0 ? void 0 : _a.currentInputScope) === constants_1.OPERATION_SCOPE.AGGREGATE
|
|
157
|
+
? functions_1.AGGREGATE_FUNCTION_LIST
|
|
158
|
+
: functions_1.ROW_FUNCTION_LIST;
|
|
159
|
+
const functionExists = currentFunctionList.includes(name);
|
|
160
|
+
if (!functionExists)
|
|
157
161
|
throw new definitions_1.UnknownFunctionError(node);
|
|
162
|
+
const func = functions_1.functionList[name];
|
|
158
163
|
const customFunction = (0, utils_1.customFunction)(this.engine, name);
|
|
159
164
|
if (customFunction)
|
|
160
165
|
this.customFunctionList.add(customFunction);
|
|
@@ -166,7 +171,9 @@ class Transpiler {
|
|
|
166
171
|
return { value, dataType: node.primitive, type: node.type, node };
|
|
167
172
|
}
|
|
168
173
|
executer(func, args, node) {
|
|
169
|
-
(0, validateFuncStructure_1.validateFuncStructure)(func, args, node
|
|
174
|
+
(0, validateFuncStructure_1.validateFuncStructure)(func, args, node, {
|
|
175
|
+
context: this.globalContext,
|
|
176
|
+
});
|
|
170
177
|
args = args.map((item) => item.value);
|
|
171
178
|
return func.transpiler[this.engine](...args);
|
|
172
179
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,4 @@
|
|
|
1
|
-
import { FunctionCallAST, FunctionDefinition, ProcessNodeResult } from '../constants/interfaces';
|
|
2
|
-
export declare function validateFuncStructure(definition: FunctionDefinition, args: Array<ProcessNodeResult>, node: FunctionCallAST
|
|
1
|
+
import { FormulaContext, FunctionCallAST, FunctionDefinition, ProcessNodeResult } from '../constants/interfaces';
|
|
2
|
+
export declare function validateFuncStructure(definition: FunctionDefinition, args: Array<ProcessNodeResult>, node: FunctionCallAST, options: {
|
|
3
|
+
context?: FormulaContext;
|
|
4
|
+
}): void;
|
|
@@ -5,7 +5,7 @@ const constants_1 = require("../constants");
|
|
|
5
5
|
const isNull_1 = require("../utils/isNull");
|
|
6
6
|
const errors_1 = require("../errors");
|
|
7
7
|
const dictionary_1 = require("../errors/dictionary");
|
|
8
|
-
function validateFuncStructure(definition, args, node) {
|
|
8
|
+
function validateFuncStructure(definition, args, node, options) {
|
|
9
9
|
var _a, _b;
|
|
10
10
|
let parameterIndex = 0;
|
|
11
11
|
let argumentIndex = 0;
|
|
@@ -36,6 +36,7 @@ function validateFuncStructure(definition, args, node) {
|
|
|
36
36
|
const validatorContext = {
|
|
37
37
|
fnNode: node,
|
|
38
38
|
argument: (_b = args[argumentIndex]) !== null && _b !== void 0 ? _b : {},
|
|
39
|
+
globalContext: options.context,
|
|
39
40
|
};
|
|
40
41
|
for (const validatorFunction of parameter.validator) {
|
|
41
42
|
const validator = validatorFunction(value, dataType, validatorContext);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":";;;AAAA,4CAA8D;
|
|
1
|
+
{"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":";;;AAAA,4CAA8D;AAS9D,4CAAyC;AAEzC,sCAImB;AACnB,qDAAoE;AAEpE,SAAgB,qBAAqB,CACjC,UAA8B,EAC9B,IAA8B,EAC9B,IAAqB,EACrB,OAEC;;IAED,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC;IAC/C,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC1B,cAAc,IAAI,CAAC,CAAC;QACpB,aAAa,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IACF,MAAM,cAAc,GAAiC,EAAE,CAAC;IACxD,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,OAAO,cAAc,GAAG,UAAU,CAAC,MAAM,EAAE;QACvC,MAAM,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;QAC7C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,mCAAI,EAAE,CAAC;QAEtD,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,QAAQ,CAAC,IAAI,SAAS,CAAC,QAAQ,EAAE;YACzD,gBAAgB,EAAE,CAAC;YACnB,SAAS;SACZ;QACD,sGAAsG;QACtG,IACI,IAAA,eAAM,EAAC,KAAK,CAAC;YACb,CAAC,CAAC,SAAS,CAAC,QAAQ;gBAChB,CAAC,SAAS,CAAC,QAAQ,IAAI,QAAQ,KAAK,0BAAc,CAAC,OAAO,CAAC,CAAC,EAClE;YACE,gBAAgB,GAAG,IAAI,CAAC;YACxB,WAAW,GAAG,IAAI,CAAC;YACnB,cAAc,CAAC,IAAI,+BACf,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,0BAAc,CAAC,QAAQ,IAC5B,6BAAgB,CAAC,uBAAU,CAAC,UAAU,CAAC,KAC1C,SAAS;gBACT,aAAa,IACf,CAAC;SACN;QAED,MAAM,gBAAgB,GAAG;YACrB,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,mCAAI,EAAE;YACnC,aAAa,EAAE,OAAO,CAAC,OAAO;SACjC,CAAC;QAEF,KAAK,MAAM,iBAAiB,IAAI,SAAS,CAAC,SAAS,EAAE;YACjD,MAAM,SAAS,GAAG,iBAAiB,CAC/B,KAAK,EACL,QAAQ,EACR,gBAAgB,CACnB,CAAC;YACF,cAAc,CAAC,IAAI,iCACZ,SAAS,KACZ,SAAS;gBACT,aAAa,IACf,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;gBAClB,IAAI,SAAS,CAAC,YAAY,IAAI,CAAC,WAAW;oBAAE,WAAW,GAAG,IAAI,CAAC;gBAC/D,IAAI,CAAC,gBAAgB;oBAAE,gBAAgB,GAAG,IAAI,CAAC;gBAC/C,MAAM;aACT;SACJ;QAED,gBAAgB,EAAE,CAAC;QACnB,MAAM,sBAAsB,GAAG,cAAc,KAAK,UAAU,CAAC,MAAM,CAAC;QACpE,MAAM,gBAAgB,GAAG,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACrD,MAAM,WAAW,GAAG,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,gBAAgB,CAAA,KAAK,QAAQ,CAAC;QACrE,IAAI,sBAAsB,IAAI,gBAAgB,IAAI,WAAW,EAAE;YAC3D,cAAc,GAAG,UAAU,CAAC,gBAA0B,CAAC;SAC1D;KACJ;IAED,IAAI,gBAAgB,EAAE;QAClB,IAAI,WAAW,EAAE;YACb,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;gBAC1C,UAAU,EAAE,cAAc;aAC7B,CAAC,CAAC;SACN;aAAM;YACH,MAAM,eAAe,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,eAAe;gBAAE,kBAAkB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;SAClE;KACJ;IAED,IAAI,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE;QAC7B,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;YAC1C,KAAK,EAAE,uBAAU,CAAC,gBAAgB;SACrC,CAAC,CAAC;KACN;AACL,CAAC;AA5FD,sDA4FC;AAED,SAAS,qBAAqB,CAC1B,UAA8B,EAC9B,IAA8B,EAC9B,IAAqB,EACrB,aAGC,EACD,SAA6B;;IAE7B,MAAM,aAAa,mBACf,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,0BAAc,CAAC,QAAQ,IAC5B,6BAAgB,CAAC,MAAA,aAAa,CAAC,KAAK,mCAAI,uBAAU,CAAC,OAAO,CAAC,CACjE,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAA,2BAAkB,EACxD,UAAU,EACV,IAAI,EACJ,aAAa,CAAC,UAAU,CAC3B,CAAC;IAEF,MAAM,IAAI,kCAAyB,CAAC;QAChC,IAAI;QACJ,SAAS;QACT,SAAS,EAAE,SAAS,IAAI,aAAa;QACrC,QAAQ;QACR,QAAQ;KACX,CAAC,CAAC;AACP,CAAC;AAED,SAAS,kBAAkB,CACvB,IAAqB,EACrB,SAAqC;IAErC,MAAM,IAAI,+BAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -9,5 +9,5 @@ export * from './getNodeValue';
|
|
|
9
9
|
export * from './getVariableType';
|
|
10
10
|
export * from './isLongLiteralNumber';
|
|
11
11
|
export * from './cleanInvalidItemsInContext';
|
|
12
|
-
export { isAColumnParam } from './isAColumn';
|
|
12
|
+
export { isAColumnParam, isANumericColumnParam } from './isAColumn';
|
|
13
13
|
export declare const removeQuotes: (str: string) => string;
|
package/dist/cjs/utils/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.removeQuotes = exports.isAColumnParam = void 0;
|
|
17
|
+
exports.removeQuotes = exports.isANumericColumnParam = exports.isAColumnParam = void 0;
|
|
18
18
|
__exportStar(require("./customFunctions"), exports);
|
|
19
19
|
__exportStar(require("./aggregatedFunctions"), exports);
|
|
20
20
|
__exportStar(require("./isNumberParam"), exports);
|
|
@@ -28,6 +28,7 @@ __exportStar(require("./isLongLiteralNumber"), exports);
|
|
|
28
28
|
__exportStar(require("./cleanInvalidItemsInContext"), exports);
|
|
29
29
|
var isAColumn_1 = require("./isAColumn");
|
|
30
30
|
Object.defineProperty(exports, "isAColumnParam", { enumerable: true, get: function () { return isAColumn_1.isAColumnParam; } });
|
|
31
|
+
Object.defineProperty(exports, "isANumericColumnParam", { enumerable: true, get: function () { return isAColumn_1.isANumericColumnParam; } });
|
|
31
32
|
const removeQuotes = (str) => str.replace(/^E?'|'$/g, '');
|
|
32
33
|
exports.removeQuotes = removeQuotes;
|
|
33
34
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,wDAAsC;AACtC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,0DAAwC;AACxC,iDAA+B;AAC/B,oDAAkC;AAClC,wDAAsC;AACtC,+DAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,wDAAsC;AACtC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,0DAAwC;AACxC,iDAA+B;AAC/B,oDAAkC;AAClC,wDAAsC;AACtC,+DAA6C;AAC7C,yCAAoE;AAA3D,2GAAA,cAAc,OAAA;AAAE,kHAAA,qBAAqB,OAAA;AAEvC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Primitive } from '../constants';
|
|
2
2
|
import { ValidatorParameterContext, ValidatorResponse } from '../constants/interfaces';
|
|
3
3
|
export declare function isAColumn(context: ValidatorParameterContext): boolean;
|
|
4
|
-
export declare function isAColumnParam(
|
|
4
|
+
export declare function isAColumnParam(param: any, _dataType: Primitive | undefined, context: ValidatorParameterContext): ValidatorResponse;
|
|
5
|
+
export declare function isANumericColumnParam(param: any, dataType: Primitive | undefined, context: ValidatorParameterContext): ValidatorResponse;
|
|
@@ -1,22 +1,45 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAColumnParam = exports.isAColumn = void 0;
|
|
3
|
+
exports.isANumericColumnParam = exports.isAColumnParam = exports.isAColumn = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const dictionary_1 = require("../errors/dictionary");
|
|
6
6
|
function isAColumn(context) {
|
|
7
7
|
return context.argument.type === constants_1.AST_TYPES.column;
|
|
8
8
|
}
|
|
9
9
|
exports.isAColumn = isAColumn;
|
|
10
|
-
function
|
|
10
|
+
function isAColumnOrExternalFormula(context) {
|
|
11
11
|
const isExternalFormula = context.argument.node
|
|
12
12
|
.isExternalFormula;
|
|
13
13
|
const isRawFunction = context.argument.node.functionScope !==
|
|
14
14
|
constants_1.OPERATION_SCOPE.AGGREGATE; //Must be a negation of the aggregate scope.
|
|
15
|
-
|
|
15
|
+
return isAColumn(context) || (isExternalFormula && isRawFunction);
|
|
16
|
+
}
|
|
17
|
+
function isAColumnParam(param, _dataType, context) {
|
|
18
|
+
let valid = false;
|
|
19
|
+
if (param)
|
|
20
|
+
valid = isAColumnOrExternalFormula(context);
|
|
16
21
|
const baseResponse = { valid };
|
|
17
22
|
if (!valid)
|
|
18
|
-
return Object.assign(Object.assign({}, baseResponse),
|
|
23
|
+
return Object.assign(Object.assign(Object.assign({}, baseResponse), { mismatchData: {
|
|
24
|
+
type: constants_1.AST_TYPES.column,
|
|
25
|
+
primitive: constants_1.AST_PRIMITIVES.UNKNOWN,
|
|
26
|
+
} }), dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingColumnExpression]);
|
|
19
27
|
return baseResponse;
|
|
20
28
|
}
|
|
21
29
|
exports.isAColumnParam = isAColumnParam;
|
|
30
|
+
function isANumericColumnParam(param, dataType, context) {
|
|
31
|
+
let valid = false;
|
|
32
|
+
if (param)
|
|
33
|
+
valid =
|
|
34
|
+
isAColumnOrExternalFormula(context) &&
|
|
35
|
+
dataType === constants_1.AST_PRIMITIVES.NUMBER;
|
|
36
|
+
const baseResponse = { valid };
|
|
37
|
+
if (!valid)
|
|
38
|
+
return Object.assign(Object.assign(Object.assign({}, baseResponse), { mismatchData: {
|
|
39
|
+
type: constants_1.AST_TYPES.column,
|
|
40
|
+
primitive: constants_1.AST_PRIMITIVES.NUMBER,
|
|
41
|
+
} }), dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingColumnExpression]);
|
|
42
|
+
return baseResponse;
|
|
43
|
+
}
|
|
44
|
+
exports.isANumericColumnParam = isANumericColumnParam;
|
|
22
45
|
//# sourceMappingURL=isAColumn.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isAColumn.js","sourceRoot":"","sources":["../../../src/utils/isAColumn.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"isAColumn.js","sourceRoot":"","sources":["../../../src/utils/isAColumn.ts"],"names":[],"mappings":";;;AAAA,4CAKsB;AAOtB,qDAAoE;AAEpE,SAAgB,SAAS,CAAC,OAAkC;IACxD,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAS,CAAC,MAAM,CAAC;AACtD,CAAC;AAFD,8BAEC;AAED,SAAS,0BAA0B,CAAC,OAAkC;IAClE,MAAM,iBAAiB,GAAI,OAAO,CAAC,QAAQ,CAAC,IAA2B;SAClE,iBAAiB,CAAC;IACvB,MAAM,aAAa,GACd,OAAO,CAAC,QAAQ,CAAC,IAAwB,CAAC,aAAa;QACxD,2BAAe,CAAC,SAAS,CAAC,CAAC,4CAA4C;IAE3E,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,IAAI,aAAa,CAAC,CAAC;AACtE,CAAC;AAED,SAAgB,cAAc,CAC1B,KAAU,EACV,SAAgC,EAChC,OAAkC;IAElC,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK;QAAE,KAAK,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,CAAC;IAE/B,IAAI,CAAC,KAAK;QACN,qDACO,YAAY,KACf,YAAY,EAAE;gBACV,IAAI,EAAE,qBAAS,CAAC,MAAM;gBACtB,SAAS,EAAE,0BAAc,CAAC,OAAO;aACpC,KACE,6BAAgB,CAAC,uBAAU,CAAC,uBAAuB,CAAC,EACzD;IACN,OAAO,YAAY,CAAC;AACxB,CAAC;AAnBD,wCAmBC;AAED,SAAgB,qBAAqB,CACjC,KAAU,EACV,QAA+B,EAC/B,OAAkC;IAElC,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK;QACL,KAAK;YACD,0BAA0B,CAAC,OAAO,CAAC;gBACnC,QAAQ,KAAK,0BAAc,CAAC,MAAM,CAAC;IAC3C,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,CAAC;IAE/B,IAAI,CAAC,KAAK;QACN,qDACO,YAAY,KACf,YAAY,EAAE;gBACV,IAAI,EAAE,qBAAS,CAAC,MAAM;gBACtB,SAAS,EAAE,0BAAc,CAAC,MAAM;aACnC,KACE,6BAAgB,CAAC,uBAAU,CAAC,uBAAuB,CAAC,EACzD;IACN,OAAO,YAAY,CAAC;AACxB,CAAC;AAtBD,sDAsBC"}
|
|
@@ -29,6 +29,7 @@ export interface ProcessNodeResult {
|
|
|
29
29
|
export interface ValidatorParameterContext {
|
|
30
30
|
fnNode: FunctionCallAST;
|
|
31
31
|
argument: ProcessNodeResult;
|
|
32
|
+
globalContext?: FormulaContext;
|
|
32
33
|
}
|
|
33
34
|
export interface ValidatorFunctionParameter {
|
|
34
35
|
(value: any, dataType: Primitive | undefined, context: ValidatorParameterContext): ValidatorResponse;
|
|
@@ -10,11 +10,11 @@ export class FunctionArgumentsMismatch extends FunctionError {
|
|
|
10
10
|
}
|
|
11
11
|
export function validateParameters(definition, args, validators = []) {
|
|
12
12
|
const received = args.map((arg) => {
|
|
13
|
-
const { from, to, primitive } = arg.node;
|
|
13
|
+
const { from, to, type, primitive } = arg.node;
|
|
14
14
|
const singlePrimitive = isSinglePrimitive(primitive)
|
|
15
15
|
? primitive
|
|
16
16
|
: AST_PRIMITIVES.UNKNOWN;
|
|
17
|
-
return { from, to, primitive: singlePrimitive };
|
|
17
|
+
return { from, to, type, primitive: singlePrimitive };
|
|
18
18
|
});
|
|
19
19
|
const parameters = definition.parameters || [];
|
|
20
20
|
const expected = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mismatch.js","sourceRoot":"","sources":["../../../src/errors/mismatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAU9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAoB5D,MAAM,OAAO,yBACT,SAAQ,aAAa;IAGrB,YAAY,QAAkB;QAC1B,KAAK,CACD,QAAQ,CAAC,IAAI,EACb,gBAAgB,CAAC,UAAU,CAAC,yBAAyB,CAAC,CACzD,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,yCAAyC;IAC5E,CAAC;CAMJ;AAED,MAAM,UAAU,kBAAkB,CAC9B,UAA8B,EAC9B,IAA8B,EAC9B,aAA2C,EAAE;IAM7C,MAAM,QAAQ,GAAqB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAChD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"mismatch.js","sourceRoot":"","sources":["../../../src/errors/mismatch.ts"],"names":[],"mappings":"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"}
|