fix: safer working with undefined context

docs/api.md

@@ -105,7 +105,7 @@ Creates an iterator which iterates and rdf:List of the current term
 <a name="Clownface+toArray"></a>
 
 ### clownface.toArray() ⇒ [<code>Array.&lt;Clownface&gt;</code>](#Clownface)
-Returns an array of graph pointers where each on has a single _context
+Returns an array of graph pointers where each one has a single _context
 
 **Kind**: instance method of [<code>Clownface</code>](#Clownface)  
 <a name="Clownface+filter"></a>

lib/Clownface.js

@@ -149,12 +149,14 @@ class Clownface {
   }
 
   /**
-   * Returns an array of graph pointers where each on has a single _context
+   * Returns an array of graph pointers where each one has a single _context
    *
    * @returns {Clownface[]}
    */
   toArray () {
-    return this._context.map(context => Clownface.fromContext(context))
+    return this._context
+      .map(context => Clownface.fromContext(context))
+      .filter(context => context.terms.some(Boolean))
   }
 
   /**

lib/Context.js

@@ -46,32 +46,40 @@ class Context {
   addIn (predicates, subjects) {
     const context = []
 
-    subjects.forEach(subject => {
-      predicates.forEach(predicate => {
-        this.dataset.add(this.factory.quad(subject, predicate, this.term, this.graph))
-      })
+    if (this.term) {
+      subjects.forEach(subject => {
+        predicates.forEach(predicate => {
+          this.dataset.add(this.factory.quad(subject, predicate, this.term, this.graph))
+        })
 
-      context.push(this.clone({ value: subject }))
-    })
+        context.push(this.clone({ value: subject }))
+      })
+    }
 
     return context
   }
 
   addOut (predicates, objects) {
     const context = []
 
-    objects.forEach(object => {
-      predicates.forEach(predicate => {
-        this.dataset.add(this.factory.quad(this.term, predicate, object, this.graph))
-      })
+    if (this.term) {
+      objects.forEach(object => {
+        predicates.forEach(predicate => {
+          this.dataset.add(this.factory.quad(this.term, predicate, object, this.graph))
+        })
 
-      context.push(this.clone({ value: object }))
-    })
+        context.push(this.clone({ value: object }))
+      })
+    }
 
     return context
   }
 
   addList (predicates, items) {
+    if (!this.term) {
+      return
+    }
+
     predicates.forEach(predicate => {
       const nodes = items.map(() => this.factory.blankNode())
 

package.json

@@ -40,6 +40,7 @@
     "rdf-dataset-ext": "^1.0.0",
     "rdf-ext": "^1.3.0",
     "rimraf": "^3.0.2",
+    "sinon": "^9.0.2",
     "standard": "^12.0.1",
     "string-to-stream": "^3.0.1",
     "tbbt-ld": "^1.1.0"

test/Clownface/addIn.js

@@ -1,6 +1,6 @@
-/* global describe, it */
-
+const { describe, it } = require('mocha')
 const assert = require('assert')
+const sinon = require('sinon')
 const clownface = require('../..')
 const rdf = require('../support/factory')
 const { addAll } = require('rdf-dataset-ext')
@@ -151,6 +151,7 @@ describe('.addIn', () => {
   it('should use the provided factory', () => {
     const dataset = rdf.dataset()
     const predicate = rdf.namedNode('http://schema.org/knows')
+    const term = rdf.namedNode('http://localhost:8080/data/person/bernadette-rostenkowski')
     const factory = {
       quad: (s, p, o, g) => {
         const quad = rdf.quad(s, p, o, g)
@@ -169,11 +170,34 @@ describe('.addIn', () => {
       }
     }
 
-    const cf = clownface({ dataset, factory }).addIn(predicate, 'test')
+    const cf = clownface({ dataset, factory, term }).addIn(predicate, 'test')
 
     assert.strictEqual(cf.in(predicate).term.testProperty, 'test')
     cf.dataset.match(null, predicate, null).forEach((quad) => {
       assert.strictEqual(quad.testProperty, 'test')
     })
   })
+
+  it('should not add quads if context is undefined', () => {
+    const dataset = rdf.dataset()
+    const cf = clownface({ dataset })
+    const subject = rdf.namedNode('http://localhost:8080/data/person/bernadette-rostenkowski')
+    const predicate = rdf.namedNode('http://schema.org/knows')
+
+    cf.addIn(predicate, subject)
+
+    assert.strictEqual(dataset.size, 0)
+  })
+
+  it('should not call callback function if context is undefined', () => {
+    const dataset = rdf.dataset()
+    const cf = clownface({ dataset })
+    const subject = rdf.namedNode('http://localhost:8080/data/person/bernadette-rostenkowski')
+    const predicate = rdf.namedNode('http://schema.org/knows')
+    const callback = sinon.spy()
+
+    cf.addIn(predicate, subject, callback)
+
+    assert.strictEqual(callback.called, false)
+  })
 })

test/Clownface/addList.js

@@ -1,5 +1,4 @@
-/* global describe, it */
-
+const { describe, it } = require('mocha')
 const assert = require('assert')
 const clownface = require('../..')
 const rdf = require('../support/factory')
@@ -107,4 +106,14 @@ describe('.addList', () => {
     assert.strictEqual(rest0.testProperty, 'test')
     assert.strictEqual(rest0.predicate.testProperty, 'test')
   })
+
+  it('should not add quads if context is undefined', () => {
+    const dataset = rdf.dataset()
+    const graph = clownface({ dataset })
+    const predicate = rdf.namedNode('http://example.org/foo')
+
+    graph.addList(predicate, ['bar', 'baz'])
+
+    assert.strictEqual(dataset.size, 0)
+  })
 })

test/Clownface/addOut.js

@@ -1,6 +1,6 @@
-/* global describe, it */
-
+const { describe, it } = require('mocha')
 const assert = require('assert')
+const sinon = require('sinon')
 const clownface = require('../..')
 const loadExample = require('../support/example')
 const rdf = require('../support/factory')
@@ -168,6 +168,7 @@ describe('.addOut', () => {
   it('should use the provided factory', () => {
     const dataset = rdf.dataset()
     const predicate = rdf.namedNode('http://schema.org/knows')
+    const term = rdf.namedNode('http://localhost:8080/data/person/mary-cooper')
     const factory = {
       quad: (s, p, o, g) => {
         const quad = rdf.quad(s, p, o, g)
@@ -186,11 +187,34 @@ describe('.addOut', () => {
       }
     }
 
-    const cf = clownface({ dataset, factory }).addOut(predicate, 'test')
+    const cf = clownface({ dataset, factory, term }).addOut(predicate, 'test')
 
     assert.strictEqual(cf.out(predicate).term.testProperty, 'test')
     cf.dataset.match(null, predicate, null).forEach((quad) => {
       assert.strictEqual(quad.testProperty, 'test')
     })
   })
+
+  it('should not add quads if context is undefined', () => {
+    const dataset = rdf.dataset()
+    const cf = clownface({ dataset })
+    const object = rdf.namedNode('http://localhost:8080/data/person/bernadette-rostenkowski')
+    const predicate = rdf.namedNode('http://schema.org/knows')
+
+    cf.addOut(predicate, object)
+
+    assert.strictEqual(dataset.size, 0)
+  })
+
+  it('should not call callback function if context is undefined', () => {
+    const dataset = rdf.dataset()
+    const cf = clownface({ dataset })
+    const object = rdf.namedNode('http://localhost:8080/data/person/bernadette-rostenkowski')
+    const predicate = rdf.namedNode('http://schema.org/knows')
+    const callback = sinon.spy()
+
+    cf.addOut(predicate, object, callback)
+
+    assert.strictEqual(callback.called, false)
+  })
 })

test/Clownface/toArray.js

@@ -30,4 +30,12 @@ describe('.toArray', () => {
     assert.strictEqual(result.length, 7)
     assert(result[0] instanceof Clownface)
   })
+
+  it('should not return an instance for undefined context', () => {
+    const cf = clownface({ dataset: rdf.dataset() })
+
+    const array = cf.toArray()
+
+    assert.strictEqual(array.length, 0)
+  })
 })