@git.zone/cli 2.14.3 → 2.15.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 +8 -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 +16 -3
- package/license +2 -2
- package/package.json +20 -30
- package/readme.hints.md +15 -17
- package/readme.md +239 -421
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/gitzone.cli.ts +8 -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 +15 -2
|
@@ -0,0 +1,258 @@
|
|
|
1
|
+
import { getCliConfigValue } from "./helpers.smartconfig.js";
|
|
2
|
+
const commitFlagToStep = {
|
|
3
|
+
f: "format",
|
|
4
|
+
t: "test",
|
|
5
|
+
b: "build",
|
|
6
|
+
p: "push",
|
|
7
|
+
};
|
|
8
|
+
const unique = (items) => {
|
|
9
|
+
const result = [];
|
|
10
|
+
for (const item of items) {
|
|
11
|
+
if (!result.includes(item)) {
|
|
12
|
+
result.push(item);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
return result;
|
|
16
|
+
};
|
|
17
|
+
const normalizeConfirmation = (value, fallback) => {
|
|
18
|
+
if (value === "prompt" || value === "auto" || value === "plan") {
|
|
19
|
+
return value;
|
|
20
|
+
}
|
|
21
|
+
return fallback;
|
|
22
|
+
};
|
|
23
|
+
const normalizeRegistryUrl = (url) => {
|
|
24
|
+
let normalizedUrl = url.trim();
|
|
25
|
+
if (!normalizedUrl.startsWith("http://") && !normalizedUrl.startsWith("https://")) {
|
|
26
|
+
normalizedUrl = `https://${normalizedUrl}`;
|
|
27
|
+
}
|
|
28
|
+
return normalizedUrl.endsWith("/") ? normalizedUrl.slice(0, -1) : normalizedUrl;
|
|
29
|
+
};
|
|
30
|
+
const isDisabled = (argvArg, ...keys) => {
|
|
31
|
+
return keys.some((key) => argvArg[key] === false || argvArg[`no-${key}`] || argvArg[`no${key[0].toUpperCase()}${key.slice(1)}`]);
|
|
32
|
+
};
|
|
33
|
+
const readCliWorkflowConfig = async () => {
|
|
34
|
+
return await getCliConfigValue("", {});
|
|
35
|
+
};
|
|
36
|
+
const getOrderedArgsAfterCommand = (commandName) => {
|
|
37
|
+
const rawArgs = process.argv.slice(2);
|
|
38
|
+
const commandIndex = rawArgs.indexOf(commandName);
|
|
39
|
+
if (commandIndex === -1) {
|
|
40
|
+
return rawArgs;
|
|
41
|
+
}
|
|
42
|
+
return rawArgs.slice(commandIndex + 1);
|
|
43
|
+
};
|
|
44
|
+
const getOrderedShortFlags = (commandName) => {
|
|
45
|
+
const orderedFlags = [];
|
|
46
|
+
for (const arg of getOrderedArgsAfterCommand(commandName)) {
|
|
47
|
+
if (arg === "--") {
|
|
48
|
+
break;
|
|
49
|
+
}
|
|
50
|
+
if (arg.startsWith("--")) {
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
if (arg.startsWith("-") && arg.length > 1) {
|
|
54
|
+
orderedFlags.push(...arg.slice(1).split(""));
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return orderedFlags;
|
|
58
|
+
};
|
|
59
|
+
const hasExplicitCommitWorkflowFlags = (argvArg) => {
|
|
60
|
+
return Boolean(argvArg.f ||
|
|
61
|
+
argvArg.format ||
|
|
62
|
+
argvArg.t ||
|
|
63
|
+
argvArg.test ||
|
|
64
|
+
argvArg.b ||
|
|
65
|
+
argvArg.build ||
|
|
66
|
+
argvArg.p ||
|
|
67
|
+
argvArg.push);
|
|
68
|
+
};
|
|
69
|
+
const normalizeCommitSteps = (rawSteps) => {
|
|
70
|
+
const steps = unique(rawSteps.filter(Boolean));
|
|
71
|
+
const pushRequested = steps.includes("push");
|
|
72
|
+
const prePushSteps = steps.filter((step) => step !== "push");
|
|
73
|
+
if (!prePushSteps.includes("analyze")) {
|
|
74
|
+
prePushSteps.unshift("analyze");
|
|
75
|
+
}
|
|
76
|
+
if (!prePushSteps.includes("changelog")) {
|
|
77
|
+
const commitIndex = prePushSteps.indexOf("commit");
|
|
78
|
+
if (commitIndex === -1) {
|
|
79
|
+
prePushSteps.push("changelog");
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
prePushSteps.splice(commitIndex, 0, "changelog");
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (!prePushSteps.includes("commit")) {
|
|
86
|
+
prePushSteps.push("commit");
|
|
87
|
+
}
|
|
88
|
+
const analyzeIndex = prePushSteps.indexOf("analyze");
|
|
89
|
+
const commitIndex = prePushSteps.indexOf("commit");
|
|
90
|
+
if (analyzeIndex > commitIndex) {
|
|
91
|
+
throw new Error("Commit workflow requires analyze before commit.");
|
|
92
|
+
}
|
|
93
|
+
const changelogIndex = prePushSteps.indexOf("changelog");
|
|
94
|
+
if (changelogIndex === -1 || changelogIndex > commitIndex) {
|
|
95
|
+
throw new Error("Commit workflow requires changelog before commit.");
|
|
96
|
+
}
|
|
97
|
+
return pushRequested ? [...prePushSteps, "push"] : prePushSteps;
|
|
98
|
+
};
|
|
99
|
+
const getTargetOverride = (argvArg) => {
|
|
100
|
+
const validTargets = ["git", "npm", "docker"];
|
|
101
|
+
const rawTargets = argvArg.target || argvArg.targets;
|
|
102
|
+
if (typeof rawTargets === "string") {
|
|
103
|
+
return rawTargets
|
|
104
|
+
.split(",")
|
|
105
|
+
.map((target) => target.trim())
|
|
106
|
+
.filter((target) => validTargets.includes(target));
|
|
107
|
+
}
|
|
108
|
+
const targets = [];
|
|
109
|
+
if (argvArg.git || argvArg.p || argvArg.push)
|
|
110
|
+
targets.push("git");
|
|
111
|
+
if (argvArg.npm)
|
|
112
|
+
targets.push("npm");
|
|
113
|
+
if (argvArg.docker)
|
|
114
|
+
targets.push("docker");
|
|
115
|
+
return targets.length > 0 ? targets : undefined;
|
|
116
|
+
};
|
|
117
|
+
const buildReleasePlan = (options) => {
|
|
118
|
+
const plan = [];
|
|
119
|
+
if (options.requireCleanTree)
|
|
120
|
+
plan.push("preflight.cleanTree");
|
|
121
|
+
if (options.runTests)
|
|
122
|
+
plan.push("preflight.test");
|
|
123
|
+
plan.push("core.version", "core.changelog", "core.commit", "core.tag");
|
|
124
|
+
if (options.runBuild)
|
|
125
|
+
plan.push("core.build");
|
|
126
|
+
for (const target of options.targets) {
|
|
127
|
+
plan.push(`target.${target}`);
|
|
128
|
+
}
|
|
129
|
+
return plan;
|
|
130
|
+
};
|
|
131
|
+
export const resolveCommitWorkflow = async (argvArg) => {
|
|
132
|
+
const cliConfig = await readCliWorkflowConfig();
|
|
133
|
+
const commitConfig = cliConfig.commit || {};
|
|
134
|
+
const releaseFlagRequested = Boolean(argvArg.r || argvArg.release);
|
|
135
|
+
let confirmation = normalizeConfirmation(commitConfig.confirmation, "prompt");
|
|
136
|
+
if (argvArg.plan) {
|
|
137
|
+
confirmation = "plan";
|
|
138
|
+
}
|
|
139
|
+
else if (argvArg.y || argvArg.yes) {
|
|
140
|
+
confirmation = "auto";
|
|
141
|
+
}
|
|
142
|
+
let rawSteps;
|
|
143
|
+
if (hasExplicitCommitWorkflowFlags(argvArg)) {
|
|
144
|
+
const orderedFlags = getOrderedShortFlags("commit");
|
|
145
|
+
rawSteps = ["analyze"];
|
|
146
|
+
for (const shortFlag of orderedFlags) {
|
|
147
|
+
const step = commitFlagToStep[shortFlag];
|
|
148
|
+
if (step) {
|
|
149
|
+
rawSteps.push(step);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
if (argvArg.format && !rawSteps.includes("format"))
|
|
153
|
+
rawSteps.push("format");
|
|
154
|
+
if (argvArg.test && !rawSteps.includes("test"))
|
|
155
|
+
rawSteps.push("test");
|
|
156
|
+
if (argvArg.build && !rawSteps.includes("build"))
|
|
157
|
+
rawSteps.push("build");
|
|
158
|
+
if (argvArg.push && !rawSteps.includes("push"))
|
|
159
|
+
rawSteps.push("push");
|
|
160
|
+
rawSteps.push("changelog");
|
|
161
|
+
rawSteps.push("commit");
|
|
162
|
+
}
|
|
163
|
+
else if (Array.isArray(commitConfig.steps) && commitConfig.steps.length > 0) {
|
|
164
|
+
rawSteps = commitConfig.steps;
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
rawSteps = ["analyze"];
|
|
168
|
+
if (commitConfig.alwaysTest)
|
|
169
|
+
rawSteps.push("test");
|
|
170
|
+
if (commitConfig.alwaysBuild)
|
|
171
|
+
rawSteps.push("build");
|
|
172
|
+
rawSteps.push("changelog");
|
|
173
|
+
rawSteps.push("commit");
|
|
174
|
+
}
|
|
175
|
+
return {
|
|
176
|
+
confirmation,
|
|
177
|
+
steps: normalizeCommitSteps(rawSteps),
|
|
178
|
+
staging: commitConfig.staging || "all",
|
|
179
|
+
testCommand: commitConfig.test?.command || "pnpm test",
|
|
180
|
+
buildCommand: commitConfig.build?.command || "pnpm build",
|
|
181
|
+
changelogFile: "changelog.md",
|
|
182
|
+
changelogSection: "Pending",
|
|
183
|
+
pushRemote: commitConfig.push?.remote || "origin",
|
|
184
|
+
pushFollowTags: commitConfig.push?.followTags || false,
|
|
185
|
+
releaseFlagRequested,
|
|
186
|
+
};
|
|
187
|
+
};
|
|
188
|
+
export const resolveReleaseWorkflow = async (argvArg) => {
|
|
189
|
+
const cliConfig = await readCliWorkflowConfig();
|
|
190
|
+
const releaseConfig = cliConfig.release || {};
|
|
191
|
+
const targetConfig = releaseConfig.targets || {};
|
|
192
|
+
const gitConfig = targetConfig.git || {};
|
|
193
|
+
const npmConfig = targetConfig.npm || {};
|
|
194
|
+
const dockerConfig = targetConfig.docker || {};
|
|
195
|
+
const npmRegistries = (npmConfig.registries || []).map(normalizeRegistryUrl);
|
|
196
|
+
const npmEnabled = npmConfig.enabled ?? npmRegistries.length > 0;
|
|
197
|
+
const gitEnabled = gitConfig.enabled ?? true;
|
|
198
|
+
const dockerEnabled = dockerConfig.enabled ?? false;
|
|
199
|
+
let confirmation = normalizeConfirmation(releaseConfig.confirmation, "prompt");
|
|
200
|
+
if (argvArg.plan) {
|
|
201
|
+
confirmation = "plan";
|
|
202
|
+
}
|
|
203
|
+
else if (argvArg.y || argvArg.yes) {
|
|
204
|
+
confirmation = "auto";
|
|
205
|
+
}
|
|
206
|
+
let requireCleanTree = releaseConfig.preflight?.requireCleanTree ?? true;
|
|
207
|
+
let runTests = releaseConfig.preflight?.test ?? false;
|
|
208
|
+
let runBuild = releaseConfig.preflight?.build ?? true;
|
|
209
|
+
if (argvArg.t || argvArg.test)
|
|
210
|
+
runTests = true;
|
|
211
|
+
if (argvArg.b || argvArg.build)
|
|
212
|
+
runBuild = true;
|
|
213
|
+
if (isDisabled(argvArg, "test"))
|
|
214
|
+
runTests = false;
|
|
215
|
+
if (isDisabled(argvArg, "build"))
|
|
216
|
+
runBuild = false;
|
|
217
|
+
if (isDisabled(argvArg, "preflight"))
|
|
218
|
+
requireCleanTree = false;
|
|
219
|
+
const configuredTargets = [];
|
|
220
|
+
if (gitEnabled)
|
|
221
|
+
configuredTargets.push("git");
|
|
222
|
+
if (npmEnabled)
|
|
223
|
+
configuredTargets.push("npm");
|
|
224
|
+
if (dockerEnabled)
|
|
225
|
+
configuredTargets.push("docker");
|
|
226
|
+
let targets = getTargetOverride(argvArg) || configuredTargets;
|
|
227
|
+
if (isDisabled(argvArg, "git", "push")) {
|
|
228
|
+
targets = targets.filter((target) => target !== "git");
|
|
229
|
+
}
|
|
230
|
+
if (isDisabled(argvArg, "publish")) {
|
|
231
|
+
targets = targets.filter((target) => target === "git");
|
|
232
|
+
}
|
|
233
|
+
targets = unique(targets);
|
|
234
|
+
return {
|
|
235
|
+
confirmation,
|
|
236
|
+
plan: buildReleasePlan({ requireCleanTree, runTests, runBuild, targets }),
|
|
237
|
+
targets,
|
|
238
|
+
requireCleanTree,
|
|
239
|
+
runTests,
|
|
240
|
+
runBuild,
|
|
241
|
+
testCommand: releaseConfig.preflight?.testCommand || "pnpm test",
|
|
242
|
+
buildCommand: releaseConfig.preflight?.buildCommand || "pnpm build",
|
|
243
|
+
changelogFile: "changelog.md",
|
|
244
|
+
changelogPendingSection: "Pending",
|
|
245
|
+
changelogVersionHeading: "## {{date}} - {{version}}",
|
|
246
|
+
gitEnabled,
|
|
247
|
+
gitRemote: gitConfig.remote || "origin",
|
|
248
|
+
pushBranch: gitConfig.pushBranch ?? true,
|
|
249
|
+
pushTags: gitConfig.pushTags ?? true,
|
|
250
|
+
npmEnabled,
|
|
251
|
+
npmRegistries,
|
|
252
|
+
npmAccessLevel: npmConfig.accessLevel || "public",
|
|
253
|
+
npmAlreadyPublished: npmConfig.alreadyPublished || "success",
|
|
254
|
+
dockerEnabled,
|
|
255
|
+
dockerImages: dockerConfig.images || [],
|
|
256
|
+
};
|
|
257
|
+
};
|
|
258
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.workflow.js","sourceRoot":"","sources":["../ts/helpers.workflow.ts"],"names":[],"mappings":"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"}
|