requirejs-esm 4.2.0 → 4.3.0

package/dist/plugin.js

@@ -38,7 +38,7 @@
       xhr.send(null);
     };
   } else {
-    const { readFileSync } = require.nodeRequire ? require.nodeRequire('fs') : require('fs');
+    const { readFileSync } = require.nodeRequire ? require.nodeRequire('fs') : require('node:fs');
     fetchText = (path, callback) => {
       // Asynchronous reading is not possible during the build in the optimizer.
       try {
@@ -58,8 +58,8 @@
   // 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');
+    const { writeFileSync, mkdirSync } = require.nodeRequire ? require.nodeRequire('fs') : require('node:fs');
+    const { dirname } = require.nodeRequire ? require.nodeRequire('path') : require('node:path');
     writeText = (path, content) => {
       mkdirSync(dirname(path), { recursive: true });
       writeFileSync(path, content);
@@ -141,7 +141,7 @@
     // mapped there using the `paths` of `map` configuration properties.
     if ((sourcePath.charAt(0) === '.' && (sourcePath.charAt(1) === '/' ||
          sourcePath.charAt(1) === '.' && sourcePath.charAt(2) === '/')) &&
-        !(needsResolve && needsResolve(sourcePath, currentFile))) {
+        !(needsResolve?.(sourcePath, currentFile))) {
       sourcePath = joinPath(parentDir(currentFile), sourcePath);
       if (sourcePath.endsWith('.js')) sourcePath = sourcePath.substring(0, sourcePath.length - 3);
     }
@@ -2171,7 +2171,7 @@
                           advanceChar(parser);
                           if (parser.currentChar === 61) {
                               advanceChar(parser);
-                              return 4194344;
+                              return 4718632;
                           }
                           return 8913465;
                       }
@@ -2214,7 +2214,7 @@
                           advanceChar(parser);
                           if (parser.currentChar === 61) {
                               advanceChar(parser);
-                              return 4194345;
+                              return 4718633;
                           }
                           return 8913720;
                       }
@@ -2230,7 +2230,7 @@
                           advanceChar(parser);
                           if (parser.currentChar === 61) {
                               advanceChar(parser);
-                              return 4194346;
+                              return 4718634;
                           }
                           return 276824445;
                       }
@@ -4896,7 +4896,7 @@
       currentChar = 0;
       exportedNames = new Set();
       exportedBindings = new Set();
-      assignable = 1;
+      assignable = 0;
       destructible = 0;
       leadingDecorators = { decorators: [] };
       constructor(source, rawOptions = {}) {
@@ -6185,6 +6185,8 @@
       if ((token & 4194304) === 4194304) {
           if (parser.assignable & 2)
               parser.report(26);
+          if ((token & 524288) === 524288 && parser.assignable & 4)
+              parser.report(26);
           if ((!isPattern && token === 1077936155 && left.type === 'ArrayExpression') ||
               left.type === 'ObjectExpression') {
               reinterpretToPattern(parser, left);
@@ -6550,7 +6552,12 @@
                       parser.flags = (parser.flags | 2048) ^ 2048;
                   }
                   const args = parseArguments(parser, context, privateScope, inGroup);
-                  parser.assignable = 2;
+                  if (!(context & 1) && parser.options.webcompat) {
+                      parser.assignable = 4;
+                  }
+                  else {
+                      parser.assignable = 2;
+                  }
                   expr = parser.finishNode({
                       type: 'CallExpression',
                       callee: expr,
@@ -6618,7 +6625,12 @@
       }
       else if (parser.getToken() === 67174411) {
           const args = parseArguments(parser, context, privateScope, 0);
-          parser.assignable = 2;
+          if (!(context & 1) && parser.options.webcompat) {
+              parser.assignable = 4;
+          }
+          else {
+              parser.assignable = 2;
+          }
           node = parser.finishNode({
               type: 'CallExpression',
               callee: expr,
@@ -7223,9 +7235,9 @@
                       }
                       else if (parser.getToken() !== 1077936155) {
                           destructible |=
-                              parser.assignable & 2
-                                  ? 16
-                                  : 32;
+                              parser.assignable & 1
+                                  ? 32
+                                  : 16;
                       }
                   }
               }
@@ -7255,9 +7267,9 @@
                       }
                       else if (parser.getToken() !== 1077936155) {
                           destructible |=
-                              parser.assignable & 2
-                                  ? 16
-                                  : 32;
+                              parser.assignable & 1
+                                  ? 32
+                                  : 16;
                       }
                   }
               }
@@ -7374,7 +7386,7 @@
               if (parser.destructible & 8)
                   parser.report(71);
               argument = parseMemberOrUpdateExpression(parser, context, privateScope, argument, inGroup, 0, tokenStart);
-              destructible |= parser.assignable & 2 ? 16 : 0;
+              destructible |= parser.assignable & 1 ? 0 : 16;
               if ((parser.getToken() & 4194304) === 4194304) {
                   if (parser.getToken() !== 1077936155)
                       destructible |= 16;
@@ -7388,9 +7400,9 @@
                       argument = parseConditionalExpression(parser, context, privateScope, argument, tokenStart);
                   }
                   destructible |=
-                      parser.assignable & 2
-                          ? 16
-                          : 32;
+                      parser.assignable & 1
+                          ? 32
+                          : 16;
               }
           }
           else {
@@ -7419,7 +7431,9 @@
                   argument = parseAssignmentExpression(parser, context, privateScope, inGroup, isPattern, tokenStart, argument);
               }
               destructible |=
