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

package/src/router/server/route-registry.js

@@ -1,262 +1,257 @@
-import path from "node:path";
-import { existsSync } from "node:fs";
-import { fileSystem } from "@ecopages/file-system";
-import { appLogger } from "../../global/app-logger.js";
-import { invariant } from "../../utils/invariant.js";
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { fileSystem } from '@ecopages/file-system';
+import { appLogger } from '../../global/app-logger.js';
+import { invariant } from '../../utils/invariant.js';
 const ROUTE_PRIORITY = {
-  exact: 0,
-  dynamic: 1,
-  "catch-all": 2
+    exact: 0,
+    dynamic: 1,
+    'catch-all': 2,
 };
-class RouteRegistry {
-  origin;
-  appConfig;
-  pagesDir;
-  templatesExt;
-  buildMode;
-  pageModuleAdapter;
-  templateRouteList = [];
-  reloadListeners = /* @__PURE__ */ new Set();
-  constructor(options) {
-    this.origin = options.origin;
-    this.appConfig = options.appConfig;
-    this.pagesDir = options.pagesDir;
-    this.templatesExt = options.templatesExt;
-    this.buildMode = options.buildMode;
-    this.pageModuleAdapter = options.pageModuleAdapter;
-  }
-  get templateRoutes() {
-    return this.templateRouteList;
-  }
-  async init() {
-    this.templateRouteList = await this.scanTemplateRoutes();
-    appLogger.debug("RouteRegistry initialized", this.templateRouteList);
-  }
-  async reload() {
-    await this.init();
-    for (const listener of this.reloadListeners) {
-      listener();
+export class RouteRegistry {
+    origin;
+    appConfig;
+    pagesDir;
+    templatesExt;
+    buildMode;
+    pageModuleAdapter;
+    templateRouteList = [];
+    reloadListeners = new Set();
+    constructor(options) {
+        this.origin = options.origin;
+        this.appConfig = options.appConfig;
+        this.pagesDir = options.pagesDir;
+        this.templatesExt = options.templatesExt;
+        this.buildMode = options.buildMode;
+        this.pageModuleAdapter = options.pageModuleAdapter;
     }
-  }
-  onReload(listener) {
-    this.reloadListeners.add(listener);
-    return () => {
-      this.reloadListeners.delete(listener);
-    };
-  }
-  matchRequest(requestUrl) {
-    const url = new URL(requestUrl);
-    const requestedPathname = normalizePathname(url.pathname);
-    const query = this.getSearchParams(url);
-    for (const route of this.templateRouteList) {
-      if (route.kind !== "exact") {
-        continue;
-      }
-      if (requestedPathname === route.pathname || requestedPathname === `${route.pathname}/`) {
-        return {
-          requestedPathname,
-          templateRoute: route,
-          params: {},
-          query
-        };
-      }
+    get templateRoutes() {
+        return this.templateRouteList;
     }
-    for (const route of this.templateRouteList) {
-      if (route.kind !== "dynamic") {
-        continue;
-      }
-      const params = this.tryExtractParams(route, requestedPathname);
-      if (!params) {
-        continue;
-      }
-      return {
-        requestedPathname,
-        templateRoute: route,
-        params,
-        query
-      };
+    async init() {
+        this.templateRouteList = await this.scanTemplateRoutes();
+        appLogger.debug('RouteRegistry initialized', this.templateRouteList);
     }
-    for (const route of this.templateRouteList) {
-      if (route.kind !== "catch-all") {
-        continue;
-      }
-      const params = this.tryExtractParams(route, requestedPathname);
-      if (!params) {
-        continue;
-      }
-      return {
-        requestedPathname,
-        templateRoute: route,
-        params,
-        query
-      };
+    async reload() {
+        await this.init();
+        for (const listener of this.reloadListeners) {
+            listener();
+        }
     }
-    return null;
-  }
-  async listStaticPathExpansions(input) {
-    const expansions = [];
-    for (const route of this.templateRouteList) {
-      if (route.kind === "exact") {
-        continue;
-      }
-      const pageModule = await this.pageModuleAdapter.loadPageModule(route.filePath);
-      const staticPaths = pageModule.staticPaths;
-      if (this.buildMode) {
-        invariant(staticPaths !== void 0, `[ecopages] Missing getStaticPaths in ${route.filePath}`);
-        invariant(
-          pageModule.staticProps !== void 0,
-          `[ecopages] Missing getStaticProps in ${route.filePath}`
-        );
-      }
-      if (!staticPaths) {
-        continue;
-      }
-      const result = await staticPaths({
-        appConfig: this.appConfig,
-        runtimeOrigin: input.runtimeOrigin
-      });
-      for (const { params } of result.paths) {
-        expansions.push({
-          pathname: this.resolveTemplatePath(route.pathname, params),
-          templateRoute: route,
-          params
-        });
-      }
+    onReload(listener) {
+        this.reloadListeners.add(listener);
+        return () => {
+            this.reloadListeners.delete(listener);
+        };
     }
-    return expansions;
-  }
-  async listStaticGenerationRoutes(input) {
-    const staticPathExpansions = await this.listStaticPathExpansions(input);
-    return [
-      ...this.templateRouteList.filter((route) => route.kind === "exact").map((route) => ({
-        requestUrl: `${input.runtimeOrigin}${route.pathname}`,
-        pathname: route.pathname,
-        templateRoute: route,
-        params: {}
-      })),
-      ...staticPathExpansions.map((route) => ({
-        requestUrl: `${input.runtimeOrigin}${route.pathname}`,
-        pathname: route.pathname,
-        templateRoute: route.templateRoute,
-        params: route.params
-      }))
-    ];
-  }
-  async scanTemplateRoutes() {
-    if (!existsSync(this.pagesDir)) {
-      return [];
+    matchRequest(requestUrl) {
+        const url = new URL(requestUrl);
+        const requestedPathname = normalizePathname(url.pathname);
+        const query = this.getSearchParams(url);
+        for (const route of this.templateRouteList) {
+            if (route.kind !== 'exact') {
+                continue;
+            }
+            if (requestedPathname === route.pathname || requestedPathname === `${route.pathname}/`) {
+                return {
+                    requestedPathname,
+                    templateRoute: route,
+                    params: {},
+                    query,
+                };
+            }
+        }
+        for (const route of this.templateRouteList) {
+            if (route.kind !== 'dynamic') {
+                continue;
+            }
+            const params = this.tryExtractParams(route, requestedPathname);
+            if (!params) {
+                continue;
+            }
+            return {
+                requestedPathname,
+                templateRoute: route,
+                params,
+                query,
+            };
+        }
+        for (const route of this.templateRouteList) {
+            if (route.kind !== 'catch-all') {
+                continue;
+            }
+            const params = this.tryExtractParams(route, requestedPathname);
+            if (!params) {
+                continue;
+            }
+            return {
+                requestedPathname,
+                templateRoute: route,
+                params,
+                query,
+            };
+        }
+        return null;
     }
-    const scannedFiles = await fileSystem.glob(
-      this.templatesExt.map((ext) => `**/*${ext}`),
-      {
-        cwd: this.pagesDir
-      }
-    );
-    const templateRoutes = [];
-    for await (const file of scannedFiles) {
-      if (file.includes(".ecopages-node.")) {
-        continue;
-      }
-      const routePathname = this.getRoutePath(file);
-      const filePath = path.join(this.pagesDir, file);
-      const kind = this.classifyRouteKind(filePath);
-      templateRoutes.push({
-        pathname: routePathname,
-        kind,
-        filePath,
-        paramNames: this.getParamNames(routePathname)
-      });
+    async listStaticPathExpansions(input) {
+        const expansions = [];
+        for (const route of this.templateRouteList) {
+            if (route.kind === 'exact') {
+                continue;
+            }
+            const pageModule = await this.pageModuleAdapter.loadPageModule(route.filePath);
+            const staticPaths = pageModule.staticPaths;
+            if (this.buildMode) {
+                invariant(staticPaths !== undefined, `[ecopages] Missing getStaticPaths in ${route.filePath}`);
+                invariant(pageModule.staticProps !== undefined, `[ecopages] Missing getStaticProps in ${route.filePath}`);
+            }
+            if (!staticPaths) {
+                continue;
+            }
+            const result = await staticPaths({
+                appConfig: this.appConfig,
+                runtimeOrigin: input.runtimeOrigin,
+            });
+            for (const { params } of result.paths) {
+                expansions.push({
+                    pathname: this.resolveTemplatePath(route.pathname, params),
+                    templateRoute: route,
+                    params,
+                });
+            }
+        }
+        return expansions;
     }
-    return templateRoutes.sort((left, right) => {
-      const priorityDifference = ROUTE_PRIORITY[left.kind] - ROUTE_PRIORITY[right.kind];
-      if (priorityDifference !== 0) {
-        return priorityDifference;
-      }
-      if (left.pathname === "/") {
-        return -1;
-      }
-      if (right.pathname === "/") {
-        return 1;
-      }
-      return left.pathname.localeCompare(right.pathname);
-    });
-  }
-  getRoutePath(file) {
-    const cleanedRoute = this.templatesExt.reduce((route, ext) => route.replace(ext, ""), file).replace(/\/?index$/, "");
-    return normalizePathname(`/${cleanedRoute}`);
-  }
-  classifyRouteKind(filePath) {
-    if (filePath.includes("[...")) {
-      return "catch-all";
+    async listStaticGenerationRoutes(input) {
+        const staticPathExpansions = await this.listStaticPathExpansions(input);
+        return [
+            ...this.templateRouteList
+                .filter((route) => route.kind === 'exact')
+                .map((route) => ({
+                requestUrl: `${input.runtimeOrigin}${route.pathname}`,
+                pathname: route.pathname,
+                templateRoute: route,
+                params: {},
+            })),
+            ...staticPathExpansions.map((route) => ({
+                requestUrl: `${input.runtimeOrigin}${route.pathname}`,
+                pathname: route.pathname,
+                templateRoute: route.templateRoute,
+                params: route.params,
+            })),
+        ];
     }
-    if (filePath.includes("[") && filePath.includes("]")) {
-      return "dynamic";
+    async scanTemplateRoutes() {
+        if (!existsSync(this.pagesDir)) {
+            return [];
+        }
+        const scannedFiles = await fileSystem.glob(this.templatesExt.map((ext) => `**/*${ext}`), {
+            cwd: this.pagesDir,
+        });
+        const templateRoutes = [];
+        for await (const file of scannedFiles) {
+            if (file.includes('.ecopages-node.')) {
+                continue;
+            }
+            const routePathname = this.getRoutePath(file);
+            const filePath = path.join(this.pagesDir, file);
+            const kind = this.classifyRouteKind(filePath);
+            templateRoutes.push({
+                pathname: routePathname,
+                kind,
+                filePath,
+                paramNames: this.getParamNames(routePathname),
+            });
+        }
+        return templateRoutes.sort((left, right) => {
+            const priorityDifference = ROUTE_PRIORITY[left.kind] - ROUTE_PRIORITY[right.kind];
+            if (priorityDifference !== 0) {
+                return priorityDifference;
+            }
+            if (left.pathname === '/') {
+                return -1;
+            }
+            if (right.pathname === '/') {
+                return 1;
+            }
+            return left.pathname.localeCompare(right.pathname);
+        });
     }
-    return "exact";
-  }
-  getParamNames(routePathname) {
-    const matches = routePathname.match(/\[(?:\.\.\.)?([^\]]+)\]/g);
-    return matches ? matches.map((match) => match.replace(/^\[(?:\.\.\.)?/, "").replace(/\]$/, "")) : [];
-  }
-  tryExtractParams(route, requestedPathname) {
-    const routeParts = route.pathname.split("/");
-    const pathnameParts = requestedPathname.split("/");
-    if (route.kind === "dynamic" && routeParts.length !== pathnameParts.length) {
-      return null;
+    getRoutePath(file) {
+        const cleanedRoute = this.templatesExt
+            .reduce((route, ext) => route.replace(ext, ''), file)
+            .replace(/\/?index$/, '');
+        return normalizePathname(`/${cleanedRoute}`);
     }
-    const params = {};
-    for (let i = 0; i < routeParts.length; i++) {
-      const routePart = routeParts[i];
-      const pathnamePart = pathnameParts[i];
-      if (!routePart) {
-        continue;
-      }
-      if (routePart.startsWith("[...") && routePart.endsWith("]")) {
-        const paramName = routePart.slice(4, -1);
-        params[paramName] = pathnameParts.slice(i).filter(Boolean);
-        return params;
-      }
-      if (routePart.startsWith("[") && routePart.endsWith("]")) {
-        if (pathnamePart === void 0) {
-          return null;
+    classifyRouteKind(filePath) {
+        if (filePath.includes('[...')) {
+            return 'catch-all';
         }
-        params[routePart.slice(1, -1)] = pathnamePart;
-        continue;
-      }
-      if (routePart !== pathnamePart) {
-        return null;
-      }
+        if (filePath.includes('[') && filePath.includes(']')) {
+            return 'dynamic';
+        }
+        return 'exact';
     }
-    if (route.kind === "catch-all") {
-      const cleanPathname = route.pathname.replace(/\[.*?\]/g, "");
-      return requestedPathname.includes(cleanPathname) ? params : null;
+    getParamNames(routePathname) {
+        const matches = routePathname.match(/\[(?:\.\.\.)?([^\]]+)\]/g);
+        return matches ? matches.map((match) => match.replace(/^\[(?:\.\.\.)?/, '').replace(/\]$/, '')) : [];
+    }
+    tryExtractParams(route, requestedPathname) {
+        const routeParts = route.pathname.split('/');
+        const pathnameParts = requestedPathname.split('/');
+        if (route.kind === 'dynamic' && routeParts.length !== pathnameParts.length) {
+            return null;
+        }
+        const params = {};
+        for (let i = 0; i < routeParts.length; i++) {
+            const routePart = routeParts[i];
+            const pathnamePart = pathnameParts[i];
+            if (!routePart) {
+                continue;
+            }
+            if (routePart.startsWith('[...') && routePart.endsWith(']')) {
+                const paramName = routePart.slice(4, -1);
+                params[paramName] = pathnameParts.slice(i).filter(Boolean);
+                return params;
+            }
+            if (routePart.startsWith('[') && routePart.endsWith(']')) {
+                if (pathnamePart === undefined) {
+                    return null;
+                }
+                params[routePart.slice(1, -1)] = pathnamePart;
+                continue;
+            }
+            if (routePart !== pathnamePart) {
+                return null;
+            }
+        }
+        if (route.kind === 'catch-all') {
+            const cleanPathname = route.pathname.replace(/\[.*?\]/g, '');
+            return requestedPathname.includes(cleanPathname) ? params : null;
+        }
+        return params;
     }
-    return params;
-  }
-  getSearchParams(url) {
-    const query = {};
-    for (const [key, value] of url.searchParams) {
-      query[key] = value;
+    getSearchParams(url) {
+        const query = {};
+        for (const [key, value] of url.searchParams) {
+            query[key] = value;
+        }
+        return query;
     }
-    return query;
-  }
-  resolveTemplatePath(pathname, params) {
-    let resolvedPath = pathname;
-    for (const [key, value] of Object.entries(params)) {
-      const serializedValue = Array.isArray(value) ? value.join("/") : value;
-      resolvedPath = resolvedPath.replace(`[...${key}]`, serializedValue);
-      resolvedPath = resolvedPath.replace(`[${key}]`, serializedValue);
+    resolveTemplatePath(pathname, params) {
+        let resolvedPath = pathname;
+        for (const [key, value] of Object.entries(params)) {
+            const serializedValue = Array.isArray(value) ? value.join('/') : value;
+            resolvedPath = resolvedPath.replace(`[...${key}]`, serializedValue);
+            resolvedPath = resolvedPath.replace(`[${key}]`, serializedValue);
+        }
+        return normalizePathname(resolvedPath);
     }
-    return normalizePathname(resolvedPath);
-  }
 }
 function normalizePathname(pathname) {
-  if (!pathname || pathname === "/") {
-    return "/";
-  }
-  const normalized = pathname.startsWith("/") ? pathname : `/${pathname}`;
-  return normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
+    if (!pathname || pathname === '/') {
+        return '/';
+    }
+    const normalized = pathname.startsWith('/') ? pathname : `/${pathname}`;
+    return normalized.endsWith('/') ? normalized.slice(0, -1) : normalized;
 }
-export {
-  RouteRegistry
-};

package/src/services/assets/asset-processing-service/asset-dependency-keys.js

@@ -1,59 +1,70 @@
-import { rapidhash } from "../../../utils/hash.js";
+import { rapidhash } from '../../../utils/hash.js';
 function generateHash(content) {
-  return rapidhash(content).toString();
+    return rapidhash(content).toString();
 }
 function getScriptDependencyBuildSignature(dep) {
-  if (dep.kind !== "script") {
-    return void 0;
-  }
-  const pluginNames = dep.bundleOptions?.plugins?.map((plugin) => plugin.name) ?? [];
-  const signature = {
-    bundle: dep.bundle,
-    inline: dep.inline,
-    excludeFromHtml: dep.excludeFromHtml,
-    groupedBundle: dep.groupedBundle,
-    naming: dep.bundleOptions?.naming,
-    external: dep.bundleOptions?.external,
-    minify: dep.bundleOptions?.minify,
-    plugins: pluginNames
-  };
-  return generateHash(JSON.stringify(signature));
+    if (dep.kind !== 'script') {
+        return undefined;
+    }
+    const pluginNames = dep.bundleOptions?.plugins?.map((plugin) => plugin.name) ?? [];
+    const signature = {
+        bundle: dep.bundle,
+        inline: dep.inline,
+        excludeFromHtml: dep.excludeFromHtml,
+        groupedBundle: dep.groupedBundle,
+        naming: dep.bundleOptions?.naming,
+        external: dep.bundleOptions?.external,
+        minify: dep.bundleOptions?.minify,
+        plugins: pluginNames,
+    };
+    return generateHash(JSON.stringify(signature));
 }
-function getAssetDependencyKey(dep) {
-  const parts = [dep.kind, dep.source];
-  if ("filepath" in dep) {
-    parts.push(dep.filepath);
-  } else if ("content" in dep) {
-    parts.push(`content:${generateHash(dep.content)}`);
-  } else if ("importPath" in dep) {
-    parts.push(dep.importPath);
-  }
-  if ("position" in dep && dep.position) {
-    parts.push(dep.position);
-  }
-  if ("packageRole" in dep && dep.packageRole) {
-    parts.push(`package:${dep.packageRole}`);
-  }
-  if (dep.kind === "script" && dep.attributes) {
-    parts.push(`attrs:${generateHash(JSON.stringify(dep.attributes))}`);
-  }
-  const scriptBuildSignature = getScriptDependencyBuildSignature(dep);
-  if (scriptBuildSignature) {
-    parts.push(`build:${scriptBuildSignature}`);
-  }
-  return parts.join(":");
+/**
+ * Stable identity for dependency deduplication and {@link AssetProcessingService} cache lookups.
+ *
+ * @remarks
+ * Script dependencies include a build signature derived from bundle flags, grouped-bundle
+ * metadata, and selected `bundleOptions` fields (`naming`, `external`, `minify`, plugin names).
+ * HTML-affecting script `attributes` are hashed into the key so dedupe and cache reuse do not
+ * collapse declarations that would emit different `<script>` tags. Full plugin objects and
+ * `NODE_ENV` are excluded from the key.
+ *
+ * Runtime minify in {@link ContentScriptProcessor} still follows `NODE_ENV` via
+ * `isProduction`, not `bundleOptions.minify`.
+ */
+export function getAssetDependencyKey(dep) {
+    const parts = [dep.kind, dep.source];
+    if ('filepath' in dep) {
+        parts.push(dep.filepath);
+    }
+    else if ('content' in dep) {
+        parts.push(`content:${generateHash(dep.content)}`);
+    }
+    else if ('importPath' in dep) {
+        parts.push(dep.importPath);
+    }
+    if ('position' in dep && dep.position) {
+        parts.push(dep.position);
+    }
+    if ('packageRole' in dep && dep.packageRole) {
+        parts.push(`package:${dep.packageRole}`);
+    }
+    if (dep.kind === 'script' && dep.attributes) {
+        parts.push(`attrs:${generateHash(JSON.stringify(dep.attributes))}`);
+    }
+    const scriptBuildSignature = getScriptDependencyBuildSignature(dep);
+    if (scriptBuildSignature) {
+        parts.push(`build:${scriptBuildSignature}`);
+    }
+    return parts.join(':');
 }
-function deduplicateAssetDependencies(deps) {
-  const seen = /* @__PURE__ */ new Map();
-  for (const dep of deps) {
-    const key = getAssetDependencyKey(dep);
-    if (!seen.has(key)) {
-      seen.set(key, dep);
-    }
-  }
-  return Array.from(seen.values());
+export function deduplicateAssetDependencies(deps) {
+    const seen = new Map();
+    for (const dep of deps) {
+        const key = getAssetDependencyKey(dep);
+        if (!seen.has(key)) {
+            seen.set(key, dep);
+        }
+    }
+    return Array.from(seen.values());
 }
-export {
-  deduplicateAssetDependencies,
-  getAssetDependencyKey
-};