@decohere/flux 0.0.1-dev.95 → 0.0.1-dev.97

package/commonjs/src/hot-reload-server.js

@@ -160,8 +160,10 @@ class HotReloadServer extends _nodeevents.EventEmitter {
         try {
             const mod = await this.loader.importEntry(entryPath);
             state.module = mod?.default;
+            state.failed = false;
         } catch (error) {
             state.module = undefined;
+            state.failed = true;
             this.logger.error("There was an error booting the entry point. Your application may not function as expected", error);
         }
     }
@@ -309,6 +311,7 @@ class HotReloadServer extends _nodeevents.EventEmitter {
                 this.loader.setSourceFile(fullPath, project);
                 this.moduleCache.set(fullPath, null);
                 this.reloadIfAffected(fullPath);
+                this.retryFailedEntries(fullPath);
             }
             return;
         }
@@ -316,7 +319,25 @@ class HotReloadServer extends _nodeevents.EventEmitter {
         if (!project.isSourceFile(file)) return;
         this.loader.invalidateTranspile(fullPath);
         this.reloadIfAffected(fullPath);
+        this.retryFailedEntries(fullPath);
     };
+    /**
+	 * A failed boot (e.g. importing a file that doesn't exist yet) may have recorded no
+	 * dependency edges, so the graph can't tell whether this save fixes it. Any source
+	 * add or change retries failed entries (#512).
+	 */ retryFailedEntries(fullPath) {
+        const failed = [
+            ...this.entries.values()
+        ].filter((entry)=>entry.failed);
+        if (failed.length === 0) return;
+        for (const entry of failed){
+            // New URL version: Node caches the failed load and would replay the same error.
+            this.invalidateModuleCaches(entry.path);
+            this.pendingEntryReboots.add(entry.path);
+        }
+        this.pendingTriggers.add(fullPath);
+        this.scheduleReboot();
+    }
     reloadIfAffected(fullPath) {
         const deps = this.getDependencyGraph(fullPath);
         const modules = [
@@ -345,30 +366,24 @@ class HotReloadServer extends _nodeevents.EventEmitter {
         return true;
     }
     // ── Dependency graph ─────────────────────────────────────────────────────
-    getDependencyGraph(moduleId, parentModules = []) {
+    /**
+	 * Every module that imports `moduleId`, directly or transitively. Visits each module
+	 * once: import graphs share modules (diamonds) and may legally contain cycles (#515).
+	 */ getDependencyGraph(moduleId) {
         if (this.isSelf(moduleId)) return [];
-        const moduleDeps = this.dependencies.get(moduleId) ?? [];
-        if (parentModules.includes(moduleId)) {
-            this.logger.error(`Circular reference detected: ${moduleId}`);
-            return [];
-        }
-        let subDeps = [];
-        for (const dep of moduleDeps){
-            if (!this.loader.hasSourceFile(dep)) continue;
-            const subs = this.getDependencyGraph(dep, [
-                moduleId,
-                ...parentModules
-            ]);
-            subDeps = [
-                ...subDeps,
-                ...subs
-            ];
+        const found = new Set();
+        const queue = [
+            moduleId
+        ];
+        for(let next = queue.shift(); next != null; next = queue.shift()){
+            for (const importer of this.dependencies.get(next) ?? []){
+                if (found.has(importer)) continue;
+                found.add(importer);
+                if (this.loader.hasSourceFile(importer) && !this.isSelf(importer)) queue.push(importer);
+            }
         }
         return [
-            ...new Set([
-                ...moduleDeps,
-                ...subDeps
-            ])
+            ...found
         ];
     }
     trackDependency(filePath, parentPath) {

package/es6/src/hot-reload-server.js

@@ -128,8 +128,10 @@ export class HotReloadServer extends EventEmitter {
         try {
             const mod = await this.loader.importEntry(entryPath);
             state.module = mod?.default;
+            state.failed = false;
         } catch (error) {
             state.module = undefined;
+            state.failed = true;
             this.logger.error("There was an error booting the entry point. Your application may not function as expected", error);
         }
     }
@@ -277,6 +279,7 @@ export class HotReloadServer extends EventEmitter {
                 this.loader.setSourceFile(fullPath, project);
                 this.moduleCache.set(fullPath, null);
                 this.reloadIfAffected(fullPath);
+                this.retryFailedEntries(fullPath);
             }
             return;
         }
@@ -284,7 +287,25 @@ export class HotReloadServer extends EventEmitter {
         if (!project.isSourceFile(file)) return;
         this.loader.invalidateTranspile(fullPath);
         this.reloadIfAffected(fullPath);
+        this.retryFailedEntries(fullPath);
     };
+    /**
+	 * A failed boot (e.g. importing a file that doesn't exist yet) may have recorded no
+	 * dependency edges, so the graph can't tell whether this save fixes it. Any source
+	 * add or change retries failed entries (#512).
+	 */ retryFailedEntries(fullPath) {
+        const failed = [
+            ...this.entries.values()
+        ].filter((entry)=>entry.failed);
+        if (failed.length === 0) return;
+        for (const entry of failed){
+            // New URL version: Node caches the failed load and would replay the same error.
+            this.invalidateModuleCaches(entry.path);
+            this.pendingEntryReboots.add(entry.path);
+        }
+        this.pendingTriggers.add(fullPath);
+        this.scheduleReboot();
+    }
     reloadIfAffected(fullPath) {
         const deps = this.getDependencyGraph(fullPath);
         const modules = [
@@ -313,30 +334,24 @@ export class HotReloadServer extends EventEmitter {
         return true;
     }
     // ── Dependency graph ─────────────────────────────────────────────────────
-    getDependencyGraph(moduleId, parentModules = []) {
+    /**
+	 * Every module that imports `moduleId`, directly or transitively. Visits each module
+	 * once: import graphs share modules (diamonds) and may legally contain cycles (#515).
+	 */ getDependencyGraph(moduleId) {
         if (this.isSelf(moduleId)) return [];
-        const moduleDeps = this.dependencies.get(moduleId) ?? [];
-        if (parentModules.includes(moduleId)) {
-            this.logger.error(`Circular reference detected: ${moduleId}`);
-            return [];
-        }
-        let subDeps = [];
-        for (const dep of moduleDeps){
-            if (!this.loader.hasSourceFile(dep)) continue;
-            const subs = this.getDependencyGraph(dep, [
-                moduleId,
-                ...parentModules
-            ]);
-            subDeps = [
-                ...subDeps,
-                ...subs
-            ];
+        const found = new Set();
+        const queue = [
+            moduleId
+        ];
+        for(let next = queue.shift(); next != null; next = queue.shift()){
+            for (const importer of this.dependencies.get(next) ?? []){
+                if (found.has(importer)) continue;
+                found.add(importer);
+                if (this.loader.hasSourceFile(importer) && !this.isSelf(importer)) queue.push(importer);
+            }
         }
         return [
-            ...new Set([
-                ...moduleDeps,
-                ...subDeps
-            ])
+            ...found
         ];
     }
     trackDependency(filePath, parentPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/flux",
-  "version": "0.0.1-dev.95",
+  "version": "0.0.1-dev.97",
   "description": "Hot module reload server for Node.js ESM applications",
   "keywords": [
     "typescript",
@@ -25,11 +25,11 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/crucible": "0.0.1-dev.95",
-    "@decohere/forge": "0.0.1-dev.95",
-    "@decohere/mesh": "0.0.1-dev.95",
-    "@decohere/nexus": "0.0.1-dev.95",
-    "@decohere/scribe": "0.0.1-dev.95",
+    "@decohere/crucible": "0.0.1-dev.97",
+    "@decohere/forge": "0.0.1-dev.97",
+    "@decohere/mesh": "0.0.1-dev.97",
+    "@decohere/nexus": "0.0.1-dev.97",
+    "@decohere/scribe": "0.0.1-dev.97",
     "commander": "^13.1.0",
     "rxjs": "^7.8.2"
   },

package/types/src/hot-reload-server.d.ts

@@ -70,7 +70,17 @@ export declare class HotReloadServer extends EventEmitter<HotReloadServerEvents>
      */
     private onPostResolve;
     private onFileChange;
+    /**
+     * A failed boot (e.g. importing a file that doesn't exist yet) may have recorded no
+     * dependency edges, so the graph can't tell whether this save fixes it. Any source
+     * add or change retries failed entries (#512).
+     */
+    private retryFailedEntries;
     private reloadIfAffected;
+    /**
+     * Every module that imports `moduleId`, directly or transitively. Visits each module
+     * once: import graphs share modules (diamonds) and may legally contain cycles (#515).
+     */
     private getDependencyGraph;
     private trackDependency;
     private getCachedOrNew;