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

Author: Francesca-Bit

dist/terminus-client.min.js

@@ -7,4 +7,5 @@ module.exports = {
                   ErrorMessage:require('./lib/errorMessage'),
                   FrameHelper:require('./lib/frameHelper'),
                   ObjectFrame:require('./lib/objectFrame'),
+                  WOQLResult:require('./lib/woqlResult'),
                   WOQL:require('./lib/woql')};

dist/terminus-client.min.js.map

@@ -7,6 +7,7 @@ const FramePattern = require('./framePattern');
 const FrameHelper = require('./frameHelper');
 
 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); }
@@ -22,19 +23,40 @@ WOQL.sub = function(a, b){ return new WOQLQuery().sub(a, b); }
 WOQL.isa = function(a, b){	return new WOQLQuery().isa(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.minus_triple = function( S, P, O ){ return new WOQLQuery().minus_triple (S, P, O);	}
-WOQL.plus_triple = function( S, P, O ){ return new WOQLQuery().plus_triple (S, P, O); }
-WOQL.minus_quad = function( S, P, O, G ){ return new WOQLQuery().minus_triple (S, P, O, G); }
-WOQL.plus_quad = function( S, P, O, G ){ 	return new WOQLQuery().plus_triple (S, P, O, G);}
+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_triple (S, P, O, G); }
+WOQL.add_quad = function( S, P, O, G ){ 	return new WOQLQuery().add_triple (S, P, O, G);}
 WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}
 WOQL.plus = function(...args){	return new WOQLQuery().plus(...args);}
 WOQL.minus = function(...args){	return new WOQLQuery().minus(...args); }
 WOQL.times = function(...args){	return new WOQLQuery().times(...args); }
 WOQL.divide = function(...args){ return new WOQLQuery().divide(...args); }
 WOQL.exp = function(a, b){	return new WOQLQuery().exp(a, b); }
+
+WOQL.schema = function(){	return new WOQLSchema(); }
+
+WOQL.query = function(){	return new WOQLQuery(); }
+
+WOQL.get = function(map, target){	return new WOQLQuery().get(map, target); }
+WOQL.as = function(map, vari){	return new WOQLQuery().as(map, vari); }
+WOQL.remote = function(url){	return new WOQLQuery().remote(url); }
+WOQL.unique = function(prefix, vari){	return new WOQLQuery().unique(prefix, vari); }
+WOQL.list = function(vars){	return new WOQLQuery().list(vars); }
+//WOQL.value = function(vars){	return new WOQLQuery().list(vars); }
+
+
 WOQL.json = function(json){	return new WOQLQuery().json(json); }
 WOQL.rule = function(){	return new FramePattern.FrameRule() }
