@bleedingdev/modern-js-renderer-solid 3.9.3-ultramodern.8 → 3.9.3-ultramodern.9

package/src/router-binding/Asset.tsx

@@ -62,7 +62,7 @@ function InlineCssStyle({
   attrs,
   children,
 }: {
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: RouterManagedTag['children'];
 }) {
   const isInlineCssPlaceholder = children === undefined;
@@ -85,7 +85,7 @@ function InlineCssStyle({
 
 function HeadElement(props: {
   tag: 'meta' | 'link' | 'style';
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: unknown;
 }): JSX.Element | null {
   // Each branch must live in its own `case` block so the Solid compiler emits
@@ -101,11 +101,12 @@ function HeadElement(props: {
   let element: Element;
   switch (props.tag) {
     case 'style': {
-      const attrs = {
-        ...props.attrs,
-        innerHTML:
-          typeof props.children === 'string' ? props.children : undefined,
-      };
+      const attrs = { ...props.attrs };
+      // The managed child text owns this field, including when it is absent.
+      delete attrs.innerHTML;
+      if (typeof props.children === 'string') {
+        attrs.innerHTML = props.children;
+      }
       element = (<style {...attrs} />) as unknown as Element;
       break;
     }
@@ -125,7 +126,7 @@ function HeadElement(props: {
 }
 
 function Title(props: {
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: unknown;
 }): JSX.Element | null {
   let el: HTMLTitleElement | undefined;
@@ -158,7 +159,7 @@ function Title(props: {
 }
 
 function Script(props: {
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: unknown;
 }): JSX.Element | null {
   const router = useRouter();

package/src/router-binding/Matches.tsx

@@ -79,16 +79,16 @@ function MatchesInner() {
         getResetKey={() => router.stores.matches.get()}
         render={matchContent}
         errorComponent={ErrorComponent}
-        onCatch={
-          process.env.NODE_ENV !== 'production'
-            ? error => {
+        {...(process.env.NODE_ENV !== 'production'
+          ? {
+              onCatch: (error: Error) => {
                 console.warn(
                   `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,
                 );
                 console.warn(`Warning: ${error.message || error.toString()}`);
-              }
-            : undefined
-        }
+              },
+            }
+          : {})}
       />
     </NearestMatchContext>
   );
@@ -126,10 +126,10 @@ export function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {
       router.stores.resolvedLocation.get();
       router.stores.status.get();
       return router.matchRoute(rest as any, {
-        pending,
-        caseSensitive,
-        fuzzy,
-        includeSearch,
+        ...(pending !== undefined ? { pending } : {}),
+        ...(caseSensitive !== undefined ? { caseSensitive } : {}),
+        ...(fuzzy !== undefined ? { fuzzy } : {}),
+        ...(includeSearch !== undefined ? { includeSearch } : {}),
       });
     });
   };

package/src/router-binding/PROVENANCE.json

@@ -67,7 +67,7 @@
     "utils.ts": "a398c76ac378efe6f8b9aa859a5335d4f07cc692a31754fa93c8bf3e5df0b6ff"
   },
   "localChanges": [
-    "The public router surface omits InjectedHtmlEntry, isPlainArray and isPlainObject, which router-core 1.171.37 no longer exports. SSR options use the current top-level serializationAdapters contract and the public Solid 2 option types without legacy fallbacks or type assertions.",
+    "The public router surface omits InjectedHtmlEntry, isPlainArray and isPlainObject, which router-core 1.171.37 no longer exports. Managed SSR uses immutable public route data and native Solid 2 promise serialization. Custom serializationAdapters are unsupported and rejected before router construction or document commitment; the local public option types do not admit them.",
     "Authored JSX types import @solidjs/web and have explicit return annotations for Solid 2 declaration generation.",
     "Hydration state and keyed match transfer use Solid 2 RC.13 public isHydrating, isHydratable, getHydrationWriter and takeHydrationValue APIs.",
     "Explicit public beforeLoad results transfer after canonical validation; private request context stays in owner closures. Initial hydration inherits checked server beforeLoad contributions, invokes the native client route-context callback and preserves client options context without rerunning initial beforeLoad callbacks or loaders.",

package/src/router-binding/RouterProvider.tsx

@@ -1,18 +1,16 @@
 import type { JSX } from '@solidjs/web';
-import type {
-  AnyRouter,
-  RegisteredRouter,
-  RouterOptions,
-} from '@tanstack/router-core';
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core';
 import { isServer } from '@tanstack/router-core/isServer';
 import * as Solid from 'solid-js';
 import { setupFlightDataConsumer } from './flightData';
 import { Matches } from './Matches';
 import {
+  assertNativeSerializationOptions,
   requireManagedPublicRouter,
   serializeMatchTransfer,
 } from './registryTransfer';
 import { routerContext } from './routerContext';
+import type { RouterOptions } from './routerOptions';
 import { SafeFragment } from './SafeFragment';
 
 const RouterContext = routerContext as unknown as Solid.Component<{
@@ -30,6 +28,7 @@ export function RouterContextProvider<
 }: RouterProps<TRouter, TDehydrated> & {
   children: () => JSX.Element;
 }) {
+  assertNativeSerializationOptions(rest);
   requireManagedPublicRouter(router);
   if (Object.keys(rest).length > 0) {
     Solid.runWithOwner(null, () => {

package/src/router-binding/Transitioner.tsx

@@ -162,9 +162,14 @@ export function Rendered() {
   Solid.onSettled(() => {
     const resolvedLocation = getResolvedLocation(router);
     if (resolvedLocation) {
+      const { fromLocation, ...changeInfo } = getLocationChangeInfo(
+        resolvedLocation,
+        resolvedLocation,
+      );
       router.emit({
         type: 'onRendered',
-        ...getLocationChangeInfo(resolvedLocation, resolvedLocation),
+        ...changeInfo,
+        ...(fromLocation !== undefined ? { fromLocation } : {}),
       });
     }
   });

package/src/router-binding/fileRoute.ts

@@ -69,7 +69,7 @@ export class FileRoute<
     public path?: TFilePath,
     _opts?: { silent: boolean },
   ) {
-    this.silent = _opts?.silent;
+    if (_opts) this.silent = _opts.silent;
   }
 
   createRoute = <

package/src/router-binding/headContentUtils.tsx

@@ -154,7 +154,9 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
           ...manifest.inlineStyle.attrs,
           nonce,
         },
-        children: manifest.inlineStyle.children,
+        ...(manifest.inlineStyle.children !== undefined
+          ? { children: manifest.inlineStyle.children }
+          : {}),
         inlineCss: true,
       });
     }
@@ -192,7 +194,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
           ...attrs,
           nonce,
         },
-        children: children as string | undefined,
+        ...(children != null ? { children: String(children) } : {}),
       })) satisfies Array<RouterManagedTag>;
   });
 
@@ -206,7 +208,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
           ...attrs,
           nonce,
         },
-        children: children as string | undefined,
+        ...(children != null ? { children: String(children) } : {}),
       })) satisfies Array<RouterManagedTag>;
   });
 

package/src/router-binding/index.tsx

@@ -26,7 +26,6 @@ export type {
   AnyRouterWithContext,
   AnyRouteWithContext,
   AnySchema,
-  AnySerializationAdapter,
   AnyValidator,
   AnyValidatorAdapter,
   AnyValidatorFn,
@@ -153,7 +152,6 @@ export type {
   RouterEvents,
   RouterListener,
   RouterManagedTag,
-  RouterOptions,
   RouterState,
   RoutesById,
   RoutesByPath,
@@ -163,7 +161,6 @@ export type {
   SearchSchemaInput,
   SearchSerializer,
   SerializableExtensions,
-  SerializationAdapter,
   StaticDataRouteOption,
   StringifyParamsFn,
   ToMaskOptions,
@@ -197,7 +194,6 @@ export {
   cleanPath,
   composeRewrites,
   createControlledPromise,
-  createSerializationAdapter,
   DEFAULT_PROTOCOL_ALLOWLIST,
   deepEqual,
   defaultParseSearch,
@@ -291,6 +287,7 @@ export {
   rootRouteWithContext,
 } from './route';
 export { createRouter, Router } from './router';
+export type { RouterOptions } from './routerOptions';
 export { ScriptOnce } from './ScriptOnce';
 export { Scripts } from './Scripts';
 export {

package/src/router-binding/link.tsx

@@ -505,9 +505,9 @@ export function useLinkProps<
   }
 
   const defineGetters = (getters: Record<string, () => any>) => {
-    for (const key of Object.keys(getters)) {
+    for (const [key, get] of Object.entries(getters)) {
       Object.defineProperty(linkProps, key, {
-        get: getters[key],
+        get,
         enumerable: true,
         configurable: true,
       });

package/src/router-binding/registryTransfer.ts

@@ -78,8 +78,21 @@ export function registerPublicRouteDataOwner(
   });
 }
 
+/** Managed match transfer uses the immutable public-data contract, not custom adapters. */
+export function assertNativeSerializationOptions(options: object): void {
+  if ('serializationAdapters' in options) {
+    const error = new DataProtocolError(
+      'Solid serializationAdapters are unsupported by the immutable public-data profile; return public records, arrays and scalars instead',
+    );
+    const owner: RequestSession | undefined = getRequestEvent()?.locals.session;
+    owner?.fail(error);
+    throw error;
+  }
+}
+
 /** Framework SSR accepts only routers that passed its public-data factory boundary. */
 export function requireManagedPublicRouter(router: AnyRouter): void {
+  assertNativeSerializationOptions(router.options);
   const owner: RequestSession | undefined = getRequestEvent()?.locals.session;
   if (
     !owner ||
@@ -268,6 +281,11 @@ export function primeRouterFromRegistry(router: AnyRouter): boolean {
   try {
     for (const [index, match] of matches.entries()) {
       const entry = entries[index]!;
+      const beforeLoadContext = preparePublicContextData(
+        entry.beforeLoadContext,
+        owner,
+        privateContexts,
+      ) as Record<string, unknown> | undefined;
       const checked: TransferredMatch = {
         ...entry,
         loaderData: prepareHydratedLoaderData(
@@ -275,11 +293,7 @@ export function primeRouterFromRegistry(router: AnyRouter): boolean {
           owner,
           privateContexts,
         ),
-        beforeLoadContext: preparePublicContextData(
-          entry.beforeLoadContext,
-          owner,
-          privateContexts,
-        ) as Record<string, unknown> | undefined,
+        ...(beforeLoadContext !== undefined ? { beforeLoadContext } : {}),
         error: preparePublicContextData(entry.error, owner, privateContexts),
       };
       entries[index] = checked;
@@ -356,7 +370,10 @@ function applyTransferredMatch(
     __beforeLoadContext: entry.beforeLoadContext,
   } as AnyRouteMatch;
   if ('loaderData' in entry) next.loaderData = entry.loaderData;
-  if ('ssr' in entry) next.ssr = entry.ssr;
+  if ('ssr' in entry) {
+    if (entry.ssr === undefined) delete next.ssr;
+    else next.ssr = entry.ssr;
+  }
   return next;
 }
 

package/src/router-binding/route.tsx

@@ -133,7 +133,7 @@ export class RouteApi<
     return useNavigate({ from: router.routesById[this.id as string].fullPath });
   };
 
-  notFound = (opts?: NotFoundError) => {
+  override notFound = (opts?: NotFoundError) => {
     return notFound({ routeId: this.id as string, ...opts });
   };
 

package/src/router-binding/router.ts

@@ -9,6 +9,7 @@ import type {
 import { RouterCore } from '@tanstack/router-core';
 import { isServer } from '@tanstack/router-core/isServer';
 import {
+  assertNativeSerializationOptions,
   installPublicContextPublication,
   primeRouterFromRegistry,
 } from './registryTransfer';
@@ -104,6 +105,7 @@ export class Router<
       TDehydrated
     >,
   ) {
+    assertNativeSerializationOptions(options);
     super(options, getStoreFactory);
     installPublicContextPublication(this);
     // The hydration-claiming boot (see registryTransfer). Router creation is

package/src/router-binding/routerOptions.ts

@@ -0,0 +1,26 @@
+import type { RouterHistory } from '@tanstack/history';
+import type {
+  AnyRoute,
+  RouterOptions as CoreRouterOptions,
+  TrailingSlashOption,
+} from '@tanstack/router-core';
+
+/** Native managed hydration transfers immutable public data only. */
+export type RouterOptions<
+  TRouteTree extends AnyRoute,
+  TTrailingSlashOption extends TrailingSlashOption,
+  TDefaultStructuralSharingOption extends boolean = false,
+  TRouterHistory extends RouterHistory = RouterHistory,
+  TDehydrated = undefined,
+> = Omit<
+  CoreRouterOptions<
+    TRouteTree,
+    TTrailingSlashOption,
+    TDefaultStructuralSharingOption,
+    TRouterHistory,
+    TDehydrated
+  >,
+  'serializationAdapters'
+> & {
+  serializationAdapters?: never;
+};

package/src/router-binding/useLoaderData.tsx

@@ -41,10 +41,11 @@ export function useLoaderData<
   opts: UseLoaderDataOptions<TRouter, TFrom, TStrict, TSelected>,
 ): Accessor<UseLoaderDataResult<TRouter, TFrom, TStrict, TSelected>> {
   return useMatch({
-    from: opts.from!,
-    strict: opts.strict,
+    ...opts,
     select: match => {
-      return opts.select ? opts.select(match.loaderData) : match.loaderData;
+      // The hook reads the rendered match; router-core also types pending
+      // matches, where loaderData is optional, in this shared match shape.
+      return opts.select ? opts.select(match.loaderData!) : match.loaderData;
     },
   }) as any;
 }

package/src/router-binding/useNavigate.tsx

@@ -16,12 +16,14 @@ export function useNavigate<
 }): UseNavigateResult<TDefaultFrom> {
   const router = useRouter();
 
-  return ((options: NavigateOptions) => {
+  const navigate: UseNavigateResult<TDefaultFrom> = options => {
+    const from = options.from ?? _defaultOpts?.from;
     return router.navigate({
       ...options,
-      from: options.from ?? _defaultOpts?.from,
+      ...(from === undefined ? {} : { from }),
     });
-  }) as UseNavigateResult<TDefaultFrom>;
+  };
+  return navigate;
 }
 
 export function Navigate<

package/src/router-binding/useParams.tsx

@@ -61,9 +61,7 @@ export function useParams<
   ThrowOrOptional<UseParamsResult<TRouter, TFrom, TStrict, TSelected>, TThrow>
 > {
   return useMatch({
-    from: opts.from!,
-    strict: opts.strict,
-    shouldThrow: opts.shouldThrow,
+    ...opts,
     select: match => {
       const params = opts.strict === false ? match.params : match._strictParams;
       return opts.select ? opts.select(params) : params;

package/src/router-binding/useSearch.tsx

@@ -61,9 +61,7 @@ export function useSearch<
   ThrowOrOptional<UseSearchResult<TRouter, TFrom, TStrict, TSelected>, TThrow>
 > {
   return useMatch({
-    from: opts.from!,
-    strict: opts.strict,
-    shouldThrow: opts.shouldThrow,
+    ...opts,
     select: match => {
       const search = match.search;
       return opts.select ? opts.select(search) : search;

package/src/router.ts

@@ -77,11 +77,11 @@ export interface FileSystemRouteModule {
   pendingComponent?: RouteComponent;
   errorComponent?: ErrorRouteComponent;
   notFoundComponent?: NotFoundRouteComponent;
-  head?: AnyRoute['options']['head'];
+  head?: NonNullable<AnyRoute['options']['head']>;
   /** Explicit returned context becomes immutable public native route context. */
-  beforeLoad?: AnyRoute['options']['beforeLoad'];
+  beforeLoad?: NonNullable<AnyRoute['options']['beforeLoad']>;
   /** Native synchronous context contributions are checked before composition. */
-  context?: AnyRoute['options']['context'];
+  context?: NonNullable<AnyRoute['options']['context']>;
   validateSearch?: (search: Record<string, unknown>) => Record<string, unknown>;
 }