@detergent-software/atk 9.4.0-dev.42 → 9.4.0-dev.43
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 +11 -0
- package/README.md +5 -0
- package/build/command-manifest.json +28 -2
- package/build/commands/doctor.d.ts.map +1 -1
- package/build/commands/doctor.js +1 -1
- package/build/commands/doctor.js.map +1 -1
- package/build/commands/update.d.ts +1 -1
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +1 -1
- package/build/commands/update.js.map +1 -1
- package/build/commands/upgrade.d.ts +16 -0
- package/build/commands/upgrade.d.ts.map +1 -0
- package/build/commands/upgrade.js +60 -0
- package/build/commands/upgrade.js.map +1 -0
- package/build/lib/api-client.d.ts.map +1 -1
- package/build/lib/api-client.js +2 -1
- package/build/lib/api-client.js.map +1 -1
- package/build/lib/diagnostics.d.ts.map +1 -1
- package/build/lib/diagnostics.js +5 -7
- package/build/lib/diagnostics.js.map +1 -1
- package/build/lib/doctor-fix.d.ts +8 -3
- package/build/lib/doctor-fix.d.ts.map +1 -1
- package/build/lib/doctor-fix.js +48 -3
- package/build/lib/doctor-fix.js.map +1 -1
- package/build/lib/lockfile.js +2 -2
- package/build/lib/lockfile.js.map +1 -1
- package/build/lib/notices.d.ts +2 -0
- package/build/lib/notices.d.ts.map +1 -1
- package/build/lib/notices.js +10 -0
- package/build/lib/notices.js.map +1 -1
- package/build/lib/self-upgrade.d.ts +66 -0
- package/build/lib/self-upgrade.d.ts.map +1 -0
- package/build/lib/self-upgrade.js +183 -0
- package/build/lib/self-upgrade.js.map +1 -0
- package/build/lib/update-check.d.ts +13 -1
- package/build/lib/update-check.d.ts.map +1 -1
- package/build/lib/update-check.js +37 -8
- package/build/lib/update-check.js.map +1 -1
- package/build/lib/version.d.ts +12 -4
- package/build/lib/version.d.ts.map +1 -1
- package/build/lib/version.js +19 -7
- package/build/lib/version.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `atk upgrade`: install the newest CLI on an npm dist-tag over the running one (ATK-873), as
|
|
3
|
+
* `conduct upgrade` does for the conductor (apps/conductor/src/upgrade.ts).
|
|
4
|
+
*
|
|
5
|
+
* npm replaces the package while this process runs from it. That works on Windows too: Node holds
|
|
6
|
+
* no handle on a module once it has loaded it, and npm rewrites the `atk.cmd` shim with the same
|
|
7
|
+
* bytes. So everything this module needs is a static import, loaded before the install, and the
|
|
8
|
+
* new version is read from the installed `package.json` on disk, never from `CLI_VERSION`.
|
|
9
|
+
*/
|
|
10
|
+
import { spawn } from 'node:child_process';
|
|
11
|
+
import { realpathSync } from 'node:fs';
|
|
12
|
+
import { posix, win32 } from 'node:path';
|
|
13
|
+
import { eq as semverEq, lt as semverLt, valid as semverValid } from 'semver';
|
|
14
|
+
import { ApiCodeError } from './errors.js';
|
|
15
|
+
import { isOffline } from './offline.js';
|
|
16
|
+
import { readDistTagsFresh } from './update-check.js';
|
|
17
|
+
import { channelOf, CLI_VERSION, npmInstallCommand, PACKAGE_DIR, PACKAGE_NAME, readInstalledVersion, UPGRADE_COMMAND, } from './version.js';
|
|
18
|
+
export const UPGRADE_TAGS = ['dev', 'latest'];
|
|
19
|
+
/** npm can take a while on a slow network; past this the install is stopped and reported. */
|
|
20
|
+
const NPM_INSTALL_TIMEOUT_MS = 5 * 60 * 1000;
|
|
21
|
+
const NPM_ROOT_TIMEOUT_MS = 30 * 1000;
|
|
22
|
+
/** How much of npm's output a failed install shows. */
|
|
23
|
+
const OUTPUT_TAIL_CHARS = 1500;
|
|
24
|
+
/** Why `atk upgrade` installed nothing, or why its install failed. */
|
|
25
|
+
export class UpgradeError extends ApiCodeError {
|
|
26
|
+
name = 'UpgradeError';
|
|
27
|
+
constructor(code, message, options = {}) {
|
|
28
|
+
super(message, { ...options, code });
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
/** The real npm, the running package and the update check's npm read. */
|
|
32
|
+
export function defaultUpgradeDeps(progress) {
|
|
33
|
+
return {
|
|
34
|
+
cliPath: realpathSync(PACKAGE_DIR),
|
|
35
|
+
currentVersion: CLI_VERSION,
|
|
36
|
+
installedVersion: readInstalledVersion,
|
|
37
|
+
// --prefer-online: npm resolves the exact version against a fresh packument, not a cached one
|
|
38
|
+
// that may not list it yet (ATK-558).
|
|
39
|
+
npmInstall: (spec) => runNpm(['install', '--global', '--prefer-online', spec], NPM_INSTALL_TIMEOUT_MS),
|
|
40
|
+
npmRoot: async () => npmRootOf(await runNpm(['root', '--global'], NPM_ROOT_TIMEOUT_MS)),
|
|
41
|
+
offline: isOffline(),
|
|
42
|
+
progress,
|
|
43
|
+
tagVersions: readDistTagsFresh,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
/** True when cliPath lies under npm's global node_modules. A linked checkout and npx's cache resolve outside it. */
|
|
47
|
+
export function isGlobalInstall(cliPath, npmRoot, platform = process.platform) {
|
|
48
|
+
const path = platform === 'win32' ? win32 : posix;
|
|
49
|
+
const rel = path.relative(npmRoot, cliPath);
|
|
50
|
+
return rel !== '' && !rel.startsWith('..') && !path.isAbsolute(rel);
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* The realpath of the folder `npm root --global` printed. stdout alone: npm writes its warnings
|
|
54
|
+
* (an unknown .npmrc key, its update notice) to stderr. Throws when npm failed.
|
|
55
|
+
*/
|
|
56
|
+
export function npmRootOf(result) {
|
|
57
|
+
if (result.code !== 0) {
|
|
58
|
+
throw new Error(tail(result.output) || `npm root --global exited ${String(result.code)}`);
|
|
59
|
+
}
|
|
60
|
+
return realpathSync(result.stdout.trim());
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Install the tag's version over the running CLI. Refuses, before it installs anything: offline,
|
|
64
|
+
* outside an npm global install, a tag npm doesn't have, and a version older than the running one
|
|
65
|
+
* unless allowDowngrade. Does nothing when the tag's version is the running one.
|
|
66
|
+
*/
|
|
67
|
+
export async function upgradeCli(options, deps) {
|
|
68
|
+
const from = deps.currentVersion;
|
|
69
|
+
const tag = options.tag ?? channelOf(from);
|
|
70
|
+
const manual = npmInstallCommand(tag);
|
|
71
|
+
if (deps.offline) {
|
|
72
|
+
throw new UpgradeError('offline', "Can't upgrade with --offline: the new version comes from npm.", {
|
|
73
|
+
command: UPGRADE_COMMAND,
|
|
74
|
+
hint: 'Run it again without --offline.',
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
deps.progress('Finding the npm global install...');
|
|
78
|
+
let root;
|
|
79
|
+
try {
|
|
80
|
+
root = await deps.npmRoot();
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
throw notGlobal(`Couldn't ask npm for its global folder (${err instanceof Error ? err.message : String(err)}).`, manual);
|
|
84
|
+
}
|
|
85
|
+
if (!isGlobalInstall(deps.cliPath, root, deps.platform)) {
|
|
86
|
+
throw notGlobal(`This atk (${deps.cliPath}) isn't an npm global install (${root}).`, manual);
|
|
87
|
+
}
|
|
88
|
+
deps.progress(`Reading the ${tag} version from npm...`);
|
|
89
|
+
const tags = await deps.tagVersions();
|
|
90
|
+
if (!tags) {
|
|
91
|
+
throw new UpgradeError('npm_unreachable', `Couldn't read ${PACKAGE_NAME}'s dist-tags from npm.`, {
|
|
92
|
+
command: UPGRADE_COMMAND,
|
|
93
|
+
hint: 'Check your network connection and run it again.',
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
const target = tags[tag];
|
|
97
|
+
if (!target || !semverValid(target)) {
|
|
98
|
+
throw new UpgradeError('tag_missing', `npm has no ${PACKAGE_NAME}@${tag}.`, {
|
|
99
|
+
hint: `Pick the other channel with --tag ${tag === 'dev' ? 'latest' : 'dev'}.`,
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
if (semverValid(from) && semverEq(target, from)) {
|
|
103
|
+
return { from, outcome: 'current', tag, to: from };
|
|
104
|
+
}
|
|
105
|
+
const downgrade = semverValid(from) !== null && semverLt(target, from);
|
|
106
|
+
if (downgrade && !options.allowDowngrade) {
|
|
107
|
+
throw new UpgradeError('downgrade_refused', `${PACKAGE_NAME}@${tag} is ${target}, older than this CLI's ${from}; nothing was installed.`, {
|
|
108
|
+
command: `${UPGRADE_COMMAND} --tag ${tag} --allow-downgrade`,
|
|
109
|
+
hint: 'Add --allow-downgrade to install it anyway.',
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
// The version just compared, not the tag, which may move before npm resolves it.
|
|
113
|
+
const exact = `${PACKAGE_NAME}@${target}`;
|
|
114
|
+
deps.progress(`Installing ${exact}...`);
|
|
115
|
+
const installed = await deps.npmInstall(exact);
|
|
116
|
+
if (installed.code !== 0) {
|
|
117
|
+
const output = tail(installed.output);
|
|
118
|
+
throw new UpgradeError('install_failed', `npm couldn't install ${exact}${installed.code === null ? ' (it was stopped)' : ` (exit ${String(installed.code)})`}.${output ? `\n${output}` : ''}`, { command: npmInstallCommand(target) });
|
|
119
|
+
}
|
|
120
|
+
// npm can succeed and leave this copy alone: one nested in another global package's node_modules.
|
|
121
|
+
const to = deps.installedVersion();
|
|
122
|
+
if (to !== target) {
|
|
123
|
+
throw new UpgradeError('install_failed', `npm installed ${exact}, but this atk (${deps.cliPath}) still reads ${to}: it isn't the copy npm replaced.`, { command: npmInstallCommand(target), hint: 'Run `atk --version` to see which copy is on your PATH.' });
|
|
124
|
+
}
|
|
125
|
+
return { from, outcome: downgrade ? 'downgraded' : 'upgraded', tag, to };
|
|
126
|
+
}
|
|
127
|
+
function notGlobal(message, manual) {
|
|
128
|
+
return new UpgradeError('not_npm_global', `${message} Nothing was installed.`, {
|
|
129
|
+
command: manual,
|
|
130
|
+
hint: 'atk upgrade only replaces an npm global install. Under npx or a linked checkout, run the npm command; with pnpm, yarn or bun, upgrade the package with that tool.',
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
/** What an npm argument may hold: flags and package specs, nothing a shell would read (`&`, `^`, `%`, quotes). */
|
|
134
|
+
const SAFE_NPM_ARG = /^[\w@./:+-]+$/;
|
|
135
|
+
/**
|
|
136
|
+
* npm, with its output captured. On Windows npm is `npm.cmd`, which only a shell starts, so the
|
|
137
|
+
* command goes as one quoted line, and an argument a shell could read otherwise is refused.
|
|
138
|
+
*/
|
|
139
|
+
function runNpm(args, timeoutMs) {
|
|
140
|
+
const unsafe = args.find((a) => !SAFE_NPM_ARG.test(a));
|
|
141
|
+
if (unsafe !== undefined) {
|
|
142
|
+
return Promise.resolve({ code: null, output: `refused an npm argument a shell could read: ${unsafe}`, stdout: '' });
|
|
143
|
+
}
|
|
144
|
+
return new Promise((resolve) => {
|
|
145
|
+
const onWindows = process.platform === 'win32';
|
|
146
|
+
const stdio = ['ignore', 'pipe', 'pipe'];
|
|
147
|
+
const child = onWindows
|
|
148
|
+
? spawn(['npm', ...args.map((a) => `"${a}"`)].join(' '), [], { shell: true, stdio, windowsHide: true })
|
|
149
|
+
: spawn('npm', [...args], { stdio, windowsHide: true });
|
|
150
|
+
let output = '';
|
|
151
|
+
let stdout = '';
|
|
152
|
+
let timedOut = false;
|
|
153
|
+
child.stdout.on('data', (chunk) => {
|
|
154
|
+
stdout += chunk.toString();
|
|
155
|
+
output += chunk.toString();
|
|
156
|
+
});
|
|
157
|
+
child.stderr.on('data', (chunk) => (output += chunk.toString()));
|
|
158
|
+
const timer = setTimeout(() => {
|
|
159
|
+
timedOut = true;
|
|
160
|
+
if (onWindows && child.pid !== undefined) {
|
|
161
|
+
// Killing the shell alone would leave npm running; /T ends the tree.
|
|
162
|
+
spawn('taskkill', ['/pid', String(child.pid), '/T', '/F'], { stdio: 'ignore', windowsHide: true }).on('error', () => { });
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
child.kill();
|
|
166
|
+
}
|
|
167
|
+
}, timeoutMs);
|
|
168
|
+
child.on('error', (err) => {
|
|
169
|
+
clearTimeout(timer);
|
|
170
|
+
resolve({ code: null, output: `${output}${err.message}`, stdout });
|
|
171
|
+
});
|
|
172
|
+
child.on('close', (code) => {
|
|
173
|
+
clearTimeout(timer);
|
|
174
|
+
// taskkill /F leaves exit code 1 on Windows; a stopped npm reads the same on every platform.
|
|
175
|
+
resolve({ code: timedOut ? null : code, output, stdout });
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
function tail(output) {
|
|
180
|
+
const trimmed = output.trim();
|
|
181
|
+
return trimmed.length > OUTPUT_TAIL_CHARS ? `…${trimmed.slice(-OUTPUT_TAIL_CHARS)}` : trimmed;
|
|
182
|
+
}
|
|
183
|
+
//# sourceMappingURL=self-upgrade.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"self-upgrade.js","sourceRoot":"","sources":["../../src/lib/self-upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,10 @@ export declare const UPDATE_CHECK_INTERVAL_MS: number;
|
|
|
6
6
|
export declare const BACKGROUND_REFRESH_TIMEOUT_MS = 1500;
|
|
7
7
|
/** `atk doctor`'s npm check makes one attempt and gives up after this long, as its `/health` probe does. */
|
|
8
8
|
export declare const VERSION_STATUS_TIMEOUT_MS = 5000;
|
|
9
|
+
export interface DistTags {
|
|
10
|
+
dev?: string;
|
|
11
|
+
latest?: string;
|
|
12
|
+
}
|
|
9
13
|
/**
|
|
10
14
|
* What turns the update check off: the config's `checkUpdates: false`, or the
|
|
11
15
|
* `ATK_NO_UPDATE_CHECK` or `CI` environment variable.
|
|
@@ -41,7 +45,8 @@ export declare function getUpdateInfo(): Promise<null | UpdateInfo>;
|
|
|
41
45
|
* This CLI's version and its channel's version on npm, whether or not that is newer. The cache
|
|
42
46
|
* answers while it is fresh; otherwise npm is asked (and the cache rewritten), and a cache of any
|
|
43
47
|
* age stands in when npm can't be read. `CI` doesn't turn it off: doctor is a check someone asked
|
|
44
|
-
* for.
|
|
48
|
+
* for. The version is the installed package's on disk, so doctor's check after `--fix` upgraded the
|
|
49
|
+
* CLI reports the new one, not the version this process loaded. Does not throw.
|
|
45
50
|
*/
|
|
46
51
|
export declare function getVersionStatus(): Promise<VersionStatus>;
|
|
47
52
|
/**
|
|
@@ -54,6 +59,13 @@ export declare function getVersionStatus(): Promise<VersionStatus>;
|
|
|
54
59
|
* {@link updateCheckSwitch} names a switch. Never throws.
|
|
55
60
|
*/
|
|
56
61
|
export declare function noteCachedUpdate(): Promise<void>;
|
|
62
|
+
/**
|
|
63
|
+
* The `dev` and `latest` dist-tags read from npm now, with the shared retries, never from the
|
|
64
|
+
* cache: the cache can be up to a day old and miss a version tagged a moment ago (ATK-558). A
|
|
65
|
+
* successful read replaces the cache, so the next run's update check sees it too. Null when
|
|
66
|
+
* npm couldn't be read, or offline. For `atk upgrade`; doesn't throw.
|
|
67
|
+
*/
|
|
68
|
+
export declare function readDistTagsFresh(): Promise<DistTags | null>;
|
|
57
69
|
/**
|
|
58
70
|
* The switch that turns the update check off, or null when it runs. An
|
|
59
71
|
* environment variable counts when it is set to anything but empty, `0` or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-check.d.ts","sourceRoot":"","sources":["../../src/lib/update-check.ts"],"names":[],"mappings":"AAWA,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,6EAA6E,CAAC;AAG5G,iHAAiH;AACjH,eAAO,MAAM,wBAAwB,QAAsB,CAAC;AAE5D,sGAAsG;AACtG,eAAO,MAAM,6BAA6B,OAAQ,CAAC;AAEnD,4GAA4G;AAC5G,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,cAAc,GAAG,IAAI,CAAC;AAE9E,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAC9C,yFAAyF;IACzF,OAAO,EAAE,OAAO,CAAC;IACjB,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"update-check.d.ts","sourceRoot":"","sources":["../../src/lib/update-check.ts"],"names":[],"mappings":"AAWA,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,6EAA6E,CAAC;AAG5G,iHAAiH;AACjH,eAAO,MAAM,wBAAwB,QAAsB,CAAC;AAE5D,sGAAsG;AACtG,eAAO,MAAM,6BAA6B,OAAQ,CAAC;AAEnD,4GAA4G;AAC5G,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,MAAM,WAAW,QAAQ;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,cAAc,GAAG,IAAI,CAAC;AAE9E,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAC9C,yFAAyF;IACzF,OAAO,EAAE,OAAO,CAAC;IACjB,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAMD;;;;;;;GAOG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,CAwChE;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,CA2B/D;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CA+BtD;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAWlE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,EAClC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,IAAI,GAAG,iBAAiB,CAK1B"}
|
|
@@ -6,7 +6,7 @@ import { getCacheDir, loadConfig } from './config.js';
|
|
|
6
6
|
import { fetchWithRetry } from './fetch-retry.js';
|
|
7
7
|
import { addNotice } from './notices.js';
|
|
8
8
|
import { isOffline } from './offline.js';
|
|
9
|
-
import { CLI_VERSION, isPreRelease,
|
|
9
|
+
import { channelOf, CLI_VERSION, isPreRelease, readInstalledVersion, UPGRADE_COMMAND } from './version.js';
|
|
10
10
|
/** The package's dist-tags alone (about 40 bytes), not its packument (over 1 MB). */
|
|
11
11
|
export const NPM_DIST_TAGS_URL = 'https://registry.npmjs.org/-/package/@detergent-software%2fatk/dist-tags';
|
|
12
12
|
const NPM_CACHE_FILE = 'npm-version.json';
|
|
@@ -53,7 +53,7 @@ export async function getUpdateInfo() {
|
|
|
53
53
|
channel,
|
|
54
54
|
currentVersion: CLI_VERSION,
|
|
55
55
|
latestVersion,
|
|
56
|
-
upgradeCommand:
|
|
56
|
+
upgradeCommand: UPGRADE_COMMAND,
|
|
57
57
|
};
|
|
58
58
|
}
|
|
59
59
|
catch {
|
|
@@ -64,11 +64,13 @@ export async function getUpdateInfo() {
|
|
|
64
64
|
* This CLI's version and its channel's version on npm, whether or not that is newer. The cache
|
|
65
65
|
* answers while it is fresh; otherwise npm is asked (and the cache rewritten), and a cache of any
|
|
66
66
|
* age stands in when npm can't be read. `CI` doesn't turn it off: doctor is a check someone asked
|
|
67
|
-
* for.
|
|
67
|
+
* for. The version is the installed package's on disk, so doctor's check after `--fix` upgraded the
|
|
68
|
+
* CLI reports the new one, not the version this process loaded. Does not throw.
|
|
68
69
|
*/
|
|
69
70
|
export async function getVersionStatus() {
|
|
70
|
-
const
|
|
71
|
-
const
|
|
71
|
+
const currentVersion = installedVersion();
|
|
72
|
+
const channel = channelOf(currentVersion);
|
|
73
|
+
const status = { channel, currentVersion, enabled: true };
|
|
72
74
|
try {
|
|
73
75
|
const config = await loadConfig();
|
|
74
76
|
const disabledBy = updateCheckSwitch(config);
|
|
@@ -113,11 +115,10 @@ export async function noteCachedUpdate() {
|
|
|
113
115
|
const cached = await readNpmCache(cachePath);
|
|
114
116
|
const version = cached?.tags[channel];
|
|
115
117
|
if (version && semverValid(CLI_VERSION) && semverValid(version) && semverGt(version, CLI_VERSION)) {
|
|
116
|
-
const command = upgradeCommand(channel);
|
|
117
118
|
addNotice({
|
|
118
|
-
command,
|
|
119
|
+
command: UPGRADE_COMMAND,
|
|
119
120
|
kind: 'update-available',
|
|
120
|
-
text: `ATK ${version} is available (this is ${CLI_VERSION}). Run \`${
|
|
121
|
+
text: `ATK ${version} is available (this is ${CLI_VERSION}). Run \`${UPGRADE_COMMAND}\` to update.`,
|
|
121
122
|
});
|
|
122
123
|
}
|
|
123
124
|
if (!cached || cached.ageMs > UPDATE_CHECK_INTERVAL_MS) {
|
|
@@ -132,6 +133,25 @@ export async function noteCachedUpdate() {
|
|
|
132
133
|
// Non-fatal: the payload simply carries no update notice.
|
|
133
134
|
}
|
|
134
135
|
}
|
|
136
|
+
/**
|
|
137
|
+
* The `dev` and `latest` dist-tags read from npm now, with the shared retries, never from the
|
|
138
|
+
* cache: the cache can be up to a day old and miss a version tagged a moment ago (ATK-558). A
|
|
139
|
+
* successful read replaces the cache, so the next run's update check sees it too. Null when
|
|
140
|
+
* npm couldn't be read, or offline. For `atk upgrade`; doesn't throw.
|
|
141
|
+
*/
|
|
142
|
+
export async function readDistTagsFresh() {
|
|
143
|
+
const tags = await fetchDistTags();
|
|
144
|
+
if (tags) {
|
|
145
|
+
try {
|
|
146
|
+
const cacheDir = getCacheDir(await loadConfig());
|
|
147
|
+
await writeNpmCache(join(cacheDir, NPM_CACHE_FILE), cacheDir, tags);
|
|
148
|
+
}
|
|
149
|
+
catch {
|
|
150
|
+
// A config that doesn't load leaves the cache as it was; the tags still answer.
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return tags;
|
|
154
|
+
}
|
|
135
155
|
/**
|
|
136
156
|
* The switch that turns the update check off, or null when it runs. An
|
|
137
157
|
* environment variable counts when it is set to anything but empty, `0` or
|
|
@@ -173,6 +193,15 @@ async function fetchDistTags(attempts = 'retry') {
|
|
|
173
193
|
return null;
|
|
174
194
|
}
|
|
175
195
|
}
|
|
196
|
+
/** The installed package's version, or the loaded one when `package.json` can't be read. */
|
|
197
|
+
function installedVersion() {
|
|
198
|
+
try {
|
|
199
|
+
return readInstalledVersion();
|
|
200
|
+
}
|
|
201
|
+
catch {
|
|
202
|
+
return CLI_VERSION;
|
|
203
|
+
}
|
|
204
|
+
}
|
|
176
205
|
function isEnvOn(value) {
|
|
177
206
|
return value !== undefined && value !== '' && value !== '0' && value.toLowerCase() !== 'false';
|
|
178
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/lib/update-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/lib/update-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE3G,qFAAqF;AACrF,MAAM,CAAC,MAAM,iBAAiB,GAAG,0EAA0E,CAAC;AAC5G,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAE1C,iHAAiH;AACjH,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE5D,sGAAsG;AACtG,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAEnD,4GAA4G;AAC5G,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAoC/C;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAqB,YAAY,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;QACpE,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,IAAI,GAAG,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAEnF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,CAAC,aAAa,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO;YACL,OAAO;YACP,cAAc,EAAE,WAAW;YAC3B,aAAa;YACb,cAAc,EAAE,eAAe;SAChC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,cAAc,GAAG,gBAAgB,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAkB,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACzE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,UAAU,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACtC,OAAO,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACnD,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,IAAI,GAAG,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACnF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,MAAM,aAAa,CAAC,yBAAyB,CAAC,CAAC;YACtD,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,IAAI,IAAI,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QACxD,OAAO,aAAa,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAqB,YAAY,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;QACpE,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,OAAO,IAAI,WAAW,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;YAClG,SAAS,CAAC;gBACR,OAAO,EAAE,eAAe;gBACxB,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,OAAO,OAAO,0BAA0B,WAAW,YAAY,eAAe,eAAe;aACpG,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,GAAG,wBAAwB,EAAE,CAAC;YACvD,KAAK,aAAa,CAAC,6BAA6B,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACpE,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;IAC5D,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC;IACnC,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,UAAU,EAAE,CAAC,CAAC;YACjD,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtE,CAAC;QAAC,MAAM,CAAC;YACP,gFAAgF;QAClF,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAkC,EAClC,MAAyB,OAAO,CAAC,GAAG;IAEpC,IAAI,MAAM,CAAC,YAAY,KAAK,KAAK;QAAE,OAAO,cAAc,CAAC;IACzD,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAAE,OAAO,qBAAqB,CAAC;IACtE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,WAA6B,OAAO;IAC/D,IAAI,SAAS,EAAE,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAgB,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,CAAC;QACtE,MAAM,QAAQ,GACZ,QAAQ,KAAK,OAAO;YAClB,CAAC,CAAC,MAAM,cAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC;YAC/C,CAAC,CAAC,MAAM,UAAU,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBACxC,GAAG,IAAI;gBACP,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;aACtC,CAAC,CAAC;QAET,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,4FAA4F;AAC5F,SAAS,gBAAgB;IACvB,IAAI,CAAC;QACH,OAAO,oBAAoB,EAAE,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,KAAyB;IACxC,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;AACjG,CAAC;AAED,6FAA6F;AAC7F,SAAS,YAAY,CAAC,IAAa;IACjC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,KAAK,MAAM,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAU,EAAE,CAAC;YACjD,MAAM,KAAK,GAAY,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,YAAY,CAAC,SAAiB;IAC3C,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1E,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,wFAAwF;AACxF,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,QAAgB,EAAE,IAAc;IAC9E,IAAI,CAAC;QACH,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAE9D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,uDAAuD;IACzD,CAAC;AACH,CAAC"}
|
package/build/lib/version.d.ts
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
|
+
/** The installed package's folder: `build/lib/..` once built, `src/lib/..` under the tests. */
|
|
2
|
+
export declare const PACKAGE_DIR: string;
|
|
3
|
+
export declare const PACKAGE_NAME = "@detergent-software/atk";
|
|
4
|
+
/** The version this process loaded. After `atk upgrade` replaces the package, {@link readInstalledVersion} differs. */
|
|
1
5
|
export declare const CLI_VERSION: string;
|
|
2
|
-
/** How to update the CLI
|
|
3
|
-
export declare const UPGRADE_COMMAND = "
|
|
6
|
+
/** How to update the CLI. The API's `426 cli_outdated` message names `npm i -g` instead: CLIs that old have no `atk upgrade`. */
|
|
7
|
+
export declare const UPGRADE_COMMAND = "atk upgrade";
|
|
8
|
+
/** The npm dist-tag a version ships on: any prerelease (`-dev.N`) on `dev`, anything else on `latest`. */
|
|
9
|
+
export declare function channelOf(version: string): 'dev' | 'latest';
|
|
4
10
|
export declare function isPreRelease(): boolean;
|
|
11
|
+
/** The npm command `atk upgrade` runs, for installs it can't upgrade itself (npx, a linked checkout, pnpm). */
|
|
12
|
+
export declare function npmInstallCommand(spec: string): string;
|
|
5
13
|
/**
|
|
6
14
|
* Parse a `name@version` specifier into its name and optional version parts.
|
|
7
15
|
* Splits on the last `@` to correctly handle scoped names (e.g., `@scope/name@1.0.0`).
|
|
@@ -12,6 +20,6 @@ export declare function parseNameVersion(input: string): {
|
|
|
12
20
|
name: string;
|
|
13
21
|
version?: string;
|
|
14
22
|
};
|
|
15
|
-
/**
|
|
16
|
-
export declare function
|
|
23
|
+
/** The version in the package's `package.json` on disk now, which `atk upgrade` may have replaced since this process loaded. */
|
|
24
|
+
export declare function readInstalledVersion(): string;
|
|
17
25
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAMA,+FAA+F;AAC/F,eAAO,MAAM,WAAW,QAA8B,CAAC;AACvD,eAAO,MAAM,YAAY,4BAA4B,CAAC;AAItD,uHAAuH;AACvH,eAAO,MAAM,WAAW,QAAc,CAAC;AAEvC,iIAAiI;AACjI,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,0GAA0G;AAC1G,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,QAAQ,CAE3D;AAED,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED,+GAA+G;AAC/G,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAiBlF;AAED,gIAAgI;AAChI,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C"}
|
package/build/lib/version.js
CHANGED
|
@@ -2,12 +2,24 @@ import { readFileSync } from 'node:fs';
|
|
|
2
2
|
import { dirname, join } from 'node:path';
|
|
3
3
|
import { fileURLToPath } from 'node:url';
|
|
4
4
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
5
|
-
|
|
5
|
+
/** The installed package's folder: `build/lib/..` once built, `src/lib/..` under the tests. */
|
|
6
|
+
export const PACKAGE_DIR = join(__dirname, '..', '..');
|
|
7
|
+
export const PACKAGE_NAME = '@detergent-software/atk';
|
|
8
|
+
const pkg = JSON.parse(readFileSync(join(PACKAGE_DIR, 'package.json'), 'utf8'));
|
|
9
|
+
/** The version this process loaded. After `atk upgrade` replaces the package, {@link readInstalledVersion} differs. */
|
|
6
10
|
export const CLI_VERSION = pkg.version;
|
|
7
|
-
/** How to update the CLI
|
|
8
|
-
export const UPGRADE_COMMAND = '
|
|
11
|
+
/** How to update the CLI. The API's `426 cli_outdated` message names `npm i -g` instead: CLIs that old have no `atk upgrade`. */
|
|
12
|
+
export const UPGRADE_COMMAND = 'atk upgrade';
|
|
13
|
+
/** The npm dist-tag a version ships on: any prerelease (`-dev.N`) on `dev`, anything else on `latest`. */
|
|
14
|
+
export function channelOf(version) {
|
|
15
|
+
return version.includes('-') ? 'dev' : 'latest';
|
|
16
|
+
}
|
|
9
17
|
export function isPreRelease() {
|
|
10
|
-
return CLI_VERSION
|
|
18
|
+
return channelOf(CLI_VERSION) === 'dev';
|
|
19
|
+
}
|
|
20
|
+
/** The npm command `atk upgrade` runs, for installs it can't upgrade itself (npx, a linked checkout, pnpm). */
|
|
21
|
+
export function npmInstallCommand(spec) {
|
|
22
|
+
return `npm install --global ${PACKAGE_NAME}@${spec}`;
|
|
11
23
|
}
|
|
12
24
|
/**
|
|
13
25
|
* Parse a `name@version` specifier into its name and optional version parts.
|
|
@@ -29,8 +41,8 @@ export function parseNameVersion(input) {
|
|
|
29
41
|
}
|
|
30
42
|
return { name, version };
|
|
31
43
|
}
|
|
32
|
-
/**
|
|
33
|
-
export function
|
|
34
|
-
return
|
|
44
|
+
/** The version in the package's `package.json` on disk now, which `atk upgrade` may have replaced since this process loaded. */
|
|
45
|
+
export function readInstalledVersion() {
|
|
46
|
+
return JSON.parse(readFileSync(join(PACKAGE_DIR, 'package.json'), 'utf8')).version;
|
|
35
47
|
}
|
|
36
48
|
//# sourceMappingURL=version.js.map
|
package/build/lib/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,+FAA+F;AAC/F,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvD,MAAM,CAAC,MAAM,YAAY,GAAG,yBAAyB,CAAC;AAEtD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAwB,CAAC;AAEvG,uHAAuH;AACvH,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC;AAEvC,iIAAiI;AACjI,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAE7C,0GAA0G;AAC1G,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC,WAAW,CAAC,KAAK,KAAK,CAAC;AAC1C,CAAC;AAED,+GAA+G;AAC/G,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO,wBAAwB,YAAY,IAAI,IAAI,EAAE,CAAC;AACxD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAEtC,iFAAiF;IACjF,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAChB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAExC,mEAAmE;IACnE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,gIAAgI;AAChI,MAAM,UAAU,oBAAoB;IAClC,OAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAyB,CAAC,OAAO,CAAC;AAC9G,CAAC"}
|