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

Author: Cheukting

lib/woql.js

@@ -48,14 +48,19 @@ WOQL.lower = function(u, l){	return new WOQLQuery().lower(u, l); }
 WOQL.pad = function(input, pad, len, output){	return new WOQLQuery().pad(input, pad, len, output); }
 WOQL.join = function(...list){	return new WOQLQuery().join(...list); }
 WOQL.unique = function(prefix, vari, type){	return new WOQLQuery().unique(prefix, vari, type); }
+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); }
+
 
 /* Mathematical Processing */
-WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}
+WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}	
 WOQL.plus = function(...args){	return new WOQLQuery().plus(...args);}
 WOQL.minus = function(...args){	return new WOQLQuery().minus(...args); }
 WOQL.times = function(...args){	return new WOQLQuery().times(...args); }
 WOQL.divide = function(...args){ return new WOQLQuery().divide(...args); }
 WOQL.exp = function(a, b){	return new WOQLQuery().exp(a, b); }
+WOQL.div = function(...args){	return new WOQLQuery().div(...args); }
+WOQL.comment = function(arg){	return new WOQLQuery().comment(arg); }
 
 
 //language extensions that can be chained after 'grounded' stuff (clauses with a specific subject) sub, isa, delete_triple, add_triple, delete_quad, add_quad, node
@@ -147,6 +152,10 @@ WOQLQuery.prototype.buildAsClauses = function(vars, cols){
 	return clauses;
 }
 
+WOQLQuery.prototype.typecast = function(va, type, vb){
+	this.cursor['typecast'] = [va, type, vb];
+	return this;
+}
 
 
 WOQLQuery.prototype.remote = function(json){
@@ -189,6 +198,24 @@ WOQLQuery.prototype.group_by = function(gvarlist, groupedvar, groupquery, output
 	return this;
 }
 
+WOQLQuery.prototype.idgen = function(prefix, vari, type, mode){
+	this.cursor['idgen'] = [prefix];
+	if(vari.json){
+		this.cursor['idgen'].push(vari.json());
+	}
+	else if(vari.list){
+		this.cursor['idgen'].push(vari);
+	}
+	else {
+		this.cursor['idgen'].push({"list": vari})
+	}
+	if(mode){
+		this.cursor['idgen'].push(mode);
+	}
+	this.cursor['idgen'].push(type);
+	return this;
+}
+
 
 WOQLQuery.prototype.unique = function(prefix, vari, type){
 	this.cursor['unique'] = [prefix];
@@ -209,6 +236,13 @@ WOQLQuery.prototype.unique = function(prefix, vari, type){
 WOQLQuery.prototype.concat = function(list, v){
 	if(typeof list == "string"){
 		var nlist = list.split(/(v:[\w_]+)\b/);
+		var nxlist = [];
+		for(var i = 1; i<nlist.length; i++){
+			if(nlist[i-1].substring(nlist[i-1].length-1) == "v" && nlist[i].substring(0, 1) == ":"){
+				nlist[i-1] = nlist[i-1].substring(0, nlist[i-1].length-1);
+				nlist[i] = nlist[i].substring(1);
+			}
+		}
 	}
 	else if(list.list){
 		var nlist = list.list;
@@ -405,6 +439,19 @@ WOQLQuery.prototype.sub = function(a, b){
 	return this.last("sub", a);
 }
 
+WOQLQuery.prototype.comment = function(val){
+	if(val){
+		val = (val.json ? val.json() : val)
+		this.cursor['comment'] = val;
+	}
+	else {
+		this.cursor['comment'] = null;
+		this.cursor = this.cursor['comment'];
+	}
+	return this;
+}
+
+
 WOQLQuery.prototype.abstract = function(varname){
 	if(varname){
 		return this.quad(varname, "tcs:tag", "tcs:abstract", "db:schema");
@@ -432,31 +479,54 @@ WOQLQuery.prototype.trim = function(a, b){
 }
 
 WOQLQuery.prototype.eval = function(arith, v){
+	arith = arith.json ? arith.json() : arith;
 	this.cursor['eval'] = [arith, v];
 	return this.last('eval', v);
 }
 
 WOQLQuery.prototype.plus = function (...args) {
-	this.cursor.plus = args;
+	this.cursor.plus = []; 
+	for(var i = 0; i < args.length; i++){
+		this.cursor.plus.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.minus = function (...args) {
-	this.cursor.minus = args;
+	this.cursor.minus = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.minus.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.times = function (...args) {
-	this.cursor.times = args;
+	this.cursor.times = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.times.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.divide = function (...args) {
-	this.cursor.divide = args;
+	this.cursor.divide = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.divide.push(args[i].json ? args[i].json() : args[i]);
+	}
+	return this.last();
+};
+
+WOQLQuery.prototype.div = function (...args) {
+	this.cursor.div = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.div.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.exp = function (a, b) {
+	a = (a.json ? a.json() : a);
+	b = (b.json ? b.json() : b);
 	this.cursor.exp = [a, b];
 	return this.last();
 };
@@ -613,7 +683,7 @@ WOQLQuery.prototype.label = function(l, lang){
 	return this;
 }
 
-WOQLQuery.prototype.comment = function(c, lang){
+WOQLQuery.prototype.description = function(c, lang){
 	if(this.tripleBuilder) this.tripleBuilder.comment(c, lang);
 	return this;
 }
@@ -1211,7 +1281,7 @@ WOQLQuery.prototype.uncleanArguments = function(operator, args, indent, show_con
  */
 WOQLQuery.prototype.uncleanArgument = function(operator, val, index, allArgs){
 	//numeric values go out untouched... 
-	const numeric_operators = ["limit", "start", "eval", "plus", "minus", "times", "divide", "exp"];
+	const numeric_operators = ["limit", "start", "eval", "plus", "minus", "times", "divide", "exp", "div"];
 	if(operator == "isa"){
 		val = (index == 0 ? this.unclean(val, 'subject') : this.unclean(val, 'class'));
 	}
@@ -1245,10 +1315,13 @@ WOQLQuery.prototype.uncleanArgument = function(operator, val, index, allArgs){
 		}
 		return oval;
 	}
-	else if(numeric_operators.indexOf(operator) !== -1){
-		return val;
+	//else if(numeric_operators.indexOf(operator) !== -1){
+	//	return val;
+	//}
+	if(typeof val == "string"){
+		return '"' + val + '"';
 	}
-	return '"' + val + '"';
+	return val;
 }