bippy 0.7.3-dev.1d4f35b → 0.7.3-dev.49fb67e

package/src/source/get-source.ts

@@ -2,15 +2,6 @@ import type { Fiber } from "../react-internals/index.js";
 import { getDisplayName } from "../core.js";
 
 import type { FiberSource } from "./types.js";
-import {
-  SCHEME_REGEX,
-  INTERNAL_SCHEME_PREFIXES,
-  ABOUT_REACT_PREFIX,
-  ANONYMOUS_FILE_PATTERNS,
-  SOURCE_FILE_EXTENSION_REGEX,
-  BUNDLED_FILE_PATTERN_REGEX,
-  QUERY_PARAMETER_PATTERN_REGEX,
-} from "./constants.js";
 import { getDefinitionFrameFromOwnedChild, getParentStack, hasDebugStack } from "./owner-stack.js";
 import { parseDebugStack } from "./parse-debug-stack.js";
 import { parseStack, type StackFrame } from "./parse-stack.js";
@@ -165,130 +156,4 @@ export const getSource = async (
   return getSourceByComponentName(fiber, shouldUseCache, sourceFetch, requestOptions);
 };
 
-const getPathSegmentCount = (path: string): number => path.split("/").filter(Boolean).length;
-
-const stripSingleBasePathPrefix = (path: string): string => {
-  const firstSlashIndex = path.indexOf("/", 1);
-  if (firstSlashIndex === -1) {
-    return path;
-  }
-
-  const basePath = path.slice(0, firstSlashIndex);
-  if (getPathSegmentCount(basePath) !== 1) {
-    return path;
-  }
-
-  const remainderPath = path.slice(firstSlashIndex);
-  if (!SOURCE_FILE_EXTENSION_REGEX.test(remainderPath)) {
-    return path;
-  }
-
-  const remainderSegments = remainderPath.split("/").filter(Boolean);
-  if (remainderSegments.length < 2) {
-    return path;
-  }
-
-  const firstRemainderSegment = remainderSegments[0];
-  if (firstRemainderSegment.startsWith("@")) {
-    return path;
-  }
-
-  if (firstRemainderSegment.length > 4) {
-    return path;
-  }
-
-  return remainderPath;
-};
-
-export const normalizeFileName = (fileName: string): string => {
-  if (!fileName) {
-    return "";
-  }
-
-  if (ANONYMOUS_FILE_PATTERNS.some((pattern) => pattern === fileName)) {
-    return "";
-  }
-
-  let normalizedFileName = fileName;
-  const isWindowsDrivePath = /^[a-zA-Z]:[\\/]/.test(normalizedFileName);
-
-  const isHttpUrl =
-    normalizedFileName.startsWith("http://") || normalizedFileName.startsWith("https://");
-  if (isHttpUrl) {
-    try {
-      const parsedUrl = new URL(normalizedFileName);
-      normalizedFileName = parsedUrl.pathname;
-    } catch {}
-    normalizedFileName = stripSingleBasePathPrefix(normalizedFileName);
-  }
-
-  if (normalizedFileName.startsWith(ABOUT_REACT_PREFIX)) {
-    const remainder = normalizedFileName.slice(ABOUT_REACT_PREFIX.length);
-    const slashIndex = remainder.indexOf("/");
-    const colonIndex = remainder.indexOf(":");
-
-    if (slashIndex !== -1 && (colonIndex === -1 || slashIndex < colonIndex)) {
-      normalizedFileName = remainder.slice(slashIndex + 1);
-    } else {
-      normalizedFileName = remainder;
-    }
-  }
-
-  let didStripPrefix = true;
-  while (didStripPrefix) {
-    didStripPrefix = false;
-    for (const prefix of INTERNAL_SCHEME_PREFIXES) {
-      if (normalizedFileName.startsWith(prefix)) {
-        normalizedFileName = normalizedFileName.slice(prefix.length);
-
-        if (prefix === "file:///") {
-          normalizedFileName = `/${normalizedFileName.replace(/^\/+/, "")}`;
-        }
-
-        didStripPrefix = true;
-        break;
-      }
-    }
-  }
-
-  if (!isWindowsDrivePath) {
-    const schemeMatch = normalizedFileName.match(SCHEME_REGEX);
-    if (schemeMatch) {
-      normalizedFileName = normalizedFileName.slice(schemeMatch[0].length);
-    }
-  }
-
-  if (normalizedFileName.startsWith("//")) {
-    const firstPathSlashIndex = normalizedFileName.indexOf("/", 2);
-    normalizedFileName =
-      firstPathSlashIndex === -1 ? "" : normalizedFileName.slice(firstPathSlashIndex);
-  }
-
-  const queryParameterIndex = normalizedFileName.indexOf("?");
-  if (queryParameterIndex !== -1) {
-    const potentialQueryParameters = normalizedFileName.slice(queryParameterIndex);
-    if (QUERY_PARAMETER_PATTERN_REGEX.test(potentialQueryParameters)) {
-      normalizedFileName = normalizedFileName.slice(0, queryParameterIndex);
-    }
-  }
-
-  return normalizedFileName;
-};
-
-export const isSourceFile = (fileName: string): boolean => {
-  const normalizedFileName = normalizeFileName(fileName);
-
-  if (!normalizedFileName) {
-    return false;
-  }
-
-  if (!SOURCE_FILE_EXTENSION_REGEX.test(normalizedFileName)) {
-    return false;
-  }
-
-  if (BUNDLED_FILE_PATTERN_REGEX.test(normalizedFileName)) {
-    return false;
-  }
-
-  return true;
-};
+export { isSourceFile, normalizeFileName } from "./normalize-file-name.js";

