@seamapi/cli 0.22.0 → 0.23.0
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/bin/cli.js +3 -3
- package/bin/cli.js.map +1 -1
- package/lib/auth/operations.d.ts +7 -7
- package/lib/auth/operations.js +15 -28
- package/lib/auth/operations.js.map +1 -1
- package/lib/blueprint/source-npm.js +2 -2
- package/lib/blueprint/source-npm.js.map +1 -1
- package/lib/commands/local/wizard.d.ts +7 -0
- package/lib/commands/local/wizard.js +31 -0
- package/lib/commands/local/wizard.js.map +1 -1
- package/lib/config/cli-config.d.ts +19 -0
- package/lib/config/cli-config.js +51 -0
- package/lib/config/cli-config.js.map +1 -0
- package/lib/config/config-store.d.ts +8 -5
- package/lib/config/config-store.js +15 -13
- package/lib/config/config-store.js.map +1 -1
- package/lib/config/index.d.ts +3 -2
- package/lib/config/index.js +3 -2
- package/lib/config/index.js.map +1 -1
- package/lib/config/memory-config-store.d.ts +6 -0
- package/lib/config/memory-config-store.js +6 -0
- package/lib/config/memory-config-store.js.map +1 -1
- package/lib/context.d.ts +3 -3
- package/lib/context.js +6 -16
- package/lib/context.js.map +1 -1
- package/lib/interactions/endpoint-selection.js +2 -2
- package/lib/interactions/endpoint-selection.js.map +1 -1
- package/lib/interactions/login.js +2 -2
- package/lib/interactions/login.js.map +1 -1
- package/lib/interactions/workspace-id.js +2 -2
- package/lib/interactions/workspace-id.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +2 -2
- package/src/bin/cli.ts +3 -3
- package/src/lib/auth/operations.ts +15 -29
- package/src/lib/blueprint/source-npm.ts +2 -3
- package/src/lib/commands/local/wizard.ts +48 -0
- package/src/lib/config/cli-config.ts +83 -0
- package/src/lib/config/config-store.ts +16 -13
- package/src/lib/config/index.ts +9 -4
- package/src/lib/config/memory-config-store.ts +9 -0
- package/src/lib/context.ts +7 -24
- package/src/lib/interactions/endpoint-selection.ts +2 -2
- package/src/lib/interactions/login.ts +2 -2
- package/src/lib/interactions/workspace-id.ts +2 -2
- package/src/lib/version.ts +1 -1
package/bin/cli.js
CHANGED
|
@@ -7,7 +7,7 @@ import { getApiBlueprint } from '../lib/blueprint/index.js';
|
|
|
7
7
|
import { printCompletion } from '../lib/commands/local/completion.js';
|
|
8
8
|
import { runWizard } from '../lib/commands/local/wizard.js';
|
|
9
9
|
import { acceptedParamsOf, buildRegistry, findLocalCommand, findLocalCommandTakingPositional, } from '../lib/commands/registry.js';
|
|
10
|
-
import {
|
|
10
|
+
import { getConfig } from '../lib/config/index.js';
|
|
11
11
|
import { resolveAuth } from '../lib/context.js';
|
|
12
12
|
import { tokenEnvVar } from '../lib/env.js';
|
|
13
13
|
import { reportErrorAndExit } from '../lib/errors.js';
|
|
@@ -23,7 +23,7 @@ import { completionShells, isCompletionShell, } from '../lib/render/completion/i
|
|
|
23
23
|
import { renderHelp } from '../lib/render/help.js';
|
|
24
24
|
import seamapiCliVersion from '../lib/version.js';
|
|
25
25
|
async function cli(args, argv) {
|
|
26
|
-
const config =
|
|
26
|
+
const config = getConfig();
|
|
27
27
|
const output = getOutput();
|
|
28
28
|
// Scoped to this one command, and read wherever auth resolves, so they are
|
|
29
29
|
// in place before anything asks what the endpoint or the workspace is.
|
|
@@ -120,7 +120,7 @@ async function cli(args, argv) {
|
|
|
120
120
|
process.exitCode = 1;
|
|
121
121
|
return;
|
|
122
122
|
}
|
|
123
|
-
const useRemoteApiDefs = args['remote_api_defs'] ?? config.
|
|
123
|
+
const useRemoteApiDefs = args['remote_api_defs'] ?? config.getUseRemoteApiDefs();
|
|
124
124
|
const blueprint = await getApiBlueprint({
|
|
125
125
|
useRemoteDefinitions: useRemoteApiDefs ?? false,
|
|
126
126
|
update,
|
package/bin/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/bin/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,IAAI,OAAO,EAAE,MAAM,WAAW,CAAA;AAExD,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACxD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,gCAAgC,GACjC,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/bin/cli.ts"],"names":[],"mappings":"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"}
|
package/lib/auth/operations.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type CliConfig } from '../config/index.js';
|
|
2
2
|
import { type AuthContext } from '../context.js';
|
|
3
3
|
import { validateToken } from './validate-token.js';
|
|
4
4
|
/** A stored auth setting an environment variable may override. */
|
|
@@ -24,18 +24,18 @@ export declare const assertMutable: (auth: AuthContext, setting: AuthSetting, ac
|
|
|
24
24
|
*
|
|
25
25
|
* Validation reaches the network, so a test may inject its own `validate`.
|
|
26
26
|
*/
|
|
27
|
-
export declare const login: (token: string, config?:
|
|
27
|
+
export declare const login: (token: string, config?: CliConfig, validate?: typeof validateToken) => Promise<void>;
|
|
28
28
|
/** Store the token for the current endpoint, e.g., one just prompted for. */
|
|
29
|
-
export declare const storeToken: (token: string, config?:
|
|
29
|
+
export declare const storeToken: (token: string, config?: CliConfig) => void;
|
|
30
30
|
/** Remove the stored token and workspace selection. */
|
|
31
|
-
export declare const logout: (config?:
|
|
31
|
+
export declare const logout: (config?: CliConfig) => void;
|
|
32
32
|
/**
|
|
33
33
|
* Store the endpoint to make requests against.
|
|
34
34
|
*
|
|
35
35
|
* The workspace selection belongs to the previous endpoint, so it is cleared.
|
|
36
36
|
*/
|
|
37
|
-
export declare const selectEndpoint: (endpoint: string, config?:
|
|
37
|
+
export declare const selectEndpoint: (endpoint: string, config?: CliConfig) => void;
|
|
38
38
|
/** Store the workspace requests are made against. */
|
|
39
|
-
export declare const selectWorkspace: (workspaceId: string, config?:
|
|
39
|
+
export declare const selectWorkspace: (workspaceId: string, config?: CliConfig) => void;
|
|
40
40
|
/** Store whether API definitions come from the endpoint instead of npm. */
|
|
41
|
-
export declare const setUseRemoteApiDefs: (useRemoteApiDefs: boolean, config?:
|
|
41
|
+
export declare const setUseRemoteApiDefs: (useRemoteApiDefs: boolean, config?: CliConfig) => void;
|
package/lib/auth/operations.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getConfig } from '../config/index.js';
|
|
2
2
|
import { resolveAuth } from '../context.js';
|
|
3
3
|
import { assertEnvVarUnset, endpointEnvVar, tokenEnvVar, workspaceIdEnvVar, } from '../env.js';
|
|
4
4
|
import { validateToken } from './validate-token.js';
|
|
@@ -40,58 +40,45 @@ export const assertMutable = (auth, setting, action) => {
|
|
|
40
40
|
*
|
|
41
41
|
* Validation reaches the network, so a test may inject its own `validate`.
|
|
42
42
|
*/
|
|
43
|
-
export const login = async (token, config =
|
|
43
|
+
export const login = async (token, config = getConfig(), validate = validateToken) => {
|
|
44
44
|
const auth = resolveAuth(config);
|
|
45
45
|
// Nothing is stored while the environment overrides it, so refuse before
|
|
46
46
|
// validating rather than after reaching the network.
|
|
47
47
|
assertMutable(auth, 'token', 'log in');
|
|
48
48
|
await validate(token, auth.workspaceId ?? undefined);
|
|
49
|
-
config.
|
|
49
|
+
config.setToken(auth.endpoint, token);
|
|
50
50
|
// The selection belongs to whoever was logged in before.
|
|
51
|
-
config.
|
|
51
|
+
config.unsetWorkspace();
|
|
52
52
|
};
|
|
53
53
|
/** Store the token for the current endpoint, e.g., one just prompted for. */
|
|
54
|
-
export const storeToken = (token, config =
|
|
54
|
+
export const storeToken = (token, config = getConfig()) => {
|
|
55
55
|
const auth = resolveAuth(config);
|
|
56
56
|
assertMutable(auth, 'token', 'log in');
|
|
57
|
-
config.
|
|
57
|
+
config.setToken(auth.endpoint, token);
|
|
58
58
|
};
|
|
59
59
|
/** Remove the stored token and workspace selection. */
|
|
60
|
-
export const logout = (config =
|
|
60
|
+
export const logout = (config = getConfig()) => {
|
|
61
61
|
const auth = resolveAuth(config);
|
|
62
62
|
assertMutable(auth, 'token', 'log out');
|
|
63
|
-
config.
|
|
64
|
-
|
|
65
|
-
// un-namespaced token, so drop that too.
|
|
66
|
-
config.delete('pat');
|
|
67
|
-
config.delete('current_workspace_id');
|
|
63
|
+
config.unsetToken(auth.endpoint);
|
|
64
|
+
config.unsetWorkspace();
|
|
68
65
|
};
|
|
69
66
|
/**
|
|
70
67
|
* Store the endpoint to make requests against.
|
|
71
68
|
*
|
|
72
69
|
* The workspace selection belongs to the previous endpoint, so it is cleared.
|
|
73
70
|
*/
|
|
74
|
-
export const selectEndpoint = (endpoint, config =
|
|
71
|
+
export const selectEndpoint = (endpoint, config = getConfig()) => {
|
|
75
72
|
assertMutable(resolveAuth(config), 'endpoint', 'select an endpoint');
|
|
76
|
-
|
|
73
|
+
config.setEndpoint(endpoint);
|
|
77
74
|
};
|
|
78
75
|
/** Store the workspace requests are made against. */
|
|
79
|
-
export const selectWorkspace = (workspaceId, config =
|
|
76
|
+
export const selectWorkspace = (workspaceId, config = getConfig()) => {
|
|
80
77
|
assertMutable(resolveAuth(config), 'workspaceId', 'select a workspace');
|
|
81
|
-
config.
|
|
78
|
+
config.setWorkspace(workspaceId);
|
|
82
79
|
};
|
|
83
80
|
/** Store whether API definitions come from the endpoint instead of npm. */
|
|
84
|
-
export const setUseRemoteApiDefs = (useRemoteApiDefs, config =
|
|
85
|
-
config.
|
|
86
|
-
};
|
|
87
|
-
/**
|
|
88
|
-
* Write the endpoint, dropping what belonged to the previous one: the
|
|
89
|
-
* workspace selection, and any value left under the legacy `server` key that
|
|
90
|
-
* {@link resolveAuth} would otherwise still fall back to.
|
|
91
|
-
*/
|
|
92
|
-
const storeEndpoint = (endpoint, config) => {
|
|
93
|
-
config.set('endpoint', endpoint);
|
|
94
|
-
config.delete('server');
|
|
95
|
-
config.delete('current_workspace_id');
|
|
81
|
+
export const setUseRemoteApiDefs = (useRemoteApiDefs, config = getConfig()) => {
|
|
82
|
+
config.setUseRemoteApiDefs(useRemoteApiDefs);
|
|
96
83
|
};
|
|
97
84
|
//# sourceMappingURL=operations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/lib/auth/operations.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/lib/auth/operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { access, mkdir, rm, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
3
|
import { pathToFileURL } from 'node:url';
|
|
4
|
-
import envPaths from 'env-paths';
|
|
5
4
|
import { extract } from 'tar';
|
|
5
|
+
import { rootPaths } from '../config/index.js';
|
|
6
6
|
import { withLoading } from '../output/with-loading.js';
|
|
7
7
|
import { getBlueprintVersion, getCacheFile, isUpdateCheckDue, readCache, writeCache, } from './cache.js';
|
|
8
8
|
const typesPackageName = '@seamapi/types';
|
|
@@ -14,7 +14,7 @@ const registryUrl = 'https://registry.npmjs.org';
|
|
|
14
14
|
*/
|
|
15
15
|
export const getBlueprint = async (options = {}) => {
|
|
16
16
|
const update = options.update ?? false;
|
|
17
|
-
const cacheDirectory = options.cacheDirectory ??
|
|
17
|
+
const cacheDirectory = options.cacheDirectory ?? rootPaths.cache;
|
|
18
18
|
const cacheFile = getCacheFile(cacheDirectory);
|
|
19
19
|
const blueprintVersion = await getBlueprintVersion();
|
|
20
20
|
const cache = await readCache(cacheFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-npm.js","sourceRoot":"","sources":["../../src/lib/blueprint/source-npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,OAAO,
|
|
1
|
+
{"version":3,"file":"source-npm.js","sourceRoot":"","sources":["../../src/lib/blueprint/source-npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAA;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,SAAS,EACT,UAAU,GACX,MAAM,YAAY,CAAA;AAEnB,MAAM,gBAAgB,GAAG,gBAAgB,CAAA;AACzC,MAAM,mBAAmB,GAAG,qCAAqC,CAAA;AACjE,MAAM,WAAW,GAAG,4BAA4B,CAAA;AAYhD;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,UAA+B,EAAE,EACb,EAAE;IACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAA;IACtC,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,SAAS,CAAC,KAAK,CAAA;IAChE,MAAM,SAAS,GAAG,YAAY,CAAC,cAAc,CAAC,CAAA;IAC9C,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,CAAA;IAEpD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,CAAA;IACxC,MAAM,aAAa,GACjB,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC,gBAAgB,KAAK,gBAAgB,CAAA;IAE9D,IAAI,CAAC,MAAM,IAAI,aAAa,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACnE,OAAO,KAAK,CAAC,SAAS,CAAA;IACxB,CAAC;IAED,IAAI,QAA8B,CAAA;IAClC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,+BAA+B,EAAE,CAAA;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,wEAAwE;QACxE,2DAA2D;QAC3D,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC,SAAS,CAAA;QACpD,MAAM,IAAI,KAAK,CACb,oDAAoD,cAAc,CAAC,KAAK,CAAC,EAAE,CAC5E,CAAA;IACH,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,aAAa,IAAI,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC;QACxE,MAAM,UAAU,CAAC,SAAS,EAAE;YAC1B,GAAG,KAAK;YACR,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAA;QACF,OAAO,KAAK,CAAC,SAAS,CAAA;IACxB,CAAC;IAED,IAAI,SAAoB,CAAA;IACxB,IAAI,CAAC;QACH,SAAS,GAAG,MAAM,WAAW,CAC3B,qCAAqC,gBAAgB,IAAI,QAAQ,CAAC,OAAO,GAAG,EAC5E,KAAK,IAAI,EAAE,CAAC,MAAM,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAC9D,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC,SAAS,CAAA;QACpD,MAAM,IAAI,KAAK,CACb,0CAA0C,cAAc,CAAC,KAAK,CAAC,EAAE,CAClE,CAAA;IACH,CAAC;IAED,MAAM,UAAU,CAAC,SAAS,EAAE;QAC1B,gBAAgB;QAChB,YAAY,EAAE,QAAQ,CAAC,OAAO;QAC9B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS;KACV,CAAC,CAAA;IAEF,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,+BAA+B,GACnC,KAAK,IAAmC,EAAE;IACxC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,WAAW,IAAI,gBAAgB,SAAS,EAAE;QACnE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE;QACvC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAC,CAAA;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IACrE,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;IAC7B,MAAM,QAAQ,GAAG,IAAqC,CAAA;IACtD,IACE,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;QACpC,OAAO,QAAQ,CAAC,IAAI,EAAE,OAAO,KAAK,QAAQ,EAC1C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;IACzE,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAA;AAC3D,CAAC,CAAA;AAEH,MAAM,iBAAiB,GAAG,KAAK,EAC7B,QAA8B,EAC9B,cAAsB,EACF,EAAE;IACtB,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;IAC/D,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC9D,OAAO,MAAM,eAAe,CAAC,EAAE,OAAO,EAAsB,EAAE;QAC5D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,KAAK,EAC3B,QAA8B,EAC9B,cAAsB,EACJ,EAAE;IACpB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE;QAC7C,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAC,CAAA;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IACrE,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;IACvD,MAAM,EAAE,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5D,MAAM,KAAK,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAA;QACvC,MAAM,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QAClD,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE;YAC1D,mBAAmB;SACpB,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAA;QAC9D,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAA;QACjD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,WAAW,mBAAmB,qBAAqB,CAAC,CAAA;QACtE,CAAC;QAED,0EAA0E;QAC1E,MAAM,gBAAgB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,CAAA;QACvD,MAAM,aAAa,GAAG,CAAC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAEpD,CAAA;QACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,aAAa,CAAA;QAC1C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,mBAAmB,EAAE,CAAC,CAAA;QACrE,CAAC;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;YAAS,CAAC;QACT,MAAM,EAAE,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9D,CAAC;AACH,CAAC,CAAA;AAED,MAAM,MAAM,GAAG,KAAK,EAAE,IAAY,EAAoB,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAA;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAAc,EAAU,EAAE,CAChD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import type { WizardAdapter } from '@seamapi/wizard';
|
|
1
2
|
import type { Command } from '../../commands/registry.js';
|
|
3
|
+
import { type CliConfig } from '../../config/index.js';
|
|
2
4
|
/**
|
|
3
5
|
* Run the Seam setup wizard.
|
|
4
6
|
*
|
|
@@ -7,3 +9,8 @@ import type { Command } from '../../commands/registry.js';
|
|
|
7
9
|
*/
|
|
8
10
|
export declare const runWizard: (argv: string[]) => Promise<void>;
|
|
9
11
|
export declare const wizardCommand: Command;
|
|
12
|
+
export declare const createWizardAdapter: ({ cliConfig, configPath, statePath, }?: {
|
|
13
|
+
cliConfig?: CliConfig;
|
|
14
|
+
configPath?: string;
|
|
15
|
+
statePath?: string;
|
|
16
|
+
}) => WizardAdapter;
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import { join } from 'node:path';
|
|
2
|
+
import { isApiKey } from '@seamapi/http/connect';
|
|
3
|
+
import Configstore from 'configstore';
|
|
4
|
+
import { getConfig, rootPaths } from '../../config/index.js';
|
|
5
|
+
import { resolveAuth } from '../../context.js';
|
|
1
6
|
/**
|
|
2
7
|
* Run the Seam setup wizard.
|
|
3
8
|
*
|
|
@@ -9,6 +14,7 @@ export const runWizard = async (argv) => {
|
|
|
9
14
|
await wizard({
|
|
10
15
|
argv,
|
|
11
16
|
commandName: 'seam wizard',
|
|
17
|
+
adapter: createWizardAdapter(),
|
|
12
18
|
});
|
|
13
19
|
};
|
|
14
20
|
export const wizardCommand = {
|
|
@@ -25,4 +31,29 @@ export const wizardCommand = {
|
|
|
25
31
|
return { kind: 'done' };
|
|
26
32
|
},
|
|
27
33
|
};
|
|
34
|
+
const wizardFileName = 'wizard.json';
|
|
35
|
+
export const createWizardAdapter = ({ cliConfig = getConfig(), configPath = join(rootPaths.config, wizardFileName), statePath = join(rootPaths.log, wizardFileName), } = {}) => ({
|
|
36
|
+
getAuth: async () => toWizardAuth(cliConfig),
|
|
37
|
+
config: createStorage(configPath),
|
|
38
|
+
state: createStorage(statePath),
|
|
39
|
+
});
|
|
40
|
+
// Only a workspace-scoped key may go in a project, so a personal access
|
|
41
|
+
// token is not handed over at all.
|
|
42
|
+
const toWizardAuth = (cliConfig) => {
|
|
43
|
+
const { endpoint, token, workspaceId } = resolveAuth(cliConfig);
|
|
44
|
+
return {
|
|
45
|
+
endpoint,
|
|
46
|
+
apiKey: token != null && isApiKey(token) ? token : null,
|
|
47
|
+
workspaceId,
|
|
48
|
+
};
|
|
49
|
+
};
|
|
50
|
+
const createStorage = (path) => {
|
|
51
|
+
const store = new Configstore('seam-cli', undefined, { configPath: path });
|
|
52
|
+
return {
|
|
53
|
+
get: async (key) => store.get(key),
|
|
54
|
+
set: async (key, value) => {
|
|
55
|
+
store.set(key, value);
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
};
|
|
28
59
|
//# sourceMappingURL=wizard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../../src/lib/commands/local/wizard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../../src/lib/commands/local/wizard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAEhD,OAAO,WAAW,MAAM,aAAa,CAAA;AAGrC,OAAO,EAAkB,SAAS,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAc,EAAiB,EAAE;IAC/D,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;IAC3D,MAAM,MAAM,CAAC;QACX,IAAI;QACJ,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,mBAAmB,EAAE;KAC/B,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAY;IACpC,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,QAAQ,CAAC;QAChB,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,qCAAqC;QAC5C,WAAW,EACT,sGAAsG;QACxG,KAAK,EAAE,EAAE;KACV;IACD,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,KAAK,IAAI,EAAE;QAClB,MAAM,SAAS,CAAC,EAAE,CAAC,CAAA;QACnB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;IACzB,CAAC;CACF,CAAA;AAED,MAAM,cAAc,GAAG,aAAa,CAAA;AAEpC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,SAAS,GAAG,SAAS,EAAE,EACvB,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,EACnD,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,MAK7C,EAAE,EAAiB,EAAE,CAAC,CAAC;IACzB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC;IAC5C,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC;IACjC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC;CAChC,CAAC,CAAA;AAEF,wEAAwE;AACxE,mCAAmC;AACnC,MAAM,YAAY,GAAG,CAAC,SAAoB,EAAc,EAAE;IACxD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,CAAA;IAE/D,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,KAAK,IAAI,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QACvD,WAAW;KACZ,CAAA;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,IAAY,EAAkB,EAAE;IACrD,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IAE1E,OAAO;QACL,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;QAClC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YACxB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACvB,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ConfigStore } from './config-store.js';
|
|
2
|
+
/**
|
|
3
|
+
* The CLI's configuration, in the terms the CLI thinks in. Keys are named
|
|
4
|
+
* here alone: a caller says what it wants stored, not where it goes.
|
|
5
|
+
*/
|
|
6
|
+
export interface CliConfig {
|
|
7
|
+
readonly path: string;
|
|
8
|
+
getEndpoint: () => string | null;
|
|
9
|
+
setEndpoint: (endpoint: string) => void;
|
|
10
|
+
getToken: (endpoint: string) => string | null;
|
|
11
|
+
setToken: (endpoint: string, token: string) => void;
|
|
12
|
+
unsetToken: (endpoint: string) => void;
|
|
13
|
+
getWorkspace: () => string | null;
|
|
14
|
+
setWorkspace: (workspaceId: string) => void;
|
|
15
|
+
unsetWorkspace: () => void;
|
|
16
|
+
getUseRemoteApiDefs: () => boolean | null;
|
|
17
|
+
setUseRemoteApiDefs: (useRemoteApiDefs: boolean) => void;
|
|
18
|
+
}
|
|
19
|
+
export declare const createCliConfig: (store: ConfigStore) => CliConfig;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/** Tokens are stored per endpoint, e.g. `https://connect.getseam.com.pat`. */
|
|
2
|
+
const tokenKey = (endpoint) => `${endpoint}.pat`;
|
|
3
|
+
export const createCliConfig = (store) => ({
|
|
4
|
+
get path() {
|
|
5
|
+
return store.path;
|
|
6
|
+
},
|
|
7
|
+
getEndpoint: () =>
|
|
8
|
+
// `server` is what an older CLI called the endpoint.
|
|
9
|
+
readString(store.get('endpoint')) ?? readString(store.get('server')),
|
|
10
|
+
/**
|
|
11
|
+
* Store the endpoint, dropping what belonged to the previous one: the
|
|
12
|
+
* workspace selection, and any value left under the legacy key that
|
|
13
|
+
* {@link CliConfig.getEndpoint} would otherwise still fall back to.
|
|
14
|
+
*/
|
|
15
|
+
setEndpoint: (endpoint) => {
|
|
16
|
+
store.set('endpoint', endpoint);
|
|
17
|
+
store.delete('server');
|
|
18
|
+
store.delete('current_workspace_id');
|
|
19
|
+
},
|
|
20
|
+
getToken: (endpoint) => readString(store.get(tokenKey(endpoint))),
|
|
21
|
+
setToken: (endpoint, token) => {
|
|
22
|
+
store.set(tokenKey(endpoint), token);
|
|
23
|
+
},
|
|
24
|
+
unsetToken: (endpoint) => {
|
|
25
|
+
store.delete(tokenKey(endpoint));
|
|
26
|
+
// Configs written before tokens were stored per endpoint may still hold
|
|
27
|
+
// an un-namespaced one.
|
|
28
|
+
store.delete('pat');
|
|
29
|
+
},
|
|
30
|
+
getWorkspace: () => readString(store.get('current_workspace_id')),
|
|
31
|
+
setWorkspace: (workspaceId) => {
|
|
32
|
+
store.set('current_workspace_id', workspaceId);
|
|
33
|
+
},
|
|
34
|
+
unsetWorkspace: () => {
|
|
35
|
+
store.delete('current_workspace_id');
|
|
36
|
+
},
|
|
37
|
+
getUseRemoteApiDefs: () => {
|
|
38
|
+
const useRemoteApiDefs = store.get('use_remote_api_defs');
|
|
39
|
+
return typeof useRemoteApiDefs === 'boolean' ? useRemoteApiDefs : null;
|
|
40
|
+
},
|
|
41
|
+
setUseRemoteApiDefs: (useRemoteApiDefs) => {
|
|
42
|
+
store.set('use_remote_api_defs', useRemoteApiDefs);
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
const readString = (value) => {
|
|
46
|
+
if (typeof value !== 'string')
|
|
47
|
+
return null;
|
|
48
|
+
const trimmedValue = value.trim();
|
|
49
|
+
return trimmedValue === '' ? null : trimmedValue;
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=cli-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-config.js","sourceRoot":"","sources":["../../src/lib/config/cli-config.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAmB,EAAE,CAAC,GAAG,QAAQ,MAAM,CAAA;AAoBzE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAkB,EAAa,EAAE,CAAC,CAAC;IACjE,IAAI,IAAI;QACN,OAAO,KAAK,CAAC,IAAI,CAAA;IACnB,CAAC;IAED,WAAW,EAAE,GAAG,EAAE;IAChB,qDAAqD;IACrD,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEtE;;;;OAIG;IACH,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;QACxB,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC/B,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACtB,KAAK,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;IACtC,CAAC;IAED,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjE,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC5B,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;QACvB,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;QAChC,wEAAwE;QACxE,wBAAwB;QACxB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;IAED,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAEjE,YAAY,EAAE,CAAC,WAAW,EAAE,EAAE;QAC5B,KAAK,CAAC,GAAG,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAA;IAChD,CAAC;IAED,cAAc,EAAE,GAAG,EAAE;QACnB,KAAK,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;IACtC,CAAC;IAED,mBAAmB,EAAE,GAAG,EAAE;QACxB,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;QACzD,OAAO,OAAO,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAA;IACxE,CAAC;IAED,mBAAmB,EAAE,CAAC,gBAAgB,EAAE,EAAE;QACxC,KAAK,CAAC,GAAG,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAA;IACpD,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAiB,EAAE;IACnD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IAE1C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAEjC,OAAO,YAAY,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAA;AAClD,CAAC,CAAA"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import Configstore from 'configstore';
|
|
2
|
+
import { type CliConfig } from './cli-config.js';
|
|
3
|
+
/** Every directory the CLI keeps files in, and what it mounts keeps its own. */
|
|
4
|
+
export declare const rootPaths: import("env-paths").Paths;
|
|
2
5
|
/**
|
|
3
6
|
* What a config store can do, regardless of where it keeps the values.
|
|
4
7
|
*
|
|
@@ -16,11 +19,11 @@ export interface ConfigStore {
|
|
|
16
19
|
delete: (key: string) => void;
|
|
17
20
|
clear: () => void;
|
|
18
21
|
}
|
|
19
|
-
export declare const
|
|
20
|
-
/** Replace the
|
|
21
|
-
export declare const
|
|
22
|
-
/** Drop the current
|
|
23
|
-
export declare const
|
|
22
|
+
export declare const getConfig: () => CliConfig;
|
|
23
|
+
/** Replace the config, e.g., with an in-memory one for a test. */
|
|
24
|
+
export declare const setConfig: (nextConfig: CliConfig) => void;
|
|
25
|
+
/** Drop the current config so the next read builds the real one. */
|
|
26
|
+
export declare const resetConfig: () => void;
|
|
24
27
|
export declare class PersistentConfigStore implements ConfigStore {
|
|
25
28
|
private readonly settingsStore;
|
|
26
29
|
private readonly stateStore;
|
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
import { join } from 'node:path';
|
|
2
2
|
import Configstore from 'configstore';
|
|
3
3
|
import envPaths from 'env-paths';
|
|
4
|
+
import { createCliConfig } from './cli-config.js';
|
|
4
5
|
import { migrateConfigStore } from './migrate.js';
|
|
5
6
|
import { isStateKey, mergeConfig, splitConfig } from './values.js';
|
|
6
7
|
const configFileName = 'cli.json';
|
|
7
8
|
const legacyConfigStoreId = 'seam-cli';
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
/** Every directory the CLI keeps files in, and what it mounts keeps its own. */
|
|
10
|
+
export const rootPaths = envPaths('seam', { suffix: '' });
|
|
11
|
+
let config = null;
|
|
12
|
+
export const getConfig = () => {
|
|
13
|
+
config ??= createCliConfig(createConfigStore());
|
|
14
|
+
return config;
|
|
13
15
|
};
|
|
14
|
-
/** Replace the
|
|
15
|
-
export const
|
|
16
|
-
|
|
16
|
+
/** Replace the config, e.g., with an in-memory one for a test. */
|
|
17
|
+
export const setConfig = (nextConfig) => {
|
|
18
|
+
config = nextConfig;
|
|
17
19
|
};
|
|
18
|
-
/** Drop the current
|
|
19
|
-
export const
|
|
20
|
-
|
|
20
|
+
/** Drop the current config so the next read builds the real one. */
|
|
21
|
+
export const resetConfig = () => {
|
|
22
|
+
config = null;
|
|
21
23
|
};
|
|
22
24
|
const createConfigStore = () => {
|
|
23
25
|
const settingsStore = new Configstore(legacyConfigStoreId, undefined, {
|
|
@@ -76,10 +78,10 @@ export class PersistentConfigStore {
|
|
|
76
78
|
}
|
|
77
79
|
}
|
|
78
80
|
const getConfigPath = () => {
|
|
79
|
-
return join(
|
|
81
|
+
return join(rootPaths.config, configFileName);
|
|
80
82
|
};
|
|
81
83
|
const getStateConfigPath = () => {
|
|
82
|
-
return join(
|
|
84
|
+
return join(rootPaths.log, configFileName);
|
|
83
85
|
};
|
|
84
86
|
const isRecord = (value) => {
|
|
85
87
|
return value != null && typeof value === 'object' && !Array.isArray(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/lib/config/config-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,WAAW,MAAM,aAAa,CAAA;AACrC,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAElE,MAAM,cAAc,GAAG,UAAU,CAAA;AACjC,MAAM,mBAAmB,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/lib/config/config-store.ts"],"names":[],"mappings":"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"}
|
package/lib/config/index.d.ts
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
export { type
|
|
2
|
-
export {
|
|
1
|
+
export { type CliConfig, createCliConfig } from './cli-config.js';
|
|
2
|
+
export { type ConfigStore, getConfig, type PersistentConfigStore, resetConfig, rootPaths, setConfig, } from './config-store.js';
|
|
3
|
+
export { createMemoryConfig, createMemoryConfigStore, } from './memory-config-store.js';
|
package/lib/config/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export {
|
|
1
|
+
export { createCliConfig } from './cli-config.js';
|
|
2
|
+
export { getConfig, resetConfig, rootPaths, setConfig, } from './config-store.js';
|
|
3
|
+
export { createMemoryConfig, createMemoryConfigStore, } from './memory-config-store.js';
|
|
3
4
|
//# sourceMappingURL=index.js.map
|
package/lib/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAEL,SAAS,EAET,WAAW,EACX,SAAS,EACT,SAAS,GACV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EACL,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,0BAA0B,CAAA"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type CliConfig } from './cli-config.js';
|
|
1
2
|
import type { ConfigStore } from './config-store.js';
|
|
2
3
|
/**
|
|
3
4
|
* A real {@link ConfigStore} held in memory, for tests.
|
|
@@ -19,3 +20,8 @@ export declare class MemoryConfigStore implements ConfigStore {
|
|
|
19
20
|
clear(): void;
|
|
20
21
|
}
|
|
21
22
|
export declare const createMemoryConfigStore: (initialValues?: Record<string, unknown>) => ConfigStore;
|
|
23
|
+
/**
|
|
24
|
+
* A config held in memory, for tests. Values may be seeded by key, e.g., to
|
|
25
|
+
* stand for a config an older CLI wrote.
|
|
26
|
+
*/
|
|
27
|
+
export declare const createMemoryConfig: (initialValues?: Record<string, unknown>) => CliConfig;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createCliConfig } from './cli-config.js';
|
|
1
2
|
/**
|
|
2
3
|
* A real {@link ConfigStore} held in memory, for tests.
|
|
3
4
|
*
|
|
@@ -45,4 +46,9 @@ export class MemoryConfigStore {
|
|
|
45
46
|
}
|
|
46
47
|
}
|
|
47
48
|
export const createMemoryConfigStore = (initialValues = {}) => new MemoryConfigStore(initialValues);
|
|
49
|
+
/**
|
|
50
|
+
* A config held in memory, for tests. Values may be seeded by key, e.g., to
|
|
51
|
+
* stand for a config an older CLI wrote.
|
|
52
|
+
*/
|
|
53
|
+
export const createMemoryConfig = (initialValues = {}) => createCliConfig(createMemoryConfigStore(initialValues));
|
|
48
54
|
//# sourceMappingURL=memory-config-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-config-store.js","sourceRoot":"","sources":["../../src/lib/config/memory-config-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"memory-config-store.js","sourceRoot":"","sources":["../../src/lib/config/memory-config-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjE;;;;;GAKG;AACH,MAAM,OAAO,iBAAiB;IACnB,IAAI,GAAG,kBAAkB,CAAA;IAEjB,MAAM,CAAsB;IAE7C,YAAY,gBAAyC,EAAE;QACrD,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,GAAG;QACL,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,GAAG,CAAC,SAAkC;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACnB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IACzB,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,GAAG,CAAC,GAAqC,EAAE,KAAe;QACxD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAC3B,OAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACzB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IACrB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,gBAAyC,EAAE,EAC9B,EAAE,CAAC,IAAI,iBAAiB,CAAC,aAAa,CAAC,CAAA;AAEtD;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,gBAAyC,EAAE,EAChC,EAAE,CAAC,eAAe,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAA"}
|
package/lib/context.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Interactivity } from './args/parse.js';
|
|
2
2
|
import type { ApiBlueprint } from './blueprint/index.js';
|
|
3
|
-
import { type
|
|
3
|
+
import { type CliConfig } from './config/index.js';
|
|
4
4
|
import type { SeamApi } from './http/api.js';
|
|
5
5
|
import type { Output } from './output/output.js';
|
|
6
6
|
export declare const defaultEndpoint = "https://connect.getseam.com";
|
|
@@ -22,13 +22,13 @@ export interface AuthContext {
|
|
|
22
22
|
workspaceId: string | null;
|
|
23
23
|
workspaceIdSource: Exclude<ValueSource, 'default'> | null;
|
|
24
24
|
}
|
|
25
|
-
export declare const resolveAuth: (config?:
|
|
25
|
+
export declare const resolveAuth: (config?: CliConfig) => AuthContext;
|
|
26
26
|
/**
|
|
27
27
|
* Everything a command runs with: the stores and auth it reads, the API
|
|
28
28
|
* shape it acts on, and how it may interact with the user.
|
|
29
29
|
*/
|
|
30
30
|
export interface CliContext {
|
|
31
|
-
config:
|
|
31
|
+
config: CliConfig;
|
|
32
32
|
auth: AuthContext;
|
|
33
33
|
output: Output;
|
|
34
34
|
blueprint: ApiBlueprint;
|
package/lib/context.js
CHANGED
|
@@ -1,22 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getConfig } from './config/index.js';
|
|
2
2
|
import { getEndpointFromEnv, getTokenFromEnv, getWorkspaceIdFromEnv, } from './env.js';
|
|
3
3
|
import { getAuthOverrides } from './overrides.js';
|
|
4
4
|
export const defaultEndpoint = 'https://connect.getseam.com';
|
|
5
|
-
export const resolveAuth = (config =
|
|
5
|
+
export const resolveAuth = (config = getConfig()) => {
|
|
6
6
|
const { endpoint: flagEndpoint, workspaceId: flagWorkspaceId } = getAuthOverrides();
|
|
7
7
|
const envEndpoint = getEndpointFromEnv();
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const storedEndpoint = config.get('endpoint') ?? config.get('server');
|
|
11
|
-
const endpoint = flagEndpoint ??
|
|
12
|
-
envEndpoint ??
|
|
13
|
-
(typeof storedEndpoint === 'string' ? storedEndpoint : null);
|
|
8
|
+
const storedEndpoint = config.getEndpoint();
|
|
9
|
+
const endpoint = flagEndpoint ?? envEndpoint ?? storedEndpoint;
|
|
14
10
|
const envToken = getTokenFromEnv();
|
|
15
11
|
// The token is stored per endpoint, so an overridden endpoint is read with
|
|
16
12
|
// the token belonging to it rather than the one it replaced.
|
|
17
|
-
const storedToken =
|
|
13
|
+
const storedToken = config.getToken(endpoint ?? defaultEndpoint);
|
|
18
14
|
const envWorkspaceId = getWorkspaceIdFromEnv();
|
|
19
|
-
const storedWorkspaceId =
|
|
15
|
+
const storedWorkspaceId = config.getWorkspace();
|
|
20
16
|
const workspaceId = flagWorkspaceId ?? envWorkspaceId ?? storedWorkspaceId;
|
|
21
17
|
return {
|
|
22
18
|
endpoint: endpoint ?? defaultEndpoint,
|
|
@@ -39,10 +35,4 @@ export const resolveAuth = (config = getConfigStore()) => {
|
|
|
39
35
|
: null,
|
|
40
36
|
};
|
|
41
37
|
};
|
|
42
|
-
const readString = (value) => {
|
|
43
|
-
if (typeof value !== 'string')
|
|
44
|
-
return null;
|
|
45
|
-
const trimmedValue = value.trim();
|
|
46
|
-
return trimmedValue === '' ? null : trimmedValue;
|
|
47
|
-
};
|
|
48
38
|
//# sourceMappingURL=context.js.map
|