1.4.1

Author: Elschnagoo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/easy-cli",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Cli lib to perform common tasks",
   "main": "dist/index.js",
   "module": "dist/index.js",

src/class/ShellComand.ts

@@ -1,7 +1,13 @@
 import Path from 'path';
 import fs from 'fs';
 import { CoreLogChannel, CoreLogger } from '@grandlinex/core';
-import { CmdProperty, IArgs, IHandler, ParamTypeRaw } from '../lib/types.js';
+import {
+  CmdProperty,
+  IArgs,
+  IHandler,
+  ParamTypeRaw,
+  StricktOption,
+} from '../lib/types.js';
 import ArgUtil from '../utils/ArgUtil.js';
 
 export type ShellCommandParentProps = {
@@ -52,7 +58,11 @@ export abstract class ShellCommand<T = any> extends CoreLogChannel {
       if (required && ArgUtil.checkParameterType(args, key) === null) {
         throw this.lError(`Parameter --${key} is not set but required`);
       }
-      if (options && p !== undefined && !options.find((o) => o.key === p)) {
+      if (
+        options &&
+        p !== undefined &&
+        !(await StricktOption(options, this.handler)).find((o) => o.key === p)
+      ) {
         throw this.lError(`Parameter --${key} has invalid option ${p}`);
       }
     }

src/commands/base/HelpAction.ts

@@ -3,6 +3,7 @@ import {
   ShellCommandParentProps,
 } from '../../class/ShellComand.js';
 import getVersion from '../../utils/Version.js';
+import { StricktOption } from '../../lib/types.js';
 
 export default class HelpAction extends ShellCommand {
   constructor(props: ShellCommandParentProps) {
@@ -24,41 +25,45 @@ export default class HelpAction extends ShellCommand {
     return '  '.repeat(n);
   }
 
-  private inspectCmd(c: ShellCommand): void {
+  private async inspectCmd(c: ShellCommand) {
     this.info(`${this.space(c.level + 1)}${c.name}: ${c.description}`);
-    c.properties.forEach(({ key, type, required, description, options }) => {
-      let t;
-      switch (type) {
-        case 'string':
-          if (!options) {
-            t = `<${type}>`;
-          } else {
-            t = `<option>`;
+    await Promise.all(
+      c.properties.map(
+        async ({ key, type, required, description, options }) => {
+          let t;
+          switch (type) {
+            case 'string':
+              if (!options) {
+                t = `<${type}>`;
+              } else {
+                t = `<option>`;
+              }
+              break;
+            case 'null':
+              t = '';
+              break;
+            default:
+              t = `<${type}>`;
           }
-          break;
-        case 'null':
-          t = '';
-          break;
-        default:
-          t = `<${type}>`;
-      }
-      this.info(
-        `${this.space(c.level + 2)}--${key} ${t} ${
-          required ? '(required)' : '(optional)'
-        } ${description ? `: ${description}` : ''}`,
-      );
-      if (options) {
-        this.info(`${this.space(c.level + 3)} Options:`);
-        options.forEach((o) => {
           this.info(
-            `${this.space(c.level + 4)}${o.key}${
-              o.description ? ` : ${o.description}` : ''
-            }`,
+            `${this.space(c.level + 2)}--${key} ${t} ${
+              required ? '(required)' : '(optional)'
+            } ${description ? `: ${description}` : ''}`,
           );
-        });
-      }
-    });
-    c.subCommands.forEach((cmd) => this.inspectCmd(cmd));
+          if (options) {
+            this.info(`${this.space(c.level + 3)} Options:`);
+            (await StricktOption(options, this.handler)).forEach((o) => {
+              this.info(
+                `${this.space(c.level + 4)}${o.key}${
+                  o.description ? ` : ${o.description}` : ''
+                }`,
+              );
+            });
+          }
+        },
+      ),
+    );
+    await Promise.all(c.subCommands.map((cmd) => this.inspectCmd(cmd)));
     if (c.level === 0) this.info('---------------------------------');
   }
 
@@ -69,7 +74,9 @@ export default class HelpAction extends ShellCommand {
       `Usage: ${this.handler.getCmdName()} <command> [...<sub-command>]  [options]`,
     );
     this.info('---------------------------------');
-    this.handler.getCmds(true).forEach((c) => this.inspectCmd(c));
+    await Promise.all(
+      this.handler.getCmds(true).map((c) => this.inspectCmd(c)),
+    );
     return true;
   }
 }

src/commands/base/InteractiveAction.ts

@@ -13,6 +13,7 @@ import {
   getStringOrUndefined,
   ParamTypeRaw,
   PathCMDProp,
+  StricktOption,
 } from '../../lib/types.js';
 
 export default class InteractiveAction extends ShellCommand {
@@ -195,18 +196,22 @@ export default class InteractiveAction extends ShellCommand {
               }
             } else {
               options[prop.key] = await validation({
-                promise: () =>
-                  select({
+                promise: async () => {
+                  const option = prop.options
+                    ? await StricktOption(prop.options, this.handler)
+                    : undefined;
+                  return select({
                     message: prop.description ?? prop.key,
                     default: getStringOrUndefined(prop.default),
                     choices:
-                      prop.options?.map((o) => ({
+                      option?.map((o) => ({
                         name: `${o.key} - ${o.description}`,
                         value: o.key,
                         disabled: false,
                       })) ?? [],
                     pageSize: this.handler.getPageSize(),
-                  }),
+                  });
+                },
                 validate: prop.validate,
               });
             }

src/lib/types.ts

@@ -74,6 +74,19 @@ export interface IArgs {
   getParameterNull(key: string): boolean;
 }
 
+export type BaseCMDOptionEl = {
+  key: ParamTypeRaw;
+  description?: string;
+};
+export type BaseCMDOption =
+  | ((handler: IHandler) => Promise<BaseCMDOptionEl[]>)
+  | BaseCMDOptionEl[];
+export async function StricktOption(option: BaseCMDOption, handler: IHandler) {
+  if (typeof option === 'function') {
+    return option(handler);
+  }
+  return option;
+}
 export type BaseCMDProperty = {
   /**
    * The key of the parameter
@@ -99,10 +112,7 @@ export type BaseCMDProperty = {
   /**
    * The options of the parameter
    */
-  options?: {
-    key: ParamTypeRaw;
-    description?: string;
-  }[];
+  options?: BaseCMDOption;
 };
 export type SimpleCMDProp = BaseCMDProperty & {
   type: 'boolean' | 'null';