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

Author: Cheukting

lib/woql.js

@@ -16,7 +16,9 @@ const WOQL = {};
 WOQL.when = function(Query, Update){ return new WOQLQuery().when(Query, Update);}
 WOQL.opt = function(query){ return new WOQLQuery().opt(query); }
 WOQL.from = function(dburl, query){ return new WOQLQuery().from(dburl, query); }
+WOQL.into = function(dburl, query){ return new WOQLQuery().into(dburl, query); }
 WOQL.limit = function(limit, query){ return new WOQLQuery().limit(limit, query); }
+WOQL.start = function(start, query){ return new WOQLQuery().start(limit, query); }
 WOQL.select = function(...list){ return new WOQLQuery().select(...list); }
 WOQL.or = function(...queries){	return new WOQLQuery().or(...queries); }
 WOQL.and = function(...queries){ return new WOQLQuery().and(...queries); }
@@ -188,14 +190,20 @@ WOQLQuery.prototype.json = function(json){
  * into the corrent place in the encompassing json 
  */
 WOQLQuery.prototype.when = function(Query, Update){
-	if(typeof Query == "boolean") {
-		var jq = {};
-		jq[Query] = [];
-		Query = jq;
+	if(typeof Query == 'boolean'){
+		this.cursor["when"] = [Query];
+	}
+	else {
+		var q = (q.json ? q.json() : q);
+		this.advanceCursor("when", q);	
 	}
-	this.advanceCursor("when", Query);	
 	if(Update){
-		this.cursor = (Update.json ? Update.json() : Update);
+		var upd = (Update.json ? Update.json() : Update);
+		this.cursor["when"][1] = upd;
+	}
+	else {
+		this.cursor["when"][1] = {};
+		this.cursor = this.cursor["when"][1];
 	}
 	return this;
 }
@@ -220,6 +228,15 @@ WOQLQuery.prototype.from = function(dburl, query){
 	return this;
 }
 
+WOQLQuery.prototype.into = function(dburl, query){
+	this.advanceCursor("into", dburl);
+	if(query){
+		this.cursor = query.json();
+	}
+	return this;
+}
+
+
 WOQLQuery.prototype.limit = function(limit, query){
 	this.advanceCursor("limit", limit);
 	if(query){
@@ -804,6 +821,14 @@ WOQLQuery.prototype.setStart = function(start){
 	return this.setPagingProperty("start", start); 
 }
 
+WOQLQuery.prototype.addStart = function(s){
+	if(this.hasStart("start")) this.setStart(s);
+	var nq = {'start': [s, this.query]};
+	this.query = nq;
+	return this;
+}
+
+
 /**
  * Executes the query using the passed client to connect to a server
  */