rdflib 2.2.26 → 2.2.27

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/convert.js

@@ -0,0 +1,60 @@
+import asyncLib from 'async'; // @@ Goal: remove this dependency
+import jsonld from 'jsonld';
+import { Parser, Writer } from 'n3'; // @@ Goal: remove this dependency
+
+export function convertToJson(n3String, jsonCallback) {
+  var jsonString;
+  var n3Parser = new Parser();
+  var n3Writer = new Writer({
+    format: 'N-Quads'
+  });
+  asyncLib.waterfall([function (callback) {
+    n3Parser.parse(n3String, function (error, quad, prefixes) {
+      if (error) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    try {
+      jsonld.fromRDF(result, {
+        format: 'application/nquads'
+      }).then(result => {
+        callback(null, result);
+      });
+    } catch (err) {
+      callback(err);
+    }
+  }, function (json, callback) {
+    jsonString = JSON.stringify(json);
+    jsonCallback(null, jsonString);
+  }], function (err, result) {
+    jsonCallback(err, jsonString);
+  });
+}
+export function convertToNQuads(n3String, nquadCallback) {
+  var nquadString;
+  var n3Parser = new Parser();
+  var n3Writer = new Writer({
+    format: 'N-Quads'
+  });
+  asyncLib.waterfall([function (callback) {
+    n3Parser.parse(n3String, function (error, triple, prefixes) {
+      if (error) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    nquadString = result;
+    nquadCallback(null, nquadString);
+  }], function (err, result) {
+    nquadCallback(err, nquadString);
+  });
+}

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/convert.d.ts

@@ -0,0 +1,2 @@
+export function convertToJson(n3String: any, jsonCallback: any): void;
+export function convertToNQuads(n3String: any, nquadCallback: any): void;

package/lib/convert.js

@@ -0,0 +1,71 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertToJson = convertToJson;
+exports.convertToNQuads = convertToNQuads;
+var _async = _interopRequireDefault(require("async"));
+var _jsonld = _interopRequireDefault(require("jsonld"));
+var _n = require("n3");
+// @@ Goal: remove this dependency
+
+// @@ Goal: remove this dependency
+
+function convertToJson(n3String, jsonCallback) {
+  var jsonString;
+  var n3Parser = new _n.Parser();
+  var n3Writer = new _n.Writer({
+    format: 'N-Quads'
+  });
+  _async.default.waterfall([function (callback) {
+    n3Parser.parse(n3String, function (error, quad, prefixes) {
+      if (error) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    try {
+      _jsonld.default.fromRDF(result, {
+        format: 'application/nquads'
+      }).then(result => {
+        callback(null, result);
+      });
+    } catch (err) {
+      callback(err);
+    }
+  }, function (json, callback) {
+    jsonString = JSON.stringify(json);
+    jsonCallback(null, jsonString);
+  }], function (err, result) {
+    jsonCallback(err, jsonString);
+  });
+}
+function convertToNQuads(n3String, nquadCallback) {
+  var nquadString;
+  var n3Parser = new _n.Parser();
+  var n3Writer = new _n.Writer({
+    format: 'N-Quads'
+  });
+  _async.default.waterfall([function (callback) {
+    n3Parser.parse(n3String, function (error, triple, prefixes) {
+      if (error) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    nquadString = result;
+    nquadCallback(null, nquadString);
+  }], function (err, result) {
+    nquadCallback(err, nquadString);
+  });
+}

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",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -94,7 +94,7 @@
     "build:types": "tsc --emitDeclarationOnly -d --moduleResolution node --declarationDir lib",
     "build:all": "npm run build && npm run build:types && npm run build:browser && npm run build:esm",
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
-    "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
+    "prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
     "postversion": "git push --follow-tags",
     "start": "webpack serve --port 4800",
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",

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/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,