@ecopages/core 0.2.0-rc.0 → 0.2.0-rc.2

package/README.md

@@ -80,7 +80,7 @@ Use this package README as the top-level map, then drill into the focused subsys
 
 - `src/config/README.md`: config finalization and app-owned runtime/build state
 - `src/plugins/README.md`: integration and processor authoring contracts
-- `src/build/README.md`: build adapter, executor, and development build coordination
+- `src/build/README.md`: build adapter, executor, development build coordination, and standalone Node server packaging
 - `src/services/README.md`: cross-cutting runtime services and orchestration helpers
 - `src/adapters/README.md`: Bun, Node, and shared adapter boundaries
 - `src/dev/README.md`: dev transform server and on-demand client delivery
@@ -298,6 +298,7 @@ Use these entrypoints when implementing integrations, processors, or source tran
 - `@ecopages/core/plugins/processor`
 - `@ecopages/core/plugins/source-transform`
 - `@ecopages/core/route-renderer/orchestration/integration-renderer`
+- `@ecopages/core/route-renderer/orchestration/document-shell/layout-shell-props.service`
 - `@ecopages/core/services/asset-processing-service`
 - `@ecopages/core/hmr/hmr-strategy`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-rc.0",
+  "version": "0.2.0-rc.2",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-rc.0",
+    "@ecopages/file-system": "0.2.0-rc.2",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@oxc-project/runtime": "0.141.0",
@@ -31,7 +31,7 @@
     "@standard-schema/utils": "^0.3.0"
   },
   "peerDependencies": {
-    "@ecopages/dev-toolbar": "0.2.0-rc.0"
+    "@ecopages/dev-toolbar": "0.2.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@ecopages/dev-toolbar": {
@@ -75,6 +75,10 @@
       "types": "./src/route-renderer/orchestration/document-shell/document-shell-render.service.d.ts",
       "default": "./src/route-renderer/orchestration/document-shell/document-shell-render.service.js"
     },
+    "./route-renderer/orchestration/document-shell/layout-shell-props.service": {
+      "types": "./src/route-renderer/orchestration/document-shell/layout-shell-props.service.d.ts",
+      "default": "./src/route-renderer/orchestration/document-shell/layout-shell-props.service.js"
+    },
     "./route-renderer/orchestration/page-browser-graph/page-browser-graph-merge.utils": {
       "types": "./src/route-renderer/orchestration/page-browser-graph/page-browser-graph-merge.utils.d.ts",
       "default": "./src/route-renderer/orchestration/page-browser-graph/page-browser-graph-merge.utils.js"
@@ -363,6 +367,10 @@
       "types": "./src/route-renderer/orchestration/document-shell/document-shell-render.service.d.ts",
       "default": "./src/route-renderer/orchestration/document-shell/document-shell-render.service.js"
     },
+    "./route-renderer/orchestration/document-shell/layout-shell-props.service.ts": {
+      "types": "./src/route-renderer/orchestration/document-shell/layout-shell-props.service.d.ts",
+      "default": "./src/route-renderer/orchestration/document-shell/layout-shell-props.service.js"
+    },
     "./route-renderer/orchestration/page-browser-graph/page-browser-graph-merge.utils.ts": {
       "types": "./src/route-renderer/orchestration/page-browser-graph/page-browser-graph-merge.utils.d.ts",
       "default": "./src/route-renderer/orchestration/page-browser-graph/page-browser-graph-merge.utils.js"

package/src/adapters/bun/create-app.d.ts

@@ -8,7 +8,7 @@
  * @module EcopagesApp
  */
 import type { Server } from 'bun';
-import type { ApiHandlerContext, RouteGroupBuilder } from '../../types/public-types.js';
+import type { ApiHandlerContext, EcopagesRouteInfo, RouteGroupBuilder } from '../../types/public-types.js';
 import { SharedApplicationAdapter } from '../shared/runtime/application-adapter.js';
 import type { RuntimeHost } from '../shared/runtime/runtime-host.js';
 import type { EcopagesAppOptions } from '../create-app.js';
@@ -55,7 +55,7 @@ export declare class BunEcopagesApp<WebSocketData = undefined> extends SharedApp
      */
     protected bootServer(): Promise<Server<WebSocketData> | void>;
     stop(force?: boolean): Promise<void>;
-    protected resolveAppRoutes(): Promise<import("../../index.browser.js").EcopagesRouteInfo[]>;
+    protected resolveAppRoutes(): Promise<EcopagesRouteInfo[]>;
 }
 /**
  * Factory function to create a Bun application

package/src/adapters/shared/http/define-api-handler.d.ts

@@ -12,55 +12,13 @@ export declare function defineApiHandler<TPath extends string, TSchema extends R
 declare const defineApiMethod: <M extends ApiHandler["method"]>(method: M) => <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: DefineApiHandlerInput<TPath, TSchema, TContext> & {
     path: TPath;
 }) => ApiHandler<TPath, Request, unknown>;
-export declare const defineGet: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare const definePost: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare const definePut: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare const defineDelete: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare const definePatch: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare const defineOptions: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
-export declare const defineHead: <const TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, "middleware" | "method" | "schema" | "handler"> & {
-    handler: (context: SchemaHandlerContext<TSchema, TContext>) => Promise<Response> | Response;
-    middleware?: Middleware<Request, unknown, TContext>[] | undefined;
-    schema?: TSchema | undefined;
-} & {
-    path: TPath;
-}) => ApiHandler<TPath, Request, unknown>;
+export declare const defineGet: ReturnType<typeof defineApiMethod<'GET'>>;
+export declare const definePost: ReturnType<typeof defineApiMethod<'POST'>>;
+export declare const definePut: ReturnType<typeof defineApiMethod<'PUT'>>;
+export declare const defineDelete: ReturnType<typeof defineApiMethod<'DELETE'>>;
+export declare const definePatch: ReturnType<typeof defineApiMethod<'PATCH'>>;
+export declare const defineOptions: ReturnType<typeof defineApiMethod<'OPTIONS'>>;
+export declare const defineHead: ReturnType<typeof defineApiMethod<'HEAD'>>;
 export declare function json(data: unknown, options?: ResponseOptions): Response;
 export declare function html(content: string, options?: ResponseOptions): Response;
 export declare function redirect(url: string, status?: number): Response;

package/src/build/README.md

@@ -56,7 +56,7 @@ build/
 - `runtime/build-request-policy.ts`: server/browser request constructors and plugin collision rules.
 - `runtime/build-request-identity.ts` / `cache/cache-keys.ts`: canonical request identity and shared cache fingerprints.
 - `contracts/build-types.ts`: the `EcoBuildPlugin` contract used by integrations and processors.
-- `rolldown/rolldown-build-adapter.ts`: the production `BuildAdapter`. Wraps the bundler, normalizes Node output imports, and exposes a normalized `BuildResult`.
+- `rolldown/rolldown-build-adapter.ts`: the production `BuildAdapter`. Wraps the bundler, normalizes Node output imports, and exposes a normalized `BuildResult`. App dependencies remain bare imports; Core-owned runtime packages that need CommonJS named-export interop are bundled, while other Core dependencies resolve to `file:` URLs. Generated server bundles therefore do not require app-level framework dependencies.
 - `rolldown/rolldown-plugin-bridge.ts`: `EcoBuildPlugin[]` → bundler-plugin translation.
 - `runtime/serialized-build-executor.ts`: FIFO queue primitive.
 - `cache/server-entry-build-cache.ts`: production server-entry bundle cache (`.eco/.server-entry/.build-cache.json` + `dist/.server/manifest.json`).

package/src/build/rolldown/rolldown-adapter-helpers.js

@@ -20,6 +20,7 @@ import { isDeclaredAppPackageImport, isWorkspacePackageImport, normalizeNodeRunt
 const corePackageRequire = createRequire(new URL('../../../package.json', import.meta.url));
 const nodeBuiltinSpecifiers = new Set(builtinModules);
 let corePackageNames;
+const CORE_RUNTIME_BUNDLED_PACKAGES = new Set(['ws']);
 /**
  * Returns the set of packages declared as direct dependencies in core's own
  * `package.json` (all dependency fields combined).
@@ -102,12 +103,12 @@ function getAppRootRequire(cache, contextRoot) {
  *    TypeScript or JSX file (source packages); pre-compiled packages are left
  *    external so the app's own resolver handles them at runtime.
  * 3. **Everything else** (undeclared transitives) — split into two sub-cases:
- *    - A **direct dependency of core** that resolves to a compiled JS file
- *      (e.g. `oxc-parser`, `rolldown`, `ws`): externalized so the
- *      `runtime-build-output-normalizer` can rewrite the import to an
- *      absolute `file://` URL after the build. "Direct" means declared in
- *      core's own `package.json`; transitives that merely *resolve through*
- *      core's `require` are excluded.
+ *    - A **direct dependency of core** that resolves to a compiled JS file:
+ *      externalized so the `runtime-build-output-normalizer` can rewrite the
+ *      import to an absolute `file://` URL after the build. Runtime packages
+ *      that require CommonJS named-export interop (currently `ws`) are
+ *      bundled instead. "Direct" means declared in core's own `package.json`;
+ *      transitives that merely *resolve through* core's `require` are excluded.
  *    - **Everything else** (true transitives like `lexical`, `@lexical/react`):
  *      bundled unconditionally. pnpm strict hoisting means these packages
  *      are unreachable as bare specifiers from output directories such as
@@ -128,6 +129,9 @@ function shouldBundlePackageImport(id, contextRoot, appRootRequireCache) {
         return Boolean(appResolvedPath && /\.(?:[cm]?ts|tsx|jsx)$/u.test(appResolvedPath));
     }
     if (isCoreDeclaredPackageImport(id)) {
+        if (CORE_RUNTIME_BUNDLED_PACKAGES.has(getPackageName(id))) {
+            return true;
+        }
         const coreResolvedPath = tryResolveModule(id, corePackageRequire);
         if (coreResolvedPath && !/\.(?:[cm]?ts|tsx|jsx)$/u.test(coreResolvedPath)) {
             return false;
@@ -135,6 +139,11 @@ function shouldBundlePackageImport(id, contextRoot, appRootRequireCache) {
     }
     return true;
 }
+function getPackageName(specifier) {
+    return specifier.startsWith('@')
+        ? specifier.split('/').slice(0, 2).join('/')
+        : (specifier.split('/')[0] ?? specifier);
+}
 function createExternalMatcher(options, appRootRequireCache) {
     const explicitExternals = new Set(options.external ?? []);
     const externalPackages = options.externalPackages === true;

package/src/build/rolldown/runtime-build-output-normalizer.js

@@ -6,19 +6,6 @@ import { isBarePackageImportSpecifier } from '../../plugins/tsconfig-import-reso
 const corePackageRequire = createRequire(new URL('../../../package.json', import.meta.url));
 const appDeclaredPackageCache = new Map();
 const appWorkspacePackageCache = new Map();
-/**
- * Core-owned packages that are part of the Node adapter's runtime surface and
- * should therefore be preserved as bare specifiers in bundled output.
- *
- * Only list packages whose bare-specifier form will be resolvable from the
- * app's Node.js runtime (i.e. they ship alongside the framework and do not
- * need to be in the app's own package.json).
- *
- * Build-time tools (e.g. oxc-parser, rolldown) deliberately omitted — their
- * imports in server-side output must be rewritten to absolute file: URLs so
- * the bundler does not embed them in app code.
- */
-const CORE_RUNTIME_BARE_SPECIFIER_PACKAGES = new Set(['ws']);
 function tryResolveRuntimeImport(specifier, resolver) {
     try {
         return resolver.resolve(specifier);
@@ -143,24 +130,11 @@ export function isDeclaredAppPackageImport(specifier, rootDir) {
  * Whether the given bare specifier should be left as-is (not rewritten to a
  * file URL) in bundled output.
  *
- * Two categories qualify:
- * 1. **App-declared packages** — present in the app's own package.json; the
- *    app's resolver will find them at runtime.
- * 2. **Core runtime surface packages** — a curated subset of the framework's
- *    own dependencies that are part of its public Node adapter surface (e.g.
- *    `ws`). These ship alongside the framework and are resolvable from the
- *    bundled output's location even when the app has not declared them.
- *
- * Build-time packages declared by core (e.g. `oxc-parser`, `rolldown`) are
- * intentionally *not* included here — their imports must still be rewritten
- * to absolute `file:` URLs so they are not left as bare specifiers in app
- * output.
+ * Only app-declared packages qualify: their resolver can find them from a
+ * generated server bundle. Core dependencies remain file URLs because a
+ * bundle in `dist/.server` is not inside Core's Node.js resolution chain.
  */
 function isDeclaredInResolutionChain(specifier, rootDir) {
-    const packageName = getPackageNameFromSpecifier(specifier);
-    if (CORE_RUNTIME_BARE_SPECIFIER_PACKAGES.has(packageName)) {
-        return true;
-    }
     return isDeclaredAppPackageImport(specifier, rootDir);
 }
 function rewriteRuntimeImportSpecifier(specifier, quote, rootDir) {

package/src/plugins/README.md

@@ -16,7 +16,8 @@ These contracts are responsible for:
 ## Main Files
 
 - `integration-plugin.ts`: framework-semantics contract for render integrations
-- `processor.ts`: asset-transformation contract for processors
+- `define-integration.ts`: typed factory for integrations that only need declarative config and a renderer class
+- `processor.ts`: asset-transformation contract for processors, including generated `@types` package helpers for virtual modules
 - `runtime-capability.ts`: runtime compatibility declaration types
 - `source-transform.ts`: bundler-neutral source-transform primitive with Ecopages adapters plus app-level Vite plugin composition helpers
 - `eco-component-meta-plugin.ts`: component-identity attribution transform that uses a lexical `eco.` gate, then an Oxc `CallExpression` rewrite

package/src/plugins/integration-plugin.d.ts

@@ -64,13 +64,14 @@ export interface IntegrationPluginConfig {
      */
     jsxImportSource?: string;
 }
-type RendererClass<C> = new (options: {
+type IntegrationRendererConstructorOptions = {
     appConfig: EcoPagesAppConfig;
     assetProcessingService: AssetProcessingService;
     resolvedIntegrationDependencies: ProcessedAsset[];
     rendererModules?: unknown;
     runtimeOrigin: string;
-}) => IntegrationRenderer<C>;
+};
+type RendererClass<C> = new (options: IntegrationRendererConstructorOptions) => IntegrationRenderer<C>;
 /**
  * Base class for framework integrations.
  *
@@ -186,13 +187,7 @@ export declare abstract class IntegrationPlugin<C = EcoPagesElement> {
      */
     protected createRendererOptions(options?: {
         rendererModules?: unknown;
-    }): {
-        appConfig: EcoPagesAppConfig;
-        assetProcessingService: AssetProcessingService;
-        resolvedIntegrationDependencies: ProcessedAsset[];
-        rendererModules: unknown;
-        runtimeOrigin: string;
-    };
+    }): IntegrationRendererConstructorOptions;
     /**
      * Attaches runtime-only services after a renderer instance has been created.
      */

package/src/plugins/processor.d.ts

@@ -13,6 +13,19 @@ export declare function resolveGeneratedPath(type: keyof typeof GENERATED_BASE_P
     module: string;
     subPath?: string;
 }): string;
+/**
+ * Serializes the TypeScript `@types` package manifest for generated virtual-module declarations.
+ */
+export declare function serializeGeneratedTypesPackage(packageName: string): string;
+/**
+ * Writes the generated `@types` package manifest that TypeScript auto-loads from `node_modules`.
+ */
+export declare function writeGeneratedTypesPackage(options: {
+    root: string;
+    module: string;
+    packageName: string;
+    writeFile: (filePath: string, content: string) => void;
+}): void;
 export interface ProcessorWatchContext {
     path: string;
     bridge: IClientBridge;

package/src/plugins/processor.js

@@ -14,6 +14,27 @@ export function resolveGeneratedPath(type, options) {
     const parts = [root, GENERATED_BASE_PATHS[type], module, subPath].filter(Boolean);
     return path.join(...parts);
 }
+/**
+ * Serializes the TypeScript `@types` package manifest for generated virtual-module declarations.
+ */
+export function serializeGeneratedTypesPackage(packageName) {
+    return `${JSON.stringify({
+        name: packageName,
+        version: '0.0.0',
+        types: './index.d.js',
+    }, null, 2)}\n`;
+}
+/**
+ * Writes the generated `@types` package manifest that TypeScript auto-loads from `node_modules`.
+ */
+export function writeGeneratedTypesPackage(options) {
+    const packageManifestPath = resolveGeneratedPath('types', {
+        root: options.root,
+        module: options.module,
+        subPath: 'package.json',
+    });
+    options.writeFile(packageManifestPath, serializeGeneratedTypesPackage(options.packageName));
+}
 /**
  * Base class for content and asset processors that contribute build plugins.
  *

package/src/route-renderer/README.md

@@ -63,7 +63,7 @@ Domain folders:
 
 - `ownership-graph/`: component graph walk/collect and up-front ownership validation
 - `foreign-child/`: active render context, foreign-subtree execution, deferred template serialization
-- `document-shell/`: shared page/layout/html shell composition and attribute stamping helpers
+- `document-shell/`: shared page/layout/html shell composition, layout prop resolution, and attribute stamping helpers
 - `route-pipeline/`: route preparation, final HTML capture, marker-artifact enforcement
 - `page-browser-graph/`: browser asset graph build, session cache, and injector assets
 

package/src/route-renderer/orchestration/document-shell/layout-shell-props.service.d.ts

@@ -1,7 +1,12 @@
-import type { EcoPageLayoutEntry, LayoutPropsContext } from '../../../types/public-types.js';
+import type { EcoComponent, EcoPageLayoutEntry, LayoutPropsContext } from '../../../types/public-types.js';
+import type { DocumentShellLayoutInput } from './document-shell-render.service.js';
 export type LayoutShellPropsContext = LayoutPropsContext & {
     pageProps?: Record<string, unknown>;
 };
+export type DocumentShellLayoutResolutionInput = LayoutShellPropsContext & {
+    layout?: EcoComponent;
+    layoutEntries?: EcoPageLayoutEntry[];
+};
 /**
  * Resolves the default shell props passed to a layout tier during route render.
  */
@@ -10,6 +15,13 @@ export declare function resolveLayoutShellProps(context: LayoutShellPropsContext
  * Resolves props for one layout entry, merging shell props with an optional factory.
  */
 export declare function resolveLayoutEntryProps(entry: EcoPageLayoutEntry, context: LayoutShellPropsContext): Record<string, unknown>;
+/**
+ * Resolves declarative layout entries into the document-shell inputs used during route render.
+ *
+ * @remarks Layout prop factories must be evaluated here so integrations do not
+ * silently fall back to the innermost layout and discard route-specific props.
+ */
+export declare function resolveDocumentShellLayouts(input: DocumentShellLayoutResolutionInput): DocumentShellLayoutInput[];
 /**
  * Reads the normalized layout stack from a page component config.
  */

package/src/route-renderer/orchestration/document-shell/layout-shell-props.service.js

@@ -22,6 +22,21 @@ export function resolveLayoutEntryProps(entry, context) {
         ...entry.props(layoutPropsContext),
     };
 }
+/**
+ * Resolves declarative layout entries into the document-shell inputs used during route render.
+ *
+ * @remarks Layout prop factories must be evaluated here so integrations do not
+ * silently fall back to the innermost layout and discard route-specific props.
+ */
+export function resolveDocumentShellLayouts(input) {
+    if (input.layoutEntries && input.layoutEntries.length > 0) {
+        return input.layoutEntries.map((entry) => ({
+            component: entry.component,
+            props: resolveLayoutEntryProps(entry, input),
+        }));
+    }
+    return input.layout ? [{ component: input.layout, props: resolveLayoutShellProps(input) }] : [];
+}
 /**
  * Reads the normalized layout stack from a page component config.
  */

package/src/route-renderer/orchestration/integration-renderer.d.ts

@@ -16,6 +16,7 @@ import { type ResolvedPageDependencies } from '../page-loading/resolved-page-dep
 import { type GroupedGraphBuildPlan } from './page-browser-graph/grouped-graph-build-plan.js';
 import type { ForeignChildRuntime } from './foreign-child/component-render-context.js';
 import { ForeignSubtreeExecutionService } from './foreign-child/foreign-subtree-execution.service.js';
+import { type DocumentShellLayoutInput } from './document-shell/document-shell-render.service.js';
 /**
  * Controls how one route module is loaded outside the normal render path.
  */
@@ -210,6 +211,7 @@ export declare abstract class IntegrationRenderer<C = EcoPagesElement> {
             component: EcoComponent;
             props?: Record<string, unknown>;
         };
+        layouts?: DocumentShellLayoutInput[];
         htmlTemplate: EcoComponent;
         metadata: PageMetadataProps;
         pageProps: Record<string, unknown>;

package/src/route-renderer/orchestration/string-markup-renderer.d.ts

@@ -9,6 +9,6 @@ import { IntegrationRenderer, type RenderToResponseContext } from './integration
  */
 export declare abstract class StringMarkupRenderer extends IntegrationRenderer<EcoPagesElement> {
     renderComponent(input: ComponentRenderInput): Promise<ComponentRenderResult>;
-    render({ params, query, props, locals, pageLocals, metadata, Page, Layout, HtmlTemplate, pageProps, }: IntegrationRendererRenderOptions): Promise<RouteRendererBody>;
+    render({ params, query, props, locals, pageLocals, metadata, Page, Layout, layoutEntries, HtmlTemplate, pageProps, }: IntegrationRendererRenderOptions): Promise<RouteRendererBody>;
     renderToResponse<P = Record<string, unknown>>(view: EcoComponent<P>, props: P, ctx: RenderToResponseContext): Promise<Response>;
 }

package/src/route-renderer/orchestration/string-markup-renderer.js

@@ -1,5 +1,5 @@
 import { IntegrationRenderer } from './integration-renderer.js';
-import { resolveInnermostPageLayout } from './document-shell/layout-shell-props.service.js';
+import { resolveDocumentShellLayouts, resolveInnermostPageLayout, } from './document-shell/layout-shell-props.service.js';
 /**
  * Base renderer for integrations whose page output is string HTML markup.
  *
@@ -14,19 +14,20 @@ export class StringMarkupRenderer extends IntegrationRenderer {
         }
         return this.renderStringComponentWithQueuedForeignSubtrees(input, input.component);
     }
-    async render({ params, query, props, locals, pageLocals, metadata, Page, Layout, HtmlTemplate, pageProps, }) {
+    async render({ params, query, props, locals, pageLocals, metadata, Page, Layout, layoutEntries, HtmlTemplate, pageProps, }) {
         try {
             return await this.renderPageWithDocumentShell({
                 page: {
                     component: Page,
                     props: { params, query, ...props, locals: pageLocals },
                 },
-                layout: Layout
-                    ? {
-                        component: Layout,
-                        props: locals ? { locals } : {},
-                    }
-                    : undefined,
+                layouts: resolveDocumentShellLayouts({
+                    layout: Layout,
+                    layoutEntries,
+                    params,
+                    query,
+                    locals,
+                }),
                 htmlTemplate: HtmlTemplate,
                 metadata,
                 pageProps: pageProps ?? props ?? {},

package/src/types/public-types.d.ts

@@ -603,8 +603,8 @@ export interface HtmlTemplateProps<T = EcoPagesElement> extends PageHeadProps<T>
  * Request-scoped context available to layout prop factories on `eco.page`.
  */
 export type LayoutPropsContext = {
-    params?: Record<string, string>;
-    query?: Record<string, string>;
+    params?: PageParams;
+    query?: PageQuery;
     locals?: RequestLocals;
 };
 /**