requirejs-esm 0.0.1 → 1.0.2

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)
@@ -49,19 +51,35 @@
 
   var fetchText$1 = fetchText;
 
-  let skipModules$1 = [];
+  /* global require */
 
-  function setSkipModules(names) {
-    skipModules$1 = names;
+  let writeText;
+
+  // Initialise the writeText variable with a function to write to a file.
+  /* istanbul ignore if */
+  if (!(typeof window !== 'undefined' && window.navigator && window.document)) {
+    const { writeFileSync, mkdirSync } = require.nodeRequire ? require.nodeRequire('fs') : require('fs');
+    const { dirname } = require.nodeRequire ? require.nodeRequire('path') : require('path');
+    writeText = (path, content) => {
+      mkdirSync(dirname(path), { recursive: true });
+      writeFileSync(path, content);
+    };
   }
 
-  // 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) {
-      // Accept a path prefix as well.
-      if (name.startsWith(skipModule)) return true
+  var writeText$1 = writeText;
+
+  // 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,
@@ -128,6 +146,25 @@
     return `${pluginName}!${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
+    }
+  }
+
   const errorMessages = {
       [0]: 'Unexpected token',
       [28]: "Unexpected token: '%0'",
@@ -1002,9 +1039,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);
@@ -1917,7 +1954,7 @@
                           }
                           else if (ch === 61) {
                               advanceChar(parser);
-                              return 8456000;
+                              return 8456256;
                           }
                           if (ch === 33) {
                               const index = parser.index + 1;
@@ -2100,7 +2137,7 @@
                       const ch = parser.currentChar;
                       if (ch === 61) {
                           advanceChar(parser);
-                          return 8456001;
+                          return 8456257;
                       }
                       if (ch !== 62)
                           return 8456259;
@@ -5092,7 +5129,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',
@@ -6208,7 +6245,7 @@
               if ((context & 524288) < 1)
                   report(parser, 26);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 2;
               break;
           }
@@ -6217,7 +6254,7 @@
               if ((context & 262144) < 1)
                   report(parser, 27);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 1;
               break;
           }
@@ -6248,10 +6285,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, {
@@ -6307,7 +6344,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);
@@ -8471,12 +8508,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);
@@ -8842,7 +8877,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);
@@ -81744,6 +81779,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URLSearchParams,
@@ -82295,6 +82333,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URL,
@@ -85250,17 +85291,18 @@
     const { elements } = deps;
     if (!elements.length) return
 
+    let updated;
     for (const element of elements) {
       if (element.type === 'Literal') {
         const moduleName = element.value;
         const newModuleName = resolvePath(moduleName, parentName, options);
         if (newModuleName && newModuleName !== moduleName) {
           replaceLiteral(element, newModuleName);
+          updated = true;
         }
       }
     }
-
-    return true
+    return updated
   }
 
   function _generateUid(name, i) {
@@ -85669,7 +85711,6 @@
     // name with `esm!`, above all.
     resolvePath = resolvePath$1,
     // ecmaVersion = 2020,
-    // minify,
     sourceMap
   } = {}) {
     // const ast = parse(text, { ecmaVersion, sourceType: 'module', locations: true })
@@ -85678,48 +85719,29 @@
     const options = { sourceFileName: file, pluginName, resolvePath, originalResolvePath: resolvePath$1 };
     transformModules(ast, options);
 
-    let code;
-    if (options.updated) {
-      // if (minify) {
-      //   const optimized = optimize(ast)
-      //   ast = mangle(optimized)
-      // }
-      // if (minify) {
-      //   ({ code, map: sourceMap } = generateMinified(ast, {
-      //     format: FORMAT_MINIFY,
-      //     sourceMap: sourceMap ? file : undefined,
-      //     sourceMapWithCode: true,
-      //     sourceContent: text,
-      //     file
-      //   }))
-      //   if (sourceMap) {
-      //     code += convert.fromJSON(sourceMap).toComment()
-      //   }
-      // }
-      // if (minify) {
-      //   ({ code } = await generateMinified(ast, {
-      //     // ecma: ecmaVersion,
-      //     module: true,
-      //     parse: { spidermonkey: true },
-      //     format: { ecma: 2015 },
-      //     sourceMap: sourceMap ? {
-      //       filename: file,
-      //       url: 'inline'
-      //       // content: map
-      //     } : undefined
-      //   }))
-      // } else {
-      sourceMap = sourceMap && new SourceMapGenerator({ file });
-      code = generate(ast, { sourceMap });
+    const { updated } = options;
+    let code, map;
+    if (updated) {
+      if (sourceMap === true) {
+        sourceMap = { inline: true, content: true };
+      }
+      const mapGenerator = sourceMap ? new SourceMapGenerator({ file }) : undefined;
+      code = generate(ast, { sourceMap: mapGenerator });
       if (sourceMap) {
-        code += convertSourceMap.fromJSON(sourceMap).toComment();
+        if (sourceMap.content) {
+          mapGenerator.setSourceContent(file, text);
+        }
+        if (sourceMap.inline) {
+          code += convertSourceMap.fromObject(mapGenerator.toJSON()).toComment();
+        } else {
+          map = mapGenerator.toJSON();
+        }
       }
-      // }
     } else {
       code = text;
     }
 
-    return code
+    return { code, map, updated }
   }
 
   /* global module */
@@ -85736,9 +85758,14 @@
     skipModules = [],
     // Method to update paths of module dependencies, to prefix JavaScript module
     // name with `esm!`, above all.
-    resolvePath
-    // minify
-    // ecmaVersion
+    resolvePath,
+    // ecmaVersion,
+    // Boolean or object with booleans { inline, content }.
+    sourceMap,
+    // Enable console logging.
+    verbose,
+    // Directory to save a copy of the transformed modules.
+    debugDir
   } = typeof module !== 'undefined' && module.config && module.config() || {};
 
   const buildMap = {};
@@ -85748,6 +85775,35 @@
   //>>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
       // re-transpile it. This can happen only during the runtime.
@@ -85761,49 +85817,55 @@
       // 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:')) {
-        return onload()
       }
 
       // Fetch the text of the source module by AJAX and transpile it.
+      verbose && console.log('esm: fetching', name, 'mapped to', url);
       fetchText$1(url, async (error, text) => {
         if (error) {
+          verbose && console.log('esm: missing', name);
           return onload.error(error)
         }
 
-        let code;
+        let code, updated;
         try {
-          // 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.
-          const sourceMap = !reqConfig.isBuild || reqConfig.generateSourceMaps;
-          code = transform(text, file, { pluginName, resolvePath, /*ecmaVersion, minify,*/ sourceMap });
+          verbose && console.log('esm: transforming', name);
+          ({ code, updated } = transform(text, file, {
+            pluginName,
+            resolvePath,
+            /*ecmaVersion,*/
+            // 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 || !isBuild
+          }));
+          if (!updated) {
+            verbose && console.log('esm: retaining', name);
+            // return req([name], onload, onload.error)
+          } else if (isBuild && debugDir) {
+            writeText$1(`${debugDir}/${file}`, code);
+          }
         } catch (error) {
           // RequireJS did not always log this error.
-          console.log(`Transforming "${name}" (resolved to "${url}") failed:`);
-          console.log(error);
+          console.error(`Transforming "${name}" (resolved to "${url}") failed:`);
+          console.error(error);
           return onload.error(error)
         }
 
         // Remember the transpiled content for the writing phase during the build.
-        if (reqConfig.isBuild) {
+        if (isBuild) {
           buildMap[name] = code;
         }
 
+        verbose && console.log('esm: returning', name);
         onload.fromText(code);
       });
     },