@qrvey/formula-lang 0.10.0 → 0.11.0

package/dist/cjs/functions/ifs.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IFS = void 0;
 const isBooleanExpression_1 = require("../utils/isBooleanExpression");
 const primitiveFunctions_1 = require("../utils/primitiveFunctions");
-const errors_1 = require("../errors");
 /**
  * `IFS` Returns one value if a logical expression is TRUE
  * when is False another logical expression have to be set with their returned value
@@ -11,19 +10,17 @@ const errors_1 = require("../errors");
  */
 exports.IFS = {
     identifier: 'IFS',
-    name: 'IFS',
     recursiveStartIn: 0,
     parameters: [
         {
             identifier: 'LOGICAL_EXPRESSION',
-            name: 'logical_expression',
             optional: false,
             validator: [isBooleanExpression_1.isBooleanExpression],
         },
         {
             identifier: 'VALUE_IF_TRUE',
-            name: 'VALUE_IF_TRUE',
             optional: false,
+            generic: true,
             validator: [],
         },
     ],
@@ -33,6 +30,7 @@ exports.IFS = {
         redshift,
         postgresql,
     },
+    maxPrimitiveValues: 1,
     primitiveResult(args) {
         const primitiveArgs = [];
         args.forEach((value, index) => {
@@ -40,10 +38,7 @@ exports.IFS = {
                 primitiveArgs.push(value.primitive);
             }
         });
-        const inferred = (0, primitiveFunctions_1.inferPrimitive)(...primitiveArgs);
-        if (Array.isArray(inferred))
-            throw new errors_1.InferredPrimitiveError(args[args.length - 1]);
-        return inferred;
+        return (0, primitiveFunctions_1.inferPrimitive)(...primitiveArgs);
     },
 };
 function elasticsearch(...args) {

package/dist/cjs/functions/ifs.js.map

@@ -1 +1 @@
-{"version":3,"file":"ifs.js","sourceRoot":"","sources":["../../../src/functions/ifs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ifs.js","sourceRoot":"","sources":["../../../src/functions/ifs.ts"],"names":[],"mappings":";;;AAEA,sEAAmE;AACnE,oEAA6D;AAE7D;;;;GAIG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,gBAAgB,EAAE,CAAC;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,EAAE;SAChB;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,kBAAkB,EAAE,CAAC;IACrB,eAAe,CAAC,IAAiB;QAC7B,MAAM,aAAa,GAAgB,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAgB,EAAE,KAAa,EAAE,EAAE;YAC7C,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE;gBACjB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;aACvC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAA,mCAAc,EAAC,GAAG,aAAa,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAC;AAEF,SAAS,aAAa,CAAC,GAAG,IAAW;IACjC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IACxB,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAElC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,IAAI,iBAAiB,MAAM,WAAW,UAAU,CAAC;KAC3D;SAAM;QACH,OAAO,IAAI,iBAAiB,MAAM,WAAW,MAAM,aAAa,CAC5D,GAAG,KAAK,CACX,GAAG,CAAC;KACR;AACL,CAAC;AAED,SAAS,SAAS,CAAC,GAAG,IAAW;IAC7B,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IACxB,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAElC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,OAAO,iBAAiB,KAAK,WAAW,SAAS,CAAC;KAC5D;SAAM;QACH,OAAO,OAAO,iBAAiB,KAAK,WAAW,KAAK,SAAS,CACzD,GAAG,KAAK,CACX,GAAG,CAAC;KACR;AACL,CAAC;AAED,SAAS,GAAG,CAAC,GAAG,IAAW;IACvB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IACxB,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAClC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO;;mBAEI,iBAAiB,SAAS,WAAW;;aAE3C,CAAC,IAAI,EAAE,CAAC;KAChB;SAAM;QACH,OAAO;;mBAEI,iBAAiB,SAAS,WAAW;mBACrC,GAAG,CAAC,GAAG,KAAK,CAAC;aACnB,CAAC,IAAI,EAAE,CAAC;KAChB;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,GAAG,IAAW;IAC5B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC"}

package/dist/cjs/functions/isNull.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISNULL = void 0;
-const constants_1 = require("../constants");
-const errors_1 = require("../errors");
 const isAColumn_1 = require("../utils/isAColumn");
 const isNotAColumn_1 = require("../utils/isNotAColumn");
 const primitiveFunctions_1 = require("../utils/primitiveFunctions");
@@ -11,18 +9,16 @@ const primitiveFunctions_1 = require("../utils/primitiveFunctions");
  */
 exports.ISNULL = {
     identifier: 'ISNULL',
-    name: 'ISNULL',
     parameters: [
         {
             identifier: 'VALUE',
-            name: 'VALUE',
             optional: false,
             validator: [isAColumn_1.isAColumn],
         },
         {
             identifier: 'REPLACEMENT',
-            name: 'REPLACEMENT',
             optional: false,
+            generic: true,
             validator: [isNotAColumn_1.isNotAColumn],
         },
     ],
@@ -32,12 +28,9 @@ exports.ISNULL = {
         redshift,
         postgresql,
     },
+    maxPrimitiveValues: 1,
     primitiveResult(args) {
-        var _a, _b;
-        const inferred = (0, primitiveFunctions_1.inferPrimitive)(...(args || []).map((arg) => arg.primitive));
-        if (Array.isArray(inferred))
-            throw new errors_1.ArgumentsDataTypeError(args[args.length - 1]);
-        return (_b = (_a = args === null || args === void 0 ? void 0 : args[0]) === null || _a === void 0 ? void 0 : _a.primitive) !== null && _b !== void 0 ? _b : constants_1.AST_PRIMITIVES.UNKNOWN;
+        return (0, primitiveFunctions_1.inferPrimitive)(...(args || []).map((arg) => arg.primitive));
     },
 };
 function elasticsearch(value, replacement) {

package/dist/cjs/functions/isNull.js.map

@@ -1 +1 @@
-{"version":3,"file":"isNull.js","sourceRoot":"","sources":["../../../src/functions/isNull.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAE9C,sCAAmD;AACnD,kDAA+C;AAC/C,wDAAqD;AACrD,oEAA6D;AAE7D;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAS,CAAC;SACzB;QACD;YACI,UAAU,EAAE,aAAa;YACzB,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,2BAAY,CAAC;SAC5B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,CAAC,IAAiB;;QAC7B,MAAM,QAAQ,GAAG,IAAA,mCAAc,EAC3B,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAC9C,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACvB,MAAM,IAAI,+BAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5D,OAAO,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,CAAC,CAAC,0CAAE,SAAS,mCAAI,0BAAc,CAAC,OAAO,CAAC;IAC1D,CAAC;CACJ,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,WAAmB;IACrD,OAAO,kBAAkB,KAAK,KAAK,WAAW,GAAG,CAAC;AACtD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,WAAmB;IAC3C,OAAO,YAAY,KAAK,KAAK,WAAW,GAAG,CAAC;AAChD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,WAAmB;IACjD,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,WAAmB;IAChD,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,WAAmB;IAClD,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"isNull.js","sourceRoot":"","sources":["../../../src/functions/isNull.ts"],"names":[],"mappings":";;;AACA,kDAA+C;AAC/C,wDAAqD;AACrD,oEAA6D;AAE7D;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAS,CAAC;SACzB;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,CAAC,2BAAY,CAAC;SAC5B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,kBAAkB,EAAE,CAAC;IACrB,eAAe,CAAC,IAAiB;QAC7B,OAAO,IAAA,mCAAc,EAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC;CACJ,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,WAAmB;IACrD,OAAO,kBAAkB,KAAK,KAAK,WAAW,GAAG,CAAC;AACtD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,WAAmB;IAC3C,OAAO,YAAY,KAAK,KAAK,WAAW,GAAG,CAAC;AAChD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,WAAmB;IACjD,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,WAAmB;IAChD,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,WAAmB;IAClD,OAAO,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC"}

package/dist/cjs/functions/mid.js

@@ -8,23 +8,19 @@ const utils_1 = require("../utils");
  */
 exports.MID = {
     identifier: 'MID',
-    name: 'MID',
     parameters: [
         {
             identifier: 'CURRENT',
-            name: 'current',
             optional: false,
             validator: [utils_1.isStringParam],
         },
         {
             identifier: 'STARTING_AT',
-            name: 'starting_at',
             optional: false,
             validator: [utils_1.isNumberParam],
         },
         {
             identifier: 'EXTRACT_LENGTH',
-            name: 'extract_length',
             optional: true,
             validator: [utils_1.isNumberParam],
         },

package/dist/cjs/functions/mid.js.map

@@ -1 +1 @@
-{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":";;;AAAA,4CAA0E;AAE1E,oCAAwD;AAExD;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE;QACR;YACI,UAAU,EAAE,SAAS;YACrB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,gBAAgB;YACtB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACjE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,GAAG,sCAA0B,CAAC,SAAS,IAAI,OAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,CAAC;AACtF,CAAC;AAED,SAAS,GAAG,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,aAAa,OAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC7D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC5D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC9D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":";;;AAAA,4CAA0E;AAE1E,oCAAwD;AAExD;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,gBAAgB;YAC5B,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACjE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,GAAG,sCAA0B,CAAC,SAAS,IAAI,OAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,CAAC;AACtF,CAAC;AAED,SAAS,GAAG,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,aAAa,OAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC7D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC5D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC9D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}

package/dist/cjs/functions/minute.js

@@ -9,11 +9,9 @@ const constants_1 = require("../constants");
  */
 exports.MINUTE = {
     identifier: 'MINUTE',
-    name: 'MINUTE',
     parameters: [
         {
             identifier: 'DATE',
-            name: 'date',
             optional: false,
             validator: [utils_1.isDateParam],
         },

package/dist/cjs/functions/minute.js.map

@@ -1 +1 @@
-{"version":3,"file":"minute.js","sourceRoot":"","sources":["../../../src/functions/minute.ts"],"names":[],"mappings":";;;AACA,4DAA8D;AAC9D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,uBAAuB,KAAK,GAAG,CAAC;AAC3C,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"}
+{"version":3,"file":"minute.js","sourceRoot":"","sources":["../../../src/functions/minute.ts"],"names":[],"mappings":";;;AACA,4DAA8D;AAC9D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,uBAAuB,KAAK,GAAG,CAAC;AAC3C,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"}

package/dist/cjs/functions/month.js

@@ -9,11 +9,9 @@ const constants_1 = require("../constants");
  */
 exports.MONTH = {
     identifier: 'MONTH',
-    name: 'MONTH',
     parameters: [
         {
             identifier: 'DATE',
-            name: 'date',
             optional: false,
             validator: [utils_1.isDateParam],
         },

package/dist/cjs/functions/month.js.map

@@ -1 +1 @@
-{"version":3,"file":"month.js","sourceRoot":"","sources":["../../../src/functions/month.ts"],"names":[],"mappings":";;;AACA,4DAA6D;AAC7D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,KAAK,GAAuB;IACrC,UAAU,EAAE,OAAO;IACnB,IAAI,EAAE,OAAO;IACb,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,sBAAsB,KAAK,GAAG,CAAC;AAC1C,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"}
+{"version":3,"file":"month.js","sourceRoot":"","sources":["../../../src/functions/month.ts"],"names":[],"mappings":";;;AACA,4DAA6D;AAC7D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,KAAK,GAAuB;IACrC,UAAU,EAAE,OAAO;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,sBAAsB,KAAK,GAAG,CAAC;AAC1C,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"}

package/dist/cjs/functions/second.js

@@ -9,11 +9,9 @@ const constants_1 = require("../constants");
  */
 exports.SECOND = {
     identifier: 'SECOND',
-    name: 'SECOND',
     parameters: [
         {
             identifier: 'DATE',
-            name: 'date',
             optional: false,
             validator: [utils_1.isDateParam],
         },

package/dist/cjs/functions/second.js.map

@@ -1 +1 @@
-{"version":3,"file":"second.js","sourceRoot":"","sources":["../../../src/functions/second.ts"],"names":[],"mappings":";;;AACA,4DAA8D;AAC9D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,uBAAuB,KAAK,GAAG,CAAC;AAC3C,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"}
+{"version":3,"file":"second.js","sourceRoot":"","sources":["../../../src/functions/second.ts"],"names":[],"mappings":";;;AACA,4DAA8D;AAC9D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,MAAM,GAAuB;IACtC,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,uBAAuB,KAAK,GAAG,CAAC;AAC3C,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"}

package/dist/cjs/functions/year.js

@@ -9,11 +9,9 @@ const constants_1 = require("../constants");
  */
 exports.YEAR = {
     identifier: 'YEAR',
-    name: 'YEAR',
     parameters: [
         {
             identifier: 'DATE',
-            name: 'date',
             optional: false,
             validator: [utils_1.isDateParam],
         },

package/dist/cjs/functions/year.js.map

@@ -1 +1 @@
-{"version":3,"file":"year.js","sourceRoot":"","sources":["../../../src/functions/year.ts"],"names":[],"mappings":";;;AACA,4DAA4D;AAC5D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,IAAI,GAAuB;IACpC,UAAU,EAAE,MAAM;IAClB,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,oBAAU,EAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,qBAAqB,KAAK,GAAG,CAAC;AACzC,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"}
+{"version":3,"file":"year.js","sourceRoot":"","sources":["../../../src/functions/year.ts"],"names":[],"mappings":";;;AACA,4DAA4D;AAC5D,oCAAuC;AACvC,4CAA8C;AAE9C;;GAEG;AACU,QAAA,IAAI,GAAuB;IACpC,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAChC,OAAO,IAAA,oBAAU,EAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,qBAAqB,KAAK,GAAG,CAAC;AACzC,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"}

package/dist/cjs/grammar/generated/qformula.lang.js

@@ -5,25 +5,47 @@ const lr_1 = require("@lezer/lr");
 const language_1 = require("@codemirror/language");
 const highlight_1 = require("@lezer/highlight");
 // This file was generated by lezer-generator. You probably shouldn't edit it.
+const noOprt = 24;
+const space = [
+    9, 10, 11, 12, 13, 32, 133, 160, 5760, 8192, 8193, 8194, 8195, 8196, 8197,
+    8198, 8199, 8200, 8201, 8202, 8232, 8233, 8239, 8287, 12288,
+];
+const operators = [43, 45, 42, 47, 60, 61, 62];
+const parenteses = [41, 40];
+const comma = 44;
+const noOperator = new lr_1.ExternalTokenizer((input, stack) => {
+    const { next } = input;
+    if (space.indexOf(next) > -1 ||
+        parenteses.indexOf(next) > -1 ||
+        next === comma)
+        return;
+    if (operators.indexOf(next) === -1 &&
+        next != -1 &&
+        !stack.context &&
+        stack.canShift(noOprt)) {
+        input.acceptToken(noOprt);
+    }
+}, { contextual: true });
+// This file was generated by lezer-generator. You probably shouldn't edit it.
 const spec_identifier = { __proto__: null, true: 14, false: 14 };
 const parser = lr_1.LRParser.deserialize({
     version: 14,
-    states: "%QO]QPOOOOQO'#C_'#C_OOQO'#Cf'#CfOwQPO'#CeO|QQO'#CiO]QPO'#CjQ!RQPOOO]QPO'#CqOOQO'#C^'#C^O!dQPO,59PO!kQPO,59TOOQO,59U,59UO]QPO,59WO]QPO,59WO]QPO,59WO]QPO,59WO!pQPO,59]O!wQPO'#CyOOQO'#Ch'#ChO#RQPO1G.kOOQO1G.o1G.oOOQO1G.r1G.rO#oQPO1G.rO#vQPO1G.rO#}QPO1G.rOOQO1G.w1G.wO]QPO'#CrO$iQPO,59eOOQO7+$V7+$VO$qQPO,59^OOQO-E6p-E6p",
-    stateData: "%V~OiOSjOSkOS~OSPOTPOUPOVPOZVO_TOlQOpSO~OZXO~OqYO~O_]Oa[Ob[Oc^Od_O~OWmP~P]OodO~OWiO~P!ROnjOWmX~P!ROWlO~Oa[Ob[Oc`id`ig`iW`in`i~O_`i~P#WO_]O~P#WO_]Oa[Ob[Oc^Od`ig`iW`in`i~OnjOWma~OWfanfa~P!ROTUijiklka~",
-    goto: "#OnPPo![PPPPP![!gP!r![![P![PPPP![!uPPPPPP!{QUOQZTQ`VQaXQe[Qf]Qg^Qh_RmjcWOTVX[]^_jcROTVX[]^_jRcXQkaRnkRbX",
+    states: "%^O]QQOOOOQP'#C_'#C_OOQO'#Cf'#CfOwQQO'#CeO|QSO'#CiO]QQO'#CjQ!RQROOO]QQO'#CqOOQP'#C^'#C^O!gQQO,59PO!nQQO,59TOOQP,59U,59UO]QQO,59WO]QQO,59WO]QQO,59WO]QQO,59WO]QQO,59WO!sQRO,59]O!zQRO'#CzOOQO'#Ch'#ChO#UQQO1G.kOOQP1G.o1G.oOOQP1G.r1G.rO#uQRO1G.rO#|QRO1G.rO$oQRO1G.rO$vQRO1G.rOOQP1G.w1G.wO]QQO'#CrO$}QQO,59fOOQP7+$V7+$VO%VQRO,59^OOQO-E6p-E6p",
+    stateData: "%k~OjOSkOSlOS~OSPOTPOUPOVPOZVO_TOmQOqSO~OZXO~OrYO~O_]Oa[Ob[Oc^Od_Oh`O~OWnP~P]OpeO~OWkO~P!ROolOWnX~P!ROWnO~Oa[Ob[Oc`id`ig`ih`iW`io`i~O_`i~P#ZO_]O~P#ZO_]Oa[Ob[Oc^Og`ih`iW`io`i~Od`i~P$TOd_O~P$TOolOWna~OWfaofa~P!ROTUjkjlmla~",
+    goto: "#UoPPp!`PPPPP!`!lP!x!`!`P!`PPPP!`!{PPPPPPP#RQUOQZTQaVQbXQf[Qg]Qh^Qi_Qj`RoleWOTVX[]^_`leROTVX[]^_`lRdXQmbRpmRcX",
     nodeNames: "⚠ Program Expression Value Number Date String Boolean ParenthesisEnd Function FunctionIdentifier ParenthesisStart FunctionArguments Variable UnaryExpression ArithOp BinaryExpression ArithOp ArithOp LogicOp LogicOp ParenthesizedExpression",
-    maxTerm: 33,
+    maxTerm: 34,
     nodeProps: [
         ["openedBy", 8, "ParenthesisStart"],
         ["closedBy", 11, "ParenthesisEnd"]
     ],
     skippedNodes: [0],
     repeatNodeCount: 1,
-    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~#[Yi~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~$POj~~$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~%dOU~~%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~4nOT~U~~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~7pOZ~~7uOW~~7zOb~R8RV_PqQ{|8h}!O8h!O!P8h!Q![8h!c!}8h#R#S8h#T#o8hQ8mVqQ{|8h}!O8h!O!P8h!Q![8h!c!}8h#R#S8h#T#o8h~9XOn~R9^VqQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S8h#T#o8hR9zVSPqQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S9s#T#o8h~:fPa~!P!Q:i~:nSk~OY:iZ;'S:i;'S;=`:z<%lO:i~:}P;=`<%l:iR;XVSPqQ{|8h}!O8h!O!P9s!Q![;Q!c!}8h#R#S;Q#T#o8h~;sQc~!_!`;y!`!a;y~<OOc~~<TOd~~<YPc~!_!`;yR<dVqQlP{|8h}!O8h!O!P8h!Q![<]!c!}<]#R#S<]#T#o<]~=OOp~~=TOo~",
-    tokenizers: [0, 1],
+    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~#[Yj~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~$POk~~$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~%dOU~~%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~4nOT~U~~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~7pOZ~~7uOW~~7zOb~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#o8hR9zVSPrQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S9s#T#o8h~:fPa~!P!Q:i~:nSl~OY:iZ;'S:i;'S;=`:z<%lO:i~:}P;=`<%l:iR;XVSPrQ{|8h}!O8h!O!P9s!Q![;Q!c!}8h#R#S;Q#T#o8h~;sQc~!_!`;y!`!a<O~<OOc~~<TOd~~<YPc~!_!`;yR<dVrQmP{|8h}!O8h!O!P8h!Q![<]!c!}<]#R#S<]#T#o<]~=OOq~~=TOp~",
+    tokenizers: [noOperator, 0, 1],
     topRules: { "Program": [0, 1] },
-    specialized: [{ term: 28, get: value => spec_identifier[value] || -1 }],
-    tokenPrec: 181
+    specialized: [{ term: 29, get: value => spec_identifier[value] || -1 }],
+    tokenPrec: 201
 });
 const QFormulaHighlightConfig = {
     parser: parser.configure({

package/dist/cjs/grammar/generated/qformula.lang.js.map

@@ -1 +1 @@
-{"version":3,"file":"qformula.lang.js","sourceRoot":"","sources":["../../../../src/grammar/generated/qformula.lang.js"],"names":[],"mappings":";;;AAAA,kCAAqC;AACrC,mDAAmE;AACnE,gDAAmD;AAEnD,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,8TAA8T;IACtU,SAAS,EAAE,wMAAwM;IACnN,IAAI,EAAE,0GAA0G;IAChH,SAAS,EAAE,+OAA+O;IAC1P,OAAO,EAAE,EAAE;IACX,SAAS,EAAE;QACT,CAAC,UAAU,EAAE,CAAC,EAAC,kBAAkB,CAAC;QAClC,CAAC,UAAU,EAAE,EAAE,EAAC,gBAAgB,CAAC;KAClC;IACD,YAAY,EAAE,CAAC,CAAC,CAAC;IACjB,eAAe,EAAE,CAAC;IAClB,SAAS,EAAE,w2EAAw2E;IACn3E,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAClB,QAAQ,EAAE,EAAC,SAAS,EAAC,CAAC,CAAC,EAAC,CAAC,CAAC,EAAC;IAC3B,WAAW,EAAE,CAAC,EAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAC,CAAC;IACrE,SAAS,EAAE,GAAG;CACf,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC;QACrB,KAAK,EAAE;YACH,IAAA,qBAAS,EAAC;gBACN,OAAO,EAAE,gBAAI,CAAC,IAAI;gBAClB,MAAM,EAAE,gBAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,gBAAI,CAAC,MAAM;gBACjB,MAAM,EAAE,gBAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,gBAAI,CAAC,OAAO;gBACtB,WAAW,EAAE,gBAAI,CAAC,WAAW;gBAC7B,kBAAkB,EAAE,gBAAI,CAAC,WAAW;gBACpC,KAAK,EAAE,gBAAI,CAAC,KAAK;aACpB,CAAC;SACL;KACJ,CAAC;IACF,YAAY,EAAE;QACV,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;KAChC;CACJ,CAAC;AAMiB,0DAAuB;AAL1C,MAAM,YAAY,GAAG,qBAAU,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAKpB,oCAAY;AAJxD,SAAS,QAAQ;IACb,OAAO,IAAI,0BAAe,CAAC,YAAY,CAAC,CAAC;AAC7C,CAAC;AAEQ,4BAAQ"}
+{"version":3,"file":"qformula.lang.js","sourceRoot":"","sources":["../../../../src/grammar/generated/qformula.lang.js"],"names":[],"mappings":"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"}

package/dist/cjs/grammar/generated/qformula.lang.terms.d.ts

@@ -1,6 +1,7 @@
-export const spaces: 25;
-export const newline: 26;
-export const lineComment: 27;
+export const noOprt: 24;
+export const spaces: 26;
+export const newline: 27;
+export const lineComment: 28;
 export const Program: 1;
 export const Expression: 2;
 export const Value: 3;

package/dist/cjs/grammar/generated/qformula.lang.terms.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = void 0;
+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;
 // This file was generated by lezer-generator. You probably shouldn't edit it.
-exports.spaces = 25, exports.newline = 26, exports.lineComment = 27, exports.Program = 1, exports.Expression = 2, exports.Value = 3, exports.Number = 4, exports.Date = 5, exports.String = 6, exports.ParenthesisEnd = 8, exports.Function = 9, exports.FunctionIdentifier = 10, exports.ParenthesisStart = 11, exports.FunctionArguments = 12, exports.Variable = 13, exports.UnaryExpression = 14, exports.BinaryExpression = 16, exports.divide = 17, exports.ParenthesizedExpression = 21;
+exports.noOprt = 24, exports.spaces = 26, exports.newline = 27, exports.lineComment = 28, exports.Program = 1, exports.Expression = 2, exports.Value = 3, exports.Number = 4, exports.Date = 5, exports.String = 6, exports.ParenthesisEnd = 8, exports.Function = 9, exports.FunctionIdentifier = 10, exports.ParenthesisStart = 11, exports.FunctionArguments = 12, exports.Variable = 13, exports.UnaryExpression = 14, exports.BinaryExpression = 16, exports.divide = 17, exports.ParenthesizedExpression = 21;
 //# sourceMappingURL=qformula.lang.terms.js.map

package/dist/cjs/grammar/generated/qformula.lang.terms.js.map

@@ -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,OAAO,GAAG,EAAE,EACZ,QAAA,WAAW,GAAG,EAAE,EAChB,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,CAAC,EACZ,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"}
+{"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,EAAE,EAChB,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,CAAC,EACZ,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"}

package/dist/cjs/grammar/tokens.d.ts

@@ -0,0 +1,2 @@
+import { ExternalTokenizer } from '@lezer/lr';
+export declare const noOperator: ExternalTokenizer;

package/dist/cjs/grammar/tokens.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.noOperator = void 0;
+const lr_1 = require("@lezer/lr");
+const qformula_lang_terms_1 = require("./generated/qformula.lang.terms");
+const space = [
+    9, 10, 11, 12, 13, 32, 133, 160, 5760, 8192, 8193, 8194, 8195, 8196, 8197,
+    8198, 8199, 8200, 8201, 8202, 8232, 8233, 8239, 8287, 12288,
+];
+const operators = [43, 45, 42, 47, 60, 61, 62];
+const parenteses = [41, 40];
+const comma = 44;
+exports.noOperator = new lr_1.ExternalTokenizer((input, stack) => {
+    const { next } = input;
+    if (space.indexOf(next) > -1 ||
+        parenteses.indexOf(next) > -1 ||
+        next === comma)
+        return;
+    if (operators.indexOf(next) === -1 &&
+        next != -1 &&
+        !stack.context &&
+        stack.canShift(qformula_lang_terms_1.noOprt)) {
+        input.acceptToken(qformula_lang_terms_1.noOprt);
+    }
+}, { contextual: true });
+//# sourceMappingURL=tokens.js.map

package/dist/cjs/grammar/tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../src/grammar/tokens.ts"],"names":[],"mappings":";;;AAAA,kCAA8C;AAC9C,yEAAyD;AAEzD,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;AAEF,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;AAEJ,QAAA,UAAU,GAAG,IAAI,sBAAiB,CAC3C,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;IACb,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,IACI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,KAAK;QAEd,OAAO;IACX,IACI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,CAAC;QACV,CAAC,KAAK,CAAC,OAAO;QACd,KAAK,CAAC,QAAQ,CAAC,4BAAM,CAAC,EACxB;QACE,KAAK,CAAC,WAAW,CAAC,4BAAM,CAAC,CAAC;KAC7B;AACL,CAAC,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACvB,CAAC"}

package/dist/cjs/parser/formula-parser.d.ts

@@ -1,4 +1,5 @@
 import { SyntaxNode } from '@lezer/common';
-import { FormulaContext, FormulaInference, FunctionCallAST } from '../constants/interfaces';
+import { FormulaContext, FormulaInference, FunctionCallAST, ProgramPosition } from '../constants/interfaces';
 import { TransformNodeFNType } from './interfaces';
 export declare function transformFunctionExpression(program: string, node: SyntaxNode, inference: FormulaInference, context: FormulaContext | undefined, transformNodeFunction: TransformNodeFNType): FunctionCallAST;
+export declare function createPositionASTFromSyntaxNode({ from, to, }: SyntaxNode): ProgramPosition;

package/dist/cjs/parser/formula-parser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformFunctionExpression = void 0;
+exports.createPositionASTFromSyntaxNode = exports.transformFunctionExpression = void 0;
 const utils_1 = require("../utils");
 const syntax_errors_1 = require("./syntax-errors");
 const primitiveFunctions_1 = require("../utils/primitiveFunctions");
@@ -14,6 +14,7 @@ function transformFunctionExpression(program, node, inference, context, transfor
     const parenthesisStart = node.getChild('ParenthesisStart');
     const parenthesisEnd = node.getChild('ParenthesisEnd');
     const args = getFunctionArguments(node, parenthesisStart, program, inference, context, transformNodeFunction);
+    const functionIdentifier = createPositionASTFromSyntaxNode(fnIdentifier);
     const baseNode = {
         type: constants_1.AST_TYPES.functionCall,
         name: (0, utils_1.getNodeValue)(program, fnIdentifier),
@@ -22,22 +23,16 @@ function transformFunctionExpression(program, node, inference, context, transfor
         to: node.to,
         parenthesisStart: !!parenthesisStart,
         parenthesisEnd: !!parenthesisEnd,
-        formulaText: fnString,
+        functionText: fnString,
+        functionIdentifier,
     };
     const functionExists = functions_1.FUNCTION_LIST.includes(fnName);
     const functionDetail = functionExists
         ? (0, functions_1.getFunctionDetail)(fnName)
         : undefined;
-    let primitive;
-    try {
-        primitive = functionDetail
-            ? (0, primitiveFunctions_1.getFunctionPrimitive)(functionDetail, baseNode.arguments)
-            : constants_1.AST_PRIMITIVES.UNKNOWN;
-    }
-    catch (error) {
-        primitive = constants_1.AST_PRIMITIVES.UNKNOWN;
-        inference.errorList.push(error);
-    }
+    const primitive = functionDetail
+        ? (0, primitiveFunctions_1.getFunctionPrimitive)(functionDetail, baseNode.arguments)
+        : constants_1.AST_PRIMITIVES.UNKNOWN;
     const resultNode = Object.assign(Object.assign({}, baseNode), { primitive });
     if (functionExists && (!parenthesisStart || !parenthesisEnd)) {
         inference.errorList.push(new errors_1.MissingParenthesisError(Object.assign(Object.assign({}, resultNode), { from: !parenthesisStart ? resultNode.from : resultNode.to })));
@@ -93,4 +88,8 @@ function createCommonASTFromNode(program, node, inference, context, transformNod
     }
     return transformNodeFunction(program, node, inference, context);
 }
+function createPositionASTFromSyntaxNode({ from, to, }) {
+    return { from, to };
+}
+exports.createPositionASTFromSyntaxNode = createPositionASTFromSyntaxNode;
 //# sourceMappingURL=formula-parser.js.map

package/dist/cjs/parser/formula-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"formula-parser.js","sourceRoot":"","sources":["../../../src/parser/formula-parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formula-parser.js","sourceRoot":"","sources":["../../../src/parser/formula-parser.ts"],"names":[],"mappings":"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"}

package/dist/cjs/parser/json-parser.js

@@ -80,9 +80,33 @@ function transformNode(program, node, inference, context) {
         inference.flatBody.push(resultNode);
     return resultNode;
 }
-const VALID_STRING_DATE_BINARY_OPERATORS = ['=', '<>'];
-function isValidStringDateBinaryOperation(logicOperator) {
-    return VALID_STRING_DATE_BINARY_OPERATORS.includes(logicOperator);
+const VALID_OPERATIONS_BY_TYPE = {
+    [constants_1.AST_PRIMITIVES.NUMBER]: [
+        '+',
+        '-',
+        '*',
+        '/',
+        '<',
+        '<=',
+        '>',
+        '>=',
+        '=',
+        '<>',
+    ],
+    [constants_1.AST_PRIMITIVES.STRING]: ['=', '<>'],
+    [constants_1.AST_PRIMITIVES.DATE]: ['=', '<>'],
+    [constants_1.AST_PRIMITIVES.BOOLEAN]: [],
+    [constants_1.AST_PRIMITIVES.UNKNOWN]: [],
+};
+function operatorIsValidForOperation(operator, leftPrimitive, rightPrimitive) {
+    const allowedOperators = calculateValidOperatorsByType(leftPrimitive, rightPrimitive);
+    return allowedOperators.includes(operator);
+}
+function calculateValidOperatorsByType(leftPrimitive, rightPrimitive) {
+    if (leftPrimitive === rightPrimitive && !Array.isArray(leftPrimitive)) {
+        return VALID_OPERATIONS_BY_TYPE[leftPrimitive];
+    }
+    return [];
 }
 function calculateBinaryElements(program, node, left, right) {
     const leftPrimitive = left === null || left === void 0 ? void 0 : left.primitive;
@@ -91,23 +115,17 @@ function calculateBinaryElements(program, node, left, right) {
     const arithOperator = node.getChild('ArithOp');
     const leftIsAValidNumber = leftPrimitive === constants_1.AST_PRIMITIVES.NUMBER;
     const rightIsAValidNumber = rightPrimitive === constants_1.AST_PRIMITIVES.NUMBER;
-    const leftIsAValidString = leftPrimitive === constants_1.AST_PRIMITIVES.STRING;
-    const rightIsAValidString = rightPrimitive === constants_1.AST_PRIMITIVES.STRING;
-    const leftIsAValidDate = leftPrimitive === constants_1.AST_PRIMITIVES.DATE;
-    const rightIsAValidDate = rightPrimitive === constants_1.AST_PRIMITIVES.DATE;
     const operatorNode = (logicOperator !== null && logicOperator !== void 0 ? logicOperator : arithOperator);
     const operator = (0, utils_1.getNodeValue)(program, operatorNode);
+    const operatorPosition = !operatorNode
+        ? undefined
+        : (0, formula_parser_1.createPositionASTFromSyntaxNode)(operatorNode);
+    const validOperators = calculateValidOperatorsByType(leftPrimitive, rightPrimitive);
     // primitive is number if arithOperator is not null and both left and right are numbers
     // primitive is boolean if logicOperator is not null and both left and right are booleans
     let primitive = constants_1.AST_PRIMITIVES.UNKNOWN;
     if (logicOperator) {
-        if ((leftPrimitive === rightPrimitive &&
-            !leftIsAValidString &&
-            !leftIsAValidDate) ||
-            (((leftIsAValidString && rightIsAValidString) ||
-                (leftIsAValidDate && rightIsAValidDate)) &&
-                // string and date operation only with allowed operators
-                isValidStringDateBinaryOperation(operator))) {
+        if (operatorIsValidForOperation(operator, leftPrimitive, rightPrimitive)) {
             primitive = constants_1.AST_PRIMITIVES.BOOLEAN;
         }
     }
@@ -122,25 +140,29 @@ function calculateBinaryElements(program, node, left, right) {
     return {
         primitive,
         operator,
+        operatorNode: operatorPosition,
         hasInvalidError,
+        validOperators,
     };
 }
 function transformBinaryExpression(program, node, inference, context) {
     const [leftNode, rightNode] = node.getChildren('Expression');
     const left = transformNode(program, leftNode, inference, context);
     const right = transformNode(program, rightNode, inference, context);
-    const { primitive, operator, hasInvalidError } = calculateBinaryElements(program, node, left, right);
+    const { primitive, operator, operatorNode, hasInvalidError, validOperators, } = calculateBinaryElements(program, node, left, right);
     const binaryAST = {
         operator,
+        operatorNode,
         type: constants_1.AST_TYPES.binaryExpression,
         left,
         right,
         from: node.from,
         to: node.to,
         primitive,
+        validOperators,
     };
     if (hasInvalidError) {
-        inference.errorList.push(new errors_1.NotAllowedExpressionError(binaryAST));
+        inference.errorList.push(new errors_1.NotAllowedOperationError(binaryAST));
     }
     return binaryAST;
 }
@@ -151,16 +173,19 @@ function transformUnaryExpression(program, node, inference, context) {
     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)
         ? right.primitive
         : constants_1.AST_PRIMITIVES.UNKNOWN;
+    const validOperators = (right === null || right === void 0 ? void 0 : right.primitive) === constants_1.AST_PRIMITIVES.NUMBER ? ['+', '-'] : [];
     const unaryAST = {
         operator: (0, utils_1.getNodeValue)(program, operator),
+        operatorNode: (0, formula_parser_1.createPositionASTFromSyntaxNode)(operator),
         type: constants_1.AST_TYPES.unaryExpression,
         right,
         from: node.from,
         to: node.to,
         primitive,
+        validOperators,
     };
     if (!rightNode) {
-        inference.errorList.push(new errors_1.NotAllowedExpressionError(unaryAST));
+        inference.errorList.push(new errors_1.NotAllowedOperationError(unaryAST));
     }
     return unaryAST;
 }
@@ -171,10 +196,14 @@ function transformParenthesizedExpression(program, node, inference, context) {
     const parenthesisEnd = node.getChild('ParenthesisEnd');
     const resultNode = transformNode(program, expressionNode, inference, context);
     if (!parenthesisStart || !parenthesisEnd) {
+        const [from, to] = [
+            !parenthesisStart ? node.from : parenthesisStart.from,
+            !parenthesisStart ? node.to : parenthesisStart.to,
+        ];
         inference.errorList.push(new errors_1.MissingParenthesisError({
             type: constants_1.AST_TYPES.parenthesisExpression,
-            from: !parenthesisStart ? node.from : node.to,
-            to: node.to,
+            from,
+            to,
             primitive: (_a = resultNode === null || resultNode === void 0 ? void 0 : resultNode.primitive) !== null && _a !== void 0 ? _a : constants_1.AST_PRIMITIVES.UNKNOWN,
         }));
     }