Less forking, more allocations

Author: eps1lon

packages/react-debug-tools/src/ReactDebugHooks.js

@@ -49,11 +49,7 @@ type HookLogEntry = {
   value: mixed,
   debugInfo: ReactDebugInfo | null,
   dispatcherHookName: string,
-  /**
-   * A list of hook function names that may call this dispatcher method.
-   * If `null`, we assume that the wrapper name is equal to the dispatcher mthod name.
-   */
-  wrapperNames: Array<string> | null,
+  wrapperNames: Array<string>,
 };
 
 let hookLog: Array<HookLogEntry> = [];
@@ -222,7 +218,7 @@ function use<T>(usable: Usable<T>): T {
             debugInfo:
               thenable._debugInfo === undefined ? null : thenable._debugInfo,
             dispatcherHookName: 'Use',
-            wrapperNames: null,
+            wrapperNames: ['Use'],
           });
           return fulfilledValue;
         }
@@ -241,7 +237,7 @@ function use<T>(usable: Usable<T>): T {
         debugInfo:
           thenable._debugInfo === undefined ? null : thenable._debugInfo,
         dispatcherHookName: 'Use',
-        wrapperNames: null,
+        wrapperNames: ['Use'],
       });
       throw SuspenseException;
     } else if (usable.$$typeof === REACT_CONTEXT_TYPE) {
@@ -255,7 +251,7 @@ function use<T>(usable: Usable<T>): T {
         value,
         debugInfo: null,
         dispatcherHookName: 'Use',
-        wrapperNames: null,
+        wrapperNames: ['Use'],
       });
 
       return value;
@@ -275,7 +271,7 @@ function useContext<T>(context: ReactContext<T>): T {
     value: value,
     debugInfo: null,
     dispatcherHookName: 'Context',
-    wrapperNames: null,
+    wrapperNames: ['Context'],
   });
   return value;
 }
@@ -298,7 +294,7 @@ function useState<S>(
     value: state,
     debugInfo: null,
     dispatcherHookName: 'State',
-    wrapperNames: null,
+    wrapperNames: ['State'],
   });
   return [state, (action: BasicStateAction<S>) => {}];
 }
@@ -322,7 +318,7 @@ function useReducer<S, I, A>(
     value: state,
     debugInfo: null,
     dispatcherHookName: 'Reducer',
-    wrapperNames: null,
+    wrapperNames: ['Reducer'],
   });
   return [state, (action: A) => {}];
 }
@@ -337,7 +333,7 @@ function useRef<T>(initialValue: T): {current: T} {
     value: ref.current,
     debugInfo: null,
     dispatcherHookName: 'Ref',
-    wrapperNames: null,
+    wrapperNames: ['Ref'],
   });
   return ref;
 }
@@ -351,7 +347,7 @@ function useCacheRefresh(): () => void {
     value: hook !== null ? hook.memoizedState : function refresh() {},
     debugInfo: null,
     dispatcherHookName: 'CacheRefresh',
-    wrapperNames: null,
+    wrapperNames: ['CacheRefresh'],
   });
   return () => {};
 }
@@ -368,7 +364,7 @@ function useLayoutEffect(
     value: create,
     debugInfo: null,
     dispatcherHookName: 'LayoutEffect',
-    wrapperNames: null,
+    wrapperNames: ['LayoutEffect'],
   });
 }
 
@@ -384,7 +380,7 @@ function useInsertionEffect(
     value: create,
     debugInfo: null,
     dispatcherHookName: 'InsertionEffect',
-    wrapperNames: null,
+    wrapperNames: ['InsertionEffect'],
   });
 }
 
@@ -400,7 +396,7 @@ function useEffect(
     value: create,
     debugInfo: null,
     dispatcherHookName: 'Effect',
-    wrapperNames: null,
+    wrapperNames: ['Effect'],
   });
 }
 
