@git.zone/cli 4.0.0 → 5.0.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 +0 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers.workflow.d.ts +0 -2
- package/dist_ts/helpers.workflow.js +23 -12
- package/dist_ts/mod_commit/mod.helpers.d.ts +3 -3
- package/dist_ts/mod_commit/mod.helpers.js +10 -10
- package/dist_ts/mod_config/index.js +22 -23
- package/dist_ts/mod_release/helpers.releasebranch.d.ts +46 -0
- package/dist_ts/mod_release/helpers.releasebranch.js +579 -0
- package/dist_ts/mod_release/index.d.ts +10 -0
- package/dist_ts/mod_release/index.js +300 -92
- package/package.json +1 -1
- package/readme.md +21 -13
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.workflow.ts +41 -12
- package/ts/mod_commit/mod.helpers.ts +12 -8
- package/ts/mod_config/index.ts +21 -22
- package/ts/mod_release/helpers.releasebranch.ts +1282 -0
- package/ts/mod_release/index.ts +608 -129
package/.smartconfig.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '
|
|
6
|
+
version: '5.0.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
|
|
@@ -54,7 +54,6 @@ export interface IReleaseWorkflowConfig {
|
|
|
54
54
|
source?: "pendingChangelog" | "manual";
|
|
55
55
|
};
|
|
56
56
|
preflight?: {
|
|
57
|
-
requireCleanTree?: boolean;
|
|
58
57
|
test?: boolean;
|
|
59
58
|
build?: boolean;
|
|
60
59
|
testCommand?: string;
|
|
@@ -83,7 +82,6 @@ export interface IResolvedReleaseWorkflow {
|
|
|
83
82
|
confirmation: TConfirmationMode;
|
|
84
83
|
plan: string[];
|
|
85
84
|
targets: TReleaseTarget[];
|
|
86
|
-
requireCleanTree: boolean;
|
|
87
85
|
runTests: boolean;
|
|
88
86
|
runBuild: boolean;
|
|
89
87
|
testCommand: string;
|
|
@@ -49,6 +49,15 @@ export const resolveDockerTestSetting = (valueArg) => {
|
|
|
49
49
|
}
|
|
50
50
|
return valueArg;
|
|
51
51
|
};
|
|
52
|
+
const resolveGitPushSetting = (valueArg, settingArg, gitEnabledArg) => {
|
|
53
|
+
if (!gitEnabledArg) {
|
|
54
|
+
return valueArg === undefined ? true : valueArg === true;
|
|
55
|
+
}
|
|
56
|
+
if (valueArg !== undefined && valueArg !== true) {
|
|
57
|
+
throw new Error(`release.targets.git.${settingArg} must be true when the Git target is enabled`);
|
|
58
|
+
}
|
|
59
|
+
return true;
|
|
60
|
+
};
|
|
52
61
|
const isStringRecord = (valueArg) => {
|
|
53
62
|
return typeof valueArg === "object" && valueArg !== null && !Array.isArray(valueArg);
|
|
54
63
|
};
|
|
@@ -168,12 +177,14 @@ const getTargetOverride = (argvArg) => {
|
|
|
168
177
|
targets.push("docker");
|
|
169
178
|
return targets.length > 0 ? targets : undefined;
|
|
170
179
|
};
|
|
180
|
+
const releaseTargetOrder = ["git", "npm", "docker"];
|
|
171
181
|
const buildReleasePlan = (options) => {
|
|
172
|
-
const plan = [];
|
|
173
|
-
if (options.requireCleanTree)
|
|
174
|
-
plan.push("preflight.cleanTree");
|
|
182
|
+
const plan = ["preflight.branch", "preflight.cleanTree"];
|
|
175
183
|
if (options.runTests)
|
|
176
184
|
plan.push("preflight.test");
|
|
185
|
+
if (options.mergeRequested) {
|
|
186
|
+
plan.push("integration.main", "integration.pushMain");
|
|
187
|
+
}
|
|
177
188
|
plan.push("core.version", "core.changelog", "core.commit", "core.tag");
|
|
178
189
|
if (options.runBuild)
|
|
179
190
|
plan.push("core.build");
|
|
@@ -251,6 +262,8 @@ export const resolveReleaseWorkflow = async (argvArg) => {
|
|
|
251
262
|
const npmEnabled = npmConfig.enabled ?? npmRegistries.length > 0;
|
|
252
263
|
const gitEnabled = gitConfig.enabled ?? true;
|
|
253
264
|
const dockerEnabled = dockerConfig.enabled ?? false;
|
|
265
|
+
const pushBranch = resolveGitPushSetting(gitConfig.pushBranch, "pushBranch", gitEnabled);
|
|
266
|
+
const pushTags = resolveGitPushSetting(gitConfig.pushTags, "pushTags", gitEnabled);
|
|
254
267
|
let confirmation = normalizeConfirmation(releaseConfig.confirmation, "prompt");
|
|
255
268
|
if (argvArg.plan) {
|
|
256
269
|
confirmation = "plan";
|
|
@@ -258,7 +271,6 @@ export const resolveReleaseWorkflow = async (argvArg) => {
|
|
|
258
271
|
else if (argvArg.y || argvArg.yes) {
|
|
259
272
|
confirmation = "auto";
|
|
260
273
|
}
|
|
261
|
-
let requireCleanTree = releaseConfig.preflight?.requireCleanTree ?? true;
|
|
262
274
|
let runTests = releaseConfig.preflight?.test ?? false;
|
|
263
275
|
let runBuild = releaseConfig.preflight?.build ?? true;
|
|
264
276
|
if (argvArg.t || argvArg.test)
|
|
@@ -269,8 +281,6 @@ export const resolveReleaseWorkflow = async (argvArg) => {
|
|
|
269
281
|
runTests = false;
|
|
270
282
|
if (isDisabled(argvArg, "build"))
|
|
271
283
|
runBuild = false;
|
|
272
|
-
if (isDisabled(argvArg, "preflight"))
|
|
273
|
-
requireCleanTree = false;
|
|
274
284
|
const configuredTargets = [];
|
|
275
285
|
if (gitEnabled)
|
|
276
286
|
configuredTargets.push("git");
|
|
@@ -285,12 +295,13 @@ export const resolveReleaseWorkflow = async (argvArg) => {
|
|
|
285
295
|
if (isDisabled(argvArg, "publish")) {
|
|
286
296
|
targets = targets.filter((target) => target === "git");
|
|
287
297
|
}
|
|
288
|
-
|
|
298
|
+
const selectedTargets = unique(targets);
|
|
299
|
+
targets = releaseTargetOrder.filter((target) => selectedTargets.includes(target));
|
|
300
|
+
const mergeRequested = argvArg.merge === true;
|
|
289
301
|
return {
|
|
290
302
|
confirmation,
|
|
291
|
-
plan: buildReleasePlan({
|
|
303
|
+
plan: buildReleasePlan({ mergeRequested, runTests, runBuild, targets }),
|
|
292
304
|
targets,
|
|
293
|
-
requireCleanTree,
|
|
294
305
|
runTests,
|
|
295
306
|
runBuild,
|
|
296
307
|
testCommand: releaseConfig.preflight?.testCommand || "pnpm test",
|
|
@@ -300,8 +311,8 @@ export const resolveReleaseWorkflow = async (argvArg) => {
|
|
|
300
311
|
changelogVersionHeading: "## {{date}} - {{version}}",
|
|
301
312
|
gitEnabled,
|
|
302
313
|
gitRemote: gitConfig.remote || "origin",
|
|
303
|
-
pushBranch
|
|
304
|
-
pushTags
|
|
314
|
+
pushBranch,
|
|
315
|
+
pushTags,
|
|
305
316
|
npmEnabled,
|
|
306
317
|
npmRegistries,
|
|
307
318
|
npmAccessLevel: npmConfig.accessLevel || "public",
|
|
@@ -327,4 +338,4 @@ export const resolveReleaseWorkflow = async (argvArg) => {
|
|
|
327
338
|
dockerNoBuild: dockerConfig.noBuild ?? false,
|
|
328
339
|
};
|
|
329
340
|
};
|
|
330
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.workflow.js","sourceRoot":"","sources":["../../ts/helpers.workflow.ts"],"names":[],"mappings":"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"}
|
|
341
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.workflow.js","sourceRoot":"","sources":["../../ts/helpers.workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare function detectCurrentBranch(): Promise<string>;
|
|
|
9
9
|
* Detects the project type based on presence of package.json and/or deno.json
|
|
10
10
|
* @returns The project type
|
|
11
11
|
*/
|
|
12
|
-
export declare function detectProjectType(): Promise<ProjectType>;
|
|
12
|
+
export declare function detectProjectType(cwdArg?: string): Promise<ProjectType>;
|
|
13
13
|
/**
|
|
14
14
|
* Parses a semantic version string and bumps it according to the version type
|
|
15
15
|
* @param currentVersion Current version string (e.g., "1.2.3")
|
|
@@ -22,7 +22,7 @@ export declare function calculateNewVersion(currentVersion: string, versionType:
|
|
|
22
22
|
* @param projectType The project type to determine which file to read
|
|
23
23
|
* @returns The current version string
|
|
24
24
|
*/
|
|
25
|
-
export declare function readCurrentVersion(projectType: ProjectType): Promise<string>;
|
|
25
|
+
export declare function readCurrentVersion(projectType: ProjectType, cwdArg?: string): Promise<string>;
|
|
26
26
|
/**
|
|
27
27
|
* Updates the version field in a JSON file (package.json or deno.json)
|
|
28
28
|
* @param filePath Path to the JSON file
|
|
@@ -32,7 +32,7 @@ export declare function updateVersionFile(filePath: string, newVersion: string):
|
|
|
32
32
|
/**
|
|
33
33
|
* Updates project version files without creating commits or tags.
|
|
34
34
|
*/
|
|
35
|
-
export declare function updateProjectVersionFiles(projectType: ProjectType, newVersion: string): Promise<string[]>;
|
|
35
|
+
export declare function updateProjectVersionFiles(projectType: ProjectType, newVersion: string, cwdArg?: string): Promise<string[]>;
|
|
36
36
|
/**
|
|
37
37
|
* Bumps the project version based on project type
|
|
38
38
|
* Handles npm-only, deno-only, and dual projects with unified logic
|
|
@@ -31,9 +31,9 @@ export async function detectCurrentBranch() {
|
|
|
31
31
|
* Detects the project type based on presence of package.json and/or deno.json
|
|
32
32
|
* @returns The project type
|
|
33
33
|
*/
|
|
34
|
-
export async function detectProjectType() {
|
|
35
|
-
const packageJsonPath = plugins.path.join(
|
|
36
|
-
const denoJsonPath = plugins.path.join(
|
|
34
|
+
export async function detectProjectType(cwdArg = paths.cwd) {
|
|
35
|
+
const packageJsonPath = plugins.path.join(cwdArg, 'package.json');
|
|
36
|
+
const denoJsonPath = plugins.path.join(cwdArg, 'deno.json');
|
|
37
37
|
const hasPackageJson = await plugins.smartfs.file(packageJsonPath).exists();
|
|
38
38
|
const hasDenoJson = await plugins.smartfs.file(denoJsonPath).exists();
|
|
39
39
|
if (hasPackageJson && hasDenoJson) {
|
|
@@ -85,9 +85,9 @@ export function calculateNewVersion(currentVersion, versionType) {
|
|
|
85
85
|
* @param projectType The project type to determine which file to read
|
|
86
86
|
* @returns The current version string
|
|
87
87
|
*/
|
|
88
|
-
export async function readCurrentVersion(projectType) {
|
|
88
|
+
export async function readCurrentVersion(projectType, cwdArg = paths.cwd) {
|
|
89
89
|
if (projectType === 'npm' || projectType === 'both') {
|
|
90
|
-
const packageJsonPath = plugins.path.join(
|
|
90
|
+
const packageJsonPath = plugins.path.join(cwdArg, 'package.json');
|
|
91
91
|
const content = (await plugins.smartfs
|
|
92
92
|
.file(packageJsonPath)
|
|
93
93
|
.encoding('utf8')
|
|
@@ -99,7 +99,7 @@ export async function readCurrentVersion(projectType) {
|
|
|
99
99
|
return packageJson.version;
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
102
|
-
const denoJsonPath = plugins.path.join(
|
|
102
|
+
const denoJsonPath = plugins.path.join(cwdArg, 'deno.json');
|
|
103
103
|
const content = (await plugins.smartfs
|
|
104
104
|
.file(denoJsonPath)
|
|
105
105
|
.encoding('utf8')
|
|
@@ -131,10 +131,10 @@ export async function updateVersionFile(filePath, newVersion) {
|
|
|
131
131
|
/**
|
|
132
132
|
* Updates project version files without creating commits or tags.
|
|
133
133
|
*/
|
|
134
|
-
export async function updateProjectVersionFiles(projectType, newVersion) {
|
|
134
|
+
export async function updateProjectVersionFiles(projectType, newVersion, cwdArg = paths.cwd) {
|
|
135
135
|
const filesToUpdate = [];
|
|
136
|
-
const packageJsonPath = plugins.path.join(
|
|
137
|
-
const denoJsonPath = plugins.path.join(
|
|
136
|
+
const packageJsonPath = plugins.path.join(cwdArg, 'package.json');
|
|
137
|
+
const denoJsonPath = plugins.path.join(cwdArg, 'deno.json');
|
|
138
138
|
if (projectType === 'npm' || projectType === 'both') {
|
|
139
139
|
await updateVersionFile(packageJsonPath, newVersion);
|
|
140
140
|
filesToUpdate.push('package.json');
|
|
@@ -192,4 +192,4 @@ export async function bumpProjectVersion(projectType, versionType, currentStep,
|
|
|
192
192
|
throw new Error(`Failed to bump project version: ${errorMessage}`);
|
|
193
193
|
}
|
|
194
194
|
}
|
|
195
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mod.helpers.js","sourceRoot":"","sources":["../../../ts/mod_commit/mod.helpers.ts"],"names":[],"mappings":"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"}
|