@icyouo/evt-cli 0.1.4 → 0.1.6

package/README.md

@@ -59,9 +59,13 @@ 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.
+`.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.
+
+Runtime state is kept under `.evt/` in the active config root. Session cache and
+live-test reports are written to `.evt/cache/`. The older `.cache/session.local.json`
+path is still read as a compatibility fallback, but new writes use `.evt/cache/`.
 
 ## Data Layout
 

package/README.zh-CN.md

@@ -59,9 +59,13 @@ evt validate
 ```
 
 `evt profile set <name>` 会把默认 profile 写到当前 config root 下的
-`data/.evt/config.json`。需要 profile 的命令在未传 `--profile` 时会使用这个默认值。
+`.evt/config.json`。需要 profile 的命令在未传 `--profile` 时会使用这个默认值。
 临时传入 `--profile <name>` 仍然可以覆盖本次命令。
 
+运行时状态统一放在当前 config root 下的 `.evt/`。登录 session cache 和真实接口测试
+报告会写到 `.evt/cache/`。旧的 `.cache/session.local.json` 仍会作为兼容 fallback 读取，
+但新的写入都会进入 `.evt/cache/`。
+
 ## 数据目录
 
 项目数据目录结构：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icyouo/evt-cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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/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",
+    "check": "node --check bin/evt.js && node --check src/index.js && node --check src/util/paths.js && node --check src/util/settings.js && node --check src/cache/sessionCache.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/api/liveTester.js

@@ -4,7 +4,7 @@ const { buildRequest } = require("../http/requestBuilder");
 const { readCache } = require("../cache/sessionCache");
 const { loadFlow } = require("../config/loaders");
 const { runFlow } = require("../flow/runner");
-const { resolveCliPath } = require("../util/paths");
+const { defaultCacheDir } = require("../util/paths");
 const { redact } = require("../util/redact");
 
 function isPlainObject(value) {
@@ -16,7 +16,7 @@ function nowCompact() {
 }
 
 function ensureCacheDir() {
-  const dir = resolveCliPath(".cache");
+  const dir = defaultCacheDir();
   fs.mkdirSync(dir, { recursive: true });
   return dir;
 }

package/src/cache/sessionCache.js

@@ -1,6 +1,6 @@
 const fs = require("node:fs");
 const path = require("node:path");
-const { defaultCachePath } = require("../util/paths");
+const { defaultCachePath, legacyCachePath } = require("../util/paths");
 
 function resolveCachePath(cachePath) {
   return cachePath ? path.resolve(cachePath) : defaultCachePath();
@@ -8,10 +8,12 @@ function resolveCachePath(cachePath) {
 
 function readCache(cachePath) {
   const file = resolveCachePath(cachePath);
-  if (!fs.existsSync(file)) {
+  const legacyFile = !cachePath ? legacyCachePath() : undefined;
+  const readableFile = fs.existsSync(file) ? file : legacyFile;
+  if (!readableFile || !fs.existsSync(readableFile)) {
     return {};
   }
-  return JSON.parse(fs.readFileSync(file, "utf8"));
+  return JSON.parse(fs.readFileSync(readableFile, "utf8"));
 }
 
 function writeCache(cachePath, value) {

package/src/util/paths.js

@@ -25,13 +25,23 @@ function resolveConfigDir(name) {
 }
 
 function defaultCachePath() {
+  return resolveCliPath(".evt", "cache", "session.local.json");
+}
+
+function legacyCachePath() {
   return resolveCliPath(".cache", "session.local.json");
 }
 
+function defaultCacheDir() {
+  return resolveCliPath(".evt", "cache");
+}
+
 module.exports = {
   cliRoot,
   configRoot,
+  defaultCacheDir,
   defaultCachePath,
+  legacyCachePath,
   resolveCliPath,
   resolveConfigDir,
   setConfigRoot

package/src/util/settings.js

@@ -3,13 +3,19 @@ const path = require("node:path");
 const { resolveCliPath } = require("./paths");
 
 function settingsPath() {
+  return resolveCliPath(".evt", "config.json");
+}
+
+function legacySettingsPath() {
   return resolveCliPath("data", ".evt", "config.json");
 }
 
 function readSettings() {
   const file = settingsPath();
-  if (!fs.existsSync(file)) return {};
-  return JSON.parse(fs.readFileSync(file, "utf8"));
+  const legacyFile = legacySettingsPath();
+  const readableFile = fs.existsSync(file) ? file : legacyFile;
+  if (!fs.existsSync(readableFile)) return {};
+  return JSON.parse(fs.readFileSync(readableFile, "utf8"));
 }
 
 function writeSettings(settings) {
@@ -38,6 +44,7 @@ function resolveProfileName(profile) {
 
 module.exports = {
   getDefaultProfile,
+  legacySettingsPath,
   readSettings,
   resolveProfileName,
   setDefaultProfile,

package/test/profileDefault.test.js

@@ -51,6 +51,8 @@ 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]));
+  assert.equal(fs.existsSync(path.join(root, ".evt", "config.json")), true);
+  assert.equal(fs.existsSync(path.join(root, "data", ".evt", "config.json")), false);
 
   const current = await capture(() => run(["profile", "current", "--config-root", root]));
   assert.equal(current[0], "dev");
@@ -68,3 +70,13 @@ test("profile set stores a project default profile used by api calls", async ()
   assert.equal(payload.request.url, "https://dev.example.test/api/todos");
   assert.equal(payload.request.headers["X-Profile"], "dev");
 });
+
+test("profile default still reads legacy data .evt settings", async () => {
+  const root = createConfigRoot();
+  write(path.join(root, "data", ".evt", "config.json"), JSON.stringify({
+    defaultProfile: "dev"
+  }, null, 2));
+
+  const current = await capture(() => run(["profile", "current", "--config-root", root]));
+  assert.equal(current[0], "dev");
+});

package/test/sessionCache.test.js

@@ -0,0 +1,30 @@
+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 { readCache, resolveCachePath, writeCache } = require("../src/cache/sessionCache");
+const { defaultCachePath, setConfigRoot } = require("../src/util/paths");
+
+test("uses .evt/cache as the default session cache directory", () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "evt-cache-new-"));
+  setConfigRoot(root);
+
+  assert.equal(defaultCachePath(), path.join(root, ".evt", "cache", "session.local.json"));
+  assert.equal(resolveCachePath(), path.join(root, ".evt", "cache", "session.local.json"));
+
+  writeCache(undefined, { token: "new-token" });
+  assert.equal(fs.existsSync(path.join(root, ".evt", "cache", "session.local.json")), true);
+  assert.deepEqual(readCache(), { token: "new-token" });
+});
+
+test("reads legacy .cache session cache when new cache does not exist", () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "evt-cache-legacy-"));
+  setConfigRoot(root);
+  fs.mkdirSync(path.join(root, ".cache"), { recursive: true });
+  fs.writeFileSync(path.join(root, ".cache", "session.local.json"), JSON.stringify({
+    token: "legacy-token"
+  }));
+
+  assert.deepEqual(readCache(), { token: "legacy-token" });
+});