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

package/README.md

@@ -89,8 +89,13 @@ type ModuleOptions = {
   /* Whether import/export and require/exports should be transformed. */
   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/module.cjs

@@ -6,16 +6,14 @@ 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");
-/**
- * Defaults to only transforming ES module globals to CommonJS.
- */
 const defaultOptions = {
   type: 'commonjs',
   out: undefined,
   modules: false,
-  specifiers: undefined
+  specifier: undefined
 };
 const transform = async (filename, options = defaultOptions) => {
   const opts = {
@@ -25,8 +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);
-
-  // TODO: Support `out` option.
-  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/types.d.cts

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

package/dist/module.js

@@ -1,15 +1,13 @@
 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';
-/**
- * Defaults to only transforming ES module globals to CommonJS.
- */
 const defaultOptions = {
   type: 'commonjs',
   out: undefined,
   modules: false,
-  specifiers: undefined
+  specifier: undefined
 };
 const transform = async (filename, options = defaultOptions) => {
   const opts = {
@@ -19,8 +17,29 @@ const transform = async (filename, options = defaultOptions) => {
   const file = resolve(filename);
   const code = (await readFile(file)).toString();
   const ast = parse(code);
-
-  // TODO: Support `out` option.
-  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,7 +1,7 @@
 export type ModuleOptions = {
     type?: 'module' | 'commonjs';
     modules?: boolean;
-    specifiers?: '.js' | '.mjs' | '.cjs' | '.ts' | '.mts' | '.cts';
+    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.2",
+  "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": {