From d5272f291969eb5ae728397f86f6e3779a2ac2e2 Mon Sep 17 00:00:00 2001 From: "Alexis H. Munsayac" Date: Thu, 6 Mar 2025 22:55:38 +0800 Subject: [PATCH] Sort bippy import --- packages/scan/src/core/index.ts | 5 +- packages/scan/src/core/instrumentation.ts | 3 +- packages/scan/src/core/monitor/index.ts | 1 + packages/scan/src/core/monitor/performance.ts | 1 + .../core/notifications/performance-utils.ts | 1 + .../src/core/notifications/performance.ts | 1 + packages/scan/src/core/utils.ts | 60 +------------------ packages/scan/src/new-outlines/index.ts | 1 + packages/scan/src/web/utils/helpers.ts | 1 + packages/scan/src/web/utils/pin.ts | 1 + .../views/inspector/components-tree/state.ts | 3 +- .../scan/src/web/views/inspector/header.tsx | 4 +- .../src/web/views/inspector/overlay/index.tsx | 1 + .../src/web/views/inspector/properties.tsx | 1 + .../scan/src/web/views/inspector/states.ts | 3 +- .../web/views/inspector/timeline/index.tsx | 1 + .../src/web/views/inspector/timeline/utils.ts | 3 +- .../scan/src/web/views/inspector/utils.ts | 4 +- 18 files changed, 29 insertions(+), 66 deletions(-) diff --git a/packages/scan/src/core/index.ts b/packages/scan/src/core/index.ts index 6357553c..9991a508 100644 --- a/packages/scan/src/core/index.ts +++ b/packages/scan/src/core/index.ts @@ -1,4 +1,3 @@ -import { type Signal, signal } from '@preact/signals'; import { type Fiber, detectReactBuildType, @@ -6,6 +5,8 @@ import { getType, isInstrumentationActive, } from 'bippy'; + +import { type Signal, signal } from '@preact/signals'; import type { ComponentType } from 'preact'; import type { ReactNode } from 'preact/compat'; import type { RenderData } from 'src/core/utils'; @@ -16,6 +17,7 @@ import { IS_CLIENT } from '~web/utils/constants'; import { readLocalStorage, saveLocalStorage } from '~web/utils/helpers'; import type { Outline } from '~web/utils/outline'; import type { States } from '~web/views/inspector/utils'; +import packageJson from '../../package.json'; import type { ChangeReason, Render, @@ -25,7 +27,6 @@ import type { InternalInteraction } from './monitor/types'; import type { getSession } from './monitor/utils'; import { startTimingTracking } from './notifications/event-tracking'; import { createHighlightCanvas } from './notifications/outline-overlay'; -import packageJson from '../../package.json'; let rootContainer: HTMLDivElement | null = null; let shadowRoot: ShadowRoot | null = null; diff --git a/packages/scan/src/core/instrumentation.ts b/packages/scan/src/core/instrumentation.ts index 3c382c42..dee3d94e 100644 --- a/packages/scan/src/core/instrumentation.ts +++ b/packages/scan/src/core/instrumentation.ts @@ -1,4 +1,3 @@ -import { type Signal, signal } from '@preact/signals'; import { ClassComponentTag, type Fiber, @@ -19,6 +18,8 @@ import { traverseProps, traverseRenderedFibers, } from 'bippy'; + +import { type Signal, signal } from '@preact/signals'; import { isValidElement } from 'preact'; import { isEqual } from '~core/utils'; import { diff --git a/packages/scan/src/core/monitor/index.ts b/packages/scan/src/core/monitor/index.ts index f1999a5f..19b048e2 100644 --- a/packages/scan/src/core/monitor/index.ts +++ b/packages/scan/src/core/monitor/index.ts @@ -5,6 +5,7 @@ import { getTimings, isCompositeFiber, } from 'bippy'; + import { type FC, useEffect } from 'react'; import { IS_CLIENT } from '~web/utils/constants'; import { diff --git a/packages/scan/src/core/monitor/performance.ts b/packages/scan/src/core/monitor/performance.ts index b9f8649c..5ef77a51 100644 --- a/packages/scan/src/core/monitor/performance.ts +++ b/packages/scan/src/core/monitor/performance.ts @@ -1,4 +1,5 @@ import { type Fiber, getDisplayName } from 'bippy'; + import { getCompositeComponentFromElement } from '~web/views/inspector/utils'; import { Store } from '..'; import type { diff --git a/packages/scan/src/core/notifications/performance-utils.ts b/packages/scan/src/core/notifications/performance-utils.ts index eee24e08..54b1761b 100644 --- a/packages/scan/src/core/notifications/performance-utils.ts +++ b/packages/scan/src/core/notifications/performance-utils.ts @@ -1,4 +1,5 @@ import { Fiber } from 'bippy'; + export const getChildrenFromFiberLL = (fiber: Fiber) => { const children: Array = []; diff --git a/packages/scan/src/core/notifications/performance.ts b/packages/scan/src/core/notifications/performance.ts index f5fb944d..f129cd62 100644 --- a/packages/scan/src/core/notifications/performance.ts +++ b/packages/scan/src/core/notifications/performance.ts @@ -5,6 +5,7 @@ import { isHostFiber, traverseFiber, } from 'bippy'; + import { Store } from '../..'; import { diff --git a/packages/scan/src/core/utils.ts b/packages/scan/src/core/utils.ts index 89fd25b2..f39f9ba6 100644 --- a/packages/scan/src/core/utils.ts +++ b/packages/scan/src/core/utils.ts @@ -1,63 +1,9 @@ -// @ts-nocheck import { type Fiber, getType } from 'bippy'; + // import type { ComponentType } from 'preact'; import { ReactScanInternals } from '~core/index'; import type { AggregatedRender } from '~web/utils/outline'; -import type { AggregatedChange, Render } from './instrumentation'; - -export const aggregateChanges = ( - changes: Array, - prevAggregatedChange?: AggregatedChange, -) => { - const newChange = { - type: prevAggregatedChange?.type ?? 0, - unstable: prevAggregatedChange?.unstable ?? false, - }; - for (const change of changes) { - newChange.type |= change.type; - newChange.unstable = newChange.unstable || (change.unstable ?? false); - } - - return newChange; -}; - -export const joinAggregations = ({ - from, - to, -}: { - from: AggregatedRender; - to: AggregatedRender; -}) => { - to.changes.type |= from.changes.type; - to.changes.unstable = to.changes.unstable || from.changes.unstable; - to.aggregatedCount += 1; - to.didCommit = to.didCommit || from.didCommit; - to.forget = to.forget || from.forget; - to.fps = to.fps + from.fps; - to.phase |= from.phase; - to.time = (to.time ?? 0) + (from.time ?? 0); - - to.unnecessary = to.unnecessary || from.unnecessary; -}; - -export const aggregateRender = ( - newRender: Render, - prevAggregated: AggregatedRender, -) => { - prevAggregated.changes = aggregateChanges( - newRender.changes, - prevAggregated.changes, - ); - prevAggregated.aggregatedCount += 1; - prevAggregated.didCommit = prevAggregated.didCommit || newRender.didCommit; - prevAggregated.forget = prevAggregated.forget || newRender.forget; - prevAggregated.fps = prevAggregated.fps + newRender.fps; - prevAggregated.phase |= newRender.phase; - prevAggregated.time = (prevAggregated.time ?? 0) + (newRender.time ?? 0); - - prevAggregated.unnecessary = - prevAggregated.unnecessary || newRender.unnecessary; -}; +import type { Render } from './instrumentation'; function descending(a: number, b: number): number { return b - a; @@ -189,7 +135,7 @@ export interface RenderData { renders: Array; displayName: string | null; type: unknown; - changes?: Array; + changes?: Array; } export function isEqual(a: unknown, b: unknown): boolean { diff --git a/packages/scan/src/new-outlines/index.ts b/packages/scan/src/new-outlines/index.ts index 25103e21..38667934 100644 --- a/packages/scan/src/new-outlines/index.ts +++ b/packages/scan/src/new-outlines/index.ts @@ -6,6 +6,7 @@ import { getNearestHostFibers, isCompositeFiber, } from 'bippy'; + import { ReactScanInternals, Store, ignoredProps } from '~core/index'; import { createInstrumentation } from '~core/instrumentation'; import { readLocalStorage, removeLocalStorage } from '~web/utils/helpers'; diff --git a/packages/scan/src/web/utils/helpers.ts b/packages/scan/src/web/utils/helpers.ts index 4304ec29..7d9b9fc3 100644 --- a/packages/scan/src/web/utils/helpers.ts +++ b/packages/scan/src/web/utils/helpers.ts @@ -6,6 +6,7 @@ import { getDisplayName, hasMemoCache, } from 'bippy'; + import { type ClassValue, clsx } from 'clsx'; import { IS_CLIENT } from './constants'; diff --git a/packages/scan/src/web/utils/pin.ts b/packages/scan/src/web/utils/pin.ts index 46f0d279..5922a476 100644 --- a/packages/scan/src/web/utils/pin.ts +++ b/packages/scan/src/web/utils/pin.ts @@ -1,4 +1,5 @@ import type { Fiber } from 'bippy'; + import { Store } from '~core/index'; import { findComponentDOMNode } from '~web/views/inspector/utils'; import { readLocalStorage } from './helpers'; diff --git a/packages/scan/src/web/views/inspector/components-tree/state.ts b/packages/scan/src/web/views/inspector/components-tree/state.ts index 8bb6f045..a8f148be 100644 --- a/packages/scan/src/web/views/inspector/components-tree/state.ts +++ b/packages/scan/src/web/views/inspector/components-tree/state.ts @@ -1,5 +1,6 @@ -import { signal } from '@preact/signals'; import type { Fiber } from 'bippy'; + +import { signal } from '@preact/signals'; import type { RenderData } from '~core/instrumentation'; export interface TreeNode { diff --git a/packages/scan/src/web/views/inspector/header.tsx b/packages/scan/src/web/views/inspector/header.tsx index 4b57c16c..ee78a313 100644 --- a/packages/scan/src/web/views/inspector/header.tsx +++ b/packages/scan/src/web/views/inspector/header.tsx @@ -1,5 +1,7 @@ -import { computed, untracked, useSignalEffect } from '@preact/signals'; + import type { Fiber } from 'bippy'; + +import { computed, untracked, useSignalEffect } from '@preact/signals'; import { useMemo, useRef, useState } from 'preact/hooks'; import { Store } from '~core/index'; import { signalIsSettingsOpen } from '~web/state'; diff --git a/packages/scan/src/web/views/inspector/overlay/index.tsx b/packages/scan/src/web/views/inspector/overlay/index.tsx index 0c293e41..4e4c3863 100644 --- a/packages/scan/src/web/views/inspector/overlay/index.tsx +++ b/packages/scan/src/web/views/inspector/overlay/index.tsx @@ -1,4 +1,5 @@ import { type Fiber, getDisplayName } from 'bippy'; + import { useEffect, useRef } from 'preact/hooks'; import { ReactScanInternals, Store } from '~core/index'; diff --git a/packages/scan/src/web/views/inspector/properties.tsx b/packages/scan/src/web/views/inspector/properties.tsx index bd653823..9425bcfe 100644 --- a/packages/scan/src/web/views/inspector/properties.tsx +++ b/packages/scan/src/web/views/inspector/properties.tsx @@ -1,4 +1,5 @@ import { getDisplayName } from 'bippy'; + import { useCallback, useEffect, diff --git a/packages/scan/src/web/views/inspector/states.ts b/packages/scan/src/web/views/inspector/states.ts index 38ecda97..f2163b58 100644 --- a/packages/scan/src/web/views/inspector/states.ts +++ b/packages/scan/src/web/views/inspector/states.ts @@ -1,5 +1,6 @@ -import { signal } from '@preact/signals'; import type { Fiber } from 'bippy'; + +import { signal } from '@preact/signals'; import type { ComponentType } from 'preact'; import { flashManager } from './flash-overlay'; import { type SectionData, resetTracking } from './timeline/utils'; diff --git a/packages/scan/src/web/views/inspector/timeline/index.tsx b/packages/scan/src/web/views/inspector/timeline/index.tsx index 43852c2a..a82b92e0 100644 --- a/packages/scan/src/web/views/inspector/timeline/index.tsx +++ b/packages/scan/src/web/views/inspector/timeline/index.tsx @@ -1,4 +1,5 @@ import { isInstrumentationActive } from 'bippy'; + import { memo } from 'preact/compat'; import { useCallback, useEffect, useMemo, useRef } from 'preact/hooks'; import { Icon } from '~web/components/icon'; diff --git a/packages/scan/src/web/views/inspector/timeline/utils.ts b/packages/scan/src/web/views/inspector/timeline/utils.ts index 07769310..52c3bb2a 100644 --- a/packages/scan/src/web/views/inspector/timeline/utils.ts +++ b/packages/scan/src/web/views/inspector/timeline/utils.ts @@ -8,6 +8,7 @@ import { type MemoizedState, SimpleMemoComponentTag, } from 'bippy'; + import { isEqual } from '~core/utils'; import { getChangedPropsDetailed, isPromise } from '../utils'; @@ -90,7 +91,7 @@ export const trackChange = ( return { hasChanged: false, count: existing.count }; }; -export { propsTracker, stateTracker, contextTracker }; +export { contextTracker, propsTracker, stateTracker }; export interface SectionData { current: Array<{ name: string | number; value: unknown }>; diff --git a/packages/scan/src/web/views/inspector/utils.ts b/packages/scan/src/web/views/inspector/utils.ts index 07cf5904..0b07b02e 100644 --- a/packages/scan/src/web/views/inspector/utils.ts +++ b/packages/scan/src/web/views/inspector/utils.ts @@ -8,14 +8,15 @@ import { isHostFiber, traverseFiber, } from 'bippy'; + import { type PropsChange, ReactScanInternals } from '~core/index'; import { ChangeReason } from '~core/instrumentation'; import { isEqual } from '~core/utils'; import { batchGetBoundingRects } from '~web/utils/outline'; import { globalInspectorState } from '.'; import type { ExtendedReactRenderer } from '../../../types'; -import { TIMELINE_MAX_UPDATES } from './states'; import type { MinimalFiberInfo } from './states'; +import { TIMELINE_MAX_UPDATES } from './states'; import { getAllFiberContexts, getStateNames } from './timeline/utils'; interface StateItem { @@ -145,7 +146,6 @@ export const getParentCompositeFiber = ( return null; }; - const isFiberInTree = (fiber: Fiber, root: Fiber): boolean => { { // const root= fiberRootCache.get(fiber) || (fiber.alternate && fiberRootCache.get(fiber.alternate) )