@decohere/cli 0.0.1-dev.128 → 0.0.1-dev.130

package/commonjs/src/flux.js

@@ -12,6 +12,8 @@ const configIndex = process.argv.indexOf("--config-file");
 const configFile = configIndex !== -1 ? process.argv[configIndex + 1] : undefined;
 const logLevelIndex = process.argv.indexOf("--log-level");
 const logLevel = logLevelIndex !== -1 ? process.argv[logLevelIndex + 1] : undefined;
+const rootDirIndex = process.argv.indexOf("--root-dir");
+const rootDir = rootDirIndex !== -1 ? process.argv[rootDirIndex + 1] : undefined;
 _scribe.scribe.withPinoPretty({
     logLevel: (0, _loglevel.cliLogLevel)(logLevel),
     when: "always"
@@ -21,7 +23,8 @@ const app = await _rootmodule.RootModule.create([
     _flux.FluxModule
 ], {
     configFile,
-    logLevel
+    logLevel,
+    rootDir
 });
 try {
     // Route directly to the flux module — users invoke as `flux serve`, not `flux flux serve`

package/commonjs/src/forge.js

@@ -12,6 +12,8 @@ const configIndex = process.argv.indexOf("--config-file");
 const configFile = configIndex !== -1 ? process.argv[configIndex + 1] : undefined;
 const logLevelIndex = process.argv.indexOf("--log-level");
 const logLevel = logLevelIndex !== -1 ? process.argv[logLevelIndex + 1] : undefined;
+const rootDirIndex = process.argv.indexOf("--root-dir");
+const rootDir = rootDirIndex !== -1 ? process.argv[rootDirIndex + 1] : undefined;
 _scribe.scribe.withPinoPretty({
     logLevel: (0, _loglevel.cliLogLevel)(logLevel),
     when: "always"
@@ -21,7 +23,8 @@ const app = await _rootmodule.RootModule.create([
     _forge.ForgeModule
 ], {
     configFile,
-    logLevel
+    logLevel,
+    rootDir
 });
 let exitCode = 0;
 try {

package/commonjs/src/root.command.js

@@ -13,10 +13,13 @@ const _cli = require("@decohere/devkit/cli");
 const _commander = require("commander");
 class RootCommand extends _cli.DecohereCommand {
     #configFile;
-    constructor(modules, configFile){
+    #rootDir;
+    constructor(modules, configFile, rootDir){
         super();
         this.#configFile = configFile;
+        this.#rootDir = rootDir;
         this.addOption(new _cli.ConfigFileOption());
+        this.addOption(new _cli.RootDirOption());
         this.addOption(new _cli.LogLevelOption());
         this.addOption(new _cli.EnvFileOption());
         this.addOption(new _cli.EnvFileIfExistsOption());
@@ -33,7 +36,8 @@ class RootCommand extends _cli.DecohereCommand {
     async parseAsync(argv, options) {
         if (argv?.includes("--version") || argv?.includes("-V")) {
             const workspace = await _workspace.WorkspaceFactory.create({
-                configFile: this.#configFile
+                configFile: this.#configFile,
+                rootDir: this.#rootDir
             });
             const version = await workspace.getVersion() ?? "unknown";
             process.stdout.write(`${version}\n`);

package/commonjs/src/root.module.js

@@ -8,12 +8,18 @@ Object.defineProperty(exports, "RootModule", {
         return RootModule;
     }
 });
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _workspace = require("@decohere/workspace");
 const _cli = require("@decohere/devkit/cli");
 const _diagnostics = require("@decohere/devkit/diagnostics");
 const _commander = require("commander");
 const _modulefactory = require("./module.factory.js");
 const _rootcommand = require("./root.command.js");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -25,10 +31,12 @@ function _ts_metadata(k, v) {
 }
 class RootModule {
     static async create(moduleTypes, options) {
-        const userConfig = await _workspace.UserConfigFactory.getUserConfig(options?.configFile);
+        // With --root-dir, the root's .decohere.js, not the current folder's.
+        const configFile = options?.configFile ?? (options?.rootDir ? _nodepath.default.join(options.rootDir, _workspace.WORKSPACE_CONFIG) : undefined);
+        const userConfig = await _workspace.UserConfigFactory.getUserConfig(configFile);
         return new RootModule(moduleTypes, {
             ...userConfig,
-            configFile: options?.configFile,
+            configFile,
             rootDir: options?.rootDir
         });
     }
@@ -42,7 +50,7 @@ class RootModule {
             return _modulefactory.ModuleFactory.create(manifest, this.onResponse, config);
         });
         this.#modules = modules;
-        this.#command = new _rootcommand.RootCommand(modules, config.configFile);
+        this.#command = new _rootcommand.RootCommand(modules, config.configFile, config.rootDir);
         // Before the command runs, not after it returns: a stop signal while `flux serve` boots
         // (`docker stop` during start-up) is held for the shutdown below instead of killing the
         // process before anything is disposed.

package/es6/src/flux.js

@@ -8,6 +8,8 @@ const configIndex = process.argv.indexOf("--config-file");
 const configFile = configIndex !== -1 ? process.argv[configIndex + 1] : undefined;
 const logLevelIndex = process.argv.indexOf("--log-level");
 const logLevel = logLevelIndex !== -1 ? process.argv[logLevelIndex + 1] : undefined;
+const rootDirIndex = process.argv.indexOf("--root-dir");
+const rootDir = rootDirIndex !== -1 ? process.argv[rootDirIndex + 1] : undefined;
 scribe.withPinoPretty({
     logLevel: cliLogLevel(logLevel),
     when: "always"
@@ -17,7 +19,8 @@ const app = await RootModule.create([
     FluxModule
 ], {
     configFile,
-    logLevel
+    logLevel,
+    rootDir
 });
 try {
     // Route directly to the flux module — users invoke as `flux serve`, not `flux flux serve`

package/es6/src/forge.js

@@ -8,6 +8,8 @@ const configIndex = process.argv.indexOf("--config-file");
 const configFile = configIndex !== -1 ? process.argv[configIndex + 1] : undefined;
 const logLevelIndex = process.argv.indexOf("--log-level");
 const logLevel = logLevelIndex !== -1 ? process.argv[logLevelIndex + 1] : undefined;
+const rootDirIndex = process.argv.indexOf("--root-dir");
+const rootDir = rootDirIndex !== -1 ? process.argv[rootDirIndex + 1] : undefined;
 scribe.withPinoPretty({
     logLevel: cliLogLevel(logLevel),
     when: "always"
@@ -17,7 +19,8 @@ const app = await RootModule.create([
     ForgeModule
 ], {
     configFile,
-    logLevel
+    logLevel,
+    rootDir
 });
 let exitCode = 0;
 try {

package/es6/src/root.command.js

@@ -1,12 +1,15 @@
 import { WorkspaceFactory } from "@decohere/workspace";
-import { ConfigFileOption, DecohereCommand, EnvFileIfExistsOption, EnvFileOption, LogLevelOption } from "@decohere/devkit/cli";
+import { ConfigFileOption, DecohereCommand, EnvFileIfExistsOption, EnvFileOption, LogLevelOption, RootDirOption } from "@decohere/devkit/cli";
 import { CommanderError } from "commander";
 export class RootCommand extends DecohereCommand {
     #configFile;
-    constructor(modules, configFile){
+    #rootDir;
+    constructor(modules, configFile, rootDir){
         super();
         this.#configFile = configFile;
+        this.#rootDir = rootDir;
         this.addOption(new ConfigFileOption());
+        this.addOption(new RootDirOption());
         this.addOption(new LogLevelOption());
         this.addOption(new EnvFileOption());
         this.addOption(new EnvFileIfExistsOption());
@@ -23,7 +26,8 @@ export class RootCommand extends DecohereCommand {
     async parseAsync(argv, options) {
         if (argv?.includes("--version") || argv?.includes("-V")) {
             const workspace = await WorkspaceFactory.create({
-                configFile: this.#configFile
+                configFile: this.#configFile,
+                rootDir: this.#rootDir
             });
             const version = await workspace.getVersion() ?? "unknown";
             process.stdout.write(`${version}\n`);

package/es6/src/root.module.js

@@ -7,7 +7,8 @@ function _ts_decorate(decorators, target, key, desc) {
 function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-import { UserConfigFactory } from "@decohere/workspace";
+import path from "node:path";
+import { UserConfigFactory, WORKSPACE_CONFIG } from "@decohere/workspace";
 import { CommandResponse, DecohereCommand } from "@decohere/devkit/cli";
 import { Trace } from "@decohere/devkit/diagnostics";
 import { CommanderError } from "commander";
@@ -15,10 +16,12 @@ import { ModuleFactory } from "./module.factory.js";
 import { RootCommand } from "./root.command.js";
 export class RootModule {
     static async create(moduleTypes, options) {
-        const userConfig = await UserConfigFactory.getUserConfig(options?.configFile);
+        // With --root-dir, the root's .decohere.js, not the current folder's.
+        const configFile = options?.configFile ?? (options?.rootDir ? path.join(options.rootDir, WORKSPACE_CONFIG) : undefined);
+        const userConfig = await UserConfigFactory.getUserConfig(configFile);
         return new RootModule(moduleTypes, {
             ...userConfig,
-            configFile: options?.configFile,
+            configFile,
             rootDir: options?.rootDir
         });
     }
@@ -32,7 +35,7 @@ export class RootModule {
             return ModuleFactory.create(manifest, this.onResponse, config);
         });
         this.#modules = modules;
-        this.#command = new RootCommand(modules, config.configFile);
+        this.#command = new RootCommand(modules, config.configFile, config.rootDir);
         // Before the command runs, not after it returns: a stop signal while `flux serve` boots
         // (`docker stop` during start-up) is held for the shutdown below instead of killing the
         // process before anything is disposed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/cli",
-  "version": "0.0.1-dev.128",
+  "version": "0.0.1-dev.130",
   "description": "CLI for the Decohere toolchain — build, serve, publish, and manage TypeScript monorepos",
   "keywords": [
     "typescript",
@@ -37,16 +37,16 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/core": "0.0.1-dev.128",
-    "@decohere/create": "0.0.1-dev.128",
-    "@decohere/crucible": "0.0.1-dev.128",
-    "@decohere/devkit": "0.0.1-dev.128",
-    "@decohere/flux": "0.0.1-dev.128",
-    "@decohere/forge": "0.0.1-dev.128",
-    "@decohere/scaffold": "0.0.1-dev.128",
-    "@decohere/scribe": "0.0.1-dev.128",
-    "@decohere/scribe-pino": "0.0.1-dev.128",
-    "@decohere/workspace": "0.0.1-dev.128",
+    "@decohere/core": "0.0.1-dev.130",
+    "@decohere/create": "0.0.1-dev.130",
+    "@decohere/crucible": "0.0.1-dev.130",
+    "@decohere/devkit": "0.0.1-dev.130",
+    "@decohere/flux": "0.0.1-dev.130",
+    "@decohere/forge": "0.0.1-dev.130",
+    "@decohere/scaffold": "0.0.1-dev.130",
+    "@decohere/scribe": "0.0.1-dev.130",
+    "@decohere/scribe-pino": "0.0.1-dev.130",
+    "@decohere/workspace": "0.0.1-dev.130",
     "commander": "^13.1.0",
     "pino-pretty": "^13.1.3"
   },

package/types/src/root.command.d.ts

@@ -2,6 +2,6 @@ import { type ApplicationModule, DecohereCommand } from "@decohere/devkit/cli";
 import { type ParseOptions } from "commander";
 export declare class RootCommand extends DecohereCommand {
     #private;
-    constructor(modules: ApplicationModule[], configFile?: string);
+    constructor(modules: ApplicationModule[], configFile?: string, rootDir?: string);
     parseAsync(argv?: readonly string[], options?: ParseOptions): Promise<this>;
 }