@git.zone/cli 2.14.3 → 2.16.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/.smartconfig.json +36 -11
- package/assets/templates/service/npmextra.json +8 -2
- package/assets/templates/smartconfig/_smartconfig.json +5 -1
- package/assets/templates/website/npmextra.json +8 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/gitzone.cli.js +15 -1
- package/dist_ts/helpers.changelog.d.ts +16 -0
- package/dist_ts/helpers.changelog.js +114 -0
- package/dist_ts/helpers.smartconfigmigrations.d.ts +7 -0
- package/dist_ts/helpers.smartconfigmigrations.js +161 -0
- package/dist_ts/helpers.workflow.d.ts +97 -0
- package/dist_ts/helpers.workflow.js +258 -0
- package/dist_ts/mod_commit/index.js +190 -303
- package/dist_ts/mod_commit/mod.helpers.d.ts +23 -0
- package/dist_ts/mod_commit/mod.helpers.js +22 -15
- package/dist_ts/mod_commit/mod.ui.d.ts +1 -1
- package/dist_ts/mod_commit/mod.ui.js +7 -2
- package/dist_ts/mod_config/classes.commitconfig.d.ts +6 -0
- package/dist_ts/mod_config/classes.commitconfig.js +28 -4
- package/dist_ts/mod_config/classes.releaseconfig.js +13 -7
- package/dist_ts/mod_config/index.js +77 -29
- package/dist_ts/mod_format/formatters/smartconfig.formatter.js +3 -57
- package/dist_ts/mod_release/index.d.ts +3 -0
- package/dist_ts/mod_release/index.js +299 -0
- package/dist_ts/mod_release/mod.plugins.d.ts +3 -0
- package/dist_ts/mod_release/mod.plugins.js +4 -0
- package/dist_ts/mod_standard/index.js +29 -3
- package/dist_ts/mod_tools/classes.packagemanager.d.ts +27 -0
- package/dist_ts/mod_tools/classes.packagemanager.js +140 -0
- package/dist_ts/mod_tools/index.d.ts +4 -0
- package/dist_ts/mod_tools/index.js +290 -0
- package/dist_ts/mod_tools/mod.plugins.d.ts +1 -0
- package/dist_ts/mod_tools/mod.plugins.js +2 -0
- package/license +2 -2
- package/package.json +20 -30
- package/readme.hints.md +15 -17
- package/readme.md +251 -415
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/gitzone.cli.ts +16 -0
- package/ts/helpers.changelog.ts +165 -0
- package/ts/helpers.smartconfigmigrations.ts +192 -0
- package/ts/helpers.workflow.ts +387 -0
- package/ts/mod_commit/index.ts +233 -435
- package/ts/mod_commit/mod.helpers.ts +28 -16
- package/ts/mod_commit/mod.ui.ts +7 -2
- package/ts/mod_config/classes.commitconfig.ts +33 -3
- package/ts/mod_config/classes.releaseconfig.ts +14 -7
- package/ts/mod_config/index.ts +89 -28
- package/ts/mod_format/formatters/smartconfig.formatter.ts +2 -62
- package/ts/mod_release/index.ts +393 -0
- package/ts/mod_release/mod.plugins.ts +5 -0
- package/ts/mod_standard/index.ts +28 -2
- package/ts/mod_tools/classes.packagemanager.ts +176 -0
- package/ts/mod_tools/index.ts +359 -0
- package/ts/mod_tools/mod.plugins.ts +1 -0
|
@@ -0,0 +1,290 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import { commitinfo } from "../00_commitinfo_data.js";
|
|
3
|
+
import { getCliMode, printJson } from "../helpers.climode.js";
|
|
4
|
+
import { PackageManagerUtil, } from "./classes.packagemanager.js";
|
|
5
|
+
export const GITZONE_PACKAGES = [
|
|
6
|
+
"@git.zone/cli",
|
|
7
|
+
"@git.zone/tsdoc",
|
|
8
|
+
"@git.zone/tsbuild",
|
|
9
|
+
"@git.zone/tstest",
|
|
10
|
+
"@git.zone/tspublish",
|
|
11
|
+
"@git.zone/tsbundle",
|
|
12
|
+
"@git.zone/tsdocker",
|
|
13
|
+
"@git.zone/tsview",
|
|
14
|
+
"@git.zone/tswatch",
|
|
15
|
+
"@git.zone/tsrust",
|
|
16
|
+
];
|
|
17
|
+
export const run = async (argvArg = {}) => {
|
|
18
|
+
const mode = await getCliMode(argvArg);
|
|
19
|
+
const command = argvArg._?.[1] || "help";
|
|
20
|
+
if (mode.help || command === "help") {
|
|
21
|
+
showHelp(mode);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
switch (command) {
|
|
25
|
+
case "update":
|
|
26
|
+
await runUpdate(argvArg, mode);
|
|
27
|
+
break;
|
|
28
|
+
case "install":
|
|
29
|
+
await runInstall(argvArg, mode);
|
|
30
|
+
break;
|
|
31
|
+
default:
|
|
32
|
+
showHelp(mode);
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
async function runUpdate(argvArg, mode) {
|
|
37
|
+
const verbose = Boolean(argvArg.v || argvArg.verbose);
|
|
38
|
+
const pmUtil = new PackageManagerUtil();
|
|
39
|
+
console.log("Scanning for installed @git.zone packages...\n");
|
|
40
|
+
const pnpmInfo = await pmUtil.getPnpmVersionInfo();
|
|
41
|
+
if (!pnpmInfo.available) {
|
|
42
|
+
console.log("pnpm is required for gitzone tools update, but it was not found.");
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
console.log("Package manager:\n");
|
|
46
|
+
console.log(" Name Current Latest Status");
|
|
47
|
+
console.log(" ----------------------------------------------");
|
|
48
|
+
const latestPnpm = (pnpmInfo.latestVersion || "unknown").padEnd(12);
|
|
49
|
+
const pnpmStatus = pnpmInfo.latestVersion === null
|
|
50
|
+
? "? Version unknown"
|
|
51
|
+
: pnpmInfo.needsUpdate
|
|
52
|
+
? "Update available"
|
|
53
|
+
: "Up to date";
|
|
54
|
+
console.log(` ${"pnpm".padEnd(9)}${pnpmInfo.currentVersion.padEnd(12)}${latestPnpm}${pnpmStatus}`);
|
|
55
|
+
console.log("");
|
|
56
|
+
if (verbose) {
|
|
57
|
+
console.log("Using pnpm as the supported global package manager.\n");
|
|
58
|
+
}
|
|
59
|
+
const selfUpdated = await handleSelfUpdate(pmUtil, mode);
|
|
60
|
+
if (selfUpdated) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const installedPackages = await pmUtil.getInstalledPackages();
|
|
64
|
+
const packageInfos = await getPackageUpdateInfos(pmUtil, installedPackages);
|
|
65
|
+
if (packageInfos.length === 0) {
|
|
66
|
+
console.log("No managed @git.zone packages found installed globally.");
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
console.log("Installed @git.zone packages:\n");
|
|
70
|
+
console.log(" Package Current Latest Status");
|
|
71
|
+
console.log(" ------------------------------------------------------------");
|
|
72
|
+
for (const packageInfo of packageInfos) {
|
|
73
|
+
const status = packageInfo.latestVersion === "unknown"
|
|
74
|
+
? "? Version unknown"
|
|
75
|
+
: packageInfo.needsUpdate
|
|
76
|
+
? "Update available"
|
|
77
|
+
: "Up to date";
|
|
78
|
+
console.log(` ${packageInfo.name.padEnd(28)}${packageInfo.currentVersion.padEnd(12)}${packageInfo.latestVersion.padEnd(12)}${status}`);
|
|
79
|
+
}
|
|
80
|
+
console.log("");
|
|
81
|
+
await printMissingPackages(pmUtil, installedPackages);
|
|
82
|
+
const packagesToUpdate = packageInfos.filter((packageInfo) => packageInfo.needsUpdate);
|
|
83
|
+
if (packagesToUpdate.length === 0) {
|
|
84
|
+
console.log("All managed packages are up to date.");
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
console.log(`Found ${packagesToUpdate.length} package(s) with available updates.\n`);
|
|
88
|
+
if (!mode.yes && !mode.interactive) {
|
|
89
|
+
console.log("Run gitzone tools update -y to update without prompts.");
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
let shouldUpdate = mode.yes;
|
|
93
|
+
if (!shouldUpdate) {
|
|
94
|
+
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
95
|
+
const answer = await interactInstance.askQuestion({
|
|
96
|
+
type: "confirm",
|
|
97
|
+
name: "confirmUpdate",
|
|
98
|
+
message: "Do you want to update these packages?",
|
|
99
|
+
default: true,
|
|
100
|
+
});
|
|
101
|
+
shouldUpdate = answer.value === true;
|
|
102
|
+
}
|
|
103
|
+
if (!shouldUpdate) {
|
|
104
|
+
console.log("Update cancelled.");
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
await installPackages(pmUtil, packagesToUpdate.map((packageInfo) => packageInfo.name), "updated");
|
|
108
|
+
}
|
|
109
|
+
async function runInstall(argvArg, mode) {
|
|
110
|
+
const verbose = Boolean(argvArg.v || argvArg.verbose);
|
|
111
|
+
const pmUtil = new PackageManagerUtil();
|
|
112
|
+
console.log("Scanning for missing @git.zone packages...\n");
|
|
113
|
+
const pnpmAvailable = await pmUtil.detectPnpm();
|
|
114
|
+
if (!pnpmAvailable) {
|
|
115
|
+
console.log("pnpm is required for gitzone tools install, but it was not found.");
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if (verbose) {
|
|
119
|
+
console.log("Using pnpm as the supported global package manager.\n");
|
|
120
|
+
}
|
|
121
|
+
const installedPackages = await pmUtil.getInstalledPackages();
|
|
122
|
+
const installedNames = new Set(installedPackages.map((packageInfo) => packageInfo.name));
|
|
123
|
+
const missingPackages = GITZONE_PACKAGES.filter((packageName) => !installedNames.has(packageName));
|
|
124
|
+
if (missingPackages.length === 0) {
|
|
125
|
+
console.log("All managed @git.zone packages are already installed.");
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
console.log(`Found ${missingPackages.length} missing package(s).\n`);
|
|
129
|
+
if (!mode.yes && !mode.interactive) {
|
|
130
|
+
await printPackageListWithLatest(pmUtil, missingPackages);
|
|
131
|
+
console.log("Run gitzone tools install -y to install all missing packages without prompts.");
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
let selectedPackages = missingPackages;
|
|
135
|
+
if (!mode.yes) {
|
|
136
|
+
const choicesWithVersions = [];
|
|
137
|
+
for (const packageName of missingPackages) {
|
|
138
|
+
const latest = await pmUtil.getLatestVersion(packageName);
|
|
139
|
+
choicesWithVersions.push({
|
|
140
|
+
name: `${packageName}${latest ? `@${latest}` : ""}`,
|
|
141
|
+
value: packageName,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
145
|
+
const answer = await interactInstance.askQuestion({
|
|
146
|
+
type: "checkbox",
|
|
147
|
+
name: "packages",
|
|
148
|
+
message: "Select packages to install:",
|
|
149
|
+
default: missingPackages,
|
|
150
|
+
choices: choicesWithVersions,
|
|
151
|
+
});
|
|
152
|
+
selectedPackages = answer.value;
|
|
153
|
+
if (selectedPackages.length === 0) {
|
|
154
|
+
console.log("No packages selected. Nothing to install.");
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
await installPackages(pmUtil, selectedPackages, "installed");
|
|
159
|
+
}
|
|
160
|
+
async function handleSelfUpdate(pmUtil, mode) {
|
|
161
|
+
console.log("Checking for gitzone self-update...\n");
|
|
162
|
+
const currentVersion = commitinfo.version;
|
|
163
|
+
const latestVersion = await pmUtil.getLatestVersion("@git.zone/cli");
|
|
164
|
+
if (!latestVersion || !pmUtil.isNewerVersion(currentVersion, latestVersion)) {
|
|
165
|
+
console.log(` @git.zone/cli ${currentVersion} Up to date\n`);
|
|
166
|
+
return false;
|
|
167
|
+
}
|
|
168
|
+
console.log(` @git.zone/cli ${currentVersion} -> ${latestVersion} Update available\n`);
|
|
169
|
+
if (!mode.yes && !mode.interactive) {
|
|
170
|
+
console.log("Run gitzone tools update -y to update gitzone first.");
|
|
171
|
+
return true;
|
|
172
|
+
}
|
|
173
|
+
let shouldUpdate = mode.yes;
|
|
174
|
+
if (!shouldUpdate) {
|
|
175
|
+
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
176
|
+
const answer = await interactInstance.askQuestion({
|
|
177
|
+
type: "confirm",
|
|
178
|
+
name: "confirmSelfUpdate",
|
|
179
|
+
message: "Do you want to update gitzone itself first?",
|
|
180
|
+
default: true,
|
|
181
|
+
});
|
|
182
|
+
shouldUpdate = answer.value === true;
|
|
183
|
+
}
|
|
184
|
+
if (!shouldUpdate) {
|
|
185
|
+
console.log("Skipping gitzone self-update.\n");
|
|
186
|
+
return false;
|
|
187
|
+
}
|
|
188
|
+
const success = await pmUtil.installLatest("@git.zone/cli");
|
|
189
|
+
if (!success) {
|
|
190
|
+
console.log("\ngitzone self-update failed. Continuing with the current version.\n");
|
|
191
|
+
return false;
|
|
192
|
+
}
|
|
193
|
+
console.log("\ngitzone has been updated. Re-run gitzone tools update to check remaining packages.");
|
|
194
|
+
return true;
|
|
195
|
+
}
|
|
196
|
+
async function getPackageUpdateInfos(pmUtil, installedPackages) {
|
|
197
|
+
const packageInfos = [];
|
|
198
|
+
for (const installedPackage of installedPackages) {
|
|
199
|
+
if (!GITZONE_PACKAGES.includes(installedPackage.name)) {
|
|
200
|
+
continue;
|
|
201
|
+
}
|
|
202
|
+
const latestVersion = await pmUtil.getLatestVersion(installedPackage.name);
|
|
203
|
+
packageInfos.push({
|
|
204
|
+
name: installedPackage.name,
|
|
205
|
+
currentVersion: installedPackage.version,
|
|
206
|
+
latestVersion: latestVersion || "unknown",
|
|
207
|
+
needsUpdate: latestVersion
|
|
208
|
+
? pmUtil.isNewerVersion(installedPackage.version, latestVersion)
|
|
209
|
+
: false,
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
return packageInfos;
|
|
213
|
+
}
|
|
214
|
+
async function printMissingPackages(pmUtil, installedPackages) {
|
|
215
|
+
const installedNames = new Set(installedPackages.map((packageInfo) => packageInfo.name));
|
|
216
|
+
const missingPackages = GITZONE_PACKAGES.filter((packageName) => !installedNames.has(packageName));
|
|
217
|
+
if (missingPackages.length === 0) {
|
|
218
|
+
return;
|
|
219
|
+
}
|
|
220
|
+
console.log("Not installed (managed @git.zone packages):\n");
|
|
221
|
+
await printPackageListWithLatest(pmUtil, missingPackages);
|
|
222
|
+
console.log("Run gitzone tools install to install missing packages.\n");
|
|
223
|
+
}
|
|
224
|
+
async function printPackageListWithLatest(pmUtil, packageNames) {
|
|
225
|
+
console.log(" Package Latest");
|
|
226
|
+
console.log(" ----------------------------------------");
|
|
227
|
+
for (const packageName of packageNames) {
|
|
228
|
+
const latest = await pmUtil.getLatestVersion(packageName);
|
|
229
|
+
console.log(` ${packageName.padEnd(28)} ${latest || "unknown"}`);
|
|
230
|
+
}
|
|
231
|
+
console.log("");
|
|
232
|
+
}
|
|
233
|
+
async function installPackages(pmUtil, packageNames, action) {
|
|
234
|
+
let successCount = 0;
|
|
235
|
+
let failCount = 0;
|
|
236
|
+
for (const packageName of packageNames) {
|
|
237
|
+
const success = await pmUtil.installLatest(packageName);
|
|
238
|
+
if (success) {
|
|
239
|
+
console.log(` ${packageName} ${action} successfully`);
|
|
240
|
+
successCount++;
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
console.log(` ${packageName} failed`);
|
|
244
|
+
failCount++;
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
console.log("");
|
|
248
|
+
if (failCount === 0) {
|
|
249
|
+
console.log(`All ${successCount} package(s) ${action} successfully.`);
|
|
250
|
+
}
|
|
251
|
+
else {
|
|
252
|
+
console.log(`${successCount} package(s) ${action}, ${failCount} failed.`);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
export function showHelp(mode) {
|
|
256
|
+
if (mode?.json) {
|
|
257
|
+
printJson({
|
|
258
|
+
name: "gitzone tools",
|
|
259
|
+
usage: "gitzone tools <command> [options]",
|
|
260
|
+
commands: [
|
|
261
|
+
{ name: "update", description: "Check and update globally installed @git.zone packages" },
|
|
262
|
+
{ name: "install", description: "Install missing managed @git.zone packages" },
|
|
263
|
+
],
|
|
264
|
+
flags: [
|
|
265
|
+
{ flag: "-y, --yes", description: "Run without confirmation prompts" },
|
|
266
|
+
{ flag: "-v, --verbose", description: "Show package manager diagnostics" },
|
|
267
|
+
],
|
|
268
|
+
packageManager: "pnpm",
|
|
269
|
+
managedPackages: GITZONE_PACKAGES,
|
|
270
|
+
});
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
console.log("");
|
|
274
|
+
console.log("Usage: gitzone tools <command> [options]");
|
|
275
|
+
console.log("");
|
|
276
|
+
console.log("Commands:");
|
|
277
|
+
console.log(" update Check and update globally installed @git.zone packages");
|
|
278
|
+
console.log(" install Install missing managed @git.zone packages");
|
|
279
|
+
console.log("");
|
|
280
|
+
console.log("Options:");
|
|
281
|
+
console.log(" -y, --yes Run without confirmation prompts");
|
|
282
|
+
console.log(" -v, --verbose Show package manager diagnostics");
|
|
283
|
+
console.log("");
|
|
284
|
+
console.log("Examples:");
|
|
285
|
+
console.log(" gitzone tools update");
|
|
286
|
+
console.log(" gitzone tools update -y");
|
|
287
|
+
console.log(" gitzone tools install");
|
|
288
|
+
console.log("");
|
|
289
|
+
}
|
|
290
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_tools/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "../plugins.js";
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export * from "../plugins.js";
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfdG9vbHMvbW9kLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxlQUFlLENBQUMifQ==
|
package/license
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
Copyright (c) 2015 Task Venture Capital GmbH (hello@
|
|
1
|
+
Copyright (c) 2015 Task Venture Capital GmbH (hello@task.vc)
|
|
2
2
|
|
|
3
3
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
4
4
|
of this software and associated documentation files (the "Software"), to deal
|
|
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
16
16
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
17
17
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
18
18
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
19
|
-
SOFTWARE.
|
|
19
|
+
SOFTWARE.
|
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.16.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.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
|
@@ -10,24 +10,6 @@
|
|
|
10
10
|
"gitzone": "./cli.js",
|
|
11
11
|
"gzone": "./cli.js"
|
|
12
12
|
},
|
|
13
|
-
"scripts": {
|
|
14
|
-
"test": "(pnpm run clean && pnpm run prepareTest && pnpm run testCli && pnpm run testFormat && pnpm run testCommit && pnpm run testDeprecate && pnpm run testVersion && pnpm run testReadme && pnpm run testUpdate && pnpm run testTemplateNpm && pnpm run testTemplateLit) && rm -rf .nogit/test",
|
|
15
|
-
"build": "tsbuild tsfolders",
|
|
16
|
-
"clean": "(rm -rf .nogit/test/)",
|
|
17
|
-
"prepareTest": "(mkdir -p .nogit && git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/test/)",
|
|
18
|
-
"testBuild": "pnpm run build && rm -r dist/",
|
|
19
|
-
"testCli": "(cd .nogit/test && node ../../cli.ts.js)",
|
|
20
|
-
"testCommit": "(cd .nogit/test && node ../../cli.ts.js commit)",
|
|
21
|
-
"testDeprecate": "(cd .nogit/test && node ../../cli.ts.js deprecate)",
|
|
22
|
-
"testOpen": "(cd .nogit/test && node ../../cli.ts.js open ci)",
|
|
23
|
-
"testReadme": "(cd .nogit/test && node ../../cli.ts.js readme)",
|
|
24
|
-
"testFormat": "(cd .nogit/test && node ../../cli.ts.js format)",
|
|
25
|
-
"testTemplateNpm": "(rm -rf .nogit/test/testtemplate_npm/ && mkdir -p .nogit/test/testtemplate_npm && cd .nogit/test/testtemplate_npm && node ../../../cli.ts.js template npm)",
|
|
26
|
-
"testTemplateLit": "(rm -rf .nogit/test/testtemplate_lit/ && mkdir -p .nogit/test/testtemplate_lit && cd .nogit/test/testtemplate_lit && node ../../../cli.ts.js template lit)",
|
|
27
|
-
"testUpdate": "(cd .nogit/test && node ../../cli.ts.js update)",
|
|
28
|
-
"testVersion": "(cd .nogit/test && node ../../cli.ts.js -v)",
|
|
29
|
-
"buildDocs": "tsdoc"
|
|
30
|
-
},
|
|
31
13
|
"repository": {
|
|
32
14
|
"type": "git",
|
|
33
15
|
"url": "https://gitlab.com/gitzone/private/gitzone.git"
|
|
@@ -107,14 +89,22 @@
|
|
|
107
89
|
"browserslist": [
|
|
108
90
|
"last 1 chrome versions"
|
|
109
91
|
],
|
|
110
|
-
"
|
|
111
|
-
"
|
|
112
|
-
"
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
92
|
+
"scripts": {
|
|
93
|
+
"test": "(pnpm run clean && pnpm run prepareTest && pnpm run testCli && pnpm run testFormat && pnpm run testCommit && pnpm run testDeprecate && pnpm run testVersion && pnpm run testReadme && pnpm run testUpdate && pnpm run testTemplateNpm && pnpm run testTemplateLit) && rm -rf .nogit/test",
|
|
94
|
+
"build": "tsbuild tsfolders",
|
|
95
|
+
"clean": "(rm -rf .nogit/test/)",
|
|
96
|
+
"prepareTest": "(mkdir -p .nogit && git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/test/)",
|
|
97
|
+
"testBuild": "pnpm run build && rm -r dist/",
|
|
98
|
+
"testCli": "(cd .nogit/test && node ../../cli.ts.js)",
|
|
99
|
+
"testCommit": "(cd .nogit/test && node ../../cli.ts.js commit)",
|
|
100
|
+
"testDeprecate": "(cd .nogit/test && node ../../cli.ts.js deprecate)",
|
|
101
|
+
"testOpen": "(cd .nogit/test && node ../../cli.ts.js open ci)",
|
|
102
|
+
"testReadme": "(cd .nogit/test && node ../../cli.ts.js readme)",
|
|
103
|
+
"testFormat": "(cd .nogit/test && node ../../cli.ts.js format)",
|
|
104
|
+
"testTemplateNpm": "(rm -rf .nogit/test/testtemplate_npm/ && mkdir -p .nogit/test/testtemplate_npm && cd .nogit/test/testtemplate_npm && node ../../../cli.ts.js template npm)",
|
|
105
|
+
"testTemplateLit": "(rm -rf .nogit/test/testtemplate_lit/ && mkdir -p .nogit/test/testtemplate_lit && cd .nogit/test/testtemplate_lit && node ../../../cli.ts.js template lit)",
|
|
106
|
+
"testUpdate": "(cd .nogit/test && node ../../cli.ts.js update)",
|
|
107
|
+
"testVersion": "(cd .nogit/test && node ../../cli.ts.js -v)",
|
|
108
|
+
"buildDocs": "tsdoc"
|
|
109
|
+
}
|
|
110
|
+
}
|
package/readme.hints.md
CHANGED
|
@@ -38,7 +38,7 @@ The format module is responsible for project standardization:
|
|
|
38
38
|
2. **copy** - File copying with glob patterns (fully implemented)
|
|
39
39
|
3. **gitignore** - Creates/updates .gitignore from templates
|
|
40
40
|
4. **license** - Checks dependency licenses for compatibility
|
|
41
|
-
5. **
|
|
41
|
+
5. **smartconfig** - Manages project metadata and configuration
|
|
42
42
|
6. **packagejson** - Formats and updates package.json
|
|
43
43
|
7. **prettier** - Applies code formatting with batching
|
|
44
44
|
8. **readme** - Ensures readme files exist
|
|
@@ -89,28 +89,26 @@ The format module is responsible for project standardization:
|
|
|
89
89
|
5. **Performance Optimizations**: Parallel execution and caching
|
|
90
90
|
6. **Reporting**: Diff views, statistics, verbose logging
|
|
91
91
|
7. **Architecture**: Clean separation of concerns with new classes
|
|
92
|
-
8. **
|
|
92
|
+
8. **Split Commit/Release Workflows**: `commit` creates source commits; `release` owns versioning, tags, and artifact publishing
|
|
93
93
|
|
|
94
|
-
###
|
|
94
|
+
### Commit/Release Workflow Refactor (Latest)
|
|
95
95
|
|
|
96
|
-
The commit module
|
|
96
|
+
The commit module no longer bumps versions, creates tags, or publishes packages. Release work now belongs to `gitzone release`:
|
|
97
97
|
|
|
98
98
|
**Changes:**
|
|
99
99
|
|
|
100
|
-
-
|
|
101
|
-
-
|
|
102
|
-
-
|
|
103
|
-
-
|
|
104
|
-
-
|
|
105
|
-
-
|
|
100
|
+
- `gitzone commit` analyzes changes, updates `changelog.md` `Pending`, commits, and optionally pushes.
|
|
101
|
+
- `gitzone release` reads `Pending`, bumps versions, moves changelog entries into a version section, tags, pushes, and publishes configured artifacts.
|
|
102
|
+
- Commit workflow steps are configured in `.smartconfig.json` under `@git.zone/cli.commit.steps`.
|
|
103
|
+
- Smartconfig schema versioning lives at `@git.zone/cli.schemaVersion`; run `gitzone config migrate <version>` for targeted migrations.
|
|
104
|
+
- Release publishing is target-based under `@git.zone/cli.release.targets`.
|
|
105
|
+
- NPM registries only live under `@git.zone/cli.release.targets.npm.registries`.
|
|
106
106
|
|
|
107
107
|
**Benefits:**
|
|
108
108
|
|
|
109
|
-
-
|
|
110
|
-
-
|
|
111
|
-
-
|
|
112
|
-
- Same code path for all project types
|
|
113
|
-
- Reuses existing `calculateNewVersion()` function
|
|
109
|
+
- Commit is safer and has no publishing side effects.
|
|
110
|
+
- Multiple source commits can accumulate into one release via `Pending`.
|
|
111
|
+
- Per-artifact release results can distinguish published, already-published, skipped, and failed targets.
|
|
114
112
|
|
|
115
113
|
### Auto-Accept Flag for Commits
|
|
116
114
|
|
|
@@ -219,7 +217,7 @@ gitzone format --detailed
|
|
|
219
217
|
# Inspect config for agents and scripts
|
|
220
218
|
gitzone config show --json
|
|
221
219
|
gitzone config set cli.output json
|
|
222
|
-
gitzone config get release.accessLevel
|
|
220
|
+
gitzone config get release.targets.npm.accessLevel
|
|
223
221
|
```
|
|
224
222
|
|
|
225
223
|
## Common Issues (Now Resolved)
|
|
@@ -291,7 +289,7 @@ All sync methods must become async. Functions that were previously synchronous (
|
|
|
291
289
|
**Affected Modules:**
|
|
292
290
|
|
|
293
291
|
- ts/mod_format/\* (largest area - 15+ files)
|
|
294
|
-
- ts/mod_commit/\* (
|
|
292
|
+
- ts/mod_commit/\* and ts/mod_release/\* (commit/release workflows)
|
|
295
293
|
- ts/mod_services/\* (configuration management)
|
|
296
294
|
- ts/mod_meta/\* (meta repository management)
|
|
297
295
|
- ts/mod_standard/\* (template listing)
|