@knighted/module 1.0.0 → 1.1.1

package/dist/format.js

@@ -1,29 +1,31 @@
+import { getModuleExportName, isAstNode, isCallExpressionNode, isIdentifierNode, isMemberExpressionNode } from './helpers/ast.js';
 import MagicString from 'magic-string';
-import { identifier } from '#formatters/identifier.js';
-import { metaProperty } from '#formatters/metaProperty.js';
-import { memberExpression } from '#formatters/memberExpression.js';
-import { assignmentExpression } from '#formatters/assignmentExpression.js';
-import { isValidUrl } from '#utils/url.js';
-import { exportsRename, collectCjsExports } from '#utils/exports.js';
-import { collectModuleIdentifiers } from '#utils/identifiers.js';
-import { isIdentifierName } from '#helpers/identifier.js';
-import { ancestorWalk } from '#walk';
+import { identifier } from './formatters/identifier.js';
+import { metaProperty } from './formatters/metaProperty.js';
+import { memberExpression } from './formatters/memberExpression.js';
+import { assignmentExpression } from './formatters/assignmentExpression.js';
+import { isValidUrl } from './utils/url.js';
+import { exportsRename, collectCjsExports } from './utils/exports.js';
+import { collectModuleIdentifiers } from './utils/identifiers.js';
+import { isIdentifierName } from './helpers/identifier.js';
+import { ancestorWalk } from './walk.js';
 const isValidIdent = name => /^[$A-Z_a-z][$\w]*$/.test(name);
 const expressionHasRequireCall = (node, shadowed) => {
   let found = false;
   const walkNode = n => {
-    if (!n || found) return;
-    if (n.type === 'CallExpression' && n.callee?.type === 'Identifier' && n.callee.name === 'require' && !shadowed.has('require')) {
+    if (!isAstNode(n) || found) return;
+    if (isCallExpressionNode(n) && isIdentifierNode(n.callee) && n.callee.name === 'require' && !shadowed.has('require')) {
       found = true;
       return;
     }
-    if (n.type === 'CallExpression' && n.callee?.type === 'MemberExpression' && n.callee.object?.type === 'Identifier' && n.callee.object.name === 'require' && !shadowed.has('require')) {
+    if (isCallExpressionNode(n) && isMemberExpressionNode(n.callee) && isIdentifierNode(n.callee.object) && n.callee.object.name === 'require' && !shadowed.has('require')) {
       found = true;
       return;
     }
-    const keys = Object.keys(n);
+    const record = n;
+    const keys = Object.keys(record);
     for (const key of keys) {
-      const value = n[key];
+      const value = record[key];
       if (!value) continue;
       if (Array.isArray(value)) {
         for (const item of value) {
@@ -80,6 +82,10 @@ const lowerCjsRequireToImports = (program, code, shadowed) => {
       if (allStatic) {
         for (const decl of decls) {
           const init = decl.init;
+          if (!init || !isCallExpressionNode(init)) {
+            needsCreateRequire = true;
+            continue;
+          }
           const arg = init.arguments[0];
           const source = code.slice(arg.start, arg.end);
           const value = arg.value;
@@ -116,6 +122,10 @@ const lowerCjsRequireToImports = (program, code, shadowed) => {
     if (stmt.type === 'ExpressionStatement') {
       const expr = stmt.expression;
       if (expr && isStaticRequire(expr, shadowed)) {
+        if (!isCallExpressionNode(expr)) {
+          needsCreateRequire = true;
+          continue;
+        }
         const arg = expr.arguments[0];
         const source = code.slice(arg.start, arg.end);
         const value = arg.value;
@@ -142,11 +152,12 @@ const lowerCjsRequireToImports = (program, code, shadowed) => {
     needsInteropHelper
   };
 };
-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 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 hasTopLevelAwait = program => {
   let found = false;
   const walkNode = (node, inFunction) => {
     if (found) return;
+    if (!isAstNode(node)) return;
     switch (node.type) {
       case 'FunctionDeclaration':
       case 'FunctionExpression':
@@ -160,9 +171,10 @@ const hasTopLevelAwait = program => {
       found = true;
       return;
     }
-    const keys = Object.keys(node);
+    const record = node;
+    const keys = Object.keys(record);
     for (const key of keys) {
-      const value = node[key];
+      const value = record[key];
       if (!value) continue;
       if (Array.isArray(value)) {
         for (const item of value) {
@@ -243,7 +255,8 @@ const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
       }
       if (namedSpecs.length) {
         const pairs = namedSpecs.map(s => {
-          const imported = s.imported.name;
+          const imported = getModuleExportName(s.imported);
+          if (!imported) return s.local.name;
           const local = s.local.name;
           return imported === local ? imported : `${imported}: ${local}`;
         });
@@ -268,7 +281,7 @@ const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
               exportedNames.push(d.id.name);
             }
           }
-        } else if (decl.id?.type === 'Identifier') {
+        } else if ('id' in decl && decl.id?.type === 'Identifier') {
           exportedNames.push(decl.id.name);
         }
         const exportLines = exportedNames.map(name => exportAssignment(name, name, live));
@@ -288,8 +301,9 @@ const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
           const lines = [`const ${modIdent} = require(${srcLiteral});`];
           for (const spec of node.specifiers) {
             if (spec.type !== 'ExportSpecifier') continue;
-            const exported = spec.exported.name;
-            const imported = spec.local.name;
+            const exported = getModuleExportName(spec.exported);
+            const imported = getModuleExportName(spec.local);
+            if (!exported || !imported) continue;
             let rhs = `${modIdent}.${imported}`;
             if (imported === 'default') {
               rhs = `${defaultInteropName}(${modIdent})`;
@@ -307,8 +321,9 @@ const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
           const lines = [];
           for (const spec of node.specifiers) {
             if (spec.type !== 'ExportSpecifier') continue;
-            const exported = spec.exported.name;
-            const local = spec.local.name;
+            const exported = getModuleExportName(spec.exported);
+            const local = getModuleExportName(spec.local);
+            if (!exported || !local) continue;
             lines.push(exportAssignment(exported, local, live));
           }
           exportTransforms.push({
@@ -352,8 +367,11 @@ const lowerEsmToCjs = (program, code, opts, containsTopLevelAwait) => {
     }
     if (node.type === 'ExportAllDeclaration') {
       const srcLiteral = code.slice(node.source.start, node.source.end);
-      if (node.exported) {
-        const exported = node.exported.name;
+      if ('exported' in node && node.exported) {
+        const exported = getModuleExportName(node.exported);
+        if (!exported) {
+          continue;
+        }
         const modIdent = `__mod${importIndex++}`;
         const lines = [`const ${modIdent} = require(${srcLiteral});`, exportAssignment(exported, modIdent, live)];
         exportTransforms.push({
@@ -600,6 +618,8 @@ const format = async (src, ast, opts) => {
   let requireMainNeedsRealpath = false;
   let needsRequireResolveHelper = false;
   const nestedRequireStrategy = opts.nestedRequireStrategy ?? 'create-require';
+  const importMetaPreludeMode = opts.importMetaPrelude ?? 'auto';
+  let importMetaRef = false;
   const shouldLowerCjs = opts.target === 'commonjs' && fullTransform;
   const shouldRaiseEsm = opts.target === 'module' && fullTransform;
   let hoistedImports = [];
@@ -647,6 +667,10 @@ const format = async (src, ast, opts) => {
             const mainExpr = requireMainStrategy === 'import-meta-main' ? 'import.meta.main' : 'import.meta.url === pathToFileURL(realpathSync(process.argv[1])).href';
             if (requireMainStrategy === 'realpath') {
               requireMainNeedsRealpath = true;
+              importMetaRef = true;
+            }
+            if (requireMainStrategy === 'import-meta-main') {
+              importMetaRef = true;
             }
             code.update(node.start, node.end, negate ? `!(${mainExpr})` : mainExpr);
             return;
@@ -765,6 +789,9 @@ const format = async (src, ast, opts) => {
         }
       }
       if (isIdentifierName(node)) {
+        if (shouldRaiseEsm && node.type === 'Identifier' && (node.name === '__dirname' || node.name === '__filename')) {
+          importMetaRef = true;
+        }
         identifier({
           node,
           ancestors,
@@ -820,8 +847,14 @@ const format = async (src, ast, opts) => {
     const asExportName = name => isValidExportName(name) ? name : JSON.stringify(name);
     const accessProp = name => isValidExportName(name) ? `${exportsRename}.${name}` : `${exportsRename}[${JSON.stringify(name)}]`;
     const exportValueFor = name => {
-      if (name === '__dirname') return 'import.meta.dirname';
-      if (name === '__filename') return 'import.meta.filename';
+      if (name === '__dirname') {
+        importMetaRef = true;
+        return 'import.meta.dirname';
+      }
+      if (name === '__filename') {
+        importMetaRef = true;
+        return 'import.meta.filename';
+      }
       return name;
     };
     const tempNameFor = name => {
@@ -877,6 +910,9 @@ const format = async (src, ast, opts) => {
   }
   if (shouldRaiseEsm && fullTransform) {
     const importPrelude = [];
+    if (needsCreateRequire || needsRequireResolveHelper) {
+      importMetaRef = true;
+    }
     if (needsCreateRequire || needsRequireResolveHelper) {
       importPrelude.push('import { createRequire } from "node:module";\n');
     }
@@ -909,9 +945,13 @@ const format = async (src, ast, opts) => {
     const exportsBagInit = useExportsBag ? `let ${exportsRename} = {};
 ` : '';
     const modulePrelude = '';
-    const prelude = `${importPrelude.join('')}${importPrelude.length ? '\n' : ''}${setupPrelude.join('')}${setupPrelude.length ? '\n' : ''}${requireInit}${requireResolveInit}${exportsBagInit}${modulePrelude}void import.meta.filename;
-`;
-    code.prepend(prelude);
+    const prelude = `${importPrelude.join('')}${importPrelude.length ? '\n' : ''}${setupPrelude.join('')}${setupPrelude.length ? '\n' : ''}${requireInit}${requireResolveInit}${exportsBagInit}${modulePrelude}`;
+    const importMetaTouch = (() => {
+      if (importMetaPreludeMode === 'on') return 'void import.meta.filename;\n';
+      if (importMetaPreludeMode === 'off') return '';
+      return importMetaRef ? 'void import.meta.filename;\n' : '';
+    })();
+    code.prepend(`${prelude}${importMetaTouch}`);
   }
   if (opts.target === 'commonjs' && fullTransform && containsTopLevelAwait) {
     const body = code.toString();

package/dist/formatters/assignmentExpression.js

@@ -1,4 +1,4 @@
-import { walk } from '#walk';
+import { walk } from '../walk.js';
 export const assignmentExpression = async ({
   node,
   parent: _parent,

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';
+import { identifier as ident } from '../helpers/identifier.js';
 export const identifier = ({
   node,
   ancestors,

package/dist/formatters/memberExpression.js

@@ -1,4 +1,4 @@
-import { exportsRename } from '#utils/exports.js';
+import { exportsRename } from '../utils/exports.js';
 export const memberExpression = (node, parent, src, options, shadowed, extras, useExportsBag = true, rewriteExports = true) => {
   if (options.target === 'module') {
     if (rewriteExports && !useExportsBag) {

package/dist/helpers/ast.d.ts

@@ -0,0 +1,39 @@
+import type { Node } from 'oxc-parser';
+import type { CjsExport } from '../types.js';
+export type IdentifierNode = Extract<Node, {
+    type: 'Identifier';
+}>;
+export type LiteralNode = Extract<Node, {
+    type: 'Literal';
+    value?: unknown;
+}>;
+export type MemberExpressionNode = Extract<Node, {
+    type: 'MemberExpression';
+}>;
+export type CallExpressionNode = Extract<Node, {
+    type: 'CallExpression';
+}>;
+export type ProgramNode = Extract<Node, {
+    type: 'Program';
+    body: Node[];
+}>;
+export type ModuleExportNameNode = Extract<Node, {
+    type: 'Identifier' | 'Literal';
+}>;
+export type ImportDefaultSpecifierNode = Extract<Node, {
+    type: 'ImportDefaultSpecifier';
+}>;
+export type ImportNamespaceSpecifierNode = Extract<Node, {
+    type: 'ImportNamespaceSpecifier';
+}>;
+export type ImportSpecifierNode = Extract<Node, {
+    type: 'ImportSpecifier';
+}>;
+export type ExportsMap = Map<string, CjsExport> & {
+    hasUnsupportedExportWrite?: boolean;
+};
+export declare const isAstNode: (value: unknown) => value is Node;
+export declare const isIdentifierNode: (node: Node | null | undefined) => node is IdentifierNode;
+export declare const isMemberExpressionNode: (node: Node | null | undefined) => node is MemberExpressionNode;
+export declare const isCallExpressionNode: (node: Node | null | undefined) => node is CallExpressionNode;
+export declare const getModuleExportName: (name: ModuleExportNameNode | null | undefined) => string | null;

package/dist/helpers/ast.js

@@ -0,0 +1,18 @@
+export const isAstNode = value => {
+  return Boolean(value) && typeof value === 'object' && 'type' in value;
+};
+export const isIdentifierNode = node => {
+  return node?.type === 'Identifier';
+};
+export const isMemberExpressionNode = node => {
+  return node?.type === 'MemberExpression';
+};
+export const isCallExpressionNode = node => {
+  return node?.type === 'CallExpression';
+};
+export const getModuleExportName = name => {
+  if (!name) return null;
+  if (name.type === 'Identifier') return name.name;
+  if (name.type === 'Literal' && typeof name.value === 'string') return name.value;
+  return null;
+};

package/dist/helpers/identifier.js

@@ -1,5 +1,4 @@
 import { analyze } from 'periscopic';
-
 /**
  * Focus exclusively on IdentifierName type as it has the name property,
  * which is what the identifer utilities are interested in.
@@ -121,14 +120,16 @@ const identifier = {
     const node = ancestors[ancestors.length - 1];
     const varBoundScopes = ['ClassDeclaration', 'ClassExpression', 'FunctionDeclaration', 'FunctionExpression', 'ArrowFunctionExpression'];
     const declaratorIndex = ancestors.findIndex(ancestor => {
-      return ancestor.type === 'VariableDeclarator' && (ancestor === node || isInBindingPattern(ancestor.id, node));
+      if (ancestor.type !== 'VariableDeclarator') return false;
+      return ancestor === node || isInBindingPattern(ancestor.id, node);
     });
     if (declaratorIndex === -1) return false;
-    const declarator = ancestors[declaratorIndex];
+    const declaratorNode = ancestors[declaratorIndex];
     const declaration = ancestors[declaratorIndex - 1];
+    if (declaratorNode?.type !== 'VariableDeclarator') return false;
     return declaration?.type === 'VariableDeclaration' && declaration.kind === 'var' && ancestors.every(ancestor => {
       return !varBoundScopes.includes(ancestor.type);
-    }) && (declarator.id === node || isInBindingPattern(declarator.id, node));
+    }) && (declaratorNode.id === node || isInBindingPattern(declaratorNode.id, node));
   },
   isIife(ancestors) {
     const parent = ancestors[ancestors.length - 2];

package/dist/module.js

@@ -1,14 +1,14 @@
 import { resolve } from 'node:path';
 import { readFile, writeFile } from 'node:fs/promises';
 import { specifier } from './specifier.js';
-import { parse } from '#parse';
-import { format } from '#format';
-import { getLangFromExt } from '#utils/lang.js';
+import { parse } from './parse.js';
+import { format } from './format.js';
+import { getLangFromExt } from './utils/lang.js';
 import { builtinModules } from 'node:module';
 import { resolve as pathResolve, dirname as pathDirname, extname, join } from 'node:path';
 import { readFile as fsReadFile, stat } from 'node:fs/promises';
-import { parse as parseModule } from '#parse';
-import { walk } from '#walk';
+import { parse as parseModule } from './parse.js';
+import { walk } from './walk.js';
 const collapseSpecifier = value => value.replace(/['"`+)\s]|new String\(/g, '');
 const builtinSpecifiers = new Set(builtinModules.map(mod => mod.startsWith('node:') ? mod.slice(5) : mod).flatMap(mod => {
   const parts = mod.split('/');
@@ -158,6 +158,7 @@ const defaultOptions = {
   nestedRequireStrategy: 'create-require',
   cjsDefault: 'auto',
   idiomaticExports: 'safe',
+  importMetaPrelude: 'auto',
   topLevelAwait: 'error',
   out: undefined,
   inPlace: false

package/dist/specifier.js

@@ -2,7 +2,7 @@ import { resolve } from 'node:path';
 import { stat, readFile } from 'node:fs/promises';
 import MagicString from 'magic-string';
 import { parseSync } from 'oxc-parser';
-import { walk } from '#walk';
+import { walk } from './walk.js';
 const isStringLiteral = node => {
   return node.type === 'Literal' && typeof node.value === 'string';
 };

package/dist/types.d.ts

@@ -40,6 +40,8 @@ export type ModuleOptions = {
     cjsDefault?: 'module-exports' | 'auto' | 'none';
     /** Emit idiomatic exports when raising CJS to ESM. */
     idiomaticExports?: 'off' | 'safe' | 'aggressive';
+    /** Control whether a no-op import.meta prelude is emitted. */
+    importMetaPrelude?: 'off' | 'auto' | 'on';
     /** Handling for top-level await constructs. */
     topLevelAwait?: 'error' | 'wrap' | 'preserve';
     /** Optional diagnostics sink for warnings/errors emitted during transform. */

package/dist/{src/utils → utils}/exports.d.ts

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

package/dist/utils/exports.js

@@ -1,4 +1,4 @@
-import { ancestorWalk } from '#walk';
+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) => {

package/dist/utils/identifiers.js

@@ -1,5 +1,5 @@
-import { ancestorWalk } from '#walk';
-import { identifier } from '#helpers/identifier.js';
+import { ancestorWalk } from '../walk.js';
+import { identifier } from '../helpers/identifier.js';
 import { scopeNodes } from './scopeNodes.js';
 const addBindingNames = (pattern, into) => {
   if (!pattern) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Bidirectional transform for ES modules and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
@@ -18,14 +18,6 @@
     },
     "./package.json": "./package.json"
   },
-  "imports": {
-    "#parse": "./src/parse.js",
-    "#format": "./src/format.js",
-    "#utils/*.js": "./src/utils/*.js",
-    "#walk": "./src/walk.js",
-    "#helpers/*.js": "./src/helpers/*.js",
-    "#formatters/*.js": "./src/formatters/*.js"
-  },
   "engines": {
     "node": ">=22.21.1 <23 || >=24 <25"
   },
@@ -40,8 +32,8 @@
     "build:types": "tsc --emitDeclarationOnly",
     "build:dual": "babel-dual-package src --extensions .ts",
     "build": "npm run build:types && npm run build:dual",
-    "prepack": "npm run build && node scripts/setImportsToDist.js",
-    "postpack": "node scripts/restoreImportsToSrc.js"
+    "cycles": "madge --circular src --extensions ts,js --ts-config tsconfig.json",
+    "prepack": "npm run build"
   },
   "keywords": [
     "esm",
@@ -72,6 +64,7 @@
     "c8": "^10.1.3",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
+    "madge": "^8.0.0",
     "oxlint": "^1.35.0",
     "prettier": "^3.7.4",
     "tsx": "^4.21.0",
@@ -83,6 +76,11 @@
     "oxc-parser": "^0.105.0",
     "periscopic": "^4.0.2"
   },
+  "overrides": {
+    "module-lookup-amd": {
+      "glob": "^9.0.0"
+    }
+  },
   "prettier": {
     "arrowParens": "avoid",
     "printWidth": 90,