Adding arithmetic variable treatment (terminusdb#296)

Author: GavinMendelGleason

lib/query/woqlQuery.js

@@ -934,7 +934,7 @@ WOQLQuery.prototype.plus = function (...args) {
   this.cursor['@type'] = 'Plus';
   this.cursor.left = this.arop(args.shift());
   if (args.length > 1) {
-    this.cursor.right = this.jobj(new WOQLQuery().plus(...args));
+    this.cursor.right = this.jobj(new WOQLQuery().plus(...args.map(this.arop)));
   } else {
     this.cursor.right = this.arop(args[0]);
   }
@@ -954,7 +954,7 @@ WOQLQuery.prototype.minus = function (...args) {
   this.cursor['@type'] = 'Minus';
   this.cursor.left = this.arop(args.shift());
   if (args.length > 1) {
-    this.cursor.right = this.jobj(new WOQLQuery().minus(...args));
+    this.cursor.right = this.jobj(new WOQLQuery().minus(...args.map(this.arop)));
   } else {
     this.cursor.right = this.arop(args[0]);
   }
@@ -973,7 +973,7 @@ WOQLQuery.prototype.times = function (...args) {
   this.cursor['@type'] = 'Times';
   this.cursor.left = this.arop(args.shift());
   if (args.length > 1) {
-    this.cursor.right = this.jobj(new WOQLQuery().times(...args));
+    this.cursor.right = this.jobj(new WOQLQuery().times(...args.map(this.arop)));
   } else {
     this.cursor.right = this.arop(args[0]);
   }
@@ -991,7 +991,7 @@ WOQLQuery.prototype.divide = function (...args) {
   this.cursor['@type'] = 'Divide';
   this.cursor.left = this.arop(args.shift());
   if (args.length > 1) {
-    this.cursor.right = this.jobj(new WOQLQuery().divide(...args));
+    this.cursor.right = this.jobj(new WOQLQuery().divide(...args.map(this.arop)));
   } else {
     this.cursor.right = this.arop(args[0]);
   }
@@ -1010,7 +1010,7 @@ WOQLQuery.prototype.div = function (...args) {
   this.cursor['@type'] = 'Div';
   this.cursor.left = this.arop(args.shift());
   if (args.length > 1) {
-    this.cursor.right = this.jobj(new WOQLQuery().div(...args));
+    this.cursor.right = this.jobj(new WOQLQuery().div(...args.map(this.arop)));
   } else {
     this.cursor.right = this.arop(args[0]);
   }

lib/woql.js

@@ -502,12 +502,18 @@ WOQL.evaluate = function (arithExp, resultVarName) {
 };
 
 /**
+ *
  * Evaluates the passed arithmetic expression and generates or matches the result value
- * @param {object| WOQLQuery | string} arithExp - query or JSON-LD representing the query
- * @param {string|Var} resultVarName - output variable
- * @returns {WOQLQuery} WOQLQuery
+ * @param {object| WOQLQuery | string} arithExp - A WOQL query containing a valid WOQL Arithmetic
+ * Expression, which is evaluated by the function
+ * @param {string|number|Var} resultVarName - Either a variable, in which the result of the
+ * expression will be stored, or a numeric literal which will be used as a test of result of
+ * the evaluated expression
+ * @returns {WOQLQuery} A WOQLQuery which contains the Arithmetic function
+ * @example
+ * let [result] = vars("result")
+ * eval(plus(2, minus(3, 1)), result)
  */
-
 WOQL.eval = function (arithExp, resultVarName) {
   return new WOQLQuery().eval(arithExp, resultVarName);
 };