@ecopages/ecopages-jsx 0.2.0-alpha.22 → 0.2.0-alpha.25

package/CHANGELOG.md

@@ -8,9 +8,13 @@
 
 ### Bug Fixes
 
-- Patched the Ecopages JSX browser runtime bundle so nested SVG templates restore canonical camel-cased SVG tag names during client rendering.
+- Fixed lazy Ecopages JSX custom-element dependencies to stay as standalone assets instead of being folded into page-owned bundles, restoring trigger-driven loading for docs components like `theme-toggle`.
+- Fixed Ecopages JSX page-owned browser bundles to inline their JSX and Radiant runtime imports while skipping separate intrinsic custom-element script tags when the current component tree already imports those scripts.
+- Fixed intrinsic custom-element script suppression to honor dependency-declared script ownership instead of relying only on source import scanning.
+- Aligned the Ecopages JSX browser runtime bundle with the upstream `@ecopages/jsx` runtime shipped by current alpha releases.
 - Aligned Ecopages JSX peer dependency ranges with the current `@ecopages/jsx` and `@ecopages/radiant` alpha releases.
 - Aligned Radiant SSR and hydration wiring with the public `@ecopages/radiant/server/render-component` and `@ecopages/radiant/client/hydrator` entrypoints so JSX apps install an explicit client hydrator bootstrap instead of relying on implicit side effects.
+- Updated the Ecopages JSX Radiant browser runtime for the `RadiantElement` and `RadiantController` API surface and switched the explicit hydrator bootstrap to `@ecopages/radiant/client/install-hydrator`.
 - Fixed Radiant SSR page inspection to install the light-DOM shim before JSX page modules are imported outside the normal render pass.
 - Restored direct `EcopagesJsxPlugin` construction so the exported class still accepts the public plugin options shape.
 - Fixed intrinsic custom-element asset discovery so Ecopages JSX registers scripts declared with decorator and function-call `customElement(...)` syntax.
@@ -20,6 +24,7 @@
 
 ### Refactoring
 
+- Removed the JSX browser import-map asset and folded the Radiant install-hydrator entry into the emitted Radiant vendor bundle.
 - Replaced Ecopages JSX renderer static and post-construction configuration with instance-owned renderer wiring and extracted shared plugin and renderer types into a dedicated module.
 
 ### Tests

package/README.md

@@ -48,9 +48,9 @@ Radiant support is enabled by default. When `radiant: true`, the plugin keeps th
 
 - Ecopages JSX owns page-level JSX SSR and container hydration.
 - Radiant SSR is activated on the server through `@ecopages/radiant/server/render-component`.
-- Radiant host hydration is activated on the client through an explicit head bootstrap that calls `installRadiantHydrator()` from `@ecopages/radiant/client/hydrator` before intrinsic custom-element modules load.
+- Radiant host hydration is activated on the client through an explicit head bootstrap that imports `@ecopages/radiant/client/install-hydrator` before intrinsic custom-element modules load.
 
