rdflib 2.2.37-d3a3ef5f → 2.2.37-dbccd446

package/esm/jsonldparser.js

@@ -56,7 +56,9 @@ function listToCollection(kb, obj) {
 export default function jsonldParser(str, kb, base, callback) {
   const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return import('jsonld').then(jsonld => {
-    return jsonld.flatten(JSON.parse(str), null, {
+    // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
+    // just calling `jsonld.flatten`, so please do not remove `default`
+    return jsonld.default.flatten(JSON.parse(str), null, {
       base: baseString
     });
   }).then(flattened => flattened.reduce((store, flatResource) => {

package/esm/store.js

@@ -129,9 +129,7 @@ export default class IndexedFormula extends Formula {
     /** Function to remove quads from the store arrays with */
     _defineProperty(this, "rdfArrayRemove", void 0);
     /** Callbacks which are triggered after a statement has been added to the store */
-    _defineProperty(this, "dataCallbacks", []);
-    /** Callbacks which are triggered after a statement has been removed from the store */
-    _defineProperty(this, "dataRemovalCallbacks", []);
+    _defineProperty(this, "dataCallbacks", void 0);
     this.propertyActions = {};
     this.classActions = {};
     this.redirections = [];
@@ -153,9 +151,6 @@ export default class IndexedFormula extends Formula {
     if (opts.dataCallback) {
       this.dataCallbacks = [opts.dataCallback];
     }
-    if (opts.dataRemovalCallback) {
-      this.dataRemovalCallbacks = [opts.dataRemovalCallback];
-    }
     this.initPropertyActions(this.features);
   }
 
@@ -184,11 +179,11 @@ export default class IndexedFormula extends Formula {
    * @param cb
    */
   addDataCallback(cb) {
+    if (!this.dataCallbacks) {
+      this.dataCallbacks = [];
+    }
     this.dataCallbacks.push(cb);
   }
-  addDataRemovalCallback(cb) {
-    this.dataRemovalCallbacks.push(cb);
-  }
 
   /**
    * Apply a set of statements to be deleted and to be inserted
@@ -402,8 +397,10 @@ export default class IndexedFormula extends Formula {
 
     // log.debug("ADDING    {"+subj+" "+pred+" "+objNode+"} "+why)
     this.statements.push(st);
-    for (const callback of this.dataCallbacks) {
-      callback(st);
+    if (this.dataCallbacks) {
+      for (const callback of this.dataCallbacks) {
+        callback(st);
+      }
     }
     return st;
   }
@@ -853,9 +850,6 @@ export default class IndexedFormula extends Formula {
       }
     }
     this.rdfArrayRemove(this.statements, st);
-    for (const callback of this.dataRemovalCallbacks) {
-      callback(st);
-    }
     return this;
   }
 

package/lib/formula.d.ts

@@ -12,7 +12,6 @@ import BlankNode from './blank-node';
 import NamedNode from './named-node';
 export interface FormulaOpts {
     dataCallback?: (q: Quad) => void;
-    dataRemovalCallback?: (q: Quad) => void;
     rdfArrayRemove?: (arr: Quad[], q: Quad) => void;
     rdfFactory?: RdfJsDataFactory;
 }

package/lib/jsonldparser.js

@@ -63,7 +63,9 @@ function listToCollection(kb, obj) {
 function jsonldParser(str, kb, base, callback) {
   const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return Promise.resolve().then(() => _interopRequireWildcard(require('jsonld'))).then(jsonld => {
-    return jsonld.flatten(JSON.parse(str), null, {
+    // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
+    // just calling `jsonld.flatten`, so please do not remove `default`
+    return jsonld.default.flatten(JSON.parse(str), null, {
       base: baseString
     });
   }).then(flattened => flattened.reduce((store, flatResource) => {

package/lib/store.d.ts

@@ -61,9 +61,7 @@ export default class IndexedFormula extends Formula {
     /** Function to remove quads from the store arrays with */
     private rdfArrayRemove;
     /** Callbacks which are triggered after a statement has been added to the store */
-    private dataCallbacks;
-    /** Callbacks which are triggered after a statement has been removed from the store */
-    private dataRemovalCallbacks;
+    private dataCallbacks?;
     /**
      * Creates a new formula
      * @param features - What sort of automatic processing to do? Array of string
@@ -88,7 +86,6 @@ export default class IndexedFormula extends Formula {
      * @param cb
      */
     addDataCallback(cb: (q: Quad) => void): void;
-    addDataRemovalCallback(cb: (q: Quad) => void): void;
     /**
      * Apply a set of statements to be deleted and to be inserted
      *

package/lib/store.js

@@ -137,9 +137,7 @@ class IndexedFormula extends _formula.default {
     /** Function to remove quads from the store arrays with */
     (0, _defineProperty2.default)(this, "rdfArrayRemove", void 0);
     /** Callbacks which are triggered after a statement has been added to the store */
-    (0, _defineProperty2.default)(this, "dataCallbacks", []);
-    /** Callbacks which are triggered after a statement has been removed from the store */
-    (0, _defineProperty2.default)(this, "dataRemovalCallbacks", []);
+    (0, _defineProperty2.default)(this, "dataCallbacks", void 0);
     this.propertyActions = {};
     this.classActions = {};
     this.redirections = [];
@@ -161,9 +159,6 @@ class IndexedFormula extends _formula.default {
     if (opts.dataCallback) {
       this.dataCallbacks = [opts.dataCallback];
     }
-    if (opts.dataRemovalCallback) {
-      this.dataRemovalCallbacks = [opts.dataRemovalCallback];
-    }
     this.initPropertyActions(this.features);
   }
 
@@ -192,11 +187,11 @@ class IndexedFormula extends _formula.default {
    * @param cb
    */
   addDataCallback(cb) {
+    if (!this.dataCallbacks) {
+      this.dataCallbacks = [];
+    }
     this.dataCallbacks.push(cb);
   }
-  addDataRemovalCallback(cb) {
-    this.dataRemovalCallbacks.push(cb);
-  }
 
   /**
    * Apply a set of statements to be deleted and to be inserted
@@ -410,8 +405,10 @@ class IndexedFormula extends _formula.default {
 
     // log.debug("ADDING    {"+subj+" "+pred+" "+objNode+"} "+why)
     this.statements.push(st);
-    for (const callback of this.dataCallbacks) {
-      callback(st);
+    if (this.dataCallbacks) {
+      for (const callback of this.dataCallbacks) {
+        callback(st);
+      }
     }
     return st;
   }
@@ -861,9 +858,6 @@ class IndexedFormula extends _formula.default {
       }
     }
     this.rdfArrayRemove(this.statements, st);
-    for (const callback of this.dataRemovalCallbacks) {
-      callback(st);
-    }
     return this;
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.37-d3a3ef5f",
+  "version": "2.2.37-dbccd446",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/formula.ts

@@ -33,7 +33,6 @@ import NamedNode from './named-node'
 
 export interface FormulaOpts {
   dataCallback?: (q: Quad) => void
-  dataRemovalCallback?: (q: Quad) => void;
   rdfArrayRemove?: (arr: Quad[], q: Quad) => void
   rdfFactory?: RdfJsDataFactory
 }

package/src/jsonldparser.js

@@ -1,4 +1,4 @@
-import { arrayToStatements } from './utils'
+import {arrayToStatements} from './utils'
 
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
@@ -6,7 +6,7 @@ import { arrayToStatements } from './utils'
  * @param obj - The json-ld object to process.
  * @return {Literal|NamedNode|BlankNode|Collection}
  */
-export function jsonldObjectToTerm (kb, obj) {
+export function jsonldObjectToTerm(kb, obj) {
   if (typeof obj === 'string') {
     return kb.rdfFactory.literal(obj)
   }
@@ -41,7 +41,7 @@ export function jsonldObjectToTerm (kb, obj) {
 /**
  * Adds the statements in a json-ld list object to {kb}.
  */
-function listToStatements (kb, obj) {
+function listToStatements(kb, obj) {
   const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode()
 
   const items = obj['@list'].map((listItem => jsonldObjectToTerm(kb, listItem)))
@@ -51,7 +51,7 @@ function listToStatements (kb, obj) {
   return listId
 }
 
-function listToCollection (kb, obj) {
+function listToCollection(kb, obj) {
   if (!Array.isArray(obj)) {
     throw new TypeError("Object must be an array")
   }
@@ -63,13 +63,15 @@ function listToCollection (kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-export default function jsonldParser (str, kb, base, callback) {
-  const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType')
-    ? base.value
-    : base
+export default function jsonldParser(str, kb, base, callback) {
+  const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base
 
   return import('jsonld')
-    .then(jsonld => { return jsonld.flatten(JSON.parse(str), null, { base: baseString }) })
+    .then(jsonld => {
+      // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
+      // just calling `jsonld.flatten`, so please do not remove `default`
+      return jsonld.default.flatten(JSON.parse(str), null, {base: baseString})
+    })
     .then((flattened) => flattened.reduce((store, flatResource) => {
 
       kb = processResource(kb, base, flatResource)
@@ -80,7 +82,7 @@ export default function jsonldParser (str, kb, base, callback) {
     .catch(callback)
 }
 
-function nodeType (kb, obj) {
+function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {
     // This object is a Blank Node. Pass the id without the `_:` prefix
     return kb.rdfFactory.blankNode(obj['@id'].substring(2));
@@ -106,7 +108,7 @@ function processResource(kb, base, flatResource) {
       const nestedFlatResources = flatResource[property]
 
       // recursively process all flat resources in the array, but with the graphId as base.
-      for (let i = 0; i < nestedFlatResources.length; i++ ) {
+      for (let i = 0; i < nestedFlatResources.length; i++) {
         kb = processResource(kb, graphId, nestedFlatResources[i])
       }
     }

package/src/store.ts

@@ -168,9 +168,7 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   /** Function to remove quads from the store arrays with */
   private rdfArrayRemove: (arr: Quad[], q: Quad) => void
   /** Callbacks which are triggered after a statement has been added to the store */
-  private dataCallbacks: Array<(q: Quad) => void> = []
-  /** Callbacks which are triggered after a statement has been removed from the store */
-  private dataRemovalCallbacks: Array<(q: Quad) => void> = []
+  private dataCallbacks?: Array<(q: Quad) => void>
 
   /**
    * Creates a new formula
@@ -210,9 +208,6 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     if (opts.dataCallback) {
       this.dataCallbacks = [opts.dataCallback]
     }
-    if (opts.dataRemovalCallback) {
-      this.dataRemovalCallbacks = [opts.dataRemovalCallback]
-    }
 
     this.initPropertyActions(this.features)
   }
@@ -242,13 +237,12 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
    * @param cb
    */
   addDataCallback(cb: (q: Quad) => void): void {
+    if (!this.dataCallbacks) {
+      this.dataCallbacks = []
+    }
     this.dataCallbacks.push(cb)
   }
 
-  addDataRemovalCallback(cb: (q: Quad) => void): void {
-    this.dataRemovalCallbacks.push(cb)
-  }
-
   /**
    * Apply a set of statements to be deleted and to be inserted
    *
@@ -492,8 +486,10 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     // log.debug("ADDING    {"+subj+" "+pred+" "+objNode+"} "+why)
     this.statements.push(st)
 
-    for (const callback of this.dataCallbacks) {
-      callback(st)
+    if (this.dataCallbacks) {
+      for (const callback of this.dataCallbacks) {
+        callback(st)
+      }
     }
 
     return st
@@ -991,9 +987,6 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
       }
     }
     this.rdfArrayRemove(this.statements, st)
-    for (const callback of this.dataRemovalCallbacks) {
-      callback(st)
-    }
     return this
   }