@git.zone/cli 2.14.2 → 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
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
import * as plugins from "./mod.plugins.js";
|
|
3
3
|
import * as paths from "../paths.js";
|
|
4
4
|
import { logger } from "../gitzone.logging.js";
|
|
5
|
-
import * as helpers from "./mod.helpers.js";
|
|
6
5
|
import * as ui from "./mod.ui.js";
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
6
|
+
import { getCliMode, printJson, runWithSuppressedOutput } from "../helpers.climode.js";
|
|
7
|
+
import { appendPendingChangelogEntry } from "../helpers.changelog.js";
|
|
8
|
+
import { resolveCommitWorkflow } from "../helpers.workflow.js";
|
|
9
9
|
export const run = async (argvArg) => {
|
|
10
10
|
const mode = await getCliMode(argvArg);
|
|
11
11
|
const subcommand = argvArg._?.[1];
|
|
@@ -24,294 +24,189 @@ export const run = async (argvArg) => {
|
|
|
24
24
|
});
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const commitConfig = gitzoneConfig.commit || {};
|
|
31
|
-
// Check flags and merge with config options
|
|
32
|
-
const wantsRelease = !!(argvArg.r || argvArg.release);
|
|
33
|
-
const wantsTest = !!(argvArg.t || argvArg.test || commitConfig.alwaysTest);
|
|
34
|
-
const wantsBuild = !!(argvArg.b || argvArg.build || commitConfig.alwaysBuild);
|
|
35
|
-
let releaseConfig = null;
|
|
36
|
-
if (wantsRelease) {
|
|
37
|
-
releaseConfig = await ReleaseConfig.fromCwd();
|
|
38
|
-
if (!releaseConfig.hasRegistries()) {
|
|
39
|
-
logger.log("error", "No release registries configured.");
|
|
40
|
-
console.log("");
|
|
41
|
-
console.log(" Run `gitzone config add <registry-url>` to add registries.");
|
|
42
|
-
console.log("");
|
|
43
|
-
process.exit(1);
|
|
44
|
-
}
|
|
27
|
+
const workflow = await resolveCommitWorkflow(argvArg);
|
|
28
|
+
if (workflow.releaseFlagRequested) {
|
|
29
|
+
logger.log("warn", "`gitzone commit -r` is deprecated and no longer releases. Use `gitzone release` after committing.");
|
|
45
30
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
push: !!(argvArg.p || argvArg.push),
|
|
50
|
-
test: wantsTest,
|
|
51
|
-
build: wantsBuild,
|
|
52
|
-
release: wantsRelease,
|
|
53
|
-
format: !!argvArg.format,
|
|
54
|
-
registries: releaseConfig?.getRegistries(),
|
|
55
|
-
});
|
|
56
|
-
if (argvArg.format) {
|
|
57
|
-
const formatMod = await import("../mod_format/index.js");
|
|
58
|
-
await formatMod.run();
|
|
31
|
+
printCommitExecutionPlan(workflow);
|
|
32
|
+
if (workflow.confirmation === "plan") {
|
|
33
|
+
return;
|
|
59
34
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
35
|
+
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
36
|
+
executor: "bash",
|
|
37
|
+
sourceFilePaths: [],
|
|
38
|
+
});
|
|
39
|
+
let nextCommitObject;
|
|
40
|
+
let answerBucket;
|
|
41
|
+
for (const step of workflow.steps) {
|
|
42
|
+
switch (step) {
|
|
43
|
+
case "format":
|
|
44
|
+
await runFormatStep();
|
|
45
|
+
break;
|
|
46
|
+
case "test":
|
|
47
|
+
await runCommandStep(smartshellInstance, "Running tests", workflow.testCommand);
|
|
48
|
+
break;
|
|
49
|
+
case "build":
|
|
50
|
+
await runCommandStep(smartshellInstance, "Running build", workflow.buildCommand);
|
|
51
|
+
break;
|
|
52
|
+
case "analyze":
|
|
53
|
+
nextCommitObject = await runAnalyzeStep();
|
|
54
|
+
answerBucket = await buildAnswerBucket(nextCommitObject, workflow, mode, argvArg);
|
|
55
|
+
break;
|
|
56
|
+
case "changelog":
|
|
57
|
+
assertAnalysisComplete(answerBucket, nextCommitObject);
|
|
58
|
+
await runChangelogStep(workflow, answerBucket, nextCommitObject);
|
|
59
|
+
break;
|
|
60
|
+
case "commit":
|
|
61
|
+
assertAnalysisComplete(answerBucket, nextCommitObject);
|
|
62
|
+
await runCommitStep(smartshellInstance, answerBucket);
|
|
63
|
+
break;
|
|
64
|
+
case "push":
|
|
65
|
+
await runPushStep(smartshellInstance, workflow);
|
|
66
|
+
break;
|
|
71
67
|
}
|
|
72
|
-
logger.log("success", "All tests passed.");
|
|
73
68
|
}
|
|
74
|
-
|
|
69
|
+
const commitShaResult = await smartshellInstance.exec("git rev-parse --short HEAD");
|
|
70
|
+
const currentBranch = await detectCurrentBranch(smartshellInstance);
|
|
71
|
+
ui.printSummary({
|
|
72
|
+
projectType: "source",
|
|
73
|
+
branch: currentBranch,
|
|
74
|
+
commitType: answerBucket.getAnswerFor("commitType"),
|
|
75
|
+
commitScope: answerBucket.getAnswerFor("commitScope"),
|
|
76
|
+
commitMessage: answerBucket.getAnswerFor("commitDescription"),
|
|
77
|
+
commitSha: commitShaResult.stdout.trim(),
|
|
78
|
+
pushed: workflow.steps.includes("push"),
|
|
79
|
+
});
|
|
80
|
+
};
|
|
81
|
+
async function runFormatStep() {
|
|
82
|
+
ui.printHeader("Formatting project files");
|
|
83
|
+
const formatMod = await import("../mod_format/index.js");
|
|
84
|
+
await formatMod.run({ write: true, yes: true, interactive: false });
|
|
85
|
+
}
|
|
86
|
+
async function runCommandStep(smartshellInstance, label, command) {
|
|
87
|
+
ui.printHeader(label);
|
|
88
|
+
const result = await smartshellInstance.exec(command);
|
|
89
|
+
if (result.exitCode !== 0) {
|
|
90
|
+
logger.log("error", `${label} failed. Aborting commit.`);
|
|
91
|
+
process.exit(1);
|
|
92
|
+
}
|
|
93
|
+
logger.log("success", `${label} passed.`);
|
|
94
|
+
}
|
|
95
|
+
async function runAnalyzeStep() {
|
|
96
|
+
ui.printHeader("Analyzing repository changes");
|
|
75
97
|
const aidoc = new plugins.tsdoc.AiDoc();
|
|
76
98
|
await aidoc.start();
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
99
|
+
try {
|
|
100
|
+
const nextCommitObject = await aidoc.buildNextCommitObject(paths.cwd);
|
|
101
|
+
ui.printRecommendation({
|
|
102
|
+
recommendedNextVersion: nextCommitObject.recommendedNextVersion,
|
|
103
|
+
recommendedNextVersionLevel: nextCommitObject.recommendedNextVersionLevel,
|
|
104
|
+
recommendedNextVersionScope: nextCommitObject.recommendedNextVersionScope,
|
|
105
|
+
recommendedNextVersionMessage: nextCommitObject.recommendedNextVersionMessage,
|
|
106
|
+
});
|
|
107
|
+
return nextCommitObject;
|
|
108
|
+
}
|
|
109
|
+
finally {
|
|
110
|
+
await aidoc.stop();
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
async function buildAnswerBucket(nextCommitObject, workflow, mode, argvArg) {
|
|
88
114
|
const isBreakingChange = nextCommitObject.recommendedNextVersionLevel === "BREAKING CHANGE";
|
|
89
|
-
const canAutoAccept =
|
|
115
|
+
const canAutoAccept = workflow.confirmation === "auto" && !isBreakingChange;
|
|
90
116
|
if (canAutoAccept) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
value: nextCommitObject.recommendedNextVersionLevel,
|
|
117
|
+
logger.log("info", "Auto-accepting AI recommendations");
|
|
118
|
+
return createAnswerBucket({
|
|
119
|
+
commitType: nextCommitObject.recommendedNextVersionLevel,
|
|
120
|
+
commitScope: nextCommitObject.recommendedNextVersionScope,
|
|
121
|
+
commitDescription: nextCommitObject.recommendedNextVersionMessage,
|
|
97
122
|
});
|
|
98
|
-
|
|
123
|
+
}
|
|
124
|
+
if (isBreakingChange && (workflow.confirmation === "auto" || argvArg.y || argvArg.yes)) {
|
|
125
|
+
logger.log("warn", "BREAKING CHANGE detected - manual confirmation required");
|
|
126
|
+
}
|
|
127
|
+
if (!mode.interactive) {
|
|
128
|
+
throw new Error("Commit confirmation requires an interactive terminal. Use `-y` or set commit.confirmation to `auto`.");
|
|
129
|
+
}
|
|
130
|
+
const commitInteract = new plugins.smartinteract.SmartInteract();
|
|
131
|
+
commitInteract.addQuestions([
|
|
132
|
+
{
|
|
133
|
+
type: "list",
|
|
134
|
+
name: "commitType",
|
|
135
|
+
message: "Choose TYPE of the commit:",
|
|
136
|
+
choices: ["fix", "feat", "BREAKING CHANGE"],
|
|
137
|
+
default: nextCommitObject.recommendedNextVersionLevel,
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
type: "input",
|
|
99
141
|
name: "commitScope",
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
142
|
+
message: "What is the SCOPE of the commit:",
|
|
143
|
+
default: nextCommitObject.recommendedNextVersionScope,
|
|
144
|
+
},
|
|
145
|
+
{
|
|
146
|
+
type: "input",
|
|
103
147
|
name: "commitDescription",
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
else {
|
|
116
|
-
// Warn if --yes was provided but we're requiring confirmation due to breaking change
|
|
117
|
-
if (isBreakingChange && (argvArg.y || argvArg.yes)) {
|
|
118
|
-
logger.log("warn", "⚠️ BREAKING CHANGE detected - manual confirmation required");
|
|
119
|
-
}
|
|
120
|
-
// Interactive mode: prompt user for input
|
|
121
|
-
const commitInteract = new plugins.smartinteract.SmartInteract();
|
|
122
|
-
commitInteract.addQuestions([
|
|
123
|
-
{
|
|
124
|
-
type: "list",
|
|
125
|
-
name: `commitType`,
|
|
126
|
-
message: `Choose TYPE of the commit:`,
|
|
127
|
-
choices: [`fix`, `feat`, `BREAKING CHANGE`],
|
|
128
|
-
default: nextCommitObject.recommendedNextVersionLevel,
|
|
129
|
-
},
|
|
130
|
-
{
|
|
131
|
-
type: "input",
|
|
132
|
-
name: `commitScope`,
|
|
133
|
-
message: `What is the SCOPE of the commit:`,
|
|
134
|
-
default: nextCommitObject.recommendedNextVersionScope,
|
|
135
|
-
},
|
|
136
|
-
{
|
|
137
|
-
type: `input`,
|
|
138
|
-
name: `commitDescription`,
|
|
139
|
-
message: `What is the DESCRIPTION of the commit?`,
|
|
140
|
-
default: nextCommitObject.recommendedNextVersionMessage,
|
|
141
|
-
},
|
|
142
|
-
{
|
|
143
|
-
type: "confirm",
|
|
144
|
-
name: `pushToOrigin`,
|
|
145
|
-
message: `Do you want to push this version now?`,
|
|
146
|
-
default: true,
|
|
147
|
-
},
|
|
148
|
-
{
|
|
149
|
-
type: "confirm",
|
|
150
|
-
name: `createRelease`,
|
|
151
|
-
message: `Do you want to publish to npm registries?`,
|
|
152
|
-
default: wantsRelease,
|
|
153
|
-
},
|
|
154
|
-
]);
|
|
155
|
-
answerBucket = await commitInteract.runQueue();
|
|
148
|
+
message: "What is the DESCRIPTION of the commit?",
|
|
149
|
+
default: nextCommitObject.recommendedNextVersionMessage,
|
|
150
|
+
},
|
|
151
|
+
]);
|
|
152
|
+
return await commitInteract.runQueue();
|
|
153
|
+
}
|
|
154
|
+
function createAnswerBucket(answers) {
|
|
155
|
+
const answerBucket = new plugins.smartinteract.AnswerBucket();
|
|
156
|
+
for (const [name, value] of Object.entries(answers)) {
|
|
157
|
+
answerBucket.addAnswer({ name, value });
|
|
156
158
|
}
|
|
159
|
+
return answerBucket;
|
|
160
|
+
}
|
|
161
|
+
async function runChangelogStep(workflow, answerBucket, nextCommitObject) {
|
|
162
|
+
await appendPendingChangelogEntry(plugins.path.join(paths.cwd, workflow.changelogFile), workflow.changelogSection, {
|
|
163
|
+
type: answerBucket.getAnswerFor("commitType"),
|
|
164
|
+
scope: answerBucket.getAnswerFor("commitScope"),
|
|
165
|
+
message: answerBucket.getAnswerFor("commitDescription"),
|
|
166
|
+
details: nextCommitObject.recommendedNextVersionDetails || [],
|
|
167
|
+
});
|
|
168
|
+
logger.log("success", `Updated ${workflow.changelogFile} pending section.`);
|
|
169
|
+
}
|
|
170
|
+
async function runCommitStep(smartshellInstance, answerBucket) {
|
|
171
|
+
ui.printHeader("Creating Semantic Commit");
|
|
157
172
|
const commitString = createCommitStringFromAnswerBucket(answerBucket);
|
|
158
|
-
const commitType = answerBucket.getAnswerFor("commitType");
|
|
159
|
-
let commitVersionType;
|
|
160
|
-
switch (commitType) {
|
|
161
|
-
case "fix":
|
|
162
|
-
commitVersionType = "patch";
|
|
163
|
-
break;
|
|
164
|
-
case "feat":
|
|
165
|
-
commitVersionType = "minor";
|
|
166
|
-
break;
|
|
167
|
-
case "BREAKING CHANGE":
|
|
168
|
-
commitVersionType = "major";
|
|
169
|
-
break;
|
|
170
|
-
default:
|
|
171
|
-
throw new Error(`Unsupported commit type: ${commitType}`);
|
|
172
|
-
}
|
|
173
|
-
ui.printHeader("✨ Creating Semantic Commit");
|
|
174
173
|
ui.printCommitMessage(commitString);
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
if (answerBucket.getAnswerFor("createRelease") && !releaseConfig) {
|
|
181
|
-
releaseConfig = await ReleaseConfig.fromCwd();
|
|
182
|
-
if (!releaseConfig.hasRegistries()) {
|
|
183
|
-
logger.log("error", "No release registries configured.");
|
|
184
|
-
console.log("");
|
|
185
|
-
console.log(" Run `gitzone config add <registry-url>` to add registries.");
|
|
186
|
-
console.log("");
|
|
187
|
-
process.exit(1);
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
// Determine total steps based on options
|
|
191
|
-
// Note: test runs early (like format) so not counted in numbered steps
|
|
192
|
-
const willPush = answerBucket.getAnswerFor("pushToOrigin") && !(process.env.CI === "true");
|
|
193
|
-
const willRelease = answerBucket.getAnswerFor("createRelease") &&
|
|
194
|
-
releaseConfig?.hasRegistries();
|
|
195
|
-
let totalSteps = 5; // Base steps: commitinfo, changelog, staging, commit, version
|
|
196
|
-
if (wantsBuild)
|
|
197
|
-
totalSteps += 2; // build step + verification step
|
|
198
|
-
if (willPush)
|
|
199
|
-
totalSteps++;
|
|
200
|
-
if (willRelease)
|
|
201
|
-
totalSteps++;
|
|
202
|
-
let currentStep = 0;
|
|
203
|
-
// Step 1: Baking commitinfo
|
|
204
|
-
currentStep++;
|
|
205
|
-
ui.printStep(currentStep, totalSteps, "🔧 Baking commit info into code", "in-progress");
|
|
206
|
-
const commitInfo = new plugins.commitinfo.CommitInfo(paths.cwd, commitVersionType);
|
|
207
|
-
await commitInfo.writeIntoPotentialDirs();
|
|
208
|
-
ui.printStep(currentStep, totalSteps, "🔧 Baking commit info into code", "done");
|
|
209
|
-
// Step 2: Writing changelog
|
|
210
|
-
currentStep++;
|
|
211
|
-
ui.printStep(currentStep, totalSteps, "📄 Generating changelog.md", "in-progress");
|
|
212
|
-
let changelog = nextCommitObject.changelog || "# Changelog\n";
|
|
213
|
-
changelog = changelog.replaceAll("{{nextVersion}}", (await commitInfo.getNextPlannedVersion()).versionString);
|
|
214
|
-
changelog = changelog.replaceAll("{{nextVersionScope}}", `${await answerBucket.getAnswerFor("commitType")}(${await answerBucket.getAnswerFor("commitScope")})`);
|
|
215
|
-
changelog = changelog.replaceAll("{{nextVersionMessage}}", nextCommitObject.recommendedNextVersionMessage);
|
|
216
|
-
if (nextCommitObject.recommendedNextVersionDetails?.length > 0) {
|
|
217
|
-
changelog = changelog.replaceAll("{{nextVersionDetails}}", "- " + nextCommitObject.recommendedNextVersionDetails.join("\n- "));
|
|
174
|
+
await smartshellInstance.exec("git add -A");
|
|
175
|
+
const result = await smartshellInstance.exec(`git commit -m ${shellQuote(commitString)}`);
|
|
176
|
+
if (result.exitCode !== 0) {
|
|
177
|
+
logger.log("error", "git commit failed.");
|
|
178
|
+
process.exit(1);
|
|
218
179
|
}
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
.
|
|
226
|
-
|
|
227
|
-
// Step 3: Staging files
|
|
228
|
-
currentStep++;
|
|
229
|
-
ui.printStep(currentStep, totalSteps, "📦 Staging files", "in-progress");
|
|
230
|
-
await smartshellInstance.exec(`git add -A`);
|
|
231
|
-
ui.printStep(currentStep, totalSteps, "📦 Staging files", "done");
|
|
232
|
-
// Step 4: Creating commit
|
|
233
|
-
currentStep++;
|
|
234
|
-
ui.printStep(currentStep, totalSteps, "💾 Creating git commit", "in-progress");
|
|
235
|
-
await smartshellInstance.exec(`git commit -m "${commitString}"`);
|
|
236
|
-
ui.printStep(currentStep, totalSteps, "💾 Creating git commit", "done");
|
|
237
|
-
// Step 5: Bumping version
|
|
238
|
-
currentStep++;
|
|
239
|
-
const projectType = await helpers.detectProjectType();
|
|
240
|
-
const newVersion = await helpers.bumpProjectVersion(projectType, commitVersionType, currentStep, totalSteps);
|
|
241
|
-
// Step 6: Run build (optional)
|
|
242
|
-
if (wantsBuild) {
|
|
243
|
-
currentStep++;
|
|
244
|
-
ui.printStep(currentStep, totalSteps, "🔨 Running build", "in-progress");
|
|
245
|
-
const buildResult = await smartshellInstance.exec("pnpm build");
|
|
246
|
-
if (buildResult.exitCode !== 0) {
|
|
247
|
-
ui.printStep(currentStep, totalSteps, "🔨 Running build", "error");
|
|
248
|
-
logger.log("error", "Build failed. Aborting release.");
|
|
249
|
-
process.exit(1);
|
|
250
|
-
}
|
|
251
|
-
ui.printStep(currentStep, totalSteps, "🔨 Running build", "done");
|
|
252
|
-
// Step 7: Verify no uncommitted changes
|
|
253
|
-
currentStep++;
|
|
254
|
-
ui.printStep(currentStep, totalSteps, "🔍 Verifying clean working tree", "in-progress");
|
|
255
|
-
const statusResult = await smartshellInstance.exec("git status --porcelain");
|
|
256
|
-
if (statusResult.stdout.trim() !== "") {
|
|
257
|
-
ui.printStep(currentStep, totalSteps, "🔍 Verifying clean working tree", "error");
|
|
258
|
-
logger.log("error", "Build produced uncommitted changes. This usually means build output is not gitignored.");
|
|
259
|
-
logger.log("error", "Uncommitted files:");
|
|
260
|
-
console.log(statusResult.stdout);
|
|
261
|
-
logger.log("error", "Aborting release. Please ensure build artifacts are in .gitignore");
|
|
262
|
-
process.exit(1);
|
|
263
|
-
}
|
|
264
|
-
ui.printStep(currentStep, totalSteps, "🔍 Verifying clean working tree", "done");
|
|
265
|
-
}
|
|
266
|
-
// Step: Push to remote (optional)
|
|
267
|
-
const currentBranch = await helpers.detectCurrentBranch();
|
|
268
|
-
if (willPush) {
|
|
269
|
-
currentStep++;
|
|
270
|
-
ui.printStep(currentStep, totalSteps, `🚀 Pushing to origin/${currentBranch}`, "in-progress");
|
|
271
|
-
await smartshellInstance.exec(`git push origin ${currentBranch} --follow-tags`);
|
|
272
|
-
ui.printStep(currentStep, totalSteps, `🚀 Pushing to origin/${currentBranch}`, "done");
|
|
180
|
+
}
|
|
181
|
+
async function runPushStep(smartshellInstance, workflow) {
|
|
182
|
+
const currentBranch = await detectCurrentBranch(smartshellInstance);
|
|
183
|
+
const followTags = workflow.pushFollowTags ? " --follow-tags" : "";
|
|
184
|
+
const result = await smartshellInstance.exec(`git push ${workflow.pushRemote} ${currentBranch}${followTags}`);
|
|
185
|
+
if (result.exitCode !== 0) {
|
|
186
|
+
logger.log("error", "git push failed.");
|
|
187
|
+
process.exit(1);
|
|
273
188
|
}
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
try {
|
|
283
|
-
await smartshellInstance.exec(`npm publish --registry=${registry} --access=${accessLevel}`);
|
|
284
|
-
releasedRegistries.push(registry);
|
|
285
|
-
}
|
|
286
|
-
catch (error) {
|
|
287
|
-
logger.log("error", `Failed to publish to ${registry}: ${error}`);
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
if (releasedRegistries.length === registries.length) {
|
|
291
|
-
ui.printStep(currentStep, totalSteps, `📦 Publishing to ${registries.length} registr${registries.length === 1 ? "y" : "ies"}`, "done");
|
|
292
|
-
}
|
|
293
|
-
else {
|
|
294
|
-
ui.printStep(currentStep, totalSteps, `📦 Publishing to ${registries.length} registr${registries.length === 1 ? "y" : "ies"}`, "error");
|
|
295
|
-
}
|
|
189
|
+
}
|
|
190
|
+
async function detectCurrentBranch(smartshellInstance) {
|
|
191
|
+
const branchResult = await smartshellInstance.exec("git branch --show-current");
|
|
192
|
+
return branchResult.stdout.trim() || "master";
|
|
193
|
+
}
|
|
194
|
+
function assertAnalysisComplete(answerBucket, nextCommitObject) {
|
|
195
|
+
if (!answerBucket || !nextCommitObject) {
|
|
196
|
+
throw new Error("Commit workflow requires analyze before changelog and commit steps.");
|
|
296
197
|
}
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
commitSha: commitSha,
|
|
310
|
-
pushed: willPush,
|
|
311
|
-
released: releasedRegistries.length > 0,
|
|
312
|
-
releasedRegistries: releasedRegistries.length > 0 ? releasedRegistries : undefined,
|
|
313
|
-
});
|
|
314
|
-
};
|
|
198
|
+
}
|
|
199
|
+
function shellQuote(value) {
|
|
200
|
+
return `'${value.replaceAll("'", "'\\''")}'`;
|
|
201
|
+
}
|
|
202
|
+
function printCommitExecutionPlan(workflow) {
|
|
203
|
+
console.log("");
|
|
204
|
+
console.log("gitzone commit - resolved workflow");
|
|
205
|
+
console.log(`confirmation: ${workflow.confirmation}`);
|
|
206
|
+
console.log(`steps: ${workflow.steps.join(" -> ")}`);
|
|
207
|
+
console.log(`changelog: ${workflow.changelogFile}#${workflow.changelogSection}`);
|
|
208
|
+
console.log("");
|
|
209
|
+
}
|
|
315
210
|
async function handleRecommend(mode) {
|
|
316
211
|
const recommendationBuilder = async () => {
|
|
317
212
|
const aidoc = new plugins.tsdoc.AiDoc();
|
|
@@ -349,7 +244,7 @@ export function showHelp(mode) {
|
|
|
349
244
|
printJson({
|
|
350
245
|
command: "commit",
|
|
351
246
|
usage: "gitzone commit [recommend] [options]",
|
|
352
|
-
description: "
|
|
247
|
+
description: "Analyzes changes and creates one semantic source commit.",
|
|
353
248
|
commands: [
|
|
354
249
|
{
|
|
355
250
|
name: "recommend",
|
|
@@ -357,30 +252,19 @@ export function showHelp(mode) {
|
|
|
357
252
|
},
|
|
358
253
|
],
|
|
359
254
|
flags: [
|
|
360
|
-
{ flag: "-y, --yes", description: "Auto-accept AI recommendations" },
|
|
361
|
-
{ flag: "-p, --push", description: "Push to origin after
|
|
362
|
-
{ flag: "-t, --test", description: "Run tests
|
|
363
|
-
{
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
},
|
|
367
|
-
{
|
|
368
|
-
flag: "-r, --release",
|
|
369
|
-
description: "Publish to configured registries after push",
|
|
370
|
-
},
|
|
371
|
-
{
|
|
372
|
-
flag: "--format",
|
|
373
|
-
description: "Run gitzone format before committing",
|
|
374
|
-
},
|
|
375
|
-
{
|
|
376
|
-
flag: "--json",
|
|
377
|
-
description: "Emit JSON for `commit recommend` only",
|
|
378
|
-
},
|
|
255
|
+
{ flag: "-y, --yes", description: "Auto-accept safe AI recommendations" },
|
|
256
|
+
{ flag: "-p, --push", description: "Push to origin after committing" },
|
|
257
|
+
{ flag: "-t, --test", description: "Run tests as part of the commit workflow" },
|
|
258
|
+
{ flag: "-b, --build", description: "Run build as part of the commit workflow" },
|
|
259
|
+
{ flag: "-f, --format", description: "Run gitzone format before committing" },
|
|
260
|
+
{ flag: "--plan", description: "Show resolved workflow without mutating files" },
|
|
261
|
+
{ flag: "--json", description: "Emit JSON for `commit recommend` only" },
|
|
379
262
|
],
|
|
380
263
|
examples: [
|
|
381
264
|
"gitzone commit recommend --json",
|
|
382
265
|
"gitzone commit -y",
|
|
383
|
-
"gitzone commit -
|
|
266
|
+
"gitzone commit -ytbp",
|
|
267
|
+
"gitzone release",
|
|
384
268
|
],
|
|
385
269
|
});
|
|
386
270
|
return;
|
|
@@ -388,22 +272,25 @@ export function showHelp(mode) {
|
|
|
388
272
|
console.log("");
|
|
389
273
|
console.log("Usage: gitzone commit [recommend] [options]");
|
|
390
274
|
console.log("");
|
|
275
|
+
console.log("Creates one semantic source commit. It does not version, tag, or publish.");
|
|
276
|
+
console.log("");
|
|
391
277
|
console.log("Commands:");
|
|
392
278
|
console.log(" recommend Generate a commit recommendation without mutating the repository");
|
|
393
279
|
console.log("");
|
|
394
280
|
console.log("Flags:");
|
|
395
|
-
console.log(" -y, --yes Auto-accept AI recommendations");
|
|
396
|
-
console.log(" -p, --push Push
|
|
397
|
-
console.log(" -t, --test Run tests
|
|
398
|
-
console.log(" -b, --build Run
|
|
399
|
-
console.log(" -
|
|
400
|
-
console.log(" --
|
|
281
|
+
console.log(" -y, --yes Auto-accept safe AI recommendations");
|
|
282
|
+
console.log(" -p, --push Push after commit");
|
|
283
|
+
console.log(" -t, --test Run tests in the configured order");
|
|
284
|
+
console.log(" -b, --build Run build in the configured order");
|
|
285
|
+
console.log(" -f, --format Run gitzone format before committing");
|
|
286
|
+
console.log(" --plan Show resolved workflow without mutating files");
|
|
401
287
|
console.log(" --json Emit JSON for `commit recommend` only");
|
|
402
288
|
console.log("");
|
|
403
289
|
console.log("Examples:");
|
|
404
290
|
console.log(" gitzone commit recommend --json");
|
|
405
291
|
console.log(" gitzone commit -y");
|
|
406
|
-
console.log(" gitzone commit -
|
|
292
|
+
console.log(" gitzone commit -ytbp");
|
|
293
|
+
console.log(" gitzone release");
|
|
407
294
|
console.log("");
|
|
408
295
|
}
|
|
409
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_commit/index.ts"],"names":[],"mappings":"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"}
|
|
296
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_commit/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAgC,MAAM,wBAAwB,CAAC;AAE7F,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE;IACxC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAElC,IAAI,IAAI,CAAC,IAAI,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,OAAO;IACT,CAAC;IAED,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,SAAS,CAAC;YACR,EAAE,EAAE,KAAK;YACT,KAAK,EACH,6GAA6G;SAChH,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,CACR,MAAM,EACN,mGAAmG,CACpG,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,QAAQ,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAC3D,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,EAAE;KACpB,CAAC,CAAC;IAEH,IAAI,gBAAqB,CAAC;IAC1B,IAAI,YAA4D,CAAC;IAEjE,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QAClC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,QAAQ;gBACX,MAAM,aAAa,EAAE,CAAC;gBACtB,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,cAAc,CAAC,kBAAkB,EAAE,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAChF,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,cAAc,CAAC,kBAAkB,EAAE,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;gBACjF,MAAM;YACR,KAAK,SAAS;gBACZ,gBAAgB,GAAG,MAAM,cAAc,EAAE,CAAC;gBAC1C,YAAY,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBAClF,MAAM;YACR,KAAK,WAAW;gBACd,sBAAsB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;gBACvD,MAAM,gBAAgB,CAAC,QAAQ,EAAE,YAAa,EAAE,gBAAgB,CAAC,CAAC;gBAClE,MAAM;YACR,KAAK,QAAQ;gBACX,sBAAsB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;gBACvD,MAAM,aAAa,CAAC,kBAAkB,EAAE,YAAa,CAAC,CAAC;gBACvD,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,WAAW,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;gBAChD,MAAM;QACV,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACpF,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IACpE,EAAE,CAAC,YAAY,CAAC;QACd,WAAW,EAAE,QAAQ;QACrB,MAAM,EAAE,aAAa;QACrB,UAAU,EAAE,YAAa,CAAC,YAAY,CAAC,YAAY,CAAC;QACpD,WAAW,EAAE,YAAa,CAAC,YAAY,CAAC,aAAa,CAAC;QACtD,aAAa,EAAE,YAAa,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAC9D,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE;QACxC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;KACxC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,KAAK,UAAU,aAAa;IAC1B,EAAE,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACzD,MAAM,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,kBAAiD,EACjD,KAAa,EACb,OAAe;IAEf,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACtB,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,2BAA2B,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,KAAK,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,cAAc;IAC3B,EAAE,CAAC,WAAW,CAAC,8BAA8B,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACxC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtE,EAAE,CAAC,mBAAmB,CAAC;YACrB,sBAAsB,EAAE,gBAAgB,CAAC,sBAAsB;YAC/D,2BAA2B,EAAE,gBAAgB,CAAC,2BAA2B;YACzE,2BAA2B,EAAE,gBAAgB,CAAC,2BAA2B;YACzE,6BAA6B,EAAE,gBAAgB,CAAC,6BAA6B;SAC9E,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC;IAC1B,CAAC;YAAS,CAAC;QACT,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,gBAAqB,EACrB,QAAiC,EACjC,IAAc,EACd,OAAY;IAEZ,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,2BAA2B,KAAK,iBAAiB,CAAC;IAC5F,MAAM,aAAa,GAAG,QAAQ,CAAC,YAAY,KAAK,MAAM,IAAI,CAAC,gBAAgB,CAAC;IAE5E,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;QACxD,OAAO,kBAAkB,CAAC;YACxB,UAAU,EAAE,gBAAgB,CAAC,2BAA2B;YACxD,WAAW,EAAE,gBAAgB,CAAC,2BAA2B;YACzD,iBAAiB,EAAE,gBAAgB,CAAC,6BAA6B;SAClE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,gBAAgB,IAAI,CAAC,QAAQ,CAAC,YAAY,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yDAAyD,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,sGAAsG,CAAC,CAAC;IAC1H,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;IACjE,cAAc,CAAC,YAAY,CAAC;QAC1B;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,4BAA4B;YACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC;YAC3C,OAAO,EAAE,gBAAgB,CAAC,2BAA2B;SACtD;QACD;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,kCAAkC;YAC3C,OAAO,EAAE,gBAAgB,CAAC,2BAA2B;SACtD;QACD;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,wCAAwC;YACjD,OAAO,EAAE,gBAAgB,CAAC,6BAA6B;SACxD;KACF,CAAC,CAAC;IACH,OAAO,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,kBAAkB,CAAC,OAI3B;IACC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;IAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,YAAY,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAAiC,EACjC,YAAgD,EAChD,gBAAqB;IAErB,MAAM,2BAA2B,CAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,CAAC,EACpD,QAAQ,CAAC,gBAAgB,EACzB;QACE,IAAI,EAAE,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC;QAC7C,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC;QAC/C,OAAO,EAAE,YAAY,CAAC,YAAY,CAAC,mBAAmB,CAAC;QACvD,OAAO,EAAE,gBAAgB,CAAC,6BAA6B,IAAI,EAAE;KAC9D,CACF,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,QAAQ,CAAC,aAAa,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,kBAAiD,EACjD,YAAgD;IAEhD,EAAE,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;IACtE,EAAE,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC1F,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,kBAAiD,EACjD,QAAiC;IAEjC,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAC1C,YAAY,QAAQ,CAAC,UAAU,IAAI,aAAa,GAAG,UAAU,EAAE,CAChE,CAAC;IACF,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,kBAAiD;IAEjD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAChF,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC;AAChD,CAAC;AAED,SAAS,sBAAsB,CAC7B,YAA4D,EAC5D,gBAAqB;IAErB,IAAI,CAAC,YAAY,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;IACzF,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,SAAS,wBAAwB,CAAC,QAAiC;IACjE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,iBAAiB,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAc;IAC3C,MAAM,qBAAqB,GAAG,KAAK,IAAI,EAAE;QACvC,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtD,CAAC;gBAAS,CAAC;YACT,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI;QAC9B,CAAC,CAAC,MAAM,uBAAuB,CAAC,qBAAqB,CAAC;QACtD,CAAC,CAAC,MAAM,qBAAqB,EAAE,CAAC;IAElC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,SAAS,CAAC,cAAc,CAAC,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,EAAE,CAAC,mBAAmB,CAAC;QACrB,sBAAsB,EAAE,cAAc,CAAC,sBAAsB;QAC7D,2BAA2B,EAAE,cAAc,CAAC,2BAA2B;QACvE,2BAA2B,EAAE,cAAc,CAAC,2BAA2B;QACvE,6BAA6B,EAAE,cAAc,CAAC,6BAA6B;KAC5E,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CACT,qBAAqB,cAAc,CAAC,2BAA2B,IAAI,cAAc,CAAC,2BAA2B,MAAM,cAAc,CAAC,6BAA6B,EAAE,CAClK,CAAC;AACJ,CAAC;AAED,MAAM,kCAAkC,GAAG,CACzC,YAAgD,EAChD,EAAE;IACF,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAC7D,MAAM,iBAAiB,GAAG,YAAY,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACzE,OAAO,GAAG,UAAU,IAAI,WAAW,MAAM,iBAAiB,EAAE,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,IAAe;IACtC,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;QACf,SAAS,CAAC;YACR,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,sCAAsC;YAC7C,WAAW,EAAE,0DAA0D;YACvE,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,WAAW;oBACjB,WAAW,EAAE,kEAAkE;iBAChF;aACF;YACD,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,qCAAqC,EAAE;gBACzE,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,iCAAiC,EAAE;gBACtE,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,0CAA0C,EAAE;gBAC/E,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,0CAA0C,EAAE;gBAChF,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,sCAAsC,EAAE;gBAC7E,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,+CAA+C,EAAE;gBAChF,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uCAAuC,EAAE;aACzE;YACD,QAAQ,EAAE;gBACR,iCAAiC;gBACjC,mBAAmB;gBACnB,sBAAsB;gBACtB,iBAAiB;aAClB;SACF,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC;IACzF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,wFAAwF,CAAC,CAAC;IACtG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtB,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,CAAC;IACnF,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;IAC3E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACnC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}
|