@catladder/cli 2.6.0 → 2.6.2

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/utils/preferences.ts

@@ -0,0 +1,56 @@
+import { readFile, writeFile, mkdir } from "fs/promises";
+import { existsSync } from "fs";
+import { join, dirname } from "path";
+import { homedir } from "os";
+import { parse, stringify } from "yaml";
+
+const legacyPreferencesPath = join(homedir(), ".catladder/preferences.yml");
+const preferencesPath = join(homedir(), ".config/catladder/preferences.yml");
+
+const ensurePreferencesFile = async () => {
+  if (existsSync(preferencesPath)) {
+    return preferencesPath;
+  }
+  await mkdir(dirname(preferencesPath), { recursive: true, mode: 0o700 });
+  await writeFile(preferencesPath, "---\n{}", {
+    encoding: "utf-8",
+    mode: 0o600,
+  });
+  if (existsSync(legacyPreferencesPath)) {
+    return legacyPreferencesPath;
+  }
+  return preferencesPath;
+};
+
+const loadPreferences = async () => {
+  const currentLoadPath = await ensurePreferencesFile();
+  return readFile(currentLoadPath, { encoding: "utf-8" });
+};
+
+const getPreferences = async () => {
+  const yamlContent = await loadPreferences();
+  return (parse(yamlContent) ?? {}) as Record<string, string>;
+};
+
+export const hasPreference = async (key: string) => {
+  const preferences = await getPreferences();
+  return key in preferences;
+};
+export const getPreference = async (key: string) => {
+  const preferences = await getPreferences();
+  return preferences[key];
+};
+
+export const setPreference = async (key: string, value: string | number) => {
+  const preferences = await getPreferences();
+
+  const newPreferences = {
+    ...preferences,
+    [key]: value,
+  };
+
+  await writeFile(preferencesPath, stringify(newPreferences), {
+    encoding: "utf-8",
+    mode: 0o600,
+  });
+};

package/dist/cli/src/utils/preferences/index.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
-const fs_extra_1 = require("fs-extra");
-const os_1 = require("os");
-const yaml_1 = require("yaml");
-const directory = `${(0, os_1.homedir)()}/.catladder`;
-const file = `${directory}/preferences.yml`;
-const getPreferences = async () => {
-    var _a;
-    if (!(await (0, fs_extra_1.pathExists)(file))) {
-        await (0, fs_extra_1.createFile)(file);
-    }
-    return ((_a = (0, yaml_1.parse)(await (0, fs_extra_1.readFile)(file, { encoding: "utf-8" }))) !== null && _a !== void 0 ? _a : {});
-};
-const hasPreference = async (key) => {
-    const preferences = await getPreferences();
-    return key in preferences;
-};
-exports.hasPreference = hasPreference;
-const getPreference = async (key) => {
-    const preferences = await getPreferences();
-    return preferences[key];
-};
-exports.getPreference = getPreference;
-const setPreference = async (key, value) => {
-    const preferences = await getPreferences();
-    const newPreferences = {
-        ...preferences,
-        [key]: value,
-    };
-    await (0, fs_extra_1.writeFile)(file, (0, yaml_1.stringify)(newPreferences));
-};
-exports.setPreference = setPreference;
-//# sourceMappingURL=index.js.map

package/dist/cli/src/utils/preferences/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utils/preferences/index.ts"],"names":[],"mappings":";;;AAAA,uCAAuE;AACvE,2BAA6B;AAE7B,+BAAwC;AACxC,MAAM,SAAS,GAAG,GAAG,IAAA,YAAO,GAAE,aAAa,CAAC;AAC5C,MAAM,IAAI,GAAG,GAAG,SAAS,kBAAkB,CAAC;AAE5C,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;;IAChC,IAAI,CAAC,CAAC,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,CAAC,MAAA,IAAA,YAAK,EAAC,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,mCAAI,EAAE,CAG/D,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IACjD,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;IAC3C,OAAO,GAAG,IAAI,WAAW,CAAC;AAC5B,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AACK,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IACjD,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;IAC3C,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEK,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,KAAsB,EAAE,EAAE;IACzE,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;IAE3C,MAAM,cAAc,GAAG;QACrB,GAAG,WAAW;QACd,CAAC,GAAG,CAAC,EAAE,KAAK;KACb,CAAC;IAEF,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAA,gBAAS,EAAC,cAAc,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB"}

package/src/utils/preferences/index.ts

@@ -1,36 +0,0 @@
-import { createFile, pathExists, readFile, writeFile } from "fs-extra";
-import { homedir } from "os";
-
-import { parse, stringify } from "yaml";
-const directory = `${homedir()}/.catladder`;
-const file = `${directory}/preferences.yml`;
-
-const getPreferences = async () => {
-  if (!(await pathExists(file))) {
-    await createFile(file);
-  }
-  return (parse(await readFile(file, { encoding: "utf-8" })) ?? {}) as Record<
-    string,
-    string
-  >;
-};
-
-export const hasPreference = async (key: string) => {
-  const preferences = await getPreferences();
-  return key in preferences;
-};
-export const getPreference = async (key: string) => {
-  const preferences = await getPreferences();
-  return preferences[key];
-};
-
-export const setPreference = async (key: string, value: string | number) => {
-  const preferences = await getPreferences();
-
-  const newPreferences = {
-    ...preferences,
-    [key]: value,
-  };
-
-  await writeFile(file, stringify(newPreferences));
-};