@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.3 → 3.5.0-ultramodern.31

package/dist/esm/runtime/routeTree/index.mjs

@@ -0,0 +1,2 @@
+export { pickRouteModuleComponent } from "./components.mjs";
+export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./construction.mjs";

package/dist/esm/runtime/routeTree/loaders.mjs

@@ -0,0 +1,117 @@
+import { notFound } from "@tanstack/react-router";
+import { isRedirectResponse, isResponse, isTanstackRedirect, throwTanstackRedirect } from "../loaderBridge.mjs";
+import { isTanstackRscPayloadNavigationEnabled, loadTanstackRscRouteData } from "../rsc/payloadRouter.mjs";
+function isModernDeferredData(value) {
+    if (!value || 'object' != typeof value) return false;
+    const deferred = value;
+    return true === deferred.__modern_deferred && Boolean(deferred.data) && 'object' == typeof deferred.data && !Array.isArray(deferred.data);
+}
+function normalizeModernLoaderResult(result) {
+    return isModernDeferredData(result) ? result.data : result;
+}
+function normalizeModernLoaderResponse(result) {
+    if (isResponse(result)) {
+        if (isRedirectResponse(result)) {
+            const location = result.headers.get('Location') || '/';
+            throwTanstackRedirect(location);
+        }
+        if (404 === result.status) throw notFound();
+    }
+    return normalizeModernLoaderResult(result);
+}
+function createModernRequest(input, signal) {
+    return new Request(input, {
+        signal
+    });
+}
+function getModernUrlFromLoaderContext(ctx) {
+    const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '/';
+    const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
+    const baseUrl = baseRequest?.url || ("u" > typeof window ? window.origin : 'http://localhost');
+    return new URL(href || '/', baseUrl);
+}
+function rememberRouteLocation(state, ctx) {
+    state.currentUrl = getModernUrlFromLoaderContext(ctx);
+    state.currentParams = ctx?.params || {};
+}
+function createModernShouldReload(shouldRevalidate, state) {
+    if ('function' != typeof shouldRevalidate) return;
+    const revalidate = shouldRevalidate;
+    return (ctx)=>{
+        const nextUrl = getModernUrlFromLoaderContext(ctx);
+        const nextParams = ctx?.params || {};
+        const result = revalidate({
+            currentUrl: state.currentUrl || nextUrl,
+            currentParams: state.currentParams || nextParams,
+            nextUrl,
+            nextParams,
+            defaultShouldRevalidate: void 0
+        });
+        state.currentUrl = nextUrl;
+        state.currentParams = nextParams;
+        return 'boolean' == typeof result ? result : void 0;
+    };
+}
+function isRouteObjectSplatRoute(route) {
+    return 'string' == typeof route.path && route.path.includes('*');
+}
+function mapParamsForRouteObjectLoader({ route, params }) {
+    if (isRouteObjectSplatRoute(route)) {
+        const { _splat, ...rest } = params;
+        if (void 0 !== _splat) return {
+            ...rest,
+            '*': _splat
+        };
+        return rest;
+    }
+    return params;
+}
+function wrapRouteObjectLoader(route, revalidationState, options = {}) {
+    const modernRoute = route;
+    const routeLoader = modernRoute.loader;
+    if ('function' != typeof routeLoader) return;
+    return async (ctx)=>{
+        try {
+            if (revalidationState) rememberRouteLocation(revalidationState, ctx);
+            if ('function' == typeof modernRoute.lazyImport) try {
+                await modernRoute.lazyImport();
+            } catch  {}
+            const signal = ctx?.abortController?.signal || ctx?.signal || new AbortController().signal;
+            const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
+            const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '';
+            const request = void 0 !== baseRequest ? new Request(baseRequest, {
+                signal
+            }) : createModernRequest(href, signal);
+            const params = mapParamsForRouteObjectLoader({
+                route,
+                params: ctx.params || {}
+            });
+            const loadModernData = async ()=>{
+                const result = await routeLoader({
+                    request,
+                    params,
+                    context: ctx?.context?.requestContext
+                });
+                return normalizeModernLoaderResponse(result);
+            };
+            if (options.rscPayloadRouter && isTanstackRscPayloadNavigationEnabled()) return loadTanstackRscRouteData({
+                hasClientLoader: modernRoute.hasClientLoader || void 0 !== modernRoute.clientData,
+                loadClientData: loadModernData,
+                request,
+                routeId: ctx.route?.id
+            });
+            return loadModernData();
+        } catch (err) {
+            if (isResponse(err)) {
+                if (isTanstackRedirect(err)) throw err;
+                if (isRedirectResponse(err)) {
+                    const location = err.headers.get('Location') || '/';
+                    throwTanstackRedirect(location);
+                }
+                if (404 === err.status) throw notFound();
+            }
+            throw err;
+        }
+    };
+}
+export { createModernShouldReload, wrapRouteObjectLoader };

