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

Author: KittyJose

lib/connectionConfig.js

@@ -119,6 +119,7 @@ ConnectionConfig.prototype.apiURL = function() {
  * @returns {string | boolean}
  */
 ConnectionConfig.prototype.db = function() {
+    if(!this.dbid) throw new Error('Invalid database name'); 
     return this.dbid
 }
 
@@ -358,7 +359,7 @@ ConnectionConfig.prototype.organizationURL = function(orgId, action) {
  * @returns {string}
  */
 ConnectionConfig.prototype.rolesURL = function() {
-    return `${this.apiURL()}roles`
+    return `${this.apiURL()}role`
 }
 
 /**

lib/query/woqlBuilder.js

@@ -57,8 +57,8 @@ WOQLQuery.prototype.literal = function(s, t) {
 
 WOQLQuery.prototype.iri = function(s) {
     return {
-        '@type': 'woql:Node',
-        'woql:node': s,
+        '@type': 'NodeValue',
+        'node': s,
     }
 }
 
@@ -130,7 +130,7 @@ WOQLQuery.prototype.property = function(proId, type_or_value) {
         let part = this.findLastSubject(this.cursor)
         let g = false
         let gpart
-        if (part) gpart = part['woql:graph_filter'] || part['woql:graph']
+        if (part) gpart = part['graph_filter'] || part['graph']
         if (gpart) g = gpart['@value']
         let nprop = new WOQLQuery()
             .add_property(proId, type_or_value, g)
@@ -144,31 +144,29 @@ WOQLQuery.prototype.property = function(proId, type_or_value) {
 
 WOQLQuery.prototype.node = function(node, type) {
     type = type || false
-    if (type == 'add_quad') type = 'AddQuad'
-    else if (type == 'delete_quad') type = 'DeleteQuad'
+    if (type == 'add_quad') type = 'AddTriple'
+    else if (type == 'delete_quad') type = 'DeleteTriple'
     else if (type == 'add_triple') type = 'AddTriple'
     else if (type == 'delete_triple') type = 'DeleteTriple'
-    else if (type == 'quad') type = 'Quad'
+    else if (type == 'quad') type = 'Triple'
     else if (type == 'triple') type = 'Triple'
-    if (type && type.indexOf(':') == -1) type = 'woql:' + type
+    if (type && type.indexOf(':') == -1) type = type
     let ctxt = {subject: node}
     if (type) ctxt.action = type
     this._set_context(ctxt)
     return this
 }
 
 WOQLQuery.prototype.insert = function(id, type, refGraph) {
-    type = this.cleanType(type, true)
     refGraph = refGraph || (this.triple_builder_context ? this.triple_builder_context.graph : false)
     if (refGraph) {
-        return this.add_quad(id, 'type', type, refGraph)
+        return this.add_quad(id, 'rdf:type', '@schema:'+type, refGraph)
     }
-    return this.add_triple(id, 'type', type)
+    return this.add_triple(id, 'rdf:type', '@schema:'+type)
 }
 
 WOQLQuery.prototype.insert_data = function(data, refGraph) {
     if (data.type && data.id) {
-        type = this.cleanType(data.type, true)
         this.insert(data.id, type, refGraph)
         if (data.label) {
             this.label(data.label)
@@ -224,7 +222,6 @@ WOQLQuery.prototype.graph = function(g) {
 }
 
 WOQLQuery.prototype.domain = function(d) {
-    d = this.cleanClass(d)
     return this._add_partial(false, 'rdfs:domain', d)
 }
 /**
@@ -258,7 +255,7 @@ WOQLQuery.prototype.description = function(c, lang) {
  */
 WOQLQuery.prototype.parent = function(...parentList) {
     for (var i = 0; i < parentList.length; i++) {
-        var pn = this.cleanClass(parentList[i])
+        var pn = parentList[i]
         this._add_partial(false, 'rdfs:subClassOf', pn)
     }
     return this
@@ -290,24 +287,24 @@ WOQLQuery.prototype._add_partial = function(s, p, o, g) {
     //if the last subject is a cardinality restriction quad
     //I'm looking for the last property
     if (
-        lastsubj['woql:predicate'] &&
-        lastsubj['woql:predicate']['woql:node'] &&
-        lastsubj['woql:predicate']['woql:node'].indexOf('Cardinality') > -1
+        lastsubj['predicate'] &&
+        lastsubj['predicate']['node'] &&
+        lastsubj['predicate']['node'].indexOf('Cardinality') > -1
     ) {
         lastsubj = this.findLastProperty(this.cursor)
     }
-    if (lastsubj && !s) s = lastsubj['woql:subject']
+    if (lastsubj && !s) s = lastsubj['subject']
     let t = ctxt.action || lastsubj['@type']
     if (!g) {
-        const gobj = lastsubj['woql:graph_filter'] || lastsubj['woql:graph']
-        g = gobj ? gobj['@value'] : 'schema/main'
+        const gobj = lastsubj['graph_filter'] || lastsubj['graph']
+        g = gobj ? gobj['@value'] : 'schema'
     }
-    if (t == 'woql:AddTriple') this.and(new WOQLQuery().add_triple(s, p, o))
-    else if (t == 'woql:DeleteTriple') this.and(new WOQLQuery().delete_triple(s, p, o))
-    else if (t == 'woql:AddQuad') this.and(new WOQLQuery().add_quad(s, p, o, g))
-    else if (t == 'woql:DeleteQuad') this.and(new WOQLQuery().delete_quad(s, p, o, g))
-    else if (t == 'woql:Quad') this.and(new WOQLQuery().quad(s, p, o, g))
-    else this.and(new WOQLQuery().triple(s, p, o))
+    if (t == 'AddTriple') this.and(new WOQLQuery().add_quad(s, p, o,g))
+    else if (t == 'DeleteTriple') this.and(new WOQLQuery().delete_quad(s, p, o,g))
+    else if (t == 'AddTriple') this.and(new WOQLQuery().add_quad(s, p, o, g))
+    else if (t == 'DeleteTriple') this.and(new WOQLQuery().delete_quad(s, p, o, g))
+    else if (t == 'Triple') this.and(new WOQLQuery().quad(s, p, o, g))
+    else this.and(new WOQLQuery().quad(s, p, o, g))
     return this
 }
 
@@ -318,7 +315,7 @@ WOQLQuery.prototype._add_partial = function(s, p, o, g) {
 WOQLQuery.prototype._adding_class = function(string_only) {
     if (this.triple_builder_context) {
         let x = this.triple_builder_context['adding_class']
-        if (x && string_only && typeof x == 'object') return x['woql:node']
+        if (x && string_only && typeof x == 'object') return x['node']
         return x
     }
     return false
@@ -346,14 +343,14 @@ WOQLQuery.prototype._set_context = function(ctxt) {
  * used to find the class that a property cardinality restriction is applied to
  */
 WOQLQuery.prototype._get_object = function(s, p) {
-    if (this.cursor['@type'] == 'woql:And') {
-        for (var i = 0; i < this.cursor['woql:query_list'].length; i++) {
-            let subq = this.cursor['woql:query_list'][i]['woql:query']
+    if (this.cursor['@type'] == 'And') {
+        for (var i = 0; i < this.cursor['query_list'].length; i++) {
+            let subq = this.cursor['query_list'][i]['query']
             if (
-                this._same_entry(subq['woql:subject'], s) &&
-                this._same_entry(subq['woql:predicate'], p)
+                this._same_entry(subq['subject'], s) &&
+                this._same_entry(subq['predicate'], p)
             )
-                return subq['woql:object']
+                return subq['object']
         }
     }
     return false
@@ -385,9 +382,9 @@ WOQLQuery.prototype._same_entry = function(a, b) {
  * @returns {string|boolean}
  */
 WOQLQuery.prototype._string_matches_object = function(str, node) {
-    if (node['woql:node']) return str == node['woql:node']
+    if (node['node']) return str == node['node']
     if (node['@value']) return str == node['@value']
-    if (node['woql:variable_name']) return str == 'v:' + node['woql:variable_name']['@value']
+    if (node['variable_name']) return str == 'v:' + node['variable_name']['@value']
     return false
 }
 
@@ -405,14 +402,14 @@ WOQLQuery.prototype._card = function(cardValue, which) {
     let subject = ctxt.subject
     let graph = ctxt.graph
     let lastsubj = this.findLastProperty(this.cursor)
-    if (lastsubj && !subject) subject = lastsubj['woql:subject']
+    if (lastsubj && !subject) subject = lastsubj['subject']
     if (typeof subject === 'object') {
-        if (subject['woql:node']) subject = subject['woql:node']
+        if (subject['node']) subject = subject['node']
         else return this
     }
 
     if (lastsubj && !graph) {
-        const gobj = lastsubj['woql:graph_filter'] || lastsubj['woql:graph']
+        const gobj = lastsubj['graph_filter'] || lastsubj['graph']
         graph = gobj ? gobj['@value'] : false
     }
     let cardId = subject + '_' + which + '_' + cardValue