@decohere/flux 0.0.1-dev.129 → 0.0.1-dev.130

package/README.md

@@ -49,7 +49,7 @@ Scaffolded apps already depend on `@decohere/cli` — use those scripts (`pnpm d
 
 ## CLI
 
-Host options (`--config-file`, `--log-level`) are parsed before the subcommand. `--config-file` (default `.decohere.js` if present) is optional workspace config for package discovery. Omit it to use [workspace defaults](../workspace/README.md#workspace-layout).
+Host options (`--root-dir`, `--config-file`, `--log-level`) are parsed before the subcommand. `--root-dir` (default: the current folder) is the workspace root. `--config-file` (default `.decohere.js` in the root, if present) is optional workspace config for package discovery. Omit it to use [workspace defaults](../workspace/README.md#workspace-layout).
 
 ### `flux run` — one-shot script
 

package/commonjs/src/source-module-loader.js

@@ -137,7 +137,7 @@ class SourceModuleLoader {
                 const rewritten = (0, _rewriteservespecifier.rewriteServeSpecifier)({
                     specifier,
                     parentUrl,
-                    isWatchedTs: (filePath)=>this.fileInfoMap.has(filePath),
+                    isWatchedTs: (filePath)=>this.sourceInfo(filePath) != null,
                     resolveBare: (bare)=>_workspace.packageAliases.resolvePath(bare, this.aliasPaths, this.aliasBaseUrl),
                     versionFileUrl: this.versionFileUrl
                 }) ?? specifier;
@@ -180,6 +180,16 @@ class SourceModuleLoader {
         this.workspace?.[Symbol.dispose]();
         this.workspace = undefined;
     }
+    /**
+	 * The file as a source flux compiles: a workspace package's file, or any other TypeScript
+	 * source on disk outside `node_modules`, which Node would otherwise only strip of types, failing
+	 * on enums, decorators and parameter properties. Null for everything else.
+	 */ sourceInfo(fullPath) {
+        const fileInfo = this.fileInfoMap.get(fullPath);
+        if (fileInfo != null) return fileInfo;
+        const outsidePackages = _workspace.sourceExtensions.isSource(fullPath) && !fullPath.split(/[/\\]/).includes("node_modules") && (0, _nodefs.existsSync)(fullPath);
+        return outsidePackages ? {} : null;
+    }
     async buildFileInfoMap(buildConfig) {
         const projects = this.workspace?.getProjects(buildConfig) ?? [];
         const entries = await Promise.all(projects.map(async (project)=>{
@@ -228,7 +238,7 @@ class SourceModuleLoader {
         this.reachedFrom.set(entryPath, seen);
     }
     /** The file's compiled code, from the cache or compiled now; undefined if it isn't a source. */ compiledAhead(fullPath) {
-        const fileInfo = this.fileInfoMap.get(fullPath);
+        const fileInfo = this.sourceInfo(fullPath);
         if (fileInfo == null) return Promise.resolve(undefined);
         const cached = this.transpileCache.get(fullPath);
         if (cached != null) return Promise.resolve(cached);
@@ -250,7 +260,7 @@ class SourceModuleLoader {
         const url = (0, _rewriteservespecifier.rewriteServeSpecifier)({
             specifier,
             parentUrl,
-            isWatchedTs: (filePath)=>this.fileInfoMap.has(filePath),
+            isWatchedTs: (filePath)=>this.sourceInfo(filePath) != null,
             resolveBare: (bare)=>_workspace.packageAliases.resolvePath(bare, this.aliasPaths, this.aliasBaseUrl),
             versionFileUrl: (fileUrl)=>fileUrl
         });
@@ -261,7 +271,7 @@ class SourceModuleLoader {
         // fileURLToPath, not URL.pathname: decodes %20 and gives Windows paths, so files
         // whose path has a space still match the workspace's package list.
         const cleanPath = (0, _nodeurl.fileURLToPath)(url);
-        const fileInfo = this.fileInfoMap.get(cleanPath);
+        const fileInfo = this.sourceInfo(cleanPath);
         if (fileInfo == null) return null;
         const format = _workspace.sourceExtensions.isCommonJs(cleanPath) ? "commonjs" : "module";
         const cached = this.transpileCache.get(cleanPath);
@@ -351,12 +361,12 @@ class SourceModuleLoader {
         this.commonJsConfigs.set(project, commonJs);
         return commonJs;
     }
-    esModuleConfigFor(project) {
+    /** Forge's defaults when there is no project: decorators and their metadata on. */ esModuleConfigFor(project) {
         const cached = this.swcConfigs.get(project);
         if (cached != null) return cached;
         const base = this.transpiler.createBaseConfig(_forge.BuildTargets.es6, {
-            tsConfig: project.getTsConfigSync(),
-            userConfig: project.getSwcConfigSync(),
+            tsConfig: project?.getTsConfigSync(),
+            userConfig: project?.getSwcConfigSync(),
             aliasPaths: false,
             workspace: this.workspace
         });

package/es6/src/source-module-loader.js

@@ -4,7 +4,7 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { registerHooks } from "node:module";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -81,7 +81,7 @@ export class SourceModuleLoader {
                 const rewritten = rewriteServeSpecifier({
                     specifier,
                     parentUrl,
-                    isWatchedTs: (filePath)=>this.fileInfoMap.has(filePath),
+                    isWatchedTs: (filePath)=>this.sourceInfo(filePath) != null,
                     resolveBare: (bare)=>packageAliases.resolvePath(bare, this.aliasPaths, this.aliasBaseUrl),
                     versionFileUrl: this.versionFileUrl
                 }) ?? specifier;
@@ -124,6 +124,16 @@ export class SourceModuleLoader {
         this.workspace?.[Symbol.dispose]();
         this.workspace = undefined;
     }
+    /**
+	 * The file as a source flux compiles: a workspace package's file, or any other TypeScript
+	 * source on disk outside `node_modules`, which Node would otherwise only strip of types, failing
+	 * on enums, decorators and parameter properties. Null for everything else.
+	 */ sourceInfo(fullPath) {
+        const fileInfo = this.fileInfoMap.get(fullPath);
+        if (fileInfo != null) return fileInfo;
+        const outsidePackages = sourceExtensions.isSource(fullPath) && !fullPath.split(/[/\\]/).includes("node_modules") && existsSync(fullPath);
+        return outsidePackages ? {} : null;
+    }
     async buildFileInfoMap(buildConfig) {
         const projects = this.workspace?.getProjects(buildConfig) ?? [];
         const entries = await Promise.all(projects.map(async (project)=>{
@@ -172,7 +182,7 @@ export class SourceModuleLoader {
         this.reachedFrom.set(entryPath, seen);
     }
     /** The file's compiled code, from the cache or compiled now; undefined if it isn't a source. */ compiledAhead(fullPath) {
-        const fileInfo = this.fileInfoMap.get(fullPath);
+        const fileInfo = this.sourceInfo(fullPath);
         if (fileInfo == null) return Promise.resolve(undefined);
         const cached = this.transpileCache.get(fullPath);
         if (cached != null) return Promise.resolve(cached);
@@ -194,7 +204,7 @@ export class SourceModuleLoader {
         const url = rewriteServeSpecifier({
             specifier,
             parentUrl,
-            isWatchedTs: (filePath)=>this.fileInfoMap.has(filePath),
+            isWatchedTs: (filePath)=>this.sourceInfo(filePath) != null,
             resolveBare: (bare)=>packageAliases.resolvePath(bare, this.aliasPaths, this.aliasBaseUrl),
             versionFileUrl: (fileUrl)=>fileUrl
         });
@@ -205,7 +215,7 @@ export class SourceModuleLoader {
         // fileURLToPath, not URL.pathname: decodes %20 and gives Windows paths, so files
         // whose path has a space still match the workspace's package list.
         const cleanPath = fileURLToPath(url);
-        const fileInfo = this.fileInfoMap.get(cleanPath);
+        const fileInfo = this.sourceInfo(cleanPath);
         if (fileInfo == null) return null;
         const format = sourceExtensions.isCommonJs(cleanPath) ? "commonjs" : "module";
         const cached = this.transpileCache.get(cleanPath);
@@ -295,12 +305,12 @@ export class SourceModuleLoader {
         this.commonJsConfigs.set(project, commonJs);
         return commonJs;
     }
-    esModuleConfigFor(project) {
+    /** Forge's defaults when there is no project: decorators and their metadata on. */ esModuleConfigFor(project) {
         const cached = this.swcConfigs.get(project);
         if (cached != null) return cached;
         const base = this.transpiler.createBaseConfig(BuildTargets.es6, {
-            tsConfig: project.getTsConfigSync(),
-            userConfig: project.getSwcConfigSync(),
+            tsConfig: project?.getTsConfigSync(),
+            userConfig: project?.getSwcConfigSync(),
             aliasPaths: false,
             workspace: this.workspace
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/flux",
-  "version": "0.0.1-dev.129",
+  "version": "0.0.1-dev.130",
   "description": "Hot module reload server for Node.js ESM applications",
   "keywords": [
     "typescript",
@@ -34,12 +34,12 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/core": "0.0.1-dev.129",
-    "@decohere/crucible": "0.0.1-dev.129",
-    "@decohere/devkit": "0.0.1-dev.129",
-    "@decohere/forge": "0.0.1-dev.129",
-    "@decohere/scribe": "0.0.1-dev.129",
-    "@decohere/workspace": "0.0.1-dev.129",
+    "@decohere/core": "0.0.1-dev.130",
+    "@decohere/crucible": "0.0.1-dev.130",
+    "@decohere/devkit": "0.0.1-dev.130",
+    "@decohere/forge": "0.0.1-dev.130",
+    "@decohere/scribe": "0.0.1-dev.130",
+    "@decohere/workspace": "0.0.1-dev.130",
     "commander": "^13.1.0",
     "rxjs": "^7.8.2"
   },

package/types/src/source-module-loader.d.ts

@@ -17,8 +17,9 @@ export interface SourceModuleLoaderOptions {
     onResolved?: (result: ResolveFnOutput, parentUrl: string) => void;
 }
 /**
- * Registers Node ESM resolve/load hooks and SWC-transpiles workspace `.ts`
- * on the fly. No file watching and no entry reboot — that belongs to
+ * Registers Node ESM resolve/load hooks and SWC-transpiles TypeScript on the fly: workspace
+ * packages' files with their package's options, and any other source outside `node_modules`
+ * (a script in a plain folder) with Forge's defaults. No file watching and no entry reboot — that belongs to
  * {@link HotReloadServer}.
  */
 export declare class SourceModuleLoader {
@@ -54,6 +55,12 @@ export declare class SourceModuleLoader {
     importEntry(absolutePath: string): Promise<unknown>;
     invalidateTranspile(...absolutePaths: string[]): void;
     dispose(): void;
+    /**
+     * The file as a source flux compiles: a workspace package's file, or any other TypeScript
+     * source on disk outside `node_modules`, which Node would otherwise only strip of types, failing
+     * on enums, decorators and parameter properties. Null for everything else.
+     */
+    private sourceInfo;
     private buildFileInfoMap;
     /**
      * Compiles the entry and the source files it imports, before Node imports it. The load
@@ -92,5 +99,6 @@ export declare class SourceModuleLoader {
      * directory indexes), so SWC does not resolve them a second time against the disk.
      */
     private swcConfigFor;
+    /** Forge's defaults when there is no project: decorators and their metadata on. */
     private esModuleConfigFor;
 }