Factor wing selector boilerplate into helper makers.

Author: mstange

src/selectors/per-thread/stack-sample.ts

@@ -47,6 +47,7 @@ import type {
   IndexIntoStackTable,
   SamplesLikeTable,
   SampleCategoriesAndSubcategories,
+  CallNodeArea,
 } from 'firefox-profiler/types';
 import type {
   CallNodeInfo,
@@ -242,13 +243,50 @@ export function getStackAndSampleSelectorsPerThread(
       ProfileData.getLowerWingCallNodeInfo
     );
 
-  const getLowerWingSelectedCallNodePath: Selector<CallNodePath> =
+  // Returns the selected call node path stored under the given area in this
+  // thread's ThreadViewOptions.
+  const makeSelectedPathSelector = (
+    area: CallNodeArea
+  ): Selector<CallNodePath> =>
     createSelector(
       threadSelectors.getViewOptions,
-      (threadViewOptions): CallNodePath =>
-        threadViewOptions.selectedCallNodePaths.LOWER_WING
+      (threadViewOptions) => threadViewOptions.selectedCallNodePaths[area]
     );
 
+  // Returns the expanded call node paths stored under the given area.
+  const makeExpandedPathsSelector = (area: CallNodeArea): Selector<PathSet> =>
+    createSelector(
+      threadSelectors.getViewOptions,
+      (threadViewOptions) => threadViewOptions.expandedCallNodePaths[area]
+    );
+
+  // Combines a CallNodeInfo selector with a CallNodePath selector to produce
+  // the corresponding call node index.
+  const makeCallNodeIndexFromPathSelector = (
+    callNodeInfoSel: Selector<CallNodeInfo>,
+    pathSel: Selector<CallNodePath>
+  ): Selector<IndexIntoCallNodeTable | null> =>
+    createSelector(callNodeInfoSel, pathSel, (callNodeInfo, callNodePath) =>
+      callNodeInfo.getCallNodeIndexFromPath(callNodePath)
+    );
+
+  // Combines a CallNodeInfo selector with an expanded-paths selector to
+  // produce the corresponding array of call node indexes.
+  const makeExpandedIndexesSelector = (
+    callNodeInfoSel: Selector<CallNodeInfo>,
+    pathsSel: Selector<PathSet>
+  ): Selector<Array<IndexIntoCallNodeTable | null>> =>
+    createSelector(callNodeInfoSel, pathsSel, (callNodeInfo, callNodePaths) =>
+      Array.from(callNodePaths).map((path) =>
+        callNodeInfo.getCallNodeIndexFromPath(path)
+      )
+    );
+
+  const getLowerWingSelectedCallNodePath =
+    makeSelectedPathSelector('LOWER_WING');
+  const getUpperWingSelectedCallNodePath =
+    makeSelectedPathSelector('UPPER_WING');
+
   const getSelectedCallNodePath: Selector<CallNodePath> = createSelector(
     threadSelectors.getViewOptions,
     UrlState.getInvertCallstack,
@@ -258,39 +296,18 @@ export function getStackAndSampleSelectorsPerThread(
         : threadViewOptions.selectedCallNodePaths.NON_INVERTED_TREE
   );
 
-  const getUpperWingSelectedCallNodePath: Selector<CallNodePath> =
-    createSelector(
-      threadSelectors.getViewOptions,
-      (threadViewOptions): CallNodePath =>
-        threadViewOptions.selectedCallNodePaths.UPPER_WING
-    );
-
-  const getSelectedCallNodeIndex: Selector<IndexIntoCallNodeTable | null> =
-    createSelector(
-      getCallNodeInfo,
-      getSelectedCallNodePath,
-      (callNodeInfo, callNodePath) => {
-        return callNodeInfo.getCallNodeIndexFromPath(callNodePath);
-      }
-    );
-
-  const getLowerWingSelectedCallNodeIndex: Selector<IndexIntoCallNodeTable | null> =
-    createSelector(
-      getLowerWingCallNodeInfo,
-      getLowerWingSelectedCallNodePath,
-      (callNodeInfo, callNodePath) => {
-        return callNodeInfo.getCallNodeIndexFromPath(callNodePath);
-      }
-    );
-
-  const getUpperWingSelectedCallNodeIndex: Selector<IndexIntoCallNodeTable | null> =
-    createSelector(
-      getUpperWingCallNodeInfo,
-      getUpperWingSelectedCallNodePath,
-      (callNodeInfo, callNodePath) => {
-        return callNodeInfo.getCallNodeIndexFromPath(callNodePath);
-      }
-    );
+  const getSelectedCallNodeIndex = makeCallNodeIndexFromPathSelector(
+    getCallNodeInfo,
+    getSelectedCallNodePath
+  );
+  const getLowerWingSelectedCallNodeIndex = makeCallNodeIndexFromPathSelector(
+    getLowerWingCallNodeInfo,
+    getLowerWingSelectedCallNodePath
+  );
+  const getUpperWingSelectedCallNodeIndex = makeCallNodeIndexFromPathSelector(
+    getUpperWingCallNodeInfo,
+    getUpperWingSelectedCallNodePath
+  );
 
   const getExpandedCallNodePaths: Selector<PathSet> = createSelector(
     threadSelectors.getViewOptions,
@@ -301,47 +318,22 @@ export function getStackAndSampleSelectorsPerThread(
         : threadViewOptions.expandedCallNodePaths.NON_INVERTED_TREE
   );
 
-  const getLowerWingExpandedCallNodePaths: Selector<PathSet> = createSelector(
-    threadSelectors.getViewOptions,
-    (threadViewOptions) => threadViewOptions.expandedCallNodePaths.LOWER_WING
-  );
-
-  const getUpperWingExpandedCallNodePaths: Selector<PathSet> = createSelector(
-    threadSelectors.getViewOptions,
-    (threadViewOptions) => threadViewOptions.expandedCallNodePaths.UPPER_WING
-  );
+  const getLowerWingExpandedCallNodePaths =
+    makeExpandedPathsSelector('LOWER_WING');
+  const getUpperWingExpandedCallNodePaths =
+    makeExpandedPathsSelector('UPPER_WING');
 
-  const getExpandedCallNodeIndexes: Selector<
-    Array<IndexIntoCallNodeTable | null>
-  > = createSelector(
+  const getExpandedCallNodeIndexes = makeExpandedIndexesSelector(
     getCallNodeInfo,
-    getExpandedCallNodePaths,
-    (callNodeInfo, callNodePaths) =>
-      Array.from(callNodePaths).map((path) =>
-        callNodeInfo.getCallNodeIndexFromPath(path)
-      )
+    getExpandedCallNodePaths
   );
-
-  const getLowerWingExpandedCallNodeIndexes: Selector<
-    Array<IndexIntoCallNodeTable | null>
-  > = createSelector(
+  const getLowerWingExpandedCallNodeIndexes = makeExpandedIndexesSelector(
     getLowerWingCallNodeInfo,
-    getLowerWingExpandedCallNodePaths,
-    (callNodeInfo, callNodePaths) =>
-      Array.from(callNodePaths).map((path) =>
-        callNodeInfo.getCallNodeIndexFromPath(path)
-      )
+    getLowerWingExpandedCallNodePaths
   );
-
-  const getUpperWingExpandedCallNodeIndexes: Selector<
-    Array<IndexIntoCallNodeTable | null>
-  > = createSelector(
+  const getUpperWingExpandedCallNodeIndexes = makeExpandedIndexesSelector(
     getUpperWingCallNodeInfo,
-    getUpperWingExpandedCallNodePaths,
-    (callNodeInfo, callNodePaths) =>
-      Array.from(callNodePaths).map((path) =>
-        callNodeInfo.getCallNodeIndexFromPath(path)
-      )
+    getUpperWingExpandedCallNodePaths
   );
 
   const _getSampleIndexToNonInvertedCallNodeIndexForPreviewFilteredCtssThread: Selector<
@@ -885,66 +877,53 @@ export function getStackAndSampleSelectorsPerThread(
       }
     );
 
-  const getLowerWingRightClickedCallNodeIndex: Selector<null | IndexIntoCallNodeTable> =
+  // Returns the right-clicked call node index in `area` for this thread, or
+  // null if the right-clicked call node belongs to a different thread or area.
+  const makeAreaRightClickedCallNodeIndexSelector = (
+    area: CallNodeArea,
+    callNodeInfoSel: Selector<CallNodeInfo>
+  ): Selector<null | IndexIntoCallNodeTable> =>
     createSelector(
       getRightClickedCallNodeInfo,
-      getLowerWingCallNodeInfo,
+      callNodeInfoSel,
       (rightClickedCallNodeInfo, callNodeInfo) => {
         if (
           rightClickedCallNodeInfo !== null &&
           rightClickedCallNodeInfo.threadsKey === threadsKey &&
-          rightClickedCallNodeInfo.area === 'LOWER_WING'
+          rightClickedCallNodeInfo.area === area
         ) {
           return callNodeInfo.getCallNodeIndexFromPath(
             rightClickedCallNodeInfo.callNodePath
           );
         }
-
         return null;
       }
     );
 
+  const getLowerWingRightClickedCallNodeIndex =
+    makeAreaRightClickedCallNodeIndexSelector(
+      'LOWER_WING',
+      getLowerWingCallNodeInfo
+    );
+
+  const getUpperWingRightClickedCallNodeIndex =
+    makeAreaRightClickedCallNodeIndexSelector(
+      'UPPER_WING',
+      getUpperWingCallNodeInfo
+    );
+
   const getLowerWingRightClickedFuncIndex: Selector<null | IndexIntoFuncTable> =
     createSelector(
-      getRightClickedCallNodeInfo,
+      getLowerWingRightClickedCallNodeIndex,
       getLowerWingCallNodeInfo,
-      (rightClickedCallNodeInfo, callNodeInfo) => {
-        if (
-          rightClickedCallNodeInfo === null ||
-          rightClickedCallNodeInfo.threadsKey !== threadsKey ||
-          rightClickedCallNodeInfo.area !== 'LOWER_WING'
-        ) {
-          return null;
-        }
-        const callNodeIndex = callNodeInfo.getCallNodeIndexFromPath(
-          rightClickedCallNodeInfo.callNodePath
-        );
+      (callNodeIndex, callNodeInfo) => {
         if (callNodeIndex === null) {
           return null;
         }
         return callNodeInfo.funcForNode(callNodeIndex);
       }
     );
 
-  const getUpperWingRightClickedCallNodeIndex: Selector<null | IndexIntoCallNodeTable> =
-    createSelector(
-      getRightClickedCallNodeInfo,
-      getUpperWingCallNodeInfo,
-      (rightClickedCallNodeInfo, callNodeInfo) => {
-        if (
-          rightClickedCallNodeInfo !== null &&
-          rightClickedCallNodeInfo.threadsKey === threadsKey &&
-          rightClickedCallNodeInfo.area === 'UPPER_WING'
-        ) {
-          return callNodeInfo.getCallNodeIndexFromPath(
-            rightClickedCallNodeInfo.callNodePath
-          );
-        }
-
-        return null;
-      }
-    );
-
   const getRightClickedFunctionIndex: Selector<null | IndexIntoFuncTable> =
     createSelector(
       ProfileSelectors.getProfileViewOptions,