@catladder/cli 0.0.0-main-4d541b99 → 0.0.0-main-430e4128

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/bundles/catenv/index.js +17 -11
  2. package/dist/bundles/cli/index.js +17 -11
  3. package/dist/cli/src/utils/preferences.d.ts +1 -0
  4. package/dist/cli/src/utils/preferences.js +17 -11
  5. package/dist/cli/src/utils/preferences.js.map +1 -1
  6. package/dist/pipeline/src/build/types.d.ts +1 -1
  7. package/dist/tsconfig.tsbuildinfo +1 -1
  8. package/package.json +1 -1
  9. package/src/utils/preferences.ts +28 -9
package/dist/bundles/catenv/index.js CHANGED
@@ -717,7 +717,7 @@ exports.upsertAllVariables = upsertAllVariables;
717
717
  "use strict";
718
718
 
719
719
  Object.defineProperty(exports, "__esModule", ({ value: true }));
720
- exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
720
+ exports.setPreference = exports.getPreference = exports.hasPreference = exports.getPreferences = void 0;
721
721
  const promises_1 = __nccwpck_require__(3292);
722
722
  const fs_1 = __nccwpck_require__(7147);
723
723
  const path_1 = __nccwpck_require__(1017);
@@ -726,40 +726,46 @@ const yaml_1 = __nccwpck_require__(8033);
726
726
  const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
727
727
  const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
728
728
  const ensurePreferencesFile = async () => {
729
+ if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
730
+ await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
731
+ await (0, promises_1.cp)(legacyPreferencesPath, preferencesPath);
732
+ await (0, promises_1.chmod)((0, path_1.dirname)(preferencesPath), 0o600);
733
+ await (0, promises_1.rename)(legacyPreferencesPath, (0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"));
734
+ await (0, promises_1.chmod)((0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"), 0o600);
735
+ await (0, promises_1.rmdir)((0, path_1.dirname)(legacyPreferencesPath));
736
+ return;
737
+ }
729
738
  if ((0, fs_1.existsSync)(preferencesPath)) {
730
- return preferencesPath;
739
+ return;
731
740
  }
732
741
  await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
733
742
  await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
734
743
  encoding: "utf-8",
735
744
  mode: 0o600,
736
745
  });
737
- if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
738
- return legacyPreferencesPath;
739
- }
740
- return preferencesPath;
741
746
  };
742
747
  const loadPreferences = async () => {
743
- const currentLoadPath = await ensurePreferencesFile();
744
- return (0, promises_1.readFile)(currentLoadPath, { encoding: "utf-8" });
748
+ await ensurePreferencesFile();
749
+ return (0, promises_1.readFile)(preferencesPath, { encoding: "utf-8" });
745
750
  };
746
751
  const getPreferences = async () => {
747
752
  var _a;
748
753
  const yamlContent = await loadPreferences();
749
754
  return ((_a = (0, yaml_1.parse)(yamlContent)) !== null && _a !== void 0 ? _a : {});
750
755
  };
756
+ exports.getPreferences = getPreferences;
751
757
  const hasPreference = async (key) => {
752
- const preferences = await getPreferences();
758
+ const preferences = await (0, exports.getPreferences)();
753
759
  return key in preferences;
754
760
  };
755
761
  exports.hasPreference = hasPreference;
756
762
  const getPreference = async (key) => {
757
- const preferences = await getPreferences();
763
+ const preferences = await (0, exports.getPreferences)();
758
764
  return preferences[key];
759
765
  };
760
766
  exports.getPreference = getPreference;
