rdflib 2.2.34 → 2.2.35-2bb9ed0b

package/lib/query.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Query = void 0;
 exports.indexedFormulaQuery = indexedFormulaQuery;
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _store = _interopRequireDefault(require("./store"));
 var _defaultGraphUri = require("./utils/default-graph-uri");
 var _log = _interopRequireDefault(require("./log"));
@@ -23,24 +21,27 @@ var _uri = require("./uri");
 // Here we introduce for the first time a subclass of term: variable.
 //
 // SVN ID: $Id: query.js 25116 2008-11-15 16:13:48Z timbl $
+
 //  Variable
 //
 // Compare with BlankNode.  They are similar, but a variable
 // stands for something whose value is to be returned.
 // Also, users name variables and want the same name back when stuff is printed
-/* jsl:option explicit */
-// Turn on JavaScriptLint variable declaration checking
+/* jsl:option explicit */ // Turn on JavaScriptLint variable declaration checking
+
 /**
  * Query class, for tracking queries the user has in the UI.
  */
-var Query = /*#__PURE__*/(0, _createClass2.default)(function Query(name, id) {
-  (0, _classCallCheck2.default)(this, Query);
-  this.pat = new _store.default(); // The pattern to search for
-  this.vars = []; // Used by UI code but not in query.js
-  //    this.orderBy = [] // Not used yet
-  this.name = name;
-  this.id = id;
-});
+class Query {
+  constructor(name, id) {
+    this.pat = new _store.default(); // The pattern to search for
+    this.vars = []; // Used by UI code but not in query.js
+    //    this.orderBy = [] // Not used yet
+    this.name = name;
+    this.id = id;
+  }
+}
+
 /**
  * This function will match a pattern to the current Store
  *
@@ -96,7 +97,6 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
         b[self] = other;
         return [[b, null]]; // Match
       }
-
       actual = self;
     }
     if (!actual.complexType) {
@@ -128,11 +128,9 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
     if (self.length !== other.length) {
       return []; // no way
     }
-
     if (!self.length) {
       return [[[], null]]; // Success
     }
-
     var nbs = unifyTerm(self[0], other[0], bindings, formula);
     if (nbs.length === 0) {
       return nbs;
@@ -155,13 +153,11 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
           bindings2[v] = nb[v]; // copy
         }
       }
-
       for (v in bindings) {
         if (bindings.hasOwnProperty(v)) {
           bindings2[v] = bindings[v]; // copy
         }
       }
-
       nbs2 = unifyContents(self.slice(1), other.slice(1), bindings2, formula);
       m = nbs2.length;
       for (j = 0; j < m; j++) {
@@ -269,7 +265,7 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
   };
 
   // An optional branch hoards its results.
-  var OptionalBranch = function OptionalBranch(junction) {
+  var OptionalBranch = function (junction) {
     this.count = 0;
     this.done = false;
     this.results = [];
@@ -308,7 +304,7 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
     terms = [item.subject, item.predicate, item.object, item.why];
     ind = [f.subjectIndex, f.predicateIndex, f.objectIndex, f.whyIndex];
     for (i = 0; i < 4; i++) {
-      var t = terms[i];
+      let t = terms[i];
       // console.log("  Prepare (" + t + ") "+(t in bindings))
       if (t.uri && t.uri === _defaultGraphUri.defaultGraphURI) {// chrome:session
         // console.log('     query: Ignoring slot ' + i)
@@ -320,13 +316,11 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
         if (f.redirections[f.id(t)]) {
           t = f.redirections[f.id(t)]; // redirect
         }
-
         termIndex = ind[i][f.id(t)];
         if (!termIndex) {
           item.index = [];
           return false; // Query line cannot match
         }
-
         if (item.index === null || item.index.length > termIndex.length) {
           // Find smallest index
           item.index = termIndex;
@@ -362,7 +356,7 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
   *
   * Will fetch linked data from the web iff the knowledge base an associated source fetcher (f.fetcher)
   ***/
-  var match = function match(f, g, bindingsSoFar, level, fetcher, localCallback, branch) {
+  var match = function (f, g, bindingsSoFar, level, fetcher, localCallback, branch) {
     _log.default.debug('Match begins, Branch count now: ' + branch.count + ' for ' + branch.pattern_debug);
 
     // log.debug("match: f has "+f.statements.length+", g has "+g.statements.length)
@@ -381,7 +375,6 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
           br[b] = new OptionalBranch(junction); // Allocate branches to prevent premature ending
           br[b].pattern_debug = g.optional[b]; // for diagnotics only
         }
-
         for (b = 0; b < g.optional.length; b++) {
           br[b].count = br[b].count + 1; // Count how many matches we have yet to complete
           match(f, g.optional[b], bindingsSoFar, '', fetcher, callback, br[b]);
@@ -391,7 +384,6 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
       _log.default.debug('Match ends -- success , Branch count now: ' + branch.count + ' for ' + branch.pattern_debug);
       return; // Success
     }
-
     var item;
     var i;
     var n = pattern.length;
@@ -401,7 +393,7 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
     if (fetcher) {
       // Fetcher is used to fetch URIs, function first term is a URI term, second is the requester
       var id = 'match' + matchIndex++;
-      var fetchResource = function fetchResource(requestedTerm, id) {
+      var fetchResource = function (requestedTerm, id) {
         var docuri = requestedTerm.uri.split('#')[0];
         fetcher.nowOrWhenFetched(docuri, undefined, function (ok, body, xhr) {
           if (!ok) {
@@ -419,7 +411,6 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
           fetchResource(bindingsSoFar[item.subject], id);
           return; // only look up one per line this time, but we will come back again though match
         }
-
         if (bindingsSoFar[item.object] !== undefined && bindingsSoFar[item.object].uri && fetcher && fetcher.getState((0, _uri.docpart)(bindingsSoFar[item.object].uri)) === 'unrequested') {
           fetchResource(bindingsSoFar[item.object], id);
           return;
@@ -429,7 +420,7 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
     match2(f, g, bindingsSoFar, level, fetcher, localCallback, branch);
   }; // match
 
-  var constraintsSatisfied = function constraintsSatisfied(bindings, constraints) {
+  var constraintsSatisfied = function (bindings, constraints) {
     var res = true;
     var x;
     var test;
@@ -447,7 +438,7 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
   };
 
   /** match2 -- stuff after the fetch **/
-  var match2 = function match2(f, g, bindingsSoFar, level, fetcher, callback, branch) {
+  var match2 = function (f, g, bindingsSoFar, level, fetcher, callback, branch) {
     // post fetch
     var pattern = g.statements;
     var n = pattern.length;
@@ -465,7 +456,6 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
       prepare(f, item, bindingsSoFar);
       // if (item.index) console.log('     item.index.length ' + item.index.length)
     }
-
     pattern.sort(easiestQuery);
     item = pattern[0];
     // log.debug("Sorted pattern:\n"+pattern)
@@ -502,20 +492,17 @@ function indexedFormulaQuery(myQuery, callback, fetcher, onDone) {
               bindings2[v] = newBindings1[v]; // copy
             }
           }
-
           for (v in bindingsSoFar) {
             if (bindingsSoFar.hasOwnProperty(v)) {
               bindings2[v] = bindingsSoFar[v]; // copy
             }
           }
-
           branch.count++; // Count how many matches we have yet to complete
           onward++;
           match(f, rest, bindings2, level + '  ', fetcher, callback, branch); // call match
         }
       }
     }
-
     branch.count--;
     if (onward === 0) {
       _log.default.debug('Match2 fails completely on ' + item);