rdflib 2.2.21 → 2.2.22

package/lib/blank-node.js

@@ -1,145 +1,92 @@
 "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");
-
-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; } }
-
 /**
  * An RDF blank node is a Node without a URI
  * @link https://rdf.js.org/data-model-spec/#blanknode-interface
  */
-var BlankNode = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(BlankNode, _Node);
-
-  var _super = _createSuper(BlankNode);
+class BlankNode extends _nodeInternal.default {
+  /**
+   * The next unique identifier for blank nodes
+   */
 
+  static getId(id) {
+    if (id) {
+      if (typeof id !== 'string') {
+        console.log('Bad blank id:', id);
+        throw new Error('Bad id argument to new blank node: ' + id);
+      }
+      if (id.includes('#')) {
+        // Is a URI with hash fragment
+        let fragments = id.split('#');
+        return fragments[fragments.length - 1];
+      }
+      return id;
+    }
+    return 'n' + BlankNode.nextId++;
+  }
   /**
    * Initializes this node
    * @param [id] The identifier for the blank node
    */
-  function BlankNode(id) {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, BlankNode);
-    _this = _super.call(this, BlankNode.getId(id));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.BlankNodeTermType);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "classOrder", _classOrder.default.BlankNode);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isBlank", 1);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVar", 1);
-    return _this;
+  constructor(id) {
+    super(BlankNode.getId(id));
+    (0, _defineProperty2.default)(this, "termType", _types.BlankNodeTermType);
+    (0, _defineProperty2.default)(this, "classOrder", _classOrder.default.BlankNode);
+    (0, _defineProperty2.default)(this, "isBlank", 1);
+    (0, _defineProperty2.default)(this, "isVar", 1);
   }
+
   /**
    * The identifier for the blank node
    */
-
-
-  (0, _createClass2.default)(BlankNode, [{
-    key: "id",
-    get: function get() {
-      return this.value;
-    },
-    set: function set(value) {
-      this.value = value;
-    }
-  }, {
-    key: "compareTerm",
-    value: function compareTerm(other) {
-      if (this.classOrder < other.classOrder) {
-        return -1;
-      }
-
-      if (this.classOrder > other.classOrder) {
-        return +1;
-      }
-
-      if (this.id < other.id) {
-        return -1;
-      }
-
-      if (this.id > other.id) {
-        return +1;
-      }
-
-      return 0;
-    }
-    /**
-     * Gets a copy of this blank node in the specified formula
-     * @param formula The formula
-     */
-
-  }, {
-    key: "copy",
-    value: function copy(formula) {
-      // depends on the formula
-      var bnodeNew = new BlankNode();
-      formula.copyTo(this, bnodeNew);
-      return bnodeNew;
+  get id() {
+    return this.value;
+  }
+  set id(value) {
+    this.value = value;
+  }
+  compareTerm(other) {
+    if (this.classOrder < other.classOrder) {
+      return -1;
     }
-  }, {
-    key: "toCanonical",
-    value: function toCanonical() {
-      return BlankNode.NTAnonymousNodePrefix + this.value;
+    if (this.classOrder > other.classOrder) {
+      return +1;
     }
-  }, {
-    key: "toString",
-    value: function toString() {
-      return BlankNode.NTAnonymousNodePrefix + this.id;
+    if (this.id < other.id) {
+      return -1;
     }
-  }], [{
-    key: "getId",
-    value:
-    /**
-     * The next unique identifier for blank nodes
-     */
-    function getId(id) {
-      if (id) {
-        if (typeof id !== 'string') {
-          console.log('Bad blank id:', id);
-          throw new Error('Bad id argument to new blank node: ' + id);
-        }
-
-        if (id.includes('#')) {
-          // Is a URI with hash fragment
-          var fragments = id.split('#');
-          return fragments[fragments.length - 1];
-        }
-
-        return id;
-      }
-
-      return 'n' + BlankNode.nextId++;
+    if (this.id > other.id) {
+      return +1;
     }
-  }]);
-  return BlankNode;
-}(_nodeInternal.default);
+    return 0;
+  }
 
+  /**
+   * Gets a copy of this blank node in the specified formula
+   * @param formula The formula
+   */
+  copy(formula) {
+    // depends on the formula
+    var bnodeNew = new BlankNode();
+    formula.copyTo(this, bnodeNew);
+    return bnodeNew;
+  }
+  toCanonical() {
+    return BlankNode.NTAnonymousNodePrefix + this.value;
+  }
+  toString() {
+    return BlankNode.NTAnonymousNodePrefix + this.id;
+  }
+}
 exports.default = BlankNode;
 (0, _defineProperty2.default)(BlankNode, "nextId", 0);
 (0, _defineProperty2.default)(BlankNode, "NTAnonymousNodePrefix", '_:');

package/lib/class-order.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /**
 * Class orders
 */
-var ClassOrder = {
+const ClassOrder = {
   'Literal': 1,
   'Collection': 3,
   'Graph': 4,

package/lib/collection.js

@@ -1,43 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 exports.fromValue = fromValue;
-
-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 _blankNode = _interopRequireDefault(require("./blank-node"));
-
 var _classOrder = _interopRequireDefault(require("./class-order"));
-
 var _literal = _interopRequireDefault(require("./literal"));
-
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _types = require("./types");
-
 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; } }
-
 /**
  * Creates an RDF Node from a native javascript value.
  * RDF Nodes are returned unchanged, undefined returned as itself.
@@ -50,139 +25,102 @@ function fromValue(value) {
   if (typeof value === 'undefined' || value === null) {
     return value;
   }
-
   if ((0, _terms.isTerm)(value)) {
     // a Node subclass or a Collection
     return value;
   }
-
   if (Array.isArray(value)) {
     return new Collection(value);
   }
-
   return _literal.default.fromValue(value);
 }
+
 /**
  * A collection of other RDF nodes
  *
  * Use generic T to control the contents of the array.
  */
-
-
-var Collection = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(Collection, _Node);
-
-  var _super = _createSuper(Collection);
-
+class Collection extends _nodeInternal.default {
   /**
    * The nodes in this collection
    */
-  function Collection(initial) {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, Collection);
-    _this = _super.call(this, (_blankNode.default.nextId++).toString());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.CollectionTermType);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "classOrder", _classOrder.default.Collection);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "closed", false);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "compareTerm", _blankNode.default.prototype.compareTerm);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "elements", []);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVar", 0);
 
