@akanjs/devkit 0.0.136 → 0.0.138

package/cjs/src/aiEditor.js

@@ -36,6 +36,7 @@ var import_prompts = require("@inquirer/prompts");
 var import_messages = require("@langchain/core/messages");
 var import_openai = require("@langchain/openai");
 var import_chalk = __toESM(require("chalk"));
+var import_ora = __toESM(require("ora"));
 var import_auth = require("./auth");
 const MAX_ASK_TRY = 300;
 const supportedLlmModels = ["deepseek-chat", "deepseek-reasoner"];
@@ -107,23 +108,28 @@ class AiSession {
       await AiSession.init();
     if (!AiSession.#chat)
       throw new Error("Failed to initialize the AI session");
+    const loader = (0, import_ora.default)(`${AiSession.#chat.model} is thinking...`).start();
     try {
       const humanMessage = new import_messages.HumanMessage(question);
       this.messageHistory.push(humanMessage);
       const stream = await AiSession.#chat.stream(this.messageHistory);
-      let fullResponse = "";
+      let fullResponse = "", tokenIdx = 0;
       for await (const chunk of stream) {
+        if (loader.isSpinning)
+          loader.succeed(`${AiSession.#chat.model} responded`);
         const content = chunk.content;
         if (typeof content === "string") {
           fullResponse += content;
           onChunk(content);
         }
+        tokenIdx++;
       }
       fullResponse += "\n";
       onChunk("\n");
       this.messageHistory.push(new import_messages.AIMessage(fullResponse));
       return { content: fullResponse, messageHistory: this.messageHistory };
     } catch (error) {
+      loader.fail(`${AiSession.#chat.model} failed to respond`);
       throw new Error("Failed to stream response");
     }
   }

package/cjs/src/executors.js

@@ -32,7 +32,8 @@ __export(executors_exports, {
   LibExecutor: () => LibExecutor,
   PkgExecutor: () => PkgExecutor,
   SysExecutor: () => SysExecutor,
-  WorkspaceExecutor: () => WorkspaceExecutor
+  WorkspaceExecutor: () => WorkspaceExecutor,
+  execEmoji: () => execEmoji
 });
 module.exports = __toCommonJS(executors_exports);
 var import_common = require("@akanjs/common");
@@ -44,10 +45,21 @@ var import_fs = __toESM(require("fs"));
 var import_promises = __toESM(require("fs/promises"));
 var import_path = __toESM(require("path"));
 var import_dependencyScanner = require("./dependencyScanner");
+var import_spinner = require("./spinner");
+const execEmoji = {
+  workspace: "\u{1F3E0}",
+  app: "\u{1F680}",
+  lib: "\u{1F527}",
+  pkg: "\u{1F4E6}",
+  dist: "\u{1F4BF}",
+  default: "\u2708\uFE0F"
+  // for sys executor
+};
 class Executor {
   name;
   logger;
   cwdPath;
+  emoji = execEmoji.default;
   constructor(name, cwdPath) {
     this.name = name;
     this.logger = new import_common.Logger(name);
@@ -174,6 +186,9 @@ class Executor {
     this.logger.verbose(msg);
     return this;
   }
+  spinning(msg, { prefix = `${this.emoji}${this.name} -`, indent = 0 } = {}) {
+    return new import_spinner.Spinner(msg, { prefix, indent }).start();
+  }
   getTsConfig(pathname = "tsconfig.json") {
     const tsconfig = this.readJson(pathname);
     if (tsconfig.extends) {
@@ -205,7 +220,7 @@ class Executor {
         `${dirname}/${filename}`
       );
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
-      this.writeFile(convertedTargetPath, content);
+      this.writeFile(convertedTargetPath, content, { overwrite });
     } else if (targetPath.endsWith(".template")) {
       const content = await import_promises.default.readFile(templatePath, "utf8");
       const convertedTargetPath = Object.entries(dict).reduce(
@@ -217,7 +232,7 @@ class Executor {
         content
       );
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
-      this.writeFile(convertedTargetPath, convertedContent);
+      this.writeFile(convertedTargetPath, convertedContent, { overwrite });
     }
   }
   async applyTemplate({
@@ -260,8 +275,9 @@ class Executor {
 class WorkspaceExecutor extends Executor {
   workspaceRoot;
   repoName;
+  emoji = execEmoji.workspace;
   constructor({ workspaceRoot, repoName }) {
-    super(`${repoName} Executor`, workspaceRoot);
+    super("workspace", workspaceRoot);
     this.workspaceRoot = workspaceRoot;
     this.repoName = repoName;
   }
@@ -416,11 +432,13 @@ class SysExecutor extends Executor {
   workspace;
   name;
   type;
+  emoji;
   constructor({ workspace = WorkspaceExecutor.fromRoot(), name, type }) {
-    super(`${name} Sys Executor`, `${workspace.workspaceRoot}/${type}s/${name}`);
+    super(name, `${workspace.workspaceRoot}/${type}s/${name}`);
     this.workspace = workspace;
     this.name = name;
     this.type = type;
+    this.emoji = execEmoji[type];
   }
   async getConfig(command) {
     return this.type === "app" ? await (0, import_config.getAppConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name, command }) : await (0, import_config.getLibConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name, command });
@@ -641,9 +659,10 @@ class SysExecutor extends Executor {
 }
 class AppExecutor extends SysExecutor {
   dist;
+  emoji = execEmoji.app;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "app" });
-    this.dist = new Executor(`${name} Dist App Executor`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
+    this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -677,9 +696,10 @@ class LibExecutor extends SysExecutor {
   workspaceRoot;
   repoName;
   dist;
+  emoji = execEmoji.lib;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "lib" });
-    this.dist = new Executor(`${name} Dist Lib Executor`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
+    this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -699,11 +719,12 @@ class PkgExecutor extends Executor {
   workspace;
   name;
   dist;
+  emoji = execEmoji.pkg;
   constructor({ workspace = WorkspaceExecutor.fromRoot(), name }) {
-    super(`${name} Pkg Executor`, `${workspace.workspaceRoot}/pkgs/${name}`);
+    super(name, `${workspace.workspaceRoot}/pkgs/${name}`);
     this.workspace = workspace;
     this.name = name;
-    this.dist = new Executor(`${name} Dist Pkg Executor`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
+    this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -740,5 +761,6 @@ class PkgExecutor extends Executor {
   LibExecutor,
   PkgExecutor,
   SysExecutor,
-  WorkspaceExecutor
+  WorkspaceExecutor,
+  execEmoji
 });

package/cjs/src/index.js

@@ -31,6 +31,7 @@ __reExport(src_exports, require("./extractDeps"), module.exports);
 __reExport(src_exports, require("./commandDecorators"), module.exports);
 __reExport(src_exports, require("./aiEditor"), module.exports);
 __reExport(src_exports, require("./builder"), module.exports);
+__reExport(src_exports, require("./spinner"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./createTunnel"),
@@ -49,5 +50,6 @@ __reExport(src_exports, require("./builder"), module.exports);
   ...require("./extractDeps"),
   ...require("./commandDecorators"),
   ...require("./aiEditor"),
-  ...require("./builder")
+  ...require("./builder"),
+  ...require("./spinner")
 });

package/cjs/src/spinner.js

@@ -0,0 +1,71 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var spinner_exports = {};
+__export(spinner_exports, {
+  Spinner: () => Spinner
+});
+module.exports = __toCommonJS(spinner_exports);
+var import_ora = __toESM(require("ora"));
+class Spinner {
+  spinner;
+  stopWatch;
+  startAt;
+  message;
+  constructor(message, { prefix = "", indent = 0 } = {}) {
+    this.message = message;
+    this.spinner = (0, import_ora.default)(message);
+    this.spinner.prefixText = prefix;
+    this.spinner.indent = indent;
+  }
+  start() {
+    this.startAt = /* @__PURE__ */ new Date();
+    const spinner = this.spinner.start();
+    this.stopWatch = setInterval(() => {
+      spinner.text = `${this.message} (${this.#getElapsedTimeStr()})`;
+    }, 1e3);
+    return this;
+  }
+  succeed(message) {
+    clearInterval(this.stopWatch);
+    this.spinner.succeed(`${message} (${this.#getElapsedTimeStr()})`);
+  }
+  #getElapsedTimeStr() {
+    const ms = (/* @__PURE__ */ new Date()).getTime() - this.startAt.getTime();
+    if (ms < 1e3)
+      return `${ms}ms`;
+    const s = Math.floor(ms / 1e3);
+    if (s < 60)
+      return `${s}s`;
+    const m = Math.floor(s / 60);
+    return `${m}m ${s % 60}s`;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Spinner
+});

package/esm/src/aiEditor.js

@@ -3,6 +3,7 @@ import { input, select } from "@inquirer/prompts";
 import { AIMessage, HumanMessage } from "@langchain/core/messages";
 import { ChatOpenAI } from "@langchain/openai";
 import chalk from "chalk";
+import ora from "ora";
 import { getAkanGlobalConfig, setAkanGlobalConfig } from "./auth";
 const MAX_ASK_TRY = 300;
 const supportedLlmModels = ["deepseek-chat", "deepseek-reasoner"];
@@ -74,23 +75,28 @@ class AiSession {
       await AiSession.init();
     if (!AiSession.#chat)
       throw new Error("Failed to initialize the AI session");
+    const loader = ora(`${AiSession.#chat.model} is thinking...`).start();
     try {
       const humanMessage = new HumanMessage(question);
       this.messageHistory.push(humanMessage);
       const stream = await AiSession.#chat.stream(this.messageHistory);
-      let fullResponse = "";
+      let fullResponse = "", tokenIdx = 0;
       for await (const chunk of stream) {
+        if (loader.isSpinning)
+          loader.succeed(`${AiSession.#chat.model} responded`);
         const content = chunk.content;
         if (typeof content === "string") {
           fullResponse += content;
           onChunk(content);
         }
+        tokenIdx++;
       }
       fullResponse += "\n";
       onChunk("\n");
       this.messageHistory.push(new AIMessage(fullResponse));
       return { content: fullResponse, messageHistory: this.messageHistory };
     } catch (error) {
+      loader.fail(`${AiSession.#chat.model} failed to respond`);
       throw new Error("Failed to stream response");
     }
   }

package/esm/src/executors.js

@@ -11,10 +11,21 @@ import fs from "fs";
 import fsPromise from "fs/promises";
 import path from "path";
 import { TypeScriptDependencyScanner } from "./dependencyScanner";
+import { Spinner } from "./spinner";
+const execEmoji = {
+  workspace: "\u{1F3E0}",
+  app: "\u{1F680}",
+  lib: "\u{1F527}",
+  pkg: "\u{1F4E6}",
+  dist: "\u{1F4BF}",
+  default: "\u2708\uFE0F"
+  // for sys executor
+};
 class Executor {
   name;
   logger;
   cwdPath;
+  emoji = execEmoji.default;
   constructor(name, cwdPath) {
     this.name = name;
     this.logger = new Logger(name);
@@ -141,6 +152,9 @@ class Executor {
     this.logger.verbose(msg);
     return this;
   }
+  spinning(msg, { prefix = `${this.emoji}${this.name} -`, indent = 0 } = {}) {
+    return new Spinner(msg, { prefix, indent }).start();
+  }
   getTsConfig(pathname = "tsconfig.json") {
     const tsconfig = this.readJson(pathname);
     if (tsconfig.extends) {
@@ -172,7 +186,7 @@ class Executor {
         `${dirname}/${filename}`
       );
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
-      this.writeFile(convertedTargetPath, content);
+      this.writeFile(convertedTargetPath, content, { overwrite });
     } else if (targetPath.endsWith(".template")) {
       const content = await fsPromise.readFile(templatePath, "utf8");
       const convertedTargetPath = Object.entries(dict).reduce(
@@ -184,7 +198,7 @@ class Executor {
         content
       );
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
-      this.writeFile(convertedTargetPath, convertedContent);
+      this.writeFile(convertedTargetPath, convertedContent, { overwrite });
     }
   }
   async applyTemplate({
@@ -227,8 +241,9 @@ class Executor {
 class WorkspaceExecutor extends Executor {
   workspaceRoot;
   repoName;
+  emoji = execEmoji.workspace;
   constructor({ workspaceRoot, repoName }) {
-    super(`${repoName} Executor`, workspaceRoot);
+    super("workspace", workspaceRoot);
     this.workspaceRoot = workspaceRoot;
     this.repoName = repoName;
   }
@@ -383,11 +398,13 @@ class SysExecutor extends Executor {
   workspace;
   name;
   type;
+  emoji;
   constructor({ workspace = WorkspaceExecutor.fromRoot(), name, type }) {
-    super(`${name} Sys Executor`, `${workspace.workspaceRoot}/${type}s/${name}`);
+    super(name, `${workspace.workspaceRoot}/${type}s/${name}`);
     this.workspace = workspace;
     this.name = name;
     this.type = type;
+    this.emoji = execEmoji[type];
   }
   async getConfig(command) {
     return this.type === "app" ? await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name, command }) : await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name, command });
@@ -608,9 +625,10 @@ class SysExecutor extends Executor {
 }
 class AppExecutor extends SysExecutor {
   dist;
+  emoji = execEmoji.app;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "app" });
-    this.dist = new Executor(`${name} Dist App Executor`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
+    this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -644,9 +662,10 @@ class LibExecutor extends SysExecutor {
   workspaceRoot;
   repoName;
   dist;
+  emoji = execEmoji.lib;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "lib" });
-    this.dist = new Executor(`${name} Dist Lib Executor`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
+    this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -666,11 +685,12 @@ class PkgExecutor extends Executor {
   workspace;
   name;
   dist;
+  emoji = execEmoji.pkg;
   constructor({ workspace = WorkspaceExecutor.fromRoot(), name }) {
-    super(`${name} Pkg Executor`, `${workspace.workspaceRoot}/pkgs/${name}`);
+    super(name, `${workspace.workspaceRoot}/pkgs/${name}`);
     this.workspace = workspace;
     this.name = name;
-    this.dist = new Executor(`${name} Dist Pkg Executor`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
+    this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -706,5 +726,6 @@ export {
   LibExecutor,
   PkgExecutor,
   SysExecutor,
-  WorkspaceExecutor
+  WorkspaceExecutor,
+  execEmoji
 };

package/esm/src/index.js

@@ -15,3 +15,4 @@ export * from "./extractDeps";
 export * from "./commandDecorators";
 export * from "./aiEditor";
 export * from "./builder";
+export * from "./spinner";

package/esm/src/spinner.js

@@ -0,0 +1,38 @@
+import ora from "ora";
+class Spinner {
+  spinner;
+  stopWatch;
+  startAt;
+  message;
+  constructor(message, { prefix = "", indent = 0 } = {}) {
+    this.message = message;
+    this.spinner = ora(message);
+    this.spinner.prefixText = prefix;
+    this.spinner.indent = indent;
+  }
+  start() {
+    this.startAt = /* @__PURE__ */ new Date();
+    const spinner = this.spinner.start();
+    this.stopWatch = setInterval(() => {
+      spinner.text = `${this.message} (${this.#getElapsedTimeStr()})`;
+    }, 1e3);
+    return this;
+  }
+  succeed(message) {
+    clearInterval(this.stopWatch);
+    this.spinner.succeed(`${message} (${this.#getElapsedTimeStr()})`);
+  }
+  #getElapsedTimeStr() {
+    const ms = (/* @__PURE__ */ new Date()).getTime() - this.startAt.getTime();
+    if (ms < 1e3)
+      return `${ms}ms`;
+    const s = Math.floor(ms / 1e3);
+    if (s < 60)
+      return `${s}s`;
+    const m = Math.floor(s / 60);
+    return `${m}m ${s % 60}s`;
+  }
+}
+export {
+  Spinner
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.136",
+  "version": "0.0.138",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/executors.d.ts

@@ -1,12 +1,22 @@
 import { Logger } from "@akanjs/common";
 import { type AppConfigResult, AppScanResult, type LibConfigResult, LibScanResult, PkgScanResult, WorkspaceScanResult } from "@akanjs/config";
 import { type ExecOptions, type ForkOptions, type SpawnOptions } from "child_process";
+import { Spinner } from "./spinner";
 import type { PackageJson, TsConfigJson } from "./types";
+export declare const execEmoji: {
+    workspace: string;
+    app: string;
+    lib: string;
+    pkg: string;
+    dist: string;
+    default: string;
+};
 export declare class Executor {
     #private;
     name: string;
     logger: Logger;
     cwdPath: string;
+    emoji: string;
     constructor(name: string, cwdPath: string);
     exec(command: string, options?: ExecOptions): Promise<unknown>;
     spawn(command: string, args?: string[], options?: SpawnOptions): Promise<{
@@ -29,6 +39,10 @@ export declare class Executor {
     cp(srcPath: string, destPath: string): Promise<void>;
     log(msg: string): this;
     verbose(msg: string): this;
+    spinning(msg: string, { prefix, indent }?: {
+        prefix?: string | undefined;
+        indent?: number | undefined;
+    }): Spinner;
     getTsConfig(pathname?: string): TsConfigJson;
     applyTemplate({ basePath, template, scanResult, dict, overwrite, }: {
         basePath: string;
@@ -48,6 +62,7 @@ export declare class WorkspaceExecutor extends Executor {
     #private;
     workspaceRoot: string;
     repoName: string;
+    emoji: string;
     constructor({ workspaceRoot, repoName }: ExecutorOptions);
     static fromRoot(): WorkspaceExecutor;
     getBaseDevEnv(): {
@@ -86,6 +101,7 @@ export declare class SysExecutor extends Executor {
     workspace: WorkspaceExecutor;
     name: string;
     type: "app" | "lib";
+    emoji: string;
     constructor({ workspace, name, type }: SysExecutorOptions);
     getConfig(command?: string): Promise<LibConfigResult>;
     getModules(): Promise<string[]>;
@@ -133,6 +149,7 @@ interface AppExecutorOptions {
 }
 export declare class AppExecutor extends SysExecutor {
     dist: Executor;
+    emoji: string;
     constructor({ workspace, name }: AppExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): AppExecutor;
     getConfig(command?: string): Promise<AppConfigResult>;
@@ -146,6 +163,7 @@ export declare class LibExecutor extends SysExecutor {
     workspaceRoot: string;
     repoName: string;
     dist: Executor;
+    emoji: string;
     constructor({ workspace, name }: LibExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): LibExecutor;
     getConfig(command?: string): Promise<LibConfigResult>;
@@ -158,6 +176,7 @@ export declare class PkgExecutor extends Executor {
     workspace: WorkspaceExecutor;
     name: string;
     dist: Executor;
+    emoji: string;
     constructor({ workspace, name }: PkgExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): PkgExecutor;
     scan({ packageJson, tsconfig, }?: {

package/src/index.d.ts

@@ -15,3 +15,4 @@ export * from "./extractDeps";
 export * from "./commandDecorators";
 export * from "./aiEditor";
 export * from "./builder";
+export * from "./spinner";

package/src/spinner.d.ts

@@ -0,0 +1,14 @@
+import ora from "ora";
+export declare class Spinner {
+    #private;
+    spinner: ora.Ora;
+    stopWatch: NodeJS.Timeout;
+    startAt: Date;
+    message: string;
+    constructor(message: string, { prefix, indent }?: {
+        prefix?: string | undefined;
+        indent?: number | undefined;
+    });
+    start(): this;
+    succeed(message: string): void;
+}