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

package/dist/cjs/runtime/rsc/slotUsageSanitizer.js

@@ -45,6 +45,7 @@ function sanitizeSlotArg(value, seen) {
     if (null == value) return value;
     if ('string' == typeof value || 'number' == typeof value || 'boolean' == typeof value || 'bigint' == typeof value) return value;
     if ('object' != typeof value && 'function' != typeof value) return String(value);
+    if ('function' == typeof value) return '[Function]';
     if (seen.has(value)) return '[Circular]';
     seen.add(value);
     if (Array.isArray(value)) return value.map((item)=>sanitizeSlotArg(item, seen));

package/dist/cjs/runtime/state.js

@@ -33,7 +33,7 @@ __webpack_require__.d(__webpack_exports__, {
 const context_namespaceObject = require("@modern-js/runtime/context");
 function getTanstackRouterState(context) {
     const state = (0, context_namespaceObject.getRouterRuntimeState)(context);
-    if (void 0 === state || 'tanstack' !== state.framework) return;
+    if (void 0 === state || 'tanstack' !== state.framework || void 0 === state.instance) return;
     return state;
 }
 exports.getTanstackRouterState = __webpack_exports__.getTanstackRouterState;

package/dist/cjs/runtime/utils.js

@@ -67,9 +67,9 @@ function toTanstackRouteObject(route, globalApp) {
         shouldRevalidate: route.shouldRevalidate,
         handle: getRouteHandle(route),
         index: route.index,
-        hasLoader: Boolean(route.loader),
-        hasClientLoader: Boolean(route.clientData),
-        hasAction: Boolean(route.action),
+        hasLoader: route.hasLoader || Boolean(route.loader),
+        hasClientLoader: route.hasClientLoader || Boolean(route.clientData),
+        hasAction: route.hasAction || Boolean(route.action),
         ...route.isClientComponent ? {
             isClientComponent: true
         } : {},

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

@@ -13,6 +13,7 @@ function sanitizeSlotArg(value, seen) {
     if (null == value) return value;
     if ('string' == typeof value || 'number' == typeof value || 'boolean' == typeof value || 'bigint' == typeof value) return value;
     if ('object' != typeof value && 'function' != typeof value) return String(value);
+    if ('function' == typeof value) return '[Function]';
     if (seen.has(value)) return '[Circular]';
     seen.add(value);
     if (Array.isArray(value)) return value.map((item)=>sanitizeSlotArg(item, seen));

package/dist/esm/runtime/state.mjs

@@ -1,7 +1,7 @@
 import { getRouterRuntimeState } from "@modern-js/runtime/context";
 function getTanstackRouterState(context) {
     const state = getRouterRuntimeState(context);
-    if (void 0 === state || 'tanstack' !== state.framework) return;
+    if (void 0 === state || 'tanstack' !== state.framework || void 0 === state.instance) return;
     return state;
 }
 export { getTanstackRouterState };

package/dist/esm/runtime/utils.mjs

@@ -25,9 +25,9 @@ function toTanstackRouteObject(route, globalApp) {
         shouldRevalidate: route.shouldRevalidate,
         handle: getRouteHandle(route),
         index: route.index,
-        hasLoader: Boolean(route.loader),
-        hasClientLoader: Boolean(route.clientData),
-        hasAction: Boolean(route.action),
+        hasLoader: route.hasLoader || Boolean(route.loader),
+        hasClientLoader: route.hasClientLoader || Boolean(route.clientData),
+        hasAction: route.hasAction || Boolean(route.action),
         ...route.isClientComponent ? {
             isClientComponent: true
         } : {},

package/dist/esm-node/runtime/rsc/slotUsageSanitizer.mjs

@@ -14,6 +14,7 @@ function sanitizeSlotArg(value, seen) {
     if (null == value) return value;
     if ('string' == typeof value || 'number' == typeof value || 'boolean' == typeof value || 'bigint' == typeof value) return value;
     if ('object' != typeof value && 'function' != typeof value) return String(value);
+    if ('function' == typeof value) return '[Function]';
     if (seen.has(value)) return '[Circular]';
     seen.add(value);
     if (Array.isArray(value)) return value.map((item)=>sanitizeSlotArg(item, seen));

package/dist/esm-node/runtime/state.mjs

@@ -2,7 +2,7 @@ import "node:module";
 import { getRouterRuntimeState } from "@modern-js/runtime/context";
 function getTanstackRouterState(context) {
     const state = getRouterRuntimeState(context);
-    if (void 0 === state || 'tanstack' !== state.framework) return;
+    if (void 0 === state || 'tanstack' !== state.framework || void 0 === state.instance) return;
     return state;
 }
 export { getTanstackRouterState };

package/dist/esm-node/runtime/utils.mjs

@@ -26,9 +26,9 @@ function toTanstackRouteObject(route, globalApp) {
         shouldRevalidate: route.shouldRevalidate,
         handle: getRouteHandle(route),
         index: route.index,
-        hasLoader: Boolean(route.loader),
-        hasClientLoader: Boolean(route.clientData),
-        hasAction: Boolean(route.action),
+        hasLoader: route.hasLoader || Boolean(route.loader),
+        hasClientLoader: route.hasClientLoader || Boolean(route.clientData),
+        hasAction: route.hasAction || Boolean(route.action),
         ...route.isClientComponent ? {
             isClientComponent: true
         } : {},

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.5.0-ultramodern.31",
+  "version": "3.5.0-ultramodern.33",
   "engines": {
     "node": ">=20"
   },
@@ -98,14 +98,14 @@
     "@tanstack/react-router": "1.170.16",
     "@tanstack/router-core": "1.171.13",
     "react-server-dom-rspack": "0.0.2",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.31",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.31",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.31",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.31"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.33",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.33",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.33",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.33"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.5.0-ultramodern.31",
-    "@modern-js/runtime": "3.5.0-ultramodern.31",
+    "@modern-js/app-tools": "3.5.0-ultramodern.33",
+    "@modern-js/runtime": "3.5.0-ultramodern.33",
     "react": "^19.2.7",
     "react-dom": "^19.2.7"
   },
@@ -120,9 +120,9 @@
     "@typescript/native-preview": "7.0.0-dev.20260628.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.31",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.31",
-    "@scripts/rstest-config": "2.66.0"
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.33",
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.33"
   },
   "sideEffects": [
     "./src/runtime/register.ts",

package/rstest.config.mts

@@ -25,6 +25,7 @@ export default {
       include: [
         'tests/router/cli.test.ts',
         'tests/router/fastDefaults.test.ts',
+        'tests/router/flightSerialization.roundtrip.test.tsx',
         'tests/router/generateRouteArtifacts.test.ts',
         'tests/router/hooks.test.ts',
         'tests/router/loaderBridge.test.ts',
@@ -33,6 +34,7 @@ export default {
         'tests/router/register.test.ts',
         'tests/router/routeHooks.test.ts',
         'tests/router/rsc.test.tsx',
+        'tests/router/slotUsageSanitizer.test.ts',
         'tests/router/ssrPreload.test.ts',
         'tests/router/tanstackTypes.test.ts',
         'tests/router/routeTree.test.ts',

package/src/runtime/rsc/slotUsageSanitizer.ts

@@ -50,6 +50,10 @@ function sanitizeSlotArg(
     return String(value);
   }
 
+  if (typeof value === 'function') {
+    return '[Function]';
+  }
+
   if (seen.has(value)) {
     return '[Circular]';
   }

package/src/runtime/state.ts

@@ -23,7 +23,11 @@ export function getTanstackRouterState(
   context: object,
 ): TanstackRouterState | undefined {
   const state = getRouterRuntimeState(context);
-  if (state === undefined || state.framework !== 'tanstack') {
+  if (
+    state === undefined ||
+    state.framework !== 'tanstack' ||
+    state.instance === undefined
+  ) {
     return undefined;
   }
 

package/src/runtime/utils.tsx

@@ -69,9 +69,9 @@ function toTanstackRouteObject(
       shouldRevalidate: route.shouldRevalidate,
       handle: getRouteHandle(route),
       index: route.index,
-      hasLoader: Boolean(route.loader),
-      hasClientLoader: Boolean(route.clientData),
-      hasAction: Boolean(route.action),
+      hasLoader: route.hasLoader || Boolean(route.loader),
+      hasClientLoader: route.hasClientLoader || Boolean(route.clientData),
+      hasAction: route.hasAction || Boolean(route.action),
       ...(route.isClientComponent ? { isClientComponent: true } : {}),
       ...(route.inValidSSRRoute ? { inValidSSRRoute: true } : {}),
       lazyImport: route.lazyImport,

package/tests/router/flightSerialization.roundtrip.test.tsx

@@ -0,0 +1,137 @@
+import type React from 'react';
+import { isValidElement } from 'react';
+import { createRscProxy } from '../../src/runtime/rsc/createRscProxy';
+import {
+  reviveTanstackRscFlightValues,
+  serializeTanstackRscFlightValues,
+} from '../../src/runtime/rsc/flightSerialization';
+import {
+  RENDERABLE_RSC,
+  SERVER_COMPONENT_STREAM,
+  type ServerComponentStream,
+} from '../../src/runtime/rsc/symbols';
+
+type RoundTripFixture = {
+  bigintValue: bigint;
+  booleanValue: boolean;
+  circular: Record<string, unknown>;
+  dateValue: Date;
+  falseValue: boolean;
+  mapValue: Map<unknown, unknown>;
+  nested: {
+    array: unknown[];
+    object: {
+      child: unknown;
+    };
+  };
+  nullValue: null;
+  numberValue: number;
+  rscProxy: React.ReactElement & Record<PropertyKey, unknown>;
+  setValue: Set<unknown>;
+  sharedA: Record<string, unknown>;
+  sharedB: Record<string, unknown>;
+  stringValue: string;
+  undefinedValue: undefined;
+};
+
+function createStream(): ServerComponentStream {
+  return {
+    createReplayStream: () => new ReadableStream<Uint8Array>(),
+  };
+}
+
+test('round-trips TanStack RSC flight values across supported value types', async () => {
+  const shared = { marker: 'shared' };
+  const circular: Record<string, unknown> = { marker: 'circular' };
+  circular.self = circular;
+
+  const mapValue = new Map<unknown, unknown>([
+    ['primitive', 1],
+    ['shared', shared],
+    [shared, circular],
+  ]);
+  mapValue.set('self', mapValue);
+
+  const setValue = new Set<unknown>(['set-item', shared, circular]);
+  setValue.add(setValue);
+
+  const rscProxy = createRscProxy(() => ({ slot: 'server' }), {
+    renderable: true,
+    stream: createStream(),
+  }) as React.ReactElement & Record<PropertyKey, unknown>;
+
+  const fixture: RoundTripFixture = {
+    bigintValue: 9007199254740993n,
+    booleanValue: true,
+    circular,
+    dateValue: new Date('2026-07-08T12:34:56.789Z'),
+    falseValue: false,
+    mapValue,
+    nested: {
+      array: [shared, [null, undefined, 7n]],
+      object: {
+        child: shared,
+      },
+    },
+    nullValue: null,
+    numberValue: 42,
+    rscProxy,
+    setValue,
+    sharedA: shared,
+    sharedB: shared,
+    stringValue: 'flight',
+    undefinedValue: undefined,
+  };
+
+  const serialized = serializeTanstackRscFlightValues(
+    fixture,
+  ) as RoundTripFixture;
+  const revived = (await reviveTanstackRscFlightValues(
+    serialized,
+  )) as RoundTripFixture;
+
+  expect(revived).not.toBe(fixture);
+  expect(revived.stringValue).toBe('flight');
+  expect(revived.numberValue).toBe(42);
+  expect(revived.booleanValue).toBe(true);
+  expect(revived.falseValue).toBe(false);
+  expect(revived.nullValue).toBeNull();
+  expect(Object.hasOwn(revived, 'undefinedValue')).toBe(true);
+  expect(revived.undefinedValue).toBeUndefined();
+  expect(revived.bigintValue).toBe(9007199254740993n);
+  expect(revived.dateValue).toBeInstanceOf(Date);
+  expect(revived.dateValue.toISOString()).toBe('2026-07-08T12:34:56.789Z');
+
+  expect(revived.nested.array[0]).toBe(revived.sharedA);
+  expect(revived.nested.object.child).toBe(revived.sharedA);
+  expect(revived.sharedB).toBe(revived.sharedA);
+
+  expect(revived.circular).not.toBe(circular);
+  expect(revived.circular.self).toBe(revived.circular);
+
+  expect(revived.mapValue).toBeInstanceOf(Map);
+  expect(revived.mapValue).not.toBe(mapValue);
+  expect(revived.mapValue.get('primitive')).toBe(1);
+  expect(revived.mapValue.get('shared')).toBe(revived.sharedA);
+  expect(revived.mapValue.get(revived.sharedA)).toBe(revived.circular);
+  expect(revived.mapValue.get('self')).toBe(revived.mapValue);
+
+  expect(revived.setValue).toBeInstanceOf(Set);
+  expect(revived.setValue).not.toBe(setValue);
+  expect(revived.setValue.has('set-item')).toBe(true);
+  expect(revived.setValue.has(revived.sharedA)).toBe(true);
+  expect(revived.setValue.has(revived.circular)).toBe(true);
+  expect(revived.setValue.has(revived.setValue)).toBe(true);
+
+  expect(serialized.rscProxy).not.toBe(rscProxy);
+  expect(serialized.rscProxy).toMatchObject({
+    __modernTanstackRsc: true,
+    kind: 'renderable',
+  });
+  expect(serialized.rscProxy.stream).toBeInstanceOf(ReadableStream);
+
+  expect(revived.rscProxy).not.toBe(rscProxy);
+  expect(isValidElement(revived.rscProxy)).toBe(true);
+  expect(revived.rscProxy[RENDERABLE_RSC]).toBe(true);
+  expect(revived.rscProxy[SERVER_COMPONENT_STREAM]).toBeDefined();
+});

package/tests/router/hooks.test.ts

@@ -3,8 +3,10 @@ import {
   routerProviderRegistryHooks,
 } from '@modern-js/runtime/context';
 import * as tanstackHooks from '../../src/runtime/hooks';
+import { applyRouterRuntimeState } from '../../src/runtime/lifecycle';
 import { tanstackRouterPlugin as browserPlugin } from '../../src/runtime/plugin';
 import { tanstackRouterPlugin as nodePlugin } from '../../src/runtime/plugin.node';
+import { getTanstackRouterState } from '../../src/runtime/state';
 
 describe('tanstack router hooks single declaration source', () => {
   test('re-exports the canonical hook instances owned by @modern-js/runtime', () => {
@@ -24,3 +26,15 @@ describe('tanstack router hooks single declaration source', () => {
     expect(nodePlugin().registryHooks).toBe(routerProviderRegistryHooks);
   });
 });
+
+describe('tanstack router runtime state accessor', () => {
+  test('returns undefined before a tanstack router instance is created', () => {
+    const context = {};
+
+    applyRouterRuntimeState(context as never, {
+      framework: 'tanstack',
+    });
+
+    expect(getTanstackRouterState(context)).toBeUndefined();
+  });
+});

package/tests/router/routeTree.test.ts

@@ -809,6 +809,9 @@ describe('tanstack route tree from RouteObject[]', () => {
             path: 'client',
             clientData: './client.data',
             data: './data',
+            hasAction: true,
+            hasClientLoader: true,
+            hasLoader: true,
             inValidSSRRoute: true,
             isClientComponent: true,
           },
@@ -830,7 +833,9 @@ describe('tanstack route tree from RouteObject[]', () => {
 
     expect(clientRoute.options.ssr).toBe(false);
     expect(clientRoute.options.staticData).toMatchObject({
+      modernRouteHasAction: true,
       modernRouteHasClientLoader: true,
+      modernRouteHasLoader: true,
       modernRouteIsClientComponent: true,
     });
   });

package/tests/router/slotUsageSanitizer.test.ts

@@ -0,0 +1,23 @@
+import { sanitizeSlotArgs } from '../../src/runtime/rsc/slotUsageSanitizer';
+
+describe('RSC slot usage sanitizer', () => {
+  test('redacts callable slot args without serializing function source', () => {
+    function tokenFactory() {
+      return 'token-secret';
+    }
+
+    const args = sanitizeSlotArgs([
+      tokenFactory,
+      { nested: tokenFactory },
+      [tokenFactory],
+    ]);
+
+    expect(args).toEqual([
+      '[Function]',
+      { nested: '[Function]' },
+      ['[Function]'],
+    ]);
+    expect(JSON.stringify(args)).not.toContain('token-secret');
+    expect(JSON.stringify(args)).not.toContain('tokenFactory');
+  });
+});