@akanjs/cli 2.1.0-rc.0 → 2.1.0-rc.2

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)
@@ -8247,6 +8316,7 @@ var Pkg = createInternalArgToken("Pkg");
 var Module = createInternalArgToken("Module");
 var Workspace = createInternalArgToken("Workspace");
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
+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";
@@ -8505,6 +8575,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,
@@ -8711,11 +8812,22 @@ 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);
-  const hasPackageJson = await FileSys.fileExists(`${__dirname2}/../package.json`);
-  process.env.AKAN_VERSION = hasPackageJson ? (await FileSys.readJson(`${__dirname2}/../package.json`)).version : "0.0.1";
+  const packageJsonCandidates = [`${path35.dirname(Bun.main)}/package.json`, `${__dirname2}/../package.json`];
+  let cliPackageJson = null;
+  for (const packageJsonPath of packageJsonCandidates) {
+    if (!await FileSys.fileExists(packageJsonPath))
+      continue;
+    const packageJson = await FileSys.readJson(packageJsonPath);
+    if (packageJson.name === "@akanjs/cli" || packageJson.name === "@akanjs/devkit") {
+      cliPackageJson = packageJson;
+      break;
+    }
+  }
+  process.env.AKAN_VERSION = cliPackageJson?.version ?? "0.0.1";
   const hasHelpFlag = process.argv.includes("--help") || process.argv.includes("-h");
   const hasCommand = process.argv.length > 2 && !process.argv[2]?.startsWith("-");
   if (hasHelpFlag || !hasCommand) {
@@ -8791,9 +8903,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;
           }
         });
