@decohere/flux 0.0.1-dev.94 → 0.0.1-dev.96

package/commonjs/src/flux.module.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "FluxModule", {
         return FluxModule;
     }
 });
-const _mesh = require("@decohere/mesh");
+const _forge = require("@decohere/forge");
 const _cli = require("@decohere/nexus/cli");
 const _deferredscriptrunner = require("./deferred-script-runner.js");
 const _fluxcommand = require("./flux.command.js");
@@ -27,8 +27,7 @@ class FluxModule extends _cli.ModuleManifest {
         builder.registerSingleton(_deferredscriptrunner.DeferredScriptRunner);
     }
     createWorkspace(options) {
-        return _mesh.WorkspaceFactory.create({
-            configFile: options.configFile
-        });
+        // Same workspace as `flux.run` / `flux.serve` and forge (#516).
+        return (0, _forge.createWorkspace)(options);
     }
 }

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/commonjs/src/source-module-loader.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "SourceModuleLoader", {
 });
 const _nodemodule = require("node:module");
 const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
+const _nodeurl = require("node:url");
 const _decorators = require("@decohere/crucible/decorators");
 const _forge = require("@decohere/forge");
 const _mesh = require("@decohere/mesh");
@@ -102,10 +103,7 @@ class SourceModuleLoader {
         this.disposed = false;
         this.transpileCache.clear();
         this.buildConfig = options.buildConfig;
-        this.workspace = options.workspace ?? await _mesh.WorkspaceFactory.create({
-            ..._forge.WorkspaceDefaults,
-            rootDir: process.cwd()
-        });
+        this.workspace = options.workspace ?? await (0, _forge.createWorkspace)();
         this.versionFileUrl = options.versionFileUrl ?? ((fileUrl)=>fileUrl);
         this.onResolved = options.onResolved;
         this.fileInfoMap = await this.buildFileInfoMap(this.buildConfig);
@@ -182,7 +180,9 @@ class SourceModuleLoader {
     }
     loadTs(url) {
         if (!url.startsWith("file:")) return null;
-        const cleanPath = new URL(url).pathname;
+        // fileURLToPath, not URL.pathname: decodes %20 and gives Windows paths, so files
+        // whose path has a space still match Mesh's list (#511).
+        const cleanPath = (0, _nodeurl.fileURLToPath)(url);
         const fileInfo = this.fileInfoMap.get(cleanPath);
         if (fileInfo == null) return null;
         const cached = this.transpileCache.get(cleanPath);

package/es6/src/flux.module.js

@@ -1,4 +1,4 @@
-import { WorkspaceFactory } from "@decohere/mesh";
+import { createWorkspace } from "@decohere/forge";
 import { ModuleManifest } from "@decohere/nexus/cli";
 import { DeferredScriptRunner } from "./deferred-script-runner.js";
 import { FluxCommand } from "./flux.command.js";
@@ -17,8 +17,7 @@ export class FluxModule extends ModuleManifest {
         builder.registerSingleton(DeferredScriptRunner);
     }
     createWorkspace(options) {
-        return WorkspaceFactory.create({
-            configFile: options.configFile
-        });
+        // Same workspace as `flux.run` / `flux.serve` and forge (#516).
+        return createWorkspace(options);
     }
 }

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/es6/src/source-module-loader.js

@@ -6,9 +6,10 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 import { registerHooks } from "node:module";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { injectable } from "@decohere/crucible/decorators";
-import { BuildTargets, SwcTranspiler, WorkspaceDefaults } from "@decohere/forge";
-import { packageAliases, WorkspaceFactory } from "@decohere/mesh";
+import { BuildTargets, createWorkspace, SwcTranspiler } from "@decohere/forge";
+import { packageAliases } from "@decohere/mesh";
 import { FileEx, io } from "@decohere/nexus/io";
 import { scribe } from "@decohere/scribe";
 import { rewriteServeSpecifier } from "./rewrite-serve-specifier.js";
@@ -46,10 +47,7 @@ export class SourceModuleLoader {
         this.disposed = false;
         this.transpileCache.clear();
         this.buildConfig = options.buildConfig;
-        this.workspace = options.workspace ?? await WorkspaceFactory.create({
-            ...WorkspaceDefaults,
-            rootDir: process.cwd()
-        });
+        this.workspace = options.workspace ?? await createWorkspace();
         this.versionFileUrl = options.versionFileUrl ?? ((fileUrl)=>fileUrl);
         this.onResolved = options.onResolved;
         this.fileInfoMap = await this.buildFileInfoMap(this.buildConfig);
@@ -126,7 +124,9 @@ export class SourceModuleLoader {
     }
     loadTs(url) {
         if (!url.startsWith("file:")) return null;
-        const cleanPath = new URL(url).pathname;
+        // fileURLToPath, not URL.pathname: decodes %20 and gives Windows paths, so files
+        // whose path has a space still match Mesh's list (#511).
+        const cleanPath = fileURLToPath(url);
         const fileInfo = this.fileInfoMap.get(cleanPath);
         if (fileInfo == null) return null;
         const cached = this.transpileCache.get(cleanPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/flux",
-  "version": "0.0.1-dev.94",
+  "version": "0.0.1-dev.96",
   "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.94",
-    "@decohere/forge": "0.0.1-dev.94",
-    "@decohere/mesh": "0.0.1-dev.94",
-    "@decohere/nexus": "0.0.1-dev.94",
-    "@decohere/scribe": "0.0.1-dev.94",
+    "@decohere/crucible": "0.0.1-dev.96",
+    "@decohere/forge": "0.0.1-dev.96",
+    "@decohere/mesh": "0.0.1-dev.96",
+    "@decohere/nexus": "0.0.1-dev.96",
+    "@decohere/scribe": "0.0.1-dev.96",
     "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;