package/dist/esm/runtime/routeTree/paths.mjs

@@ -0,0 +1,16 @@
+function toTanstackPath(pathname) {
+    return pathname.split('/').map((segment)=>{
+        if (!segment) return segment;
+        if ('*' === segment) return '$';
+        if (segment.startsWith(':')) {
+            const name = segment.slice(1);
+            if (name.endsWith('?')) return `{-$${name.slice(0, -1)}}`;
+            return `$${name}`;
+        }
+        return segment;
+    }).join('/');
+}
+function isRouteObjectPathlessLayout(route) {
+    return !route.path && !route.index;
+}
+export { isRouteObjectPathlessLayout, toTanstackPath };

package/dist/esm/runtime/routeTree/staticData.mjs

@@ -0,0 +1,22 @@
+function mergeModernRouteHandle(route) {
+    const config = route.config;
+    const handle = {
+        ...route.handle,
+        ...config && 'object' == typeof config ? config.handle : {}
+    };
+    return Object.keys(handle).length > 0 ? handle : void 0;
+}
+function createRouteStaticData(opts) {
+    const staticData = {};
+    if (opts.modernRouteId) staticData.modernRouteId = opts.modernRouteId;
+    if (opts.modernRouteAction) staticData.modernRouteAction = opts.modernRouteAction;
+    if (opts.modernRouteHandle) staticData.modernRouteHandle = opts.modernRouteHandle;
+    if (opts.modernRouteHasAction) staticData.modernRouteHasAction = true;
+    if (opts.modernRouteHasClientLoader) staticData.modernRouteHasClientLoader = true;
+    if (opts.modernRouteHasLoader) staticData.modernRouteHasLoader = true;
+    if (opts.modernRouteIsClientComponent) staticData.modernRouteIsClientComponent = true;
+    if (opts.modernRouteLoader) staticData.modernRouteLoader = opts.modernRouteLoader;
+    if (opts.modernRouteShouldRevalidate) staticData.modernRouteShouldRevalidate = opts.modernRouteShouldRevalidate;
+    return Object.keys(staticData).length > 0 ? staticData : void 0;
+}
+export { createRouteStaticData, mergeModernRouteHandle };

package/dist/esm/runtime/routeTree/tanstackRoutes.mjs

@@ -0,0 +1,13 @@
+import { createRootRoute, createRoute } from "@tanstack/react-router";
+import { withModernRouteMatchContext } from "../outlet.mjs";
+function createTanstackRoute(options) {
+    return createRoute(options);
+}
+function createTanstackRootRoute(options) {
+    return createRootRoute(options);
+}
+function wrapRouteComponentWithModernContext(route, component, routeId) {
+    const routeMatchId = routeId || route.id;
+    if (component && routeMatchId) route.options.component = withModernRouteMatchContext(component, routeMatchId);
+}
+export { createTanstackRootRoute, createTanstackRoute, wrapRouteComponentWithModernContext };

package/dist/esm/runtime/routeTree.mjs

