@git.zone/cli 2.6.1 → 2.7.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_config/index.js +22 -5
- 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_config/index.ts +27 -5
- 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
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.7.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
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
|
|
@@ -4,7 +4,9 @@ import type { TGitzoneProjectType } from './classes.gitzoneconfig.js';
|
|
|
4
4
|
* the Project class is a tool to work with a gitzone project
|
|
5
5
|
*/
|
|
6
6
|
export declare class Project {
|
|
7
|
-
static fromCwd(
|
|
7
|
+
static fromCwd(options?: {
|
|
8
|
+
requireProjectType?: boolean;
|
|
9
|
+
}): Promise<Project>;
|
|
8
10
|
gitzoneConfig: GitzoneConfig;
|
|
9
11
|
get type(): TGitzoneProjectType;
|
|
10
12
|
constructor(gitzoneConfigArg: GitzoneConfig);
|
|
@@ -5,10 +5,11 @@ import { GitzoneConfig } from './classes.gitzoneconfig.js';
|
|
|
5
5
|
* the Project class is a tool to work with a gitzone project
|
|
6
6
|
*/
|
|
7
7
|
export class Project {
|
|
8
|
-
static async fromCwd() {
|
|
8
|
+
static async fromCwd(options = {}) {
|
|
9
9
|
const gitzoneConfig = await GitzoneConfig.fromCwd();
|
|
10
10
|
const project = new Project(gitzoneConfig);
|
|
11
|
-
|
|
11
|
+
const requireProjectType = options.requireProjectType ?? true;
|
|
12
|
+
if (requireProjectType && !project.gitzoneConfig.data.projectType) {
|
|
12
13
|
throw new Error('Please define a project type');
|
|
13
14
|
}
|
|
14
15
|
return project;
|
|
@@ -20,4 +21,4 @@ export class Project {
|
|
|
20
21
|
this.gitzoneConfig = gitzoneConfigArg;
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5wcm9qZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5wcm9qZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxLQUFLLE1BQU0sWUFBWSxDQUFDO0FBRXBDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUczRDs7R0FFRztBQUNILE1BQU0sT0FBTyxPQUFPO0lBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsVUFBNEMsRUFBRTtRQUN4RSxNQUFNLGFBQWEsR0FBRyxNQUFNLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNwRCxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQyxNQUFNLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsSUFBSSxJQUFJLENBQUM7UUFDOUQsSUFBSSxrQkFBa0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2xFLE1BQU0sSUFBSSxLQUFLLENBQUMsOEJBQThCLENBQUMsQ0FBQztRQUNsRCxDQUFDO1FBQ0QsT0FBTyxPQUFPLENBQUM7SUFDakIsQ0FBQztJQUdELElBQVcsSUFBSTtRQUNiLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDO0lBQzdDLENBQUM7SUFFRCxZQUFZLGdCQUErQjtRQUN6QyxJQUFJLENBQUMsYUFBYSxHQUFHLGdCQUFnQixDQUFDO0lBQ3hDLENBQUM7Q0FDRiJ9
|
package/dist_ts/gitzone.cli.js
CHANGED
|
@@ -61,7 +61,9 @@ export let run = async () => {
|
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
63
|
// Handle format with options
|
|
64
|
+
// Default is dry-mode, use --write/-w to apply changes
|
|
64
65
|
await modFormat.run({
|
|
66
|
+
write: argvArg.write || argvArg.w,
|
|
65
67
|
dryRun: argvArg['dry-run'],
|
|
66
68
|
yes: argvArg.yes,
|
|
67
69
|
planOnly: argvArg['plan-only'],
|
|
@@ -124,4 +126,4 @@ export let run = async () => {
|
|
|
124
126
|
gitzoneSmartcli.startParse();
|
|
125
127
|
return await done.promise;
|
|
126
128
|
};
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0em9uZS5jbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9naXR6b25lLmNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssS0FBSyxNQUFNLFlBQVksQ0FBQztBQUNwQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFM0QsTUFBTSxlQUFlLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0FBRXhELE1BQU0sQ0FBQyxJQUFJLEdBQUcsR0FBRyxLQUFLLElBQUksRUFBRTtJQUMxQixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBRTFDLGtCQUFrQjtJQUNsQixNQUFNLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUUxRSxvQkFBb0I7SUFDcEIsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDbEUsTUFBTSxtQkFBbUIsQ0FBQyxLQUFLLENBQzdCLFNBQVMsRUFDVCxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFDdkIsaURBQWlELENBQ2xELENBQUM7SUFDRixPQUFPLENBQUMsR0FBRyxDQUFDLCtDQUErQyxDQUFDLENBQUM7SUFDN0QsZUFBZSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXBELGdDQUFnQztJQUVoQzs7T0FFRztJQUNILGVBQWUsQ0FBQyxlQUFlLEVBQUUsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO1FBQzVELE1BQU0sV0FBVyxHQUFHLE1BQU0sTUFBTSxDQUFDLHlCQUF5QixDQUFDLENBQUM7UUFD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
|
|
@@ -3,6 +3,23 @@ import * as plugins from './mod.plugins.js';
|
|
|
3
3
|
import { ReleaseConfig } from './classes.releaseconfig.js';
|
|
4
4
|
import { runFormatter } from '../mod_format/index.js';
|
|
5
5
|
export { ReleaseConfig };
|
|
6
|
+
/**
|
|
7
|
+
* Format npmextra.json with diff preview
|
|
8
|
+
* Shows diff first, asks for confirmation, then applies
|
|
9
|
+
*/
|
|
10
|
+
async function formatNpmextraWithDiff() {
|
|
11
|
+
// Check for diffs first
|
|
12
|
+
const checkResult = await runFormatter('npmextra', {
|
|
13
|
+
checkOnly: true,
|
|
14
|
+
showDiff: true,
|
|
15
|
+
});
|
|
16
|
+
if (checkResult && checkResult.hasDiff) {
|
|
17
|
+
const shouldApply = await plugins.smartinteract.SmartInteract.getCliConfirmation('Apply formatting changes to npmextra.json?', true);
|
|
18
|
+
if (shouldApply) {
|
|
19
|
+
await runFormatter('npmextra', { silent: true });
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
6
23
|
export const run = async (argvArg) => {
|
|
7
24
|
const command = argvArg._?.[1];
|
|
8
25
|
const value = argvArg._?.[2];
|
|
@@ -134,8 +151,8 @@ async function handleAdd(url) {
|
|
|
134
151
|
const added = config.addRegistry(url);
|
|
135
152
|
if (added) {
|
|
136
153
|
await config.save();
|
|
137
|
-
await runFormatter('npmextra', { silent: true });
|
|
138
154
|
plugins.logger.log('success', `Added registry: ${url}`);
|
|
155
|
+
await formatNpmextraWithDiff();
|
|
139
156
|
}
|
|
140
157
|
else {
|
|
141
158
|
plugins.logger.log('warn', `Registry already exists: ${url}`);
|
|
@@ -166,8 +183,8 @@ async function handleRemove(url) {
|
|
|
166
183
|
const removed = config.removeRegistry(url);
|
|
167
184
|
if (removed) {
|
|
168
185
|
await config.save();
|
|
169
|
-
await runFormatter('npmextra', { silent: true });
|
|
170
186
|
plugins.logger.log('success', `Removed registry: ${url}`);
|
|
187
|
+
await formatNpmextraWithDiff();
|
|
171
188
|
}
|
|
172
189
|
else {
|
|
173
190
|
plugins.logger.log('warn', `Registry not found: ${url}`);
|
|
@@ -187,8 +204,8 @@ async function handleClear() {
|
|
|
187
204
|
if (confirmed) {
|
|
188
205
|
config.clearRegistries();
|
|
189
206
|
await config.save();
|
|
190
|
-
await runFormatter('npmextra', { silent: true });
|
|
191
207
|
plugins.logger.log('success', 'All registries cleared.');
|
|
208
|
+
await formatNpmextraWithDiff();
|
|
192
209
|
}
|
|
193
210
|
else {
|
|
194
211
|
plugins.logger.log('info', 'Operation cancelled.');
|
|
@@ -223,8 +240,8 @@ async function handleAccessLevel(level) {
|
|
|
223
240
|
}
|
|
224
241
|
config.setAccessLevel(level);
|
|
225
242
|
await config.save();
|
|
226
|
-
await runFormatter('npmextra', { silent: true });
|
|
227
243
|
plugins.logger.log('success', `Access level set to: ${level}`);
|
|
244
|
+
await formatNpmextraWithDiff();
|
|
228
245
|
}
|
|
229
246
|
/**
|
|
230
247
|
* Show help for config command
|
|
@@ -250,4 +267,4 @@ function showHelp() {
|
|
|
250
267
|
console.log(' gitzone config access private');
|
|
251
268
|
console.log('');
|
|
252
269
|
}
|
|
253
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_config/index.ts"],"names":[],"mappings":"AAAA,yDAAyD;AAEzD,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7B,gDAAgD;IAChD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,qBAAqB,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM;YACT,MAAM,UAAU,EAAE,CAAC;YACnB,MAAM;QACR,KAAK,KAAK;YACR,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;YACvB,MAAM;QACR,KAAK,QAAQ;YACX,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,OAAO;YACV,MAAM,WAAW,EAAE,CAAC;YACpB,MAAM;QACR,KAAK,QAAQ,CAAC;QACd,KAAK,aAAa;YAChB,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM;QACR,KAAK,MAAM;YACT,QAAQ,EAAE,CAAC;YACX,MAAM;QACR;YACE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,OAAO,EAAE,CAAC,CAAC;YAC3D,QAAQ,EAAE,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,KAAK,UAAU,qBAAqB;IAClC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC;QAClD,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,4BAA4B;QACrC,OAAO,EAAE,MAAM;QACf,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,MAAM,EAAE;YACrD,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE;YACxC,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC9C,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE;YAChD,EAAE,IAAI,EAAE,mCAAmC,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC9D,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE;SACrC;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAI,QAAgB,CAAC,KAAK,CAAC;IAEvC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM;YACT,MAAM,UAAU,EAAE,CAAC;YACnB,MAAM;QACR,KAAK,KAAK;YACR,MAAM,SAAS,EAAE,CAAC;YAClB,MAAM;QACR,KAAK,QAAQ;YACX,MAAM,YAAY,EAAE,CAAC;YACrB,MAAM;QACR,KAAK,OAAO;YACV,MAAM,WAAW,EAAE,CAAC;YACpB,MAAM;QACR,KAAK,QAAQ;YACX,MAAM,iBAAiB,EAAE,CAAC;YAC1B,MAAM;QACR,KAAK,MAAM;YACT,QAAQ,EAAE,CAAC;YACX,MAAM;IACV,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,UAAU;IACvB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;IAE5C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,oBAAoB;IACpB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,WAAW,EAAE,CAAC,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC;QAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,SAAS,CAAC,GAAY;IACnC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,mBAAmB;QACnB,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC;YAClD,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,qBAAqB;YAC9B,OAAO,EAAE,4BAA4B;YACrC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1C,CAAC;SACF,CAAC,CAAC;QACH,GAAG,GAAI,QAAgB,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,GAAI,CAAC,CAAC;IAEvC,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,YAAY,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,mBAAmB,GAAG,EAAE,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,GAAG,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,YAAY,CAAC,GAAY;IACtC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;IAE1C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qCAAqC,CAAC,CAAC;QAClE,OAAO;IACT,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,8CAA8C;QAC9C,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC;YAClD,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,4BAA4B;YACrC,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;SACvB,CAAC,CAAC;QACH,GAAG,GAAI,QAAgB,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,GAAI,CAAC,CAAC;IAE5C,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,YAAY,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,GAAG,EAAE,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,GAAG,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,WAAW;IACxB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;IAE7C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;QACtD,OAAO;IACT,CAAC;IAED,0BAA0B;IAC1B,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAkB,CAC5E,kCAAkC,EAClC,KAAK,CACN,CAAC;IAEF,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,YAAY,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,iBAAiB,CAAC,KAAc;IAC7C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;IAE7C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,mCAAmC;QACnC,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACnE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC;YAClD,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,yCAAyC;YAClD,OAAO,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;YAC9B,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;QACH,KAAK,GAAI,QAAgB,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,qBAAqB;IACrB,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,KAAK,kCAAkC,CAAC,CAAC;QAC9F,OAAO;IACT,CAAC;IAED,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QAC3B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,KAAK,EAAE,CAAC,CAAC;QACvE,OAAO;IACT,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,KAA6B,CAAC,CAAC;IACrD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACpB,MAAM,YAAY,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,wBAAwB,KAAK,EAAE,CAAC,CAAC;AACjE,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ;IACf,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}
|
|
270
|
+
//# 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.7.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.7.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'],
|
package/ts/mod_config/index.ts
CHANGED
|
@@ -2,10 +2,32 @@
|
|
|
2
2
|
|
|
3
3
|
import * as plugins from './mod.plugins.js';
|
|
4
4
|
import { ReleaseConfig } from './classes.releaseconfig.js';
|
|
5
|
-
import { runFormatter } from '../mod_format/index.js';
|
|
5
|
+
import { runFormatter, type ICheckResult } from '../mod_format/index.js';
|
|
6
6
|
|
|
7
7
|
export { ReleaseConfig };
|
|
8
8
|
|
|
9
|
+
/**
|
|
10
|
+
* Format npmextra.json with diff preview
|
|
11
|
+
* Shows diff first, asks for confirmation, then applies
|
|
12
|
+
*/
|
|
13
|
+
async function formatNpmextraWithDiff(): Promise<void> {
|
|
14
|
+
// Check for diffs first
|
|
15
|
+
const checkResult = await runFormatter('npmextra', {
|
|
16
|
+
checkOnly: true,
|
|
17
|
+
showDiff: true,
|
|
18
|
+
}) as ICheckResult | void;
|
|
19
|
+
|
|
20
|
+
if (checkResult && checkResult.hasDiff) {
|
|
21
|
+
const shouldApply = await plugins.smartinteract.SmartInteract.getCliConfirmation(
|
|
22
|
+
'Apply formatting changes to npmextra.json?',
|
|
23
|
+
true
|
|
24
|
+
);
|
|
25
|
+
if (shouldApply) {
|
|
26
|
+
await runFormatter('npmextra', { silent: true });
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
9
31
|
export const run = async (argvArg: any) => {
|
|
10
32
|
const command = argvArg._?.[1];
|
|
11
33
|
const value = argvArg._?.[2];
|
|
@@ -149,8 +171,8 @@ async function handleAdd(url?: string): Promise<void> {
|
|
|
149
171
|
|
|
150
172
|
if (added) {
|
|
151
173
|
await config.save();
|
|
152
|
-
await runFormatter('npmextra', { silent: true });
|
|
153
174
|
plugins.logger.log('success', `Added registry: ${url}`);
|
|
175
|
+
await formatNpmextraWithDiff();
|
|
154
176
|
} else {
|
|
155
177
|
plugins.logger.log('warn', `Registry already exists: ${url}`);
|
|
156
178
|
}
|
|
@@ -185,8 +207,8 @@ async function handleRemove(url?: string): Promise<void> {
|
|
|
185
207
|
|
|
186
208
|
if (removed) {
|
|
187
209
|
await config.save();
|
|
188
|
-
await runFormatter('npmextra', { silent: true });
|
|
189
210
|
plugins.logger.log('success', `Removed registry: ${url}`);
|
|
211
|
+
await formatNpmextraWithDiff();
|
|
190
212
|
} else {
|
|
191
213
|
plugins.logger.log('warn', `Registry not found: ${url}`);
|
|
192
214
|
}
|
|
@@ -212,8 +234,8 @@ async function handleClear(): Promise<void> {
|
|
|
212
234
|
if (confirmed) {
|
|
213
235
|
config.clearRegistries();
|
|
214
236
|
await config.save();
|
|
215
|
-
await runFormatter('npmextra', { silent: true });
|
|
216
237
|
plugins.logger.log('success', 'All registries cleared.');
|
|
238
|
+
await formatNpmextraWithDiff();
|
|
217
239
|
} else {
|
|
218
240
|
plugins.logger.log('info', 'Operation cancelled.');
|
|
219
241
|
}
|
|
@@ -252,8 +274,8 @@ async function handleAccessLevel(level?: string): Promise<void> {
|
|
|
252
274
|
|
|
253
275
|
config.setAccessLevel(level as 'public' | 'private');
|
|
254
276
|
await config.save();
|
|
255
|
-
await runFormatter('npmextra', { silent: true });
|
|
256
277
|
plugins.logger.log('success', `Access level set to: ${level}`);
|
|
278
|
+
await formatNpmextraWithDiff();
|
|
257
279
|
}
|
|
258
280
|
|
|
259
281
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './mod.plugins.js';
|
|
2
2
|
import { FormatContext } from './classes.formatcontext.js';
|
|
3
|
-
import type { IPlannedChange } from './interfaces.format.js';
|
|
3
|
+
import type { IPlannedChange, ICheckResult } from './interfaces.format.js';
|
|
4
4
|
import { Project } from '../classes.project.js';
|
|
5
5
|
|
|
6
6
|
export abstract class BaseFormatter {
|
|
@@ -79,4 +79,94 @@ export abstract class BaseFormatter {
|
|
|
79
79
|
protected async shouldProcessFile(filepath: string): Promise<boolean> {
|
|
80
80
|
return true;
|
|
81
81
|
}
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Check for diffs without applying changes
|
|
85
|
+
* Returns information about what would change
|
|
86
|
+
*/
|
|
87
|
+
async check(): Promise<ICheckResult> {
|
|
88
|
+
const changes = await this.analyze();
|
|
89
|
+
const diffs: ICheckResult['diffs'] = [];
|
|
90
|
+
|
|
91
|
+
for (const change of changes) {
|
|
92
|
+
// Skip generic changes that don't have actual content
|
|
93
|
+
if (change.path === '<various files>') {
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
if (change.type === 'modify' || change.type === 'create') {
|
|
98
|
+
// Read current content if file exists
|
|
99
|
+
let currentContent: string | undefined;
|
|
100
|
+
try {
|
|
101
|
+
currentContent = await plugins.smartfs.file(change.path).encoding('utf8').read() as string;
|
|
102
|
+
} catch {
|
|
103
|
+
// File doesn't exist yet
|
|
104
|
+
currentContent = undefined;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
const newContent = change.content;
|
|
108
|
+
|
|
109
|
+
// Check if there's an actual diff
|
|
110
|
+
if (currentContent !== newContent && newContent !== undefined) {
|
|
111
|
+
diffs.push({
|
|
112
|
+
path: change.path,
|
|
113
|
+
type: change.type,
|
|
114
|
+
before: currentContent,
|
|
115
|
+
after: newContent,
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
} else if (change.type === 'delete') {
|
|
119
|
+
// Check if file exists before marking for deletion
|
|
120
|
+
try {
|
|
121
|
+
const currentContent = await plugins.smartfs.file(change.path).encoding('utf8').read() as string;
|
|
122
|
+
diffs.push({
|
|
123
|
+
path: change.path,
|
|
124
|
+
type: 'delete',
|
|
125
|
+
before: currentContent,
|
|
126
|
+
after: undefined,
|
|
127
|
+
});
|
|
128
|
+
} catch {
|
|
129
|
+
// File doesn't exist, nothing to delete
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
return {
|
|
135
|
+
hasDiff: diffs.length > 0,
|
|
136
|
+
diffs,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/**
|
|
141
|
+
* Display a single diff using smartdiff
|
|
142
|
+
*/
|
|
143
|
+
displayDiff(diff: ICheckResult['diffs'][0]): void {
|
|
144
|
+
console.log(`\n--- ${diff.path}`);
|
|
145
|
+
if (diff.before && diff.after) {
|
|
146
|
+
console.log(plugins.smartdiff.formatLineDiffForConsole(diff.before, diff.after));
|
|
147
|
+
} else if (diff.after && !diff.before) {
|
|
148
|
+
console.log(' (new file)');
|
|
149
|
+
// Show first few lines of new content
|
|
150
|
+
const lines = diff.after.split('\n').slice(0, 10);
|
|
151
|
+
lines.forEach(line => console.log(` + ${line}`));
|
|
152
|
+
if (diff.after.split('\n').length > 10) {
|
|
153
|
+
console.log(' ... (truncated)');
|
|
154
|
+
}
|
|
155
|
+
} else if (diff.before && !diff.after) {
|
|
156
|
+
console.log(' (file will be deleted)');
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* Display all diffs from a check result
|
|
162
|
+
*/
|
|
163
|
+
displayAllDiffs(result: ICheckResult): void {
|
|
164
|
+
if (!result.hasDiff) {
|
|
165
|
+
console.log(' No changes detected');
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
for (const diff of result.diffs) {
|
|
169
|
+
this.displayDiff(diff);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
82
172
|
}
|
package/ts/mod_format/index.ts
CHANGED
|
@@ -19,7 +19,8 @@ import { CopyFormatter } from './formatters/copy.formatter.js';
|
|
|
19
19
|
|
|
20
20
|
export let run = async (
|
|
21
21
|
options: {
|
|
22
|
-
|
|
22
|
+
write?: boolean; // Explicitly write changes (default: false, dry-mode)
|
|
23
|
+
dryRun?: boolean; // Deprecated, kept for compatibility
|
|
23
24
|
yes?: boolean;
|
|
24
25
|
planOnly?: boolean;
|
|
25
26
|
savePlan?: string;
|
|
@@ -35,7 +36,11 @@ export let run = async (
|
|
|
35
36
|
setVerboseMode(true);
|
|
36
37
|
}
|
|
37
38
|
|
|
38
|
-
|
|
39
|
+
// Determine if we should write changes
|
|
40
|
+
// Default is dry-mode (no writing) unless --write/-w is specified
|
|
41
|
+
const shouldWrite = options.write ?? (options.dryRun === false);
|
|
42
|
+
|
|
43
|
+
const project = await Project.fromCwd({ requireProjectType: false });
|
|
39
44
|
const context = new FormatContext();
|
|
40
45
|
// Cache system removed - no longer needed
|
|
41
46
|
const planner = new FormatPlanner();
|
|
@@ -127,9 +132,9 @@ export let run = async (
|
|
|
127
132
|
return;
|
|
128
133
|
}
|
|
129
134
|
|
|
130
|
-
// Dry-run mode
|
|
131
|
-
if (
|
|
132
|
-
logger.log('info', 'Dry-run mode -
|
|
135
|
+
// Dry-run mode (default behavior)
|
|
136
|
+
if (!shouldWrite) {
|
|
137
|
+
logger.log('info', 'Dry-run mode - use --write (-w) to apply changes');
|
|
133
138
|
return;
|
|
134
139
|
}
|
|
135
140
|
|
|
@@ -197,14 +202,27 @@ export const handleCleanBackups = async (): Promise<void> => {
|
|
|
197
202
|
);
|
|
198
203
|
};
|
|
199
204
|
|
|
205
|
+
// Import the ICheckResult type for external use
|
|
206
|
+
import type { ICheckResult } from './interfaces.format.js';
|
|
207
|
+
export type { ICheckResult };
|
|
208
|
+
|
|
209
|
+
// Formatters that don't require projectType to be set
|
|
210
|
+
const formattersNotRequiringProjectType = ['npmextra', 'prettier', 'cleanup', 'packagejson'];
|
|
211
|
+
|
|
200
212
|
/**
|
|
201
213
|
* Run a single formatter by name (for use by other modules)
|
|
202
214
|
*/
|
|
203
215
|
export const runFormatter = async (
|
|
204
216
|
formatterName: string,
|
|
205
|
-
options: {
|
|
206
|
-
|
|
207
|
-
|
|
217
|
+
options: {
|
|
218
|
+
silent?: boolean;
|
|
219
|
+
checkOnly?: boolean; // Only check for diffs, don't apply
|
|
220
|
+
showDiff?: boolean; // Show the diff output
|
|
221
|
+
} = {}
|
|
222
|
+
): Promise<ICheckResult | void> => {
|
|
223
|
+
// Determine if this formatter requires projectType
|
|
224
|
+
const requireProjectType = !formattersNotRequiringProjectType.includes(formatterName);
|
|
225
|
+
const project = await Project.fromCwd({ requireProjectType });
|
|
208
226
|
const context = new FormatContext();
|
|
209
227
|
|
|
210
228
|
// Map formatter names to classes
|
|
@@ -227,6 +245,17 @@ export const runFormatter = async (
|
|
|
227
245
|
}
|
|
228
246
|
|
|
229
247
|
const formatter = new FormatterClass(context, project);
|
|
248
|
+
|
|
249
|
+
// Check-only mode: just check for diffs and optionally display them
|
|
250
|
+
if (options.checkOnly) {
|
|
251
|
+
const result = await formatter.check();
|
|
252
|
+
if (result.hasDiff && options.showDiff) {
|
|
253
|
+
formatter.displayAllDiffs(result);
|
|
254
|
+
}
|
|
255
|
+
return result;
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
// Normal mode: analyze and apply changes
|
|
230
259
|
const changes = await formatter.analyze();
|
|
231
260
|
|
|
232
261
|
for (const change of changes) {
|
|
@@ -39,7 +39,18 @@ export type IPlannedChange = {
|
|
|
39
39
|
path: string;
|
|
40
40
|
module: string;
|
|
41
41
|
description: string;
|
|
42
|
-
content?: string; //
|
|
42
|
+
content?: string; // New content for create/modify operations
|
|
43
|
+
originalContent?: string; // Original content for comparison
|
|
43
44
|
diff?: string;
|
|
44
45
|
size?: number;
|
|
45
46
|
};
|
|
47
|
+
|
|
48
|
+
export interface ICheckResult {
|
|
49
|
+
hasDiff: boolean;
|
|
50
|
+
diffs: Array<{
|
|
51
|
+
path: string;
|
|
52
|
+
type: 'create' | 'modify' | 'delete';
|
|
53
|
+
before?: string;
|
|
54
|
+
after?: string;
|
|
55
|
+
}>;
|
|
56
|
+
}
|