@afoures/auto-release 0.1.2 → 0.2.0

package/dist/lib/commands/init.mjs

@@ -1,6 +1,5 @@
 import { create_command } from "../cli.mjs";
 import { exec } from "../utils/exec.mjs";
-import { name } from "../../package.mjs";
 import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
 import { basename, dirname, join } from "node:path";
 import { constants } from "node:fs";
@@ -8,48 +7,58 @@ import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 
 //#region src/lib/commands/init.ts
 function generate_config_source(options) {
-	const { apps, changes_dir, release_branch_prefix, git } = options;
-	const imports = ["import { define_config } from \"auto-release\";"];
-	if (apps.some((app) => app.versioning === "semver")) imports.push("import { semver } from \"auto-release/versioning/semver\";");
-	if (apps.some((app) => app.versioning === "calver")) imports.push("import { calver } from \"auto-release/versioning/calver\";");
-	if (git.platform === "github") imports.push("import { github } from \"auto-release/git/github\";");
-	else imports.push("import { gitlab } from \"auto-release/git/gitlab\";");
+	const { apps, changes_dir, target_branch, default_release_branch_prefix, git } = options;
+	const imports = ["import { define_config } from \"@afoures/auto-release\";"];
+	const component_types = /* @__PURE__ */ new Set();
+	for (const app of apps) for (const component of app.components) component_types.add(component.type);
+	if (component_types.size > 0) {
+		const components = Array.from(component_types).sort();
+		imports.push(`import { ${components.join(", ")} } from "@afoures/auto-release/components";`);
+	}
+	const versioning_types = /* @__PURE__ */ new Set();
+	for (const app of apps) versioning_types.add(app.versioning);
+	if (versioning_types.size > 0) {
+		const versioning = Array.from(versioning_types).sort();
+		imports.push(`import { ${versioning.join(", ")} } from "@afoures/auto-release/versioning";`);
+	}
+	if (git.platform === "github") imports.push("import { github } from \"@afoures/auto-release/platforms\";");
+	else imports.push("import { gitlab } from \"@afoures/auto-release/platforms\";");
 	const lines = [
 		...imports,
 		"",
 		"export default define_config({"
 	];
-	lines.push(`  changes_dir: ${JSON.stringify(changes_dir)},`);
-	lines.push(`  release_branch_prefix: ${JSON.stringify(release_branch_prefix)},`);
-	lines.push("  apps: [");
+	if (changes_dir !== ".changes") lines.push(`  changes_dir: ${JSON.stringify(changes_dir)},`);
+	lines.push("  apps: {");
 	apps.forEach((app, index) => {
-		lines.push("    {");
-		lines.push(`      name: ${JSON.stringify(app.name)},`);
-		lines.push("      packages: [");
-		app.packages.forEach((pkg) => {
-			lines.push(`        ${JSON.stringify(pkg)},`);
+		lines.push(`    ${JSON.stringify(app.name)}: {`);
+		lines.push("      components: [");
+		app.components.forEach((component) => {
+			lines.push(`        ${component.type}(${JSON.stringify(component.path)}),`);
 		});
 		lines.push("      ],");
-		lines.push(`      versioning: ${app.versioning === "semver" ? "semver()" : "calver()"},`);
-		lines.push("      changelog: {");
-		lines.push(`        path: ${JSON.stringify(app.changelog_path)},`);
-		lines.push("      },");
-		lines.push(index === apps.length - 1 ? "    }" : "    },");
+		lines.push(`      versioning: ${app.versioning}(),`);
+		lines.push(`      changelog: ${JSON.stringify(app.changelog_path)},`);
+		lines.push(index === apps.length - 1 ? "    }," : "    },");
 	});
-	lines.push("  ],");
+	lines.push("  },");
+	lines.push("  git: {");
 	if (git.platform === "github") {
-		lines.push("  git: github({");
-		lines.push(`    token: process.env.${git.token_env}!,`);
-		lines.push(`    owner: ${JSON.stringify(git.owner)},`);
-		lines.push(`    repo: ${JSON.stringify(git.repo)},`);
-		lines.push("  }),");
+		lines.push("    platform: github({");
+		lines.push(`      token: process.env.${git.token_env}!,`);
+		lines.push(`      owner: ${JSON.stringify(git.owner)},`);
+		lines.push(`      repo: ${JSON.stringify(git.repo)},`);
+		lines.push("    }),");
 	} else {
-		lines.push("  git: gitlab({");
-		lines.push(`    token: process.env.${git.token_env}!,`);
-		lines.push(`    project_id: ${JSON.stringify(git.project_id)},`);
-		if (git.host) lines.push(`    host: ${JSON.stringify(git.host)},`);
-		lines.push("  }),");
+		lines.push("    platform: gitlab({");
+		lines.push(`      token: process.env.${git.token_env}!,`);
+		lines.push(`      project_id: ${JSON.stringify(git.project_id)},`);
+		if (git.host) lines.push(`      host: ${JSON.stringify(git.host)},`);
+		lines.push("    }),");
 	}
+	if (target_branch !== "main") lines.push(`    target_branch: ${JSON.stringify(target_branch)},`);
+	if (default_release_branch_prefix !== "release") lines.push(`    default_release_branch_prefix: ${JSON.stringify(default_release_branch_prefix)},`);
+	lines.push("  },");
 	lines.push("});", "");
 	return lines.join("\n");
 }
@@ -79,10 +88,10 @@ async function detect_package_manager(cwd, package_json) {
 }
 function get_install_command(package_manager) {
 	switch (package_manager) {
-		case "pnpm": return `pnpm add -D ${name}`;
-		case "yarn": return `yarn add -D ${name}`;
-		case "bun": return `bun add -d ${name}`;
-		default: return `npm install --save-dev ${name}`;
+		case "pnpm": return "pnpm add -D @afoures/auto-release";
+		case "yarn": return "yarn add -D @afoures/auto-release";
+		case "bun": return "bun add -d @afoures/auto-release";
+		default: return "npm install --save-dev @afoures/auto-release";
 	}
 }
 async function ensure_package_json(path) {
@@ -155,7 +164,7 @@ const init = create_command({
 				package_manager = selection;
 			}
 			if (!package_manager) throw new Error("Package manager selection failed");
-			if (!(Boolean(package_json.dependencies?.["auto-release"]) || Boolean(package_json.devDependencies?.["auto-release"]))) {
+			if (!(Boolean(package_json.dependencies?.["@afoures/auto-release"]) || Boolean(package_json.devDependencies?.["@afoures/auto-release"]))) {
 				const install_spinner = spinner();
 				install_spinner.start("Installing auto-release...");
 				try {
@@ -185,7 +194,17 @@ const init = create_command({
 				cancel("Initialization cancelled");
 				return { status: "success" };
 			}
-			const release_branch_prefix = release_prefix_input.trim();
+			const default_release_branch_prefix = release_prefix_input.trim();
+			const target_branch_input = await text({
+				message: "Target branch (main branch for PRs)",
+				initialValue: "main",
+				validate: (value = "") => value.trim().length === 0 ? "Target branch cannot be empty" : void 0
+			});
+			if (isCancel(target_branch_input)) {
+				cancel("Initialization cancelled");
+				return { status: "success" };
+			}
+			const target_branch = target_branch_input.trim();
 			const app_count_input = await text({
 				message: "How many apps should auto-release manage?",
 				initialValue: "1",
@@ -212,16 +231,63 @@ const init = create_command({
 					return { status: "success" };
 				}
 				const app_name = normalize_app_name(app_name_input);
-				const package_paths_input = await text({
-					message: `Package paths for ${app_name} (comma separated)`,
-					initialValue: app_count === 1 ? "." : `apps/${app_name}`,
-					validate: (value = "") => value.trim().length === 0 ? "At least one package path is required" : void 0
+				const component_count_input = await text({
+					message: `How many components for ${app_name}?`,
+					initialValue: "1",
+					validate: (value = "") => {
+						const parsed = Number.parseInt(value, 10);
+						return Number.isNaN(parsed) || parsed <= 0 ? "Enter a positive number" : void 0;
+					}
 				});
-				if (isCancel(package_paths_input)) {
+				if (isCancel(component_count_input)) {
 					cancel("Initialization cancelled");
 					return { status: "success" };
 				}
-				const package_paths = package_paths_input.split(",").map((path) => path.trim()).filter(Boolean);
+				const component_count = Number.parseInt(component_count_input, 10);
+				const components = [];
+				for (let comp_index = 0; comp_index < component_count; comp_index++) {
+					const component_type_choice = await select({
+						message: `Component #${comp_index + 1} type for ${app_name}`,
+						options: [
+							{
+								value: "node",
+								label: "Node (package.json)"
+							},
+							{
+								value: "bun",
+								label: "Bun (package.json)"
+							},
+							{
+								value: "expo",
+								label: "Expo (package.json + app.json)"
+							},
+							{
+								value: "php",
+								label: "PHP (composer.json)"
+							}
+						]
+					});
+					if (isCancel(component_type_choice)) {
+						cancel("Initialization cancelled");
+						return { status: "success" };
+					}
+					const component_type = component_type_choice;
+					const default_path = app_count === 1 && component_count === 1 ? "." : `apps/${app_name}`;
+					const component_path_input = await text({
+						message: `Component #${comp_index + 1} path for ${app_name}`,
+						initialValue: default_path,
+						validate: (value = "") => value.trim().length === 0 ? "Component path is required" : void 0
+					});
+					if (isCancel(component_path_input)) {
+						cancel("Initialization cancelled");
+						return { status: "success" };
+					}
+					const component_path = component_path_input.trim();
+					components.push({
+						type: component_type,
+						path: component_path
+					});
+				}
 				const changelog_input = await text({
 					message: `Changelog path for ${app_name}`,
 					initialValue: app_count === 1 ? "CHANGELOG.md" : `apps/${app_name}/CHANGELOG.md`,
@@ -235,13 +301,20 @@ const init = create_command({
 				const version_choice = await select({
 					message: `Versioning strategy for ${app_name}`,
 					initialValue: "semver",
-					options: [{
-						value: "semver",
-						label: "Semver (1.2.3)"
-					}, {
-						value: "calver",
-						label: "Calver (YYYY.MM.micro)"
-					}]
+					options: [
+						{
+							value: "semver",
+							label: "Semver (1.2.3) - major, minor, patch"
+						},
+						{
+							value: "calver",
+							label: "Calver (YYYY.MM.micro) - feature, fix"
+						},
+						{
+							value: "markver",
+							label: "Markver (1.0.0) - marketing, feature, fix"
+						}
+					]
 				});
 				if (isCancel(version_choice)) {
 					cancel("Initialization cancelled");
@@ -249,7 +322,7 @@ const init = create_command({
 				}
 				apps.push({
 					name: app_name,
-					packages: package_paths,
+					components,
 					changelog_path,
 					versioning: version_choice
 				});
@@ -353,7 +426,8 @@ const init = create_command({
 			await writeFile(config_path, generate_config_source({
 				apps,
 				changes_dir,
-				release_branch_prefix,
+				target_branch,
+				default_release_branch_prefix,
 				git: git_answers
 			}), "utf-8");
 			await create_changes_directories(context.cwd, changes_dir, apps);
@@ -361,7 +435,7 @@ const init = create_command({
 			log.success("Generated auto-release.config.ts");
 			log.success(`Change files directory: ${changes_dir}`);
 			apps.forEach((app) => {
-				log.success(`App ${app.name} ready with ${app.packages.length} package(s)`);
+				log.success(`App ${app.name} ready with ${app.components.length} component(s)`);
 			});
 			outro("auto-release init complete!");
 			return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afoures/auto-release",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A file based release management tool for monorepos",
   "homepage": "https://github.com/afoures/auto-release#readme",
   "bugs": {

package/dist/package.mjs

@@ -1,5 +0,0 @@
-//#region package.json
-var name = "@afoures/auto-release";
-
-//#endregion
-export { name };