@@ -8982,8 +9092,8 @@ var scanModuleSpecifiers = (source, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts6.readConfigFile(tsConfigPath, (path35) => {
-    return ts6.sys.readFile(path35);
+  const configFile = ts6.readConfigFile(tsConfigPath, (path36) => {
+    return ts6.sys.readFile(path36);
   });
   return ts6.parseJsonConfigFileContent(configFile.config, ts6.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
@@ -9328,7 +9438,7 @@ class LibraryScript extends script("library", [LibraryRunner]) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-import path35 from "path";
+import path36 from "path";
 import { confirm as confirm2, input as input4, select as select5 } from "@inquirer/prompts";
 import { StringOutputParser } from "@langchain/core/output_parsers";
 import { PromptTemplate as PromptTemplate2 } from "@langchain/core/prompts";
@@ -9394,7 +9504,7 @@ class ApplicationRunner extends runner("application") {
   }
   async test(exec2) {
     const isSignalTarget = exec2 instanceof AppExecutor || exec2 instanceof LibExecutor;
-    const preloadPath = path35.join(exec2.cwdPath, "../../pkgs/akanjs/test/signalTest.preload.ts");
+    const preloadPath = path36.join(exec2.cwdPath, "../../pkgs/akanjs/test/signalTest.preload.ts");
     const env = isSignalTarget ? {
       AKAN_TEST_SIGNAL: "1",
       AKAN_TEST_TARGET_TYPE: exec2.type,
@@ -9571,8 +9681,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) {
@@ -9950,18 +10067,35 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 import { Logger as Logger16 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/package/package.runner.ts
-import path36 from "path";
+import path37 from "path";
 import { Logger as Logger14 } from "akanjs/common";
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
   async version(workspace, { log = true } = {}) {
-    const pkgJson = await FileSys.readJson(process.env.USE_AKANJS_PKGS === "true" ? `${workspace?.workspaceRoot ?? process.cwd()}/pkgs/akanjs/package.json` : `${path36.dirname(Bun.main)}/../package.json`);
-    const version = pkgJson.version;
+    const pkgJson = process.env.USE_AKANJS_PKGS === "true" ? await FileSys.readJson(`${workspace?.workspaceRoot ?? process.cwd()}/pkgs/akanjs/package.json`) : await this.#getInstalledPackageJson();
+    const version = pkgJson.name === "akanjs" ? pkgJson.version : pkgJson.dependencies?.akanjs ?? pkgJson.version;
     if (log)
-      Logger14.rawLog(`${pkgJson.name}@${version}`);
+      Logger14.rawLog(`akanjs@${version}`);
     return version;
   }
+  async#getInstalledPackageJson() {
+    const packageJsonCandidates = [
+      `${path37.dirname(Bun.main)}/package.json`,
+      `${process.cwd()}/node_modules/akanjs/package.json`
+    ];
+    try {
+      packageJsonCandidates.unshift(Bun.resolveSync("akanjs/package.json", path37.dirname(Bun.main)));
+    } catch {}
+    for (const packageJsonPath of packageJsonCandidates) {
+      if (!await Bun.file(packageJsonPath).exists())
+        continue;
+      const packageJson = await FileSys.readJson(packageJsonPath);
+      if (packageJson.name === "akanjs" || packageJson.name === "@akanjs/cli")
+        return packageJson;
+    }
+    throw new Error(`[package] failed to locate akanjs package.json from ${path37.dirname(Bun.main)}`);
+  }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
     await workspace.setPkgTsPaths(pkgName);
@@ -10308,14 +10442,14 @@ class GuidelinePrompt extends Prompter {
   async#getScanFilePaths(matchPattern, { avoidDirs = ["node_modules", ".next"], filterText } = {}) {
     const glob = new Bun.Glob(matchPattern);
     const paths = [];
-    for await (const path37 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
-      if (avoidDirs.some((dir) => path37.includes(dir)))
+    for await (const path38 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
+      if (avoidDirs.some((dir) => path38.includes(dir)))
         continue;
-      const fileContent = await FileSys.readText(path37);
+      const fileContent = await FileSys.readText(path38);
       const textFilter = filterText ? new RegExp(filterText) : null;
       if (filterText && !textFilter?.test(fileContent))
         continue;
-      paths.push(path37);
+      paths.push(path38);
     }
     return paths;
   }
@@ -11405,11 +11539,11 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 }
 
 // pkgs/@akanjs/cli/workspace/workspace.script.ts
-import path38 from "path";
+import path39 from "path";
 import { Logger as Logger17 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
-import path37 from "path";
+import path38 from "path";
 var defaultWorkspacePeerDependencies = new Set([
   "react",
   "react-dom",
@@ -11423,7 +11557,7 @@ var defaultWorkspacePeerDependencies = new Set([
 class WorkspaceRunner extends runner("workspace") {
   async createWorkspace(repoName, appName, { dirname: dirname3 = ".", init = true, akanVersion }) {
     const cwdPath = process.cwd();
-    const workspaceRoot = path37.join(cwdPath, dirname3, repoName);
+    const workspaceRoot = path38.join(cwdPath, dirname3, repoName);
     const workspace = WorkspaceExecutor.fromRoot({ workspaceRoot, repoName });
     const templateSpinner = workspace.spinning(`Creating workspace template files in ${dirname3}/${repoName}...`);
     const latestTypesBunVersion = await getLatestPackageVersion("@types/bun");
@@ -11437,16 +11571,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);
@@ -11468,9 +11604,9 @@ class WorkspaceRunner extends runner("workspace") {
   }
   async#getCliPackageJson() {
     const packageJsonCandidates = [
-      path37.join(import.meta.dir, "../package.json"),
-      path37.join(import.meta.dir, "package.json"),
-      path37.join(path37.dirname(Bun.main), "package.json")
+      path38.join(import.meta.dir, "../package.json"),
+      path38.join(import.meta.dir, "package.json"),
+      path38.join(path38.dirname(Bun.main), "package.json")
     ];
     try {
       packageJsonCandidates.unshift(Bun.resolveSync("@akanjs/cli/package.json", import.meta.dir));
@@ -11486,9 +11622,9 @@ class WorkspaceRunner extends runner("workspace") {
   }
   async#getAkanPackageJson() {
     const packageJsonCandidates = [
-      path37.join(import.meta.dir, "../../../akanjs/package.json"),
-      path37.join(process.cwd(), "pkgs/akanjs/package.json"),
-      path37.join(path37.dirname(Bun.main), "node_modules/akanjs/package.json")
+      path38.join(import.meta.dir, "../../../akanjs/package.json"),
+      path38.join(process.cwd(), "pkgs/akanjs/package.json"),
+      path38.join(path38.dirname(Bun.main), "node_modules/akanjs/package.json")
     ];
     try {
       packageJsonCandidates.unshift(Bun.resolveSync("akanjs/package.json", import.meta.dir));
@@ -11502,13 +11638,13 @@ class WorkspaceRunner extends runner("workspace") {
     }
     let current = import.meta.dir;
     for (let depth = 0;depth < 6; depth++) {
-      const packageJsonPath = path37.join(current, "package.json");
+      const packageJsonPath = path38.join(current, "package.json");
       if (await Bun.file(packageJsonPath).exists()) {
         const packageJson = await FileSys.readJson(packageJsonPath);
         if (packageJson.name === "akanjs")
           return packageJson;
       }
-      const parent = path37.dirname(current);
+      const parent = path38.dirname(current);
       if (parent === current)
         break;
       current = parent;
@@ -11551,7 +11687,7 @@ class WorkspaceScript extends script("workspace", [
     } catch (_) {
       gitSpinner.fail("Git repository initialization failed. It's not fatal, you can commit manually");
     }
-    const workspacePath = path38.join(dirname3, repoName);
+    const workspacePath = path39.join(dirname3, repoName);
     Logger17.rawLog(`
 \uD83C\uDF89 Welcome aboard! Workspace created in ${dirname3}/${repoName}`);
     Logger17.rawLog(`\uD83D\uDE80 Run \`cd ${workspacePath} && akan start ${appName}\` to start the development server.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0-rc.2",
   "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.1",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "fontaine": "^0.8.0",