review woql and tests

Author: Francesca-Bit

lib/connectionConfig.js

@@ -119,7 +119,7 @@ ConnectionConfig.prototype.apiURL = function() {
  * @returns {string | boolean}
  */
 ConnectionConfig.prototype.db = function() {
-    if(!this.dbid) return false//throw new Error('Invalid database name'); 
+    if(!this.dbid) throw new Error('Invalid database name'); 
     return this.dbid
 }
 

lib/query/woqlBuilder.js

@@ -1,10 +1,10 @@
 //WOQLQuery
 /**
  * module WOQLQuery
+ *  
  */
-const WOQLQuery = require('./woqlSchema')
-//const WOQLQuery = require('./woqlCore')
-//const WOQLSchema = require('./woqlSchema')
+
+const WOQLQuery = require('./woqlQuery')
 const WOQLLibrary = require('./woqlLibrary')
 
 /*class WOQLQuery extends WOQLQueryImp {
@@ -36,11 +36,6 @@ WOQLQuery.prototype.lib = function() {
     return new WOQLLibrary()
 }
 
-WOQLQuery.prototype.abstract = function(graph, subj) {
-    this._add_partial(subj, 'system:tag', 'system:abstract', graph)
-    return this
-}
-
 WOQLQuery.prototype.string = function(s) {
     return {'@type': 'xsd:string', '@value': String(s)}
 }
@@ -111,36 +106,6 @@ WOQLQuery.prototype.nuke = function(g) {
     }
 }
 
-/**
- * Add a property at the current class/document
- *
- * @param {string} proId - property ID
- * @param {string} type  - property type (range) (on class inserts) property value on data inserts
- * @returns WOQLQuery object
- *
- * A range could be another class/document or an "xsd":"http://www.w3.org/2001/XMLSchema#" type
- * like string|integer|datatime|nonNegativeInteger|positiveInteger etc ..
- * (you don't need the prefix xsd for specific a type)
- */
-
-WOQLQuery.prototype.property = function(proId, type_or_value) {
-    //get the name of the last class it used only here!!!
-    //the value is setted in add_class (woqlSchema)
-    if (this._adding_class()) {
-        let part = this.findLastSubject(this.cursor)
-        let g = false
-        let gpart
-        if (part) gpart = part['graph_filter'] || part['graph']
-        if (gpart) g = gpart['@value']
-        let nprop = new WOQLQuery()
-            .add_property(proId, type_or_value, g)
-            .domain(this._adding_class())
-        this.and(nprop)
-    } else {
-        this._add_partial(false, proId, type_or_value)
-    }
-    return this
-}
 
 WOQLQuery.prototype.node = function(node, type) {
     type = type || false
@@ -157,6 +122,28 @@ WOQLQuery.prototype.node = function(node, type) {
     return this
 }
 
+/** 
+ * set the graph type schema or instance 
+ * for the query we point at the instance graph so you use this only 
+ * if you would like to query the schema graph
+ */
+//do not remove 
+WOQLQuery.prototype.graph = function (g) {
+    return this._set_context({
+      graph: g
+    });
+};
+//do not remove
+WOQLQuery.prototype._set_context = function (ctxt) {
+    if (!this.triple_builder_context) this.triple_builder_context = {};
+  
+    for (var k in ctxt) {
+      this.triple_builder_context[k] = ctxt[k];
+    }
+  
+    return this;
+  };
+
 WOQLQuery.prototype.insert = function(id, type, refGraph) {
     refGraph = refGraph || (this.triple_builder_context ? this.triple_builder_context.graph : false)
     if (refGraph) {
@@ -165,24 +152,6 @@ WOQLQuery.prototype.insert = function(id, type, refGraph) {
     return this.add_triple(id, 'rdf:type', '@schema:'+type)
 }
 
-WOQLQuery.prototype.insert_data = function(data, refGraph) {
-    if (data.type && data.id) {
-        this.insert(data.id, type, refGraph)
-        if (data.label) {
-            this.label(data.label)
-        }
-        if (data.description) {
-            this.description(data.description)
-        }
-        for (var k in data) {
-            if (['id', 'label', 'type', 'description'].indexOf(k) == -1) {
-                this.property(k, data[k])
-            }
-        }
-    }
-    return this
-}
-
 /**
  * @description Creates a pattern matching rule for a quad [Subject, Predicate, Object, Graph] or for a triple [Subject, Predicate, Object]
  * add extra information about the type of the value object
@@ -217,226 +186,4 @@ WOQLQuery.prototype.link = function(a, b, c, g) {
     }
 }
 
-WOQLQuery.prototype.graph = function(g) {
-    return this._set_context({graph: g})
-}
-
-WOQLQuery.prototype.domain = function(d) {
-    return this._add_partial(false, 'rdfs:domain', d)
-}
-/**
- * @param {string} labelVar - the label variable name or string "v:Label" or "My Label"
- * @param {string} [lang] - the label language
- */
-
-WOQLQuery.prototype.label = function(labelVar, lang = 'en') {
-    if (labelVar.substring(0, 2) == 'v:') {
-        var d = labelVar
-    } else {
-        var d = {'@value': labelVar, '@type': 'xsd:string', '@language': lang}
-    }
-    return this._add_partial(false, 'rdfs:label', d)
-}
-
-WOQLQuery.prototype.description = function(c, lang) {
-    lang = lang ? lang : 'en'
-    if (c.substring(0, 2) == 'v:') {
-        var d = c
-    } else {
-        var d = {'@value': c, '@type': 'xsd:string', '@language': lang}
-    }
-    return this._add_partial(false, 'rdfs:comment', d)
-}
-
-/**
- * Specifies that a new class should have parents class
- * @param {array} parentList the list of parent class []
- *
- */
-WOQLQuery.prototype.parent = function(...parentList) {
-    for (var i = 0; i < parentList.length; i++) {
-        var pn = parentList[i]
-        this._add_partial(false, 'rdfs:subClassOf', pn)
-    }
-    return this
-}
-
-WOQLQuery.prototype.max = function(m) {
-    this._card(m, 'max')
-    return this
-}
-
-WOQLQuery.prototype.cardinality = function(m) {
-    this._card(m, 'cardinality')
-    return this
-}
-
-WOQLQuery.prototype.min = function(m) {
-    this._card(m, 'min')
-    return this
-}
-
-/**
- * Adds partially specified triples / quads as used in add_class, add_property, property, label, etc
- */
-WOQLQuery.prototype._add_partial = function(s, p, o, g) {
-    let ctxt = this.triple_builder_context || {}
-    s = s || ctxt.subject
-    g = g || ctxt.graph
-    let lastsubj = this.findLastSubject(this.cursor)
-    //if the last subject is a cardinality restriction quad
-    //I'm looking for the last property
-    if (
-        lastsubj['predicate'] &&
-        lastsubj['predicate']['node'] &&
-        lastsubj['predicate']['node'].indexOf('Cardinality') > -1
-    ) {
-        lastsubj = this.findLastProperty(this.cursor)
-    }
-    if (lastsubj && !s) s = lastsubj['subject']
-    let t = ctxt.action || lastsubj['@type']
-    if (!g) {
-        const gobj = lastsubj['graph_filter'] || lastsubj['graph']
-        g = gobj ? gobj['@value'] : 'schema'
-    }
-    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
-}
-
-/**
- * Called to indicate that a add class chain has started
- * needed to ensure that we maintain a second state (class) as well as a property state
- */
-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['node']
-        return x
-    }
-    return false
-}
-
-WOQLQuery.prototype._set_adding_class = function(c) {
-    if (!this.triple_builder_context) this.triple_builder_context = {}
-    this.triple_builder_context['adding_class'] = c
-    return this
-}
-
-/**
- * Sets the internal context for triple building functions
- */
-WOQLQuery.prototype._set_context = function(ctxt) {
-    if (!this.triple_builder_context) this.triple_builder_context = {}
-    for (var k in ctxt) {
-        this.triple_builder_context[k] = ctxt[k]
-    }
-    return this
-}
-
-/**
- * gets the object (value) for a triple earlier in the query that has a specific subject and predicate
- * used to find the class that a property cardinality restriction is applied to
- */
-WOQLQuery.prototype._get_object = function(s, p) {
-    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['subject'], s) &&
-                this._same_entry(subq['predicate'], p)
-            )
-                return subq['object']
-        }
-    }
-    return false
-}
-
-WOQLQuery.prototype._same_entry = function(a, b) {
-    if (a == b) return true
-    if (typeof a == 'object' && typeof b == 'string') {
-        return this._string_matches_object(b, a)
-    }
-    if (typeof b == 'object' && typeof a == 'string') {
-        return this._string_matches_object(a, b)
-    }
-    if (typeof a == 'object' && typeof b == 'object') {
-        for (var k in a) {
-            if (!b[k] || a[k] != b[k]) return false
-        }
-        for (var k in b) {
-            if (!a[k] || a[k] != b[k]) return false
-        }
-        return true
-    }
-}
-
-/**
- * Checks to see if a string and a node / datatype / variable are in fact the same
- * @param {string} str
- * @param {object} node
- * @returns {string|boolean}
- */
-WOQLQuery.prototype._string_matches_object = function(str, node) {
-    if (node['node']) return str == node['node']
-    if (node['@value']) return str == node['@value']
-    if (node['variable_name']) return str == 'v:' + node['variable_name']['@value']
-    return false
-}
-
-/**
- *
- * @param {number} cardValue
- * @param {string} which
- * @returns {WOQLQuery}
- */
-
-WOQLQuery.prototype._card = function(cardValue, which) {
-    //need to generate a new id for the cardinality restriction object
-    //and point it at the property in question via the onProperty function
-    let ctxt = this.triple_builder_context || {}
-    let subject = ctxt.subject
-    let graph = ctxt.graph
-    let lastsubj = this.findLastProperty(this.cursor)
-    if (lastsubj && !subject) subject = lastsubj['subject']
-    if (typeof subject === 'object') {
-        if (subject['node']) subject = subject['node']
-        else return this
-    }
-
-    if (lastsubj && !graph) {
-        const gobj = lastsubj['graph_filter'] || lastsubj['graph']
-        graph = gobj ? gobj['@value'] : false
-    }
-    let cardId = subject + '_' + which + '_' + cardValue
-
-    //important!! this add_quad have to stay in this position
-    //then make the domain of the property into a subclass of the restriction
-    let classDomain = this._get_object(subject, 'rdfs:domain')
-    if (classDomain) {
-        this.and(new WOQLQuery().add_quad(classDomain, 'subClassOf', cardId, graph))
-    }
-    this.and(
-        new WOQLQuery()
-            .add_quad(cardId, 'type', 'owl:Restriction', graph)
-            .add_quad(cardId, 'owl:onProperty', subject, graph),
-    )
-    const cardObj = {min: 'owl:minCardinality', max: 'owl:maxCardinality'}
-    let cardType = cardObj[which] ? cardObj[which] : 'owl:Cardinality'
-
-    this.and(
-        new WOQLQuery().add_quad(
-            cardId,
-            cardType,
-            {'@value': cardValue, '@type': 'xsd:nonNegativeInteger'},
-            graph,
-        ),
-    )
-    return this
-}
-
 module.exports = WOQLQuery