-                  parser.assignable & 1 ? 32 : 16;
+                  parser.assignable & 1
+                      ? 32
+                      : 16;
           }
           parser.destructible = destructible;
           if (parser.getToken() !== closingToken && parser.getToken() !== 18)
@@ -7611,7 +7625,9 @@
                                   : parseObjectLiteralOrPattern(parser, context, scope, privateScope, 0, inGroup, isPattern, kind, origin);
                           destructible = parser.destructible;
                           parser.assignable =
-                              destructible & 16 ? 2 : 1;
+                              destructible & 16
+                                  ? 2
+                                  : 1;
                           if (parser.getToken() === 18 || parser.getToken() === 1074790415) {
                               if (parser.assignable & 2)
                                   destructible |= 16;
@@ -7633,9 +7649,9 @@
                                       value = parseConditionalExpression(parser, context, privateScope, value, tokenStart);
                                   }
                                   destructible |=
-                                      parser.assignable & 2
-                                          ? 16
-                                          : 32;
+                                      parser.assignable & 1
+                                          ? 32
+                                          : 16;
                               }
                           }
                       }
@@ -7792,7 +7808,9 @@
                                   : parseObjectLiteralOrPattern(parser, context, scope, privateScope, 0, inGroup, isPattern, kind, origin);
                           destructible = parser.destructible;
                           parser.assignable =
-                              destructible & 16 ? 2 : 1;
+                              destructible & 16
+                                  ? 2
+                                  : 1;
                           if (parser.getToken() === 18 || parser.getToken() === 1074790415) {
                               if (parser.assignable & 2) {
                                   destructible |= 16;
@@ -7812,9 +7830,9 @@
                                       value = parseConditionalExpression(parser, context, privateScope, value, tokenStart);
                                   }
                                   destructible |=
-                                      parser.assignable & 2
-                                          ? 16
-                                          : 32;
+                                      parser.assignable & 1
+                                          ? 32
+                                          : 16;
                               }
                           }
                       }
