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

Author: Cheukting

dist/terminus-client.min.js

@@ -30,6 +30,12 @@ FrameHelper.removeChildren = function (node) {
 	}
 };
 
+FrameHelper.removeElement = function (node) {
+	if (node) {
+			node.parentNode.removeChild(node);
+	}
+}
+
 FrameHelper.empty = function (obj) {
 	   // null and undefined are "empty"
 	if (!obj) return true;

dist/terminus-client.min.js.map

@@ -114,6 +114,14 @@ ObjectFrame.prototype.getAsFrame = function (prop, parent) {
 	return ff;
 };
 
+ObjectFrame.prototype.getAsFrames = function (prop, parent) {
+	var frames = [];
+	for (const prop of Object.keys(this.properties)) {
+		frames = frames.concat(frames, this.properties[prop].getAsFrames());
+	}
+	return frames;
+}
+
 ObjectFrame.prototype.isnew = function () {
 	return this.newDoc;
 };
@@ -588,12 +596,12 @@ PropertyFrame.prototype.get = function(){
 	return gets;
 }
 
-
 PropertyFrame.prototype.clear = function(){
 	for(var i = 0 ; i<this.values.length; i++){
 		this.values[i].clear();
 	}
 }
+
 PropertyFrame.prototype.clone = function(){
 	const cvalues = [];
 	const cloned = new PropertyFrame(this.predicate, this.cframe, this.parent);

lib/frameHelper.js

@@ -23,14 +23,14 @@ WOQL.and = function(...queries){ return new WOQLQuery().and(...queries); }
 WOQL.not = function(query){ return new WOQLQuery().not(query); }
 WOQL.triple = function(a, b, c){ return new WOQLQuery().triple(a, b, c); }
 WOQL.quad = function(a, b, c, d){ return new WOQLQuery().quad(a, b, c, d); }
-WOQL.eq = function(a, b){ return new WOQLQuery().eq(a, b);}
 WOQL.sub = function(a, b){ return new WOQLQuery().sub(a, b); }
 WOQL.isa = function(a, b){	return new WOQLQuery().isa(a, b);	}
+WOQL.eq = function(a, b){ return new WOQLQuery().eq(a, b);}
 WOQL.trim = function(a, b){	return new WOQLQuery().trim(a, b);	}
 WOQL.delete = function(JSON_or_IRI){ return new WOQLQuery().delete(JSON_or_IRI);	}
 WOQL.delete_triple = function( S, P, O ){ return new WOQLQuery().delete_triple (S, P, O);	}
-WOQL.add_triple = function( S, P, O ){ return new WOQLQuery().add_triple (S, P, O); }
 WOQL.delete_quad = function( S, P, O, G ){ return new WOQLQuery().delete_quad (S, P, O, G); }
+WOQL.add_triple = function( S, P, O ){ return new WOQLQuery().add_triple (S, P, O); }
 WOQL.add_quad = function( S, P, O, G ){ 	return new WOQLQuery().add_quad (S, P, O, G);}
 WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}
 WOQL.plus = function(...args){	return new WOQLQuery().plus(...args);}
@@ -49,11 +49,12 @@ WOQL.list = function(vars){	return new WOQLQuery().list(vars); }
 //WOQL.value = function(vars){	return new WOQLQuery().list(vars); }
 //These ones are special ones for dealing with the schema only...
 WOQL.addClass = function(classid, graph){	return new WOQLQuery().addClass(classid, graph); }
-WOQL.addProperty = function(propid, graph){	return new WOQLQuery().addProperty(propid, graph); }
+WOQL.addProperty = function(propid, type, graph){	return new WOQLQuery().addProperty(propid, type, graph); }
+WOQL.deleteClass = function(classid, graph){	return new WOQLQuery().deleteClass(classid, graph); }
+WOQL.deleteProperty = function(propid, type, graph){	return new WOQLQuery().deleteProperty(propid, type, graph); }
 WOQL.node = function(nodeid, type){	return new WOQLQuery().node(nodeid, type); }
 
 
-
 /*
  * Beneath here are pseudo predicates - they belong to the javascript object
  * but not to the WOQL language
@@ -62,8 +63,6 @@ WOQL.node = function(nodeid, type){	return new WOQLQuery().node(nodeid, type); }
 WOQL.query = function(){	return new WOQLQuery(); }
 //loads query from json
 WOQL.json = function(json){	return new WOQLQuery().json(json); }
-//returns a special schema object for terse schema updates
-WOQL.schema = function(){	return new WOQLSchema(); }
 
 WOQL.rule = function(){ return new Pattern.FrameRule(); }
 //Simple utility function for typechecking
@@ -238,7 +237,6 @@ WOQLQuery.prototype.nspaces = function(n){
 	return spaces;
 }
 
-
 WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, embed){
 	if(!embed) this.indent = indent;
 	q = (q ? q : this.query);
@@ -346,15 +344,6 @@ WOQLQuery.prototype.setPage = function(pagenum){
 	return this;
 }
 
-
-WOQLQuery.prototype.hasStart = function(){
-	return (typeof this.getPagingProperty("start") != "undefined");
-}
-
-WOQLQuery.prototype.getStart = function(){
-	return this.getPagingProperty("start");
-}
-
 WOQLQuery.prototype.nextPage = function(){
 	return this.setPage(this.getPage() + 1);
 }
@@ -369,6 +358,17 @@ WOQLQuery.prototype.previousPage = function(){
 	return this;
 }
 
+WOQLQuery.prototype.setPageSize = function(size){
+	this.setPagingProperty("limit", size); 
+	if(this.hasStart()){
+		this.setStart(0);
+	}
+	else {
+		this.addStart(0);
+	}
+	return this;
+}
+
 WOQLQuery.prototype.hasSelect = function(){
 	return this.getPagingProperty("select"); 
 }
@@ -389,19 +389,16 @@ WOQLQuery.prototype.getSelectVariables = function(q){
 	}
 }
 
-WOQLQuery.prototype.setStart = function(start){
-	return this.setPagingProperty("start", start); 
+WOQLQuery.prototype.hasStart = function(){
+	return (typeof this.getPagingProperty("start") != "undefined");
 }
 
-WOQLQuery.prototype.setPageSize = function(size){
-	this.setPagingProperty("limit", size); 
-	if(this.hasStart()){
-		this.setStart(0);
-	}
-	else {
-		this.addStart(0);
-	}
-	return this;
+WOQLQuery.prototype.getStart = function(){
+	return this.getPagingProperty("start");
+}
+
+WOQLQuery.prototype.setStart = function(start){
+	return this.setPagingProperty("start", start); 
 }
 
 /*
@@ -477,6 +474,7 @@ WOQLQuery.prototype.when = function(Query, Update){
 
 WOQLQuery.prototype.opt = function(query){
 	if(query){
+		q = (query.json ? query.json() : q); 
 		this.cursor["opt"] = [query];
 	}
 	else {
@@ -774,6 +772,7 @@ WOQLQuery.prototype.elementMetadata = function(){
 		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")
 	);
@@ -868,36 +867,36 @@ WOQLQuery.prototype.cleanSubject = function(s){
 	if(typeof s != "string") return s;
 	if(s.indexOf(":") != -1) return s;
 	if(this.vocab && this.vocab[s]) return this.vocab[s];
-	return "v:" + s;
+	return "doc:" + s;
 }
 
 WOQLQuery.prototype.cleanPredicate = function(p){
 	if(p.indexOf(":") != -1) return p;
 	if(this.vocab && this.vocab[p]) return this.vocab[p];
-	return "v:" + p;
+	return "scm:" + p;
 }
 WOQLQuery.prototype.cleanType = function(t){
 	if(t.indexOf(":") != -1) return t;
 	if(this.vocab && this.vocab[t]) return this.vocab[t];
-	return "v:" + t;
+	return "scm:" + t;
 }
 
 WOQLQuery.prototype.cleanObject = function(o){
 	if(typeof o != "string" || o.indexOf(":") != -1) return o;
 	if(this.vocab && this.vocab[o]) return this.vocab[o];
-	return "v:" + o;
+	return { "@value": o, "@language": "en"};
 }
 
 WOQLQuery.prototype.cleanGraph = function(g){
 	if(g.indexOf(":") != -1) return g;
 	if(this.vocab && this.vocab[g]) return this.vocab[g];
-	return "v:" + g;
+	return "db:" + g;
 }
 
 WOQLQuery.prototype.cleanClass = function(c){
 	if(c.indexOf(":") != -1) return c;
 	if(this.vocab && this.vocab[c]) return this.vocab[c];
-	return "v:" + c;
+	return "scm:" + c;
 }
 
 /**
@@ -1036,11 +1035,16 @@ TripleBuilder.prototype.max = function(m){
 	return this.card(m, "max");
 }
 
+TripleBuilder.prototype.cardinality = function(m){
+	return this.card(m, "cardinality");
+}
+
+
 TripleBuilder.prototype.min = function(m){
 	return this.card(m, "min");	
 }
 
-TripleBuilder.prototype.s = function(s){
+TripleBuilder.prototype.node = function(s){
 	this.subject = this.query.cleanSubject(s);
 	return this;
 }