@ecopages/kitajs 0.2.0-alpha.1 → 0.2.0-alpha.11

package/CHANGELOG.md

@@ -6,16 +6,18 @@ All notable changes to `@ecopages/kitajs` are documented here.
 
 ## [UNRELEASED] — TBD
 
+### Bug Fixes
+
+- Fixed direct `ctx.render()` flows and mixed-integration Kita boundaries to resolve through the marker pipeline.
+
 ### 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.1",
+  "version": "0.2.0-alpha.11",
   "description": "Kitajs plugin for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/integrations/kitajs"
   },
   "peerDependencies": {
-    "@ecopages/core": "0.2.0-alpha.1",
+    "@ecopages/core": "0.2.0-alpha.11",
     "@kitajs/html": "^4.1.0",
     "@kitajs/ts-html-plugin": "^4.0.1"
   }

package/src/kitajs-renderer.js

@@ -36,7 +36,8 @@ class KitaRenderer extends IntegrationRenderer {
   }) {
     try {
       const pageContent = await Page({ params, query, ...props, locals: pageLocals });
-      const children = Layout && typeof Layout === "function" ? await Layout({ children: pageContent, locals }) : pageContent;
+      const pageHtml = String(pageContent);
+      const children = Layout && typeof Layout === "function" ? await Layout({ children: pageHtml, locals }) : pageHtml;
       const body = await HtmlTemplate({
         metadata,
         pageProps: props ?? {},
@@ -50,31 +51,38 @@ 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);
+        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
       });
-      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.plugin.d.ts

@@ -1,4 +1,4 @@
-import { IntegrationPlugin, type IntegrationPluginConfig } from '@ecopages/core/plugins/integration-plugin';
+import { IntegrationPlugin, type ComponentBoundaryPolicyInput, type IntegrationPluginConfig } from '@ecopages/core/plugins/integration-plugin';
 import { KitaRenderer } from './kitajs-renderer.js';
 /**
  * The name of the Kita.js plugin
@@ -11,6 +11,7 @@ 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,4 +1,6 @@
-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 {
@@ -7,9 +9,13 @@ class KitaHtmlPlugin extends IntegrationPlugin {
     super({
       name: PLUGIN_NAME,
       extensions: [".kita.tsx"],
+      jsxImportSource: "@kitajs/html",
       ...options
     });
   }
+  shouldDeferComponentBoundary(input) {
+    return input.targetIntegration === this.name && input.currentIntegration !== this.name;
+  }
 }
 function kitajsPlugin(options) {
   return new KitaHtmlPlugin(options);

package/src/kitajs-renderer.ts

@@ -1,130 +0,0 @@
-/**
- * This module contains the Kita.js renderer
- * @module
- */
-
-import type {
-	ComponentRenderInput,
-	ComponentRenderResult,
-	EcoComponent,
-	EcoPagesElement,
-	IntegrationRendererRenderOptions,
-	RouteRendererBody,
-} from '@ecopages/core';
-import { IntegrationRenderer, type RenderToResponseContext } from '@ecopages/core/route-renderer/integration-renderer';
-import { PLUGIN_NAME } from './kitajs.plugin.ts';
-
-/** Narrows an EcoComponent to its KitaJS callable signature. */
-type KitaViewFn<P> = (props: P) => Promise<EcoPagesElement> | EcoPagesElement;
-
-/** KitaJS layout function signature. */
-type KitaLayoutFn = (props: { children: EcoPagesElement } & Record<string, unknown>) => Promise<EcoPagesElement>;
-
-/**
- * A renderer for the Kita.js integration.
- * It renders a page using the HtmlTemplate and Page components.
- */
-export class KitaRenderer extends IntegrationRenderer<EcoPagesElement> {
-	name = PLUGIN_NAME;
-
-	/**
-	 * Renders a Kita component boundary for component-level orchestration.
-	 *
-	 * Includes component-scoped dependency assets when declared.
-	 */
-	override async renderComponent(input: ComponentRenderInput): Promise<ComponentRenderResult> {
-		const component = input.component as KitaViewFn<Record<string, unknown>>;
-		const props = input.children === undefined ? 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])
-				: undefined;
-
-		return {
-			html,
-			canAttachAttributes: true,
-			rootTag: this.getRootTagName(html),
-			integrationName: this.name,
-			assets,
-		};
-	}
-
-	async render({
-		params,
-		query,
-		props,
-		locals,
-		pageLocals,
-		metadata,
-		Page,
-		Layout,
-		HtmlTemplate,
-	}: IntegrationRendererRenderOptions): Promise<RouteRendererBody> {
-		try {
-			const pageContent = await Page({ params, query, ...props, locals: pageLocals });
-			const children =
-				Layout && typeof Layout === 'function' ? await Layout({ children: pageContent, locals }) : pageContent;
-			const body = await HtmlTemplate({
-				metadata,
-				pageProps: props ?? {},
-				children,
-			});
-
-			return this.DOC_TYPE + body;
-		} catch (error) {
-			throw this.createRenderError('Error rendering page', error);
-		}
-	}
-
-	async renderToResponse<P = Record<string, unknown>>(
-		view: EcoComponent<P>,
-		props: P,
-		ctx: RenderToResponseContext,
-	): 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 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 transformedResponse = await this.htmlTransformer.transform(
-				new Response(html, {
-					headers: { 'Content-Type': 'text/html' },
-				}),
-			);
-
-			return this.createHtmlResponse(transformedResponse.body ?? '', ctx);
-		} catch (error) {
-			throw this.createRenderError('Error rendering view', error);
-		}
-	}
-}

package/src/kitajs.plugin.ts

@@ -1,32 +0,0 @@
-import { IntegrationPlugin, type IntegrationPluginConfig } from '@ecopages/core/plugins/integration-plugin';
-import { KitaRenderer } from './kitajs-renderer.ts';
-
-/**
- * The name of the Kita.js plugin
- */
-export const PLUGIN_NAME = 'kitajs';
-
-/**
- * The Kita.js plugin class
- * This plugin provides support for Kita.js components in Ecopages
- */
-export class KitaHtmlPlugin extends IntegrationPlugin {
-	renderer = KitaRenderer;
-
-	constructor(options?: Omit<IntegrationPluginConfig, 'name'>) {
-		super({
-			name: PLUGIN_NAME,
-			extensions: ['.kita.tsx'],
-			...options,
-		});
-	}
-}
-
-/**
- * Factory function to create a Kita.js plugin instance.
- * @param options Configuration options for the Kita.js plugin
- * @returns A new KitaHtmlPlugin instance
- */
-export function kitajsPlugin(options?: Omit<IntegrationPluginConfig, 'name'>): KitaHtmlPlugin {
-	return new KitaHtmlPlugin(options);
-}