@@ -7843,7 +7861,7 @@
                   else if (parser.getToken() === 67174411) {
                       state |= 1;
                       value = parseMethodDefinition(parser, context, privateScope, state, inGroup, parser.tokenStart);
-                      destructible = parser.assignable | 16;
+                      destructible = 16;
                   }
                   else {
                       parser.report(134);
@@ -7863,11 +7881,11 @@
                           value = parseMemberOrUpdateExpression(parser, context, privateScope, value, inGroup, 0, tokenStart);
                           if ((parser.getToken() & 4194304) === 4194304) {
                               destructible |=
-                                  parser.assignable & 2
-                                      ? 16
-                                      : token === 1077936155
+                                  parser.assignable & 1
+                                      ? token === 1077936155
                                           ? 0
-                                          : 32;
+                                          : 32
+                                      : 16;
                               value = parseAssignmentExpressionOrPattern(parser, context, privateScope, inGroup, isPattern, tokenStart, value);
                           }
                           else if (parser.getToken() === 18 || parser.getToken() === 1074790415) {
@@ -7898,7 +7916,9 @@
                                   : parseObjectLiteralOrPattern(parser, context, scope, privateScope, 0, inGroup, isPattern, kind, origin);
                           destructible = parser.destructible;
                           parser.assignable =
-                              destructible & 16 ? 2 : 1;
+                              destructible & 16
+                                  ? 2
+                                  : 1;
                           if (parser.getToken() === 18 || parser.getToken() === 1074790415) {
                               if (parser.assignable & 2)
                                   destructible |= 16;
@@ -7923,9 +7943,9 @@
                                       value = parseConditionalExpression(parser, context, privateScope, value, tokenStart);
                                   }
                                   destructible |=
-                                      parser.assignable & 2
-                                          ? 16
-                                          : 32;
+                                      parser.assignable & 1
+                                          ? 32
+                                          : 16;
                               }
                           }
                       }
@@ -8530,6 +8550,12 @@
                   parser.report(48);
               return parseParenthesizedArrow(parser, context, scope, privateScope, [], canAssign, 1, start);
           }
