refactor: style consistency

twada · twada · commit 9a57ba3a3f15 · 2022-07-31T21:18:52.000+09:00
diff --git a/src/index.mjs b/src/index.mjs
@@ -130,7 +130,7 @@ function createVisitor (options) {
     }
   }
 
-  const isRequireAssert = (id, init) => {
+  function isRequireAssert (id, init) {
     if (!isCallExpression(init)) {
       return false;
     }
@@ -143,9 +143,9 @@ function createVisitor (options) {
       return false;
     }
     return isIdentifier(id) || isObjectPattern(id);
-  };
+  }
 
-  const isRequireAssertStrict = (id, init) => {
+  function isRequireAssertDotStrict (id, init) {
     if (!isMemberExpression(init)) {
       return false;
     }
@@ -157,9 +157,9 @@ function createVisitor (options) {
       return false;
     }
     return prop.name === 'strict';
-  };
+  }
 
-  const isRemovalTarget = (id, init) => isRequireAssert(id, init) || isRequireAssertStrict(id, init);
+  const isRemovalTarget = (id, init) => isRequireAssert(id, init) || isRequireAssertDotStrict(id, init);
 
   const nodeToRemove = new WeakSet();
 
diff --git a/test/test.mjs b/test/test.mjs
@@ -25,7 +25,7 @@ function testWithGeneratedFixture (ext, code) {
   const expected = readFileSync(expectedFilepath).toString();
 
   function deftest (name, fun) {
-    it(`${name}: ${code}`, function () {
+    it(`${name}: ${code}`, () => {
       const ast = createFixture({ code, postlude, prelude });
       const modifiedAst = fun(ast);
       const actual = generate(modifiedAst);
@@ -50,7 +50,7 @@ function testWithFixture (fixtureName, options) {
   const expected = readFileSync(expectedFilepath).toString();
 
   function deftest (name, fun) {
-    it(`${name}: ${fixtureName}`, function () {
+    it(`${name}: ${fixtureName}`, () => {
       const ast = parseFixture(fixtureFilepath);
       const modifiedAst = fun(ast);
       const actual = generate(modifiedAst);
@@ -68,7 +68,7 @@ describe('with default options', () => {
   testWithFixture('assignment_singlevar');
   testWithFixture('non_block_statement');
 
-  describe('removal of ESM imports', function () {
+  describe('removal of ESM imports', () => {
     testESM("import assert from 'assert';");
     testESM("import assert from 'node:assert';");
     testESM("import assert from 'node:assert/strict';");
@@ -83,7 +83,7 @@ describe('with default options', () => {
     testESM("import { default as assert } from 'node:assert';");
   });
 
-  describe('removal of CJS requires', function () {
+  describe('removal of CJS requires', () => {
     testCJS("const assert = require('assert');");
     testCJS("const assert = require('assert').strict;");
     testCJS("const assert = require('assert/strict');");
@@ -97,17 +97,13 @@ describe('with default options', () => {
 
 describe('with custom options', () => {
   testWithFixture('custom_modules_cjs', {
-    variables: [
-    ],
     modules: [
       'http-assert',
       'node:assert'
     ]
   });
 
   testWithFixture('custom_modules_mjs', {
-    variables: [
-    ],
     modules: [
       'node:assert',
       'node:assert/strict',

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ function createVisitor (options) {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`- const isRequireAssert = (id, init) => {`
	`133`	`+ function isRequireAssert (id, init) {`
`134`	`134`	`if (!isCallExpression(init)) {`
`135`	`135`	`return false;`
`136`	`136`	`}`
`@@ -143,9 +143,9 @@ function createVisitor (options) {`
`143`	`143`	`return false;`
`144`	`144`	`}`
`145`	`145`	`return isIdentifier(id) \|\| isObjectPattern(id);`
`146`		`- };`
	`146`	`+ }`
`147`	`147`
`148`		`- const isRequireAssertStrict = (id, init) => {`
	`148`	`+ function isRequireAssertDotStrict (id, init) {`
`149`	`149`	`if (!isMemberExpression(init)) {`
`150`	`150`	`return false;`
`151`	`151`	`}`
`@@ -157,9 +157,9 @@ function createVisitor (options) {`
`157`	`157`	`return false;`
`158`	`158`	`}`
`159`	`159`	`return prop.name === 'strict';`
`160`		`- };`
	`160`	`+ }`
`161`	`161`
`162`		`- const isRemovalTarget = (id, init) => isRequireAssert(id, init) \|\| isRequireAssertStrict(id, init);`
	`162`	`+ const isRemovalTarget = (id, init) => isRequireAssert(id, init) \|\| isRequireAssertDotStrict(id, init);`
`163`	`163`
`164`	`164`	`const nodeToRemove = new WeakSet();`
`165`	`165`