git-it-done 1.0.3 → 1.1.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/LICENSE +21 -0
- package/dist/index.js +22 -30
- package/dist/index.js.map +1 -1
- package/dist/utils/branches.d.ts +2 -0
- package/dist/utils/branches.js +60 -0
- package/dist/utils/branches.js.map +1 -0
- package/dist/utils/checkGitStatus.js +37 -22
- package/dist/utils/checkGitStatus.js.map +1 -1
- package/dist/utils/commitWorkflow.d.ts +1 -0
- package/dist/utils/commitWorkflow.js +33 -0
- package/dist/utils/commitWorkflow.js.map +1 -0
- package/dist/utils/conflicts.d.ts +7 -0
- package/dist/utils/conflicts.js +96 -0
- package/dist/utils/conflicts.js.map +1 -0
- package/dist/utils/diffSignals.d.ts +22 -0
- package/dist/utils/diffSignals.js +75 -0
- package/dist/utils/diffSignals.js.map +1 -0
- package/dist/utils/displayStatus.js +8 -9
- package/dist/utils/displayStatus.js.map +1 -1
- package/dist/utils/fileStaging.js +68 -22
- package/dist/utils/fileStaging.js.map +1 -1
- package/dist/utils/formatFileStatus.js +6 -0
- package/dist/utils/formatFileStatus.js.map +1 -1
- package/dist/utils/generateCommitMessage.d.ts +12 -0
- package/dist/utils/generateCommitMessage.js +178 -83
- package/dist/utils/generateCommitMessage.js.map +1 -1
- package/dist/utils/getFileChanges.d.ts +15 -1
- package/dist/utils/getFileChanges.js +59 -18
- package/dist/utils/getFileChanges.js.map +1 -1
- package/dist/utils/gitCommand.d.ts +27 -1
- package/dist/utils/gitCommand.js +53 -10
- package/dist/utils/gitCommand.js.map +1 -1
- package/dist/utils/help.d.ts +7 -0
- package/dist/utils/help.js +35 -0
- package/dist/utils/help.js.map +1 -0
- package/dist/utils/inspect.d.ts +2 -0
- package/dist/utils/inspect.js +37 -0
- package/dist/utils/inspect.js.map +1 -0
- package/dist/utils/performCommit.js +29 -34
- package/dist/utils/performCommit.js.map +1 -1
- package/dist/utils/process_interruption.js +22 -13
- package/dist/utils/process_interruption.js.map +1 -1
- package/dist/utils/push_to_remote.d.ts +14 -0
- package/dist/utils/push_to_remote.js +76 -36
- package/dist/utils/push_to_remote.js.map +1 -1
- package/dist/utils/repoRoot.d.ts +6 -0
- package/dist/utils/repoRoot.js +10 -0
- package/dist/utils/repoRoot.js.map +1 -0
- package/dist/utils/repository.d.ts +21 -0
- package/dist/utils/repository.js +60 -0
- package/dist/utils/repository.js.map +1 -0
- package/dist/utils/setup.d.ts +2 -0
- package/dist/utils/setup.js +77 -0
- package/dist/utils/setup.js.map +1 -0
- package/dist/utils/stash.d.ts +2 -0
- package/dist/utils/stash.js +64 -0
- package/dist/utils/stash.js.map +1 -0
- package/dist/utils/sync.d.ts +3 -0
- package/dist/utils/sync.js +55 -0
- package/dist/utils/sync.js.map +1 -0
- package/dist/utils/types/types.d.ts +11 -1
- package/dist/utils/ui.d.ts +15 -0
- package/dist/utils/ui.js +28 -0
- package/dist/utils/ui.js.map +1 -0
- package/dist/utils/validation.d.ts +4 -0
- package/dist/utils/validation.js +26 -0
- package/dist/utils/validation.js.map +1 -0
- package/dist/utils/workspace.d.ts +1 -0
- package/dist/utils/workspace.js +61 -0
- package/dist/utils/workspace.js.map +1 -0
- package/package.json +9 -8
- package/readme.md +40 -268
- package/dist/utils/isGitrepo.d.ts +0 -1
- package/dist/utils/isGitrepo.js +0 -6
- package/dist/utils/isGitrepo.js.map +0 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 Sid.
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/dist/index.js
CHANGED
|
@@ -11,48 +11,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
import { intro, outro, cancel } from '@clack/prompts';
|
|
12
12
|
import chalk from 'chalk';
|
|
13
13
|
import { checkGitStatus } from './utils/checkGitStatus.js';
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
19
|
-
import { handlePushToRemote } from './utils/push_to_remote.js';
|
|
14
|
+
import { runCommitWorkflow } from './utils/commitWorkflow.js';
|
|
15
|
+
import { runWorkspace } from './utils/workspace.js';
|
|
16
|
+
import { getRepositoryState } from './utils/repository.js';
|
|
17
|
+
import { handleInProgressOperation } from './utils/conflicts.js';
|
|
18
|
+
import { runInitialSetup } from './utils/setup.js';
|
|
20
19
|
import start from './utils/process_interruption.js';
|
|
21
20
|
function main() {
|
|
22
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
var _a;
|
|
23
|
+
if (process.argv.slice(2).some(argument => argument === '--help' || argument === '-h')) {
|
|
24
|
+
console.log(`Git-it-Done — a guided Git workspace\n\nUsage:\n git-it-done Open the interactive workspace\n git-it-done commit Start the direct commit workflow\n git-it-done --help Show this help\n\nChoose actions in the terminal UI; no Git command memorization is required.`);
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
23
27
|
console.clear();
|
|
24
28
|
intro(chalk.bgBlue(' Auto Commit Tool '));
|
|
25
29
|
// 1. Validate git repository and configuration
|
|
26
30
|
const gitStatus = checkGitStatus();
|
|
27
31
|
if (!gitStatus.valid) {
|
|
32
|
+
if (gitStatus.reason === 'Not in a Git repository') {
|
|
33
|
+
yield runInitialSetup();
|
|
34
|
+
outro(chalk.green('Setup complete.'));
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
28
37
|
cancel(gitStatus.reason);
|
|
29
38
|
process.exit(1);
|
|
30
39
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// 3. Handle no changes case
|
|
35
|
-
if (allFiles.length === 0) {
|
|
36
|
-
outro(chalk.green('✨ Working directory is clean. Nothing to commit! 🎉'));
|
|
37
|
-
process.exit(0);
|
|
38
|
-
}
|
|
39
|
-
// 4. Display current repository status
|
|
40
|
-
displayRepositoryStatus(changes);
|
|
41
|
-
// 5. Handle file staging if needed
|
|
42
|
-
const filesToCommit = yield handleFileStaging(changes);
|
|
43
|
-
if (filesToCommit.length === 0) {
|
|
44
|
-
outro(chalk.yellow('ℹ️ No files to commit after staging process.'));
|
|
45
|
-
process.exit(0);
|
|
46
|
-
}
|
|
47
|
-
// 6. Handle commit message creation
|
|
48
|
-
const commitMessage = yield handleCommitMessage(filesToCommit);
|
|
49
|
-
// 7. Perform the commit
|
|
50
|
-
const commitSuccess = yield performCommit(commitMessage);
|
|
51
|
-
if (!commitSuccess) {
|
|
52
|
-
process.exit(1);
|
|
40
|
+
(_a = gitStatus.warnings) === null || _a === void 0 ? void 0 : _a.forEach(warning => console.log(chalk.yellow.bold(`\n⚠️ ${warning}`)));
|
|
41
|
+
if (process.argv[2] === 'commit' && getRepositoryState().operation) {
|
|
42
|
+
yield handleInProgressOperation();
|
|
53
43
|
}
|
|
54
|
-
|
|
55
|
-
|
|
44
|
+
else if (process.argv[2] === 'commit')
|
|
45
|
+
yield runCommitWorkflow();
|
|
46
|
+
else
|
|
47
|
+
yield runWorkspace();
|
|
56
48
|
outro(chalk.green('🎉 All done!'));
|
|
57
49
|
});
|
|
58
50
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,MAAM,iCAAiC,CAAC;AAEpD,SAAe,IAAI;;;QACjB,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,sRAAsR,CAAC,CAAC;YACpS,OAAO;QACT,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAE1C,+CAA+C;QAC/C,MAAM,SAAS,GAAG,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,SAAS,CAAC,MAAM,KAAK,yBAAyB,EAAE,CAAC;gBACnD,MAAM,eAAe,EAAE,CAAC;gBACxB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3F,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,kBAAkB,EAAE,CAAC,SAAS,EAAE,CAAC;YACnE,MAAM,yBAAyB,EAAE,CAAC;QACpC,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ;YAAE,MAAM,iBAAiB,EAAE,CAAC;;YAC9D,MAAM,YAAY,EAAE,CAAC;QAE1B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IACrC,CAAC;CAAA;AAED,KAAK,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import { confirm, isCancel, select, text } from '@clack/prompts';
|
|
11
|
+
import { gitCommand, gitErrorText, gitOutput } from './gitCommand.js';
|
|
12
|
+
import { getRepositoryState, hasLocalChanges } from './repository.js';
|
|
13
|
+
import { validateBranchName } from './validation.js';
|
|
14
|
+
import { ui } from './ui.js';
|
|
15
|
+
export function buildCreateBranchArgs(name) { return ['switch', '-c', name]; }
|
|
16
|
+
export function manageBranches() {
|
|
17
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
const action = yield select({ message: 'Branch action:', options: [{ value: 'switch', label: 'Switch branch' }, { value: 'create', label: 'Create branch' }, { value: 'list', label: 'List branches' }] });
|
|
19
|
+
if (isCancel(action))
|
|
20
|
+
return;
|
|
21
|
+
if (action === 'list') {
|
|
22
|
+
ui.title('Branches', '⑂');
|
|
23
|
+
const output = gitOutput(['branch', '--verbose', '--no-abbrev']);
|
|
24
|
+
return output ? ui.branchList(output, getRepositoryState().branch) : ui.warning('No branches found.');
|
|
25
|
+
}
|
|
26
|
+
if (action === 'create')
|
|
27
|
+
return void (yield createBranch());
|
|
28
|
+
yield switchBranch();
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
function createBranch() {
|
|
32
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
const name = yield text({ message: 'New branch name:', placeholder: 'feature/my-change', validate: value => validateBranchName(value) });
|
|
34
|
+
if (isCancel(name))
|
|
35
|
+
return;
|
|
36
|
+
const confirmed = yield confirm({ message: `Create and switch to "${name}"?` });
|
|
37
|
+
if (isCancel(confirmed) || !confirmed)
|
|
38
|
+
return;
|
|
39
|
+
const result = gitCommand(buildCreateBranchArgs(name));
|
|
40
|
+
result.ok ? ui.success(`Now on ${name}.`) : ui.error(gitErrorText(result));
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
function switchBranch() {
|
|
44
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
var _a;
|
|
46
|
+
const state = getRepositoryState();
|
|
47
|
+
if (hasLocalChanges(state.changes))
|
|
48
|
+
return void ui.warning('Commit or stash local changes before switching branches.');
|
|
49
|
+
const branches = ((_a = gitOutput(['branch', '--format=%(refname:short)'])) !== null && _a !== void 0 ? _a : '').split('\n').filter(Boolean);
|
|
50
|
+
const target = yield select({ message: 'Switch to:', options: branches.filter(branch => branch !== state.branch).map(branch => ({ value: branch, label: branch })) });
|
|
51
|
+
if (isCancel(target))
|
|
52
|
+
return;
|
|
53
|
+
const confirmed = yield confirm({ message: `Switch to "${target}"?` });
|
|
54
|
+
if (isCancel(confirmed) || !confirmed)
|
|
55
|
+
return;
|
|
56
|
+
const result = gitCommand(['switch', target]);
|
|
57
|
+
result.ok ? ui.success(`Now on ${target}.`) : ui.error(gitErrorText(result));
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=branches.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"branches.js","sourceRoot":"","sources":["../../src/utils/branches.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,MAAM,UAAU,qBAAqB,CAAC,IAAY,IAAc,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAEhG,MAAM,UAAgB,cAAc;;QAClC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3M,IAAI,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO;QAC7B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC1B,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;YACjE,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACxG,CAAC;QACD,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC,MAAM,YAAY,EAAE,CAAC,CAAC;QAC5D,MAAM,YAAY,EAAE,CAAC;IACvB,CAAC;CAAA;AAED,SAAe,YAAY;;QACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzI,IAAI,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO;QAC3B,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,OAAO,EAAE,yBAAyB,IAAI,IAAI,EAAE,CAAC,CAAC;QAChF,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS;YAAE,OAAO;QAC9C,MAAM,MAAM,GAAG,UAAU,CAAC,qBAAqB,CAAC,IAAc,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,CAAC;CAAA;AAED,SAAe,YAAY;;;QACzB,MAAM,KAAK,GAAG,kBAAkB,EAAE,CAAC;QACnC,IAAI,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,OAAO,KAAK,EAAE,CAAC,OAAO,CAAC,0DAA0D,CAAC,CAAC;QACvH,MAAM,QAAQ,GAAG,CAAC,MAAA,SAAS,CAAC,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxG,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACtK,IAAI,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO;QAC7B,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,OAAO,EAAE,cAAc,MAAM,IAAI,EAAE,CAAC,CAAC;QACvE,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS;YAAE,OAAO;QAC9C,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,QAAQ,EAAE,MAAgB,CAAC,CAAC,CAAC;QACxD,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/E,CAAC;CAAA"}
|
|
@@ -1,34 +1,49 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
|
|
1
|
+
import { existsSync } from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { gitCommand, gitOutput } from './gitCommand.js';
|
|
4
|
+
/** In-progress operations we refuse to commit into. */
|
|
5
|
+
const IN_PROGRESS = [
|
|
6
|
+
{ entry: 'MERGE_HEAD', reason: 'A merge is in progress' },
|
|
7
|
+
{ entry: 'REBASE_HEAD', reason: 'A rebase is in progress' },
|
|
8
|
+
{ entry: 'rebase-merge', reason: 'A rebase is in progress' },
|
|
9
|
+
{ entry: 'rebase-apply', reason: 'A rebase or `git am` is in progress' },
|
|
10
|
+
{ entry: 'CHERRY_PICK_HEAD', reason: 'A cherry-pick is in progress' },
|
|
11
|
+
{ entry: 'REVERT_HEAD', reason: 'A revert is in progress' },
|
|
12
|
+
{ entry: 'BISECT_LOG', reason: 'A bisect session is in progress' }
|
|
13
|
+
];
|
|
4
14
|
export function checkGitStatus() {
|
|
15
|
+
var _a;
|
|
16
|
+
const warnings = [];
|
|
5
17
|
// Step 1: Check if Git is installed
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
9
|
-
catch (_a) {
|
|
10
|
-
return {
|
|
11
|
-
valid: false,
|
|
12
|
-
reason: 'Git is not installed or not in PATH',
|
|
13
|
-
};
|
|
18
|
+
if (!gitCommand(['--version']).ok) {
|
|
19
|
+
return { valid: false, reason: 'Git is not installed or not in PATH' };
|
|
14
20
|
}
|
|
15
21
|
// Step 2: Check if inside a Git repository
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
22
|
+
const gitDir = gitOutput(['rev-parse', '--absolute-git-dir']);
|
|
23
|
+
if (!gitDir) {
|
|
24
|
+
return { valid: false, reason: 'Not in a Git repository' };
|
|
25
|
+
}
|
|
26
|
+
// An in-progress operation is recoverable from the workspace conflict UI.
|
|
27
|
+
for (const { entry, reason } of IN_PROGRESS) {
|
|
28
|
+
if (existsSync(path.join(gitDir, entry))) {
|
|
29
|
+
warnings.push(`${reason}. Select “Resolve in-progress operation” for guided recovery.`);
|
|
30
|
+
break;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
// Step 4: Warn loudly about a detached HEAD (commits there are easy to lose)
|
|
34
|
+
if (!gitCommand(['symbolic-ref', '--quiet', 'HEAD']).ok) {
|
|
35
|
+
const head = (_a = gitOutput(['rev-parse', '--short', 'HEAD'])) !== null && _a !== void 0 ? _a : 'unknown';
|
|
36
|
+
warnings.push(`HEAD is detached at ${head} — commits made here are not on any branch and can be lost. Run \`git switch -c <branch>\` first.`);
|
|
21
37
|
}
|
|
22
|
-
// Step
|
|
23
|
-
const userName =
|
|
24
|
-
const userEmail =
|
|
38
|
+
// Step 5: Check if Git user config is set
|
|
39
|
+
const userName = gitOutput(['config', 'user.name']);
|
|
40
|
+
const userEmail = gitOutput(['config', 'user.email']);
|
|
25
41
|
if (!userName || !userEmail) {
|
|
26
42
|
return {
|
|
27
43
|
valid: false,
|
|
28
|
-
reason: `Git user not configured. Run:\n git config --global user.name "Your Name"\n git config --global user.email "you@example.com"
|
|
44
|
+
reason: `Git user not configured. Run:\n git config --global user.name "Your Name"\n git config --global user.email "you@example.com"`
|
|
29
45
|
};
|
|
30
46
|
}
|
|
31
|
-
|
|
32
|
-
return { valid: true };
|
|
47
|
+
return warnings.length > 0 ? { valid: true, warnings } : { valid: true };
|
|
33
48
|
}
|
|
34
49
|
//# sourceMappingURL=checkGitStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkGitStatus.js","sourceRoot":"","sources":["../../src/utils/checkGitStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"checkGitStatus.js","sourceRoot":"","sources":["../../src/utils/checkGitStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGxD,uDAAuD;AACvD,MAAM,WAAW,GAA6C;IAC5D,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,wBAAwB,EAAE;IACzD,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC3D,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC5D,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,qCAAqC,EAAE;IACxE,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,8BAA8B,EAAE;IACrE,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAyB,EAAE;IAC3D,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,iCAAiC,EAAE;CACnE,CAAC;AAEF,MAAM,UAAU,cAAc;;IAC5B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,oCAAoC;IACpC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAClC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,qCAAqC,EAAE,CAAC;IACzE,CAAC;IAED,2CAA2C;IAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC7D,CAAC;IAED,0EAA0E;IAC1E,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,+DAA+D,CAAC,CAAC;YACxF,MAAM;QACR,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,mCAAI,SAAS,CAAC;QACtE,QAAQ,CAAC,IAAI,CACX,uBAAuB,IAAI,mGAAmG,CAC/H,CAAC;IACJ,CAAC;IAED,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEtD,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,gIAAgI;SACzI,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC3E,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function runCommitWorkflow(): Promise<void>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import { outro } from '@clack/prompts';
|
|
11
|
+
import chalk from 'chalk';
|
|
12
|
+
import { getChanges } from './getFileChanges.js';
|
|
13
|
+
import { displayRepositoryStatus } from './displayStatus.js';
|
|
14
|
+
import { handleFileStaging } from './fileStaging.js';
|
|
15
|
+
import { handleCommitMessage } from './commitMessage.js';
|
|
16
|
+
import { performCommit } from './performCommit.js';
|
|
17
|
+
import { handlePushToRemote } from './push_to_remote.js';
|
|
18
|
+
export function runCommitWorkflow() {
|
|
19
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
const changes = getChanges();
|
|
21
|
+
const allFiles = [...changes.staged, ...changes.unstaged, ...changes.untracked];
|
|
22
|
+
if (!allFiles.length)
|
|
23
|
+
return void outro(chalk.green('Working directory is clean. Nothing to commit.'));
|
|
24
|
+
displayRepositoryStatus(changes);
|
|
25
|
+
const files = yield handleFileStaging(changes);
|
|
26
|
+
if (!files.length)
|
|
27
|
+
return;
|
|
28
|
+
const message = yield handleCommitMessage(files);
|
|
29
|
+
if (yield performCommit(message))
|
|
30
|
+
yield handlePushToRemote();
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=commitWorkflow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commitWorkflow.js","sourceRoot":"","sources":["../../src/utils/commitWorkflow.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,UAAgB,iBAAiB;;QACrC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAChF,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC,CAAC;QACvG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,MAAM,aAAa,CAAC,OAAO,CAAC;YAAE,MAAM,kBAAkB,EAAE,CAAC;IAC/D,CAAC;CAAA"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { GitOperation } from './repository.js';
|
|
2
|
+
export interface OperationCommands {
|
|
3
|
+
continueArgs: string[] | null;
|
|
4
|
+
abortArgs: string[];
|
|
5
|
+
}
|
|
6
|
+
export declare function operationCommands(operation: GitOperation): OperationCommands;
|
|
7
|
+
export declare function handleInProgressOperation(): Promise<void>;
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import { spawnSync } from 'child_process';
|
|
11
|
+
import { confirm, isCancel, select } from '@clack/prompts';
|
|
12
|
+
import chalk from 'chalk';
|
|
13
|
+
import { gitCommand, gitErrorText } from './gitCommand.js';
|
|
14
|
+
import { getRepositoryState } from './repository.js';
|
|
15
|
+
export function operationCommands(operation) {
|
|
16
|
+
switch (operation) {
|
|
17
|
+
case 'merge': return { continueArgs: ['commit', '--no-edit'], abortArgs: ['merge', '--abort'] };
|
|
18
|
+
case 'rebase': return { continueArgs: ['rebase', '--continue'], abortArgs: ['rebase', '--abort'] };
|
|
19
|
+
case 'am': return { continueArgs: ['am', '--continue'], abortArgs: ['am', '--abort'] };
|
|
20
|
+
case 'cherry-pick': return { continueArgs: ['cherry-pick', '--continue'], abortArgs: ['cherry-pick', '--abort'] };
|
|
21
|
+
case 'revert': return { continueArgs: ['revert', '--continue'], abortArgs: ['revert', '--abort'] };
|
|
22
|
+
case 'bisect': return { continueArgs: null, abortArgs: ['bisect', 'reset'] };
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function operationLabel(operation) { return operation === 'cherry-pick' ? 'cherry-pick' : operation; }
|
|
26
|
+
export function handleInProgressOperation() {
|
|
27
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
const state = getRepositoryState();
|
|
29
|
+
if (!state.operation)
|
|
30
|
+
return void console.log(chalk.green('No merge, rebase, cherry-pick, revert, or bisect is in progress.'));
|
|
31
|
+
const { operation, conflicts } = state;
|
|
32
|
+
console.log(chalk.yellow(`\n${operationLabel(operation)} in progress.`));
|
|
33
|
+
if (conflicts.length)
|
|
34
|
+
console.log(chalk.red(`Conflicted files:\n${conflicts.map(file => ` • ${file}`).join('\n')}`));
|
|
35
|
+
else
|
|
36
|
+
console.log('No unresolved files detected. You can continue or abort the operation.');
|
|
37
|
+
const commands = operationCommands(operation);
|
|
38
|
+
const action = yield select({ message: `Resolve ${operationLabel(operation)}:`, options: [
|
|
39
|
+
...(conflicts.length ? [{ value: 'edit', label: 'Open a conflicted file in my editor' }, { value: 'resolved', label: 'Mark a resolved file as staged' }] : []),
|
|
40
|
+
...(commands.continueArgs ? [{ value: 'continue', label: `Continue ${operationLabel(operation)}` }] : []),
|
|
41
|
+
{ value: 'abort', label: `Abort ${operationLabel(operation)}` },
|
|
42
|
+
{ value: 'back', label: 'Back to workspace' }
|
|
43
|
+
] });
|
|
44
|
+
if (isCancel(action) || action === 'back')
|
|
45
|
+
return;
|
|
46
|
+
if (action === 'edit')
|
|
47
|
+
return void (yield editConflict(conflicts));
|
|
48
|
+
if (action === 'resolved')
|
|
49
|
+
return void (yield stageResolved(conflicts));
|
|
50
|
+
yield finishOperation(operation, action);
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
function editConflict(files) {
|
|
54
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
const file = yield select({ message: 'Open which file?', options: files.map(value => ({ value, label: value })) });
|
|
56
|
+
if (isCancel(file))
|
|
57
|
+
return;
|
|
58
|
+
const editor = process.env.GIT_EDITOR || process.env.VISUAL || process.env.EDITOR;
|
|
59
|
+
if (!editor)
|
|
60
|
+
return void console.log(chalk.yellow(`No editor is configured. Resolve ${file} in your editor, then return here to mark it resolved.`));
|
|
61
|
+
const [command, ...args] = editor.split(/\s+/).filter(Boolean);
|
|
62
|
+
const result = spawnSync(command, [...args, file], { stdio: 'inherit' });
|
|
63
|
+
if (result.error)
|
|
64
|
+
console.log(chalk.red(`Could not open ${command}: ${result.error.message}`));
|
|
65
|
+
else
|
|
66
|
+
console.log('Editor closed. Select “Mark a resolved file as staged” after removing conflict markers.');
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
function stageResolved(files) {
|
|
70
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
+
const file = yield select({ message: 'Which resolved file should be staged?', options: files.map(value => ({ value, label: value })) });
|
|
72
|
+
if (isCancel(file))
|
|
73
|
+
return;
|
|
74
|
+
const confirmed = yield confirm({ message: `Mark ${file} as resolved by staging it?` });
|
|
75
|
+
if (isCancel(confirmed) || !confirmed)
|
|
76
|
+
return;
|
|
77
|
+
const result = gitCommand(['add', '--', file]);
|
|
78
|
+
console.log(result.ok ? chalk.green(`${file} staged. Resolve remaining files, then continue.`) : chalk.red(gitErrorText(result)));
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
function finishOperation(operation, action) {
|
|
82
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
const state = getRepositoryState();
|
|
84
|
+
if (action === 'continue' && state.conflicts.length)
|
|
85
|
+
return void console.log(chalk.yellow('Resolve and stage every conflicted file before continuing.'));
|
|
86
|
+
const confirmed = yield confirm({ message: `${action === 'abort' ? 'Abort' : 'Continue'} this ${operationLabel(operation)}?` });
|
|
87
|
+
if (isCancel(confirmed) || !confirmed)
|
|
88
|
+
return;
|
|
89
|
+
const commands = operationCommands(operation);
|
|
90
|
+
if (action === 'continue' && !commands.continueArgs)
|
|
91
|
+
return;
|
|
92
|
+
const result = gitCommand(action === 'continue' ? commands.continueArgs : commands.abortArgs);
|
|
93
|
+
console.log(result.ok ? chalk.green(`${operationLabel(operation)} ${action === 'abort' ? 'aborted' : 'completed'}.`) : chalk.red(gitErrorText(result)));
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=conflicts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/utils/conflicts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export interface DiffSignals {
|
|
2
|
+
/** An added comment explicitly states the change fixes something. */
|
|
3
|
+
fixIntent: boolean;
|
|
4
|
+
/** An added comment explicitly states the change restructures code. */
|
|
5
|
+
refactorIntent: boolean;
|
|
6
|
+
/** More declarations were added than removed — likely new API surface. */
|
|
7
|
+
newApi: boolean;
|
|
8
|
+
/** Conditional logic was both removed and added — weak "behaviour fix" hint. */
|
|
9
|
+
conditionalChurn: boolean;
|
|
10
|
+
/** The diff was too large to read; callers should say so rather than guess. */
|
|
11
|
+
oversized: boolean;
|
|
12
|
+
}
|
|
13
|
+
export declare const EMPTY_SIGNALS: DiffSignals;
|
|
14
|
+
/**
|
|
15
|
+
* Derive intent hints from a unified diff, looking only at ADDED lines (`+`,
|
|
16
|
+
* excluding the `+++` file header) and REMOVED lines (`-`, excluding `---`).
|
|
17
|
+
* Scanning the raw diff text — headers, context lines and all — is what made
|
|
18
|
+
* every commit come out as "fix: resolve issues and bugs".
|
|
19
|
+
*/
|
|
20
|
+
export declare function analyzeDiff(diff: string): DiffSignals;
|
|
21
|
+
/** Read and analyse the staged diff. Returns null when git itself failed. */
|
|
22
|
+
export declare function readStagedDiffSignals(): DiffSignals | null;
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { gitCommand } from './gitCommand.js';
|
|
2
|
+
export const EMPTY_SIGNALS = {
|
|
3
|
+
fixIntent: false,
|
|
4
|
+
refactorIntent: false,
|
|
5
|
+
newApi: false,
|
|
6
|
+
conditionalChurn: false,
|
|
7
|
+
oversized: false
|
|
8
|
+
};
|
|
9
|
+
const COMMENT = /^\s*(\/\/+|\/\*+|\*|#+|--|<!--|"""|''')/;
|
|
10
|
+
/**
|
|
11
|
+
* Deliberately narrow: it matches someone *stating* they fixed something, not
|
|
12
|
+
* the mere presence of the substring "error" (which `catch (error)` supplies in
|
|
13
|
+
* almost every real diff).
|
|
14
|
+
*/
|
|
15
|
+
const FIX_INTENT = /\b(bug\s?fix|hot\s?fix|work\s?around|regression|fix(e[sd])?\s+(a|an|the|this|issue|bug|crash|error|regression|typo|#\d+)|(fix|fixes|fixed|resolve|resolves|resolved|close|closes|closed)\s+#\d+)\b/i;
|
|
16
|
+
const REFACTOR_INTENT = /\b(refactor(ed|ing)?|restructur(e|ed|ing)|clean\s?up|simplif(y|ied|ies)|dedupe|deduplicat(e|ed)|extract(ed)?\s+(in)?to)\b/i;
|
|
17
|
+
const DECLARATION = /^\s*(export\s+(default\s+)?)?(public\s+|private\s+|protected\s+|static\s+|abstract\s+)*(async\s+)?(function|class|interface|enum|type\s+\w+\s*=|struct|trait|impl|def|func|fn)\b/;
|
|
18
|
+
const CONDITIONAL = /(^|[^\w.])(if|elif|else\s+if|switch|while|unless)\s*[({:]|\?\?|\?\./;
|
|
19
|
+
function isComment(line) {
|
|
20
|
+
return COMMENT.test(line);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Derive intent hints from a unified diff, looking only at ADDED lines (`+`,
|
|
24
|
+
* excluding the `+++` file header) and REMOVED lines (`-`, excluding `---`).
|
|
25
|
+
* Scanning the raw diff text — headers, context lines and all — is what made
|
|
26
|
+
* every commit come out as "fix: resolve issues and bugs".
|
|
27
|
+
*/
|
|
28
|
+
export function analyzeDiff(diff) {
|
|
29
|
+
const signals = Object.assign({}, EMPTY_SIGNALS);
|
|
30
|
+
let addedDeclarations = 0;
|
|
31
|
+
let removedDeclarations = 0;
|
|
32
|
+
let addedConditionals = 0;
|
|
33
|
+
let removedConditionals = 0;
|
|
34
|
+
for (const line of diff.split('\n')) {
|
|
35
|
+
const added = line.startsWith('+') && !line.startsWith('+++');
|
|
36
|
+
const removed = line.startsWith('-') && !line.startsWith('---');
|
|
37
|
+
if (!added && !removed)
|
|
38
|
+
continue;
|
|
39
|
+
const content = line.slice(1);
|
|
40
|
+
if (isComment(content)) {
|
|
41
|
+
if (added && FIX_INTENT.test(content))
|
|
42
|
+
signals.fixIntent = true;
|
|
43
|
+
if (added && REFACTOR_INTENT.test(content))
|
|
44
|
+
signals.refactorIntent = true;
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
if (DECLARATION.test(content)) {
|
|
48
|
+
if (added)
|
|
49
|
+
addedDeclarations++;
|
|
50
|
+
else
|
|
51
|
+
removedDeclarations++;
|
|
52
|
+
}
|
|
53
|
+
if (CONDITIONAL.test(content)) {
|
|
54
|
+
if (added)
|
|
55
|
+
addedConditionals++;
|
|
56
|
+
else
|
|
57
|
+
removedConditionals++;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
signals.newApi = addedDeclarations > removedDeclarations;
|
|
61
|
+
signals.conditionalChurn = removedConditionals > 0 && addedConditionals > 0;
|
|
62
|
+
return signals;
|
|
63
|
+
}
|
|
64
|
+
/** Read and analyse the staged diff. Returns null when git itself failed. */
|
|
65
|
+
export function readStagedDiffSignals() {
|
|
66
|
+
const result = gitCommand(['diff', '--cached', '--no-color', '--no-ext-diff']);
|
|
67
|
+
if (result.oversized) {
|
|
68
|
+
return Object.assign(Object.assign({}, EMPTY_SIGNALS), { oversized: true });
|
|
69
|
+
}
|
|
70
|
+
if (!result.ok) {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
return analyzeDiff(result.stdout);
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=diffSignals.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diffSignals.js","sourceRoot":"","sources":["../../src/utils/diffSignals.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { formatFileStatus } from './formatFileStatus.js';
|
|
1
|
+
import { ui } from './ui.js';
|
|
3
2
|
export function displayRepositoryStatus(changes) {
|
|
4
|
-
|
|
3
|
+
ui.title('Repository Status', '◈');
|
|
5
4
|
if (changes.staged.length > 0) {
|
|
6
|
-
|
|
7
|
-
changes.staged
|
|
5
|
+
ui.section('Staged files', '✓');
|
|
6
|
+
ui.files(changes.staged);
|
|
8
7
|
}
|
|
9
8
|
if (changes.unstaged.length > 0) {
|
|
10
|
-
|
|
11
|
-
changes.unstaged
|
|
9
|
+
ui.section('Unstaged files', '!');
|
|
10
|
+
ui.files(changes.unstaged);
|
|
12
11
|
}
|
|
13
12
|
if (changes.untracked.length > 0) {
|
|
14
|
-
|
|
15
|
-
changes.untracked
|
|
13
|
+
ui.section('Untracked files', '?');
|
|
14
|
+
ui.files(changes.untracked);
|
|
16
15
|
}
|
|
17
16
|
}
|
|
18
17
|
//# sourceMappingURL=displayStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayStatus.js","sourceRoot":"","sources":["../../src/utils/displayStatus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"displayStatus.js","sourceRoot":"","sources":["../../src/utils/displayStatus.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,MAAM,UAAU,uBAAuB,CAAC,OAAmB;IACzD,EAAE,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAEnC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
|