rdflib 2.2.33 → 2.2.34-ac7c600e

package/lib/variable.js

@@ -8,19 +8,18 @@ Object.defineProperty(exports, "__esModule", {
 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 _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 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 Uri = _interopRequireWildcard(require("./uri"));
-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; } }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
 * Variables are placeholders used in patterns to be matched.
 * In cwm they are symbols which are the formula's list of quantified variables.
@@ -28,9 +27,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 * a common special base URI for variables. Their names are uris,
 * but the ? notation has an implicit base uri of 'varid:'
 */
-var Variable = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(Variable, _Node);
-  var _super = _createSuper(Variable);
+var Variable = exports.default = /*#__PURE__*/function (_Node) {
   /**
    * Initializes this variable
    * @param name The variable's name
@@ -39,19 +36,20 @@ var Variable = /*#__PURE__*/function (_Node) {
     var _this;
     var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     (0, _classCallCheck2.default)(this, Variable);
-    _this = _super.call(this, name);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.VariableTermType);
+    _this = _callSuper(this, Variable, [name]);
+    (0, _defineProperty2.default)(_this, "termType", _types.VariableTermType);
     /** The base string for a variable's name */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "base", 'varid:');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "classOrder", _classOrder.default.Variable);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVar", 1);
+    (0, _defineProperty2.default)(_this, "base", 'varid:');
+    (0, _defineProperty2.default)(_this, "classOrder", _classOrder.default.Variable);
+    (0, _defineProperty2.default)(_this, "isVar", 1);
     /** The unique identifier of this variable */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "uri", void 0);
+    (0, _defineProperty2.default)(_this, "uri", void 0);
     _this.base = 'varid:';
     _this.uri = Uri.join(name, _this.base);
     return _this;
   }
