requirejs-esm 4.1.0 → 4.3.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2025 Ferdinand Prantl
+Copyright (c) 2022-2026 Ferdinand Prantl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -123,6 +123,8 @@ The `esm` plugin supports configuration with the following defaults:
     mixedAmdAndEsm: false,
     // Suppress transpiling even if an optimized module has not been loaded yet.
     onlyAmd: false,
+    // Assume AMD/UMD if there're no import or export statements.
+    skipIfNoImportExport: false,
     // 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.
     useStrict: true,
@@ -182,13 +184,21 @@ The returned object:
 }
 ```
 
+## Skipping ann Forcing Transformation
+
+If the option `skipIfNoImportExport` of `transform` is set to `true` and the input source contains neither `import` nor `export` statements, the input source won't be enclosed in the AMD wrapper. The input will be assumed to be in AMD/UMD format already.
+
+If the input source contains a line "// requirejs-esm-skip-file" among the first 10 lines shorter than 100 characters, the input file will not be transformed.
+
+If the input source contains a line "// requirejs-esm-process-file" among the first 10 lines shorter than 100 characters and the `transform` option `skipIfNoImportExport` is set to `true`, the input will be transformed nevertheless. The comment has a higher priority than the option.
+
 ## Contributing
 
 In lieu of a formal styleguide, take care to maintain the existing coding style. Lint and test your code.
 
 ## License
 
-Copyright (c) 2022-2025 Ferdinand Prantl
+Copyright (c) 2022-2026 Ferdinand Prantl
 
 Licensed under the MIT license.
 

package/bin/esm2requirejs.js

@@ -3,7 +3,7 @@
 // Require module dependencies.
 const { Command } = require('commander')
 const glob = require('tiny-glob')
-const { readFile, writeFile } = require('fs/promises')
+const { readFile, writeFile } = require('node:fs/promises')
 const { transform } = require('../dist/api')
 
 // Define the command-line interface.
@@ -16,9 +16,10 @@ program.description('Transforms an ESM module to AMD or adapts an AMD module for
   .option('-o, --output <file>', 'write the adapted module source to a file')
   .option('-r, --rewrite', 'rewrite the input files with the adapted output')
   .option('-s, --source-map', 'write inline source maps to the adapted output')
+  .option('-a, --skip-if-no-import-export', 'assume AMD/UMD if there\'re no import or export statements')
   .option('-v, --verbose', 'print progress and call stack in case of error')
   .argument('[files...]')
-  .on('--help', function () {
+  .on('--help', () => {
     console.log()
     console.log('You can use one or more file names or one or more glob patterns to specify one')
     console.log('or more files. If you set the plugin name to an empty string, modules already')
@@ -35,6 +36,7 @@ const {
   /*ecma: ecmaVersion,*/
   plugin: pluginName,
   sourceMap,
+  skipIfNoImportExport,
   output: outputFile,
   rewrite,
   verbose
@@ -45,7 +47,7 @@ if (!args.length) {
 }
 
 // Main entry point.
-(async function () {
+((async () => {
   try {
     const files = (await Promise.all(args.map(arg => glob(arg)))).flat()
     if (!files.length) {
@@ -57,6 +59,7 @@ if (!args.length) {
         /*ecmaVersion,*/
         pluginName,
         sourceMap,
+        skipIfNoImportExport,
         verbose
       })
       if (updated) {
@@ -75,4 +78,4 @@ if (!args.length) {
     console.error((!verbose && error.message) || error)
     process.exitCode = 1
   }
-}())
+})())

package/dist/api.js

@@ -69,7 +69,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);
     }
@@ -2080,7 +2080,7 @@
                           advanceChar(parser);
                           if (parser.currentChar === 61) {
                               advanceChar(parser);
-                              return 4194344;
+                              return 4718632;
                           }
                           return 8913465;
                       }
@@ -2123,7 +2123,7 @@
                           advanceChar(parser);
                           if (parser.currentChar === 61) {
                               advanceChar(parser);
-                              return 4194345;
+                              return 4718633;
                           }
                           return 8913720;
                       }
@@ -2139,7 +2139,7 @@
                           advanceChar(parser);
                           if (parser.currentChar === 61) {
                               advanceChar(parser);
-                              return 4194346;
+                              return 4718634;
                           }
                           return 276824445;
                       }
@@ -4805,7 +4805,7 @@
       currentChar = 0;
       exportedNames = new Set();
       exportedBindings = new Set();
-      assignable = 1;
+      assignable = 0;
       destructible = 0;
       leadingDecorators = { decorators: [] };
       constructor(source, rawOptions = {}) {
@@ -6094,6 +6094,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);
@@ -6459,7 +6461,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,
@@ -6527,7 +6534,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,
@@ -7132,9 +7144,9 @@
                       }
                       else if (parser.getToken() !== 1077936155) {
                           destructible |=
-                              parser.assignable & 2
-                                  ? 16
-                                  : 32;
+                              parser.assignable & 1
+                                  ? 32
+                                  : 16;
                       }
                   }
               }
@@ -7164,9 +7176,9 @@
                       }
                       else if (parser.getToken() !== 1077936155) {
                           destructible |=
-                              parser.assignable & 2
-                                  ? 16
-                                  : 32;
+                              parser.assignable & 1
+                                  ? 32
+                                  : 16;
                       }
                   }
               }
@@ -7283,7 +7295,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;
@@ -7297,9 +7309,9 @@
                       argument = parseConditionalExpression(parser, context, privateScope, argument, tokenStart);
                   }
                   destructible |=
-                      parser.assignable & 2
-                          ? 16
-                          : 32;
+                      parser.assignable & 1
+                          ? 32
+                          : 16;
               }
           }
           else {
@@ -7328,7 +7340,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)
@@ -7520,7 +7534,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;
@@ -7542,9 +7558,9 @@
                                       value = parseConditionalExpression(parser, context, privateScope, value, tokenStart);
                                   }
                                   destructible |=
-                                      parser.assignable & 2
-                                          ? 16
-                                          : 32;
+                                      parser.assignable & 1
+                                          ? 32
+                                          : 16;
                               }
                           }
                       }
@@ -7701,7 +7717,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;
@@ -7721,9 +7739,9 @@
                                       value = parseConditionalExpression(parser, context, privateScope, value, tokenStart);
                                   }
                                   destructible |=
-                                      parser.assignable & 2
-                                          ? 16
-                                          : 32;
+                                      parser.assignable & 1
+                                          ? 32
+                                          : 16;
                               }
                           }
                       }
@@ -7752,7 +7770,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);
@@ -7772,11 +7790,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) {
@@ -7807,7 +7825,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;
@@ -7832,9 +7852,9 @@
                                       value = parseConditionalExpression(parser, context, privateScope, value, tokenStart);
                                   }
                                   destructible |=
-                                      parser.assignable & 2
-                                          ? 16
-                                          : 32;
+                                      parser.assignable & 1
+                                          ? 32
+                                          : 16;
                               }
                           }
                       }
@@ -8439,6 +8459,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,
@@ -8512,7 +8538,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));
@@ -8520,7 +8546,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,
@@ -8558,7 +8589,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,
@@ -86090,7 +86126,7 @@
   }
 
   function toIdentifier(input) {
-    input = input + '';
+    input = `${input}`;
 
     let name = '';
     for (const c of input) {
@@ -86099,9 +86135,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}`;
@@ -86337,17 +86371,25 @@
 
   // Updates dependency paths to be prefixed by `esm!` or otherwise updated.
   function updateAmdDeps(amd, options) {
-    options.onBeforeUpdate?.(amd);
+    let updated = options.onBeforeUpdate?.({
+      ...options,
+      amd
+    });
 
     const { deps } = amd;
-    if (!deps) return
+    if (!deps) {
+      afterUpdate();
+      return updated
+    }
 
     const { sourceFileName: parentName } = options;
     const { elements } = deps;
-    if (!elements.length) return
+    if (!elements.length) {
+      afterUpdate();
+      return updated
+    }
 
     const { resolvePath } = options;
-    let updated;
     for (const element of elements) {
       if (element.type === 'Literal') {
         const moduleName = element.value;
@@ -86359,9 +86401,27 @@
       }
     }
 
-    updated ||= options.onAfterUpdate?.(amd);
+    afterUpdate();
 
     return updated
+
+    function afterUpdate() {
+      const updatedNow = options.onAfterUpdate?.({
+        ...options,
+        amd
+      });
+      updated ||= updatedNow;
+    }
+  }
+
+  function callAmdUpdateHooks(amd, options) {
+    options = {
+      ...options,
+      amd
+    };
+    const updatedBefore = options.onBeforeUpdate?.(options);
+    const updatedAfter = options.onAfterUpdate?.(options);
+    return updatedBefore || updatedAfter
   }
 
   function _generateUid(name, i) {
@@ -86692,7 +86752,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;
@@ -86766,6 +86826,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;
@@ -86798,10 +86869,13 @@
 
     options.onAfterTransform?.({
       ...options,
+      updated: true,
       program,
       callbackBody: body
     });
 
+    return true
+
     function addExportStatement({ exported, local }) {
       const asName = exported.name;
       if (asName !== 'default') {
@@ -86883,20 +86957,37 @@
     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;
     const result = {};
     if (length) {
       result.amd = true;
-      if (options.resolvePath) {
-        for (const amd of amds) {
-          result.updated ||= updateAmdDeps(amd, options);
-        }
+      for (const amd of amds) {
+        const updated = options.resolvePath
+          ? updateAmdDeps(amd, options)
+          : callAmdUpdateHooks(amd, options);
+        result.updated ||= updated;
       }
     } else {
-      transformEsmToAmd(program, options);
-      result.updated = true;
+      result.updated = transformEsmToAmd(program, options);
     }
     return result
   }
@@ -86907,6 +86998,8 @@
     // Method to update paths of module dependencies, to prefix JavaScript module
     // name with `esm!`, above all.
     resolvePath: resolvePath$1 = resolvePath,
+    // 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.
@@ -86921,8 +87014,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,
@@ -86930,6 +87030,7 @@
       resolvePath: resolvePath$1,
       originalResolvePath: resolvePath,
       useStrict,
+      skipIfNoImportExport,
       onBeforeTransform,
       onAfterTransform,
       onBeforeUpdate,
@@ -86963,6 +87064,7 @@
 
   exports.detectDefinesOrRequires = detectDefinesOrRequires;
   exports.detectImportsAndExports = detectImportsAndExports;
+  exports.processOrSkipByComment = processOrSkipByComment;
   exports.resolvePath = resolvePath;
   exports.transform = transform;
   exports.transformAst = transformAst;