@icyouo/evt-cli 0.1.4 → 0.1.5

package/README.md

@@ -59,9 +59,9 @@ 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.
 
 ## Data Layout
 

package/README.zh-CN.md

@@ -59,7 +59,7 @@ evt validate
 ```
 
 `evt profile set <name>` 会把默认 profile 写到当前 config root 下的
-`data/.evt/config.json`。需要 profile 的命令在未传 `--profile` 时会使用这个默认值。
+`.evt/config.json`。需要 profile 的命令在未传 `--profile` 时会使用这个默认值。
 临时传入 `--profile <name>` 仍然可以覆盖本次命令。
 
 ## 数据目录

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icyouo/evt-cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Run YAML-defined HTTP APIs and interactive workflows from your terminal.",
   "license": "MIT",
   "repository": {

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");
+});