@git.zone/cli 2.19.0 → 2.19.2
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/gitzone.cli.d.ts +1 -1
- package/dist_ts/gitzone.cli.js +100 -126
- package/dist_ts/helpers.climode.d.ts +2 -0
- package/dist_ts/helpers.climode.js +31 -2
- package/dist_ts/helpers.smartconfigmigrations.js +34 -2
- package/dist_ts/mod_config/index.js +51 -10
- package/dist_ts/mod_format/classes.baseformatter.d.ts +3 -1
- package/dist_ts/mod_format/classes.baseformatter.js +7 -1
- package/dist_ts/mod_format/classes.formatplanner.d.ts +2 -0
- package/dist_ts/mod_format/classes.formatplanner.js +48 -4
- package/dist_ts/mod_format/formatters/license.formatter.d.ts +4 -1
- package/dist_ts/mod_format/formatters/license.formatter.js +32 -10
- package/dist_ts/mod_format/formatters/prettier.formatter.d.ts +0 -3
- package/dist_ts/mod_format/formatters/prettier.formatter.js +53 -62
- package/dist_ts/mod_format/index.d.ts +1 -1
- package/dist_ts/mod_format/index.js +237 -8
- package/dist_ts/mod_format/interfaces.format.d.ts +7 -11
- package/dist_ts/mod_format/interfaces.format.js +1 -1
- package/dist_ts/mod_standard/index.js +2 -1
- package/dist_ts/mod_tools/classes.packagemanager.d.ts +36 -1
- package/dist_ts/mod_tools/classes.packagemanager.js +541 -34
- package/dist_ts/mod_tools/index.js +128 -26
- package/dist_ts/plugins.d.ts +2 -1
- package/dist_ts/plugins.js +3 -2
- package/package.json +1 -1
- package/readme.hints.md +10 -0
- package/readme.md +11 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/gitzone.cli.ts +104 -144
- package/ts/helpers.climode.ts +36 -1
- package/ts/helpers.smartconfigmigrations.ts +37 -1
- package/ts/mod_config/index.ts +60 -9
- package/ts/mod_format/classes.baseformatter.ts +13 -1
- package/ts/mod_format/classes.formatplanner.ts +66 -4
- package/ts/mod_format/formatters/license.formatter.ts +43 -15
- package/ts/mod_format/formatters/prettier.formatter.ts +54 -66
- package/ts/mod_format/index.ts +289 -8
- package/ts/mod_format/interfaces.format.ts +8 -11
- package/ts/mod_standard/index.ts +1 -0
- package/ts/mod_tools/classes.packagemanager.ts +724 -34
- package/ts/mod_tools/index.ts +225 -45
- package/ts/plugins.ts +2 -0
|
@@ -77,17 +77,47 @@ const getFormatConfig = async () => {
|
|
|
77
77
|
...rawFormatConfig,
|
|
78
78
|
};
|
|
79
79
|
};
|
|
80
|
+
const normalizeModuleList = (value) => {
|
|
81
|
+
if (Array.isArray(value)) {
|
|
82
|
+
return value.flatMap((item) => normalizeModuleList(item));
|
|
83
|
+
}
|
|
84
|
+
if (typeof value !== "string") {
|
|
85
|
+
return [];
|
|
86
|
+
}
|
|
87
|
+
return value
|
|
88
|
+
.split(",")
|
|
89
|
+
.map((item) => item.trim())
|
|
90
|
+
.filter(Boolean);
|
|
91
|
+
};
|
|
92
|
+
const getPlanStatus = (plan) => {
|
|
93
|
+
const errorWarnings = plan.warnings.filter((warning) => warning.level === "error");
|
|
94
|
+
const hasChanges = plan.summary.totalFiles > 0;
|
|
95
|
+
const hasErrors = errorWarnings.length > 0;
|
|
96
|
+
return {
|
|
97
|
+
ok: !hasChanges && !hasErrors,
|
|
98
|
+
hasChanges,
|
|
99
|
+
hasErrors,
|
|
100
|
+
errorCount: errorWarnings.length,
|
|
101
|
+
};
|
|
102
|
+
};
|
|
80
103
|
const createActiveFormatters = async (options) => {
|
|
81
104
|
const project = await Project.fromCwd({ requireProjectType: false });
|
|
82
105
|
const context = new FormatContext(options);
|
|
83
106
|
const planner = new FormatPlanner();
|
|
84
107
|
const formatConfig = await getFormatConfig();
|
|
85
108
|
const formatters = Object.entries(formatterMap).map(([, FormatterClass]) => new FormatterClass(context, project));
|
|
109
|
+
const onlyModules = options.only?.length
|
|
110
|
+
? options.only
|
|
111
|
+
: formatConfig.modules.only;
|
|
112
|
+
const skipModules = [
|
|
113
|
+
...formatConfig.modules.skip,
|
|
114
|
+
...(options.skip || []),
|
|
115
|
+
];
|
|
86
116
|
const activeFormatters = formatters.filter((formatter) => {
|
|
87
|
-
if (
|
|
88
|
-
return
|
|
117
|
+
if (onlyModules.length > 0) {
|
|
118
|
+
return onlyModules.includes(formatter.name);
|
|
89
119
|
}
|
|
90
|
-
if (
|
|
120
|
+
if (skipModules.includes(formatter.name)) {
|
|
91
121
|
return false;
|
|
92
122
|
}
|
|
93
123
|
return true;
|
|
@@ -103,6 +133,8 @@ const buildFormatPlan = async (options) => {
|
|
|
103
133
|
const { context, planner, formatConfig, activeFormatters } = await createActiveFormatters({
|
|
104
134
|
interactive: options.interactive,
|
|
105
135
|
jsonOutput: options.jsonOutput,
|
|
136
|
+
only: options.only,
|
|
137
|
+
skip: options.skip,
|
|
106
138
|
});
|
|
107
139
|
const plan = options.fromPlan
|
|
108
140
|
? JSON.parse((await plugins.smartfs
|
|
@@ -130,6 +162,144 @@ const serializePlan = (plan) => {
|
|
|
130
162
|
})),
|
|
131
163
|
};
|
|
132
164
|
};
|
|
165
|
+
const buildFormatFixPrompt = (plan, extraInstructions) => {
|
|
166
|
+
const promptParts = [
|
|
167
|
+
"Other /c-* commands can be found at ~/.config/opencode/commands/*",
|
|
168
|
+
"# gitzone format fix",
|
|
169
|
+
"",
|
|
170
|
+
`Working directory: ${process.cwd()}`,
|
|
171
|
+
"",
|
|
172
|
+
"Repair project formatting so `gitzone format check --json` passes.",
|
|
173
|
+
"",
|
|
174
|
+
"Rules:",
|
|
175
|
+
"- Read `.smartconfig.json`, `package.json`, `tsconfig.json`, and the current format plan before editing.",
|
|
176
|
+
"- Prefer deterministic gitzone standards, bundled assets, and existing project conventions.",
|
|
177
|
+
"- Keep changes focused on formatting, metadata normalization, templates, and config consistency.",
|
|
178
|
+
"- Do not commit, release, install dependencies, or modify unrelated files.",
|
|
179
|
+
"- Use pnpm commands only if commands are needed.",
|
|
180
|
+
"- Run `gitzone format --write --yes` after changes.",
|
|
181
|
+
"- Run `gitzone format check --json` after changes and keep fixing until it passes.",
|
|
182
|
+
"- Run `git diff --check` after changes to catch whitespace problems.",
|
|
183
|
+
"",
|
|
184
|
+
"Current format plan:",
|
|
185
|
+
JSON.stringify(serializePlan(plan), null, 2),
|
|
186
|
+
];
|
|
187
|
+
if (extraInstructions) {
|
|
188
|
+
promptParts.push("", "Additional user instructions:", extraInstructions);
|
|
189
|
+
}
|
|
190
|
+
return promptParts.join("\n");
|
|
191
|
+
};
|
|
192
|
+
const handleFormatFix = async (options, mode) => {
|
|
193
|
+
if (mode.json) {
|
|
194
|
+
printJson({
|
|
195
|
+
ok: false,
|
|
196
|
+
error: "JSON output is not supported for `gitzone format fix`. Use `gitzone format check --json` for machine-readable diagnostics.",
|
|
197
|
+
});
|
|
198
|
+
process.exitCode = 1;
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
const extraInstructions = (options._?.slice(2).join(" ") || "").trim();
|
|
202
|
+
const force = Boolean(options.force);
|
|
203
|
+
const autoApprove = Boolean(options.yes || mode.yes);
|
|
204
|
+
const formatConfig = await getFormatConfig();
|
|
205
|
+
const interactive = options.interactive ?? (mode.interactive && formatConfig.interactive);
|
|
206
|
+
const only = normalizeModuleList(options.only);
|
|
207
|
+
const skip = normalizeModuleList(options.skip);
|
|
208
|
+
const buildCurrentPlan = async () => {
|
|
209
|
+
return await buildFormatPlan({
|
|
210
|
+
interactive,
|
|
211
|
+
jsonOutput: false,
|
|
212
|
+
only,
|
|
213
|
+
skip,
|
|
214
|
+
});
|
|
215
|
+
};
|
|
216
|
+
logger.log("info", "Analyzing project for format fixes...");
|
|
217
|
+
let { plan } = await buildCurrentPlan();
|
|
218
|
+
let status = getPlanStatus(plan);
|
|
219
|
+
if (status.ok && !extraInstructions && !force) {
|
|
220
|
+
logger.log("success", "Format check found no issues. Use `gitzone format fix --force` to run opencode anyway.");
|
|
221
|
+
return;
|
|
222
|
+
}
|
|
223
|
+
if (!autoApprove) {
|
|
224
|
+
if (!mode.interactive) {
|
|
225
|
+
throw new Error("Format fix requires an interactive terminal or `-y` to run non-interactively.");
|
|
226
|
+
}
|
|
227
|
+
const confirmed = await plugins.smartinteract.SmartInteract.getCliConfirmation(`Run format fixes? (${plan.summary.totalFiles} planned change(s), ${status.errorCount} error warning(s))`, true);
|
|
228
|
+
if (!confirmed) {
|
|
229
|
+
logger.log("info", "Format fix cancelled.");
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
if (status.hasChanges) {
|
|
234
|
+
logger.log("info", "Applying deterministic format changes first...");
|
|
235
|
+
await run({
|
|
236
|
+
_: ["format"],
|
|
237
|
+
write: true,
|
|
238
|
+
yes: true,
|
|
239
|
+
interactive: false,
|
|
240
|
+
verbose: options.verbose,
|
|
241
|
+
detailed: options.detailed,
|
|
242
|
+
only: options.only,
|
|
243
|
+
skip: options.skip,
|
|
244
|
+
});
|
|
245
|
+
({ plan } = await buildCurrentPlan());
|
|
246
|
+
status = getPlanStatus(plan);
|
|
247
|
+
if (status.ok && !extraInstructions && !force) {
|
|
248
|
+
logger.log("success", "Format fix completed successfully.");
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
const opencodeArgs = [
|
|
253
|
+
"run",
|
|
254
|
+
"--title",
|
|
255
|
+
"gitzone format fix",
|
|
256
|
+
"--dir",
|
|
257
|
+
process.cwd(),
|
|
258
|
+
];
|
|
259
|
+
if (autoApprove) {
|
|
260
|
+
opencodeArgs.push("--dangerously-skip-permissions");
|
|
261
|
+
}
|
|
262
|
+
opencodeArgs.push(buildFormatFixPrompt(plan, extraInstructions));
|
|
263
|
+
logger.log("info", "Starting opencode format fix...");
|
|
264
|
+
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
265
|
+
executor: "bash",
|
|
266
|
+
sourceFilePaths: [],
|
|
267
|
+
});
|
|
268
|
+
let result;
|
|
269
|
+
try {
|
|
270
|
+
result = await smartshellInstance.execSpawn("opencode", opencodeArgs, {
|
|
271
|
+
stdio: "inherit",
|
|
272
|
+
});
|
|
273
|
+
}
|
|
274
|
+
catch (error) {
|
|
275
|
+
throw new Error(`Failed to run opencode: ${error instanceof Error ? error.message : String(error)}`);
|
|
276
|
+
}
|
|
277
|
+
if (result.exitCode !== 0) {
|
|
278
|
+
logger.log("error", `opencode exited with code ${result.exitCode}`);
|
|
279
|
+
process.exitCode = result.exitCode || 1;
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
logger.log("info", "Running deterministic format pass after opencode...");
|
|
283
|
+
await run({
|
|
284
|
+
_: ["format"],
|
|
285
|
+
write: true,
|
|
286
|
+
yes: true,
|
|
287
|
+
interactive: false,
|
|
288
|
+
verbose: options.verbose,
|
|
289
|
+
detailed: options.detailed,
|
|
290
|
+
only: options.only,
|
|
291
|
+
skip: options.skip,
|
|
292
|
+
});
|
|
293
|
+
const { planner: finalPlanner, plan: finalPlan } = await buildCurrentPlan();
|
|
294
|
+
await finalPlanner.displayPlan(finalPlan, options.detailed);
|
|
295
|
+
const finalStatus = getPlanStatus(finalPlan);
|
|
296
|
+
if (finalStatus.ok) {
|
|
297
|
+
logger.log("success", "Format fix completed successfully.");
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
logger.log("error", `Format fix left ${finalPlan.summary.totalFiles} planned change(s) and ${finalStatus.errorCount} error warning(s).`);
|
|
301
|
+
process.exitCode = 1;
|
|
302
|
+
};
|
|
133
303
|
export let run = async (options = {}) => {
|
|
134
304
|
const mode = await getCliMode(options);
|
|
135
305
|
const subcommand = options?._?.[1];
|
|
@@ -140,8 +310,24 @@ export let run = async (options = {}) => {
|
|
|
140
310
|
if (options.verbose) {
|
|
141
311
|
setVerboseMode(true);
|
|
142
312
|
}
|
|
313
|
+
if (subcommand === "fix") {
|
|
314
|
+
await handleFormatFix(options, mode);
|
|
315
|
+
return;
|
|
316
|
+
}
|
|
143
317
|
const shouldWrite = options.write ?? options.dryRun === false;
|
|
144
318
|
const treatAsPlan = subcommand === "plan";
|
|
319
|
+
const treatAsCheck = subcommand === "check" || Boolean(options.check);
|
|
320
|
+
if (treatAsCheck && shouldWrite) {
|
|
321
|
+
const error = "`gitzone format check` is read-only and cannot be combined with --write.";
|
|
322
|
+
if (mode.json) {
|
|
323
|
+
printJson({ ok: false, error });
|
|
324
|
+
}
|
|
325
|
+
else {
|
|
326
|
+
logger.log("error", error);
|
|
327
|
+
}
|
|
328
|
+
process.exitCode = 1;
|
|
329
|
+
return;
|
|
330
|
+
}
|
|
145
331
|
if (mode.json && shouldWrite) {
|
|
146
332
|
printJson({
|
|
147
333
|
ok: false,
|
|
@@ -153,13 +339,17 @@ export let run = async (options = {}) => {
|
|
|
153
339
|
await migrateConfigFile(shouldWrite);
|
|
154
340
|
const formatConfig = await getFormatConfig();
|
|
155
341
|
const interactive = options.interactive ?? (mode.interactive && formatConfig.interactive);
|
|
156
|
-
const autoApprove = options.yes ?? formatConfig.autoApprove;
|
|
342
|
+
const autoApprove = options.yes ?? (mode.yes || formatConfig.autoApprove);
|
|
343
|
+
const only = normalizeModuleList(options.only);
|
|
344
|
+
const skip = normalizeModuleList(options.skip);
|
|
157
345
|
try {
|
|
158
346
|
const planBuilder = async () => {
|
|
159
347
|
return await buildFormatPlan({
|
|
160
348
|
fromPlan: options.fromPlan,
|
|
161
349
|
interactive,
|
|
162
350
|
jsonOutput: mode.json,
|
|
351
|
+
only,
|
|
352
|
+
skip,
|
|
163
353
|
});
|
|
164
354
|
};
|
|
165
355
|
if (!mode.json) {
|
|
@@ -169,7 +359,16 @@ export let run = async (options = {}) => {
|
|
|
169
359
|
? await runWithSuppressedOutput(planBuilder)
|
|
170
360
|
: await planBuilder();
|
|
171
361
|
if (mode.json) {
|
|
172
|
-
|
|
362
|
+
const serializedPlan = serializePlan(plan);
|
|
363
|
+
if (treatAsCheck) {
|
|
364
|
+
const status = getPlanStatus(plan);
|
|
365
|
+
printJson({ ok: status.ok, ...serializedPlan });
|
|
366
|
+
if (!status.ok) {
|
|
367
|
+
process.exitCode = 1;
|
|
368
|
+
}
|
|
369
|
+
return;
|
|
370
|
+
}
|
|
371
|
+
printJson(serializedPlan);
|
|
173
372
|
return;
|
|
174
373
|
}
|
|
175
374
|
// Display plan
|
|
@@ -185,6 +384,17 @@ export let run = async (options = {}) => {
|
|
|
185
384
|
if (options.planOnly || treatAsPlan) {
|
|
186
385
|
return;
|
|
187
386
|
}
|
|
387
|
+
if (treatAsCheck) {
|
|
388
|
+
const status = getPlanStatus(plan);
|
|
389
|
+
if (status.ok) {
|
|
390
|
+
logger.log("success", "Format check passed");
|
|
391
|
+
}
|
|
392
|
+
else {
|
|
393
|
+
logger.log("error", `Format check failed: ${plan.summary.totalFiles} planned change(s), ${status.errorCount} error warning(s)`);
|
|
394
|
+
process.exitCode = 1;
|
|
395
|
+
}
|
|
396
|
+
return;
|
|
397
|
+
}
|
|
188
398
|
// Show diffs if explicitly requested or before interactive write confirmation
|
|
189
399
|
const showDiffs = options.diff || (shouldWrite && interactive && !autoApprove);
|
|
190
400
|
if (showDiffs) {
|
|
@@ -269,7 +479,7 @@ export function showHelp(mode) {
|
|
|
269
479
|
if (mode?.json) {
|
|
270
480
|
printJson({
|
|
271
481
|
command: "format",
|
|
272
|
-
usage: "gitzone format [plan] [options]",
|
|
482
|
+
usage: "gitzone format [plan|check|fix] [options]",
|
|
273
483
|
description: "Plans formatting changes by default and applies them only with --write.",
|
|
274
484
|
flags: [
|
|
275
485
|
{ flag: "--write, -w", description: "Apply planned changes" },
|
|
@@ -298,18 +508,32 @@ export function showHelp(mode) {
|
|
|
298
508
|
flag: "--diff",
|
|
299
509
|
description: "Show per-file diffs before applying changes",
|
|
300
510
|
},
|
|
511
|
+
{
|
|
512
|
+
flag: "--only <modules>",
|
|
513
|
+
description: "Run only the comma-separated formatter modules",
|
|
514
|
+
},
|
|
515
|
+
{
|
|
516
|
+
flag: "--skip <modules>",
|
|
517
|
+
description: "Skip the comma-separated formatter modules",
|
|
518
|
+
},
|
|
519
|
+
{
|
|
520
|
+
flag: "--force",
|
|
521
|
+
description: "Run `format fix` even when the deterministic plan is clean",
|
|
522
|
+
},
|
|
301
523
|
{ flag: "--json", description: "Emit a read-only format plan as JSON" },
|
|
302
524
|
],
|
|
303
525
|
examples: [
|
|
304
526
|
"gitzone format",
|
|
305
527
|
"gitzone format plan --json",
|
|
528
|
+
"gitzone format check",
|
|
306
529
|
"gitzone format --write --yes",
|
|
530
|
+
"gitzone format fix",
|
|
307
531
|
],
|
|
308
532
|
});
|
|
309
533
|
return;
|
|
310
534
|
}
|
|
311
535
|
console.log("");
|
|
312
|
-
console.log("Usage: gitzone format [plan] [options]");
|
|
536
|
+
console.log("Usage: gitzone format [plan|check|fix] [options]");
|
|
313
537
|
console.log("");
|
|
314
538
|
console.log("Plans formatting changes by default and applies them only with --write.");
|
|
315
539
|
console.log("");
|
|
@@ -322,12 +546,17 @@ export function showHelp(mode) {
|
|
|
322
546
|
console.log(" --detailed Show detailed diffs and save stats");
|
|
323
547
|
console.log(" --verbose Enable verbose logging");
|
|
324
548
|
console.log(" --diff Show per-file diffs before applying changes");
|
|
549
|
+
console.log(" --only <modules> Run only comma-separated formatter modules");
|
|
550
|
+
console.log(" --skip <modules> Skip comma-separated formatter modules");
|
|
551
|
+
console.log(" --force Run format fix even when the plan is clean");
|
|
325
552
|
console.log(" --json Emit a read-only format plan as JSON");
|
|
326
553
|
console.log("");
|
|
327
554
|
console.log("Examples:");
|
|
328
555
|
console.log(" gitzone format");
|
|
329
556
|
console.log(" gitzone format plan --json");
|
|
557
|
+
console.log(" gitzone format check");
|
|
330
558
|
console.log(" gitzone format --write --yes");
|
|
559
|
+
console.log(" gitzone format fix");
|
|
331
560
|
console.log("");
|
|
332
561
|
}
|
|
333
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_format/index.ts"],"names":[],"mappings":"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"}
|
|
562
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_format/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
export type IFormatWarning = {
|
|
2
|
+
level: 'info' | 'warning' | 'error';
|
|
3
|
+
message: string;
|
|
4
|
+
module: string;
|
|
5
|
+
};
|
|
1
6
|
export type IFormatPlan = {
|
|
2
7
|
summary: {
|
|
3
8
|
totalFiles: number;
|
|
@@ -5,17 +10,8 @@ export type IFormatPlan = {
|
|
|
5
10
|
filesModified: number;
|
|
6
11
|
filesRemoved: number;
|
|
7
12
|
};
|
|
8
|
-
changes:
|
|
9
|
-
|
|
10
|
-
path: string;
|
|
11
|
-
module: string;
|
|
12
|
-
description: string;
|
|
13
|
-
}>;
|
|
14
|
-
warnings: Array<{
|
|
15
|
-
level: 'info' | 'warning' | 'error';
|
|
16
|
-
message: string;
|
|
17
|
-
module: string;
|
|
18
|
-
}>;
|
|
13
|
+
changes: IPlannedChange[];
|
|
14
|
+
warnings: IFormatWarning[];
|
|
19
15
|
};
|
|
20
16
|
export type IPlannedChange = {
|
|
21
17
|
type: 'create' | 'modify' | 'delete';
|
|
@@ -13,4 +13,4 @@ export function getModuleIcon(module) {
|
|
|
13
13
|
};
|
|
14
14
|
return icons[module] || '📁';
|
|
15
15
|
}
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5mb3JtYXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfZm9ybWF0L2ludGVyZmFjZXMuZm9ybWF0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQW1DQSxNQUFNLFVBQVUsYUFBYSxDQUFDLE1BQWM7SUFDMUMsTUFBTSxLQUFLLEdBQTJCO1FBQ3BDLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsUUFBUSxFQUFFLElBQUk7UUFDZCxPQUFPLEVBQUUsSUFBSTtRQUNiLFNBQVMsRUFBRSxJQUFJO1FBQ2YsUUFBUSxFQUFFLEdBQUc7UUFDYixNQUFNLEVBQUUsSUFBSTtRQUNaLFNBQVMsRUFBRSxJQUFJO1FBQ2YsV0FBVyxFQUFFLElBQUk7UUFDakIsSUFBSSxFQUFFLElBQUk7S0FDWCxDQUFDO0lBQ0YsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksSUFBSSxDQUFDO0FBQy9CLENBQUMifQ==
|
|
@@ -167,6 +167,7 @@ export async function showHelp(mode, commandName) {
|
|
|
167
167
|
console.log(" gitzone commit recommend --json");
|
|
168
168
|
console.log(" gitzone release --plan");
|
|
169
169
|
console.log(" gitzone format plan --json");
|
|
170
|
+
console.log(" gitzone format check");
|
|
170
171
|
console.log(" gitzone services set mongodb,minio");
|
|
171
172
|
console.log(" gitzone tools update");
|
|
172
173
|
console.log("");
|
|
@@ -209,4 +210,4 @@ async function showCommandHelp(commandName, mode) {
|
|
|
209
210
|
return false;
|
|
210
211
|
}
|
|
211
212
|
}
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_standard/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
export interface IInstalledPackage {
|
|
2
2
|
name: string;
|
|
3
3
|
version: string;
|
|
4
|
+
globalDir?: string;
|
|
5
|
+
packagePath?: string;
|
|
6
|
+
legacy?: boolean;
|
|
4
7
|
}
|
|
5
8
|
export interface IPackageUpdateInfo {
|
|
6
9
|
name: string;
|
|
7
10
|
currentVersion: string;
|
|
8
11
|
latestVersion: string;
|
|
9
12
|
needsUpdate: boolean;
|
|
13
|
+
needsMigration?: boolean;
|
|
14
|
+
globalDir?: string;
|
|
10
15
|
}
|
|
11
16
|
export interface IPackageManagerInfo {
|
|
12
17
|
available: boolean;
|
|
@@ -14,14 +19,44 @@ export interface IPackageManagerInfo {
|
|
|
14
19
|
latestVersion: string | null;
|
|
15
20
|
needsUpdate: boolean;
|
|
16
21
|
}
|
|
22
|
+
export interface ILegacyGlobalRootInfo {
|
|
23
|
+
globalDir: string;
|
|
24
|
+
packages: IInstalledPackage[];
|
|
25
|
+
unmanagedPackageNames: string[];
|
|
26
|
+
safeToDelete: boolean;
|
|
27
|
+
}
|
|
28
|
+
export interface ILegacyCleanupResult {
|
|
29
|
+
globalDir: string;
|
|
30
|
+
deleted: boolean;
|
|
31
|
+
reason?: string;
|
|
32
|
+
}
|
|
33
|
+
export interface IShimSyncResult {
|
|
34
|
+
name: string;
|
|
35
|
+
action: "updated" | "removed" | "skipped";
|
|
36
|
+
reason?: string;
|
|
37
|
+
}
|
|
17
38
|
export declare class PackageManagerUtil {
|
|
18
39
|
private shell;
|
|
40
|
+
private pnpmCommand;
|
|
19
41
|
detectPnpm(): Promise<boolean>;
|
|
20
42
|
getPnpmVersionInfo(): Promise<IPackageManagerInfo>;
|
|
21
43
|
getInstalledPackages(): Promise<IInstalledPackage[]>;
|
|
44
|
+
getLegacyGlobalRoots(): Promise<ILegacyGlobalRootInfo[]>;
|
|
45
|
+
cleanupLegacyGlobalRoots(): Promise<ILegacyCleanupResult[]>;
|
|
46
|
+
syncCurrentGlobalShims(): Promise<IShimSyncResult[]>;
|
|
22
47
|
getLatestVersion(packageName: string, registries?: string[]): Promise<string | null>;
|
|
23
|
-
installLatest(packageName: string): Promise<boolean>;
|
|
48
|
+
installLatest(packageName: string, version?: string): Promise<boolean>;
|
|
49
|
+
updatePnpm(targetVersion: string): Promise<boolean>;
|
|
24
50
|
isNewerVersion(current: string, latest: string): boolean;
|
|
25
51
|
private getCurrentPnpmVersion;
|
|
52
|
+
private getPnpmCommand;
|
|
53
|
+
private execPnpmSilent;
|
|
54
|
+
private getPnpmListProjects;
|
|
55
|
+
private getCurrentGlobalDir;
|
|
56
|
+
private getCurrentInstalledPackages;
|
|
57
|
+
private inspectGlobalRoot;
|
|
58
|
+
private getInstalledPackageVersion;
|
|
59
|
+
private getShimReferences;
|
|
60
|
+
private getPnpmShimDirs;
|
|
26
61
|
private getLatestVersionFromRegistry;
|
|
27
62
|
}
|