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

package/dist/cjs/format.cjs

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.format = void 0;
 var _magicString = _interopRequireDefault(require("magic-string"));
 var _traverse2 = _interopRequireDefault(require("@babel/traverse"));
+var _identifier = require("./formatters/identifier.cjs");
 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;
 
@@ -19,12 +19,12 @@ const traverse = _traverse2.default.default;
 const format = (code, ast, options) => {
   const src = new _magicString.default(code);
   traverse(ast, {
+    Identifier(path) {
+      (0, _identifier.identifier)(path, src, options);
+    },
     MetaProperty(path) {
       (0, _metaProperty.metaProperty)(path, src, options);
     },
-    ExpressionStatement(path) {
-      (0, _expressionStatement.expressionStatement)(path, src, options);
-    },
     MemberExpression(path) {
       (0, _memberExpression.memberExpression)(path, src, options);
     }

package/dist/cjs/formatters/identifier.cjs

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.identifier = void 0;
+const identifier = (nodePath, src, options) => {
+  if (options.type === 'module') {
+    const {
+      node
+    } = nodePath;
+    const {
+      start,
+      end
+    } = node;
+    if (typeof start === 'number' && typeof end === 'number' && node.type === 'Identifier') {
+      const {
+        name
+      } = node;
+      const isMemberExpression = Boolean(nodePath.findParent(path => path.isMemberExpression()));
+
+      // CommonJS globals in expression/statement
+      switch (name) {
+        case 'module':
+          {
+            if (!isMemberExpression) {
+              src.update(start, end, 'import.meta');
+            }
+            break;
+          }
+        case 'exports':
+          {
+            if (!isMemberExpression) {
+              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;
+      }
+    }
+  }
+};
+exports.identifier = identifier;

package/dist/cjs/identifier.d.cts

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

package/dist/cjs/module.cjs

@@ -15,6 +15,21 @@ const defaultOptions = {
   modules: false,
   specifier: undefined
 };
+const getLangFromExt = filename => {
+  const ext = (0, _nodePath.extname)(filename);
+  if (/\.js$/.test(ext)) {
+    return 'js';
+  }
+  if (/\.ts$/.test(ext)) {
+    return 'ts';
+  }
+  if (ext === '.tsx') {
+    return 'tsx';
+  }
+  if (ext === '.jsx') {
+    return 'jsx';
+  }
+};
 const transform = async (filename, options = defaultOptions) => {
   const opts = {
     ...defaultOptions,
@@ -25,10 +40,7 @@ const transform = async (filename, options = defaultOptions) => {
   const ast = (0, _parse.parse)(code);
   let source = (0, _format.format)(code, ast, opts).toString();
   if (options.specifier) {
-    const {
-      code,
-      error
-    } = await _specifier.specifier.updateSrc(source, ({
+    const code = await _specifier.specifier.updateSrc(source, getLangFromExt(filename), ({
       value
     }) => {
       // Collapse any BinaryExpression or NewExpression to test for a relative specifier
@@ -39,9 +51,7 @@ const transform = async (filename, options = defaultOptions) => {
         return value.replace(/(.+)\.(?:m|c)?(?:j|t)s([)'"`]*)?$/, `$1${options.specifier}$2`);
       }
     });
-    if (code && !error) {
-      source = code;
-    }
+    source = code;
   }
   if (opts.out) {
     await (0, _promises.writeFile)((0, _nodePath.resolve)(opts.out), source);

package/dist/format.js

@@ -1,8 +1,8 @@
 import MagicString from 'magic-string';
 import _traverse from '@babel/traverse';
+import { identifier } from './formatters/identifier.js';
 import { metaProperty } from './formatters/metaProperty.js';
 import { memberExpression } from './formatters/memberExpression.js';
-import { expressionStatement } from './formatters/expressionStatement.js';
 const traverse = _traverse.default;
 
 /**
@@ -12,12 +12,12 @@ const traverse = _traverse.default;
 export const format = (code, ast, options) => {
   const src = new MagicString(code);
   traverse(ast, {
+    Identifier(path) {
+      identifier(path, src, options);
+    },
     MetaProperty(path) {
       metaProperty(path, src, options);
     },
-    ExpressionStatement(path) {
-      expressionStatement(path, src, options);
-    },
     MemberExpression(path) {
       memberExpression(path, src, options);
     }

package/dist/formatters/identifier.d.ts

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

package/dist/formatters/identifier.js

@@ -0,0 +1,41 @@
+export const identifier = (nodePath, src, options) => {
+  if (options.type === 'module') {
+    const {
+      node
+    } = nodePath;
+    const {
+      start,
+      end
+    } = node;
+    if (typeof start === 'number' && typeof end === 'number' && node.type === 'Identifier') {
+      const {
+        name
+      } = node;
+      const isMemberExpression = Boolean(nodePath.findParent(path => path.isMemberExpression()));
+
+      // CommonJS globals in expression/statement
+      switch (name) {
+        case 'module':
+          {
+            if (!isMemberExpression) {
+              src.update(start, end, 'import.meta');
+            }
+            break;
+          }
+        case 'exports':
+          {
+            if (!isMemberExpression) {
+              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;
+      }
+    }
+  }
+};

package/dist/identifier.d.ts

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

package/dist/module.js

@@ -1,4 +1,4 @@
-import { resolve } from 'node:path';
+import { resolve, extname } from 'node:path';
 import { readFile, writeFile } from 'node:fs/promises';
 import { specifier } from '@knighted/specifier';
 import { parse } from './parse.js';
@@ -9,6 +9,21 @@ const defaultOptions = {
   modules: false,
   specifier: undefined
 };
+const getLangFromExt = filename => {
+  const ext = extname(filename);
+  if (/\.js$/.test(ext)) {
+    return 'js';
+  }
+  if (/\.ts$/.test(ext)) {
+    return 'ts';
+  }
+  if (ext === '.tsx') {
+    return 'tsx';
+  }
+  if (ext === '.jsx') {
+    return 'jsx';
+  }
+};
 const transform = async (filename, options = defaultOptions) => {
   const opts = {
     ...defaultOptions,
@@ -19,10 +34,7 @@ const transform = async (filename, options = defaultOptions) => {
   const ast = parse(code);
   let source = format(code, ast, opts).toString();
   if (options.specifier) {
-    const {
-      code,
-      error
-    } = await specifier.updateSrc(source, ({
+    const code = await specifier.updateSrc(source, getLangFromExt(filename), ({
       value
     }) => {
       // Collapse any BinaryExpression or NewExpression to test for a relative specifier
@@ -33,9 +45,7 @@ const transform = async (filename, options = defaultOptions) => {
         return value.replace(/(.+)\.(?:m|c)?(?:j|t)s([)'"`]*)?$/, `$1${options.specifier}$2`);
       }
     });
-    if (code && !error) {
-      source = code;
-    }
+    source = code;
   }
   if (opts.out) {
     await writeFile(resolve(opts.out), source);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "Converts module differences in source files between ES and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
@@ -57,25 +57,25 @@
     "url": "https://github.com/knightedcodemonkey/module/issues"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.24.6",
-    "@babel/preset-typescript": "^7.24.6",
-    "@babel/types": "^7.24.6",
+    "@babel/preset-env": "^7.26.9",
+    "@babel/preset-typescript": "^7.27.0",
+    "@babel/types": "^7.27.0",
     "@eslint/js": "^9.3.0",
     "@types/babel__traverse": "^7.20.6",
-    "@types/node": "^20.12.12",
-    "babel-dual-package": "^1.1.3",
-    "c8": "^9.1.0",
-    "eslint": "^9.3.0",
+    "@types/node": "^22.13.17",
+    "babel-dual-package": "^1.1.4",
+    "c8": "^10.1.3",
+    "eslint": "^9.23.0",
     "eslint-plugin-n": "^17.7.0",
     "prettier": "^3.2.5",
-    "tsx": "^4.11.0",
-    "typescript": "^5.4.5",
-    "typescript-eslint": "^8.0.0-alpha.18"
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.29.0"
   },
   "dependencies": {
-    "@babel/parser": "^7.24.6",
-    "@babel/traverse": "^7.24.6",
-    "@knighted/specifier": "^2.0.0-rc.1",
+    "@babel/parser": "^7.27.0",
+    "@babel/traverse": "^7.27.0",
+    "@knighted/specifier": "^2.0.0-rc.4",
     "magic-string": "^0.30.10"
   },
   "prettier": {