-  (0, _createClass2.default)(Variable, [{
+  (0, _inherits2.default)(Variable, _Node);
+  return (0, _createClass2.default)(Variable, [{
     key: "equals",
     value: function equals(other) {
       if (!other) {
@@ -84,6 +82,4 @@ var Variable = /*#__PURE__*/function (_Node) {
       return "?".concat(variable.uri);
     }
   }]);
-  return Variable;
-}(_nodeInternal.default);
-exports.default = Variable;
+}(_nodeInternal.default);

package/lib/xsd-internal.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _namedNode = _interopRequireDefault(require("./named-node"));
-var _default = {
+var _default = exports.default = {
   boolean: new _namedNode.default('http://www.w3.org/2001/XMLSchema#boolean'),
   dateTime: new _namedNode.default('http://www.w3.org/2001/XMLSchema#dateTime'),
   decimal: new _namedNode.default('http://www.w3.org/2001/XMLSchema#decimal'),
@@ -14,5 +14,4 @@ var _default = {
   integer: new _namedNode.default('http://www.w3.org/2001/XMLSchema#integer'),
   langString: new _namedNode.default('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString'),
   string: new _namedNode.default('http://www.w3.org/2001/XMLSchema#string')
-};
-exports.default = _default;
+};

package/lib/xsd.js

@@ -20,5 +20,4 @@ function createXSD() {
   };
 }
 var defaultXSD = createXSD(_canonicalDataFactory.default);
-var _default = defaultXSD;
-exports.default = _default;
+var _default = exports.default = defaultXSD;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.33",
+  "version": "2.2.34-ac7c600e",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -44,49 +44,49 @@
   "homepage": "http://github.com/linkeddata/rdflib.js",
   "bugs": "http://github.com/linkeddata/rdflib.js/issues",
   "dependencies": {
-    "@babel/runtime": "^7.21.0",
+    "@babel/runtime": "^7.24.4",
     "@frogcat/ttl2jsonld": "^0.0.9",
-    "@xmldom/xmldom": "^0.8.7",
-    "cross-fetch": "^3.1.5",
-    "jsonld": "^8.1.1",
-    "n3": "^1.16.4",
+    "@xmldom/xmldom": "^0.8.10",
+    "cross-fetch": "^3.1.8",
+    "jsonld": "^8.3.2",
+    "n3": "^1.17.3",
     "solid-namespace": "^0.5.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.4",
+    "@babel/cli": "^7.24.1",
+    "@babel/core": "^7.24.4",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-transform-runtime": "^7.21.4",
-    "@babel/preset-env": "^7.21.4",
-    "@babel/preset-typescript": "^7.21.4",
-    "@babel/register": "^7.21.0",
-    "@types/chai": "^4.3.4",
-    "@types/dirty-chai": "^2.0.2",
-    "@types/express": "^4.17.17",
-    "@types/jsonld": "^1.5.8",
-    "@types/mocha": "^10.0.4",
-    "@types/sinon-chai": "^3.2.9",
-    "babel-loader": "^9.1.2",
-    "chai": "^4.3.7",
-    "diff": "^5.1.0",
+    "@babel/plugin-transform-runtime": "^7.24.3",
+    "@babel/preset-env": "^7.24.4",
+    "@babel/preset-typescript": "^7.24.1",
+    "@babel/register": "^7.23.7",
+    "@types/chai": "^4.3.14",
+    "@types/dirty-chai": "^2.0.4",
+    "@types/express": "^4.17.21",
+    "@types/jsonld": "^1.5.13",
+    "@types/mocha": "^10.0.6",
+    "@types/sinon-chai": "^3.2.12",
+    "babel-loader": "^9.1.3",
+    "chai": "^4.4.1",
+    "diff": "^5.2.0",
     "dirty-chai": "^2.0.1",
-    "eslint": "^8.38.0",
+    "eslint": "^8.57.0",
     "fs-grep": "0.0.5",
     "locate-path": "^7.2.0",
-    "mocha": "^10.2.0",
-    "nock": "^13.3.0",
-    "node-fetch": "^3.3.1",
+    "mocha": "^10.4.0",
+    "nock": "^13.5.4",
+    "node-fetch": "^3.3.2",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "rdf-js": "^4.0.2",
     "sinon": "^15.0.3",
     "sinon-chai": "^3.7.0",
-    "source-map-loader": "^4.0.1",
-    "ts-node": "^10.9.1",
-    "typedoc": "^0.24.2",
+    "source-map-loader": "^4.0.2",
+    "ts-node": "^10.9.2",
+    "typedoc": "^0.25.13",
     "typescript": "^5.0.4",
-    "webpack": "^5.79.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.13.3"
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.2"
   },
   "scripts": {
     "build": "babel src --extensions \".ts,.js\" -d lib",

package/src/fetcher.ts

@@ -980,7 +980,7 @@ export default class Fetcher implements CallbackifyInterface {
     const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), meta).map(st => st.subject)
     for (const request of requests) {
       const response = kb.any(request, this.ns.link('response'), null, meta) as Quad_Subject
-      if (response !== undefined) { // ts
+      if (response != undefined) { // ts
         const quad = kb.statementsMatching(response, this.ns.link('outOfDate'), true as any, meta)
         kb.remove(quad)
         options.force = true
@@ -2004,7 +2004,12 @@ export default class Fetcher implements CallbackifyInterface {
 
       // Before we parse new data clear old but only on 200
       if (options.clearPreviousData) {
-        kb.removeDocument(options.resource)
+        // kb.removeDocument(options.resource)
+        // only remove content, keep metatdata
+        const sts = kb.statementsMatching(undefined, undefined, undefined, options.resource).slice() // Take a copy as this is the actual index
+        for (let i = 0; i < sts.length; i++) {
+          kb.removeStatement(sts[i])
+        }
       }
 
       let isImage = contentType.includes('image/') ||

package/src/store.ts

@@ -871,31 +871,55 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   }
 
   /**
-   * Removes all statements in a doc, along with the related metadata including request/response
+   * Removes all statements in a doc, along with the related metadata including request/response/status
    * @param doc - The document / graph
    */
   removeDocument(doc: Quad_Graph): IndexedFormula {
+    this.removeMetadata(doc)
+    // remove document
+    var sts: Quad[] = this.statementsMatching(undefined, undefined, undefined, doc).slice() // Take a copy as this is the actual index
+    for (var i = 0; i < sts.length; i++) {
+      this.removeStatement(sts[i])
+    }
+    this.removeMatches(doc as Quad_Subject, null, null)
+    return this
+  }
+
+  removeMetadata(doc: Quad_Graph): IndexedFormula {
     const meta = this.sym('chrome://TheCurrentSession') // or this.rdfFactory.namedNode('chrome://TheCurrentSession')
-    const linkNamespaceURI = 'http://www.w3.org/2007/ont/link#' // alain
-    // remove request/response and metadata
+    const linkNamespaceURI = 'http://www.w3.org/2007/ont/link#'
+    // remove status/response/request metadata
     const requests = this.statementsMatching(undefined, this.sym(`${linkNamespaceURI}requestedURI`), this.rdfFactory.literal(doc.value), meta).map(st => st.subject)
     for (var r = 0; r < requests.length; r++) {
       const request = requests[r]
-      if (request !== undefined) {
-        this.removeMatches(request, null, null, meta)
+      if (request != undefined) {
+        // removeMatches unresolved issue with collection https://github.com/linkeddata/rdflib.js/issues/631
+        let sts: Quad[]
+        // status collection
+        const status = this.any(request, this.sym(`${linkNamespaceURI}status`), null, meta) as Quad_Subject
+        if (status != undefined) {
+          sts = this.statementsMatching(status, this.sym(`${linkNamespaceURI}status`), null, meta).slice()
+          for (var i = 0; i < sts.length; i++) {
+            this.removeStatement(sts[i])
+          }
+        }
+        // response items list
         const response = this.any(request, this.sym(`${linkNamespaceURI}response`), null, meta) as Quad_Subject
-        if (response !== undefined) { // ts
-          this.removeMatches(response, null, null, meta)
+        if (response != undefined) {
+          sts = this.statementsMatching(response, null, null, meta).slice()
+          for (var i = 0; i < sts.length; i++) {
+            this.removeStatement(sts[i])
+          }
+        }
+        // request triples
+        sts = this.statementsMatching(request, null, null, meta).slice()
+        for (var i = 0; i < sts.length; i++) {
+          this.removeStatement(sts[i])
         }
+
       }
     }
     this.removeMatches(this.sym(doc.value), null, null, meta) // content-type
-
-    // remove document
-    var sts: Quad[] = this.statementsMatching(undefined, undefined, undefined, doc).slice() // Take a copy as this is the actual index
-    for (var i = 0; i < sts.length; i++) {
-      this.removeStatement(sts[i])
-    }
     return this
   }
 

package/src/update-manager.ts

@@ -95,7 +95,7 @@ export default class UpdateManager {
     const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), undefined, meta).map(st => st.subject)
     for (const request of requests) {
       const response = kb.any(request, this.ns.link('response'), null, meta) as Quad_Subject
-      if (response !== undefined) { // ts
+      if (response != undefined) { // ts
         kb.add(response, this.ns.link('outOfDate'), true as any, meta) // @@ Boolean is fine - fix types
       }
     }
@@ -601,7 +601,7 @@ export default class UpdateManager {
           }
         } else {
           control.reloading = false
-          if ((response as Response).status === 0) {
+          if (response && (response as Response).status === 0) {
             // console.log('Network error refreshing the data. Retrying in ' +
             // retryTimeout / 1000)
             control.reloading = true

package/dist/670.rdflib.min.js

@@ -1 +0,0 @@
-(self.webpackChunk$rdf=self.webpackChunk$rdf||[]).push([[670],{7670:()=>{}}]);