+  constructor(initial) {
+    super((_blankNode.default.nextId++).toString());
+    (0, _defineProperty2.default)(this, "termType", _types.CollectionTermType);
+    (0, _defineProperty2.default)(this, "classOrder", _classOrder.default.Collection);
+    (0, _defineProperty2.default)(this, "closed", false);
+    (0, _defineProperty2.default)(this, "compareTerm", _blankNode.default.prototype.compareTerm);
+    (0, _defineProperty2.default)(this, "elements", []);
+    (0, _defineProperty2.default)(this, "isVar", 0);
     if (initial && initial.length > 0) {
-      initial.forEach(function (element) {
-        _this.elements.push(fromValue(element));
+      initial.forEach(element => {
+        this.elements.push(fromValue(element));
       });
     }
-
-    return _this;
+  }
+  get id() {
+    return this.value;
+  }
+  set id(value) {
+    this.value = value;
   }
 
-  (0, _createClass2.default)(Collection, [{
-    key: "id",
-    get: function get() {
-      return this.value;
-    },
-    set: function set(value) {
-      this.value = value;
-    }
-    /**
-     * Appends an element to this collection
-     * @param element - The new element
-     */
-
-  }, {
-    key: "append",
-    value: function append(element) {
-      return this.elements.push(element);
-    }
-    /**
-     * Closes this collection
-     */
+  /**
+   * Appends an element to this collection
+   * @param element - The new element
+   */
+  append(element) {
+    return this.elements.push(element);
+  }
 
-  }, {
-    key: "close",
-    value: function close() {
-      this.closed = true;
-      return this.closed;
-    }
-    /**
-     * Removes the first element from the collection (and return it)
-     */
+  /**
+   * Closes this collection
+   */
+  close() {
+    this.closed = true;
+    return this.closed;
+  }
 
-  }, {
-    key: "shift",
-    value: function shift() {
-      return this.elements.shift();
-    }
-    /**
-     * Creates a new Collection with the substituting bindings applied
-     * @param bindings - The bindings to substitute
-     */
+  /**
+   * Removes the first element from the collection (and return it)
+   */
+  shift() {
+    return this.elements.shift();
+  }
 
-  }, {
-    key: "substitute",
-    value: function substitute(bindings) {
-      var elementsCopy = this.elements.map(function (ea) {
-        return ea.substitute(bindings);
-      });
-      return new Collection(elementsCopy);
-    }
-  }, {
-    key: "toNT",
-    value: function toNT() {
-      return Collection.toNT(this);
-    }
-  }, {
-    key: "toString",
-    value:
-    /**
-     * Serializes the collection to a string.
-     * Surrounded by (parentheses) and separated by spaces.
-     */
-    function toString() {
-      return '(' + this.elements.join(' ') + ')';
-    }
-    /**
-     * Prepends the specified element to the collection's front
-     * @param element - The element to prepend
-     */
+  /**
+   * Creates a new Collection with the substituting bindings applied
+   * @param bindings - The bindings to substitute
+   */
+  substitute(bindings) {
+    const elementsCopy = this.elements.map(ea => ea.substitute(bindings));
+    return new Collection(elementsCopy);
+  }
+  toNT() {
+    return Collection.toNT(this);
+  }
+  static toNT(collection) {
+    // return '(' + collection.elements.map(x => x.toNT()).join(' ') + ')'
+    // As lists are not in NT and toNT() must be a reversible function, we kludge it for a list
+    return _blankNode.default.NTAnonymousNodePrefix + collection.id;
+  }
 
-  }, {
-    key: "unshift",
-    value: function unshift(element) {
-      return this.elements.unshift(element);
-    }
-  }], [{
-    key: "toNT",
-    value: function toNT(collection) {
-      // return '(' + collection.elements.map(x => x.toNT()).join(' ') + ')'
-      // As lists are not in NT and toNT() must be a reversible function, we kludge it for a list
-      return _blankNode.default.NTAnonymousNodePrefix + collection.id;
-    }
-  }]);
-  return Collection;
-}(_nodeInternal.default);
+  /**
+   * Serializes the collection to a string.
+   * Surrounded by (parentheses) and separated by spaces.
+   */
+  toString() {
+    return '(' + this.elements.join(' ') + ')';
+  }
 
+  /**
+   * Prepends the specified element to the collection's front
+   * @param element - The element to prepend
+   */
+  unshift(element) {
+    return this.elements.unshift(element);
+  }
+}
 exports.default = Collection;
 (0, _defineProperty2.default)(Collection, "termType", _types.CollectionTermType);

