Fix lxsmnsyc#14

SukkaW · May 9, 2023 · dd5e7a9 · dd5e7a9
1 parent ce4ace5
commit dd5e7a9
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 1 deletion.
diff --git a/packages/forgetti/src/core/checks.ts b/packages/forgetti/src/core/checks.ts
@@ -72,3 +72,23 @@ export function isNestedExpression(node: t.Node): node is NestedExpression {
       return false;
   }
 }
+
+/** Check whether a Node is CallExpression and a React Hook call */
+export function isCallExpressionAndHook(ctx: StateContext, node: t.Node): node is t.CallExpression {
+  if (node.type !== 'CallExpression') {
+    return false;
+  }
+
+  // A simple check to see if "node.callee" is an Identifier
+  // TypeScript is able to infer the type of "node.callee" to Identifier or V8IntrinsicIdentifier
+  if (!('name' in node.callee)) {
+    return false;
+  }
+
+  // Check if callee is a react hook
+  if (!ctx.filters.hook) {
+    return false;
+  }
+
+  return ctx.filters.hook.test(node.callee.name);
+}
diff --git a/packages/forgetti/src/core/optimizer.ts b/packages/forgetti/src/core/optimizer.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import { isNestedExpression, isPathValid } from './checks';
+import { isCallExpressionAndHook, isNestedExpression, isPathValid } from './checks';
 import getForeignBindings, { isForeignBinding } from './get-foreign-bindings';
 import getImportIdentifier from './get-import-identifier';
 import { RUNTIME_EQUALS } from './imports';
@@ -517,6 +517,7 @@ export default class Optimizer {
       // Check if callee is potentially a namespace import
       }
       const trueMember = unwrapNode(calleePath.node, t.isMemberExpression);
+
       if (
         trueMember
         && !trueMember.computed
@@ -561,7 +562,12 @@ export default class Optimizer {
         for (let i = 0, len = argumentsPath.length; i < len; i++) {
           argument = argumentsPath[i];
           if (isPathValid(argument, t.isExpression)) {
+            if (isCallExpressionAndHook(this.ctx, argument.node)) {
+              continue;
+            }
+
             const optimized = this.createDependency(argument);
+
             if (optimized) {
               mergeDependencies(dependencies, optimized.deps);
               path.node.arguments[i] = optimized.expr;

diff --git a/packages/forgetti/test/__snapshots__/hooks.test.ts.snap b/packages/forgetti/test/__snapshots__/hooks.test.ts.snap
@@ -1,5 +1,14 @@
 // Vitest Snapshot v1
 
+exports[`hooks > should correct transform nested hooks call (issue #14) 1`] = `
+"import { useDeferredValue } from 'react';
+import { useAtomValue } from 'jotai';
+import { stateAtom } from 'whatever';
+function Example(props) {
+  return useDeferredValue(useAtomValue(stateAtom));
+}"
+`;
+
 exports[`hooks > should optimize useCallback 1`] = `
 "import { useMemo as _useMemo } from \\"react\\";
 import { $$cache as _$$cache } from \\"forgetti/runtime\\";

diff --git a/packages/forgetti/test/hooks.test.ts b/packages/forgetti/test/hooks.test.ts
@@ -111,6 +111,17 @@ import { useEffect } from 'react';
 function Example(props) {
   useEffect(() => props.value());
 }
+`;
+    expect(await compile(code)).toMatchSnapshot();
+  });
+  it('should correct transform nested hooks call (issue #14)', async () => {
+    const code = `
+import { useDeferredValue } from 'react';
+import { useAtomValue } from 'jotai';
+import { stateAtom } from 'whatever';
+function Example(props) {
+  return useDeferredValue(useAtomValue(stateAtom));
+}
 `;
     expect(await compile(code)).toMatchSnapshot();
   });