rdflib 2.3.0 → 2.3.1-07daeac2

package/esm/factories/rdflib-data-factory.js

@@ -15,9 +15,7 @@ const RDFlibDataFactory = {
   /**
    * Creates a new graph (store)
    */
-  graph() {
-    let features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-    let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  graph(features = undefined, opts = undefined) {
     return new IndexedFormula(features, opts || {
       rdfFactory: ExtendedTermFactory
     });

package/esm/fetcher.js

@@ -435,8 +435,7 @@ function isXMLNS(responseText) {
   * and put back the data to the web.
  */
 export default class Fetcher {
-  constructor(store) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  constructor(store, options = {}) {
     _defineProperty(this, "store", void 0);
     _defineProperty(this, "timeout", void 0);
     _defineProperty(this, "_fetch", void 0);
@@ -589,8 +588,7 @@ export default class Fetcher {
    * @param requestedURI
    * @param options
    */
-  static setCredentials(requestedURI) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  static setCredentials(requestedURI, options = {}) {
     // 2014 CORS problem:
     // XMLHttpRequest cannot load http://www.w3.org/People/Berners-Lee/card.
     // A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin'
@@ -653,8 +651,7 @@ export default class Fetcher {
    *
    * @returns {Promise<Result>}
    */
-  load(uri) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  load(uri, options = {}) {
     options = Object.assign({}, options); // Take a copy as we add stuff to the options!!
     if (uri instanceof Array) {
       return Promise.all(uri.map(x => {
@@ -872,8 +869,7 @@ export default class Fetcher {
    *    response         The fetch Response object (was: XHR) if there was was one
    *                     includes response.status as the HTTP status if any.
    */
-  nowOrWhenFetched(uriIn, p2, userCallback) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  nowOrWhenFetched(uriIn, p2, userCallback, options = {}) {
     const uri = termValue(uriIn);
     if (typeof p2 === 'function') {
       // nowOrWhenFetched (uri, userCallback)
@@ -1055,8 +1051,7 @@ export default class Fetcher {
   /**
    * Writes back to the web what we have in the store for this uri
    */
-  putBack(uri) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  putBack(uri, options = {}) {
     const uriSting = termValue(uri);
     let doc = new RDFlibNamedNode(uriSting).doc(); // strip off #
     options.contentType = options["content-type"] || options["Content-Type"] || options.contentType || TurtleContentType;
@@ -1100,9 +1095,7 @@ export default class Fetcher {
    * as otherwise existing could  be deleted.
    * @param doc - The resource
   */
-  async createIfNotExists(doc) {
-    let contentType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TurtleContentType;
-    let data = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  async createIfNotExists(doc, contentType = TurtleContentType, data = '') {
     const fetcher = this;
     try {
       var response = await fetcher.load(doc);
@@ -1187,8 +1180,9 @@ export default class Fetcher {
    *  Returns promise of Response
    *  If data is returned, copies it to response.responseText before returning
    */
-  webOperation(method, uriIn) {
-    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  webOperation(method, uriIn,
+  // Not sure about this type. Maybe this Options is different?
+  options = {}) {
     const uri = termValue(uriIn);
     options.method = method;
     options.body = options.data || options.body;

package/esm/formula.js

@@ -25,15 +25,8 @@ export default class Formula extends Node {
    * @param opts
    * @param opts.rdfFactory - The rdf factory that should be used by the store
   */
-  constructor() {
-    var _this;
-    let statements = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    let constraints = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    let initBindings = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-    let optional = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    let opts = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  constructor(statements = [], constraints = [], initBindings = [], optional = [], opts = {}) {
     super('');
-    _this = this;
     this.statements = statements;
     this.constraints = constraints;
     this.initBindings = initBindings;
@@ -57,9 +50,7 @@ export default class Formula extends Node {
     this.rdfFactory = opts && opts.rdfFactory || CanonicalDataFactory;
     // Enable default factory methods on this while preserving factory context.
     for (const factoryMethod of appliedFactoryMethods) {
-      this[factoryMethod] = function () {
-        return _this.rdfFactory[factoryMethod](...arguments);
-      };
+      this[factoryMethod] = (...args) => this.rdfFactory[factoryMethod](...args);
     }
   }
 

package/esm/n3parser.js

@@ -183,9 +183,19 @@ var ws = new RegExp("^[ \\t]*", 'g');
 var signed_integer = new RegExp("^[-+]?[0-9]+", 'g');
 var number_syntax = new RegExp("^([-+]?[0-9]+)(\\.[0-9]+)?([eE][-+]?[0-9]+)?", 'g');
 var datetime_syntax = new RegExp('^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9](T[0-9][0-9]:[0-9][0-9](:[0-9][0-9](\\.[0-9]*)?)?)?Z?');
+
+// Reused in tight loops to detect whitespace or comment after a dot
+var wsOrHash = new RegExp("[\\s#]");
 var digitstring = new RegExp("^[0-9]+", 'g');
 var interesting = new RegExp("[\\\\\\r\\n\\\"]", 'g');
 var langcode = new RegExp("^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*", 'g');
+
+// Returns true when a dot at position i should terminate a name,
+// i.e., when the next character is whitespace, a comment start, or EOF
+function dotTerminatesName(str, i) {
+  var next = str.charAt(i + 1);
+  return next === '' || wsOrHash.test(next);
+}
 function createSinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
   return new SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why);
 }
@@ -674,6 +684,16 @@ export class SinkParser {
       if (j < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when ']' expected after [ <propertyList>");
       }
+      if (str.slice(j, j + 1) == ".") {
+        // If a dot is found after a blank node, treat it as a statement terminator.
+        // Do NOT consume the '.' here: statement terminators are handled centrally by
+        // checkDot() (called by directiveOrStatement after statement()). Consuming the dot
+        // locally would bypass that unified logic and could cause inconsistencies.
+        // We do consume ']' below because it is a structural closer of the blank node,
+        // not a statement terminator.
+        res.push(subj);
+        return j; // leave '.' for checkDot()
+      }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
       }
@@ -1122,7 +1142,17 @@ export class SinkParser {
       return -1;
     }
     var i = j;
-    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
+    while (i < pyjslib_len(str)) {
+      var c = str.charAt(i);
+      if (c === '.') {
+        if (dotTerminatesName(str, i)) {
+          break; // treat as statement terminator, not part of name
+        }
+        // else: accept '.' as part of name
+      } else if (_notNameChars.indexOf(c) >= 0) {
+        // Other invalid characters terminate the name
+        break;
+      }
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1148,12 +1178,15 @@ export class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1164,12 +1197,15 @@ export class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

package/esm/parse.js

@@ -19,9 +19,7 @@ import { TurtleContentType, N3ContentType, RDFXMLContentType, XHTMLContentType,
  * @param contentType - The MIME content type string for the input - defaults to text/turtle
  * @param [callback] - The callback to call when the data has been loaded
  */
-export default function parse(str, kb, base) {
-  let contentType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'text/turtle';
-  let callback = arguments.length > 4 ? arguments[4] : undefined;
+export default function parse(str, kb, base, contentType = 'text/turtle', callback) {
   contentType = contentType || TurtleContentType;
   contentType = contentType.split(';')[0];
   try {

package/esm/serialize.js

@@ -40,7 +40,8 @@ contentType, callback, options) {
         return executeCallback(null, documentString);
       case TurtleContentType:
       case TurtleLegacyContentType:
-        sz.setFlags('si'); // Suppress = for sameAs and => for implies
+        // Suppress = for sameAs and => for implies; preserve any user-specified flags (e.g., 'o')
+        sz.setFlags('si' + (opts.flags ? ' ' + opts.flags : ''));
         documentString = sz.statementsToN3(newSts);
         return executeCallback(null, documentString);
       case NTriplesContentType:
@@ -48,7 +49,8 @@ contentType, callback, options) {
         documentString = sz.statementsToNTriples(newSts);
         return executeCallback(null, documentString);
       case JSONLDContentType:
-        sz.setFlags('si dr'); // turtle + dr (means no default, no relative prefix)
+        // turtle + dr (means no default, no relative prefix); preserve user flags
+        sz.setFlags('si dr' + (opts.flags ? ' ' + opts.flags : ''));
         documentString = sz.statementsToJsonld(newSts); // convert via turtle
         return executeCallback(null, documentString);
       case NQuadsContentType:

package/esm/serializer.js

@@ -6,21 +6,20 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 ** This is or was https://github.com/linkeddata/rdflib.js/blob/main/src/serializer.js
 ** Licence: MIT
 */
-import NamedNode from './named-node';
-import BlankNode from './blank-node';
+import * as ttl2jsonld from '@frogcat/ttl2jsonld';
+import solidNs from 'solid-namespace';
+import CanonicalDataFactory from './factories/canonical-data-factory';
 import * as Uri from './uri';
 import * as Util from './utils-js';
-import CanonicalDataFactory from './factories/canonical-data-factory';
 import { createXSD } from './xsd';
-import solidNs from 'solid-namespace';
-import * as ttl2jsonld from '@frogcat/ttl2jsonld';
 export default function createSerializer(store) {
   return new Serializer(store);
 }
 ;
 export class Serializer {
   constructor(store) {
-    _defineProperty(this, "_notQNameChars", '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~');
+    _defineProperty(this, "_notQNameChars", '\t\r\n !"#$%&\'()*,+/;<=>?@[\\]^`{|}~');
+    // issue#228
     _defineProperty(this, "_notNameChars", this._notQNameChars + ':');
     //  stringToN3:  String escaping for N3
     _defineProperty(this, "validPrefix", new RegExp(/^[a-zA-Z][a-zA-Z0-9]*$/));
@@ -42,7 +41,7 @@ export class Serializer {
 
     this.namespacesUsed = []; // Count actually used and so needed in @prefixes
     this.keywords = ['a']; // The only one we generate at the moment
-    this.prefixchars = 'abcdefghijklmnopqustuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    this.prefixchars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     this.incoming = null; // Array not calculated yet
     this.formulas = []; // remembering original formulae from hashes
     this.store = store;
@@ -53,6 +52,13 @@ export class Serializer {
     this.base = base;
     return this;
   }
+
+  /**
+   * Set serializer behavior flags. Letters can be combined with spaces.
+   * Examples: 'si', 'deinprstux', 'si dr', 'o'.
+   * Notable flags:
+   *  - 'o': do not abbreviate to a prefixed name when the local part contains a dot
+   */
   setFlags(flags) {
     this.flags = flags || '';
     return this;
@@ -162,7 +168,7 @@ export class Serializer {
     if (slash >= 0) p = p.slice(slash + 1);
     var i = 0;
     while (i < p.length) {
-      if (this.prefixchars.indexOf(p[i])) {
+      if (this.prefixchars.indexOf(p[i]) >= 0) {
         i++;
       } else {
         break;
@@ -243,6 +249,28 @@ export class Serializer {
   toN3(f) {
     return this.statementsToN3(f.statements);
   }
+  // Validate if a string is a valid PN_LOCAL per Turtle 1.1 spec
+  // Allows dots inside the local name but not as trailing character
+  // Also allows empty local names (for URIs ending in / or #)
+  isValidPNLocal(local) {
+    // Empty local name is valid (e.g., ex: for http://example.com/)
+    if (local.length === 0) return true;
+
+    // Cannot end with a dot
+    if (local[local.length - 1] === '.') return false;
+
+    // Check each character (allow dots mid-string)
+    for (var i = 0; i < local.length; i++) {
+      var ch = local[i];
+      // Dot is allowed unless it's the last character (checked above)
+      if (ch === '.') continue;
+      // Other characters must not be in the blacklist
+      if (this._notNameChars.indexOf(ch) >= 0) {
+        return false;
+      }
+    }
+    return true;
+  }
   explicitURI(uri) {
     if (this.flags.indexOf('r') < 0 && this.base) {
       uri = Uri.refTo(this.base, uri);
@@ -605,13 +633,17 @@ export class Serializer {
     if (j >= 0 && this.flags.indexOf('p') < 0 && (
     // Can split at namespace but only if http[s]: URI or file: or ws[s] (why not others?)
     uri.indexOf('http') === 0 || uri.indexOf('ws') === 0 || uri.indexOf('file') === 0)) {
-      var canSplit = true;
-      for (var k = j + 1; k < uri.length; k++) {
-        if (this._notNameChars.indexOf(uri[k]) >= 0) {
-          canSplit = false;
-          break;
-        }
-      }
+      var localid = uri.slice(j + 1);
+      var namesp = uri.slice(0, j + 1);
+      // Don't split if namespace is just the protocol (e.g., https://)
+      // A valid namespace should have content after the protocol
+      var minNamespaceLength = uri.indexOf('://') + 4; // e.g., "http://x" minimum
+      // Also don't split if namespace is the base directory (would serialize as relative URI)
+      var baseDir = this.base ? this.base.slice(0, Math.max(this.base.lastIndexOf('/'), this.base.lastIndexOf('#')) + 1) : null;
+      var namespaceIsBaseDir = baseDir && namesp === baseDir;
+      // If flag 'o' is present, forbid dots in local part when abbreviating
+      var forbidDotLocal = this.flags.indexOf('o') >= 0 && localid.indexOf('.') >= 0;
+      var canSplit = !namespaceIsBaseDir && !forbidDotLocal && namesp.length > minNamespaceLength && this.isValidPNLocal(localid);
       /*
             if (uri.slice(0, j + 1) === this.base + '#') { // base-relative
               if (canSplit) {
@@ -622,8 +654,6 @@ export class Serializer {
             }
       */
       if (canSplit) {
-        var localid = uri.slice(j + 1);
-        var namesp = uri.slice(0, j + 1);
         if (this.defaultNamespace && this.defaultNamespace === namesp && this.flags.indexOf('d') < 0) {
           // d -> suppress default
           if (this.flags.indexOf('k') >= 0 && this.keyords.indexOf(localid) < 0) {
@@ -844,7 +874,7 @@ export class Serializer {
             results = results.concat(['<' + t + ' rdf:resource="' + relURI(st.object) + '"/>']);
             break;
           case 'Literal':
-            results = results.concat(['<' + t + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
+            results = results.concat(['<' + t + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
             break;
           case 'Collection':
             results = results.concat(['<' + t + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + t + '>']);
@@ -895,7 +925,7 @@ export class Serializer {
             results = results.concat(['<' + qname(st.predicate) + ' rdf:resource="' + relURI(st.object) + '"/>']);
             break;
           case 'Literal':
-            results = results.concat(['<' + qname(st.predicate) + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
+            results = results.concat(['<' + qname(st.predicate) + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
             break;
           case 'Collection':
             results = results.concat(['<' + qname(st.predicate) + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + qname(st.predicate) + '>']);

package/esm/store.js

@@ -92,8 +92,7 @@ export default class IndexedFormula extends Formula {
    * @param [opts.rdfArrayRemove] - Function which removes statements from the store
    * @param [opts.dataCallback] - Callback when a statement is added to the store, will not trigger when adding duplicates
    */
-  constructor(features) {
-    let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  constructor(features, opts = {}) {
     super(undefined, undefined, undefined, undefined, opts);
     // IN future - allow pass array of statements to constructor
     /**

package/esm/update-manager.js

@@ -378,8 +378,7 @@ export default class UpdateManager {
   /**
    * @private
    */
-  fire(uri, query, callbackFunction) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  fire(uri, query, callbackFunction, options = {}) {
     return Promise.resolve().then(() => {
       if (!uri) {
         throw new Error('No URI given for remote editing operation: ' + query);
@@ -667,8 +666,7 @@ export default class UpdateManager {
    * @param insertions - Statement or statements to be inserted.
    * @returns a promise
    */
-  updateMany(deletions) {
-    let insertions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  updateMany(deletions, insertions = []) {
     const docs = deletions.concat(insertions).map(st => st.why);
     const thisUpdater = this;
     const uniqueDocs = [];
@@ -781,8 +779,7 @@ _:patch
    *           OR returns a promise
    * @param options - Options for the fetch call
    */
-  update(deletions, insertions, callback, secondTry) {
-    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  update(deletions, insertions, callback, secondTry, options = {}) {
     if (!callback) {
       var thisUpdater = this;
       return new Promise(function (resolve, reject) {
@@ -925,8 +922,7 @@ _:patch
       callback(undefined, false, 'Exception in update: ' + e + '\n' + Util.stackString(e));
     }
   }
-  updateDav(doc, ds, is, callbackFunction) {
-    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  updateDav(doc, ds, is, callbackFunction, options = {}) {
     let kb = this.store;
     // The code below is derived from Kenny's UpdateCenter.js
     var request = kb.any(doc, this.ns.link('request'));
@@ -983,8 +979,7 @@ _:patch
    * @param callbackFunction
    * @param options
    */
-  updateLocalFile(doc, ds, is, callbackFunction) {
-    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  updateLocalFile(doc, ds, is, callbackFunction, options = {}) {
     const kb = this.store;
     // console.log('Writing back to local file\n')
 

package/esm/utils.js

@@ -79,8 +79,7 @@ export function arrayToStatements(rdfFactory, subject, data) {
   }, subject);
   return statements;
 }
-export function ArrayIndexOf(arr, item) {
-  let i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+export function ArrayIndexOf(arr, item, i = 0) {
   var length = arr.length;
   if (i < 0) i = length + i;
   for (; i < length; i++) {

package/esm/variable.js

@@ -15,8 +15,7 @@ export default class Variable extends Node {
    * Initializes this variable
    * @param name The variable's name
    */
-  constructor() {
-    let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  constructor(name = '') {
     super(name);
     _defineProperty(this, "termType", VariableTermType);
     /** The base string for a variable's name */

package/esm/xsd.js

@@ -1,6 +1,5 @@
 import CanonicalDataFactory from "./factories/canonical-data-factory";
-export function createXSD() {
-  let localFactory = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : CanonicalDataFactory;
+export function createXSD(localFactory = CanonicalDataFactory) {
   return {
     boolean: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#boolean"),
     dateTime: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#dateTime"),

package/lib/factories/rdflib-data-factory.js

@@ -22,9 +22,7 @@ const RDFlibDataFactory = {
   /**
    * Creates a new graph (store)
    */
-  graph() {
-    let features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-    let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  graph(features = undefined, opts = undefined) {
     return new _store.default(features, opts || {
       rdfFactory: _extendedTermFactory.default
     });

package/lib/fetcher.js

@@ -444,8 +444,7 @@ function isXMLNS(responseText) {
   * and put back the data to the web.
  */
 class Fetcher {
-  constructor(store) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  constructor(store, options = {}) {
     (0, _defineProperty2.default)(this, "store", void 0);
     (0, _defineProperty2.default)(this, "timeout", void 0);
     (0, _defineProperty2.default)(this, "_fetch", void 0);
@@ -598,8 +597,7 @@ class Fetcher {
    * @param requestedURI
    * @param options
    */
-  static setCredentials(requestedURI) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  static setCredentials(requestedURI, options = {}) {
     // 2014 CORS problem:
     // XMLHttpRequest cannot load http://www.w3.org/People/Berners-Lee/card.
     // A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin'
@@ -662,8 +660,7 @@ class Fetcher {
    *
    * @returns {Promise<Result>}
    */
-  load(uri) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  load(uri, options = {}) {
     options = Object.assign({}, options); // Take a copy as we add stuff to the options!!
     if (uri instanceof Array) {
       return Promise.all(uri.map(x => {
@@ -881,8 +878,7 @@ class Fetcher {
    *    response         The fetch Response object (was: XHR) if there was was one
    *                     includes response.status as the HTTP status if any.
    */
-  nowOrWhenFetched(uriIn, p2, userCallback) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  nowOrWhenFetched(uriIn, p2, userCallback, options = {}) {
     const uri = (0, _termValue.termValue)(uriIn);
     if (typeof p2 === 'function') {
       // nowOrWhenFetched (uri, userCallback)
@@ -1064,8 +1060,7 @@ class Fetcher {
   /**
    * Writes back to the web what we have in the store for this uri
    */
-  putBack(uri) {
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  putBack(uri, options = {}) {
     const uriSting = (0, _termValue.termValue)(uri);
     let doc = new _namedNode.default(uriSting).doc(); // strip off #
     options.contentType = options["content-type"] || options["Content-Type"] || options.contentType || _types.TurtleContentType;
@@ -1109,9 +1104,7 @@ class Fetcher {
    * as otherwise existing could  be deleted.
    * @param doc - The resource
   */
-  async createIfNotExists(doc) {
-    let contentType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _types.TurtleContentType;
-    let data = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  async createIfNotExists(doc, contentType = _types.TurtleContentType, data = '') {
     const fetcher = this;
     try {
       var response = await fetcher.load(doc);
@@ -1196,8 +1189,9 @@ class Fetcher {
    *  Returns promise of Response
    *  If data is returned, copies it to response.responseText before returning
    */
-  webOperation(method, uriIn) {
-    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  webOperation(method, uriIn,
+  // Not sure about this type. Maybe this Options is different?
+  options = {}) {
     const uri = (0, _termValue.termValue)(uriIn);
     options.method = method;
     options.body = options.data || options.body;

package/lib/formula.js

@@ -32,15 +32,8 @@ class Formula extends _nodeInternal.default {
    * @param opts
    * @param opts.rdfFactory - The rdf factory that should be used by the store
   */
-  constructor() {
-    var _this;
-    let statements = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    let constraints = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    let initBindings = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-    let optional = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    let opts = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  constructor(statements = [], constraints = [], initBindings = [], optional = [], opts = {}) {
     super('');
-    _this = this;
     this.statements = statements;
     this.constraints = constraints;
     this.initBindings = initBindings;
@@ -64,9 +57,7 @@ class Formula extends _nodeInternal.default {
     this.rdfFactory = opts && opts.rdfFactory || _canonicalDataFactory.default;
     // Enable default factory methods on this while preserving factory context.
     for (const factoryMethod of _utils.appliedFactoryMethods) {
-      this[factoryMethod] = function () {
-        return _this.rdfFactory[factoryMethod](...arguments);
-      };
+      this[factoryMethod] = (...args) => this.rdfFactory[factoryMethod](...args);
     }
   }