@qrvey/formula-lang 2.0.0-post-mvp → 2.0.0

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

@@ -1,51 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QFormulaLang = exports.QFormulaHighlightConfig = exports.QFormula = void 0;
+exports.QFormulaParser = exports.QFormulaLang = exports.QFormula = void 0;
 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 spec_identifier = { __proto__: null, true: 14, false: 14 };
+const noOprt = 25;
+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: 16, false: 16 };
 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",
-    nodeNames: "⚠ Program Expression Value Number Date String Boolean ParenthesisEnd Function FunctionIdentifier ParenthesisStart FunctionArguments Variable UnaryExpression ArithOp BinaryExpression ArithOp ArithOp LogicOp LogicOp ParenthesizedExpression",
-    maxTerm: 33,
+    states: "%^O]QQOOOOQP'#C`'#C`OOQO'#Cg'#CgOwQQO'#CfO|QSO'#CjO]QQO'#CkQ!RQROOO]QQO'#CrOOQP'#C_'#C_O!gQQO,59QO!nQQO,59UOOQP,59V,59VO]QQO,59XO]QQO,59XO]QQO,59XO]QQO,59XO]QQO,59XO!sQRO,59^O!zQRO'#CzOOQO'#Ci'#CiO#UQQO1G.lOOQP1G.p1G.pOOQP1G.s1G.sO#uQRO1G.sO#|QRO1G.sO$oQRO1G.sO$vQRO1G.sOOQP1G.x1G.xO]QQO'#CsO$}QQO,59fOOQP7+$W7+$WO%VQRO,59_OOQO-E6q-E6q",
+    stateData: "%k~OkOSlOSPOS~OTPOUPOVPOWPO[VO`TOmQOqSO~O[XO~OrYO~O`]Ob[Oc[Od^Oe_Oi`O~OXnP~P]OpeO~OXkO~P!ROolOXnX~P!ROXnO~Ob[Oc[OdaieaihaiiaiXaioai~O`ai~P#ZO`]O~P#ZO`]Ob[Oc[Od^OhaiiaiXaioai~Oeai~P$TOe_O~P$TOolOXna~OXgaoga~P!ROUVklkPmPb~",
+    goto: "#UoPPPp!`PPPPP!`!lP!x!`!`P!`PPPP!`!{PPPPPP#RQUOQZTQaVQbXQf[Qg]Qh^Qi_Qj`RoleWOTVX[]^_`leROTVX[]^_`lRdXQmbRpmRcX",
+    nodeNames: "⚠ LineComment Program Expression Value Number Date String Boolean ParenthesisEnd Function FunctionIdentifier ParenthesisStart FunctionArguments Variable UnaryExpression ArithOp BinaryExpression ArithOp ArithOp LogicOp LogicOp ParenthesizedExpression",
+    maxTerm: 34,
     nodeProps: [
-        ["openedBy", 8, "ParenthesisStart"],
-        ["closedBy", 11, "ParenthesisEnd"]
+        ["openedBy", 9, "ParenthesisStart"],
+        ["closedBy", 12, "ParenthesisEnd"]
     ],
-    skippedNodes: [0],
+    skippedNodes: [0, 1],
     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],
