@formigio/fazemos-cli 0.10.46 → 0.10.47
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/dist/config.d.ts +11 -0
- package/dist/config.js +49 -6
- package/dist/config.js.map +1 -1
- package/dist/index.js +40 -8
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/config.d.ts
CHANGED
|
@@ -84,6 +84,17 @@ export declare function addEnvironment(name: string, env: {
|
|
|
84
84
|
cognitoRegion: string;
|
|
85
85
|
}): void;
|
|
86
86
|
export declare function hasEnvironments(): boolean;
|
|
87
|
+
/** Set the in-memory environment override from the global `--env` flag (or null to clear). */
|
|
88
|
+
export declare function setEnvOverride(name: string | null): void;
|
|
89
|
+
export type EnvSource = 'flag' | 'session' | 'persisted' | 'none';
|
|
90
|
+
/** Where the effective environment name came from, for display in whoami/env. */
|
|
91
|
+
export declare function getActiveEnvSource(): EnvSource;
|
|
92
|
+
/**
|
|
93
|
+
* The effective environment name for this process, honoring the precedence
|
|
94
|
+
* chain above. Returns '' when nothing is configured (callers surface a clear
|
|
95
|
+
* "no environment" error via getEnv).
|
|
96
|
+
*/
|
|
97
|
+
export declare function getActiveEnvName(): string;
|
|
87
98
|
export declare function getEnv(): {
|
|
88
99
|
apiUrl: string;
|
|
89
100
|
cognitoPoolId: string;
|
package/dist/config.js
CHANGED
|
@@ -22,15 +22,58 @@ export function addEnvironment(name, env) {
|
|
|
22
22
|
export function hasEnvironments() {
|
|
23
23
|
return Object.keys(config.get('environments')).length > 0;
|
|
24
24
|
}
|
|
25
|
+
// ── Session-scoped environment override ─────────────────────
|
|
26
|
+
//
|
|
27
|
+
// The persisted `activeEnv` lives in a single on-disk `conf` file shared by
|
|
28
|
+
// every session on the machine, so a bare `fazemos env <name>` in one session
|
|
29
|
+
// clobbers another. To let concurrent agents target different environments
|
|
30
|
+
// without stomping each other (the CLI-DX-1 "credentials keyed only by env"
|
|
31
|
+
// gap), the effective environment is resolved per-process:
|
|
32
|
+
//
|
|
33
|
+
// --env <name> flag > FAZEMOS_ENV env var > persisted activeEnv
|
|
34
|
+
//
|
|
35
|
+
// The flag override is set once at CLI bootstrap (see the preAction hook in
|
|
36
|
+
// src/index.ts). Environment is deliberately session-scoped — not written into
|
|
37
|
+
// a git-committable `.fazemos.json` like org/project — because dev/prod is a
|
|
38
|
+
// per-session choice that shouldn't be pinned in a shared repo file.
|
|
39
|
+
let envOverride = null;
|
|
40
|
+
/** Set the in-memory environment override from the global `--env` flag (or null to clear). */
|
|
41
|
+
export function setEnvOverride(name) {
|
|
42
|
+
envOverride = name?.trim() || null;
|
|
43
|
+
}
|
|
44
|
+
/** Where the effective environment name came from, for display in whoami/env. */
|
|
45
|
+
export function getActiveEnvSource() {
|
|
46
|
+
if (envOverride)
|
|
47
|
+
return 'flag';
|
|
48
|
+
if (process.env.FAZEMOS_ENV?.trim())
|
|
49
|
+
return 'session';
|
|
50
|
+
if (config.get('activeEnv'))
|
|
51
|
+
return 'persisted';
|
|
52
|
+
return 'none';
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* The effective environment name for this process, honoring the precedence
|
|
56
|
+
* chain above. Returns '' when nothing is configured (callers surface a clear
|
|
57
|
+
* "no environment" error via getEnv).
|
|
58
|
+
*/
|
|
59
|
+
export function getActiveEnvName() {
|
|
60
|
+
return envOverride || process.env.FAZEMOS_ENV?.trim() || config.get('activeEnv');
|
|
61
|
+
}
|
|
25
62
|
export function getEnv() {
|
|
26
|
-
const name =
|
|
63
|
+
const name = getActiveEnvName();
|
|
64
|
+
if (!name) {
|
|
65
|
+
throw new Error('No environment configured. Run: fazemos init <name> --api-url <url>');
|
|
66
|
+
}
|
|
27
67
|
const env = config.get('environments')[name];
|
|
28
|
-
if (!env)
|
|
29
|
-
|
|
68
|
+
if (!env) {
|
|
69
|
+
const src = getActiveEnvSource();
|
|
70
|
+
const via = src === 'flag' ? ' (from --env)' : src === 'session' ? ' (from FAZEMOS_ENV)' : '';
|
|
71
|
+
throw new Error(`Environment "${name}"${via} is not configured. Configure it with: fazemos init ${name} --api-url <url>`);
|
|
72
|
+
}
|
|
30
73
|
return { name, ...env };
|
|
31
74
|
}
|
|
32
75
|
export function getToken() {
|
|
33
|
-
const env =
|
|
76
|
+
const env = getActiveEnvName();
|
|
34
77
|
const auth = config.get('auth')[env];
|
|
35
78
|
if (!auth)
|
|
36
79
|
return null;
|
|
@@ -123,7 +166,7 @@ export function getAuthMeCache() {
|
|
|
123
166
|
const cache = config.get('authMeCache');
|
|
124
167
|
if (!cache)
|
|
125
168
|
return null;
|
|
126
|
-
const activeEnv =
|
|
169
|
+
const activeEnv = getActiveEnvName();
|
|
127
170
|
if (cache.activeEnv !== activeEnv)
|
|
128
171
|
return null;
|
|
129
172
|
if (Date.now() - cache.fetchedAt > AUTH_ME_CACHE_TTL_MS)
|
|
@@ -131,7 +174,7 @@ export function getAuthMeCache() {
|
|
|
131
174
|
return cache.data;
|
|
132
175
|
}
|
|
133
176
|
export function setAuthMeCache(data) {
|
|
134
|
-
const activeEnv =
|
|
177
|
+
const activeEnv = getActiveEnvName();
|
|
135
178
|
config.set('authMeCache', {
|
|
136
179
|
activeEnv,
|
|
137
180
|
fetchedAt: Date.now(),
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AA+ExB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAElD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAgB;IAC5C,WAAW,EAAE,aAAa;IAC1B,QAAQ,EAAE;QACR,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,kBAAkB,EAAE,EAAE;QACtB,IAAI,EAAE,EAAE;KACT;CACF,CAAC,CAAC;AAEH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,GAA8F;IACzI,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;IACjB,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACjC,iCAAiC;IACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,MAAM;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AA+ExB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAElD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAgB;IAC5C,WAAW,EAAE,aAAa;IAC1B,QAAQ,EAAE;QACR,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,kBAAkB,EAAE,EAAE;QACtB,IAAI,EAAE,EAAE;KACT;CACF,CAAC,CAAC;AAEH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,GAA8F;IACzI,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;IACjB,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACjC,iCAAiC;IACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5D,CAAC;AAED,+DAA+D;AAC/D,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,2EAA2E;AAC3E,4EAA4E;AAC5E,2DAA2D;AAC3D,EAAE;AACF,sEAAsE;AACtE,EAAE;AACF,4EAA4E;AAC5E,+EAA+E;AAC/E,6EAA6E;AAC7E,qEAAqE;AAErE,IAAI,WAAW,GAAkB,IAAI,CAAC;AAEtC,8FAA8F;AAC9F,MAAM,UAAU,cAAc,CAAC,IAAmB;IAChD,WAAW,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC;AACrC,CAAC;AAID,iFAAiF;AACjF,MAAM,UAAU,kBAAkB;IAChC,IAAI,WAAW;QAAE,OAAO,MAAM,CAAC;IAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE;QAAE,OAAO,SAAS,CAAC;IACtD,IAAI,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO,WAAW,CAAC;IAChD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,MAAM;IACpB,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAChC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9F,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,IAAI,GAAG,uDAAuD,IAAI,kBAAkB,CAAC,CAAC;IAC5H,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC7C,OAAO,IAAI,CAAC,OAAO,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACxC,OAAO,KAAK,IAAI,IAAI,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,+DAA+D;AAC/D,EAAE;AACF,6EAA6E;AAC7E,8EAA8E;AAC9E,wEAAwE;AACxE,8EAA8E;AAC9E,6EAA6E;AAC7E,4DAA4D;AAE5D,IAAI,WAAW,GAAkB,IAAI,CAAC;AACtC,IAAI,eAAe,GAAkB,IAAI,CAAC;AAC1C,IAAI,gBAAgB,GAA4D,IAAI,CAAC;AAErF,iFAAiF;AACjF,MAAM,UAAU,cAAc,CAAC,KAAoB;IACjD,WAAW,GAAG,KAAK,CAAC;AACtB,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,kBAAkB,CAAC,SAAwB;IACzD,eAAe,GAAG,SAAS,CAAC;AAC9B,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,mBAAmB,CAAC,MAA+D;IACjG,gBAAgB,GAAG,MAAM,CAAC;AAC5B,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,mBAAmB;IACjC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,OAAe,EAAE,YAAoB,EAAE,gBAAwB;IACjH,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,GAAG,CAAC,GAAG;QACV,KAAK;QACL,OAAO;QACP,YAAY;QACZ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,GAAG,IAAI;KAChD,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED,+DAA+D;AAE/D;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB;IAChC,IAAI,eAAe;QAAE,OAAO,eAAe,CAAC;IAC5C,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AAC5B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa,EAAE,SAAiB;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;IACnD,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IACvB,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;IAClB,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAED,+DAA+D;AAE/D,MAAM,UAAU,cAAc;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IACrC,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC/C,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,oBAAoB;QAAE,OAAO,IAAI,CAAC;IACrE,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAoB;IACjD,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE;QACxB,SAAS;QACT,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,yEAAyE;IACzE,yEAAyE;IACzE,wBAAwB;IACxB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa,EAAE,IAAY;IAC3D,MAAM,EAAE,GAAG,cAAc,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,SAAiB;IAC9D,MAAM,EAAE,GAAG,cAAc,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,IAAI,IAAI,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,EAAE,GAAG,cAAc,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC;AACnD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,EAAE,GAAG,cAAc,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC;AACpD,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import chalk from 'chalk';
|
|
4
|
-
import { config, getEnv, getToken, getActiveOrgId, setActiveOrgId, addEnvironment, hasEnvironments,
|
|
4
|
+
import { config, getEnv, getToken, getActiveEnvName, getActiveEnvSource, setEnvOverride, getActiveOrgId, setActiveOrgId, addEnvironment, hasEnvironments,
|
|
5
5
|
// F15 — project context helpers
|
|
6
6
|
getActiveProjectId, setActiveProjectId, clearActiveProjectId, findProjectBySlug, findProjectById, findOrgById,
|
|
7
7
|
// Directory-scoped context override (.fazemos.json)
|
|
@@ -199,7 +199,12 @@ const program = new Command();
|
|
|
199
199
|
program
|
|
200
200
|
.name('fazemos')
|
|
201
201
|
.description('Fazemos CLI — Team Accomplishment Platform')
|
|
202
|
-
.version(pkg.version)
|
|
202
|
+
.version(pkg.version)
|
|
203
|
+
// Session-scoped environment override. Precedence: this flag > FAZEMOS_ENV
|
|
204
|
+
// env var > the persisted active env. Lets one command (or, via the env var,
|
|
205
|
+
// a whole session) target a different environment without a shared-disk
|
|
206
|
+
// `fazemos env` switch that would clobber a concurrent session.
|
|
207
|
+
.option('--env <name>', 'Environment to use for this invocation (overrides FAZEMOS_ENV and the persisted active env)');
|
|
203
208
|
// ── Directory-scoped default org/project (.fazemos.json) ─────
|
|
204
209
|
//
|
|
205
210
|
// Before any command action runs, discover the nearest `.fazemos.json`
|
|
@@ -266,6 +271,11 @@ async function applyDirContext(topCommand) {
|
|
|
266
271
|
}
|
|
267
272
|
}
|
|
268
273
|
program.hook('preAction', async (_thisCommand, actionCommand) => {
|
|
274
|
+
// Apply the global `--env` flag first so every downstream resolution (dir
|
|
275
|
+
// context slug lookups, auth, API calls) sees the right environment.
|
|
276
|
+
const envFlag = program.opts().env;
|
|
277
|
+
if (envFlag)
|
|
278
|
+
setEnvOverride(envFlag);
|
|
269
279
|
// Resolve the top-level command name (e.g. `worksheets list` → `worksheets`).
|
|
270
280
|
let c = actionCommand;
|
|
271
281
|
let top = c?.name?.();
|
|
@@ -332,8 +342,8 @@ program
|
|
|
332
342
|
// ── Environment ─────────────────────────────────────────────
|
|
333
343
|
program
|
|
334
344
|
.command('env')
|
|
335
|
-
.description('Show or switch environment')
|
|
336
|
-
.argument('[name]', 'Environment to switch to')
|
|
345
|
+
.description('Show or switch environment. The persisted switch is machine-global; for per-session isolation set FAZEMOS_ENV or pass --env.')
|
|
346
|
+
.argument('[name]', 'Environment to switch to (persisted, machine-global)')
|
|
337
347
|
.action((name) => {
|
|
338
348
|
if (!hasEnvironments()) {
|
|
339
349
|
console.log(chalk.yellow('No environments configured. Run: fazemos init <name> --api-url <url>'));
|
|
@@ -347,10 +357,25 @@ program
|
|
|
347
357
|
process.exit(1);
|
|
348
358
|
}
|
|
349
359
|
config.set('activeEnv', name);
|
|
350
|
-
console.log(chalk.green(`Switched to ${name}`));
|
|
360
|
+
console.log(chalk.green(`Switched persisted environment to ${name}`));
|
|
361
|
+
// A persisted switch is machine-global. If this session is pinned to a
|
|
362
|
+
// different env via the override chain, the switch won't take effect here
|
|
363
|
+
// until the override is cleared — say so rather than silently no-op'ing.
|
|
364
|
+
const src = getActiveEnvSource();
|
|
365
|
+
if ((src === 'session' || src === 'flag') && getActiveEnvName() !== name) {
|
|
366
|
+
const via = src === 'flag' ? '--env' : 'FAZEMOS_ENV';
|
|
367
|
+
console.log(chalk.yellow(`Note: this session is pinned to "${getActiveEnvName()}" via ${via}; ` +
|
|
368
|
+
`the persisted switch won't take effect here until that override is cleared.`));
|
|
369
|
+
}
|
|
351
370
|
}
|
|
352
371
|
const env = getEnv();
|
|
353
|
-
|
|
372
|
+
const src = getActiveEnvSource();
|
|
373
|
+
const srcLabel = src === 'flag'
|
|
374
|
+
? chalk.gray(' (this invocation, via --env)')
|
|
375
|
+
: src === 'session'
|
|
376
|
+
? chalk.gray(' (this session, via FAZEMOS_ENV)')
|
|
377
|
+
: '';
|
|
378
|
+
console.log(` Environment: ${chalk.cyan(env.name)}${srcLabel}`);
|
|
354
379
|
console.log(` API: ${env.apiUrl}`);
|
|
355
380
|
console.log(` Cognito: ${env.cognitoPoolId}`);
|
|
356
381
|
const token = getToken();
|
|
@@ -433,11 +458,11 @@ auth
|
|
|
433
458
|
.command('logout')
|
|
434
459
|
.description('Clear stored credentials')
|
|
435
460
|
.action(() => {
|
|
436
|
-
const env =
|
|
461
|
+
const env = getActiveEnvName();
|
|
437
462
|
const auths = config.get('auth');
|
|
438
463
|
delete auths[env];
|
|
439
464
|
config.set('auth', auths);
|
|
440
|
-
console.log(chalk.green(
|
|
465
|
+
console.log(chalk.green(`Logged out of ${env}`));
|
|
441
466
|
});
|
|
442
467
|
// ── Whoami ──────────────────────────────────────────────────
|
|
443
468
|
program
|
|
@@ -459,6 +484,13 @@ program
|
|
|
459
484
|
}
|
|
460
485
|
console.log(` User: ${chalk.cyan(data.user.email)}`);
|
|
461
486
|
console.log(` Member: ${data.member.displayName} (${data.member.role})`);
|
|
487
|
+
const envSrc = getActiveEnvSource();
|
|
488
|
+
const envSrcLabel = envSrc === 'flag'
|
|
489
|
+
? chalk.gray(' (this invocation, via --env)')
|
|
490
|
+
: envSrc === 'session'
|
|
491
|
+
? chalk.gray(' (this session, via FAZEMOS_ENV)')
|
|
492
|
+
: '';
|
|
493
|
+
console.log(` Env: ${chalk.cyan(getActiveEnvName())}${envSrcLabel}`);
|
|
462
494
|
const activeOrgId = getActiveOrgId() ?? data.activeOrgId;
|
|
463
495
|
const activeOrg = data.orgs.find(o => o.id === activeOrgId);
|
|
464
496
|
if (activeOrg) {
|