@akanjs/devkit 0.0.91 → 0.0.93

package/README.md

@@ -0,0 +1,11 @@
+# akan
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build akan` to build the library.
+
+## Running unit tests
+
+Run `nx test akan` to execute the unit tests via [Jest](https://jestjs.io).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -23,6 +23,8 @@
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
     "dotenv": "^16.4.7",
+    "esbuild": "^0.19.2",
+    "esbuild-plugin-d.ts": "^1.3.1",
     "form-data": "^4.0.1",
     "js-yaml": "^4.1.0",
     "ora": "^3.4.0",
@@ -35,5 +37,8 @@
       "require": "./index.js",
       "import": "./index.mjs"
     }
+  },
+  "esbuild": {
+    "platform": "node"
   }
 }

package/src/builder.d.ts

@@ -0,0 +1,18 @@
+import { Executor } from "./executors";
+import { PackageJson } from "./types";
+interface BuildOptions {
+    bundle?: boolean;
+    additionalEntryPoints?: string[];
+}
+interface BuilderOptions {
+    executor: Executor;
+    distExecutor: Executor;
+    pkgJson: PackageJson;
+    rootPackageJson: PackageJson;
+}
+export declare class Builder {
+    #private;
+    constructor({ executor, distExecutor, pkgJson, rootPackageJson }: BuilderOptions);
+    build(options?: BuildOptions): Promise<void>;
+}
+export {};

package/src/builder.js

@@ -0,0 +1,110 @@
+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 builder_exports = {};
+__export(builder_exports, {
+  Builder: () => Builder
+});
+module.exports = __toCommonJS(builder_exports);
+var esbuild = __toESM(require("esbuild"));
+var import_esbuild_plugin_d = require("esbuild-plugin-d.ts");
+var import_fs = __toESM(require("fs"));
+var import_extractDeps = require("./extractDeps");
+class Builder {
+  #executor;
+  #distExecutor;
+  #pkgJson;
+  #rootPackageJson;
+  constructor({ executor, distExecutor, pkgJson, rootPackageJson }) {
+    this.#executor = executor;
+    this.#distExecutor = distExecutor;
+    this.#pkgJson = pkgJson;
+    this.#rootPackageJson = rootPackageJson;
+  }
+  #getBuildOptions(format, { bundle = false, additionalEntryPoints = [] } = {}) {
+    return {
+      entryPoints: [
+        ...bundle ? [`${this.#executor.cwdPath}/index.ts`] : [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
+        ...additionalEntryPoints
+      ],
+      bundle,
+      packages: "external",
+      splitting: false,
+      platform: this.#pkgJson.esbuild?.platform,
+      format,
+      outdir: this.#distExecutor.cwdPath,
+      outExtension: format === "cjs" ? { ".js": this.#pkgJson.type === "module" ? ".cjs" : ".js" } : { ".js": this.#pkgJson.type === "module" ? ".js" : ".mjs" },
+      logLevel: "error"
+    };
+  }
+  #getAssetBuildOptions() {
+    return {
+      write: true,
+      bundle: false,
+      entryPoints: [
+        `${this.#executor.cwdPath}/**/*.css`,
+        `${this.#executor.cwdPath}/**/*.md`,
+        `${this.#executor.cwdPath}/**/*.template`,
+        `${this.#executor.cwdPath}/**/*.js`
+      ],
+      outdir: this.#distExecutor.cwdPath,
+      logLevel: "error",
+      loader: { ".css": "copy", ".md": "copy", ".template": "copy", ".js": "copy" }
+    };
+  }
+  async build(options = {}) {
+    if (import_fs.default.existsSync(this.#distExecutor.cwdPath))
+      await this.#distExecutor.exec(`rm -rf ${this.#distExecutor.cwdPath}`);
+    const plugins = [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${this.#executor.cwdPath}/tsconfig.json` })];
+    const [buildResult] = await Promise.all([
+      esbuild.build({ ...this.#getBuildOptions("cjs", options), write: false, plugins }),
+      esbuild.build({ write: true, ...this.#getBuildOptions("esm", options) }),
+      esbuild.build({ ...this.#getAssetBuildOptions() })
+    ]);
+    const existingDeps = Object.keys(this.#pkgJson.dependencies ?? {});
+    const dependencies = (0, import_extractDeps.extractDependencies)(buildResult.outputFiles, this.#rootPackageJson, existingDeps);
+    const pkgPackageJson = {
+      ...this.#pkgJson,
+      main: "./index.js",
+      engines: { node: ">=22" },
+      dependencies,
+      exports: {
+        ".": {
+          require: this.#pkgJson.type === "module" ? "./index.cjs" : "./index.js",
+          import: this.#pkgJson.type === "module" ? "./index.js" : "./index.mjs"
+        },
+        ...this.#pkgJson.exports ?? {}
+      }
+    };
+    buildResult.outputFiles.map((file) => this.#distExecutor.writeFile(file.path, file.text));
+    this.#distExecutor.writeJson("package.json", pkgPackageJson);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Builder
+});

package/src/builder.mjs

@@ -0,0 +1,77 @@
+import * as esbuild from "esbuild";
+import { dtsPlugin } from "esbuild-plugin-d.ts";
+import fs from "fs";
+import { extractDependencies } from "./extractDeps";
+class Builder {
+  #executor;
+  #distExecutor;
+  #pkgJson;
+  #rootPackageJson;
+  constructor({ executor, distExecutor, pkgJson, rootPackageJson }) {
+    this.#executor = executor;
+    this.#distExecutor = distExecutor;
+    this.#pkgJson = pkgJson;
+    this.#rootPackageJson = rootPackageJson;
+  }
+  #getBuildOptions(format, { bundle = false, additionalEntryPoints = [] } = {}) {
+    return {
+      entryPoints: [
+        ...bundle ? [`${this.#executor.cwdPath}/index.ts`] : [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
+        ...additionalEntryPoints
+      ],
+      bundle,
+      packages: "external",
+      splitting: false,
+      platform: this.#pkgJson.esbuild?.platform,
+      format,
+      outdir: this.#distExecutor.cwdPath,
+      outExtension: format === "cjs" ? { ".js": this.#pkgJson.type === "module" ? ".cjs" : ".js" } : { ".js": this.#pkgJson.type === "module" ? ".js" : ".mjs" },
+      logLevel: "error"
+    };
+  }
+  #getAssetBuildOptions() {
+    return {
+      write: true,
+      bundle: false,
+      entryPoints: [
+        `${this.#executor.cwdPath}/**/*.css`,
+        `${this.#executor.cwdPath}/**/*.md`,
+        `${this.#executor.cwdPath}/**/*.template`,
+        `${this.#executor.cwdPath}/**/*.js`
+      ],
+      outdir: this.#distExecutor.cwdPath,
+      logLevel: "error",
+      loader: { ".css": "copy", ".md": "copy", ".template": "copy", ".js": "copy" }
+    };
+  }
+  async build(options = {}) {
+    if (fs.existsSync(this.#distExecutor.cwdPath))
+      await this.#distExecutor.exec(`rm -rf ${this.#distExecutor.cwdPath}`);
+    const plugins = [dtsPlugin({ tsconfig: `${this.#executor.cwdPath}/tsconfig.json` })];
+    const [buildResult] = await Promise.all([
+      esbuild.build({ ...this.#getBuildOptions("cjs", options), write: false, plugins }),
+      esbuild.build({ write: true, ...this.#getBuildOptions("esm", options) }),
+      esbuild.build({ ...this.#getAssetBuildOptions() })
+    ]);
+    const existingDeps = Object.keys(this.#pkgJson.dependencies ?? {});
+    const dependencies = extractDependencies(buildResult.outputFiles, this.#rootPackageJson, existingDeps);
+    const pkgPackageJson = {
+      ...this.#pkgJson,
+      main: "./index.js",
+      engines: { node: ">=22" },
+      dependencies,
+      exports: {
+        ".": {
+          require: this.#pkgJson.type === "module" ? "./index.cjs" : "./index.js",
+          import: this.#pkgJson.type === "module" ? "./index.js" : "./index.mjs"
+        },
+        ...this.#pkgJson.exports ?? {}
+      }
+    };
+    buildResult.outputFiles.map((file) => this.#distExecutor.writeFile(file.path, file.text));
+    this.#distExecutor.writeJson("package.json", pkgPackageJson);
+  }
+}
+export {
+  Builder
+};

package/src/commandDecorators/command.js

@@ -30,7 +30,9 @@ __export(command_exports, {
   runCommands: () => runCommands
 });
 module.exports = __toCommonJS(command_exports);
+var import_common = require("@akanjs/common");
 var import_prompts = require("@inquirer/prompts");
+var import_chalk = __toESM(require("chalk"));
 var import_commander = require("commander");
 var import_fs = __toESM(require("fs"));
 var import_executors = require("../executors");
@@ -48,7 +50,7 @@ const handleOption = (programCommand, argMeta) => {
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase(argMeta.name);
   programCommand.option(
-    `-${flag}, --${kebabName} <${kebabName}>`,
+    `-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`,
     `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.join(", ")})` : ""}`
   );
   return programCommand;
@@ -59,7 +61,7 @@ const convertOptionValue = (value, type) => {
   else if (type === "number")
     return Number(value);
   else
-    return value === "true";
+    return value === true || value === "true";
 };
 const getOptionValue = async (argMeta, opt) => {
   const {
@@ -74,15 +76,15 @@ const getOptionValue = async (argMeta, opt) => {
     return null;
   if (choices) {
     const choice = await (0, import_prompts.select)({
-      message: ask ?? `Select the ${name} value`,
+      message: ask ?? desc ?? `Select the ${name} value`,
       choices: choices.map((choice2) => choice2.toString())
     });
     return choice;
   } else if (type === "boolean") {
-    const message = ask ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
+    const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
     return await (0, import_prompts.confirm)({ message });
   } else {
-    const message = ask ? `${ask}: ` : `Enter the ${name} value${example ? ` (example: ${example})` : ""}: `;
+    const message = ask ? `${ask}: ` : desc ? `${desc}: ` : `Enter the ${name} value${example ? ` (example: ${example})` : ""}: `;
     if (argMeta.argsOption.nullable)
       return await (0, import_prompts.input)({ message });
     else
@@ -170,7 +172,12 @@ const runCommands = async (...commands) => {
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
           }
           const cmd = new command();
-          await cmd[targetMeta.key](...commandArgs);
+          try {
+            await cmd[targetMeta.key](...commandArgs);
+          } catch (e) {
+            const errMsg = e instanceof Error ? e.message : typeof e === "string" ? e : JSON.stringify(e);
+            import_common.Logger.error(`Command Error: ${import_chalk.default.red(errMsg)}`);
+          }
         });
       }
     }

package/src/commandDecorators/command.mjs

@@ -1,4 +1,6 @@
+import { Logger } from "@akanjs/common";
 import { confirm, input, select } from "@inquirer/prompts";
+import chalk from "chalk";
 import { program } from "commander";
 import fs from "fs";
 import { AppExecutor, LibExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
@@ -16,7 +18,7 @@ const handleOption = (programCommand, argMeta) => {
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase(argMeta.name);
   programCommand.option(
-    `-${flag}, --${kebabName} <${kebabName}>`,
+    `-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`,
     `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.join(", ")})` : ""}`
   );
   return programCommand;
@@ -27,7 +29,7 @@ const convertOptionValue = (value, type) => {
   else if (type === "number")
     return Number(value);
   else
-    return value === "true";
+    return value === true || value === "true";
 };
 const getOptionValue = async (argMeta, opt) => {
   const {
@@ -42,15 +44,15 @@ const getOptionValue = async (argMeta, opt) => {
     return null;
   if (choices) {
     const choice = await select({
-      message: ask ?? `Select the ${name} value`,
+      message: ask ?? desc ?? `Select the ${name} value`,
       choices: choices.map((choice2) => choice2.toString())
     });
     return choice;
   } else if (type === "boolean") {
-    const message = ask ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
+    const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
     return await confirm({ message });
   } else {
-    const message = ask ? `${ask}: ` : `Enter the ${name} value${example ? ` (example: ${example})` : ""}: `;
+    const message = ask ? `${ask}: ` : desc ? `${desc}: ` : `Enter the ${name} value${example ? ` (example: ${example})` : ""}: `;
     if (argMeta.argsOption.nullable)
       return await input({ message });
     else
@@ -138,7 +140,12 @@ const runCommands = async (...commands) => {
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
           }
           const cmd = new command();
-          await cmd[targetMeta.key](...commandArgs);
+          try {
+            await cmd[targetMeta.key](...commandArgs);
+          } catch (e) {
+            const errMsg = e instanceof Error ? e.message : typeof e === "string" ? e : JSON.stringify(e);
+            Logger.error(`Command Error: ${chalk.red(errMsg)}`);
+          }
         });
       }
     }

package/src/executors.d.ts

@@ -52,7 +52,7 @@ export declare class WorkspaceExecutor extends Executor {
     getBaseDevEnv(): {
         repoName: string;
         serveDomain: string;
-        env: "debug" | "testing" | "develop" | "main";
+        env: "testing" | "local" | "debug" | "develop" | "main";
         name?: string | undefined;
     };
     scan(): Promise<WorkspaceScanResult>;

package/src/executors.js

@@ -37,6 +37,7 @@ __export(executors_exports, {
 module.exports = __toCommonJS(executors_exports);
 var import_common = require("@akanjs/common");
 var import_config = require("@akanjs/config");
+var import_chalk = __toESM(require("chalk"));
 var import_child_process = require("child_process");
 var import_dotenv = __toESM(require("dotenv"));
 var import_fs = __toESM(require("fs"));
@@ -58,7 +59,7 @@ class Executor {
       import_common.Logger.raw(data.toString());
     });
     proc.stderr?.on("data", (data) => {
-      import_common.Logger.raw(data.toString());
+      import_common.Logger.raw(import_chalk.default.red(data.toString()));
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
@@ -72,7 +73,7 @@ class Executor {
   spawn(command, args = [], options = {}) {
     const proc = (0, import_child_process.spawn)(command, args, { cwd: this.cwdPath, stdio: "inherit", ...options });
     proc.stderr?.on("data", (data) => {
-      import_common.Logger.raw(data.toString());
+      import_common.Logger.raw(import_chalk.default.red(data.toString()));
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
@@ -187,7 +188,7 @@ class Executor {
     overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
-      const getContent = await import(templatePath);
+      const getContent = require(templatePath);
       const result = getContent.default(scanResult ?? null, dict);
       if (result === null)
         return;

package/src/executors.mjs

@@ -4,6 +4,7 @@ import {
   getDefaultFileScan,
   getLibConfig
 } from "@akanjs/config";
+import chalk from "chalk";
 import { exec, fork, spawn } from "child_process";
 import dotenv from "dotenv";
 import fs from "fs";
@@ -25,7 +26,7 @@ class Executor {
       Logger.raw(data.toString());
     });
     proc.stderr?.on("data", (data) => {
-      Logger.raw(data.toString());
+      Logger.raw(chalk.red(data.toString()));
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
@@ -39,7 +40,7 @@ class Executor {
   spawn(command, args = [], options = {}) {
     const proc = spawn(command, args, { cwd: this.cwdPath, stdio: "inherit", ...options });
     proc.stderr?.on("data", (data) => {
-      Logger.raw(data.toString());
+      Logger.raw(chalk.red(data.toString()));
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
@@ -154,7 +155,7 @@ class Executor {
     overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
-      const getContent = await import(templatePath);
+      const getContent = require(templatePath);
       const result = getContent.default(scanResult ?? null, dict);
       if (result === null)
         return;

package/src/extractDeps.d.ts

@@ -1,5 +1,6 @@
 import type { PackageJson } from "./types";
 export declare const extractDependencies: (filepaths: {
+    path: string;
     text: string;
 }[], pacakgeJson: PackageJson, defaultDependencies?: string[]) => {
     [k: string]: string;

package/src/extractDeps.js

@@ -75,7 +75,7 @@ const extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) =
     ...pacakgeJson.devDependencies ?? {}
   };
   const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
-  for (const { text } of filepaths) {
+  for (const { text } of filepaths.filter(({ path }) => path.endsWith(".js"))) {
     let requireMatch;
     while ((requireMatch = requireRegex.exec(text)) !== null) {
       const moduleName = requireMatch[1];

package/src/extractDeps.mjs

@@ -53,7 +53,7 @@ const extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) =
     ...pacakgeJson.devDependencies ?? {}
   };
   const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
-  for (const { text } of filepaths) {
+  for (const { text } of filepaths.filter(({ path }) => path.endsWith(".js"))) {
     let requireMatch;
     while ((requireMatch = requireRegex.exec(text)) !== null) {
       const moduleName = requireMatch[1];

package/src/index.d.ts

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

package/src/index.js

@@ -30,6 +30,7 @@ __reExport(src_exports, require("./capacitorApp"), module.exports);
 __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);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./createTunnel"),
@@ -47,5 +48,6 @@ __reExport(src_exports, require("./aiEditor"), module.exports);
   ...require("./capacitorApp"),
   ...require("./extractDeps"),
   ...require("./commandDecorators"),
-  ...require("./aiEditor")
+  ...require("./aiEditor"),
+  ...require("./builder")
 });

package/src/index.mjs

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

package/src/types.d.ts

@@ -10,6 +10,9 @@ export interface PackageJson {
     peerDependencies?: Record<string, string>;
     engines?: Record<string, string>;
     exports?: Record<string, Record<string, string>>;
+    esbuild?: {
+        platform?: "node" | "browser" | "neutral";
+    };
 }
 export interface TsConfigJson {
     extends?: string;