-    topRules: { "Program": [0, 1] },
-    specialized: [{ term: 28, get: value => spec_identifier[value] || -1 }],
-    tokenPrec: 181
+    tokenData: "=T~RpXY#VYZ#zZ[#V]^#zpq#Vrs$Pxy7kyz7pz{7u{|7z|}9S}!O7z!O!P9X!P!Q:a!Q![;Q!^!_;n!_!`<O!`!a<T!c!}<]!}#O<y#P#Q=O#R#S8h#T#o<]$f$g#V#BY#BZ#V$IS$I_#V$I|$I}#z$I}$JO#z$JT$JU#V$KV$KW#V&FU&FV#V?HT?HU#V~#[Yk~XY#VZ[#Vpq#V$f$g#V#BY#BZ#V$IS$I_#V$JT$JU#V$KV$KW#V&FU&FV#V?HT?HU#V~$POl~~$SZOr$urs%_s!Q$u!Q!R&c!R!S6r!S![6S![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~$xVOr$urs%_s#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~%dOV~~%gRO;'S$u;'S;=`%p;=`O$u~%sWOr$urs%_s#O$u#O#P%d#P;'S$u;'S;=`&];=`<%l$u<%lO$u~&`P;=`<%l$u~&fYOr$urs%_s!P$u!P!Q'U!Q![6S![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~'X]Or$urs%_s!Q$u!Q!R(Q!R!S(Q!S!T(Q!T!U(Q!U![5d![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~(TYOr$urs%_s!P$u!P!Q(s!Q![5d![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~(vXOr$urs%_s!Q$u!Q![)c![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~)fXOr$urs%_s!Q$u!Q![*R![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~*UXOr$urs%_s!Q$u!Q![*q![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~*tXOr$urs%_s!Q$u!Q![+a![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~+dkOX$uX^-X^p$upq-Xqr$urs4gs#O$u#O#P%d#P#y$u#y#z-X#z$f$u$f$g-X$g#BY$u#BY#BZ-X#BZ$IS$u$IS$I_-X$I_$I|$u$I|$JO-X$JO$JT$u$JT$JU-X$JU$KV$u$KV$KW-X$KW&FU$u&FU&FV-X&FV;'S$u;'S;=`&]<%lO$u~-[pOX$uX^-X^p$upq-Xqr$urs%_s!Q$u!Q!R/`!R!S/`!S!T4n!T![0R![#O$u#O#P%d#P#y$u#y#z-X#z$f$u$f$g-X$g#BY$u#BY#BZ-X#BZ$IS$u$IS$I_-X$I_$I|$u$I|$JO-X$JO$JT$u$JT$JU-X$JU$KV$u$KV$KW-X$KW&FU$u&FU&FV-X&FV;'S$u;'S;=`&]<%lO$u~/cYOr$urs%_s!Q$u!Q![0R![!]0q!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~0UXOr$urs%_s![$u![!]0q!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~0tXOr$urs%_s!Q$u!Q!W1a!W#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~1dXOr$urs%_s!Q$u!Q![2P![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~2SXOr$urs%_s![$u![!]2o!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~2rXOr$urs%_s!Q$u!Q!W3_!W#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~3bXOr$urs%_s!Q$u!Q![3}![#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~4QVOr$urs4gs#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~4nOU~V~~4qZOr$urs%_s!Q$u!Q!U0R!U![$u![!]0q!]#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~5gXOr$urs%_s!P$u!P!Q(s!Q#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~6VXOr$urs%_s!P$u!P!Q'U!Q#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~6u[Or$urs%_s!P$u!P!Q'U!Q!R6S!R!S6S!S!T6S!T#O$u#O#P%d#P;'S$u;'S;=`&]<%lO$u~7pO[~~7uOX~~7zOc~R8RV`PrQ{|8h}!O8h!O!P8h!Q![8h!c!}8h#R#S8h#T#o8hQ8mVrQ{|8h}!O8h!O!P8h!Q![8h!c!}8h#R#S8h#T#o8h~9XOo~R9^VrQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S8h#T#o8hR9zVTPrQ{|8h}!O8h!O!P8h!Q![9s!c!}8h#R#S9s#T#o8h~:fPb~!P!Q:i~:nSP~OY:iZ;'S:i;'S;=`:z<%lO:i~:}P;=`<%l:iR;XVTPrQ{|8h}!O8h!O!P9s!Q![;Q!c!}8h#R#S;Q#T#o8h~;sQd~!_!`;y!`!a<O~<OOd~~<TOe~~<YPd~!_!`;yR<dVrQmP{|8h}!O8h!O!P8h!Q![<]!c!}<]#R#S<]#T#o<]~=OOq~~=TOp~",
+    tokenizers: [noOperator, 0, 1],
+    topRules: { "Program": [0, 2] },
+    specialized: [{ term: 29, get: value => spec_identifier[value] || -1 }],
+    tokenPrec: 201
+});
+const QFormulaParser = parser.configure({
+    props: [
+        (0, highlight_1.styleTags)({
+            Boolean: highlight_1.tags.bool,
+            String: highlight_1.tags.string,
+            Date: highlight_1.tags.string,
+            Number: highlight_1.tags.number,
+            Variable: highlight_1.tags.variableName,
+            LineComment: highlight_1.tags.lineComment,
+            FunctionIdentifier: highlight_1.tags.keyword,
+            ParenthesisStart: highlight_1.tags.paren,
+            ParenthesisEnd: highlight_1.tags.paren,
+            LogicOp: highlight_1.tags.operator,
+            ArithOp: highlight_1.tags.operator,
+        }),
+    ],
 });
