@ecopages/ecopages-jsx 0.2.0-beta.36 → 0.2.0-beta.38

package/package.json

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

package/src/ecopages-jsx-hmr-ownership.d.ts

@@ -30,7 +30,15 @@ export declare function getEjsxHmrOwnership(): EjsxHmrOwnershipState;
  * state is replaced only when the resulting file set has a different hash, so
  * the renderer's per-render hook is free in the steady state.
  */
-export declare function updateEjsxHmrOwnership(components: ReadonlyArray<EcoComponent | undefined>): void;
+export declare function updateEjsxHmrOwnership(components: ReadonlyArray<EcoComponent | Partial<EcoComponent> | undefined>): void;
+/**
+ * Merges one render tree into a pending ownership set during an active render.
+ */
+export declare function mergeEjsxHmrOwnership(target: Set<string>, components: ReadonlyArray<EcoComponent | undefined>): void;
+/**
+ * Publishes the merged ownership set for the completed render.
+ */
+export declare function publishEjsxHmrOwnership(files: ReadonlySet<string>): void;
 /**
  * Resets the state to empty. Used by tests and by HMR manager teardown.
  */

package/src/ecopages-jsx-hmr-ownership.js

@@ -12,8 +12,8 @@
  * lifecycle anchor. A fresh state is installed only when the source-file set
  * changes, so the renderer's per-render hook stays O(1) in the steady state.
  */
-import path from 'node:path';
 import { rapidhash } from '@ecopages/core/hash';
