@ecopages/core 0.2.0-beta.20 → 0.2.0-beta.21

package/src/services/module-loading/page-module-import.service.js

@@ -109,7 +109,6 @@ class PageModuleImportService {
       if (!cachedModule.dependencyHashes) {
         return await cachedModule.promise;
       }
-      this.dependencyHasher.clearMemo();
       if (this.dependencyHasher.matchesStoredHashes(cachedModule.dependencyHashes, filePath, fileHash)) {
         return await cachedModule.promise;
       }

package/src/services/module-loading/route-module-dependency-hasher.js

@@ -55,6 +55,7 @@ class RouteModuleDependencyHasher {
    * @returns `true` when all stored hashes are present and still valid.
    */
   matchesStoredHashes(storedHashes, entrypointPath, entrypointSourceHash) {
+    this.clearMemo();
     if (!storedHashes || Object.keys(storedHashes).length === 0) {
       return false;
     }

package/src/types/public-types.d.ts

@@ -1,7 +1,6 @@
 import type { Readable } from 'node:stream';
 import type { ApiResponseBuilder } from '../adapters/shared/api-response.js';
 import type { BuildExecutor } from '../build/build-adapter.js';
-import type { EcoBuildPlugin } from '../build/build-types.js';
 import type { ForeignChildRuntime } from '../route-renderer/orchestration/component-render-context.js';
 import type { EcoPageComponent } from '../eco/eco.types.js';
 import type { EcoPagesAppConfig } from './internal-types.js';
@@ -175,10 +174,6 @@ export interface DefaultHmrContext {
      * Directory where HMR bundles are written.
      */
     getDistDir(): string;
-    /**
-     * Build plugins to use during bundling.
-     */
-    getPlugins(): EcoBuildPlugin[];
     /**
      * Absolute path to the source directory.
      */
@@ -243,6 +238,14 @@ export interface IClientBridge {
     error(message: string): void;
     subscriberCount: number;
 }
+/**
+ * Verified HMR entrypoint artifact produced by registration.
+ */
+export interface ResolvedHmrEntrypoint {
+    sourcePath: string;
+    outputPath: string;
+    outputUrl: string;
+}
 /**
  * Interface for the HMR Manager.
  * Used by integration plugins to register entrypoints and strategies.
@@ -264,15 +267,11 @@ export interface IHmrManager {
      * framework integration. Unlike `registerEntrypoint()`, it may use the generic
      * script bundling path.
      */
-    registerScriptEntrypoint(entrypointPath: string): Promise<string>;
+    registerScriptEntrypoint(entrypointPath: string): Promise<ResolvedHmrEntrypoint>;
     /**
      * Registers a custom HMR strategy.
      */
     registerStrategy(strategy: HmrStrategy): void;
-    /**
-     * Sets the build plugins to use during bundling.
-     */
-    setPlugins(plugins: EcoBuildPlugin[]): void;
     /**
      * Enables or disables HMR.
      */
@@ -296,10 +295,7 @@ export interface IHmrManager {
     /**
      * Returns an existing emitted HMR script artifact without registering it.
      */
-    getResolvedScriptOutput?(entrypointPath: string): {
-        outputUrl: string;
-        outputPath: string;
-    } | undefined;
+    getResolvedScriptOutput?(entrypointPath: string): ResolvedHmrEntrypoint | undefined;
     /**
      * Gets the map of watched files.
      */
@@ -308,10 +304,6 @@ export interface IHmrManager {
      * Gets the HMR dist directory.
      */
     getDistDir(): string;
-    /**
-     * Gets the build plugins.
-     */
-    getPlugins(): EcoBuildPlugin[];
     /**
      * Gets the default HMR context.
      */

package/src/watchers/project-watcher.d.ts

@@ -50,8 +50,8 @@ export declare class ProjectWatcher {
     private readonly invalidationService;
     private readonly changeDebounceMs;
     private watcher;
-    private lastHandledChange;
-    private pendingChangeTimers;
+    private closed;
+    private pendingChangeEvents;
     private changeQueue;
     constructor({ config, refreshRouterRoutesCallback, hmrManager, bridge, hostOwnsDevClient, changeDebounceMs, }: ProjectWatcherConfig);
     /**

package/src/watchers/project-watcher.js

@@ -25,8 +25,8 @@ class ProjectWatcher {
   invalidationService;
   changeDebounceMs;
   watcher = null;
-  lastHandledChange = /* @__PURE__ */ new Map();
-  pendingChangeTimers = /* @__PURE__ */ new Map();
+  closed = false;
+  pendingChangeEvents = /* @__PURE__ */ new Map();
   changeQueue = Promise.resolve();
   constructor({
     config,
@@ -123,28 +123,25 @@ class ProjectWatcher {
    * @param event - The type of file system event
    */
   handleFileChange(rawPath, event = "change") {
+    if (this.closed) {
+      return Promise.resolve();
+    }
     const filePath = path.resolve(rawPath);
     if (this.changeDebounceMs === 0) {
       return this.enqueueChange(() => this.processFileChange(filePath, event));
     }
-    const existing = this.pendingChangeTimers.get(filePath);
+    const existing = this.pendingChangeEvents.get(filePath);
     if (existing) {
-      clearTimeout(existing);
+      clearTimeout(existing.timer);
     }
     const timer = setTimeout(() => {
-      this.pendingChangeTimers.delete(filePath);
-      this.enqueueChange(() => this.processFileChange(filePath, event));
+      this.pendingChangeEvents.delete(filePath);
+      void this.enqueueChange(() => this.processFileChange(filePath, event));
     }, this.changeDebounceMs);
-    this.pendingChangeTimers.set(filePath, timer);
+    this.pendingChangeEvents.set(filePath, { event, timer });
     return Promise.resolve();
   }
   async processFileChange(filePath, event) {
-    const now = Date.now();
-    const lastHandledAt = this.lastHandledChange.get(filePath);
-    if (lastHandledAt !== void 0 && now - lastHandledAt < ProjectWatcher.duplicateChangeWindowMs) {
-      return;
-    }
-    this.lastHandledChange.set(filePath, now);
     try {
       const plan = this.invalidationService.planFileChange(filePath);
       if (plan.category === "public-asset") {
@@ -157,11 +154,8 @@ class ProjectWatcher {
         this.hmrManager.getWatchedFiles(),
         resolvedFilePath
       );
-      if (plan.invalidateServerModules) {
+      if (plan.invalidateServerModules && !isRegisteredScriptEdit) {
         this.invalidationService.invalidateServerModules([filePath]);
-        if (isRegisteredScriptEdit) {
-          await this.invalidationService.notifyRegisteredScriptEntrypointChange(resolvedFilePath);
-        }
       }
       if (plan.refreshRoutes) {
         await this.refreshRouterRoutesCallback();
@@ -172,9 +166,9 @@ class ProjectWatcher {
       }
       const deferProcessorNotifications = plan.category === "include-source" || plan.category === "explicit-server-view" || isRegisteredScriptEdit;
       if (deferProcessorNotifications && plan.delegateToHmr) {
-        await this.prewarmBeforeHmr(resolvedFilePath, plan, isRegisteredScriptEdit);
+        await this.prewarmBeforeHmr(resolvedFilePath, plan);
         await this.hmrManager.handleFileChange(filePath);
-        void this.notifyProcessors(filePath, event);
+        await this.notifyProcessors(filePath, event);
         return;
       }
       await this.notifyProcessors(filePath, event);
@@ -195,11 +189,7 @@ class ProjectWatcher {
    * Re-imports server modules before HMR broadcast so reload/refetch does not
    * race stale in-memory imports or custom-element registry state.
    */
-  async prewarmBeforeHmr(filePath, plan, isRegisteredScriptEdit) {
-    if (isRegisteredScriptEdit) {
-      await this.prewarmServerModuleImports([filePath], { bypassCache: true, scope: "registered script" });
-      return;
-    }
+  async prewarmBeforeHmr(filePath, plan) {
     if (plan.category !== "include-source" && plan.category !== "explicit-server-view") {
       return;
     }
@@ -370,11 +360,16 @@ class ProjectWatcher {
    * and other short-lived Ecopages runtimes.
    */
   async close() {
-    if (!this.watcher) {
-      return;
+    this.closed = true;
+    for (const pending of this.pendingChangeEvents.values()) {
+      clearTimeout(pending.timer);
+    }
+    this.pendingChangeEvents.clear();
+    if (this.watcher) {
+      await this.watcher.close();
+      this.watcher = null;
     }
-    await this.watcher.close();
-    this.watcher = null;
+    await this.changeQueue.catch(() => void 0);
   }
 }
 export {

package/src/watchers/project-watcher.test-helpers.js

@@ -6,21 +6,21 @@ const createMockHmrManager = () => ({
   }),
   setEnabled: vi.fn(() => {
   }),
-  setPlugins: vi.fn(() => {
-  }),
   registerEntrypoint: vi.fn(async () => ""),
-  registerScriptEntrypoint: vi.fn(async () => ""),
+  registerScriptEntrypoint: vi.fn(async () => ({
+    sourcePath: "",
+    outputPath: "",
+    outputUrl: ""
+  })),
   registerStrategy: vi.fn(() => {
   }),
   isEnabled: vi.fn(() => true),
   getOutputUrl: vi.fn(() => void 0),
   getWatchedFiles: vi.fn(() => /* @__PURE__ */ new Map()),
   getDistDir: vi.fn(() => ""),
-  getPlugins: vi.fn(() => []),
   getDefaultContext: vi.fn(() => ({
     getWatchedFiles: () => /* @__PURE__ */ new Map(),
     getDistDir: () => "",
-    getPlugins: () => [],
     getSrcDir: () => "",
     getLayoutsDir: () => "",
     getPagesDir: () => "",