@ecopages/kitajs 0.2.0-alpha.5 → 0.2.0-alpha.7

package/CHANGELOG.md

@@ -6,16 +6,18 @@ All notable changes to `@ecopages/kitajs` are documented here.
 
 ## [UNRELEASED] — TBD
 
+### Bug Fixes
+
+- Fixed explicit `ctx.render()` flows so deferred cross-integration layout components resolve through the marker pipeline instead of crashing during direct server rendering.
+
 ### Features
 
-- Aligned KitaJS renderer with full orchestration mode — removed legacy rendering path (`fc07bdb0`).
+- Aligned KitaJS with the unified orchestration pipeline.
 
 ### Refactoring
 
-- **Type safety improvements** — Enhanced type safety for component signatures; test component creation helpers are now more accurately typed (`574657eb`).
-- Ambient module declarations cleaned up (`5f46ecc5`).
-- Updated test suite for esbuild adapter and Node.js runtime compatibility (`31a44458`).
+- Tightened Kita component typing and cleaned up ambient module declarations.
 
 ### Tests
 
-- Updated integration tests to align with the new orchestration model.
+- Updated integration coverage for the orchestration pipeline and Node and esbuild compatibility.

package/README.md

@@ -1,8 +1,8 @@
-# Ecopages KitaJs Integration Plugin
+# @ecopages/kitajs
 
-The `@ecopages/kitajs` package provides seamless integration with [Kita](https://kitajs.org/html/), enabling effortless rendering of JSX templates. This integration represents a minimalistic layer within the broader Ecopages integration plugin system, designed to enhance the platform's flexibility and ease of use.
+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.
 
-## Install
+## Installation
 
 ```bash
 bunx jsr add @ecopages/kitajs
@@ -10,10 +10,10 @@ bunx jsr add @ecopages/kitajs
 
 ## Usage
 
-Incorporating this integration into your project is straightforward. Simply import and include the `kitajsPlugin` in your Ecopages configuration as shown below:
+Import and register the `kitajsPlugin` in your `eco.config.ts`.
 
 ```ts
-import { ConfigBuilder } from '@ecopages/core';
+import { ConfigBuilder } from '@ecopages/core/config-builder';
 import { kitajsPlugin } from '@ecopages/kitajs';
 
 const config = await new ConfigBuilder()

package/package.json

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

package/src/kitajs-renderer.js

@@ -50,31 +50,37 @@ class KitaRenderer extends IntegrationRenderer {
   async renderToResponse(view, props, ctx) {
     try {
       const Layout = view.config?.layout;
-      const viewFn = view;
-      const pageContent = await viewFn(props);
-      if (ctx.partial) {
-        return this.createHtmlResponse(pageContent, ctx);
-      }
-      const children = Layout ? await Layout({ children: pageContent }) : pageContent;
-      const HtmlTemplate = await this.getHtmlTemplate();
-      const metadata = view.metadata ? await view.metadata({
+      const HtmlTemplate = ctx.partial ? void 0 : await this.getHtmlTemplate();
+      const metadata = ctx.partial || !HtmlTemplate ? void 0 : view.metadata ? await view.metadata({
         params: {},
         query: {},
         props,
         appConfig: this.appConfig
       }) : this.appConfig.defaultMetadata;
-      await this.prepareViewDependencies(view, Layout);
-      const html = this.DOC_TYPE + await HtmlTemplate({
-        metadata,
-        pageProps: props,
-        children: children ?? ""
+      if (!ctx.partial) {
+        await this.prepareViewDependencies(view, Layout);
+      }
+      const viewFn = view;
+      const renderExecution = await this.captureHtmlRender(async () => {
+        const pageContent = await viewFn(props);
+        if (ctx.partial) {
+          return pageContent;
+        }
+        const children = Layout ? await Layout({ children: pageContent }) : pageContent;
+        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
       });
-      const transformedResponse = await this.htmlTransformer.transform(
-        new Response(html, {
-          headers: { "Content-Type": "text/html" }
-        })
-      );
-      return this.createHtmlResponse(transformedResponse.body ?? "", ctx);
+      return this.createHtmlResponse(body, ctx);
     } catch (error) {
       throw this.createRenderError("Error rendering view", error);
     }

package/src/kitajs-renderer.ts

@@ -87,42 +87,53 @@ export class KitaRenderer extends IntegrationRenderer<EcoPagesElement> {
 	): Promise<Response> {
 		try {
 			const Layout = view.config?.layout as KitaLayoutFn | undefined;
-
-			const viewFn = view as KitaViewFn<P>;
-			const pageContent = await viewFn(props);
-
-			if (ctx.partial) {
-				return this.createHtmlResponse(pageContent, ctx);
+			const HtmlTemplate = ctx.partial ? undefined : await this.getHtmlTemplate();
+			const metadata =
+				ctx.partial || !HtmlTemplate
+					? undefined
+					: view.metadata
+						? await view.metadata({
+								params: {},
+								query: {},
+								props: props as Record<string, unknown>,
+								appConfig: this.appConfig,
+							})
+						: this.appConfig.defaultMetadata;
+
+			if (!ctx.partial) {
+				await this.prepareViewDependencies(view, Layout as EcoComponent | undefined);
 			}
 
-			const children = Layout ? await Layout({ children: pageContent }) : pageContent;
-
-			const HtmlTemplate = await this.getHtmlTemplate();
-			const metadata = view.metadata
-				? await view.metadata({
-						params: {},
-						query: {},
-						props: props as Record<string, unknown>,
-						appConfig: this.appConfig,
-					})
-				: this.appConfig.defaultMetadata;
-			await this.prepareViewDependencies(view, Layout as EcoComponent | undefined);
-
-			const html =
-				this.DOC_TYPE +
-				(await HtmlTemplate({
-					metadata,
-					pageProps: props as Record<string, unknown>,
-					children: children ?? '',
-				}));
+			const viewFn = view as KitaViewFn<P>;
+			const renderExecution = await this.captureHtmlRender(async () => {
+				const pageContent = await viewFn(props);
+
+				if (ctx.partial) {
+					return pageContent;
+				}
+
+				const children = Layout ? await Layout({ children: pageContent }) : pageContent;
+				return (
+					this.DOC_TYPE +
+					(await HtmlTemplate!({
+						metadata: metadata ?? this.appConfig.defaultMetadata,
+						pageProps: (props as Record<string, unknown>) ?? {},
+						children: children ?? '',
+					}))
+				);
+			});
 
-			const transformedResponse = await this.htmlTransformer.transform(
-				new Response(html, {
-					headers: { 'Content-Type': 'text/html' },
-				}),
-			);
+			const componentsToResolve = ctx.partial
+				? [view]
+				: ([HtmlTemplate, Layout, view].filter(Boolean) as EcoComponent[]);
+			const body = await this.finalizeCapturedHtmlRender({
+				html: renderExecution.html,
+				componentsToResolve,
+				graphContext: renderExecution.graphContext,
+				partial: ctx.partial,
+			});
 
-			return this.createHtmlResponse(transformedResponse.body ?? '', ctx);
+			return this.createHtmlResponse(body, ctx);
 		} catch (error) {
 			throw this.createRenderError('Error rendering view', error);
 		}