package/lib/convert.js

@@ -1,28 +1,24 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.convertToJson = convertToJson;
 exports.convertToNQuads = convertToNQuads;
-
 var _async = _interopRequireDefault(require("async"));
-
 var _jsonld = _interopRequireDefault(require("jsonld"));
-
 var _n = require("n3");
-
 // @@ Goal: remove this dependency
+
 // @@ Goal: remove this dependency
+
 function convertToJson(n3String, jsonCallback) {
   var jsonString;
   var n3Parser = new _n.Parser();
   var n3Writer = new _n.Writer({
     format: 'N-Quads'
   });
-
   _async.default.waterfall([function (callback) {
     n3Parser.parse(n3String, function (error, quad, prefixes) {
       if (error) {
@@ -37,7 +33,7 @@ function convertToJson(n3String, jsonCallback) {
     try {
       _jsonld.default.fromRDF(result, {
         format: 'application/nquads'
-      }).then(function (result) {
+      }).then(result => {
         callback(null, result);
       });
     } catch (err) {
@@ -50,14 +46,12 @@ function convertToJson(n3String, jsonCallback) {
     jsonCallback(err, jsonString);
   });
 }
-
 function convertToNQuads(n3String, nquadCallback) {
   var nquadString;
   var n3Parser = new _n.Parser();
   var n3Writer = new _n.Writer({
     format: 'N-Quads'
   });
-
   _async.default.waterfall([function (callback) {
     n3Parser.parse(n3String, function (error, triple, prefixes) {
       if (error) {

package/lib/default-graph.js

@@ -1,70 +1,31 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 exports.isDefaultGraph = isDefaultGraph;
-
-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 _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _types = require("./types");
-
 var _defaultGraphUri = require("./utils/default-graph-uri");
-
-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; } }
-
 /** The RDF default graph */
-var DefaultGraph = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(DefaultGraph, _Node);
-
-  var _super = _createSuper(DefaultGraph);
-
-  function DefaultGraph() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, DefaultGraph);
-    _this = _super.call(this, '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "value", '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.DefaultGraphTermType);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "uri", _defaultGraphUri.defaultGraphURI);
-    return _this;
+class DefaultGraph extends _nodeInternal.default {
+  constructor() {
+    super('');
+    (0, _defineProperty2.default)(this, "value", '');
+    (0, _defineProperty2.default)(this, "termType", _types.DefaultGraphTermType);
+    (0, _defineProperty2.default)(this, "uri", _defaultGraphUri.defaultGraphURI);
   }
-
-  (0, _createClass2.default)(DefaultGraph, [{
-    key: "toCanonical",
-    value: function toCanonical() {
-      return this.value;
-    }
-  }, {
-    key: "toString",
-    value: function toString() {
-      return 'DefaultGraph';
-    }
-  }]);
-  return DefaultGraph;
-}(_nodeInternal.default);
-
+  toCanonical() {
+    return this.value;
+  }
+  toString() {
+    return 'DefaultGraph';
+  }
+}
 exports.default = DefaultGraph;
-
 function isDefaultGraph(object) {
   return !!object && object.termType === _types.DefaultGraphTermType;
 }

package/lib/empty.js

@@ -1,58 +1,23 @@
 "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 _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _types = require("./types");
-
-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; } }
-
 /**
 * An empty node
 */
-var Empty = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(Empty, _Node);
-
-  var _super = _createSuper(Empty);
-
-  function Empty() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, Empty);
-    _this = _super.call(this, '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.EmptyTermType);
-    return _this;
+class Empty extends _nodeInternal.default {
+  constructor() {
+    super('');
+    (0, _defineProperty2.default)(this, "termType", _types.EmptyTermType);
   }
-
-  (0, _createClass2.default)(Empty, [{
-    key: "toString",
-    value: function toString() {
-      return '()';
-    }
-  }]);
-  return Empty;
-}(_nodeInternal.default);
-
+  toString() {
+    return '()';
+  }
+}
 exports.default = Empty;