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

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/module",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "description": "Converts module differences in source files between ES and CommonJS.",
   "type": "module",
   "main": "dist/module.js",
@@ -68,9 +68,9 @@
     "eslint": "^9.3.0",
     "eslint-plugin-n": "^17.7.0",
     "prettier": "^3.2.5",
-    "tsx": "^4.11.0",
+    "tsx": "^4.11.2",
     "typescript": "^5.4.5",
-    "typescript-eslint": "^8.0.0-alpha.18"
+    "typescript-eslint": "^8.0.0-alpha.26"
   },
   "dependencies": {
     "@babel/parser": "^7.24.6",