@@ -1,318 +1 @@
-import { DefaultNotFound } from "@modern-js/runtime/context";
-import { createRootRoute, createRoute, notFound, rootRouteId } from "@tanstack/react-router";
-import { createElement } from "react";
-import { isRedirectResponse, isResponse, isTanstackRedirect, throwTanstackRedirect } from "./loaderBridge.mjs";
-import { withModernRouteMatchContext } from "./outlet.mjs";
-import { isTanstackRscPayloadNavigationEnabled, loadTanstackRscRouteData } from "./rsc/payloadRouter.mjs";
-function createTanstackRoute(options) {
-    return createRoute(options);
-}
-function createTanstackRootRoute(options) {
-    return createRootRoute(options);
-}
-function wrapRouteComponentWithModernContext(route, component, routeId) {
-    const routeMatchId = routeId || route.id;
-    if (component && routeMatchId) route.options.component = withModernRouteMatchContext(component, routeMatchId);
-}
-function toTanstackPath(pathname) {
-    return pathname.split('/').map((segment)=>{
-        if (!segment) return segment;
-        if ('*' === segment) return '$';
-        if (segment.startsWith(':')) {
-            const name = segment.slice(1);
-            if (name.endsWith('?')) return `{-$${name.slice(0, -1)}}`;
-            return `$${name}`;
-        }
-        return segment;
-    }).join('/');
-}
-function isModernDeferredData(value) {
-    if (!value || 'object' != typeof value) return false;
-    const deferred = value;
-    return true === deferred.__modern_deferred && Boolean(deferred.data) && 'object' == typeof deferred.data && !Array.isArray(deferred.data);
-}
-function normalizeModernLoaderResult(result) {
-    return isModernDeferredData(result) ? result.data : result;
-}
-function normalizeModernLoaderResponse(result) {
-    if (isResponse(result)) {
-        if (isRedirectResponse(result)) {
-            const location = result.headers.get('Location') || '/';
-            throwTanstackRedirect(location);
-        }
-        if (404 === result.status) throw notFound();
-    }
-    return normalizeModernLoaderResult(result);
-}
-function pickRouteModuleComponent(routeModule, seen = new Set()) {
-    if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
-    if (!routeModule || 'object' != typeof routeModule) return;
-    if (seen.has(routeModule)) return;
-    seen.add(routeModule);
-    const module = routeModule;
-    for (const candidate of [
-        module.default,
-        module.Component
-    ]){
-        const component = pickRouteModuleComponent(candidate, seen);
-        if (component) return component;
-    }
-}
-function createServerLazyImportComponent(lazyImport, fallbackComponent) {
-    if ("u" > typeof document) return fallbackComponent;
-    let resolvedComponent;
-    let pendingLoad;
-    const load = async ()=>{
-        if (resolvedComponent) return resolvedComponent;
-        const routeModule = await lazyImport();
-        const component = pickRouteModuleComponent(routeModule);
-        if (component) resolvedComponent = component;
-        return resolvedComponent;
-    };
-    const Component = (props)=>{
-        if (resolvedComponent) return createElement(resolvedComponent, props);
-        pendingLoad ||= load();
-        throw pendingLoad;
-    };
-    Component.load = load;
-    Component.preload = load;
-    return Component;
-}
-function createModernRequest(input, signal) {
-    return new Request(input, {
-        signal
-    });
-}
-function getModernUrlFromLoaderContext(ctx) {
-    const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '/';
-    const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
-    const baseUrl = baseRequest?.url || ("u" > typeof window ? window.origin : 'http://localhost');
-    return new URL(href || '/', baseUrl);
-}
-function rememberRouteLocation(state, ctx) {
-    state.currentUrl = getModernUrlFromLoaderContext(ctx);
-    state.currentParams = ctx?.params || {};
-}
-function createModernShouldReload(shouldRevalidate, state) {
-    if ('function' != typeof shouldRevalidate) return;
-    const revalidate = shouldRevalidate;
-    return (ctx)=>{
-        const nextUrl = getModernUrlFromLoaderContext(ctx);
-        const nextParams = ctx?.params || {};
-        const result = revalidate({
-            currentUrl: state.currentUrl || nextUrl,
-            currentParams: state.currentParams || nextParams,
-            nextUrl,
-            nextParams,
-            defaultShouldRevalidate: void 0
-        });
-        state.currentUrl = nextUrl;
-        state.currentParams = nextParams;
-        return 'boolean' == typeof result ? result : void 0;
-    };
-}
-function isRouteObjectPathlessLayout(route) {
-    return !route.path && !route.index;
-}
-function isRouteObjectSplatRoute(route) {
-    return 'string' == typeof route.path && route.path.includes('*');
-}
-function mapParamsForRouteObjectLoader({ route, params }) {
-    if (isRouteObjectSplatRoute(route)) {
-        const { _splat, ...rest } = params;
-        if (void 0 !== _splat) return {
-            ...rest,
-            '*': _splat
-        };
-        return rest;
-    }
-    return params;
-}
-function wrapRouteObjectLoader(route, revalidationState, options = {}) {
-    const modernRoute = route;
-    const routeLoader = modernRoute.loader;
-    if ('function' != typeof routeLoader) return;
-    return async (ctx)=>{
-        try {
-            if (revalidationState) rememberRouteLocation(revalidationState, ctx);
-            if ('function' == typeof modernRoute.lazyImport) try {
-                await modernRoute.lazyImport();
-            } catch  {}
-            const signal = ctx?.abortController?.signal || ctx?.signal || new AbortController().signal;
-            const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
-            const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '';
-            const request = void 0 !== baseRequest ? new Request(baseRequest, {
-                signal
-            }) : createModernRequest(href, signal);
-            const params = mapParamsForRouteObjectLoader({
-                route,
-                params: ctx.params || {}
-            });
-            const loadModernData = async ()=>{
-                const result = await routeLoader({
-                    request,
-                    params,
-                    context: ctx?.context?.requestContext
-                });
-                return normalizeModernLoaderResponse(result);
-            };
-            if (options.rscPayloadRouter && isTanstackRscPayloadNavigationEnabled()) return loadTanstackRscRouteData({
-                hasClientLoader: modernRoute.hasClientLoader || void 0 !== modernRoute.clientData,
-                loadClientData: loadModernData,
-                request,
-                routeId: ctx.route?.id
-            });
-            return loadModernData();
-        } catch (err) {
-            if (isResponse(err)) {
-                if (isTanstackRedirect(err)) throw err;
-                if (isRedirectResponse(err)) {
-                    const location = err.headers.get('Location') || '/';
-                    throwTanstackRedirect(location);
-                }
-                if (404 === err.status) throw notFound();
-            }
-            throw err;
-        }
-    };
-}
-function toRouteComponent(routeObject) {
-    const route = routeObject;
-    const lazyImport = 'function' == typeof route.lazyImport ? route.lazyImport : void 0;
-    const fallbackComponent = route.Component ? route.Component : route.element ? ()=>route.element : void 0;
-    if (lazyImport && fallbackComponent) return createServerLazyImportComponent(lazyImport, fallbackComponent);
-    if (route.Component) return route.Component;
-    const element = route.element;
-    if (element) return ()=>element;
-}
-function toErrorComponent(routeObject) {
-    const route = routeObject;
-    if (route.ErrorBoundary) return route.ErrorBoundary;
-    if (route.errorElement) return ()=>route.errorElement;
-}
-function toPendingComponent(routeObject) {
-    const route = routeObject;
-    return route.HydrateFallback || route.pendingComponent || void 0;
-}
-function mergeModernRouteHandle(route) {
-    const config = route.config;
-    const handle = {
-        ...route.handle,
-        ...config && 'object' == typeof config ? config.handle : {}
-    };
-    return Object.keys(handle).length > 0 ? handle : void 0;
-}
-function createRouteStaticData(opts) {
-    const staticData = {};
-    if (opts.modernRouteId) staticData.modernRouteId = opts.modernRouteId;
-    if (opts.modernRouteAction) staticData.modernRouteAction = opts.modernRouteAction;
-    if (opts.modernRouteHandle) staticData.modernRouteHandle = opts.modernRouteHandle;
-    if (opts.modernRouteHasAction) staticData.modernRouteHasAction = true;
-    if (opts.modernRouteHasClientLoader) staticData.modernRouteHasClientLoader = true;
-    if (opts.modernRouteHasLoader) staticData.modernRouteHasLoader = true;
-    if (opts.modernRouteIsClientComponent) staticData.modernRouteIsClientComponent = true;
-    if (opts.modernRouteLoader) staticData.modernRouteLoader = opts.modernRouteLoader;
-    if (opts.modernRouteShouldRevalidate) staticData.modernRouteShouldRevalidate = opts.modernRouteShouldRevalidate;
-    return Object.keys(staticData).length > 0 ? staticData : void 0;
-}
-function createRouteFromRouteObject(opts) {
-    const { options = {}, parent, routeObject } = opts;
-    const modernRouteObject = routeObject;
-    const revalidationState = {};
-    const shouldRevalidate = modernRouteObject.shouldRevalidate;
-    const shouldReload = createModernShouldReload(shouldRevalidate, revalidationState);
-    const stableFallbackId = routeObject.id || modernRouteObject.file || routeObject.path || 'pathless';
-    const component = toRouteComponent(routeObject);
-    const base = {
-        getParentRoute: ()=>parent,
-        component,
-        pendingComponent: toPendingComponent(routeObject),
-        errorComponent: toErrorComponent(routeObject),
-        validateSearch: modernRouteObject.validateSearch,
-        loaderDeps: modernRouteObject.loaderDeps,
-        staticData: createRouteStaticData({
-            modernRouteId: routeObject.id,
-            modernRouteAction: modernRouteObject.action,
-            modernRouteHandle: mergeModernRouteHandle(modernRouteObject),
-            modernRouteHasAction: modernRouteObject.hasAction || Boolean(modernRouteObject.action),
-            modernRouteHasClientLoader: modernRouteObject.hasClientLoader || void 0 !== modernRouteObject.clientData,
-            modernRouteHasLoader: modernRouteObject.hasLoader || 'function' == typeof modernRouteObject.loader,
-            modernRouteIsClientComponent: modernRouteObject.isClientComponent,
-            modernRouteLoader: modernRouteObject.loader,
-            modernRouteShouldRevalidate: shouldRevalidate
-        }),
-        loader: wrapRouteObjectLoader(routeObject, revalidationState, options)
-    };
-    if (modernRouteObject.inValidSSRRoute) base.ssr = false;
-    if (shouldReload) base.shouldReload = shouldReload;
-    if (isRouteObjectPathlessLayout(routeObject)) base.id = stableFallbackId;
-    else base.path = routeObject.index ? '/' : toTanstackPath(routeObject.path || '');
-    const route = createTanstackRoute(base);
-    wrapRouteComponentWithModernContext(route, component, routeObject.id);
-    const children = routeObject.children;
-    if (children && children.length > 0) {
-        const childRoutes = children.map((child)=>createRouteFromRouteObject({
-                options,
-                parent: route,
-                routeObject: child
-            }));
-        route.addChildren(childRoutes);
-    }
-    return route;
-}
-function getRootLikeRouteObject(routes) {
-    return routes.find((route)=>'/' === route.path && !route.index);
-}
-function createRouteTreeFromRouteObjects(routes, options = {}) {
-    const rootLikeRoute = getRootLikeRouteObject(routes);
-    const rootRevalidationState = {};
-    const rootShouldRevalidate = rootLikeRoute?.shouldRevalidate;
-    const rootShouldReload = createModernShouldReload(rootShouldRevalidate, rootRevalidationState);
-    const rootComponent = rootLikeRoute ? toRouteComponent(rootLikeRoute) : void 0;
-    const rootRouteOptions = {
-        component: rootComponent,
-        pendingComponent: rootLikeRoute ? toPendingComponent(rootLikeRoute) : void 0,
-        errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : void 0,
-        validateSearch: rootLikeRoute?.validateSearch,
-        loaderDeps: rootLikeRoute?.loaderDeps,
-        notFoundComponent: DefaultNotFound,
-        staticData: createRouteStaticData({
-            modernRouteId: rootLikeRoute?.id,
-            modernRouteAction: rootLikeRoute?.action,
-            modernRouteHandle: rootLikeRoute ? mergeModernRouteHandle(rootLikeRoute) : void 0,
-            modernRouteHasAction: rootLikeRoute?.hasAction || Boolean(rootLikeRoute?.action),
-            modernRouteHasClientLoader: rootLikeRoute?.hasClientLoader || void 0 !== rootLikeRoute?.clientData,
-            modernRouteHasLoader: rootLikeRoute?.hasLoader || 'function' == typeof rootLikeRoute?.loader,
-            modernRouteIsClientComponent: rootLikeRoute?.isClientComponent,
-            modernRouteLoader: rootLikeRoute?.loader,
-            modernRouteShouldRevalidate: rootShouldRevalidate
-        }),
-        loader: rootLikeRoute ? wrapRouteObjectLoader(rootLikeRoute, rootRevalidationState, options) : void 0
-    };
-    if (rootShouldReload) rootRouteOptions.shouldReload = rootShouldReload;
-    if (rootLikeRoute?.inValidSSRRoute) rootRouteOptions.ssr = false;
-    const rootRoute = createTanstackRootRoute(rootRouteOptions);
-    if (rootComponent) rootRoute.options.component = withModernRouteMatchContext(rootComponent, rootRouteId);
-    const topLevel = rootLikeRoute ? [
-        ...rootLikeRoute.children || [],
-        ...routes.filter((route)=>route !== rootLikeRoute)
-    ] : routes;
-    const childRoutes = topLevel.map((routeObject)=>createRouteFromRouteObject({
-            options,
-            parent: rootRoute,
-            routeObject
-        }));
-    rootRoute.addChildren(childRoutes);
-    return rootRoute;
-}
-function getModernRouteIdsFromMatches(router) {
-    const matches = router.state.matches || [];
-    const routesById = router.routesById;
-    const ids = matches.map((match)=>{
-        const normalizedMatch = match;
-        const routeId = 'string' == typeof normalizedMatch.routeId ? normalizedMatch.routeId : void 0;
-        return normalizedMatch.route?.options?.staticData?.modernRouteId ?? (routeId ? routesById?.[routeId]?.options?.staticData?.modernRouteId : void 0);
-    }).filter((id)=>'string' == typeof id);
-    return Array.from(new Set(ids));
-}
-export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches };
+export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches, pickRouteModuleComponent } from "./routeTree/index.mjs";

