@knighted/module 1.0.0-alpha.1 → 1.0.0-alpha.3

package/README.md

@@ -55,7 +55,7 @@ await transform('./file.js', {
 
 Which produces
 
-**file.js**
+**file.cjs**
 
 ```js
 const { argv } = require('node:process')
@@ -87,10 +87,15 @@ type ModuleOptions = {
   /* What module system to convert to. */
   type?: 'module' | 'commonjs'
   /* Whether import/export and require/exports should be transformed. */
-  moduleLoading?: boolean
+  modules?: boolean
   /* Whether to change specifier extensions to the assigned value. If omitted they are left alone. */
-  specifiers?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts'
-  /* What filepath to write the transformed source to. If omitted the transformed source is returned. */
+  specifier?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts'
+  /* What filepath to write the transformed source to. */
   out?: string
 }
 ```
+
+## Roadmap
+
+- Support option `modules`.
+- Remove `@knighted/specifier` and avoid double parsing.

package/dist/cjs/expressionStatement.d.cts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { ExpressionStatement } from '@babel/types';
+import type { FormatterOptions } from '../types.cjs';
+export declare const expressionStatement: (nodePath: NodePath<ExpressionStatement>, src: MagicString, options: FormatterOptions) => void;

package/dist/cjs/format.cjs

@@ -6,82 +6,27 @@ Object.defineProperty(exports, "__esModule", {
 exports.format = void 0;
 var _magicString = _interopRequireDefault(require("magic-string"));
 var _traverse2 = _interopRequireDefault(require("@babel/traverse"));
+var _metaProperty = require("./formatters/metaProperty.cjs");
+var _memberExpression = require("./formatters/memberExpression.cjs");
+var _expressionStatement = require("./formatters/expressionStatement.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const traverse = _traverse2.default.default;
+
+/**
+ * Note, there is no specific conversion for `import.meta.main` as it does not exist.
+ * @see https://github.com/nodejs/node/issues/49440
+ */
 const format = (code, ast, options) => {
   const src = new _magicString.default(code);
-  const {
-    type = 'commonjs'
-  } = options;
   traverse(ast, {
-    MetaProperty(metaPropertyPath) {
-      if (type === 'commonjs') {
-        const path = metaPropertyPath.findParent(path => path.isMemberExpression());
-        if (path) {
-          const {
-            node
-          } = path;
-          const {
-            start,
-            end
-          } = node;
-          if (node.type === 'MemberExpression' && node.property.type === 'Identifier' && typeof start == 'number' && typeof end === 'number') {
-            const name = node.property.name;
-            switch (name) {
-              case 'url':
-                src.update(start, end, 'require("node:url").pathToFileURL(__filename).toString()');
-                break;
-              case 'filename':
-                src.update(start, end, '__filename');
-                break;
-              case 'dirname':
-                src.update(start, end, '__dirname');
-                break;
-              case 'resolve':
-                src.update(start, end, 'require.resolve');
-                break;
-            }
-          }
-        }
-      }
+    MetaProperty(path) {
+      (0, _metaProperty.metaProperty)(path, src, options);
     },
-    ExpressionStatement(expressionStatementPath) {
-      if (type === 'module') {
-        const {
-          node
-        } = expressionStatementPath;
-        const {
-          start,
-          end
-        } = node;
-        if (node.expression.type === 'Identifier' && typeof start === 'number' && typeof end === 'number') {
-          const name = node.expression.name;
-          switch (name) {
-            case '__filename':
-              src.update(start, end, 'import.meta.filename');
-              break;
-            case '__dirname':
-              src.update(start, end, 'import.meta.dirname');
-              break;
-          }
-        }
-      }
+    ExpressionStatement(path) {
+      (0, _expressionStatement.expressionStatement)(path, src, options);
     },
-    MemberExpression(memberExpressionPath) {
-      if (type === 'module') {
-        const {
-          node
-        } = memberExpressionPath;
-        const {
-          start,
-          end
-        } = node;
-
-        // Update require.resolve to import.meta.resolve
-        if (node.object.type === 'Identifier' && node.object.name === 'require' && node.property.type === 'Identifier' && node.property.name == 'resolve' && typeof start === 'number' && typeof end === 'number') {
-          src.update(start, end, 'import.meta.resolve');
-        }
-      }
+    MemberExpression(path) {
+      (0, _memberExpression.memberExpression)(path, src, options);
     }
   });
   return src;

package/dist/cjs/format.d.cts

@@ -1,7 +1,9 @@
 import MagicString from 'magic-string';
 import type { ParseResult } from '@babel/parser';
 import type { File } from '@babel/types';
-import type { ModuleOptions } from './types.cjs';
-type FormatOptions = Omit<ModuleOptions, 'out'>;
-export declare const format: (code: string, ast: ParseResult<File>, options: FormatOptions) => MagicString;
-export {};
+import type { FormatterOptions } from './types.cjs';
+/**
+ * Note, there is no specific conversion for `import.meta.main` as it does not exist.
+ * @see https://github.com/nodejs/node/issues/49440
+ */
+export declare const format: (code: string, ast: ParseResult<File>, options: FormatterOptions) => MagicString;

package/dist/cjs/formatters/expressionStatement.cjs

@@ -0,0 +1,68 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.expressionStatement = void 0;
+const expressionStatement = (nodePath, src, options) => {
+  if (options.type === 'module') {
+    const {
+      node
+    } = nodePath;
+    const {
+      start,
+      end
+    } = node;
+    if (typeof start === 'number' && typeof end === 'number') {
+      const isMemberExpressionModuleExports = expression => {
+        return expression.object.type === 'Identifier' && expression.object.name === 'module' && expression.property.type === 'Identifier' && expression.property.name === 'exports';
+      };
+      if (node.expression.type === 'Identifier') {
+        const name = node.expression.name;
+
+        // CommonJS globals
+        switch (name) {
+          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 (node.expression.type === 'MemberExpression') {
+        const {
+          expression
+        } = node;
+
+        // Check for `module.exports` without an assignment
+        if (isMemberExpressionModuleExports(expression)) {
+          /**
+           * @TODO: Should this depend on `options.modules` being enabled?
+           * Probably not for the same reason `exports` is converted to an empty object (ReferenceError in ESM).
+           * This is a standalone reference to `module.exports` without being part of an AssignmentExpression.
+           */
+          src.update(start, end, '{}');
+        }
+      }
+
+      /*
+      if (
+        options.modules &&
+        node.expression.type === 'AssignmentExpression' &&
+        node.expression.left.type === 'MemberExpression' &&
+        isMemberExpressionModuleExports(node.expression.left)
+      ) {
+        // @TODO support `modules` option.
+      }
+      */
+    }
+  }
+};
+exports.expressionStatement = expressionStatement;

package/dist/cjs/formatters/memberExpression.cjs

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.memberExpression = void 0;
+const memberExpression = (nodePath, src, options) => {
+  if (options.type === 'module') {
+    const {
+      node
+    } = nodePath;
+    const {
+      start,
+      end
+    } = node;
+    if (typeof start === 'number' && typeof end === 'number' && node.object.type === 'Identifier' && node.object.name === 'require' && node.property.type === 'Identifier') {
+      const {
+        name
+      } = node.property;
+
+      // CommonJS properties of `require`
+      switch (name) {
+        case 'main':
+          src.update(start, end, 'import.meta');
+          break;
+        case 'resolve':
+          src.update(start, end, 'import.meta.resolve');
+          break;
+        case 'cache':
+          /**
+           * Can of worms here. ¯\_(ツ)_/¯
+           * @see https://github.com/nodejs/help/issues/2806
+           */
+          src.update(start, end, '{}');
+          break;
+      }
+    }
+  }
+};
+exports.memberExpression = memberExpression;

package/dist/cjs/formatters/metaProperty.cjs

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.metaProperty = void 0;
+const metaProperty = (nodePath, src, options) => {
+  if (options.type === 'commonjs') {
+    const path = nodePath.findParent(path => path.isMemberExpression());
+    if (path) {
+      const {
+        node
+      } = path;
+      const {
+        start,
+        end
+      } = node;
+      if (node.type === 'MemberExpression' && node.property.type === 'Identifier' && typeof start == 'number' && typeof end === 'number') {
+        const name = node.property.name;
+        switch (name) {
+          case 'url':
+            src.update(start, end, 'require("node:url").pathToFileURL(__filename).toString()');
+            break;
+          case 'filename':
+            src.update(start, end, '__filename');
+            break;
+          case 'dirname':
+            src.update(start, end, '__dirname');
+            break;
+          case 'resolve':
+            src.update(start, end, 'require.resolve');
+            break;
+        }
+      }
+    } else {
+      const {
+        node
+      } = nodePath;
+      const {
+        start,
+        end
+      } = node;
+      if (node.property.type === 'Identifier' && node.property.name === 'meta' && typeof start === 'number' && typeof end === 'number') {
+        // This is an `import.meta` expression
+        src.update(start, end, 'require.main');
+      }
+    }
+  }
+};
+exports.metaProperty = metaProperty;

package/dist/cjs/memberExpression.d.cts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { MemberExpression } from '@babel/types';
+import type { FormatterOptions } from '../types.cjs';
+export declare const memberExpression: (nodePath: NodePath<MemberExpression>, src: MagicString, options: FormatterOptions) => void;

package/dist/cjs/metaProperty.d.cts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { MetaProperty } from '@babel/types';
+import type { FormatterOptions } from '../types.cjs';
+export declare const metaProperty: (nodePath: NodePath<MetaProperty>, src: MagicString, options: FormatterOptions) => void;

package/dist/cjs/module.cjs

@@ -6,21 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.transform = void 0;
 var _nodePath = require("node:path");
 var _promises = require("node:fs/promises");
+var _specifier = require("@knighted/specifier");
 var _parse = require("./parse.cjs");
 var _format = require("./format.cjs");
 const defaultOptions = {
   type: 'commonjs',
   out: undefined,
-  moduleLoading: false,
-  specifiers: undefined
+  modules: false,
+  specifier: undefined
 };
-
-/**
- * Transforms a file from one Node.js module system to another based on options.
- * Module globals, for example import.meta, __dirname, __filename, etc. are always transformed.
- * However, the CommonJS `module` object is not transformed, for instance `module.path`, `module.children`, etc.,
- * with the exception of `module.exports` which is converted when `loading` is set to `true`.
- */
 const transform = async (filename, options = defaultOptions) => {
   const opts = {
     ...defaultOptions,
@@ -29,6 +23,29 @@ const transform = async (filename, options = defaultOptions) => {
   const file = (0, _nodePath.resolve)(filename);
   const code = (await (0, _promises.readFile)(file)).toString();
   const ast = (0, _parse.parse)(code);
-  return (0, _format.format)(code, ast, opts).toString();
+  let source = (0, _format.format)(code, ast, opts).toString();
+  if (options.specifier) {
+    const {
+      code,
+      error
+    } = await _specifier.specifier.updateSrc(source, ({
+      value
+    }) => {
+      // Collapse any BinaryExpression or NewExpression to test for a relative specifier
+      const collapsed = value.replace(/['"`+)\s]|new String\(/g, '');
+      const relative = /^(?:\.|\.\.)\//;
+      if (relative.test(collapsed)) {
+        // $2 is for any closing quotation/parens around BE or NE
+        return value.replace(/(.+)\.(?:m|c)?(?:j|t)s([)'"`]*)?$/, `$1${options.specifier}$2`);
+      }
+    });
+    if (code && !error) {
+      source = code;
+    }
+  }
+  if (opts.out) {
+    await (0, _promises.writeFile)((0, _nodePath.resolve)(opts.out), source);
+  }
+  return source;
 };
 exports.transform = transform;

package/dist/cjs/module.d.cts

@@ -1,9 +1,3 @@
 import type { ModuleOptions } from './types.cjs';
-/**
- * Transforms a file from one Node.js module system to another based on options.
- * Module globals, for example import.meta, __dirname, __filename, etc. are always transformed.
- * However, the CommonJS `module` object is not transformed, for instance `module.path`, `module.children`, etc.,
- * with the exception of `module.exports` which is converted when `loading` is set to `true`.
- */
 declare const transform: (filename: string, options?: ModuleOptions) => Promise<string>;
 export { transform };

package/dist/cjs/types.d.cts

@@ -1,6 +1,7 @@
 export type ModuleOptions = {
     type?: 'module' | 'commonjs';
-    moduleLoading?: boolean;
-    specifiers?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts';
+    modules?: boolean;
+    specifier?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts';
     out?: string;
 };
+export type FormatterOptions = Omit<ModuleOptions, 'out'> & Required<Pick<ModuleOptions, 'type'>>;

package/dist/expressionStatement.d.ts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { ExpressionStatement } from '@babel/types';
+import type { FormatterOptions } from '../types.js';
+export declare const expressionStatement: (nodePath: NodePath<ExpressionStatement>, src: MagicString, options: FormatterOptions) => void;

package/dist/format.d.ts

@@ -1,7 +1,9 @@
 import MagicString from 'magic-string';
 import type { ParseResult } from '@babel/parser';
 import type { File } from '@babel/types';
-import type { ModuleOptions } from './types.js';
-type FormatOptions = Omit<ModuleOptions, 'out'>;
-export declare const format: (code: string, ast: ParseResult<File>, options: FormatOptions) => MagicString;
-export {};
+import type { FormatterOptions } from './types.js';
+/**
+ * Note, there is no specific conversion for `import.meta.main` as it does not exist.
+ * @see https://github.com/nodejs/node/issues/49440
+ */
+export declare const format: (code: string, ast: ParseResult<File>, options: FormatterOptions) => MagicString;

package/dist/format.js

@@ -1,80 +1,25 @@
 import MagicString from 'magic-string';
 import _traverse from '@babel/traverse';
+import { metaProperty } from './formatters/metaProperty.js';
+import { memberExpression } from './formatters/memberExpression.js';
+import { expressionStatement } from './formatters/expressionStatement.js';
 const traverse = _traverse.default;
+
+/**
+ * Note, there is no specific conversion for `import.meta.main` as it does not exist.
+ * @see https://github.com/nodejs/node/issues/49440
+ */
 export const format = (code, ast, options) => {
   const src = new MagicString(code);
-  const {
-    type = 'commonjs'
-  } = options;
   traverse(ast, {
-    MetaProperty(metaPropertyPath) {
-      if (type === 'commonjs') {
-        const path = metaPropertyPath.findParent(path => path.isMemberExpression());
-        if (path) {
-          const {
-            node
-          } = path;
-          const {
-            start,
-            end
-          } = node;
-          if (node.type === 'MemberExpression' && node.property.type === 'Identifier' && typeof start == 'number' && typeof end === 'number') {
-            const name = node.property.name;
-            switch (name) {
-              case 'url':
-                src.update(start, end, 'require("node:url").pathToFileURL(__filename).toString()');
-                break;
-              case 'filename':
-                src.update(start, end, '__filename');
-                break;
-              case 'dirname':
-                src.update(start, end, '__dirname');
-                break;
-              case 'resolve':
-                src.update(start, end, 'require.resolve');
-                break;
-            }
-          }
-        }
-      }
+    MetaProperty(path) {
+      metaProperty(path, src, options);
     },
-    ExpressionStatement(expressionStatementPath) {
-      if (type === 'module') {
-        const {
-          node
-        } = expressionStatementPath;
-        const {
-          start,
-          end
-        } = node;
-        if (node.expression.type === 'Identifier' && typeof start === 'number' && typeof end === 'number') {
-          const name = node.expression.name;
-          switch (name) {
-            case '__filename':
-              src.update(start, end, 'import.meta.filename');
-              break;
-            case '__dirname':
-              src.update(start, end, 'import.meta.dirname');
-              break;
-          }
-        }
-      }
+    ExpressionStatement(path) {
+      expressionStatement(path, src, options);
     },
-    MemberExpression(memberExpressionPath) {
-      if (type === 'module') {
-        const {
-          node
-        } = memberExpressionPath;
-        const {
-          start,
-          end
-        } = node;
-
-        // Update require.resolve to import.meta.resolve
-        if (node.object.type === 'Identifier' && node.object.name === 'require' && node.property.type === 'Identifier' && node.property.name == 'resolve' && typeof start === 'number' && typeof end === 'number') {
-          src.update(start, end, 'import.meta.resolve');
-        }
-      }
+    MemberExpression(path) {
+      memberExpression(path, src, options);
     }
   });
   return src;

package/dist/formatters/expressionStatement.d.ts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { ExpressionStatement } from '@babel/types';
+import type { FormatterOptions } from '../types.js';
+export declare const expressionStatement: (nodePath: NodePath<ExpressionStatement>, src: MagicString, options: FormatterOptions) => void;

package/dist/formatters/expressionStatement.js

@@ -0,0 +1,61 @@
+export const expressionStatement = (nodePath, src, options) => {
+  if (options.type === 'module') {
+    const {
+      node
+    } = nodePath;
+    const {
+      start,
+      end
+    } = node;
+    if (typeof start === 'number' && typeof end === 'number') {
+      const isMemberExpressionModuleExports = expression => {
+        return expression.object.type === 'Identifier' && expression.object.name === 'module' && expression.property.type === 'Identifier' && expression.property.name === 'exports';
+      };
+      if (node.expression.type === 'Identifier') {
+        const name = node.expression.name;
+
+        // CommonJS globals
+        switch (name) {
+          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 (node.expression.type === 'MemberExpression') {
+        const {
+          expression
+        } = node;
+
+        // Check for `module.exports` without an assignment
+        if (isMemberExpressionModuleExports(expression)) {
+          /**
+           * @TODO: Should this depend on `options.modules` being enabled?
+           * Probably not for the same reason `exports` is converted to an empty object (ReferenceError in ESM).
+           * This is a standalone reference to `module.exports` without being part of an AssignmentExpression.
+           */
+          src.update(start, end, '{}');
+        }
+      }
+
+      /*
+      if (
+        options.modules &&
+        node.expression.type === 'AssignmentExpression' &&
+        node.expression.left.type === 'MemberExpression' &&
+        isMemberExpressionModuleExports(node.expression.left)
+      ) {
+        // @TODO support `modules` option.
+      }
+      */
+    }
+  }
+};

package/dist/formatters/memberExpression.d.ts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { MemberExpression } from '@babel/types';
+import type { FormatterOptions } from '../types.js';
+export declare const memberExpression: (nodePath: NodePath<MemberExpression>, src: MagicString, options: FormatterOptions) => void;

package/dist/formatters/memberExpression.js

@@ -0,0 +1,33 @@
+export const memberExpression = (nodePath, src, options) => {
+  if (options.type === 'module') {
+    const {
+      node
+    } = nodePath;
+    const {
+      start,
+      end
+    } = node;
+    if (typeof start === 'number' && typeof end === 'number' && node.object.type === 'Identifier' && node.object.name === 'require' && node.property.type === 'Identifier') {
+      const {
+        name
+      } = node.property;
+
+      // CommonJS properties of `require`
+      switch (name) {
+        case 'main':
+          src.update(start, end, 'import.meta');
+          break;
+        case 'resolve':
+          src.update(start, end, 'import.meta.resolve');
+          break;
+        case 'cache':
+          /**
+           * Can of worms here. ¯\_(ツ)_/¯
+           * @see https://github.com/nodejs/help/issues/2806
+           */
+          src.update(start, end, '{}');
+          break;
+      }
+    }
+  }
+};

package/dist/formatters/metaProperty.d.ts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { MetaProperty } from '@babel/types';
+import type { FormatterOptions } from '../types.js';
+export declare const metaProperty: (nodePath: NodePath<MetaProperty>, src: MagicString, options: FormatterOptions) => void;

package/dist/formatters/metaProperty.js

@@ -0,0 +1,43 @@
+export const metaProperty = (nodePath, src, options) => {
+  if (options.type === 'commonjs') {
+    const path = nodePath.findParent(path => path.isMemberExpression());
+    if (path) {
+      const {
+        node
+      } = path;
+      const {
+        start,
+        end
+      } = node;
+      if (node.type === 'MemberExpression' && node.property.type === 'Identifier' && typeof start == 'number' && typeof end === 'number') {
+        const name = node.property.name;
+        switch (name) {
+          case 'url':
+            src.update(start, end, 'require("node:url").pathToFileURL(__filename).toString()');
+            break;
+          case 'filename':
+            src.update(start, end, '__filename');
+            break;
+          case 'dirname':
+            src.update(start, end, '__dirname');
+            break;
+          case 'resolve':
+            src.update(start, end, 'require.resolve');
+            break;
+        }
+      }
+    } else {
+      const {
+        node
+      } = nodePath;
+      const {
+        start,
+        end
+      } = node;
+      if (node.property.type === 'Identifier' && node.property.name === 'meta' && typeof start === 'number' && typeof end === 'number') {
+        // This is an `import.meta` expression
+        src.update(start, end, 'require.main');
+      }
+    }
+  }
+};

package/dist/memberExpression.d.ts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { MemberExpression } from '@babel/types';
+import type { FormatterOptions } from '../types.js';
+export declare const memberExpression: (nodePath: NodePath<MemberExpression>, src: MagicString, options: FormatterOptions) => void;

package/dist/metaProperty.d.ts

@@ -0,0 +1,5 @@
+import MagicString from 'magic-string';
+import type { NodePath } from '@babel/traverse';
+import type { MetaProperty } from '@babel/types';
+import type { FormatterOptions } from '../types.js';
+export declare const metaProperty: (nodePath: NodePath<MetaProperty>, src: MagicString, options: FormatterOptions) => void;

package/dist/module.d.ts

@@ -1,9 +1,3 @@
 import type { ModuleOptions } from './types.js';
-/**
- * Transforms a file from one Node.js module system to another based on options.
- * Module globals, for example import.meta, __dirname, __filename, etc. are always transformed.
- * However, the CommonJS `module` object is not transformed, for instance `module.path`, `module.children`, etc.,
- * with the exception of `module.exports` which is converted when `loading` is set to `true`.
- */
 declare const transform: (filename: string, options?: ModuleOptions) => Promise<string>;
 export { transform };

package/dist/module.js

@@ -1,20 +1,14 @@
 import { resolve } from 'node:path';
-import { readFile } from 'node:fs/promises';
+import { readFile, writeFile } from 'node:fs/promises';
+import { specifier } from '@knighted/specifier';
 import { parse } from './parse.js';
 import { format } from './format.js';
 const defaultOptions = {
   type: 'commonjs',
   out: undefined,
-  moduleLoading: false,
-  specifiers: undefined
+  modules: false,
+  specifier: undefined
 };
-
-/**
- * Transforms a file from one Node.js module system to another based on options.
- * Module globals, for example import.meta, __dirname, __filename, etc. are always transformed.
- * However, the CommonJS `module` object is not transformed, for instance `module.path`, `module.children`, etc.,
- * with the exception of `module.exports` which is converted when `loading` is set to `true`.
- */
 const transform = async (filename, options = defaultOptions) => {
   const opts = {
     ...defaultOptions,
@@ -23,6 +17,29 @@ const transform = async (filename, options = defaultOptions) => {
   const file = resolve(filename);
   const code = (await readFile(file)).toString();
   const ast = parse(code);
-  return format(code, ast, opts).toString();
+  let source = format(code, ast, opts).toString();
+  if (options.specifier) {
+    const {
+      code,
+      error
+    } = await specifier.updateSrc(source, ({
+      value
+    }) => {
+      // Collapse any BinaryExpression or NewExpression to test for a relative specifier
+      const collapsed = value.replace(/['"`+)\s]|new String\(/g, '');
+      const relative = /^(?:\.|\.\.)\//;
+      if (relative.test(collapsed)) {
+        // $2 is for any closing quotation/parens around BE or NE
+        return value.replace(/(.+)\.(?:m|c)?(?:j|t)s([)'"`]*)?$/, `$1${options.specifier}$2`);
+      }
+    });
+    if (code && !error) {
+      source = code;
+    }
+  }
+  if (opts.out) {
+    await writeFile(resolve(opts.out), source);
+  }
+  return source;
 };
 export { transform };

package/dist/types.d.ts

@@ -1,6 +1,7 @@
 export type ModuleOptions = {
     type?: 'module' | 'commonjs';
-    moduleLoading?: boolean;
-    specifiers?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts';
+    modules?: boolean;
+    specifier?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts';
     out?: string;
 };
+export type FormatterOptions = Omit<ModuleOptions, 'out'> & Required<Pick<ModuleOptions, 'type'>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.3",
   "description": "Converts module differences in source files between ES and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
@@ -70,11 +70,12 @@
     "prettier": "^3.2.5",
     "tsx": "^4.11.0",
     "typescript": "^5.4.5",
-    "typescript-eslint": "^8.0.0-alpha.16"
+    "typescript-eslint": "^8.0.0-alpha.18"
   },
   "dependencies": {
     "@babel/parser": "^7.24.6",
     "@babel/traverse": "^7.24.6",
+    "@knighted/specifier": "^2.0.0-rc.1",
     "magic-string": "^0.30.10"
   },
   "prettier": {