@ecopages/core 0.2.0-beta.13 → 0.2.0-beta.14

package/src/route-renderer/orchestration/ownership-validation.service.d.ts

@@ -24,6 +24,7 @@ export declare class OwnershipValidationService {
      * Validates foreign ownership edges reachable from the supplied route roots.
      */
     validate(input: OwnershipValidationInput): OwnershipValidationError[];
+    private assertDeclaredComponentDependencies;
     private isRegisteredIntegration;
 }
 /**

package/src/route-renderer/orchestration/ownership-validation.service.js

@@ -1,4 +1,6 @@
+import { assertEcoDeclaredComponent } from "../../eco/eco-declared-component.js";
 import { mapDeclaredOwnershipGraph } from "./declared-ownership-graph.js";
+import { walkComponentGraph } from "./component-graph.js";
 class OwnershipValidationService {
   appConfig;
   /**
@@ -11,6 +13,7 @@ class OwnershipValidationService {
    * Validates foreign ownership edges reachable from the supplied route roots.
    */
   validate(input) {
+    this.assertDeclaredComponentDependencies(input);
     return mapDeclaredOwnershipGraph({
       roots: input.roots,
       currentIntegrationName: input.currentIntegrationName,
@@ -44,6 +47,21 @@ class OwnershipValidationService {
       }
     }).flat();
   }
