es-module-shims 1.7.3 → 1.8.1

package/README.md

@@ -29,7 +29,7 @@ Because we are still using the native module loader the edge cases work out comp
 Include ES Module Shims with a `async` attribute on the script, then include an import map and module scripts normally:
 
 ```html
-<script async src="https://ga.jspm.io/npm:es-module-shims@1.7.3/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.8.1/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">

package/dist/es-module-shims.debug.js

@@ -1,4 +1,4 @@
-/* ES Module Shims DEBUG BUILD 1.7.3 */
+/* ES Module Shims DEBUG BUILD 1.8.1 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -127,6 +127,9 @@
         relUrl.length === 1  && (relUrl += '/')) ||
         relUrl[0] === '/') {
       const parentProtocol = parentUrl.slice(0, parentUrl.indexOf(':') + 1);
+      if (parentProtocol === 'blob:') {
+        throw new TypeError(`Failed to resolve module specifier "${relUrl}". Invalid relative url or base scheme isn't hierarchical.`);
+      }
       // Disabled, but these cases will give inconsistent results for deep backtracking
       //if (parentUrl[parentProtocol.length] !== '/')
       //  throw new Error('Cannot resolve');
@@ -463,6 +466,7 @@
   };
 
   const registry = importShim._r = {};
+  importShim._w = {};
 
   async function loadAll (load, seen) {
     if (load.b || seen[load.u])
@@ -708,6 +712,7 @@
   const sourceMapURLCommentPrefix = '\n//# sourceMappingURL=';
 
   const jsContentType = /^(text|application)\/(x-)?javascript(;|$)/;
+  const wasmContentType = /^(application)\/wasm(;|$)/;
   const jsonContentType = /^(text|application)\/json(;|$)/;
   const cssContentType = /^(text|application)\/css(;|$)/;
 
@@ -741,8 +746,12 @@
     finally {
       popFetchPool();
     }
-    if (!res.ok)
-      throw Error(`${res.status} ${res.statusText} ${res.url}${fromParent(parent)}`);
+
+    if (!res.ok) {
+      const error = new TypeError(`${res.status} ${res.statusText} ${res.url}${fromParent(parent)}`);
+      error.response = res;
+      throw error;
+    }
     return res;
   }
 
@@ -751,6 +760,21 @@
     const contentType = res.headers.get('content-type');
     if (jsContentType.test(contentType))
       return { r: res.url, s: await res.text(), t: 'js' };
