@cabloy/cli 3.0.56 → 3.0.59

package/dist/lib/cli.d.ts

@@ -39,4 +39,5 @@ export declare class CliCommand extends BaseCommand {
         group: any;
         context: any;
     }): any;
+    _prepareArgv(argv: any): any;
 }

package/dist/lib/cli.js

@@ -12,9 +12,9 @@ export class CliCommand extends BaseCommand {
     __argv;
     constructor(rawArgv, { meta, argv }) {
         super(rawArgv);
-        this.usage = meta.info.usage;
+        // this.usage = meta.info.usage; // readonly
+        // this.options = meta.options; // readonly
         this.version = meta.info.version;
-        this.options = meta.options;
         this.__meta = meta;
         this.__groups = meta.groups;
         this.__argv = argv;
@@ -22,8 +22,7 @@ export class CliCommand extends BaseCommand {
     async run(options) {
         let { argv, cwd, env, rawArgv } = options;
         // argv
-        argv = Object.assign({}, argv, this.__argv);
-        delete argv.$0;
+        argv = this._prepareArgv(argv);
         // context
         const context = {
             brandName: process.env.CabloyCliBrandName,
@@ -200,4 +199,19 @@ export class CliCommand extends BaseCommand {
             return true;
         return evaluate(expression, { group, context });
     }
+    _prepareArgv(argv) {
+        argv = Object.assign({}, argv, this.__argv);
+        delete argv.$0;
+        // alias
+        const options = this.__meta.options;
+        if (options) {
+            for (const key in options) {
+                const option = options[key];
+                if (option.alias && argv[key] === undefined) {
+                    argv[key] = argv[option.alias];
+                }
+            }
+        }
+        return argv;
+    }
 }

package/dist/registry.js

@@ -6,7 +6,7 @@ export async function getRegistry() {
         const npmConfig = new NPMConfig(Object.assign({ npmPath: '' }, npmDefinitions));
         await npmConfig.load();
         __registry = npmConfig.get('registry') || 'https://registry.npmjs.org/';
-        if (__registry.charAt(__registry.length - 1) !== '/') {
+        if (!__registry.endsWith('/')) {
             __registry = `${__registry}/`;
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
   "type": "module",
-  "version": "3.0.56",
+  "version": "3.0.59",
   "description": "@cabloy/cli",
   "publishConfig": {
     "access": "public"
@@ -32,7 +32,7 @@
     "@cabloy/process-helper": "^2.0.21",
     "@cabloy/utils": "^1.0.47",
     "@cabloy/word-utils": "^2.0.1",
-    "@npmcli/config": "^8.3.4",
+    "@npmcli/config": "^10.4.2",
     "@zhennann/common-bin": "^4.0.0",
     "@zhennann/ejs": "^3.0.1",
     "boxen": "^4.2.0",