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

Author: KittyJose

lib/objectFrame.js

@@ -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;
 };

lib/woql.js

@@ -50,6 +50,8 @@ WOQL.list = 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, 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); }
 
 
@@ -233,7 +235,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);
@@ -344,6 +345,7 @@ WOQLQuery.prototype.setPage = function (pagenum) {
 	return this;
 };
 
+<<<<<<< HEAD
 
 WOQLQuery.prototype.hasStart = function () {
 	return (typeof this.getPagingProperty('start') !== 'undefined');
@@ -354,6 +356,9 @@ WOQLQuery.prototype.getStart = function () {
 };
 
 WOQLQuery.prototype.nextPage = function () {
+=======
+WOQLQuery.prototype.nextPage = function(){
+>>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 	return this.setPage(this.getPage() + 1);
 };
 
@@ -367,9 +372,26 @@ WOQLQuery.prototype.previousPage = function () {
 	return this;
 };
 
+<<<<<<< HEAD
 WOQLQuery.prototype.hasSelect = function () {
 	return this.getPagingProperty('select');
 };
+=======
+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"); 
+}
+>>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 
 WOQLQuery.prototype.getSelectVariables = function (q) {
 	q = (q || this.query);
@@ -387,6 +409,7 @@ WOQLQuery.prototype.getSelectVariables = function (q) {
 	}
 };
 
+<<<<<<< HEAD
 WOQLQuery.prototype.setStart = function(start){
 	return this.setPagingProperty("start", start);
 }
@@ -400,6 +423,19 @@ WOQLQuery.prototype.setPageSize = function (size) {
 	}
 	return this;
 };
+=======
+WOQLQuery.prototype.hasStart = function(){
+	return (typeof this.getPagingProperty("start") != "undefined");
+}
+
+WOQLQuery.prototype.getStart = function(){
+	return this.getPagingProperty("start");
+}
+
+WOQLQuery.prototype.setStart = function(start){
+	return this.setPagingProperty("start", start); 
+}
+>>>>>>> c85055e6384aa4c834e1a014093ad63850781f8f
 
 /*
  * Called to indicate an update that is the last chainable element in a query
@@ -763,12 +799,22 @@ 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
 	);
 };
 
@@ -861,36 +907,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;
 }
 
 /**
@@ -1038,7 +1084,7 @@ 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;
 }