rdflib 2.2.26-0aa57642 → 2.2.26-2

package/esm/collection.js

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

package/esm/jsonldparser.js

@@ -1,3 +1,4 @@
+import jsonld from 'jsonld';
 import { arrayToStatements } from './utils';
 
 /**
@@ -59,10 +60,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 jsonld.flatten(JSON.parse(str), null, {
+    base: baseString
+  }).then(function (flattened) {
+    console.log(flattened);
+    return flattened;
   }).then(function (flattened) {
     return flattened.reduce(function (store, flatResource) {
       kb = processResource(kb, base, flatResource);

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.map(function (st) {
+          var ds2 = ds.elements.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,8 +264,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
           // log.info("doPatch insert "+patch['insert'])
           ds = patch['insert'];
           if (binding) ds = ds.substitute(binding);
-          ds = ds.statements;
-          ds.map(function (st) {
+          ds.elements.map(function (st) {
             st.graph = target;
             targetKB.add(st.subject, st.predicate, st.object, st.graph);
           });
@@ -282,6 +281,7 @@ 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,10 +117,11 @@ var Collection = /*#__PURE__*/function (_Node) {
   }, {
     key: "substitute",
     value: function substitute(bindings) {
-      var elementsCopy = this.elements.map(function (ea) {
-        return ea.substitute(bindings);
+      var collection = new Collection();
+      this.elements.forEach(function (ea) {
+        collection.append(ea.substitute(bindings));
       });
-      return new Collection(elementsCopy);
+      return collection;
     }
   }, {
     key: "toNT",

package/lib/jsonldparser.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = jsonldParser;
 exports.jsonldObjectToTerm = jsonldObjectToTerm;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _jsonld = _interopRequireDefault(require("jsonld"));
 var _utils = require("./utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || (0, _typeof2.default)(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
  * @param kb - The DataFactory to use.
@@ -69,12 +67,11 @@ function listToCollection(kb, obj) {
  */
 function jsonldParser(str, kb, base, callback) {
   var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
-  return Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('jsonld'));
-  }).then(function (jsonld) {
-    return jsonld.flatten(JSON.parse(str), null, {
-      base: baseString
-    });
+  return _jsonld.default.flatten(JSON.parse(str), null, {
+    base: baseString
+  }).then(function (flattened) {
+    console.log(flattened);
+    return flattened;
   }).then(function (flattened) {
     return flattened.reduce(function (store, flatResource) {
       kb = processResource(kb, base, flatResource);

package/lib/store.d.ts

@@ -95,7 +95,7 @@ export default class IndexedFormula extends Formula {
      */
     applyPatch(patch: {
         delete?: ReadonlyArray<Statement>;
-        patch?: ReadonlyArray<Statement>;
+        insert?: 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.map(function (st) {
+          var ds2 = ds.elements.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,8 +253,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
           // log.info("doPatch insert "+patch['insert'])
           ds = patch['insert'];
           if (binding) ds = ds.substitute(binding);
-          ds = ds.statements;
-          ds.map(function (st) {
+          ds.elements.map(function (st) {
             st.graph = target;
             targetKB.add(st.subject, st.predicate, st.object, st.graph);
           });
@@ -271,6 +270,7 @@ 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-0aa57642",
+  "version": "2.2.26-2",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -48,7 +48,7 @@
     "@frogcat/ttl2jsonld": "^0.0.9",
     "@xmldom/xmldom": "^0.8.6",
     "cross-fetch": "^3.1.5",
-    "jsonld": "^8.1.0",
+    "jsonld": "^5.2.0",
     "n3": "^1.16.3",
     "solid-namespace": "^0.5.2"
   },
@@ -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) {
-    const elementsCopy = this.elements.map((ea) => ea.substitute(bindings))
-
-    return new Collection(elementsCopy) as Collection<Node | Collection<any> | Literal | Variable>
+    let collection = new Collection();
+    this.elements.forEach((ea) => {collection.append(ea.substitute(bindings))})
+    return collection as Collection<Node | Collection<any> | Literal | Variable>;
   }
 
   toNT () {

package/src/jsonldparser.js

@@ -1,3 +1,4 @@
+import jsonld from 'jsonld'
 import { arrayToStatements } from './utils'
 
 /**
@@ -68,8 +69,9 @@ export default function jsonldParser (str, kb, base, callback) {
     ? base.value
     : base
 
-  return import('jsonld')
-    .then(jsonld => { return jsonld.flatten(JSON.parse(str), null, { base: baseString }) })
+  return jsonld
+    .flatten(JSON.parse(str), null, { base: baseString })
+    .then(flattened => { console.log(flattened); return flattened })
     .then((flattened) => flattened.reduce((store, flatResource) => {
 
       kb = processResource(kb, base, flatResource)