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

Author: Cheukting

lib/woql.js

@@ -94,6 +94,15 @@ WOQLQuery.prototype.loadDefaultVocabulary = function(){
 	vocab.type = "rdf:type";
 	vocab.label = "rdfs:label";
 	vocab.Class = "owl:Class";
+	vocab.DatatypeProperty = "owl:DatatypeProperty"; 
+	vocab.ObjectProperty = "owl:ObjectProperty"; 
+	vocab.Entity = "tcs:Entity"; 
+	vocab.Document = "tcs:Document"; 
+	vocab.Relationship = "tcs:Relationship"; 
+	vocab.temporality = "tcs:temporality"; 
+	vocab.geotemporality = "tcs:geotemporality"; 
+	vocab.geography = "tcs:geography"; 
+	vocab.abstract = "tcs:abstract"; 
 	vocab.comment = "rdfs:comment";
 	vocab.range = "rdfs:range";
 	vocab.domain = "rdfs:domain";
@@ -277,15 +286,15 @@ WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, embed){
 				str += "(\n" + this.nspaces(indent) + "WOQL." + clauses.join(",\n"+ this.nspaces(indent) + "WOQL.") + "\n" + this.nspaces(indent - this.indent) + ")";
 
 			}
-			else if(typeof val[val.length-1] == "object" ){
+			else if(typeof val[val.length-1] == "object" && typeof val[val.length-1]['@value'] == "undefined"){
 				var nvals = []
 				for(var i = 0; i<val.length-1; i++){
 					if(key == "limit" || key == "start"){
 						nvals.push(val[i]);						
 					}
 					else {
 						if(typeof val[i] == "string"){
-							nvals.push('"' + self.unclean(val[i]) + '"');
+							nvals.push(self.unclean(val[i]));
 						}
 						else if(typeof val[i] == "object"){
 							nvals.push(JSON.stringify(val[i]));
@@ -297,8 +306,8 @@ WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, embed){
 				}
 				if(nvals.length){
 					str += unclean(nvals);
-					if(key == "from") str += ")\n    .";
-					else str +=").";
+					if(key == "from") str += "\n    .";
+					else str +=".";
 				}
 				else {
 					str += "().";					
@@ -474,8 +483,8 @@ WOQLQuery.prototype.when = function(Query, Update){
 
 WOQLQuery.prototype.opt = function(query){
 	if(query){
-		q = (query.json ? query.json() : q); 
-		this.cursor["opt"] = [query];
+		q = (query.json ? query.json() : query);
+		this.cursor["opt"] = [q];
 	}
 	else {
 		this.cursor['opt'] = [{}];		
@@ -658,7 +667,8 @@ WOQLQuery.prototype.addClass = function(c, graph){
 }
 
 WOQLQuery.prototype.addProperty = function(p, t, g){
-	if(p && t){
+	t = (t ? t : "xsd:string");
+	if(p){
 		graph = (g ? this.cleanGraph(g) : "db:schema");
 		p = (p.indexOf(":") == -1) ?  "scm:" + p : p;
 		t = (t.indexOf(":") == -1) ? this.cleanType(t) : t ;

lib/woqlResult.js

@@ -2,7 +2,12 @@ const FrameHelper = require("./frameHelper");
 
 function WOQLResult(results, query, config){
 	this.bindings = results.bindings;
-	this.query = query;
+	if(query.constructor.name == "WOQLQuery"){
+		this.query = query;
+	}
+	else {
+		this.query = query.query;
+	}
 	this.cursor = 0;
 	if(!(config && config.no_compress)){
 		var context = (config && config.context ? config.context : false);