rdflib 2.2.26 → 2.2.27-936d06bf

package/esm/collection.js

@@ -109,11 +109,10 @@ var Collection = /*#__PURE__*/function (_Node) {
   }, {
     key: "substitute",
     value: function substitute(bindings) {
-      var collection = new Collection();
-      this.elements.forEach(function (ea) {
-        collection.append(ea.substitute(bindings));
+      var elementsCopy = this.elements.map(function (ea) {
+        return ea.substitute(bindings);
       });
-      return collection;
+      return new Collection(elementsCopy);
     }
   }, {
     key: "toNT",

package/esm/jsonldparser.js

@@ -59,7 +59,11 @@ function listToCollection(kb, obj) {
  */
 export default function jsonldParser(str, kb, base, callback) {
   var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
-  return import('jsonld').then(function (jsonld) {
+
+  /* return jsonld
+    .flatten(JSON.parse(str), null, { base: baseString }) */
+  return import('jsonld') // jsonld // alain
+  .then(function (jsonld) {
     return jsonld.flatten(JSON.parse(str), null, {
       base: baseString
     });

package/esm/store.js

@@ -237,9 +237,9 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
           // console.log('ds before substitute: ' + ds)
           if (binding) ds = ds.substitute(binding);
           // console.log('applyPatch: delete: ' + ds)
-
+          ds = ds.statements;
           var bad = [];
-          var ds2 = ds.elements.map(function (st) {
+          var ds2 = ds.map(function (st) {
             // Find the actual statements in the store
             var sts = targetKB.statementsMatching(st.subject, st.predicate, st.object, target);
             if (sts.length === 0) {
@@ -264,7 +264,8 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
           // log.info("doPatch insert "+patch['insert'])
           ds = patch['insert'];
           if (binding) ds = ds.substitute(binding);
-          ds.elements.map(function (st) {
+          ds = ds.statements;
+          ds.map(function (st) {
             st.graph = target;
             targetKB.add(st.subject, st.predicate, st.object, st.graph);
           });
@@ -281,7 +282,6 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
         //@ts-ignore TODO: add sync property to Query when converting Query to typescript
         query.sync = true;
         var bindingsFound = [];
-        query.pat.initBindings = [];
         targetKB.query(query, function onBinding(binding) {
           bindingsFound.push(binding);
           // console.log('   got a binding: ' + bindingDebug(binding))

package/lib/collection.js

@@ -117,11 +117,10 @@ var Collection = /*#__PURE__*/function (_Node) {
   }, {
     key: "substitute",
     value: function substitute(bindings) {
-      var collection = new Collection();
-      this.elements.forEach(function (ea) {
-        collection.append(ea.substitute(bindings));
+      var elementsCopy = this.elements.map(function (ea) {
+        return ea.substitute(bindings);
       });
-      return collection;
+      return new Collection(elementsCopy);
     }
   }, {
     key: "toNT",

package/lib/jsonldparser.js

@@ -69,9 +69,13 @@ function listToCollection(kb, obj) {
  */
 function jsonldParser(str, kb, base, callback) {
   var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
+
+  /* return jsonld
+    .flatten(JSON.parse(str), null, { base: baseString }) */
   return Promise.resolve().then(function () {
     return _interopRequireWildcard(require('jsonld'));
-  }).then(function (jsonld) {
+  }) // jsonld // alain
+  .then(function (jsonld) {
     return jsonld.flatten(JSON.parse(str), null, {
       base: baseString
     });

package/lib/store.d.ts

@@ -95,7 +95,7 @@ export default class IndexedFormula extends Formula {
      */
     applyPatch(patch: {
         delete?: ReadonlyArray<Statement>;
-        insert?: ReadonlyArray<Statement>;
+        patch?: ReadonlyArray<Statement>;
         where?: any;
     }, target: TFNamedNode, patchCallback: (errorString?: string) => void): void;
     /**

package/lib/store.js

@@ -226,9 +226,9 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
           // console.log('ds before substitute: ' + ds)
           if (binding) ds = ds.substitute(binding);
           // console.log('applyPatch: delete: ' + ds)
-
+          ds = ds.statements;
           var bad = [];
-          var ds2 = ds.elements.map(function (st) {
+          var ds2 = ds.map(function (st) {
             // Find the actual statements in the store
             var sts = targetKB.statementsMatching(st.subject, st.predicate, st.object, target);
             if (sts.length === 0) {
@@ -253,7 +253,8 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
           // log.info("doPatch insert "+patch['insert'])
           ds = patch['insert'];
           if (binding) ds = ds.substitute(binding);
-          ds.elements.map(function (st) {
+          ds = ds.statements;
+          ds.map(function (st) {
             st.graph = target;
             targetKB.add(st.subject, st.predicate, st.object, st.graph);
           });
@@ -270,7 +271,6 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
         //@ts-ignore TODO: add sync property to Query when converting Query to typescript
         query.sync = true;
         var bindingsFound = [];
-        query.pat.initBindings = [];
         targetKB.query(query, function onBinding(binding) {
           bindingsFound.push(binding);
           // console.log('   got a binding: ' + bindingDebug(binding))

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.26",
+  "version": "2.2.27-936d06bf",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/collection.ts

@@ -102,9 +102,9 @@ export default class Collection<
    * @param bindings - The bindings to substitute
    */
   substitute (bindings: Bindings) {
-    let collection = new Collection();
-    this.elements.forEach((ea) => {collection.append(ea.substitute(bindings))})
-    return collection as Collection<Node | Collection<any> | Literal | Variable>;
+    const elementsCopy = this.elements.map((ea) => ea.substitute(bindings))
+
+    return new Collection(elementsCopy) as Collection<Node | Collection<any> | Literal | Variable>
   }
 
   toNT () {

package/src/jsonldparser.js

@@ -68,7 +68,9 @@ export default function jsonldParser (str, kb, base, callback) {
     ? base.value
     : base
 
-  return import('jsonld')
+  /* return jsonld
+    .flatten(JSON.parse(str), null, { base: baseString }) */
+    return import('jsonld') // jsonld // alain
     .then(jsonld => { return jsonld.flatten(JSON.parse(str), null, { base: baseString }) })
     .then((flattened) => flattened.reduce((store, flatResource) => {
 

package/src/store.ts

@@ -253,7 +253,7 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   applyPatch(
     patch: {
         delete?: ReadonlyArray<Statement>,
-        insert?: ReadonlyArray<Statement>,
+        patch?: ReadonlyArray<Statement>,
         where?: any
     },
     target: TFNamedNode,
@@ -270,9 +270,9 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
         // console.log('ds before substitute: ' + ds)
         if (binding) ds = ds.substitute(binding)
         // console.log('applyPatch: delete: ' + ds)
-
+        ds = ds.statements as Statement[]
         var bad: Quad[] = []
-        var ds2 = ds.elements.map(function (st: Quad) { // Find the actual statements in the store
+        var ds2 = ds.map(function (st: Quad) { // Find the actual statements in the store
           var sts = targetKB.statementsMatching(st.subject, st.predicate, st.object, target)
           if (sts.length === 0) {
             // log.info("NOT FOUND deletable " + st)
@@ -296,8 +296,8 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
         // log.info("doPatch insert "+patch['insert'])
         ds = patch['insert']
         if (binding) ds = ds.substitute(binding)
-
-        ds.elements.map(function (st: Quad) {
+        ds = ds.statements
+        ds.map(function (st: Quad) {
           st.graph = target
           targetKB.add(st.subject, st.predicate, st.object, st.graph)
         })
@@ -315,7 +315,6 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
       query.sync = true
 
       var bindingsFound: Bindings[] = []
-      query.pat.initBindings = [];
 
       targetKB.query(
         query,