+          if (!(context & 1) && parser.options.webcompat) {
+              parser.assignable = 4;
+          }
+          else {
+              parser.assignable = 2;
+          }
           return parser.finishNode({
               type: 'CallExpression',
               callee,
@@ -8603,7 +8629,7 @@
           }
           else {
               expr = parseExpression(parser, context, privateScope, 1, 0, tokenStart);
-              destructible = parser.assignable;
+              destructible = 0;
               params.push(expr);
               while (consumeOpt(parser, context | 32, 18)) {
                   params.push(parseExpression(parser, context, privateScope, 1, 0, tokenStart));
@@ -8611,7 +8637,12 @@
               destructible |= parser.assignable;
               consume(parser, context, 16);
               parser.destructible = destructible | 16;
-              parser.assignable = 2;
+              if (!(context & 1) && parser.options.webcompat) {
+                  parser.assignable = 4;
+              }
+              else {
+                  parser.assignable = 2;
+              }
               return parser.finishNode({
                   type: 'CallExpression',
                   callee,
@@ -8649,7 +8680,12 @@
       if (destructible & 8) {
           parser.report(62);
       }
-      parser.assignable = 2;
+      if (!(context & 1) && parser.options.webcompat) {
+          parser.assignable = 4;
+      }
+      else {
+          parser.assignable = 2;
+      }
       return parser.finishNode({
           type: 'CallExpression',
           callee,
@@ -86181,7 +86217,7 @@
   }
 
   function toIdentifier(input) {
-    input = input + '';
+    input = `${input}`;
 
     let name = '';
     for (const c of input) {
@@ -86190,9 +86226,7 @@
 
     name = name.replace(/^[-0-9]+/, '');
 
-    name = name.replace(/[-\s]+(.)?/g, function (match, c) {
-      return c ? c.toUpperCase() : ''
-    });
+    name = name.replace(/[-\s]+(.)?/g, (_match, c) => c ? c.toUpperCase() : '');
 
     if (!isValidIdentifier(name)) {
       name = `_${name}`;
@@ -86737,7 +86771,7 @@
             const importVar = generateUidIdentifier(exportSource.value, program);
             importVars.push(importVar);
 
-            for (let specifier of specifiers) {
+            for (const specifier of specifiers) {
               const { exported, local } = specifier;
               const { name } = local;
               let localName;
@@ -86811,6 +86845,17 @@
       }
     }
 
+    // no imports and exports, do not wrap to AMD module, if AMD/UMD should be assumed
+    if (options.skipIfNoImportExport && !(importPaths.length || hasExport)) {
+      options.onAfterTransform?.({
+        ...options,
+        updated: false,
+        program,
+        callbackBody: body
+      });
+      return false
+    }
+
     // adding define wrapper
     if (hasExport && needReturnExport) {
       let returnStat;
@@ -86843,10 +86888,13 @@
 
     options.onAfterTransform?.({
       ...options,
+      updated: true,
       program,
       callbackBody: body
     });
 
+    return true
+
     function addExportStatement({ exported, local }) {
       const asName = exported.name;
       if (asName !== 'default') {
@@ -86928,6 +86976,23 @@
     return arrayExpression(importPaths)
   }
 
+  // Check if one of the first 10 lines shorter than 100 characters contains
+  // "// requirejs-esm-skip-file" or // requirejs-esm-process-file".
+  function processOrSkipByComment(text) {
+    for (let start = 0, i = 0; i < 10; ++i) {
+      const endLine = text.indexOf('\n', start);
+      if (endLine < 0 || endLine > 100) break
+      const line = text.substring(start, endLine);
+      const comment = /^\s*\/\//.test(line);
+      if (!comment) break
+      const directive = /^\s*\/\/\s*requirejs-esm-(skip|process)-file\s*$/.exec(line);
+      if (directive) {
+        return directive[1] === 'process'
+      }
+      start = endLine + 1;
+    }
+  }
+
   function transformAst(program, options = {}) {
     const amds = detectDefinesOrRequires(program);
     const { length } = amds;
@@ -86941,8 +87006,7 @@
         result.updated ||= updated;
       }
     } else {
-      transformEsmToAmd(program, options);
-      result.updated = true;
+      result.updated = transformEsmToAmd(program, options);
     }
     return result
   }
@@ -86953,6 +87017,8 @@
     // Method to update paths of module dependencies, to prefix JavaScript module
     // name with `esm!`, above all.
     resolvePath = resolvePath$1,
+    // Assume AMD/UMD if there're no import or export statements.
+    skipIfNoImportExport,
     // ecmaVersion = 2020,
     // Do not insert `"use strict"` expression to the AMD modules. You'd set it
     // to `false` if your bundler inserts `"use strict"` to the outer scope.
@@ -86967,8 +87033,15 @@
     onBeforeUpdate,
     onAfterUpdate
   } = {}) {
+    const processOrSkip = processOrSkipByComment(text);
+    if (processOrSkip === false) {
+      return { code: text, map: null, updated: false }
+    } else if (processOrSkip === true) {
+      skipIfNoImportExport = undefined;
+    }
+
     // const ast = parse(text, { ecmaVersion, sourceType: 'module', locations: true })
-    let ast = parseModule(text, { next: true, loc: true });
+    const ast = parseModule(text, { next: true, loc: true });
 
     const options = {
       sourceFileName: file,
@@ -86976,6 +87049,7 @@
       resolvePath,
       originalResolvePath: resolvePath$1,
       useStrict,
+      skipIfNoImportExport,
       onBeforeTransform,
       onAfterTransform,
       onBeforeUpdate,
@@ -87020,6 +87094,8 @@
     onlyAmd,
     // List of module names not to check and transform.
     skipModules = [],
+    // Assume AMD/UMD if there're no import or export statements.
+    skipIfNoImportExport,
     // Method to update paths of module dependencies, to prefix JavaScript module
     // name with `esm!`, above all.
     resolvePath,
@@ -87116,6 +87192,7 @@
             resolvePath,
             /*ecmaVersion,*/
             useStrict,
+            skipIfNoImportExport,
             // 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.
@@ -87160,7 +87237,7 @@
         // compiled with esm refer it with that name and this stub will simplify
         // the module loading by skipping the plugin evaluation.
         write.asModule(`${pluginName}!${moduleName}`,
-          '\ndefine([\'' + moduleName + '\'], res => res);\n');
+          `\ndefine(['${moduleName}'], res => res);\n`);
       }
   //>>excludeEnd('excludeEsm')
     }