@icyouo/evt-cli 0.1.2 → 0.1.4

package/README.md

@@ -25,18 +25,21 @@ Run the bundled example data:
 
 ```bash
 evt profile list
+evt profile set local
+evt profile current
 evt api list
 evt validate
-evt api call todo.list --profile local --dry-run
+evt api call todo.list --dry-run
 ```
 
 During local development, run the entry file directly:
 
 ```bash
 node bin/evt.js profile list
+node bin/evt.js profile set local
 node bin/evt.js api list
 node bin/evt.js validate
-node bin/evt.js api call todo.list --profile local --dry-run
+node bin/evt.js api call todo.list --dry-run
 ```
 
 Use your own project data directory:
@@ -44,7 +47,8 @@ Use your own project data directory:
 ```bash
 evt validate --config-root /path/to/project/cli
 evt api list --config-root /path/to/project/cli
-evt flow run login --config-root /path/to/project/cli --profile dev
+evt profile set dev --config-root /path/to/project/cli
+evt flow run login --config-root /path/to/project/cli
 ```
 
 Or set an environment variable:
@@ -54,6 +58,11 @@ export EVT_CLI_ROOT=/path/to/project/cli
 evt validate
 ```
 
+`evt profile set <name>` stores the default profile in
+`data/.evt/config.json` under the active config root. Commands that need a
+profile use that value when `--profile` is omitted. Passing `--profile <name>`
+still overrides the default for one command.
+
 ## Data Layout
 
 Recommended project data layout:
@@ -266,18 +275,56 @@ intermediate endpoint should include at least:
 
 This JSON is used only for scanning, coverage, and sync. Runtime execution still reads YAML.
 
+## Flow Inputs
+
+Flow inputs can prompt users interactively. Inputs with `type: "password"` are
+masked with `*` while typing.
+
+Use `inputGroups.anyOf` when one value from a set is required. For example,
+login flows can accept either an email verification code or a Google OTP:
+
+```yaml
+inputs:
+  email:
+    prompt: Email
+    type: string
+    required: true
+  password:
+    prompt: Password
+    type: password
+    required: true
+  code:
+    prompt: Email code
+    type: string
+    default: ""
+  googleCode:
+    prompt: Google OTP
+    type: string
+    default: ""
+
+inputGroups:
+  anyOf:
+    - fields:
+        - code
+        - googleCode
+      prompt: Enter either an email code or Google OTP.
+      message: email code or Google OTP
+```
+
 ## Common Commands
 
 ```bash
 evt profile list
+evt profile set local
+evt profile current
 evt api list
 evt api discover --config-root ./cli
 evt api sync --config-root ./cli
 evt api audit --config-root ./cli --strict
 evt api coverage --config-root ./cli
 evt api call todo.list --dry-run
-evt flow run login --profile local
+evt flow run login
 evt cache show
 evt cache clear
-evt api test-all --profile local
+evt api test-all
 ```

package/README.zh-CN.md

@@ -25,18 +25,21 @@ npm install -g @icyouo/evt-cli
 
 ```bash
 evt profile list
+evt profile set local
+evt profile current
 evt api list
 evt validate
-evt api call todo.list --profile local --dry-run
+evt api call todo.list --dry-run
 ```
 
 仓库内开发时也可以直接运行：
 
 ```bash
 node bin/evt.js profile list
+node bin/evt.js profile set local
 node bin/evt.js api list
 node bin/evt.js validate
-node bin/evt.js api call todo.list --profile local --dry-run
+node bin/evt.js api call todo.list --dry-run
 ```
 
 使用项目自己的数据目录：
@@ -44,7 +47,8 @@ node bin/evt.js api call todo.list --profile local --dry-run
 ```bash
 evt validate --config-root /path/to/project/cli
 evt api list --config-root /path/to/project/cli
-evt flow run login --config-root /path/to/project/cli --profile dev
+evt profile set dev --config-root /path/to/project/cli
+evt flow run login --config-root /path/to/project/cli
 ```
 
 也可以设置环境变量：
@@ -54,6 +58,10 @@ export EVT_CLI_ROOT=/path/to/project/cli
 evt validate
 ```
 
