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

package/src/route-renderer/page-loading/module-declaration-aggregation.js

@@ -1,37 +1,44 @@
-import { normalizeModuleDeclarations } from "../../eco/module-dependencies.js";
-import { isBrowserEcopagesVirtualImport } from "./ecopages-virtual-imports.js";
+import { normalizeModuleDeclarations } from '../../eco/module-dependencies.js';
+import { isBrowserEcopagesVirtualImport } from './ecopages-virtual-imports.js';
+/**
+ * Narrows arbitrary config input onto the declared module string array shape.
+ */
 function getDeclaredModules(value) {
-  if (!Array.isArray(value)) {
-    return void 0;
-  }
-  return value.every((entry) => typeof entry === "string") ? value : void 0;
+    if (!Array.isArray(value)) {
+        return undefined;
+    }
+    return value.every((entry) => typeof entry === 'string') ? value : undefined;
 }
+/**
+ * Merges one module declaration into the aggregated map, preserving the wildcard
+ * import semantics represented by `null`.
+ */
 function mergeModuleDeclaration(modulesMap, declaration) {
-  const existing = modulesMap.get(declaration.from);
-  if (!declaration.imports || declaration.imports.length === 0) {
-    modulesMap.set(declaration.from, null);
-    return;
-  }
-  if (existing === null) {
-    return;
-  }
-  const merged = existing ?? /* @__PURE__ */ new Set();
-  for (const imported of declaration.imports) {
-    merged.add(imported);
-  }
-  modulesMap.set(declaration.from, merged);
+    const existing = modulesMap.get(declaration.from);
+    if (!declaration.imports || declaration.imports.length === 0) {
+        modulesMap.set(declaration.from, null);
+        return;
+    }
+    if (existing === null) {
+        return;
+    }
+    const merged = existing ?? new Set();
+    for (const imported of declaration.imports) {
+        merged.add(imported);
+    }
+    modulesMap.set(declaration.from, merged);
 }
