requirejs-esm 1.0.0 → 1.1.0

package/dist/plugin.js

@@ -1,10 +1,12 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define([
 //>>excludeStart('excludeEsm', pragmas.excludeEsm)
       'module'
 //>>excludeEnd('excludeEsm')
     ], factory) :
+//>>excludeStart('excludeEsm', pragmas.excludeEsm)
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+//>>excludeEnd('excludeEsm')
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.requirejsEsmPlugin = factory());
 })(this, (function (
 //>>excludeStart('excludeEsm', pragmas.excludeEsm)
@@ -66,23 +68,18 @@
 
   var writeText$1 = writeText;
 
-  let skipModules$1 = [];
-
-  function setSkipModules(names) {
-    skipModules$1 = names;
-  }
-
-  // Checks if a module name is included in the list of modules to skip
-  // the transformation.
-  function skipModule(name) {
-    for (const skipModule of skipModules$1) {
-      // Recognise an asterisk at the beginning
-      if (skipModule.startsWith('*')) {
-        if (name.indexOf(skipModule.substring(1)) >= 0) return true
-      }
-      // Accept a path prefix as well.
-      else if (name.startsWith(skipModule)) return true
+  // Returns the child file name by cutting the directoris before the last slash,
+  // including the slash. If there is no slash in the path - the path is just
+  // a file name, it will return the file name. If the path includes a URL
+  // query starting with the question mark, it will cut it away including the
+  // question mark.
+  function childFile (path) {
+    const lastSlash = path.lastIndexOf('/');
+    if (lastSlash > 0) {
+      path = path.substring(lastSlash + 1);
     }
+    const questionMark = path.lastIndexOf('?');
+    return questionMark > 0 ? path.substring(0, questionMark) : path
   }
 
   // Returns the parent directory by cutting the file name after the last slash,
@@ -132,21 +129,43 @@
 
   // Ensures that every JavaScript dependency will be prefixed by `esm!`.
   // Relative paths will be converted to be relative to the parent module.
-  function resolvePath$1 (sourcePath, currentFile, { pluginName }) {
+  function resolvePath$1 (sourcePath, currentFile, { pluginName, needsResolve } = {}) {
     // Ignore paths with other plugins applied and the three built-in
     // pseudo-modules of RequireJS.
-    if (!pluginName || sourcePath.includes('!') || sourcePath === 'require' ||
+    if (sourcePath.includes('!') || sourcePath === 'require' ||
         sourcePath === 'module' || sourcePath === 'exports') return
 
     // If `sourcePath` is relative to `currentFile` - starts with ./ or ../ -
     // prepend the parent directory of `currentFile` to it. This was needed
     // for modules located outside the source root (`baseUrl`), which were
     // mapped there using the `paths` of `map` configuration properties.
-    if (sourcePath.charAt(0) === '.' && (sourcePath.charAt(1) === '/' ||
-        sourcePath.charAt(1) === '.' && sourcePath.charAt(2) === '/')) {
+    if ((sourcePath.charAt(0) === '.' && (sourcePath.charAt(1) === '/' ||
+         sourcePath.charAt(1) === '.' && sourcePath.charAt(2) === '/')) &&
+        !(needsResolve && needsResolve(sourcePath, currentFile))) {
       sourcePath = joinPath(parentDir(currentFile), sourcePath);
+      if (sourcePath.endsWith('.js')) sourcePath = sourcePath.substring(0, sourcePath.length - 3);
+    }
+
+    return pluginName ? `${pluginName}!${sourcePath}` : sourcePath
+  }
+
+  let skipModules$1 = [];
+
+  function setSkipModules(names) {
+    skipModules$1 = names;
+  }
+
+  // Checks if a module name is included in the list of modules to skip
+  // the transformation.
+  function skipModule(name) {
+    for (const skipModule of skipModules$1) {
+      // Recognise an asterisk at the beginning
+      if (skipModule.startsWith('*')) {
+        if (name.indexOf(skipModule.substring(1)) >= 0) return true
+      }
+      // Accept a path prefix as well.
+      else if (name.startsWith(skipModule)) return true
     }
-    return `${pluginName}!${sourcePath}`
   }
 
   const errorMessages = {
@@ -1023,9 +1042,9 @@
                   mask |= 8;
                   break;
               case 115:
-                  if (mask & 12)
+                  if (mask & 32)
                       report(parser, 34, 's');
-                  mask |= 12;
+                  mask |= 32;
                   break;
               default:
                   report(parser, 33);
@@ -1938,7 +1957,7 @@
                           }
                           else if (ch === 61) {
                               advanceChar(parser);
-                              return 8456000;
+                              return 8456256;
                           }
                           if (ch === 33) {
                               const index = parser.index + 1;
@@ -2121,7 +2140,7 @@
                       const ch = parser.currentChar;
                       if (ch === 61) {
                           advanceChar(parser);
-                          return 8456001;
+                          return 8456257;
                       }
                       if (ch !== 62)
                           return 8456259;
@@ -5113,7 +5132,7 @@
       nextToken(parser, context | 32768);
       const argument = parser.flags & 1 || parser.token & 1048576
           ? null
-          : parseExpressions(parser, context, 0, 1, parser.tokenPos, parser.line, parser.column);
+          : parseExpressions(parser, context, 0, 1, parser.tokenPos, parser.linePos, parser.colPos);
       matchOrInsertSemicolon(parser, context | 32768);
       return finishNode(parser, context, start, line, column, {
           type: 'ReturnStatement',
@@ -6229,7 +6248,7 @@
               if ((context & 524288) < 1)
                   report(parser, 26);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 2;
               break;
           }
@@ -6238,7 +6257,7 @@
               if ((context & 262144) < 1)
                   report(parser, 27);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 1;
               break;
           }
@@ -6269,10 +6288,10 @@
           expr = parseUpdateExpression(parser, context, expr, start, line, column);
       }
       else if ((parser.token & 67108864) === 67108864) {
-          context = (context | 134217728 | 8192) ^ (134217728 | 8192);
+          context = (context | 134217728) ^ 134217728;
           switch (parser.token) {
               case 67108877: {
-                  nextToken(parser, context | 1073741824);
+                  nextToken(parser, (context | 1073741824 | 8192) ^ 8192);
                   parser.assignable = 1;
                   const property = parsePropertyOrPrivatePropertyName(parser, context);
                   expr = finishNode(parser, context, start, line, column, {
@@ -6328,7 +6347,7 @@
                   break;
               }
               case 67108991: {
-                  nextToken(parser, context);
+                  nextToken(parser, (context | 1073741824 | 8192) ^ 8192);
                   parser.flags |= 2048;
                   parser.assignable = 2;
                   expr = parseOptionalChain(parser, context, expr, start, line, column);
@@ -8492,12 +8511,10 @@
       }
       else if (context & 1 && parser.token === 131) {
           kind |= 4096;
-          key = parsePrivateIdentifier(parser, context, tokenPos, linePos, colPos);
-          context = context | 16384;
+          key = parsePrivateIdentifier(parser, context | 16384, tokenPos, linePos, colPos);
       }
       else if (context & 1 && (parser.token & 1073741824) === 1073741824) {
           kind |= 128;
-          context = context | 16384;
       }
       else if (token === 122) {
           key = parseIdentifier(parser, context, 0);
@@ -8863,7 +8880,7 @@
       });
   }
   function parseJSXExpressionContainer(parser, context, inJSXChild, isAttr, start, line, column) {
-      nextToken(parser, context);
+      nextToken(parser, context | 32768);
       const { tokenPos, linePos, colPos } = parser;
       if (parser.token === 14)
           return parseJSXSpreadChild(parser, context, tokenPos, linePos, colPos);
@@ -81765,6 +81782,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URLSearchParams,
@@ -82316,6 +82336,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URL,
@@ -85261,9 +85284,6 @@
 
   // Updates dependency paths to be prefixed by `esm!` or otherwise updated.
   function updateAmdDeps(amd, options) {
-    const { resolvePath } = options;
-    if (!resolvePath) return
-
     const { deps } = amd;
     if (!deps) return
 
@@ -85271,6 +85291,7 @@
     const { elements } = deps;
     if (!elements.length) return
 
+    const { resolvePath } = options;
     let updated;
     for (const element of elements) {
       if (element.type === 'Literal') {
@@ -85649,11 +85670,8 @@
   // Update dependency paths to be prefixed by `esm!` or otherwise updated.
   function prepareImportPaths(importPaths, options ) {
     const { resolvePath } = options;
-    if (!resolvePath) return
-
     if (resolvePath) {
       const { sourceFileName: parentName } = options;
-
       for (const importPath of importPaths) {
         if (importPath.type === 'Literal') {
           const moduleName = importPath.value;
@@ -85664,7 +85682,6 @@
         }
       }
     }
-
     return arrayExpression(importPaths)
   }
 
@@ -85673,7 +85690,7 @@
     const { length } = amds;
     if (length) {
       options.amd = true;
-      if (options.pluginName) {
+      if (options.resolvePath) {
         for (const amd of amds) {
           options.updated |= updateAmdDeps(amd, options);
         }
@@ -85755,6 +85772,34 @@
   //>>excludeEnd('excludeEsm')
   var plugin = {
     load(name, req, onload, reqConfig) {
+  //>>excludeStart('excludeEsm', pragmas.excludeEsm)
+      const { isBuild } = reqConfig;
+      // if (!bundledModules) {
+      //   bundledModules = new Set()
+      //   const { bundles } = reqConfig
+      //   if (bundles) {
+      //     verbose && console.log('esm: initialising bundles', name)
+      //     for (const bundle in bundles) {
+      //       for (const module of bundles[bundle]) {
+      //         bundledModules.add(module)
+      //       }
+      //     }
+      //   }
+      // }
+
+      // Paths relative to the current directory include the file extension.
+      // Otherwise the file extension must not be used for JavaScript modules.
+      // The file name should include the orioginal extension in the source maps.
+      const file = name.endsWith(fileExtension) ? name : name + fileExtension;
+      // Compilation and bundling of module sub-trees can be skipped, if those
+      // are mapped to the pseudo-path `empty:`, meaning that those modules
+      // are external and will be loaded during the runtime.
+      const url = req.toUrl(file);
+      if (url.startsWith('empty:')) {
+        verbose && console.log('esm: skipping', name, 'mapped to', url);
+        return onload()
+      }
+
       verbose && console.log('esm: loading', name);
       // If the module has been already defined from a module bundle, it was
       // already transpiled, when the output bundle was written. No need to
@@ -85769,24 +85814,14 @@
       // If the whole application is transpiled, there is no need to transpile
       // ESM modules or prefix dependencies of AMD modules. Even not yet defined
       // modules can be loaded just by `require` to get better performance.
-      if (!mixedAmdAndEsm && !reqConfig.isBuild && req.specified(name) ||
-          onlyAmd || skipModule(name)) {
+      if (!mixedAmdAndEsm && !isBuild && req.specified(name) ||
+          /*bundledModules.has(name) ||*/ onlyAmd || skipModule(name) ||
+          // If the module was bundled, it had to be already transpiled.
+          !isBuild && childFile(url) !== childFile(file)) {
         verbose && console.log('esm: delegating', name);
+  //>>excludeEnd('excludeEsm')
         return req([name], onload, onload.error)
-      }
   //>>excludeStart('excludeEsm', pragmas.excludeEsm)
-
-      // Paths relative to the current directory include the file extension.
-      // Otherwise the file extension must not be used for JavaScript modules.
-      // The file name should include the orioginal extension in the source maps.
-      const file = name.endsWith(fileExtension) ? name : name + fileExtension;
-      // Compilation and bundling of module sub-trees can be skipped, if those
-      // are mapped to the pseudo-path `empty:`, meaning that those modules
-      // are external and will be loaded during the runtime.
-      const url = req.toUrl(file);
-      if (url.startsWith('empty:')) {
-        verbose && console.log('esm: skipping', name, 'mapped to', url);
-        return onload()
       }
 
       // Fetch the text of the source module by AJAX and transpile it.
@@ -85807,12 +85842,12 @@
             // Always produce the source maps when transpiling in the browser, otherwise
             // the debugging would me impossible. When building and bundling, check if
             // the source maps were enabled for the output.
-            sourceMap: sourceMap || !reqConfig.isBuild
+            sourceMap: sourceMap || !isBuild
           }));
           if (!updated) {
             verbose && console.log('esm: retaining', name);
             // return req([name], onload, onload.error)
-          } else if (reqConfig.isBuild && debugDir) {
+          } else if (isBuild && debugDir) {
             writeText$1(`${debugDir}/${file}`, code);
           }
         } catch (error) {
@@ -85823,7 +85858,7 @@
         }
 
         // Remember the transpiled content for the writing phase during the build.
-        if (reqConfig.isBuild) {
+        if (isBuild) {
           buildMap[name] = code;
         }