rdflib 2.2.28 → 2.2.30

package/esm/blank-node.js

@@ -93,7 +93,6 @@ var BlankNode = /*#__PURE__*/function (_Node) {
     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('#')) {

package/esm/convert.js

@@ -0,0 +1,60 @@
+import asyncLib from 'async'; // @@ Goal: remove this dependency
+import jsonld from 'jsonld';
+import { Parser, Writer } from 'n3'; // @@ Goal: remove this dependency
+
+export function convertToJson(n3String, jsonCallback) {
+  var jsonString;
+  var n3Parser = new Parser();
+  var n3Writer = new Writer({
+    format: 'N-Quads'
+  });
+  asyncLib.waterfall([function (callback) {
+    n3Parser.parse(n3String, function (error, quad, prefixes) {
+      if (error) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    try {
+      jsonld.fromRDF(result, {
+        format: 'application/nquads'
+      }).then(result => {
+        callback(null, result);
+      });
+    } catch (err) {
+      callback(err);
+    }
+  }, function (json, callback) {
+    jsonString = JSON.stringify(json);
+    jsonCallback(null, jsonString);
+  }], function (err, result) {
+    jsonCallback(err, jsonString);
+  });
+}
+export function convertToNQuads(n3String, nquadCallback) {
+  var nquadString;
+  var n3Parser = new Parser();
+  var n3Writer = new Writer({
+    format: 'N-Quads'
+  });
+  asyncLib.waterfall([function (callback) {
+    n3Parser.parse(n3String, function (error, triple, prefixes) {
+      if (error) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    nquadString = result;
+    nquadCallback(null, nquadString);
+  }], function (err, result) {
+    nquadCallback(err, nquadString);
+  });
+}

package/esm/fetcher.js

@@ -878,7 +878,7 @@ var Fetcher = /*#__PURE__*/function () {
           size: 0,
           timeout: 0
         };
-        console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error);
+        // console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error)
         return _this5.handleError(dummyResponse, docuri, options); // possible credentials retry
         // return this.failFetch(options, 'fetch failed: ' + error, 999, dummyResponse) // Fake status code: fetch exception
 
@@ -939,25 +939,21 @@ var Fetcher = /*#__PURE__*/function () {
             if (fetchResponse.ok) {
               userCallback(true, 'OK', fetchResponse);
             } else {
-              // console.log('@@@ fetcher.js Should not take this path !!!!!!!!!!!!')
               var oops = 'HTTP error: Status ' + fetchResponse.status + ' (' + fetchResponse.statusText + ')';
               if (fetchResponse.responseText) {
                 oops += ' ' + fetchResponse.responseText; // not in 404, dns error, nock failure
               }
 
-              console.log(oops + ' fetching ' + uri);
               userCallback(false, oops, fetchResponse);
             }
           } else {
             var _oops = '@@ nowOrWhenFetched:  no response object!';
-            console.log(_oops);
             userCallback(false, _oops);
           }
         }
       }, function (err) {
         var message = err.message || err.statusText;
         message = 'Failed to load  <' + uri + '> ' + message;
-        console.log(message);
         if (err.response && err.response.status) {
           message += ' status: ' + err.response.status;
         }
@@ -1196,45 +1192,42 @@ var Fetcher = /*#__PURE__*/function () {
               return fetcher.load(doc);
             case 6:
               response = _context2.sent;
-              _context2.next = 29;
+              _context2.next = 26;
               break;
             case 9:
               _context2.prev = 9;
               _context2.t0 = _context2["catch"](3);
               if (!(_context2.t0.response.status === 404)) {
-                _context2.next = 27;
+                _context2.next = 25;
                 break;
               }
-              console.log('createIfNotExists: doc does NOT exist, will create... ' + doc);
-              _context2.prev = 13;
-              _context2.next = 16;
+              _context2.prev = 12;
+              _context2.next = 15;
               return fetcher.webOperation('PUT', doc.value, {
                 data: data,
                 contentType: contentType
               });
-            case 16:
+            case 15:
               response = _context2.sent;
-              _context2.next = 23;
+              _context2.next = 21;
               break;
-            case 19:
-              _context2.prev = 19;
-              _context2.t1 = _context2["catch"](13);
-              console.log('createIfNotExists doc FAILED: ' + doc + ': ' + _context2.t1);
+            case 18:
+              _context2.prev = 18;
+              _context2.t1 = _context2["catch"](12);
               throw _context2.t1;
-            case 23:
+            case 21:
               delete fetcher.requested[doc.value]; // delete cached 404 error
               // console.log('createIfNotExists doc created ok ' + doc)
               return _context2.abrupt("return", response);
-            case 27:
-              console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + _context2.t0);
+            case 25:
               throw _context2.t0;
-            case 29:
+            case 26:
               return _context2.abrupt("return", response);
-            case 30:
+            case 27:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[3, 9], [13, 19]]);
+        }, _callee2, this, [[3, 9], [12, 18]]);
       }));
       function createIfNotExists(_x4) {
         return _createIfNotExists.apply(this, arguments);
@@ -1543,7 +1536,8 @@ var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "retryNoCredentials",
     value: function retryNoCredentials(docuri, options) {
-      console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource);
+      // console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource)
+
       options.retriedWithNoCredentials = true; // protect against being called twice
 
       delete this.requested[docuri]; // forget the original request happened
@@ -1588,7 +1582,7 @@ var Fetcher = /*#__PURE__*/function () {
         // Now attempt retry via proxy
         var proxyUri = Fetcher.crossSiteProxy(docuri);
         if (proxyUri && !options.proxyUsed) {
-          console.log('web: Direct failed so trying proxy ' + proxyUri);
+          // console.log('web: Direct failed so trying proxy ' + proxyUri)
           return this.redirectToProxy(proxyUri, options);
         }
       }
@@ -1661,7 +1655,7 @@ var Fetcher = /*#__PURE__*/function () {
 
       // Check for masked errors (CORS, etc)
       if (response.status === 0) {
-        console.log('Masked error - status 0 for ' + docuri);
+        // console.log('Masked error - status 0 for ' + docuri)
         return this.handleError(response, docuri, options);
       }
       if (response.status >= 400) {

package/esm/formula.js

@@ -552,7 +552,6 @@ var Formula = /*#__PURE__*/function (_Node) {
       while (todo.length) {
         follow(todo.shift());
       }
-      // console.log('' + result.length + ' statements about ' + subject)
       return result;
     }
 
@@ -709,10 +708,10 @@ var Formula = /*#__PURE__*/function (_Node) {
       var statementsCopy = this.statements.map(function (ea) {
         return ea.substitute(bindings);
       });
-      console.log('Formula subs statmnts:' + statementsCopy);
+      // console.log('Formula subs statmnts:' + statementsCopy)
       var y = new Formula();
       y.addAll(statementsCopy);
-      console.log('indexed-form subs formula:' + y);
+      // console.log('indexed-form subs formula:' + y)
       return y;
     }
   }, {

package/esm/node-internal.js

@@ -35,7 +35,6 @@ var Node = /*#__PURE__*/function () {
   _createClass(Node, [{
     key: "substitute",
     value: function substitute(bindings) {
-      console.log('@@@ node substitute' + this);
       return this;
     }
 

package/esm/statement.js

@@ -76,7 +76,7 @@ var Statement = /*#__PURE__*/function () {
     key: "substitute",
     value: function substitute(bindings) {
       var y = new Statement(this.subject.substitute(bindings), this.predicate.substitute(bindings), this.object.substitute(bindings), isDefaultGraph(this.graph) ? this.graph : this.graph.substitute(bindings)); // 2016
-      console.log('@@@ statement substitute:' + y);
+      // console.log('@@@ statement substitute:' + y)
       return y;
     }
 

package/lib/blank-node.js

@@ -100,7 +100,6 @@ var BlankNode = /*#__PURE__*/function (_Node) {
     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('#')) {

package/lib/convert.d.ts

@@ -0,0 +1,2 @@
+export function convertToJson(n3String: any, jsonCallback: any): void;
+export function convertToNQuads(n3String: any, nquadCallback: any): void;

package/lib/convert.js

@@ -0,0 +1,71 @@
+"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) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    try {
+      _jsonld.default.fromRDF(result, {
+        format: 'application/nquads'
+      }).then(result => {
+        callback(null, result);
+      });
+    } catch (err) {
+      callback(err);
+    }
+  }, function (json, callback) {
+    jsonString = JSON.stringify(json);
+    jsonCallback(null, jsonString);
+  }], function (err, result) {
+    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) {
+        callback(error);
+      } else if (quad !== null) {
+        n3Writer.addQuad(quad);
+      } else {
+        n3Writer.end(callback);
+      }
+    });
+  }, function (result, callback) {
+    nquadString = result;
+    nquadCallback(null, nquadString);
+  }], function (err, result) {
+    nquadCallback(err, nquadString);
+  });
+}