+`evt profile set <name>` 会把默认 profile 写到当前 config root 下的
+`data/.evt/config.json`。需要 profile 的命令在未传 `--profile` 时会使用这个默认值。
+临时传入 `--profile <name>` 仍然可以覆盖本次命令。
+
 ## 数据目录
 
 项目数据目录结构：
@@ -256,18 +264,55 @@ npm run sync:api -- --config-root /path/to/project/cli
 
 这个 JSON 只参与扫描/覆盖率/sync，最终运行仍然读取 YAML。
 
+## Flow 输入
+
+flow inputs 支持交互式输入。`type: "password"` 的输入会在键入时显示为 `*`。
+
+当一组输入里必须至少提供一个值时，可以使用 `inputGroups.anyOf`。例如登录 flow
+可以支持邮箱验证码和 Google OTP 二选一：
+
+```yaml
+inputs:
+  email:
+    prompt: Email
+    type: string
+    required: true
+  password:
+    prompt: Password
+    type: password
+    required: true
+  code:
+    prompt: Email code
+    type: string
+    default: ""
+  googleCode:
+    prompt: Google OTP
+    type: string
+    default: ""
+
+inputGroups:
+  anyOf:
+    - fields:
+        - code
+        - googleCode
+      prompt: Enter either an email code or Google OTP.
+      message: email code or Google OTP
+```
+
 ## 常用命令
 
 ```bash
 evt profile list
+evt profile set local
+evt profile current
 evt api list
 evt api discover --config-root ./cli
 evt api sync --config-root ./cli
 evt api audit --config-root ./cli --strict
 evt api coverage --config-root ./cli
 evt api call todo.list --dry-run
-evt flow run login --profile local
+evt flow run login
 evt cache show
 evt cache clear
-evt api test-all --profile local
+evt api test-all
 ```

package/data/flows/login.example.yaml

@@ -10,6 +10,24 @@ inputs:
     prompt: Password
     type: password
     required: true
+  code:
+    prompt: Email code
+    type: string
+    required: false
+    default: ""
+  googleCode:
+    prompt: Google OTP
+    type: string
+    required: false
+    default: ""
+
+inputGroups:
+  anyOf:
+    - fields:
+        - code
+        - googleCode
+      prompt: Enter either an email code or Google OTP.
+      message: email code or Google OTP
 
 steps:
   - id: login
@@ -17,6 +35,8 @@ steps:
     body:
       email: "{{inputs.email}}"
       password: "{{inputs.password}}"
+      code: "{{inputs.code}}"
+      googleCode: "{{inputs.googleCode}}"
 
 save:
   cache:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icyouo/evt-cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Run YAML-defined HTTP APIs and interactive workflows from your terminal.",
   "license": "MIT",
   "repository": {
@@ -27,7 +27,7 @@
   "scripts": {
     "ci:local": "node scripts/local-ci.js",
     "test": "node --test",
-    "check": "node --check bin/evt.js && node --check src/index.js && node --check src/api/liveTester.js && node --check scripts/sync-api-coverage.js && node --check scripts/check-api-coverage.js && node --check scripts/check-api-audit.js && node --check scripts/local-ci.js && node --check scripts/build-package.js && node --check skills/evt-api-scanner/scripts/discover.js && node --check skills/evt-api-scanner/scripts/scan.js",
+    "check": "node --check bin/evt.js && node --check src/index.js && node --check src/util/settings.js && node --check src/flow/inputResolver.js && node --check src/api/liveTester.js && node --check scripts/sync-api-coverage.js && node --check scripts/check-api-coverage.js && node --check scripts/check-api-audit.js && node --check scripts/local-ci.js && node --check scripts/build-package.js && node --check skills/evt-api-scanner/scripts/discover.js && node --check skills/evt-api-scanner/scripts/scan.js",
     "package:local": "node scripts/build-package.js",
     "sync:api": "node scripts/sync-api-coverage.js",
     "coverage:api": "node scripts/check-api-coverage.js",

package/src/config/validate.js

@@ -143,6 +143,25 @@ function validateFlow(flow, file) {
       }
     }
   }
