rdflib 2.2.22-4e175603 → 2.2.22-53d65d90

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -57,194 +58,200 @@ var _exportNames = {
 };
 Object.defineProperty(exports, "BlankNode", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _blankNode.default;
   }
 });
 Object.defineProperty(exports, "Collection", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _collection.default;
   }
 });
 exports.ConnectedStore = void 0;
 Object.defineProperty(exports, "DataFactory", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _rdflibDataFactory.default;
   }
 });
 Object.defineProperty(exports, "Empty", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _empty.default;
   }
 });
 Object.defineProperty(exports, "Fetcher", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _fetcher.default;
   }
 });
 Object.defineProperty(exports, "Formula", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _formula.default;
   }
 });
 Object.defineProperty(exports, "IndexedFormula", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _store.default;
   }
 });
 Object.defineProperty(exports, "Literal", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _literal.default;
   }
 });
 exports.LiveStore = void 0;
 Object.defineProperty(exports, "N3Parser", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _n3parser.default;
   }
 });
 Object.defineProperty(exports, "NamedNode", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _namedNode.default;
   }
 });
 Object.defineProperty(exports, "Namespace", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _namespace.default;
   }
 });
 exports.NextId = void 0;
 Object.defineProperty(exports, "Node", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _node.default;
   }
 });
 Object.defineProperty(exports, "Query", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _query.Query;
   }
 });
 Object.defineProperty(exports, "RDFParser", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _rdfxmlparser.default;
   }
 });
 Object.defineProperty(exports, "RDFaProcessor", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _rdfaparser.default;
   }
 });
 Object.defineProperty(exports, "SPARQLToQuery", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _sparqlToQuery.default;
   }
 });
 Object.defineProperty(exports, "Serializer", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _serializer.default;
   }
 });
 Object.defineProperty(exports, "Statement", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _statement.default;
   }
 });
 Object.defineProperty(exports, "Store", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _store.default;
   }
 });
 Object.defineProperty(exports, "UpdateManager", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _updateManager.default;
   }
 });
 Object.defineProperty(exports, "UpdatesSocket", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _updatesVia.UpdatesSocket;
   }
 });
 Object.defineProperty(exports, "UpdatesVia", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _updatesVia.UpdatesVia;
   }
 });
 exports.Util = void 0;
 Object.defineProperty(exports, "Variable", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _variable.default;
   }
 });
 exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.blankNode = void 0;
 Object.defineProperty(exports, "jsonParser", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _jsonparser.default;
   }
 });
 exports.literal = exports.lit = void 0;
 Object.defineProperty(exports, "log", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _log.default;
   }
 });
 exports.namedNode = void 0;
 Object.defineProperty(exports, "parse", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _parse.default;
   }
 });
 exports.quad = void 0;
 Object.defineProperty(exports, "queryToSPARQL", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _queryToSparql.default;
   }
 });
 Object.defineProperty(exports, "serialize", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _serialize.default;
   }
 });
 Object.defineProperty(exports, "sparqlUpdateParser", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _patchParser.default;
   }
 });
 exports.term = exports.sym = exports.st = void 0;
 Object.defineProperty(exports, "termValue", {
   enumerable: true,
-  get: function () {
+  get: function get() {
     return _termValue.termValue;
   }
 });
 exports.variable = exports.uri = exports.triple = void 0;
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _blankNode = _interopRequireDefault(require("./blank-node"));
 var _collection = _interopRequireDefault(require("./collection"));
@@ -284,32 +291,32 @@ Object.keys(_terms).forEach(function (key) {
   if (key in exports && exports[key] === _terms[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function () {
+    get: function get() {
       return _terms[key];
     }
   });
 });
 var _termValue = require("./utils/termValue");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof 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; }
+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 || _typeof(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; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 // Prepare bound versions of data factory methods for export
-const boundDataFactory = {};
-for (const name in _rdflibDataFactory.default) {
+var boundDataFactory = {};
+for (var name in _rdflibDataFactory.default) {
   if (typeof _rdflibDataFactory.default[name] === 'function') boundDataFactory[name] = _rdflibDataFactory.default[name].bind(_rdflibDataFactory.default);
 }
-const {
-  fetcher,
-  graph,
-  lit,
-  st,
-  namedNode,
-  variable,
-  blankNode,
-  defaultGraph,
-  literal,
-  quad,
-  triple
-} = boundDataFactory;
+var fetcher = boundDataFactory.fetcher,
+  graph = boundDataFactory.graph,
+  lit = boundDataFactory.lit,
+  st = boundDataFactory.st,
+  namedNode = boundDataFactory.namedNode,
+  variable = boundDataFactory.variable,
+  blankNode = boundDataFactory.blankNode,
+  defaultGraph = boundDataFactory.defaultGraph,
+  literal = boundDataFactory.literal,
+  quad = boundDataFactory.quad,
+  triple = boundDataFactory.triple;
 exports.triple = triple;
 exports.quad = quad;
 exports.literal = literal;
@@ -321,29 +328,43 @@ exports.st = st;
 exports.lit = lit;
 exports.graph = graph;
 exports.fetcher = fetcher;
-const formula = new _formula.default();
-const fromNT = str => formula.fromNT(str);
+var formula = new _formula.default();
+var fromNT = function fromNT(str) {
+  return formula.fromNT(str);
+};
 exports.fromNT = fromNT;
-const term = _node.default.fromValue;
+var term = _node.default.fromValue;
 
 // TODO: this export is broken;
 // it exports the _current_ value of nextId, which is always 0
 exports.term = term;
-const NextId = _blankNode.default.nextId;
+var NextId = _blankNode.default.nextId;
 exports.NextId = NextId;
-class ConnectedStore extends _store.default {
-  constructor(features) {
-    super(features);
-    (0, _defineProperty2.default)(this, "fetcher", void 0);
-    this.fetcher = new _fetcher.default(this, {});
-  }
-}
+var ConnectedStore = /*#__PURE__*/function (_Store) {
+  (0, _inherits2.default)(ConnectedStore, _Store);
+  var _super = _createSuper(ConnectedStore);
+  function ConnectedStore(features) {
+    var _this;
+    (0, _classCallCheck2.default)(this, ConnectedStore);
+    _this = _super.call(this, features);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetcher", void 0);
+    _this.fetcher = new _fetcher.default((0, _assertThisInitialized2.default)(_this), {});
+    return _this;
+  }
+  return (0, _createClass2.default)(ConnectedStore);
+}(_store.default);
 exports.ConnectedStore = ConnectedStore;
-class LiveStore extends ConnectedStore {
-  constructor(features) {
-    super(features);
-    (0, _defineProperty2.default)(this, "updater", void 0);
-    this.updater = new _updateManager.default(this);
-  }
-}
+var LiveStore = /*#__PURE__*/function (_ConnectedStore) {
+  (0, _inherits2.default)(LiveStore, _ConnectedStore);
+  var _super2 = _createSuper(LiveStore);
+  function LiveStore(features) {
+    var _this2;
+    (0, _classCallCheck2.default)(this, LiveStore);
+    _this2 = _super2.call(this, features);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this2), "updater", void 0);
+    _this2.updater = new _updateManager.default((0, _assertThisInitialized2.default)(_this2));
+    return _this2;
+  }
+  return (0, _createClass2.default)(LiveStore);
+}(ConnectedStore);
 exports.LiveStore = LiveStore;

package/lib/jsonldparser.js

@@ -43,9 +43,11 @@ function jsonldObjectToTerm(kb, obj) {
  * Adds the statements in a json-ld list object to {kb}.
  */
 function listToStatements(kb, obj) {
-  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode();
-  const items = obj['@list'].map(listItem => jsonldObjectToTerm(kb, listItem));
-  const statements = (0, _utils.arrayToStatements)(kb.rdfFactory, listId, items);
+  var listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode();
+  var items = obj['@list'].map(function (listItem) {
+    return jsonldObjectToTerm(kb, listItem);
+  });
+  var statements = (0, _utils.arrayToStatements)(kb.rdfFactory, listId, items);
   kb.addAll(statements);
   return listId;
 }
@@ -53,7 +55,9 @@ function listToCollection(kb, obj) {
   if (!Array.isArray(obj)) {
     throw new TypeError("Object must be an array");
   }
-  return kb.rdfFactory.collection(obj.map(o => jsonldObjectToTerm(kb, o)));
+  return kb.rdfFactory.collection(obj.map(function (o) {
+    return jsonldObjectToTerm(kb, o);
+  }));
 }
 
 /**
@@ -62,17 +66,19 @@ function listToCollection(kb, obj) {
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
 function jsonldParser(str, kb, base, callback) {
-  const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
+  var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return _jsonld.default.flatten(JSON.parse(str), null, {
     base: baseString
-  }).then(flattened => flattened.reduce((store, flatResource) => {
-    kb = processResource(kb, base, flatResource);
-    return kb;
-  }, kb)).then(callback).catch(callback);
+  }).then(function (flattened) {
+    return flattened.reduce(function (store, flatResource) {
+      kb = processResource(kb, base, flatResource);
+      return kb;
+    }, kb);
+  }).then(callback).catch(callback);
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node.. pass the id without the preceding _:
+    // This object is a Blank Node. Pass the id without the `_:` prefix
     return kb.rdfFactory.blankNode(obj['@id'].substring(2));
   } else {
     // This object is a Named Node
@@ -80,26 +86,27 @@ function nodeType(kb, obj) {
   }
 }
 function processResource(kb, base, flatResource) {
-  const id = flatResource['@id'] ? nodeType(kb, flatResource) : kb.rdfFactory.blankNode();
-  for (const property of Object.keys(flatResource)) {
+  var id = flatResource['@id'] ? nodeType(kb, flatResource) : kb.rdfFactory.blankNode();
+  for (var _i = 0, _Object$keys = Object.keys(flatResource); _i < _Object$keys.length; _i++) {
+    var property = _Object$keys[_i];
     if (property === '@id') {
       continue;
     } else if (property == '@graph') {
       // the JSON-LD flattened structure may contain nested graphs
       // the id value for this object is the new base (named graph id) for all nested flat resources
-      const graphId = id;
+      var graphId = id;
       // this is an array of resources
-      const nestedFlatResources = flatResource[property];
+      var 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 (var i = 0; i < nestedFlatResources.length; i++) {
         kb = processResource(kb, graphId, nestedFlatResources[i]);
       }
     }
-    const value = flatResource[property];
+    var value = flatResource[property];
     if (Array.isArray(value)) {
-      for (let i = 0; i < value.length; i++) {
-        kb.addStatement(createStatement(kb, id, property, value[i], base));
+      for (var _i2 = 0; _i2 < value.length; _i2++) {
+        kb.addStatement(createStatement(kb, id, property, value[_i2], base));
       }
     } else {
       kb.addStatement(createStatement(kb, id, property, value, base));
@@ -117,7 +124,7 @@ function processResource(kb, base, flatResource) {
  * @return quad statement
  */
 function createStatement(kb, id, property, value, base) {
-  let predicate, object;
+  var predicate, object;
   if (property === "@type") {
     predicate = kb.rdfFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
     object = kb.rdfFactory.namedNode(value);

package/lib/jsonparser.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = function () {
   return {
-    parseJSON: function (data, source, store) {
+    parseJSON: function parseJSON(data, source, store) {
       var subject, predicate, object;
       var bnodes = {};
       var why = store.sym(source);

package/lib/lists.js

@@ -10,23 +10,10 @@ exports.substituteNillsInDoc = substituteNillsInDoc;
 var _collection = _interopRequireDefault(require("./collection"));
 var _statement = _interopRequireDefault(require("./statement"));
 var _namespace = _interopRequireDefault(require("./namespace"));
-/* Lists form conversion
-*/
-
-// import DataFactory from './factories/extended-term-factory'
-// import jsonldParser from './jsonldparser'
-// @ts-ignore is this injected?
-// @@ Goal: remove this dependency
-// import N3Parser from './n3parser'
-// import { parseRDFaDOM } from './rdfaparser'
-// import RDFParser from './rdfxmlparser'
-// import sparqlUpdateParser from './patch-parser'
-// import * as Util from './utils-js'
-
-// import BlankNode from './blank-node'
-// import NamedNode from './named-node'
-
-const RDF = (0, _namespace.default)('http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var RDF = (0, _namespace.default)('http://www.w3.org/1999/02/22-rdf-syntax-ns#');
 
 /* Replace a given node with another node throughout a given document
 *
@@ -34,38 +21,83 @@ const RDF = (0, _namespace.default)('http://www.w3.org/1999/02/22-rdf-syntax-ns#
 */
 function substituteInDoc(store, x, y, doc) {
   // console.log(`substituteInDoc put ${x} for ${y} in ${doc}}`)
-  for (const quad of store.statementsMatching(y, null, null, doc)) {
-    const newStatement = new _statement.default(x, quad.predicate, quad.object, doc);
-    store.remove(quad);
-    store.add(newStatement);
+  var _iterator = _createForOfIteratorHelper(store.statementsMatching(y, null, null, doc)),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var quad = _step.value;
+      var newStatement = new _statement.default(x, quad.predicate, quad.object, doc);
+      store.remove(quad);
+      store.add(newStatement);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
-  for (const quad of store.statementsMatching(null, y, null, doc)) {
-    store.remove(quad);
-    // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
-    store.add(new _statement.default(quad.subject, x, quad.object, doc));
+  var _iterator2 = _createForOfIteratorHelper(store.statementsMatching(null, y, null, doc)),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _quad = _step2.value;
+      store.remove(_quad);
+      // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
+      store.add(new _statement.default(_quad.subject, x, _quad.object, doc));
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
   }
-  for (const quad of store.statementsMatching(null, null, y, doc)) {
-    store.remove(quad);
-    store.add(new _statement.default(quad.subject, quad.predicate, x, doc));
+  var _iterator3 = _createForOfIteratorHelper(store.statementsMatching(null, null, y, doc)),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _quad2 = _step3.value;
+      store.remove(_quad2);
+      store.add(new _statement.default(_quad2.subject, _quad2.predicate, x, doc));
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
   }
 }
 
 /* Change all lone rdf:nil nodes into empty Collections
 */
 function substituteNillsInDoc(store, doc) {
-  const x = RDF('nil');
-  for (const quad of store.statementsMatching(x, null, null, doc)) {
-    store.remove(quad);
-    const y = new _collection.default();
-    store.add(new _statement.default(y, quad.predicate, quad.object, doc));
-  }
-  for (const quad of store.statementsMatching(null, null, x, doc)) {
-    if (!quad.predicate.sameTerm(RDF('rest'))) {
-      // If not a tail
+  var x = RDF('nil');
+  var _iterator4 = _createForOfIteratorHelper(store.statementsMatching(x, null, null, doc)),
+    _step4;
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var quad = _step4.value;
       store.remove(quad);
-      const y = new _collection.default();
-      store.add(new _statement.default(quad.subject, quad.predicate, y, doc));
+      var y = new _collection.default();
+      store.add(new _statement.default(y, quad.predicate, quad.object, doc));
+    }
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+  var _iterator5 = _createForOfIteratorHelper(store.statementsMatching(null, null, x, doc)),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var _quad3 = _step5.value;
+      if (!_quad3.predicate.sameTerm(RDF('rest'))) {
+        // If not a tail
+        store.remove(_quad3);
+        var _y = new _collection.default();
+        store.add(new _statement.default(_quad3.subject, _quad3.predicate, _y, doc));
+      }
     }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
   }
 }
 /**
@@ -80,34 +112,34 @@ function substituteNillsInDoc(store, doc) {
 function convertFirstRestNil(store, doc // Do whole store?
 ) {
   function preceding(ele, listSoFar, trash) {
-    const rests = store.statementsMatching(ele, RDF('rest'), null, doc);
-    if (rests.length !== 1) throw new Error(`Bad list structure: no rest at ${ele}`);
-    const firsts = store.statementsMatching(ele, RDF('first'), null, doc);
-    if (firsts.length !== 1) throw new Error(`Bad list structure: rest but ${firsts.length} firsts at ${ele}`);
-    const value = firsts[0].object;
-    const total = [value].concat(listSoFar);
+    var rests = store.statementsMatching(ele, RDF('rest'), null, doc);
+    if (rests.length !== 1) throw new Error("Bad list structure: no rest at ".concat(ele));
+    var firsts = store.statementsMatching(ele, RDF('first'), null, doc);
+    if (firsts.length !== 1) throw new Error("Bad list structure: rest but ".concat(firsts.length, " firsts at ").concat(ele));
+    var value = firsts[0].object;
+    var total = [value].concat(listSoFar);
     // console.log('  List now is: ', total)
-    const totalTrash = trash.concat(rests).concat(firsts);
-    const pres = store.statementsMatching(null, RDF('rest'), ele, doc);
+    var totalTrash = trash.concat(rests).concat(firsts);
+    var pres = store.statementsMatching(null, RDF('rest'), ele, doc);
     if (pres.length === 0) {
       // Head of the list
-      const newList = new _collection.default(total);
+      var newList = new _collection.default(total);
       store.remove(totalTrash);
       // Replace old list with new list:
       substituteInDoc(store, newList, ele, doc);
       return;
     }
-    if (pres.length !== 1) throw new Error(`Bad list structure: ${pres.length} pres at ${ele}`);
-    const pre = pres[0].subject;
-    if (pre.termType !== 'BlankNode') throw new Error(`Bad list element node ${pre} type: ${pre.termType} `);
+    if (pres.length !== 1) throw new Error("Bad list structure: ".concat(pres.length, " pres at ").concat(ele));
+    var pre = pres[0].subject;
+    if (pre.termType !== 'BlankNode') throw new Error("Bad list element node ".concat(pre, " type: ").concat(pre.termType, " "));
     preceding(pre, total, totalTrash);
     return;
   }
   substituteNillsInDoc(store, doc); // lone ones only
 
-  const tails = store.statementsMatching(null, RDF('rest'), RDF('nil'), doc);
-  tails.forEach(tail => {
-    if (tail.subject.termType !== 'BlankNode') throw new Error(`Bad list element node ${tail.subject} type: ${tail.subject.termType} `);
+  var tails = store.statementsMatching(null, RDF('rest'), RDF('nil'), doc);
+  tails.forEach(function (tail) {
+    if (tail.subject.termType !== 'BlankNode') throw new Error("Bad list element node ".concat(tail.subject, " type: ").concat(tail.subject.termType, " "));
     preceding(tail.subject, [], []);
   });
 }