fireflyy 4.0.0-alpha.8 → 4.0.0-dev.fd79cb3

package/assets/firefly.schema.json

@@ -35,6 +35,10 @@
           "default": "",
           "type": "string"
         },
+        "branch": {
+          "description": "Git branch to release from.",
+          "type": "string"
+        },
         "changelogPath": {
           "description": "Changelog file path, relative to project root.",
           "default": "CHANGELOG.md",

package/dist/{filesystem.service-B_dgIoTJ.js → filesystem.service-DdVwnqoa.js}

@@ -1,5 +1,5 @@
 import { c as notFoundErrAsync } from "./result.constructors-C9M1MP3_.js";
-import { n as wrapPromise } from "./result.utilities-oXWCXEvw.js";
+import { n as wrapPromise } from "./result.utilities-B03Jkhlx.js";
 import { t as withDryRun } from "./dry-run-BfYCtldz.js";
 
 //#region src/services/implementations/filesystem.service.ts

package/dist/{git.service-C5zcZ5BB.js → git.service-DarjfyXF.js}

@@ -250,7 +250,7 @@ var DefaultGitService = class {
 		return executeGitCommand(args, {
 			cwd: this.cwd,
 			dryRun: options?.dryRun,
-			verbose: options?.verbose ?? false
+			verbose: options?.verbose ?? true
 		});
 	}
 	isInsideRepository() {
@@ -523,6 +523,58 @@ var DefaultGitService = class {
 		if (options?.followTags) args.push("--follow-tags");
 		return this.git(args).map(() => void 0);
 	}
+	/**
+	* Gets the upstream remote name for the current branch.
+	* @returns The remote name or null if no upstream is configured.
+	*/
+	getUpstreamRemote() {
+		return this.git([
+			"rev-parse",
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			"@{upstream}"
+		]).map((output) => {
+			const upstream = output.trim();
+			const slashIndex = upstream.indexOf("/");
+			if (slashIndex > 0) return upstream.substring(0, slashIndex);
+			return null;
+		}).orElse(() => FireflyOkAsync(null));
+	}
+	/**
+	* Lists all configured remotes.
+	* @returns Array of remote names.
+	*/
+	listRemotes() {
+		return this.git(["remote"]).map((output) => output.split("\n").map((remote) => remote.trim()).filter((remote) => remote.length > 0));
+	}
+	inferRepositoryUrl() {
+		return this.getUpstreamRemote().andThen((upstreamRemote) => {
+			if (upstreamRemote) {
+				logger.verbose(`GitService: Inferring repository URL from upstream remote: ${upstreamRemote}`);
+				return this.getRemoteUrl(upstreamRemote).map((url) => url).orElse(() => this.tryOriginOrFirstRemote());
+			}
+			return this.tryOriginOrFirstRemote();
+		});
+	}
+	/**
+	* Tries to get the repository URL from 'origin' or the first available remote.
+	*/
+	tryOriginOrFirstRemote() {
+		return this.getRemoteUrl("origin").map((url) => {
+			logger.verbose("GitService: Inferring repository URL from origin remote");
+			return url;
+		}).orElse(() => {
+			return this.listRemotes().andThen((remotes) => {
+				if (remotes.length === 0) {
+					logger.verbose("GitService: No remotes configured, cannot infer repository URL");
+					return FireflyOkAsync(null);
+				}
+				const firstRemote = remotes[0];
+				logger.verbose(`GitService: Inferring repository URL from first remote: ${firstRemote}`);
+				return this.getRemoteUrl(firstRemote).map((url) => url).orElse(() => FireflyOkAsync(null));
+			});
+		});
+	}
 };
 /**
 * Creates a git service instance.

package/dist/index.d.ts

@@ -11,6 +11,7 @@ declare const FireflyConfigSchema: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     scope: z.ZodOptional<z.ZodString>;
     base: z.ZodDefault<z.ZodString>;
+    branch: z.ZodOptional<z.ZodString>;
     changelogPath: z.ZodDefault<z.ZodString>;
     bumpStrategy: z.ZodDefault<z.ZodUnion<[z.ZodEnum<{
       auto: "auto";

package/dist/main.js

@@ -71,7 +71,7 @@ const logger = createConsola({
 
 //#endregion
 //#region package.json
-var version = "4.0.0-alpha.8";
+var version = "4.0.0-dev.fd79cb3";
 var description = " CLI orchestrator for automatic semantic versioning, changelog generation, and creating releases. Built for my own use cases.";
 var dependencies = {
 	"c12": "^3.3.2",
@@ -99,7 +99,7 @@ async function main() {
 		description,
 		gitCliffVersion: dependencies["git-cliff"]?.replace("^", "") || "unknown"
 	});
-	const { createFireflyCLI } = await import("./program-CASpr1JR.js");
+	const { createFireflyCLI } = await import("./program-DSPj4l5A.js");
 	createFireflyCLI().parseAsync(process.argv).catch((error) => {
 		logger.error("Fatal error:", error);
 		process.exit(1);

package/dist/{program-CASpr1JR.js → program-DSPj4l5A.js}

@@ -1,6 +1,6 @@
 import { n as RuntimeEnv, t as logger } from "./main.js";
 import { _ as validationError, a as conflictErrAsync, c as notFoundErrAsync, d as validationErrAsync, f as conflictError, h as notFoundError, i as FireflyOkAsync, l as timeoutErrAsync, m as failedError, n as FireflyErrAsync, r as FireflyOk, s as invalidErr, t as FireflyErr, u as validationErr, v as wrapErrorMessage } from "./result.constructors-C9M1MP3_.js";
-import { i as zipAsync, n as wrapPromise, r as zip3Async, t as ensureNotAsync } from "./result.utilities-oXWCXEvw.js";
+import { n as wrapPromise, r as zip3Async, t as ensureNotAsync } from "./result.utilities-B03Jkhlx.js";
 import { n as parseSchema, t as formatZodErrors } from "./schema.utilities-BGd9t1wm.js";
 import { LogLevels } from "consola";
 import { colors } from "consola/utils";
@@ -1152,17 +1152,28 @@ function extractPreReleaseId(version) {
 }
 /**
 * Hydrates the repository field from git remote URL.
+*
+* Behavior:
+* - If not inside a git repository, resolves to undefined.
+* - If inside a repository, detect the repository URL
+*   using a fall-through strategy (upstream remote → origin → first remote).
+* - Parses the URL and returns "owner/repo" when possible.
 */
 function hydrateRepository(ctx) {
-	return ctx.services.git.isInsideRepository().andThen((isRepo) => {
-		if (!isRepo) return FireflyOkAsync(void 0);
-		return ctx.services.git.getRemoteUrl().map((url) => {
-			const parsed = parseGitRemoteUrl(url);
-			if (parsed) return `${parsed.owner}/${parsed.repo}`;
-			return null;
-		}).orElse(() => FireflyOkAsync(null)).map((val) => val ?? void 0).andTee((repository) => logger.verbose(`PrepareReleaseConfigTask: Prepared repository: ${repository}`));
-	});
+	return ctx.services.git.inferRepositoryUrl().map((url) => {
+		if (!url) return null;
+		const parsed = parseGitRemoteUrl(url);
+		if (parsed) return `${parsed.owner}/${parsed.repo}`;
+		return null;
+	}).map((val) => val ?? void 0).andTee((repository) => logger.verbose(`PrepareReleaseConfigTask: Prepared repository: ${repository}`));
 }
+/**
+* Hydrates name, scope, and preReleaseId from package.json.
+*
+* Behavior:
+* - If package.json does not exist, returns all values as undefined.
+* - If it exists, reads package.json and returns parsed results for name, scope and preReleaseId.
+*/
 function hydrateFromPackageJson(ctx) {
 	return ctx.services.fs.exists("package.json").andThen((exists) => {
 		if (!exists) return FireflyOkAsync({
@@ -1179,6 +1190,14 @@ function hydrateFromPackageJson(ctx) {
 		}));
 	});
 }
+/**
+* Hydrates the `name` field from package.json when not provided in config.
+*
+* Cases:
+* 1. If name is undefined and package.json has no name, returns a validation error.
+* 2. If name is undefined and package.json has a name, extracts the name (stripping scope) and returns it.
+* 3. Otherwise uses provided name.
+*/
 function hydrateNameFromPackageJson(ctx, packageJson) {
 	if (ctx.config.name === void 0 && !packageJson.name) return validationErrAsync({ message: "Could not find a valid name in package.json" });
 	if (ctx.config.name === void 0 && packageJson.name) {
@@ -1189,6 +1208,14 @@ function hydrateNameFromPackageJson(ctx, packageJson) {
 	logger.verbose(`PrepareReleaseConfigTask: Using provided name: "${ctx.config.name}" as it is explicitly set`);
 	return FireflyOkAsync(ctx.config.name);
 }
+/**
+* Hydrates the `scope` field from package.json when not provided in config.
+*
+* Cases:
+* 1. If scope is explicitly provided (key exists and value is not undefined), it is used.
+* 2. If not provided, but package.json has a scoped `name` (e.g., "@scope/name"), the scope will be extracted and returned.
+* 3. Otherwise returns undefined.
+*/
 function hydrateScopeFromPackageJson(ctx, packageJson) {
 	if (Object.hasOwn(ctx.config, "scope") && ctx.config.scope !== void 0) {
 		logger.verbose(`PrepareReleaseConfigTask: Using provided scope: "${ctx.config.scope}" as it is explicitly set`);
@@ -1204,6 +1231,14 @@ function hydrateScopeFromPackageJson(ctx, packageJson) {
 	logger.verbose("PrepareReleaseConfigTask: No scope to prepare from package.json");
 	return FireflyOkAsync(void 0);
 }
+/**
+* Hydrates the `preReleaseId` field from `package.json.version` when not provided.
+*
+* Cases:
+* 1. If preReleaseId is explicitly provided and not an empty string, it is used.
+* 2. If not provided, and `package.json.version` contains a prerelease segment, the prerelease identifier will be extracted and returned.
+* 3. Otherwise the function defaults to "alpha".
+*/
 function hydratePreReleaseIdFromPackageJson(ctx, packageJson) {
 	if (ctx.config.preReleaseId !== void 0 && ctx.config.preReleaseId.trim() !== "") {
 		logger.verbose(`PrepareReleaseConfigTask: Using provided preReleaseId: "${ctx.config.preReleaseId}" as it is explicitly set`);
@@ -1222,6 +1257,29 @@ function hydratePreReleaseIdFromPackageJson(ctx, packageJson) {
 	return FireflyOkAsync("alpha");
 }
 /**
+* Hydrates branch setting from git.
+*
+* Behavior:
+* - If not inside a git repository, resolves to undefined.
+* - If a branch is explicitly provided in the config, validates it against the
+*   current git branch and returns it (otherwise returns a validation error).
+* - If no branch is provided in the config, uses current git branch.
+*/
+function hydrateBranch(ctx) {
+	return ctx.services.git.isInsideRepository().andThen((isRepo) => {
+		if (!isRepo) return FireflyOkAsync(void 0);
+		return ctx.services.git.getCurrentBranch().andThen((currentBranch) => {
+			if (Object.hasOwn(ctx.config, "branch") && ctx.config.branch !== void 0 && ctx.config.branch.trim() !== "") {
+				if (ctx.config.branch !== currentBranch) return validationErrAsync({ message: `Configured branch "${ctx.config.branch}" does not match current git branch "${currentBranch}"` });
+				logger.verbose(`PrepareReleaseConfigTask: Using provided branch: "${ctx.config.branch}" as it is explicitly set`);
+				return FireflyOkAsync(ctx.config.branch);
+			}
+			logger.verbose(`PrepareReleaseConfigTask: Prepared branch from git: ${currentBranch}`);
+			return FireflyOkAsync(currentBranch);
+		});
+	});
+}
+/**
 * Creates the Prepare Release Config Task.
 *
 * This task determines and hydrates configuration settings, by inferring values from the environment.
@@ -1230,15 +1288,17 @@ function hydratePreReleaseIdFromPackageJson(ctx, packageJson) {
 * 1. Detects repository owner/repo from git remote URL
 * 2. Extracts name and scope from package.json
 * 3. Extracts preReleaseId from package.json version
+* 4. Detects current git branch if not provided
 */
 function createPrepareReleaseConfigTask() {
 	return TaskBuilder.create("prepare-release-config").description("Hydrate and prepare the release configuration").execute((ctx) => {
 		const hydrated = {};
-		return zipAsync(hydrateRepository(ctx), hydrateFromPackageJson(ctx)).map(([repository, pkgData]) => {
+		return zip3Async(hydrateRepository(ctx), hydrateFromPackageJson(ctx), hydrateBranch(ctx)).map(([repository, pkgData, branch]) => {
 			if (repository) hydrated.repository = repository;
 			if (pkgData.name) hydrated.name = pkgData.name;
 			if (pkgData.scope) hydrated.scope = pkgData.scope;
 			if (pkgData.preReleaseId) hydrated.preReleaseId = pkgData.preReleaseId;
+			if (branch) hydrated.branch = branch;
 			logger.verbose(`PrepareReleaseConfigTask: Hydrated config: ${JSON.stringify(hydrated)}`);
 			return ctx.fork("hydratedConfig", hydrated);
 		});
@@ -1454,6 +1514,7 @@ const ReleaseConfigSchema = z$1.object({
 	name: z$1.string().optional().describe("Unscoped project name. Auto-detected from package.json."),
 	scope: z$1.string().optional().describe("Org/user scope without '@'. Auto-detected from package.json."),
 	base: z$1.string().default("").describe("Relative path from repository root to project root."),
+	branch: z$1.string().optional().describe("Git branch to release from."),
 	changelogPath: z$1.string().default("CHANGELOG.md").describe("Changelog file path, relative to project root."),
 	bumpStrategy: BumpStrategySchema.describe("\"auto\" (from commits) or \"manual\" (user-specified)."),
 	releaseType: ReleaseTypeSchema.optional().describe("The release type to bump."),
@@ -1525,7 +1586,7 @@ function defineService(definition) {
 */
 const SERVICE_DEFINITIONS = {
 	fs: defineService({ factory: async ({ basePath }) => {
-		const { createFileSystemService } = await import("./filesystem.service-B_dgIoTJ.js");
+		const { createFileSystemService } = await import("./filesystem.service-DdVwnqoa.js");
 		return createFileSystemService(basePath);
 	} }),
 	packageJson: defineService({
@@ -1537,7 +1598,7 @@ const SERVICE_DEFINITIONS = {
 		}
 	}),
 	git: defineService({ factory: async ({ basePath }) => {
-		const { createGitService } = await import("./git.service-C5zcZ5BB.js");
+		const { createGitService } = await import("./git.service-DarjfyXF.js");
 		return createGitService(basePath);
 	} })
 };

package/dist/{result.utilities-oXWCXEvw.js → result.utilities-B03Jkhlx.js}

@@ -18,12 +18,6 @@ function ensureNotAsync(condition, errorOpts) {
 	return condition ? validationErrAsync(errorOpts) : FireflyOkAsync(void 0);
 }
 /**
-* Async version of zip.
-*/
-function zipAsync(resultA, resultB) {
-	return ResultAsync.combine([resultA, resultB]);
-}
-/**
 * Async version of zip3.
 */
 function zip3Async(resultA, resultB, resultC) {
@@ -35,4 +29,4 @@ function zip3Async(resultA, resultB, resultC) {
 }
 
 //#endregion
-export { zipAsync as i, wrapPromise as n, zip3Async as r, ensureNotAsync as t };
+export { wrapPromise as n, zip3Async as r, ensureNotAsync as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fireflyy",
-  "version": "4.0.0-alpha.8",
+  "version": "4.0.0-dev.fd79cb3",
   "description": " CLI orchestrator for automatic semantic versioning, changelog generation, and creating releases. Built for my own use cases.",
   "type": "module",
   "license": "MIT",