@akanjs/devkit 0.9.10 → 0.9.12

package/cjs/src/commandDecorators/command.js

@@ -35,9 +35,11 @@ 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__ = require("..");
 var import_executors = require("../executors");
 var import_argMeta = require("./argMeta");
 var import_targetMeta = require("./targetMeta");
+const import_meta = {};
 const camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
 const handleOption = (programCommand, argMeta) => {
   const {
@@ -213,6 +215,7 @@ const runCommands = async (...commands) => {
   process.on("unhandledRejection", (error) => {
     process.exit(1);
   });
+  const __dirname = (0, import__.getDirname)(import_meta.url);
   const hasPackageJson = import_fs.default.existsSync(`${__dirname}/../package.json`);
   const version = hasPackageJson ? JSON.parse(import_fs.default.readFileSync(`${__dirname}/../package.json`, "utf8")).version : "0.0.1";
   import_commander.program.version(version).description("Akan CLI");

package/cjs/src/executors.js

@@ -46,9 +46,11 @@ 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_getDirname = require("./getDirname");
 var import_linter = require("./linter");
 var import_spinner = require("./spinner");
 var import_typeChecker = require("./typeChecker");
+const import_meta = {};
 const execEmoji = {
   workspace: "\u{1F3E0}",
   app: "\u{1F680}",
@@ -66,6 +68,7 @@ class Executor {
   }
   name;
   logger;
+  logs;
   cwdPath;
   emoji = execEmoji.default;
   typeChecker = null;
@@ -73,6 +76,7 @@ class Executor {
   constructor(name, cwdPath) {
     this.name = name;
     this.logger = new import_common.Logger(name);
+    this.logs = [];
     this.cwdPath = cwdPath;
     if (!import_fs.default.existsSync(cwdPath))
       import_fs.default.mkdirSync(cwdPath, { recursive: true });
@@ -111,10 +115,12 @@ class Executor {
     let stderr = "";
     proc.stdout?.on("data", (data) => {
       stdout += data;
+      this.logs.push(data);
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
       stderr += data;
+      this.logs.push(data);
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
@@ -126,6 +132,14 @@ class Executor {
       });
     });
   }
+  spawnSync(command, args = [], options = {}) {
+    const proc = (0, import_child_process.spawn)(command, args, {
+      cwd: this.cwdPath,
+      // stdio: "inherit",
+      ...options
+    });
+    return proc;
+  }
   fork(modulePath, args = [], options = {}) {
     const proc = (0, import_child_process.fork)(modulePath, args, {
       cwd: this.cwdPath,
@@ -272,7 +286,7 @@ class Executor {
     overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
-      const getContent = require(templatePath);
+      const getContent = await import(templatePath);
       const result = getContent.default(scanResult ?? null, dict);
       if (result === null)
         return null;
@@ -307,7 +321,7 @@ class Executor {
     dict = {},
     overwrite = true
   }) {
-    const templatePath = `${__dirname}/src/templates${template ? `/${template}` : ""}`;
+    const templatePath = `${(0, import_getDirname.getDirname)(import_meta.url)}/src/templates${template ? `/${template}` : ""}`;
     const prefixTemplatePath = templatePath.endsWith(".tsx") ? templatePath : templatePath.replace(".ts", ".js");
     if (import_fs.default.statSync(prefixTemplatePath).isFile()) {
       const filename = import_path.default.basename(prefixTemplatePath);
@@ -848,28 +862,17 @@ class AppExecutor extends SysExecutor {
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
-    await Promise.all([
-      import_fs.default.existsSync(projectPublicLibPath) && import_promises.default.rm(projectPublicLibPath, { recursive: true }),
-      import_fs.default.existsSync(projectAssetsLibPath) && import_promises.default.rm(projectAssetsLibPath, { recursive: true })
-    ]);
+    if (import_fs.default.existsSync(projectPublicLibPath))
+      await import_promises.default.rm(projectPublicLibPath, { recursive: true });
     const targetDeps = libDeps.filter((dep) => import_fs.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
-    await Promise.all([
-      ...targetDeps.map((dep) => import_promises.default.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
-      ...targetDeps.map((dep) => import_promises.default.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
-    ]);
-    await Promise.all([
-      ...targetDeps.map(
-        (dep) => import_fs.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`) && import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
-          recursive: true
-        })
-      ),
-      ...targetDeps.map(
-        (dep) => import_fs.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`) && import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
+    await Promise.all(targetDeps.map((dep) => import_promises.default.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })));
+    await Promise.all(
+      targetDeps.map(
+        (dep) => import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
           recursive: true
         })
       )
-    ]);
+    );
   }
 }
 class LibExecutor extends SysExecutor {

package/cjs/src/getDirname.js

@@ -0,0 +1,38 @@
+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 getDirname_exports = {};
+__export(getDirname_exports, {
+  getDirname: () => getDirname
+});
+module.exports = __toCommonJS(getDirname_exports);
+var import_path = __toESM(require("path"));
+const getDirname = (url) => import_path.default.dirname(new URL(url).pathname);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDirname
+});

package/cjs/src/index.js

@@ -34,6 +34,8 @@ __reExport(src_exports, require("./builder"), module.exports);
 __reExport(src_exports, require("./spinner"), module.exports);
 __reExport(src_exports, require("./prompter"), module.exports);
 __reExport(src_exports, require("./guideline"), module.exports);
+__reExport(src_exports, require("./getDirname"), module.exports);
+__reExport(src_exports, require("./useStdoutDimensions"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./createTunnel"),
@@ -55,5 +57,7 @@ __reExport(src_exports, require("./guideline"), module.exports);
   ...require("./builder"),
   ...require("./spinner"),
   ...require("./prompter"),
-  ...require("./guideline")
+  ...require("./guideline"),
+  ...require("./getDirname"),
+  ...require("./useStdoutDimensions")
 });

package/cjs/src/prompter.js

@@ -32,18 +32,22 @@ __export(prompter_exports, {
 module.exports = __toCommonJS(prompter_exports);
 var import_prompts = require("@inquirer/prompts");
 var import_promises = __toESM(require("fs/promises"));
+var import_getDirname = require("./getDirname");
+const import_meta = {};
 class Prompter {
   static async selectGuideline() {
-    const guideNames = (await import_promises.default.readdir(`${__dirname}/src/guidelines`)).filter((name) => !name.startsWith("_"));
+    const guideNames = (await import_promises.default.readdir(`${(0, import_getDirname.getDirname)(import_meta.url)}/src/guidelines`)).filter(
+      (name) => !name.startsWith("_")
+    );
     return await (0, import_prompts.select)({ message: "Select a guideline", choices: guideNames.map((name) => ({ name, value: name })) });
   }
   static async getGuideJson(guideName) {
-    const filePath = `${__dirname}/src/guidelines/${guideName}/${guideName}.generate.json`;
+    const filePath = `${(0, import_getDirname.getDirname)(import_meta.url)}/src/guidelines/${guideName}/${guideName}.generate.json`;
     const guideJson = await import_promises.default.readFile(filePath, "utf-8");
     return JSON.parse(guideJson);
   }
   static async getInstruction(guideName) {
-    const filePath = `${__dirname}/src/guidelines/${guideName}/${guideName}.instruction.md`;
+    const filePath = `${(0, import_getDirname.getDirname)(import_meta.url)}/src/guidelines/${guideName}/${guideName}.instruction.md`;
     const content = await import_promises.default.readFile(filePath, "utf-8");
     return content;
   }
@@ -67,7 +71,7 @@ ${request}
 `;
   }
   async getDocumentation(guideName) {
-    const filePath = `${__dirname}/src/guidelines/${guideName}/${guideName}.instruction.md`;
+    const filePath = `${(0, import_getDirname.getDirname)(import_meta.url)}/src/guidelines/${guideName}/${guideName}.instruction.md`;
     const document = await import_promises.default.readFile(filePath, "utf-8");
     return `\`\`\`markdown
 ${document}

package/cjs/src/useStdoutDimensions.js

@@ -0,0 +1,43 @@
+"use client";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var useStdoutDimensions_exports = {};
+__export(useStdoutDimensions_exports, {
+  useStdoutDimensions: () => useStdoutDimensions
+});
+module.exports = __toCommonJS(useStdoutDimensions_exports);
+var import_ink = require("ink");
+var import_react = require("react");
+const useStdoutDimensions = () => {
+  const { stdout } = (0, import_ink.useStdout)();
+  const [dimensions, setDimensions] = (0, import_react.useState)([stdout.columns, stdout.rows]);
+  (0, import_react.useEffect)(() => {
+    const handler = () => {
+      setDimensions([stdout.columns, stdout.rows]);
+    };
+    stdout.on("resize", handler);
+    return () => {
+      stdout.off("resize", handler);
+    };
+  }, [stdout]);
+  return dimensions;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useStdoutDimensions
+});

package/esm/src/commandDecorators/command.js

@@ -3,6 +3,7 @@ import { confirm, input, select } from "@inquirer/prompts";
 import chalk from "chalk";
 import { program } from "commander";
 import fs from "fs";
+import { getDirname } from "..";
 import { AppExecutor, Executor, LibExecutor, ModuleExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
 import { getArgMetas } from "./argMeta";
 import { getTargetMetas } from "./targetMeta";
@@ -181,6 +182,7 @@ const runCommands = async (...commands) => {
   process.on("unhandledRejection", (error) => {
     process.exit(1);
   });
+  const __dirname = getDirname(import.meta.url);
   const hasPackageJson = fs.existsSync(`${__dirname}/../package.json`);
   const version = hasPackageJson ? JSON.parse(fs.readFileSync(`${__dirname}/../package.json`, "utf8")).version : "0.0.1";
   program.version(version).description("Akan CLI");

package/esm/src/executors.js

@@ -11,6 +11,7 @@ import fs from "fs";
 import fsPromise from "fs/promises";
 import path from "path";
 import { TypeScriptDependencyScanner } from "./dependencyScanner";
+import { getDirname } from "./getDirname";
 import { Linter } from "./linter";
 import { Spinner } from "./spinner";
 import { TypeChecker } from "./typeChecker";
@@ -31,6 +32,7 @@ class Executor {
   }
   name;
   logger;
+  logs;
   cwdPath;
   emoji = execEmoji.default;
   typeChecker = null;
@@ -38,6 +40,7 @@ class Executor {
   constructor(name, cwdPath) {
     this.name = name;
     this.logger = new Logger(name);
+    this.logs = [];
     this.cwdPath = cwdPath;
     if (!fs.existsSync(cwdPath))
       fs.mkdirSync(cwdPath, { recursive: true });
@@ -76,10 +79,12 @@ class Executor {
     let stderr = "";
     proc.stdout?.on("data", (data) => {
       stdout += data;
+      this.logs.push(data);
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
       stderr += data;
+      this.logs.push(data);
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
@@ -91,6 +96,14 @@ class Executor {
       });
     });
   }
+  spawnSync(command, args = [], options = {}) {
+    const proc = spawn(command, args, {
+      cwd: this.cwdPath,
+      // stdio: "inherit",
+      ...options
+    });
+    return proc;
+  }
   fork(modulePath, args = [], options = {}) {
     const proc = fork(modulePath, args, {
       cwd: this.cwdPath,
@@ -237,7 +250,7 @@ class Executor {
     overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
-      const getContent = require(templatePath);
+      const getContent = await import(templatePath);
       const result = getContent.default(scanResult ?? null, dict);
       if (result === null)
         return null;
@@ -272,7 +285,7 @@ class Executor {
     dict = {},
     overwrite = true
   }) {
-    const templatePath = `${__dirname}/src/templates${template ? `/${template}` : ""}`;
+    const templatePath = `${getDirname(import.meta.url)}/src/templates${template ? `/${template}` : ""}`;
     const prefixTemplatePath = templatePath.endsWith(".tsx") ? templatePath : templatePath.replace(".ts", ".js");
     if (fs.statSync(prefixTemplatePath).isFile()) {
       const filename = path.basename(prefixTemplatePath);
@@ -813,28 +826,17 @@ class AppExecutor extends SysExecutor {
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
-    await Promise.all([
-      fs.existsSync(projectPublicLibPath) && fsPromise.rm(projectPublicLibPath, { recursive: true }),
-      fs.existsSync(projectAssetsLibPath) && fsPromise.rm(projectAssetsLibPath, { recursive: true })
-    ]);
+    if (fs.existsSync(projectPublicLibPath))
+      await fsPromise.rm(projectPublicLibPath, { recursive: true });
     const targetDeps = libDeps.filter((dep) => fs.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
-    await Promise.all([
-      ...targetDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
-      ...targetDeps.map((dep) => fsPromise.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
-    ]);
-    await Promise.all([
-      ...targetDeps.map(
-        (dep) => fs.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`) && fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
-          recursive: true
-        })
-      ),
-      ...targetDeps.map(
-        (dep) => fs.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`) && fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
+    await Promise.all(targetDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })));
+    await Promise.all(
+      targetDeps.map(
+        (dep) => fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
           recursive: true
         })
       )
-    ]);
+    );
   }
 }
 class LibExecutor extends SysExecutor {

package/esm/src/getDirname.js

@@ -0,0 +1,5 @@
+import path from "path";
+const getDirname = (url) => path.dirname(new URL(url).pathname);
+export {
+  getDirname
+};

package/esm/src/index.js

@@ -18,3 +18,5 @@ export * from "./builder";
 export * from "./spinner";
 export * from "./prompter";
 export * from "./guideline";
+export * from "./getDirname";
+export * from "./useStdoutDimensions";

package/esm/src/prompter.js

@@ -1,17 +1,20 @@
 import { input, select } from "@inquirer/prompts";
 import fsPromise from "fs/promises";
+import { getDirname } from "./getDirname";
 class Prompter {
   static async selectGuideline() {
-    const guideNames = (await fsPromise.readdir(`${__dirname}/src/guidelines`)).filter((name) => !name.startsWith("_"));
+    const guideNames = (await fsPromise.readdir(`${getDirname(import.meta.url)}/src/guidelines`)).filter(
+      (name) => !name.startsWith("_")
+    );
     return await select({ message: "Select a guideline", choices: guideNames.map((name) => ({ name, value: name })) });
   }
   static async getGuideJson(guideName) {
-    const filePath = `${__dirname}/src/guidelines/${guideName}/${guideName}.generate.json`;
+    const filePath = `${getDirname(import.meta.url)}/src/guidelines/${guideName}/${guideName}.generate.json`;
     const guideJson = await fsPromise.readFile(filePath, "utf-8");
     return JSON.parse(guideJson);
   }
   static async getInstruction(guideName) {
-    const filePath = `${__dirname}/src/guidelines/${guideName}/${guideName}.instruction.md`;
+    const filePath = `${getDirname(import.meta.url)}/src/guidelines/${guideName}/${guideName}.instruction.md`;
     const content = await fsPromise.readFile(filePath, "utf-8");
     return content;
   }
@@ -35,7 +38,7 @@ ${request}
 `;
   }
   async getDocumentation(guideName) {
-    const filePath = `${__dirname}/src/guidelines/${guideName}/${guideName}.instruction.md`;
+    const filePath = `${getDirname(import.meta.url)}/src/guidelines/${guideName}/${guideName}.instruction.md`;
     const document = await fsPromise.readFile(filePath, "utf-8");
     return `\`\`\`markdown
 ${document}

package/esm/src/useStdoutDimensions.js

@@ -0,0 +1,20 @@
+"use client";
+import { useStdout } from "ink";
+import { useEffect, useState } from "react";
+const useStdoutDimensions = () => {
+  const { stdout } = useStdout();
+  const [dimensions, setDimensions] = useState([stdout.columns, stdout.rows]);
+  useEffect(() => {
+    const handler = () => {
+      setDimensions([stdout.columns, stdout.rows]);
+    };
+    stdout.on("resize", handler);
+    return () => {
+      stdout.off("resize", handler);
+    };
+  }, [stdout]);
+  return dimensions;
+};
+export {
+  useStdoutDimensions
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"
@@ -28,8 +28,10 @@
     "esbuild-plugin-d.ts": "^1.3.1",
     "eslint": "^9.19.0",
     "form-data": "^4.0.1",
+    "ink": "^5.2.1",
     "js-yaml": "^4.1.0",
     "ora": "^3.4.0",
+    "react": "18.3.1",
     "reflect-metadata": "^0.2.2",
     "tunnel-ssh": "^5.2.0",
     "typescript": "5.8.3"

package/src/executors.d.ts

@@ -1,6 +1,6 @@
 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 { ChildProcess, type ExecOptions, type ForkOptions, type SpawnOptions } from "child_process";
 import { Linter } from "./linter";
 import { Spinner } from "./spinner";
 import { TypeChecker } from "./typeChecker";
@@ -20,6 +20,7 @@ export declare class Executor {
     static setVerbose(verbose: boolean): void;
     name: string;
     logger: Logger;
+    logs: string[];
     cwdPath: string;
     emoji: string;
     typeChecker: TypeChecker | null;
@@ -27,6 +28,7 @@ export declare class Executor {
     constructor(name: string, cwdPath: string);
     exec(command: string, options?: ExecOptions): Promise<unknown>;
     spawn(command: string, args?: string[], options?: SpawnOptions): Promise<string>;
+    spawnSync(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
     fork(modulePath: string, args?: string[], options?: ForkOptions): Promise<unknown>;
     getPath(filePath: string): string;
     mkdir(dirPath: string): this;

package/src/getDirname.d.ts

@@ -0,0 +1 @@
+export declare const getDirname: (url: string) => string;

package/src/index.d.ts

@@ -18,3 +18,5 @@ export * from "./builder";
 export * from "./spinner";
 export * from "./prompter";
 export * from "./guideline";
+export * from "./getDirname";
+export * from "./useStdoutDimensions";

package/src/useStdoutDimensions.d.ts

@@ -0,0 +1 @@
+export declare const useStdoutDimensions: () => [number, number];