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

Author: KittyJose

dist/terminus-client.min.js

@@ -661,23 +661,13 @@ PropertyFrame.prototype.first = function () {
 	}
 };
 
-<<<<<<< HEAD
-PropertyFrame.prototype.renderValues = function () {
-	const sortedVals = this.sortValues();
-	const vals = [];
-	for (let i = 0; i < sortedVals.length; i++) {
-		if (sortedVals[i].render) {
-			const rend = sortedVals[i].render(sortedVals[i]);
-			if (rend) vals.push(rend);
-=======
 PropertyFrame.prototype.renderValues = function(){
 	var sortedVals = this.sortValues();
 	var vals = [];
 	for(var i = 0; i<sortedVals.length; i++){
 		if(sortedVals[i] && sortedVals[i].render){
 			var rend = sortedVals[i].render(sortedVals[i]);
 			if(rend) vals.push(rend);
->>>>>>> 4617c50289151c0411b50a5c0cdda19ceeb4e6b8
 		}
 	}
 	return vals;

dist/terminus-client.min.js.map

@@ -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";
@@ -275,15 +284,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]));
@@ -295,8 +304,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 +=".";
 				}
 				if (nvals.length) {
 					str += `(${nvals.join(',')}`;
@@ -345,20 +354,7 @@ WOQLQuery.prototype.setPage = function (pagenum) {
 	return this;
 };
 
-<<<<<<< HEAD
-
-WOQLQuery.prototype.hasStart = function () {
-	return (typeof this.getPagingProperty('start') !== 'undefined');
-};
-
-WOQLQuery.prototype.getStart = function () {
-	return this.getPagingProperty('start');
-};
-
-WOQLQuery.prototype.nextPage = function () {
-=======
 WOQLQuery.prototype.nextPage = function(){
->>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 	return this.setPage(this.getPage() + 1);
 };
 
@@ -372,13 +368,8 @@ WOQLQuery.prototype.previousPage = function () {
 	return this;
 };
 
-<<<<<<< HEAD
-WOQLQuery.prototype.hasSelect = function () {
-	return this.getPagingProperty('select');
-};
-=======
 WOQLQuery.prototype.setPageSize = function(size){
-	this.setPagingProperty("limit", size); 
+	this.setPagingProperty("limit", size);
 	if(this.hasStart()){
 		this.setStart(0);
 	}
@@ -389,9 +380,8 @@ WOQLQuery.prototype.setPageSize = function(size){
 }
 
 WOQLQuery.prototype.hasSelect = function(){
-	return this.getPagingProperty("select"); 
+	return this.getPagingProperty("select");
 }
->>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 
 WOQLQuery.prototype.getSelectVariables = function (q) {
 	q = (q || this.query);
@@ -409,21 +399,6 @@ WOQLQuery.prototype.getSelectVariables = function (q) {
 	}
 };
 
-<<<<<<< HEAD
-WOQLQuery.prototype.setStart = function(start){
-	return this.setPagingProperty("start", start);
-}
-
-WOQLQuery.prototype.setPageSize = function (size) {
-	this.setPagingProperty('limit', size);
-	if (this.hasStart()) {
-		this.setStart(0);
-	} else {
-		this.addStart(0);
-	}
-	return this;
-};
-=======
 WOQLQuery.prototype.hasStart = function(){
 	return (typeof this.getPagingProperty("start") != "undefined");
 }
@@ -433,9 +408,8 @@ WOQLQuery.prototype.getStart = function(){
 }
 
 WOQLQuery.prototype.setStart = function(start){
-	return this.setPagingProperty("start", start); 
+	return this.setPagingProperty("start", start);
 }
->>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 
 /*
  * Called to indicate an update that is the last chainable element in a query
@@ -508,8 +482,8 @@ WOQLQuery.prototype.when = function (Query, Update) {
 
 WOQLQuery.prototype.opt = function(query){
 	if(query){
-		q = (query.json ? query.json() : q);
-		this.cursor["opt"] = [query];
+		var q = ((typeof query.json == "function") ? query.json() : query);
+		this.cursor["opt"] = [q];
 	}
 	else {
 		this.cursor['opt'] = [{}];
@@ -690,8 +664,9 @@ WOQLQuery.prototype.addClass = function(c, graph){
 }
 
 WOQLQuery.prototype.addProperty = function(p, t, g){
-	if(p && t){
-		graph = (g ? this.cleanGraph(g) : "db:schema");
+	t = (t ? t : "xsd:string");
+	if(p){
+		var graph = (g ? this.cleanGraph(g) : "db:schema");
 		p = (p.indexOf(":") == -1) ?  "scm:" + p : p;
 		t = (t.indexOf(":") == -1) ? this.cleanType(t) : t ;
 		var tc = this.cursor;
@@ -799,22 +774,13 @@ WOQLQuery.prototype.propertyMetadata = function(){
 
 WOQLQuery.prototype.elementMetadata = function () {
 	return this.and(
-<<<<<<< HEAD
-		WOQL.quad('v:Element', 'rdf:type', 'v:Type', 'db:schema'),
-		WOQL.opt().quad('v:Element', 'tcs:tag', 'v:Abstract', 'db:schema'),
-		WOQL.opt().quad('v:Element', 'rdfs:label', 'v:Label', 'db:schema'),
-		WOQL.opt().quad('v:Element', 'rdfs:comment', 'v:Comment', 'db:schema'),
-		WOQL.opt().quad('v:Element', 'rdfs:domain', 'v:Domain', 'db:schema'),
-		WOQL.opt().quad('v:Element', 'rdfs:range', 'v:Range', 'db:schema')
-=======
 		WOQL.quad("v:Element", "rdf:type", "v:Type", "db:schema"),
 		WOQL.opt().quad("v:Element", "tcs:tag", "v:Abstract", "db:schema"),
 		WOQL.opt().quad("v:Element", "rdfs:label", "v:Label", "db:schema"),
 		WOQL.opt().quad("v:Element", "rdfs:comment", "v:Comment", "db:schema"),
 		WOQL.opt().quad("v:Element", "rdfs:subClassOf", "v:Parent", "db:schema"),
 		WOQL.opt().quad("v:Element", "rdfs:domain", "v:Domain", "db:schema"),
 		WOQL.opt().quad("v:Element", "rdfs:range", "v:Range", "db:schema")
->>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 	);
 };
 
@@ -948,12 +914,15 @@ function TripleBuilder(type, cursor, s, query){
 	this.type = type;
 	this.cursor = cursor;
 	this.subject = query.cleanSubject(s);
-	this.graph = false;
+	this.g = false;
 	this.query = query;//the containing query
 }
 
 TripleBuilder.prototype.graph = function(g){
-	this.graph = g;
+	this.g = this.query.cleanGraph(g);
+	if(this.type == "triple") this.type = "quad";
+	if(this.type == "add_triple") this.type = "add_quad";
+	if(this.type == "delete_triple") this.type = "delete_quad";
 	return this;
 };
 
@@ -972,8 +941,8 @@ TripleBuilder.prototype.addPO = function(p, o, g){
 	else {
 		evstr += o;
 	}
-	if(ttype.substring(ttype.length-4) == "quad"){
-		var g = (g ? g : (this.graph ? this.graph : "db:schema"));
+	if(ttype.substring(ttype.length-4) == "quad" || this.g){
+		var g = (g ? g : (this.g ? this.g : "db:schema"));
 		evstr += ", '" + g + "'";
 	}
 	evstr += ")";
@@ -1013,13 +982,19 @@ TripleBuilder.prototype.isa = function(s){
 	return this.addEntry(unit);
 }
 
+TripleBuilder.prototype.domain = function(d){
+	d = this.query.cleanClass(d);
+	var x = this.addPO('rdfs:domain',d);
+	return x;
+}
+
+
 TripleBuilder.prototype.sub = function(s){
 	s = this.query.cleanClass(s);
 	var unit = new WOQLQuery.sub(this.subject, s);
 	return this.addEntry(unit);
 }
 
-
 TripleBuilder.prototype.label = function(l, lang){
 	lang = (lang ? lang : "en");
 	var x = this.addPO('rdfs:label', {"@value": l, "@language": lang});
@@ -1031,9 +1006,14 @@ TripleBuilder.prototype.comment = function(c, lang){
 	return this.addPO('rdfs:comment', {"@value": c, "@language": lang});
 }
 
+TripleBuilder.prototype.property = function(p,val){
+	p = this.query.cleanPredicate(p);
+	return this.addPO(p, val);
+}
+
 TripleBuilder.prototype.parent = function(...p){
 	for(var i = 0 ; i<p.length; i++){
-		pn = this.query.cleanClass(p[i]);
+		var pn = this.query.cleanClass(p[i]);
 		this.addPO('rdfs:subClassOf', pn);
 	}
 	return this;

lib/objectFrame.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)) {
 		const context = (config && config.context ? config.context : false);
@@ -23,17 +28,18 @@ WOQLResult.prototype.compress = function (context) {
 			this.bindings[i][nprop] = nval;
 		}
 	}
-};
+	return this;
+}
 
 WOQLResult.prototype.first = function () {
 	this.cursor = 0;
 	return this.bindings[0];
 };
 
-WOQLResult.prototype.last = function () {
-	this.curor = this.bindings.length - 1;
-	return this.bindings[this.bindings.length - 1];
-};
+WOQLResult.prototype.last = function(){
+	this.cursor = this.bindings.length-1;
+	return this.bindings[this.bindings.length-1];
+}
 
 WOQLResult.prototype.next = function () {
 	const res = this.bindings[this.cursor];
@@ -62,10 +68,12 @@ WOQLResult.prototype.compareValues = function(a, b, asc_or_desc){
 	}
 };
 
-
-WOQLResult.prototype.sort = function (key, asc_or_desc) {
-	this.bindings.sort((a, b) => this.compareValues(a[key], b[key], asc_or_desc));
-};
+WOQLResult.prototype.sort = function(key, asc_or_desc){
+	this.bindings.sort((a, b) => {
+		return this.compareValues(a[key], b[key], asc_or_desc);
+	});
+	this;
+}
 
 WOQLResult.prototype.getVariableList = function () {
 	if (this.bindings && this.bindings[0]) {

lib/woql.js

@@ -21,7 +21,7 @@
     "babel-loader": "^8.0.6",
     "chai": "^4.2.0",
     "chai-json-equal": "0.0.1",
-    "coveralls": "^3.0.6",
+    "coveralls": "^3.0.9",
     "cross-env": "^5.2.1",
     "eslint": "^5.16.0",
     "eslint-config-airbnb": "^17.1.1",