@capillarytech/blaze-ui 5.23.3-beta.1 → 5.23.3-beta.10

package/CapExpressionEditor/js/expressionEditor.js

@@ -1,34 +1,22 @@
-/* eslint-disable */
-import rangy from 'rangy';
-import $ from 'jquery';
-import { CAP_BLACK_ALPHA01, CAP_COLOR_16, CAP_WHITE } from "../../styles/_variables";
-$.fn.expredit = function (grammar, options) {
-  'use strict';
-
-  //pickers.js
+import rangy from "rangy";
+import $ from "jquery";
+import { CAP_COLOR_16, CAP_BLACK_ALPHA01, CAP_WHITE } from "../../styles/_variables.js";
+$.fn.expredit = function(grammar, options) {
   var pickers = {};
   var elems;
-  (function () {
-    // pickers are defined in a closure to prevent polluting the global object.
-
-    // A useful function for safe regex creation (for string matching).
-
+  (function() {
     function makeRegex(str, atBegin, atEnd) {
       try {
-        return new RegExp((atBegin ? '^' : '') + str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') + (atEnd ? '$' : ''), 'i');
+        return new RegExp(
+          (atBegin ? "^" : "") + str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") + (atEnd ? "$" : ""),
+          "i"
+        );
       } catch (e) {
         return null;
       }
     }
-
-    // ----- Enum -----
-
-    pickers.enum = function (value, type, setValue, onKey) {
-      var i,
-        l,
-        menu = $("<div class='calltips'>"),
-        tReg = value ? makeRegex(value, true) : false,
-        show = false;
+    pickers.enum = function(value, type, setValue, onKey) {
+      var i, l, menu = $("<div class='calltips'>"), tReg = value ? makeRegex(value, true) : false, show = false;
       for (i = 0, l = type.values.length; i < l; i += 1) {
         if (!tReg || tReg.test(type.values[i])) {
           show = true;
@@ -37,45 +25,21 @@ $.fn.expredit = function (grammar, options) {
       }
       return show ? menu : false;
     };
-    //
-    //pickers.datetime = function(value, type, setValue, onKey) {
-    //
-    //	return getCalender();;//$("<div>").addClass("info").html("Date picker will come here.");
-    //},
-
-    pickers.interval = function (value, type, setValue, onKey) {
-      return $('<div>').addClass('info').html('Time interval picker will come here.');
-    }, pickers.enumset = function (value, type, setValue, onKey) {
-      var list = pickers.enum(value, type.valueType);
-      return $('<div>').addClass('info').html('Multiselect box with options ' + node.getType(type.valueType).values.join(', '));
-    },
-    // ----- Calltips from the current scope -----
-
-    pickers.any = function (node, sort) {
-      // This populates calltips.
-      if (typeof sort === 'undefined') sort = false;
-      var r = [],
-        calltipDiv,
-        scope = node.scope,
-        name = node.value,
-        number = 10,
-        i,
-        j,
-        m,
-        t,
-        root,
-        prefix = '';
-
-      // turn the name into a regex for matching.
+    pickers.interval = function(value, type, setValue, onKey) {
+      return $("<div>").addClass("info").html("Time interval picker will come here.");
+    }, pickers.enumset = function(value, type, setValue, onKey) {
+      pickers.enum(value, type.valueType);
+      return $("<div>").addClass("info").html("Multiselect box with options " + node.getType(type.valueType).values.join(", "));
+    }, // ----- Calltips from the current scope -----
+    pickers.any = function(node2, sort) {
+      if (typeof sort === "undefined") sort = false;
+      var r = [], calltipDiv, scope = node2.scope, name = node2.value, i, prefix = "";
       try {
-        name = node.value ? makeRegex(node.value, true) : null;
+        name = node2.value ? makeRegex(node2.value, true) : null;
       } catch (e) {
-        // Regex syntax errors
         name = null;
       }
       calltipDiv = $("<div class='calltips'>");
-
-      //		while(scope && scope.idents && r.length < number) {
       while (scope && scope.idents) {
         var idents = [];
         for (i in scope.idents) idents.push(i.toString());
@@ -88,24 +52,14 @@ $.fn.expredit = function (grammar, options) {
             r.push(elems[i]);
             $("<a href='#' class='calltip'>").html(elems[i]).appendTo(calltipDiv);
           }
-          //				if(r.length >= number) {
-          //					return calltipDiv;
-          //				}
         }
-        prefix += 'outer.';
+        prefix += "outer.";
         scope = scope.outer;
       }
-      return r.length && (r.length > 1 || node.text != r[0]) ? calltipDiv : false;
+      return r.length && (r.length > 1 || node2.text != r[0]) ? calltipDiv : false;
     };
   })();
-
-  // tokenize.js
-  // Tokenizer for Java-like expressions, written in JavaScript.
-  // Aravind R S, Capillary Technologies, 2012-02-09
-
-  var tokenize = function tokenize(str) {
-    'use strict';
-
+  var tokenize = function(str) {
     var rex = {
       space: /^\s+/,
       number: /^[0-9]+(?:\.[0-9]*)?/,
@@ -114,48 +68,40 @@ $.fn.expredit = function (grammar, options) {
       name: /^[a-zA-Z0-9_]+\b/,
       operator: /^(\&\&|\|\||==|!=|<=|>=|\S)/
     };
-    var tokens = [],
-      tok,
-      pos = 0,
-      r;
-    while (str != '') {
+    var tokens = [], tok, pos = 0, r;
+    while (str != "") {
       tok = null;
       for (r in rex) {
-        str = str.replace(rex[r], function (m) {
-          var len = m.length,
-            val;
-          if (r == 'space') {
+        str = str.replace(rex[r], function(m) {
+          var len = m.length, val;
+          if (r == "space") {
             pos += len;
-            return '';
-          } else if (r == 'number') {
+            return "";
+          } else if (r == "number") {
             val = parseFloat(m);
-          } else if (r == 'date') {
+          } else if (r == "date") {
             val = new Date(m.substring(2, m.length - 2));
-          } else if (r == 'name') switch (m) {
-            case 'true':
-              val = true;
-              r = 'boolean';
-              break;
-            case 'false':
-              val = false;
-              r = 'boolean';
-              break;
-            default:
-              val = m;
-          } else if (r == 'string') {
+          } else if (r == "name")
+            switch (m) {
+              case "true":
+                val = true;
+                r = "boolean";
+                break;
+              case "false":
+                val = false;
+                r = "boolean";
+                break;
+              default:
+                val = m;
+            }
+          else if (r == "string") {
             val = m.substr(1, len - 2);
           } else {
             val = m;
           }
-          tok = {
-            value: val,
-            arity: r,
-            text: m,
-            pos: pos,
-            len: len
-          };
+          tok = { value: val, arity: r, text: m, pos, len };
           pos += len;
-          return '';
+          return "";
         });
         if (tok) break;
       }
@@ -163,40 +109,22 @@ $.fn.expredit = function (grammar, options) {
     }
     return tokens;
   };
-  // parse.js
-  // Parser for Java-like expressions, written in JavaScript.
-  // Aravind R S, Capillary Technologies, 2012-02-09
-  // based on
-  //   parse.js
-  //   Parser for Simplified JavaScript written in Simplified JavaScript
-  //   From Top Down Operator Precedence
-  //   http://javascript.crockford.com/tdop/index.html
-  //   Douglas Crockford
-  //   2010-06-26
-
   var protonode = {};
-  var parse = function () {
-    'use strict';
-
-    var symbol_table = {},
-      token,
-      tokens,
-      token_nr,
-      terminators = ['(end)'],
-      has_errors;
-    var itself = function itself() {
+  var parse = function() {
+    var symbol_table = {}, token, tokens, token_nr, terminators = ["(end)"], has_errors;
+    var itself = function() {
       return this;
     };
-    var nothing = function nothing() {
+    var nothing = function() {
       return;
     };
-    var advance = function advance(id) {
+    var advance = function(id) {
       var a, o, t, v, e, type;
       if (id && token.id !== id) {
         e = "Expected '" + id + "'";
       }
       if (token_nr >= tokens.length) {
-        token = symbol_table['(end)'];
+        token = symbol_table["(end)"];
         t = tokens[tokens.length - 1];
         token.pos = t ? t.pos + t.len : 0;
         token.len = 0;
@@ -206,30 +134,30 @@ $.fn.expredit = function (grammar, options) {
       token_nr += 1;
       v = t.value;
       a = t.arity;
-      if (a === 'name') {
-        o = symbol_table['(name)'];
-      } else if (a === 'operator') {
+      if (a === "name") {
+        o = symbol_table["(name)"];
+      } else if (a === "operator") {
         o = symbol_table[v];
         if (!o) {
-          e = 'Unknown operator.';
+          e = "Unknown operator.";
         }
-      } else if (a === 'string' || a === 'number' || a === 'boolean' || a === 'datetime') {
-        o = symbol_table['(literal)'];
+      } else if (a === "string" || a === "number" || a === "boolean" || a === "datetime") {
+        o = symbol_table["(literal)"];
         type = a;
-        a = 'literal';
+        a = "literal";
       } else {
-        e = 'Unexpected token.';
+        e = "Unexpected token.";
       }
       if (o) {
         token = Object.create(o);
       } else {
         token = missing();
-        a = 'missing';
+        a = "missing";
       }
       token.value = v;
       token.arity = a;
       token.type = type;
-      token.text = t.text || '';
+      token.text = t.text || "";
       token.pos = t.pos;
       token.len = t.len;
       if (e) {
@@ -237,7 +165,7 @@ $.fn.expredit = function (grammar, options) {
       }
       return token;
     };
-    var expression = function expression(rbp) {
+    var expression = function(rbp) {
       var left;
       var t;
       var term = terminators.lastIndexOf(token.id);
@@ -256,19 +184,19 @@ $.fn.expredit = function (grammar, options) {
       }
       return left;
     };
-    protonode.nud = function () {
-      this.arity = 'missing';
-      this.error('Unknown operator.');
+    protonode.nud = function() {
+      this.arity = "missing";
+      this.error("Unknown operator.");
       return this;
     };
-    protonode.led = function (left) {
+    protonode.led = function(left) {
       var n = missing();
-      this.arity = 'group';
-      this.error('Unknown operator.');
+      this.arity = "group";
+      this.error("Unknown operator.");
       n.children = [left, this];
       return n;
     };
-    var symbol = function symbol(id, bp) {
+    var symbol = function(id, bp) {
       var s = symbol_table[id];
       bp = bp || 0;
       if (s) {
@@ -283,179 +211,144 @@ $.fn.expredit = function (grammar, options) {
       }
       return s;
     };
-    var group = function group(e) {
+    var group = function(e) {
       var g = Object.create(protonode);
-      g.value = undefined;
-      g.arity = 'group';
+      g.value = void 0;
+      g.arity = "group";
       g.children = [];
-      if (e) g.error(e);
       return g;
     };
-    var missing = function missing(e) {
+    var missing = function(e) {
       var m = Object.create(protonode);
-      m.value = undefined;
-      m.arity = 'missing';
+      m.value = void 0;
+      m.arity = "missing";
       if (e) {
         m.error(e);
       } else if (e !== false) {
-        m.error('Missing value.');
+        m.error("Missing value.");
       }
       return m;
     };
-    var pos_missing = function pos_missing(node, pos) {
-      if (node.arity !== 'missing') return node;
-      if (typeof node.pos === 'undefined') node.pos = pos;
-      if (typeof node.len === 'undefined') node.len = node.text ? node.text.length : 1;
-      return node;
+    var pos_missing = function(node2, pos) {
+      if (node2.arity !== "missing") return node2;
+      if (typeof node2.pos === "undefined") node2.pos = pos;
+      if (typeof node2.len === "undefined") node2.len = node2.text ? node2.text.length : 1;
+      return node2;
     };
-    var infix = function infix(id, bp, led) {
+    var infix = function(id, bp, led) {
       var s = symbol(id, bp);
-      s.led = led || function (left) {
+      s.led = led || function(left) {
         this.children = [left, expression(bp)];
         pos_missing(this.children[0], this.pos);
         pos_missing(this.children[1], this.pos + this.len);
-        this.arity = 'binary_operation';
+        this.arity = "binary_operation";
         return this;
       };
       return s;
     };
-    var infixr = function infixr(id, bp, led) {
+    var infixr = function(id, bp, led) {
       var s = symbol(id, bp);
-      s.led = led || function (left) {
+      s.led = function(left) {
         this.children = [left, expression(bp - 1)];
         pos_missing(this.children[0], this.pos);
         pos_missing(this.children[1], this.pos + this.len);
-        this.arity = 'binary_operation';
+        this.arity = "binary_operation";
         return this;
       };
       return s;
     };
-    var prefix = function prefix(id, nud) {
+    var prefix = function(id, nud) {
       var s = symbol(id);
-      s.nud = nud || function () {
+      s.nud = nud || function() {
         this.children = [expression(70)];
         pos_missing(this.children[0], this.pos + this.len);
-        this.arity = 'unary_operation';
+        this.arity = "unary_operation";
         return this;
       };
       return s;
     };
-    symbol('(end)').nud = nothing;
-    symbol('(name)').nud = itself;
-    symbol(')');
-    //    symbol("]");
-    symbol(':');
-    symbol(',');
-    symbol('(literal)').nud = itself;
-    infix('?', 20, function (left) {
+    symbol("(end)").nud = nothing;
+    symbol("(name)").nud = itself;
+    symbol(")");
+    symbol(":");
+    symbol(",");
+    symbol("(literal)").nud = itself;
+    infix("?", 20, function(left) {
       var s_tok;
       this.children = [left];
       pos_missing(this.children[0], this.pos);
-      terminators.push(':');
+      terminators.push(":");
       this.children[1] = expression(0);
       pos_missing(this.children[1], this.pos + this.len);
       s_tok = token;
-      if (terminators[terminators.length - 1] == ':') terminators.pop();
-      advance(':');
+      if (terminators[terminators.length - 1] == ":") terminators.pop();
+      advance(":");
       this.children[2] = expression(0);
       pos_missing(this.children[2], s_tok.pos + s_tok.len);
-      this.arity = 'ternary_operation';
+      this.arity = "ternary_operation";
       return this;
     });
-    infixr('&&', 30);
-    infixr('||', 30);
-    infixr('==', 40);
-    infixr('!=', 40);
-    infixr('<', 40);
-    infixr('<=', 40);
-    infixr('>', 40);
-    infixr('>=', 40);
-    infix('+', 50);
-    infix('-', 50);
-    infix('*', 60);
-    infix('/', 60);
-    infix('%', 60);
-    infix('.', 80, function (left) {
-      var n;
+    infixr("&&", 30);
+    infixr("||", 30);
+    infixr("==", 40);
+    infixr("!=", 40);
+    infixr("<", 40);
+    infixr("<=", 40);
+    infixr(">", 40);
+    infixr(">=", 40);
+    infix("+", 50);
+    infix("-", 50);
+    infix("*", 60);
+    infix("/", 60);
+    infix("%", 60);
+    infix(".", 80, function(left) {
       this.children = [left];
-      this.arity = 'object_dereference';
-      this.value = undefined;
-      if (token.arity === 'name') {
+      this.arity = "object_dereference";
+      this.value = void 0;
+      if (token.arity === "name") {
         this.children[1] = token;
         advance();
-      } else if (token.id === '(literal)') {
-        token.arity = 'missing';
-        token.error('Expected a property name.');
+      } else if (token.id === "(literal)") {
+        token.arity = "missing";
+        token.error("Expected a property name.");
         this.children[1] = token;
         advance();
       } else {
-        this.children[1] = missing('Expected a property name.');
+        this.children[1] = missing("Expected a property name.");
       }
       pos_missing(this.children[0], this.pos);
       pos_missing(this.children[1], this.pos + this.len);
       return this;
     });
-
-    /*    infix("[", 80, function (left) {
-    var g, n, e;
-    if(left.id === "(literal)") {
-    left.error("Expected a collection.");
-    }
-    terminators.push("]");
-        this.children = [left];
-        pos_missing(this.children[0], this.pos);
-    	n = expression(0);
-    	e = [n];
-    while(token.id !== "]" && token.id !== "(end)") {
-    e.push(expression(0));
-    }
-    if(e.length > 1) {
-    g = group();
-    g.paren = false;
-    g.children = e;
-    this.children.push(g);
-    } else {
-    this.children.push(n);
-    }
-           pos_missing(this.children[1], this.pos + this.len);
-        this.arity = "array_lookup";
-        this.value = undefined;
-    if(terminators[terminators.length-1]=="]") terminators.pop();
-        advance("]");
-        return this;
-    });*/
-
-    infix('(', 80, function (left) {
+    infix("(", 80, function(left) {
       var g, n, e;
-      if (left.arity === 'object_dereference') {
-        this.arity = 'method_call';
-        this.value = undefined;
+      if (left.arity === "object_dereference") {
+        this.arity = "method_call";
+        this.value = void 0;
         this.children = left.children;
-        if (left.children[1].arity !== 'name') {
-          left.children[1].error('Expected a method name.');
+        if (left.children[1].arity !== "name") {
+          left.children[1].error("Expected a method name.");
         }
       } else {
-        this.arity = 'function_call';
-        this.value = undefined;
+        this.arity = "function_call";
+        this.value = void 0;
         this.children = [left];
-        if (left.arity !== 'name') {
-          left.error('Expected a function name.');
+        if (left.arity !== "name") {
+          left.error("Expected a function name.");
         }
       }
-      terminators.push(')');
+      terminators.push(")");
       n = missing(false);
       pos_missing(n, token.pos);
-      while (token.id !== ')' && token.id !== '(end)') {
-        if (token.id === ',') {
+      while (token.id !== ")" && token.id !== "(end)") {
+        if (token.id === ",") {
           n = missing();
         } else {
           n = expression(0);
         }
         pos_missing(n, token.pos);
         e = [n];
-
-        // Gather any malformed tokens from here to the next ) or ,
-        while (token.id !== ',' && token.id !== ')' && token.id !== '(end)') {
+        while (token.id !== "," && token.id !== ")" && token.id !== "(end)") {
           e.push(expression(0));
         }
         if (e.length > 1) {
@@ -467,35 +360,35 @@ $.fn.expredit = function (grammar, options) {
           this.children.push(n);
         }
         n = null;
-        if (token.id === ',') {
+        if (token.id === ",") {
           n = missing();
           pos_missing(n, token.pos + token.len);
-          advance(',');
+          advance(",");
         }
       }
       if (n) {
         this.children.push(n);
       }
-      if (terminators[terminators.length - 1] == ')') terminators.pop();
-      advance(')');
+      if (terminators[terminators.length - 1] == ")") terminators.pop();
+      advance(")");
       return this;
     });
-    prefix('!');
-    prefix('-');
-    prefix('+');
-    prefix('(', function () {
+    prefix("!");
+    prefix("-");
+    prefix("+");
+    prefix("(", function() {
       var e;
-      this.arity = 'group';
-      this.value = undefined;
-      this.text = '';
+      this.arity = "group";
+      this.value = void 0;
+      this.text = "";
       this.children = [];
-      terminators.push(')');
-      if (token.id === ')' || token.id === '(end)') {
+      terminators.push(")");
+      if (token.id === ")" || token.id === "(end)") {
         e = missing();
         pos_missing(e, token.pos);
         this.children.push(e);
       } else {
-        while (token.id !== ')' && token.id !== '(end)') {
+        while (token.id !== ")" && token.id !== "(end)") {
           e = expression(0);
           pos_missing(e, token.pos);
           if (this.children.length > 0) {
@@ -504,35 +397,33 @@ $.fn.expredit = function (grammar, options) {
           this.children.push(e);
         }
       }
-      if (terminators[terminators.length - 1] == ')') terminators.pop();
-      advance(')');
+      if (terminators[terminators.length - 1] == ")") terminators.pop();
+      advance(")");
       return this;
     });
-    protonode.error = function (e) {
+    protonode.error = function(e) {
       if (!this.err) {
         this.err = [];
       }
       this.err.push(e);
       has_errors = true;
     };
-    return function (tks) {
-      var selNode,
-        trees = [],
-        tree;
+    return function(tks) {
+      var trees = [], tree;
       has_errors = false;
       tokens = tks;
       token_nr = 0;
       advance();
       do {
-        terminators = ['(end)'];
+        terminators = ["(end)"];
         tree = expression(0);
-        if (token.id !== '(end)') {
-          token.error('Expected an operator.');
+        if (token.id !== "(end)") {
+          token.error("Expected an operator.");
         }
-        if (!(tree.arity == 'missing' && (tree.value == ')' || tree.value == ']'))) {
+        if (!(tree.arity == "missing" && (tree.value == ")" || tree.value == "]"))) {
           trees.push(tree);
         }
-      } while (token.id !== '(end)');
+      } while (token.id !== "(end)");
       if (trees.length == 1) {
         tree = trees[0];
       } else {
@@ -544,14 +435,9 @@ $.fn.expredit = function (grammar, options) {
       return tree.crosslink(null);
     };
   }();
-
-  /*
-   *	Crosslink creates the operands[] and parent crosslinks between nodes
-   *	which help in traversal for type relationship evaluation.
-   */
-  protonode.crosslink = function (parent) {
-    var i, l, subtree;
-    if (this.arity === 'group' && this.children && this.children.length === 1) {
+  protonode.crosslink = function(parent) {
+    var i, l;
+    if (this.arity === "group" && this.children && this.children.length === 1) {
       this.operands = this.children;
       return this.children[0].crosslink(parent);
     }
@@ -564,27 +450,22 @@ $.fn.expredit = function (grammar, options) {
     }
     return this;
   };
-  // type.js
-  // Type checker for Java-like expressions, written in JavaScript.
-  // Aravind R S, Capillary Technologies, 2012-02-09
-
-  var typify = function () {
-    // this is the prototype of the primitive types
-
+  var typify = function() {
     var primitive = {
-      ancestry: 'primitive',
+      ancestry: "primitive",
       prepared: true,
       //Adding isStrict to match the exact type and not any super type.(Author:Susi)
-      is: function is(type, isStrict) {
+      is: function(type, isStrict) {
         if (!type) {
           return false;
         }
         if (type.ancestry && !/\banonymous\b/.test(type.ancestry)) {
           type = type.ancestry;
         }
-        if (typeof type === 'string') {
+        if (typeof type === "string") {
           if (this.ancestry) {
-            if (isStrict === true) return this.ancestry === type;else return new RegExp('\\b' + type + '\\b').test(this.ancestry);
+            if (isStrict === true) return this.ancestry === type;
+            else return new RegExp("\\b" + type + "\\b").test(this.ancestry);
           } else {
             return false;
           }
@@ -593,20 +474,18 @@ $.fn.expredit = function (grammar, options) {
         }
       }
     };
-
-    /* This function replaces JsonPath */
-
-    var traverse = function traverse(root, path) {
+    var traverse = function(root, path) {
       var res;
-      path = path.replace(/\$/g, 'this');
+      path = path.replace(/\$/g, "this");
       try {
-        res = new Function('return ' + path).call(root);
-      } catch (e) {}
+        res = new Function("return " + path).call(root);
+      } catch (e) {
+      }
       return res;
     };
-    protonode.getScope = function () {
+    protonode.getScope = /* @__PURE__ */ function() {
       var base_scope = {
-        find: function find(name) {
+        find: function(name) {
           var r;
           r = this.idents[name];
           if (!r && this.outer) {
@@ -615,9 +494,9 @@ $.fn.expredit = function (grammar, options) {
           return r;
         }
       };
-      return function (idents, currentScope) {
+      return function(idents, currentScope) {
         var scope = Object.create(base_scope);
-        var i, j;
+        var i;
         scope.idents = {};
         scope.root = this;
         for (i in idents) {
@@ -626,7 +505,7 @@ $.fn.expredit = function (grammar, options) {
         if (currentScope && currentScope.idents) {
           scope.idents.outer = {
             type: this.getType({
-              form: 'object',
+              form: "object",
               memberScope: currentScope,
               members: currentScope.idents
             })
@@ -636,26 +515,17 @@ $.fn.expredit = function (grammar, options) {
         return scope;
       };
     }();
-    protonode.getOperator = function () {
-      var i,
-        l,
-        j,
-        m,
-        op,
-        t,
-        merged = {
-          symbol: this.value,
-          count: 0,
-          type: null,
-          operandTypes: []
-        };
+    protonode.getOperator = function() {
+      var i, l, j, m, op, t, merged = {
+        symbol: this.value,
+        count: 0,
+        type: null,
+        operandTypes: []
+      };
       for (i = 0, l = grammar.operators.length; i < l; i += 1) {
         op = grammar.operators[i];
         m = op.operandTypes.length;
         if (op.symbol === merged.symbol && m === this.operands.length) {
-          //Adding this check to exactly match the operands in grammar and the expression's operands
-          //Also adding to allow cross type additions/subtraction and other arithmetic operations.
-          //Author:SuSi
           var allOpTypeMatches = false;
           for (j = 0; j < m; j += 1) {
             t = this.operands[j].getType();
@@ -666,13 +536,11 @@ $.fn.expredit = function (grammar, options) {
           }
           if (allOpTypeMatches === true) {
             t = this.getType(op.type);
-            if (merged.type === false) {
-              // already in conflict; do nothing
-            } else if (!merged.type || merged.type.is(t)) {
+            if (merged.type === false) ;
+            else if (!merged.type || merged.type.is(t)) {
               merged.type = t;
-            } else if (t.is(merged.type)) {
-              // supertype already chosen; do nothing
-            } else {
+            } else if (t.is(merged.type)) ;
+            else {
               merged.type = false;
             }
             for (j = 0; j < m; j += 1) {
@@ -688,18 +556,17 @@ $.fn.expredit = function (grammar, options) {
       }
       return merged;
     };
-    protonode.getType = function (p) {
-      var type, t, typeName, i, pp, _inherit, scope;
-      if (p === 'any') {
+    protonode.getType = function(p) {
+      var type, t, typeName, pp, inherit, scope;
+      if (p === "any") {
         return primitive;
       }
-      if (typeof p === 'undefined') p = this.type;
-      if (typeof p === 'string') {
-        if (p.indexOf('$') === -1) {
+      if (typeof p === "undefined") p = this.type;
+      if (typeof p === "string") {
+        if (p.indexOf("$") === -1) {
           type = grammar.types[p];
           if (!type) {
             if (type !== false) {
-              // We have already tried to load this.
               loadType(p);
             }
             type = p;
@@ -713,86 +580,76 @@ $.fn.expredit = function (grammar, options) {
           }
           if (pp) {
             type = this.getType(pp);
-            typeName = 'anonymous';
+            typeName = "anonymous";
           }
         }
       } else {
         type = p;
-        typeName = 'anonymous';
+        typeName = "anonymous";
       }
       if (!type) {
         return null;
       } else if (type.ancestry) {
         return type;
       }
-
-      // We found a type, but it's not "prepared", i.e. its inheritance hierarchy
-      // is not yet resolved.
-
-      _inherit = function inherit(oldObj, props) {
-        var i,
-          newObj = Object.create(oldObj);
-        for (i in props) {
-          if (typeof oldObj[i] === 'object' && typeof props[i] === 'object' && oldObj[i] !== null && props[i] !== null) {
-            newObj[i] = _inherit(oldObj[i], props[i]);
+      inherit = function(oldObj, props) {
+        var i2, newObj = Object.create(oldObj);
+        for (i2 in props) {
+          if (typeof oldObj[i2] === "object" && typeof props[i2] === "object" && oldObj[i2] !== null && props[i2] !== null) {
+            newObj[i2] = inherit(oldObj[i2], props[i2]);
           } else {
-            newObj[i] = props[i];
+            newObj[i2] = props[i2];
           }
         }
         return newObj;
       };
-      if (type.form === 'primitive') {
-        t = _inherit(primitive, type);
+      if (type.form === "primitive") {
+        t = inherit(primitive, type);
       } else {
         p = this.getType(type.form);
         if (p) {
-          t = _inherit(p, type);
+          t = inherit(p, type);
         } else {
           return;
         }
       }
-      t.ancestry = typeName + ':' + t.ancestry;
+      t.ancestry = typeName + ":" + t.ancestry;
       t.prepared = true;
       return t;
     };
-    protonode.setType = function (scope) {
+    protonode.setType = function(scope) {
       var i, l, op, e;
-      var setParamTypes = function setParamTypes(node, offset, scope) {
-        var fnType,
-          paramScope,
-          opNode,
-          paramType,
-          i,
-          l = node.operands.length - offset;
-        fnType = node.operands[offset - 1].type;
-        if (!fnType || !fnType.is('function')) {
+      var setParamTypes = function(node2, offset, scope2) {
+        var fnType, paramScope, opNode, i2, l2 = node2.operands.length - offset;
+        fnType = node2.operands[offset - 1].type;
+        if (!fnType || !fnType.is("function")) {
           return;
         }
-        node.type = fnType.type;
-        if (fnType.params && fnType.params.length !== l) {
-          //Handling wherever the function doesnt have parameters.Not an error.
-          if (fnType.params.length != 0) node.error('Expected ' + fnType.params.length + ' arguments.');
-          l = Math.min(l, fnType.params.length);
+        node2.type = fnType.type;
+        if (fnType.params && fnType.params.length !== l2) {
+          if (fnType.params.length != 0)
+            node2.error("Expected " + fnType.params.length + " arguments.");
+          l2 = Math.min(l2, fnType.params.length);
         }
-        for (i = 0; i < l; i += 1) {
-          opNode = node.operands[i + offset];
-          if (fnType.params[i].closureParams) {
-            paramScope = opNode.getScope(fnType.params[i].closureParams, scope);
+        for (i2 = 0; i2 < l2; i2 += 1) {
+          opNode = node2.operands[i2 + offset];
+          if (fnType.params[i2].closureParams) {
+            paramScope = opNode.getScope(fnType.params[i2].closureParams, scope2);
           } else {
-            paramScope = scope;
+            paramScope = scope2;
           }
           opNode.setType(paramScope);
-          opNode.param = fnType.params[i];
-          opNode.setExpectedTypes([fnType.params[i].type]);
+          opNode.param = fnType.params[i2];
+          opNode.setExpectedTypes([fnType.params[i2].type]);
         }
       };
       this.scope = scope;
       switch (this.arity) {
-        case 'literal':
+        case "literal":
           break;
-        case 'missing':
+        case "missing":
           break;
-        case 'name':
+        case "name":
           while (scope) {
             this.ident = scope.find(this.value);
             if (this.ident) break;
@@ -802,12 +659,12 @@ $.fn.expredit = function (grammar, options) {
             this.type = this.ident.type;
             this.scope = scope;
           } else {
-            this.error('Unknown identifier.');
+            this.error("Unknown identifier.");
           }
           break;
-        case 'unary_operation':
-        case 'binary_operation':
-        case 'ternary_operation':
+        case "unary_operation":
+        case "binary_operation":
+        case "ternary_operation":
           for (i = 0, l = this.operands.length; i < l; i += 1) {
             this.operands[i].setType(scope);
           }
@@ -822,41 +679,40 @@ $.fn.expredit = function (grammar, options) {
             for (i = 0, l = this.operands.length; i < l; i += 1) {
               e.push(getTypeName(this.operands[i]));
             }
-            this.error('Invalid ' + this.value + ' between ' + e.join(', '));
+            this.error("Invalid " + this.value + " between " + e.join(", "));
           }
           break;
-        case 'object_dereference':
+        case "object_dereference":
           this.operands[0].setType(scope);
           if (this.operands[0].type) {
-            this.operands[1].setType(this.operands[0].type.memberScope || this.getScope(this.operands[0].type.members, null));
+            this.operands[1].setType(
+              this.operands[0].type.memberScope || this.getScope(this.operands[0].type.members, null)
+            );
           }
           this.type = this.operands[1].type;
-          this.operands[0].setExpectedTypes(['object']);
+          this.operands[0].setExpectedTypes(["object"]);
           break;
-        case 'function_call':
+        case "function_call":
           this.operands[0].setType(scope);
           setParamTypes(this, 1, scope);
-          this.operands[0].setExpectedTypes(['function']);
+          this.operands[0].setExpectedTypes(["function"]);
           break;
-        case 'method_call':
-          //TODO : auto braces with number of arguments
-          //might have to make some changes here for inserting braces automatically
-          //console.log(this);
+        case "method_call":
           this.operands[0].setType(scope);
           if (this.operands[0].type) {
-            this.operands[1].setType(this.operands[0].type.memberScope || this.getScope(this.operands[0].type.members, null));
+            this.operands[1].setType(
+              this.operands[0].type.memberScope || this.getScope(this.operands[0].type.members, null)
+            );
           }
           setParamTypes(this, 2, scope);
-          this.operands[0].setExpectedTypes(['object']);
-          this.operands[1].setExpectedTypes(['function']);
-
-          //Handling wherever the function doesnt have parameters. Remove the last node.
+          this.operands[0].setExpectedTypes(["object"]);
+          this.operands[1].setExpectedTypes(["function"]);
           if (this.operands[1] && this.operands[1].type && this.operands[1].type.params == 0) {
             this.operands[2] = null;
             this.operands.length = 2;
           }
           break;
-        case 'array_lookup':
+        case "array_lookup":
           this.operands[0].setType(scope);
           this.operands[1].setType(scope);
           if (this.operands[0].type) {
@@ -866,17 +722,9 @@ $.fn.expredit = function (grammar, options) {
       }
       this.type = this.getType();
     };
-    protonode.setExpectedTypes = function (types) {
-      var i,
-        j,
-        l,
-        expectedType,
-        unique = [],
-        typeNames = [],
-        e;
+    protonode.setExpectedTypes = function(types) {
+      var i, j, l, expectedType, unique = [], typeNames = [], e;
       l = types ? types.length : 0;
-
-      /*	First, get rid of types that aren't resolvable. */
       for (i = 0; i < l; i += 1) {
         expectedType = this.getType(types[i]);
         if (expectedType) {
@@ -885,16 +733,11 @@ $.fn.expredit = function (grammar, options) {
       }
       types = unique;
       l = types.length;
-
-      /*	Remove duplicates and subtypes (when supertypes are also there) */
       if (l > 1) {
         unique = [];
         for (i = 0; i < l; i++) {
           for (j = 0; j < l; j++) {
-            if (i !== j && types[j] && types[i].is(types[j]) && (!types[j].is(types[i]) || i < j)
-            /*	Don't push types[i] if it is a proper subtype
-            of types[j]; However if both are the same type,
-            push one of them (the last one). */) {
+            if (i !== j && types[j] && types[i].is(types[j]) && (!types[j].is(types[i]) || i < j)) {
               break;
             }
           }
@@ -903,52 +746,36 @@ $.fn.expredit = function (grammar, options) {
         types = unique;
         l = types.length;
       }
-
-      // No remaining expected types? nothing to do.
       if (!l) {
         return;
       }
       this.expectedTypes = types;
       for (i = 0; i < l; i += 1) {
-        typeNames[i] = types[i].ancestry.split(':')[0];
+        typeNames[i] = types[i].ancestry.split(":")[0];
       }
-
-      // Check if the current type is one of the expected ones.
       if (this.type) {
         for (i = 0; i < l; i += 1) {
           expectedType = types[i];
-          if (this.arity === 'literal') {
-            //brackets are a must!
-            //console.log(expectedType, this.type);
-          }
+          if (this.arity === "literal") ;
           if (this.type.is(expectedType)) {
             break;
           }
-          if (this.arity === 'literal' && expectedType.is(this.type)) {
-            // Auto-cast literals to subtypes.
-            // This is done to handle enums, etc.
+          if (this.arity === "literal" && expectedType.is(this.type)) {
             this.type = expectedType;
             break;
           }
         }
       }
-
-      // Put type mismatch errors
       if (i === l) {
-        e = 'Expected: ' + typeNames.join('/');
+        e = "Expected: " + typeNames.join("/");
         if (this.type && this.type.ancestry) {
-          e += ', not ' + this.type.ancestry.split(':')[0];
+          e += ", not " + this.type.ancestry.split(":")[0];
         }
         this.error(e);
       }
     };
-
-    /*
-     *  Type annotates nodes with "type" and "expectedType" attributes
-     *  and adds error messages if needed.
-     */
     var loadType;
-    return function (tree, expected, loader) {
+    return function(tree, expected, loader) {
       loadType = loader;
       tree.setType(tree.getScope(grammar.identifiers));
       if (expected) tree.setExpectedTypes(expected);
@@ -956,150 +783,111 @@ $.fn.expredit = function (grammar, options) {
     };
   }();
   var io = {
-    charOffset: function charOffset(node, pos) {
+    charOffset: function(node2, pos) {
       var i, l, n, t;
-      if (rangy.dom.isCharacterDataNode(node)) {
-        return {
-          node: node,
-          pos: pos
-        };
+      if (rangy.dom.isCharacterDataNode(node2)) {
+        return { node: node2, pos };
       }
-      t = node.textContent || node.innerText || '';
+      t = node2.textContent || node2.innerText || "";
       if (pos > t.length) {
         pos = t.length;
       }
-      for (i = 0, l = node.childNodes.length; i < l; i += 1) {
-        n = node.childNodes[i];
-        t = n.textContent || n.innerText || '';
+      for (i = 0, l = node2.childNodes.length; i < l; i += 1) {
+        n = node2.childNodes[i];
+        t = n.textContent || n.innerText || "";
         if (t.length < pos) {
           pos -= t.length;
         } else {
           return io.charOffset(n, pos);
         }
       }
-      return {
-        node: node,
-        pos: pos
-      };
+      return { node: node2, pos };
     },
-    getCursor: function getCursor(editor) {
-      'use strict';
-
-      var range = rangy.createRange(),
-        select = rangy.getSelection(),
-        reverse = select.isBackwards(),
-        start,
-        end;
+    getCursor: function(editor) {
+      var range = rangy.createRange(), select = rangy.getSelection(), reverse = select.isBackwards(), start, end;
       select = select.getRangeAt(0);
       range.setStart(editor, 0);
       range.setEnd(select.startContainer, select.startOffset);
       start = range.toString().length;
       end = start + select.toString().length;
-      return {
-        start: start,
-        end: end,
-        reverse: reverse
-      };
+      return { start, end, reverse };
     },
-    putCursor: function putCursor(start, end, reverse) {
-      'use strict';
-
-      var range = rangy.createRange(),
-        select = rangy.getSelection();
+    putCursor: function(start, end, reverse) {
+      var range = rangy.createRange(), select = rangy.getSelection();
       range.setStart(start.node, start.pos);
       range.setEnd(end.node, end.pos);
       select.removeAllRanges();
       select.addRange(range, reverse);
     },
-    expr: function expr(d) {
-      'use strict';
-
+    expr: function(d) {
       var t = $(d);
-      t.find('br').remove();
+      t.find("br").remove();
       return t.text();
     },
-    balloon: function balloon(node) {
-      'use strict';
-
-      var popup = $('.balloon'),
-        editor,
-        t,
-        i,
-        l,
-        j,
-        m,
-        expected,
-        picker,
-        calltips = [],
-        show = false,
-        calltipDiv,
-        calltipEls;
-      if (!node.dom || node.dom.hasClass('selected')) return;
-      editor = node.dom.closest('.expredit').eq(0);
-      if (!editor.is(':focus')) return;
+    balloon: function(node2) {
+      var popup = $(".balloon"), editor, t, i, l, j, m, expected, picker, show = false, calltipEls;
+      if (!node2.dom || node2.dom.hasClass("selected")) return;
+      editor = node2.dom.closest(".expredit").eq(0);
+      if (!editor.is(":focus")) return;
       if (popup.length) {
         io.removeBalloon();
       }
-      editor.find('.selected').removeClass('selected');
-      node.dom.addClass('selected');
-      var rect = node.dom[0].getBoundingClientRect();
-      popup = $('<div>').addClass('balloon').data('node', node).css({
-        position: 'fixed',
-        top: rect.bottom + 8 + 'px',
-        left: rect.left + 'px',
+      editor.find(".selected").removeClass("selected");
+      node2.dom.addClass("selected");
+      var rect = node2.dom[0].getBoundingClientRect();
+      popup = $("<div>").addClass("balloon").data("node", node2).css({
+        position: "fixed",
+        top: rect.bottom + 8 + "px",
+        left: rect.left + "px",
         zIndex: 2147483647,
         background: CAP_WHITE,
-        boxShadow: "0 2px 8px " + CAP_BLACK_ALPHA01,
-        border: "1px solid " + CAP_COLOR_16
+        boxShadow: `0 2px 8px ${CAP_BLACK_ALPHA01}`,
+        border: `1px solid ${CAP_COLOR_16}`
       });
-      var setValue = function setValue(value) {
+      var setValue = function(value) {
         var range;
-        node.dom.html(value);
+        node2.dom.html(value);
         range = rangy.createRange();
-        range.collapseAfter(node.dom[0]);
+        range.collapseAfter(node2.dom[0]);
         rangy.getSelection().setSingleRange(range);
-        node.dom.trigger('keyup');
+        node2.dom.trigger("keyup");
       };
-      var calltipHover = function calltipHover(e) {
-        if ($(this).hasClass('sel')) {
+      var calltipHover = function(e) {
+        if ($(this).hasClass("sel")) {
           return;
         }
-        $('.calltip.sel').removeClass('sel');
-        $(this).addClass('sel');
+        $(".calltip.sel").removeClass("sel");
+        $(this).addClass("sel");
       };
-      var calltipClick = function calltipClick(e) {
+      var calltipClick = function(e) {
         setValue($(this).html());
         e.preventDefault();
       };
-      var calltipKey = function calltipKey(e) {
-        var UP = 38,
-          DOWN = 40,
-          ENTER = 13,
-          ESC = 27,
-          selection,
-          numTips;
+      var calltipKey = function(e) {
+        var UP = 38, DOWN = 40, ENTER = 13, ESC = 27, selection, numTips;
         if (e.which === UP || e.which === DOWN || e.which === ENTER || e.which === ESC) {
-          selection = $('.calltip.sel');
-          var callTipDiv = $('.calltips');
+          selection = $(".calltip.sel");
+          var callTipDiv = $(".calltips");
           numTips = calltipEls.length;
           if (selection.length) {
             if (e.which === UP) {
-              $('.balloon').removeClass('hide');
+              $(".balloon").removeClass("hide");
               selection = calltipEls.eq((calltipEls.index(selection) + numTips - 1) % numTips);
-              callTipDiv.animate({
-                scrollTop: calltipEls.index(selection) * selection.outerHeight()
-              }, 100);
+              callTipDiv.animate(
+                { scrollTop: calltipEls.index(selection) * selection.outerHeight() },
+                100
+              );
             } else if (e.which === DOWN) {
-              $('.balloon').removeClass('hide');
+              $(".balloon").removeClass("hide");
               selection = calltipEls.eq((calltipEls.index(selection) + 1) % numTips);
-              callTipDiv.animate({
-                scrollTop: calltipEls.index(selection) * selection.outerHeight()
-              }, 100);
+              callTipDiv.animate(
+                { scrollTop: calltipEls.index(selection) * selection.outerHeight() },
+                100
+              );
             } else if (e.which === ENTER) {
-              //console.log(grammar);
               setValue(selection.html());
             } else if (e.which === ESC) {
-              $('.balloon').addClass('hide');
+              $(".balloon").addClass("hide");
             }
           } else {
             if (e.which === UP) {
@@ -1109,8 +897,8 @@ $.fn.expredit = function (grammar, options) {
             }
           }
           if (selection.length) {
-            $('.calltip.sel').removeClass('sel');
-            selection.addClass('sel');
+            $(".calltip.sel").removeClass("sel");
+            selection.addClass("sel");
           }
           e.preventDefault();
           e.stopPropagation();
@@ -1118,54 +906,48 @@ $.fn.expredit = function (grammar, options) {
         }
         return true;
       };
-
-      /* Add error messages */
-      if (node.err) {
-        popup.append($('<div>').addClass('expressionError').html(node.err.join('<br />')));
+      if (node2.err) {
+        popup.append($("<div>").addClass("expressionError").html(node2.err.join("<br />")));
         show = true;
       }
-
-      /* Add info messages */
-      var info = '',
-        expDescs = [],
-        expinfo = '';
-      if (node.param && node.param.desc) {
-        expinfo += 'argument: ' + node.param.desc + ' ';
-      }
-      if (node.expectedTypes) {
-        for (i = 0, l = node.expectedTypes.length; i < l; i += 1) {
-          if (node.expectedTypes[i].desc) {
-            expDescs.push(node.expectedTypes[i].desc);
+      var info = "", expDescs = [], expinfo = "";
+      if (node2.param && node2.param.desc) {
+        expinfo += "argument: " + node2.param.desc + " ";
+      }
+      if (node2.expectedTypes) {
+        for (i = 0, l = node2.expectedTypes.length; i < l; i += 1) {
+          if (node2.expectedTypes[i].desc) {
+            expDescs.push(node2.expectedTypes[i].desc);
           }
         }
-        expinfo += expDescs.length ? (expinfo ? '(' : '') + expDescs.join(', ') + (expinfo ? ')' : '') : '';
+        expinfo += expDescs.length ? (expinfo ? "(" : "") + expDescs.join(", ") + (expinfo ? ")" : "") : "";
       }
-      if (node.ident && node.ident.desc) {
-        info += node.ident.desc + ' ';
+      if (node2.ident && node2.ident.desc) {
+        info += node2.ident.desc + " ";
       }
-      if (node.type && node.type.desc) {
-        info += (info ? '(' : 'Found: ') + node.type.desc + (info ? ')' : '');
+      if (node2.type && node2.type.desc) {
+        info += (info ? "(" : "Found: ") + node2.type.desc + (info ? ")" : "");
       }
       if (expinfo) {
-        popup.append($('<div>').addClass('info').html('Expected ' + expinfo));
+        popup.append(
+          $("<div>").addClass("info").html("Expected " + expinfo)
+        );
         show = true;
       }
       if (info) {
-        popup.append($('<div>').addClass('info').html(info));
+        popup.append($("<div>").addClass("info").html(info));
         show = true;
       }
-
-      /* Add pickers */
-      if (node.expectedTypes && (m = node.expectedTypes.length)) {
+      if (node2.expectedTypes && (m = node2.expectedTypes.length)) {
         for (j = 0; j < m; j += 1) {
-          expected = node.getType(node.expectedTypes[j]);
+          expected = node2.getType(node2.expectedTypes[j]);
           if (expected && expected.ancestry) {
-            t = expected.ancestry.split(':');
+            t = expected.ancestry.split(":");
             for (i = 0, l = t.length; i < l; i += 1) {
               if (pickers[t[i]]) {
-                picker = pickers[t[i]](node.value, expected, setValue);
+                picker = pickers[t[i]](node2.value, expected, setValue);
                 if (picker) {
-                  popup.append(picker.addClass('picker').addClass(t[i]));
+                  popup.append(picker.addClass("picker").addClass(t[i]));
                   show = true;
                   break;
                 }
@@ -1174,71 +956,57 @@ $.fn.expredit = function (grammar, options) {
           }
         }
       }
-
-      /* Add calltips */
-      picker = pickers.any(node, true);
+      picker = pickers.any(node2, true);
       if (picker) {
         popup.append(picker);
         show = true;
       }
       if (show) {
-        popup.data('editor', editor);
-        editor.on('keydown.balloon', calltipKey);
+        popup.data("editor", editor);
+        editor.on("keydown.balloon", calltipKey);
         var targetBody = editor[0] && editor[0].ownerDocument ? editor[0].ownerDocument.body : document.body;
-        popup.on('mousedown', function () {
-          editor.trigger('focus');
+        popup.on("mousedown", function() {
+          editor.trigger("focus");
           ignoreBlur = true;
         }).appendTo(targetBody);
-        $('.calltip').on('mousemove', calltipHover).on('click', calltipClick);
+        $(".calltip").on("mousemove", calltipHover).on("click", calltipClick);
       }
-      calltipEls = $('.calltip');
-      calltipEls.eq(0).addClass('sel');
+      calltipEls = $(".calltip");
+      calltipEls.eq(0).addClass("sel");
     },
-    removeBalloon: function removeBalloon() {
+    removeBalloon: function() {
       var editor;
-      editor = $('.balloon').data('editor');
+      editor = $(".balloon").data("editor");
       if (editor) {
-        editor.off('keydown.balloon');
+        editor.off("keydown.balloon");
       }
-      $('.balloon').remove();
-      $('.selected').removeClass('selected');
+      $(".balloon").remove();
+      $(".selected").removeClass("selected");
     }
   };
-
-  /*
-  selectNode could be rewritten as protonode.findSelectedLeaf(cursor)
-  */
-
-  var selectNode = function selectNode(tree, cursor) {
-    'use strict';
-
-    var selDist = 99999,
-      selNode,
-      t;
-    var affinity = function affinity(node) {
-      switch (node.arity) {
-        case 'missing':
+  var selectNode = function(tree, cursor) {
+    var selDist = 99999, selNode, t;
+    var affinity = function(node2) {
+      switch (node2.arity) {
+        case "missing":
           return 2;
-        case 'literal':
-        case 'name':
+        case "literal":
+        case "name":
           return 1;
         default:
           return 0;
       }
     };
-    function testSel(node) {
-      // recursively tests nodes for cursor intersection
-      if (!node) return;
-      var dist = Math.max(node.pos - cursor, cursor - node.pos - node.len),
-        i,
-        l;
-      if (dist <= 0 && (dist < selDist || dist == selDist && affinity(node) > affinity(selNode))) {
-        selNode = node;
+    function testSel(node2) {
+      if (!node2) return;
+      var dist = Math.max(node2.pos - cursor, cursor - node2.pos - node2.len), i, l;
+      if (dist <= 0 && (dist < selDist || dist == selDist && affinity(node2) > affinity(selNode))) {
+        selNode = node2;
         selDist = dist;
       }
-      if (node.children) {
-        for (i = 0, l = node.children.length; i < l; i += 1) {
-          testSel(node.children[i]);
+      if (node2.children) {
+        for (i = 0, l = node2.children.length; i < l; i += 1) {
+          testSel(node2.children[i]);
         }
       }
     }
@@ -1246,27 +1014,21 @@ $.fn.expredit = function (grammar, options) {
     if (selNode) {
       if (selNode.dom) {
         t = selNode.dom[0];
-        t = (t.textContent || t.innerText || '').length;
+        t = (t.textContent || t.innerText || "").length;
       }
-      return {
-        node: selNode,
-        pos: Math.min(t, cursor - selNode.pos)
-      };
-    } else if (tree.arity === 'missing') {
-      return {
-        node: tree,
-        pos: 0
-      };
+      return { node: selNode, pos: Math.min(t, cursor - selNode.pos) };
+    } else if (tree.arity === "missing") {
+      return { node: tree, pos: 0 };
     } else {
       return null;
     }
   };
-  var getTypeName = function getTypeName(node, full) {
-    var type = node.type;
+  var getTypeName = function(node2, full) {
+    var type = node2.type;
     if (type) {
-      if (typeof type === 'string') {
+      if (typeof type === "string") {
         if (full) {
-          return node.getType(type).ancestry;
+          return node2.getType(type).ancestry;
         }
         return type;
       }
@@ -1274,83 +1036,72 @@ $.fn.expredit = function (grammar, options) {
         if (full) {
           return type.ancestry;
         }
-        return type.ancestry.replace(/anonymous\:/g, '').split(':')[0];
+        return type.ancestry.replace(/anonymous\:/g, "").split(":")[0];
       }
     }
-    return 'unknown';
+    return "unknown";
   };
-  protonode.toJson = function (prefix, indent) {
-    'use strict';
-
+  protonode.toJson = function(prefix, indent) {
     var i, l, str, delim;
-    str = prefix + '{';
+    str = prefix + "{";
     str += prefix + indent + '"arity":"' + this.arity + '"';
-    if (typeof this.value !== 'undefined') {
-      str += ',' + prefix + indent + '"value":"';
-      str += ('' + this.value).replace(/[\\'"\0]/g, '\\$&') + '"';
+    if (typeof this.value !== "undefined") {
+      str += "," + prefix + indent + '"value":"';
+      str += ("" + this.value).replace(/[\\'"\0]/g, "\\$&") + '"';
     }
     if (this.type) {
-      str += ',' + prefix + indent + '"type":"';
+      str += "," + prefix + indent + '"type":"';
       str += getTypeName(this, true) + '"';
     }
     if (this.operands) {
-      str += ',' + prefix + indent + '"operands":[';
-      delim = '';
+      str += "," + prefix + indent + '"operands":[';
+      delim = "";
       for (i = 0, l = this.operands.length; i < l; i += 1) {
         str += delim + this.operands[i].toJson(prefix + indent + indent, indent);
-        delim = ',';
+        delim = ",";
       }
-      str += prefix + indent + ']';
+      str += prefix + indent + "]";
     }
-    str += prefix + '}';
+    str += prefix + "}";
     return str;
   };
-  protonode.toDom = function (pos) {
-    'use strict';
-
-    var i,
-      l,
-      el,
-      className = 'node',
-      node = this,
-      typeName;
+  protonode.toDom = function(pos) {
+    var el, className = "node", node2 = this, typeName;
     pos = pos || 0;
-    var addChildren = function addChildren(node, startIndex, delim) {
-      var i,
-        l,
-        d = null;
-      if (!node.children || node.children.length <= startIndex) {
+    var addChildren = function(node3, startIndex, delim) {
+      var i2, l2, d = null;
+      if (!node3.children || node3.children.length <= startIndex) {
         return;
       }
-      for (i = startIndex, l = node.children.length; i < l; i += 1) {
-        if (d) node.dom.append(d);
-        node.dom.append(node.children[i].toDom(pos));
+      for (i2 = startIndex, l2 = node3.children.length; i2 < l2; i2 += 1) {
+        if (d) node3.dom.append(d);
+        node3.dom.append(node3.children[i2].toDom(pos));
         if (delim) d = delim.clone(false);
       }
     };
-    this.dom = el = $('<span>');
-    className += ' ' + this.arity;
-    className += this.err ? ' has_errors' : '';
-    typeName = 'expredit_' + getTypeName(this, true);
-    className += typeName ? ' ' + typeName.replace(/anonymous/g, '').replace(/\:+/g, ' ') : '';
+    this.dom = el = $("<span>");
+    className += " " + this.arity;
+    className += this.err ? " has_errors" : "";
+    typeName = "expredit_" + getTypeName(this, true);
+    className += typeName ? " " + typeName.replace(/anonymous/g, "").replace(/\:+/g, " ") : "";
     el.addClass(className);
     switch (this.arity) {
-      case 'binary_operation':
-      case 'object_dereference':
-        addChildren(this, 0, $("<span class='operator'>" + this.text + '</span>'));
+      case "binary_operation":
+      case "object_dereference":
+        addChildren(this, 0, $("<span class='operator'>" + this.text + "</span>"));
         break;
-      case 'unary_operation':
-        el.append($("<span class='operator'>" + this.text + '</span>'));
+      case "unary_operation":
+        el.append($("<span class='operator'>" + this.text + "</span>"));
         el.append(this.children[0].toDom(pos));
         break;
-      case 'ternary_operation':
+      case "ternary_operation":
         el.append(this.children[0].toDom(pos));
         el.append($("<span class='operator'>?</span>"));
         el.append(this.children[1].toDom(pos));
         el.append($("<span class='operator'>:</span>"));
         el.append(this.children[2].toDom(pos));
         break;
-      case 'method_call':
+      case "method_call":
         el.append(this.children[0].toDom(pos));
         el.append($("<span class='operator'>.</span>"));
         el.append(this.children[1].toDom(pos));
@@ -1358,19 +1109,19 @@ $.fn.expredit = function (grammar, options) {
         addChildren(this, 2, $("<span class='operator'>,</span>"));
         el.append($("<span class='operator paren'>)</span>"));
         break;
-      case 'function_call':
+      case "function_call":
         el.append(this.children[0].toDom(pos));
         el.append($("<span class='operator paren'>(</span>"));
         addChildren(this, 1, $("<span class='operator'>,</span>"));
         el.append($("<span class='operator paren'>)</span>"));
         break;
-      case 'array_lookup':
+      case "array_lookup":
         el.append(this.children[0].toDom(pos));
         el.append($("<span class='operator paren'>[</span>"));
         addChildren(this, 1, $("<span class='operator'> </span>"));
         el.append($("<span class='operator paren'>]</span>"));
         break;
-      case 'group':
+      case "group":
         if (this.paren !== false) {
           el.append($("<span class='operator paren'>(</span>"));
         }
@@ -1379,72 +1130,65 @@ $.fn.expredit = function (grammar, options) {
           el.append($("<span class='operator paren'>)</span>"));
         }
         break;
-      case 'missing':
+      case "missing":
         if (this.text) {
           el.html(this.text);
         } else {
-          el.html('&nbsp;');
+          el.html("&nbsp;");
         }
         break;
       default:
-        el.html(this.text || '');
+        el.html(this.text || "");
         break;
     }
-    el.on('mousemove', function (e) {
-      io.balloon(node);
+    el.on("mousemove", function(e) {
+      io.balloon(node2);
       e.stopPropagation();
     });
     return el;
   };
-  return this.each(function () {
+  return this.each(function() {
     var tree, selectedNode;
     var initVal = this.value;
     var input = $(this);
-    var cursor,
-      onMissing = false,
-      missingPos;
-    var loadType = function loadType(typeName) {
+    var cursor, onMissing = false, missingPos;
+    var loadType = function(typeName) {
       if (!options.typeSource) return;
-      var notif = $('<div>').addClass('notification').insertAfter(xedit).html('Loading ' + typeName + '...').fadeIn(200);
-      $.getJSON(options.typeSource, {
-        t: typeName
-      }).done(function (data) {
+      var notif = $("<div>").addClass("notification").insertAfter(xedit).html("Loading " + typeName + "...").fadeIn(200);
+      $.getJSON(options.typeSource, { t: typeName }).done(function(data) {
         notif.fadeOut(500);
         grammar.types[typeName] = data;
         io.removeBalloon();
-        //Do the same as in key up function but force to reload the balloon
         if (!options.offline) cursor = io.getCursor(xedit[0]);
         handleText(true);
         if (!options.offline) handleCursor();
-      }).fail(function () {
-        //console.log(this);
-        notif.html('Error loading ' + typeName);
+      }).fail(function() {
+        notif.html("Error loading " + typeName);
         grammar.types[typeName] = false;
-        setTimeout(function () {
+        setTimeout(function() {
           notif.fadeOut(500);
-        }, 1000);
+        }, 1e3);
       });
     };
-    var handleText = function handleText(force) {
+    var handleText = function(force) {
       var expr = io.expr(xedit);
       if (force || expr !== input.val()) {
         tree = parse(tokenize(expr));
         typify(tree, options.expected, loadType);
         xedit.empty().append(tree.toDom());
-        //console.log(tree);
-        input.val(io.expr(xedit)).data('json', tree.toJson('\n', '  ')).trigger('change');
+        input.val(io.expr(xedit)).data("json", tree.toJson("\n", "  ")).trigger("change");
       }
     };
-    var handleCursor = function handleCursor() {
+    var handleCursor = function() {
       var reverse = cursor.reverse;
       var node_s = selectNode(tree, cursor.start);
       var node_e = selectNode(tree, cursor.end);
-      var cur_s = node_s && node_s.node.dom && node_s.node.arity === 'missing' ? io.charOffset(node_s.node.dom[0], node_s.pos) : io.charOffset(xedit[0], cursor.start);
-      var cur_e = node_e && node_s.node.dom && node_e.node.arity === 'missing' ? io.charOffset(node_e.node.dom[0], node_e.pos) : io.charOffset(xedit[0], cursor.end);
+      var cur_s = node_s && node_s.node.dom && node_s.node.arity === "missing" ? io.charOffset(node_s.node.dom[0], node_s.pos) : io.charOffset(xedit[0], cursor.start);
+      var cur_e = node_e && node_s.node.dom && node_e.node.arity === "missing" ? io.charOffset(node_e.node.dom[0], node_e.pos) : io.charOffset(xedit[0], cursor.end);
       onMissing = false;
       if (node_e && node_s && node_e.node === node_s.node) {
         selectedNode = node_s.node;
-        if (selectedNode.arity === 'missing' && !selectedNode.text) {
+        if (selectedNode.arity === "missing" && !selectedNode.text) {
           cur_s.pos = 0;
           cur_e.pos = 1;
           missingPos = node_s.pos;
@@ -1455,51 +1199,45 @@ $.fn.expredit = function (grammar, options) {
       }
       io.putCursor(cur_s, cur_e, reverse);
     };
-    var handleBlur = function handleBlur() {
-      //		console.log(xedit.is(":focus"));
-      setTimeout(function () {
+    var handleBlur = function() {
+      setTimeout(function() {
         if (ignoreBlur) {
-          //console.log("stop ignoring");
           ignoreBlur = false;
         } else {
           io.removeBalloon();
         }
       }, 200);
     };
-    $(document.body).attr({
-      spellcheck: false
-    });
-    var xedit = $('<div>').attr({
+    $(document.body).attr({ spellcheck: false });
+    var xedit = $("<div>").attr({
       contenteditable: true,
       spellcheck: false,
-      class: 'expredit ' + input[0].className,
-      style: input.attr('style')
+      class: "expredit " + input[0].className,
+      style: input.attr("style")
     }).css({
       width: input.width(),
-      height: 'auto',
-      display: input.is(':visible') ? 'inline-block' : 'none'
-    }).on('keyup', function (e) {
+      height: "auto",
+      display: input.is(":visible") ? "inline-block" : "none"
+    }).on("keyup", function(e) {
       if (onMissing && selectedNode != tree && (e.which == 8 || e.which == 46 || e.which == 37 && missingPos == 0 || e.which == 39 && missingPos == 1)) {
         onMissing = false;
       }
       if (!options.offline) cursor = io.getCursor(xedit[0]);
       handleText();
       if (!options.offline) handleCursor();
-    }).on('mouseup', function () {
+    }).on("mouseup", function() {
       if (!options.offline) {
         cursor = io.getCursor(xedit[0]);
         handleCursor();
       }
-    }).on('blur', handleBlur).insertAfter(input);
-
-    //TODO: Do it in a better way. Escaping the special characters.
-    var initVal1 = initVal.replace(/</g, '&lt;');
-    initVal1 = initVal1.replace(/>/g, '&gt;');
-    initVal1 = initVal1.replace(/&&/g, '&amp;&amp;');
-    initVal1 = initVal1.replace(/'/g, '&quot;');
+    }).on("blur", handleBlur).insertAfter(input);
+    var initVal1 = initVal.replace(/</g, "&lt;");
+    initVal1 = initVal1.replace(/>/g, "&gt;");
+    initVal1 = initVal1.replace(/&&/g, "&amp;&amp;");
+    initVal1 = initVal1.replace(/'/g, "&quot;");
     xedit.html(initVal1);
     input.hide();
     handleText(true);
   });
 };
-var ignoreBlur = false;
+var ignoreBlur = false;