@ecopages/core 0.2.0-beta.31 → 0.2.0-beta.33

package/src/route-renderer/orchestration/string-markup-renderer.js

@@ -1,55 +1,52 @@
-import { IntegrationRenderer } from "./integration-renderer.js";
-import { resolveInnermostPageLayout } from "./document-shell/layout-shell-props.service.js";
-class StringMarkupRenderer extends IntegrationRenderer {
-  async renderComponent(input) {
-    if (typeof input.component !== "function") {
-      throw new TypeError(`${this.name} renderer expected a callable component.`);
+import { IntegrationRenderer } from './integration-renderer.js';
+import { resolveInnermostPageLayout } from './document-shell/layout-shell-props.service.js';
+/**
+ * Base renderer for integrations whose page output is string HTML markup.
+ *
+ * @remarks
+ * Ghtml, KitaJS, and MDX share the same document-shell rendering path. Subclasses
+ * only need to set `name` and override hooks for integration-specific behavior.
+ */
+export class StringMarkupRenderer extends IntegrationRenderer {
+    async renderComponent(input) {
+        if (typeof input.component !== 'function') {
+            throw new TypeError(`${this.name} renderer expected a callable component.`);
+        }
+        return this.renderStringComponentWithQueuedForeignSubtrees(input, input.component);
     }
-    return this.renderStringComponentWithQueuedForeignSubtrees(input, input.component);
-  }
-  async render({
-    params,
-    query,
-    props,
-    locals,
-    pageLocals,
-    metadata,
-    Page,
-    Layout,
-    HtmlTemplate,
-    pageProps
-  }) {
-    try {
-      return await this.renderPageWithDocumentShell({
-        page: {
-          component: Page,
-          props: { params, query, ...props, locals: pageLocals }
-        },
-        layout: Layout ? {
-          component: Layout,
-          props: locals ? { locals } : {}
-        } : void 0,
-        htmlTemplate: HtmlTemplate,
-        metadata,
-        pageProps: pageProps ?? props ?? {}
-      });
-    } catch (error) {
-      throw this.createRenderError("Error rendering page", error);
+    async render({ params, query, props, locals, pageLocals, metadata, Page, Layout, HtmlTemplate, pageProps, }) {
+        try {
+            return await this.renderPageWithDocumentShell({
+                page: {
+                    component: Page,
+                    props: { params, query, ...props, locals: pageLocals },
+                },
+                layout: Layout
+                    ? {
+                        component: Layout,
+                        props: locals ? { locals } : {},
+                    }
+                    : undefined,
+                htmlTemplate: HtmlTemplate,
+                metadata,
+                pageProps: pageProps ?? props ?? {},
+            });
+        }
+        catch (error) {
+            throw this.createRenderError('Error rendering page', error);
+        }
     }
-  }
-  async renderToResponse(view, props, ctx) {
-    try {
-      return await this.renderViewWithDocumentShell({
-        view,
-        props,
-        ctx,
-        layout: resolveInnermostPageLayout(view.config?.layouts)
-      });
-    } catch (error) {
-      throw this.createRenderError("Error rendering view", error);
+    async renderToResponse(view, props, ctx) {
+        try {
+            return await this.renderViewWithDocumentShell({
+                view,
+                props,
+                ctx,
+                layout: resolveInnermostPageLayout(view.config?.layouts),
+            });
+        }
+        catch (error) {
+            throw this.createRenderError('Error rendering view', error);
+        }
     }
-  }
 }
-export {
-  StringMarkupRenderer
-};

package/src/route-renderer/page-loading/component-dependency-collection.js

@@ -1,135 +1,131 @@
-import path from "node:path";
-import { assertEcoDeclaredComponent } from "../../eco/eco-declared-component.js";
-import { AssetFactory } from "../../services/assets/asset-processing-service/index.js";
-import { extractEcopagesVirtualImports } from "./ecopages-virtual-imports.js";
-import { collectDeclaredAssetEntries } from "./declared-asset-collection.js";
-import { getLazyTriggerKey } from "./lazy-trigger-planning.js";
-import { collectLazyScriptEntries } from "./lazy-entry-collection.js";
-import {
-  createModuleScriptName,
-  createNamedImportModuleSource,
-  createNamespaceImportModuleSource
-} from "./module-declaration-scripts.js";
-import { collectModuleDeclarations } from "./module-declaration-aggregation.js";
+import path from 'node:path';
+import { assertEcoDeclaredComponent } from '../../eco/eco-declared-component.js';
+import { AssetFactory } from '../../services/assets/asset-processing-service/index.js';
+import { extractEcopagesVirtualImports } from './ecopages-virtual-imports.js';
+import { collectDeclaredAssetEntries } from './declared-asset-collection.js';
+import { getLazyTriggerKey } from './lazy-trigger-planning.js';
+import { collectLazyScriptEntries } from './lazy-entry-collection.js';
+import { createModuleScriptName, createNamedImportModuleSource, createNamespaceImportModuleSource, } from './module-declaration-scripts.js';
+import { collectModuleDeclarations } from './module-declaration-aggregation.js';
 const MODULE_SCRIPT_ATTRIBUTES = {
-  type: "module",
-  defer: ""
+    type: 'module',
+    defer: '',
 };
 function createModuleScriptAttributes(attributes) {
-  return {
-    ...MODULE_SCRIPT_ATTRIBUTES,
-    ...attributes
-  };
+    return {
+        ...MODULE_SCRIPT_ATTRIBUTES,
+        ...attributes,
+    };
 }
 function pushUniqueDependency(keys, key, dependencies, dependency) {
-  if (keys.has(key)) {
-    return false;
-  }
-  keys.add(key);
-  dependencies.push(dependency);
-  return true;
+    if (keys.has(key)) {
+        return false;
+    }
+    keys.add(key);
+    dependencies.push(dependency);
+    return true;
 }
 function resolveDependencyPath(componentDir, pathUrl) {
-  return path.join(componentDir, pathUrl);
+    return path.join(componentDir, pathUrl);
 }
-function collectComponentDependencies(options) {
-  const {
-    components,
-    integrationName,
-    resolveLazyScripts,
-    createEcopagesJsxLazyEntryName,
-    isEcopagesJsxIntegration,
-    errors
-  } = options;
-  const dependencies = [];
-  const lazyScriptsByConfig = /* @__PURE__ */ new Map();
-  const lazyDependencyKeys = /* @__PURE__ */ new Set();
-  for (const component of components) {
-    if (!component) continue;
-    const componentFile = component.config?.__eco?.file;
-    if (!componentFile) continue;
-    const stylesheetDependencyKeys = /* @__PURE__ */ new Set();
-    const scriptDependencyKeys = /* @__PURE__ */ new Set();
-    const modulesMap = /* @__PURE__ */ new Map();
-    const collect = (config) => {
-      if (!config) return;
-      const file = config.__eco?.file;
-      if (!file) return;
-      const dir = path.dirname(file);
-      const dependenciesConfig = config.dependencies;
-      const registerLazyScript = ({
-        lazy,
-        lazyKey,
-        fallbackUrl
-      }) => {
-        let grouped = lazyScriptsByConfig.get(config);
-        if (!grouped) {
-          grouped = /* @__PURE__ */ new Map();
-          lazyScriptsByConfig.set(config, grouped);
-        }
-        const triggerKey = getLazyTriggerKey(lazy);
-        const existing = grouped.get(triggerKey) ?? { lazy, scripts: [] };
-        existing.scripts.push({ lazyKey, fallbackUrl });
-        grouped.set(triggerKey, existing);
-      };
-      collectDeclaredAssetEntries({
-        stylesheetEntries: dependenciesConfig?.stylesheets ?? [],
-        scriptEntries: dependenciesConfig?.scripts ?? [],
-        componentDir: dir,
-        dependencies,
-        stylesheetDependencyKeys,
-        scriptDependencyKeys,
-        resolveDependencyPath,
-        createModuleScriptAttributes,
-        pushUniqueDependency,
-        getInvalidStylesheetEntryMessage: () => errors.invalidStylesheetEntry,
-        getInvalidScriptEntryMessage: () => errors.invalidScriptEntry
-      });
-      collectModuleDeclarations(modulesMap, dependenciesConfig?.modules, extractEcopagesVirtualImports(file));
-      collectLazyScriptEntries({
-        scriptEntries: dependenciesConfig?.scripts ?? [],
-        componentFile: file,
-        componentDir: dir,
-        integrationName,
-        dependencies,
-        lazyDependencyKeys,
-        registerLazyScript,
-        resolveDependencyPath,
-        resolveLazyScripts,
-        createModuleScriptAttributes,
-        createEcopagesJsxLazyEntryName,
-        pushUniqueDependency,
-        getLazyScriptMissingSrcMessage: () => errors.lazyScriptMissingSrc,
-        isEcopagesJsxIntegration
-      });
-      if (dependenciesConfig?.components) {
-        for (const nestedComponent of dependenciesConfig.components) {
-          if (!nestedComponent) {
+/**
+ * Walks component dependency trees and collects declared assets, module declarations,
+ * and lazy-script group metadata in one pass.
+ *
+ * The returned structures intentionally preserve both the flat asset list used by
+ * asset processing and the grouped lazy-trigger data used later during render output.
+ */
+export function collectComponentDependencies(options) {
+    const { components, integrationName, resolveLazyScripts, createEcopagesJsxLazyEntryName, isEcopagesJsxIntegration, errors, } = options;
+    const dependencies = [];
+    const lazyScriptsByConfig = new Map();
+    const lazyDependencyKeys = new Set();
+    for (const component of components) {
+        if (!component)
             continue;
-          }
-          assertEcoDeclaredComponent(nestedComponent, { parentComponentFile: file });
-          collect(nestedComponent.config);
-        }
-      }
+        const componentFile = component.config?.__eco?.file;
+        if (!componentFile)
+            continue;
+        const stylesheetDependencyKeys = new Set();
+        const scriptDependencyKeys = new Set();
+        const modulesMap = new Map();
+        /**
+         * Recursively visits one component config and its declared child dependencies.
+         */
+        const collect = (config) => {
+            if (!config)
+                return;
+            const file = config.__eco?.file;
+            if (!file)
+                return;
+            const dir = path.dirname(file);
+            const dependenciesConfig = config.dependencies;
+            const registerLazyScript = ({ lazy, lazyKey, fallbackUrl, }) => {
+                let grouped = lazyScriptsByConfig.get(config);
+                if (!grouped) {
+                    grouped = new Map();
+                    lazyScriptsByConfig.set(config, grouped);
+                }
+                const triggerKey = getLazyTriggerKey(lazy);
+                const existing = grouped.get(triggerKey) ?? { lazy, scripts: [] };
+                existing.scripts.push({ lazyKey, fallbackUrl });
+                grouped.set(triggerKey, existing);
+            };
+            collectDeclaredAssetEntries({
+                stylesheetEntries: dependenciesConfig?.stylesheets ?? [],
+                scriptEntries: dependenciesConfig?.scripts ?? [],
+                componentDir: dir,
+                dependencies,
+                stylesheetDependencyKeys,
+                scriptDependencyKeys,
+                resolveDependencyPath,
+                createModuleScriptAttributes,
+                pushUniqueDependency,
+                getInvalidStylesheetEntryMessage: () => errors.invalidStylesheetEntry,
+                getInvalidScriptEntryMessage: () => errors.invalidScriptEntry,
+            });
+            collectModuleDeclarations(modulesMap, dependenciesConfig?.modules, extractEcopagesVirtualImports(file));
+            collectLazyScriptEntries({
+                scriptEntries: dependenciesConfig?.scripts ?? [],
+                componentFile: file,
+                componentDir: dir,
+                integrationName,
+                dependencies,
+                lazyDependencyKeys,
+                registerLazyScript,
+                resolveDependencyPath,
+                resolveLazyScripts,
+                createModuleScriptAttributes,
+                createEcopagesJsxLazyEntryName,
+                pushUniqueDependency,
+                getLazyScriptMissingSrcMessage: () => errors.lazyScriptMissingSrc,
+                isEcopagesJsxIntegration,
+            });
+            if (dependenciesConfig?.components) {
+                for (const nestedComponent of dependenciesConfig.components) {
+                    if (!nestedComponent) {
+                        continue;
+                    }
+                    assertEcoDeclaredComponent(nestedComponent, { parentComponentFile: file });
+                    collect(nestedComponent.config);
+                }
+            }
+        };
+        collect(component.config);
+        dependencies.push(...Array.from(modulesMap.entries()).map(([from, importsSet]) => {
+            const imports = importsSet ? Array.from(importsSet) : undefined;
+            return AssetFactory.createContentScript({
+                position: 'head',
+                name: createModuleScriptName(from, imports),
+                content: imports && imports.length > 0
+                    ? createNamedImportModuleSource(from, imports)
+                    : createNamespaceImportModuleSource(from),
+                attributes: createModuleScriptAttributes(),
+            });
+        }));
+    }
+    return {
+        dependencies,
+        lazyScriptsByConfig,
     };
-    collect(component.config);
-    dependencies.push(
-      ...Array.from(modulesMap.entries()).map(([from, importsSet]) => {
-        const imports = importsSet ? Array.from(importsSet) : void 0;
-        return AssetFactory.createContentScript({
-          position: "head",
-          name: createModuleScriptName(from, imports),
-          content: imports && imports.length > 0 ? createNamedImportModuleSource(from, imports) : createNamespaceImportModuleSource(from),
-          attributes: createModuleScriptAttributes()
-        });
-      })
-    );
-  }
-  return {
-    dependencies,
-    lazyScriptsByConfig
-  };
 }
-export {
-  collectComponentDependencies
-};

package/src/route-renderer/page-loading/declared-asset-collection.js

@@ -1,106 +1,78 @@
-import { AssetFactory } from "../../services/assets/asset-processing-service/index.js";
+import { AssetFactory } from '../../services/assets/asset-processing-service/index.js';
 function isDependencyEntryObject(entry) {
-  return typeof entry === "object" && entry !== null;
+    return typeof entry === 'object' && entry !== null;
 }
 function getDependencyEntrySrc(entry) {
-  return isDependencyEntryObject(entry) ? entry.src : entry;
+    return isDependencyEntryObject(entry) ? entry.src : entry;
 }
 function getDependencyEntryContent(entry) {
-  return isDependencyEntryObject(entry) ? entry.content : void 0;
+    return isDependencyEntryObject(entry) ? entry.content : undefined;
 }
 function getDependencyEntryAttributes(entry) {
-  return isDependencyEntryObject(entry) ? entry.attributes : void 0;
+    return isDependencyEntryObject(entry) ? entry.attributes : undefined;
 }
-function collectDeclaredAssetEntries(options) {
-  const {
-    stylesheetEntries,
-    scriptEntries,
-    componentDir,
-    dependencies,
-    stylesheetDependencyKeys,
-    scriptDependencyKeys,
-    resolveDependencyPath,
-    createModuleScriptAttributes,
-    pushUniqueDependency,
-    getInvalidStylesheetEntryMessage,
-    getInvalidScriptEntryMessage
-  } = options;
-  for (const style of stylesheetEntries) {
-    const content = getDependencyEntryContent(style);
-    const src = getDependencyEntrySrc(style);
-    const attributes = getDependencyEntryAttributes(style);
-    if (content) {
-      const depKey2 = `style:content:${content}:${JSON.stringify(attributes ?? {})}`;
-      pushUniqueDependency(
-        stylesheetDependencyKeys,
-        depKey2,
-        dependencies,
-        AssetFactory.createContentStylesheet({
-          content,
-          position: "head",
-          attributes
-        })
-      );
-      continue;
-    }
-    if (!src) {
-      throw new Error(getInvalidStylesheetEntryMessage());
-    }
-    const resolvedPath = resolveDependencyPath(componentDir, src);
-    const depKey = `style:file:${resolvedPath}:${JSON.stringify(attributes ?? {})}`;
-    pushUniqueDependency(
-      stylesheetDependencyKeys,
-      depKey,
-      dependencies,
-      AssetFactory.createFileStylesheet({
-        filepath: resolvedPath,
-        position: "head",
-        attributes: {
-          rel: "stylesheet",
-          ...attributes
+/**
+ * Normalizes non-lazy stylesheet and script declarations into asset definitions.
+ *
+ * Duplicate declarations are filtered through the provided key sets so callers can
+ * compose this helper into larger recursive collection passes without re-emitting
+ * the same asset multiple times.
+ */
+export function collectDeclaredAssetEntries(options) {
+    const { stylesheetEntries, scriptEntries, componentDir, dependencies, stylesheetDependencyKeys, scriptDependencyKeys, resolveDependencyPath, createModuleScriptAttributes, pushUniqueDependency, getInvalidStylesheetEntryMessage, getInvalidScriptEntryMessage, } = options;
+    for (const style of stylesheetEntries) {
+        const content = getDependencyEntryContent(style);
+        const src = getDependencyEntrySrc(style);
+        const attributes = getDependencyEntryAttributes(style);
+        if (content) {
+            const depKey = `style:content:${content}:${JSON.stringify(attributes ?? {})}`;
+            pushUniqueDependency(stylesheetDependencyKeys, depKey, dependencies, AssetFactory.createContentStylesheet({
+                content,
+                position: 'head',
+                attributes,
+            }));
+            continue;
         }
-      })
-    );
-  }
-  for (const script of scriptEntries) {
-    if (isDependencyEntryObject(script) && "lazy" in script && script.lazy) {
-      continue;
-    }
-    const content = getDependencyEntryContent(script);
-    const src = getDependencyEntrySrc(script);
-    const attributes = getDependencyEntryAttributes(script);
-    if (content) {
-      const depKey2 = `script:content:${content}:${JSON.stringify(attributes ?? {})}`;
-      pushUniqueDependency(
-        scriptDependencyKeys,
-        depKey2,
-        dependencies,
-        AssetFactory.createInlineContentScript({
-          position: "head",
-          content,
-          bundle: false,
-          attributes
-        })
-      );
-      continue;
+        if (!src) {
+            throw new Error(getInvalidStylesheetEntryMessage());
+        }
+        const resolvedPath = resolveDependencyPath(componentDir, src);
+        const depKey = `style:file:${resolvedPath}:${JSON.stringify(attributes ?? {})}`;
+        pushUniqueDependency(stylesheetDependencyKeys, depKey, dependencies, AssetFactory.createFileStylesheet({
+            filepath: resolvedPath,
+            position: 'head',
+            attributes: {
+                rel: 'stylesheet',
+                ...attributes,
+            },
+        }));
     }
-    if (!src) {
-      throw new Error(getInvalidScriptEntryMessage());
+    for (const script of scriptEntries) {
+        if (isDependencyEntryObject(script) && 'lazy' in script && script.lazy) {
+            continue;
+        }
+        const content = getDependencyEntryContent(script);
+        const src = getDependencyEntrySrc(script);
+        const attributes = getDependencyEntryAttributes(script);
+        if (content) {
+            const depKey = `script:content:${content}:${JSON.stringify(attributes ?? {})}`;
+            pushUniqueDependency(scriptDependencyKeys, depKey, dependencies, AssetFactory.createInlineContentScript({
+                position: 'head',
+                content,
+                bundle: false,
+                attributes,
+            }));
+            continue;
+        }
+        if (!src) {
+            throw new Error(getInvalidScriptEntryMessage());
+        }
+        const resolvedPath = resolveDependencyPath(componentDir, src);
+        const depKey = `script:file:${resolvedPath}:${JSON.stringify(attributes ?? {})}`;
+        pushUniqueDependency(scriptDependencyKeys, depKey, dependencies, AssetFactory.createFileScript({
+            filepath: resolvedPath,
+            position: 'head',
+            attributes: createModuleScriptAttributes(attributes),
+        }));
     }
-    const resolvedPath = resolveDependencyPath(componentDir, src);
-    const depKey = `script:file:${resolvedPath}:${JSON.stringify(attributes ?? {})}`;
-    pushUniqueDependency(
-      scriptDependencyKeys,
-      depKey,
-      dependencies,
-      AssetFactory.createFileScript({
-        filepath: resolvedPath,
-        position: "head",
-        attributes: createModuleScriptAttributes(attributes)
-      })
-    );
-  }
 }
-export {
-  collectDeclaredAssetEntries
-};