fix: remove unnecessary return value

Hajime-san · Apr 10, 2023 · b2c1cd9 · b2c1cd9
1 parent 81b67a2
commit b2c1cd9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/src/resolve_util.ts b/src/resolve_util.ts
@@ -68,7 +68,6 @@ export const getModuleSpecifier = <T extends HasModuleSpecifierNode>(args: {
   imports: ReturnType<typeof resolvedModules>;
 }): {
   moduleSpecifier: ModuleSpecifierReturnType<T>;
-  node: T;
 } => {
   const { node, imports } = args;
   let moduleSpecifier: ModuleSpecifierReturnType<T>;
@@ -82,7 +81,6 @@ export const getModuleSpecifier = <T extends HasModuleSpecifierNode>(args: {
   return {
     // @ts-ignore Variable 'X' is used before being assigned. deno-ts(2454)
     moduleSpecifier,
-    node,
   };
 };
 
@@ -91,7 +89,6 @@ export const getExpressionArguments = (args: {
   imports: ReturnType<typeof resolvedModules>;
 }): {
   expressionArguments: Array<string>;
-  node: ts.CallExpression;
 } => {
   const { node, imports } = args;
   const expressionArguments = node.arguments.map((argument) => {
@@ -103,7 +100,6 @@ export const getExpressionArguments = (args: {
 
   return {
     expressionArguments,
-    node,
   };
 };
 

diff --git a/src/resolve_util_test.ts b/src/resolve_util_test.ts
@@ -141,7 +141,6 @@ Deno.test('getModuleSpecifier', async (t) => {
       }),
       {
         moduleSpecifier: './ComponentA.tsx',
-        node: localSourceImportDeclaration,
       },
     );
   });
@@ -154,7 +153,6 @@ Deno.test('getModuleSpecifier', async (t) => {
       }),
       {
         moduleSpecifier: 'react',
-        node: externalLibImportDeclaration,
       },
     );
   });
@@ -171,7 +169,6 @@ Deno.test('getExpressionArguments', async (t) => {
       }),
       {
         expressionArguments: ['./ComponentE.tsx'],
-        node: localCallExpression,
       },
     );
   });

diff --git a/src/transform.ts b/src/transform.ts
@@ -22,22 +22,22 @@ const transformModuleSpecifier = (
         ts.isCallExpression(newNode) &&
         newNode.expression.kind === ts.SyntaxKind.ImportKeyword
       ) {
-        const { expressionArguments, node } = getExpressionArguments({
+        const { expressionArguments } = getExpressionArguments({
           node: newNode,
           imports,
         });
         return context.factory.updateCallExpression(
-          node,
-          node.expression,
-          node.typeArguments,
+          newNode,
+          newNode.expression,
+          newNode.typeArguments,
           expressionArguments.map((argument) =>
             context.factory.createStringLiteral(argument)
           ),
         );
       }
       // Transform "aggregating modules"
       if (ts.isExportDeclaration(newNode)) {
-        const { moduleSpecifier, node } = getModuleSpecifier({
+        const { moduleSpecifier } = getModuleSpecifier({
           node: newNode,
           imports,
         });
@@ -46,12 +46,12 @@ const transformModuleSpecifier = (
         // export { foo } from "./foo.(ts|tsx|d.ts)"
         if (moduleSpecifier) {
           return context.factory.updateExportDeclaration(
-            node,
-            node.modifiers,
-            node.isTypeOnly,
-            node.exportClause,
+            newNode,
+            newNode.modifiers,
+            newNode.isTypeOnly,
+            newNode.exportClause,
             context.factory.createStringLiteral(moduleSpecifier),
-            node.assertClause,
+            newNode.assertClause,
           );
         }
         //
@@ -64,16 +64,16 @@ const transformModuleSpecifier = (
       // to
       // import { bar } from "./bar.(ts|tsx|d.ts)"
       if (ts.isImportDeclaration(newNode)) {
-        const { moduleSpecifier, node } = getModuleSpecifier({
+        const { moduleSpecifier } = getModuleSpecifier({
           node: newNode,
           imports,
         });
         return context.factory.updateImportDeclaration(
-          node,
-          node.modifiers,
-          node.importClause,
+          newNode,
+          newNode.modifiers,
+          newNode.importClause,
           context.factory.createStringLiteral(moduleSpecifier),
-          node.assertClause,
+          newNode.assertClause,
         );
       }
       return newNode;