rdflib 2.2.20 → 2.2.21-23b2ead1

package/esm/index.js

@@ -1,18 +1,6 @@
-import _createClass from "@babel/runtime/helpers/createClass";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-
 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';
@@ -40,77 +28,52 @@ import { UpdatesVia } from './updates-via';
 import * as uri from './uri';
 import * as Util from './utils-js';
 import Variable from './variable';
-import DataFactory from './factories/rdflib-data-factory'; // Prepare bound versions of data factory methods for export
+import DataFactory from './factories/rdflib-data-factory';
 
-var boundDataFactory = {};
-
-for (var name in DataFactory) {
+// Prepare bound versions of data factory methods for export
+const boundDataFactory = {};
+for (const name in DataFactory) {
   if (typeof DataFactory[name] === 'function') boundDataFactory[name] = DataFactory[name].bind(DataFactory);
 }
-
-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;
-var formula = new Formula();
-
-var fromNT = function fromNT(str) {
-  return formula.fromNT(str);
-};
-
-var term = Node.fromValue; // TODO: this export is broken;
+const {
+  fetcher,
+  graph,
+  lit,
+  st,
+  namedNode,
+  variable,
+  blankNode,
+  defaultGraph,
+  literal,
+  quad,
+  triple
+} = boundDataFactory;
+const formula = new Formula();
+const fromNT = str => formula.fromNT(str);
+const term = Node.fromValue;
+
+// TODO: this export is broken;
 // it exports the _current_ value of nextId, which is always 0
-
-var NextId = BlankNode.nextId;
+const NextId = BlankNode.nextId;
 export * from './utils/terms';
-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
-NextId, fromNT, fetcher, graph, lit, st, namedNode as sym, // RDFJS DataFactory interface
+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,
+// RDFJS DataFactory interface
 blankNode, defaultGraph, literal, namedNode, quad, triple, variable };
 export { termValue } from './utils/termValue';
-export var ConnectedStore = /*#__PURE__*/function (_Store) {
-  _inherits(ConnectedStore, _Store);
-
-  var _super = _createSuper(ConnectedStore);
-
-  function ConnectedStore(features) {
-    var _this;
-
-    _classCallCheck(this, ConnectedStore);
-
-    _this = _super.call(this, features);
-
-    _defineProperty(_assertThisInitialized(_this), "fetcher", void 0);
-
-    _this.fetcher = new Fetcher(_assertThisInitialized(_this), {});
-    return _this;
+export class ConnectedStore extends Store {
+  constructor(features) {
+    super(features);
+    _defineProperty(this, "fetcher", void 0);
+    this.fetcher = new Fetcher(this, {});
   }
-
-  return _createClass(ConnectedStore);
-}(Store);
-export var LiveStore = /*#__PURE__*/function (_ConnectedStore) {
-  _inherits(LiveStore, _ConnectedStore);
-
-  var _super2 = _createSuper(LiveStore);
-
-  function LiveStore(features) {
-    var _this2;
-
-    _classCallCheck(this, LiveStore);
-
-    _this2 = _super2.call(this, features);
-
-    _defineProperty(_assertThisInitialized(_this2), "updater", void 0);
-
-    _this2.updater = new UpdateManager(_assertThisInitialized(_this2));
-    return _this2;
+}
+export class LiveStore extends ConnectedStore {
+  constructor(features) {
+    super(features);
+    _defineProperty(this, "updater", void 0);
+    this.updater = new UpdateManager(this);
   }
-
-  return _createClass(LiveStore);
-}(ConnectedStore);
+}

package/esm/jsonldparser.js

@@ -1,118 +1,106 @@
 import jsonld from 'jsonld';
 import { arrayToStatements } from './utils';
+
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
  * @param kb - The DataFactory to use.
  * @param obj - The json-ld object to process.
  * @return {Literal|NamedNode|BlankNode|Collection}
  */
-
 export 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 items = obj['@list'].map(function (listItem) {
-    return jsonldObjectToTerm(kb, listItem);
-  });
-  var statements = arrayToStatements(kb.rdfFactory, listId, items);
+  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode();
+  const items = obj['@list'].map(listItem => jsonldObjectToTerm(kb, listItem));
+  const statements = arrayToStatements(kb.rdfFactory, listId, items);
   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);
-  }));
+  return kb.rdfFactory.collection(obj.map(o => jsonldObjectToTerm(kb, o)));
 }
+
 /**
  * Takes a json-ld formatted string {str} and adds its statements to {kb}.
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-
-
 export default function jsonldParser(str, kb, base, callback) {
-  var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
+  const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return jsonld.flatten(JSON.parse(str), null, {
     base: baseString
-  }).then(function (flattened) {
-    return flattened.reduce(function (store, flatResource) {
-      kb = processResource(kb, base, flatResource);
-      return kb;
-    }, kb);
-  }).then(callback).catch(callback);
+  }).then(flattened => flattened.reduce((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 _:
+    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();
-
-  for (var _i = 0, _Object$keys = Object.keys(flatResource); _i < _Object$keys.length; _i++) {
-    var property = _Object$keys[_i];
-
+  const id = flatResource['@id'] ? nodeType(kb, flatResource) : kb.rdfFactory.blankNode();
+  for (const property of Object.keys(flatResource)) {
     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.
+      const graphId = id;
+      // this is an array of resources
+      const nestedFlatResources = flatResource[property];
 
-      for (var i = 0; i < nestedFlatResources.length; i++) {
+      // recursively process all flat resources in the array, but with the graphId as base.
+      for (let i = 0; i < nestedFlatResources.length; i++) {
         kb = processResource(kb, graphId, nestedFlatResources[i]);
       }
     }
-
-    var value = flatResource[property];
-
+    const value = flatResource[property];
     if (Array.isArray(value)) {
-      for (var _i2 = 0; _i2 < value.length; _i2++) {
-        kb.addStatement(createStatement(kb, id, property, value[_i2], base));
+      for (let i = 0; i < value.length; i++) {
+        kb.addStatement(createStatement(kb, id, property, value[i], base));
       }
     } else {
       kb.addStatement(createStatement(kb, id, property, value, base));
     }
   }
-
   return kb;
 }
+
 /**
  * Create statement quad depending on @type being a type node
  * @param kb
@@ -121,11 +109,8 @@ function processResource(kb, base, flatResource) {
  * @param value
  * @return quad statement
  */
-
-
 function createStatement(kb, id, property, value, base) {
-  var predicate, object;
-
+  let 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);
@@ -133,6 +118,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/esm/jsonparser.js

@@ -1,10 +1,9 @@
 export default (function () {
   return {
-    parseJSON: function parseJSON(data, source, store) {
+    parseJSON: function (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]) {
@@ -16,16 +15,12 @@ export 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);
@@ -36,7 +31,6 @@ export default (function () {
                 object = store.bnode(obj.value);
                 bnodes[obj.value] = object;
               }
-
               store.add(subject, predicate, object, why);
             } else if (obj.type === 'Literal') {
               // var datatype
@@ -47,7 +41,6 @@ export default (function () {
               } else {
                 object = store.literal(obj.value);
               }
-
               store.add(subject, predicate, object, why);
             } else {
               throw new Error('error: unexpected termtype: ' + z.type);

package/esm/lists.js

@@ -0,0 +1,105 @@
+/* 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'
+import Collection from './collection';
+import Statement from './statement';
+// import Formula from './formula'
+
+import Namespace from './namespace';
+const RDF = Namespace('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
+*/
+export 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(x, quad.predicate, quad.object, doc);
+    store.remove(quad);
+    store.add(newStatement);
+  }
+  for (const quad of store.statementsMatching(null, y, null, doc)) {
+    store.remove(quad);
+    // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
+    store.add(new Statement(quad.subject, x, quad.object, doc));
+  }
+  for (const quad of store.statementsMatching(null, null, y, doc)) {
+    store.remove(quad);
+    store.add(new Statement(quad.subject, quad.predicate, x, doc));
+  }
+}
+
+/* Change all lone rdf:nil nodes into empty Collections
+*/
+export 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();
+    store.add(new Statement(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
+      store.remove(quad);
+      const y = new Collection();
+      store.add(new Statement(quad.subject, quad.predicate, y, doc));
+    }
+  }
+}
+/**
+ * Convert lists reified as rdf:first, rest
+ * Normal method is sync.
+ * Unfortunately jsdonld is currently written to need to be called async.
+ * Hence the mess below with executeCallback.
+ * @param store - The quadstore
+ * @param doc - The document in which the conversion is done
+ */
+
+export 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);
+    // console.log('  List now is: ', total)
+    const totalTrash = trash.concat(rests).concat(firsts);
+    const pres = store.statementsMatching(null, RDF('rest'), ele, doc);
+    if (pres.length === 0) {
+      // Head of the list
+      const newList = new Collection(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} `);
+    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} `);
+    preceding(tail.subject, [], []);
+  });
+}