@khangal.j/fireside-cli 0.0.1 → 0.0.2

package/README.md

@@ -22,8 +22,7 @@ fireside projects list
 
 The CLI stores local files under the `fireside` config directory.
 
-- macOS: `~/Library/Application Support/fireside/{config,auth}.json`
-- Linux: `$XDG_CONFIG_HOME/fireside/{config,auth}.json` or `~/.config/fireside/{config,auth}.json`
+- macOS/Linux: `$XDG_CONFIG_HOME/fireside/{config,auth}.json` or `~/.config/fireside/{config,auth}.json`
 - Windows: `%APPDATA%\\fireside\\{config,auth}.json`
 
 `config.json` stores settings like `baseUrl`. `auth.json` stores the local session token.

package/dist/index.js

@@ -139,22 +139,23 @@ var legacyMigrationPromise = null;
 function normalizeBaseUrl(baseUrl) {
   return baseUrl.trim().replace(/\/+$/, "");
 }
+function getUnixConfigHomeDirectory() {
+  return process.env.XDG_CONFIG_HOME || (0, import_node_path.join)((0, import_node_os.homedir)(), ".config");
+}
 function getConfigDirectory(appName = "fireside") {
   switch (process.platform) {
-    case "darwin":
-      return (0, import_node_path.join)((0, import_node_os.homedir)(), "Library", "Application Support", appName);
     case "win32":
       return (0, import_node_path.join)(
         process.env.APPDATA || (0, import_node_path.join)((0, import_node_os.homedir)(), "AppData", "Roaming"),
         appName
       );
     default:
-      return (0, import_node_path.join)(
-        process.env.XDG_CONFIG_HOME || (0, import_node_path.join)((0, import_node_os.homedir)(), ".config"),
-        appName
-      );
+      return (0, import_node_path.join)(getUnixConfigHomeDirectory(), appName);
   }
 }
+function getLegacyMacOsConfigDirectory(appName) {
+  return (0, import_node_path.join)((0, import_node_os.homedir)(), "Library", "Application Support", appName);
+}
 function getAuthStateFilePath() {
   return (0, import_node_path.join)(getConfigDirectory(), "auth.json");
 }
@@ -162,8 +163,17 @@ function getConfigStateFilePath() {
   return (0, import_node_path.join)(getConfigDirectory(), "config.json");
 }
 function getLegacyAuthStateFilePath() {
+  if (process.platform === "darwin") {
+    return (0, import_node_path.join)(getLegacyMacOsConfigDirectory("fireside-cli"), "auth.json");
+  }
   return (0, import_node_path.join)(getConfigDirectory("fireside-cli"), "auth.json");
 }
+function getLegacyMacOsAuthStateFilePath() {
+  return (0, import_node_path.join)(getLegacyMacOsConfigDirectory("fireside"), "auth.json");
+}
+function getLegacyMacOsConfigStateFilePath() {
+  return (0, import_node_path.join)(getLegacyMacOsConfigDirectory("fireside"), "config.json");
+}
 async function fileExists(filePath) {
   try {
     await (0, import_promises.access)(filePath);
@@ -215,6 +225,40 @@ function isLegacyAuthState(value) {
   return isAuthState(value) && isConfigState(value);
 }
 async function migrateLegacyState() {
+  const authStateFilePath = getAuthStateFilePath();
+  const configStateFilePath = getConfigStateFilePath();
+  let hasAuthState = await fileExists(authStateFilePath);
+  let hasConfigState = await fileExists(configStateFilePath);
+  if (process.platform === "darwin") {
+    const legacyMacOsAuthState = await readStateFile(
+      getLegacyMacOsAuthStateFilePath()
+    );
+    const legacyMacOsConfigState = await readStateFile(
+      getLegacyMacOsConfigStateFilePath()
+    );
+    if (legacyMacOsAuthState !== null) {
+      if (!isAuthState(legacyMacOsAuthState)) {
+        throw new Error("Invalid legacy auth state file format.");
+      }
+      if (!hasAuthState) {
+        await writeStateFile(authStateFilePath, legacyMacOsAuthState);
+        hasAuthState = true;
+      }
+      await (0, import_promises.rm)(getLegacyMacOsAuthStateFilePath(), { force: true });
+    }
+    if (legacyMacOsConfigState !== null) {
+      if (!isConfigState(legacyMacOsConfigState)) {
+        throw new Error("Invalid legacy config state file format.");
+      }
+      if (!hasConfigState) {
+        await writeStateFile(configStateFilePath, {
+          baseUrl: normalizeBaseUrl(legacyMacOsConfigState.baseUrl)
+        });
+        hasConfigState = true;
+      }
+      await (0, import_promises.rm)(getLegacyMacOsConfigStateFilePath(), { force: true });
+    }
+  }
   const legacyState = await readStateFile(getLegacyAuthStateFilePath());
   if (legacyState === null) {
     return;
@@ -222,18 +266,18 @@ async function migrateLegacyState() {
   if (!isLegacyAuthState(legacyState)) {
     throw new Error("Invalid legacy auth state file format.");
   }
-  const authStateFilePath = getAuthStateFilePath();
-  const configStateFilePath = getConfigStateFilePath();
-  if (!await fileExists(authStateFilePath)) {
+  if (!hasAuthState) {
     await writeStateFile(authStateFilePath, {
       accessToken: legacyState.accessToken,
       createdAt: legacyState.createdAt
     });
+    hasAuthState = true;
   }
-  if (!await fileExists(configStateFilePath)) {
+  if (!hasConfigState) {
     await writeStateFile(configStateFilePath, {
       baseUrl: normalizeBaseUrl(legacyState.baseUrl)
     });
+    hasConfigState = true;
   }
   await (0, import_promises.rm)(getLegacyAuthStateFilePath(), { force: true });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khangal.j/fireside-cli",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Fireside CLI",
   "license": "MIT",
   "private": false,