+  if (flow.inputGroups !== undefined) {
+    if (!isObject(flow.inputGroups)) {
+      push(errors, file, "flow.inputGroups must be an object");
+    } else if (flow.inputGroups.anyOf !== undefined) {
+      if (!Array.isArray(flow.inputGroups.anyOf)) {
+        push(errors, file, "flow.inputGroups.anyOf must be an array");
+      } else {
+        for (const [index, group] of flow.inputGroups.anyOf.entries()) {
+          if (!isObject(group)) {
+            push(errors, file, `inputGroups.anyOf[${index}] must be an object`);
+            continue;
+          }
+          if (!Array.isArray(group.fields) || group.fields.length === 0) {
+            push(errors, file, `inputGroups.anyOf[${index}].fields must be a non-empty array`);
+          }
+        }
+      }
+    }
+  }
   if (flow.steps !== undefined && !Array.isArray(flow.steps)) push(errors, file, "flow.steps must be an array");
   for (const [index, step] of (flow.steps || []).entries()) {
     if (!isObject(step)) {

package/src/flow/inputResolver.js

@@ -4,11 +4,79 @@ function envNameFor(key, input) {
   return input.env || `NEPTUNE_${key.replace(/[^a-zA-Z0-9]/g, "_").toUpperCase()}`;
 }
 
+function hasValue(value) {
+  return !(value === undefined || value === null || value === "");
+}
+
+function promptPassword(question, input) {
+  return new Promise((resolve, reject) => {
+    let value = "";
+    const stdin = process.stdin;
+    const stdout = process.stdout;
+
+    if (!stdin.isTTY || typeof stdin.setRawMode !== "function") {
+      const rl = readline.createInterface({
+        input: stdin,
+        output: stdout,
+        terminal: true
+      });
+      rl.question(question, (answer) => {
+        rl.close();
+        resolve(answer === "" && input.default !== undefined ? input.default : answer);
+      });
+      return;
+    }
+
+    const wasRaw = stdin.isRaw;
+    stdout.write(question);
+    readline.emitKeypressEvents(stdin);
+    stdin.setRawMode(true);
+    stdin.resume();
+
+    const cleanup = () => {
+      stdin.removeListener("keypress", onKeypress);
+      stdin.setRawMode(Boolean(wasRaw));
+      stdout.write("\n");
+    };
+
+    function onKeypress(sequence, key = {}) {
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        reject(new Error("Input cancelled"));
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        cleanup();
+        resolve(value === "" && input.default !== undefined ? input.default : value);
+        return;
+      }
+      if (key.name === "backspace" || key.name === "delete") {
+        if (value.length > 0) {
+          value = value.slice(0, -1);
+          stdout.write("\b \b");
+        }
+        return;
+      }
+      if (key.ctrl || key.meta || !sequence || /[\r\n]/.test(sequence)) {
+        return;
+      }
+      value += sequence;
+      stdout.write("*");
+    }
+
+    stdin.on("keypress", onKeypress);
+  });
+}
+
 function promptValue(key, input) {
   const label = input.prompt || key;
   const suffix = input.default !== undefined && input.default !== "" ? ` (${input.default})` : "";
   const question = `${label}${suffix}: `;
 
+  if (input.type === "password") {
+    return promptPassword(question, input);
+  }
+
   return new Promise((resolve) => {
     const rl = readline.createInterface({
       input: process.stdin,
@@ -16,47 +84,92 @@ function promptValue(key, input) {
       terminal: true
     });
 
-    if (input.type === "password") {
-      rl.stdoutMuted = true;
-      rl._writeToOutput = function writeToOutput(stringToWrite) {
-        if (!rl.stdoutMuted) {
-          rl.output.write(stringToWrite);
-        }
-      };
-    }
-
     rl.question(question, (answer) => {
       rl.close();
-      if (input.type === "password") {
-        process.stdout.write("\n");
-      }
       resolve(answer === "" && input.default !== undefined ? input.default : answer);
     });
   });
 }
 
+function readConfiguredInput(key, input, options) {
+  const envName = envNameFor(key, input);
+  if (Object.prototype.hasOwnProperty.call(options.set || {}, key)) {
+    return options.set[key];
+  }
+  if (process.env[envName] !== undefined) {
+    return process.env[envName];
+  }
+  if (options.cache && options.cache.inputs && options.cache.inputs[key] !== undefined) {
+    return options.cache.inputs[key];
+  }
+  if (options.profile && options.profile.inputs && options.profile.inputs[key] !== undefined) {
+    return options.profile.inputs[key];
+  }
+  return undefined;
+}
+
+function anyOfGroups(flow) {
+  const inputGroups = flow.inputGroups || {};
+  const groups = inputGroups.anyOf || [];
+  return Array.isArray(groups) ? groups : [];
+}
+
+function groupedKeys(flow) {
+  const keys = new Set();
+  for (const group of anyOfGroups(flow)) {
+    for (const key of group.fields || []) keys.add(key);
+  }
+  return keys;
+}
+
+async function resolveAnyOfGroups(flow, options, result) {
+  const definitions = flow.inputs || {};
+
+  for (const group of anyOfGroups(flow)) {
+    const fields = group.fields || [];
+    if (fields.some((key) => hasValue(result[key]))) {
+      continue;
+    }
+
+    let resolved = false;
+    if (!options.noInteractive && process.stdin.isTTY) {
+      if (group.prompt) {
+        process.stdout.write(`${group.prompt}\n`);
+      }
+      for (const key of fields) {
+        const input = definitions[key];
+        if (!input) continue;
+        const value = await promptValue(key, { ...input, default: undefined });
+        if (hasValue(value)) {
+          result[key] = value;
+          resolved = true;
+          break;
+        }
+      }
+    }
+
+    if (!resolved && !fields.some((key) => hasValue(result[key]))) {
+      const label = group.message || `One of ${fields.join(", ")} is required`;
+      throw new Error(`Missing required flow input group: ${label}`);
+    }
+  }
+}
+
 async function resolveInputs(flow, options) {
   const definitions = flow.inputs || {};
   const result = {};
+  const anyOfKeys = groupedKeys(flow);
 
   for (const [key, input] of Object.entries(definitions)) {
-    const envName = envNameFor(key, input);
-    let value;
-    if (Object.prototype.hasOwnProperty.call(options.set || {}, key)) {
-      value = options.set[key];
-    } else if (process.env[envName] !== undefined) {
-      value = process.env[envName];
-    } else if (options.cache && options.cache.inputs && options.cache.inputs[key] !== undefined) {
-      value = options.cache.inputs[key];
-    } else if (options.profile && options.profile.inputs && options.profile.inputs[key] !== undefined) {
-      value = options.profile.inputs[key];
-    } else if (!options.noInteractive && process.stdin.isTTY) {
+    let value = readConfiguredInput(key, input, options);
+    const deferInteractive = anyOfKeys.has(key) && !input.required;
+    if (value === undefined && !deferInteractive && !options.noInteractive && process.stdin.isTTY) {
       value = await promptValue(key, input);
-    } else if (input.default !== undefined) {
+    } else if (value === undefined && input.default !== undefined) {
       value = input.default;
     }
 
-    if (input.required && (value === undefined || value === null || value === "")) {
+    if (input.required && !hasValue(value)) {
       throw new Error(`Missing required flow input: ${key}`);
     }
     if (value !== undefined) {
@@ -64,9 +177,14 @@ async function resolveInputs(flow, options) {
     }
   }
 
+  await resolveAnyOfGroups(flow, options, result);
+
   return result;
 }
 
 module.exports = {
+  hasValue,
+  promptPassword,
+  promptValue,
   resolveInputs
 };

package/src/index.js

@@ -4,6 +4,7 @@ const { parseArgs } = require("./util/args");
 const { parseJsonObject, stableJson } = require("./util/json");
 const { redact } = require("./util/redact");
 const { cliRoot, setConfigRoot } = require("./util/paths");
+const { getDefaultProfile, resolveProfileName, setDefaultProfile, settingsPath } = require("./util/settings");
 const {
   listApiFiles,
   listProfiles,
@@ -34,6 +35,8 @@ function usage() {
   return [
     "Usage:",
     "  evt profile list [--config-root ./cli]",
+    "  evt profile current [--config-root ./cli]",
+    "  evt profile set <name> [--config-root ./cli]",
     "  evt profile show <name>",
     "  evt api list",
     "  evt api show <id>",
@@ -42,11 +45,11 @@ function usage() {
     "  evt api sync [--config-root ./cli]",
     "  evt api coverage [--config-root ./cli]",
     "  evt api audit [--config-root ./cli] [--strict]",
-    "  evt api call <id> [--profile local] [--set k=v] [--body '{...}'] [--dry-run]",
-    "  evt api test-all [--profile local] [--include-dangerous] [--only namespace]",
+    "  evt api call <id> [--profile name] [--set k=v] [--body '{...}'] [--dry-run]",
+    "  evt api test-all [--profile name] [--include-dangerous] [--only namespace]",
     "  evt validate",
     "  evt flow list",
-    "  evt flow run <name> [--profile local] [--set k=v] [--dry-run]",
+    "  evt flow run <name> [--profile name] [--set k=v] [--dry-run]",
     "  evt cache show|clear|path"
   ].join("\n");
 }
@@ -63,7 +66,7 @@ function runNodeScript(relativeScript, args) {
 }
 
 function commonRuntime(options) {
-  const profile = loadProfile(options.profile || "local");
+  const profile = loadProfile(resolveProfileName(options.profile));
   const cachePath = resolveCachePath(options.cache);
   const cache = readCache(cachePath);
   return {
@@ -82,8 +85,25 @@ async function handleProfile(tokens) {
     print(listProfiles(), options.json);
     return;
   }
+  if (sub === "current") {
+    const profile = getDefaultProfile();
+    if (options.json) {
+      print({ profile, settingsPath: settingsPath() }, true);
+    } else {
+      print(profile);
+    }
+    return;
+  }
+  if (sub === "set") {
+    const name = options._[0];
+    if (!name) throw new Error("evt profile set expects a profile name");
+    loadProfile(name);
+    const result = setDefaultProfile(name);
+    print(options.json ? { ok: true, ...result } : `Default profile set to ${name}`);
+    return;
+  }
   if (sub === "show") {
-    print(loadProfile(options._[0]), true);
+    print(loadProfile(resolveProfileName(options._[0])), true);
     return;
   }
   throw new Error(usage());

package/src/util/settings.js

@@ -0,0 +1,45 @@
+const fs = require("node:fs");
+const path = require("node:path");
+const { resolveCliPath } = require("./paths");
+
+function settingsPath() {
+  return resolveCliPath("data", ".evt", "config.json");
+}
+
+function readSettings() {
+  const file = settingsPath();
+  if (!fs.existsSync(file)) return {};
+  return JSON.parse(fs.readFileSync(file, "utf8"));
+}
+
+function writeSettings(settings) {
+  const file = settingsPath();
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, `${JSON.stringify(settings, null, 2)}\n`);
+}
+
+function getDefaultProfile() {
+  return readSettings().defaultProfile || "local";
+}
+
+function setDefaultProfile(profile) {
+  const settings = readSettings();
+  settings.defaultProfile = profile;
+  writeSettings(settings);
+  return {
+    profile,
+    path: settingsPath()
+  };
+}
+
+function resolveProfileName(profile) {
+  return profile || getDefaultProfile();
+}
+
+module.exports = {
+  getDefaultProfile,
+  readSettings,
+  resolveProfileName,
+  setDefaultProfile,
+  settingsPath
+};

package/test/flow.test.js

@@ -213,3 +213,89 @@ test("skips response expectations during dry-run", async () => {
   assert.equal(result.flow, "dry-run-expect");
   assert.deepEqual(result.vars, []);
 });
+
+test("accepts one input from an anyOf input group", async () => {
+  const result = await runFlow({
+    name: "login-any-of",
+    inputs: {
+      email: { required: true },
+      password: { required: true, type: "password" },
+      code: { default: "" },
+      googleCode: { default: "" }
+    },
+    inputGroups: {
+      anyOf: [
+        { fields: ["code", "googleCode"], message: "email code or Google OTP" }
+      ]
+    },
+    steps: [
+      {
+        id: "login",
+        call: "auth.login",
+        body: {
+          email: "{{inputs.email}}",
+          password: "{{inputs.password}}",
+          code: "{{inputs.code}}",
+          googleCode: "{{inputs.googleCode}}"
+        }
+      }
+    ]
+  }, {
+    registry: loadApiRegistry(),
+    profile: loadProfile("local"),
+    cache: {},
+    cachePath: "/tmp/evt-cli-any-of-cache-test.json",
+    set: {
+      email: "user@example.com",
+      password: "secret",
+      googleCode: "123456"
+    },
+    dryRun: true,
+    noInteractive: true
+  });
+
+  assert.deepEqual(result.inputs.sort(), ["code", "email", "googleCode", "password"].sort());
+  assert.equal(result.steps.login.request.body.code, "");
+  assert.equal(result.steps.login.request.body.googleCode, "123456");
+});
+
+test("fails when no input from an anyOf input group is available", async () => {
+  await assert.rejects(
+    runFlow({
+      name: "login-any-of-missing",
+      inputs: {
+        email: { required: true },
+        password: { required: true, type: "password" },
+        code: { default: "" },
+        googleCode: { default: "" }
+      },
+      inputGroups: {
+        anyOf: [
+          { fields: ["code", "googleCode"], message: "email code or Google OTP" }
+        ]
+      },
+      steps: [
+        {
+          id: "login",
+          call: "auth.login",
+          body: {
+            email: "{{inputs.email}}",
+            password: "{{inputs.password}}"
+          }
+        }
+      ]
+    }, {
+      registry: loadApiRegistry(),
+      profile: { name: "test", baseUrl: "https://api.example.com", inputs: {} },
+      cache: {},
+      cachePath: "/tmp/evt-cli-any-of-missing-cache-test.json",
+      set: {
+        email: "user@example.com",
+        password: "secret"
+      },
+      dryRun: true,
+      noInteractive: true
+    }),
+    /Missing required flow input group: email code or Google OTP/
+  );
+});

package/test/profileDefault.test.js

@@ -0,0 +1,70 @@
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const { run } = require("../src/index");
+
+function write(file, content) {
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, content);
+}
+
+async function capture(fn) {
+  const originalLog = console.log;
+  const lines = [];
+  console.log = (value) => lines.push(value);
+  try {
+    await fn();
+  } finally {
+    console.log = originalLog;
+  }
+  return lines;
+}
+
+function createConfigRoot() {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "evt-profile-default-"));
+  write(path.join(root, "data", "profiles", "dev.json"), JSON.stringify({
+    name: "dev",
+    baseUrl: "https://dev.example.test",
+    headers: {
+      "X-Profile": "dev"
+    }
+  }, null, 2));
+  write(path.join(root, "data", "apis", "todo.yaml"), [
+    "namespace: todo",
+    "",
+    "endpoints:",
+    "  list:",
+    "    method: \"GET\"",
+    "    path: \"/api/todos\"",
+    "    auth: false",
+    "    response:",
+    "      data:",
+    "        type: \"array\"",
+    ""
+  ].join("\n"));
+  return root;
+}
+
+test("profile set stores a project default profile used by api calls", async () => {
+  const root = createConfigRoot();
+
+  await capture(() => run(["profile", "set", "dev", "--config-root", root]));
+
+  const current = await capture(() => run(["profile", "current", "--config-root", root]));
+  assert.equal(current[0], "dev");
+
+  const output = await capture(() => run([
+    "api",
+    "call",
+    "todo.list",
+    "--config-root",
+    root,
+    "--dry-run",
+    "--json"
+  ]));
+  const payload = JSON.parse(output[0]);
+  assert.equal(payload.request.url, "https://dev.example.test/api/todos");
+  assert.equal(payload.request.headers["X-Profile"], "dev");
+});