rdflib 2.2.21 → 2.2.22-0de51c50

package/esm/utils-js.js

@@ -12,12 +12,12 @@ var string = {
 export { log, uri, string };
 export function mediaTypeClass(mediaType) {
   mediaType = mediaType.split(';')[0].trim(); // remove media type parameters
-
   return new NamedNode('http://www.w3.org/ns/iana/media-types/' + mediaType + '#Resource');
 }
 export function linkRelationProperty(relation) {
   return new NamedNode('http://www.w3.org/ns/iana/link-relations/relation#' + relation.trim());
 }
+
 /**
  * Adds callback functionality to an object.
  * Callback functions are indexed by a 'hook' string.
@@ -26,24 +26,19 @@ export function linkRelationProperty(relation) {
  * @param obj {Object}
  * @param callbacks {Array<string>}
  */
-
 export function callbackify(obj, callbacks) {
   obj.callbacks = {};
-
   for (var x = callbacks.length - 1; x >= 0; x--) {
     obj.callbacks[callbacks[x]] = [];
   }
-
   obj.addHook = function (hook) {
     if (!obj.callbacks[hook]) {
       obj.callbacks[hook] = [];
     }
   };
-
   obj.addCallback = function (hook, func) {
     obj.callbacks[hook].push(func);
   };
-
   obj.removeCallback = function (hook, funcName) {
     for (var i = 0; i < obj.callbacks[hook].length; i++) {
       if (obj.callbacks[hook][i].name === funcName) {
@@ -51,45 +46,39 @@ export function callbackify(obj, callbacks) {
         return true;
       }
     }
-
     return false;
   };
-
   obj.insertCallback = function (hook, func) {
     obj.callbacks[hook].unshift(func);
   };
-
   obj.fireCallbacks = function fireCallbacks(hook, args) {
     var newCallbacks = [];
     var replaceCallbacks = [];
     var len = obj.callbacks[hook].length;
     var x;
-    var callback; // log.info('!@$ Firing '+hook+' call back with length'+len)
+    var callback;
 
+    // log.info('!@$ Firing '+hook+' call back with length'+len)
     for (x = len - 1; x >= 0; x--) {
       // log.info('@@ Firing '+hook+' callback '+ obj.callbacks[hook][x])
       callback = obj.callbacks[hook][x];
-
       if (callback && callback.apply(obj, args)) {
         newCallbacks.push(callback);
       }
     }
-
     for (x = newCallbacks.length - 1; x >= 0; x--) {
       replaceCallbacks.push(newCallbacks[x]);
     }
-
     for (x = len; x < obj.callbacks[hook].length; x++) {
       replaceCallbacks.push(obj.callbacks[hook][x]);
     }
-
     obj.callbacks[hook] = replaceCallbacks;
   };
 }
+
 /**
  * Returns a DOM parser based on current runtime environment.
  */
-
 export function DOMParserFactory() {
   if (window.DOMParser) {
     return new DOMParser();
@@ -98,26 +87,23 @@ export function DOMParserFactory() {
   } else {
     return false;
   }
-} // From https://github.com/linkeddata/dokieli
+}
 
+// From https://github.com/linkeddata/dokieli
 export function domToString(node, options) {
   options = options || {};
   var selfClosing = [];
-
   if (options && options.selfClosing) {
     options.selfClosing.split(' ').forEach(function (n) {
       selfClosing[n] = true;
     });
   }
-
   var skipAttributes = [];
-
   if (options && options.skipAttributes) {
     options.skipAttributes.split(' ').forEach(function (n) {
       skipAttributes[n] = true;
     });
   }
-
   return dumpNode(node, options, selfClosing, skipAttributes);
 }
 export function dumpNode(node, options, selfClosing, skipAttributes) {
@@ -125,7 +111,6 @@ export function dumpNode(node, options, selfClosing, skipAttributes) {
   var out = '';
   var noEsc = [false];
   if (typeof node.nodeType === 'undefined') return out;
-
   if (node.nodeType === 1) {
     if (node.hasAttribute('class') && options && options.classWithChildText && node.matches(options.classWithChildText.class)) {
       out += node.querySelector(options.classWithChildText.element).textContent;
@@ -133,43 +118,33 @@ export function dumpNode(node, options, selfClosing, skipAttributes) {
       var ename = node.nodeName.toLowerCase();
       out += '<' + ename;
       var attrList = [];
-
       for (i = node.attributes.length - 1; i >= 0; i--) {
         var atn = node.attributes[i];
         if (skipAttributes && skipAttributes.length > 0 && skipAttributes[atn.name]) continue;
         if (/^\d+$/.test(atn.name)) continue;
-
         if (atn.name === 'class' && options && options.replaceClassItemWith && atn.value.split(' ').indexOf(options.replaceClassItemWith.source) > -1) {
           var re = new RegExp(options.replaceClassItemWith.source, 'g');
           atn.value = atn.value.replace(re, options.replaceClassItemWith.target).trim();
         }
-
         if (!(atn.name === 'class' && options && options.skipClassWithValue && options.skipClassWithValue === atn.value)) {
           attrList.push(atn.name + '=\'' + atn.value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/'/g, '&quot;') + '\'');
         }
       }
-
       if (attrList.length > 0) {
         if (options && options.sortAttributes) {
           attrList.sort(function (a, b) {
             return a.toLowerCase().localeCompare(b.toLowerCase());
           });
         }
-
         out += ' ' + attrList.join(' ');
       }
-
       if (selfClosing && selfClosing.ename) {
         out += ' />';
       } else {
         out += '>';
         out += ename === 'html' ? '\n  ' : '';
         noEsc.push(ename === 'style' || ename === 'script');
-
-        for (i = 0; i < node.childNodes.length; i++) {
-          out += dumpNode(node.childNodes[i]);
-        }
-
+        for (i = 0; i < node.childNodes.length; i++) out += dumpNode(node.childNodes[i]);
         noEsc.pop();
         out += ename === 'body' ? '</' + ename + '>' + '\n' : '</' + ename + '>';
       }
@@ -185,7 +160,6 @@ export function dumpNode(node, options, selfClosing, skipAttributes) {
     console.log('Warning; Cannot handle serialising nodes of type: ' + node.nodeType);
     console.log(node);
   }
-
   return out;
 }
 export function dtstamp() {
@@ -203,15 +177,14 @@ export function dtstamp() {
   if (second < 10) second = '0' + second;
   return year + '-' + month + '-' + day + 'T' + hour + ':' + minute + ':' + second + 'Z';
 }
+
 /**
  * Compares statements (heavy comparison for repeatable canonical ordering)
  */
-
 export function heavyCompare(x, y, g, uriMap) {
   var nonBlank = function nonBlank(x) {
     return x.termType === 'BlankNode' ? null : x;
   };
-
   var signature = function signature(x) {
     var lis = g.statementsMatching(x).map(function (st) {
       return '' + nonBlank(st.subject) + ' ' + nonBlank(st.predicate) + ' ' + nonBlank(st.object);
@@ -221,12 +194,9 @@ export function heavyCompare(x, y, g, uriMap) {
     lis.sort();
     return lis.join('\n');
   };
-
   var comparison = Object.prototype.hasOwnProperty.call(g, "compareTerms") ? g.compareTerms(x, y) : x.compareTerm(y);
-
   if (x.termType === 'BlankNode' && y.termType === 'BlankNode') {
     if (comparison === 0) return 0; // Same
-
     if (signature(x) > signature(y)) return +1;
     if (signature(x) < signature(y)) return -1;
     return comparison; // Too bad -- this order not canonical.
@@ -235,33 +205,31 @@ export function heavyCompare(x, y, g, uriMap) {
     if (uriMap && x.uri && y.uri) {
       return (uriMap[x.uri] || x.uri).localeCompare(uriMap[y.uri] || y.uri);
     }
-
     return comparison;
   }
 }
 export function heavyCompareSPO(x, y, g, uriMap) {
   return heavyCompare(x.subject, y.subject, g, uriMap) || heavyCompare(x.predicate, y.predicate, g, uriMap) || heavyCompare(x.object, y.object, g, uriMap);
 }
+
 /**
  * Defines a simple debugging function
  * @method output
  * @param o {String}
  */
-
 export function output(o) {
   var k = document.createElement('div');
   k.textContent = o;
   document.body.appendChild(k);
 }
 import { DOMParser } from '@xmldom/xmldom';
+
 /**
  * Returns a DOM from parsed XML.
  */
-
 export function parseXML(str, options) {
   var dparser;
   options = options || {};
-
   if (typeof module !== 'undefined' && module && module.exports) {
     // Node.js
     var dom = new DOMParser().parseFromString(str, options.contentType || 'application/xhtml+xml');
@@ -276,10 +244,10 @@ export function parseXML(str, options) {
 
   return dparser.parseFromString(str, 'application/xml');
 }
+
 /**
  * Removes all statements equal to x from a
  */
-
 export function RDFArrayRemove(a, x) {
   for (var i = 0; i < a.length; i++) {
     // TODO: This used to be the following, which didnt always work..why
@@ -289,60 +257,51 @@ export function RDFArrayRemove(a, x) {
       return;
     }
   }
-
   throw new Error('RDFArrayRemove: Array did not contain ' + x + ' ' + x.why);
 }
 export function string_startswith(str, pref) {
   // missing library routines
   return str.slice(0, pref.length) === pref;
 }
+
 /**
  * C++, python style %s -> subs
  */
-
 function stringTemplate(base, subs) {
   var baseA = base.split('%s');
   var result = '';
-
   for (var i = 0; i < subs.length; i++) {
     subs[i] += '';
     result += baseA[i] + subs[i];
   }
-
   return result + baseA.slice(subs.length).join();
-} // Stack dump on errors - to pass errors back
+}
 
+// Stack dump on errors - to pass errors back
 
 export function stackString(e) {
   var str = '' + e + '\n';
-
   if (!e.stack) {
     return str + 'No stack available.\n';
   }
-
   var lines = e.stack.toString().split('\n');
   var toprint = [];
-
   for (var i = 0; i < lines.length; i++) {
     var line = lines[i];
-
     if (line.indexOf('ecmaunit.js') > -1) {
       // remove useless bit of traceback
       break;
     }
-
     if (line.charAt(0) == '(') {
       line = 'function' + line;
     }
-
     var chunks = line.split('@');
     toprint.push(chunks);
-  } // toprint.reverse();  No - I prefer the latest at the top by the error message -tbl
-
+  }
+  // toprint.reverse();  No - I prefer the latest at the top by the error message -tbl
 
   for (var i = 0; i < toprint.length; i++) {
     str += '  ' + toprint[i][1] + '\n    ' + toprint[i][0];
   }
-
   return str;
 }

package/esm/utils.js

@@ -1,7 +1,6 @@
 import log from './log';
 import { docpart } from './uri';
 import { string_startswith } from './utils-js';
-
 /** RDF/JS spec Typeguards */
 
 /**
@@ -10,30 +9,28 @@ import { string_startswith } from './utils-js';
  */
 export function AJAR_handleNewTerm(kb, p, requestedBy) {
   var sf = null;
-
   if (typeof kb.fetcher !== 'undefined') {
     sf = kb.fetcher;
   } else {
     return;
   }
-
   if (p.termType !== 'NamedNode') return;
   var docuri = docpart(p.uri);
   var fixuri;
-
   if (p.uri.indexOf('#') < 0) {
     // No hash
     // @@ major hack for dbpedia Categories, which spread indefinitely
     if (string_startswith(p.uri, 'http://dbpedia.org/resource/Category:')) return;
+
     /*
       if (string_startswith(p.uri, 'http://xmlns.com/foaf/0.1/')) {
       fixuri = "http://dig.csail.mit.edu/2005/ajar/ajaw/test/foaf"
       // should give HTTP 303 to ontology -- now is :-)
       } else
     */
-
     if (string_startswith(p.uri, 'http://purl.org/dc/elements/1.1/') || string_startswith(p.uri, 'http://purl.org/dc/terms/')) {
-      fixuri = 'http://dublincore.org/2005/06/13/dcq'; // dc fetched multiple times
+      fixuri = 'http://dublincore.org/2005/06/13/dcq';
+      // dc fetched multiple times
     } else if (string_startswith(p.uri, 'http://xmlns.com/wot/0.1/')) {
       fixuri = 'http://xmlns.com/wot/0.1/index.rdf';
     } else if (string_startswith(p.uri, 'http://web.resource.org/cc/')) {
@@ -41,18 +38,14 @@ export function AJAR_handleNewTerm(kb, p, requestedBy) {
       fixuri = 'http://web.resource.org/cc/schema.rdf';
     }
   }
-
   if (fixuri) {
     docuri = fixuri;
   }
-
   if (sf && sf.getState(docuri) !== 'unrequested') return;
-
   if (fixuri) {
     // only give warning once: else happens too often
     log.warn('Assuming server still broken, faking redirect of <' + p.uri + '> to <' + docuri + '>');
   }
-
   return sf.fetch(docuri, {
     referringTerm: requestedBy
   });
@@ -63,6 +56,7 @@ var rdf = {
   rest: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#rest',
   nil: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'
 };
+
 /**
  * Expands an array of Terms to a set of statements representing the rdf:list.
  * @param rdfFactory - The factory to use
@@ -70,20 +64,17 @@ var rdf = {
  * @param data - The terms to expand into the list.
  * @return The {data} as a set of statements.
  */
-
 export function arrayToStatements(rdfFactory, subject, data) {
   var statements = [];
   data.reduce(function (id, _listObj, i, listData) {
     statements.push(rdfFactory.quad(id, rdfFactory.namedNode(rdf.first), listData[i]));
     var nextNode;
-
     if (i < listData.length - 1) {
       nextNode = rdfFactory.blankNode();
       statements.push(rdfFactory.quad(id, rdfFactory.namedNode(rdf.rest), nextNode));
     } else {
       statements.push(rdfFactory.quad(id, rdfFactory.namedNode(rdf.rest), rdfFactory.namedNode(rdf.nil)));
     }
-
     return nextNode;
   }, subject);
   return statements;
@@ -92,12 +83,10 @@ export function ArrayIndexOf(arr, item) {
   var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var length = arr.length;
   if (i < 0) i = length + i;
-
   for (; i < length; i++) {
     if (arr[i] === item) {
       return i;
     }
   }
-
   return -1;
 }

package/esm/variable.js

@@ -5,16 +5,12 @@ 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 ClassOrder from './class-order';
 import Node from './node-internal';
 import { VariableTermType } from './types';
 import * as Uri from './uri';
-
 /**
 * Variables are placeholders used in patterns to be matched.
 * In cwm they are symbols which are the formula's list of quantified variables.
@@ -24,9 +20,7 @@ import * as Uri from './uri';
 */
 var Variable = /*#__PURE__*/function (_Node) {
   _inherits(Variable, _Node);
-
   var _super = _createSuper(Variable);
-
   /** The base string for a variable's name */
 
   /** The unique identifier of this variable */
@@ -37,35 +31,24 @@ var Variable = /*#__PURE__*/function (_Node) {
    */
   function Variable() {
     var _this;
-
     var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-
     _classCallCheck(this, Variable);
-
     _this = _super.call(this, name);
-
     _defineProperty(_assertThisInitialized(_this), "termType", VariableTermType);
-
     _defineProperty(_assertThisInitialized(_this), "base", 'varid:');
-
     _defineProperty(_assertThisInitialized(_this), "classOrder", ClassOrder.Variable);
-
     _defineProperty(_assertThisInitialized(_this), "isVar", 1);
-
     _defineProperty(_assertThisInitialized(_this), "uri", void 0);
-
     _this.base = 'varid:';
     _this.uri = Uri.join(name, _this.base);
     return _this;
   }
-
   _createClass(Variable, [{
     key: "equals",
     value: function equals(other) {
       if (!other) {
         return false;
       }
-
       return this.termType === other.termType && this.value === other.value;
     }
   }, {
@@ -90,12 +73,9 @@ var Variable = /*#__PURE__*/function (_Node) {
       if (variable.uri.slice(0, variable.base.length) === variable.base) {
         return "?".concat(variable.uri.slice(variable.base.length));
       }
-
       return "?".concat(variable.uri);
     }
   }]);
-
   return Variable;
 }(Node);
-
 export { Variable as default };

package/lib/blank-node.js

@@ -1,52 +1,35 @@
 "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);
-
   /**
    * 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);
@@ -55,11 +38,10 @@ var BlankNode = /*#__PURE__*/function (_Node) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVar", 1);
     return _this;
   }
+
   /**
    * The identifier for the blank node
    */
-
-
   (0, _createClass2.default)(BlankNode, [{
     key: "id",
     get: function get() {
@@ -74,26 +56,22 @@ var BlankNode = /*#__PURE__*/function (_Node) {
       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) {
@@ -118,28 +96,25 @@ var BlankNode = /*#__PURE__*/function (_Node) {
     /**
      * 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++;
     }
   }]);
   return BlankNode;
 }(_nodeInternal.default);
-
 exports.default = BlankNode;
 (0, _defineProperty2.default)(BlankNode, "nextId", 0);
 (0, _defineProperty2.default)(BlankNode, "NTAnonymousNodePrefix", '_:');

package/lib/class-order.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /**
 * Class orders
 */