-WOQL.getAllDocuments= function(){return new WOQLQuery().getAllDocuments()}
+
+WOQL.isLiteralType = function(t){
+	if(t){
+		var pref = t.split(":");
+		if(pref[0] == "xdd" || pref[0] == "xsd") return true;
+	}
+	return false;
+}
+
 
 function WOQLQuery(query, results){
 	this.query = (query ? query : {});
@@ -405,7 +427,7 @@ WOQLQuery.prototype.and = function(...queries){
 	return this;
 }
 
-WOQLQuery.prototype.or = function(queries){
+WOQLQuery.prototype.or = function(...queries){
 	this.cursor["or"] = [];
 	for(var i = 0; i<queries.length; i++){
 		if(queries[i].contains_update) this.contains_update = true;
@@ -491,23 +513,23 @@ WOQLQuery.prototype.delete = function(JSON_or_IRI){
 	return this.lastUpdate();
 }
 
-WOQLQuery.prototype.minus_triple = function( Subject, Predicate, Object_or_Literal ){
-	this.cursor['minus_triple'] = [ Subject, Predicate, Object_or_Literal ];
+WOQLQuery.prototype.delete_triple = function( Subject, Predicate, Object_or_Literal ){
+	this.cursor['delete_triple'] = [ Subject, Predicate, Object_or_Literal ];
 	return this.lastUpdate();
 }
 
-WOQLQuery.prototype.plus_triple = function( Subject, Predicate, Object_or_Literal ){
-	this.cursor['plus_triple'] = [ Subject, Predicate, Object_or_Literal ];
+WOQLQuery.prototype.add_triple = function( Subject, Predicate, Object_or_Literal ){
+	this.cursor['add_triple'] = [ Subject, Predicate, Object_or_Literal ];
 	return this.lastUpdate();	
 }
 
-WOQLQuery.prototype.minus_quad = function( Subject, Predicate, Object_or_Literal, Graph ){
-	this.cursor['minus_quad'] = [ Subject, Predicate, Object_or_Literal, Graph ];
+WOQLQuery.prototype.delete_quad = function( Subject, Predicate, Object_or_Literal, Graph ){
+	this.cursor['delete_quad'] = [ Subject, Predicate, Object_or_Literal, Graph ];
 	return this.lastUpdate();	
 }
 
-WOQLQuery.prototype.plus_quad = function( Subject, Predicate, Object_or_Literal, Graph){
-	this.cursor['plus_quad'] = [ Subject, Predicate, Object_or_Literal, Graph ];
+WOQLQuery.prototype.add_quad = function( Subject, Predicate, Object_or_Literal, Graph){
+	this.cursor['add_quad'] = [ Subject, Predicate, Object_or_Literal, Graph ];
 	return this.lastUpdate();		
 }
 
@@ -552,6 +574,9 @@ WOQLQuery.prototype.documentMetadata = function(){
 	);
 }
 
+
+
+
 WOQLQuery.prototype.propertyMetadata = function(){
 	return this.and(
 		WOQL.or(
@@ -602,9 +627,9 @@ WOQLQuery.prototype.getDataOfProperty = function(chosen){
 
 WOQLQuery.prototype.documentProperties = function(id){
 	return this.and(
-		WOQL.triple(id, "v:Property", "v:Property_Value"),
-		WOQL.opt().quad("v:Property", "rdfs:label", "v:Property_Label", "db:schema"),
-		WOQL.opt().quad("v:Property", "rdf:type", "v:Property_Type", "db:schema")
+		'WOQL.triple(id, "v:Property", "v:Property_Value")',
+		'WOQL.opt().quad("v:Property", "rdfs:label", "v:Property_Label", "db:schema")',
+		'WOQL.opt().quad("v:Property", "rdf:type", "v:Property_Type", "db:schema")'
 	);
 }
 
@@ -637,4 +662,109 @@ WOQLQuery.prototype.simpleGraphQuery = function(){
 	);
 }
 
-module.exports = WOQL ;
+function WOQLSchema(){
+	this.triples = [];
+	this.subject = false;
+}
+
+WOQLSchema.prototype.execute = function(client){
+	var subs = [];
+	for(var i = 0; i<this.triples.length; i++){
+		subs.push(WOQL.add_quad(...this.triples[i], "db:schema"));
+	}
+	return WOQL.and(subs).execute(client);
+}
+
+WOQLSchema.prototype.getO = function(s, p){
+	for(var i = 0; i<this.triples.length; i++){
+		if(this.triples[i][0] == s && this.triples[i][1] == p ) return this.triples[i][2];
+	}
+	return false;
+}
+
+
+WOQLSchema.prototype.addPO = function(p, o){
+	this.triples.push([this.subject, p, o]);
+	return this;
+}
+
+WOQLSchema.prototype.addClass = function(c){
+	this.subject = c;
+	return this.addPO("rdf:type", "owl:Class");
+}
+
+WOQLSchema.prototype.addProperty = function(p, t){
+	this.subject = p;
+	this.addPO("rdfs:range", t);
+	if(WOQL.isLiteralType(t)){
+		return this.addPO("rdf:type", "owl:DatatypeProperty");
+	}
+	else {
+		return this.addPO("rdf:type", "owl:ObjectProperty");		
+	}
+}
+
+WOQLSchema.prototype.label = function(l, lang){
+	lang = (lang ? lang : "en");
+	return this.addPO('rdfs:label', {"@value": l, "@language": "en"});
+}
+
+WOQLSchema.prototype.comment = function(c, lang){
+	lang = (lang ? lang : "en");
+	return this.addPO('rdfs:comment', {"@value": c, "@language": "en"});
+}
+
+WOQLSchema.prototype.parent = function(...p){
+	return this.addPO('rdfs:subClassOf', p);
+}
+
+WOQLSchema.prototype.abstract = function(){
+	return this.addPO('tcs:tag', "tcs:abstract");
+}
+
+WOQLSchema.prototype.entity = function(){
+	return this.parent("tcs:Entity");
+}
+
+WOQLSchema.prototype.relationship = function(){
+	return this.parent("tcs:Relationship");
+}
+
+WOQLSchema.prototype.card = function(n, which){
+	let os = this.subject;
+	this.subject += "_" + which;
+	this.addPO('rdf:type', "owl:Restriction");
+	this.addPO("owl:onProperty", os);
+	switch(which){
+		case "max": this.addPO("owl:maxCardinality", n);
+			break;
+		case "min": this.addPO("owl:minCardinality", n);
+			break;
+		default: this.addPO("owl:cardinality", n);			
+	}
+	let od = this.getO(os, "rdfs:domain");
+	if(od){
+		this.triples.push([od, "rdfs:subClassOf", this.subject]);
+	}
+	this.subject = os;
+	return this;
+}
+
+WOQLSchema.prototype.max = function(m){
+	return this.card(m, "max");
+}
+
+WOQLSchema.prototype.min = function(m){
+	return this.card(m, "min");	
+}
+
+WOQLSchema.prototype.cardinality = function(m){
+	return this.card(m, "cardinality");	
+}
+
+WOQLSchema.prototype.domain = function(d){
+	return this.addPO('rdfs:domain', d);
+}
+
+
+module.exports = WOQL;

index.js

@@ -36,8 +36,9 @@ WOQLResult.prototype.last = function(){
 }
 
 WOQLResult.prototype.next = function(){
+	var res = this.bindings[this.cursor];	
 	this.cursor++;
-	return this.bindings[this.cursor];	
+	return res;
 }
 
 WOQLResult.prototype.prev = function(){