@@ -425,7 +421,7 @@ function useImperativeHandle<T>(
     value: instance,
     debugInfo: null,
     dispatcherHookName: 'ImperativeHandle',
-    wrapperNames: null,
+    wrapperNames: ['ImperativeHandle'],
   });
 }
 
@@ -437,7 +433,7 @@ function useDebugValue(value: any, formatterFn: ?(value: any) => any) {
     value: typeof formatterFn === 'function' ? formatterFn(value) : value,
     debugInfo: null,
     dispatcherHookName: 'DebugValue',
-    wrapperNames: null,
+    wrapperNames: ['DebugValue'],
   });
 }
 
@@ -450,7 +446,7 @@ function useCallback<T>(callback: T, inputs: Array<mixed> | void | null): T {
     value: hook !== null ? hook.memoizedState[0] : callback,
     debugInfo: null,
     dispatcherHookName: 'Callback',
-    wrapperNames: null,
+    wrapperNames: ['Callback'],
   });
   return callback;
 }
@@ -468,7 +464,7 @@ function useMemo<T>(
     value,
     debugInfo: null,
     dispatcherHookName: 'Memo',
-    wrapperNames: null,
+    wrapperNames: ['Memo'],
   });
   return value;
 }
@@ -491,7 +487,7 @@ function useSyncExternalStore<T>(
     value,
     debugInfo: null,
     dispatcherHookName: 'SyncExternalStore',
-    wrapperNames: null,
+    wrapperNames: ['SyncExternalStore'],
   });
   return value;
 }
@@ -515,7 +511,7 @@ function useTransition(): [
     value: isPending,
     debugInfo: null,
     dispatcherHookName: 'Transition',
-    wrapperNames: null,
+    wrapperNames: ['Transition'],
   });
   return [isPending, () => {}];
 }
@@ -530,7 +526,7 @@ function useDeferredValue<T>(value: T, initialValue?: T): T {
     value: prevValue,
     debugInfo: null,
     dispatcherHookName: 'DeferredValue',
-    wrapperNames: null,
+    wrapperNames: ['DeferredValue'],
   });
   return prevValue;
 }
@@ -545,7 +541,7 @@ function useId(): string {
     value: id,
     debugInfo: null,
     dispatcherHookName: 'Id',
-    wrapperNames: null,
+    wrapperNames: ['Id'],
   });
   return id;
 }
@@ -597,7 +593,7 @@ function useOptimistic<S, A>(
     value: state,
     debugInfo: null,
     dispatcherHookName: 'Optimistic',
-    wrapperNames: null,
+    wrapperNames: ['Optimistic'],
   });
   return [state, (action: A) => {}];
 }
@@ -658,7 +654,7 @@ function useFormState<S, P>(
     value: value,
     debugInfo: debugInfo,
     dispatcherHookName: 'FormState',
-    wrapperNames: null,
+    wrapperNames: ['FormState'],
   });
 
   if (error !== null) {
@@ -729,7 +725,7 @@ function useActionState<S, P>(
     value: value,
     debugInfo: debugInfo,
     dispatcherHookName: 'ActionState',
-    wrapperNames: null,
+    wrapperNames: ['ActionState'],
   });
 
   if (error !== null) {
@@ -914,18 +910,8 @@ function findPrimitiveIndex(hookStack: any, hook: HookLogEntry) {
       ) {
         i++;
       }
-      if (hook.wrapperNames !== null) {
-        for (let j = 0; j < hook.wrapperNames.length; j++) {
-          const wrapperName = hook.wrapperNames[j];
-          if (
-            i < hookStack.length - 1 &&
-            isReactWrapper(hookStack[i].functionName, wrapperName)
-          ) {
-            i++;
-          }
-        }
-      } else {
-        const wrapperName = hook.dispatcherHookName;
+      for (let j = 0; j < hook.wrapperNames.length; j++) {
+        const wrapperName = hook.wrapperNames[j];
         if (
           i < hookStack.length - 1 &&
           isReactWrapper(hookStack[i].functionName, wrapperName)