package/lib/fetcher.js

@@ -861,7 +861,7 @@ var Fetcher = /*#__PURE__*/function () {
           size: 0,
           timeout: 0
         };
-        console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error);
+        // console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error)
         return _this5.handleError(dummyResponse, docuri, options); // possible credentials retry
         // return this.failFetch(options, 'fetch failed: ' + error, 999, dummyResponse) // Fake status code: fetch exception
 
@@ -922,25 +922,21 @@ var Fetcher = /*#__PURE__*/function () {
             if (fetchResponse.ok) {
               userCallback(true, 'OK', fetchResponse);
             } else {
-              // console.log('@@@ fetcher.js Should not take this path !!!!!!!!!!!!')
               var oops = 'HTTP error: Status ' + fetchResponse.status + ' (' + fetchResponse.statusText + ')';
               if (fetchResponse.responseText) {
                 oops += ' ' + fetchResponse.responseText; // not in 404, dns error, nock failure
               }
 
-              console.log(oops + ' fetching ' + uri);
               userCallback(false, oops, fetchResponse);
             }
           } else {
             var _oops = '@@ nowOrWhenFetched:  no response object!';
-            console.log(_oops);
             userCallback(false, _oops);
           }
         }
       }, function (err) {
         var message = err.message || err.statusText;
         message = 'Failed to load  <' + uri + '> ' + message;
-        console.log(message);
         if (err.response && err.response.status) {
           message += ' status: ' + err.response.status;
         }
@@ -1179,45 +1175,42 @@ var Fetcher = /*#__PURE__*/function () {
               return fetcher.load(doc);
             case 6:
               response = _context2.sent;
-              _context2.next = 29;
+              _context2.next = 26;
               break;
             case 9:
               _context2.prev = 9;
               _context2.t0 = _context2["catch"](3);
               if (!(_context2.t0.response.status === 404)) {
-                _context2.next = 27;
+                _context2.next = 25;
                 break;
               }
-              console.log('createIfNotExists: doc does NOT exist, will create... ' + doc);
-              _context2.prev = 13;
-              _context2.next = 16;
+              _context2.prev = 12;
+              _context2.next = 15;
               return fetcher.webOperation('PUT', doc.value, {
                 data: data,
                 contentType: contentType
               });
-            case 16:
+            case 15:
               response = _context2.sent;
-              _context2.next = 23;
+              _context2.next = 21;
               break;
-            case 19:
-              _context2.prev = 19;
-              _context2.t1 = _context2["catch"](13);
-              console.log('createIfNotExists doc FAILED: ' + doc + ': ' + _context2.t1);
+            case 18:
+              _context2.prev = 18;
+              _context2.t1 = _context2["catch"](12);
               throw _context2.t1;
-            case 23:
+            case 21:
               delete fetcher.requested[doc.value]; // delete cached 404 error
               // console.log('createIfNotExists doc created ok ' + doc)
               return _context2.abrupt("return", response);
-            case 27:
-              console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + _context2.t0);
+            case 25:
               throw _context2.t0;
-            case 29:
+            case 26:
               return _context2.abrupt("return", response);
-            case 30:
+            case 27:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[3, 9], [13, 19]]);
+        }, _callee2, this, [[3, 9], [12, 18]]);
       }));
       function createIfNotExists(_x4) {
         return _createIfNotExists.apply(this, arguments);
@@ -1526,7 +1519,8 @@ var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "retryNoCredentials",
     value: function retryNoCredentials(docuri, options) {
-      console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource);
+      // console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource)
+
       options.retriedWithNoCredentials = true; // protect against being called twice
 
       delete this.requested[docuri]; // forget the original request happened
@@ -1571,7 +1565,7 @@ var Fetcher = /*#__PURE__*/function () {
         // Now attempt retry via proxy
         var proxyUri = Fetcher.crossSiteProxy(docuri);
         if (proxyUri && !options.proxyUsed) {
-          console.log('web: Direct failed so trying proxy ' + proxyUri);
+          // console.log('web: Direct failed so trying proxy ' + proxyUri)
           return this.redirectToProxy(proxyUri, options);
         }
       }
@@ -1644,7 +1638,7 @@ var Fetcher = /*#__PURE__*/function () {
 
       // Check for masked errors (CORS, etc)
       if (response.status === 0) {
-        console.log('Masked error - status 0 for ' + docuri);
+        // console.log('Masked error - status 0 for ' + docuri)
         return this.handleError(response, docuri, options);
       }
       if (response.status >= 400) {

package/lib/formula.js

@@ -559,7 +559,6 @@ var Formula = /*#__PURE__*/function (_Node) {
       while (todo.length) {
         follow(todo.shift());
       }
-      // console.log('' + result.length + ' statements about ' + subject)
       return result;
     }
 
@@ -716,10 +715,10 @@ var Formula = /*#__PURE__*/function (_Node) {
       var statementsCopy = this.statements.map(function (ea) {
         return ea.substitute(bindings);
       });
-      console.log('Formula subs statmnts:' + statementsCopy);
+      // console.log('Formula subs statmnts:' + statementsCopy)
       var y = new Formula();
       y.addAll(statementsCopy);
-      console.log('indexed-form subs formula:' + y);
+      // console.log('indexed-form subs formula:' + y)
       return y;
     }
   }, {

package/lib/node-internal.js

@@ -42,7 +42,6 @@ var Node = /*#__PURE__*/function () {
   (0, _createClass2.default)(Node, [{
     key: "substitute",
     value: function substitute(bindings) {
-      console.log('@@@ node substitute' + this);
       return this;
     }
 

package/lib/statement.js

@@ -86,7 +86,7 @@ var Statement = /*#__PURE__*/function () {
     key: "substitute",
     value: function substitute(bindings) {
       var y = new Statement(this.subject.substitute(bindings), this.predicate.substitute(bindings), this.object.substitute(bindings), (0, _defaultGraph.isDefaultGraph)(this.graph) ? this.graph : this.graph.substitute(bindings)); // 2016
-      console.log('@@@ statement substitute:' + y);
+      // console.log('@@@ statement substitute:' + y)
       return y;
     }
 

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.28",
+  "version": "2.2.30",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -94,7 +94,7 @@
     "build:types": "tsc --emitDeclarationOnly -d --moduleResolution node --declarationDir lib",
     "build:all": "npm run build && npm run build:types && npm run build:browser && npm run build:esm",
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
-    "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
+    "prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
     "postversion": "git push --follow-tags",
     "start": "webpack serve --port 4800",
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",

package/src/blank-node.ts

@@ -19,7 +19,6 @@ export default class BlankNode extends Node implements TFBlankNode {
   private static getId (id: string | unknown): string {
     if (id) {
       if (typeof id !== 'string') {
-        console.log('Bad blank id:', id)
         throw new Error('Bad id argument to new blank node: ' + id)
       }
 

package/src/fetcher.ts

@@ -1160,7 +1160,7 @@ export default class Fetcher implements CallbackifyInterface {
           size: 0,
           timeout: 0
         }
-        console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error)
+        // console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error)
         return this.handleError(dummyResponse, docuri, options) // possible credentials retry
         // return this.failFetch(options, 'fetch failed: ' + error, 999, dummyResponse) // Fake status code: fetch exception
 
@@ -1227,24 +1227,20 @@ export default class Fetcher implements CallbackifyInterface {
             if ((fetchResponse as Response).ok) {
               userCallback(true, 'OK', fetchResponse)
             } else {
-              // console.log('@@@ fetcher.js Should not take this path !!!!!!!!!!!!')
               let oops = 'HTTP error: Status ' + fetchResponse.status + ' (' + fetchResponse.statusText + ')'
               if (fetchResponse.responseText) {
                 oops += ' ' + fetchResponse.responseText // not in 404, dns error, nock failure
               }
-              console.log(oops + ' fetching ' + uri)
               userCallback(false, oops, fetchResponse)
             }
           } else {
             let oops = ('@@ nowOrWhenFetched:  no response object!')
-            console.log(oops)
             userCallback(false, oops)
           }
         }
       }, function (err: FetchError) {
         var message = err.message || err.statusText
         message = 'Failed to load  <' + uri + '> ' + message
-        console.log(message)
         if (err.response && err.response.status) {
           message += ' status: ' + err.response.status
         }
@@ -1497,18 +1493,18 @@ export default class Fetcher implements CallbackifyInterface {
     } catch (err) {
       // @ts-ignore
       if (err.response.status === 404) {
-        console.log('createIfNotExists: doc does NOT exist, will create... ' + doc)
+        // console.log('createIfNotExists: doc does NOT exist, will create... ' + doc)
         try {
           response = await fetcher.webOperation('PUT', doc.value, {data, contentType})
         } catch (err) {
-          console.log('createIfNotExists doc FAILED: ' + doc + ': ' + err)
+          // console.log('createIfNotExists doc FAILED: ' + doc + ': ' + err)
           throw err
         }
         delete fetcher.requested[doc.value] // delete cached 404 error
         // console.log('createIfNotExists doc created ok ' + doc)
         return response
       } else {
-        console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err)
+        // console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err)
         throw err
       }
     }
@@ -1837,7 +1833,7 @@ export default class Fetcher implements CallbackifyInterface {
     docuri: string,
     options
   ): Promise<Result> {
-    console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource)
+    // console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource)
 
     options.retriedWithNoCredentials = true // protect against being called twice
 
@@ -1886,8 +1882,7 @@ export default class Fetcher implements CallbackifyInterface {
       let proxyUri = Fetcher.crossSiteProxy(docuri)
 
       if (proxyUri && !options.proxyUsed) {
-        console.log('web: Direct failed so trying proxy ' + proxyUri)
-
+        // console.log('web: Direct failed so trying proxy ' + proxyUri)
         return this.redirectToProxy(proxyUri, options)
       }
     }
@@ -1960,7 +1955,7 @@ export default class Fetcher implements CallbackifyInterface {
 
     // Check for masked errors (CORS, etc)
     if (response.status === 0) {
-      console.log('Masked error - status 0 for ' + docuri)
+      // console.log('Masked error - status 0 for ' + docuri)
       return this.handleError(response, docuri, options)
     }
 

package/src/formula.ts

@@ -589,7 +589,6 @@ export default class Formula extends Node {
     while (todo.length) {
       follow(todo.shift())
     }
-    // console.log('' + result.length + ' statements about ' + subject)
     return result
   }
 
@@ -736,10 +735,10 @@ export default class Formula extends Node {
     let statementsCopy = this.statements.map(function (ea) {
       return (ea as Statement).substitute(bindings)
     })
-    console.log('Formula subs statmnts:' + statementsCopy)
+    // console.log('Formula subs statmnts:' + statementsCopy)
     const y = new Formula()
     y.addAll(statementsCopy as Quad[])
-    console.log('indexed-form subs formula:' + y)
+    // console.log('indexed-form subs formula:' + y)
     return y as unknown as T
   }
 

package/src/node-internal.ts

@@ -33,7 +33,6 @@ export default abstract class Node {
    * @param bindings - Bindings of identifiers to nodes
    */
   substitute <T extends Node = Node>(bindings: Bindings): T {
-    console.log('@@@ node substitute' + this)
     return this as unknown as T
   }
 

package/src/statement.ts

@@ -99,7 +99,7 @@ export default class Statement<
       isDefaultGraph(this.graph) ? this.graph :
         (this.graph as G).substitute(bindings)
     ) // 2016
-    console.log('@@@ statement substitute:' + y)
+    // console.log('@@@ statement substitute:' + y)
     return y
   }