761
767
  const setPreference = async (key, value) => {
762
- const preferences = await getPreferences();
768
+ const preferences = await (0, exports.getPreferences)();
763
769
  const newPreferences = {
764
770
  ...preferences,
765
771
  [key]: value,
package/dist/bundles/cli/index.js CHANGED
@@ -3604,7 +3604,7 @@ exports.stopAllPortForwards = stopAllPortForwards;
3604
3604
  "use strict";
3605
3605
 
3606
3606
  Object.defineProperty(exports, "__esModule", ({ value: true }));
3607
- exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
3607
+ exports.setPreference = exports.getPreference = exports.hasPreference = exports.getPreferences = void 0;
3608
3608
  const promises_1 = __nccwpck_require__(73292);
3609
3609
  const fs_1 = __nccwpck_require__(57147);
3610
3610
  const path_1 = __nccwpck_require__(71017);
@@ -3613,40 +3613,46 @@ const yaml_1 = __nccwpck_require__(68033);
3613
3613
  const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
3614
3614
  const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
3615
3615
  const ensurePreferencesFile = async () => {
3616
+ if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
3617
+ await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
3618
+ await (0, promises_1.cp)(legacyPreferencesPath, preferencesPath);
3619
+ await (0, promises_1.chmod)((0, path_1.dirname)(preferencesPath), 0o600);
3620
+ await (0, promises_1.rename)(legacyPreferencesPath, (0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"));
3621
+ await (0, promises_1.chmod)((0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"), 0o600);
3622
+ await (0, promises_1.rmdir)((0, path_1.dirname)(legacyPreferencesPath));
3623
+ return;
3624
+ }
3616
3625
  if ((0, fs_1.existsSync)(preferencesPath)) {
3617
- return preferencesPath;
3626
+ return;
3618
3627
  }
3619
3628
  await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
3620
3629
  await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
3621
3630
  encoding: "utf-8",
3622
3631
  mode: 0o600,
3623
3632
  });
3624
- if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
3625
- return legacyPreferencesPath;
3626
- }
3627
- return preferencesPath;
3628
3633
  };
3629
3634
  const loadPreferences = async () => {
3630
- const currentLoadPath = await ensurePreferencesFile();
3631
- return (0, promises_1.readFile)(currentLoadPath, { encoding: "utf-8" });
3635
+ await ensurePreferencesFile();
3636
+ return (0, promises_1.readFile)(preferencesPath, { encoding: "utf-8" });
3632
3637
  };
3633
3638
  const getPreferences = async () => {
3634
3639
  var _a;
3635
3640
  const yamlContent = await loadPreferences();
3636
3641
  return ((_a = (0, yaml_1.parse)(yamlContent)) !== null && _a !== void 0 ? _a : {});
3637
3642
  };
3643
+ exports.getPreferences = getPreferences;
3638
3644
  const hasPreference = async (key) => {
3639
- const preferences = await getPreferences();
3645
+ const preferences = await (0, exports.getPreferences)();
3640
3646
  return key in preferences;
3641
3647
  };
3642
3648
  exports.hasPreference = hasPreference;
3643
3649
  const getPreference = async (key) => {
3644
- const preferences = await getPreferences();
3650
+ const preferences = await (0, exports.getPreferences)();
3645
3651
  return preferences[key];
3646
3652
  };
3647
3653
  exports.getPreference = getPreference;
3648
3654
  const setPreference = async (key, value) => {
3649
- const preferences = await getPreferences();
3655
+ const preferences = await (0, exports.getPreferences)();
3650
3656
  const newPreferences = {
3651
3657
  ...preferences,
3652
3658
  [key]: value,
package/dist/cli/src/utils/preferences.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ export declare const getPreferences: () => Promise<Record<string, string>>;
1
2
  export declare const hasPreference: (key: string) => Promise<boolean>;
2
3
  export declare const getPreference: (key: string) => Promise<string>;
3
4
  export declare const setPreference: (key: string, value: string | number) => Promise<void>;
package/dist/cli/src/utils/preferences.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
3
+ exports.setPreference = exports.getPreference = exports.hasPreference = exports.getPreferences = void 0;
4
4
  const promises_1 = require("fs/promises");
5
5
  const fs_1 = require("fs");
6
6
  const path_1 = require("path");
@@ -9,40 +9,46 @@ const yaml_1 = require("yaml");
9
9
  const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
10
10
  const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
11
11
  const ensurePreferencesFile = async () => {
12
+ if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
13
+ await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
14
+ await (0, promises_1.cp)(legacyPreferencesPath, preferencesPath);
15
+ await (0, promises_1.chmod)((0, path_1.dirname)(preferencesPath), 0o600);
16
+ await (0, promises_1.rename)(legacyPreferencesPath, (0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"));
17
+ await (0, promises_1.chmod)((0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"), 0o600);
18
+ await (0, promises_1.rmdir)((0, path_1.dirname)(legacyPreferencesPath));
19
+ return;
20
+ }
12
21
  if ((0, fs_1.existsSync)(preferencesPath)) {
13
- return preferencesPath;
22
+ return;
14
23
  }
15
24
  await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
16
25
  await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
17
26
  encoding: "utf-8",
18
27
  mode: 0o600,
19
28
  });
20
- if ((0, fs_1.existsSync)(legacyPreferencesPath)) {
21
- return legacyPreferencesPath;
22
- }
23
- return preferencesPath;
24
29
  };
25
30
  const loadPreferences = async () => {
26
- const currentLoadPath = await ensurePreferencesFile();
27
- return (0, promises_1.readFile)(currentLoadPath, { encoding: "utf-8" });
31
+ await ensurePreferencesFile();
32
+ return (0, promises_1.readFile)(preferencesPath, { encoding: "utf-8" });
28
33
  };
29
34
  const getPreferences = async () => {
30
35
  var _a;
31
36
  const yamlContent = await loadPreferences();
32
37
  return ((_a = (0, yaml_1.parse)(yamlContent)) !== null && _a !== void 0 ? _a : {});
33
38
  };
39
+ exports.getPreferences = getPreferences;
34
40
  const hasPreference = async (key) => {
35
- const preferences = await getPreferences();
41
+ const preferences = await (0, exports.getPreferences)();
36
42
  return key in preferences;
37
43
  };
38
44
  exports.hasPreference = hasPreference;
39
45
  const getPreference = async (key) => {
40
- const preferences = await getPreferences();
46
+ const preferences = await (0, exports.getPreferences)();
41
47
  return preferences[key];
42
48
  };
43
49
  exports.getPreference = getPreference;
44
50
  const setPreference = async (key, value) => {
45
- const preferences = await getPreferences();
51
+ const preferences = await (0, exports.getPreferences)();
46
52
  const newPreferences = {
47
53
  ...preferences,
48
54
  [key]: value,
package/dist/cli/src/utils/preferences.js.map CHANGED
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../../src/utils/preferences.ts"],"names":[],"mappings":"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"}
package/dist/pipeline/src/build/types.d.ts CHANGED
@@ -133,7 +133,7 @@ export type BuildConfigNode = {
133
133
  } & BuildConfigNodeBase;
134
134
  export type BuildConfigNodeStatic = BuildConfigNodeBase & {
135
135
  /**
136
- * @deprecated use type: "node" and docker: { type: "nginx" } instead
136
+ * @deprecated use `type: "node", startCommand: "", docker: { type: "nginx" }` instead
137
137
  */
138
138
  type: "node-static";
139
139
  startCommand?: never;