@cabloy/cli 3.1.5 → 3.1.7

package/dist/index.js

@@ -12,7 +12,7 @@ import { globby } from 'globby';
 import path from 'node:path';
 import * as ModuleInfo from '@cabloy/module-info';
 import { ProcessHelper } from '@cabloy/process-helper';
-import { combineResourceName, catchError, evaluate } from '@cabloy/utils';
+import { combineResourceName, catchError, isNil, evaluate } from '@cabloy/utils';
 import TableClass from 'cli-table3';
 import gogocode from 'gogocode';
 import { pathToFileURL } from 'node:url';
@@ -1432,7 +1432,7 @@ class CliCommand extends BaseCommand {
     const varsWant = [];
     for (const key in group.questions) {
       const value = argv[key];
-      if (value !== undefined) continue;
+      if (!isNil(value)) continue;
       const question = group.questions[key];
       const varWant = this._prepareQuestion({
         group,
@@ -1464,13 +1464,20 @@ class CliCommand extends BaseCommand {
     const expression = question[propName] && question[propName].expression;
     if (!expression) return null;
     return function (value) {
-      return evaluate(expression, {
+      const res = evaluate(expression, {
         value,
         group,
         question,
         key,
-        context
+        context,
+        arg0: context.argv._[0] ?? null,
+        arg1: context.argv._[1] ?? null,
+        arg2: context.argv._[2] ?? null,
+        arg3: context.argv._[3] ?? null,
+        arg4: context.argv._[4] ?? null,
+        arg5: context.argv._[5] ?? null
       });
+      return res === null ? undefined : res;
     };
   }
   _prepareQuestion({
@@ -1504,7 +1511,7 @@ class CliCommand extends BaseCommand {
     let initial = varWant.initial;
     if (initial && is.function(initial)) {
       initial = initial();
-      if (initial !== undefined) {
+      if (!isNil(initial)) {
         argv[key] = initial;
         return null;
       }
@@ -1553,7 +1560,7 @@ class CliCommand extends BaseCommand {
     if (options) {
       for (const key in options) {
         const option = options[key];
-        if (option.alias && argv[key] === undefined) {
+        if (option.alias && isNil(argv[key])) {
           argv[key] = argv[option.alias];
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "@cabloy/cli",
   "keywords": [
@@ -29,7 +29,7 @@
   "dependencies": {
     "@babel/parser": "^7.29.2",
     "@cabloy/module-info": "^2.0.0",
-    "@cabloy/word-utils": "^2.1.7",
+    "@cabloy/word-utils": "^2.1.8",
     "@npmcli/config": "^10.8.1",
     "@zhennann/common-bin": "^4.0.1",
     "@zhennann/ejs": "^3.0.1",
@@ -46,9 +46,9 @@
     "semver": "^7.7.4",
     "tmp": "^0.2.5",
     "urllib": "^3.27.3",
-    "@cabloy/module-glob": "^5.3.4",
-    "@cabloy/utils": "^2.1.4",
-    "@cabloy/process-helper": "^3.1.4"
+    "@cabloy/module-glob": "^5.3.5",
+    "@cabloy/process-helper": "^3.1.4",
+    "@cabloy/utils": "^2.1.5"
   },
   "scripts": {
     "clean": "rimraf dist tsconfig.tsbuildinfo",