package/src/source/inspect-hooks.ts

@@ -14,7 +14,7 @@ import {
   BippyUnsupportedHookError,
 } from "../errors.js";
 import { getReactWorkTagsForFiber } from "../react-internals/index.js";
-import { parseStack, type StackFrame } from "./parse-stack.js";
+import { createStackParser, parseStack, type StackFrame } from "./parse-stack.js";
 import {
   getRendererDispatcherRefs,
   readDispatcher,
@@ -87,6 +87,16 @@ let currentHook: MemoizedState | null = null;
 let currentContextDependency: ContextDependency<unknown> | null = null;
 let currentThenableIndex = 0;
 let currentThenableState: unknown[] | null = null;
+let currentMemoCacheIndex = 0;
+let isInspectingHooks = false;
+
+const assertNotInspectingHooks = (): void => {
+  if (isInspectingHooks) {
+    throw new BippyHookInspectionError(
+      "Hook inspection cannot be called during another inspection.",
+    );
+  }
+};
 
 const SuspenseException: unknown = new Error(
   "Suspense interrupted this render. This error is an internal implementation detail of `use`.",
@@ -323,16 +333,8 @@ const dispatcherUseMemoCache = (size: number): unknown[] => {
   const memoCache = fiber.updateQueue?.memoCache;
   if (memoCache === null || memoCache === undefined) return [];
 
-  let memoCacheSlots = memoCache.data[memoCache.index];
-  if (memoCacheSlots === undefined) {
-    memoCacheSlots = memoCache.data[memoCache.index] = Array.from(
-      { length: size },
-      () => REACT_MEMO_CACHE_SENTINEL,
-    );
-  }
-
-  memoCache.index++;
-  return memoCacheSlots;
+  const memoCacheSlots = memoCache.data[currentMemoCacheIndex++];
+  return memoCacheSlots?.slice() ?? Array.from({ length: size }, () => REACT_MEMO_CACHE_SENTINEL);
 };
 
 const dispatcherUseOptimistic = (passthrough: unknown): [unknown, () => void] => {
@@ -602,8 +604,9 @@ const findPrimitiveIndex = (hookStack: StackFrame[], hook: HookLogEntry): number
 const parseTrimmedStack = (
   rootStack: StackFrame[],
   hook: HookLogEntry,
+  parseHookStack: (stack: string) => StackFrame[],
 ): [StackFrame | null, StackFrame[] | null] => {
-  const hookStack = parseErrorStack(hook.stackError);
+  const hookStack = parseHookStack(hook.stackError.stack || "");
   const rootIndex = findCommonAncestorIndex(rootStack, hookStack);
   const primitiveIndex = findPrimitiveIndex(hookStack, hook);
   if (rootIndex === -1 || primitiveIndex === -1 || rootIndex - primitiveIndex < 2) {
@@ -624,13 +627,14 @@ const NON_ID_HOOK_PRIMITIVES = new Set([
 
 const buildTree = (rootStack: StackFrame[], capturedHookLog: HookLogEntry[]): HooksTree => {
   const rootChildren: HooksNode[] = [];
+  const parseHookStack = createStackParser();
   let previousStack: StackFrame[] | null = null;
   let levelChildren = rootChildren;
   let nativeHookID = 0;
   const childrenStack: HooksNode[][] = [];
 
   for (const hook of capturedHookLog) {
-    const [primitiveFrame, stack] = parseTrimmedStack(rootStack, hook);
+    const [primitiveFrame, stack] = parseTrimmedStack(rootStack, hook, parseHookStack);
     let displayName = hook.displayName;
     if (displayName === null && primitiveFrame !== null) {
       const primitiveName = parseHookName(primitiveFrame.functionName);
@@ -834,6 +838,7 @@ const performDispatcherInspection = <TArgs extends unknown[]>(
 ): HooksTree => {
   const previousDispatcher = readDispatcher(dispatcherRef);
   writeDispatcher(dispatcherRef, dispatcherProxy);
+  isInspectingHooks = true;
 
   let capturedHookLog: HookLogEntry[] = [];
   let ancestorStackError: Error | undefined;
@@ -846,6 +851,7 @@ const performDispatcherInspection = <TArgs extends unknown[]>(
   } finally {
     capturedHookLog = hookLog;
     hookLog = [];
+    isInspectingHooks = false;
     writeDispatcher(dispatcherRef, previousDispatcher);
   }
 
@@ -938,6 +944,7 @@ export const inspectHooks = (
   props: Record<string, unknown>,
   target: ReactDevToolsTarget = globalThis,
 ): HooksTree => {
+  assertNotInspectingHooks();
   const dispatcherRef = requireDispatcherRef(undefined, target);
   getPrimitiveStackCache();
   currentHook = null;
@@ -961,6 +968,7 @@ export const inspectHooks = (
 };
 
 export const getFiberHooks = (fiber: Fiber): HooksTree => {
+  assertNotInspectingHooks();
   const dispatcherRef = requireDispatcherRef(fiber);
   const workTags = getReactWorkTagsForFiber(fiber);
 
@@ -976,6 +984,7 @@ export const getFiberHooks = (fiber: Fiber): HooksTree => {
 
   currentHook = fiber.memoizedState;
   currentFiber = fiber;
+  currentMemoCacheIndex = 0;
 
   const debugThenableState = fiber.dependencies?._debugThenableState;
   const usedThenables = Array.isArray(debugThenableState)
@@ -984,18 +993,16 @@ export const getFiberHooks = (fiber: Fiber): HooksTree => {
   currentThenableState = Array.isArray(usedThenables) ? usedThenables : null;
   currentThenableIndex = 0;
 
-  resolveContextDependency(fiber);
-
-  const type = fiber.type;
-  let props = fiber.memoizedProps;
-  if (type !== fiber.elementType) {
-    props = resolveDefaultProps(type, props);
-  }
-
   const originalConsoleMethods = suppressConsole();
   const contextMap = new Map<ReactContext<unknown>, unknown>();
 
   try {
+    resolveContextDependency(fiber);
+    const type = fiber.type;
+    const props =
+      type !== fiber.elementType
+        ? resolveDefaultProps(type, fiber.memoizedProps)
+        : fiber.memoizedProps;
     if (
       currentContextDependency !== null &&
       !Object.hasOwn(currentContextDependency, "memoizedValue")
@@ -1030,6 +1037,7 @@ export const getFiberHooks = (fiber: Fiber): HooksTree => {
     currentContextDependency = null;
     currentThenableState = null;
     currentThenableIndex = 0;
+    currentMemoCacheIndex = 0;
     restoreContexts(contextMap);
     restoreConsole(originalConsoleMethods);
   }