-function collectModuleDeclarations(modulesMap, declaredModules, autoVirtualImports) {
-  for (const declaration of normalizeModuleDeclarations(getDeclaredModules(declaredModules))) {
-    if (declaration.from.startsWith("ecopages:") && !isBrowserEcopagesVirtualImport(declaration.from)) {
-      continue;
+/**
+ * Combines explicit config module declarations with auto-detected `ecopages:` imports.
+ */
+export function collectModuleDeclarations(modulesMap, declaredModules, autoVirtualImports) {
+    for (const declaration of normalizeModuleDeclarations(getDeclaredModules(declaredModules))) {
+        if (declaration.from.startsWith('ecopages:') && !isBrowserEcopagesVirtualImport(declaration.from)) {
+            continue;
+        }
+        mergeModuleDeclaration(modulesMap, declaration);
+    }
+    for (const declaration of autoVirtualImports) {
+        mergeModuleDeclaration(modulesMap, declaration);
     }
-    mergeModuleDeclaration(modulesMap, declaration);
-  }
-  for (const declaration of autoVirtualImports) {
-    mergeModuleDeclaration(modulesMap, declaration);
-  }
 }
-export {
-  collectModuleDeclarations
-};

package/src/route-renderer/page-loading/module-declaration-scripts.js

@@ -1,18 +1,13 @@
-import { rapidhash } from "../../utils/hash.js";
-function createModuleScriptName(from, imports) {
-  const normalizedImports = imports ? [...imports].sort().join(",") : "*";
-  const hash = rapidhash(`${from}|${normalizedImports}`).toString(16);
-  return `module-${hash}`;
+import { rapidhash } from '../../utils/hash.js';
+export function createModuleScriptName(from, imports) {
+    const normalizedImports = imports ? [...imports].sort().join(',') : '*';
+    const hash = rapidhash(`${from}|${normalizedImports}`).toString(16);
+    return `module-${hash}`;
 }
-function createNamedImportModuleSource(from, imports) {
-  const namedImports = [...new Set(imports)].sort().join(", ");
-  return `export { ${namedImports} } from '${from}';`;
+export function createNamedImportModuleSource(from, imports) {
+    const namedImports = [...new Set(imports)].sort().join(', ');
+    return `export { ${namedImports} } from '${from}';`;
 }
-function createNamespaceImportModuleSource(from) {
-  return `export * from '${from}';`;
+export function createNamespaceImportModuleSource(from) {
+    return `export * from '${from}';`;
 }
-export {
-  createModuleScriptName,
-  createNamedImportModuleSource,
-  createNamespaceImportModuleSource
-};

package/src/route-renderer/page-loading/page-dependency-bundling.js

@@ -1,137 +1,180 @@
-import { existsSync, readFileSync } from "node:fs";
-import { AssetFactory } from "../../services/assets/asset-processing-service/index.js";
-import { rapidhash } from "../../utils/hash.js";
+import { existsSync, readFileSync } from 'node:fs';
+import { AssetFactory } from '../../services/assets/asset-processing-service/index.js';
+import { rapidhash } from '../../utils/hash.js';
+/**
+ * Returns `true` when the asset attributes match the exact shape required for
+ * safe page-owned bundling.
+ */
 function hasOnlyExpectedAttributes(attributes, expected) {
-  const keys = Object.keys(attributes ?? {});
-  const expectedKeys = Object.keys(expected);
-  if (keys.length !== expectedKeys.length) {
-    return false;
-  }
-  return expectedKeys.every((key) => attributes?.[key] === expected[key]);
+    const keys = Object.keys(attributes ?? {});
+    const expectedKeys = Object.keys(expected);
+    if (keys.length !== expectedKeys.length) {
+        return false;
+    }
+    return expectedKeys.every((key) => attributes?.[key] === expected[key]);
 }
 function isSafeBundledStylesheetReference(reference) {
-  return reference.startsWith("/") || reference.startsWith("data:") || reference.startsWith("http://") || reference.startsWith("https://") || reference.startsWith("#");
+    return (reference.startsWith('/') ||
+        reference.startsWith('data:') ||
+        reference.startsWith('http://') ||
+        reference.startsWith('https://') ||
+        reference.startsWith('#'));
 }
+/**
+ * Normalizes CSS URL tokens before safety checks so quoted and unquoted forms are treated equally.
+ */
 function normalizeCssReferenceToken(token) {
-  return token.trim().replace(/^['"]|['"]$/g, "");
+    return token.trim().replace(/^['"]|['"]$/g, '');
 }
+/**
+ * Rejects stylesheet content that contains relative references which would stop
+ * working once multiple files are collapsed into one page-owned bundle.
+ */
 function isSafeBundledStylesheetContent(content) {
-  for (const match of content.matchAll(/@import\s+(?:url\()?['"]?([^'")\s]+)['"]?\)?/g)) {
-    const reference = normalizeCssReferenceToken(match[1] ?? "");
-    if (reference && !isSafeBundledStylesheetReference(reference)) {
-      return false;
+    for (const match of content.matchAll(/@import\s+(?:url\()?['"]?([^'")\s]+)['"]?\)?/g)) {
+        const reference = normalizeCssReferenceToken(match[1] ?? '');
+        if (reference && !isSafeBundledStylesheetReference(reference)) {
+            return false;
+        }
     }
-  }
-  for (const match of content.matchAll(/url\(([^)]+)\)/g)) {
-    const reference = normalizeCssReferenceToken(match[1] ?? "");
-    if (reference && !isSafeBundledStylesheetReference(reference)) {
-      return false;
+    for (const match of content.matchAll(/url\(([^)]+)\)/g)) {
+        const reference = normalizeCssReferenceToken(match[1] ?? '');
+        if (reference && !isSafeBundledStylesheetReference(reference)) {
+            return false;
+        }
     }
-  }
-  return true;
+    return true;
 }
 function isBundleableFileStylesheetAsset(dependency) {
-  return dependency.kind === "stylesheet" && dependency.source === "file";
+    return dependency.kind === 'stylesheet' && dependency.source === 'file';
 }
 function isBundleableFileScriptAsset(dependency) {
-  return dependency.kind === "script" && dependency.source === "file";
+    return dependency.kind === 'script' && dependency.source === 'file';
 }
-function shouldBundlePageDependencies(integrationName) {
-  return integrationName === "react" || integrationName === "ecopages-jsx";
+/**
+ * Returns whether the current integration should collapse eligible page assets into
+ * page-owned bundle entries.
+ */
+export function shouldBundlePageDependencies(integrationName) {
+    return integrationName === 'react' || integrationName === 'ecopages-jsx';
 }
 function createPageDependencyPackagingPlan(dependencies, integrationName) {
-  const shouldBundleDependencies = process.env.NODE_ENV === "production";
-  const bundleableStyles = dependencies.filter((dependency) => {
-    if (!shouldBundleDependencies) {
-      return false;
-    }
-    if (dependency.kind !== "stylesheet" || dependency.inline || dependency.position === "body") {
-      return false;
-    }
-    if (dependency.packageRole || !hasOnlyExpectedAttributes(dependency.attributes, { rel: "stylesheet" })) {
-      return false;
-    }
-    if (dependency.source === "content") {
-      return isSafeBundledStylesheetContent(dependency.content);
-    }
-    if (!existsSync(dependency.filepath)) {
-      return false;
-    }
-    return isSafeBundledStylesheetContent(readFileSync(dependency.filepath, "utf8"));
-  }).filter(isBundleableFileStylesheetAsset);
-  const bundleableScripts = dependencies.filter((dependency) => {
-    if (!shouldBundleDependencies) {
-      return false;
+    const shouldBundleDependencies = process.env.NODE_ENV === 'production';
+    const bundleableStyles = dependencies
+        .filter((dependency) => {
+        if (!shouldBundleDependencies) {
+            return false;
+        }
+        if (dependency.kind !== 'stylesheet' || dependency.inline || dependency.position === 'body') {
+            return false;
+        }
+        if (dependency.packageRole || !hasOnlyExpectedAttributes(dependency.attributes, { rel: 'stylesheet' })) {
+            return false;
+        }
+        if (dependency.source === 'content') {
+            return isSafeBundledStylesheetContent(dependency.content);
+        }
+        if (!existsSync(dependency.filepath)) {
+            return false;
+        }
+        return isSafeBundledStylesheetContent(readFileSync(dependency.filepath, 'utf8'));
+    })
+        .filter(isBundleableFileStylesheetAsset);
+    const bundleableScripts = dependencies
+        .filter((dependency) => {
+        if (!shouldBundleDependencies) {
+            return false;
+        }
+        return (dependency.kind === 'script' &&
+            dependency.source === 'file' &&
+            !dependency.inline &&
+            !dependency.excludeFromHtml &&
+            dependency.position !== 'body' &&
+            !dependency.packageRole &&
+            dependency.bundle !== false &&
+            hasOnlyExpectedAttributes(dependency.attributes, { type: 'module', defer: '' }) &&
+            existsSync(dependency.filepath));
+    })
+        .filter(isBundleableFileScriptAsset);
+    const bundledStylesheet = bundleableStyles.length > 1
+        ? AssetFactory.createContentStylesheet({
+            content: bundleableStyles.map((dependency) => readFileSync(dependency.filepath, 'utf8')).join('\n'),
+            position: 'head',
+            attributes: { rel: 'stylesheet' },
+            packageRole: 'page-style',
+            bundledSourceFilepaths: bundleableStyles.map((dependency) => dependency.filepath),
+        })
+        : undefined;
+    const pageScriptImports = [...new Set(bundleableScripts.map((dependency) => dependency.filepath))];
+    const shouldBundlePageScript = pageScriptImports.length > 0 && bundleableScripts.length > 1;
+    const bundledScript = shouldBundlePageScript
+        ? AssetFactory.createContentScript({
+            name: `${integrationName}-page-${rapidhash(pageScriptImports.join('|')).toString(16)}`,
+            content: pageScriptImports.map((filepath) => `import ${JSON.stringify(filepath)};`).join('\n'),
+            position: 'head',
+            attributes: { type: 'module', defer: '' },
+            packageRole: 'page-script',
+            bundledSourceFilepaths: pageScriptImports,
+        })
+        : undefined;
+    if (!bundledStylesheet && !bundledScript) {
+        return undefined;
     }
-    return dependency.kind === "script" && dependency.source === "file" && !dependency.inline && !dependency.excludeFromHtml && dependency.position !== "body" && !dependency.packageRole && dependency.bundle !== false && hasOnlyExpectedAttributes(dependency.attributes, { type: "module", defer: "" }) && existsSync(dependency.filepath);
-  }).filter(isBundleableFileScriptAsset);
-  const bundledStylesheet = bundleableStyles.length > 1 ? AssetFactory.createContentStylesheet({
-    content: bundleableStyles.map((dependency) => readFileSync(dependency.filepath, "utf8")).join("\n"),
-    position: "head",
-    attributes: { rel: "stylesheet" },
-    packageRole: "page-style",
-    bundledSourceFilepaths: bundleableStyles.map((dependency) => dependency.filepath)
-  }) : void 0;
-  const pageScriptImports = [...new Set(bundleableScripts.map((dependency) => dependency.filepath))];
-  const shouldBundlePageScript = pageScriptImports.length > 0 && bundleableScripts.length > 1;
-  const bundledScript = shouldBundlePageScript ? AssetFactory.createContentScript({
-    name: `${integrationName}-page-${rapidhash(pageScriptImports.join("|")).toString(16)}`,
-    content: pageScriptImports.map((filepath) => `import ${JSON.stringify(filepath)};`).join("\n"),
-    position: "head",
-    attributes: { type: "module", defer: "" },
-    packageRole: "page-script",
-    bundledSourceFilepaths: pageScriptImports
-  }) : void 0;
-  if (!bundledStylesheet && !bundledScript) {
-    return void 0;
-  }
-  return {
-    bundledStylesheet,
-    bundledScript,
-    bundleableStyleFilepaths: new Set(bundleableStyles.map((dependency) => dependency.filepath)),
-    bundleableScriptFilepaths: new Set(pageScriptImports)
-  };
+    return {
+        bundledStylesheet,
+        bundledScript,
+        bundleableStyleFilepaths: new Set(bundleableStyles.map((dependency) => dependency.filepath)),
+        bundleableScriptFilepaths: new Set(pageScriptImports),
+    };
 }
 function applyPageDependencyPackagingPlan(dependencies, plan) {
-  const unifiedDependencies = [];
-  let insertedStylesheet = false;
-  let insertedScript = false;
-  for (const dependency of dependencies) {
-    if (plan.bundledStylesheet && dependency.kind === "stylesheet" && dependency.source === "file" && plan.bundleableStyleFilepaths.has(dependency.filepath)) {
-      if (!insertedStylesheet) {
-        unifiedDependencies.push(plan.bundledStylesheet);
-        insertedStylesheet = true;
-      }
-      continue;
+    const unifiedDependencies = [];
+    let insertedStylesheet = false;
+    let insertedScript = false;
+    for (const dependency of dependencies) {
+        if (plan.bundledStylesheet &&
+            dependency.kind === 'stylesheet' &&
+            dependency.source === 'file' &&
+            plan.bundleableStyleFilepaths.has(dependency.filepath)) {
+            if (!insertedStylesheet) {
+                unifiedDependencies.push(plan.bundledStylesheet);
+                insertedStylesheet = true;
+            }
+            continue;
+        }
+        if (plan.bundledScript &&
+            dependency.kind === 'script' &&
+            dependency.source === 'file' &&
+            plan.bundleableScriptFilepaths.has(dependency.filepath)) {
+            if (!insertedScript) {
+                unifiedDependencies.push(plan.bundledScript);
+                insertedScript = true;
+            }
+            continue;
+        }
+        unifiedDependencies.push(dependency);
     }
-    if (plan.bundledScript && dependency.kind === "script" && dependency.source === "file" && plan.bundleableScriptFilepaths.has(dependency.filepath)) {
-      if (!insertedScript) {
+    if (plan.bundledScript && !insertedScript) {
         unifiedDependencies.push(plan.bundledScript);
-        insertedScript = true;
-      }
-      continue;
     }
-    unifiedDependencies.push(dependency);
-  }
-  if (plan.bundledScript && !insertedScript) {
-    unifiedDependencies.push(plan.bundledScript);
-  }
-  if (plan.bundledStylesheet && !insertedStylesheet) {
-    unifiedDependencies.push(plan.bundledStylesheet);
-  }
-  return unifiedDependencies;
+    if (plan.bundledStylesheet && !insertedStylesheet) {
+        unifiedDependencies.push(plan.bundledStylesheet);
+    }
+    return unifiedDependencies;
 }
-function packagePageDependencies(dependencies, integrationName) {
-  if (!shouldBundlePageDependencies(integrationName)) {
-    return dependencies;
-  }
-  const plan = createPageDependencyPackagingPlan(dependencies, integrationName);
-  if (!plan) {
-    return dependencies;
-  }
-  return applyPageDependencyPackagingPlan(dependencies, plan);
+/**
+ * Rewrites eligible flat dependency declarations into page-owned stylesheet and script bundles.
+ *
+ * Only assets with the default attribute shape and without explicit packaging roles are
+ * collapsed so integration-specific or lazy behavior keeps its existing ownership model.
+ */
+export function packagePageDependencies(dependencies, integrationName) {
+    if (!shouldBundlePageDependencies(integrationName)) {
+        return dependencies;
+    }
+    const plan = createPageDependencyPackagingPlan(dependencies, integrationName);
+    if (!plan) {
+        return dependencies;
+    }
+    return applyPageDependencyPackagingPlan(dependencies, plan);
 }
-export {
-  packagePageDependencies,
-  shouldBundlePageDependencies
-};