@akanjs/devkit 0.0.125 → 0.0.126

package/cjs/src/commandDecorators/argMeta.js

@@ -18,6 +18,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var argMeta_exports = {};
 __export(argMeta_exports, {
   App: () => App,
+  Exec: () => Exec,
   Lib: () => Lib,
   Option: () => Option,
   Pkg: () => Pkg,
@@ -30,7 +31,7 @@ __export(argMeta_exports, {
 module.exports = __toCommonJS(argMeta_exports);
 var import_reflect_metadata = require("reflect-metadata");
 const argTypes = ["Option"];
-const internalArgTypes = ["Workspace", "App", "Lib", "Sys", "Pkg"];
+const internalArgTypes = ["Workspace", "App", "Lib", "Sys", "Pkg", "Exec"];
 const getArgMetas = (command, key) => {
   const allArgMetas = getArgMetasOnPrototype(command.prototype, key);
   const argMetas = allArgMetas.filter((argMeta) => argMeta.type === "Option");
@@ -63,11 +64,13 @@ const createArgMetaDecorator = (type) => {
 const App = createArgMetaDecorator("App");
 const Lib = createArgMetaDecorator("Lib");
 const Sys = createArgMetaDecorator("Sys");
+const Exec = createArgMetaDecorator("Exec");
 const Pkg = createArgMetaDecorator("Pkg");
 const Workspace = createArgMetaDecorator("Workspace");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   App,
+  Exec,
   Lib,
   Option,
   Pkg,

package/cjs/src/commandDecorators/command.js

@@ -95,7 +95,7 @@ const getArgumentValue = async (argMeta, value, workspace) => {
   if (argMeta.type === "Workspace")
     return workspace;
   const sysType = argMeta.type.toLowerCase();
-  const [appNames, libNames] = await workspace.getSyss();
+  const [appNames, libNames, pkgNames] = await workspace.getExecs();
   if (sysType === "sys") {
     if (value && appNames.includes(value))
       return import_executors.AppExecutor.from(workspace, value);
@@ -113,6 +113,27 @@ const getArgumentValue = async (argMeta, value, workspace) => {
       else
         throw new Error(`Invalid system name: ${sysName}`);
     }
+  } else if (sysType === "exec") {
+    if (value && appNames.includes(value))
+      return import_executors.AppExecutor.from(workspace, value);
+    else if (value && libNames.includes(value))
+      return import_executors.LibExecutor.from(workspace, value);
+    else if (value && pkgNames.includes(value))
+      return import_executors.PkgExecutor.from(workspace, value);
+    else {
+      const execName = await (0, import_prompts.select)({
+        message: `Select the App or Lib or Pkg name`,
+        choices: [...appNames, ...libNames, ...pkgNames]
+      });
+      if (appNames.includes(execName))
+        return import_executors.AppExecutor.from(workspace, execName);
+      else if (libNames.includes(execName))
+        return import_executors.LibExecutor.from(workspace, execName);
+      else if (pkgNames.includes(execName))
+        return import_executors.PkgExecutor.from(workspace, execName);
+      else
+        throw new Error(`Invalid system name: ${execName}`);
+    }
   } else if (sysType === "app") {
     if (value && appNames.includes(value))
       return import_executors.AppExecutor.from(workspace, value);

package/cjs/src/executors.js

@@ -326,6 +326,10 @@ class WorkspaceExecutor extends Executor {
   async getPkgs() {
     return await this.#getDirHasFile(`${this.workspaceRoot}/pkgs`, "package.json");
   }
+  async getExecs() {
+    const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
+    return [appNames, libNames, pkgNames];
+  }
   setTsPaths(type, name) {
     const rootTsConfig = this.readJson("tsconfig.json");
     if (type === "lib")

package/esm/src/commandDecorators/argMeta.js

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 const argTypes = ["Option"];
-const internalArgTypes = ["Workspace", "App", "Lib", "Sys", "Pkg"];
+const internalArgTypes = ["Workspace", "App", "Lib", "Sys", "Pkg", "Exec"];
 const getArgMetas = (command, key) => {
   const allArgMetas = getArgMetasOnPrototype(command.prototype, key);
   const argMetas = allArgMetas.filter((argMeta) => argMeta.type === "Option");
@@ -33,10 +33,12 @@ const createArgMetaDecorator = (type) => {
 const App = createArgMetaDecorator("App");
 const Lib = createArgMetaDecorator("Lib");
 const Sys = createArgMetaDecorator("Sys");
+const Exec = createArgMetaDecorator("Exec");
 const Pkg = createArgMetaDecorator("Pkg");
 const Workspace = createArgMetaDecorator("Workspace");
 export {
   App,
+  Exec,
   Lib,
   Option,
   Pkg,

package/esm/src/commandDecorators/command.js

@@ -63,7 +63,7 @@ const getArgumentValue = async (argMeta, value, workspace) => {
   if (argMeta.type === "Workspace")
     return workspace;
   const sysType = argMeta.type.toLowerCase();
-  const [appNames, libNames] = await workspace.getSyss();
+  const [appNames, libNames, pkgNames] = await workspace.getExecs();
   if (sysType === "sys") {
     if (value && appNames.includes(value))
       return AppExecutor.from(workspace, value);
@@ -81,6 +81,27 @@ const getArgumentValue = async (argMeta, value, workspace) => {
       else
         throw new Error(`Invalid system name: ${sysName}`);
     }
+  } else if (sysType === "exec") {
+    if (value && appNames.includes(value))
+      return AppExecutor.from(workspace, value);
+    else if (value && libNames.includes(value))
+      return LibExecutor.from(workspace, value);
+    else if (value && pkgNames.includes(value))
+      return PkgExecutor.from(workspace, value);
+    else {
+      const execName = await select({
+        message: `Select the App or Lib or Pkg name`,
+        choices: [...appNames, ...libNames, ...pkgNames]
+      });
+      if (appNames.includes(execName))
+        return AppExecutor.from(workspace, execName);
+      else if (libNames.includes(execName))
+        return LibExecutor.from(workspace, execName);
+      else if (pkgNames.includes(execName))
+        return PkgExecutor.from(workspace, execName);
+      else
+        throw new Error(`Invalid system name: ${execName}`);
+    }
   } else if (sysType === "app") {
     if (value && appNames.includes(value))
       return AppExecutor.from(workspace, value);

package/esm/src/executors.js

@@ -293,6 +293,10 @@ class WorkspaceExecutor extends Executor {
   async getPkgs() {
     return await this.#getDirHasFile(`${this.workspaceRoot}/pkgs`, "package.json");
   }
+  async getExecs() {
+    const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
+    return [appNames, libNames, pkgNames];
+  }
   setTsPaths(type, name) {
     const rootTsConfig = this.readJson("tsconfig.json");
     if (type === "lib")

package/package.json

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

package/src/commandDecorators/argMeta.d.ts

@@ -1,9 +1,9 @@
 import "reflect-metadata";
-import type { AppExecutor, LibExecutor, PkgExecutor, SysExecutor, WorkspaceExecutor } from "../executors";
+import type { AppExecutor, Executor, LibExecutor, PkgExecutor, SysExecutor, WorkspaceExecutor } from "../executors";
 import type { Type } from "./types";
 export declare const argTypes: readonly ["Option"];
 export type ArgType = (typeof argTypes)[number];
-export declare const internalArgTypes: readonly ["Workspace", "App", "Lib", "Sys", "Pkg"];
+export declare const internalArgTypes: readonly ["Workspace", "App", "Lib", "Sys", "Pkg", "Exec"];
 export type InternalArgType = (typeof internalArgTypes)[number];
 interface ArgsOption {
     type?: "string" | "number" | "boolean";
@@ -44,6 +44,10 @@ export declare const Sys: (option?: {
     nullable?: boolean;
 }) => (prototype: object, key: string, idx: number) => void;
 export type Sys = SysExecutor;
+export declare const Exec: (option?: {
+    nullable?: boolean;
+}) => (prototype: object, key: string, idx: number) => void;
+export type Exec = Executor;
 export declare const Pkg: (option?: {
     nullable?: boolean;
 }) => (prototype: object, key: string, idx: number) => void;

package/src/executors.d.ts

@@ -60,6 +60,7 @@ export declare class WorkspaceExecutor extends Executor {
     getLibs(): Promise<string[]>;
     getSyss(): Promise<[string[], string[]]>;
     getPkgs(): Promise<string[]>;
+    getExecs(): Promise<[string[], string[], string[]]>;
     setTsPaths(type: "app" | "lib", name: string): this;
     getDirInModule(basePath: string, name: string): Promise<string[]>;
     commit(message: string, { init, add }?: {