@catladder/cli 0.0.0-main-8ec1b61a → 0.0.0-main-bcd7ed75

package/dist/bundles/catenv/index.js

@@ -508,7 +508,7 @@ const lodash_1 = __nccwpck_require__(3255);
 const memoizee_1 = __importDefault(__nccwpck_require__(5839));
 const node_fetch_1 = __importDefault(__nccwpck_require__(6372));
 const open_1 = __importDefault(__nccwpck_require__(4247));
-const preferences_1 = __nccwpck_require__(2636);
+const preferences_1 = __nccwpck_require__(3511);
 const gitProjectInformation_1 = __nccwpck_require__(8329);
 const TOKEN_KEY = "gitlab-personal-access-token";
 const hasGitlabToken = async () => await (0, preferences_1.hasPreference)(TOKEN_KEY);
@@ -711,24 +711,42 @@ exports.upsertAllVariables = upsertAllVariables;
 
 /***/ }),
 
-/***/ 2636:
+/***/ 3511:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
-const fs_extra_1 = __nccwpck_require__(7564);
+const promises_1 = __nccwpck_require__(3292);
+const fs_1 = __nccwpck_require__(7147);
+const path_1 = __nccwpck_require__(1017);
 const os_1 = __nccwpck_require__(2037);
 const yaml_1 = __nccwpck_require__(8033);
-const directory = `${(0, os_1.homedir)()}/.catladder`;
-const file = `${directory}/preferences.yml`;
+const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
+const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
+const ensurePreferencesFile = async () => {
+    if ((0, fs_1.existsSync)(preferencesPath)) {
+        return preferencesPath;
+    }
+    await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
+    await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
+    if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
+        return legacyPreferencesPath;
+    }
+    return preferencesPath;
+};
+const loadPreferences = async () => {
+    const currentLoadPath = await ensurePreferencesFile();
+    return (0, promises_1.readFile)(currentLoadPath, { encoding: "utf-8" });
+};
 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 yamlContent = await loadPreferences();
+    return ((_a = (0, yaml_1.parse)(yamlContent)) !== null && _a !== void 0 ? _a : {});
 };
 const hasPreference = async (key) => {
     const preferences = await getPreferences();
@@ -746,10 +764,13 @@ const setPreference = async (key, value) => {
         ...preferences,
         [key]: value,
     };
-    await (0, fs_extra_1.writeFile)(file, (0, yaml_1.stringify)(newPreferences));
+    await (0, promises_1.writeFile)(preferencesPath, (0, yaml_1.stringify)(newPreferences), {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
 };
 exports.setPreference = setPreference;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=preferences.js.map
 
 /***/ }),
 

package/dist/bundles/cli/index.js

@@ -2458,7 +2458,7 @@ exports["default"] = async (vorpal) => {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getGoogleAuthUserNumber = void 0;
-const preferences_1 = __nccwpck_require__(62636);
+const preferences_1 = __nccwpck_require__(13511);
 const KEY = "googleAuthUserNumber";
 const getGoogleAuthUserNumber = async function () {
     if (!(await (0, preferences_1.hasPreference)(KEY))) {
@@ -3319,7 +3319,7 @@ const lodash_1 = __nccwpck_require__(23255);
 const memoizee_1 = __importDefault(__nccwpck_require__(85839));
 const node_fetch_1 = __importDefault(__nccwpck_require__(26372));
 const open_1 = __importDefault(__nccwpck_require__(14247));
-const preferences_1 = __nccwpck_require__(62636);
+const preferences_1 = __nccwpck_require__(13511);
 const gitProjectInformation_1 = __nccwpck_require__(78329);
 const TOKEN_KEY = "gitlab-personal-access-token";
 const hasGitlabToken = async () => await (0, preferences_1.hasPreference)(TOKEN_KEY);
@@ -3598,24 +3598,42 @@ exports.stopAllPortForwards = stopAllPortForwards;
 
 /***/ }),
 
-/***/ 62636:
+/***/ 13511:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
-const fs_extra_1 = __nccwpck_require__(85501);
+const promises_1 = __nccwpck_require__(73292);
+const fs_1 = __nccwpck_require__(57147);
+const path_1 = __nccwpck_require__(71017);
 const os_1 = __nccwpck_require__(22037);
 const yaml_1 = __nccwpck_require__(68033);
-const directory = `${(0, os_1.homedir)()}/.catladder`;
-const file = `${directory}/preferences.yml`;
+const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
+const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
+const ensurePreferencesFile = async () => {
+    if ((0, fs_1.existsSync)(preferencesPath)) {
+        return preferencesPath;
+    }
+    await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
+    await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
+    if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
+        return legacyPreferencesPath;
+    }
+    return preferencesPath;
+};
+const loadPreferences = async () => {
+    const currentLoadPath = await ensurePreferencesFile();
+    return (0, promises_1.readFile)(currentLoadPath, { encoding: "utf-8" });
+};
 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 yamlContent = await loadPreferences();
