@akanjs/cli 2.1.0-rc.1 → 2.1.0-rc.3

package/index.js

@@ -1959,6 +1959,45 @@ var staticTemplateFileExtensions = new Set([
   ".woff2",
   ".xml"
 ]);
+var formatCommandArg = (value) => /^[\w@%+=:,./-]+$/.test(value) ? value : JSON.stringify(value);
+var formatCommandForDisplay = (command, args = []) => [command, ...args].map(formatCommandArg).join(" ");
+
+class CommandExecutionError extends Error {
+  command;
+  args;
+  cwd;
+  code;
+  signal;
+  stdout;
+  stderr;
+  constructor({
+    command,
+    args = [],
+    cwd,
+    code,
+    signal,
+    stdout = "",
+    stderr = "",
+    cause
+  }) {
+    const displayCommand = formatCommandForDisplay(command, args);
+    const status = signal ? `signal: ${signal}` : `exit code: ${code ?? "unknown"}`;
+    const output = (stderr || stdout).trim();
+    super([`Command failed: ${displayCommand}`, `cwd: ${cwd}`, status, output ? `
+${output}` : ""].join(`
+`), {
+      cause
+    });
+    this.name = "CommandExecutionError";
+    this.command = command;
+    this.args = args;
+    this.cwd = cwd;
+    this.code = code;
+    this.signal = signal;
+    this.stdout = stdout;
+    this.stderr = stderr;
+  }
+}
 var execEmoji = {
   workspace: "\uD83C\uDFE0",
   app: "\uD83D\uDE80",
@@ -2089,23 +2128,32 @@ class Executor {
     Logger4.raw(chalk4.red(data.toString()));
   }
   exec(command, options = {}) {
+    const cwd = options.cwd?.toString() ?? this.cwdPath;
     const proc = exec(command, { cwd: this.cwdPath, ...options });
+    let stdout = "";
+    let stderr = "";
     proc.stdout?.on("data", (data) => {
+      stdout += data.toString();
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
+      stderr += data.toString();
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
+      proc.on("error", (error) => {
+        reject(new CommandExecutionError({ command, cwd, code: null, signal: null, stdout, stderr, cause: error }));
+      });
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject({ code, signal });
+          reject(new CommandExecutionError({ command, cwd, code, signal, stdout, stderr }));
         else
           resolve({ code, signal });
       });
     });
   }
   spawn(command, args = [], options = {}) {
+    const cwd = options.cwd?.toString() ?? this.cwdPath;
     const proc = spawn(command, args, {
       cwd: this.cwdPath,
       ...options
@@ -2123,9 +2171,12 @@ class Executor {
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
+      proc.on("error", (error) => {
+        reject(new CommandExecutionError({ command, args, cwd, code: null, signal: null, stdout, stderr, cause: error }));
+      });
       proc.on("close", (code, signal) => {
         if (code !== 0 || signal)
-          reject(stderr || stdout);
+          reject(new CommandExecutionError({ command, args, cwd, code, signal, stdout, stderr }));
         else
           resolve(stdout);
       });
@@ -2139,20 +2190,37 @@ class Executor {
     return proc;
   }
   fork(modulePath, args = [], options = {}) {
+    const cwd = options.cwd?.toString() ?? this.cwdPath;
     const proc = fork(modulePath, args, {
       cwd: this.cwdPath,
       ...options
     });
+    let stdout = "";
+    let stderr = "";
     proc.stdout?.on("data", (data) => {
+      stdout += data.toString();
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
+      stderr += data.toString();
       this.#stderr(data);
     });
     return new Promise((resolve, reject) => {
+      proc.on("error", (error) => {
+        reject(new CommandExecutionError({
+          command: modulePath,
+          args,
+          cwd,
+          code: null,
+          signal: null,
+          stdout,
+          stderr,
+          cause: error
+        }));
+      });
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject({ code, signal });
+          reject(new CommandExecutionError({ command: modulePath, args, cwd, code, signal, stdout, stderr }));
         else
           resolve({ code, signal });
       });
@@ -3374,6 +3442,7 @@ class IncrementalBuilderHost {
     const candidates = [
       path8.join(app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts"),
       path8.join(app.workspace.workspaceRoot, "node_modules/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts"),
+      path8.join(import.meta.dir, "incrementalBuilder.proc.js"),
       path8.join(import.meta.dir, "incrementalBuilder.proc.ts")
     ];
     for (const c of candidates)
@@ -5793,9 +5862,9 @@ class CssImportResolver {
   }
   async resolve(id, fromBase) {
     for (const resolve of [
+      () => this.#resolveWithTsconfig(id),
       () => this.#resolveWithBun(id, fromBase),
       () => this.#resolveWithRequire(id, fromBase),
-      () => this.#resolveWithTsconfig(id),
       () => this.#resolvePackageStyle(id, fromBase)
     ]) {
       const resolved = await resolve();
@@ -5805,20 +5874,24 @@ class CssImportResolver {
     return null;
   }
   #resolveWithBun(id, fromBase) {
-    try {
-      const resolved = Bun.resolveSync(id, fromBase);
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = Bun.resolveSync(id, base);
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   #resolveWithRequire(id, fromBase) {
-    try {
-      const resolved = __require.resolve(id, { paths: [fromBase] });
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = __require.resolve(id, { paths: [base] });
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   async#resolveWithTsconfig(id) {
     const exact = this.#paths[id];
@@ -5846,8 +5919,25 @@ class CssImportResolver {
     const pkgName = CssImportResolver.getPackageName(id);
     if (!pkgName)
       return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [base] });
+        const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+        if (resolved)
+          return resolved;
+      } catch {}
+    }
+    for (const pkgPath of this.#packageJsonCandidates(pkgName)) {
+      const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+      if (resolved)
+        return resolved;
+    }
+    return null;
+  }
+  async#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath) {
     try {
-      const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [fromBase] });
+      if (!await Bun.file(pkgPath).exists())
+        return null;
       const pkgDir = path22.dirname(pkgPath);
       const pkg = await Bun.file(pkgPath).json();
       const subpath = id === pkgName ? "." : `.${id.slice(pkgName.length)}`;
@@ -5858,6 +5948,22 @@ class CssImportResolver {
       return null;
     }
   }
+  #resolutionBases(fromBase) {
+    return [
+      fromBase,
+      this.#workspaceRoot,
+      path22.dirname(Bun.main),
+      path22.resolve(path22.dirname(Bun.main), "../..")
+    ];
+  }
+  #packageJsonCandidates(pkgName) {
+    return [
+      path22.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
+      path22.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "../../", pkgName, "package.json")
+    ];
+  }
   async#firstExisting(basePath2) {
     for (const suffix of CSS_IMPORT_EXTS) {
       const candidate = `${basePath2}${suffix}`;
@@ -6982,14 +7088,23 @@ class SsrBaseArtifactBuilder {
   async#resolveAkanServerPath() {
     const candidates = [
       path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
+      path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
+      path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"),
+      path30.join(path30.dirname(Bun.main), "../../akanjs/server"),
       path30.resolve(import.meta.dir, "../../server"),
       path30.resolve(import.meta.dir, "../server")
     ];
+    try {
+      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+    } catch {}
+    try {
+      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
+    } catch {}
     for (const candidate of candidates) {
       if (await Bun.file(path30.join(candidate, "rscClient.tsx")).exists())
         return candidate;
     }
-    return candidates[0];
+    throw new Error(`[base-artifact] failed to locate akanjs/server; looked in: ${candidates.join(", ")}`);
   }
   async#buildStyleAssets() {
     const cssCompiler = new CssCompiler(this.#app);
@@ -8247,8 +8362,8 @@ var Pkg = createInternalArgToken("Pkg");
 var Module = createInternalArgToken("Module");
 var Workspace = createInternalArgToken("Workspace");
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
-import { confirm, input as input2, select as select2 } from "@inquirer/prompts";
 import path35 from "path";
+import { confirm, input as input2, select as select2 } from "@inquirer/prompts";
 import { Logger as Logger11 } from "akanjs/common";
 import chalk6 from "chalk";
 import { program } from "commander";
@@ -8506,6 +8621,37 @@ var formatCommandHelp = (command, key) => {
 
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
 var camelToKebabCase2 = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
+var loggedCliErrorObjects = new WeakSet;
+var loggedCliErrorMessages = new Set;
+var formatCliError = (error) => {
+  if (error instanceof Error)
+    return error.message || error.name;
+  if (typeof error === "string")
+    return error.trim() || "Unknown error";
+  if (error === null || error === undefined)
+    return "Unknown error";
+  try {
+    const json = JSON.stringify(error);
+    if (json)
+      return json;
+  } catch {
+    return String(error);
+  }
+  return String(error) || "Unknown error";
+};
+var printCliError = (error) => {
+  if (typeof error === "object" && error !== null) {
+    if (loggedCliErrorObjects.has(error))
+      return;
+    loggedCliErrorObjects.add(error);
+  }
+  const message = formatCliError(error);
+  if (loggedCliErrorMessages.has(message))
+    return;
+  loggedCliErrorMessages.add(message);
+  Logger11.rawLog(`
+${chalk6.red(message)}`);
+};
 var handleOption = (programCommand, argMeta) => {
   const {
     type,
@@ -8712,6 +8858,7 @@ var getInternalArgumentValue = async (argMeta, value, workspace) => {
 };
 var runCommands = async (...commands) => {
   process.on("unhandledRejection", (error) => {
+    printCliError(error);
     process.exit(1);
   });
   const __dirname2 = getDirname(import.meta.url);
@@ -8802,9 +8949,7 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`)
             await targetMeta.handler.call(cmd, ...commandArgs);
             Logger11.rawLog();
           } catch (e) {
-            const errMsg = e instanceof Error ? e.message : typeof e === "string" ? e : JSON.stringify(e);
-            Logger11.rawLog(`
-${chalk6.red(errMsg)}`);
+            printCliError(e);
             throw e;
           }
         });
@@ -9582,8 +9727,15 @@ class ApplicationRunner extends runner("application") {
           cwd: `${workspace.workspaceRoot}/local`
         });
       return wasAlreadyUp;
-    } catch {
-      throw new Error(`Docker daemon is not running. Please install docker or start docker daemon and try again.`);
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : typeof error === "string" ? error : JSON.stringify(error) || "Unknown error";
+      throw new Error([
+        "Docker daemon may not be running. Please install Docker or start the Docker daemon and try again.",
+        `Original error:
+${detail}`
+      ].join(`
+
+`));
     }
   }
   async dbdown(workspace) {
@@ -11465,16 +11617,18 @@ class WorkspaceRunner extends runner("workspace") {
       workspace.getPackageJson(),
       this.#getAkanPeerDependencies()
     ]);
+    const { typescript, ...dependencies } = peerDependencies;
     const packageJson = {
       ...rootPackageJson,
       dependencies: {
         ...rootPackageJson.dependencies,
-        ...peerDependencies,
+        ...dependencies,
         akanjs: akanVersion
       },
       devDependencies: {
         ...rootPackageJson.devDependencies,
-        "@types/bun": latestTypesBunVersion
+        "@types/bun": latestTypesBunVersion,
+        ...typescript ? { typescript } : {}
       }
     };
     await workspace.setPackageJson(packageJson);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.3",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/deepseek": "^1.0.26",
     "@langchain/openai": "^1.4.6",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.1.0-rc.0",
+    "akanjs": "2.1.0-rc.3",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "fontaine": "^0.8.0",