@detergent-software/atk 8.5.1 → 8.6.0-dev.2
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/CHANGELOG.md +21 -0
- package/build/commands/audit.d.ts +2 -1
- package/build/commands/audit.d.ts.map +1 -1
- package/build/commands/audit.js +11 -5
- package/build/commands/audit.js.map +1 -1
- package/build/commands/browse.d.ts +2 -1
- package/build/commands/browse.d.ts.map +1 -1
- package/build/commands/browse.js +16 -10
- package/build/commands/browse.js.map +1 -1
- package/build/commands/diff.d.ts +2 -1
- package/build/commands/diff.d.ts.map +1 -1
- package/build/commands/diff.js +8 -2
- package/build/commands/diff.js.map +1 -1
- package/build/commands/freeze.d.ts +2 -1
- package/build/commands/freeze.d.ts.map +1 -1
- package/build/commands/freeze.js +10 -4
- package/build/commands/freeze.js.map +1 -1
- package/build/commands/install.d.ts +2 -1
- package/build/commands/install.d.ts.map +1 -1
- package/build/commands/install.js +19 -9
- package/build/commands/install.js.map +1 -1
- package/build/commands/list.d.ts +2 -1
- package/build/commands/list.d.ts.map +1 -1
- package/build/commands/list.js +18 -12
- package/build/commands/list.js.map +1 -1
- package/build/commands/outdated.d.ts +2 -1
- package/build/commands/outdated.d.ts.map +1 -1
- package/build/commands/outdated.js +12 -7
- package/build/commands/outdated.js.map +1 -1
- package/build/commands/pin.d.ts +2 -1
- package/build/commands/pin.d.ts.map +1 -1
- package/build/commands/pin.js +10 -4
- package/build/commands/pin.js.map +1 -1
- package/build/commands/prune.d.ts +2 -1
- package/build/commands/prune.d.ts.map +1 -1
- package/build/commands/prune.js +8 -1
- package/build/commands/prune.js.map +1 -1
- package/build/commands/setup.d.ts +4 -2
- package/build/commands/setup.d.ts.map +1 -1
- package/build/commands/setup.js +46 -5
- package/build/commands/setup.js.map +1 -1
- package/build/commands/sync.d.ts +2 -1
- package/build/commands/sync.d.ts.map +1 -1
- package/build/commands/sync.js +12 -6
- package/build/commands/sync.js.map +1 -1
- package/build/commands/thaw.d.ts +2 -1
- package/build/commands/thaw.d.ts.map +1 -1
- package/build/commands/thaw.js +10 -4
- package/build/commands/thaw.js.map +1 -1
- package/build/commands/uninstall.d.ts +2 -1
- package/build/commands/uninstall.d.ts.map +1 -1
- package/build/commands/uninstall.js +9 -4
- package/build/commands/uninstall.js.map +1 -1
- package/build/commands/unpin.d.ts +2 -1
- package/build/commands/unpin.d.ts.map +1 -1
- package/build/commands/unpin.js +10 -4
- package/build/commands/unpin.js.map +1 -1
- package/build/commands/update.d.ts +2 -1
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +13 -7
- package/build/commands/update.js.map +1 -1
- package/build/commands/why.d.ts +2 -1
- package/build/commands/why.d.ts.map +1 -1
- package/build/commands/why.js +10 -4
- package/build/commands/why.js.map +1 -1
- package/build/hooks/useListActions.d.ts.map +1 -1
- package/build/hooks/useListActions.js +3 -2
- package/build/hooks/useListActions.js.map +1 -1
- package/build/hooks/usePruneState.d.ts +1 -0
- package/build/hooks/usePruneState.d.ts.map +1 -1
- package/build/hooks/usePruneState.js +5 -5
- package/build/hooks/usePruneState.js.map +1 -1
- package/build/hooks/useSetupState.d.ts +11 -0
- package/build/hooks/useSetupState.d.ts.map +1 -1
- package/build/hooks/useSetupState.js +22 -18
- package/build/hooks/useSetupState.js.map +1 -1
- package/build/hooks/useUninstallState.d.ts +3 -0
- package/build/hooks/useUninstallState.d.ts.map +1 -1
- package/build/hooks/useUninstallState.js +12 -6
- package/build/hooks/useUninstallState.js.map +1 -1
- package/build/lib/config.d.ts +32 -4
- package/build/lib/config.d.ts.map +1 -1
- package/build/lib/config.js +93 -28
- package/build/lib/config.js.map +1 -1
- package/build/lib/diff-command.d.ts +2 -1
- package/build/lib/diff-command.d.ts.map +1 -1
- package/build/lib/diff-command.js +5 -4
- package/build/lib/diff-command.js.map +1 -1
- package/build/lib/gitignore.d.ts +4 -0
- package/build/lib/gitignore.d.ts.map +1 -1
- package/build/lib/gitignore.js +10 -0
- package/build/lib/gitignore.js.map +1 -1
- package/build/lib/installer.d.ts +3 -0
- package/build/lib/installer.d.ts.map +1 -1
- package/build/lib/installer.js.map +1 -1
- package/build/lib/paths.d.ts.map +1 -1
- package/build/lib/paths.js +1 -7
- package/build/lib/paths.js.map +1 -1
- package/build/lib/same-path.d.ts +3 -0
- package/build/lib/same-path.d.ts.map +1 -0
- package/build/lib/same-path.js +8 -0
- package/build/lib/same-path.js.map +1 -0
- package/build/lib/schemas/config.d.ts +1 -0
- package/build/lib/schemas/config.d.ts.map +1 -1
- package/build/lib/schemas/config.js +4 -0
- package/build/lib/schemas/config.js.map +1 -1
- package/build/lib/scope.d.ts +53 -0
- package/build/lib/scope.d.ts.map +1 -0
- package/build/lib/scope.js +98 -0
- package/build/lib/scope.js.map +1 -0
- package/build/lib/setup.d.ts +15 -0
- package/build/lib/setup.d.ts.map +1 -1
- package/build/lib/setup.js +27 -5
- package/build/lib/setup.js.map +1 -1
- package/build/lib/sync.d.ts +3 -0
- package/build/lib/sync.d.ts.map +1 -1
- package/build/lib/sync.js +2 -1
- package/build/lib/sync.js.map +1 -1
- package/build/lib/tool-resolver.d.ts +4 -3
- package/build/lib/tool-resolver.d.ts.map +1 -1
- package/build/lib/tool-resolver.js +18 -15
- package/build/lib/tool-resolver.js.map +1 -1
- package/build/lib/uninstaller.d.ts +3 -0
- package/build/lib/uninstaller.d.ts.map +1 -1
- package/build/lib/uninstaller.js.map +1 -1
- package/build/lib/updater.d.ts +3 -0
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +4 -1
- package/build/lib/updater.js.map +1 -1
- package/build/lib/user-setup.d.ts +23 -0
- package/build/lib/user-setup.d.ts.map +1 -0
- package/build/lib/user-setup.js +99 -0
- package/build/lib/user-setup.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { useEffect, useReducer } from 'react';
|
|
2
2
|
import { loadAllAdapters } from '../lib/adapter.js';
|
|
3
|
-
import { loadConfig, loadProjectConfig } from '../lib/config.js';
|
|
3
|
+
import { loadConfig, loadProjectConfig, loadUserScopeConfig } from '../lib/config.js';
|
|
4
4
|
import { errorGuidance, errorMessage } from '../lib/errors.js';
|
|
5
5
|
import { readLockfile } from '../lib/lockfile.js';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
6
|
+
import { parseToolsInput, performSetupCreation, resolveSetupScope } from '../lib/setup.js';
|
|
7
|
+
import { performUserSetup } from '../lib/user-setup.js';
|
|
8
8
|
// ---------------------------------------------------------------------------
|
|
9
9
|
// Initial state factory
|
|
10
10
|
// ---------------------------------------------------------------------------
|
|
@@ -40,7 +40,13 @@ export function setupReducer(state, action) {
|
|
|
40
40
|
return { ...state, phase: nextPhase };
|
|
41
41
|
}
|
|
42
42
|
case 'CREATE_DONE':
|
|
43
|
-
return {
|
|
43
|
+
return {
|
|
44
|
+
...state,
|
|
45
|
+
changed: action.changed,
|
|
46
|
+
phase: 'done',
|
|
47
|
+
summaryActions: action.actions,
|
|
48
|
+
summaryWarnings: action.warnings ?? [],
|
|
49
|
+
};
|
|
44
50
|
case 'CURSOR_DOWN': {
|
|
45
51
|
const len = state.adapters.length;
|
|
46
52
|
if (len === 0)
|
|
@@ -78,6 +84,7 @@ export function setupReducer(state, action) {
|
|
|
78
84
|
orgValue: action.orgValue,
|
|
79
85
|
phase: action.phase,
|
|
80
86
|
projectDir: action.projectDir,
|
|
87
|
+
scope: action.scope ?? state.scope,
|
|
81
88
|
selectedTools: action.selectedTools ?? state.selectedTools,
|
|
82
89
|
};
|
|
83
90
|
}
|
|
@@ -111,12 +118,12 @@ export function useSetupState(flags) {
|
|
|
111
118
|
let cancelled = false;
|
|
112
119
|
const load = async () => {
|
|
113
120
|
const { flags: f } = state;
|
|
114
|
-
const resolvedDir =
|
|
121
|
+
const { root: resolvedDir, scope } = await resolveSetupScope({ projectRoot: f.projectRoot, user: f.user });
|
|
115
122
|
const [allAdapters, config, existingLockfile, projConfig] = await Promise.all([
|
|
116
123
|
loadAllAdapters(),
|
|
117
124
|
loadConfig(),
|
|
118
125
|
readLockfile(resolvedDir),
|
|
119
|
-
loadProjectConfig(resolvedDir),
|
|
126
|
+
scope === 'user' ? loadUserScopeConfig(resolvedDir) : loadProjectConfig(resolvedDir),
|
|
120
127
|
]);
|
|
121
128
|
if (cancelled)
|
|
122
129
|
return;
|
|
@@ -167,6 +174,7 @@ export function useSetupState(flags) {
|
|
|
167
174
|
orgValue,
|
|
168
175
|
phase: nextPhase,
|
|
169
176
|
projectDir: resolvedDir,
|
|
177
|
+
scope,
|
|
170
178
|
selectedTools: requestedTools,
|
|
171
179
|
type: 'LOAD_DONE',
|
|
172
180
|
});
|
|
@@ -180,6 +188,7 @@ export function useSetupState(flags) {
|
|
|
180
188
|
orgValue,
|
|
181
189
|
phase: 'creating',
|
|
182
190
|
projectDir: resolvedDir,
|
|
191
|
+
scope,
|
|
183
192
|
selectedTools: defaultTools,
|
|
184
193
|
type: 'LOAD_DONE',
|
|
185
194
|
});
|
|
@@ -197,6 +206,7 @@ export function useSetupState(flags) {
|
|
|
197
206
|
orgValue,
|
|
198
207
|
phase: 'creating',
|
|
199
208
|
projectDir: resolvedDir,
|
|
209
|
+
scope,
|
|
200
210
|
selectedTools: defaultTools,
|
|
201
211
|
type: 'LOAD_DONE',
|
|
202
212
|
});
|
|
@@ -210,6 +220,7 @@ export function useSetupState(flags) {
|
|
|
210
220
|
orgValue,
|
|
211
221
|
phase: 'select-tool',
|
|
212
222
|
projectDir: resolvedDir,
|
|
223
|
+
scope,
|
|
213
224
|
selectedTools,
|
|
214
225
|
type: 'LOAD_DONE',
|
|
215
226
|
});
|
|
@@ -235,20 +246,13 @@ export function useSetupState(flags) {
|
|
|
235
246
|
return;
|
|
236
247
|
let cancelled = false;
|
|
237
248
|
const create = async () => {
|
|
238
|
-
const
|
|
239
|
-
|
|
240
|
-
orgValue:
|
|
241
|
-
|
|
242
|
-
selectedTools: state.selectedTools,
|
|
243
|
-
});
|
|
249
|
+
const { orgLocked, orgValue, projectDir, selectedTools } = state;
|
|
250
|
+
const result = state.scope === 'user'
|
|
251
|
+
? await performUserSetup({ orgLocked, orgValue, selectedTools, userRoot: projectDir })
|
|
252
|
+
: await performSetupCreation({ orgLocked, orgValue, projectDir, selectedTools });
|
|
244
253
|
if (cancelled)
|
|
245
254
|
return;
|
|
246
|
-
|
|
247
|
-
const actions = [...result.actions];
|
|
248
|
-
for (const warning of result.warnings) {
|
|
249
|
-
actions.push({ detail: warning, label: 'Warning' });
|
|
250
|
-
}
|
|
251
|
-
dispatch({ actions, type: 'CREATE_DONE' });
|
|
255
|
+
dispatch({ actions: result.actions, changed: result.changed, type: 'CREATE_DONE', warnings: result.warnings });
|
|
252
256
|
};
|
|
253
257
|
create().catch((err) => {
|
|
254
258
|
if (!cancelled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSetupState.js","sourceRoot":"","sources":["../../src/hooks/useSetupState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useSetupState.js","sourceRoot":"","sources":["../../src/hooks/useSetupState.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,6 +49,7 @@ export interface UninstallFlags {
|
|
|
49
49
|
refresh: boolean;
|
|
50
50
|
tool?: string;
|
|
51
51
|
type?: AssetType;
|
|
52
|
+
user?: boolean;
|
|
52
53
|
yes: boolean;
|
|
53
54
|
}
|
|
54
55
|
/**
|
|
@@ -87,6 +88,8 @@ export type UninstallOutcome = {
|
|
|
87
88
|
lockfileEffects?: LockfileEffect[];
|
|
88
89
|
outcome: 'dry-run-single';
|
|
89
90
|
plan: UninstallPlan;
|
|
91
|
+
/** The scope root the plan's paths resolve against. */
|
|
92
|
+
projectDir: string;
|
|
90
93
|
tools: Array<{
|
|
91
94
|
adapter: Adapter;
|
|
92
95
|
tool: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUninstallState.d.ts","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useUninstallState.d.ts","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { loadConfig } from '../lib/config.js';
|
|
|
4
4
|
import { errorGuidance, errorMessage } from '../lib/errors.js';
|
|
5
5
|
import { findInstalledAssetWithFallback, LOCKFILE_LOCKED_MESSAGE, LockfileLockedError, readLockfile, withLockfileLock, } from '../lib/lockfile.js';
|
|
6
6
|
import { parseBundleSpec, resolveActiveOrg } from '../lib/org.js';
|
|
7
|
-
import { findProjectRoot } from '../lib/paths.js';
|
|
8
7
|
import { fetchRegistry, findBundle } from '../lib/registry.js';
|
|
8
|
+
import { resolveScope } from '../lib/scope.js';
|
|
9
9
|
import { resolveTools } from '../lib/tool-resolver.js';
|
|
10
10
|
import { executeBundleUninstall, planBundleUninstall, planUninstall, uninstallAsset, UninstallerError, } from '../lib/uninstaller.js';
|
|
11
11
|
// ---------------------------------------------------------------------------
|
|
@@ -112,8 +112,8 @@ export function useUninstallState(flags) {
|
|
|
112
112
|
hasLoadedRef.current = true;
|
|
113
113
|
let cancelled = false;
|
|
114
114
|
const load = async () => {
|
|
115
|
-
const { cascade, dryRun, name: rawName, org: cliOrg, projectRoot, refresh, tool, type, yes } = state.flags;
|
|
116
|
-
const projectDir =
|
|
115
|
+
const { cascade, dryRun, name: rawName, org: cliOrg, projectRoot, refresh, tool, type, user, yes } = state.flags;
|
|
116
|
+
const { root: projectDir, scope } = await resolveScope({ projectRoot, user });
|
|
117
117
|
// Extract org from @org/name syntax if present (shared bundle/asset spec parser)
|
|
118
118
|
const { name: nameFromOrg, org: inlineOrg } = parseBundleSpec(rawName);
|
|
119
119
|
const name = inlineOrg ? nameFromOrg : rawName;
|
|
@@ -176,6 +176,7 @@ export function useUninstallState(flags) {
|
|
|
176
176
|
dispatch({ message, type: 'LOAD_PROGRESS' });
|
|
177
177
|
},
|
|
178
178
|
projectDir,
|
|
179
|
+
scope,
|
|
179
180
|
toolScope,
|
|
180
181
|
});
|
|
181
182
|
if (cancelled)
|
|
@@ -225,6 +226,7 @@ export function useUninstallState(flags) {
|
|
|
225
226
|
lockfileEffects: effectsFor(cascade ? [plan.primary, ...plan.orphanedDependencies] : [plan.primary]),
|
|
226
227
|
outcome: 'dry-run-single',
|
|
227
228
|
plan,
|
|
229
|
+
projectDir,
|
|
228
230
|
tools,
|
|
229
231
|
},
|
|
230
232
|
type: 'LOAD_DONE',
|
|
@@ -274,6 +276,7 @@ export function useUninstallState(flags) {
|
|
|
274
276
|
},
|
|
275
277
|
org,
|
|
276
278
|
projectDir,
|
|
279
|
+
scope,
|
|
277
280
|
toolScope,
|
|
278
281
|
});
|
|
279
282
|
return { outcome: 'success', toolResults };
|
|
@@ -306,8 +309,8 @@ export function useUninstallState(flags) {
|
|
|
306
309
|
dispatch({ message: 'Internal error: no outcome available for execution.', type: 'EXECUTE_ERROR' });
|
|
307
310
|
return;
|
|
308
311
|
}
|
|
309
|
-
const { cascade, projectRoot } = state.flags;
|
|
310
|
-
const projectDir =
|
|
312
|
+
const { cascade, projectRoot, user } = state.flags;
|
|
313
|
+
const { root: projectDir, scope } = await resolveScope({ projectRoot, user });
|
|
311
314
|
// Handle bundle confirmation execution
|
|
312
315
|
if (outcome.outcome === 'bundle-confirming') {
|
|
313
316
|
const { plan, tools, toolScope } = outcome;
|
|
@@ -322,6 +325,7 @@ export function useUninstallState(flags) {
|
|
|
322
325
|
dispatch({ message, type: 'EXECUTE_PROGRESS' });
|
|
323
326
|
},
|
|
324
327
|
projectDir,
|
|
328
|
+
scope,
|
|
325
329
|
toolScope,
|
|
326
330
|
});
|
|
327
331
|
if (cancelled)
|
|
@@ -356,6 +360,7 @@ export function useUninstallState(flags) {
|
|
|
356
360
|
},
|
|
357
361
|
org,
|
|
358
362
|
projectDir,
|
|
363
|
+
scope,
|
|
359
364
|
toolScope,
|
|
360
365
|
});
|
|
361
366
|
});
|
|
@@ -432,7 +437,7 @@ function skipPromptCommand(flags) {
|
|
|
432
437
|
return uninstallCommand(flags, '--yes');
|
|
433
438
|
}
|
|
434
439
|
/** `atk uninstall` with the run's flags, followed by `extra`. */
|
|
435
|
-
function uninstallCommand({ cascade, name, org, projectRoot, tool, type }, ...extra) {
|
|
440
|
+
function uninstallCommand({ cascade, name, org, projectRoot, tool, type, user }, ...extra) {
|
|
436
441
|
const spec = org && !name.startsWith('@') ? `@${org}/${name}` : name;
|
|
437
442
|
return [
|
|
438
443
|
'atk uninstall',
|
|
@@ -441,6 +446,7 @@ function uninstallCommand({ cascade, name, org, projectRoot, tool, type }, ...ex
|
|
|
441
446
|
...(tool ? ['--tool', tool] : []),
|
|
442
447
|
...(cascade ? [] : ['--no-cascade']),
|
|
443
448
|
...(projectRoot ? ['--project-root', JSON.stringify(projectRoot)] : []),
|
|
449
|
+
...(user ? ['--user'] : []),
|
|
444
450
|
...extra,
|
|
445
451
|
].join(' ');
|
|
446
452
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUninstallState.js","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useUninstallState.js","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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"}
|
package/build/lib/config.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { AssetType } from './schemas/index.js';
|
|
2
2
|
import { type Config, type ProjectConfig } from './schemas/config.js';
|
|
3
3
|
/**
|
|
4
|
-
* Freeze an asset by adding it to the
|
|
4
|
+
* Freeze an asset by adding it to the `frozenAssets` of the scope at `projectDir` (the project's
|
|
5
|
+
* .atkrc.json, or the user scope's config when `projectDir` is the user root).
|
|
5
6
|
* No-op if the asset is already frozen with the same name, type, and org.
|
|
6
7
|
*/
|
|
7
8
|
export declare function freezeAssetInConfig(projectDir: string, name: string, type: AssetType, org?: string): Promise<void>;
|
|
@@ -27,8 +28,12 @@ export declare function getProjectConfigPath(projectDir: string): string;
|
|
|
27
28
|
*/
|
|
28
29
|
export declare function hasLocalConfig(projectDir: string): boolean;
|
|
29
30
|
/**
|
|
30
|
-
*
|
|
31
|
-
|
|
31
|
+
* Whether ~/.atkrc.json has the user scope's `user` section, which `atk setup --user` writes.
|
|
32
|
+
*/
|
|
33
|
+
export declare function hasUserScopeSection(): Promise<boolean>;
|
|
34
|
+
/**
|
|
35
|
+
* Check whether an asset is frozen in the config of the scope at `projectDir`.
|
|
36
|
+
* Loads the config from disk each time — for batch checks use `isFrozenInConfig` instead.
|
|
32
37
|
*/
|
|
33
38
|
export declare function isAssetFrozen(projectDir: string, name: string, type?: AssetType, org?: string): Promise<boolean>;
|
|
34
39
|
/**
|
|
@@ -58,6 +63,12 @@ export declare function loadConfig(): Promise<Config>;
|
|
|
58
63
|
* Legacy `{ tool: string }` files are automatically migrated to `{ tools: string[] }` on read via schema preprocess.
|
|
59
64
|
*/
|
|
60
65
|
export declare function loadProjectConfig(projectDir: string): Promise<null | ProjectConfig>;
|
|
66
|
+
/**
|
|
67
|
+
* Load the user scope's config: the `user` section of ~/.atkrc.json.
|
|
68
|
+
* Until `atk setup --user` writes that section, the legacy top-level `tools`/`frozenAssets`
|
|
69
|
+
* of a project set up in the home directory stand in for it, when `userRoot` is that directory.
|
|
70
|
+
*/
|
|
71
|
+
export declare function loadUserScopeConfig(userRoot: string): Promise<null | ProjectConfig>;
|
|
61
72
|
/**
|
|
62
73
|
* Reset a config key back to its default value.
|
|
63
74
|
* Returns the updated config.
|
|
@@ -72,14 +83,31 @@ export declare function saveConfig(config: Config): Promise<void>;
|
|
|
72
83
|
* Always writes the new `{ tools: string[] }` format, never the legacy `{ tool }` format.
|
|
73
84
|
*/
|
|
74
85
|
export declare function saveProjectConfig(projectDir: string, config: ProjectConfig): Promise<void>;
|
|
86
|
+
/**
|
|
87
|
+
* Save the user scope's config where `loadUserScopeConfig` reads it: the `user` section of
|
|
88
|
+
* ~/.atkrc.json, or the legacy top-level keys while they stand in for it, so a save never
|
|
89
|
+
* half-migrates them.
|
|
90
|
+
*/
|
|
91
|
+
export declare function saveUserScopeConfig(userRoot: string, config: ProjectConfig): Promise<void>;
|
|
75
92
|
/**
|
|
76
93
|
* Set a single config value by key.
|
|
77
94
|
* Returns the updated config. Validates the result against the schema.
|
|
78
95
|
*/
|
|
79
96
|
export declare function setConfigValue(config: Config, key: string, value: string): Config;
|
|
80
97
|
/**
|
|
81
|
-
* Thaw an asset by removing it from the
|
|
98
|
+
* Thaw an asset by removing it from the `frozenAssets` of the scope at `projectDir`.
|
|
82
99
|
* Removes all entries matching the given name, and optionally type and org.
|
|
83
100
|
*/
|
|
84
101
|
export declare function thawAssetInConfig(projectDir: string, name: string, type?: AssetType, org?: string): Promise<void>;
|
|
102
|
+
/**
|
|
103
|
+
* Write the user scope's config to the `user` section of ~/.atkrc.json, as `atk setup --user` does.
|
|
104
|
+
* With `dropLegacy`, the same write removes the legacy top-level `tools`/`tool`/`frozenAssets` of a
|
|
105
|
+
* project set up in the home directory, so the section is all the user scope reads; other keys stay.
|
|
106
|
+
* Returns whether any legacy key was removed.
|
|
107
|
+
*/
|
|
108
|
+
export declare function writeUserScopeSection(config: ProjectConfig, { dropLegacy }: {
|
|
109
|
+
dropLegacy: boolean;
|
|
110
|
+
}): Promise<{
|
|
111
|
+
droppedLegacy: boolean;
|
|
112
|
+
}>;
|
|
85
113
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
package/build/lib/config.js
CHANGED
|
@@ -1,30 +1,33 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { readFile } from 'node:fs/promises';
|
|
3
3
|
import { homedir } from 'node:os';
|
|
4
|
-
import { join } from 'node:path';
|
|
4
|
+
import { join, resolve } from 'node:path';
|
|
5
5
|
import { z } from 'zod';
|
|
6
6
|
import { SetupRequiredError } from './errors.js';
|
|
7
7
|
import { parseAndValidate } from './parse-json.js';
|
|
8
|
+
import { isSamePath } from './same-path.js';
|
|
8
9
|
import { ConfigSchema, DEFAULT_CONFIG, ProjectConfigBase, ProjectConfigSchema, } from './schemas/config.js';
|
|
10
|
+
import { loadScopeConfig, saveScopeConfig, setupGuidance } from './scope.js';
|
|
9
11
|
import { writeJsonFile } from './write-file.js';
|
|
10
12
|
const ATKRC_FILENAME = '.atkrc.json';
|
|
11
|
-
// ~/.atkrc.json is
|
|
12
|
-
// directory, so each save rewrites only the keys it owns and keeps the rest.
|
|
13
|
+
// ~/.atkrc.json is the user config, holds the user scope's `user` section, and is the config of a
|
|
14
|
+
// project set up in the home directory, so each save rewrites only the keys it owns and keeps the rest.
|
|
13
15
|
// Retired user keys stay owned, so the next save removes them: `githubToken` held a GitHub token.
|
|
14
16
|
const RETIRED_USER_CONFIG_KEYS = ['githubToken'];
|
|
15
17
|
const USER_CONFIG_KEYS = [...Object.keys(ConfigSchema.shape), ...RETIRED_USER_CONFIG_KEYS];
|
|
16
18
|
const PROJECT_CONFIG_KEYS = [...Object.keys(ProjectConfigBase.shape), 'tool'];
|
|
19
|
+
// The user scope's tools and frozen assets live in their own section of ~/.atkrc.json.
|
|
20
|
+
const USER_SCOPE_KEY = 'user';
|
|
21
|
+
const UserScopeFileSchema = z.object({ [USER_SCOPE_KEY]: ProjectConfigBase });
|
|
17
22
|
/**
|
|
18
|
-
* Freeze an asset by adding it to the
|
|
23
|
+
* Freeze an asset by adding it to the `frozenAssets` of the scope at `projectDir` (the project's
|
|
24
|
+
* .atkrc.json, or the user scope's config when `projectDir` is the user root).
|
|
19
25
|
* No-op if the asset is already frozen with the same name, type, and org.
|
|
20
26
|
*/
|
|
21
27
|
export async function freezeAssetInConfig(projectDir, name, type, org) {
|
|
22
|
-
const config = await
|
|
28
|
+
const config = await loadScopeConfig(projectDir);
|
|
23
29
|
if (!config) {
|
|
24
|
-
throw
|
|
25
|
-
command: 'atk setup',
|
|
26
|
-
hint: 'Run `atk setup` to initialize the project and select a tool.',
|
|
27
|
-
});
|
|
30
|
+
throw await noScopeConfigError(projectDir);
|
|
28
31
|
}
|
|
29
32
|
const frozenAssets = config.frozenAssets ?? [];
|
|
30
33
|
// Already frozen — nothing to do
|
|
@@ -35,7 +38,7 @@ export async function freezeAssetInConfig(projectDir, name, type, org) {
|
|
|
35
38
|
if (org !== undefined) {
|
|
36
39
|
entry.org = org;
|
|
37
40
|
}
|
|
38
|
-
await
|
|
41
|
+
await saveScopeConfig(projectDir, {
|
|
39
42
|
...config,
|
|
40
43
|
frozenAssets: [...frozenAssets, entry],
|
|
41
44
|
});
|
|
@@ -75,11 +78,20 @@ export function hasLocalConfig(projectDir) {
|
|
|
75
78
|
return existsSync(getProjectConfigPath(projectDir));
|
|
76
79
|
}
|
|
77
80
|
/**
|
|
78
|
-
*
|
|
79
|
-
|
|
81
|
+
* Whether ~/.atkrc.json has the user scope's `user` section, which `atk setup --user` writes.
|
|
82
|
+
*/
|
|
83
|
+
export async function hasUserScopeSection() {
|
|
84
|
+
const configPath = getConfigPath();
|
|
85
|
+
if (!existsSync(configPath))
|
|
86
|
+
return false;
|
|
87
|
+
return USER_SCOPE_KEY in (parseJsonObject(await readFile(configPath, 'utf-8')) ?? {});
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Check whether an asset is frozen in the config of the scope at `projectDir`.
|
|
91
|
+
* Loads the config from disk each time — for batch checks use `isFrozenInConfig` instead.
|
|
80
92
|
*/
|
|
81
93
|
export async function isAssetFrozen(projectDir, name, type, org) {
|
|
82
|
-
const config = await
|
|
94
|
+
const config = await loadScopeConfig(projectDir);
|
|
83
95
|
return isFrozenInConfig(config, name, type, org);
|
|
84
96
|
}
|
|
85
97
|
/**
|
|
@@ -136,6 +148,22 @@ export async function loadProjectConfig(projectDir) {
|
|
|
136
148
|
}
|
|
137
149
|
return parseAndValidate(raw, ProjectConfigSchema, `Invalid project config at ${configPath}`);
|
|
138
150
|
}
|
|
151
|
+
/**
|
|
152
|
+
* Load the user scope's config: the `user` section of ~/.atkrc.json.
|
|
153
|
+
* Until `atk setup --user` writes that section, the legacy top-level `tools`/`frozenAssets`
|
|
154
|
+
* of a project set up in the home directory stand in for it, when `userRoot` is that directory.
|
|
155
|
+
*/
|
|
156
|
+
export async function loadUserScopeConfig(userRoot) {
|
|
157
|
+
const configPath = getConfigPath();
|
|
158
|
+
if (!existsSync(configPath)) {
|
|
159
|
+
return null;
|
|
160
|
+
}
|
|
161
|
+
const raw = await readFile(configPath, 'utf-8');
|
|
162
|
+
if (!(USER_SCOPE_KEY in (parseJsonObject(raw) ?? {}))) {
|
|
163
|
+
return isSamePath(userRoot, resolve(homedir())) ? loadProjectConfig(homedir()) : null;
|
|
164
|
+
}
|
|
165
|
+
return parseAndValidate(raw, UserScopeFileSchema, `Invalid user scope config at ${configPath}`)[USER_SCOPE_KEY];
|
|
166
|
+
}
|
|
139
167
|
/**
|
|
140
168
|
* Reset a config key back to its default value.
|
|
141
169
|
* Returns the updated config.
|
|
@@ -176,15 +204,19 @@ export async function saveConfig(config) {
|
|
|
176
204
|
*/
|
|
177
205
|
export async function saveProjectConfig(projectDir, config) {
|
|
178
206
|
const configPath = getProjectConfigPath(projectDir);
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
207
|
+
await writeJsonFile(configPath, await mergeOwnedKeys(configPath, PROJECT_CONFIG_KEYS, toSavedScopeConfig(config)));
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
210
|
+
* Save the user scope's config where `loadUserScopeConfig` reads it: the `user` section of
|
|
211
|
+
* ~/.atkrc.json, or the legacy top-level keys while they stand in for it, so a save never
|
|
212
|
+
* half-migrates them.
|
|
213
|
+
*/
|
|
214
|
+
export async function saveUserScopeConfig(userRoot, config) {
|
|
215
|
+
if (!(await hasUserScopeSection()) && isSamePath(userRoot, resolve(homedir()))) {
|
|
216
|
+
await saveProjectConfig(homedir(), config);
|
|
217
|
+
return;
|
|
186
218
|
}
|
|
187
|
-
await
|
|
219
|
+
await writeUserScopeSection(config, { dropLegacy: false });
|
|
188
220
|
}
|
|
189
221
|
/**
|
|
190
222
|
* Set a single config value by key.
|
|
@@ -214,24 +246,36 @@ export function setConfigValue(config, key, value) {
|
|
|
214
246
|
return result.data;
|
|
215
247
|
}
|
|
216
248
|
/**
|
|
217
|
-
* Thaw an asset by removing it from the
|
|
249
|
+
* Thaw an asset by removing it from the `frozenAssets` of the scope at `projectDir`.
|
|
218
250
|
* Removes all entries matching the given name, and optionally type and org.
|
|
219
251
|
*/
|
|
220
252
|
export async function thawAssetInConfig(projectDir, name, type, org) {
|
|
221
|
-
const config = await
|
|
253
|
+
const config = await loadScopeConfig(projectDir);
|
|
222
254
|
if (!config) {
|
|
223
|
-
throw
|
|
224
|
-
command: 'atk setup',
|
|
225
|
-
hint: 'Run `atk setup` to initialize the project and select a tool.',
|
|
226
|
-
});
|
|
255
|
+
throw await noScopeConfigError(projectDir);
|
|
227
256
|
}
|
|
228
257
|
const frozenAssets = config.frozenAssets ?? [];
|
|
229
258
|
const filtered = frozenAssets.filter((entry) => !(entry.name === name && (type === undefined || entry.type === type) && (org === undefined || entry.org === org)));
|
|
230
|
-
await
|
|
259
|
+
await saveScopeConfig(projectDir, {
|
|
231
260
|
...config,
|
|
232
261
|
frozenAssets: filtered,
|
|
233
262
|
});
|
|
234
263
|
}
|
|
264
|
+
/**
|
|
265
|
+
* Write the user scope's config to the `user` section of ~/.atkrc.json, as `atk setup --user` does.
|
|
266
|
+
* With `dropLegacy`, the same write removes the legacy top-level `tools`/`tool`/`frozenAssets` of a
|
|
267
|
+
* project set up in the home directory, so the section is all the user scope reads; other keys stay.
|
|
268
|
+
* Returns whether any legacy key was removed.
|
|
269
|
+
*/
|
|
270
|
+
export async function writeUserScopeSection(config, { dropLegacy }) {
|
|
271
|
+
const configPath = getConfigPath();
|
|
272
|
+
const existing = existsSync(configPath) ? parseJsonObject(await readFile(configPath, 'utf-8')) : null;
|
|
273
|
+
const droppedLegacy = dropLegacy && PROJECT_CONFIG_KEYS.some((key) => existing !== null && key in existing);
|
|
274
|
+
const owned = dropLegacy ? [USER_SCOPE_KEY, ...PROJECT_CONFIG_KEYS] : [USER_SCOPE_KEY];
|
|
275
|
+
const toSave = { [USER_SCOPE_KEY]: toSavedScopeConfig(config) };
|
|
276
|
+
await writeJsonFile(configPath, await mergeOwnedKeys(configPath, owned, toSave));
|
|
277
|
+
return { droppedLegacy };
|
|
278
|
+
}
|
|
235
279
|
function isRecord(value) {
|
|
236
280
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
237
281
|
}
|
|
@@ -245,6 +289,14 @@ async function mergeOwnedKeys(configPath, ownedKeys, toSave) {
|
|
|
245
289
|
const kept = Object.entries(existing).filter(([key]) => !ownedKeys.includes(key) || key in toSave);
|
|
246
290
|
return { ...Object.fromEntries(kept), ...toSave };
|
|
247
291
|
}
|
|
292
|
+
/**
|
|
293
|
+
* The error for a scope with no config, naming the setup command of the scope at `root`.
|
|
294
|
+
*/
|
|
295
|
+
async function noScopeConfigError(root) {
|
|
296
|
+
const { command, hint, user } = await setupGuidance(root);
|
|
297
|
+
const missing = user ? `No user scope config found in ${getConfigPath()}` : `No project config found in ${root}`;
|
|
298
|
+
return new SetupRequiredError(`${missing}. Run \`${command}\` first.`, { command, hint });
|
|
299
|
+
}
|
|
248
300
|
/**
|
|
249
301
|
* Parse JSON text that should hold an object. Returns null when it doesn't parse or isn't an object.
|
|
250
302
|
*/
|
|
@@ -258,4 +310,17 @@ function parseJsonObject(raw) {
|
|
|
258
310
|
}
|
|
259
311
|
return isRecord(parsed) ? parsed : null;
|
|
260
312
|
}
|
|
313
|
+
/**
|
|
314
|
+
* The saved form of a scope's config: always the `tools` array (never the legacy `tool` field),
|
|
315
|
+
* and `frozenAssets` only when non-empty to keep the file minimal.
|
|
316
|
+
*/
|
|
317
|
+
function toSavedScopeConfig(config) {
|
|
318
|
+
const toSave = {
|
|
319
|
+
tools: config.tools,
|
|
320
|
+
};
|
|
321
|
+
if (config.frozenAssets && config.frozenAssets.length > 0) {
|
|
322
|
+
toSave.frozenAssets = config.frozenAssets;
|
|
323
|
+
}
|
|
324
|
+
return toSave;
|
|
325
|
+
}
|
|
261
326
|
//# sourceMappingURL=config.js.map
|