es-module-shims 2.0.5 → 2.0.7

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

@@ -1,96 +1,96 @@
-/* ES Module Shims Wasm 2.0.5 */
+/* ES Module Shims Wasm 2.0.7 */
 (function () {
 
-  const hasDocument = typeof document !== 'undefined';
-
-  const noop = () => {};
-
-  const dynamicImport = (u, errUrl) => import(u);
-
-  const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
-
-  const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
-  Object.assign(esmsInitOptions, self.esmsInitOptions || {});
-
-  // shim mode is determined on initialization, no late shim mode
-  const shimMode =
-    hasDocument ?
-      esmsInitOptions.shimMode ||
-      document.querySelectorAll('script[type=module-shim],script[type=importmap-shim],link[rel=modulepreload-shim]')
-        .length > 0
-    : true;
-
-  const importHook = globalHook(shimMode && esmsInitOptions.onimport);
-  const resolveHook = globalHook(shimMode && esmsInitOptions.resolve);
-  let fetchHook = esmsInitOptions.fetch ? globalHook(esmsInitOptions.fetch) : fetch;
-  const metaHook = esmsInitOptions.meta ? globalHook(shimMode && esmsInitOptions.meta) : noop;
-  const tsTransform =
-    esmsInitOptions.tsTransform ||
-    (document.currentScript &&
-      document.currentScript.src.replace(/\.js$/, '-typescript.js')) ||
-    './es-module-shims-typescript.js';
-
-  const mapOverrides = esmsInitOptions.mapOverrides;
-
-  let nonce = esmsInitOptions.nonce;
-  if (!nonce && hasDocument) {
-    const nonceElement = document.querySelector('script[nonce]');
-    if (nonceElement) nonce = nonceElement.nonce || nonceElement.getAttribute('nonce');
-  }
-
-  const onerror = globalHook(esmsInitOptions.onerror || noop);
-
-  const { revokeBlobURLs, noLoadEventRetriggers, enforceIntegrity } = esmsInitOptions;
-
-  function globalHook(name) {
-    return typeof name === 'string' ? self[name] : name;
-  }
-
-  const enable = Array.isArray(esmsInitOptions.polyfillEnable) ? esmsInitOptions.polyfillEnable : [];
-  const enableAll = esmsInitOptions.polyfillEnable === 'all' || enable.includes('all');
-  const enableLatest = esmsInitOptions.polyfillEnable === 'latest' || enable.includes('latest');
-  const cssModulesEnabled = enable.includes('css-modules') || enableAll || enableLatest;
-  const jsonModulesEnabled = enable.includes('json-modules') || enableAll || enableLatest;
-  const wasmModulesEnabled = enable.includes('wasm-modules') || enableAll;
-  const sourcePhaseEnabled = enable.includes('source-phase') || enableAll;
-  const typescriptEnabled = enable.includes('typescript') || enableAll;
-
-  const onpolyfill =
-    esmsInitOptions.onpolyfill ?
-      globalHook(esmsInitOptions.onpolyfill)
-    : () => {
-        console.log(`%c^^ Module error above is polyfilled and can be ignored ^^`, 'font-weight:900;color:#391');
-      };
-
-  const baseUrl =
-    hasDocument ?
-      document.baseURI
-    : `${location.protocol}//${location.host}${
-      location.pathname.includes('/') ?
-        location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1)
-      : location.pathname
-    }`;
-
-  const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
-  let { skip } = esmsInitOptions;
-  if (Array.isArray(skip)) {
-    const l = skip.map(s => new URL(s, baseUrl).href);
-    skip = s => l.some(i => (i[i.length - 1] === '/' && s.startsWith(i)) || s === i);
-  } else if (typeof skip === 'string') {
-    const r = new RegExp(skip);
-    skip = s => r.test(s);
-  } else if (skip instanceof RegExp) {
-    skip = s => skip.test(s);
-  }
-
-  const dispatchError = error => self.dispatchEvent(Object.assign(new Event('error'), { error }));
-
-  const throwError = err => {
-    (self.reportError || dispatchError)(err), void onerror(err);
-  };
-
-  function fromParent(parent) {
-    return parent ? ` imported from ${parent}` : '';
+  const hasDocument = typeof document !== 'undefined';
+
+  const noop = () => {};
+
+  const dynamicImport = (u, errUrl) => import(u);
+
+  const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
+
+  const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
+  Object.assign(esmsInitOptions, self.esmsInitOptions || {});
+
+  // shim mode is determined on initialization, no late shim mode
+  const shimMode =
+    hasDocument ?
+      esmsInitOptions.shimMode ||
+      document.querySelectorAll('script[type=module-shim],script[type=importmap-shim],link[rel=modulepreload-shim]')
+        .length > 0
+    : true;
+
+  const importHook = globalHook(shimMode && esmsInitOptions.onimport);
+  const resolveHook = globalHook(shimMode && esmsInitOptions.resolve);
+  let fetchHook = esmsInitOptions.fetch ? globalHook(esmsInitOptions.fetch) : fetch;
+  const metaHook = esmsInitOptions.meta ? globalHook(shimMode && esmsInitOptions.meta) : noop;
+  const tsTransform =
+    esmsInitOptions.tsTransform ||
+    (document.currentScript &&
+      document.currentScript.src.replace(/\.js$/, '-typescript.js')) ||
+    './es-module-shims-typescript.js';
+
+  const mapOverrides = esmsInitOptions.mapOverrides;
+
+  let nonce = esmsInitOptions.nonce;
+  if (!nonce && hasDocument) {
+    const nonceElement = document.querySelector('script[nonce]');
+    if (nonceElement) nonce = nonceElement.nonce || nonceElement.getAttribute('nonce');
+  }
+
+  const onerror = globalHook(esmsInitOptions.onerror || noop);
+
+  const { revokeBlobURLs, noLoadEventRetriggers, enforceIntegrity } = esmsInitOptions;
+
+  function globalHook(name) {
+    return typeof name === 'string' ? self[name] : name;
+  }
+
+  const enable = Array.isArray(esmsInitOptions.polyfillEnable) ? esmsInitOptions.polyfillEnable : [];
+  const enableAll = esmsInitOptions.polyfillEnable === 'all' || enable.includes('all');
+  const enableLatest = esmsInitOptions.polyfillEnable === 'latest' || enable.includes('latest');
+  const cssModulesEnabled = enable.includes('css-modules') || enableAll || enableLatest;
+  const jsonModulesEnabled = enable.includes('json-modules') || enableAll || enableLatest;
+  const wasmModulesEnabled = enable.includes('wasm-modules') || enableAll;
+  const sourcePhaseEnabled = enable.includes('source-phase') || enableAll;
+  const typescriptEnabled = enable.includes('typescript') || enableAll;
+
+  const onpolyfill =
+    esmsInitOptions.onpolyfill ?
+      globalHook(esmsInitOptions.onpolyfill)
+    : () => {
+        console.log(`%c^^ Module error above is polyfilled and can be ignored ^^`, 'font-weight:900;color:#391');
+      };
+
+  const baseUrl =
+    hasDocument ?
+      document.baseURI
+    : `${location.protocol}//${location.host}${
+      location.pathname.includes('/') ?
+        location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1)
+      : location.pathname
+    }`;
+
+  const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
+  let { skip } = esmsInitOptions;
+  if (Array.isArray(skip)) {
+    const l = skip.map(s => new URL(s, baseUrl).href);
+    skip = s => l.some(i => (i[i.length - 1] === '/' && s.startsWith(i)) || s === i);
+  } else if (typeof skip === 'string') {
+    const r = new RegExp(skip);
+    skip = s => r.test(s);
+  } else if (skip instanceof RegExp) {
+    skip = s => skip.test(s);
+  }
+
+  const dispatchError = error => self.dispatchEvent(Object.assign(new Event('error'), { error }));
+
+  const throwError = err => {
+    (self.reportError || dispatchError)(err), void onerror(err);
+  };
+
+  function fromParent(parent) {
+    return parent ? ` imported from ${parent}` : '';
   }
 
   const backslashRegEx = /\\/g;
@@ -453,17 +453,18 @@
     }
     // we mock import('./x.css', { with: { type: 'css' }}) support via an inline static reexport
     // because we can't syntactically pass through to dynamic import with a second argument in this libarary
-    const url = await importHandler(id, opts, parentUrl);
-    const source =
-      typeof opts === 'object' && typeof opts.with === 'object' && typeof opts.with.type === 'string' ?
-        `export{default}from'${url}'with{type:"${opts.with.type}"}`
-      : null;
-    return topLevelLoad(url, { credentials: 'same-origin' }, source);
+    let url = await importHandler(id, opts, parentUrl);
+    let source = null;
+    if (typeof opts === 'object' && typeof opts.with === 'object' && typeof opts.with.type === 'string') {
+      source = `export{default}from'${url}'with{type:"${opts.with.type}"}`;
+      url += '?entry';
+    }
+    return topLevelLoad(url, { credentials: 'same-origin' }, source, undefined, undefined);
   }
 
   // import.source()
   // (opts not currently supported as no use cases yet)
-  if (sourcePhaseEnabled)
+  if (shimMode || sourcePhaseEnabled)
     importShim.source = async function importShimSource(specifier, opts, parentUrl) {
       if (typeof opts === 'string') {
         parentUrl = opts;
@@ -536,7 +537,12 @@
       (!multipleImportMaps || supportsMultipleImportMaps) &&
       !importMapSrc &&
       !typescriptEnabled;
-    if (sourcePhaseEnabled && typeof WebAssembly !== 'undefined' && !Object.getPrototypeOf(WebAssembly.Module).name) {
+    if (
+      !shimMode &&
+      sourcePhaseEnabled &&
+      typeof WebAssembly !== 'undefined' &&
+      !Object.getPrototypeOf(WebAssembly.Module).name
+    ) {
       const s = Symbol();
       const brand = m =>
         Object.defineProperty(m, s, { writable: false, configurable: false, value: 'WebAssembly.Module' });
@@ -873,6 +879,10 @@
   }
 
   let esmsTsTransform;
+  async function initTs() {
+    const m = await import(tsTransform);
+    if (!esmsTsTransform) esmsTsTransform = m.transform;
+  }
 
   async function fetchModule(url, fetchOpts, parent) {
     const mapIntegrity = composedImportMap.integrity[url];
@@ -913,12 +923,12 @@
       )});export default s;`,
         t: 'css'
       };
-    } else if ((typescriptEnabled && tsContentType.test(contentType)) || url.endsWith('.ts') || url.endsWith('.mts')) {
+    } else if (
+      (shimMode || typescriptEnabled) &&
+      (tsContentType.test(contentType) || url.endsWith('.ts') || url.endsWith('.mts'))
+    ) {
       const source = await res.text();
-      // if we don't have a ts transform hook, try to load it
-      if (!esmsTsTransform) {
-        ({ transform: esmsTsTransform } = await import(tsTransform));
-      }
+      if (!esmsTsTransform) await initTs();
       const transformed = esmsTsTransform(source, url);
       return { r, s: transformed || source, t: transformed ? 'ts' : 'js' };
     } else
@@ -1008,12 +1018,16 @@
     load.L = load.f.then(async () => {
       let childFetchOpts = fetchOpts;
       load.d = load.a[0]
-        .map(({ n, d, t }) => {
+        .map(({ n, d, t, a }) => {
           const sourcePhase = t >= 4;
           if (sourcePhase) {
-            if (!sourcePhaseEnabled) throw featErr('source-phase');
+            if (!shimMode && !sourcePhaseEnabled) throw featErr('source-phase');
             if (!supportsSourcePhase) load.n = true;
           }
+          if (a > 0) {
+            if (!shimMode && !cssModulesEnabled && !jsonModulesEnabled) throw featErr('css-modules / json-modules');
+            if (!supportsCssType && !supportsJsonType) load.n = true;
+          }
           if (d !== -1 || !n) return;
           const resolved = resolve(n, load.r || load.u);
           if (resolved.n) load.n = true;
@@ -1118,7 +1132,7 @@
     if (!firstImportMap && legacyAcceptingImportMaps) importMapPromise.then(() => (firstImportMap = composedImportMap));
     if (!legacyAcceptingImportMaps && !multipleImportMaps) {
       multipleImportMaps = true;
-      if (baselinePassthrough && !supportsMultipleImportMaps) {
+      if (!shimMode && baselinePassthrough && !supportsMultipleImportMaps) {
         baselinePassthrough = false;
         if (hasDocument) attachMutationObserver();
       }
@@ -1128,6 +1142,20 @@
 
   function processScript(script, ready = readyStateCompleteCnt > 0) {
     if (epCheck(script, ready)) return;
+    if (script.lang === 'ts' && !script.src) {
+      const source = script.innerHTML;
+      return initTs()
+        .then(() =>
+          topLevelLoad(
+            baseUrl,
+            getFetchOpts(script),
+            esmsTsTransform(source, baseUrl) || source,
+            undefined,
+            undefined
+          )
+        )
+        .catch(throwError);
+    }
     // does this load block readystate complete
     const isBlockingReadyScript = script.getAttribute('async') === null && readyStateCompleteCnt > 0;
     // does this load block DOMContentLoaded

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-module-shims",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {
@@ -31,7 +31,7 @@
   "license": "MIT",
   "devDependencies": {
     "@rollup/plugin-replace": "^2.4.2",
-    "amaro": "^0.1.8",
+    "amaro": "^0.3.0",
     "es-module-lexer": "1.6.0",
     "kleur": "^4.1.4",
     "mime-types": "^2.1.33",