rdflib 2.2.21 → 2.2.22-b51259b5

package/lib/named-node.js

@@ -1,169 +1,112 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-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 _classOrder = _interopRequireDefault(require("./class-order"));
-
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _types = require("./types");
-
 var _termValue = require("./utils/termValue");
-
 var _terms = require("./utils/terms");
-
-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; } }
-
 /**
  * A named (IRI) RDF node
  */
-var NamedNode = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(NamedNode, _Node);
-
-  var _super = _createSuper(NamedNode);
-
+class NamedNode extends _nodeInternal.default {
   /**
    * Create a named (IRI) RDF Node
    * @constructor
    * @param iri - The IRI for this node
    */
-  function NamedNode(iri) {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, NamedNode);
-    _this = _super.call(this, (0, _termValue.termValue)(iri));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.NamedNodeTermType);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "classOrder", _classOrder.default.NamedNode);
-
-    if (!_this.value) {
+  constructor(iri) {
+    super((0, _termValue.termValue)(iri));
+    (0, _defineProperty2.default)(this, "termType", _types.NamedNodeTermType);
+    (0, _defineProperty2.default)(this, "classOrder", _classOrder.default.NamedNode);
+    if (!this.value) {
       throw new Error('Missing IRI for NamedNode');
     }
-
-    if (!_this.value.includes(':')) {
+    if (!this.value.includes(':')) {
       throw new Error('NamedNode IRI "' + iri + '" must be absolute.');
     }
-
-    if (_this.value.includes(' ')) {
+    if (this.value.includes(' ')) {
       var message = 'Error: NamedNode IRI "' + iri + '" must not contain unencoded spaces.';
       throw new Error(message);
     }
-
-    return _this;
   }
+
   /**
    * Returns an $rdf node for the containing directory, ending in slash.
    */
+  dir() {
+    var str = this.value.split('#')[0];
+    var p = str.slice(0, -1).lastIndexOf('/');
+    var q = str.indexOf('//');
+    if (q >= 0 && p < q + 2 || p < 0) return null;
+    return new NamedNode(str.slice(0, p + 1));
+  }
 
-
-  (0, _createClass2.default)(NamedNode, [{
-    key: "dir",
-    value: function dir() {
-      var str = this.value.split('#')[0];
-      var p = str.slice(0, -1).lastIndexOf('/');
-      var q = str.indexOf('//');
-      if (q >= 0 && p < q + 2 || p < 0) return null;
-      return new NamedNode(str.slice(0, p + 1));
+  /**
+   * Returns an NN for the whole web site, ending in slash.
+   * Contrast with the "origin" which does NOT have a trailing slash
+   */
+  site() {
+    var str = this.value.split('#')[0];
+    var p = str.indexOf('//');
+    if (p < 0) throw new Error('This URI does not have a web site part (origin)');
+    var q = str.indexOf('/', p + 2);
+    if (q < 0) {
+      return new NamedNode(str.slice(0) + '/'); // Add slash to a bare origin
+    } else {
+      return new NamedNode(str.slice(0, q + 1));
     }
-    /**
-     * Returns an NN for the whole web site, ending in slash.
-     * Contrast with the "origin" which does NOT have a trailing slash
-     */
-
-  }, {
-    key: "site",
-    value: function site() {
-      var str = this.value.split('#')[0];
-      var p = str.indexOf('//');
-      if (p < 0) throw new Error('This URI does not have a web site part (origin)');
-      var q = str.indexOf('/', p + 2);
+  }
 
-      if (q < 0) {
-        return new NamedNode(str.slice(0) + '/'); // Add slash to a bare origin
-      } else {
-        return new NamedNode(str.slice(0, q + 1));
-      }
+  /**
+   * Creates the fetchable named node for the document.
+   * Removes everything from the # anchor tag.
+   */
+  doc() {
+    if (this.value.indexOf('#') < 0) {
+      return this;
+    } else {
+      return new NamedNode(this.value.split('#')[0]);
     }
-    /**
-     * Creates the fetchable named node for the document.
-     * Removes everything from the # anchor tag.
-     */
+  }
 
-  }, {
-    key: "doc",
-    value: function doc() {
-      if (this.value.indexOf('#') < 0) {
-        return this;
-      } else {
-        return new NamedNode(this.value.split('#')[0]);
-      }
-    }
-    /**
-     * Returns the URI including <brackets>
-     */
+  /**
+   * Returns the URI including <brackets>
+   */
+  toString() {
+    return '<' + this.value + '>';
+  }
 
-  }, {
-    key: "toString",
-    value: function toString() {
-      return '<' + this.value + '>';
-    }
-    /** The local identifier with the document */
+  /** The local identifier with the document */
+  id() {
+    return this.value.split('#')[1];
+  }
 
-  }, {
-    key: "id",
-    value: function id() {
-      return this.value.split('#')[1];
-    }
-    /** Alias for value, favored by Tim */
+  /** Alias for value, favored by Tim */
+  get uri() {
+    return this.value;
+  }
+  set uri(uri) {
+    this.value = uri;
+  }
 
-  }, {
-    key: "uri",
-    get: function get() {
-      return this.value;
-    },
-    set: function set(uri) {
-      this.value = uri;
+  /**
+   * Creates a named node from the specified input value
+   * @param value - An input value
+   */
+  static fromValue(value) {
+    if (typeof value === 'undefined' || value === null) {
+      return value;
     }
-    /**
-     * Creates a named node from the specified input value
-     * @param value - An input value
-     */
-
-  }], [{
-    key: "fromValue",
-    value: function fromValue(value) {
-      if (typeof value === 'undefined' || value === null) {
-        return value;
-      }
-
-      if ((0, _terms.isTerm)(value)) {
-        return value;
-      }
-
-      return new NamedNode(value);
+    if ((0, _terms.isTerm)(value)) {
+      return value;
     }
-  }]);
-  return NamedNode;
-}(_nodeInternal.default);
-
+    return new NamedNode(value);
+  }
+}
 exports.default = NamedNode;

package/lib/namespace.js

@@ -1,24 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Namespace;
-
 var _namedNode = _interopRequireDefault(require("./named-node"));
-
 /**
  * Gets a namespace for the specified namespace's URI
  * @param nsuri - The URI for the namespace
  * @param [factory] - The factory for creating named nodes with
  */
 function Namespace(nsuri, factory) {
-  var dataFactory = factory || {
-    namedNode: function namedNode(value) {
-      return new _namedNode.default(value);
-    }
+  const dataFactory = factory || {
+    namedNode: value => new _namedNode.default(value)
   };
   return function (ln) {
     return dataFactory.namedNode(nsuri + (ln || ''));

package/lib/node-internal.js

@@ -1,18 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 /**
  * The superclass of all RDF Statement objects, that is
  * NamedNode, Literal, BlankNode, etc.
@@ -21,8 +14,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
  * @link https://rdf.js.org/data-model-spec/#term-interface
  * @class Node
  */
-var Node = /*#__PURE__*/function () {
+class Node {
   // Specified in './node.ts' to prevent circular dependency
+
   // Specified in './node.ts' to prevent circular dependency
 
   /** The type of node */
@@ -30,126 +24,99 @@ var Node = /*#__PURE__*/function () {
   /** The class order for this node */
 
   /** The node's value */
-  function Node(value) {
-    (0, _classCallCheck2.default)(this, Node);
+
+  constructor(value) {
     (0, _defineProperty2.default)(this, "termType", void 0);
     (0, _defineProperty2.default)(this, "classOrder", void 0);
     (0, _defineProperty2.default)(this, "value", void 0);
     this.value = value;
   }
+
   /**
    * Creates the substituted node for this one, according to the specified bindings
    * @param bindings - Bindings of identifiers to nodes
    */
+  substitute(bindings) {
+    console.log('@@@ node substitute' + this);
+    return this;
+  }
 
-
-  (0, _createClass2.default)(Node, [{
-    key: "substitute",
-    value: function substitute(bindings) {
-      console.log('@@@ node substitute' + this);
-      return this;
+  /**
+   * Compares this node with another
+   * @see {equals} to check if two nodes are equal
+   * @param other - The other node
+   */
+  compareTerm(other) {
+    if (this.classOrder < other.classOrder) {
+      return -1;
     }
-    /**
-     * Compares this node with another
-     * @see {equals} to check if two nodes are equal
-     * @param other - The other node
-     */
-
-  }, {
-    key: "compareTerm",
-    value: function compareTerm(other) {
-      if (this.classOrder < other.classOrder) {
-        return -1;
-      }
-
-      if (this.classOrder > other.classOrder) {
-        return +1;
-      }
-
-      if (this.value < other.value) {
-        return -1;
-      }
-
-      if (this.value > other.value) {
-        return +1;
-      }
-
-      return 0;
+    if (this.classOrder > other.classOrder) {
+      return +1;
     }
-    /**
-     * Compares whether the two nodes are equal
-     * @param other The other node
-     */
-
-  }, {
-    key: "equals",
-    value: function equals(other) {
-      if (!other) {
-        return false;
-      }
-
-      return this.termType === other.termType && this.value === other.value;
+    if (this.value < other.value) {
+      return -1;
     }
-    /**
-     * Creates a hash for this node
-     * @deprecated use {rdfFactory.id} instead if possible
-     */
-
-  }, {
-    key: "hashString",
-    value: function hashString() {
-      return this.toCanonical();
+    if (this.value > other.value) {
+      return +1;
     }
-    /**
-     * Compares whether this node is the same as the other one
-     * @param other - Another node
-     */
+    return 0;
+  }
 
-  }, {
-    key: "sameTerm",
-    value: function sameTerm(other) {
-      return this.equals(other);
+  /**
+   * Compares whether the two nodes are equal
+   * @param other The other node
+   */
+  equals(other) {
+    if (!other) {
+      return false;
     }
-    /**
-     * Creates a canonical string representation of this node
-     */
+    return this.termType === other.termType && this.value === other.value;
+  }
 
-  }, {
-    key: "toCanonical",
-    value: function toCanonical() {
-      return this.toNT();
-    }
-    /**
-     * Creates a n-triples string representation of this node
-     */
+  /**
+   * Creates a hash for this node
+   * @deprecated use {rdfFactory.id} instead if possible
+   */
+  hashString() {
+    return this.toCanonical();
+  }
 
-  }, {
-    key: "toNT",
-    value: function toNT() {
-      return this.toString();
-    }
-    /**
-     * Creates a n-quads string representation of this node
-     */
+  /**
+   * Compares whether this node is the same as the other one
+   * @param other - Another node
+   */
+  sameTerm(other) {
+    return this.equals(other);
+  }
 
-  }, {
-    key: "toNQ",
-    value: function toNQ() {
-      return this.toNT();
-    }
-    /**
-     * Creates a string representation of this node
-     */
+  /**
+   * Creates a canonical string representation of this node
+   */
+  toCanonical() {
+    return this.toNT();
+  }
 
-  }, {
-    key: "toString",
-    value: function toString() {
-      throw new Error('Node.toString() is abstract - see the subclasses instead');
-    }
-  }]);
-  return Node;
-}();
+  /**
+   * Creates a n-triples string representation of this node
+   */
+  toNT() {
+    return this.toString();
+  }
 
+  /**
+   * Creates a n-quads string representation of this node
+   */
+  toNQ() {
+    return this.toNT();
+  }
+
+  /**
+   * Creates a string representation of this node
+   */
+  toString() {
+    throw new Error('Node.toString() is abstract - see the subclasses instead');
+  }
+}
 exports.default = Node;
 (0, _defineProperty2.default)(Node, "fromValue", void 0);
 (0, _defineProperty2.default)(Node, "toJS", void 0);

package/lib/node.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _collection = require("./collection");
-
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _namespace = _interopRequireDefault(require("./namespace"));
-
 var _terms = require("./utils/terms");
-
 // This file attaches all functionality to Node
 // that would otherwise require circular dependencies.
 
@@ -29,32 +23,28 @@ var _terms = require("./utils/terms");
 _nodeInternal.default.fromValue = _collection.fromValue;
 var _default = _nodeInternal.default;
 exports.default = _default;
-var ns = {
+const ns = {
   xsd: (0, _namespace.default)('http://www.w3.org/2001/XMLSchema#')
 };
+
 /**
  * Gets the javascript object equivalent to a node
  * @param term The RDF node
  */
-
 _nodeInternal.default.toJS = function (term) {
   if ((0, _terms.isCollection)(term)) {
     return term.elements.map(_nodeInternal.default.toJS); // Array node (not standard RDFJS)
   }
 
   if (!(0, _terms.isLiteral)(term)) return term;
-
   if (term.datatype.equals(ns.xsd('boolean'))) {
     return term.value === '1' || term.value === 'true';
   }
-
   if (term.datatype.equals(ns.xsd('dateTime')) || term.datatype.equals(ns.xsd('date'))) {
     return new Date(term.value);
   }
-
   if (term.datatype.equals(ns.xsd('integer')) || term.datatype.equals(ns.xsd('float')) || term.datatype.equals(ns.xsd('decimal'))) {
     return Number(term.value);
   }
-
   return term.value;
 };

package/lib/parse.d.ts

@@ -1,6 +1,6 @@
 import Formula from './formula';
 import { ContentType } from './types';
-declare type CallbackFunc = (error: any, kb: Formula | null) => void;
+type CallbackFunc = (error: any, kb: Formula | null) => void;
 /**
  * Parse a string and put the result into the graph kb.
  * Normal method is sync.

package/lib/parse.js

@@ -1,36 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = parse;
-
 var _extendedTermFactory = _interopRequireDefault(require("./factories/extended-term-factory"));
-
 var _jsonldparser = _interopRequireDefault(require("./jsonldparser"));
-
 var _n = require("n3");
-
 var _n3parser = _interopRequireDefault(require("./n3parser"));
-
 var _rdfaparser = require("./rdfaparser");
-
 var _rdfxmlparser = _interopRequireDefault(require("./rdfxmlparser"));
-
 var _patchParser = _interopRequireDefault(require("./patch-parser"));
-
 var Util = _interopRequireWildcard(require("./utils-js"));
-
 var _types = require("./types");
-
-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 _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; }
 // @ts-ignore is this injected?
 // @@ Goal: remove this dependency
 
@@ -46,11 +31,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @param [callback] - The callback to call when the data has been loaded
  */
 function parse(str, kb, base) {
-  var contentType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'text/turtle';
-  var callback = arguments.length > 4 ? arguments[4] : undefined;
+  let contentType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'text/turtle';
+  let callback = arguments.length > 4 ? arguments[4] : undefined;
   contentType = contentType || _types.TurtleContentType;
   contentType = contentType.split(';')[0];
-
   try {
     if (contentType === _types.N3ContentType || contentType === _types.TurtleContentType) {
       var p = (0, _n3parser.default)(kb, kb, base, base, null, null, '', null);
@@ -90,7 +74,6 @@ function parse(str, kb, base) {
     // @ts-ignore
     executeErrorCallback(e);
   }
-
   parse.handled = {
     'text/n3': true,
     'text/turtle': true,
@@ -103,7 +86,6 @@ function parse(str, kb, base) {
     'application/nquads': true,
     'application/n-quads': true
   };
-
   function executeCallback() {
     if (callback) {
       callback(null, kb);
@@ -111,17 +93,19 @@ function parse(str, kb, base) {
       return;
     }
   }
-
   function executeErrorCallback(e) {
-    if ( // TODO: Always true, what is the right behavior
-    contentType !== _types.JSONLDContentType || // @ts-ignore always true?
-    contentType !== _types.NQuadsContentType || // @ts-ignore always true?
+    if (
+    // TODO: Always true, what is the right behavior
+    contentType !== _types.JSONLDContentType ||
+    // @ts-ignore always true?
+    contentType !== _types.NQuadsContentType ||
+    // @ts-ignore always true?
     contentType !== _types.NQuadsAltContentType) {
       if (callback) {
         callback(e, kb);
       } else {
-        var e2 = new Error('' + e + ' while trying to parse <' + base + '> as ' + contentType); //@ts-ignore .cause is not a default error property
-
+        let e2 = new Error('' + e + ' while trying to parse <' + base + '> as ' + contentType);
+        //@ts-ignore .cause is not a default error property
         e2.cause = e;
         throw e2;
       }
@@ -138,20 +122,16 @@ function parse(str, kb, base) {
       doc['@context']['@base'] = base
     }
   */
-
-
   function nquadCallback(err, nquads) {
     if (err) {
       callback(err, kb);
     }
-
     try {
       n3Parser.parse(nquads, tripleCallback);
     } catch (err) {
       callback(err, kb);
     }
   }
-
   function tripleCallback(err, triple) {
     if (triple) {
       kb.add(triple.subject, triple.predicate, triple.object, triple.graph);