indexer-cli 0.12.0 → 0.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/commands/update.d.ts +2 -0
- package/dist/cli/commands/update.js +45 -0
- package/dist/cli/commands/update.js.map +1 -0
- package/dist/cli/entry.js +9 -1
- package/dist/cli/entry.js.map +1 -1
- package/dist/core/update-check.d.ts +1 -0
- package/dist/core/update-check.js +23 -6
- package/dist/core/update-check.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.registerUpdateCommand = registerUpdateCommand;
|
|
4
|
+
const update_check_js_1 = require("../../core/update-check.js");
|
|
5
|
+
const version_js_1 = require("../../core/version.js");
|
|
6
|
+
function describeSkipReason(reason) {
|
|
7
|
+
switch (reason) {
|
|
8
|
+
case "unsupported-install-method":
|
|
9
|
+
return "auto-update is only supported for global npm installs. Run: npm install -g indexer-cli@latest";
|
|
10
|
+
case "ci":
|
|
11
|
+
return "auto-update is disabled in CI. Run locally: npm install -g indexer-cli@latest";
|
|
12
|
+
case "flag-disabled":
|
|
13
|
+
return "auto-update was disabled with --no-auto-update.";
|
|
14
|
+
case "update-lock-held":
|
|
15
|
+
return "another indexer-cli update is already running.";
|
|
16
|
+
case "non-tty":
|
|
17
|
+
return "auto-update requires an interactive terminal.";
|
|
18
|
+
default:
|
|
19
|
+
return reason;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function registerUpdateCommand(program) {
|
|
23
|
+
program
|
|
24
|
+
.command("update")
|
|
25
|
+
.description("Check npm and update the global indexer-cli install now")
|
|
26
|
+
.action(async () => {
|
|
27
|
+
const result = await (0, update_check_js_1.performManualUpdate)();
|
|
28
|
+
switch (result.kind) {
|
|
29
|
+
case "no-update":
|
|
30
|
+
console.log(`indexer-cli is already up to date (${version_js_1.PACKAGE_VERSION}).`);
|
|
31
|
+
return;
|
|
32
|
+
case "updated":
|
|
33
|
+
return;
|
|
34
|
+
case "skipped":
|
|
35
|
+
console.error(`Update skipped: ${describeSkipReason(result.reason)}`);
|
|
36
|
+
process.exitCode = 1;
|
|
37
|
+
return;
|
|
38
|
+
case "failed":
|
|
39
|
+
console.error(`Update failed: ${result.message}`);
|
|
40
|
+
process.exitCode = 1;
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":";;AAqBA,sDAuBC;AA3CD,gEAAiE;AACjE,sDAAwD;AAExD,SAAS,kBAAkB,CAAC,MAAc;IACzC,QAAQ,MAAM,EAAE,CAAC;QAChB,KAAK,4BAA4B;YAChC,OAAO,+FAA+F,CAAC;QACxG,KAAK,IAAI;YACR,OAAO,+EAA+E,CAAC;QACxF,KAAK,eAAe;YACnB,OAAO,iDAAiD,CAAC;QAC1D,KAAK,kBAAkB;YACtB,OAAO,gDAAgD,CAAC;QACzD,KAAK,SAAS;YACb,OAAO,+CAA+C,CAAC;QACxD;YACC,OAAO,MAAM,CAAC;IAChB,CAAC;AACF,CAAC;AAED,SAAgB,qBAAqB,CAAC,OAAgB;IACrD,OAAO;SACL,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,yDAAyD,CAAC;SACtE,MAAM,CAAC,KAAK,IAAI,EAAE;QAClB,MAAM,MAAM,GAAG,MAAM,IAAA,qCAAmB,GAAE,CAAC;QAE3C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,WAAW;gBACf,OAAO,CAAC,GAAG,CAAC,sCAAsC,4BAAe,IAAI,CAAC,CAAC;gBACvE,OAAO;YACR,KAAK,SAAS;gBACb,OAAO;YACR,KAAK,SAAS;gBACb,OAAO,CAAC,KAAK,CAAC,mBAAmB,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACtE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACrB,OAAO;YACR,KAAK,QAAQ;gBACZ,OAAO,CAAC,KAAK,CAAC,kBAAkB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACrB,OAAO;QACT,CAAC;IACF,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cli/entry.js
CHANGED
|
@@ -11,6 +11,7 @@ const doctor_js_1 = require("./commands/doctor.js");
|
|
|
11
11
|
const setup_js_1 = require("./commands/setup.js");
|
|
12
12
|
const explain_js_1 = require("./commands/explain.js");
|
|
13
13
|
const deps_js_1 = require("./commands/deps.js");
|
|
14
|
+
const update_js_1 = require("./commands/update.js");
|
|
14
15
|
const version_js_1 = require("../core/version.js");
|
|
15
16
|
const skills_version_js_1 = require("../core/skills-version.js");
|
|
16
17
|
const version_check_js_1 = require("../core/version-check.js");
|
|
@@ -20,7 +21,9 @@ const SKIP_MIGRATION_COMMANDS = new Set([
|
|
|
20
21
|
"init",
|
|
21
22
|
"uninstall",
|
|
22
23
|
"doctor",
|
|
24
|
+
"update",
|
|
23
25
|
]);
|
|
26
|
+
const SKIP_POST_AUTO_UPDATE_COMMANDS = new Set(["update"]);
|
|
24
27
|
const HANDLED_COMMANDER_EXIT_CODES = new Set([
|
|
25
28
|
"commander.helpDisplayed",
|
|
26
29
|
"commander.help",
|
|
@@ -83,10 +86,13 @@ commander_1.program
|
|
|
83
86
|
(0, architecture_js_1.registerArchitectureCommand)(commander_1.program);
|
|
84
87
|
(0, explain_js_1.registerExplainCommand)(commander_1.program);
|
|
85
88
|
(0, deps_js_1.registerDepsCommand)(commander_1.program);
|
|
89
|
+
(0, update_js_1.registerUpdateCommand)(commander_1.program);
|
|
86
90
|
(0, uninstall_js_1.registerUninstallCommand)(commander_1.program);
|
|
87
91
|
(0, doctor_js_1.registerDoctorCommand)(commander_1.program);
|
|
92
|
+
let lastActionCommandName = null;
|
|
88
93
|
commander_1.program.hook("preAction", async (thisCommand, actionCommand) => {
|
|
89
94
|
void thisCommand;
|
|
95
|
+
lastActionCommandName = actionCommand.name();
|
|
90
96
|
await runPreActionChecks(actionCommand.name());
|
|
91
97
|
});
|
|
92
98
|
async function main() {
|
|
@@ -112,7 +118,9 @@ async function main() {
|
|
|
112
118
|
}
|
|
113
119
|
}
|
|
114
120
|
}
|
|
115
|
-
if (commandExecutedSuccessfully
|
|
121
|
+
if (commandExecutedSuccessfully &&
|
|
122
|
+
(lastActionCommandName === null ||
|
|
123
|
+
!SKIP_POST_AUTO_UPDATE_COMMANDS.has(lastActionCommandName))) {
|
|
116
124
|
await (0, update_check_js_1.performAutoUpdateAfterCommand)();
|
|
117
125
|
}
|
|
118
126
|
}
|
package/dist/cli/entry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/cli/entry.ts"],"names":[],"mappings":";;AAAA,yCAAoD;AACpD,gDAAyD;AACzD,kDAA2D;AAC3D,oDAA6D;AAC7D,0DAAmE;AACnE,gEAAyE;AACzE,0DAAmE;AACnE,oDAA6D;AAC7D,kDAA2D;AAC3D,sDAA+D;AAC/D,gDAAyD;AACzD,mDAAqD;AACrD,iEAA2D;AAC3D,+DAGkC;AAClC,6DAAwE;AAExE,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC;IACvC,OAAO;IACP,MAAM;IACN,WAAW;IACX,QAAQ;CACR,CAAC,CAAC;AAEH,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC;IAC5C,yBAAyB;IACzB,gBAAgB;IAChB,mBAAmB;IACnB,0BAA0B;IAC1B,2BAA2B;IAC3B,yBAAyB;IACzB,2BAA2B;IAC3B,yBAAyB;CACzB,CAAC,CAAC;AAEH,KAAK,UAAU,kBAAkB,CAAC,WAAmB;IACpD,IAAI,uBAAuB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9C,OAAO;IACR,CAAC;IAED,IAAI,CAAC;QACJ,MAAM,IAAA,0CAAuB,GAAE,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,KAAK,CAAC,4CAA4C,OAAO,EAAE,CAAC,CAAC;QACrE,MAAM,IAAI,0BAAc,CAAC,CAAC,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,QAAQ,GACb,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,0BAAc,CAAC,QAAQ,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,CAAC;QACJ,MAAM,IAAA,wCAAqB,GAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,KAAK,CAAC,uCAAuC,OAAO,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,MAAM,IAAI,0BAAc,CAAC,CAAC,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,QAAQ,GACb,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,0BAAc,CAAC,QAAQ,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;QACvE,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC3E,CAAC;AAED,mBAAO;KACL,IAAI,CAAC,KAAK,CAAC;KACX,WAAW,CAAC,mDAAmD,CAAC;KAChE,OAAO,CAAC,GAAG,4BAAe,aAAa,kCAAc,GAAG,CAAC;KACzD,WAAW,CACX,OAAO,EACP,cAAc,4BAAe,aAAa,kCAAc,KAAK,CAC7D;KACA,YAAY,EAAE;KACd,MAAM,CAAC,kBAAkB,EAAE,6CAA6C,CAAC,CAAC;AAE5E,IAAA,+BAAoB,EAAC,mBAAO,CAAC,CAAC;AAC9B,IAAA,6BAAmB,EAAC,mBAAO,CAAC,CAAC;AAC7B,IAAA,+BAAoB,EAAC,mBAAO,CAAC,CAAC;AAC9B,IAAA,iCAAqB,EAAC,mBAAO,CAAC,CAAC;AAC/B,IAAA,uCAAwB,EAAC,mBAAO,CAAC,CAAC;AAClC,IAAA,6CAA2B,EAAC,mBAAO,CAAC,CAAC;AACrC,IAAA,mCAAsB,EAAC,mBAAO,CAAC,CAAC;AAChC,IAAA,6BAAmB,EAAC,mBAAO,CAAC,CAAC;AAC7B,IAAA,uCAAwB,EAAC,mBAAO,CAAC,CAAC;AAClC,IAAA,iCAAqB,EAAC,mBAAO,CAAC,CAAC;AAE/B,mBAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE;IAC9D,KAAK,WAAW,CAAC;IACjB,MAAM,kBAAkB,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,IAAI;IAClB,MAAM,SAAS,GACd,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QACzB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC3E,IAAI,2BAA2B,GAAG,KAAK,CAAC;IAExC,IAAI,CAAC;QACJ,IAAI,SAAS,EAAE,CAAC;YACf,mBAAO,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO;QACR,CAAC;QACD,MAAM,mBAAO,CAAC,UAAU,EAAE,CAAC;QAC3B,2BAA2B,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACzB,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,KAAK,CAAC;QACb,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YAChD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;gBACpD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC;QACF,CAAC;IACF,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/cli/entry.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,4 +17,5 @@ export declare function detectInstallMethod(): InstallMethod;
|
|
|
17
17
|
export declare function getAutoUpdateSkipReason(): SkipAutoUpdateReason;
|
|
18
18
|
export declare function shouldSkipAutoUpdate(): boolean;
|
|
19
19
|
export declare function performAutoUpdateAfterCommand(): Promise<AutoUpdateResult>;
|
|
20
|
+
export declare function performManualUpdate(): Promise<AutoUpdateResult>;
|
|
20
21
|
export declare function checkForUpdates(): Promise<void>;
|
|
@@ -4,6 +4,7 @@ exports.detectInstallMethod = detectInstallMethod;
|
|
|
4
4
|
exports.getAutoUpdateSkipReason = getAutoUpdateSkipReason;
|
|
5
5
|
exports.shouldSkipAutoUpdate = shouldSkipAutoUpdate;
|
|
6
6
|
exports.performAutoUpdateAfterCommand = performAutoUpdateAfterCommand;
|
|
7
|
+
exports.performManualUpdate = performManualUpdate;
|
|
7
8
|
exports.checkForUpdates = checkForUpdates;
|
|
8
9
|
const node_child_process_1 = require("node:child_process");
|
|
9
10
|
const node_fs_1 = require("node:fs");
|
|
@@ -112,6 +113,17 @@ function getAutoUpdateSkipReason() {
|
|
|
112
113
|
function shouldSkipAutoUpdate() {
|
|
113
114
|
return getAutoUpdateSkipReason() !== null;
|
|
114
115
|
}
|
|
116
|
+
function getUpdateSkipReason(options) {
|
|
117
|
+
if (detectInstallMethod() !== "npm-global")
|
|
118
|
+
return "unsupported-install-method";
|
|
119
|
+
if (!options.ignoreTty && !process.stdout.isTTY)
|
|
120
|
+
return "non-tty";
|
|
121
|
+
if (process.env.CI === "true" || process.env.CI === "1")
|
|
122
|
+
return "ci";
|
|
123
|
+
if (process.argv.includes("--no-auto-update"))
|
|
124
|
+
return "flag-disabled";
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
115
127
|
function readInstalledPackageVersion() {
|
|
116
128
|
const npmRoot = tryGetNpmGlobalRoot();
|
|
117
129
|
if (npmRoot) {
|
|
@@ -139,8 +151,8 @@ function releaseUpdateLock(lockHeld) {
|
|
|
139
151
|
return;
|
|
140
152
|
(0, node_fs_1.rmSync)(UPDATE_LOCK_DIR, { recursive: true, force: true });
|
|
141
153
|
}
|
|
142
|
-
async function
|
|
143
|
-
const skipReason =
|
|
154
|
+
async function runUpdate(options = {}) {
|
|
155
|
+
const skipReason = getUpdateSkipReason(options);
|
|
144
156
|
if (skipReason !== null) {
|
|
145
157
|
return { kind: "skipped", reason: skipReason };
|
|
146
158
|
}
|
|
@@ -148,11 +160,10 @@ async function performAutoUpdateAfterCommand() {
|
|
|
148
160
|
try {
|
|
149
161
|
const now = Date.now();
|
|
150
162
|
const cache = readCache();
|
|
151
|
-
if (cache && !isNewerVersion(version_js_1.PACKAGE_VERSION, cache.latestVersion)) {
|
|
152
|
-
return { kind: "no-update" };
|
|
153
|
-
}
|
|
154
163
|
let latest = cache?.latestVersion;
|
|
155
|
-
if (
|
|
164
|
+
if (options.forceCheck === true ||
|
|
165
|
+
!cache ||
|
|
166
|
+
now - cache.lastChecked >= CHECK_INTERVAL_MS) {
|
|
156
167
|
latest = await fetchLatestVersion();
|
|
157
168
|
writeCache({ lastChecked: now, latestVersion: latest });
|
|
158
169
|
}
|
|
@@ -205,6 +216,12 @@ async function performAutoUpdateAfterCommand() {
|
|
|
205
216
|
return { kind: "failed", message };
|
|
206
217
|
}
|
|
207
218
|
}
|
|
219
|
+
async function performAutoUpdateAfterCommand() {
|
|
220
|
+
return runUpdate();
|
|
221
|
+
}
|
|
222
|
+
async function performManualUpdate() {
|
|
223
|
+
return runUpdate({ forceCheck: true, ignoreTty: true });
|
|
224
|
+
}
|
|
208
225
|
function showUpdateNotification(current, latest, method = "npm-global") {
|
|
209
226
|
const updateCommands = {
|
|
210
227
|
npx: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/core/update-check.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/core/update-check.ts"],"names":[],"mappings":"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"}
|