@lenne.tech/cli 1.5.0 → 1.6.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/README.md +30 -0
- package/bin/postinstall.js +156 -0
- package/build/cli.js +11 -1
- package/build/commands/blocks/add.js +28 -306
- package/build/commands/blocks/blocks.js +2 -2
- package/build/commands/claude/claude.js +2 -2
- package/build/commands/cli/cli.js +2 -2
- package/build/commands/cli/create.js +69 -21
- package/build/commands/cli/rename.js +11 -5
- package/build/commands/completion.js +311 -0
- package/build/commands/components/add.js +25 -219
- package/build/commands/components/components.js +2 -2
- package/build/commands/config/help.js +5 -2
- package/build/commands/config/init.js +20 -5
- package/build/commands/config/show.js +4 -1
- package/build/commands/config/validate.js +27 -2
- package/build/commands/deployment/create.js +18 -5
- package/build/commands/deployment/deployment.js +2 -2
- package/build/commands/docs/open.js +4 -1
- package/build/commands/doctor.js +285 -0
- package/build/commands/frontend/angular.js +88 -28
- package/build/commands/frontend/nuxt.js +2 -1
- package/build/commands/fullstack/init.js +58 -19
- package/build/commands/git/clean.js +60 -11
- package/build/commands/git/clear.js +17 -11
- package/build/commands/git/create.js +51 -10
- package/build/commands/git/force-pull.js +42 -15
- package/build/commands/git/get.js +14 -15
- package/build/commands/git/install-scripts.js +6 -6
- package/build/commands/git/rebase.js +40 -12
- package/build/commands/git/rename.js +33 -13
- package/build/commands/git/reset.js +48 -13
- package/build/commands/git/squash.js +67 -26
- package/build/commands/git/undo.js +33 -13
- package/build/commands/git/update.js +59 -6
- package/build/commands/history.js +75 -0
- package/build/commands/mongodb/collection-export.js +2 -2
- package/build/commands/mongodb/mongodb.js +2 -2
- package/build/commands/mongodb/s3-restore.js +2 -2
- package/build/commands/npm/reinit.js +11 -12
- package/build/commands/npm/update.js +6 -2
- package/build/commands/qdrant/delete.js +6 -2
- package/build/commands/qdrant/qdrant.js +2 -2
- package/build/commands/qdrant/stats.js +5 -2
- package/build/commands/redis/redis.js +2 -2
- package/build/commands/server/add-property.js +8 -12
- package/build/commands/server/create-secret.js +6 -3
- package/build/commands/server/create.js +39 -21
- package/build/commands/server/module.js +22 -16
- package/build/commands/server/object.js +7 -11
- package/build/commands/server/set-secrets.js +6 -3
- package/build/commands/server/test.js +3 -3
- package/build/commands/starter/chrome-extension.js +3 -3
- package/build/commands/status.js +198 -0
- package/build/commands/templates/list.js +107 -0
- package/build/commands/templates/llm.js +8 -3
- package/build/commands/templates/templates.js +2 -2
- package/build/commands/tools/jwt-read.js +2 -2
- package/build/commands/tools/regex.js +5 -2
- package/build/commands/typescript/create.js +84 -21
- package/build/commands/typescript/playground.js +5 -2
- package/build/extensions/config.js +37 -1
- package/build/extensions/git.js +57 -2
- package/build/extensions/history.js +118 -0
- package/build/extensions/logger.js +189 -0
- package/build/lib/nuxt-base-components.js +249 -0
- package/build/lib/validation.js +204 -0
- package/build/templates/completion/bash.sh.ejs +92 -0
- package/build/templates/completion/fish.sh.ejs +77 -0
- package/build/templates/completion/zsh.sh.ejs +119 -0
- package/docs/commands.md +464 -14
- package/docs/lt.config.md +138 -8
- package/package.json +16 -14
|
@@ -18,22 +18,27 @@ const NewCommand = {
|
|
|
18
18
|
hidden: false,
|
|
19
19
|
name: 'create',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a, _b;
|
|
21
|
+
var _a, _b, _c, _d, _e;
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { config, git, helper, npm, parameters, print: { error, info, spin, success }, system, } = toolbox;
|
|
23
|
+
const { config, git, helper, npm, parameters, print: { error, info, spin, success, warning }, system, } = toolbox;
|
|
24
|
+
// Parse dry-run flag early
|
|
25
|
+
const dryRun = parameters.options.dryRun || parameters.options['dry-run'];
|
|
24
26
|
// Check git
|
|
25
27
|
if (!(yield git.gitInstalled())) {
|
|
26
28
|
return;
|
|
27
29
|
}
|
|
28
30
|
// Load configuration
|
|
29
31
|
const ltConfig = config.loadConfig();
|
|
30
|
-
const
|
|
32
|
+
const commandBaseBranch = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.create) === null || _c === void 0 ? void 0 : _c.base;
|
|
33
|
+
const categoryBaseBranch = (_e = (_d = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _d === void 0 ? void 0 : _d.git) === null || _e === void 0 ? void 0 : _e.baseBranch;
|
|
31
34
|
// Load global defaults
|
|
32
35
|
const globalBaseBranch = config.getGlobalDefault(ltConfig, 'baseBranch');
|
|
33
36
|
// Parse CLI arguments
|
|
34
37
|
const { base: cliBaseBranch } = parameters.options;
|
|
35
|
-
// Check changes in current branch (reset optional)
|
|
36
|
-
|
|
38
|
+
// Check changes in current branch (reset optional) - skip in dry-run mode
|
|
39
|
+
if (!dryRun) {
|
|
40
|
+
yield git.askForReset();
|
|
41
|
+
}
|
|
37
42
|
// Get branch name
|
|
38
43
|
const branch = yield helper.getInput(parameters.first, {
|
|
39
44
|
name: 'branch name',
|
|
@@ -69,11 +74,27 @@ const NewCommand = {
|
|
|
69
74
|
return;
|
|
70
75
|
}
|
|
71
76
|
}
|
|
72
|
-
else if (
|
|
73
|
-
// Command-specific config value provided
|
|
74
|
-
if (!(yield tryUseBranch(
|
|
77
|
+
else if (commandBaseBranch) {
|
|
78
|
+
// Command-specific config value provided (git.create.base)
|
|
79
|
+
if (!(yield tryUseBranch(commandBaseBranch, 'lt.config commands.git.create'))) {
|
|
80
|
+
// Fall through to category-level or global
|
|
81
|
+
if (categoryBaseBranch && categoryBaseBranch !== commandBaseBranch) {
|
|
82
|
+
if (!(yield tryUseBranch(categoryBaseBranch, 'lt.config commands.git'))) {
|
|
83
|
+
if (globalBaseBranch && globalBaseBranch !== categoryBaseBranch) {
|
|
84
|
+
yield tryUseBranch(globalBaseBranch, 'lt.config defaults');
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
else if (globalBaseBranch && globalBaseBranch !== commandBaseBranch) {
|
|
89
|
+
yield tryUseBranch(globalBaseBranch, 'lt.config defaults');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
else if (categoryBaseBranch) {
|
|
94
|
+
// Category-level config value provided (git.baseBranch)
|
|
95
|
+
if (!(yield tryUseBranch(categoryBaseBranch, 'lt.config commands.git'))) {
|
|
75
96
|
// Fall through to global or interactive
|
|
76
|
-
if (globalBaseBranch && globalBaseBranch !==
|
|
97
|
+
if (globalBaseBranch && globalBaseBranch !== categoryBaseBranch) {
|
|
77
98
|
yield tryUseBranch(globalBaseBranch, 'lt.config defaults');
|
|
78
99
|
}
|
|
79
100
|
}
|
|
@@ -97,6 +118,22 @@ const NewCommand = {
|
|
|
97
118
|
error('No base branch selected!');
|
|
98
119
|
return;
|
|
99
120
|
}
|
|
121
|
+
// Dry-run mode: show what would happen
|
|
122
|
+
if (dryRun) {
|
|
123
|
+
warning('DRY-RUN MODE - No changes will be made');
|
|
124
|
+
info('');
|
|
125
|
+
info('Would create branch:');
|
|
126
|
+
info(` - New branch: ${branch}`);
|
|
127
|
+
info(` - Base branch: ${baseBranch}`);
|
|
128
|
+
info('');
|
|
129
|
+
info('Steps that would be executed:');
|
|
130
|
+
info(' 1. git fetch');
|
|
131
|
+
info(` 2. git checkout ${baseBranch}`);
|
|
132
|
+
info(' 3. git pull');
|
|
133
|
+
info(` 4. git checkout -b ${branch}`);
|
|
134
|
+
info(' 5. npm install');
|
|
135
|
+
return `dry-run create branch ${branch} from ${baseBranch}`;
|
|
136
|
+
}
|
|
100
137
|
// Start timer
|
|
101
138
|
const timer = system.startTimer();
|
|
102
139
|
// Checkout
|
|
@@ -108,9 +145,13 @@ const NewCommand = {
|
|
|
108
145
|
// Success info
|
|
109
146
|
success(`Branch ${branch} was created from ${baseBranch} in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
110
147
|
info('');
|
|
148
|
+
// Exit if not running from menu
|
|
149
|
+
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
150
|
+
process.exit();
|
|
151
|
+
}
|
|
111
152
|
// For tests
|
|
112
153
|
return `created branch ${branch}`;
|
|
113
154
|
}),
|
|
114
155
|
};
|
|
115
156
|
exports.default = NewCommand;
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9jcmVhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsbUJBQW1CO0lBQ2hDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLFFBQVE7SUFDZCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7O1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osTUFBTSxFQUNOLEdBQUcsRUFDSCxNQUFNLEVBQ04sR0FBRyxFQUNILFVBQVUsRUFDVixLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEVBQzlDLE1BQU0sR0FDUCxHQUFHLE9BQU8sQ0FBQztRQUVaLDJCQUEyQjtRQUMzQixNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRTFFLFlBQVk7UUFDWixJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDaEMsT0FBTztRQUNULENBQUM7UUFFRCxxQkFBcUI7UUFDckIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3JDLE1BQU0saUJBQWlCLEdBQUcsTUFBQSxNQUFBLE1BQUEsUUFBUSxhQUFSLFFBQVEsdUJBQVIsUUFBUSxDQUFFLFFBQVEsMENBQUUsR0FBRywwQ0FBRSxNQUFNLDBDQUFFLElBQUksQ0FBQztRQUNoRSxNQUFNLGtCQUFrQixHQUFHLE1BQUEsTUFBQSxRQUFRLGFBQVIsUUFBUSx1QkFBUixRQUFRLENBQUUsUUFBUSww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
|
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
/**
|
|
13
|
-
* Pull branch with
|
|
13
|
+
* Pull branch with losing changes
|
|
14
14
|
*/
|
|
15
15
|
const NewCommand = {
|
|
16
16
|
alias: ['pf', 'pull-force'],
|
|
@@ -18,22 +18,19 @@ const NewCommand = {
|
|
|
18
18
|
hidden: false,
|
|
19
19
|
name: 'force-pull',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a, _b, _c
|
|
21
|
+
var _a, _b, _c;
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { config, git, helper, parameters, print: { info, spin, success }, prompt, system: { run, startTimer }, } = toolbox;
|
|
23
|
+
const { config, git, helper, parameters, print: { info, spin, success, warning }, prompt, system: { run, startTimer }, } = toolbox;
|
|
24
24
|
// Load configuration
|
|
25
25
|
const ltConfig = config.loadConfig();
|
|
26
|
-
const configNoConfirm = (_d = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.forcePull) === null || _c === void 0 ? void 0 : _c.noConfirm) !== null && _d !== void 0 ? _d : (_f = (_e = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _e === void 0 ? void 0 : _e.git) === null || _f === void 0 ? void 0 : _f.noConfirm;
|
|
27
|
-
// Load global defaults
|
|
28
|
-
const globalNoConfirm = config.getGlobalDefault(ltConfig, 'noConfirm');
|
|
29
26
|
// Parse CLI arguments
|
|
30
|
-
const
|
|
27
|
+
const dryRun = parameters.options.dryRun || parameters.options['dry-run'];
|
|
31
28
|
// Determine noConfirm with priority: CLI > config > global > default (false)
|
|
32
|
-
const noConfirm = config.
|
|
33
|
-
cliValue:
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
29
|
+
const noConfirm = config.getNoConfirm({
|
|
30
|
+
cliValue: parameters.options.noConfirm,
|
|
31
|
+
commandConfig: (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.forcePull,
|
|
32
|
+
config: ltConfig,
|
|
33
|
+
parentConfig: (_c = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _c === void 0 ? void 0 : _c.git,
|
|
37
34
|
});
|
|
38
35
|
// Check git
|
|
39
36
|
if (!(yield git.gitInstalled())) {
|
|
@@ -41,6 +38,32 @@ const NewCommand = {
|
|
|
41
38
|
}
|
|
42
39
|
// Get current branch
|
|
43
40
|
const branch = yield git.currentBranch();
|
|
41
|
+
// Dry-run mode: show what would be affected
|
|
42
|
+
if (dryRun) {
|
|
43
|
+
warning('DRY-RUN MODE - No changes will be made');
|
|
44
|
+
info('');
|
|
45
|
+
// Show local changes that would be lost
|
|
46
|
+
const status = yield run('git status --porcelain');
|
|
47
|
+
if (status === null || status === void 0 ? void 0 : status.trim()) {
|
|
48
|
+
const lines = status.trim().split('\n');
|
|
49
|
+
info(`Would discard on branch "${branch}":`);
|
|
50
|
+
info(` - ${lines.length} file(s) with local changes`);
|
|
51
|
+
info('');
|
|
52
|
+
info('Files:');
|
|
53
|
+
lines.forEach(line => info(` ${line}`));
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
info('No local changes to discard.');
|
|
57
|
+
}
|
|
58
|
+
// Show commits that would be lost
|
|
59
|
+
const localCommits = yield run(`git log origin/${branch}..HEAD --oneline 2>/dev/null || echo ""`);
|
|
60
|
+
if (localCommits === null || localCommits === void 0 ? void 0 : localCommits.trim()) {
|
|
61
|
+
info('');
|
|
62
|
+
info('Local commits that would be lost:');
|
|
63
|
+
localCommits.trim().split('\n').forEach(line => info(` ${line}`));
|
|
64
|
+
}
|
|
65
|
+
return `dry-run force-pull branch ${branch}`;
|
|
66
|
+
}
|
|
44
67
|
// Ask for reset
|
|
45
68
|
if (!noConfirm && !(yield prompt.confirm('You will lose your changes, are you sure?'))) {
|
|
46
69
|
return;
|
|
@@ -52,11 +75,15 @@ const NewCommand = {
|
|
|
52
75
|
yield run(`git fetch && git reset origin/${branch} --hard`);
|
|
53
76
|
pullSpinner.succeed();
|
|
54
77
|
// Success
|
|
55
|
-
success(`
|
|
78
|
+
success(`Force pulled ${branch} in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
56
79
|
info('');
|
|
80
|
+
// Exit if not running from menu
|
|
81
|
+
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
82
|
+
process.exit();
|
|
83
|
+
}
|
|
57
84
|
// For tests
|
|
58
|
-
return `
|
|
85
|
+
return `force pulled ${branch}`;
|
|
59
86
|
}),
|
|
60
87
|
};
|
|
61
88
|
exports.default = NewCommand;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yY2UtcHVsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9naXQvZm9yY2UtcHVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUlBOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEdBQW1CO0lBQ2pDLEtBQUssRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLENBQUM7SUFDM0IsV0FBVyxFQUFFLDRCQUE0QjtJQUN6QyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxZQUFZO0lBQ2xCLEdBQUcsRUFBRSxDQUFPLE9BQStCLEVBQUUsRUFBRTs7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixNQUFNLEVBQ04sR0FBRyxFQUNILE1BQU0sRUFDTixVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEVBQ3ZDLE1BQU0sRUFDTixNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQzVCLEdBQUcsT0FBTyxDQUFDO1FBRVoscUJBQXFCO1FBQ3JCLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVyQyxzQkFBc0I7UUFDdEIsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxNQUFNLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUUxRSw2RUFBNkU7UUFDN0UsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQztZQUNwQyxRQUFRLEVBQUUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTO1lBQ3RDLGFBQWEsRUFBRSxNQUFBLE1BQUEsUUFBUSxhQUFSLFFBQVEsdUJBQVIsUUFBUSxDQUFFLFFBQVEsMENBQUUsR0FBRywwQ0FBRSxTQUFTO1lBQ2pELE1BQU0sRUFBRSxRQUFRO1lBQ2hCLFlBQVksRUFBRSxNQUFBLFFBQVEsYUFBUixR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
|
|
@@ -18,24 +18,20 @@ const NewCommand = {
|
|
|
18
18
|
hidden: false,
|
|
19
19
|
name: 'get',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a, _b, _c, _d, _e, _f
|
|
21
|
+
var _a, _b, _c, _d, _e, _f;
|
|
22
22
|
// Retrieve the tools we need
|
|
23
23
|
const { config, filesystem, git, helper, npm, parameters, print: { error, info, spin, success }, prompt, system, } = toolbox;
|
|
24
24
|
// Load configuration
|
|
25
25
|
const ltConfig = config.loadConfig();
|
|
26
|
-
const
|
|
27
|
-
const configMode = (_j = (_h = (_g = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _g === void 0 ? void 0 : _g.git) === null || _h === void 0 ? void 0 : _h.get) === null || _j === void 0 ? void 0 : _j.mode;
|
|
28
|
-
// Load global defaults
|
|
29
|
-
const globalNoConfirm = config.getGlobalDefault(ltConfig, 'noConfirm');
|
|
26
|
+
const configMode = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.get) === null || _c === void 0 ? void 0 : _c.mode;
|
|
30
27
|
// Parse CLI arguments
|
|
31
|
-
const cliNoConfirm = parameters.options.noConfirm;
|
|
32
28
|
const cliMode = parameters.options.mode;
|
|
33
29
|
// Determine noConfirm with priority: CLI > config > global > default (false)
|
|
34
|
-
const noConfirm = config.
|
|
35
|
-
cliValue:
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
const noConfirm = config.getNoConfirm({
|
|
31
|
+
cliValue: parameters.options.noConfirm,
|
|
32
|
+
commandConfig: (_e = (_d = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _d === void 0 ? void 0 : _d.git) === null || _e === void 0 ? void 0 : _e.get,
|
|
33
|
+
config: ltConfig,
|
|
34
|
+
parentConfig: (_f = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _f === void 0 ? void 0 : _f.git,
|
|
39
35
|
});
|
|
40
36
|
// Start timer
|
|
41
37
|
const timer = system.startTimer();
|
|
@@ -63,7 +59,7 @@ const NewCommand = {
|
|
|
63
59
|
spin: true,
|
|
64
60
|
});
|
|
65
61
|
if (!branch) {
|
|
66
|
-
|
|
62
|
+
return;
|
|
67
63
|
}
|
|
68
64
|
// Get remote branch
|
|
69
65
|
const remoteBranch = yield git.getBranch(branch, { remote: true });
|
|
@@ -71,7 +67,7 @@ const NewCommand = {
|
|
|
71
67
|
if (branchName !== branch) {
|
|
72
68
|
if (!noConfirm
|
|
73
69
|
&& !(yield prompt.confirm(`Checkout ${remoteBranch ? 'remote' : 'local'} branch ${branch}`))) {
|
|
74
|
-
|
|
70
|
+
return;
|
|
75
71
|
}
|
|
76
72
|
}
|
|
77
73
|
else {
|
|
@@ -89,6 +85,9 @@ const NewCommand = {
|
|
|
89
85
|
checkSpin.succeed();
|
|
90
86
|
// Determine mode with priority: CLI > config > interactive
|
|
91
87
|
let mode = cliMode || configMode;
|
|
88
|
+
if (!cliMode && configMode) {
|
|
89
|
+
info(`Using mode from lt.config commands.git.get: ${configMode}`);
|
|
90
|
+
}
|
|
92
91
|
if (!mode && !noConfirm) {
|
|
93
92
|
if (yield prompt.confirm(`Remove local commits of ${branch}`)) {
|
|
94
93
|
mode = 'hard';
|
|
@@ -146,8 +145,8 @@ const NewCommand = {
|
|
|
146
145
|
process.exit();
|
|
147
146
|
}
|
|
148
147
|
// For tests
|
|
149
|
-
return `
|
|
148
|
+
return `checked out branch ${branch}`;
|
|
150
149
|
}),
|
|
151
150
|
};
|
|
152
151
|
exports.default = NewCommand;
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9nZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsaUJBQWlCO0lBQzlCLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLEtBQUs7SUFDWCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7O1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osTUFBTSxFQUNOLFVBQVUsRUFDVixHQUFHLEVBQ0gsTUFBTSxFQUNOLEdBQUcsRUFDSCxVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE1BQU0sRUFDTixNQUFNLEdBQ1AsR0FBRyxPQUFPLENBQUM7UUFFWixxQkFBcUI7UUFDckIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sVUFBVSxHQUFHLE1BQUEsTUFBQSxNQUFBLFFBQVEsYUFBUixRQUFRLHVCQUFSLFFBQVEsQ0FBRSxRQUFRLDBDQUFFLEdBQUcsMENBQUUsR0FBRywwQ0FBRSxJQUFJLENBQUM7UUFFdEQsc0JBQXNCO1FBQ3RCLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBRXhDLDZFQUE2RTtRQUM3RSxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDO1lBQ3BDLFFBQVEsRUFBRSxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVM7WUFDdEMsYUFBYSxFQUFFLE1BQUEsTUFBQSxRQUFRLGFBQVIsUUFBUSx1QkFBUixRQUFRLENBQUUsUUFBUSwwQ0FBRSxHQUFHLDBDQUFFLEdBQUc7WUFDM0MsTUFBTSxFQUFFLFFBQVE7WUFDaEIsWUFBWSxFQUFFLE1BQUEsUUFBUSxhQUFSLFFBQVEsdUJBQVIsUUFBUSxDQUFFLFFBQVEsMENBQUUsR0FBRztTQUN0QyxDQUFDLENBQUM7UUFFSCxjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRWxDLFlBQVk7UUFDWixJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDaEMsT0FBTztRQUNULENBQUM7UUFFRCw0QkFBNEI7UUFDNUIsTUFBTSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUU7WUFDekQsSUFBSSxFQUFFLGFBQWE7WUFDbkIsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hCLE9BQU87UUFDVCxDQUFDO1FBRUQsb0RBQW9EO1FBQ3BELElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUNsRCxPQUFPO1FBQ1QsQ0FBQztRQUVELGdEQUFnRDtRQUNoRCxNQUFNLE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFFO1lBQzdDLEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7WUFDWixNQUFNLEVBQUUsS0FBSztZQUNiLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osT0FBTztRQUNULENBQUM7UUFFRCxvQkFBb0I7UUFDcEIsTUFBTSxZQUFZLEdBQUcsTUFBTSxHQUFHLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBRW5FLDBCQUEwQjtRQUMxQixJQUFJLFVBQVUsS0FBSyxNQUFNLEVBQUUsQ0FBQztZQUMxQixJQUNFLENBQUMsU0FBUzttQkFDUCxDQUFDLENBQUMsTUFBTSxNQUFNLENBQUMsT0FBTyxDQUFDLFlBQVksWUFBWSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sV0FBVyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQzVGLENBQUM7Z0JBQ0QsT0FBTztZQUNULENBQUM7UUFDSCxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sQ0FBQyxVQUFVLFVBQVUsUUFBUSxDQUFDLENBQUM7UUFDeEMsQ0FBQztRQUVELGtCQUFrQjtRQUNsQixNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxJQUFJLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDN0UsSUFBSSxZQUFZLENBQUM7UUFFakIsc0JBQXNCO1FBQ3RCLElBQUksWUFBWSxFQUFFLENBQUM7WUFDakIsZUFBZTtZQUNmLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztZQUNwQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7WUFDdkMsSUFBSSxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO2dCQUM5RixTQUFTLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3BCLDJEQUEyRDtnQkFDM0QsSUFBSSxJQUFJLEdBQUcsT0FBTyxJQUFJLFVBQVUsQ0FBQztnQkFDakMsSUFBSSxDQUFDLE9BQU8sSUFBSSxVQUFVLEVBQUUsQ0FBQztvQkFDM0IsSUFBSSxDQUFDLCtDQUErQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO2dCQUNwRSxDQUFDO2dCQUNELElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztvQkFDeEIsSUFBSSxNQUFNLE1BQU0sQ0FBQyxPQUFPLENBQUMsMkJBQTJCLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQzt3QkFDOUQsSUFBSSxHQUFHLE1BQU0sQ0FBQztvQkFDaEIsQ0FBQztnQkFDSCxDQUFDO3FCQUFNLElBQUksQ0FBQyxJQUFJLElBQUksU0FBUyxFQUFFLENBQUM7b0JBQzlCLG1FQUFtRTtvQkFDbkUsSUFBSSxHQUFHLFNBQVMsQ0FBQztnQkFDbkIsQ0FBQztnQkFDRCxJQUFJLElBQUksS0FBSyxNQUFNLEVBQUUsQ0FBQztvQkFDcEIsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsTUFBTSxFQUFFLENBQUMsQ0FBQztvQkFDOUMsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLGlCQUFpQixNQUFNLEVBQUUsQ0FBQyxDQUFDO29CQUM1QyxPQUFPLEdBQUcsSUFBSSxDQUFDO29CQUNmLFdBQVcsQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDeEIsQ0FBQztZQUNILENBQUM7aUJBQU0sQ0FBQztnQkFDTixTQUFTLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDdEIsQ0FBQztZQUVELGFBQWE7WUFDYixZQUFZLEdBQUcsSUFBSSxDQUFDLFlBQVksTUFBTSxFQUFFLENBQUMsQ0FBQztZQUUxQyw2Q0FBNkM7WUFDN0MsSUFBSSxPQUFPLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQy9ELE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FDZCw0Q0FBNEMsTUFBTSxtREFBbUQsQ0FDdEcsQ0FBQztnQkFFRix3QkFBd0I7WUFDMUIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsTUFBTSxtREFBbUQsQ0FBQyxDQUFDO1lBQzNHLENBQUM7WUFFRCwwQkFBMEI7UUFDNUIsQ0FBQzthQUFNLElBQUksTUFBTSxFQUFFLENBQUM7WUFDbEIsWUFBWSxHQUFHLElBQUksQ0FBQyxZQUFZLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDMUMsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLDZCQUE2QixNQUFNLHVDQUF1QyxDQUFDLENBQUM7WUFFN0Ysa0JBQWtCO1FBQ3BCLENBQUM7YUFBTSxDQUFDO1lBQ04sS0FBSyxDQUFDLFVBQVUsTUFBTSxhQUFhLENBQUMsQ0FBQztZQUNyQyxPQUFPO1FBQ1QsQ0FBQztRQUVELGdCQUFnQjtRQUNoQixZQUFZLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFdkIsdUJBQXVCO1FBQ3ZCLE1BQU0sR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRXBCLHNCQUFzQjtRQUN0QixJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztZQUN0QyxNQUFNLGdCQUFnQixHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUMvQyxNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUMsQ0FBQztZQUM5QyxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUM3QixDQUFDO1FBRUQsZUFBZTtRQUNmLE9BQU8sQ0FDTCxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxPQUFPLFdBQVcsTUFBTSxtQkFBbUIsTUFBTSxDQUFDLHFCQUFxQixDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FDbEgsQ0FBQztRQUNGLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNULElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUNoRCxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDakIsQ0FBQztRQUVELFlBQVk7UUFDWixPQUFPLHNCQUFzQixNQUFNLEVBQUUsQ0FBQztJQUN4QyxDQUFDLENBQUE7Q0FDRixDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=
|
|
@@ -29,19 +29,19 @@ const NewCommand = {
|
|
|
29
29
|
// Check if source directory exists
|
|
30
30
|
if (!(0, fs_1.existsSync)(sourceDir)) {
|
|
31
31
|
error(`Source directory not found: ${sourceDir}`);
|
|
32
|
-
return
|
|
32
|
+
return 'install-scripts: source not found';
|
|
33
33
|
}
|
|
34
34
|
// Check if target directory exists
|
|
35
35
|
if (!(0, fs_1.existsSync)(targetDir)) {
|
|
36
36
|
error(`Target directory not found: ${targetDir}`);
|
|
37
37
|
info('You may need to create it first: sudo mkdir -p /usr/local/bin');
|
|
38
|
-
return
|
|
38
|
+
return 'install-scripts: target not found';
|
|
39
39
|
}
|
|
40
40
|
// Get all script files
|
|
41
41
|
const scripts = (0, fs_1.readdirSync)(sourceDir).filter(file => !file.startsWith('.'));
|
|
42
42
|
if (scripts.length === 0) {
|
|
43
43
|
error('No scripts found to install.');
|
|
44
|
-
return
|
|
44
|
+
return 'install-scripts: no scripts';
|
|
45
45
|
}
|
|
46
46
|
info(`Installing ${scripts.length} script${scripts.length > 1 ? 's' : ''} to ${targetDir}...`);
|
|
47
47
|
info('');
|
|
@@ -93,10 +93,10 @@ const NewCommand = {
|
|
|
93
93
|
}
|
|
94
94
|
info('');
|
|
95
95
|
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
96
|
-
process.exit(
|
|
96
|
+
process.exit();
|
|
97
97
|
}
|
|
98
|
-
return 'scripts installed';
|
|
98
|
+
return failed.length > 0 ? `scripts installed with ${failed.length} failures` : 'scripts installed';
|
|
99
99
|
}),
|
|
100
100
|
};
|
|
101
101
|
exports.default = NewCommand;
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC1zY3JpcHRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9pbnN0YWxsLXNjcmlwdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSwyQkFBc0U7QUFFdEUsK0JBQTRCO0FBSTVCOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEdBQW1CO0lBQ2pDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQztJQUNiLFdBQVcsRUFBRSw0QkFBNEI7SUFDekMsTUFBTSxFQUFFLEtBQUs7SUFDYixJQUFJLEVBQUUsaUJBQWlCO0lBQ3ZCLEdBQUcsRUFBRSxDQUFPLE9BQStCLEVBQUUsRUFBRTtRQUM3QyxNQUFNLEVBQ0osTUFBTSxFQUNOLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxNQUFNLEVBQUUsRUFBRSxVQUFVLEVBQUUsR0FDdkIsR0FBRyxPQUFPLENBQUM7UUFFWixjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsVUFBVSxFQUFFLENBQUM7UUFFM0IsMkNBQTJDO1FBQzNDLE1BQU0sU0FBUyxHQUFHLElBQUEsV0FBSSxFQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDbEYsTUFBTSxTQUFTLEdBQUcsZ0JBQWdCLENBQUM7UUFFbkMsbUNBQW1DO1FBQ25DLElBQUksQ0FBQyxJQUFBLGVBQVUsRUFBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1lBQzNCLEtBQUssQ0FBQywrQkFBK0IsU0FBUyxFQUFFLENBQUMsQ0FBQztZQUNsRCxPQUFPLG1DQUFtQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxtQ0FBbUM7UUFDbkMsSUFBSSxDQUFDLElBQUEsZUFBVSxFQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7WUFDM0IsS0FBSyxDQUFDLCtCQUErQixTQUFTLEVB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
|
|
@@ -18,25 +18,23 @@ const NewCommand = {
|
|
|
18
18
|
hidden: false,
|
|
19
19
|
name: 'rebase',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j
|
|
21
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { config, git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
23
|
+
const { config, git, helper, parameters, print: { error, info, spin, success, warning }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
24
24
|
// Load configuration
|
|
25
25
|
const ltConfig = config.loadConfig();
|
|
26
|
-
const
|
|
27
|
-
const configBaseBranch = (_k = (_j = (_h = (_g = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _g === void 0 ? void 0 : _g.git) === null || _h === void 0 ? void 0 : _h.rebase) === null || _j === void 0 ? void 0 : _j.base) !== null && _k !== void 0 ? _k : (_m = (_l = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _l === void 0 ? void 0 : _l.git) === null || _m === void 0 ? void 0 : _m.baseBranch;
|
|
26
|
+
const configBaseBranch = (_d = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.rebase) === null || _c === void 0 ? void 0 : _c.base) !== null && _d !== void 0 ? _d : (_f = (_e = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _e === void 0 ? void 0 : _e.git) === null || _f === void 0 ? void 0 : _f.baseBranch;
|
|
28
27
|
// Load global defaults
|
|
29
|
-
const globalNoConfirm = config.getGlobalDefault(ltConfig, 'noConfirm');
|
|
30
28
|
const globalBaseBranch = config.getGlobalDefault(ltConfig, 'baseBranch');
|
|
31
29
|
// Parse CLI arguments
|
|
32
|
-
const cliNoConfirm = parameters.options.noConfirm;
|
|
33
30
|
const cliBaseBranch = parameters.options.base;
|
|
31
|
+
const dryRun = parameters.options.dryRun || parameters.options['dry-run'];
|
|
34
32
|
// Determine noConfirm with priority: CLI > config > global > default (false)
|
|
35
|
-
const noConfirm = config.
|
|
36
|
-
cliValue:
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
33
|
+
const noConfirm = config.getNoConfirm({
|
|
34
|
+
cliValue: parameters.options.noConfirm,
|
|
35
|
+
commandConfig: (_h = (_g = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _g === void 0 ? void 0 : _g.git) === null || _h === void 0 ? void 0 : _h.rebase,
|
|
36
|
+
config: ltConfig,
|
|
37
|
+
parentConfig: (_j = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _j === void 0 ? void 0 : _j.git,
|
|
40
38
|
});
|
|
41
39
|
// Check git
|
|
42
40
|
if (!(yield git.gitInstalled())) {
|
|
@@ -49,6 +47,32 @@ const NewCommand = {
|
|
|
49
47
|
error(`Rebase of branch ${branch} is not allowed!`);
|
|
50
48
|
return;
|
|
51
49
|
}
|
|
50
|
+
// Determine base branch early for dry-run
|
|
51
|
+
const baseBranchPreview = cliBaseBranch || parameters.first || configBaseBranch || globalBaseBranch || 'dev';
|
|
52
|
+
// Dry-run mode: show what would be affected
|
|
53
|
+
if (dryRun) {
|
|
54
|
+
warning('DRY-RUN MODE - No changes will be made');
|
|
55
|
+
info('');
|
|
56
|
+
// Show commits that would be rebased
|
|
57
|
+
const commitsToRebase = yield run(`git log ${baseBranchPreview}..HEAD --oneline 2>/dev/null || echo ""`);
|
|
58
|
+
if (commitsToRebase === null || commitsToRebase === void 0 ? void 0 : commitsToRebase.trim()) {
|
|
59
|
+
const commitCount = commitsToRebase.trim().split('\n').length;
|
|
60
|
+
info(`Would rebase ${commitCount} commit(s) from branch "${branch}" onto "${baseBranchPreview}":`);
|
|
61
|
+
info('');
|
|
62
|
+
info('Commits to be rebased:');
|
|
63
|
+
commitsToRebase.trim().split('\n').forEach(line => info(` ${line}`));
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
info(`No commits to rebase on branch "${branch}" (already up to date with "${baseBranchPreview}")`);
|
|
67
|
+
}
|
|
68
|
+
info('');
|
|
69
|
+
info('Actions that would be performed:');
|
|
70
|
+
info(` 1. Fetch latest changes`);
|
|
71
|
+
info(` 2. Checkout and pull ${baseBranchPreview}`);
|
|
72
|
+
info(` 3. Checkout ${branch}`);
|
|
73
|
+
info(` 4. Rebase onto ${baseBranchPreview}`);
|
|
74
|
+
return `dry-run rebase branch ${branch}`;
|
|
75
|
+
}
|
|
52
76
|
// Ask to Rebase the branch
|
|
53
77
|
if (!noConfirm && !(yield confirm(`Rebase branch ${branch}?`))) {
|
|
54
78
|
return;
|
|
@@ -107,9 +131,13 @@ const NewCommand = {
|
|
|
107
131
|
// Success
|
|
108
132
|
success(`Rebased ${branch} in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
109
133
|
info('');
|
|
134
|
+
// Exit if not running from menu
|
|
135
|
+
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
136
|
+
process.exit();
|
|
137
|
+
}
|
|
110
138
|
// For tests
|
|
111
139
|
return `rebased ${branch}`;
|
|
112
140
|
}),
|
|
113
141
|
};
|
|
114
142
|
exports.default = NewCommand;
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
143
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmViYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9yZWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDYixXQUFXLEVBQUUsb0JBQW9CO0lBQ2pDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLFFBQVE7SUFDZCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7O1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osTUFBTSxFQUNOLEdBQUcsRUFDSCxNQUFNLEVBQ04sVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsRUFDOUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQ25CLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsR0FDNUIsR0FBRyxPQUFPLENBQUM7UUFFWixxQkFBcUI7UUFDckIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBQSxNQUFBLE1BQUEsTUFBQSxRQUFRLGFBQVIsUUFBUSx1QkFBUixRQUFRLENBQUUsUUFBUSwwQ0FBRSxHQUFHLDBDQUFFLE1BQU0sMENBQUUsSUFBSSxtQ0FBSSxNQUFBLE1BQUEsUUFBUSxhQUFSLFFBQVEsdUJBQVIsUUFBUSxDQUFFLFFBQVEsMENBQUUsR0FBRywwQ0FBRSxVQUFVLENBQUM7UUFFdEcsdUJBQXVCO1FBQ3ZCLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLGdCQUFnQixDQUFTLFFBQVEsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUVqRixzQkFBc0I7UUFDdEIsTUFBTSxhQUFhLEdBQUcsVUFBVSxDQUFDLE9B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
|
|
@@ -18,22 +18,19 @@ const NewCommand = {
|
|
|
18
18
|
hidden: false,
|
|
19
19
|
name: 'rename',
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a, _b, _c
|
|
21
|
+
var _a, _b, _c;
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { config, git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
23
|
+
const { config, git, helper, parameters, print: { error, info, spin, success, warning }, prompt: { confirm }, system: { run, startTimer }, } = toolbox;
|
|
24
24
|
// Load configuration
|
|
25
25
|
const ltConfig = config.loadConfig();
|
|
26
|
-
const configNoConfirm = (_d = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.rename) === null || _c === void 0 ? void 0 : _c.noConfirm) !== null && _d !== void 0 ? _d : (_f = (_e = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _e === void 0 ? void 0 : _e.git) === null || _f === void 0 ? void 0 : _f.noConfirm;
|
|
27
|
-
// Load global defaults
|
|
28
|
-
const globalNoConfirm = config.getGlobalDefault(ltConfig, 'noConfirm');
|
|
29
26
|
// Parse CLI arguments
|
|
30
|
-
const
|
|
27
|
+
const dryRun = parameters.options.dryRun || parameters.options['dry-run'];
|
|
31
28
|
// Determine noConfirm with priority: CLI > config > global > default (false)
|
|
32
|
-
const noConfirm = config.
|
|
33
|
-
cliValue:
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
29
|
+
const noConfirm = config.getNoConfirm({
|
|
30
|
+
cliValue: parameters.options.noConfirm,
|
|
31
|
+
commandConfig: (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.git) === null || _b === void 0 ? void 0 : _b.rename,
|
|
32
|
+
config: ltConfig,
|
|
33
|
+
parentConfig: (_c = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _c === void 0 ? void 0 : _c.git,
|
|
37
34
|
});
|
|
38
35
|
// Check git
|
|
39
36
|
if (!(yield git.gitInstalled())) {
|
|
@@ -46,7 +43,7 @@ const NewCommand = {
|
|
|
46
43
|
name: 'new name',
|
|
47
44
|
showError: true,
|
|
48
45
|
});
|
|
49
|
-
if (!
|
|
46
|
+
if (!name) {
|
|
50
47
|
return;
|
|
51
48
|
}
|
|
52
49
|
// Check branch
|
|
@@ -59,6 +56,25 @@ const NewCommand = {
|
|
|
59
56
|
error(`Branch with name ${name} already exists`);
|
|
60
57
|
return;
|
|
61
58
|
}
|
|
59
|
+
// Dry-run mode: show what would be affected
|
|
60
|
+
if (dryRun) {
|
|
61
|
+
warning('DRY-RUN MODE - No changes will be made');
|
|
62
|
+
info('');
|
|
63
|
+
// Check for remote branch
|
|
64
|
+
const remote = yield git.getBranch(branch, { exact: true, remote: true });
|
|
65
|
+
info(`Would rename branch "${branch}" to "${name}"`);
|
|
66
|
+
info('');
|
|
67
|
+
info('Actions that would be performed:');
|
|
68
|
+
info(` 1. Rename local branch (git branch -m ${name})`);
|
|
69
|
+
if (remote) {
|
|
70
|
+
info(` 2. Push new branch name to remote (git push origin ${name})`);
|
|
71
|
+
info(` 3. Delete old remote branch (git push origin :${branch})`);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
info(' (No remote branch to update)');
|
|
75
|
+
}
|
|
76
|
+
return `dry-run rename branch ${branch} to ${name}`;
|
|
77
|
+
}
|
|
62
78
|
// Ask to rename branch
|
|
63
79
|
if (!noConfirm && !(yield confirm(`Rename branch ${branch} into ${name}?`))) {
|
|
64
80
|
return;
|
|
@@ -90,9 +106,13 @@ const NewCommand = {
|
|
|
90
106
|
// Success
|
|
91
107
|
success(`Renamed ${branch} to ${name} in ${helper.msToMinutesAndSeconds(time)}m.`);
|
|
92
108
|
info('');
|
|
109
|
+
// Exit if not running from menu
|
|
110
|
+
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
111
|
+
process.exit();
|
|
112
|
+
}
|
|
93
113
|
// For tests
|
|
94
114
|
return `renamed ${branch} to ${name}`;
|
|
95
115
|
}),
|
|
96
116
|
};
|
|
97
117
|
exports.default = NewCommand;
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuYW1lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9yZW5hbWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDYixXQUFXLEVBQUUsdUJBQXVCO0lBQ3BDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLFFBQVE7SUFDZCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7O1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osTUFBTSxFQUNOLEdBQUcsRUFDSCxNQUFNLEVBQ04sVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsRUFDOUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQ25CLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsR0FDNUIsR0FBRyxPQUFPLENBQUM7UUFFWixxQkFBcUI7UUFDckIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRXJDLHNCQUFzQjtRQUN0QixNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRTFFLDZFQUE2RTtRQUM3RSxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDO1lBQ3BDLFFBQVEsRUFBRSxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVM7WUFDdEMsYUFBYSxFQUFFLE1BQUEsTUFBQSxRQUFRLGFBQVIsUUFBUSx1QkFBUixRQUFRLENBQUUsUUFBUSwwQ0FBRSxHQUFHLDBDQUFFLE1BQU07WUFDOUMsTUFBTSxFQUFFLFFBQVE7WUFDaEIsWUFBWSxFQUFFLE1BQUEs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
|