Marshall variable args carefully in arithmetic expressions (terminusdb#297)

Author: GavinMendelGleason

lib/query/woqlCore.js

@@ -260,7 +260,7 @@ WOQLQuery.prototype.wform = function (opts) {
  */
 WOQLQuery.prototype.arop = function (arg) {
   if (typeof arg === 'object') {
-    return arg.json ? arg.json() : arg;
+    return this.jobj(this.cleanArithmeticValue(arg));
   }
   return this.cleanArithmeticValue(arg, 'xsd:decimal');
 };

test/woql.spec.js

@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 
 const WOQL = require('../lib/woql');
-const { Var } = require('../lib/query/woqlDoc');
+const { Var, Vars } = require('../lib/query/woqlDoc');
 
 const idGenJson = require('./woqlJson/woqlIdgenJson');
 const woqlStarJson = require('./woqlJson/woqlStarJson');
@@ -461,4 +461,39 @@ describe('woql queries', () => {
     })
   });
 
+  it('check arithmetic var', () => {
+    let v = Vars("a", "res");
+    const wq = WOQL.eval(WOQL.times(v.a, 3),v.res).json();
+    expect(wq).to.deep.eql({
+      "@type": "Eval",
+        "expression": {
+          "@type": "Times",
+          "left": {
+            "@type": "ArithmeticValue",
+            "variable": "a"
+          },
+          "right": {
+            "@type": "ArithmeticValue",
+            "data": {
+              "@type": "xsd:decimal",
+              "@value": 3
+            }
+          }
+        },
+        "result": {
+          "@type": "ArithmeticValue",
+          "variable": "res"
+        }
+      })
+  });
+  it('check deep arithmetic var', () => {
+    let v = Vars("a", "res");
+      const wq = WOQL.and(
+        WOQL.eval(WOQL.times(3,4), v.a),
+        WOQL.eval(WOQL.times(v.a, 3),v.res)
+      ).json();
+    console.log(JSON.stringify(wq));
+    expect(wq).to.deep.eql(
+      {"@type":"And","and":[{"@type":"Eval","expression":{"@type":"Times","left":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":3}},"right":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":4}}},"result":{"@type":"ArithmeticValue","variable":"a"}},{"@type":"Eval","expression":{"@type":"Times","left":{"@type":"ArithmeticValue","variable":"a"},"right":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":3}}},"result":{"@type":"ArithmeticValue","variable":"res"}}]})
+  });
 });