@ecopages/kitajs 0.2.0-alpha.12 → 0.2.0-alpha.14

package/CHANGELOG.md

@@ -8,16 +8,12 @@ All notable changes to `@ecopages/kitajs` are documented here.
 
 ### Bug Fixes
 
-- Fixed direct `ctx.render()` flows and mixed-integration Kita boundaries to resolve through the marker pipeline.
+- Fixed Kita full-route and direct `ctx.render()` rendering to stay on the renderer-owned page/layout/document path while resolving mixed boundaries inside the owning renderer.
 
-### Features
+### Documentation
 
-- Aligned KitaJS with the unified orchestration pipeline.
-
-### Refactoring
-
-- Tightened Kita component typing and cleaned up ambient module declarations.
+- Updated the README to document `.kita.tsx` route ownership and Kita's role as an outer shell in mixed-renderer apps.
 
 ### Tests
 
-- Updated integration coverage for the orchestration pipeline and Node and esbuild compatibility.
+- Updated integration coverage for explicit boundary composition and Node and esbuild compatibility.

package/README.md

@@ -1,6 +1,6 @@
 # @ecopages/kitajs
 
-Integration plugin for [KitaJS](https://kitajs.org/html/) HTML within the Ecopages framework. It enables the rendering of standard JSX templates for multi-page applications.
+Integration plugin for [KitaJS](https://kitajs.org/html/) HTML in Ecopages. Use it when Kita should own `.kita.tsx` routes, page shells, and document shells in HTML-first apps.
 
 ## Installation
 
@@ -23,3 +23,13 @@ const config = await new ConfigBuilder()
 
 export default config;
 ```
+
+## What This Integration Owns
+
+- `.kita.tsx` route files.
+- Page, layout, and document shells rendered by `@kitajs/html`.
+- HTML-first outer shells that host nested component boundaries from other integrations.
+
+## Mixed Rendering
+
+Kita works well as the outer renderer in mixed apps. When a Kita-owned page encounters a nested boundary from another integration, Ecopages resolves that boundary with its owning renderer and inserts the resulting HTML back into the Kita shell.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/kitajs",
-  "version": "0.2.0-alpha.12",
+  "version": "0.2.0-alpha.14",
   "description": "Kitajs plugin for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/integrations/kitajs"
   },
   "peerDependencies": {
-    "@ecopages/core": "0.2.0-alpha.12",
+    "@ecopages/core": "0.2.0-alpha.14",
     "@kitajs/html": "^4.1.0",
     "@kitajs/ts-html-plugin": "^4.0.1"
   }

package/src/kitajs-renderer.d.ts

@@ -16,6 +16,10 @@ export declare class KitaRenderer extends IntegrationRenderer<EcoPagesElement> {
      * Includes component-scoped dependency assets when declared.
      */
     renderComponent(input: ComponentRenderInput): Promise<ComponentRenderResult>;
+    protected createComponentBoundaryRuntime(options: {
+        boundaryInput: ComponentRenderInput;
+        rendererCache: Map<string, IntegrationRenderer<any>>;
+    }): import("@ecopages/core").ComponentBoundaryRuntime;
     render({ params, query, props, locals, pageLocals, metadata, Page, Layout, HtmlTemplate, }: IntegrationRendererRenderOptions): Promise<RouteRendererBody>;
     renderToResponse<P = Record<string, unknown>>(view: EcoComponent<P>, props: P, ctx: RenderToResponseContext): Promise<Response>;
 }

package/src/kitajs-renderer.js

@@ -8,20 +8,16 @@ class KitaRenderer extends IntegrationRenderer {
    * Includes component-scoped dependency assets when declared.
    */
   async renderComponent(input) {
-    const component = input.component;
-    const props = input.children === void 0 ? input.props : { ...input.props, children: input.children };
-    const content = await component(props);
-    const html = String(content);
-    const hasDependencies = Boolean(input.component.config?.dependencies);
-    const canResolveAssets = typeof this.assetProcessingService?.processDependencies === "function";
-    const assets = hasDependencies && canResolveAssets ? await this.processComponentDependencies([input.component]) : void 0;
-    return {
-      html,
-      canAttachAttributes: true,
-      rootTag: this.getRootTagName(html),
-      integrationName: this.name,
-      assets
-    };
+    return this.renderStringComponentBoundaryWithQueuedForeignBoundaries(
+      input,
+      input.component
+    );
+  }
+  createComponentBoundaryRuntime(options) {
+    return this.createQueuedBoundaryRuntime({
+      boundaryInput: options.boundaryInput,
+      rendererCache: options.rendererCache
+    });
   }
   async render({
     params,
@@ -35,54 +31,31 @@ class KitaRenderer extends IntegrationRenderer {
     HtmlTemplate
   }) {
     try {
-      const pageContent = await Page({ params, query, ...props, locals: pageLocals });
-      const pageHtml = String(pageContent);
-      const children = Layout && typeof Layout === "function" ? await Layout({ children: pageHtml, locals }) : pageHtml;
-      const body = await HtmlTemplate({
+      return await this.renderPageWithDocumentShell({
+        page: {
+          component: Page,
+          props: { params, query, ...props, locals: pageLocals }
+        },
+        layout: Layout ? {
+          component: Layout,
+          props: locals ? { locals } : {}
+        } : void 0,
+        htmlTemplate: HtmlTemplate,
         metadata,
-        pageProps: props ?? {},
-        children
+        pageProps: props ?? {}
       });
-      return this.DOC_TYPE + body;
     } catch (error) {
       throw this.createRenderError("Error rendering page", error);
     }
   }
   async renderToResponse(view, props, ctx) {
     try {
-      const Layout = view.config?.layout;
-      const HtmlTemplate = ctx.partial ? void 0 : await this.getHtmlTemplate();
-      const metadata = ctx.partial || !HtmlTemplate ? void 0 : view.metadata ? await view.metadata({
-        params: {},
-        query: {},
+      return await this.renderViewWithDocumentShell({
+        view,
         props,
-        appConfig: this.appConfig
-      }) : this.appConfig.defaultMetadata;
-      if (!ctx.partial) {
-        await this.prepareViewDependencies(view, Layout);
-      }
-      const viewFn = view;
-      const renderExecution = await this.captureHtmlRender(async () => {
-        const pageContent = await viewFn(props);
-        const pageHtml = String(pageContent);
-        if (ctx.partial) {
-          return pageHtml;
-        }
-        const children = Layout ? await Layout({ children: pageHtml }) : pageHtml;
-        return this.DOC_TYPE + await HtmlTemplate({
-          metadata: metadata ?? this.appConfig.defaultMetadata,
-          pageProps: props ?? {},
-          children: children ?? ""
-        });
-      });
-      const componentsToResolve = ctx.partial ? [view] : [HtmlTemplate, Layout, view].filter(Boolean);
-      const body = await this.finalizeCapturedHtmlRender({
-        html: renderExecution.html,
-        componentsToResolve,
-        graphContext: renderExecution.graphContext,
-        partial: ctx.partial
+        ctx,
+        layout: view.config?.layout
       });
-      return this.createHtmlResponse(body, ctx);
     } catch (error) {
       throw this.createRenderError("Error rendering view", error);
     }

package/src/kitajs.plugin.d.ts

@@ -1,4 +1,4 @@
-import { IntegrationPlugin, type ComponentBoundaryPolicyInput, type IntegrationPluginConfig } from '@ecopages/core/plugins/integration-plugin';
+import { IntegrationPlugin, type IntegrationPluginConfig } from '@ecopages/core/plugins/integration-plugin';
 import { KitaRenderer } from './kitajs-renderer.js';
 /**
  * The name of the Kita.js plugin
@@ -11,7 +11,6 @@ export declare const PLUGIN_NAME = "kitajs";
 export declare class KitaHtmlPlugin extends IntegrationPlugin {
     renderer: typeof KitaRenderer;
     constructor(options?: Omit<IntegrationPluginConfig, 'name'>);
-    shouldDeferComponentBoundary(input: ComponentBoundaryPolicyInput): boolean;
 }
 /**
  * Factory function to create a Kita.js plugin instance.

package/src/kitajs.plugin.js

@@ -1,6 +1,4 @@
-import {
-  IntegrationPlugin
-} from "@ecopages/core/plugins/integration-plugin";
+import { IntegrationPlugin } from "@ecopages/core/plugins/integration-plugin";
 import { KitaRenderer } from "./kitajs-renderer.js";
 const PLUGIN_NAME = "kitajs";
 class KitaHtmlPlugin extends IntegrationPlugin {
@@ -13,9 +11,6 @@ class KitaHtmlPlugin extends IntegrationPlugin {
       ...options
     });
   }
-  shouldDeferComponentBoundary(input) {
-    return input.targetIntegration === this.name && input.currentIntegration !== this.name;
-  }
 }
 function kitajsPlugin(options) {
   return new KitaHtmlPlugin(options);