Skip to content

Commit 3eb822c

Browse files
committed
Use export at each declaration
It's getting a lot to duplicate.
1 parent f85c537 commit 3eb822c

File tree

2 files changed

+36
-81
lines changed

2 files changed

+36
-81
lines changed

packages/react-reconciler/src/ReactFiberCommitWork.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ import {
9999
Cloned,
100100
} from './ReactFiberFlags';
101101
import {
102-
getCommitTime,
103-
getCompleteTime,
102+
commitTime,
103+
completeTime,
104104
pushNestedEffectDurations,
105105
popNestedEffectDurations,
106106
bubbleNestedEffectDurations,
@@ -504,7 +504,7 @@ function commitLayoutEffectOnFiber(
504504
commitProfilerUpdate(
505505
finishedWork,
506506
current,
507-
getCommitTime(),
507+
commitTime,
508508
profilerInstance.effectDuration,
509509
);
510510
} else {
@@ -2342,7 +2342,7 @@ export function reappearLayoutEffects(
23422342
commitProfilerUpdate(
23432343
finishedWork,
23442344
current,
2345-
getCommitTime(),
2345+
commitTime,
23462346
profilerInstance.effectDuration,
23472347
);
23482348
} else {
@@ -2573,9 +2573,7 @@ export function commitPassiveMountEffects(
25732573
finishedWork,
25742574
committedLanes,
25752575
committedTransitions,
2576-
enableProfilerTimer && enableComponentPerformanceTrack
2577-
? getCompleteTime()
2578-
: 0,
2576+
enableProfilerTimer && enableComponentPerformanceTrack ? completeTime : 0,
25792577
);
25802578
}
25812579

@@ -2762,7 +2760,7 @@ function commitPassiveMountOnFiber(
27622760
finishedWork.alternate,
27632761
// This value will still reflect the previous commit phase.
27642762
// It does not get reset until the start of the next commit phase.
2765-
getCommitTime(),
2763+
commitTime,
27662764
profilerInstance.passiveEffectDuration,
27672765
);
27682766
} else {

packages/react-reconciler/src/ReactProfilerTimer.js

Lines changed: 30 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,14 @@ import * as Scheduler from 'scheduler';
2121

2222
const {unstable_now: now} = Scheduler;
2323

24-
export type ProfilerTimer = {
25-
getCommitTime(): number,
26-
isCurrentUpdateNested(): boolean,
27-
markNestedUpdateScheduled(): void,
28-
recordCommitTime(): void,
29-
startProfilerTimer(fiber: Fiber): void,
30-
stopProfilerTimerIfRunning(fiber: Fiber): void,
31-
stopProfilerTimerIfRunningAndRecordDuration(fiber: Fiber): void,
32-
stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber: Fiber): void,
33-
syncNestedUpdateFlag(): void,
34-
...
35-
};
36-
37-
let completeTime: number = -0;
38-
let commitTime: number = -0;
39-
let profilerStartTime: number = -1.1;
40-
let profilerEffectDuration: number = -0;
41-
let componentEffectStartTime: number = -1.1;
42-
let componentEffectEndTime: number = -1.1;
43-
44-
function pushNestedEffectDurations(): number {
24+
export let completeTime: number = -0;
25+
export let commitTime: number = -0;
26+
export let profilerStartTime: number = -1.1;
27+
export let profilerEffectDuration: number = -0;
28+
export let componentEffectStartTime: number = -1.1;
29+
export let componentEffectEndTime: number = -1.1;
30+
31+
export function pushNestedEffectDurations(): number {
4532
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
4633
return 0;
4734
}
@@ -50,7 +37,7 @@ function pushNestedEffectDurations(): number {
5037
return prevEffectDuration;
5138
}
5239

53-
function popNestedEffectDurations(prevEffectDuration: number): number {
40+
export function popNestedEffectDurations(prevEffectDuration: number): number {
5441
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
5542
return 0;
5643
}
@@ -60,7 +47,9 @@ function popNestedEffectDurations(prevEffectDuration: number): number {
6047
}
6148

6249
// Like pop but it also adds the current elapsed time to the parent scope.
63-
function bubbleNestedEffectDurations(prevEffectDuration: number): number {
50+
export function bubbleNestedEffectDurations(
51+
prevEffectDuration: number,
52+
): number {
6453
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
6554
return 0;
6655
}
@@ -69,15 +58,15 @@ function bubbleNestedEffectDurations(prevEffectDuration: number): number {
6958
return elapsedTime;
7059
}
7160

72-
function resetComponentEffectTimers(): void {
61+
export function resetComponentEffectTimers(): void {
7362
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
7463
return;
7564
}
7665
componentEffectStartTime = -1.1;
7766
componentEffectEndTime = -1.1;
7867
}
7968

80-
function pushComponentEffectStart(): number {
69+
export function pushComponentEffectStart(): number {
8170
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
8271
return 0;
8372
}
@@ -86,7 +75,7 @@ function pushComponentEffectStart(): number {
8675
return prevEffectStart;
8776
}
8877

89-
function popComponentEffectStart(prevEffectStart: number): void {
78+
export function popComponentEffectStart(prevEffectStart: number): void {
9079
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
9180
return;
9281
}
@@ -121,53 +110,45 @@ function popComponentEffectStart(prevEffectStart: number): void {
121110
let currentUpdateIsNested: boolean = false;
122111
let nestedUpdateScheduled: boolean = false;
123112

124-
function isCurrentUpdateNested(): boolean {
113+
export function isCurrentUpdateNested(): boolean {
125114
return currentUpdateIsNested;
126115
}
127116

128-
function markNestedUpdateScheduled(): void {
117+
export function markNestedUpdateScheduled(): void {
129118
if (enableProfilerNestedUpdatePhase) {
130119
nestedUpdateScheduled = true;
131120
}
132121
}
133122

134-
function resetNestedUpdateFlag(): void {
123+
export function resetNestedUpdateFlag(): void {
135124
if (enableProfilerNestedUpdatePhase) {
136125
currentUpdateIsNested = false;
137126
nestedUpdateScheduled = false;
138127
}
139128
}
140129

141-
function syncNestedUpdateFlag(): void {
130+
export function syncNestedUpdateFlag(): void {
142131
if (enableProfilerNestedUpdatePhase) {
143132
currentUpdateIsNested = nestedUpdateScheduled;
144133
nestedUpdateScheduled = false;
145134
}
146135
}
147136

148-
function getCompleteTime(): number {
149-
return completeTime;
150-
}
151-
152-
function recordCompleteTime(): void {
137+
export function recordCompleteTime(): void {
153138
if (!enableProfilerTimer) {
154139
return;
155140
}
156141
completeTime = now();
157142
}
158143

159-
function getCommitTime(): number {
160-
return commitTime;
161-
}
162-
163-
function recordCommitTime(): void {
144+
export function recordCommitTime(): void {
164145
if (!enableProfilerTimer) {
165146
return;
166147
}
167148
commitTime = now();
168149
}
169150

170-
function startProfilerTimer(fiber: Fiber): void {
151+
export function startProfilerTimer(fiber: Fiber): void {
171152
if (!enableProfilerTimer) {
172153
return;
173154
}
@@ -179,14 +160,16 @@ function startProfilerTimer(fiber: Fiber): void {
179160
}
180161
}
181162

182-
function stopProfilerTimerIfRunning(fiber: Fiber): void {
163+
export function stopProfilerTimerIfRunning(fiber: Fiber): void {
183164
if (!enableProfilerTimer) {
184165
return;
185166
}
186167
profilerStartTime = -1;
187168
}
188169

189-
function stopProfilerTimerIfRunningAndRecordDuration(fiber: Fiber): void {
170+
export function stopProfilerTimerIfRunningAndRecordDuration(
171+
fiber: Fiber,
172+
): void {
190173
if (!enableProfilerTimer) {
191174
return;
192175
}
@@ -199,7 +182,7 @@ function stopProfilerTimerIfRunningAndRecordDuration(fiber: Fiber): void {
199182
}
200183
}
201184

202-
function stopProfilerTimerIfRunningAndRecordIncompleteDuration(
185+
export function stopProfilerTimerIfRunningAndRecordIncompleteDuration(
203186
fiber: Fiber,
204187
): void {
205188
if (!enableProfilerTimer) {
@@ -214,7 +197,7 @@ function stopProfilerTimerIfRunningAndRecordIncompleteDuration(
214197
}
215198
}
216199

217-
function recordEffectDuration(fiber: Fiber): void {
200+
export function recordEffectDuration(fiber: Fiber): void {
218201
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
219202
return;
220203
}
@@ -234,7 +217,7 @@ function recordEffectDuration(fiber: Fiber): void {
234217
}
235218
}
236219

237-
function startEffectTimer(): void {
220+
export function startEffectTimer(): void {
238221
if (!enableProfilerTimer || !enableProfilerCommitHooks) {
239222
return;
240223
}
@@ -245,7 +228,7 @@ function startEffectTimer(): void {
245228
}
246229
}
247230

248-
function transferActualDuration(fiber: Fiber): void {
231+
export function transferActualDuration(fiber: Fiber): void {
249232
// Transfer time spent rendering these children so we don't lose it
250233
// after we rerender. This is used as a helper in special cases
251234
// where we should count the work of multiple passes.
@@ -256,29 +239,3 @@ function transferActualDuration(fiber: Fiber): void {
256239
child = child.sibling;
257240
}
258241
}
259-
260-
export {
261-
getCompleteTime,
262-
recordCompleteTime,
263-
getCommitTime,
264-
recordCommitTime,
265-
isCurrentUpdateNested,
266-
markNestedUpdateScheduled,
267-
recordEffectDuration,
268-
resetNestedUpdateFlag,
269-
startEffectTimer,
270-
startProfilerTimer,
271-
stopProfilerTimerIfRunning,
272-
stopProfilerTimerIfRunningAndRecordDuration,
273-
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
274-
syncNestedUpdateFlag,
275-
transferActualDuration,
276-
pushNestedEffectDurations,
277-
popNestedEffectDurations,
278-
bubbleNestedEffectDurations,
279-
resetComponentEffectTimers,
280-
pushComponentEffectStart,
281-
popComponentEffectStart,
282-
componentEffectStartTime,
283-
componentEffectEndTime,
284-
};

0 commit comments

Comments
 (0)