@git.zone/cli 2.6.1 → 2.8.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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.project.d.ts +3 -1
- package/dist_ts/classes.project.js +4 -3
- package/dist_ts/gitzone.cli.js +3 -1
- package/dist_ts/mod_commit/index.js +24 -3
- package/dist_ts/mod_commit/mod.ui.d.ts +1 -0
- package/dist_ts/mod_commit/mod.ui.js +5 -1
- package/dist_ts/mod_config/classes.commitconfig.d.ts +41 -0
- package/dist_ts/mod_config/classes.commitconfig.js +83 -0
- package/dist_ts/mod_config/index.d.ts +2 -1
- package/dist_ts/mod_config/index.js +140 -7
- package/dist_ts/mod_format/classes.baseformatter.d.ts +14 -1
- package/dist_ts/mod_format/classes.baseformatter.js +88 -1
- package/dist_ts/mod_format/index.d.ts +6 -1
- package/dist_ts/mod_format/index.js +22 -6
- package/dist_ts/mod_format/interfaces.format.d.ts +10 -0
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.project.ts +3 -2
- package/ts/gitzone.cli.ts +2 -0
- package/ts/mod_commit/index.ts +30 -2
- package/ts/mod_commit/mod.ui.ts +5 -0
- package/ts/mod_config/classes.commitconfig.ts +104 -0
- package/ts/mod_config/index.ts +156 -7
- package/ts/mod_format/classes.baseformatter.ts +91 -1
- package/ts/mod_format/index.ts +37 -8
- package/ts/mod_format/interfaces.format.ts +12 -1
|
@@ -1,8 +1,26 @@
|
|
|
1
1
|
// gitzone config - manage release registry configuration
|
|
2
2
|
import * as plugins from './mod.plugins.js';
|
|
3
3
|
import { ReleaseConfig } from './classes.releaseconfig.js';
|
|
4
|
+
import { CommitConfig } from './classes.commitconfig.js';
|
|
4
5
|
import { runFormatter } from '../mod_format/index.js';
|
|
5
|
-
export { ReleaseConfig };
|
|
6
|
+
export { ReleaseConfig, CommitConfig };
|
|
7
|
+
/**
|
|
8
|
+
* Format npmextra.json with diff preview
|
|
9
|
+
* Shows diff first, asks for confirmation, then applies
|
|
10
|
+
*/
|
|
11
|
+
async function formatNpmextraWithDiff() {
|
|
12
|
+
// Check for diffs first
|
|
13
|
+
const checkResult = await runFormatter('npmextra', {
|
|
14
|
+
checkOnly: true,
|
|
15
|
+
showDiff: true,
|
|
16
|
+
});
|
|
17
|
+
if (checkResult && checkResult.hasDiff) {
|
|
18
|
+
const shouldApply = await plugins.smartinteract.SmartInteract.getCliConfirmation('Apply formatting changes to npmextra.json?', true);
|
|
19
|
+
if (shouldApply) {
|
|
20
|
+
await runFormatter('npmextra', { silent: true });
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
6
24
|
export const run = async (argvArg) => {
|
|
7
25
|
const command = argvArg._?.[1];
|
|
8
26
|
const value = argvArg._?.[2];
|
|
@@ -28,6 +46,12 @@ export const run = async (argvArg) => {
|
|
|
28
46
|
case 'accessLevel':
|
|
29
47
|
await handleAccessLevel(value);
|
|
30
48
|
break;
|
|
49
|
+
case 'commit':
|
|
50
|
+
await handleCommit(argvArg._?.[2], argvArg._?.[3]);
|
|
51
|
+
break;
|
|
52
|
+
case 'services':
|
|
53
|
+
await handleServices();
|
|
54
|
+
break;
|
|
31
55
|
case 'help':
|
|
32
56
|
showHelp();
|
|
33
57
|
break;
|
|
@@ -42,7 +66,7 @@ export const run = async (argvArg) => {
|
|
|
42
66
|
async function handleInteractiveMenu() {
|
|
43
67
|
console.log('');
|
|
44
68
|
console.log('╭─────────────────────────────────────────────────────────────╮');
|
|
45
|
-
console.log('│ gitzone config -
|
|
69
|
+
console.log('│ gitzone config - Project Configuration │');
|
|
46
70
|
console.log('╰─────────────────────────────────────────────────────────────╯');
|
|
47
71
|
console.log('');
|
|
48
72
|
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
@@ -57,6 +81,8 @@ async function handleInteractiveMenu() {
|
|
|
57
81
|
{ name: 'Remove a registry', value: 'remove' },
|
|
58
82
|
{ name: 'Clear all registries', value: 'clear' },
|
|
59
83
|
{ name: 'Set access level (public/private)', value: 'access' },
|
|
84
|
+
{ name: 'Configure commit options', value: 'commit' },
|
|
85
|
+
{ name: 'Configure services', value: 'services' },
|
|
60
86
|
{ name: 'Show help', value: 'help' },
|
|
61
87
|
],
|
|
62
88
|
});
|
|
@@ -77,6 +103,12 @@ async function handleInteractiveMenu() {
|
|
|
77
103
|
case 'access':
|
|
78
104
|
await handleAccessLevel();
|
|
79
105
|
break;
|
|
106
|
+
case 'commit':
|
|
107
|
+
await handleCommit();
|
|
108
|
+
break;
|
|
109
|
+
case 'services':
|
|
110
|
+
await handleServices();
|
|
111
|
+
break;
|
|
80
112
|
case 'help':
|
|
81
113
|
showHelp();
|
|
82
114
|
break;
|
|
@@ -134,8 +166,8 @@ async function handleAdd(url) {
|
|
|
134
166
|
const added = config.addRegistry(url);
|
|
135
167
|
if (added) {
|
|
136
168
|
await config.save();
|
|
137
|
-
await runFormatter('npmextra', { silent: true });
|
|
138
169
|
plugins.logger.log('success', `Added registry: ${url}`);
|
|
170
|
+
await formatNpmextraWithDiff();
|
|
139
171
|
}
|
|
140
172
|
else {
|
|
141
173
|
plugins.logger.log('warn', `Registry already exists: ${url}`);
|
|
@@ -166,8 +198,8 @@ async function handleRemove(url) {
|
|
|
166
198
|
const removed = config.removeRegistry(url);
|
|
167
199
|
if (removed) {
|
|
168
200
|
await config.save();
|
|
169
|
-
await runFormatter('npmextra', { silent: true });
|
|
170
201
|
plugins.logger.log('success', `Removed registry: ${url}`);
|
|
202
|
+
await formatNpmextraWithDiff();
|
|
171
203
|
}
|
|
172
204
|
else {
|
|
173
205
|
plugins.logger.log('warn', `Registry not found: ${url}`);
|
|
@@ -187,8 +219,8 @@ async function handleClear() {
|
|
|
187
219
|
if (confirmed) {
|
|
188
220
|
config.clearRegistries();
|
|
189
221
|
await config.save();
|
|
190
|
-
await runFormatter('npmextra', { silent: true });
|
|
191
222
|
plugins.logger.log('success', 'All registries cleared.');
|
|
223
|
+
await formatNpmextraWithDiff();
|
|
192
224
|
}
|
|
193
225
|
else {
|
|
194
226
|
plugins.logger.log('info', 'Operation cancelled.');
|
|
@@ -223,8 +255,104 @@ async function handleAccessLevel(level) {
|
|
|
223
255
|
}
|
|
224
256
|
config.setAccessLevel(level);
|
|
225
257
|
await config.save();
|
|
226
|
-
await runFormatter('npmextra', { silent: true });
|
|
227
258
|
plugins.logger.log('success', `Access level set to: ${level}`);
|
|
259
|
+
await formatNpmextraWithDiff();
|
|
260
|
+
}
|
|
261
|
+
/**
|
|
262
|
+
* Handle commit configuration
|
|
263
|
+
*/
|
|
264
|
+
async function handleCommit(setting, value) {
|
|
265
|
+
const config = await CommitConfig.fromCwd();
|
|
266
|
+
// No setting = interactive mode
|
|
267
|
+
if (!setting) {
|
|
268
|
+
await handleCommitInteractive(config);
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
271
|
+
// Direct setting
|
|
272
|
+
switch (setting) {
|
|
273
|
+
case 'alwaysTest':
|
|
274
|
+
await handleCommitSetting(config, 'alwaysTest', value);
|
|
275
|
+
break;
|
|
276
|
+
case 'alwaysBuild':
|
|
277
|
+
await handleCommitSetting(config, 'alwaysBuild', value);
|
|
278
|
+
break;
|
|
279
|
+
default:
|
|
280
|
+
plugins.logger.log('error', `Unknown commit setting: ${setting}`);
|
|
281
|
+
showCommitHelp();
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
/**
|
|
285
|
+
* Interactive commit configuration
|
|
286
|
+
*/
|
|
287
|
+
async function handleCommitInteractive(config) {
|
|
288
|
+
console.log('');
|
|
289
|
+
console.log('╭─────────────────────────────────────────────────────────────╮');
|
|
290
|
+
console.log('│ Commit Configuration │');
|
|
291
|
+
console.log('╰─────────────────────────────────────────────────────────────╯');
|
|
292
|
+
console.log('');
|
|
293
|
+
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
294
|
+
const response = await interactInstance.askQuestion({
|
|
295
|
+
type: 'checkbox',
|
|
296
|
+
name: 'commitOptions',
|
|
297
|
+
message: 'Select commit options to enable:',
|
|
298
|
+
choices: [
|
|
299
|
+
{ name: 'Always run tests before commit (-t)', value: 'alwaysTest' },
|
|
300
|
+
{ name: 'Always build after commit (-b)', value: 'alwaysBuild' },
|
|
301
|
+
],
|
|
302
|
+
default: [
|
|
303
|
+
...(config.getAlwaysTest() ? ['alwaysTest'] : []),
|
|
304
|
+
...(config.getAlwaysBuild() ? ['alwaysBuild'] : []),
|
|
305
|
+
],
|
|
306
|
+
});
|
|
307
|
+
const selected = response.value || [];
|
|
308
|
+
config.setAlwaysTest(selected.includes('alwaysTest'));
|
|
309
|
+
config.setAlwaysBuild(selected.includes('alwaysBuild'));
|
|
310
|
+
await config.save();
|
|
311
|
+
plugins.logger.log('success', 'Commit configuration updated');
|
|
312
|
+
await formatNpmextraWithDiff();
|
|
313
|
+
}
|
|
314
|
+
/**
|
|
315
|
+
* Set a specific commit setting
|
|
316
|
+
*/
|
|
317
|
+
async function handleCommitSetting(config, setting, value) {
|
|
318
|
+
// Parse boolean value
|
|
319
|
+
const boolValue = value === 'true' || value === '1' || value === 'on';
|
|
320
|
+
if (setting === 'alwaysTest') {
|
|
321
|
+
config.setAlwaysTest(boolValue);
|
|
322
|
+
}
|
|
323
|
+
else if (setting === 'alwaysBuild') {
|
|
324
|
+
config.setAlwaysBuild(boolValue);
|
|
325
|
+
}
|
|
326
|
+
await config.save();
|
|
327
|
+
plugins.logger.log('success', `Set ${setting} to ${boolValue}`);
|
|
328
|
+
await formatNpmextraWithDiff();
|
|
329
|
+
}
|
|
330
|
+
/**
|
|
331
|
+
* Show help for commit subcommand
|
|
332
|
+
*/
|
|
333
|
+
function showCommitHelp() {
|
|
334
|
+
console.log('');
|
|
335
|
+
console.log('Usage: gitzone config commit [setting] [value]');
|
|
336
|
+
console.log('');
|
|
337
|
+
console.log('Settings:');
|
|
338
|
+
console.log(' alwaysTest [true|false] Always run tests before commit');
|
|
339
|
+
console.log(' alwaysBuild [true|false] Always build after commit');
|
|
340
|
+
console.log('');
|
|
341
|
+
console.log('Examples:');
|
|
342
|
+
console.log(' gitzone config commit # Interactive mode');
|
|
343
|
+
console.log(' gitzone config commit alwaysTest true');
|
|
344
|
+
console.log(' gitzone config commit alwaysBuild false');
|
|
345
|
+
console.log('');
|
|
346
|
+
}
|
|
347
|
+
/**
|
|
348
|
+
* Handle services configuration
|
|
349
|
+
*/
|
|
350
|
+
async function handleServices() {
|
|
351
|
+
// Import and use ServiceManager's configureServices
|
|
352
|
+
const { ServiceManager } = await import('../mod_services/classes.servicemanager.js');
|
|
353
|
+
const serviceManager = new ServiceManager();
|
|
354
|
+
await serviceManager.init();
|
|
355
|
+
await serviceManager.configureServices();
|
|
228
356
|
}
|
|
229
357
|
/**
|
|
230
358
|
* Show help for config command
|
|
@@ -239,6 +367,8 @@ function showHelp() {
|
|
|
239
367
|
console.log(' remove [url] Remove a registry URL');
|
|
240
368
|
console.log(' clear Clear all registries');
|
|
241
369
|
console.log(' access [public|private] Set npm access level for publishing');
|
|
370
|
+
console.log(' commit [setting] [value] Configure commit options');
|
|
371
|
+
console.log(' services Configure which services are enabled');
|
|
242
372
|
console.log('');
|
|
243
373
|
console.log('Examples:');
|
|
244
374
|
console.log(' gitzone config show');
|
|
@@ -248,6 +378,9 @@ function showHelp() {
|
|
|
248
378
|
console.log(' gitzone config clear');
|
|
249
379
|
console.log(' gitzone config access public');
|
|
250
380
|
console.log(' gitzone config access private');
|
|
381
|
+
console.log(' gitzone config commit # Interactive');
|
|
382
|
+
console.log(' gitzone config commit alwaysTest true');
|
|
383
|
+
console.log(' gitzone config services # Interactive');
|
|
251
384
|
console.log('');
|
|
252
385
|
}
|
|
253
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_config/index.ts"],"names":[],"mappings":"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"}
|
|
386
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_config/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FormatContext } from './classes.formatcontext.js';
|
|
2
|
-
import type { IPlannedChange } from './interfaces.format.js';
|
|
2
|
+
import type { IPlannedChange, ICheckResult } from './interfaces.format.js';
|
|
3
3
|
import { Project } from '../classes.project.js';
|
|
4
4
|
export declare abstract class BaseFormatter {
|
|
5
5
|
protected context: FormatContext;
|
|
@@ -16,4 +16,17 @@ export declare abstract class BaseFormatter {
|
|
|
16
16
|
protected createFile(filepath: string, content: string): Promise<void>;
|
|
17
17
|
protected deleteFile(filepath: string): Promise<void>;
|
|
18
18
|
protected shouldProcessFile(filepath: string): Promise<boolean>;
|
|
19
|
+
/**
|
|
20
|
+
* Check for diffs without applying changes
|
|
21
|
+
* Returns information about what would change
|
|
22
|
+
*/
|
|
23
|
+
check(): Promise<ICheckResult>;
|
|
24
|
+
/**
|
|
25
|
+
* Display a single diff using smartdiff
|
|
26
|
+
*/
|
|
27
|
+
displayDiff(diff: ICheckResult['diffs'][0]): void;
|
|
28
|
+
/**
|
|
29
|
+
* Display all diffs from a check result
|
|
30
|
+
*/
|
|
31
|
+
displayAllDiffs(result: ICheckResult): void;
|
|
19
32
|
}
|
|
@@ -60,5 +60,92 @@ export class BaseFormatter {
|
|
|
60
60
|
async shouldProcessFile(filepath) {
|
|
61
61
|
return true;
|
|
62
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* Check for diffs without applying changes
|
|
65
|
+
* Returns information about what would change
|
|
66
|
+
*/
|
|
67
|
+
async check() {
|
|
68
|
+
const changes = await this.analyze();
|
|
69
|
+
const diffs = [];
|
|
70
|
+
for (const change of changes) {
|
|
71
|
+
// Skip generic changes that don't have actual content
|
|
72
|
+
if (change.path === '<various files>') {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
if (change.type === 'modify' || change.type === 'create') {
|
|
76
|
+
// Read current content if file exists
|
|
77
|
+
let currentContent;
|
|
78
|
+
try {
|
|
79
|
+
currentContent = await plugins.smartfs.file(change.path).encoding('utf8').read();
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
// File doesn't exist yet
|
|
83
|
+
currentContent = undefined;
|
|
84
|
+
}
|
|
85
|
+
const newContent = change.content;
|
|
86
|
+
// Check if there's an actual diff
|
|
87
|
+
if (currentContent !== newContent && newContent !== undefined) {
|
|
88
|
+
diffs.push({
|
|
89
|
+
path: change.path,
|
|
90
|
+
type: change.type,
|
|
91
|
+
before: currentContent,
|
|
92
|
+
after: newContent,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
else if (change.type === 'delete') {
|
|
97
|
+
// Check if file exists before marking for deletion
|
|
98
|
+
try {
|
|
99
|
+
const currentContent = await plugins.smartfs.file(change.path).encoding('utf8').read();
|
|
100
|
+
diffs.push({
|
|
101
|
+
path: change.path,
|
|
102
|
+
type: 'delete',
|
|
103
|
+
before: currentContent,
|
|
104
|
+
after: undefined,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
// File doesn't exist, nothing to delete
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return {
|
|
113
|
+
hasDiff: diffs.length > 0,
|
|
114
|
+
diffs,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Display a single diff using smartdiff
|
|
119
|
+
*/
|
|
120
|
+
displayDiff(diff) {
|
|
121
|
+
console.log(`\n--- ${diff.path}`);
|
|
122
|
+
if (diff.before && diff.after) {
|
|
123
|
+
console.log(plugins.smartdiff.formatLineDiffForConsole(diff.before, diff.after));
|
|
124
|
+
}
|
|
125
|
+
else if (diff.after && !diff.before) {
|
|
126
|
+
console.log(' (new file)');
|
|
127
|
+
// Show first few lines of new content
|
|
128
|
+
const lines = diff.after.split('\n').slice(0, 10);
|
|
129
|
+
lines.forEach(line => console.log(` + ${line}`));
|
|
130
|
+
if (diff.after.split('\n').length > 10) {
|
|
131
|
+
console.log(' ... (truncated)');
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
else if (diff.before && !diff.after) {
|
|
135
|
+
console.log(' (file will be deleted)');
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Display all diffs from a check result
|
|
140
|
+
*/
|
|
141
|
+
displayAllDiffs(result) {
|
|
142
|
+
if (!result.hasDiff) {
|
|
143
|
+
console.log(' No changes detected');
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
for (const diff of result.diffs) {
|
|
147
|
+
this.displayDiff(diff);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
63
150
|
}
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5iYXNlZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvbW9kX2Zvcm1hdC9jbGFzc2VzLmJhc2Vmb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhELE1BQU0sT0FBZ0IsYUFBYTtJQUtqQyxZQUFZLE9BQXNCLEVBQUUsT0FBZ0I7UUFDbEQsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLEtBQUssR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7SUFDeEMsQ0FBQztJQU1ELEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBeUI7UUFDckMsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hELElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVsQyxJQUFJLENBQUM7WUFDSCxNQUFNLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUV4QixLQUFLLE1BQU0sTUFBTSxJQUFJLE9BQU8sRUFBRSxDQUFDO2dCQUM3QixJQUFJLENBQUM7b0JBQ0gsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUMvQixJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztnQkFDL0QsQ0FBQztnQkFBQyxPQUFPLEtBQUssRUFB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
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare let run: (options?: {
|
|
2
|
+
write?: boolean;
|
|
2
3
|
dryRun?: boolean;
|
|
3
4
|
yes?: boolean;
|
|
4
5
|
planOnly?: boolean;
|
|
@@ -12,9 +13,13 @@ export declare let run: (options?: {
|
|
|
12
13
|
export declare const handleRollback: (operationId?: string) => Promise<void>;
|
|
13
14
|
export declare const handleListBackups: () => Promise<void>;
|
|
14
15
|
export declare const handleCleanBackups: () => Promise<void>;
|
|
16
|
+
import type { ICheckResult } from './interfaces.format.js';
|
|
17
|
+
export type { ICheckResult };
|
|
15
18
|
/**
|
|
16
19
|
* Run a single formatter by name (for use by other modules)
|
|
17
20
|
*/
|
|
18
21
|
export declare const runFormatter: (formatterName: string, options?: {
|
|
19
22
|
silent?: boolean;
|
|
20
|
-
|
|
23
|
+
checkOnly?: boolean;
|
|
24
|
+
showDiff?: boolean;
|
|
25
|
+
}) => Promise<ICheckResult | void>;
|
|
@@ -20,7 +20,10 @@ export let run = async (options = {}) => {
|
|
|
20
20
|
if (options.verbose) {
|
|
21
21
|
setVerboseMode(true);
|
|
22
22
|
}
|
|
23
|
-
|
|
23
|
+
// Determine if we should write changes
|
|
24
|
+
// Default is dry-mode (no writing) unless --write/-w is specified
|
|
25
|
+
const shouldWrite = options.write ?? (options.dryRun === false);
|
|
26
|
+
const project = await Project.fromCwd({ requireProjectType: false });
|
|
24
27
|
const context = new FormatContext();
|
|
25
28
|
// Cache system removed - no longer needed
|
|
26
29
|
const planner = new FormatPlanner();
|
|
@@ -100,9 +103,9 @@ export let run = async (options = {}) => {
|
|
|
100
103
|
if (options.planOnly) {
|
|
101
104
|
return;
|
|
102
105
|
}
|
|
103
|
-
// Dry-run mode
|
|
104
|
-
if (
|
|
105
|
-
logger.log('info', 'Dry-run mode -
|
|
106
|
+
// Dry-run mode (default behavior)
|
|
107
|
+
if (!shouldWrite) {
|
|
108
|
+
logger.log('info', 'Dry-run mode - use --write (-w) to apply changes');
|
|
106
109
|
return;
|
|
107
110
|
}
|
|
108
111
|
// Interactive confirmation
|
|
@@ -152,11 +155,15 @@ export const handleListBackups = async () => {
|
|
|
152
155
|
export const handleCleanBackups = async () => {
|
|
153
156
|
logger.log('info', 'Backup cleaning has been disabled - backup system removed');
|
|
154
157
|
};
|
|
158
|
+
// Formatters that don't require projectType to be set
|
|
159
|
+
const formattersNotRequiringProjectType = ['npmextra', 'prettier', 'cleanup', 'packagejson'];
|
|
155
160
|
/**
|
|
156
161
|
* Run a single formatter by name (for use by other modules)
|
|
157
162
|
*/
|
|
158
163
|
export const runFormatter = async (formatterName, options = {}) => {
|
|
159
|
-
|
|
164
|
+
// Determine if this formatter requires projectType
|
|
165
|
+
const requireProjectType = !formattersNotRequiringProjectType.includes(formatterName);
|
|
166
|
+
const project = await Project.fromCwd({ requireProjectType });
|
|
160
167
|
const context = new FormatContext();
|
|
161
168
|
// Map formatter names to classes
|
|
162
169
|
const formatterMap = {
|
|
@@ -176,6 +183,15 @@ export const runFormatter = async (formatterName, options = {}) => {
|
|
|
176
183
|
throw new Error(`Unknown formatter: ${formatterName}`);
|
|
177
184
|
}
|
|
178
185
|
const formatter = new FormatterClass(context, project);
|
|
186
|
+
// Check-only mode: just check for diffs and optionally display them
|
|
187
|
+
if (options.checkOnly) {
|
|
188
|
+
const result = await formatter.check();
|
|
189
|
+
if (result.hasDiff && options.showDiff) {
|
|
190
|
+
formatter.displayAllDiffs(result);
|
|
191
|
+
}
|
|
192
|
+
return result;
|
|
193
|
+
}
|
|
194
|
+
// Normal mode: analyze and apply changes
|
|
179
195
|
const changes = await formatter.analyze();
|
|
180
196
|
for (const change of changes) {
|
|
181
197
|
await formatter.applyChange(change);
|
|
@@ -184,4 +200,4 @@ export const runFormatter = async (formatterName, options = {}) => {
|
|
|
184
200
|
logger.log('success', `Formatter '${formatterName}' completed`);
|
|
185
201
|
}
|
|
186
202
|
};
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_format/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,16 @@ export type IPlannedChange = {
|
|
|
38
38
|
module: string;
|
|
39
39
|
description: string;
|
|
40
40
|
content?: string;
|
|
41
|
+
originalContent?: string;
|
|
41
42
|
diff?: string;
|
|
42
43
|
size?: number;
|
|
43
44
|
};
|
|
45
|
+
export interface ICheckResult {
|
|
46
|
+
hasDiff: boolean;
|
|
47
|
+
diffs: Array<{
|
|
48
|
+
path: string;
|
|
49
|
+
type: 'create' | 'modify' | 'delete';
|
|
50
|
+
before?: string;
|
|
51
|
+
after?: string;
|
|
52
|
+
}>;
|
|
53
|
+
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.8.0",
|
|
5
5
|
"description": "A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.",
|
|
6
6
|
"main": "dist_ts/index.ts",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"@push.rocks/npmextra": "^5.3.3",
|
|
77
77
|
"@push.rocks/projectinfo": "^5.0.2",
|
|
78
78
|
"@push.rocks/smartcli": "^4.0.19",
|
|
79
|
-
"@push.rocks/smartdiff": "^1.0
|
|
79
|
+
"@push.rocks/smartdiff": "^1.1.0",
|
|
80
80
|
"@push.rocks/smartfile": "^13.1.2",
|
|
81
81
|
"@push.rocks/smartfs": "^1.2.0",
|
|
82
82
|
"@push.rocks/smartgulp": "^3.0.4",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.8.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
}
|
package/ts/classes.project.ts
CHANGED
|
@@ -8,10 +8,11 @@ import type { TGitzoneProjectType } from './classes.gitzoneconfig.js';
|
|
|
8
8
|
* the Project class is a tool to work with a gitzone project
|
|
9
9
|
*/
|
|
10
10
|
export class Project {
|
|
11
|
-
public static async fromCwd() {
|
|
11
|
+
public static async fromCwd(options: { requireProjectType?: boolean } = {}) {
|
|
12
12
|
const gitzoneConfig = await GitzoneConfig.fromCwd();
|
|
13
13
|
const project = new Project(gitzoneConfig);
|
|
14
|
-
|
|
14
|
+
const requireProjectType = options.requireProjectType ?? true;
|
|
15
|
+
if (requireProjectType && !project.gitzoneConfig.data.projectType) {
|
|
15
16
|
throw new Error('Please define a project type');
|
|
16
17
|
}
|
|
17
18
|
return project;
|
package/ts/gitzone.cli.ts
CHANGED
|
@@ -80,7 +80,9 @@ export let run = async () => {
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
// Handle format with options
|
|
83
|
+
// Default is dry-mode, use --write/-w to apply changes
|
|
83
84
|
await modFormat.run({
|
|
85
|
+
write: argvArg.write || argvArg.w,
|
|
84
86
|
dryRun: argvArg['dry-run'],
|
|
85
87
|
yes: argvArg.yes,
|
|
86
88
|
planOnly: argvArg['plan-only'],
|