@jacebenson/jsn 0.0.6 → 0.0.8
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.
- package/package.json +1 -1
- package/src/commands/setup.js +5 -1
- package/src/config.js +4 -2
package/package.json
CHANGED
package/src/commands/setup.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import readline from 'node:readline';
|
|
2
|
-
import { getEffectiveInstance, normalizeInstanceURL, setProfile } from '../config.js';
|
|
2
|
+
import { getEffectiveInstance, normalizeInstanceURL, saveConfig, setProfile } from '../config.js';
|
|
3
3
|
|
|
4
4
|
export function setupCmd(wrap) {
|
|
5
5
|
return {
|
|
@@ -21,6 +21,10 @@ export function setupCmd(wrap) {
|
|
|
21
21
|
|
|
22
22
|
const profileName = await ask('Profile name (default): ') || 'default';
|
|
23
23
|
await setProfile(app.config, profileName, { instance_url: instance });
|
|
24
|
+
// Set as active profile so subsequent commands know which instance to use
|
|
25
|
+
app.config.activeProfile = profileName;
|
|
26
|
+
app.config.defaultProfile = profileName;
|
|
27
|
+
saveConfig(app.config);
|
|
24
28
|
|
|
25
29
|
const loginNow = await ask('Login now? [Y/n]: ');
|
|
26
30
|
if (!loginNow || loginNow.toLowerCase() !== 'n') {
|
package/src/config.js
CHANGED
|
@@ -50,6 +50,7 @@ function loadFromFile(cfg, filePath, source) {
|
|
|
50
50
|
}
|
|
51
51
|
if (fileCfg.default_profile) {
|
|
52
52
|
cfg.defaultProfile = fileCfg.default_profile;
|
|
53
|
+
cfg.activeProfile = fileCfg.default_profile;
|
|
53
54
|
cfg.sources.default_profile = source;
|
|
54
55
|
}
|
|
55
56
|
if (fileCfg.profiles && typeof fileCfg.profiles === 'object') {
|
|
@@ -134,8 +135,9 @@ export function saveLocalConfig(cfg) {
|
|
|
134
135
|
}
|
|
135
136
|
|
|
136
137
|
export function getEffectiveInstance(cfg) {
|
|
137
|
-
|
|
138
|
-
|
|
138
|
+
const name = cfg.activeProfile || cfg.defaultProfile;
|
|
139
|
+
if (name && cfg.profiles[name] && cfg.profiles[name].instance_url) {
|
|
140
|
+
return cfg.profiles[name].instance_url;
|
|
139
141
|
}
|
|
140
142
|
return cfg.instanceURL || '';
|
|
141
143
|
}
|