+import { collectComponentConfigFilePaths } from '@ecopages/core/route-renderer/page-loading/file-scoped-dependency-components';
 const EMPTY_STATE = {
     fileOwners: new Set(),
     hash: '',
@@ -35,13 +35,26 @@ export function getEjsxHmrOwnership() {
  * the renderer's per-render hook is free in the steady state.
  */
 export function updateEjsxHmrOwnership(components) {
-    const files = collectFileOwners(components);
+    publishEjsxHmrOwnership(collectFileOwners(components));
+}
+/**
+ * Merges one render tree into a pending ownership set during an active render.
+ */
+export function mergeEjsxHmrOwnership(target, components) {
+    for (const file of collectFileOwners(components)) {
+        target.add(file);
+    }
+}
+/**
+ * Publishes the merged ownership set for the completed render.
+ */
+export function publishEjsxHmrOwnership(files) {
     const hash = hashFileSet(files);
     if (hash === currentState.hash) {
         return;
     }
     currentState = {
-        fileOwners: files,
+        fileOwners: new Set(files),
         hash,
     };
 }
@@ -52,30 +65,7 @@ export function resetEjsxHmrOwnership() {
     currentState = EMPTY_STATE;
 }
 function collectFileOwners(components) {
-    const files = new Set();
-    const visited = new Set();
-    const visit = (config) => {
-        const file = config?.__eco?.file;
-        if (!file) {
-            return;
-        }
-        const resolved = path.resolve(file);
-        if (visited.has(resolved)) {
-            return;
-        }
-        visited.add(resolved);
-        files.add(resolved);
-        for (const dependency of config?.dependencies?.components ?? []) {
-            visit(dependency?.config);
-        }
-        for (const layout of config?.layouts ?? []) {
-            visit(layout?.config);
-        }
-    };
-    for (const component of components) {
-        visit(component?.config);
-    }
-    return files;
+    return collectComponentConfigFilePaths(components, { includeLayouts: true });
 }
 function hashFileSet(files) {
     if (files.size === 0) {

package/src/ecopages-jsx-render-session.d.ts

@@ -1,3 +1,4 @@
+import type { EcoComponent } from '@ecopages/core';
 import type { ProcessedAsset } from '@ecopages/core/services/asset-processing-service';
 export declare const ECOPAGES_JSX_SSR_RENDER_STATE_KEY: unique symbol;
 /**
@@ -21,11 +22,13 @@ export declare class EcopagesJsxRenderSession {
      * mirrored back into the JSX SSR scope so nested `renderToString()` calls see
      * the same asset frame stack. When no session exists yet, a new state is
      * created and published through both the internal async-local store and the
-     * JSX SSR scope bridge.
+     * JSX SSR scope bridge. HMR ownership accumulated during the outer scope is
+     * published once when that scope completes.
      */
-    withActiveScope<T>(render: () => T): T;
+    withActiveScope<T>(render: () => T | Promise<T>): Promise<T>;
     beginCollectedAssetFrame(): ProcessedAsset[];
     endCollectedAssetFrame(frame: ProcessedAsset[]): ProcessedAsset[];
+    mergeHmrOwnership(components: ReadonlyArray<EcoComponent | undefined>): void;
     recordCollectedAssets(collectedAssets: ProcessedAsset[]): ProcessedAsset[];
     /**
      * Resolves the current render-session state from the local async scope first.

package/src/ecopages-jsx-render-session.js

@@ -1,7 +1,30 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { getActiveSsrScopeValue, withActiveSsrScopeValue } from '@ecopages/jsx/server';
+import { mergeEjsxHmrOwnership, publishEjsxHmrOwnership } from './ecopages-jsx-hmr-ownership.js';
 export const ECOPAGES_JSX_SSR_RENDER_STATE_KEY = Symbol.for('@ecopages/ecopages-jsx.ssr-render-state');
 const renderStateStorage = new AsyncLocalStorage();
+function ensurePendingHmrFileOwners(state) {
+    if (!state.pendingHmrFileOwners) {
+        state.pendingHmrFileOwners = new Set();
+    }
+    return state.pendingHmrFileOwners;
+}
+function commitPendingHmrOwnership(state) {
+    const pending = state.pendingHmrFileOwners;
+    if (!pending || pending.size === 0) {
+        return;
+    }
+    publishEjsxHmrOwnership(pending);
+    pending.clear();
+}
+async function runWithCommittedHmrOwnership(state, render) {
+    try {
+        return await render();
+    }
+    finally {
+        commitPendingHmrOwnership(state);
+    }
+}
 /**
  * Tracks JSX SSR asset-collection state for one active render flow.
  *
@@ -25,21 +48,24 @@ export class EcopagesJsxRenderSession {
      * mirrored back into the JSX SSR scope so nested `renderToString()` calls see
      * the same asset frame stack. When no session exists yet, a new state is
      * created and published through both the internal async-local store and the
-     * JSX SSR scope bridge.
+     * JSX SSR scope bridge. HMR ownership accumulated during the outer scope is
+     * published once when that scope completes.
      */
-    withActiveScope(render) {
+    async withActiveScope(render) {
         const activeState = renderStateStorage.getStore();
         if (activeState) {
-            return withActiveSsrScopeValue(ECOPAGES_JSX_SSR_RENDER_STATE_KEY, activeState, render);
+            return await withActiveSsrScopeValue(ECOPAGES_JSX_SSR_RENDER_STATE_KEY, activeState, render);
         }
         const jsxScopeState = getActiveSsrScopeValue(ECOPAGES_JSX_SSR_RENDER_STATE_KEY);
         if (jsxScopeState) {
-            return renderStateStorage.run(jsxScopeState, () => render());
+            ensurePendingHmrFileOwners(jsxScopeState);
+            return await runWithCommittedHmrOwnership(jsxScopeState, () => renderStateStorage.run(jsxScopeState, () => render()));
         }
         const state = {
             collectedAssetFrames: [],
+            pendingHmrFileOwners: new Set(),
         };
-        return renderStateStorage.run(state, () => withActiveSsrScopeValue(ECOPAGES_JSX_SSR_RENDER_STATE_KEY, state, render));
+        return await runWithCommittedHmrOwnership(state, () => renderStateStorage.run(state, () => withActiveSsrScopeValue(ECOPAGES_JSX_SSR_RENDER_STATE_KEY, state, render)));
     }
     beginCollectedAssetFrame() {
         const state = this.getState();
@@ -54,6 +80,9 @@ export class EcopagesJsxRenderSession {
         }
         return this.dedupeProcessedAssets(activeFrame);
     }
+    mergeHmrOwnership(components) {
+        mergeEjsxHmrOwnership(ensurePendingHmrFileOwners(this.getState()), components);
+    }
     recordCollectedAssets(collectedAssets) {
         const dedupedAssets = this.dedupeProcessedAssets(collectedAssets);
         const state = this.getState();

package/src/ecopages-jsx-renderer.js

@@ -6,7 +6,6 @@ import { ECOPAGES_JSX_PLUGIN_NAME } from './ecopages-jsx.constants.js';
 import { isMdxFile, normalizeMdxPageModule, } from './ecopages-jsx-mdx.js';
 import { EcopagesJsxRenderSession } from './ecopages-jsx-render-session.js';
 import { EcopagesJsxRadiantSsrPolicy } from './ecopages-jsx-radiant-ssr-policy.js';
-import { updateEjsxHmrOwnership } from './ecopages-jsx-hmr-ownership.js';
 /**
  * Local Ecopages renderer for JSX templates in the docs app.
  *
@@ -136,7 +135,7 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
         });
     }
     async render(options) {
-        return await this.withPreparedRadiantRuntime(() => this.renderSession.withActiveScope(async () => {
+        return await this.withPreparedRadiantRuntime(async () => await this.renderSession.withActiveScope(async () => {
             try {
                 const result = await this.renderPageWithDocumentShell({
                     page: {
@@ -159,7 +158,12 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
                     metadata: options.metadata,
                     pageProps: options.pageProps ?? {},
                 });
-                this.recordHmrOwnership([options.Page, options.Layout, options.HtmlTemplate]);
+                this.recordHmrOwnership([
+                    options.Page,
+                    options.Layout,
+                    options.HtmlTemplate,
+                    ...(options.resolvedPageDependencyComponents ?? []),
+                ]);
                 return result;
             }
             catch (error) {
@@ -168,7 +172,7 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
         }));
     }
     async renderComponent(input) {
-        return await this.withPreparedRadiantRuntime(() => this.renderSession.withActiveScope(async () => {
+        return await this.withPreparedRadiantRuntime(async () => await this.renderSession.withActiveScope(async () => {
             const assetFrame = this.renderSession.beginCollectedAssetFrame();
             try {
                 if (typeof input.component !== 'function') {
@@ -227,7 +231,7 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
         }));
     }
     async renderToResponse(view, props, ctx) {
-        return await this.withPreparedRadiantRuntime(() => this.renderSession.withActiveScope(async () => {
+        return await this.withPreparedRadiantRuntime(async () => await this.renderSession.withActiveScope(async () => {
             try {
                 if (typeof view !== 'function') {
                     throw new TypeError('JSX renderer expected a callable view component.');
@@ -275,6 +279,6 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
      * re-walking the component tree.
      */
     recordHmrOwnership(components) {
-        updateEjsxHmrOwnership(components);
+        this.renderSession.mergeHmrOwnership(components);
     }
 }