package/dist/esm/runtime/rsc/CompositeComponent.mjs

@@ -2,22 +2,27 @@
 import { jsx } from "react/jsx-runtime";
 import { Suspense } from "react";
 import { SlotProvider } from "./SlotContext.mjs";
-import { RSC_PROXY_GET_TREE, RSC_PROXY_PATH } from "./symbols.mjs";
-function EmptyFallback() {
-    return null;
-}
-function selectTreePath(tree, path) {
-    let current = tree;
-    for (const key of path){
-        if (null === current || 'object' != typeof current) return null;
-        current = current[key];
+import { EmptyFallback, renderSelectedTree } from "./shared.mjs";
+import { RSC_PROXY_GET_TREE, SERVER_COMPONENT_STREAM } from "./symbols.mjs";
+import { createTreeGetterFromFlightStream } from "./treeGetter.mjs";
+const rawServerValueGetters = new WeakMap();
+function getRawServerTreeGetter(src) {
+    if (!src || 'object' != typeof src && 'function' != typeof src) return;
+    const source = src;
+    const stream = source[SERVER_COMPONENT_STREAM];
+    if ('function' != typeof stream?.createReplayStream) return;
+    let getTree = rawServerValueGetters.get(src);
+    if (!getTree) {
+        getTree = createTreeGetterFromFlightStream(stream.createReplayStream());
+        rawServerValueGetters.set(src, getTree);
     }
-    return current;
+    return getTree;
 }
 function CompositeInner({ slotProps, src, strict }) {
-    const getTree = src[RSC_PROXY_GET_TREE];
-    if (!getTree) throw new Error('CompositeComponent src must come from createCompositeComponent().');
-    const tree = selectTreePath(getTree(), src[RSC_PROXY_PATH] || []);
+    const tree = renderSelectedTree(src, {
+        getTree: src[RSC_PROXY_GET_TREE] || getRawServerTreeGetter(src),
+        missingTreeError: 'CompositeComponent src must come from createCompositeComponent().'
+    });
     return /*#__PURE__*/ jsx(SlotProvider, {
         implementations: slotProps,
         strict: strict,

package/dist/esm/runtime/rsc/RscNodeRenderer.mjs

@@ -1,23 +1,12 @@
 "use client";
 import { Fragment, jsx } from "react/jsx-runtime";
 import { Suspense } from "react";
-import { RSC_PROXY_GET_TREE, RSC_PROXY_PATH } from "./symbols.mjs";
-function EmptyFallback() {
-    return null;
-}
-function selectTreePath(tree, path) {
-    let current = tree;
-    for (const key of path){
-        if (null === current || 'object' != typeof current) return null;
-        current = current[key];
-    }
-    return current;
-}
+import { EmptyFallback, renderSelectedTree } from "./shared.mjs";
 function RscNodeRenderInner({ data }) {
-    const getTree = data[RSC_PROXY_GET_TREE];
-    if (!getTree) throw new Error('Renderable RSC is missing its decoded tree getter.');
     return /*#__PURE__*/ jsx(Fragment, {
-        children: selectTreePath(getTree(), data[RSC_PROXY_PATH] || [])
+        children: renderSelectedTree(data, {
+            missingTreeError: 'Renderable RSC is missing its decoded tree getter.'
+        })
     });
 }
 function RscNodeRenderer({ data }) {

package/dist/esm/runtime/rsc/client.mjs

@@ -1,40 +1,20 @@
 "use client";
 import { createSerializationAdapter } from "@tanstack/react-router";
-import { use } from "react";
+import { createTreeGetterFromFlightStream } from "./treeGetter.mjs";
 import { createRscProxy } from "./createRscProxy.mjs";
-let modernRscClientRuntimePromise;
-function loadModernRscClientRuntime() {
-    modernRscClientRuntimePromise ??= import("@modern-js/runtime/rsc/client").then((runtime)=>{
-        runtime.setServerCallback(runtime.callServer);
-        return runtime;
-    });
-    return modernRscClientRuntimePromise;
-}
-function createTreeGetter(stream) {
-    let ready = false;
-    let tree;
-    const treePromise = loadModernRscClientRuntime().then((runtime)=>runtime.createFromReadableStream(stream, {
-            callServer: runtime.callServer
-        })).then((value)=>{
-        tree = value;
-        ready = true;
-        return value;
-    });
-    return ()=>{
-        if (ready) return tree;
-        return use(treePromise);
-    };
-}
 function createFromFlightStream(serialized) {
     const streamWrapper = {
         createReplayStream: ()=>serialized.stream
     };
-    return createRscProxy(createTreeGetter(serialized.stream), {
+    return createRscProxy(createTreeGetterFromFlightStream(serialized.stream), {
         renderable: 'renderable' === serialized.kind,
         slotUsagesStream: serialized.slotUsagesStream,
         stream: streamWrapper
     });
 }
+function createTanstackRscValueFromFlight(serialized) {
+    return createFromFlightStream(serialized);
+}
 const adapter = createSerializationAdapter({
     key: '$MODERN_TANSTACK_RSC',
     test: (_value)=>false,
@@ -50,4 +30,4 @@ function getTanstackRscSerializationAdapters() {
 }
 const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 export { CompositeComponent } from "./CompositeComponent.mjs";
-export { getTanstackRscSerializationAdapters, rscSerializationAdapter };
+export { createTanstackRscValueFromFlight, getTanstackRscSerializationAdapters, rscSerializationAdapter };