npm - @tanstack/redact - Versions diffs - 0.0.13 → 0.0.15 - Mend

@tanstack/redact 0.0.13 → 0.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (93) hide show

package/dist/core/internal.d.ts +23 -39
package/dist/core/internal.js +7 -23
package/dist/core/internal.js.map +3 -3
package/dist/dom/dispatcher.d.ts +3 -1
package/dist/dom/dispatcher.js +104 -97
package/dist/dom/dispatcher.js.map +2 -2
package/dist/dom/dom.js +1 -1
package/dist/dom/dom.js.map +2 -2
package/dist/dom/event-replay.js +7 -29
package/dist/dom/event-replay.js.map +2 -2
package/dist/dom/features/class/full.js +16 -16
package/dist/dom/features/class/full.js.map +2 -2
package/dist/dom/features/class/stub.js +7 -7
package/dist/dom/features/class/stub.js.map +2 -2
package/dist/dom/features/context/full.js +7 -7
package/dist/dom/features/context/full.js.map +2 -2
package/dist/dom/features/context/stub.js +3 -3
package/dist/dom/features/context/stub.js.map +2 -2
package/dist/dom/features/forward-ref/full.js +11 -11
package/dist/dom/features/forward-ref/full.js.map +2 -2
package/dist/dom/features/hydration/full.d.ts +26 -14
package/dist/dom/features/hydration/full.js +412 -92
package/dist/dom/features/hydration/full.js.map +2 -2
package/dist/dom/features/hydration/stub.d.ts +13 -12
package/dist/dom/features/hydration/stub.js +23 -8
package/dist/dom/features/hydration/stub.js.map +2 -2
package/dist/dom/features/lazy/full.js +3 -43
package/dist/dom/features/lazy/full.js.map +2 -2
package/dist/dom/features/lazy/stub.js +1 -1
package/dist/dom/features/lazy/stub.js.map +2 -2
package/dist/dom/features/memo/full.js +3 -3
package/dist/dom/features/memo/full.js.map +2 -2
package/dist/dom/features/memo/stub.js +1 -1
package/dist/dom/features/memo/stub.js.map +2 -2
package/dist/dom/features/portal/full.js +2 -2
package/dist/dom/features/portal/full.js.map +2 -2
package/dist/dom/features/suspense/full.js +151 -109
package/dist/dom/features/suspense/full.js.map +2 -2
package/dist/dom/reconcile.d.ts +3 -1
package/dist/dom/reconcile.js +141 -129
package/dist/dom/reconcile.js.map +2 -2
package/dist/dom/root-internal.d.ts +9 -0
package/dist/dom/root-internal.js +31 -0
package/dist/dom/root-internal.js.map +7 -0
package/dist/dom/root.d.ts +1 -1
package/dist/dom/root.js +4 -136
package/dist/dom/root.js.map +2 -2
package/dist/dom/test-utils.js +1 -1
package/dist/dom/test-utils.js.map +2 -2
package/dist/react/children.js +4 -1
package/dist/react/children.js.map +2 -2
package/dist/react/class.js +8 -2
package/dist/react/class.js.map +2 -2
package/dist/react/context.js +4 -1
package/dist/react/context.js.map +2 -2
package/dist/react/index.js +1 -1
package/dist/react/index.js.map +2 -2
package/dist/react/shared-internals.d.ts +4 -7
package/dist/react/shared-internals.js +4 -7
package/dist/react/shared-internals.js.map +2 -2
package/dist/server/stream.d.ts +5 -1
package/dist/server/stream.js.map +2 -2
package/dist/vite/index.js +19 -3
package/dist/vite/index.js.map +2 -2
package/package.json +1 -1
package/src/core/internal.ts +30 -50
package/src/dom/dispatcher.ts +114 -105
package/src/dom/dom.ts +1 -1
package/src/dom/event-replay.ts +14 -30
package/src/dom/features/class/full.ts +16 -16
package/src/dom/features/class/stub.ts +7 -7
package/src/dom/features/context/full.ts +7 -7
package/src/dom/features/context/stub.ts +3 -3
package/src/dom/features/forward-ref/full.ts +11 -11
package/src/dom/features/hydration/full.ts +516 -104
package/src/dom/features/hydration/stub.ts +28 -14
package/src/dom/features/lazy/full.ts +3 -56
package/src/dom/features/lazy/stub.ts +1 -1
package/src/dom/features/memo/full.ts +3 -3
package/src/dom/features/memo/stub.ts +1 -1
package/src/dom/features/portal/full.ts +2 -2
package/src/dom/features/suspense/full.ts +176 -129
package/src/dom/reconcile.ts +164 -170
package/src/dom/root-internal.ts +40 -0
package/src/dom/root.ts +5 -165
package/src/dom/test-utils.ts +1 -1
package/src/react/children.ts +4 -1
package/src/react/class.ts +8 -2
package/src/react/context.ts +4 -1
package/src/react/index.ts +1 -1
package/src/react/shared-internals.ts +8 -14
package/src/server/stream.ts +9 -4
package/src/vite/index.ts +34 -3

package/src/dom/root-internal.ts ADDED Viewed

@@ -0,0 +1,40 @@
+import { FiberTag, createFiber, type Fiber, type FiberRoot } from '../core'
+export interface RootOptionsInternal {
+  identifierPrefix?: string
+  onRecoverableError?: (error: unknown) => void
+  onCaughtError?: (error: unknown) => void
+  onUncaughtError?: (error: unknown) => void
+}
+export function createFiberRoot(
+  container: Element | Document | DocumentFragment,
+  options: RootOptionsInternal,
+): FiberRoot {
+  const rootFiber = createFiber(FiberTag.Root, null, null)
+  const root: FiberRoot = {
+    c: container as any,
+    r: rootFiber,
+    p: new Set(),
+    s: false,
+    re: options.onRecoverableError,
+    ce: options.onCaughtError,
+    ue: options.onUncaughtError,
+    i: options.identifierPrefix ?? ':r',
+    h: false,
+  }
+  rootFiber.root = root
+  rootFiber.sn = container
+  return root
+}
+export function attachRootFiber(
+  root: FiberRoot,
+  container: Element | Document | DocumentFragment,
+): void {
+  const rootFiber = createFiber(FiberTag.Root, null, null)
+  root.c = container as any
+  rootFiber.root = root
+  rootFiber.sn = container
+  root.r = rootFiber
+}

package/src/dom/root.ts CHANGED Viewed

@@ -1,18 +1,7 @@
-import {
-  FiberTag,
-  REACT_ELEMENT_TYPE,
-  createFiber,
-  type FiberRoot,
-  type ReactElement,
-  type ReactNode,
-} from '../core'
+import type { ReactNode } from '../core'
 import { renderRoot, flushSyncWork, batchedUpdates } from './reconcile'