+    else if (wasmContentType.test(contentType)) {
+      const module = importShim._w[url] = await WebAssembly.compileStreaming(res);
+      let s = '', i = 0, importObj = '';
+      for (const impt of WebAssembly.Module.imports(module)) {
+        s += `import * as impt${i} from '${impt.module}';\n`;
+        importObj += `'${impt.module}':impt${i++},`;
+      }
+      i = 0;
+      s += `const instance = await WebAssembly.instantiate(importShim._w['${url}'], {${importObj}});\n`;
+      for (const expt of WebAssembly.Module.exports(module)) {
+        s += `const expt${i} = instance['${expt.name}'];\n`;
+        s += `export { expt${i++} as "${expt.name}" };\n`;
+      }
+      return { r: res.url, s, t: 'wasm' };
+    }
     else if (jsonContentType.test(contentType))
       return { r: res.url, s: `export default ${await res.text()}`, t: 'json' };
     else if (cssContentType.test(contentType)) {

package/dist/es-module-shims.js

@@ -1,4 +1,4 @@
-/* ES Module Shims 1.7.3 */
+/* ES Module Shims 1.8.1 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -127,6 +127,9 @@
         relUrl.length === 1  && (relUrl += '/')) ||
         relUrl[0] === '/') {
       const parentProtocol = parentUrl.slice(0, parentUrl.indexOf(':') + 1);
+      if (parentProtocol === 'blob:') {
+        throw new TypeError(`Failed to resolve module specifier "${relUrl}". Invalid relative url or base scheme isn't hierarchical.`);
+      }
       // Disabled, but these cases will give inconsistent results for deep backtracking
       //if (parentUrl[parentProtocol.length] !== '/')
       //  throw new Error('Cannot resolve');
@@ -458,6 +461,7 @@
   };
 
   const registry = importShim._r = {};
+  importShim._w = {};
 
   async function loadAll (load, seen) {
     if (load.b || seen[load.u])
@@ -701,6 +705,7 @@
   const sourceMapURLCommentPrefix = '\n//# sourceMappingURL=';
 
   const jsContentType = /^(text|application)\/(x-)?javascript(;|$)/;
+  const wasmContentType = /^(application)\/wasm(;|$)/;
   const jsonContentType = /^(text|application)\/json(;|$)/;
   const cssContentType = /^(text|application)\/css(;|$)/;
 
@@ -734,8 +739,12 @@
     finally {
       popFetchPool();
     }
-    if (!res.ok)
-      throw Error(`${res.status} ${res.statusText} ${res.url}${fromParent(parent)}`);
+
+    if (!res.ok) {
+      const error = new TypeError(`${res.status} ${res.statusText} ${res.url}${fromParent(parent)}`);
+      error.response = res;
+      throw error;
+    }
     return res;
   }
 
@@ -744,6 +753,21 @@
     const contentType = res.headers.get('content-type');
     if (jsContentType.test(contentType))
       return { r: res.url, s: await res.text(), t: 'js' };
+    else if (wasmContentType.test(contentType)) {
+      const module = importShim._w[url] = await WebAssembly.compileStreaming(res);
+      let s = '', i = 0, importObj = '';
+      for (const impt of WebAssembly.Module.imports(module)) {
+        s += `import * as impt${i} from '${impt.module}';\n`;
+        importObj += `'${impt.module}':impt${i++},`;
+      }
+      i = 0;
+      s += `const instance = await WebAssembly.instantiate(importShim._w['${url}'], {${importObj}});\n`;
+      for (const expt of WebAssembly.Module.exports(module)) {
+        s += `const expt${i} = instance['${expt.name}'];\n`;
+        s += `export { expt${i++} as "${expt.name}" };\n`;
+      }
+      return { r: res.url, s, t: 'wasm' };
+    }
     else if (jsonContentType.test(contentType))
       return { r: res.url, s: `export default ${await res.text()}`, t: 'json' };
     else if (cssContentType.test(contentType)) {

package/dist/es-module-shims.wasm.js

@@ -1,4 +1,4 @@
-/* ES Module Shims Wasm 1.7.3 */
+/* ES Module Shims Wasm 1.8.1 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -127,6 +127,9 @@
         relUrl.length === 1  && (relUrl += '/')) ||
         relUrl[0] === '/') {
       const parentProtocol = parentUrl.slice(0, parentUrl.indexOf(':') + 1);
+      if (parentProtocol === 'blob:') {
+        throw new TypeError(`Failed to resolve module specifier "${relUrl}". Invalid relative url or base scheme isn't hierarchical.`);
+      }
       // Disabled, but these cases will give inconsistent results for deep backtracking
       //if (parentUrl[parentProtocol.length] !== '/')
       //  throw new Error('Cannot resolve');
@@ -458,6 +461,7 @@
   };
 
   const registry = importShim._r = {};
+  importShim._w = {};
 
   async function loadAll (load, seen) {
     if (load.b || seen[load.u])
@@ -701,6 +705,7 @@
   const sourceMapURLCommentPrefix = '\n//# sourceMappingURL=';
 
   const jsContentType = /^(text|application)\/(x-)?javascript(;|$)/;
+  const wasmContentType = /^(application)\/wasm(;|$)/;
   const jsonContentType = /^(text|application)\/json(;|$)/;
   const cssContentType = /^(text|application)\/css(;|$)/;
 
@@ -734,8 +739,12 @@
     finally {
       popFetchPool();
     }
-    if (!res.ok)
-      throw Error(`${res.status} ${res.statusText} ${res.url}${fromParent(parent)}`);
+
+    if (!res.ok) {
+      const error = new TypeError(`${res.status} ${res.statusText} ${res.url}${fromParent(parent)}`);
+      error.response = res;
+      throw error;
+    }
     return res;
   }
 
@@ -744,6 +753,21 @@
     const contentType = res.headers.get('content-type');
     if (jsContentType.test(contentType))
       return { r: res.url, s: await res.text(), t: 'js' };
+    else if (wasmContentType.test(contentType)) {
+      const module = importShim._w[url] = await WebAssembly.compileStreaming(res);
+      let s = '', i = 0, importObj = '';
+      for (const impt of WebAssembly.Module.imports(module)) {
+        s += `import * as impt${i} from '${impt.module}';\n`;
+        importObj += `'${impt.module}':impt${i++},`;
+      }
+      i = 0;
+      s += `const instance = await WebAssembly.instantiate(importShim._w['${url}'], {${importObj}});\n`;
+      for (const expt of WebAssembly.Module.exports(module)) {
+        s += `const expt${i} = instance['${expt.name}'];\n`;
+        s += `export { expt${i++} as "${expt.name}" };\n`;
+      }
+      return { r: res.url, s, t: 'wasm' };
+    }
     else if (jsonContentType.test(contentType))
       return { r: res.url, s: `export default ${await res.text()}`, t: 'json' };
     else if (cssContentType.test(contentType)) {

package/index.d.ts

@@ -8,7 +8,7 @@ interface ESMSInitOptions {
    * Enable polyfill features.
    * Currently supports ['css-modules', 'json-modules']
    */
-  polyfillEnable?: string[];
+  polyfillEnable?: Array<'css-modules' | 'json-modules'>
 
   /**
    * #### Enforce Integrity
@@ -16,7 +16,7 @@ interface ESMSInitOptions {
    * Set to *true* to enable secure mode to not support loading modules without integrity (integrity is always verified though).
    *
    */
-  enforceIntegrity: boolean;
+  enforceIntegrity?: boolean;
 
   /**
    * Nonce for CSP build
@@ -26,7 +26,7 @@ interface ESMSInitOptions {
   /**
    * Disable retriggering of document readystate
    */
-  noLoadEventRetriggers: true;
+  noLoadEventRetriggers?: true;
 
   /**
    * #### Skip Processing Stability
@@ -49,7 +49,7 @@ interface ESMSInitOptions {
    * By default, this expression supports jspm.dev, dev.jspm.io and
    * cdn.pika.dev.
    */
-  skip: RegExp;
+  skip?: RegExp;
 
   /**
    * #### Error hook
@@ -57,7 +57,7 @@ interface ESMSInitOptions {
    * Register a callback for any ES Module Shims module errors.
    *
    */
-  onerror: (e: any) => any;
+  onerror?: (e: any) => any;
 
   /**
    * #### Polyfill hook
@@ -65,7 +65,7 @@ interface ESMSInitOptions {
    * Register a callback invoked when polyfill mode first engages.
    *
    */
-  onpolyfill: () => void;
+  onpolyfill?: () => void;
 
   /**
    * #### Resolve Hook
@@ -74,7 +74,7 @@ interface ESMSInitOptions {
    *
    * Provide a custom resolver function.
    */
-  resolve: (
+  resolve?: (
     id: string,
     parentUrl: string,
     resolve: (id: string, parentUrl: string) => string
@@ -142,7 +142,7 @@ interface ESMSInitOptions {
    * }
    * ```
    */
-  fetch: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+  fetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
 
   /**
    * #### Revoke Blob URLs
@@ -151,7 +151,7 @@ interface ESMSInitOptions {
    * Can cost some compute time for large loads.
    *
    */
-  revokeBlobURLs: boolean;
+  revokeBlobURLs?: boolean;
 
   /**
    * #### Map Overrides
@@ -159,7 +159,7 @@ interface ESMSInitOptions {
    * Set to *true* to permit overrides to import maps.
    *
    */
-  mapOverrides: boolean;
+  mapOverrides?: boolean;
 
   /**
   * #### Meta hook
@@ -167,7 +167,7 @@ interface ESMSInitOptions {
   * Register a callback for import.meta construction.
   *
   */
-  meta: (meta: any, url: string) => void;
+  meta?: (meta: any, url: string) => void;
 
   /**
    * #### On import hook
@@ -175,7 +175,7 @@ interface ESMSInitOptions {
    * Register a callback for top-level imports.
    *
    */
-  onimport: (url: string, options: any, parentUrl: string) => void;
+  onimport?: (url: string, options: any, parentUrl: string) => void;
 }
 
 interface ImportMap {

package/package.json

@@ -1,12 +1,21 @@
 {
   "name": "es-module-shims",
-  "version": "1.7.3",
+  "version": "1.8.1",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {
-    ".": "./dist/es-module-shims.js",
-    "./debug": "./dist/es-module-shims.debug.js",
-    "./wasm": "./dist/es-module-shims.wasm.js"
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./dist/es-module-shims.js"
+    },
+    "./debug": {
+      "types": "./index.d.ts",
+      "default": "./dist/es-module-shims.debug.js"
+    },
+    "./wasm": {
+      "types": "./index.d.ts",
+      "default": "./dist/es-module-shims.wasm.js"
+    }
   },
   "types": "index.d.ts",
   "type": "module",