es-module-shims 1.5.17 → 1.5.18

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.5.17/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.5.18/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">

package/dist/es-module-shims.js

@@ -1,4 +1,4 @@
-/* ES Module Shims 1.5.17 */
+/* ES Module Shims 1.5.18 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -101,22 +101,14 @@
     }
   }
 
-  /*
-   * Import maps implementation
-   *
-   * To make lookups fast we pre-resolve the entire import map
-   * and then match based on backtracked hash lookups
-   *
-   */
   function resolveUrl (relUrl, parentUrl) {
     return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (isURL(relUrl) ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));
   }
 
   function resolveIfNotPlainOrUrl (relUrl, parentUrl) {
-    // strip off any trailing query params or hashes
-    const queryHashIndex = parentUrl.indexOf('?', parentUrl.indexOf('#') === -1 ? parentUrl.indexOf('#') : parentUrl.length);
-    if (queryHashIndex !== -1)
-      parentUrl = parentUrl.slice(0, queryHashIndex);
+    const hIdx = parentUrl.indexOf('#'), qIdx = parentUrl.indexOf('?');
+    if (hIdx + qIdx > -2)
+      parentUrl = parentUrl.slice(0, hIdx === -1 ? qIdx : qIdx === -1 || qIdx > hIdx ? hIdx : qIdx);
     if (relUrl.indexOf('\\') !== -1)
       relUrl = relUrl.replace(backslashRegEx, '/');
     // protocol-relative
@@ -641,9 +633,9 @@
         }
       }
 
-      // support progressive cycle binding updates
+      // support progressive cycle binding updates (try statement avoids tdz errors)
       if (load.s)
-        resolvedSource += `\n;import{u$_}from'${load.s}';u$_({ ${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')} });\n`;
+        resolvedSource += `\n;import{u$_}from'${load.s}';try{u$_({${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')}})}catch(_){};\n`;
 
       pushStringTo(source.length);
     }

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

@@ -1,4 +1,4 @@
-/* ES Module Shims Wasm 1.5.17 */
+/* ES Module Shims Wasm 1.5.18 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -101,22 +101,14 @@
     }
   }
 
-  /*
-   * Import maps implementation
-   *
-   * To make lookups fast we pre-resolve the entire import map
-   * and then match based on backtracked hash lookups
-   *
-   */
   function resolveUrl (relUrl, parentUrl) {
     return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (isURL(relUrl) ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));
   }
 
   function resolveIfNotPlainOrUrl (relUrl, parentUrl) {
-    // strip off any trailing query params or hashes
-    const queryHashIndex = parentUrl.indexOf('?', parentUrl.indexOf('#') === -1 ? parentUrl.indexOf('#') : parentUrl.length);
-    if (queryHashIndex !== -1)
-      parentUrl = parentUrl.slice(0, queryHashIndex);
+    const hIdx = parentUrl.indexOf('#'), qIdx = parentUrl.indexOf('?');
+    if (hIdx + qIdx > -2)
+      parentUrl = parentUrl.slice(0, hIdx === -1 ? qIdx : qIdx === -1 || qIdx > hIdx ? hIdx : qIdx);
     if (relUrl.indexOf('\\') !== -1)
       relUrl = relUrl.replace(backslashRegEx, '/');
     // protocol-relative
@@ -641,9 +633,9 @@
         }
       }
 
-      // support progressive cycle binding updates
+      // support progressive cycle binding updates (try statement avoids tdz errors)
       if (load.s)
-        resolvedSource += `\n;import{u$_}from'${load.s}';u$_({ ${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')} });\n`;
+        resolvedSource += `\n;import{u$_}from'${load.s}';try{u$_({${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')}})}catch(_){};\n`;
 
       pushStringTo(source.length);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-module-shims",
-  "version": "1.5.17",
+  "version": "1.5.18",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {