@knighted/module 1.0.0-beta.2 → 1.0.0-beta.4

package/README.md

@@ -22,7 +22,7 @@ By default `@knighted/module` transforms the one-to-one [differences between ES
 
 ## Requirements
 
-- Node >= 20.11.0
+- Node >= 22.21.1
 
 ## Install
 
@@ -134,7 +134,7 @@ Behavior notes (defaults in parentheses)
 - `cjsDefault` (`auto`): bundler-style default interop vs direct `module.exports`.
 - `out`/`inPlace`: write the transformed code to a file; otherwise the function returns the transformed string only.
 
-See [docs/esm-to-cjs.md](docs/esm-to-cjs.md) for deeper notes on live bindings, interop helpers, top-level await behavior, and `import.meta.main` handling.
+See [docs/esm-to-cjs.md](docs/esm-to-cjs.md) for deeper notes on live bindings, interop helpers, top-level await behavior, and `import.meta.main` handling. For CommonJS to ESM lowering details, read [docs/cjs-to-esm.md](docs/cjs-to-esm.md).
 
 ## Roadmap
 

package/dist/cjs/format.cjs

@@ -26,6 +26,79 @@ const exportAssignment = (name, expr, live) => {
 };
 const defaultInteropName = '__interopDefault';
 const interopHelper = `const ${defaultInteropName} = mod => (mod && mod.__esModule ? mod.default : mod);\n`;
+const isRequireCallee = (callee, shadowed) => {
+  if (callee.type === 'Identifier' && callee.name === 'require' && !shadowed.has('require')) {
+    return true;
+  }
+  if (callee.type === 'MemberExpression' && callee.object.type === 'Identifier' && callee.object.name === 'module' && !shadowed.has('module') && callee.property.type === 'Identifier' && callee.property.name === 'require') {
+    return true;
+  }
+  return false;
+};
+const isStaticRequire = (node, shadowed) => node.type === 'CallExpression' && isRequireCallee(node.callee, shadowed) && node.arguments.length === 1 && node.arguments[0].type === 'Literal' && typeof node.arguments[0].value === 'string';
+const isRequireCall = (node, shadowed) => node.type === 'CallExpression' && isRequireCallee(node.callee, shadowed);
+const lowerCjsRequireToImports = (program, code, shadowed) => {
+  const transforms = [];
+  const imports = [];
+  let nsIndex = 0;
+  let needsCreateRequire = false;
+  for (const stmt of program.body) {
+    if (stmt.type === 'VariableDeclaration') {
+      const decls = stmt.declarations;
+      const allStatic = decls.length > 0 && decls.every(decl => decl.init && isStaticRequire(decl.init, shadowed));
+      if (allStatic) {
+        for (const decl of decls) {
+          const init = decl.init;
+          const source = code.slice(init.arguments[0].start, init.arguments[0].end);
+          if (decl.id.type === 'Identifier') {
+            imports.push(`import * as ${decl.id.name} from ${source};\n`);
+          } else if (decl.id.type === 'ObjectPattern') {
+            const ns = `__cjsImport${nsIndex++}`;
+            const pattern = code.slice(decl.id.start, decl.id.end);
+            imports.push(`import * as ${ns} from ${source};\n`);
+            imports.push(`const ${pattern} = ${ns};\n`);
+          } else {
+            needsCreateRequire = true;
+          }
+        }
+        transforms.push({
+          start: stmt.start,
+          end: stmt.end,
+          code: ';\n'
+        });
+        continue;
+      }
+      for (const decl of decls) {
+        const init = decl.init;
+        if (init && isRequireCall(init, shadowed)) {
+          needsCreateRequire = true;
+        }
+      }
+    }
+    if (stmt.type === 'ExpressionStatement') {
+      const expr = stmt.expression;
+      if (expr && isStaticRequire(expr, shadowed)) {
+        const source = code.slice(expr.arguments[0].start, expr.arguments[0].end);
+        imports.push(`import ${source};\n`);
+        transforms.push({
+          start: stmt.start,
+          end: stmt.end,
+          code: ';\n'
+        });
+        continue;
+      }
+      if (expr && isRequireCall(expr, shadowed)) {
+        needsCreateRequire = true;
+      }
+    }
+  }
+  return {
+    transforms,
+    imports,
+    needsCreateRequire
+  };
+};
+const isRequireMainMember = (node, shadowed) => node && node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.object.name === 'require' && !shadowed.has('require') && node.property.type === 'Identifier' && node.property.name === 'main';
 const hasTopLevelAwait = program => {
   let found = false;
   const walkNode = (node, inFunction) => {
@@ -262,28 +335,67 @@ const format = async (src, ast, opts) => {
     hasDefaultExportBeenReassigned: false,
     hasDefaultExportBeenAssigned: false
   };
+  const moduleIdentifiers = await (0, _identifiers.collectModuleIdentifiers)(ast.program);
+  const shadowedBindings = new Set([...moduleIdentifiers.entries()].filter(([, meta]) => meta.declare.length > 0).map(([name]) => name));
+  if (opts.target === 'module' && opts.transformSyntax) {
+    if (shadowedBindings.has('module') || shadowedBindings.has('exports')) {
+      throw new Error('Cannot transform to ESM: module or exports is shadowed in module scope.');
+    }
+  }
   const exportTable = opts.target === 'module' ? await (0, _exports.collectCjsExports)(ast.program) : null;
-  await (0, _identifiers.collectModuleIdentifiers)(ast.program);
   const shouldCheckTopLevelAwait = opts.target === 'commonjs' && opts.transformSyntax;
   const containsTopLevelAwait = shouldCheckTopLevelAwait ? hasTopLevelAwait(ast.program) : false;
   const shouldLowerCjs = opts.target === 'commonjs' && opts.transformSyntax;
+  const shouldRaiseEsm = opts.target === 'module' && opts.transformSyntax;
+  let hoistedImports = [];
+  let pendingRequireTransforms = [];
+  let needsCreateRequire = false;
   let pendingCjsTransforms = null;
   if (shouldLowerCjs && opts.topLevelAwait === 'error' && containsTopLevelAwait) {
     throw new Error('Top-level await is not supported when targeting CommonJS (set topLevelAwait to "wrap" or "preserve" to override).');
   }
-  if (opts.target === 'module' && opts.transformSyntax) {
-    /**
-     * Prepare ESM output by renaming `exports` to `__exports` and seeding an
-     * `import.meta.filename` touch so import.meta is present even when the
-     * original source never referenced it.
-     */
-    code.prepend(`let ${_exports.exportsRename} = {};
-void import.meta.filename;
-`);
+  if (shouldRaiseEsm) {
+    const {
+      transforms,
+      imports,
+      needsCreateRequire: reqCreate
+    } = lowerCjsRequireToImports(ast.program, code, shadowedBindings);
+    pendingRequireTransforms = transforms;
+    hoistedImports = imports;
+    needsCreateRequire = reqCreate;
   }
   await (0, _walk.ancestorWalk)(ast.program, {
     async enter(node, ancestors) {
       const parent = ancestors[ancestors.length - 2] ?? null;
+      if (shouldRaiseEsm && node.type === 'BinaryExpression') {
+        const op = node.operator;
+        const isEquality = op === '===' || op === '==' || op === '!==' || op === '!=';
+        if (isEquality) {
+          const leftMain = isRequireMainMember(node.left, shadowedBindings);
+          const rightMain = isRequireMainMember(node.right, shadowedBindings);
+          const leftModule = node.left.type === 'Identifier' && node.left.name === 'module' && !shadowedBindings.has('module');
+          const rightModule = node.right.type === 'Identifier' && node.right.name === 'module' && !shadowedBindings.has('module');
+          if (leftMain && rightModule || rightMain && leftModule) {
+            const negate = op === '!==' || op === '!=';
+            code.update(node.start, node.end, negate ? '!import.meta.main' : 'import.meta.main');
+            return;
+          }
+        }
+      }
+      if (shouldRaiseEsm && node.type === 'CallExpression' && isRequireCall(node, shadowedBindings)) {
+        const isStatic = isStaticRequire(node, shadowedBindings);
+        const parent = ancestors[ancestors.length - 2] ?? null;
+        const grandparent = ancestors[ancestors.length - 3] ?? null;
+        const greatGrandparent = ancestors[ancestors.length - 4] ?? null;
+
+        // Hoistable cases are handled separately and don't need createRequire.
+        const topLevelExprStmt = parent?.type === 'ExpressionStatement' && grandparent?.type === 'Program';
+        const topLevelVarDecl = parent?.type === 'VariableDeclarator' && grandparent?.type === 'VariableDeclaration' && greatGrandparent?.type === 'Program';
+        const hoistableTopLevel = isStatic && (topLevelExprStmt || topLevelVarDecl);
+        if (!isStatic || !hoistableTopLevel) {
+          needsCreateRequire = true;
+        }
+      }
       if (node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
         const skipped = ['__filename', '__dirname'];
         const skippedParams = node.params.filter(param => param.type === 'Identifier' && skipped.includes(param.name));
@@ -342,7 +454,7 @@ void import.meta.filename;
         (0, _metaProperty.metaProperty)(node, parent, code, opts);
       }
       if (node.type === 'MemberExpression') {
-        (0, _memberExpression.memberExpression)(node, parent, code, opts);
+        (0, _memberExpression.memberExpression)(node, parent, code, opts, shadowedBindings);
       }
       if ((0, _identifier2.isIdentifierName)(node)) {
         (0, _identifier.identifier)({
@@ -350,11 +462,17 @@ void import.meta.filename;
           ancestors,
           code,
           opts,
-          meta: exportsMeta
+          meta: exportsMeta,
+          shadowed: shadowedBindings
         });
       }
     }
   });
+  if (pendingRequireTransforms.length) {
+    for (const t of pendingRequireTransforms) {
+      code.overwrite(t.start, t.end, t.code);
+    }
+  }
   if (shouldLowerCjs) {
     const {
       importTransforms,
@@ -403,6 +521,20 @@ void import.meta.filename;
       code.append(`\n${lines.join('\n')}\n`);
     }
   }
+  if (shouldRaiseEsm && opts.transformSyntax) {
+    const importPrelude = [];
+    if (needsCreateRequire) {
+      importPrelude.push('import { createRequire } from "node:module";\n');
+    }
+    if (hoistedImports.length) {
+      importPrelude.push(...hoistedImports);
+    }
+    const requireInit = needsCreateRequire ? 'const require = createRequire(import.meta.url);\n' : '';
+    const prelude = `${importPrelude.join('')}${importPrelude.length ? '\n' : ''}${requireInit}let ${_exports.exportsRename} = {};
+void import.meta.filename;
+`;
+    code.prepend(prelude);
+  }
   if (opts.target === 'commonjs' && opts.transformSyntax && containsTopLevelAwait) {
     const body = code.toString();
     if (opts.topLevelAwait === 'wrap') {

package/dist/cjs/formatters/identifier.cjs

@@ -11,7 +11,8 @@ const identifier = ({
   ancestors,
   code,
   opts,
-  meta
+  meta,
+  shadowed
 }) => {
   if (opts.target === 'module') {
     const {
@@ -19,6 +20,9 @@ const identifier = ({
       end,
       name
     } = node;
+    if (shadowed?.has(name)) {
+      return;
+    }
     switch (name) {
       case '__filename':
         code.update(start, end, 'import.meta.url');

package/dist/cjs/formatters/memberExpression.cjs

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.memberExpression = void 0;
 var _exports = require("#utils/exports.js");
-const memberExpression = (node, parent, src, options) => {
+const memberExpression = (node, parent, src, options, shadowed) => {
   if (options.target === 'module') {
+    if (node.object.type === 'Identifier' && shadowed?.has(node.object.name) || node.property.type === 'Identifier' && shadowed?.has(node.property.name)) {
+      return;
+    }
     if (node.object.type === 'Identifier' && node.property.type === 'Identifier' && node.object.name === 'module' && node.property.name === 'exports') {
       src.update(node.start, node.end, _exports.exportsRename);
       return;
@@ -23,18 +26,10 @@ const memberExpression = (node, parent, src, options) => {
       // CommonJS properties of `require`
       switch (name) {
         case 'main':
-          /**
-           * Node.js team still quibbling over import.meta.main ¯\_(ツ)_/¯
-           * @see https://github.com/nodejs/node/pull/32223
-           */
-          if (parent?.type === 'ExpressionStatement') {
-            // This is a standalone expression so remove it to not cause run-time errors.
-            src.remove(start, end);
+          if (parent?.type === 'BinaryExpression') {
+            return;
           }
-          /**
-           * Transform require.main === module.
-           */
-          if (parent?.type === 'BinaryExpression') {}
+          src.update(start, end, 'import.meta.main');
           break;
         case 'resolve':
           src.update(start, end, 'import.meta.resolve');
@@ -48,6 +43,11 @@ const memberExpression = (node, parent, src, options) => {
           break;
       }
     }
+    if (node.object.type === 'Identifier' && node.property.type === 'Identifier' && node.object.name === 'module' && node.property.name === 'require') {
+      if (!shadowed?.has('module')) {
+        src.update(node.start, node.end, 'require');
+      }
+    }
   }
 };
 exports.memberExpression = memberExpression;

package/dist/cjs/memberExpression.d.cts

@@ -1,4 +1,4 @@
 import MagicString from 'magic-string';
 import type { MemberExpression, Node } from 'oxc-parser';
 import type { FormatterOptions } from '../types.cjs';
-export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions) => void;
+export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions, shadowed?: Set<string>) => void;

package/dist/cjs/scopeNodes.d.cts

@@ -0,0 +1,2 @@
+declare const scopeNodes: string[];
+export { scopeNodes };

package/dist/cjs/utils/identifiers.cjs

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collectScopeIdentifiers = exports.collectModuleIdentifiers = void 0;
 var _walk = require("#walk");
-var _scope = require("#helpers/scope.js");
 var _identifier = require("#helpers/identifier.js");
+var _scopeNodes = require("./scopeNodes.cjs");
 const collectScopeIdentifiers = (node, scopes) => {
   const {
     type
@@ -180,7 +180,7 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
       const {
         type
       } = node;
-      if (_scope.scopes.includes(type)) {
+      if (_scopeNodes.scopeNodes.includes(type)) {
         scopes.pop();
       }
     }

package/dist/cjs/utils/scopeNodes.cjs

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.scopeNodes = void 0;
+const scopeNodes = exports.scopeNodes = ['BlockStatement', 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', 'ClassDeclaration', 'ClassExpression', 'ClassBody', 'StaticBlock'];

package/dist/cjs/utils.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.requireMainRgx = exports.isValidUrl = exports.getLangFromExt = exports.exportsRename = exports.collectScopeIdentifiers = exports.collectModuleIdentifiers = exports.collectCjsExports = void 0;
 var _nodePath = require("node:path");
 var _walk = require("./walk.cjs");
-var _scope = require("./helpers/scope.cjs");
 var _identifier = require("./helpers/identifier.cjs");
+var _scopeNodes = require("./utils/scopeNodes.cjs");
 const getLangFromExt = filename => {
   const ext = (0, _nodePath.extname)(filename);
   if (ext.endsWith('.js')) {
@@ -278,7 +278,7 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
       const {
         type
       } = node;
-      if (_scope.scopes.includes(type)) {
+      if (_scopeNodes.scopeNodes.includes(type)) {
         scopes.pop();
       }
     }

package/dist/format.js

@@ -19,6 +19,79 @@ const exportAssignment = (name, expr, live) => {
 };
 const defaultInteropName = '__interopDefault';
 const interopHelper = `const ${defaultInteropName} = mod => (mod && mod.__esModule ? mod.default : mod);\n`;
+const isRequireCallee = (callee, shadowed) => {
+  if (callee.type === 'Identifier' && callee.name === 'require' && !shadowed.has('require')) {
+    return true;
+  }
+  if (callee.type === 'MemberExpression' && callee.object.type === 'Identifier' && callee.object.name === 'module' && !shadowed.has('module') && callee.property.type === 'Identifier' && callee.property.name === 'require') {
+    return true;
+  }
+  return false;
+};
+const isStaticRequire = (node, shadowed) => node.type === 'CallExpression' && isRequireCallee(node.callee, shadowed) && node.arguments.length === 1 && node.arguments[0].type === 'Literal' && typeof node.arguments[0].value === 'string';
+const isRequireCall = (node, shadowed) => node.type === 'CallExpression' && isRequireCallee(node.callee, shadowed);
+const lowerCjsRequireToImports = (program, code, shadowed) => {
+  const transforms = [];
+  const imports = [];
+  let nsIndex = 0;
+  let needsCreateRequire = false;
+  for (const stmt of program.body) {
+    if (stmt.type === 'VariableDeclaration') {
+      const decls = stmt.declarations;
+      const allStatic = decls.length > 0 && decls.every(decl => decl.init && isStaticRequire(decl.init, shadowed));
+      if (allStatic) {
+        for (const decl of decls) {
+          const init = decl.init;
+          const source = code.slice(init.arguments[0].start, init.arguments[0].end);
+          if (decl.id.type === 'Identifier') {
+            imports.push(`import * as ${decl.id.name} from ${source};\n`);
+          } else if (decl.id.type === 'ObjectPattern') {
+            const ns = `__cjsImport${nsIndex++}`;
+            const pattern = code.slice(decl.id.start, decl.id.end);
+            imports.push(`import * as ${ns} from ${source};\n`);
+            imports.push(`const ${pattern} = ${ns};\n`);
+          } else {
+            needsCreateRequire = true;
+          }
+        }
+        transforms.push({
+          start: stmt.start,
+          end: stmt.end,
+          code: ';\n'
+        });
+        continue;
+      }
+      for (const decl of decls) {
+        const init = decl.init;
+        if (init && isRequireCall(init, shadowed)) {
+          needsCreateRequire = true;
+        }
+      }
+    }
+    if (stmt.type === 'ExpressionStatement') {
+      const expr = stmt.expression;
+      if (expr && isStaticRequire(expr, shadowed)) {
+        const source = code.slice(expr.arguments[0].start, expr.arguments[0].end);
+        imports.push(`import ${source};\n`);
+        transforms.push({
+          start: stmt.start,
+          end: stmt.end,
+          code: ';\n'
+        });
+        continue;
+      }
+      if (expr && isRequireCall(expr, shadowed)) {
+        needsCreateRequire = true;
+      }
+    }
+  }
+  return {
+    transforms,
+    imports,
+    needsCreateRequire
+  };
+};
+const isRequireMainMember = (node, shadowed) => node && node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.object.name === 'require' && !shadowed.has('require') && node.property.type === 'Identifier' && node.property.name === 'main';
 const hasTopLevelAwait = program => {
   let found = false;
   const walkNode = (node, inFunction) => {
@@ -255,28 +328,67 @@ const format = async (src, ast, opts) => {
     hasDefaultExportBeenReassigned: false,
     hasDefaultExportBeenAssigned: false
   };
+  const moduleIdentifiers = await collectModuleIdentifiers(ast.program);
+  const shadowedBindings = new Set([...moduleIdentifiers.entries()].filter(([, meta]) => meta.declare.length > 0).map(([name]) => name));
+  if (opts.target === 'module' && opts.transformSyntax) {
+    if (shadowedBindings.has('module') || shadowedBindings.has('exports')) {
+      throw new Error('Cannot transform to ESM: module or exports is shadowed in module scope.');
+    }
+  }
   const exportTable = opts.target === 'module' ? await collectCjsExports(ast.program) : null;
-  await collectModuleIdentifiers(ast.program);
   const shouldCheckTopLevelAwait = opts.target === 'commonjs' && opts.transformSyntax;
   const containsTopLevelAwait = shouldCheckTopLevelAwait ? hasTopLevelAwait(ast.program) : false;
   const shouldLowerCjs = opts.target === 'commonjs' && opts.transformSyntax;
+  const shouldRaiseEsm = opts.target === 'module' && opts.transformSyntax;
+  let hoistedImports = [];
+  let pendingRequireTransforms = [];
+  let needsCreateRequire = false;
   let pendingCjsTransforms = null;
   if (shouldLowerCjs && opts.topLevelAwait === 'error' && containsTopLevelAwait) {
     throw new Error('Top-level await is not supported when targeting CommonJS (set topLevelAwait to "wrap" or "preserve" to override).');
   }
-  if (opts.target === 'module' && opts.transformSyntax) {
-    /**
-     * Prepare ESM output by renaming `exports` to `__exports` and seeding an
-     * `import.meta.filename` touch so import.meta is present even when the
-     * original source never referenced it.
-     */
-    code.prepend(`let ${exportsRename} = {};
-void import.meta.filename;
-`);
+  if (shouldRaiseEsm) {
+    const {
+      transforms,
+      imports,
+      needsCreateRequire: reqCreate
+    } = lowerCjsRequireToImports(ast.program, code, shadowedBindings);
+    pendingRequireTransforms = transforms;
+    hoistedImports = imports;
+    needsCreateRequire = reqCreate;
   }
   await ancestorWalk(ast.program, {
     async enter(node, ancestors) {
       const parent = ancestors[ancestors.length - 2] ?? null;
+      if (shouldRaiseEsm && node.type === 'BinaryExpression') {
+        const op = node.operator;
+        const isEquality = op === '===' || op === '==' || op === '!==' || op === '!=';
+        if (isEquality) {
+          const leftMain = isRequireMainMember(node.left, shadowedBindings);
+          const rightMain = isRequireMainMember(node.right, shadowedBindings);
+          const leftModule = node.left.type === 'Identifier' && node.left.name === 'module' && !shadowedBindings.has('module');
+          const rightModule = node.right.type === 'Identifier' && node.right.name === 'module' && !shadowedBindings.has('module');
+          if (leftMain && rightModule || rightMain && leftModule) {
+            const negate = op === '!==' || op === '!=';
+            code.update(node.start, node.end, negate ? '!import.meta.main' : 'import.meta.main');
+            return;
+          }
+        }
+      }
+      if (shouldRaiseEsm && node.type === 'CallExpression' && isRequireCall(node, shadowedBindings)) {
+        const isStatic = isStaticRequire(node, shadowedBindings);
+        const parent = ancestors[ancestors.length - 2] ?? null;
+        const grandparent = ancestors[ancestors.length - 3] ?? null;
+        const greatGrandparent = ancestors[ancestors.length - 4] ?? null;
+
+        // Hoistable cases are handled separately and don't need createRequire.
+        const topLevelExprStmt = parent?.type === 'ExpressionStatement' && grandparent?.type === 'Program';
+        const topLevelVarDecl = parent?.type === 'VariableDeclarator' && grandparent?.type === 'VariableDeclaration' && greatGrandparent?.type === 'Program';
+        const hoistableTopLevel = isStatic && (topLevelExprStmt || topLevelVarDecl);
+        if (!isStatic || !hoistableTopLevel) {
+          needsCreateRequire = true;
+        }
+      }
       if (node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
         const skipped = ['__filename', '__dirname'];
         const skippedParams = node.params.filter(param => param.type === 'Identifier' && skipped.includes(param.name));
@@ -335,7 +447,7 @@ void import.meta.filename;
         metaProperty(node, parent, code, opts);
       }
       if (node.type === 'MemberExpression') {
-        memberExpression(node, parent, code, opts);
+        memberExpression(node, parent, code, opts, shadowedBindings);
       }
       if (isIdentifierName(node)) {
         identifier({
@@ -343,11 +455,17 @@ void import.meta.filename;
           ancestors,
           code,
           opts,
-          meta: exportsMeta
+          meta: exportsMeta,
+          shadowed: shadowedBindings
         });
       }
     }
   });
+  if (pendingRequireTransforms.length) {
+    for (const t of pendingRequireTransforms) {
+      code.overwrite(t.start, t.end, t.code);
+    }
+  }
   if (shouldLowerCjs) {
     const {
       importTransforms,
@@ -396,6 +514,20 @@ void import.meta.filename;
       code.append(`\n${lines.join('\n')}\n`);
     }
   }
+  if (shouldRaiseEsm && opts.transformSyntax) {
+    const importPrelude = [];
+    if (needsCreateRequire) {
+      importPrelude.push('import { createRequire } from "node:module";\n');
+    }
+    if (hoistedImports.length) {
+      importPrelude.push(...hoistedImports);
+    }
+    const requireInit = needsCreateRequire ? 'const require = createRequire(import.meta.url);\n' : '';
+    const prelude = `${importPrelude.join('')}${importPrelude.length ? '\n' : ''}${requireInit}let ${exportsRename} = {};
+void import.meta.filename;
+`;
+    code.prepend(prelude);
+  }
   if (opts.target === 'commonjs' && opts.transformSyntax && containsTopLevelAwait) {
     const body = code.toString();
     if (opts.topLevelAwait === 'wrap') {

package/dist/formatters/identifier.js

@@ -5,7 +5,8 @@ export const identifier = ({
   ancestors,
   code,
   opts,
-  meta
+  meta,
+  shadowed
 }) => {
   if (opts.target === 'module') {
     const {
@@ -13,6 +14,9 @@ export const identifier = ({
       end,
       name
     } = node;
+    if (shadowed?.has(name)) {
+      return;
+    }
     switch (name) {
       case '__filename':
         code.update(start, end, 'import.meta.url');

package/dist/formatters/memberExpression.js

@@ -1,6 +1,9 @@
 import { exportsRename } from '#utils/exports.js';
-export const memberExpression = (node, parent, src, options) => {
+export const memberExpression = (node, parent, src, options, shadowed) => {
   if (options.target === 'module') {
+    if (node.object.type === 'Identifier' && shadowed?.has(node.object.name) || node.property.type === 'Identifier' && shadowed?.has(node.property.name)) {
+      return;
+    }
     if (node.object.type === 'Identifier' && node.property.type === 'Identifier' && node.object.name === 'module' && node.property.name === 'exports') {
       src.update(node.start, node.end, exportsRename);
       return;
@@ -17,18 +20,10 @@ export const memberExpression = (node, parent, src, options) => {
       // CommonJS properties of `require`
       switch (name) {
         case 'main':
-          /**
-           * Node.js team still quibbling over import.meta.main ¯\_(ツ)_/¯
-           * @see https://github.com/nodejs/node/pull/32223
-           */
-          if (parent?.type === 'ExpressionStatement') {
-            // This is a standalone expression so remove it to not cause run-time errors.
-            src.remove(start, end);
+          if (parent?.type === 'BinaryExpression') {
+            return;
           }
-          /**
-           * Transform require.main === module.
-           */
-          if (parent?.type === 'BinaryExpression') {}
+          src.update(start, end, 'import.meta.main');
           break;
         case 'resolve':
           src.update(start, end, 'import.meta.resolve');
@@ -42,5 +37,10 @@ export const memberExpression = (node, parent, src, options) => {
           break;
       }
     }
+    if (node.object.type === 'Identifier' && node.property.type === 'Identifier' && node.object.name === 'module' && node.property.name === 'require') {
+      if (!shadowed?.has('module')) {
+        src.update(node.start, node.end, 'require');
+      }
+    }
   }
 };

package/dist/memberExpression.d.ts

@@ -1,4 +1,4 @@
 import MagicString from 'magic-string';
 import type { MemberExpression, Node } from 'oxc-parser';
 import type { FormatterOptions } from '../types.js';
-export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions) => void;
+export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions, shadowed?: Set<string>) => void;

package/dist/scopeNodes.d.ts

@@ -0,0 +1,2 @@
+declare const scopeNodes: string[];
+export { scopeNodes };

package/dist/src/formatters/identifier.d.ts

@@ -7,6 +7,7 @@ type IdentifierArg = {
     code: MagicString;
     opts: FormatterOptions;
     meta: ExportsMeta;
+    shadowed?: Set<string>;
 };
-export declare const identifier: ({ node, ancestors, code, opts, meta }: IdentifierArg) => void;
+export declare const identifier: ({ node, ancestors, code, opts, meta, shadowed, }: IdentifierArg) => void;
 export {};

package/dist/src/formatters/memberExpression.d.ts

@@ -1,4 +1,4 @@
 import MagicString from 'magic-string';
 import type { MemberExpression, Node } from 'oxc-parser';
 import type { FormatterOptions } from '../types.js';
-export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions) => void;
+export declare const memberExpression: (node: MemberExpression, parent: Node | null, src: MagicString, options: FormatterOptions, shadowed?: Set<string>) => void;

package/dist/src/utils/scopeNodes.d.ts

@@ -0,0 +1,2 @@
+declare const scopeNodes: string[];
+export { scopeNodes };

package/dist/utils/identifiers.js

@@ -1,6 +1,6 @@
 import { ancestorWalk } from '#walk';
-import { scopes as scopeNodes } from '#helpers/scope.js';
 import { identifier } from '#helpers/identifier.js';
+import { scopeNodes } from './scopeNodes.js';
 const collectScopeIdentifiers = (node, scopes) => {
   const {
     type

package/dist/utils/scopeNodes.js

@@ -0,0 +1,2 @@
+const scopeNodes = ['BlockStatement', 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', 'ClassDeclaration', 'ClassExpression', 'ClassBody', 'StaticBlock'];
+export { scopeNodes };

package/dist/utils.js

@@ -1,7 +1,7 @@
 import { extname } from 'node:path';
 import { ancestorWalk } from './walk.js';
-import { scopes as scopeNodes } from './helpers/scope.js';
 import { identifier } from './helpers/identifier.js';
+import { scopeNodes } from './utils/scopeNodes.js';
 const getLangFromExt = filename => {
   const ext = extname(filename);
   if (ext.endsWith('.js')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "Transforms differences between ES modules and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
@@ -27,7 +27,7 @@
     "#formatters/*.js": "./src/formatters/*.js"
   },
   "engines": {
-    "node": ">=20.11.0"
+    "node": ">=22.21.1"
   },
   "engineStrict": true,
   "scripts": {

package/dist/cjs/helpers/scope.cjs

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.scopes = exports.scope = void 0;
-const scopes = exports.scopes = ['BlockStatement', 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', 'ClassDeclaration', 'ClassExpression', 'ClassBody', 'StaticBlock'];
-const scope = exports.scope = {
-  isScope(node) {
-    return scopes.includes(node.type);
-  }
-};

package/dist/cjs/scope.d.cts

@@ -1,6 +0,0 @@
-import type { Node } from 'oxc-parser';
-declare const scopes: string[];
-declare const scope: {
-    isScope(node: Node): boolean;
-};
-export { scopes, scope };

package/dist/helpers/scope.js

@@ -1,7 +0,0 @@
-const scopes = ['BlockStatement', 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression', 'ClassDeclaration', 'ClassExpression', 'ClassBody', 'StaticBlock'];
-const scope = {
-  isScope(node) {
-    return scopes.includes(node.type);
-  }
-};
-export { scopes, scope };

package/dist/scope.d.ts

@@ -1,6 +0,0 @@
-import type { Node } from 'oxc-parser';
-declare const scopes: string[];
-declare const scope: {
-    isScope(node: Node): boolean;
-};
-export { scopes, scope };

package/dist/src/helpers/scope.d.ts

@@ -1,6 +0,0 @@
-import type { Node } from 'oxc-parser';
-declare const scopes: string[];
-declare const scope: {
-    isScope(node: Node): boolean;
-};
-export { scopes, scope };