-import {
-  beginHydration,
-  endHydration,
-  drainReplayQueue,
-  installHydrationScrollGuard,
-} from './features/hydration'
+import { hydrateRootImpl } from './features/hydration'
+import { createFiberRoot } from './root-internal'
 export interface RootOptions {
   identifierPrefix?: string
@@ -27,21 +16,7 @@ export interface Root {
 }
 export function createRoot(container: Element | DocumentFragment, options: RootOptions = {}): Root {
-  const rootFiber = createFiber(FiberTag.Root, null, null)
-  rootFiber.dom = container
-  const root: FiberRoot = {
-    container,
-    current: rootFiber,
-    pending: new Set(),
-    scheduled: false,
-    onRecoverableError: options.onRecoverableError,
-    onCaughtError: options.onCaughtError,
-    onUncaughtError: options.onUncaughtError,
-    identifierPrefix: options.identifierPrefix ?? ':r',
-    hydrating: false,
-  }
-  rootFiber.root = root
-  rootFiber.stateNode = container
+  const root = createFiberRoot(container, options)
   let firstRender = true
   return {
@@ -72,142 +47,7 @@ export function hydrateRoot(
   initialChildren: ReactNode,
   options: RootOptions = {},
 ): Root {
-  // `container` may be the Document when the React tree renders <html>...</html>
-  // (e.g. TanStack Start's default client entry). In that case we adopt
-  // documentElement as a CHILD of the root, not as the root itself — otherwise
-  // we'd try to render <html> inside <html>.
-  const target = container as any as Element | Document
-  const rootFiber = createFiber(FiberTag.Root, null, null)
-  rootFiber.dom = target as unknown as Node
-  const root: FiberRoot = {
-    container: target as any,
-    current: rootFiber,
-    pending: new Set(),
-    scheduled: false,
-    onRecoverableError: options.onRecoverableError,
-    onCaughtError: options.onCaughtError,
-    onUncaughtError: options.onUncaughtError,
-    identifierPrefix: options.identifierPrefix ?? ':r',
-    hydrating: false,
-  }
-  rootFiber.root = root
-  rootFiber.stateNode = target
-  // Preserve the user's scroll position across hydration (see feature impl
-  // for the details). No-op in SSR; no-op in the stub.
-  installHydrationScrollGuard()
-  beginHydration(root)
-  try {
-    const normalizedInitialChildren =
-      isDocumentContainer(container) ? normalizeDocumentChildren(initialChildren) : initialChildren
-    flushSyncWork(() => {
-      renderRoot(root, normalizedInitialChildren)
-    })
-  } finally {
-    endHydration(root)
-  }
-  drainReplayQueue()
-  return {
-    render(children) {
-      flushSyncWork(() => {
-        renderRoot(root, isDocumentContainer(container) ? normalizeDocumentChildren(children) : children)
-      })
-    },
-    unmount() {
-      flushSyncWork(() => {
-        renderRoot(root, null)
-      })
-    },
-  }
-}
-const HEAD_TAGS = new Set(['base', 'link', 'meta', 'script', 'style', 'title'])
-function isDocumentContainer(container: unknown): container is Document {
-  return !!container && (container as Node).nodeType === 9
-}
-function normalizeDocumentChildren(children: ReactNode): ReactNode {
-  const list = toChildArray(children)
-  const htmlIndex = list.findIndex((child) => isHostElement(child, 'html'))
-  if (htmlIndex === -1) return children
-  const headNodes = list.filter(isHeadElement)
-  if (headNodes.length === 0) return children
-  const htmlElement = list[htmlIndex] as ReactElement
-  const normalizedHtml = hoistIntoHtmlHead(htmlElement, headNodes)
-  return list
-    .filter((child, index) => index === htmlIndex || !isHeadElement(child))
-    .map((child) => (child === htmlElement ? normalizedHtml : child))
-}
-function hoistIntoHtmlHead(htmlElement: ReactElement, headNodes: ReactNode[]): ReactElement {
-  const htmlChildren = toChildArray(htmlElement.props?.children)
-  const headIndex = htmlChildren.findIndex((child) => isHostElement(child, 'head'))
-  let nextChildren: ReactNode[]
-  if (headIndex === -1) {
-    nextChildren = [
-      createHostElement('head', { children: headNodes }),
-      ...htmlChildren,
-    ]
-  } else {
-    const headElement = htmlChildren[headIndex] as ReactElement
-    const existingHeadChildren = toChildArray(headElement.props?.children)
-    const nextHead = {
-      ...headElement,
-      props: {
-        ...headElement.props,
-        children: [...headNodes, ...existingHeadChildren],
-      },
-    }
-    nextChildren = htmlChildren.map((child, index) => (index === headIndex ? nextHead : child))
-  }
-  return {
-    ...htmlElement,
-    props: {
-      ...htmlElement.props,
-      children: nextChildren,
-    },
-  }
-}
-function toChildArray(children: unknown): ReactNode[] {
-  if (children == null || typeof children === 'boolean') return []
-  if (Array.isArray(children)) return children as ReactNode[]
-  if (isReactElement(children)) return [children]
-  if (typeof children !== 'string' && isIterable(children)) return Array.from(children) as ReactNode[]
-  return [children as ReactNode]
-}
-function isHeadElement(value: ReactNode): boolean {
-  return isReactElement(value) && typeof value.type === 'string' && HEAD_TAGS.has(value.type)
-}
-function isHostElement(value: ReactNode, tag: string): boolean {
-  return isReactElement(value) && value.type === tag
-}
-function isReactElement(value: unknown): value is ReactElement {
-  return !!value && typeof value === 'object' && (value as ReactElement).$$typeof === REACT_ELEMENT_TYPE
-}
-function isIterable(value: unknown): value is Iterable<ReactNode> {
-  return !!value && typeof (value as { [Symbol.iterator]?: unknown })[Symbol.iterator] === 'function'
-}
-function createHostElement(type: string, props: Record<string, unknown>): ReactElement {
-  return {
-    $$typeof: REACT_ELEMENT_TYPE,
-    type,
-    key: null,
-    ref: null,
-    props,
-  }
+  return hydrateRootImpl(container, initialChildren, options)
 }
 export { flushSyncWork as flushSync, batchedUpdates }

package/src/dom/test-utils.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 export async function act(fn: () => any): Promise<void> {
   const r = fn()
-  if (r && typeof r.then === 'function') await r
+  if (r && typeof r.then == 'function') await r
   // Drain pending microtasks
   for (let i = 0; i < 10; i++) await Promise.resolve()
 }

package/src/react/children.ts CHANGED Viewed

@@ -78,7 +78,10 @@ export const Children = {
   },
   only(children: ReactNode): ReactElement {
     if (!isValidElement(children)) {
-      throw new Error('Children.only expected a single React element.')
+      if (process.env.NODE_ENV !== 'production') {
+        throw new Error('Children.only expected a single React element.')
+      }
+      throw new Error()
     }
     return children
   },

package/src/react/class.ts CHANGED Viewed

@@ -29,7 +29,10 @@ export class Component<P = {}, S = {}> {
   setState(updater: SetStateCallback<S, P>, callback?: () => void): void {
     if (!this._enqueueUpdate) {
-      throw new Error('Cannot call setState on an unmounted component.')
+      if (process.env.NODE_ENV !== 'production') {
+        throw new Error('Cannot call setState on an um component.')
+      }
+      throw new Error()
     }
     this._enqueueUpdate(updater, callback)
   }
@@ -40,7 +43,10 @@ export class Component<P = {}, S = {}> {
   }
   render(): ReactNode {
-    throw new Error('Component subclass must implement render().')
+    if (process.env.NODE_ENV !== 'production') {
+      throw new Error('Component subclass must implement render().')
+    }
+    throw new Error()
   }
   componentDidMount?(): void

package/src/react/context.ts CHANGED Viewed

@@ -32,7 +32,10 @@ export function createContext<T>(defaultValue: T): Context<T> {
   } as Context<T>
   const Provider: any = function Provider(_props: any): any {
-    throw new Error('Provider components are handled by the renderer.')
+    if (process.env.NODE_ENV !== 'production') {
+      throw new Error('Provider components are handled by the renderer.')
+    }
+    throw new Error()
   }
   Provider.$$typeof = REACT_PROVIDER_TYPE
   Provider._context = context

package/src/react/index.ts CHANGED Viewed

@@ -70,7 +70,7 @@ export { ReactSharedInternals } from './shared-internals'
 export const cache = <T extends Function>(fn: T): T => fn
 export const act = async (fn: () => any) => {
   const r = fn()
-  if (r && typeof r.then === 'function') await r
+  if (r && typeof r.then == 'function') await r
 }
 export function taintUniqueValue(_msg: string, _lifetime: any, _value: any): void {}
 export function taintObjectReference(_msg: string, _object: any): void {}

package/src/react/shared-internals.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Fiber, FiberRoot, Hook } from '../core'
+import type { Fiber, Hook } from '../core'
 export interface Dispatcher {
   useState<S>(initial: S | (() => S)): [S, (s: S | ((p: S) => S)) => void]
@@ -29,12 +29,9 @@ export interface Dispatcher {
 interface SharedInternals {
   H: Dispatcher | null
-  T: any
-  S: ((fn: () => void) => void) | null
-  currentFiber: Fiber | null
-  currentRoot: FiberRoot | null
-  currentHook: Hook | null
-  hookIndex: number
+  F: Fiber | null
+  K: Hook | null
+  I: number
 }
 // Stash the singleton on `globalThis` under a registered symbol. Module-scoped
@@ -54,12 +51,9 @@ export const ReactSharedInternals: SharedInternals =
   g[KEY] ??
   (g[KEY] = {
     H: null,
-    T: null,
-    S: null,
-    currentFiber: null,
-    currentRoot: null,
-    currentHook: null,
-    hookIndex: 0,
+    F: null,
+    K: null,
+    I: 0,
   })
 export function getDispatcher(): Dispatcher {
@@ -73,7 +67,7 @@ export function getDispatcher(): Dispatcher {
           '"use client" directive at the top of its file.',
       )
     }
-    throw new Error('Hooks can only be called inside a function component.')
+    throw new Error()
   }
   return d
 }

package/src/server/stream.ts CHANGED Viewed

@@ -25,6 +25,11 @@ export interface ReadableStreamResult extends ReadableStream<Uint8Array> {
   allReady: Promise<void>
 }
+export interface PipeableWritable {
+  write(chunk: string): unknown
+  end(): unknown
+}
 export interface OrchestratorState {
   nextId: number
   pending: Set<Promise<void>>
@@ -302,7 +307,7 @@ export function renderToReadableStream(
 // ---------------------------------------------------------------------------
 export interface PipeableHandle {
-  pipe<T extends NodeJS.WritableStream>(dest: T): T
+  pipe<T extends PipeableWritable>(dest: T): T
   abort(reason?: unknown): void
 }
@@ -324,12 +329,12 @@ export function renderToPipeableStream(
   }
   const buffers: string[] = []
-  let dest: NodeJS.WritableStream | null = null
+  let dest: PipeableWritable | null = null
   let shellReady = false
   let finished = false
   let aborted = false
-  const flushTo = (w: NodeJS.WritableStream) => {
+  const flushTo = (w: PipeableWritable) => {
     if (!buffers.length) return
     for (const b of buffers) w.write(b)
     buffers.length = 0
@@ -368,7 +373,7 @@ export function renderToPipeableStream(
   })
   return {
-    pipe<T extends NodeJS.WritableStream>(target: T): T {
+    pipe<T extends PipeableWritable>(target: T): T {
       dest = target
       flushTo(target)
       if (finished) target.end()

package/src/vite/index.ts CHANGED Viewed

@@ -283,9 +283,27 @@ function resolveSpecifier(
   }
 }
+interface OptimizeDepsWithInclude {
+  include?: Array<string>
+}
+function pruneOptimizeDepsInclude(
+  optimizeDeps: OptimizeDepsWithInclude | undefined,
+  blocked: ReadonlySet<string>,
+): void {
+  if (!optimizeDeps?.include) return
+  optimizeDeps.include = optimizeDeps.include.filter((id) => {
+    const tailSpecifier = id.split('>').pop()?.trim() ?? id
+    return !blocked.has(id) && !blocked.has(tailSpecifier)
+  })
+}
 export function redact(options: RedactOptions = {}): any {
   const skip = new Set(options.skip ?? [])
   const entries = Object.entries(ALIASES).filter(([k]) => !skip.has(k))
+  const excludeList = entries.map(([k]) => k)
+  const optimizeDepsBlocked = new Set(excludeList)
   const features = resolveFeatures(options.preset ?? 'full', options.features ?? {})
   const resolvedMap: Record<string, string> = {}
@@ -302,12 +320,11 @@ export function redact(options: RedactOptions = {}): any {
     done = true
   }
-  return {
+  return [{
     name: 'redact',
     enforce: 'pre',
     config() {
-      const excludeList = entries.map(([k]) => k)
       // Single package — only one name to dedupe / no-external.
       const noExt = ['@tanstack/redact']
       const aliasMap = Object.fromEntries(entries.filter(([from, to]) => from !== to))
@@ -397,7 +414,21 @@ export function redact(options: RedactOptions = {}): any {
       return resolvedMap[id] ?? null
     },
-  }
+  }, {
+    name: 'redact:optimize-deps-guard',
+    enforce: 'post',
+    configResolved(config: any) {
+      // `optimizeDeps.exclude` loses when another plugin force-adds the same
+      // ids to `include`. That lets Vite pre-bundle real React next to Redact,
+      // producing duplicate dispatcher state. Prune after config settles so
+      // Redact's client/SSR shims stay canonical.
+      pruneOptimizeDepsInclude(config.optimizeDeps, optimizeDepsBlocked)
+      pruneOptimizeDepsInclude(config.environments?.client?.optimizeDeps, optimizeDepsBlocked)
+      pruneOptimizeDepsInclude(config.environments?.ssr?.optimizeDeps, optimizeDepsBlocked)
+      // Leave `environments.rsc` untouched. RSC depends on real React internals.
+    },
+  }]
 }
 export default redact