@radkode/neo 0.9.2 → 0.10.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/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/git/pull/index.d.ts.map +1 -1
- package/dist/commands/git/pull/index.js +121 -20
- package/dist/commands/git/pull/index.js.map +1 -1
- package/dist/commands/git/push/index.d.ts.map +1 -1
- package/dist/commands/git/push/index.js +90 -8
- package/dist/commands/git/push/index.js.map +1 -1
- package/dist/commands/init/index.d.ts.map +1 -1
- package/dist/commands/init/index.js +11 -7
- package/dist/commands/init/index.js.map +1 -1
- package/dist/commands/update/index.d.ts.map +1 -1
- package/dist/commands/update/index.js +2 -19
- package/dist/commands/update/index.js.map +1 -1
- package/dist/utils/config.d.ts +14 -10
- package/dist/utils/config.d.ts.map +1 -1
- package/dist/utils/config.js +15 -9
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/update-check.d.ts +11 -0
- package/dist/utils/update-check.d.ts.map +1 -0
- package/dist/utils/update-check.js +79 -0
- package/dist/utils/update-check.js.map +1 -0
- package/package.json +1 -1
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAUtD,wBAAgB,SAAS,IAAI,OAAO,CAsEnC"}
|
package/dist/cli.js
CHANGED
|
@@ -4,6 +4,7 @@ import { displayBanner } from './utils/banner.js';
|
|
|
4
4
|
import { logger } from './utils/logger.js';
|
|
5
5
|
import { registerCommands } from './commands/index.js';
|
|
6
6
|
import { configManager } from './utils/config.js';
|
|
7
|
+
import { notifyIfCliUpdateAvailable } from './utils/update-check.js';
|
|
7
8
|
import packageJson from '../package.json' with { type: 'json' };
|
|
8
9
|
export function createCLI() {
|
|
9
10
|
const program = new Command();
|
|
@@ -46,6 +47,7 @@ export function createCLI() {
|
|
|
46
47
|
if (opts.color === false) {
|
|
47
48
|
chalk.level = 0;
|
|
48
49
|
}
|
|
50
|
+
await notifyIfCliUpdateAvailable();
|
|
49
51
|
});
|
|
50
52
|
registerCommands(program);
|
|
51
53
|
return program;
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAEhE,MAAM,UAAU,SAAS;IACvB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,IAAI,CAAC,KAAK,CAAC;SACX,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC;SACpC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;SAC5B,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC;SACjD,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,YAAY,EAAE,wBAAwB,CAAC;SAC9C,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC;SACpC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE;QACtD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QAQzC,MAAM,eAAe,GACnB,WAAW,KAAK,SAAS;YACzB,WAAW,KAAK,MAAM;YACtB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAG9B,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAGD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAGD,IAAI,UAAU,GAAe,MAAM,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC1C,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,MAAM,CAAC,KAAK,CAAC,gDAAgD,KAAK,EAAE,CAAC,CAAC;QACxE,CAAC;QAGD,aAAa,CAAC,UAAU,CAAC,CAAC;QAG1B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,sBAAsB,WAAW,EAAE,CAAC,CAAC;QACpD,CAAC;QAGD,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACzB,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;QAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAiBtD,wBAAgB,iBAAiB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAiBtD,wBAAgB,iBAAiB,IAAI,OAAO,CAwJ3C"}
|
|
@@ -56,8 +56,8 @@ export function createPullCommand() {
|
|
|
56
56
|
logger.debug('Attempting normal pull...');
|
|
57
57
|
try {
|
|
58
58
|
const { stdout } = await execa('git', ['pull'], {
|
|
59
|
-
stdio: 'pipe',
|
|
60
59
|
encoding: 'utf8',
|
|
60
|
+
stdio: 'pipe',
|
|
61
61
|
});
|
|
62
62
|
spinner.succeed('Successfully pulled from remote!');
|
|
63
63
|
if (stdout.trim()) {
|
|
@@ -65,26 +65,21 @@ export function createPullCommand() {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
catch (error) {
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (stdout.trim()) {
|
|
82
|
-
ui.muted(stdout);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
throw error;
|
|
68
|
+
const stderr = error.stderr ?? '';
|
|
69
|
+
const shortMessage = error.shortMessage ?? '';
|
|
70
|
+
const combinedMessage = `${error instanceof Error ? error.message : String(error)} ${stderr} ${shortMessage}`.toLowerCase();
|
|
71
|
+
const diverged = combinedMessage.includes('divergent') ||
|
|
72
|
+
combinedMessage.includes('diverging') ||
|
|
73
|
+
combinedMessage.includes('fast-forward') ||
|
|
74
|
+
combinedMessage.includes('pull.ff') ||
|
|
75
|
+
combinedMessage.includes('non-fast-forward') ||
|
|
76
|
+
combinedMessage.includes('not possible to fast-forward');
|
|
77
|
+
if (diverged) {
|
|
78
|
+
spinner.stop();
|
|
79
|
+
await handleDivergedPull(branchName, validatedOptions);
|
|
80
|
+
return;
|
|
87
81
|
}
|
|
82
|
+
throw error;
|
|
88
83
|
}
|
|
89
84
|
}
|
|
90
85
|
catch (error) {
|
|
@@ -131,6 +126,112 @@ export function createPullCommand() {
|
|
|
131
126
|
});
|
|
132
127
|
return command;
|
|
133
128
|
}
|
|
129
|
+
async function handleDivergedPull(branchName, validatedOptions) {
|
|
130
|
+
ui.error('Local and remote branches have diverged.');
|
|
131
|
+
ui.warn('Choose how to reconcile the branches.');
|
|
132
|
+
const defaultStrategy = validatedOptions.noRebase ? 'merge' : 'rebase';
|
|
133
|
+
const { strategy } = await inquirer.prompt([
|
|
134
|
+
{
|
|
135
|
+
choices: [
|
|
136
|
+
{
|
|
137
|
+
name: 'Cancel (do nothing)',
|
|
138
|
+
value: 'cancel',
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
name: 'Merge remote into current branch (--no-ff)',
|
|
142
|
+
value: 'merge',
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
name: 'Rebase onto remote (recommended)',
|
|
146
|
+
value: 'rebase',
|
|
147
|
+
},
|
|
148
|
+
],
|
|
149
|
+
default: defaultStrategy,
|
|
150
|
+
message: 'Branches have diverged. Choose a pull strategy:',
|
|
151
|
+
name: 'strategy',
|
|
152
|
+
type: 'list',
|
|
153
|
+
},
|
|
154
|
+
]);
|
|
155
|
+
if (strategy === 'rebase') {
|
|
156
|
+
const rebaseSpinner = ui.spinner('Pulling with rebase');
|
|
157
|
+
try {
|
|
158
|
+
rebaseSpinner.start();
|
|
159
|
+
const { stdout } = await execa('git', ['pull', '--rebase'], {
|
|
160
|
+
encoding: 'utf8',
|
|
161
|
+
stdio: 'pipe',
|
|
162
|
+
});
|
|
163
|
+
rebaseSpinner.succeed('Successfully pulled with rebase');
|
|
164
|
+
ui.info('Rebased onto remote to resolve divergence');
|
|
165
|
+
if (stdout.trim()) {
|
|
166
|
+
ui.muted(stdout);
|
|
167
|
+
}
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
catch (error) {
|
|
171
|
+
rebaseSpinner.stop();
|
|
172
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
173
|
+
if (message.toLowerCase().includes('conflict')) {
|
|
174
|
+
ui.error('Rebase hit conflicts.');
|
|
175
|
+
ui.warn('Resolve conflicts, then continue the rebase:');
|
|
176
|
+
ui.list([
|
|
177
|
+
'Fix conflicts in your editor',
|
|
178
|
+
'Stage resolved files: git add <files>',
|
|
179
|
+
'Continue rebase: git rebase --continue',
|
|
180
|
+
]);
|
|
181
|
+
ui.muted('Or abort the rebase:');
|
|
182
|
+
ui.muted(' git rebase --abort');
|
|
183
|
+
process.exit(1);
|
|
184
|
+
}
|
|
185
|
+
ui.error('Rebase pull failed.');
|
|
186
|
+
ui.muted(message);
|
|
187
|
+
process.exit(1);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
if (strategy === 'merge') {
|
|
191
|
+
const fetchSpinner = ui.spinner('Fetching latest changes');
|
|
192
|
+
const mergeSpinner = ui.spinner('Merging remote into current branch');
|
|
193
|
+
const remoteRef = branchName || 'HEAD';
|
|
194
|
+
try {
|
|
195
|
+
fetchSpinner.start();
|
|
196
|
+
await execa('git', ['fetch', 'origin', remoteRef], {
|
|
197
|
+
encoding: 'utf8',
|
|
198
|
+
stdio: 'pipe',
|
|
199
|
+
});
|
|
200
|
+
fetchSpinner.succeed('Fetched remote updates');
|
|
201
|
+
mergeSpinner.start();
|
|
202
|
+
const { stdout } = await execa('git', ['merge', '--no-ff', `origin/${remoteRef}`], {
|
|
203
|
+
encoding: 'utf8',
|
|
204
|
+
stdio: 'pipe',
|
|
205
|
+
});
|
|
206
|
+
mergeSpinner.succeed('Merge completed');
|
|
207
|
+
ui.info('Merged remote changes (non fast-forward)');
|
|
208
|
+
if (stdout.trim()) {
|
|
209
|
+
ui.muted(stdout);
|
|
210
|
+
}
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
catch (error) {
|
|
214
|
+
fetchSpinner.stop();
|
|
215
|
+
mergeSpinner.stop();
|
|
216
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
217
|
+
if (message.toLowerCase().includes('conflict')) {
|
|
218
|
+
ui.error('Merge produced conflicts.');
|
|
219
|
+
ui.warn('Resolve conflicts, then finish the merge:');
|
|
220
|
+
ui.list([
|
|
221
|
+
'Fix conflicts in your editor',
|
|
222
|
+
'Stage resolved files: git add <files>',
|
|
223
|
+
'Commit the merge: git commit',
|
|
224
|
+
]);
|
|
225
|
+
process.exit(1);
|
|
226
|
+
}
|
|
227
|
+
ui.error('Merge pull failed.');
|
|
228
|
+
ui.muted(message);
|
|
229
|
+
process.exit(1);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
ui.info('Pull cancelled. No changes were applied.');
|
|
233
|
+
process.exit(1);
|
|
234
|
+
}
|
|
134
235
|
async function handleDeletedRemoteBranch(branchName) {
|
|
135
236
|
ui.error('Remote branch no longer exists!');
|
|
136
237
|
ui.warn(`Your local branch "${branchName}" is tracking a remote branch that has been deleted`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAWrF,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC,OAAO;SACJ,WAAW,CAAC,oEAAoE,CAAC;SACjF,MAAM,CAAC,UAAU,EAAE,uBAAuB,CAAC;SAC3C,MAAM,CAAC,aAAa,EAAE,mCAAmC,CAAC;SAC1D,MAAM,CAAC,KAAK,EAAE,OAAgB,EAAE,EAAE;QAEjC,IAAI,gBAAgC,CAAC;QACrC,IAAI,CAAC;YACH,gBAAgB,GAAG,QAAQ,CAAC,oBAAoB,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QACjF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClD,IAAI,UAAU,GAAG,EAAE,CAAC;QAEpB,IAAI,CAAC;YAEH,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACnF,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;YAElC,MAAM,CAAC,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;YAG9C,IAAI,CAAC;gBACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,EAAE,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBAC3C,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;gBACzC,EAAE,CAAC,KAAK,CAAC,yCAAyC,UAAU,IAAI,UAAU,EAAE,CAAC,CAAC;gBAC9E,EAAE,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBACnC,EAAE,CAAC,KAAK,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,OAAO,CAAC,KAAK,EAAE,CAAC;YAGhB,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAC5B,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBACvD,OAAO,CAAC,IAAI,GAAG,wBAAwB,CAAC;gBAExC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;oBAC1D,KAAK,EAAE,MAAM;oBACb,QAAQ,EAAE,MAAM;iBACjB,CAAC,CAAC;gBAEH,OAAO,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;gBAEpD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBAClB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnB,CAAC;gBAED,OAAO;YACT,CAAC;YAGD,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAE1C,IAAI,CAAC;gBACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE;oBAC9C,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,MAAM;iBACd,CAAC,CAAC;gBAEH,OAAO,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;gBAEpD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBAClB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,MAAM,GAAI,KAA6B,CAAC,MAAM,IAAI,EAAE,CAAC;gBAC3D,MAAM,YAAY,GAAI,KAAmC,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC7E,MAAM,eAAe,GAAG,GACtB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,IAAI,MAAM,IAAI,YAAY,EAAE,CAAC,WAAW,EAAE,CAAC;gBAE3C,MAAM,QAAQ,GACZ,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACrC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACrC,eAAe,CAAC,QAAQ,CAAC,cAAc,CAAC;oBACxC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC;oBACnC,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC;oBAC5C,eAAe,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC;gBAE3D,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM,kBAAkB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;oBACvD,OAAO;gBACT,CAAC;gBAED,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,EAAE,CAAC;YAEf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;gBAEnC,IAAI,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;oBAClD,EAAE,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBAClC,EAAE,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;oBAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAGD,IACE,YAAY,CAAC,QAAQ,CAAC,yBAAyB,CAAC;oBAChD,YAAY,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EACpD,CAAC;oBACD,MAAM,yBAAyB,CAAC,UAAU,CAAC,CAAC;oBAC5C,OAAO;gBACT,CAAC;gBAED,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACtC,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBACtC,EAAE,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;oBAC7C,EAAE,CAAC,IAAI,CAAC;wBACN,8BAA8B;wBAC9B,uCAAuC;wBACvC,wCAAwC;qBACzC,CAAC,CAAC;oBACH,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBACjC,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAED,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBACnF,EAAE,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;oBACnC,EAAE,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;oBAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAED,IAAI,YAAY,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;oBACpD,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;oBAC3B,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;YAED,EAAE,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YACvC,EAAE,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,UAAkB,EAClB,gBAAgC;IAEhC,EAAE,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACrD,EAAE,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;IAEjD,MAAM,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEvE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACzC;YACE,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,qBAAqB;oBAC3B,KAAK,EAAE,QAAQ;iBAChB;gBACD;oBACE,IAAI,EAAE,4CAA4C;oBAClD,KAAK,EAAE,OAAO;iBACf;gBACD;oBACE,IAAI,EAAE,kCAAkC;oBACxC,KAAK,EAAE,QAAQ;iBAChB;aACF;YACD,OAAO,EAAE,eAAe;YACxB,OAAO,EAAE,iDAAiD;YAC1D,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,MAAM;SACb;KACF,CAAC,CAAC;IAEH,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACxD,IAAI,CAAC;YACH,aAAa,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;gBAC1D,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YACH,aAAa,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;YACzD,EAAE,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;gBAClB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC;YAED,OAAO;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/C,EAAE,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAClC,EAAE,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;gBACxD,EAAE,CAAC,IAAI,CAAC;oBACN,8BAA8B;oBAC9B,uCAAuC;oBACvC,wCAAwC;iBACzC,CAAC,CAAC;gBACH,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBACjC,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAChC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,UAAU,IAAI,MAAM,CAAC;QACvC,IAAI,CAAC;YACH,YAAY,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE;gBACjD,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YACH,YAAY,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;YAE/C,YAAY,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,SAAS,EAAE,CAAC,EAAE;gBACjF,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YACH,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACxC,EAAE,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAEpD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;gBAClB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC;YAED,OAAO;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,IAAI,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/C,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBACtC,EAAE,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;gBACrD,EAAE,CAAC,IAAI,CAAC;oBACN,8BAA8B;oBAC9B,uCAAuC;oBACvC,8BAA8B;iBAC/B,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC/B,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,EAAE,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;IACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAMD,KAAK,UAAU,yBAAyB,CAAC,UAAkB;IACzD,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC5C,EAAE,CAAC,IAAI,CAAC,sBAAsB,UAAU,qDAAqD,CAAC,CAAC;IAC/F,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACvC;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,qCAAqC;YAC9C,OAAO,EAAE,oBAAoB;YAC7B,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,qDAAqD;oBAC3D,KAAK,EAAE,oBAAoB;iBAC5B;gBACD;oBACE,IAAI,EAAE,qCAAqC;oBAC3C,KAAK,EAAE,kBAAkB;iBAC1B;gBACD;oBACE,IAAI,EAAE,2BAA2B,UAAU,GAAG;oBAC9C,KAAK,EAAE,cAAc;iBACtB;gBACD;oBACE,IAAI,EAAE,qBAAqB;oBAC3B,KAAK,EAAE,QAAQ;iBAChB;aACF;SACF;KACF,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEhE,QAAQ,eAAe,EAAE,CAAC;QACxB,KAAK,oBAAoB;YACvB,MAAM,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACxC,MAAM;QACR,KAAK,kBAAkB;YACrB,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;YAC/B,MAAM;QACR,KAAK,cAAc;YACjB,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;YACjC,MAAM;QACR,KAAK,QAAQ;YACX,EAAE,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAMD,KAAK,UAAU,qBAAqB,CAAC,UAAkB;IACrD,IAAI,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAG7C,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7C,EAAE,CAAC,OAAO,CAAC,eAAe,UAAU,SAAS,CAAC,CAAC;QAG/C,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;YACjD,EAAE,CAAC,OAAO,CAAC,mBAAmB,UAAU,GAAG,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,IAAI,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC9C,EAAE,CAAC,IAAI,CAAC,WAAW,UAAU,wBAAwB,CAAC,CAAC;gBAEvD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;oBAC5C;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,aAAa;wBACnB,OAAO,EAAE,+DAA+D;wBACxE,OAAO,EAAE,KAAK;qBACf;iBACF,CAAC,CAAC;gBAEH,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;oBACjD,EAAE,CAAC,OAAO,CAAC,yBAAyB,UAAU,GAAG,CAAC,CAAC;oBACnD,EAAE,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;gBACnE,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,IAAI,CAAC,WAAW,UAAU,iBAAiB,CAAC,CAAC;oBAChD,EAAE,CAAC,KAAK,CAAC,+CAA+C,UAAU,EAAE,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACvD,EAAE,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAMD,KAAK,UAAU,YAAY,CAAC,UAAkB;IAC5C,IAAI,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAG7C,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7C,EAAE,CAAC,OAAO,CAAC,eAAe,UAAU,SAAS,CAAC,CAAC;QAC/C,EAAE,CAAC,IAAI,CAAC,WAAW,UAAU,iBAAiB,CAAC,CAAC;QAChD,EAAE,CAAC,KAAK,CAAC,0CAA0C,UAAU,EAAE,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAC5C,EAAE,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAMD,KAAK,UAAU,cAAc,CAAC,UAAkB;IAC9C,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,UAAU,UAAU,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;QACxF,EAAE,CAAC,OAAO,CAAC,qBAAqB,UAAU,eAAe,UAAU,EAAE,CAAC,CAAC;QACvE,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5C,EAAE,CAAC,KAAK,CAAC,wBAAwB,UAAU,iBAAiB,CAAC,CAAC;YAC9D,EAAE,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YACnD,EAAE,CAAC,KAAK,CAAC,wBAAwB,UAAU,EAAE,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC1C,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAMD,KAAK,UAAU,iBAAiB;IAC9B,IAAI,CAAC;QAEH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC3E,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YAEH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC;YAC7E,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,MAAM,CAAC;YAEP,IAAI,CAAC;gBACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC,CAAC;gBACpF,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3D,CAAC;YAAC,MAAM,CAAC;gBAEP,EAAE,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;gBAC5D,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/push/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAStD,wBAAgB,iBAAiB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/push/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAStD,wBAAgB,iBAAiB,IAAI,OAAO,CA8P3C"}
|
|
@@ -26,6 +26,7 @@ export function createPushCommand() {
|
|
|
26
26
|
}
|
|
27
27
|
let branchName = '';
|
|
28
28
|
const spinner = ui.spinner('Pushing to remote');
|
|
29
|
+
let pushArgs = [];
|
|
29
30
|
try {
|
|
30
31
|
const { stdout: currentBranch } = await execa('git', ['branch', '--show-current']);
|
|
31
32
|
branchName = currentBranch.trim();
|
|
@@ -81,7 +82,7 @@ export function createPushCommand() {
|
|
|
81
82
|
}
|
|
82
83
|
return;
|
|
83
84
|
}
|
|
84
|
-
|
|
85
|
+
pushArgs = ['push'];
|
|
85
86
|
if (validatedOptions.force) {
|
|
86
87
|
pushArgs.push('--force');
|
|
87
88
|
}
|
|
@@ -110,6 +111,9 @@ export function createPushCommand() {
|
|
|
110
111
|
catch (error) {
|
|
111
112
|
spinner.stop();
|
|
112
113
|
if (error instanceof Error) {
|
|
114
|
+
const stderr = error.stderr ?? '';
|
|
115
|
+
const shortMessage = error.shortMessage ?? '';
|
|
116
|
+
const combinedMessage = `${error.message} ${stderr} ${shortMessage}`.toLowerCase();
|
|
113
117
|
if (error.message?.includes('not a git repository')) {
|
|
114
118
|
ui.error('Not a git repository!');
|
|
115
119
|
ui.warn('Make sure you are in a git repository directory');
|
|
@@ -121,13 +125,91 @@ export function createPushCommand() {
|
|
|
121
125
|
ui.muted(` git push -u origin ${branchName || 'your-branch'}`);
|
|
122
126
|
process.exit(1);
|
|
123
127
|
}
|
|
124
|
-
if (
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
ui.
|
|
130
|
-
ui.
|
|
128
|
+
if (combinedMessage.includes('non-fast-forward') ||
|
|
129
|
+
combinedMessage.includes('fetch first') ||
|
|
130
|
+
combinedMessage.includes('behind') ||
|
|
131
|
+
combinedMessage.includes('remote contains') ||
|
|
132
|
+
combinedMessage.includes('tip of your current branch is behind its remote counterpart')) {
|
|
133
|
+
ui.error('Push was rejected because the remote has new commits.');
|
|
134
|
+
ui.warn('Choose how to resolve the divergence:');
|
|
135
|
+
const { resolution } = await inquirer.prompt([
|
|
136
|
+
{
|
|
137
|
+
choices: [
|
|
138
|
+
{
|
|
139
|
+
name: 'Pull with rebase and retry push',
|
|
140
|
+
value: 'pull-rebase',
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
name: 'Force push (overwrite remote)',
|
|
144
|
+
value: 'force',
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
name: 'Cancel for now',
|
|
148
|
+
value: 'cancel',
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
default: 'pull-rebase',
|
|
152
|
+
message: 'Select a resolution strategy',
|
|
153
|
+
name: 'resolution',
|
|
154
|
+
type: 'list',
|
|
155
|
+
},
|
|
156
|
+
]);
|
|
157
|
+
if (resolution === 'pull-rebase') {
|
|
158
|
+
const rebaseSpinner = ui.spinner('Pulling latest changes with rebase');
|
|
159
|
+
try {
|
|
160
|
+
rebaseSpinner.start();
|
|
161
|
+
await execa('git', ['pull', '--rebase', 'origin', branchName || 'HEAD']);
|
|
162
|
+
rebaseSpinner.succeed('Rebased onto remote changes');
|
|
163
|
+
const retrySpinner = ui.spinner('Retrying push after rebase');
|
|
164
|
+
retrySpinner.start();
|
|
165
|
+
const retryResult = await execa('git', pushArgs, {
|
|
166
|
+
encoding: 'utf8',
|
|
167
|
+
stdio: 'pipe',
|
|
168
|
+
});
|
|
169
|
+
retrySpinner.succeed('Successfully pushed after rebase');
|
|
170
|
+
if (retryResult.stdout) {
|
|
171
|
+
ui.muted(retryResult.stdout);
|
|
172
|
+
}
|
|
173
|
+
if (validatedOptions.setUpstream) {
|
|
174
|
+
ui.info(`Set upstream branch: ${validatedOptions.setUpstream}`);
|
|
175
|
+
}
|
|
176
|
+
process.exit(0);
|
|
177
|
+
}
|
|
178
|
+
catch (rebaseError) {
|
|
179
|
+
rebaseSpinner.stop();
|
|
180
|
+
ui.error('Rebase failed. Resolve conflicts then push again.');
|
|
181
|
+
ui.muted(rebaseError instanceof Error ? rebaseError.message : String(rebaseError));
|
|
182
|
+
process.exit(1);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
if (resolution === 'force') {
|
|
186
|
+
const forceSpinner = ui.spinner('Force pushing (overwriting remote)');
|
|
187
|
+
const forceArgs = pushArgs.includes('--force')
|
|
188
|
+
? pushArgs
|
|
189
|
+
: ['push', '--force', ...pushArgs.slice(1)];
|
|
190
|
+
try {
|
|
191
|
+
forceSpinner.start();
|
|
192
|
+
const forceResult = await execa('git', forceArgs, {
|
|
193
|
+
encoding: 'utf8',
|
|
194
|
+
stdio: 'pipe',
|
|
195
|
+
});
|
|
196
|
+
forceSpinner.succeed('Force push completed');
|
|
197
|
+
if (forceResult.stdout) {
|
|
198
|
+
ui.muted(forceResult.stdout);
|
|
199
|
+
}
|
|
200
|
+
if (validatedOptions.setUpstream) {
|
|
201
|
+
ui.info(`Set upstream branch: ${validatedOptions.setUpstream}`);
|
|
202
|
+
}
|
|
203
|
+
process.exit(0);
|
|
204
|
+
}
|
|
205
|
+
catch (forceError) {
|
|
206
|
+
forceSpinner.stop();
|
|
207
|
+
ui.error('Force push failed.');
|
|
208
|
+
ui.muted(forceError instanceof Error ? forceError.message : String(forceError));
|
|
209
|
+
process.exit(1);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
ui.info('Push cancelled. No changes were pushed.');
|
|
131
213
|
process.exit(1);
|
|
132
214
|
}
|
|
133
215
|
if (error.message?.includes('authentication')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/push/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAG1D,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC,OAAO;SACJ,WAAW,CAAC,mCAAmC,CAAC;SAChD,MAAM,CAAC,aAAa,EAAE,gCAAgC,CAAC;SACvD,MAAM,CAAC,6BAA6B,EAAE,qBAAqB,CAAC;SAC5D,MAAM,CAAC,WAAW,EAAE,oDAAoD,CAAC;SACzE,MAAM,CAAC,QAAQ,EAAE,8BAA8B,CAAC;SAChD,MAAM,CAAC,KAAK,EAAE,OAAgB,EAAE,EAAE;QAEjC,IAAI,gBAAgC,CAAC;QACrC,IAAI,CAAC;YACH,gBAAgB,GAAG,QAAQ,CAAC,oBAAoB,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QACjF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,IAAI,UAAU,GAAW,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/push/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,wBAAgB,iBAAiB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,wBAAgB,iBAAiB,IAAI,OAAO,CAiL3C"}
|
|
@@ -102,7 +102,12 @@ export function createInitCommand() {
|
|
|
102
102
|
const configSpinner = ui.spinner('Setting up configuration');
|
|
103
103
|
configSpinner.start();
|
|
104
104
|
const newConfig = {
|
|
105
|
-
|
|
105
|
+
installation: {
|
|
106
|
+
completionsPath: join(configManager.getConfigDir(), 'completions'),
|
|
107
|
+
...(installStatus.globalPath ? { globalPath: installStatus.globalPath } : {}),
|
|
108
|
+
installedAt: new Date().toISOString(),
|
|
109
|
+
version: installStatus.packageVersion || '0.1.0',
|
|
110
|
+
},
|
|
106
111
|
preferences: {
|
|
107
112
|
aliases: {
|
|
108
113
|
n: true,
|
|
@@ -111,15 +116,14 @@ export function createInitCommand() {
|
|
|
111
116
|
theme: 'auto',
|
|
112
117
|
},
|
|
113
118
|
shell: {
|
|
114
|
-
type: 'zsh',
|
|
115
119
|
rcFile: shell.getRcFile(),
|
|
120
|
+
type: 'zsh',
|
|
116
121
|
},
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
...(installStatus.globalPath && { globalPath: installStatus.globalPath }),
|
|
121
|
-
completionsPath: join(configManager.getConfigDir(), 'completions'),
|
|
122
|
+
updates: {
|
|
123
|
+
lastCheckedAt: null,
|
|
124
|
+
latestVersion: null,
|
|
122
125
|
},
|
|
126
|
+
user: {},
|
|
123
127
|
};
|
|
124
128
|
await configManager.write(newConfig);
|
|
125
129
|
configSpinner.succeed('Configuration saved');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAmFtD,wBAAgB,mBAAmB,IAAI,OAAO,CA+I7C"}
|
|
@@ -6,6 +6,7 @@ import { logger } from '../../utils/logger.js';
|
|
|
6
6
|
import { ui } from '../../utils/ui.js';
|
|
7
7
|
import { validate, isValidationError } from '../../utils/validation.js';
|
|
8
8
|
import { updateOptionsSchema } from '../../types/schemas.js';
|
|
9
|
+
import { compareVersions, fetchLatestCliVersion } from '../../utils/update-check.js';
|
|
9
10
|
function getCurrentVersion() {
|
|
10
11
|
try {
|
|
11
12
|
return packageJson.version;
|
|
@@ -17,31 +18,13 @@ function getCurrentVersion() {
|
|
|
17
18
|
}
|
|
18
19
|
async function getLatestVersion() {
|
|
19
20
|
try {
|
|
20
|
-
|
|
21
|
-
if (!response.ok) {
|
|
22
|
-
throw new Error(`HTTP error! status: ${response.status}`);
|
|
23
|
-
}
|
|
24
|
-
const data = (await response.json());
|
|
25
|
-
return data['dist-tags'].latest;
|
|
21
|
+
return await fetchLatestCliVersion();
|
|
26
22
|
}
|
|
27
23
|
catch (error) {
|
|
28
24
|
ui.error('Failed to fetch latest version from npm registry');
|
|
29
25
|
throw error;
|
|
30
26
|
}
|
|
31
27
|
}
|
|
32
|
-
function compareVersions(v1, v2) {
|
|
33
|
-
const parts1 = v1.split('.').map(Number);
|
|
34
|
-
const parts2 = v2.split('.').map(Number);
|
|
35
|
-
for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
|
|
36
|
-
const part1 = parts1[i] || 0;
|
|
37
|
-
const part2 = parts2[i] || 0;
|
|
38
|
-
if (part1 > part2)
|
|
39
|
-
return 1;
|
|
40
|
-
if (part1 < part2)
|
|
41
|
-
return -1;
|
|
42
|
-
}
|
|
43
|
-
return 0;
|
|
44
|
-
}
|
|
45
28
|
async function detectPackageManager() {
|
|
46
29
|
try {
|
|
47
30
|
await execa('ls', ['pnpm-lock.yaml']);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,WAAW,MAAM,uBAAuB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/update/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/config.d.ts
CHANGED
|
@@ -1,26 +1,30 @@
|
|
|
1
1
|
import type { BannerType } from './banner.js';
|
|
2
2
|
export interface NeoConfig {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
installation: {
|
|
4
|
+
completionsPath?: string;
|
|
5
|
+
globalPath?: string;
|
|
6
|
+
installedAt: string;
|
|
7
|
+
version: string;
|
|
6
8
|
};
|
|
7
9
|
preferences: {
|
|
8
10
|
aliases: {
|
|
9
11
|
n: boolean;
|
|
10
12
|
};
|
|
11
13
|
banner: BannerType;
|
|
12
|
-
theme: 'dark' | 'light' | 'auto';
|
|
13
14
|
editor?: string;
|
|
15
|
+
theme: 'dark' | 'light' | 'auto';
|
|
14
16
|
};
|
|
15
17
|
shell: {
|
|
16
|
-
type: 'zsh' | 'bash' | 'fish';
|
|
17
18
|
rcFile: string;
|
|
19
|
+
type: 'zsh' | 'bash' | 'fish';
|
|
18
20
|
};
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
updates: {
|
|
22
|
+
lastCheckedAt: string | null;
|
|
23
|
+
latestVersion: string | null;
|
|
24
|
+
};
|
|
25
|
+
user: {
|
|
26
|
+
email?: string;
|
|
27
|
+
name?: string;
|
|
24
28
|
};
|
|
25
29
|
}
|
|
26
30
|
export declare class ConfigManager {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAKpD,MAAM,WAAW,SAAS;IACxB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAKpD,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE;QACZ,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE;YACP,CAAC,EAAE,OAAO,CAAC;SACZ,CAAC;QAOF,MAAM,EAAE,UAAU,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;KAClC,CAAC;IACF,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;KAC9B,CAAC;IACF,IAAI,EAAE;QACJ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAyBD,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;;YAUb,eAAe;IAYvB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAYjC,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC;IAiC1B,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBxD,YAAY,IAAI,MAAM;IAOtB,aAAa,IAAI,MAAM;IAOjB,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAmBvC;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
|
package/dist/utils/config.js
CHANGED
|
@@ -4,7 +4,10 @@ import { homedir } from 'os';
|
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { logger } from './logger.js';
|
|
6
6
|
const DEFAULT_CONFIG = {
|
|
7
|
-
|
|
7
|
+
installation: {
|
|
8
|
+
installedAt: new Date().toISOString(),
|
|
9
|
+
version: '0.1.0',
|
|
10
|
+
},
|
|
8
11
|
preferences: {
|
|
9
12
|
aliases: {
|
|
10
13
|
n: true,
|
|
@@ -13,13 +16,14 @@ const DEFAULT_CONFIG = {
|
|
|
13
16
|
theme: 'auto',
|
|
14
17
|
},
|
|
15
18
|
shell: {
|
|
16
|
-
type: 'zsh',
|
|
17
19
|
rcFile: join(homedir(), '.zshrc'),
|
|
20
|
+
type: 'zsh',
|
|
18
21
|
},
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
updates: {
|
|
23
|
+
lastCheckedAt: null,
|
|
24
|
+
latestVersion: null,
|
|
22
25
|
},
|
|
26
|
+
user: {},
|
|
23
27
|
};
|
|
24
28
|
export class ConfigManager {
|
|
25
29
|
configDir;
|
|
@@ -57,14 +61,15 @@ export class ConfigManager {
|
|
|
57
61
|
return {
|
|
58
62
|
...DEFAULT_CONFIG,
|
|
59
63
|
...config,
|
|
60
|
-
|
|
64
|
+
installation: { ...DEFAULT_CONFIG.installation, ...config.installation },
|
|
61
65
|
preferences: {
|
|
62
66
|
...DEFAULT_CONFIG.preferences,
|
|
63
67
|
...config.preferences,
|
|
64
68
|
aliases: { ...DEFAULT_CONFIG.preferences.aliases, ...config.preferences?.aliases },
|
|
65
69
|
},
|
|
66
70
|
shell: { ...DEFAULT_CONFIG.shell, ...config.shell },
|
|
67
|
-
|
|
71
|
+
updates: { ...DEFAULT_CONFIG.updates, ...config.updates },
|
|
72
|
+
user: { ...DEFAULT_CONFIG.user, ...config.user },
|
|
68
73
|
};
|
|
69
74
|
}
|
|
70
75
|
catch (error) {
|
|
@@ -89,14 +94,15 @@ export class ConfigManager {
|
|
|
89
94
|
const updated = {
|
|
90
95
|
...current,
|
|
91
96
|
...updates,
|
|
92
|
-
|
|
97
|
+
installation: { ...current.installation, ...updates.installation },
|
|
93
98
|
preferences: {
|
|
94
99
|
...current.preferences,
|
|
95
100
|
...updates.preferences,
|
|
96
101
|
aliases: { ...current.preferences.aliases, ...updates.preferences?.aliases },
|
|
97
102
|
},
|
|
98
103
|
shell: { ...current.shell, ...updates.shell },
|
|
99
|
-
|
|
104
|
+
updates: { ...current.updates, ...updates.updates },
|
|
105
|
+
user: { ...current.user, ...updates.user },
|
|
100
106
|
};
|
|
101
107
|
await this.write(updated);
|
|
102
108
|
}
|
package/dist/utils/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface UpdateCheckResult {
|
|
2
|
+
checkedAt: string | null;
|
|
3
|
+
currentVersion: string;
|
|
4
|
+
hasUpdate: boolean;
|
|
5
|
+
latestVersion: string | null;
|
|
6
|
+
}
|
|
7
|
+
export declare function compareVersions(v1: string, v2: string): number;
|
|
8
|
+
export declare function fetchLatestCliVersion(): Promise<string>;
|
|
9
|
+
export declare function checkForCliUpdates(): Promise<UpdateCheckResult>;
|
|
10
|
+
export declare function notifyIfCliUpdateAvailable(): Promise<void>;
|
|
11
|
+
//# sourceMappingURL=update-check.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-check.d.ts","sourceRoot":"","sources":["../../src/utils/update-check.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAKD,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAa9D;AAKD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAW7D;AAKD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAyCrE;AAKD,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAehE"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import packageJson from '../../package.json' with { type: 'json' };
|
|
2
|
+
import { configManager } from './config.js';
|
|
3
|
+
import { logger } from './logger.js';
|
|
4
|
+
import { ui } from './ui.js';
|
|
5
|
+
const UPDATE_CHECK_INTERVAL_MS = 1000 * 60 * 60 * 24;
|
|
6
|
+
const UPDATE_COMMAND = 'npm install -g @radkode/neo@latest';
|
|
7
|
+
const UPDATE_PACKAGE_NAME = '@radkode/neo';
|
|
8
|
+
export function compareVersions(v1, v2) {
|
|
9
|
+
const parts1 = v1.split('.').map(Number);
|
|
10
|
+
const parts2 = v2.split('.').map(Number);
|
|
11
|
+
for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
|
|
12
|
+
const part1 = parts1[i] || 0;
|
|
13
|
+
const part2 = parts2[i] || 0;
|
|
14
|
+
if (part1 > part2)
|
|
15
|
+
return 1;
|
|
16
|
+
if (part1 < part2)
|
|
17
|
+
return -1;
|
|
18
|
+
}
|
|
19
|
+
return 0;
|
|
20
|
+
}
|
|
21
|
+
export async function fetchLatestCliVersion() {
|
|
22
|
+
const response = await fetch(`https://registry.npmjs.org/${UPDATE_PACKAGE_NAME}`);
|
|
23
|
+
if (!response.ok) {
|
|
24
|
+
throw new Error(`HTTP error! status: ${response.status}`);
|
|
25
|
+
}
|
|
26
|
+
const data = (await response.json());
|
|
27
|
+
return data['dist-tags'].latest;
|
|
28
|
+
}
|
|
29
|
+
export async function checkForCliUpdates() {
|
|
30
|
+
const config = await configManager.read();
|
|
31
|
+
const now = Date.now();
|
|
32
|
+
const lastCheckedAt = config.updates.lastCheckedAt;
|
|
33
|
+
const lastCheckedTime = lastCheckedAt ? Date.parse(lastCheckedAt) : NaN;
|
|
34
|
+
const shouldCheck = Number.isNaN(lastCheckedTime) || now - lastCheckedTime > UPDATE_CHECK_INTERVAL_MS;
|
|
35
|
+
let latestVersion = config.updates.latestVersion;
|
|
36
|
+
let checkedAt = lastCheckedAt;
|
|
37
|
+
if (shouldCheck) {
|
|
38
|
+
checkedAt = new Date(now).toISOString();
|
|
39
|
+
try {
|
|
40
|
+
latestVersion = await fetchLatestCliVersion();
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
logger.debug(`Update check failed: ${error}`);
|
|
44
|
+
}
|
|
45
|
+
try {
|
|
46
|
+
await configManager.update({
|
|
47
|
+
updates: {
|
|
48
|
+
lastCheckedAt: checkedAt,
|
|
49
|
+
latestVersion,
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
logger.debug(`Failed to persist update check result: ${error}`);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
const currentVersion = packageJson.version;
|
|
58
|
+
const hasUpdate = Boolean(latestVersion && compareVersions(latestVersion, currentVersion) > 0);
|
|
59
|
+
return {
|
|
60
|
+
checkedAt: checkedAt ?? null,
|
|
61
|
+
currentVersion,
|
|
62
|
+
hasUpdate,
|
|
63
|
+
latestVersion: latestVersion ?? null,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
export async function notifyIfCliUpdateAvailable() {
|
|
67
|
+
try {
|
|
68
|
+
const result = await checkForCliUpdates();
|
|
69
|
+
if (!result.hasUpdate || !result.latestVersion) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
ui.warn(`Neo CLI update available: ${result.currentVersion} → ${result.latestVersion} (run: ${UPDATE_COMMAND})`);
|
|
73
|
+
ui.muted('Run the command above to upgrade to the latest version.');
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
logger.debug(`Failed to notify about updates: ${error}`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=update-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/utils/update-check.ts"],"names":[],"mappings":"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"}
|