rdflib 2.2.21 → 2.2.22-0de51c50

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 import BlankNode from './blank-node';
 import Collection from './collection';
-import * as convert from './convert';
 import Empty from './empty';
 import Fetcher from './fetcher';
 import Formula from './formula';
@@ -35,7 +34,7 @@ declare const term: <T extends import("./types").FromValueReturns<any>>(value: i
 declare const NextId: number;
 export * from './utils/terms';
 export type { AutoInitOptions, ExtendedResponse, FetchError } from './fetcher';
-export { BlankNode, Collection, convert, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula, // Alias
+export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula, // Alias
 NextId, fromNT, fetcher, graph, lit, st, namedNode as sym, blankNode, defaultGraph, literal, namedNode, quad, triple, variable, };
 export { termValue } from './utils/termValue';
 export declare class ConnectedStore extends Store {

package/lib/index.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -27,7 +25,6 @@ var _exportNames = {
   LiveStore: true,
   BlankNode: true,
   Collection: true,
-  convert: true,
   Empty: true,
   Fetcher: true,
   Formula: true,
@@ -201,7 +198,7 @@ Object.defineProperty(exports, "Variable", {
     return _variable.default;
   }
 });
-exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.convert = exports.blankNode = void 0;
+exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.blankNode = void 0;
 Object.defineProperty(exports, "jsonParser", {
   enumerable: true,
   get: function get() {
@@ -249,89 +246,45 @@ Object.defineProperty(exports, "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"));
-
-var convert = _interopRequireWildcard(require("./convert"));
-
-exports.convert = convert;
-
 var _empty = _interopRequireDefault(require("./empty"));
-
 var _fetcher = _interopRequireDefault(require("./fetcher"));
-
 var _formula = _interopRequireDefault(require("./formula"));
-
 var _store = _interopRequireDefault(require("./store"));
-
 var _jsonparser = _interopRequireDefault(require("./jsonparser"));
-
 var _literal = _interopRequireDefault(require("./literal"));
-
 var _log = _interopRequireDefault(require("./log"));
-
 var _n3parser = _interopRequireDefault(require("./n3parser"));
-
 var _namedNode = _interopRequireDefault(require("./named-node"));
-
 var _namespace = _interopRequireDefault(require("./namespace"));
-
 var _node = _interopRequireDefault(require("./node"));
-
 var _parse = _interopRequireDefault(require("./parse"));
-
 var _query = require("./query");
-
 var _queryToSparql = _interopRequireDefault(require("./query-to-sparql"));
-
 var _rdfaparser = _interopRequireDefault(require("./rdfaparser"));
-
 var _rdfxmlparser = _interopRequireDefault(require("./rdfxmlparser"));
-
 var _serialize = _interopRequireDefault(require("./serialize"));
-
 var _serializer = _interopRequireDefault(require("./serializer"));
-
 var _sparqlToQuery = _interopRequireDefault(require("./sparql-to-query"));
-
 var _patchParser = _interopRequireDefault(require("./patch-parser"));
-
 var _statement = _interopRequireDefault(require("./statement"));
-
 var _updateManager = _interopRequireDefault(require("./update-manager"));
-
 var _updatesVia = require("./updates-via");
-
 var uri = _interopRequireWildcard(require("./uri"));
-
 exports.uri = uri;
-
 var Util = _interopRequireWildcard(require("./utils-js"));
-
 exports.Util = Util;
-
 var _variable = _interopRequireDefault(require("./variable"));
-
 var _rdflibDataFactory = _interopRequireDefault(require("./factories/rdflib-data-factory"));
-
 var _terms = require("./utils/terms");
-
 Object.keys(_terms).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -343,35 +296,27 @@ Object.keys(_terms).forEach(function (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 _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
 var boundDataFactory = {};
-
 for (var name in _rdflibDataFactory.default) {
   if (typeof _rdflibDataFactory.default[name] === 'function') boundDataFactory[name] = _rdflibDataFactory.default[name].bind(_rdflibDataFactory.default);
 }
-
 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;
+  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;
@@ -384,55 +329,42 @@ exports.lit = lit;
 exports.graph = graph;
 exports.fetcher = fetcher;
 var formula = new _formula.default();
-
 var fromNT = function fromNT(str) {
   return formula.fromNT(str);
 };
-
 exports.fromNT = fromNT;
-var term = _node.default.fromValue; // TODO: this export is broken;
-// it exports the _current_ value of nextId, which is always 0
+var term = _node.default.fromValue;
 
+// TODO: this export is broken;
+// it exports the _current_ value of nextId, which is always 0
 exports.term = term;
 var NextId = _blankNode.default.nextId;
 exports.NextId = NextId;
-
 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;
-
 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

@@ -1,17 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = jsonldParser;
 exports.jsonldObjectToTerm = jsonldObjectToTerm;
-
 var _jsonld = _interopRequireDefault(require("jsonld"));
-
 var _utils = require("./utils");
-
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
  * @param kb - The DataFactory to use.
@@ -22,40 +18,32 @@ function jsonldObjectToTerm(kb, obj) {
   if (typeof obj === 'string') {
     return kb.rdfFactory.literal(obj);
   }
-
   if (Object.prototype.hasOwnProperty.call(obj, '@list')) {
     if (kb.rdfFactory.supports["COLLECTIONS"] === true) {
       return listToCollection(kb, obj['@list']);
     }
-
     return listToStatements(kb, obj);
   }
-
   if (Object.prototype.hasOwnProperty.call(obj, '@id')) {
-    return kb.rdfFactory.namedNode(obj['@id']);
+    return nodeType(kb, obj);
   }
-
   if (Object.prototype.hasOwnProperty.call(obj, '@language')) {
     return kb.rdfFactory.literal(obj['@value'], obj['@language']);
   }
-
   if (Object.prototype.hasOwnProperty.call(obj, '@type')) {
     return kb.rdfFactory.literal(obj['@value'], kb.rdfFactory.namedNode(obj['@type']));
   }
-
   if (Object.prototype.hasOwnProperty.call(obj, '@value')) {
     return kb.rdfFactory.literal(obj['@value']);
   }
-
   return kb.rdfFactory.literal(obj);
 }
+
 /**
  * Adds the statements in a json-ld list object to {kb}.
  */
-
-
 function listToStatements(kb, obj) {
-  var listId = obj['@id'] ? kb.rdfFactory.namedNode(obj['@id']) : kb.rdfFactory.blankNode();
+  var listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode();
   var items = obj['@list'].map(function (listItem) {
     return jsonldObjectToTerm(kb, listItem);
   });
@@ -63,23 +51,20 @@ function listToStatements(kb, obj) {
   kb.addAll(statements);
   return listId;
 }
-
 function listToCollection(kb, obj) {
   if (!Array.isArray(obj)) {
     throw new TypeError("Object must be an array");
   }
-
   return kb.rdfFactory.collection(obj.map(function (o) {
     return jsonldObjectToTerm(kb, o);
   }));
 }
+
 /**
  * Takes a json-ld formatted string {str} and adds its statements to {kb}.
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-
-
 function jsonldParser(str, kb, base, callback) {
   var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return _jsonld.default.flatten(JSON.parse(str), null, {
@@ -91,29 +76,34 @@ function jsonldParser(str, kb, base, callback) {
     }, kb);
   }).then(callback).catch(callback);
 }
-
+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));
+  } else {
+    // This object is a Named Node
+    return kb.rdfFactory.namedNode(obj['@id']);
+  }
+}
 function processResource(kb, base, flatResource) {
-  var id = flatResource['@id'] ? kb.rdfFactory.namedNode(flatResource['@id']) : kb.rdfFactory.blankNode();
-
+  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
-      var graphId = id; // this is an array of resources
-
-      var nestedFlatResources = flatResource[property]; // recursively process all flat resources in the array, but with the graphId as base.
+      var graphId = id;
+      // this is an array of resources
+      var nestedFlatResources = flatResource[property];
 
+      // recursively process all flat resources in the array, but with the graphId as base.
       for (var i = 0; i < nestedFlatResources.length; i++) {
         kb = processResource(kb, graphId, nestedFlatResources[i]);
       }
     }
-
     var value = flatResource[property];
-
     if (Array.isArray(value)) {
       for (var _i2 = 0; _i2 < value.length; _i2++) {
         kb.addStatement(createStatement(kb, id, property, value[_i2], base));
@@ -122,9 +112,9 @@ function processResource(kb, base, flatResource) {
       kb.addStatement(createStatement(kb, id, property, value, base));
     }
   }
-
   return kb;
 }
+
 /**
  * Create statement quad depending on @type being a type node
  * @param kb
@@ -133,11 +123,8 @@ function processResource(kb, base, flatResource) {
  * @param value
  * @return quad statement
  */
-
-
 function createStatement(kb, id, property, value, base) {
   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);
@@ -145,6 +132,5 @@ function createStatement(kb, id, property, value, base) {
     predicate = kb.rdfFactory.namedNode(property);
     object = jsonldObjectToTerm(kb, value);
   }
-
   return kb.rdfFactory.quad(id, predicate, object, kb.rdfFactory.namedNode(base));
 }

package/lib/jsonparser.js

@@ -4,14 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _default = function () {
   return {
     parseJSON: function parseJSON(data, source, store) {
       var subject, predicate, object;
       var bnodes = {};
       var why = store.sym(source);
-
       for (var x in data) {
         if (x.indexOf('_:') === 0) {
           if (bnodes[x]) {
@@ -23,16 +21,12 @@ var _default = function () {
         } else {
           subject = store.sym(x);
         }
-
         var preds = data[x];
-
         for (var y in preds) {
           var objects = preds[y];
           predicate = store.sym(y);
-
           for (var z in objects) {
             var obj = objects[z];
-
             if (obj.type === 'uri') {
               object = store.sym(obj.value);
               store.add(subject, predicate, object, why);
@@ -43,7 +37,6 @@ var _default = function () {
                 object = store.bnode(obj.value);
                 bnodes[obj.value] = object;
               }
-
               store.add(subject, predicate, object, why);
             } else if (obj.type === 'Literal') {
               // var datatype
@@ -54,7 +47,6 @@ var _default = function () {
               } else {
                 object = store.literal(obj.value);
               }
-
               store.add(subject, predicate, object, why);
             } else {
               throw new Error('error: unexpected termtype: ' + z.type);
@@ -65,5 +57,4 @@ var _default = function () {
     }
   };
 }();
-
 exports.default = _default;

package/lib/lists.js

@@ -1,37 +1,28 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.convertFirstRestNil = convertFirstRestNil;
 exports.substituteInDoc = substituteInDoc;
 exports.substituteNillsInDoc = substituteNillsInDoc;
-
 var _collection = _interopRequireDefault(require("./collection"));
-
 var _statement = _interopRequireDefault(require("./statement"));
-
 var _namespace = _interopRequireDefault(require("./namespace"));
-
 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; }
-
+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
 *
 * we do the predicate as well for complenesss though we don't expect Collections to use it
 */
-
 function substituteInDoc(store, x, y, doc) {
   // console.log(`substituteInDoc put ${x} for ${y} in ${doc}}`)
   var _iterator = _createForOfIteratorHelper(store.statementsMatching(y, null, null, doc)),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var quad = _step.value;
@@ -44,15 +35,13 @@ function substituteInDoc(store, x, y, doc) {
   } finally {
     _iterator.f();
   }
-
   var _iterator2 = _createForOfIteratorHelper(store.statementsMatching(null, y, null, doc)),
-      _step2;
-
+    _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _quad = _step2.value;
-      store.remove(_quad); // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
-
+      store.remove(_quad);
+      // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
       store.add(new _statement.default(_quad.subject, x, _quad.object, doc));
     }
   } catch (err) {
@@ -60,10 +49,8 @@ function substituteInDoc(store, x, y, doc) {
   } finally {
     _iterator2.f();
   }
-
   var _iterator3 = _createForOfIteratorHelper(store.statementsMatching(null, null, y, doc)),
-      _step3;
-
+    _step3;
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var _quad2 = _step3.value;
@@ -76,16 +63,13 @@ function substituteInDoc(store, x, y, doc) {
     _iterator3.f();
   }
 }
+
 /* Change all lone rdf:nil nodes into empty Collections
 */
-
-
 function substituteNillsInDoc(store, doc) {
   var x = RDF('nil');
-
   var _iterator4 = _createForOfIteratorHelper(store.statementsMatching(x, null, null, doc)),
-      _step4;
-
+    _step4;
   try {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var quad = _step4.value;
@@ -98,20 +82,15 @@ function substituteNillsInDoc(store, doc) {
   } finally {
     _iterator4.f();
   }
-
   var _iterator5 = _createForOfIteratorHelper(store.statementsMatching(null, null, x, doc)),
-      _step5;
-
+    _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));
       }
     }
@@ -130,7 +109,6 @@ function substituteNillsInDoc(store, doc) {
  * @param doc - The document in which the conversion is done
  */
 
-
 function convertFirstRestNil(store, doc // Do whole store?
 ) {
   function preceding(ele, listSoFar, trash) {
@@ -139,27 +117,24 @@ function convertFirstRestNil(store, doc // Do whole store?
     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)
-
+    var total = [value].concat(listSoFar);
+    // console.log('  List now is: ', total)
     var totalTrash = trash.concat(rests).concat(firsts);
     var pres = store.statementsMatching(null, RDF('rest'), ele, doc);
-
     if (pres.length === 0) {
       // Head of the list
       var newList = new _collection.default(total);
-      store.remove(totalTrash); // Replace old list with new list:
-
+      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: ".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
 
   var tails = store.statementsMatching(null, RDF('rest'), RDF('nil'), doc);