@ecopages/ecopages-jsx 0.2.0-beta.27 → 0.2.0-beta.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/ecopages-jsx",
-  "version": "0.2.0-beta.27",
+  "version": "0.2.0-beta.29",
   "description": "JSX integration plugin for Ecopages",
   "keywords": [
     "ecopages",
@@ -31,12 +31,12 @@
     "directory": "packages/integrations/ecopages-jsx"
   },
   "dependencies": {
-    "@ecopages/mdx": "0.2.0-beta.27",
+    "@ecopages/mdx": "0.2.0-beta.29",
     "@mdx-js/mdx": "^3.1.1",
     "vfile": "^6.0.3"
   },
   "peerDependencies": {
-    "@ecopages/core": "0.2.0-beta.27",
+    "@ecopages/core": "0.2.0-beta.29",
     "@ecopages/jsx": "0.3.0-beta.2",
     "@ecopages/radiant": "0.3.0-beta.2"
   }

package/src/ecopages-jsx-renderer.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentRenderInput, ComponentRenderResult, EcoComponent, IntegrationRendererRenderOptions, RouteRendererBody } from '@ecopages/core';
-import { IntegrationRenderer, type RenderToResponseContext, type RouteModuleLoadOptions } from '@ecopages/core/route-renderer/integration-renderer';
-import type { ForeignChildRuntime } from '@ecopages/core/route-renderer/component-render-context';
+import { IntegrationRenderer, type RenderToResponseContext, type RouteModuleLoadOptions } from '@ecopages/core/route-renderer/orchestration/integration-renderer';
+import type { ForeignChildRuntime } from '@ecopages/core/route-renderer/orchestration/foreign-child/component-render-context';
 import { type JsxRenderable } from '@ecopages/jsx';
 import { type EcopagesJsxMdxPageModule } from './ecopages-jsx-mdx.js';
 import type { EcopagesJsxRendererOptions } from './ecopages-jsx.types.js';

package/src/ecopages-jsx-renderer.js

@@ -1,6 +1,10 @@
 import {
   IntegrationRenderer
-} from "@ecopages/core/route-renderer/integration-renderer";
+} from "@ecopages/core/route-renderer/orchestration/integration-renderer";
+import {
+  getForeignSubtreeResolutionContextKey,
+  resolveOwningIntegrationRenderer
+} from "@ecopages/core/route-renderer/orchestration/foreign-child/owning-renderer-resolution";
 import { createMarkupNodeLike } from "@ecopages/jsx";
 import { renderToString, withServerCustomElementRenderHook } from "@ecopages/jsx/server";
 import { ECOPAGES_JSX_PLUGIN_NAME } from "./ecopages-jsx.constants.js";
@@ -178,12 +182,26 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
           };
           const content = await this.withCustomElementRenderHook(() => component(componentProps));
           const rendered = await this.renderJsx(content);
-          const queuedForeignSubtreeResolution = await this.resolveQueuedForeignSubtreeHtml(
-            rendered.html,
-            this.getQueuedForeignSubtreeResolutionContext(input),
-            (children, _runtimeContext, queuedResolutionsByToken, resolveToken) => this.renderQueuedForeignSubtreeChildren(children, queuedResolutionsByToken, resolveToken),
-            "Ecopages JSX"
-          );
+          const queuedForeignSubtreeResolution = await this.foreignSubtreeExecutionService.resolveQueuedHtml({
+            currentIntegrationName: this.name,
+            html: rendered.html,
+            runtimeContext: this.foreignSubtreeExecutionService.getQueuedRuntimeContext(
+              input,
+              getForeignSubtreeResolutionContextKey(this.name)
+            ),
+            queueLabel: "Ecopages JSX",
+            getOwningRenderer: (integrationName, rendererCache) => resolveOwningIntegrationRenderer({
+              appConfig: this.appConfig,
+              runtimeOrigin: this.runtimeOrigin,
+              currentIntegrationName: this.name,
+              currentRenderer: this,
+              integrationName,
+              cache: rendererCache
+            }),
+            applyAttributesToFirstElement: (resolvedHtml, attributes) => this.htmlTransformer.applyAttributesToFirstElement(resolvedHtml, attributes),
+            dedupeProcessedAssets: (assets2) => this.htmlTransformer.dedupeProcessedAssets(assets2),
+            renderQueuedChildren: (children, _runtimeContext, queuedResolutionsByToken, resolveToken) => this.renderQueuedForeignSubtreeChildren(children, queuedResolutionsByToken, resolveToken)
+          });
           const componentAssets = input.component.config?.dependencies && typeof this.assetProcessingService?.processDependencies === "function" ? await this.processComponentDependencies([input.component]) : [];
           const assets = this.htmlTransformer.dedupeProcessedAssets([
             ...this.renderSession.endCollectedAssetFrame(assetFrame),