Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: Cheukting

lib/woql.js

@@ -51,6 +51,9 @@ WOQL.unique = function(prefix, vari, type){	return new WOQLQuery().unique(prefix
 WOQL.idgen = function(prefix, vari, type, output){	return new WOQLQuery().idgen(prefix, vari, type, output); }
 WOQL.typecast = function(vara, type, varb){	return new WOQLQuery().typecast(vara, type, varb); }
 
+WOQL.less = function(v1, v2){	return new WOQLQuery().less(v1, v2); }
+WOQL.greater = function(v1, v2){	return new WOQLQuery().greater(v1, v2); }
+
 
 /* Mathematical Processing */
 WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}	
@@ -286,6 +289,16 @@ WOQLQuery.prototype.join = function(...list){
 	return this;
 }
 
+WOQLQuery.prototype.less = function(v1, v2){
+	this.cursor['less'] = [v1, v2];
+	return this;
+}
+
+WOQLQuery.prototype.greater = function(v1, v2){
+	this.cursor['greater'] = [v1, v2];
+	return this;
+}
+
 
 WOQLQuery.prototype.list  = function(...vars){
 	this.cursor['list'] = vars;
@@ -440,14 +453,22 @@ WOQLQuery.prototype.sub = function(a, b){
 }
 
 WOQLQuery.prototype.comment = function(val){
-	if(val){
-		val = (val.json ? val.json() : val)
-		this.cursor['comment'] = val;
+	if(val && val.json){
+		this.cursor['comment'] = [val.json()];
+	}
+	else if(typeof val == "string"){
+		this.cursor['comment'] = [{"@value": val, "@language": "en"}];
+	}
+	else if(typeof val == "object"){
+		if(val.length) this.cursor['comment'] = val;
+		else this.cursor['comment'] = [val];
 	}
 	else {
-		this.cursor['comment'] = null;
-		this.cursor = this.cursor['comment'];
+		this.cursor['comment'] = [];
 	}
+	var last_index = this.cursor['comment'].length;
+	this.cursor['comment'][last_index] = {};
+	this.cursor = this.cursor['comment'][last_index];
 	return this;
 }
 
@@ -684,7 +705,7 @@ WOQLQuery.prototype.label = function(l, lang){
 }
 
 WOQLQuery.prototype.description = function(c, lang){
-	if(this.tripleBuilder) this.tripleBuilder.comment(c, lang);
+	if(this.tripleBuilder) this.tripleBuilder.description(c, lang);
 	return this;
 }
 
@@ -1219,7 +1240,7 @@ WOQLQuery.prototype.getWOQLPrelude = function(operator, fluent, inline){
  */
 WOQLQuery.prototype.chainable = function(operator, lastArg){
 	const non_chaining_operators = ["and", "or"];
-	if(typeof lastArg == "object" && typeof lastArg['@value'] == "undefined"  && typeof lastArg['@type'] == "undefined"  && typeof lastArg['value'] == "undefined" && non_chaining_operators.indexOf(operator) == -1){
+	if(lastArg && typeof lastArg == "object" && typeof lastArg['@value'] == "undefined"  && typeof lastArg['@type'] == "undefined"  && typeof lastArg['value'] == "undefined" && non_chaining_operators.indexOf(operator) == -1){
 		return true;
 	}
 	return false;
@@ -1348,9 +1369,13 @@ WOQLQuery.prototype.uncleanObjectArgument = function(operator, val, index){
 	return JSON.stringify(val);
 }
 
-WOQLQuery.prototype.argIsSubQuery = function(operator, args){
-	const squery_operators = ["and", "or", "when", "not", "opt"];
-	return (squery_operators.indexOf(operator) !== -1);
+WOQLQuery.prototype.argIsSubQuery = function(operator, arg, index){
+	const squery_operators = ["and", "or", "when", "not", "opt", "exp", "minus", "div", "divide", "plus", "multiply"];
+	if(squery_operators.indexOf(operator) !== -1){
+		if(arg && typeof arg != "object") return false;
+		return true;
+	}
+	else return false;
 }
 
 /**
@@ -1463,7 +1488,7 @@ TripleBuilder.prototype.label = function(l, lang){
 	return x;
 }
 
-TripleBuilder.prototype.comment = function(c, lang){
+TripleBuilder.prototype.description = function(c, lang){
 	lang = (lang ? lang : "en");
 	if(c.substring(0, 2) == "v:"){
 		var d = {"value": l, "@language": lang }