keepchanges 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/cli.mjs

@@ -8,7 +8,7 @@ import { resolve } from "node:path";
 import ansis from "ansis";
 import { x } from "tinyexec";
 //#region package.json
-var version = "1.0.0-beta.2";
+var version = "1.0.0-beta.3";
 //#endregion
 //#region src/git.ts
 async function git(cwd, ...args) {
@@ -95,17 +95,18 @@ const giteaRepository = {
 			accept: "application/json",
 			authorization: `token ${token}`
 		};
-		const commitsByEmail = new Map(commits.flatMap((commit) => commit.authors[0] ? [[commit.authors[0].email, commit]] : []));
-		const loginsByEmail = /* @__PURE__ */ new Map();
-		await Promise.all([...commitsByEmail].map(async ([email, commit]) => {
+		const authorsByEmail = collectRepositoryAuthors(commits);
+		await Promise.all([...authorsByEmail.values()].map(async (info) => {
+			const { author, commit } = info;
+			if (!commit) return;
 			try {
 				const response = await fetch(`${new URL(repository.webUrl).origin}/api/v1/repos/${repository.path}/git/commits/${commit.hash}`, { headers });
 				if (!response.ok) return;
 				const data = await response.json();
-				if (data.author?.login) loginsByEmail.set(email, data.author.login);
+				if (data.author?.login) author.login = data.author.login;
 			} catch {}
 		}));
-		for (const commit of commits) for (const author of commit.authors) author.login = loginsByEmail.get(author.email);
+		for (const commit of commits) for (const author of commit.authors) author.login = authorsByEmail.get(author.email)?.author.login;
 	},
 	async publishRelease(repository, release, token, fetch) {
 		const headers = {
@@ -183,15 +184,15 @@ const githubRepository = {
 			accept: "application/vnd.github.v3+json",
 			authorization: `token ${token}`
 		};
-		const authorsByEmail = new Map(commits.flatMap((commit) => commit.authors).map((author) => [author.email, author]));
-		await Promise.all([...authorsByEmail.values()].map(async (author) => {
+		const authorsByEmail = collectRepositoryAuthors(commits);
+		await Promise.all([...authorsByEmail.values()].map(async (info) => {
+			const { author, commit } = info;
 			try {
 				author.login = (await (await fetch(`https://api.github.com/search/users?q=${encodeURIComponent(`${author.email} type:user in:email`)}`, { headers })).json()).items?.[0]?.login;
-				const commit = commits.find((commit) => commit.authors[0].email === author.email);
 				if (!author.login && commit) author.login = (await (await fetch(`https://api.github.com/repos/${repository.path}/commits/${commit.hash}`, { headers })).json()).author?.login;
 			} catch {}
 		}));
-		for (const commit of commits) for (const author of commit.authors) author.login = authorsByEmail.get(author.email)?.login;
+		for (const commit of commits) for (const author of commit.authors) author.login = authorsByEmail.get(author.email)?.author.login;
 	},
 	async publishRelease(repository, release, token, fetch) {
 		const headers = {
@@ -229,6 +230,15 @@ const githubRepository = {
 };
 //#endregion
 //#region src/repository.ts
+function collectRepositoryAuthors(commits) {
+	const authorsByEmail = /* @__PURE__ */ new Map();
+	for (const commit of commits) commit.authors.forEach((author, index) => {
+		const info = authorsByEmail.get(author.email) ?? { author };
+		if (index === 0 && !info.commit) info.commit = commit;
+		authorsByEmail.set(author.email, info);
+	});
+	return authorsByEmail;
+}
 const repositoryProviders = {
 	github: githubRepository,
 	gitea: giteaRepository

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "keepchanges",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Generate and maintain CHANGELOG.md from Conventional Commits.",
   "author": "edram",
   "license": "MIT",