+    return ((_a = (0, yaml_1.parse)(yamlContent)) !== null && _a !== void 0 ? _a : {});
 };
 const hasPreference = async (key) => {
     const preferences = await getPreferences();
@@ -3633,10 +3651,13 @@ const setPreference = async (key, value) => {
         ...preferences,
         [key]: value,
     };
-    await (0, fs_extra_1.writeFile)(file, (0, yaml_1.stringify)(newPreferences));
+    await (0, promises_1.writeFile)(preferencesPath, (0, yaml_1.stringify)(newPreferences), {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
 };
 exports.setPreference = setPreference;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=preferences.js.map
 
 /***/ }),
 

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

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
+const promises_1 = require("fs/promises");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const os_1 = require("os");
+const yaml_1 = require("yaml");
+const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
+const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
+const ensurePreferencesFile = async () => {
+    if ((0, fs_1.existsSync)(preferencesPath)) {
+        return preferencesPath;
+    }
+    await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
+    await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
+    if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
+        return legacyPreferencesPath;
+    }
+    return preferencesPath;
+};
+const loadPreferences = async () => {
+    const currentLoadPath = await ensurePreferencesFile();
+    return (0, promises_1.readFile)(currentLoadPath, { encoding: "utf-8" });
+};
+const getPreferences = async () => {
+    var _a;
+    const yamlContent = await loadPreferences();
+    return ((_a = (0, yaml_1.parse)(yamlContent)) !== 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, promises_1.writeFile)(preferencesPath, (0, yaml_1.stringify)(newPreferences), {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
+};
+exports.setPreference = setPreference;
+//# sourceMappingURL=preferences.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../../src/utils/preferences.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,2BAAgC;AAChC,+BAAqC;AACrC,2BAA6B;AAC7B,+BAAwC;AAExC,MAAM,qBAAqB,GAAG,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,4BAA4B,CAAC,CAAC;AAC5E,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,mCAAmC,CAAC,CAAC;AAE7E,MAAM,qBAAqB,GAAG,KAAK,IAAI,EAAE;IACvC,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QAChC,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,IAAA,gBAAK,EAAC,IAAA,cAAO,EAAC,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,MAAM,IAAA,oBAAS,EAAC,eAAe,EAAE,SAAS,EAAE;QAC1C,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IACH,IAAI,IAAA,eAAU,EAAC,qBAAqB,CAAC,EAAE,CAAC;QACtC,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACjC,MAAM,eAAe,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACtD,OAAO,IAAA,mBAAQ,EAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;;IAChC,MAAM,WAAW,GAAG,MAAM,eAAe,EAAE,CAAC;IAC5C,OAAO,CAAC,MAAA,IAAA,YAAK,EAAC,WAAW,CAAC,mCAAI,EAAE,CAA2B,CAAC;AAC9D,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,eAAe,EAAE,IAAA,gBAAS,EAAC,cAAc,CAAC,EAAE;QAC1D,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,aAAa,iBAYxB"}