-That means server-rendered `RadiantComponent` hosts hydrate in place only when both the SSR markers and the explicit client hydrator are present. Without the client hydrator, Radiant intentionally falls back to a fresh client render on first connect.
+That means server-rendered `RadiantElement` hosts hydrate in place only when both the SSR markers and the explicit client hydrator are present. Without the client hydrator, Radiant intentionally falls back to a fresh client render on first connect.
 
 ```ts
 ecopagesJsxPlugin({
@@ -60,7 +60,7 @@ ecopagesJsxPlugin({
 
 Set `radiant: false` when your JSX pages do not need Radiant SSR or the Radiant browser runtime on a given app.
 
-The plugin bootstrap is intentionally explicit rather than relying on unrelated imports to install the Radiant hydrator as a side effect.
+The plugin bootstrap is intentionally explicit rather than depending on custom-element modules to install the Radiant hydrator opportunistically.
 
 ## MDX Support
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/ecopages-jsx",
-  "version": "0.2.0-alpha.22",
+  "version": "0.2.0-alpha.25",
   "description": "JSX integration plugin for Ecopages",
   "keywords": [
     "ecopages",
@@ -21,8 +21,8 @@
     "vfile": "^6.0.3"
   },
   "peerDependencies": {
-    "@ecopages/core": "0.2.0-alpha.22",
-    "@ecopages/jsx": "0.3.0-alpha.4",
-    "@ecopages/radiant": "0.3.0-alpha.4"
+    "@ecopages/core": "0.2.0-alpha.25",
+    "@ecopages/jsx": "0.3.0-alpha.10",
+    "@ecopages/radiant": "0.3.0-alpha.10"
   }
 }

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

@@ -17,8 +17,11 @@ type MdxPageModule = EcoPageFile<{
 export declare class EcopagesJsxRenderer extends IntegrationRenderer<JsxRenderable> {
     name: string;
     private static radiantServerRuntimeInstallPromise;
+    private static readonly SCRIPT_IMPORT_RE;
     private readonly intrinsicCustomElementAssets;
+    private readonly intrinsicCustomElementScriptFiles;
     private collectedAssetFrames;
+    private importedIntrinsicScriptFrames;
     private readonly mdxExtensions;
     private readonly radiantSsrEnabled;
     /**
@@ -57,6 +60,17 @@ export declare class EcopagesJsxRenderer extends IntegrationRenderer<JsxRenderab
     private renderJsx;
     private renderEcoComponent;
     private recordCollectedAssets;
+    private beginImportedIntrinsicScriptFrame;
+    private endImportedIntrinsicScriptFrame;
+    private getActiveImportedIntrinsicScriptFiles;
+    /**
+     * Collects intrinsic custom-element script files already owned by the current
+     * component tree through direct source imports or dependency declarations.
+     */
+    private collectImportedIntrinsicScriptFiles;
+    private extractImportedIntrinsicScriptFiles;
+    private extractConfiguredDependencyScriptFiles;
+    private resolveImportedIntrinsicScriptFile;
     private ensureRadiantServerRuntimeIfEnabled;
     private ensureRadiantServerRuntimeInstalled;
     private isFunctionComponent;

package/src/ecopages-jsx-renderer.js

@@ -1,4 +1,6 @@
 import { rapidhash } from "@ecopages/core/hash";
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
 import {
   IntegrationRenderer
 } from "@ecopages/core/route-renderer/integration-renderer";
@@ -8,8 +10,11 @@ import { ECOPAGES_JSX_PLUGIN_NAME } from "./ecopages-jsx.constants.js";
 class EcopagesJsxRenderer extends IntegrationRenderer {
   name = ECOPAGES_JSX_PLUGIN_NAME;
   static radiantServerRuntimeInstallPromise;
+  static SCRIPT_IMPORT_RE = /import\s+(?:[^'";]+\s+from\s+)?['"](\.[^'"\n]*\.script(?:\.[cm]?[jt]sx?)?)['"]/g;
   intrinsicCustomElementAssets;
+  intrinsicCustomElementScriptFiles;
   collectedAssetFrames = [];
+  importedIntrinsicScriptFrames = [];
   mdxExtensions;
   radiantSsrEnabled;
   /**
@@ -63,6 +68,7 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
       runtimeOrigin
     });
     this.intrinsicCustomElementAssets = jsxConfig?.intrinsicCustomElementAssets ?? /* @__PURE__ */ new Map();
+    this.intrinsicCustomElementScriptFiles = jsxConfig?.intrinsicCustomElementScriptFiles ?? /* @__PURE__ */ new Map();
     this.mdxExtensions = jsxConfig?.mdxExtensions ?? [".mdx"];
     this.radiantSsrEnabled = jsxConfig?.radiantSsrEnabled ?? false;
   }
@@ -76,6 +82,11 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
     return this.isMdxFile(file) ? this.normalizeMdxPageModule(file, module) : module;
   }
   async render(options) {
+    const importedScriptFrame = this.beginImportedIntrinsicScriptFrame([
+      options.Page,
+      options.Layout,
+      options.HtmlTemplate
+    ]);
     try {
       return await this.renderPageWithDocumentShell({
         page: {
@@ -98,18 +109,18 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
       });
     } catch (error) {
       throw this.createRenderError("Error rendering page", error);
+    } finally {
+      this.endImportedIntrinsicScriptFrame(importedScriptFrame);
     }
   }
   async renderComponent(input) {
+    const importedScriptFrame = this.beginImportedIntrinsicScriptFrame([input.component]);
     const assetFrame = this.beginCollectedAssetFrame();
     try {
       if (!this.isFunctionComponent(input.component)) {
         throw new TypeError("JSX renderer expected a callable component.");
       }
-      const content = await this.renderEcoComponent(
-        input.component,
-        this.createComponentProps(input)
-      );
+      const content = await this.renderEcoComponent(input.component, this.createComponentProps(input));
       const rendered = await this.renderJsx(content);
       const queuedBoundaryResolution = await this.resolveOwnedBoundaryHtml(
         rendered.html,
@@ -131,6 +142,8 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
     } catch (error) {
       this.endCollectedAssetFrame(assetFrame);
       throw this.createRenderError("Error rendering component", error);
+    } finally {
+      this.endImportedIntrinsicScriptFrame(importedScriptFrame);
     }
   }
   createComponentBoundaryRuntime(options) {
@@ -140,6 +153,7 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
     });
   }
   async renderToResponse(view, props, ctx) {
+    const importedScriptFrame = this.beginImportedIntrinsicScriptFrame([view, view.config?.layout]);
     try {
       if (!this.isFunctionComponent(view)) {
         throw new TypeError("JSX renderer expected a callable view component.");
@@ -152,6 +166,8 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
       });
     } catch (error) {
       throw this.createRenderError("Error rendering view", error);
+    } finally {
+      this.endImportedIntrinsicScriptFrame(importedScriptFrame);
     }
   }
   /**
@@ -162,6 +178,9 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
    * any layout or document-shell logic runs.
    */
   normalizeMdxPageModule(file, module) {
+    if (!this.isFunctionComponent(module.default)) {
+      throw new TypeError("MDX file must export a callable default component.");
+    }
     const Page = module.default;
     const normalizedConfig = {
       ...module.config ?? Page.config ?? {},
@@ -221,6 +240,104 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
     }
     return dedupedAssets;
   }
+  beginImportedIntrinsicScriptFrame(components) {
+    const frame = this.collectImportedIntrinsicScriptFiles(components);
+    this.importedIntrinsicScriptFrames.push(frame);
+    return frame;
+  }
+  endImportedIntrinsicScriptFrame(frame) {
+    const activeFrame = this.importedIntrinsicScriptFrames.pop();
+    if (activeFrame !== frame) {
+      this.importedIntrinsicScriptFrames = this.importedIntrinsicScriptFrames.filter((entry) => entry !== frame);
+    }
+  }
+  getActiveImportedIntrinsicScriptFiles() {
+    return this.importedIntrinsicScriptFrames[this.importedIntrinsicScriptFrames.length - 1];
+  }
+  /**
+   * Collects intrinsic custom-element script files already owned by the current
+   * component tree through direct source imports or dependency declarations.
+   */
+  collectImportedIntrinsicScriptFiles(components) {
+    const importedScriptFiles = /* @__PURE__ */ new Set();
+    const visitedFiles = /* @__PURE__ */ new Set();
+    const visit = (component) => {
+      const file = component?.config?.__eco?.file;
+      if (!file || visitedFiles.has(file)) {
+        return;
+      }
+      visitedFiles.add(file);
+      for (const scriptFile of this.extractConfiguredDependencyScriptFiles(component, path.dirname(file))) {
+        importedScriptFiles.add(scriptFile);
+      }
+      for (const scriptFile of this.extractImportedIntrinsicScriptFiles(file)) {
+        importedScriptFiles.add(scriptFile);
+      }
+      for (const nestedComponent of component?.config?.dependencies?.components ?? []) {
+        visit(nestedComponent);
+      }
+      visit(component?.config?.layout);
+    };
+    for (const component of components) {
+      visit(component);
+    }
+    return importedScriptFiles;
+  }
+  extractImportedIntrinsicScriptFiles(file) {
+    let source;
+    try {
+      source = readFileSync(file, "utf8");
+    } catch {
+      return [];
+    }
+    const scriptFiles = /* @__PURE__ */ new Set();
+    const directory = path.dirname(file);
+    for (const match of source.matchAll(EcopagesJsxRenderer.SCRIPT_IMPORT_RE)) {
+      const specifier = match[1];
+      if (!specifier) {
+        continue;
+      }
+      const resolvedScriptFile = this.resolveImportedIntrinsicScriptFile(directory, specifier);
+      if (resolvedScriptFile) {
+        scriptFiles.add(resolvedScriptFile);
+      }
+    }
+    return [...scriptFiles];
+  }
+  extractConfiguredDependencyScriptFiles(component, directory) {
+    const scriptFiles = /* @__PURE__ */ new Set();
+    for (const script of component?.config?.dependencies?.scripts ?? []) {
+      const specifier = typeof script === "string" ? script : script.src;
+      if (!specifier) {
+        continue;
+      }
+      const resolvedScriptFile = this.resolveImportedIntrinsicScriptFile(directory, specifier);
+      if (resolvedScriptFile) {
+        scriptFiles.add(resolvedScriptFile);
+      }
+    }
+    return [...scriptFiles];
+  }
+  resolveImportedIntrinsicScriptFile(directory, specifier) {
+    const basePath = path.resolve(directory, specifier);
+    const candidatePaths = [
+      basePath,
+      `${basePath}.ts`,
+      `${basePath}.tsx`,
+      `${basePath}.js`,
+      `${basePath}.jsx`,
+      `${basePath}.mts`,
+      `${basePath}.cts`,
+      `${basePath}.mjs`,
+      `${basePath}.cjs`
+    ];
+    for (const candidatePath of candidatePaths) {
+      if (existsSync(candidatePath)) {
+        return candidatePath;
+      }
+    }
+    return void 0;
+  }
   async ensureRadiantServerRuntimeIfEnabled() {
     if (!this.radiantSsrEnabled) {
       return;
@@ -270,7 +387,7 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
     config,
     metadata
   }) {
-    const wrappedPage = (async (props) => this.invokeComponent(page, props));
+    const wrappedPage = async (props) => await this.invokeComponent(page, props);
     wrappedPage.config = config;
     if (metadata) {
       wrappedPage.metadata = metadata;
@@ -279,6 +396,11 @@ class EcopagesJsxRenderer extends IntegrationRenderer {
   }
   createIntrinsicCustomElementRenderHook(target) {
     return ({ tagName }) => {
+      const currentImportedScriptFiles = this.getActiveImportedIntrinsicScriptFiles();
+      const intrinsicScriptFile = this.intrinsicCustomElementScriptFiles.get(tagName);
+      if (intrinsicScriptFile && currentImportedScriptFiles?.has(intrinsicScriptFile)) {
+        return void 0;
+      }
       const assets = this.intrinsicCustomElementAssets.get(tagName);
       if (assets) {
         target.push(...assets);

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

@@ -8,6 +8,7 @@ export type { EcopagesJsxMdxCompileOptions, EcopagesJsxMdxOptions, EcopagesJsxPl
 export declare class EcopagesJsxPlugin extends IntegrationPlugin<JsxRenderable> {
     renderer: typeof EcopagesJsxRenderer;
     private customElementAssets;
+    private customElementScriptFiles;
     private includeRadiant;
     private mdxEnabled;
     private mdxCompilerOptions?;

package/src/ecopages-jsx.plugin.js

@@ -80,6 +80,7 @@ const resolvePluginOptions = (options) => {
 class EcopagesJsxPlugin extends IntegrationPlugin {
   renderer = EcopagesJsxRenderer;
   customElementAssets = /* @__PURE__ */ new Map();
+  customElementScriptFiles = /* @__PURE__ */ new Map();
   includeRadiant;
   mdxEnabled;
   mdxCompilerOptions;
@@ -112,6 +113,7 @@ class EcopagesJsxPlugin extends IntegrationPlugin {
   initializeRenderer(options) {
     const rendererConfig = {
       intrinsicCustomElementAssets: this.customElementAssets,
+      intrinsicCustomElementScriptFiles: this.customElementScriptFiles,
       mdxExtensions: this.mdxExtensions,
       radiantSsrEnabled: this.includeRadiant
     };
@@ -200,6 +202,7 @@ class EcopagesJsxPlugin extends IntegrationPlugin {
       return;
     }
     this.customElementAssets.clear();
+    this.customElementScriptFiles.clear();
     const scriptFiles = await this.collectScriptEntries(this.appConfig.absolutePaths.srcDir);
     for (const scriptFile of scriptFiles) {
       const tagNames = await this.extractCustomElementTagNames(scriptFile);
@@ -212,6 +215,7 @@ class EcopagesJsxPlugin extends IntegrationPlugin {
       }
       for (const tagName of tagNames) {
         this.customElementAssets.set(tagName, [asset]);
+        this.customElementScriptFiles.set(tagName, scriptFile);
       }
     }
   }

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

@@ -37,9 +37,10 @@ export type EcopagesJsxPluginOptions = Omit<IntegrationPluginConfig, 'name' | 'e
      *
      * When enabled, Ecopages JSX:
      * - imports `@ecopages/radiant/server/render-component` before Radiant SSR
-     * - exposes browser-safe Radiant bare specifiers through the runtime import map
-     * - injects an explicit client bootstrap that calls `installRadiantHydrator()`
-     *   before intrinsic custom-element modules load
+     * - rewrites browser runtime specifiers to emitted vendor assets at build time
+     * - folds `@ecopages/radiant/client/install-hydrator` into the emitted
+     *   Radiant vendor so intrinsic custom-element modules install the
+     *   hydrator before they connect
      *
      * Set to `false` when pages do not use Radiant web components.
      * @default true
@@ -50,6 +51,7 @@ export type EcopagesJsxPluginOptions = Omit<IntegrationPluginConfig, 'name' | 'e
 };
 export type EcopagesJsxRendererConfig = {
     intrinsicCustomElementAssets?: Map<string, readonly ProcessedAsset[]>;
+    intrinsicCustomElementScriptFiles?: Map<string, string>;
     mdxExtensions?: string[];
     radiantSsrEnabled?: boolean;
 };

package/src/services/jsx-runtime-bundle.service.d.ts

@@ -10,7 +10,6 @@
  */
 import type { EcoBuildPlugin } from '@ecopages/core/build/build-types';
 import { type AssetDefinition } from '@ecopages/core/services/asset-processing-service';
-export declare const RADIANT_HYDRATOR_BOOTSTRAP_ATTRIBUTE = "data-ecopages-jsx-radiant-hydrator";
 export interface JsxRuntimeBundleServiceConfig {
     radiant: boolean;
     rootDir?: string;
@@ -42,11 +41,9 @@ export declare class JsxRuntimeBundleService {
     getSpecifierMap(): Promise<Record<string, string>>;
     /**
      * Builds the full list of vendor asset definitions: the import map inline
-     * script plus one `createBrowserRuntimeScriptAsset` per vendor bundle.
+     * assets plus one `createBrowserRuntimeScriptAsset` per vendor bundle.
      */
     getDependencies(): Promise<AssetDefinition[]>;
-    private createRadiantHydratorBootstrapAsset;
-    private createRadiantHydratorBootstrapSource;
     private getArtifactsDir;
     private getEntryImportPath;
     private getOrCreateSpecifierMap;

package/src/services/jsx-runtime-bundle.service.js

@@ -2,27 +2,13 @@ import path from "node:path";
 import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { createRuntimeSpecifierAliasPlugin } from "@ecopages/core/build/runtime-specifier-alias-plugin";
 import {
-  BROWSER_RUNTIME_SCRIPT_ATTRIBUTES,
   buildBrowserRuntimeAssetUrl,
-  createBrowserRuntimeScriptAsset,
-  AssetFactory
+  createBrowserRuntimeScriptAsset
 } from "@ecopages/core/services/asset-processing-service";
 const VENDOR_FILE_NAMES = {
   jsx: "ecopages-jsx-esm.js",
   radiant: "ecopages-radiant-esm.js"
 };
-const RADIANT_HYDRATOR_BOOTSTRAP_ATTRIBUTE = "data-ecopages-jsx-radiant-hydrator";
-const JSX_RUNTIME_NAMESPACE_REPAIR_SNIPPET = "function rG(W,G,J){let j=G instanceof Element?G:G?.parentElement,U=j?.namespaceURI??K9,$=j?.localName,X=W.firstElementChild;if(!X)return;let F=J??X.localName,Z=O9(U,$,F);if(X.namespaceURI===Z&&X.localName===F)return;W.replaceChild(tG(X,Z,F),X)}function tG(W,G,J){let j=document.createElementNS(G,J);for(let U of Array.from(W.attributes)){if(U.namespaceURI){j.setAttributeNS(U.namespaceURI,U.name,U.value);continue}n(j,U.name,U.value)}return j.append(...W.childNodes),j}";
-const JSX_RUNTIME_NAMESPACE_REPAIR_PATCH = [
-  "const eopHtmlNamespace='http://www.w3.org/1999/xhtml',eopSvgNamespace='http://www.w3.org/2000/svg',eopCanonicalSvgLocalNames={altglyph:'altGlyph',altglyphdef:'altGlyphDef',altglyphitem:'altGlyphItem',animatemotion:'animateMotion',animatetransform:'animateTransform',clippath:'clipPath',feblend:'feBlend',fecolormatrix:'feColorMatrix',fecomponenttransfer:'feComponentTransfer',fecomposite:'feComposite',feconvolvematrix:'feConvolveMatrix',fediffuselighting:'feDiffuseLighting',fedisplacementmap:'feDisplacementMap',fedistantlight:'feDistantLight',fedropshadow:'feDropShadow',feflood:'feFlood',fefunca:'feFuncA',fefuncb:'feFuncB',fefuncg:'feFuncG',fefuncr:'feFuncR',fegaussianblur:'feGaussianBlur',feimage:'feImage',femerge:'feMerge',femergenode:'feMergeNode',femorphology:'feMorphology',feoffset:'feOffset',fepointlight:'fePointLight',fespecularlighting:'feSpecularLighting',fespotlight:'feSpotLight',fetile:'feTile',feturbulence:'feTurbulence',foreignobject:'foreignObject',glyphref:'glyphRef',lineargradient:'linearGradient',radialgradient:'radialGradient',textpath:'textPath'};",
-  "function eopGetCanonicalSvgLocalName(W){return eopCanonicalSvgLocalNames[W]??W}",
-  "function eopIsSvgNamespace(W){return W===eopSvgNamespace}",
-  "function rG(W,G,J){let j=G instanceof Element?G:G?.parentElement,U=j?.namespaceURI??K9,$=j?.localName;eopRepairNamespaceFragment(W,U??eopHtmlNamespace,$,J)}",
-  "function eopRepairNamespaceFragment(W,G,J,j){let U=W.firstElementChild;if(!U)return;let $=j??U.localName,X=O9(G,J,$),F=eopIsSvgNamespace(X)?eopGetCanonicalSvgLocalName($):$;eopRepairNamespaceElement(W,U,X,F)}",
-  "function eopRepairNamespaceElement(W,G,J,j){let U=G;if(G.namespaceURI!==J||G.localName!==j)U=tG(G,J,j),W.replaceChild(U,G);eopRepairNamespaceChildren(U,J,j)}",
-  "function eopRepairNamespaceChildren(W,G,J){for(let j of Array.from(W.children)){let U=O9(G,J,j.localName),$=eopIsSvgNamespace(U)?eopGetCanonicalSvgLocalName(j.localName):j.localName,X=j;if(j.namespaceURI!==U||j.localName!==$)X=tG(j,U,$),W.replaceChild(X,j);eopRepairNamespaceChildren(X,U,$)}}",
-  "function tG(W,G,J){let j=document.createElementNS(G,eopIsSvgNamespace(G)?eopGetCanonicalSvgLocalName(J):J);for(let U of Array.from(W.attributes)){if(U.namespaceURI){j.setAttributeNS(U.namespaceURI,U.name,U.value);continue}n(j,U.name,U.value)}return j.append(...W.childNodes),j}"
-].join("");
 function getNamedExportNamesFromModuleSource(source) {
   const exportNames = /* @__PURE__ */ new Set();
   for (const match of source.matchAll(/export\s*\{([^}]+)\}/g)) {
@@ -50,27 +36,34 @@ function isBrowserRuntimeRadiantSpecifier(exportKey) {
   if (exportKey === "." || exportKey.startsWith("./context/")) {
     return true;
   }
+  if (exportKey === "./controller-registry") {
+    return true;
+  }
   if (exportKey === "./client/hydrator") {
     return true;
   }
+  if (exportKey === "./client/install-hydrator") {
+    return true;
+  }
   if (exportKey.startsWith("./decorators/") || exportKey.startsWith("./helpers/")) {
     return true;
   }
-  return exportKey === "./core/radiant-component" || exportKey === "./core/radiant-element";
+  return exportKey === "./core/radiant-controller" || exportKey === "./core/radiant-element";
 }
-function replaceExactOnce(source, search, replacement, label) {
-  if (!source.includes(search)) {
-    throw new Error(`Could not find ${label} in @ecopages/jsx browser runtime source`);
-  }
-  return source.replace(search, replacement);
+function isObjectRecord(value) {
+  return typeof value === "object" && value !== null;
 }
-function createPatchedJsxBrowserRuntimeSource(source) {
-  return replaceExactOnce(
-    source,
-    JSX_RUNTIME_NAMESPACE_REPAIR_SNIPPET,
-    JSX_RUNTIME_NAMESPACE_REPAIR_PATCH,
-    "SVG namespace repair snippet"
-  );
+function readRadiantPackageJson(manifestPath) {
+  const parsed = JSON.parse(readFileSync(manifestPath, "utf8"));
+  if (!isObjectRecord(parsed)) {
+    throw new Error(`Invalid package manifest at ${manifestPath}`);
+  }
+  if (parsed.exports !== void 0 && !isObjectRecord(parsed.exports)) {
+    throw new Error(`Invalid package exports in ${manifestPath}`);
+  }
+  return {
+    exports: parsed.exports
+  };
 }
 function findPackageManifestPath(packageName) {
   let currentDir = path.dirname(new URL(import.meta.url).pathname);
@@ -124,22 +117,11 @@ class JsxRuntimeBundleService {
   }
   /**
    * Builds the full list of vendor asset definitions: the import map inline
-   * script plus one `createBrowserRuntimeScriptAsset` per vendor bundle.
+   * assets plus one `createBrowserRuntimeScriptAsset` per vendor bundle.
    */
   async getDependencies() {
-    const specifierMap = await this.getSpecifierMap();
     const jsxEntryModulePath = await this.getOrCreateJsxEntryModulePath();
-    const deps = [
-      AssetFactory.createInlineContentScript({
-        position: "head",
-        bundle: false,
-        content: JSON.stringify({ imports: specifierMap }, null, 2),
-        attributes: { type: "importmap" }
-      })
-    ];
-    if (this.config.radiant) {
-      deps.push(this.createRadiantHydratorBootstrapAsset());
-    }
+    const deps = [];
     deps.push(
       createBrowserRuntimeScriptAsset({
         importPath: jsxEntryModulePath,
@@ -159,23 +141,6 @@ class JsxRuntimeBundleService {
     }
     return deps;
   }
-  createRadiantHydratorBootstrapAsset() {
-    return AssetFactory.createInlineContentScript({
-      position: "head",
-      bundle: false,
-      content: this.createRadiantHydratorBootstrapSource(),
-      attributes: {
-        ...BROWSER_RUNTIME_SCRIPT_ATTRIBUTES,
-        [RADIANT_HYDRATOR_BOOTSTRAP_ATTRIBUTE]: "true"
-      }
-    });
-  }
-  createRadiantHydratorBootstrapSource() {
-    return [
-      "import { installRadiantHydrator } from '@ecopages/radiant/client/hydrator';",
-      "installRadiantHydrator();"
-    ].join("\n");
-  }
   getArtifactsDir() {
     const rootDir = this.config.rootDir ?? process.cwd();
     return path.join(rootDir, "node_modules", ".cache", "ecopages-browser-runtime");
@@ -197,9 +162,7 @@ class JsxRuntimeBundleService {
     };
     if (this.config.radiant) {
       const radiantVendorUrl = buildBrowserRuntimeAssetUrl(VENDOR_FILE_NAMES.radiant);
-      const radiantPkg = JSON.parse(
-        readFileSync(findPackageManifestPath("@ecopages/radiant"), "utf8")
-      );
+      const radiantPkg = readRadiantPackageJson(findPackageManifestPath("@ecopages/radiant"));
       for (const key of Object.keys(radiantPkg.exports ?? {})) {
         if (!isBrowserRuntimeRadiantSpecifier(key)) {
           continue;
@@ -219,36 +182,28 @@ class JsxRuntimeBundleService {
     const filePath = path.join(artifactsDir, "ecopages-jsx-esm-entry.mjs");
     const manifestPath = findPackageManifestPath("@ecopages/jsx");
     const packageDir = path.dirname(realpathSync(manifestPath));
-    const jsxPkg = JSON.parse(readFileSync(manifestPath, "utf8"));
-    const jsxModulePath = this.resolvePackageExportModulePath(
-      packageDir,
-      ".",
-      jsxPkg.exports?.["."]
-    );
-    const patchedRuntimeSource = createPatchedJsxBrowserRuntimeSource(readFileSync(jsxModulePath, "utf8"));
+    const jsxPkg = readRadiantPackageJson(manifestPath);
+    const jsxModulePath = this.resolvePackageExportModulePath(packageDir, ".", jsxPkg.exports?.["."]);
+    const jsxRuntimeSource = readFileSync(jsxModulePath, "utf8");
     mkdirSync(artifactsDir, { recursive: true });
-    writeFileSync(filePath, patchedRuntimeSource, "utf8");
+    writeFileSync(filePath, jsxRuntimeSource, "utf8");
     this.cachedJsxEntryModulePath = filePath;
     return filePath;
   }
   getRadiantBrowserRuntimeModules() {
     const manifestPath = findPackageManifestPath("@ecopages/radiant");
     const packageDir = path.dirname(realpathSync(manifestPath));
-    const radiantPkg = JSON.parse(readFileSync(manifestPath, "utf8"));
+    const radiantPkg = readRadiantPackageJson(manifestPath);
     return Object.entries(radiantPkg.exports ?? {}).filter(([key]) => isBrowserRuntimeRadiantSpecifier(key) && key !== ".").sort(([left], [right]) => left.localeCompare(right)).map(([exportKey, exportTarget]) => ({
       exportKey,
-      modulePath: this.resolvePackageExportModulePath(
-        packageDir,
-        exportKey,
-        exportTarget
-      )
+      modulePath: this.resolvePackageExportModulePath(packageDir, exportKey, exportTarget)
     })).filter((module) => existsSync(module.modulePath));
   }
   resolvePackageExportModulePath(packageDir, exportKey, exportTarget) {
     if (typeof exportTarget === "string") {
       return path.resolve(packageDir, exportTarget);
     }
-    if (exportTarget && typeof exportTarget === "object" && "import" in exportTarget) {
+    if (isObjectRecord(exportTarget) && "import" in exportTarget) {
       const importTarget = exportTarget.import;
       if (typeof importTarget === "string") {
         return path.resolve(packageDir, importTarget);
@@ -262,8 +217,18 @@ class JsxRuntimeBundleService {
     }
     const artifactsDir = this.getArtifactsDir();
     const filePath = path.join(artifactsDir, "ecopages-radiant-esm-entry.mjs");
+    const manifestPath = findPackageManifestPath("@ecopages/radiant");
+    const packageDir = path.dirname(realpathSync(manifestPath));
+    const radiantPkg = readRadiantPackageJson(manifestPath);
+    const installHydratorModulePath = this.resolvePackageExportModulePath(
+      packageDir,
+      "./client/install-hydrator",
+      radiantPkg.exports?.["./client/install-hydrator"]
+    );
     const seenExports = /* @__PURE__ */ new Set();
-    const statements = [];
+    const statements = [
+      `import '${this.getEntryImportPath(artifactsDir, installHydratorModulePath)}';`
+    ];
     mkdirSync(artifactsDir, { recursive: true });
     for (const module of this.getRadiantBrowserRuntimeModules()) {
       const exportNames = getNamedExportNamesFromModuleSource(readFileSync(module.modulePath, "utf8")).filter((name) => !seenExports.has(name)).filter((name) => /^[$A-Z_a-z][$\w]*$/.test(name)).sort();
@@ -282,6 +247,5 @@ class JsxRuntimeBundleService {
   }
 }
 export {
-  JsxRuntimeBundleService,
-  RADIANT_HYDRATOR_BOOTSTRAP_ATTRIBUTE
+  JsxRuntimeBundleService
 };