@knighted/module 1.5.1 → 1.6.0

package/README.md

@@ -25,7 +25,7 @@ By default `@knighted/module` transforms the one-to-one [differences between ES
 
 ## Requirements
 
-- Node 22.21.1+ or 24+
+- Node >= 22.21.1 (<23), >= 24 (<25), or >= 26 (<27)
 
 ## Install
 
@@ -222,4 +222,7 @@ dub -t commonjs "src/**/*.{ts,js,mts,cts}" --ignore node_modules/** --transform-
 tsc
 ```
 
+> [!NOTE]
+> With TypeScript 6+, when a `tsconfig.json` is present, `rootDir` defaults to `.`. If your config uses `outDir` and includes sources under `src`, set `"rootDir": "./src"` explicitly to avoid TS5011.
+
 This pre-`tsc` step rewrites globals-only (keeps import/export syntax) so the TypeScript checker sees already-rewritten sources; runtime semantics still match the target build.

package/dist/ast.d.ts

@@ -1,14 +1,14 @@
 import type { Node } from 'oxc-parser';
 import type { CjsExport } from '../types.js';
 export type { Node };
-export type IdentifierNode = Extract<Node, {
+type IdentifierNode = Extract<Node, {
     type: 'Identifier';
 }>;
 export type LiteralNode = Extract<Node, {
     type: 'Literal';
     value?: unknown;
 }>;
-export type MemberExpressionNode = Extract<Node, {
+type MemberExpressionNode = Extract<Node, {
     type: 'MemberExpression';
 }>;
 export type CallExpressionNode = Extract<Node, {

package/dist/async.d.ts

@@ -1,4 +1,4 @@
-import type { Node, ProgramNode } from './ast.js';
+import { type Node, type ProgramNode } from './ast.js';
 declare const hasTopLevelAwait: (program: ProgramNode) => boolean;
 declare const isAsyncContext: (ancestors: Node[]) => boolean;
 export { hasTopLevelAwait, isAsyncContext };

package/dist/cjs/ast.d.cts

@@ -1,14 +1,14 @@
 import type { Node } from 'oxc-parser';
 import type { CjsExport } from '../types.cjs';
 export type { Node };
-export type IdentifierNode = Extract<Node, {
+type IdentifierNode = Extract<Node, {
     type: 'Identifier';
 }>;
 export type LiteralNode = Extract<Node, {
     type: 'Literal';
     value?: unknown;
 }>;
-export type MemberExpressionNode = Extract<Node, {
+type MemberExpressionNode = Extract<Node, {
     type: 'MemberExpression';
 }>;
 export type CallExpressionNode = Extract<Node, {

package/dist/cjs/async.d.cts

@@ -1,4 +1,4 @@
-import type { Node, ProgramNode } from './ast.cjs';
+import { type Node, type ProgramNode } from './ast.cjs';
 declare const hasTopLevelAwait: (program: ProgramNode) => boolean;
 declare const isAsyncContext: (ancestors: Node[]) => boolean;
 export { hasTopLevelAwait, isAsyncContext };

package/dist/cjs/cli.cjs

@@ -5,17 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.runCli = void 0;
-var _nodeProcess = require("node:process");
-var _nodeUtil = require("node:util");
 var _promises = require("node:fs/promises");
 var _nodePath = require("node:path");
-var _glob = require("glob");
+var _nodeProcess = require("node:process");
+var _nodeUtil = require("node:util");
+var _format = require("./format.cjs");
 var _module = require("./module.cjs");
 var _parse = require("./parse.cjs");
-var _format = require("./format.cjs");
 var _specifier = require("./specifier.cjs");
-var _lang = require("./utils/lang.cjs");
 var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
+var _lang = require("./utils/lang.cjs");
 const defaultOptions = {
   target: 'commonjs',
   sourceType: 'auto',
@@ -387,14 +386,14 @@ const normalizeSourceMapArgv = argv => {
 const expandFiles = async (patterns, cwd, ignore) => {
   const files = new Set();
   for (const pattern of patterns) {
-    const matches = await (0, _glob.glob)(pattern, {
+    for await (const match of (0, _promises.glob)(pattern, {
       cwd,
-      absolute: true,
-      nodir: true,
-      windowsPathsNoEscape: true,
-      ignore
-    });
-    for (const m of matches) files.add((0, _nodePath.resolve)(m));
+      exclude: ignore,
+      withFileTypes: true
+    })) {
+      if (match.isDirectory()) continue;
+      files.add((0, _nodePath.resolve)(match.parentPath, match.name));
+    }
   }
   return [...files];
 };
@@ -685,7 +684,7 @@ if (import.meta.main) {
   runCli().then(code => {
     if (code !== 0) process.exit(code);
   }, err => {
-    // eslint-disable-next-line no-console -- CLI surface
+    // eslint-disable-next-line no-console
     console.error(err);
     process.exit(1);
   });

package/dist/cjs/exports.d.cts

@@ -1,9 +1,8 @@
 import type { Node } from 'oxc-parser';
 import type { CjsExport } from '../types.cjs';
 declare const exportsRename = "__exports";
-declare const requireMainRgx: RegExp;
 type ExportsMap = Map<string, CjsExport> & {
     hasUnsupportedExportWrite?: boolean;
 };
 declare const collectCjsExports: (ast: Node) => Promise<ExportsMap>;
-export { exportsRename, requireMainRgx, collectCjsExports };
+export { exportsRename, collectCjsExports };

package/dist/cjs/format.cjs

@@ -5,26 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dualPackageHazardDiagnostics = exports.collectDualPackageUsage = void 0;
 exports.format = format;
-var _nodePath = require("node:path");
 var _promises = require("node:fs/promises");
+var _nodePath = require("node:path");
 var _magicString = _interopRequireDefault(require("magic-string"));
-var _async = require("./helpers/async.cjs");
-var _identifier = require("./helpers/identifier.cjs");
 var _assignmentExpression = require("./formatters/assignmentExpression.cjs");
-var _identifier2 = require("./formatters/identifier.cjs");
+var _identifier = require("./formatters/identifier.cjs");
 var _memberExpression = require("./formatters/memberExpression.cjs");
 var _metaProperty = require("./formatters/metaProperty.cjs");
-var _idiomaticPlan = require("./pipeline/idiomaticPlan.cjs");
+var _async = require("./helpers/async.cjs");
+var _identifier2 = require("./helpers/identifier.cjs");
 var _buildEsmPrelude = require("./pipeline/buildEsmPrelude.cjs");
 var _exportBagToEsm = require("./pipeline/exportBagToEsm.cjs");
-var _lowerCjsRequireToImports = require("./pipeline/lowerCjsRequireToImports.cjs");
-var _lowerEsmToCjs = require("./pipeline/lowerEsmToCjs.cjs");
 var _formatVisitor = require("./pipeline/formatVisitor.cjs");
+var _idiomaticPlan = require("./pipeline/idiomaticPlan.cjs");
 var _interopHelpers = require("./pipeline/interopHelpers.cjs");
+var _lowerCjsRequireToImports = require("./pipeline/lowerCjsRequireToImports.cjs");
+var _lowerEsmToCjs = require("./pipeline/lowerEsmToCjs.cjs");
+var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
 var _exports = require("./utils/exports.cjs");
 var _identifiers = require("./utils/identifiers.cjs");
 var _url = require("./utils/url.cjs");
-var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
 var _walk = require("./walk.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const isRequireMainMember = (node, shadowed) => node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.object.name === 'require' && !shadowed.has('require') && node.property.type === 'Identifier' && node.property.name === 'main';
@@ -313,12 +313,12 @@ async function format(src, ast, opts) {
       return;
     }
     if (diag.level === 'warning') {
-      // eslint-disable-next-line no-console -- used for opt-in diagnostics
+      // eslint-disable-next-line no-console
       console.warn(diag.message);
       return;
     }
 
-    // eslint-disable-next-line no-console -- used for opt-in diagnostics
+    // eslint-disable-next-line no-console
     console.error(diag.message);
   };
   const diagOnce = (level, codeId, message, loc) => {
@@ -447,11 +447,11 @@ async function format(src, ast, opts) {
       isStaticRequire: _lowerCjsRequireToImports.isStaticRequire,
       isAsyncContext: _async.isAsyncContext,
       isValidUrl: _url.isValidUrl,
-      isIdentifierName: _identifier.isIdentifierName,
+      isIdentifierName: _identifier2.isIdentifierName,
       assignmentExpression: _assignmentExpression.assignmentExpression,
       metaProperty: _metaProperty.metaProperty,
       memberExpression: _memberExpression.memberExpression,
-      identifier: _identifier2.identifier
+      identifier: _identifier.identifier
     }, walkState)
   });
   ({

package/dist/cjs/format.d.cts

@@ -1,8 +1,8 @@
-import type { Node, ParseResult } from 'oxc-parser';
 import MagicString from 'magic-string';
+import type { Node, ParseResult } from 'oxc-parser';
 import type { Diagnostic, FormatterOptions } from './types.cjs';
 type HazardLevel = 'warning' | 'error';
-export type PackageUse = {
+type PackageUse = {
     spec: string;
     subpath: string;
     loc?: {

package/dist/cjs/formatVisitor.d.cts

@@ -1,7 +1,7 @@
 import type MagicString from 'magic-string';
-import type { Node, CallExpressionNode } from '../helpers/ast.cjs';
 import type { IdentifierName } from 'oxc-parser';
 import type { WarnOnce } from './exportBagToEsm.cjs';
+import type { Node, CallExpressionNode } from '../helpers/ast.cjs';
 import type { FormatterOptions, ExportsMeta } from '../types.cjs';
 type AssignmentExpressionFn = (typeof import('../formatters/assignmentExpression.cjs'))['assignmentExpression'];
 type IdentifierFn = (typeof import('../formatters/identifier.cjs'))['identifier'];

package/dist/cjs/formatters/identifier.cjs

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.identifier = void 0;
-var _exports = require("../utils/exports.cjs");
 var _identifier = require("../helpers/identifier.cjs");
+var _exports = require("../utils/exports.cjs");
 const identifier = ({
   node,
   ancestors,

package/dist/cjs/identifiers.d.cts

@@ -1,6 +1,5 @@
 import type { Node } from 'oxc-parser';
-import type { IdentMeta, Scope } from '../types.cjs';
-declare const collectScopeIdentifiers: (node: Node, scopes: Scope[]) => void;
+import type { IdentMeta } from '../types.cjs';
 /**
  * Collects all module scope identifiers in the AST.
  *
@@ -16,4 +15,4 @@ declare const collectScopeIdentifiers: (node: Node, scopes: Scope[]) => void;
  * which are also valid module scope identifiers.
  */
 declare const collectModuleIdentifiers: (ast: Node, hoisting?: boolean) => Promise<Map<string, IdentMeta>>;
-export { collectScopeIdentifiers, collectModuleIdentifiers };
+export { collectModuleIdentifiers };

package/dist/cjs/idiomaticPlan.d.cts

@@ -25,4 +25,3 @@ type BuildIdiomaticPlanParams = {
 };
 declare const buildIdiomaticPlan: ({ src, code, exportTable, shadowedBindings, idiomaticMode, }: BuildIdiomaticPlanParams) => IdiomaticPlanResult;
 export { buildIdiomaticPlan };
-export type { IdiomaticPlan, IdiomaticPlanResult };

package/dist/cjs/lowerEsmToCjs.d.cts

@@ -1,7 +1,6 @@
 import MagicString from 'magic-string';
 import { type ProgramNode } from '../helpers/ast.cjs';
 import type { FormatterOptions } from '../types.cjs';
-declare const exportAssignment: (name: string, expr: string, live: "strict" | "loose" | "off") => string;
 type ImportTransform = {
     start: number;
     end: number;
@@ -19,4 +18,4 @@ declare const lowerEsmToCjs: (program: ProgramNode, code: MagicString, opts: For
     exportTransforms: ExportTransform[];
     needsInterop: boolean;
 };
-export { exportAssignment, lowerEsmToCjs, type ExportTransform, type ImportTransform };
+export { lowerEsmToCjs, type ExportTransform, type ImportTransform };

package/dist/cjs/module.cjs

@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collectProjectDualPackageHazards = void 0;
 exports.transform = transform;
-var _nodePath = require("node:path");
 var _promises = require("node:fs/promises");
-var _specifier = require("./specifier.cjs");
-var _parse = require("./parse.cjs");
+var _nodePath = require("node:path");
 var _format = require("./format.cjs");
+var _parse = require("./parse.cjs");
+var _specifier = require("./specifier.cjs");
+var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
+var _identifiers = require("./utils/identifiers.cjs");
 var _lang = require("./utils/lang.cjs");
 var _walk = require("./walk.cjs");
-var _identifiers = require("./utils/identifiers.cjs");
-var _builtinSpecifiers = require("./utils/builtinSpecifiers.cjs");
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
 const appendExtensionIfNeeded = (spec, mode, dirIndex, value = spec.value) => {
   if (mode === 'off') return;
@@ -122,7 +122,8 @@ const detectCircularRequireGraph = async (entryFile, mode, dirIndex) => {
       if (mode === 'error') {
         throw new Error(msg);
       }
-      // eslint-disable-next-line no-console -- surfaced when cycle detection is warn-only
+
+      // eslint-disable-next-line no-console
       console.warn(msg);
       return;
     }

package/dist/cjs/module.d.cts

@@ -1,5 +1,5 @@
 import type { ModuleOptions, Diagnostic } from './types.cjs';
-import type { SourceMap } from 'magic-string';
+type SourceMap = import('magic-string').SourceMap;
 declare const collectProjectDualPackageHazards: (files: string[], opts: ModuleOptions) => Promise<Map<string, Diagnostic[]>>;
 declare function transform(filename: string, options: ModuleOptions & {
     sourceMap: true;

package/dist/cjs/pipeline/buildEsmPrelude.cjs

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildEsmPrelude = void 0;
-var _exports = require("../utils/exports.cjs");
 var _interopHelpers = require("./interopHelpers.cjs");
+var _exports = require("../utils/exports.cjs");
 const buildEsmPrelude = options => {
   const {
     needsCreateRequire,

package/dist/cjs/pipeline/lowerCjsRequireToImports.cjs

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.lowerCjsRequireToImports = exports.isStaticRequire = exports.isRequireCall = void 0;
-var _ast = require("../helpers/ast.cjs");
 var _interopHelpers = require("./interopHelpers.cjs");
+var _ast = require("../helpers/ast.cjs");
 const isRequireCallee = (callee, shadowed) => {
   if (callee.type === 'Identifier' && callee.name === 'require' && !shadowed.has('require')) {
     return true;

package/dist/cjs/pipeline/lowerEsmToCjs.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.lowerEsmToCjs = exports.exportAssignment = void 0;
-var _ast = require("../helpers/ast.cjs");
+exports.lowerEsmToCjs = void 0;
 var _interopHelpers = require("./interopHelpers.cjs");
+var _ast = require("../helpers/ast.cjs");
 const isValidIdent = name => /^[$A-Z_a-z][$\w]*$/.test(name);
 const exportAssignment = (name, expr, live) => {
   const prop = isValidIdent(name) ? `.${name}` : `[${JSON.stringify(name)}]`;
@@ -15,7 +15,6 @@ const exportAssignment = (name, expr, live) => {
   }
   return `exports${prop} = ${expr};`;
 };
-exports.exportAssignment = exportAssignment;
 const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
   const live = opts.liveBindings ?? 'strict';
   const importTransforms = [];

package/dist/cjs/specifier.cjs

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.specifier = void 0;
-var _nodePath = require("node:path");
 var _promises = require("node:fs/promises");
+var _nodePath = require("node:path");
 var _magicString = _interopRequireDefault(require("magic-string"));
 var _oxcParser = require("oxc-parser");
 var _walk = require("./walk.cjs");

package/dist/cjs/specifier.d.cts

@@ -15,4 +15,4 @@ declare const specifier: {
     updateMagicString(code: MagicString, src: string, ast: ParseResult, callback: Callback): Promise<MagicString>;
 };
 export { specifier };
-export type { Spec, Callback };
+export type { Spec };

package/dist/cjs/utils/exports.cjs

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requireMainRgx = exports.exportsRename = exports.collectCjsExports = void 0;
+exports.exportsRename = exports.collectCjsExports = void 0;
 var _walk = require("../walk.cjs");
 const exportsRename = exports.exportsRename = '__exports';
-const requireMainRgx = exports.requireMainRgx = /(require\.main\s*===\s*module|module\s*===\s*require\.main)/g;
 const literalPropName = (prop, literals) => {
   if (prop.type === 'Identifier') return literals?.get(prop.name)?.toString() ?? prop.name;
   if (prop.type === 'Literal' && (typeof prop.value === 'string' || typeof prop.value === 'number')) {

package/dist/cjs/utils/identifiers.cjs

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.collectScopeIdentifiers = exports.collectModuleIdentifiers = void 0;
-var _walk = require("../walk.cjs");
-var _identifier = require("../helpers/identifier.cjs");
+exports.collectModuleIdentifiers = void 0;
 var _scopeNodes = require("./scopeNodes.cjs");
+var _identifier = require("../helpers/identifier.cjs");
+var _walk = require("../walk.cjs");
 const addBindingNames = (pattern, into) => {
   if (!pattern) return;
   switch (pattern.type) {
@@ -135,7 +135,6 @@ const collectScopeIdentifiers = (node, scopes) => {
  * Special case handling for var inside BlockStatement
  * which are also valid module scope identifiers.
  */
-exports.collectScopeIdentifiers = collectScopeIdentifiers;
 const collectModuleIdentifiers = async (ast, hoisting = true) => {
   const identifiers = new Map();
   const globalReads = new Map();

package/dist/cjs/walk.d.cts

@@ -1,4 +1,4 @@
-import type { Node } from 'oxc-parser';
+import { type Node } from 'oxc-parser';
 /**
  * Using visitorKeys instead of oxc Visitor to keep
  * an ancestor-aware enter/leave API with this.skip()

package/dist/cli.js

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
+import { readFile, mkdir, writeFile, glob } from 'node:fs/promises';
+import { dirname, resolve, relative, join, basename } from 'node:path';
 import { stdin as defaultStdin, stdout as defaultStdout, stderr as defaultStderr } from 'node:process';
 import { parseArgs } from 'node:util';
-import { readFile, mkdir, writeFile } from 'node:fs/promises';
-import { dirname, resolve, relative, join, basename } from 'node:path';
-import { glob } from 'glob';
+import { format } from './format.js';
 import { transform, collectProjectDualPackageHazards } from './module.js';
 import { parse } from './parse.js';
-import { format } from './format.js';
 import { specifier } from './specifier.js';
-import { getLangFromExt } from './utils/lang.js';
 import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
+import { getLangFromExt } from './utils/lang.js';
 const defaultOptions = {
   target: 'commonjs',
   sourceType: 'auto',
@@ -381,14 +380,14 @@ const normalizeSourceMapArgv = argv => {
 const expandFiles = async (patterns, cwd, ignore) => {
   const files = new Set();
   for (const pattern of patterns) {
-    const matches = await glob(pattern, {
+    for await (const match of glob(pattern, {
       cwd,
-      absolute: true,
-      nodir: true,
-      windowsPathsNoEscape: true,
-      ignore
-    });
-    for (const m of matches) files.add(resolve(m));
+      exclude: ignore,
+      withFileTypes: true
+    })) {
+      if (match.isDirectory()) continue;
+      files.add(resolve(match.parentPath, match.name));
+    }
   }
   return [...files];
 };
@@ -678,7 +677,7 @@ if (import.meta.main) {
   runCli().then(code => {
     if (code !== 0) process.exit(code);
   }, err => {
-    // eslint-disable-next-line no-console -- CLI surface
+    // eslint-disable-next-line no-console
     console.error(err);
     process.exit(1);
   });

package/dist/exports.d.ts

@@ -1,9 +1,8 @@
 import type { Node } from 'oxc-parser';
 import type { CjsExport } from '../types.js';
 declare const exportsRename = "__exports";
-declare const requireMainRgx: RegExp;
 type ExportsMap = Map<string, CjsExport> & {
     hasUnsupportedExportWrite?: boolean;
 };
 declare const collectCjsExports: (ast: Node) => Promise<ExportsMap>;
-export { exportsRename, requireMainRgx, collectCjsExports };
+export { exportsRename, collectCjsExports };

package/dist/format.d.ts

@@ -1,8 +1,8 @@
-import type { Node, ParseResult } from 'oxc-parser';
 import MagicString from 'magic-string';
+import type { Node, ParseResult } from 'oxc-parser';
 import type { Diagnostic, FormatterOptions } from './types.js';
 type HazardLevel = 'warning' | 'error';
-export type PackageUse = {
+type PackageUse = {
     spec: string;
     subpath: string;
     loc?: {

package/dist/format.js

@@ -1,23 +1,23 @@
-import { dirname, join, resolve as pathResolve } from 'node:path';
 import { readFile as fsReadFile, stat as fsStat } from 'node:fs/promises';
+import { dirname, join, resolve as pathResolve } from 'node:path';
 import MagicString from 'magic-string';
-import { hasTopLevelAwait, isAsyncContext } from './helpers/async.js';
-import { isIdentifierName } from './helpers/identifier.js';
 import { assignmentExpression } from './formatters/assignmentExpression.js';
 import { identifier } from './formatters/identifier.js';
 import { memberExpression } from './formatters/memberExpression.js';
 import { metaProperty } from './formatters/metaProperty.js';
-import { buildIdiomaticPlan } from './pipeline/idiomaticPlan.js';
+import { hasTopLevelAwait, isAsyncContext } from './helpers/async.js';
+import { isIdentifierName } from './helpers/identifier.js';
 import { buildEsmPrelude } from './pipeline/buildEsmPrelude.js';
 import { exportBagToEsm } from './pipeline/exportBagToEsm.js';
-import { isRequireCall, isStaticRequire, lowerCjsRequireToImports } from './pipeline/lowerCjsRequireToImports.js';
-import { lowerEsmToCjs } from './pipeline/lowerEsmToCjs.js';
 import { buildFormatVisitor } from './pipeline/formatVisitor.js';
+import { buildIdiomaticPlan } from './pipeline/idiomaticPlan.js';
 import { interopHelper } from './pipeline/interopHelpers.js';
+import { isRequireCall, isStaticRequire, lowerCjsRequireToImports } from './pipeline/lowerCjsRequireToImports.js';
+import { lowerEsmToCjs } from './pipeline/lowerEsmToCjs.js';
+import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
 import { collectCjsExports } from './utils/exports.js';
 import { collectModuleIdentifiers } from './utils/identifiers.js';
 import { isValidUrl } from './utils/url.js';
-import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
 import { ancestorWalk } from './walk.js';
 const isRequireMainMember = (node, shadowed) => node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.object.name === 'require' && !shadowed.has('require') && node.property.type === 'Identifier' && node.property.name === 'main';
 const stripQuery = value => value.includes('?') || value.includes('#') ? value.split(/[?#]/)[0] ?? value : value;
@@ -303,12 +303,12 @@ async function format(src, ast, opts) {
       return;
     }
     if (diag.level === 'warning') {
-      // eslint-disable-next-line no-console -- used for opt-in diagnostics
+      // eslint-disable-next-line no-console
       console.warn(diag.message);
       return;
     }
 
-    // eslint-disable-next-line no-console -- used for opt-in diagnostics
+    // eslint-disable-next-line no-console
     console.error(diag.message);
   };
   const diagOnce = (level, codeId, message, loc) => {

package/dist/formatVisitor.d.ts

@@ -1,7 +1,7 @@
 import type MagicString from 'magic-string';
-import type { Node, CallExpressionNode } from '../helpers/ast.js';
 import type { IdentifierName } from 'oxc-parser';
 import type { WarnOnce } from './exportBagToEsm.js';
+import type { Node, CallExpressionNode } from '../helpers/ast.js';
 import type { FormatterOptions, ExportsMeta } from '../types.js';
 type AssignmentExpressionFn = (typeof import('../formatters/assignmentExpression.js'))['assignmentExpression'];
 type IdentifierFn = (typeof import('../formatters/identifier.js'))['identifier'];

package/dist/formatters/identifier.js

@@ -1,5 +1,5 @@
-import { exportsRename } from '../utils/exports.js';
 import { identifier as ident } from '../helpers/identifier.js';
+import { exportsRename } from '../utils/exports.js';
 export const identifier = ({
   node,
   ancestors,

package/dist/helpers/ast.d.ts

@@ -1,14 +1,14 @@
 import type { Node } from 'oxc-parser';
 import type { CjsExport } from '../types.js';
 export type { Node };
-export type IdentifierNode = Extract<Node, {
+type IdentifierNode = Extract<Node, {
     type: 'Identifier';
 }>;
 export type LiteralNode = Extract<Node, {
     type: 'Literal';
     value?: unknown;
 }>;
-export type MemberExpressionNode = Extract<Node, {
+type MemberExpressionNode = Extract<Node, {
     type: 'MemberExpression';
 }>;
 export type CallExpressionNode = Extract<Node, {

package/dist/helpers/async.d.ts

@@ -1,4 +1,4 @@
-import type { Node, ProgramNode } from './ast.js';
+import { type Node, type ProgramNode } from './ast.js';
 declare const hasTopLevelAwait: (program: ProgramNode) => boolean;
 declare const isAsyncContext: (ancestors: Node[]) => boolean;
 export { hasTopLevelAwait, isAsyncContext };

package/dist/helpers/identifier.js

@@ -1,4 +1,5 @@
 import { analyze } from 'periscopic';
+
 /**
  * Focus exclusively on IdentifierName type as it has the name property,
  * which is what the identifer utilities are interested in.

package/dist/identifiers.d.ts

@@ -1,6 +1,5 @@
 import type { Node } from 'oxc-parser';
-import type { IdentMeta, Scope } from '../types.js';
-declare const collectScopeIdentifiers: (node: Node, scopes: Scope[]) => void;
+import type { IdentMeta } from '../types.js';
 /**
  * Collects all module scope identifiers in the AST.
  *
@@ -16,4 +15,4 @@ declare const collectScopeIdentifiers: (node: Node, scopes: Scope[]) => void;
  * which are also valid module scope identifiers.
  */
 declare const collectModuleIdentifiers: (ast: Node, hoisting?: boolean) => Promise<Map<string, IdentMeta>>;
-export { collectScopeIdentifiers, collectModuleIdentifiers };
+export { collectModuleIdentifiers };

package/dist/idiomaticPlan.d.ts

@@ -25,4 +25,3 @@ type BuildIdiomaticPlanParams = {
 };
 declare const buildIdiomaticPlan: ({ src, code, exportTable, shadowedBindings, idiomaticMode, }: BuildIdiomaticPlanParams) => IdiomaticPlanResult;
 export { buildIdiomaticPlan };
-export type { IdiomaticPlan, IdiomaticPlanResult };

package/dist/lowerEsmToCjs.d.ts

@@ -1,7 +1,6 @@
 import MagicString from 'magic-string';
 import { type ProgramNode } from '../helpers/ast.js';
 import type { FormatterOptions } from '../types.js';
-declare const exportAssignment: (name: string, expr: string, live: "strict" | "loose" | "off") => string;
 type ImportTransform = {
     start: number;
     end: number;
@@ -19,4 +18,4 @@ declare const lowerEsmToCjs: (program: ProgramNode, code: MagicString, opts: For
     exportTransforms: ExportTransform[];
     needsInterop: boolean;
 };
-export { exportAssignment, lowerEsmToCjs, type ExportTransform, type ImportTransform };
+export { lowerEsmToCjs, type ExportTransform, type ImportTransform };

package/dist/module.d.ts

@@ -1,5 +1,5 @@
 import type { ModuleOptions, Diagnostic } from './types.js';
-import type { SourceMap } from 'magic-string';
+type SourceMap = import('magic-string').SourceMap;
 declare const collectProjectDualPackageHazards: (files: string[], opts: ModuleOptions) => Promise<Map<string, Diagnostic[]>>;
 declare function transform(filename: string, options: ModuleOptions & {
     sourceMap: true;

package/dist/module.js

@@ -1,15 +1,12 @@
-import { resolve } from 'node:path';
-import { readFile, writeFile } from 'node:fs/promises';
-import { specifier } from './specifier.js';
-import { parse } from './parse.js';
+import { readFile, writeFile, stat, realpath } from 'node:fs/promises';
+import { resolve, dirname, extname, join } from 'node:path';
 import { format, collectDualPackageUsage, dualPackageHazardDiagnostics } from './format.js';
+import { parse } from './parse.js';
+import { specifier } from './specifier.js';
+import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
+import { collectModuleIdentifiers } from './utils/identifiers.js';
 import { getLangFromExt } from './utils/lang.js';
-import { resolve as pathResolve, dirname as pathDirname, extname, join } from 'node:path';
-import { readFile as fsReadFile, stat, realpath } from 'node:fs/promises';
-import { parse as parseModule } from './parse.js';
 import { walk } from './walk.js';
-import { collectModuleIdentifiers } from './utils/identifiers.js';
-import { builtinSpecifiers } from './utils/builtinSpecifiers.js';
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
 const appendExtensionIfNeeded = (spec, mode, dirIndex, value = spec.value) => {
   if (mode === 'off') return;
@@ -68,10 +65,10 @@ const fileExists = async candidate => {
     return false;
   }
 };
-const normalizePath = async p => pathResolve(await realpath(p).catch(() => p));
+const normalizePath = async p => resolve(await realpath(p).catch(() => p));
 const resolveRequirePath = async (fromFile, spec, dirIndex) => {
   if (!spec.startsWith('./') && !spec.startsWith('../')) return null;
-  const base = pathResolve(pathDirname(fromFile), spec);
+  const base = resolve(dirname(fromFile), spec);
   const ext = extname(base);
   const candidates = [];
   if (ext) {
@@ -86,8 +83,8 @@ const resolveRequirePath = async (fromFile, spec, dirIndex) => {
   return null;
 };
 const collectStaticRequires = async (filePath, dirIndex) => {
-  const src = await fsReadFile(filePath, 'utf8');
-  const ast = parseModule(filePath, src);
+  const src = await readFile(filePath, 'utf8');
+  const ast = parse(filePath, src);
   const specs = [];
   await walk(ast.program, {
     enter(node) {
@@ -118,7 +115,8 @@ const detectCircularRequireGraph = async (entryFile, mode, dirIndex) => {
       if (mode === 'error') {
         throw new Error(msg);
       }
-      // eslint-disable-next-line no-console -- surfaced when cycle detection is warn-only
+
+      // eslint-disable-next-line no-console
       console.warn(msg);
       return;
     }
@@ -158,7 +156,7 @@ const collectProjectDualPackageHazards = async (files, opts) => {
   const manifestCache = new Map();
   for (const file of files) {
     const code = await readFile(file, 'utf8');
-    const ast = parseModule(file, code);
+    const ast = parse(file, code);
     const moduleIdentifiers = await collectModuleIdentifiers(ast.program);
     const shadowedBindings = new Set([...moduleIdentifiers.entries()].filter(([, meta]) => meta.declare.length > 0).map(([name]) => name));
     const perFileUsage = await collectDualPackageUsage(ast.program, shadowedBindings, file);

package/dist/pipeline/buildEsmPrelude.js

@@ -1,5 +1,5 @@
-import { exportsRename } from '../utils/exports.js';
 import { requireInteropHelper } from './interopHelpers.js';
+import { exportsRename } from '../utils/exports.js';
 const buildEsmPrelude = options => {
   const {
     needsCreateRequire,

package/dist/pipeline/formatVisitor.d.ts

@@ -1,7 +1,7 @@
 import type MagicString from 'magic-string';
-import type { Node, CallExpressionNode } from '../helpers/ast.js';
 import type { IdentifierName } from 'oxc-parser';
 import type { WarnOnce } from './exportBagToEsm.js';
+import type { Node, CallExpressionNode } from '../helpers/ast.js';
 import type { FormatterOptions, ExportsMeta } from '../types.js';
 type AssignmentExpressionFn = (typeof import('../formatters/assignmentExpression.js'))['assignmentExpression'];
 type IdentifierFn = (typeof import('../formatters/identifier.js'))['identifier'];

package/dist/pipeline/idiomaticPlan.d.ts

@@ -25,4 +25,3 @@ type BuildIdiomaticPlanParams = {
 };
 declare const buildIdiomaticPlan: ({ src, code, exportTable, shadowedBindings, idiomaticMode, }: BuildIdiomaticPlanParams) => IdiomaticPlanResult;
 export { buildIdiomaticPlan };
-export type { IdiomaticPlan, IdiomaticPlanResult };

package/dist/pipeline/lowerCjsRequireToImports.js

@@ -1,5 +1,5 @@
-import { isCallExpressionNode } from '../helpers/ast.js';
 import { requireInteropName } from './interopHelpers.js';
+import { isCallExpressionNode } from '../helpers/ast.js';
 const isRequireCallee = (callee, shadowed) => {
   if (callee.type === 'Identifier' && callee.name === 'require' && !shadowed.has('require')) {
     return true;

package/dist/pipeline/lowerEsmToCjs.d.ts

@@ -1,7 +1,6 @@
 import MagicString from 'magic-string';
 import { type ProgramNode } from '../helpers/ast.js';
 import type { FormatterOptions } from '../types.js';
-declare const exportAssignment: (name: string, expr: string, live: "strict" | "loose" | "off") => string;
 type ImportTransform = {
     start: number;
     end: number;
@@ -19,4 +18,4 @@ declare const lowerEsmToCjs: (program: ProgramNode, code: MagicString, opts: For
     exportTransforms: ExportTransform[];
     needsInterop: boolean;
 };
-export { exportAssignment, lowerEsmToCjs, type ExportTransform, type ImportTransform };
+export { lowerEsmToCjs, type ExportTransform, type ImportTransform };

package/dist/pipeline/lowerEsmToCjs.js

@@ -1,5 +1,5 @@
-import { getModuleExportName } from '../helpers/ast.js';
 import { defaultInteropName } from './interopHelpers.js';
+import { getModuleExportName } from '../helpers/ast.js';
 const isValidIdent = name => /^[$A-Z_a-z][$\w]*$/.test(name);
 const exportAssignment = (name, expr, live) => {
   const prop = isValidIdent(name) ? `.${name}` : `[${JSON.stringify(name)}]`;
@@ -194,4 +194,4 @@ const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
     needsInterop
   };
 };
-export { exportAssignment, lowerEsmToCjs };
+export { lowerEsmToCjs };

package/dist/specifier.d.ts

@@ -15,4 +15,4 @@ declare const specifier: {
     updateMagicString(code: MagicString, src: string, ast: ParseResult, callback: Callback): Promise<MagicString>;
 };
 export { specifier };
-export type { Spec, Callback };
+export type { Spec };

package/dist/specifier.js

@@ -1,5 +1,5 @@
-import { resolve } from 'node:path';
 import { stat, readFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
 import MagicString from 'magic-string';
 import { parseSync } from 'oxc-parser';
 import { walk } from './walk.js';

package/dist/utils/exports.d.ts

@@ -1,9 +1,8 @@
 import type { Node } from 'oxc-parser';
 import type { CjsExport } from '../types.js';
 declare const exportsRename = "__exports";
-declare const requireMainRgx: RegExp;
 type ExportsMap = Map<string, CjsExport> & {
     hasUnsupportedExportWrite?: boolean;
 };
 declare const collectCjsExports: (ast: Node) => Promise<ExportsMap>;
-export { exportsRename, requireMainRgx, collectCjsExports };
+export { exportsRename, collectCjsExports };

package/dist/utils/exports.js

@@ -1,6 +1,5 @@
 import { ancestorWalk } from '../walk.js';
 const exportsRename = '__exports';
-const requireMainRgx = /(require\.main\s*===\s*module|module\s*===\s*require\.main)/g;
 const literalPropName = (prop, literals) => {
   if (prop.type === 'Identifier') return literals?.get(prop.name)?.toString() ?? prop.name;
   if (prop.type === 'Literal' && (typeof prop.value === 'string' || typeof prop.value === 'number')) {
@@ -269,4 +268,4 @@ const collectCjsExports = async ast => {
   exportsMap.hasUnsupportedExportWrite = hasUnsupportedExportWrite;
   return exportsMap;
 };
-export { exportsRename, requireMainRgx, collectCjsExports };
+export { exportsRename, collectCjsExports };

package/dist/utils/identifiers.d.ts

@@ -1,6 +1,5 @@
 import type { Node } from 'oxc-parser';
-import type { IdentMeta, Scope } from '../types.js';
-declare const collectScopeIdentifiers: (node: Node, scopes: Scope[]) => void;
+import type { IdentMeta } from '../types.js';
 /**
  * Collects all module scope identifiers in the AST.
  *
@@ -16,4 +15,4 @@ declare const collectScopeIdentifiers: (node: Node, scopes: Scope[]) => void;
  * which are also valid module scope identifiers.
  */
 declare const collectModuleIdentifiers: (ast: Node, hoisting?: boolean) => Promise<Map<string, IdentMeta>>;
-export { collectScopeIdentifiers, collectModuleIdentifiers };
+export { collectModuleIdentifiers };

package/dist/utils/identifiers.js

@@ -1,6 +1,6 @@
-import { ancestorWalk } from '../walk.js';
-import { identifier } from '../helpers/identifier.js';
 import { scopeNodes } from './scopeNodes.js';
+import { identifier } from '../helpers/identifier.js';
+import { ancestorWalk } from '../walk.js';
 const addBindingNames = (pattern, into) => {
   if (!pattern) return;
   switch (pattern.type) {
@@ -201,4 +201,4 @@ const collectModuleIdentifiers = async (ast, hoisting = true) => {
   });
   return identifiers;
 };
-export { collectScopeIdentifiers, collectModuleIdentifiers };
+export { collectModuleIdentifiers };

package/dist/walk.d.ts

@@ -1,4 +1,4 @@
-import type { Node } from 'oxc-parser';
+import { type Node } from 'oxc-parser';
 /**
  * Using visitorKeys instead of oxc Visitor to keep
  * an ancestor-aware enter/leave API with this.skip()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Bidirectional transform for ES modules and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
@@ -22,14 +22,17 @@
     "./package.json": "./package.json"
   },
   "engines": {
-    "node": ">=22.21.1 <23 || >=24 <25"
+    "node": ">=22.21.1 <23 || >=24 <25 || >=26 <27"
   },
   "engineStrict": true,
   "scripts": {
     "check-types": "tsc -p tsconfig.test.json",
     "prettier": "prettier -w .",
     "prettier:check": "prettier -c .",
-    "lint": "oxlint --config oxlint.json .",
+    "lint:oxlint": "oxlint --config oxlint.json .",
+    "lint:eslint": "eslint src test --ext .ts",
+    "lint": "npm run lint:oxlint && npm run lint:eslint",
+    "lint:fix": "oxlint --config oxlint.json --fix . && eslint src test --ext .ts --fix",
     "prepare": "husky",
     "test:base": "tsx --test --test-reporter=spec",
     "test:cli": "npm run test:base -- test/cli.ts",
@@ -64,21 +67,29 @@
     "url": "https://github.com/knightedcodemonkey/module/issues"
   },
   "devDependencies": {
-    "@types/node": "^22.19.3",
-    "babel-dual-package": "^1.2.3",
+    "@types/node": "^25.9.1",
+    "@typescript-eslint/parser": "^8.59.4",
+    "babel-dual-package": "^2.0.1",
     "c8": "^11.0.0",
+    "eslint": "^9.39.4",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import": "^2.32.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
-    "oxlint": "^1.51.0",
+    "lint-staged": "^17.0.5",
+    "oxlint": "^1.66.0",
     "prettier": "^3.7.4",
-    "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "tsx": "^4.22.3",
+    "typescript": "^6.0.3"
   },
   "dependencies": {
-    "glob": "^13.0.6",
     "magic-string": "^0.30.21",
-    "oxc-parser": "^0.116.0",
-    "periscopic": "^4.0.2"
+    "oxc-parser": "^0.132.0",
+    "periscopic": "^4.0.3"
+  },
+  "overrides": {
+    "c8": {
+      "yargs": ">17.7.2 <19"
+    }
   },
   "prettier": {
     "arrowParens": "avoid",
@@ -91,6 +102,7 @@
       "prettier -c",
       "oxlint --config oxlint.json"
     ],
+    "*.ts": "eslint --ext .ts",
     "*.{json,md,yml,yaml,css,scss,html}": "prettier -c"
   }
 }

package/dist/cjs/expressionStatement.d.cts

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

package/dist/cjs/formatters/expressionStatement.cjs

@@ -1,49 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.expressionStatement = void 0;
-const expressionStatement = (node, parent, src, options) => {
-  if (options.target === 'module') {
-    if (node.expression.type === 'Identifier') {
-      const {
-        start,
-        end
-      } = node;
-      const name = node.expression.name;
-
-      // CommonJS globals (as bare identifiers)
-      switch (name) {
-        case 'require':
-          src.remove(start, end);
-          break;
-        case 'module':
-          src.update(start, end, 'import.meta');
-          break;
-        case 'exports':
-          src.update(start, end, '{}');
-          break;
-        case '__filename':
-          src.update(start, end, 'import.meta.filename');
-          break;
-        case '__dirname':
-          src.update(start, end, 'import.meta.dirname');
-          break;
-      }
-    }
-  }
-  if (options.target === 'commonjs') {
-    if (node.expression.type === 'Identifier') {
-      const {
-        start,
-        end
-      } = node;
-      const name = node.expression.name;
-      void start;
-      void end;
-      void name;
-    }
-  }
-};
-exports.expressionStatement = expressionStatement;

package/dist/expressionStatement.d.ts

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

package/dist/formatters/expressionStatement.d.ts

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

package/dist/formatters/expressionStatement.js

@@ -1,42 +0,0 @@
-export const expressionStatement = (node, parent, src, options) => {
-  if (options.target === 'module') {
-    if (node.expression.type === 'Identifier') {
-      const {
-        start,
-        end
-      } = node;
-      const name = node.expression.name;
-
-      // CommonJS globals (as bare identifiers)
-      switch (name) {
-        case 'require':
-          src.remove(start, end);
-          break;
-        case 'module':
-          src.update(start, end, 'import.meta');
-          break;
-        case 'exports':
-          src.update(start, end, '{}');
-          break;
-        case '__filename':
-          src.update(start, end, 'import.meta.filename');
-          break;
-        case '__dirname':
-          src.update(start, end, 'import.meta.dirname');
-          break;
-      }
-    }
-  }
-  if (options.target === 'commonjs') {
-    if (node.expression.type === 'Identifier') {
-      const {
-        start,
-        end
-      } = node;
-      const name = node.expression.name;
-      void start;
-      void end;
-      void name;
-    }
-  }
-};