Updated WOQL syntax tests passing (aside from TripleBuilder)

Author: GavinMendelGleason

lib/query/woqlCore.js

@@ -110,6 +110,15 @@ WOQLQuery.prototype.rawVar = function(varb) {
     return varb
 }
 
+WOQLQuery.prototype.rawVarList = function(vl) {
+    let ret = []
+    for (var i = 0; i < vl.length; i++) {
+        let co = this.rawVar(vl[i])
+        ret.push(co)
+    }
+    return ret
+}
+
 /**
  * Transforms a javascript representation of a query into a json object if needs be
  */
@@ -181,19 +190,64 @@ WOQLQuery.prototype.arop = function(arg) {
     if (typeof arg == 'object') {
         return arg.json ? arg.json() : arg
     }
-    return this.cleanArithmeticObject(arg, 'xsd:decimal')
+    return this.cleanArithmeticValue(arg, 'xsd:decimal')
+}
+
+/**
+ * takes input that can be either a string (variable name)
+ * or an array - each element of the array is a member of the list
+ */
+WOQLQuery.prototype.wlist = function(wvar, string_only) {
+    if (typeof wvar == 'string') return this.expandDataVariable(wvar, true)
+    if (Array.isArray(wvar)) {
+        let ret = []
+        for (var i = 0; i < wvar.length; i++) {
+            let co = this.cleanDataValue(wvar[i])
+            if (typeof co == 'string') co = {node: co}
+            ret.push(co)
+        }
+        return ret
+    }
+}
+
+/**
+ * takes a list of input that can be any value
+ */
+WOQLQuery.prototype.valueList = function(wvar, string_only) {
+    if (typeof wvar == 'string') return this.expandValueVariable(wvar, true)
+    if (Array.isArray(wvar)) {
+        let ret = []
+        for (var i = 0; i < wvar.length; i++) {
+            let co = this.cleanObject(wvar[i])
+            if (typeof co == 'string') co = {node: co}
+            ret.push(co)
+        }
+        return ret
+    }
 }
 
 /**
- * Wraps value lists in the appropriate json-ld
+ * creates an unadorned variable name list
  */
 WOQLQuery.prototype.vlist = function(list) {
-    vlist = []
-    for(i = 0; i++; i < list.length){
-        v = this.expandVariable(list[i])
-        vlist.push(v)
+    let vl = []
+    for (var i = 0; i < list.length; i++){
+        let v = this.expandValueVariable(list[i])
+        vl.push(v['variable'])
     }
-    return vlist
+    return vl
+}
+
+/**
+ * Wraps data values
+ */
+WOQLQuery.prototype.dataValueList = function(list) {
+    let dvl = []
+    for (var i = 0; i < list.length; i++){
+        let o = this.cleanDataValue(list[i])
+        dvl.push(o)
+    }
+    return dvl
 }
 
 /**
@@ -208,8 +262,7 @@ WOQLQuery.prototype.cleanSubject = function(s) {
         return s
     } else if (typeof s === 'string') {
         if (s.indexOf('v:') !== -1) subj = s
-        //else if (this.vocab && this.vocab[s]) subj = this.vocab[s]
-        else subj = s //'doc:' + s
+        else subj = s
         return this.expandNodeVariable(subj)
     }
     this.parameterError('Subject must be a URI string')
@@ -265,6 +318,8 @@ WOQLQuery.prototype.cleanObject = function(o, t) {
             return this.cleanClass(o)
         } else if (this.vocab && this.vocab[o]) {
             return this.cleanClass(this.vocab[o])
+        } else if (s.indexOf('v:') !== -1) {
+            return this.expandValueVariable(o)
         } else {
             obj['data'] = this.jlt(o, t)
         }
@@ -278,10 +333,14 @@ WOQLQuery.prototype.cleanObject = function(o, t) {
     return obj
 }
 
-WOQLQuery.prototype.cleanDataObject = function(o, t) {
+WOQLQuery.prototype.cleanDataValue = function(o, t) {
     let obj = {'@type': 'DataValue'}
     if (typeof o === 'string') {
-        obj['data'] = this.jlt(o, t)
+        if (o.indexOf('v:') !== -1) {
+            return this.expandDataVariable(o)
+        }else{
+            obj['data'] = this.jlt(o, t)
+        }
     } else if (typeof o == 'number') {
         t = t || 'xsd:decimal'
         obj['data'] = this.jlt(o, t)
@@ -292,10 +351,14 @@ WOQLQuery.prototype.cleanDataObject = function(o, t) {
     return obj
 }
 
-WOQLQuery.prototype.cleanArithmeticObject = function(o, t) {
+WOQLQuery.prototype.cleanArithmeticValue = function(o, t) {
     let obj = {'@type': 'ArithmeticValue'}
     if (typeof o === 'string') {
-        obj['data'] = this.jlt(o, t)
+        if (o.indexOf('v:') !== -1) {
+            return this.expandArithmeticVariable(o)
+        }else{
+            obj['data'] = this.jlt(o, t)
+        }
     } else if (typeof o == 'number') {
         t = t || 'xsd:decimal'
         obj['data'] = this.jlt(o, t)
@@ -306,12 +369,27 @@ WOQLQuery.prototype.cleanArithmeticObject = function(o, t) {
     return obj
 }
 
+WOQLQuery.prototype.cleanNodeValue = function(o, t) {
+    let obj = {'@type': 'NodeValue'}
+    if (typeof o === 'string') {
+        if (o.indexOf('v:') !== -1) {
+            return this.expandNodeVariable(o)
+        } else {
+            obj['node'] = o
+        }
+    } else if (typeof o == 'object' && o) {
+        if (o['@value']) obj['data'] = o
+        else return o
+    }
+    return obj
+}
+
 /*
 * check if can be a class in the object
 */
 WOQLQuery.prototype.looksLikeClass = function(o) {
     //if it is like User or Person it is a class
-    if (o.indexOf('v:') === -1) return true  
+    if (o.indexOf('v:') === -1) return true
 
     let pref = o.split(':')[0]
     if (
@@ -339,61 +417,45 @@ WOQLQuery.prototype.cleanGraph = function(g) {
  * Transforms strings that start with v: into variable json-ld structures
  * @param varname - will be transformed if it starts with v:
  */
-WOQLQuery.prototype.expandVariable = function(varname, always) {
+WOQLQuery.prototype.expandVariable = function(varname,type,always) {
     if (varname.substring(0, 2) == 'v:' || always) {
         if (varname.substring(0, 2) == 'v:') varname = varname.substring(2)
         return {
-            '@type': 'Value',
+            '@type': type,
             'variable': varname
         }
     } else {
         return {
-            '@type': 'Value',
+            '@type': type,
             'node': varname,
         }
     }
-    //return varname
+}
+
+WOQLQuery.prototype.expandValueVariable = function(varname, always) {
+    return this.expandVariable(varname, 'Value', always)
 }
 
 WOQLQuery.prototype.expandNodeVariable = function(varname, always) {
-    if (varname.substring(0, 2) == 'v:' || always) {
-        if (varname.substring(0, 2) == 'v:') varname = varname.substring(2)
-        return {
-            '@type': 'NodeValue',
-            'variable': varname,
-        }
-    } else {
-        return {
-            '@type': 'NodeValue',
-            'node': varname,
-        }
-    }
-    //return varname
+    return this.expandVariable(varname, 'NodeValue', always)
 }
 
 WOQLQuery.prototype.expandDataVariable = function(varname, always) {
-    if (varname.substring(0, 2) == 'v:' || always) {
-        if (varname.substring(0, 2) == 'v:') varname = varname.substring(2)
-        return {
-            '@type': 'Value',
-            'variable': varname
-        }
-    } else {
-        return {
-            '@type': 'Value',
-            'node': varname,
-        }
-    }
-    //return varname
+    return this.expandVariable(varname, 'DataValue', always)
 }
 
+WOQLQuery.prototype.expandArithmeticVariable = function(varname, always) {
+    return this.expandVariable(varname, 'ArithmeticValue', always)
+}
+
+
 WOQLQuery.prototype.cleanClass = function(c, stringonly) {
     if (typeof c !== 'string') return ''
     if (c.indexOf(':') === -1) {
         if (this.vocab && this.vocab[c]) c = this.vocab[c]
         else c = c //'scm:' + c
     }
-    return stringonly ? c : this.expandVariable(c)
+    return stringonly ? c : this.expandValueVariable(c)
 }
 
 WOQLQuery.prototype.cleanType = function(t, stringonly) {
@@ -724,11 +786,16 @@ function tokensToJSON(seq, q) {
 function copyJSON(orig, rollup) {
     if (Array.isArray(orig)) return orig
     if (rollup) {
-        if (['And', 'Or'].indexOf(orig['@type']) != -1) {
-            if (!orig['query_list'] || !orig['query_list'].length) return {}
-            if (orig['query_list'].length == 1)
-                return copyJSON(orig['query_list'][0]['query'], rollup)
+        if (orig['@type'] == 'And') {
+            if (!orig['and'] || !orig['and'].length) return {}
+            if (orig['and'].length == 1)
+                return copyJSON(orig['and'][0], rollup)
+        } else if (orig['@type'] == 'Or') {
+            if (!orig['or'] || !orig['or'].length) return {}
+            if (orig['or'].length == 1)
+                return copyJSON(orig['or'][0], rollup)
         }
+
         if (typeof orig['query'] != 'undefined' && orig['@type'] != 'Comment') {
             if (!orig['query']['@type']) return {}
         } else if (orig['@type'] == 'Comment' && orig['comment']) {