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

package/CHANGELOG.md

@@ -8,7 +8,7 @@ All notable changes to `@ecopages/kitajs` are documented here.
 
 ### 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.
+- Fixed direct `ctx.render()` flows and mixed-integration Kita boundaries to resolve through the marker pipeline.
 
 ### Features
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/kitajs",
-  "version": "0.2.0-alpha.10",
+  "version": "0.2.0-alpha.12",
   "description": "Kitajs plugin for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/integrations/kitajs"
   },
   "peerDependencies": {
-    "@ecopages/core": "0.2.0-alpha.10",
+    "@ecopages/core": "0.2.0-alpha.12",
     "@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 ?? {},
@@ -63,10 +64,11 @@ class KitaRenderer extends IntegrationRenderer {
       const viewFn = view;
       const renderExecution = await this.captureHtmlRender(async () => {
         const pageContent = await viewFn(props);
+        const pageHtml = String(pageContent);
         if (ctx.partial) {
-          return pageContent;
+          return pageHtml;
         }
-        const children = Layout ? await Layout({ children: pageContent }) : pageContent;
+        const children = Layout ? await Layout({ children: pageHtml }) : pageHtml;
         return this.DOC_TYPE + await HtmlTemplate({
           metadata: metadata ?? this.appConfig.defaultMetadata,
           pageProps: props ?? {},

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);