{"commit":{"authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","authoredAt":"2019-04-30T08:47:05-07:00","subject":"Merge pull request #243 from sompylasar\/rename-profiler-types-to-frontend-backend-to-disambiguate","shortRevision":"da951ec9bb","revision":"da951ec9bb9f7cf4835f8c1a1d30170cafedce84"},"parents":["44205f16d9924f0f053c2ff3e103e1bb40a1d4c7","d3e5fcd81cc74a97bd719f39d7886303490ba58a"],"files":[{"status":"M","path":"src\/backend\/renderer.js"},{"status":"M","path":"src\/backend\/types.js"},{"status":"M","path":"src\/devtools\/ProfilingCache.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitFlamegraph.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitRanked.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/CommitTreeBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/FlamegraphChartBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Interactions.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/InteractionsChartBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/RankedChartBuilder.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/SidebarInteractions.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/types.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/utils.js"}],"body":"Rename Profiler types to disambiguate which is Frontend and Backend","patch":"diff --git a\/src\/backend\/renderer.js b\/src\/backend\/renderer.js\nindex c4e515829b..3b029be297 100644\n--- a\/src\/backend\/renderer.js\n+++ b\/src\/backend\/renderer.js\n@@ -28,17 +28,17 @@ import { getUID } from '..\/utils';\n import { inspectHooksOfFiber } from '.\/ReactDebugHooks';\n \n import type {\n- CommitDetails,\n+ CommitDetailsBackend,\n DevToolsHook,\n Fiber,\n- FiberCommits,\n+ FiberCommitsBackend,\n FiberData,\n- Interaction,\n- Interactions,\n- InteractionWithCommits,\n+ InteractionBackend,\n+ InteractionsBackend,\n+ InteractionWithCommitsBackend,\n PathFrame,\n PathMatch,\n- ProfilingSummary,\n+ ProfilingSummaryBackend,\n ReactRenderer,\n RendererInterface,\n } from '.\/types';\n@@ -1160,7 +1160,7 @@ export function attach(\n actualDurations: [],\n commitTime: performance.now() - profilingStartTime,\n interactions: Array.from(root.memoizedInteractions).map(\n- (interaction: Interaction) => ({\n+ (interaction: InteractionBackend) => ({\n ...interaction,\n timestamp: interaction.timestamp - profilingStartTime,\n })\n@@ -1202,7 +1202,7 @@ export function attach(\n actualDurations: [],\n commitTime: performance.now() - profilingStartTime,\n interactions: Array.from(root.memoizedInteractions).map(\n- (interaction: Interaction) => ({\n+ (interaction: InteractionBackend) => ({\n ...interaction,\n timestamp: interaction.timestamp - profilingStartTime,\n })\n@@ -1789,7 +1789,7 @@ export function attach(\n type CommitProfilingData = {|\n actualDurations: Array,\n commitTime: number,\n- interactions: Array,\n+ interactions: Array,\n maxActualDuration: number,\n |};\n \n@@ -1805,7 +1805,7 @@ export function attach(\n function getCommitDetails(\n rootID: number,\n commitIndex: number\n- ): CommitDetails {\n+ ): CommitDetailsBackend {\n const commitProfilingMetadata = ((rootToCommitProfilingMetadataMap: any): CommitProfilingMetadataMap).get(\n rootID\n );\n@@ -1833,7 +1833,10 @@ export function attach(\n };\n }\n \n- function getFiberCommits(rootID: number, fiberID: number): FiberCommits {\n+ function getFiberCommits(\n+ rootID: number,\n+ fiberID: number\n+ ): FiberCommitsBackend {\n const commitProfilingMetadata = ((rootToCommitProfilingMetadataMap: any): CommitProfilingMetadataMap).get(\n rootID\n );\n@@ -1866,12 +1869,15 @@ export function attach(\n };\n }\n \n- function getInteractions(rootID: number): Interactions {\n+ function getInteractions(rootID: number): InteractionsBackend {\n const commitProfilingMetadata = ((rootToCommitProfilingMetadataMap: any): CommitProfilingMetadataMap).get(\n rootID\n );\n if (commitProfilingMetadata != null) {\n- const interactionsMap: Map = new Map();\n+ const interactionsMap: Map<\n+ number,\n+ InteractionWithCommitsBackend\n+ > = new Map();\n \n commitProfilingMetadata.forEach((commitProfilingData, commitIndex) => {\n commitProfilingData.interactions.forEach(interaction => {\n@@ -1921,7 +1927,7 @@ export function attach(\n };\n }\n \n- function getProfilingSummary(rootID: number): ProfilingSummary {\n+ function getProfilingSummary(rootID: number): ProfilingSummaryBackend {\n const interactions = new Set();\n const commitDurations = [];\n const commitTimes = [];\ndiff --git a\/src\/backend\/types.js b\/src\/backend\/types.js\nindex 0bd1648233..d1946d164a 100644\n--- a\/src\/backend\/types.js\n+++ b\/src\/backend\/types.js\n@@ -53,36 +53,36 @@ export type ReactRenderer = {\n currentDispatcherRef?: {| current: null | Dispatcher |},\n };\n \n-export type Interaction = {|\n+export type InteractionBackend = {|\n id: number,\n name: string,\n timestamp: number,\n |};\n \n-export type CommitDetails = {|\n+export type CommitDetailsBackend = {|\n actualDurations: Array,\n commitIndex: number,\n- interactions: Array,\n+ interactions: Array,\n rootID: number,\n |};\n \n-export type FiberCommits = {|\n+export type FiberCommitsBackend = {|\n commitDurations: Array,\n fiberID: number,\n rootID: number,\n |};\n \n-export type InteractionWithCommits = {|\n- ...Interaction,\n+export type InteractionWithCommitsBackend = {|\n+ ...InteractionBackend,\n commits: Array,\n |};\n \n-export type Interactions = {|\n- interactions: Array,\n+export type InteractionsBackend = {|\n+ interactions: Array,\n rootID: number,\n |};\n \n-export type ProfilingSummary = {|\n+export type ProfilingSummaryBackend = {|\n commitDurations: Array,\n commitTimes: Array,\n initialTreeBaseDurations: Array,\n@@ -106,15 +106,18 @@ export type RendererInterface = {\n findNativeByFiberID: (id: number) => ?NativeType,\n flushInitialOperations: () => void,\n getBestMatchForTrackedPath: () => PathMatch | null,\n- getCommitDetails: (rootID: number, commitIndex: number) => CommitDetails,\n+ getCommitDetails: (\n+ rootID: number,\n+ commitIndex: number\n+ ) => CommitDetailsBackend,\n getFiberIDFromNative: (\n component: NativeType,\n findNearestUnfilteredAncestor?: boolean\n ) => number | null,\n- getFiberCommits: (rootID: number, fiberID: number) => FiberCommits,\n- getInteractions: (rootID: number) => Interactions,\n+ getFiberCommits: (rootID: number, fiberID: number) => FiberCommitsBackend,\n+ getInteractions: (rootID: number) => InteractionsBackend,\n getProfilingDataForDownload: (rootID: number) => Object,\n- getProfilingSummary: (rootID: number) => ProfilingSummary,\n+ getProfilingSummary: (rootID: number) => ProfilingSummaryBackend,\n getPathForElement: (id: number) => Array | null,\n handleCommitFiberRoot: (fiber: Object) => void,\n handleCommitFiberUnmount: (fiber: Object) => void,\ndiff --git a\/src\/devtools\/ProfilingCache.js b\/src\/devtools\/ProfilingCache.js\nindex d313111e67..1ebbba06e1 100644\n--- a\/src\/devtools\/ProfilingCache.js\n+++ b\/src\/devtools\/ProfilingCache.js\n@@ -22,18 +22,18 @@ import {\n import type { Resource } from '.\/cache';\n import type { Bridge } from '..\/types';\n import type {\n- CommitDetails as CommitDetailsBackend,\n- FiberCommits as FiberCommitsBackend,\n- Interactions as InteractionsBackend,\n- ProfilingSummary as ProfilingSummaryBackend,\n+ CommitDetailsBackend,\n+ FiberCommitsBackend,\n+ InteractionsBackend,\n+ ProfilingSummaryBackend,\n } from 'src\/backend\/types';\n import type {\n- CommitDetails as CommitDetailsFrontend,\n- FiberCommits as FiberCommitsFrontend,\n- Interactions as InteractionsFrontend,\n- InteractionWithCommits,\n- CommitTree as CommitTreeFrontend,\n- ProfilingSummary as ProfilingSummaryFrontend,\n+ CommitDetailsFrontend,\n+ FiberCommitsFrontend,\n+ InteractionsFrontend,\n+ InteractionWithCommitsFrontend,\n+ CommitTreeFrontend,\n+ ProfilingSummaryFrontend,\n } from 'src\/devtools\/views\/Profiler\/types';\n import type { ChartData as FlamegraphChartData } from 'src\/devtools\/views\/Profiler\/FlamegraphChartBuilder';\n import type { ChartData as InteractionsChartData } from 'src\/devtools\/views\/Profiler\/InteractionsChartBuilder';\n@@ -273,7 +273,7 @@ export default class ProfilingCache {\n profilingSummary,\n rootID,\n }: {|\n- interactions: Array,\n+ interactions: Array,\n profilingSummary: ProfilingSummaryFrontend,\n |}): InteractionsChartData =>\n getInteractionsChartData({\ndiff --git a\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js b\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js\nindex a4ad534a82..84a1ca5134 100644\n--- a\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js\n+++ b\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js\n@@ -13,7 +13,7 @@ import { StoreContext } from '..\/context';\n import styles from '.\/CommitFlamegraph.css';\n \n import type { ChartData, ChartNode } from '.\/FlamegraphChartBuilder';\n-import type { CommitDetails, CommitTree } from '.\/types';\n+import type { CommitDetailsFrontend, CommitTreeFrontend } from '.\/types';\n \n export type ItemData = {|\n chartData: ChartData,\n@@ -43,8 +43,8 @@ export default function CommitFlamegraphAutoSizer(_: {||}) {\n rootID: ((rootID: any): number),\n });\n \n- let commitDetails: CommitDetails | null = null;\n- let commitTree: CommitTree | null = null;\n+ let commitDetails: CommitDetailsFrontend | null = null;\n+ let commitTree: CommitTreeFrontend | null = null;\n let chartData: ChartData | null = null;\n if (selectedCommitIndex !== null) {\n commitDetails = profilingCache.CommitDetails.read({\n@@ -75,10 +75,12 @@ export default function CommitFlamegraphAutoSizer(_: {||}) {\n

\n \n {({ height, width }) => (\n+ \/\/ Force Flow types to avoid checking for `null` here because there's no static proof that\n+ \/\/ by the time this render prop function is called, the values of the `let` variables have not changed.\n \n@@ -93,8 +95,8 @@ export default function CommitFlamegraphAutoSizer(_: {||}) {\n \n type Props = {|\n chartData: ChartData,\n- commitDetails: CommitDetails,\n- commitTree: CommitTree,\n+ commitDetails: CommitDetailsFrontend,\n+ commitTree: CommitTreeFrontend,\n height: number,\n width: number,\n |};\ndiff --git a\/src\/devtools\/views\/Profiler\/CommitRanked.js b\/src\/devtools\/views\/Profiler\/CommitRanked.js\nindex 63cb41cd71..63200f37ba 100644\n--- a\/src\/devtools\/views\/Profiler\/CommitRanked.js\n+++ b\/src\/devtools\/views\/Profiler\/CommitRanked.js\n@@ -13,7 +13,7 @@ import { StoreContext } from '..\/context';\n import styles from '.\/CommitRanked.css';\n \n import type { ChartData } from '.\/RankedChartBuilder';\n-import type { CommitDetails, CommitTree } from '.\/types';\n+import type { CommitDetailsFrontend, CommitTreeFrontend } from '.\/types';\n \n export type ItemData = {|\n chartData: ChartData,\n@@ -43,8 +43,8 @@ export default function CommitRankedAutoSizer(_: {||}) {\n rootID: ((rootID: any): number),\n });\n \n- let commitDetails: CommitDetails | null = null;\n- let commitTree: CommitTree | null = null;\n+ let commitDetails: CommitDetailsFrontend | null = null;\n+ let commitTree: CommitTreeFrontend | null = null;\n let chartData: ChartData | null = null;\n if (selectedCommitIndex !== null) {\n commitDetails = profilingCache.CommitDetails.read({\n@@ -77,8 +77,8 @@ export default function CommitRankedAutoSizer(_: {||}) {\n {({ height, width }) => (\n \n@@ -93,8 +93,8 @@ export default function CommitRankedAutoSizer(_: {||}) {\n \n type Props = {|\n chartData: ChartData,\n- commitDetails: CommitDetails,\n- commitTree: CommitTree,\n+ commitDetails: CommitDetailsFrontend,\n+ commitTree: CommitTreeFrontend,\n height: number,\n width: number,\n |};\ndiff --git a\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js b\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js\nindex c04cc6a6ae..fdf98533c2 100644\n--- a\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js\n+++ b\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js\n@@ -13,9 +13,9 @@ import Store from 'src\/devtools\/store';\n \n import type { ElementType } from 'src\/devtools\/types';\n import type {\n- CommitTree,\n- Node,\n- ProfilingSummary as ProfilingSummaryFrontend,\n+ CommitTreeFrontend,\n+ CommitTreeNodeFrontend,\n+ ProfilingSummaryFrontend,\n } from 'src\/devtools\/views\/Profiler\/types';\n \n const debug = (methodName, ...args) => {\n@@ -29,7 +29,7 @@ const debug = (methodName, ...args) => {\n }\n };\n \n-const rootToCommitTreeMap: Map> = new Map();\n+const rootToCommitTreeMap: Map> = new Map();\n \n export function getCommitTree({\n commitIndex,\n@@ -39,7 +39,7 @@ export function getCommitTree({\n commitIndex: number,\n profilingSummary: ProfilingSummaryFrontend,\n store: Store,\n-|}): CommitTree {\n+|}): CommitTreeFrontend {\n const { rootID } = profilingSummary;\n \n if (!rootToCommitTreeMap.has(rootID)) {\n@@ -48,7 +48,7 @@ export function getCommitTree({\n \n const commitTrees = ((rootToCommitTreeMap.get(\n rootID\n- ): any): Array);\n+ ): any): Array);\n \n if (commitIndex < commitTrees.length) {\n return commitTrees[commitIndex];\n@@ -120,7 +120,7 @@ export function getCommitTree({\n function recursivelyInitializeTree(\n id: number,\n parentID: number,\n- nodes: Map,\n+ nodes: Map,\n initialTreeBaseDurations: Map,\n store: Store\n ): void {\n@@ -153,15 +153,18 @@ function recursivelyInitializeTree(\n }\n \n function updateTree(\n- commitTree: CommitTree,\n+ commitTree: CommitTreeFrontend,\n operations: Uint32Array\n-): CommitTree {\n+): CommitTreeFrontend {\n \/\/ Clone the original tree so edits don't affect it.\n const nodes = new Map(commitTree.nodes);\n \n \/\/ Clone nodes before mutating them so edits don't affect them.\n- const getClonedNode = (id: number): Node => {\n- const clonedNode = ((Object.assign({}, nodes.get(id)): any): Node);\n+ const getClonedNode = (id: number): CommitTreeNodeFrontend => {\n+ const clonedNode = ((Object.assign(\n+ {},\n+ nodes.get(id)\n+ ): any): CommitTreeNodeFrontend);\n nodes.set(id, clonedNode);\n return clonedNode;\n };\n@@ -209,7 +212,7 @@ function updateTree(\n debug('Add', `new root fiber ${id}`);\n }\n \n- const node: Node = {\n+ const node: CommitTreeNodeFrontend = {\n children: [],\n displayName: null,\n id,\n@@ -243,7 +246,7 @@ function updateTree(\n const parentNode = getClonedNode(parentID);\n parentNode.children = parentNode.children.concat(id);\n \n- const node: Node = {\n+ const node: CommitTreeNodeFrontend = {\n children: [],\n displayName,\n id,\n@@ -343,7 +346,7 @@ export function invalidateCommitTrees(): void {\n }\n \n \/\/ DEBUG\n-const __printTree = (commitTree: CommitTree) => {\n+const __printTree = (commitTree: CommitTreeFrontend) => {\n if (__DEBUG__) {\n const { nodes, rootID } = commitTree;\n console.group('__printTree()');\n@@ -352,7 +355,10 @@ const __printTree = (commitTree: CommitTree) => {\n const id = queue.shift();\n const depth = queue.shift();\n \n- const node = ((nodes.get(id): any): Node);\n+ const node = nodes.get(id);\n+ if (node == null) {\n+ throw Error(`Could not find node with id \"${id}\" in commit tree`);\n+ }\n \n console.log(\n `${'•'.repeat(depth)}${node.id}:${node.displayName || ''} ${\ndiff --git a\/src\/devtools\/views\/Profiler\/FlamegraphChartBuilder.js b\/src\/devtools\/views\/Profiler\/FlamegraphChartBuilder.js\nindex bfb912adcc..8096972175 100644\n--- a\/src\/devtools\/views\/Profiler\/FlamegraphChartBuilder.js\n+++ b\/src\/devtools\/views\/Profiler\/FlamegraphChartBuilder.js\n@@ -2,7 +2,7 @@\n \n import { calculateSelfDuration } from '.\/utils';\n \n-import type { CommitDetails, CommitTree, Node } from '.\/types';\n+import type { CommitDetailsFrontend, CommitTreeFrontend } from '.\/types';\n \n export type ChartNode = {|\n actualDuration: number,\n@@ -29,9 +29,9 @@ export function getChartData({\n commitIndex,\n commitTree,\n }: {|\n- commitDetails: CommitDetails,\n+ commitDetails: CommitDetailsFrontend,\n commitIndex: number,\n- commitTree: CommitTree,\n+ commitTree: CommitTreeFrontend,\n |}): ChartData {\n const { actualDurations, rootID } = commitDetails;\n const { nodes } = commitTree;\n@@ -55,8 +55,7 @@ export function getChartData({\n ) => {\n idToDepthMap.set(id, currentDepth);\n \n- const node = ((nodes.get(id): any): Node);\n-\n+ const node = nodes.get(id);\n if (node == null) {\n throw Error(`Could not find node with id \"${id}\" in commit tree`);\n }\n@@ -104,7 +103,12 @@ export function getChartData({\n };\n \n \/\/ Skip over the root; we don't want to show it in the flamegraph.\n- const root = ((nodes.get(rootID): any): Node);\n+ const root = nodes.get(rootID);\n+ if (root == null) {\n+ throw Error(`Could not find root node with id \"${rootID}\" in commit tree`);\n+ }\n+\n+ \/\/ TODO: Looks like there's an assumption here that a root has only one child. Is that so with a fragment in the root?\n walkTree(root.children[0]);\n \n const chartData = {\ndiff --git a\/src\/devtools\/views\/Profiler\/Interactions.js b\/src\/devtools\/views\/Profiler\/Interactions.js\nindex 6ce175c245..f2ebbefce3 100644\n--- a\/src\/devtools\/views\/Profiler\/Interactions.js\n+++ b\/src\/devtools\/views\/Profiler\/Interactions.js\n@@ -13,13 +13,16 @@ import styles from '.\/Interactions.css';\n \n import type { ChartData } from '.\/InteractionsChartBuilder';\n import type { TabID } from '.\/ProfilerContext';\n-import type { InteractionWithCommits, ProfilingSummary } from '.\/types';\n+import type {\n+ InteractionWithCommitsFrontend,\n+ ProfilingSummaryFrontend,\n+} from '.\/types';\n \n export type ItemData = {|\n chartData: ChartData,\n- interactions: Array,\n+ interactions: Array,\n labelWidth: number,\n- profilingSummary: ProfilingSummary,\n+ profilingSummary: ProfilingSummaryFrontend,\n scaleX: (value: number, fallbackValue: number) => number,\n selectedInteractionID: number | null,\n selectCommitIndex: (id: number | null) => void,\ndiff --git a\/src\/devtools\/views\/Profiler\/InteractionsChartBuilder.js b\/src\/devtools\/views\/Profiler\/InteractionsChartBuilder.js\nindex b1391a6eea..08bf71be00 100644\n--- a\/src\/devtools\/views\/Profiler\/InteractionsChartBuilder.js\n+++ b\/src\/devtools\/views\/Profiler\/InteractionsChartBuilder.js\n@@ -1,6 +1,9 @@\n \/\/ @flow\n \n-import type { InteractionWithCommits, ProfilingSummary } from '.\/types';\n+import type {\n+ InteractionWithCommitsFrontend,\n+ ProfilingSummaryFrontend,\n+} from '.\/types';\n \n export type ChartData = {|\n lastInteractionTime: number,\n@@ -13,8 +16,8 @@ export function getChartData({\n interactions,\n profilingSummary,\n }: {|\n- interactions: Array,\n- profilingSummary: ProfilingSummary,\n+ interactions: Array,\n+ profilingSummary: ProfilingSummaryFrontend,\n |}): ChartData {\n const { rootID } = profilingSummary;\n \ndiff --git a\/src\/devtools\/views\/Profiler\/RankedChartBuilder.js b\/src\/devtools\/views\/Profiler\/RankedChartBuilder.js\nindex 981692c90c..4274bac0c4 100644\n--- a\/src\/devtools\/views\/Profiler\/RankedChartBuilder.js\n+++ b\/src\/devtools\/views\/Profiler\/RankedChartBuilder.js\n@@ -2,7 +2,7 @@\n \n import { calculateSelfDuration } from '.\/utils';\n \n-import type { CommitDetails, CommitTree, Node } from '.\/types';\n+import type { CommitDetailsFrontend, CommitTreeFrontend } from '.\/types';\n \n export type ChartNode = {|\n id: number,\n@@ -23,9 +23,9 @@ export function getChartData({\n commitIndex,\n commitTree,\n }: {|\n- commitDetails: CommitDetails,\n+ commitDetails: CommitDetailsFrontend,\n commitIndex: number,\n- commitTree: CommitTree,\n+ commitTree: CommitTreeFrontend,\n |}): ChartData {\n const { actualDurations, rootID } = commitDetails;\n const { nodes } = commitTree;\n@@ -39,7 +39,7 @@ export function getChartData({\n \n const chartNodes: Array = [];\n actualDurations.forEach((actualDuration, id) => {\n- const node = ((nodes.get(id): any): Node);\n+ const node = nodes.get(id);\n \n if (node == null) {\n throw Error(`Could not find node with id \"${id}\" in commit tree`);\ndiff --git a\/src\/devtools\/views\/Profiler\/SidebarInteractions.js b\/src\/devtools\/views\/Profiler\/SidebarInteractions.js\nindex 22fb062e68..992a815c49 100644\n--- a\/src\/devtools\/views\/Profiler\/SidebarInteractions.js\n+++ b\/src\/devtools\/views\/Profiler\/SidebarInteractions.js\n@@ -8,8 +8,6 @@ import { getGradientColor } from '.\/utils';\n \n import styles from '.\/SidebarInteractions.css';\n \n-import type { InteractionWithCommits } from '.\/types';\n-\n export type Props = {||};\n \n export default function SidebarInteractions(_: Props) {\n@@ -31,6 +29,14 @@ export default function SidebarInteractions(_: Props) {\n rendererID: ((rendererID: any): number),\n rootID: ((rootID: any): number),\n });\n+ const interaction = interactions.find(\n+ interaction => interaction.id === selectedInteractionID\n+ );\n+ if (interaction == null) {\n+ throw Error(\n+ `Could not find interaction by selected interaction id \"${selectedInteractionID}\"`\n+ );\n+ }\n \n const profilingSummary = profilingCache.ProfilingSummary.read({\n rendererID: ((rendererID: any): number),\n@@ -44,10 +50,6 @@ export default function SidebarInteractions(_: Props) {\n \n const { commitDurations, commitTimes } = profilingSummary;\n \n- const interaction = ((interactions.find(\n- interaction => interaction.id === selectedInteractionID\n- ): any): InteractionWithCommits);\n-\n const viewCommit = (commitIndex: number) => {\n selectTab('flame-chart');\n selectCommitIndex(commitIndex);\ndiff --git a\/src\/devtools\/views\/Profiler\/types.js b\/src\/devtools\/views\/Profiler\/types.js\nindex eb9dd1b494..2cb024f808 100644\n--- a\/src\/devtools\/views\/Profiler\/types.js\n+++ b\/src\/devtools\/views\/Profiler\/types.js\n@@ -1,6 +1,6 @@\n \/\/ @flow\n \n-export type Node = {|\n+export type CommitTreeNodeFrontend = {|\n id: number,\n children: Array,\n displayName: string | null,\n@@ -9,38 +9,38 @@ export type Node = {|\n treeBaseDuration: number,\n |};\n \n-export type CommitTree = {|\n- nodes: Map,\n+export type CommitTreeFrontend = {|\n+ nodes: Map,\n rootID: number,\n |};\n \n-export type Interaction = {|\n+export type InteractionFrontend = {|\n id: number,\n name: string,\n timestamp: number,\n |};\n \n-export type InteractionWithCommits = {|\n- ...Interaction,\n+export type InteractionWithCommitsFrontend = {|\n+ ...InteractionFrontend,\n commits: Array,\n |};\n \n-export type Interactions = Array;\n+export type InteractionsFrontend = Array;\n \n-export type CommitDetails = {|\n+export type CommitDetailsFrontend = {|\n rootID: number,\n commitIndex: number,\n actualDurations: Map,\n- interactions: Array,\n+ interactions: Array,\n |};\n \n-export type FiberCommits = {|\n+export type FiberCommitsFrontend = {|\n commitDurations: Array,\n fiberID: number,\n rootID: number,\n |};\n \n-export type ProfilingSummary = {|\n+export type ProfilingSummaryFrontend = {|\n rootID: number,\n \n \/\/ Commit durations\n@@ -66,7 +66,7 @@ export type ImportedProfilingData = {|\n version: number,\n profilingOperations: Map>,\n profilingSnapshot: Map,\n- commitDetails: CommitDetails,\n- interactions: Interactions,\n- profilingSummary: ProfilingSummary,\n+ commitDetails: CommitDetailsFrontend,\n+ interactions: InteractionsFrontend,\n+ profilingSummary: ProfilingSummaryFrontend,\n |};\ndiff --git a\/src\/devtools\/views\/Profiler\/utils.js b\/src\/devtools\/views\/Profiler\/utils.js\nindex c8e439ce73..33c9217f86 100644\n--- a\/src\/devtools\/views\/Profiler\/utils.js\n+++ b\/src\/devtools\/views\/Profiler\/utils.js\n@@ -1,6 +1,6 @@\n \/\/ @flow\n \n-import type { CommitDetails, CommitTree, Node } from '.\/types';\n+import type { CommitDetailsFrontend, CommitTreeFrontend } from '.\/types';\n \n const commitGradient = [\n 'var(--color-commit-gradient-0)',\n@@ -17,8 +17,8 @@ const commitGradient = [\n \n export const calculateSelfDuration = (\n id: number,\n- commitTree: CommitTree,\n- commitDetails: CommitDetails\n+ commitTree: CommitTreeFrontend,\n+ commitDetails: CommitDetailsFrontend\n ): number => {\n const { actualDurations } = commitDetails;\n const { nodes } = commitTree;\n@@ -28,8 +28,11 @@ export const calculateSelfDuration = (\n }\n \n let selfDuration = ((actualDurations.get(id): any): number);\n+ const node = nodes.get(id);\n+ if (node == null) {\n+ throw Error(`Could not find node with id \"${id}\" in commit tree`);\n+ }\n \n- const node = ((nodes.get(id): any): Node);\n node.children.forEach(childID => {\n if (actualDurations.has(childID)) {\n selfDuration -= ((actualDurations.get(childID): any): number);\n"}

dillon1000/react

Files changed