-const QFormulaHighlightConfig = {
-    parser: parser.configure({
-        props: [
-            (0, highlight_1.styleTags)({
-                Boolean: highlight_1.tags.bool,
-                String: highlight_1.tags.string,
-                Date: highlight_1.tags.string,
-                Number: highlight_1.tags.number,
-                Variable: highlight_1.tags.keyword,
-                LineComment: highlight_1.tags.lineComment,
-                FunctionIdentifier: highlight_1.tags.lineComment,
-                '( )': highlight_1.tags.paren,
-            }),
-        ],
-    }),
+exports.QFormulaParser = QFormulaParser;
+const QFormulaLang = language_1.LRLanguage.define({
+    parser: QFormulaParser,
     languageData: {
         commentTokens: { line: '//' },
     },
-};
-exports.QFormulaHighlightConfig = QFormulaHighlightConfig;
-const QFormulaLang = language_1.LRLanguage.define(QFormulaHighlightConfig);
+});
 exports.QFormulaLang = QFormulaLang;
 function QFormula() {
     return new language_1.LanguageSupport(QFormulaLang);

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,19 +1,20 @@
-export const spaces: 25;
-export const newline: 26;
-export const lineComment: 27;
-export const Program: 1;
-export const Expression: 2;
-export const Value: 3;
-export const Number: 4;
-export const Date: 5;
-export const String: 6;
-export const ParenthesisEnd: 8;
-export const Function: 9;
-export const FunctionIdentifier: 10;
-export const ParenthesisStart: 11;
-export const FunctionArguments: 12;
-export const Variable: 13;
-export const UnaryExpression: 14;
-export const BinaryExpression: 16;
-export const divide: 17;
-export const ParenthesizedExpression: 21;
+export const noOprt: 25;
+export const spaces: 27;
+export const newline: 28;
+export const lineComment: 1;
+export const Program: 2;
+export const Expression: 3;
+export const Value: 4;
+export const Number: 5;
+export const Date: 6;
+export const String: 7;
+export const ParenthesisEnd: 9;
+export const Function: 10;
+export const FunctionIdentifier: 11;
+export const ParenthesisStart: 12;
+export const FunctionArguments: 13;
+export const Variable: 14;
+export const UnaryExpression: 15;
+export const BinaryExpression: 17;
+export const divide: 18;
+export const ParenthesizedExpression: 22;

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 = 25, exports.spaces = 27, exports.newline = 28, exports.lineComment = 1, exports.Program = 2, exports.Expression = 3, exports.Value = 4, exports.Number = 5, exports.Date = 6, exports.String = 7, exports.ParenthesisEnd = 9, exports.Function = 10, exports.FunctionIdentifier = 11, exports.ParenthesisStart = 12, exports.FunctionArguments = 13, exports.Variable = 14, exports.UnaryExpression = 15, exports.BinaryExpression = 17, exports.divide = 18, exports.ParenthesizedExpression = 22;
 //# 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,CAAC,EACf,QAAA,OAAO,GAAG,CAAC,EACX,QAAA,UAAU,GAAG,CAAC,EACd,QAAA,KAAK,GAAG,CAAC,EACT,QAAA,MAAM,GAAG,CAAC,EACV,QAAA,IAAI,GAAG,CAAC,EACR,QAAA,MAAM,GAAG,CAAC,EACV,QAAA,cAAc,GAAG,CAAC,EAClB,QAAA,QAAQ,GAAG,EAAE,EACb,QAAA,kBAAkB,GAAG,EAAE,EACvB,QAAA,gBAAgB,GAAG,EAAE,EACrB,QAAA,iBAAiB,GAAG,EAAE,EACtB,QAAA,QAAQ,GAAG,EAAE,EACb,QAAA,eAAe,GAAG,EAAE,EACpB,QAAA,gBAAgB,GAAG,EAAE,EACrB,QAAA,MAAM,GAAG,EAAE,EACX,QAAA,uBAAuB,GAAG,EAAE,CAAA"}

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/index.d.ts

@@ -1,10 +1,12 @@
 import { ENGINES } from './constants/index';
 import { FormulaContext, TranspilationResponse } from './constants/interfaces';
-export { QFormula as FormulaHighlight, QFormulaLang as FormulaLang, QFormulaHighlightConfig as FormulaHightConfig, } from './grammar/qformula.grammar';
+export { QFormula as FormulaHighlight, QFormulaLang as FormulaLang, QFormulaParser as FormulaParser, } from './grammar/qformula.grammar';
 export { calculateAST } from './parser/json-parser';
 export { ENGINES, AST_PRIMITIVES } from './constants/index';
 export { FUNCTION_LIST, getFunctionDetail } from './functions/index';
 export { TranspileAST } from './transpiler/index';
 export { ProgramAST, TranspilationResponse, FormulaContext, } from './constants/interfaces';
 export { BaseError, errorAnalyzer } from './errors';
+export { cleanInvalidItemsInContext } from './utils';
+export { getPrimitiveAsValue } from './utils/primitiveFunctions';
 export declare function Transpile(program: string, engine: ENGINES, context?: FormulaContext): TranspilationResponse | undefined;

package/dist/cjs/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transpile = exports.errorAnalyzer = exports.BaseError = exports.TranspileAST = exports.getFunctionDetail = exports.FUNCTION_LIST = exports.AST_PRIMITIVES = exports.ENGINES = exports.calculateAST = exports.FormulaHightConfig = exports.FormulaLang = exports.FormulaHighlight = void 0;
+exports.Transpile = exports.getPrimitiveAsValue = exports.cleanInvalidItemsInContext = exports.errorAnalyzer = exports.BaseError = exports.TranspileAST = exports.getFunctionDetail = exports.FUNCTION_LIST = exports.AST_PRIMITIVES = exports.ENGINES = exports.calculateAST = exports.FormulaParser = exports.FormulaLang = exports.FormulaHighlight = void 0;
 const qformula_grammar_1 = require("./grammar/qformula.grammar");
 const json_parser_1 = require("./parser/json-parser");
 const index_1 = require("./transpiler/index");
 var qformula_grammar_2 = require("./grammar/qformula.grammar");
 Object.defineProperty(exports, "FormulaHighlight", { enumerable: true, get: function () { return qformula_grammar_2.QFormula; } });
 Object.defineProperty(exports, "FormulaLang", { enumerable: true, get: function () { return qformula_grammar_2.QFormulaLang; } });
-Object.defineProperty(exports, "FormulaHightConfig", { enumerable: true, get: function () { return qformula_grammar_2.QFormulaHighlightConfig; } });
+Object.defineProperty(exports, "FormulaParser", { enumerable: true, get: function () { return qformula_grammar_2.QFormulaParser; } });
 var json_parser_2 = require("./parser/json-parser");
 Object.defineProperty(exports, "calculateAST", { enumerable: true, get: function () { return json_parser_2.calculateAST; } });
 var index_2 = require("./constants/index");
@@ -21,6 +21,10 @@ Object.defineProperty(exports, "TranspileAST", { enumerable: true, get: function
 var errors_1 = require("./errors");
 Object.defineProperty(exports, "BaseError", { enumerable: true, get: function () { return errors_1.BaseError; } });
 Object.defineProperty(exports, "errorAnalyzer", { enumerable: true, get: function () { return errors_1.errorAnalyzer; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "cleanInvalidItemsInContext", { enumerable: true, get: function () { return utils_1.cleanInvalidItemsInContext; } });
+var primitiveFunctions_1 = require("./utils/primitiveFunctions");
+Object.defineProperty(exports, "getPrimitiveAsValue", { enumerable: true, get: function () { return primitiveFunctions_1.getPrimitiveAsValue; } });
 function Transpile(program, engine, context) {
     const parser = qformula_grammar_1.QFormulaLang.parser;
     const tree = parser.parse(program);

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAEA,iEAA0D;AAC1D,sDAAoD;AACpD,8CAAkD;AAElD,+DAIoC;AAHhC,oHAAA,QAAQ,OAAoB;AAC5B,+GAAA,YAAY,OAAe;AAC3B,sHAAA,uBAAuB,OAAsB;AAEjD,oDAAoD;AAA3C,2GAAA,YAAY,OAAA;AACrB,2CAA4D;AAAnD,gGAAA,OAAO,OAAA;AAAE,uGAAA,cAAc,OAAA;AAChC,2CAAqE;AAA5D,sGAAA,aAAa,OAAA;AAAE,0GAAA,iBAAiB,OAAA;AACzC,4CAAkD;AAAzC,qGAAA,YAAY,OAAA;AAMrB,mCAAoD;AAA3C,mGAAA,SAAS,OAAA;AAAE,uGAAA,aAAa,OAAA;AAEjC,SAAgB,SAAS,CACrB,OAAe,EACf,MAAe,EACf,OAAwB;IAExB,MAAM,MAAM,GAAG,+BAAY,CAAC,MAAM,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,OAAO;QAAE,OAAO;IAC1B,MAAM,GAAG,GAAG,IAAA,0BAAY,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,IAAA,oBAAY,EAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAXD,8BAWC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAEA,iEAA0D;AAC1D,sDAAoD;AACpD,8CAAkD;AAElD,+DAIoC;AAHhC,oHAAA,QAAQ,OAAoB;AAC5B,+GAAA,YAAY,OAAe;AAC3B,iHAAA,cAAc,OAAiB;AAEnC,oDAAoD;AAA3C,2GAAA,YAAY,OAAA;AACrB,2CAA4D;AAAnD,gGAAA,OAAO,OAAA;AAAE,uGAAA,cAAc,OAAA;AAChC,2CAAqE;AAA5D,sGAAA,aAAa,OAAA;AAAE,0GAAA,iBAAiB,OAAA;AACzC,4CAAkD;AAAzC,qGAAA,YAAY,OAAA;AAMrB,mCAAoD;AAA3C,mGAAA,SAAS,OAAA;AAAE,uGAAA,aAAa,OAAA;AACjC,iCAAqD;AAA5C,mHAAA,0BAA0B,OAAA;AACnC,iEAAiE;AAAxD,yHAAA,mBAAmB,OAAA;AAE5B,SAAgB,SAAS,CACrB,OAAe,EACf,MAAe,EACf,OAAwB;IAExB,MAAM,MAAM,GAAG,+BAAY,CAAC,MAAM,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,OAAO;QAAE,OAAO;IAC1B,MAAM,GAAG,GAAG,IAAA,0BAAY,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,IAAA,oBAAY,EAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAXD,8BAWC"}

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

@@ -7,11 +7,13 @@ const syntax_errors_1 = require("./syntax-errors");
 const errors_1 = require("../errors");
 const primitiveFunctions_1 = require("../utils/primitiveFunctions");
 const formula_parser_1 = require("./formula-parser");
+const qformula_grammar_1 = require("../grammar/qformula.grammar");
 const PARSER_VERSION = '0.0.0';
 const LANG_NAME = 'QrveyLang';
 function calculateAST(program, tree, context) {
     var _a;
-    const startNode = tree.topNode;
+    const cursor = tree.cursor();
+    const startNode = cursor.node;
     if (!startNode)
         return;
     const syntaxErrors = (0, syntax_errors_1.calculateNodeSyntaxErrors)(program, startNode);
@@ -21,7 +23,7 @@ function calculateAST(program, tree, context) {
         formulaFunctions: [],
         flatBody: [],
     };
-    const body = transformNode(program, startNode, inference, context);
+    const body = transformNode(program, startNode, inference, context, cursor);
     const { errorList: errors, formulaVariables: variables, formulaFunctions, flatBody, } = inference;
     return {
         type: constants_1.AST_TYPES.program,
@@ -39,7 +41,8 @@ function calculateAST(program, tree, context) {
     };
 }
 exports.calculateAST = calculateAST;
-function transformNode(program, node, inference, context) {
+function transformNode(program, refNode, inference, context, cursor) {
+    const node = refNode !== null && refNode !== void 0 ? refNode : cursor === null || cursor === void 0 ? void 0 : cursor.node;
     if (!node)
         return undefined;
     let resultNode;
@@ -72,17 +75,41 @@ function transformNode(program, node, inference, context) {
             resultNode = transformVariableValue(program, node, inference, context);
             break;
         default:
-            return node.firstChild
-                ? transformNode(program, node.firstChild, inference, context)
+            return (cursor === null || cursor === void 0 ? void 0 : cursor.next()) || node.firstChild
+                ? transformNode(program, node.firstChild, inference, context, cursor)
                 : undefined;
     }
     if (resultNode !== undefined)
         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 +118,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 +143,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 +176,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 +199,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,
         }));
     }
@@ -230,11 +262,11 @@ function transformBooleanValue(program, node) {
     return createLiteralValue(node, constants_1.AST_PRIMITIVES.BOOLEAN, value);
 }
 function transformVariableValue(program, node, inference, context) {
-    var _a;
+    var _a, _b;
     let variableValue = (0, utils_1.getNodeValue)(program, node).slice(1, -1);
     const variableContext = (0, utils_1.getVariableContext)(variableValue, context);
     const variableType = (0, utils_1.getVariableType)(variableContext);
-    if (variableType === 'Token')
+    if (variableType === constants_1.AST_TYPES.token)
         variableValue = `{{${variableValue}}}`;
     const variableExistInInference = inference.formulaVariables
         .map((v) => v.id)
@@ -245,7 +277,7 @@ function transformVariableValue(program, node, inference, context) {
             label: variableValue,
             type: constants_1.AST_PRIMITIVES.STRING,
         });
-    return {
+    const baseResult = {
         type: variableType,
         value: variableValue,
         context: variableContext,
@@ -253,5 +285,19 @@ function transformVariableValue(program, node, inference, context) {
         to: node.to,
         primitive: (_a = variableContext === null || variableContext === void 0 ? void 0 : variableContext.type) !== null && _a !== void 0 ? _a : constants_1.AST_PRIMITIVES.UNKNOWN,
     };
+    //IF externalFormula AND NOT sampleData, due to sampleData will replace the externalFormulas into a Literal (in Transpiler)
+    if (variableType === constants_1.AST_TYPES.externalFormula && !(context === null || context === void 0 ? void 0 : context.useSampleData)) {
+        const isCircularDependency = (context === null || context === void 0 ? void 0 : context.currentFormulaId) &&
+            (context === null || context === void 0 ? void 0 : context.currentFormulaId) === variableValue;
+        if (isCircularDependency)
+            throw new errors_1.CircularDependencyError();
+        const parser = qformula_grammar_1.QFormulaLang.parser;
+        const externalFunctionProgram = (_b = variableContext === null || variableContext === void 0 ? void 0 : variableContext.replacement) !== null && _b !== void 0 ? _b : '';
+        const tree = parser.parse(externalFunctionProgram);
+        const ast = calculateAST(externalFunctionProgram, tree, context);
+        const formulaBody = ast === null || ast === void 0 ? void 0 : ast.body;
+        return Object.assign(Object.assign({ isExternalFormula: true }, baseResult), formulaBody);
+    }
+    return baseResult;
 }
 //# sourceMappingURL=json-parser.js.map