+  assertDeclaredComponentDependencies(input) {
+    walkComponentGraph({
+      roots: input.roots,
+      currentIntegrationName: input.currentIntegrationName,
+      onComponent: ({ component }) => {
+        const parentFile = component.config?.__eco?.file;
+        for (const child of component.config?.dependencies?.components ?? []) {
+          if (!child) {
+            continue;
+          }
+          assertEcoDeclaredComponent(child, { parentComponentFile: parentFile });
+        }
+      }
+    });
+  }
   isRegisteredIntegration(integrationName, currentIntegrationName) {
     if (integrationName === currentIntegrationName) {
       return true;

package/src/route-renderer/orchestration/route-prepared-options.builder.d.ts

@@ -1,10 +1,12 @@
 import type { EcoPagesAppConfig } from '../../types/internal-types.js';
-import type { ComponentRenderResult, EcoComponent, EcoPageComponent, EcoPageFile, HtmlTemplateProps, IntegrationRendererRenderOptions, PageBrowserGraphResult, PageMetadataProps, RouteRendererOptions } from '../../types/public-types.js';
+import type { ComponentRenderResult, EcoComponent, EcoPageComponent, EcoPageFile, HtmlTemplateProps, IntegrationRendererRenderOptions, PageBrowserGraphResult, PageMetadataProps, EcoPageLayoutEntry, RouteRendererOptions } from '../../types/public-types.js';
 import { type ProcessedAsset } from '../../services/assets/asset-processing-service/index.js';
 type PreparedRenderInputs = {
     Page: EcoPageFile['default'] | EcoPageComponent<any>;
     HtmlTemplate: EcoComponent<HtmlTemplateProps>;
+    Layouts: EcoComponent[];
     Layout?: EcoComponent;
+    layoutEntries?: EcoPageLayoutEntry[];
     props: Record<string, unknown>;
     metadata: PageMetadataProps;
     integrationSpecificProps: Record<string, unknown>;

package/src/route-renderer/orchestration/route-prepared-options.builder.js

@@ -11,7 +11,7 @@ function buildPreparedRenderOptions(input) {
     componentRender,
     appConfig
   } = input;
-  const { Page, HtmlTemplate, Layout, props, metadata, integrationSpecificProps } = resolvedInputs;
+  const { Page, HtmlTemplate, Layouts, Layout, layoutEntries, props, metadata, integrationSpecificProps } = resolvedInputs;
   const dedupedDependencies = dedupeProcessedAssets(allDependencies);
   const pagePackage = createPagePackage(dedupedDependencies, { pageBrowserGraph });
   const pageProps = {
@@ -31,7 +31,9 @@ function buildPreparedRenderOptions(input) {
     pagePackage,
     componentRender,
     HtmlTemplate,
+    Layouts,
     Layout,
+    layoutEntries,
     props,
     Page,
     metadata,

package/src/route-renderer/orchestration/route-render-orchestrator.d.ts

@@ -1,5 +1,5 @@
 import type { EcoPagesAppConfig } from '../../types/internal-types.js';
-import type { ComponentRenderResult, EcoComponent, EcoPageComponent, EcoPageFile, HtmlTemplateProps, IntegrationRendererRenderOptions, PageBrowserGraphContribution, PageBrowserGraphResult, PageMetadataProps, RouteRendererBody, RouteRendererOptions, RouteRenderResult } from '../../types/public-types.js';
+import type { ComponentRenderResult, EcoComponent, EcoPageComponent, EcoPageFile, HtmlTemplateProps, IntegrationRendererRenderOptions, PageBrowserGraphContribution, PageBrowserGraphResult, PageMetadataProps, RouteRendererBody, RouteRendererOptions, RouteRenderResult, EcoPageLayoutEntry } from '../../types/public-types.js';
 import type { AssetProcessingService, ProcessedAsset } from '../../services/assets/asset-processing-service/index.js';
 import type { HtmlDocumentContribution } from '../../services/html/html-transformer.service.js';
 import { OwnershipValidationService } from './ownership-validation.service.js';
@@ -7,7 +7,9 @@ import { PageBrowserGraphService } from './page-browser-graph.service.js';
 export type RouteRenderOrchestratorResolvedInputs = {
     Page: EcoPageFile['default'] | EcoPageComponent<any>;
     HtmlTemplate: EcoComponent<HtmlTemplateProps>;
+    Layouts: EcoComponent[];
     Layout?: EcoComponent;
+    layoutEntries?: EcoPageLayoutEntry[];
     props: Record<string, unknown>;
     metadata: PageMetadataProps;
     integrationSpecificProps: Record<string, unknown>;

package/src/route-renderer/orchestration/route-render-orchestrator.js

@@ -28,17 +28,17 @@ class RouteRenderOrchestrator {
    */
   async prepareRenderOptions(routeOptions, adapter) {
     const resolvedInputs = await adapter.resolveRouteRenderInputs(routeOptions);
-    const { Page, HtmlTemplate, Layout } = resolvedInputs;
+    const { Page, HtmlTemplate, Layouts, Layout } = resolvedInputs;
     const validationErrors = this.ownershipValidationService.validate({
       currentIntegrationName: adapter.name,
       roots: [
         { component: HtmlTemplate, source: "html-template" },
-        ...Layout ? [{ component: Layout, source: "layout" }] : [],
+        ...Layouts.map((layout) => ({ component: layout, source: "layout" })),
         { component: Page, source: "page" }
       ]
     });
     throwIfOwnershipInvalid(validationErrors);
-    const componentsToResolve = Layout ? [HtmlTemplate, Layout, Page] : [HtmlTemplate, Page];
+    const componentsToResolve = [HtmlTemplate, ...Layouts, Page];
     const [{ resolvedDependencies }, pageBrowserGraph, componentRender] = await Promise.all([
       adapter.resolveRouteDependencies({
         components: componentsToResolve

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

@@ -1,4 +1,5 @@
 import { IntegrationRenderer } from "./integration-renderer.js";
+import { resolveInnermostPageLayout } from "./layout-shell-props.service.js";
 class StringMarkupRenderer extends IntegrationRenderer {
   async renderComponent(input) {
     if (typeof input.component !== "function") {
@@ -42,7 +43,7 @@ class StringMarkupRenderer extends IntegrationRenderer {
         view,
         props,
         ctx,
-        layout: view.config?.layout
+        layout: resolveInnermostPageLayout(view.config?.layouts)
       });
     } catch (error) {
       throw this.createRenderError("Error rendering view", error);

package/src/route-renderer/page-loading/component-dependency-collection.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { assertEcoDeclaredComponent } from "../../eco/eco-declared-component.js";
 import { AssetFactory } from "../../services/assets/asset-processing-service/index.js";
 import { extractEcopagesVirtualImports } from "./ecopages-virtual-imports.js";
 import { collectDeclaredAssetEntries } from "./declared-asset-collection.js";
@@ -103,9 +104,11 @@ function collectComponentDependencies(options) {
       });
       if (dependenciesConfig?.components) {
         for (const nestedComponent of dependenciesConfig.components) {
-          if (nestedComponent?.config) {
-            collect(nestedComponent.config);
+          if (!nestedComponent) {
+            continue;
           }
+          assertEcoDeclaredComponent(nestedComponent, { parentComponentFile: file });
+          collect(nestedComponent.config);
         }
       }
     };

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

@@ -334,8 +334,21 @@ export type EcoComponentDependencies = {
      * to express explicit module imports for client bundles.
      */
     modules?: string[];
-    components?: EcoComponent[];
+    /**
+     * Child components whose assets and foreign-child graph are collected transitively.
+     * Each entry must be an `eco.component()`, `eco.layout()`, or `eco.html()` result
+     * with plugin-injected `config.__eco` metadata.
+     */
+    components?: EcoDeclaredComponent[];
 };
+/**
+ * Component returned from `eco.component()`, `eco.layout()`, or `eco.html()`.
+ *
+ * @remarks
+ * Used for `dependencies.components` and eco factory return types. Plugin-injected
+ * `config.__eco` is enforced at runtime via `isEcoDeclaredComponent()`, not by this alias.
+ */
+export type EcoDeclaredComponent<P = any, R = any> = EcoComponent<P, R>;
 export type EcoPagesElement = string | Promise<string>;
 /**
  * Serializable child payloads accepted by cross-integration deferred rendering.
@@ -401,11 +414,13 @@ export type EcoComponentConfig = {
      * );
      *
      * // Page using the layout
-     * const MyPage = () => <h1>Hello</h1>;
-     * MyPage.config = { layout: Layout };
+     * const MyPage = eco.page({ layout: Layout, render: () => <h1>Hello</h1> });
      * ```
      */
-    layout?: EcoPageLayoutComponent<any>;
+    /** Normalized outer→inner layout stack from `eco.page({ layout: [...] })`. */
+    layouts?: EcoDeclaredComponent[];
+    /** Layout entries retained for per-tier prop factories. */
+    layoutEntries?: EcoPageLayoutEntry[];
     dependencies?: EcoComponentDependencies;
     /**
      * Internal: Resolved lazy scripts grouped by trigger.
@@ -529,6 +544,36 @@ export interface HtmlTemplateProps<T = EcoPagesElement> extends PageHeadProps<T>
     headContent?: T;
     pageProps: Record<string, unknown>;
 }
+/**
+ * Request-scoped context available to layout prop factories on `eco.page`.
+ */
+export type LayoutPropsContext = {
+    params?: Record<string, string>;
+    query?: Record<string, string>;
+    locals?: RequestLocals;
+};
+/**
+ * One layout tier in a page layout stack (outer→inner).
+ */
+export type EcoPageLayoutEntry<E = EcoPagesElement> = {
+    component: EcoDeclaredComponent<any, E>;
+    props?: (context: LayoutPropsContext) => Record<string, unknown>;
+};
+/**
+ * Layout declaration accepted by `eco.page()`.
+ *
+ * @remarks
+ * Array order is outer→inner, matching Next.js App Router segment nesting.
+ */
+export type EcoPageLayoutSpec<E = EcoPagesElement> = EcoDeclaredComponent<any, E> | EcoPageLayoutEntry<E>;
+/**
+ * One or more layout tiers for `eco.page({ layout })`.
+ *
+ * @remarks
+ * When an array, order is **outer → inner** (outermost layout wraps all inner tiers).
+ * Normalized at factory time to `config.layouts` and `config.layoutEntries`.
+ */
+export type EcoPageLayouts<E = EcoPagesElement> = EcoPageLayoutSpec<E> | EcoPageLayoutSpec<E>[];
 /**
  * Layout components accepted by pages.
  *
@@ -746,7 +791,9 @@ export type IntegrationRendererRenderOptions<C = EcoPagesElement> = RouteRendere
     metadata: PageMetadataProps;
     HtmlTemplate: EcoHtmlComponent<C>;
     Page: EcoComponent<PageProps, C>;
+    Layouts?: EcoDeclaredComponent[];
     Layout?: EcoPageLayoutComponent<any>;
+    layoutEntries?: EcoPageLayoutEntry[];
     dependencies?: EcoComponentDependencies;
     resolvedDependencies: ProcessedAsset[];
     pagePackage?: PagePackageResult;

package/src/utils/parse-cli-args.d.ts

@@ -14,6 +14,7 @@ export type ReturnParseCliArgs = {
     start: boolean;
     dev: boolean;
     force: boolean;
+    serveOnly: boolean;
     port?: number;
     hostname?: string;
     reactFastRefresh?: boolean;

package/src/utils/parse-cli-args.js

@@ -8,6 +8,7 @@ function getEmbeddedRuntimeCommandOptions() {
     start: !isDevelopment,
     dev: isDevelopment,
     force: false,
+    serveOnly: false,
     port: void 0,
     hostname: void 0,
     reactFastRefresh: void 0
@@ -27,6 +28,7 @@ function parseCliArgs(options = {}) {
       preview: { type: "boolean" },
       build: { type: "boolean" },
       force: { type: "boolean" },
+      "serve-only": { type: "boolean" },
       port: { type: "string" },
       hostname: { type: "string" },
       "react-fast-refresh": { type: "boolean" }
@@ -51,6 +53,7 @@ function parseCliArgs(options = {}) {
     start: isStartCommand,
     dev: isDevCommand,
     force: !!values.force,
+    serveOnly: !!values["serve-only"] || process.env.ECOPAGES_PREVIEW_SERVE_ONLY === "true",
     port: values.port ? Number(values.port) : void 0,
     hostname: values.hostname,
     reactFastRefresh: values["react-fast-refresh"]

package/src/utils/server-utils.module.js

@@ -17,6 +17,7 @@ const ContentTypeMap = /* @__PURE__ */ new Map([
   ["ogv", "video/ogg"],
   ["mov", "video/quicktime"],
   ["txt", "text/plain"],
+  ["md", "text/markdown"],
   ["html", "text/html"],
   ["css", "text/css"],
   ["js", "text/javascript"],

package/src/watchers/project-watcher-ignore.d.ts

@@ -0,0 +1,11 @@
+export type ProjectWatcherIgnorePaths = {
+    workDir: string;
+    distDir: string;
+};
+/**
+ * @remarks
+ * chokidar v4+ no longer treats glob strings in `ignored` as patterns. A path
+ * predicate keeps node_modules, VCS metadata, and scoped artifact dirs out of
+ * the watch tree without descending into symlinked monorepo node_modules.
+ */
+export declare function createProjectWatcherIgnorePredicate(absolutePaths: ProjectWatcherIgnorePaths): (watchedPath: string) => boolean;

package/src/watchers/project-watcher-ignore.js

@@ -0,0 +1,16 @@
+import path from "node:path";
+function createProjectWatcherIgnorePredicate(absolutePaths) {
+  const ignoredPrefixes = [absolutePaths.workDir, absolutePaths.distDir];
+  return (watchedPath) => {
+    const segments = watchedPath.split(path.sep);
+    if (segments.includes("node_modules") || segments.includes(".git")) {
+      return true;
+    }
+    return ignoredPrefixes.some(
+      (prefix) => watchedPath === prefix || watchedPath.startsWith(`${prefix}${path.sep}`)
+    );
+  };
+}
+export {
+  createProjectWatcherIgnorePredicate
+};

package/src/watchers/project-watcher.js

@@ -3,6 +3,7 @@ import chokidar, {} from "chokidar";
 import { fileSystem } from "@ecopages/file-system";
 import { appLogger } from "../global/app-logger.js";
 import { DevelopmentInvalidationService } from "../services/invalidation/development-invalidation.service.js";
+import { createProjectWatcherIgnorePredicate } from "./project-watcher-ignore.js";
 class ProjectWatcher {
   /**
    * Duplicate identical watcher events within this window are ignored.
@@ -261,12 +262,7 @@ class ProjectWatcher {
     for (const watchPath of this.appConfig.additionalWatchPaths) {
       processorPaths.add(watchPath);
     }
-    const ignored = [
-      "**/node_modules/**",
-      "**/.git/**",
-      path.join(this.appConfig.absolutePaths.workDir, "**"),
-      path.join(this.appConfig.absolutePaths.distDir, "**")
-    ];
+    const ignored = createProjectWatcherIgnorePredicate(this.appConfig.absolutePaths);
     this.watcher = chokidar.watch(Array.from(processorPaths), {
       ignoreInitial: true,
       ignorePermissionErrors: true,