@knighted/module 1.0.0-beta.3 → 1.0.0-beta.5

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
 
@@ -133,6 +133,7 @@ Behavior notes (defaults in parentheses)
 - `requireSource` (`builtin`): whether `require` comes from Node or `createRequire`.
 - `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.
+- CommonJS → ESM lowering will throw on `with` statements and unshadowed `eval` calls to avoid unsound rewrites.
 
 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).
 
@@ -141,3 +142,4 @@ See [docs/esm-to-cjs.md](docs/esm-to-cjs.md) for deeper notes on live bindings,
 - Remove `@knighted/specifier` and avoid double parsing.
 - Emit source maps and clearer diagnostics for transform choices.
 - Broaden fixtures covering live-binding and top-level await edge cases across Node versions.
+- Benchmark scope analysis choices: compare `periscopic`, `scope-analyzer`, and `eslint-scope` on fixtures and pick the final adapter.

package/dist/cjs/format.cjs

@@ -382,6 +382,12 @@ const format = async (src, ast, opts) => {
           }
         }
       }
+      if (shouldRaiseEsm && node.type === 'WithStatement') {
+        throw new Error('Cannot transform to ESM: with statements are not supported.');
+      }
+      if (shouldRaiseEsm && node.type === 'CallExpression' && node.callee.type === 'Identifier' && node.callee.name === 'eval' && !shadowedBindings.has('eval')) {
+        throw new Error('Cannot transform to ESM: eval is not supported.');
+      }
       if (shouldRaiseEsm && node.type === 'CallExpression' && isRequireCall(node, shadowedBindings)) {
         const isStatic = isStaticRequire(node, shadowedBindings);
         const parent = ancestors[ancestors.length - 2] ?? null;

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
@@ -152,11 +152,14 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
           const isModuleScope = _identifier.identifier.isModuleScope(ancestors);
           const isClassOrFuncDeclaration = _identifier.identifier.isClassOrFuncDeclarationId(ancestors);
           const isVarDeclarationInGlobalScope = _identifier.identifier.isVarDeclarationInGlobalScope(ancestors);
+          const parent = ancestors[ancestors.length - 2];
+          const grandParent = ancestors[ancestors.length - 3];
+          const hoistSafe = parent.type === 'FunctionDeclaration' || parent.type === 'VariableDeclarator' && grandParent?.type === 'VariableDeclaration' && grandParent.kind === 'var';
           if (isModuleScope || isClassOrFuncDeclaration || isVarDeclarationInGlobalScope) {
             meta.declare.push(node);
 
             // Check for hoisted reads
-            if (hoisting && globalReads.has(name)) {
+            if (hoisting && hoistSafe && globalReads.has(name)) {
               const reads = globalReads.get(name);
               if (reads) {
                 reads.forEach(read => {
@@ -180,7 +183,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/lang.cjs

@@ -8,11 +8,11 @@ var _nodePath = require("node:path");
 // Determine language from filename extension for specifier rewrite.
 
 const getLangFromExt = filename => {
-  const ext = (0, _nodePath.extname)(filename);
-  if (ext.endsWith('.js')) {
+  const ext = (0, _nodePath.extname)(filename).toLowerCase();
+  if (ext === '.js' || ext === '.mjs' || ext === '.cjs') {
     return 'js';
   }
-  if (ext.endsWith('.ts')) {
+  if (ext === '.ts' || ext === '.mts' || ext === '.cts') {
     return 'ts';
   }
   if (ext === '.tsx') {

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,14 +6,14 @@ 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')) {
+  const ext = (0, _nodePath.extname)(filename).toLowerCase();
+  if (ext === '.js' || ext === '.mjs' || ext === '.cjs') {
     return 'js';
   }
-  if (ext.endsWith('.ts')) {
+  if (ext === '.ts' || ext === '.mts' || ext === '.cts') {
     return 'ts';
   }
   if (ext === '.tsx') {
@@ -250,11 +250,14 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
           const isModuleScope = _identifier.identifier.isModuleScope(ancestors);
           const isClassOrFuncDeclaration = _identifier.identifier.isClassOrFuncDeclarationId(ancestors);
           const isVarDeclarationInGlobalScope = _identifier.identifier.isVarDeclarationInGlobalScope(ancestors);
+          const parent = ancestors[ancestors.length - 2];
+          const grandParent = ancestors[ancestors.length - 3];
+          const hoistSafe = parent.type === 'FunctionDeclaration' || parent.type === 'VariableDeclarator' && grandParent?.type === 'VariableDeclaration' && grandParent.kind === 'var';
           if (isModuleScope || isClassOrFuncDeclaration || isVarDeclarationInGlobalScope) {
             meta.declare.push(node);
 
             // Check for hoisted reads
-            if (hoisting && globalReads.has(name)) {
+            if (hoisting && hoistSafe && globalReads.has(name)) {
               const reads = globalReads.get(name);
               if (reads) {
                 reads.forEach(read => {
@@ -278,7 +281,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

@@ -375,6 +375,12 @@ const format = async (src, ast, opts) => {
           }
         }
       }
+      if (shouldRaiseEsm && node.type === 'WithStatement') {
+        throw new Error('Cannot transform to ESM: with statements are not supported.');
+      }
+      if (shouldRaiseEsm && node.type === 'CallExpression' && node.callee.type === 'Identifier' && node.callee.name === 'eval' && !shadowedBindings.has('eval')) {
+        throw new Error('Cannot transform to ESM: eval is not supported.');
+      }
       if (shouldRaiseEsm && node.type === 'CallExpression' && isRequireCall(node, shadowedBindings)) {
         const isStatic = isStaticRequire(node, shadowedBindings);
         const parent = ancestors[ancestors.length - 2] ?? null;

package/dist/scopeNodes.d.ts

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

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
@@ -145,11 +145,14 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
           const isModuleScope = identifier.isModuleScope(ancestors);
           const isClassOrFuncDeclaration = identifier.isClassOrFuncDeclarationId(ancestors);
           const isVarDeclarationInGlobalScope = identifier.isVarDeclarationInGlobalScope(ancestors);
+          const parent = ancestors[ancestors.length - 2];
+          const grandParent = ancestors[ancestors.length - 3];
+          const hoistSafe = parent.type === 'FunctionDeclaration' || parent.type === 'VariableDeclarator' && grandParent?.type === 'VariableDeclaration' && grandParent.kind === 'var';
           if (isModuleScope || isClassOrFuncDeclaration || isVarDeclarationInGlobalScope) {
             meta.declare.push(node);
 
             // Check for hoisted reads
-            if (hoisting && globalReads.has(name)) {
+            if (hoisting && hoistSafe && globalReads.has(name)) {
               const reads = globalReads.get(name);
               if (reads) {
                 reads.forEach(read => {

package/dist/utils/lang.js

@@ -3,11 +3,11 @@ import { extname } from 'node:path';
 // Determine language from filename extension for specifier rewrite.
 
 const getLangFromExt = filename => {
-  const ext = extname(filename);
-  if (ext.endsWith('.js')) {
+  const ext = extname(filename).toLowerCase();
+  if (ext === '.js' || ext === '.mjs' || ext === '.cjs') {
     return 'js';
   }
-  if (ext.endsWith('.ts')) {
+  if (ext === '.ts' || ext === '.mts' || ext === '.cts') {
     return 'ts';
   }
   if (ext === '.tsx') {

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,13 +1,13 @@
 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')) {
+  const ext = extname(filename).toLowerCase();
+  if (ext === '.js' || ext === '.mjs' || ext === '.cjs') {
     return 'js';
   }
-  if (ext.endsWith('.ts')) {
+  if (ext === '.ts' || ext === '.mts' || ext === '.cts') {
     return 'ts';
   }
   if (ext === '.tsx') {
@@ -240,11 +240,14 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
           const isModuleScope = identifier.isModuleScope(ancestors);
           const isClassOrFuncDeclaration = identifier.isClassOrFuncDeclarationId(ancestors);
           const isVarDeclarationInGlobalScope = identifier.isVarDeclarationInGlobalScope(ancestors);
+          const parent = ancestors[ancestors.length - 2];
+          const grandParent = ancestors[ancestors.length - 3];
+          const hoistSafe = parent.type === 'FunctionDeclaration' || parent.type === 'VariableDeclarator' && grandParent?.type === 'VariableDeclaration' && grandParent.kind === 'var';
           if (isModuleScope || isClassOrFuncDeclaration || isVarDeclarationInGlobalScope) {
             meta.declare.push(node);
 
             // Check for hoisted reads
-            if (hoisting && globalReads.has(name)) {
+            if (hoisting && hoistSafe && globalReads.has(name)) {
               const reads = globalReads.get(name);
               if (reads) {
                 reads.forEach(read => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "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 };