scratch-storage 3.0.0 → 3.0.2

package/dist/web/scratch-storage.js

@@ -153,15 +153,23 @@ const setMetadata = (name, value) => {
 const unsetMetadata = name => {
   metadata.delete(name);
 };
+
+/**
+ * Retrieve a named request metadata item.
+ * Only for use in tests. At the time of writing, used in scratch-vm tests.
+ * @param {RequestMetadata} name The name of the metadata item to retrieve.
+ * @returns {any} value The value of the metadata item, or `undefined` if it was not found.
+ */
+const getMetadata = name => metadata.get(name);
 module.exports = {
   Headers: crossFetch.Headers,
   RequestMetadata,
   applyMetadata,
   scratchFetch,
   setMetadata,
-  unsetMetadata
+  unsetMetadata,
+  getMetadata
 };
-if (false) {}
 
 /***/ }),
 
@@ -2439,27 +2447,39 @@ function BufferBigIntNotDefined () {
 /***/ }),
 
 /***/ 945:
-/***/ (function(module, exports) {
+/***/ ((module, exports, __webpack_require__) => {
 
-var global = typeof self !== 'undefined' ? self : this;
-var __self__ = (function () {
+// Save global object in a variable
+var __global__ =
+(typeof globalThis !== 'undefined' && globalThis) ||
+(typeof self !== 'undefined' && self) ||
+(typeof __webpack_require__.g !== 'undefined' && __webpack_require__.g);
+// Create an object that extends from __global__ without the fetch function
+var __globalThis__ = (function () {
 function F() {
 this.fetch = false;
-this.DOMException = global.DOMException
+this.DOMException = __global__.DOMException
 }
-F.prototype = global;
+F.prototype = __global__; // Needed for feature detection on whatwg-fetch's code
 return new F();
 })();
-(function(self) {
+// Wraps whatwg-fetch with a function scope to hijack the global object
+// "globalThis" that's going to be patched
+(function(globalThis) {
 
 var irrelevant = (function (exports) {
 
+  var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof self !== 'undefined' && self) ||
+    (typeof global !== 'undefined' && global);
+
   var support = {
-    searchParams: 'URLSearchParams' in self,
-    iterable: 'Symbol' in self && 'iterator' in Symbol,
+    searchParams: 'URLSearchParams' in global,
+    iterable: 'Symbol' in global && 'iterator' in Symbol,
     blob:
-      'FileReader' in self &&
-      'Blob' in self &&
+      'FileReader' in global &&
+      'Blob' in global &&
       (function() {
         try {
           new Blob();
@@ -2468,8 +2488,8 @@ var irrelevant = (function (exports) {
           return false
         }
       })(),
-    formData: 'FormData' in self,
-    arrayBuffer: 'ArrayBuffer' in self
+    formData: 'FormData' in global,
+    arrayBuffer: 'ArrayBuffer' in global
   };
 
   function isDataView(obj) {
@@ -2500,8 +2520,8 @@ var irrelevant = (function (exports) {
     if (typeof name !== 'string') {
       name = String(name);
     }
-    if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(name)) {
-      throw new TypeError('Invalid character in header field name')
+    if (/[^a-z0-9\-#$%&'*+.^_`|~!]/i.test(name) || name === '') {
+      throw new TypeError('Invalid character in header field name: "' + name + '"')
     }
     return name.toLowerCase()
   }
@@ -2665,6 +2685,17 @@ var irrelevant = (function (exports) {
     this.bodyUsed = false;
 
     this._initBody = function(body) {
+      /*
+        fetch-mock wraps the Response object in an ES6 Proxy to
+        provide useful test harness features such as flush. However, on
+        ES5 browsers without fetch or Proxy support pollyfills must be used;
+        the proxy-pollyfill is unable to proxy an attribute unless it exists
+        on the object before the Proxy is created. This change ensures
+        Response.bodyUsed exists on the instance, while maintaining the
+        semantic of setting Request.bodyUsed in the constructor before
+        _initBody is called.
+      */
+      this.bodyUsed = this.bodyUsed;
       this._bodyInit = body;
       if (!body) {
         this._bodyText = '';
@@ -2717,7 +2748,20 @@ var irrelevant = (function (exports) {
 
       this.arrayBuffer = function() {
         if (this._bodyArrayBuffer) {
-          return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
+          var isConsumed = consumed(this);
+          if (isConsumed) {
+            return isConsumed
+          }
+          if (ArrayBuffer.isView(this._bodyArrayBuffer)) {
+            return Promise.resolve(
+              this._bodyArrayBuffer.buffer.slice(
+                this._bodyArrayBuffer.byteOffset,
+                this._bodyArrayBuffer.byteOffset + this._bodyArrayBuffer.byteLength
+              )
+            )
+          } else {
+            return Promise.resolve(this._bodyArrayBuffer)
+          }
         } else {
           return this.blob().then(readBlobAsArrayBuffer)
         }
@@ -2763,6 +2807,10 @@ var irrelevant = (function (exports) {
   }
 
   function Request(input, options) {
+    if (!(this instanceof Request)) {
+      throw new TypeError('Please use the "new" operator, this DOM object constructor cannot be called as a function.')
+    }
+
     options = options || {};
     var body = options.body;
 
@@ -2799,6 +2847,21 @@ var irrelevant = (function (exports) {
       throw new TypeError('Body not allowed for GET or HEAD requests')
     }
     this._initBody(body);
+
+    if (this.method === 'GET' || this.method === 'HEAD') {
+      if (options.cache === 'no-store' || options.cache === 'no-cache') {
+        // Search for a '_' parameter in the query string
+        var reParamSearch = /([?&])_=[^&]*/;
+        if (reParamSearch.test(this.url)) {
+          // If it already exists then set the value with the current time
+          this.url = this.url.replace(reParamSearch, '$1_=' + new Date().getTime());
+        } else {
+          // Otherwise add a new '_' parameter to the end with the current time
+          var reQueryString = /\?/;
+          this.url += (reQueryString.test(this.url) ? '&' : '?') + '_=' + new Date().getTime();
+        }
+      }
+    }
   }
 
   Request.prototype.clone = function() {
@@ -2826,20 +2889,31 @@ var irrelevant = (function (exports) {
     // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
     // https://tools.ietf.org/html/rfc7230#section-3.2
     var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
-    preProcessedHeaders.split(/\r?\n/).forEach(function(line) {
-      var parts = line.split(':');
-      var key = parts.shift().trim();
-      if (key) {
-        var value = parts.join(':').trim();
-        headers.append(key, value);
-      }
-    });
+    // Avoiding split via regex to work around a common IE11 bug with the core-js 3.6.0 regex polyfill
+    // https://github.com/github/fetch/issues/748
+    // https://github.com/zloirock/core-js/issues/751
+    preProcessedHeaders
+      .split('\r')
+      .map(function(header) {
+        return header.indexOf('\n') === 0 ? header.substr(1, header.length) : header
+      })
+      .forEach(function(line) {
+        var parts = line.split(':');
+        var key = parts.shift().trim();
+        if (key) {
+          var value = parts.join(':').trim();
+          headers.append(key, value);
+        }
+      });
     return headers
   }
 
   Body.call(Request.prototype);
 
   function Response(bodyInit, options) {
+    if (!(this instanceof Response)) {
+      throw new TypeError('Please use the "new" operator, this DOM object constructor cannot be called as a function.')
+    }
     if (!options) {
       options = {};
     }
@@ -2847,7 +2921,7 @@ var irrelevant = (function (exports) {
     this.type = 'default';
     this.status = options.status === undefined ? 200 : options.status;
     this.ok = this.status >= 200 && this.status < 300;
-    this.statusText = 'statusText' in options ? options.statusText : 'OK';
+    this.statusText = options.statusText === undefined ? '' : '' + options.statusText;
     this.headers = new Headers(options.headers);
     this.url = options.url || '';
     this._initBody(bodyInit);
@@ -2880,7 +2954,7 @@ var irrelevant = (function (exports) {
     return new Response(null, {status: status, headers: {location: url}})
   };
 
-  exports.DOMException = self.DOMException;
+  exports.DOMException = global.DOMException;
   try {
     new exports.DOMException();
   } catch (err) {
@@ -2916,22 +2990,38 @@ var irrelevant = (function (exports) {
         };
         options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL');
         var body = 'response' in xhr ? xhr.response : xhr.responseText;
-        resolve(new Response(body, options));
+        setTimeout(function() {
+          resolve(new Response(body, options));
+        }, 0);
       };
 
       xhr.onerror = function() {
-        reject(new TypeError('Network request failed'));
+        setTimeout(function() {
+          reject(new TypeError('Network request failed'));
+        }, 0);
       };
 
       xhr.ontimeout = function() {
-        reject(new TypeError('Network request failed'));
+        setTimeout(function() {
+          reject(new TypeError('Network request failed'));
+        }, 0);
       };
 
       xhr.onabort = function() {
-        reject(new exports.DOMException('Aborted', 'AbortError'));
+        setTimeout(function() {
+          reject(new exports.DOMException('Aborted', 'AbortError'));
+        }, 0);
       };
 
-      xhr.open(request.method, request.url, true);
+      function fixUrl(url) {
+        try {
+          return url === '' && global.location.href ? global.location.href : url
+        } catch (e) {
+          return url
+        }
+      }
+
+      xhr.open(request.method, fixUrl(request.url), true);
 
       if (request.credentials === 'include') {
         xhr.withCredentials = true;
@@ -2939,13 +3029,27 @@ var irrelevant = (function (exports) {
         xhr.withCredentials = false;
       }
 
-      if ('responseType' in xhr && support.blob) {
-        xhr.responseType = 'blob';
+      if ('responseType' in xhr) {
+        if (support.blob) {
+          xhr.responseType = 'blob';
+        } else if (
+          support.arrayBuffer &&
+          request.headers.get('Content-Type') &&
+          request.headers.get('Content-Type').indexOf('application/octet-stream') !== -1
+        ) {
+          xhr.responseType = 'arraybuffer';
+        }
       }
 
-      request.headers.forEach(function(value, name) {
-        xhr.setRequestHeader(name, value);
-      });
+      if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers)) {
+        Object.getOwnPropertyNames(init.headers).forEach(function(name) {
+          xhr.setRequestHeader(name, normalizeValue(init.headers[name]));
+        });
+      } else {
+        request.headers.forEach(function(value, name) {
+          xhr.setRequestHeader(name, value);
+        });
+      }
 
       if (request.signal) {
         request.signal.addEventListener('abort', abortXhr);
@@ -2964,11 +3068,11 @@ var irrelevant = (function (exports) {
 
   fetch.polyfill = true;
 
-  if (!self.fetch) {
-    self.fetch = fetch;
-    self.Headers = Headers;
-    self.Request = Request;
-    self.Response = Response;
+  if (!global.fetch) {
+    global.fetch = fetch;
+    global.Headers = Headers;
+    global.Request = Request;
+    global.Response = Response;
   }
 
   exports.Headers = Headers;
@@ -2976,18 +3080,15 @@ var irrelevant = (function (exports) {
   exports.Response = Response;
   exports.fetch = fetch;
 
-  Object.defineProperty(exports, '__esModule', { value: true });
-
   return exports;
 
 })({});
-})(__self__);
-__self__.fetch.ponyfill = true;
-// Remove "polyfill" property added by whatwg-fetch
-delete __self__.fetch.polyfill;
-// Choose between native implementation (global) or custom implementation (__self__)
-// var ctx = global.fetch ? global : __self__;
-var ctx = __self__; // this line disable service worker support temporarily
+})(__globalThis__);
+// This is a ponyfill, so...
+__globalThis__.fetch.ponyfill = true;
+delete __globalThis__.fetch.polyfill;
+// Choose between native implementation (__global__) or custom implementation (__globalThis__)
+var ctx = __global__.fetch ? __global__ : __globalThis__;
 exports = ctx.fetch // To enable: import fetch from 'cross-fetch'
 exports["default"] = ctx.fetch // For TypeScript consumers without esModuleInterop.
 exports.fetch = ctx.fetch // To enable: import {fetch} from 'cross-fetch'
@@ -4407,7 +4508,7 @@ module.exports = logger;
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "chunks/" + "fetch-worker" + "." + "ba5eddd48c8ae259073b" + ".js";
+/******/ 			return "chunks/" + "fetch-worker" + "." + "cd3a909d7b876aabf94a" + ".js";
 /******/ 		};
 /******/ 	})();
 /******/ 	
@@ -4490,14 +4591,14 @@ __webpack_require__.d(__webpack_exports__, {
 // EXTERNAL MODULE: ./node_modules/minilog/lib/web/index.js
 var web = __webpack_require__(557);
 var web_default = /*#__PURE__*/__webpack_require__.n(web);
-;// CONCATENATED MODULE: ./src/log.ts
+;// ./src/log.ts
 
 web_default().enable();
 /* harmony default export */ const log = (web_default()('storage'));
 // EXTERNAL MODULE: ./node_modules/js-md5/src/md5.js
 var md5 = __webpack_require__(386);
 var md5_default = /*#__PURE__*/__webpack_require__.n(md5);
-;// CONCATENATED MODULE: ./src/memoizedToString.ts
+;// ./src/memoizedToString.ts
 // Use JS implemented TextDecoder and TextEncoder if it is not provided by the
 // browser.
 let _TextDecoder;
@@ -4570,7 +4671,7 @@ const memoizedToString = function () {
   };
 }();
 
-;// CONCATENATED MODULE: ./src/Asset.ts
+;// ./src/Asset.ts
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -4643,7 +4744,7 @@ class Asset {
     return "data:".concat(contentType, ";base64,").concat(memoizedToString(this.assetId, this.data));
   }
 }
-;// CONCATENATED MODULE: ./src/DataFormat.ts
+;// ./src/DataFormat.ts
 /**
  * Enumeration of the supported data formats.
  * @enum {string}
@@ -4658,7 +4759,7 @@ const DataFormat = {
   SVG: 'svg',
   WAV: 'wav'
 };
-;// CONCATENATED MODULE: ./src/AssetType.ts
+;// ./src/AssetType.ts
 
 /**
  * Enumeration of the supported asset types.
@@ -4702,7 +4803,7 @@ const AssetType = {
     immutable: true
   }
 };
-;// CONCATENATED MODULE: ./src/Helper.ts
+;// ./src/Helper.ts
 function Helper_defineProperty(e, r, t) { return (r = Helper_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function Helper_toPropertyKey(t) { var i = Helper_toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function Helper_toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -4737,7 +4838,7 @@ var defaultVectorarrayBuffer = __webpack_require__(914);
 var defaultVectorarrayBuffer_default = /*#__PURE__*/__webpack_require__.n(defaultVectorarrayBuffer);
 // EXTERNAL MODULE: ./node_modules/buffer/index.js
 var buffer = __webpack_require__(287);
-;// CONCATENATED MODULE: ./src/BuiltinHelper.ts
+;// ./src/BuiltinHelper.ts
 function BuiltinHelper_defineProperty(e, r, t) { return (r = BuiltinHelper_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function BuiltinHelper_toPropertyKey(t) { var i = BuiltinHelper_toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function BuiltinHelper_toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -4882,7 +4983,7 @@ class BuiltinHelper extends Helper {
 // EXTERNAL MODULE: ./src/scratchFetch.js
 var scratchFetch = __webpack_require__(953);
 var scratchFetch_default = /*#__PURE__*/__webpack_require__.n(scratchFetch);
-;// CONCATENATED MODULE: ./src/FetchWorkerTool.ts
+;// ./src/FetchWorkerTool.ts
 const _excluded = ["url"];
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
@@ -5076,7 +5177,7 @@ class PublicFetchWorkerTool {
     throw new Error('Not implemented.');
   }
 }
-;// CONCATENATED MODULE: ./src/FetchTool.ts
+;// ./src/FetchTool.ts
 const FetchTool_excluded = ["url"],
   _excluded2 = ["url", "withCredentials"];
 function FetchTool_objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = FetchTool_objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
@@ -5142,7 +5243,7 @@ class FetchTool {
     });
   }
 }
-;// CONCATENATED MODULE: ./src/ProxyTool.ts
+;// ./src/ProxyTool.ts
 function ProxyTool_defineProperty(e, r, t) { return (r = ProxyTool_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function ProxyTool_toPropertyKey(t) { var i = ProxyTool_toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function ProxyTool_toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -5234,7 +5335,7 @@ ProxyTool_defineProperty(ProxyTool, "TOOL_FILTER", {
    */
   READY: 'ready'
 });
-;// CONCATENATED MODULE: ./src/WebHelper.ts
+;// ./src/WebHelper.ts
 function WebHelper_defineProperty(e, r, t) { return (r = WebHelper_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function WebHelper_toPropertyKey(t) { var i = WebHelper_toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function WebHelper_toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -5402,7 +5503,7 @@ class WebHelper extends Helper {
     });
   }
 }
-;// CONCATENATED MODULE: ./src/ScratchStorage.ts
+;// ./src/ScratchStorage.ts
 function ScratchStorage_defineProperty(e, r, t) { return (r = ScratchStorage_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function ScratchStorage_toPropertyKey(t) { var i = ScratchStorage_toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function ScratchStorage_toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -5627,7 +5728,7 @@ class ScratchStorage {
     });
   }
 }
-;// CONCATENATED MODULE: ./src/index.ts
+;// ./src/index.ts