@ucdjs/release-scripts 0.1.0-beta.16 → 0.1.0-beta.17

package/dist/index.mjs

@@ -387,22 +387,23 @@ async function getGroupedFilesByCommitSha(workspaceRoot, from, to) {
 //#endregion
 //#region src/core/changelog.ts
 const DEFAULT_CHANGELOG_TEMPLATE = dedent`
-  <% if (it.previousVersion) { %>
+  <% if (it.previousVersion) { -%>
   ## [<%= it.version %>](<%= it.compareUrl %>) (<%= it.date %>)
-  <% } else { %>
+  <% } else { -%>
   ## <%= it.version %> (<%= it.date %>)
   <% } %>
 
   <% it.groups.forEach((group) => { %>
   <% if (group.commits.length > 0) { %>
-  ### <%= group.title %>
 
+  ### <%= group.title %>
   <% group.commits.forEach((commit) => { %>
+
   * <%= commit.line %>
-  <% }) %>
+  <% }); %>
 
   <% } %>
-  <% }) %>
+  <% }); %>
 `;
 async function generateChangelogEntry(options) {
 	const { packageName, version, previousVersion, date, commits, owner, repo, groups, template, githubClient } = options;
@@ -411,16 +412,7 @@ async function generateChangelogEntry(options) {
 		includeNonConventional: false,
 		mergeKeys: Object.fromEntries(groups.map((g) => [g.name, g.types]))
 	});
-	for (const commit of commits) {
-		if (commit.authors.length === 0) continue;
-		commit.resolvedAuthors = await Promise.all(commit.authors.map(async (author) => {
-			const username = await githubClient.resolveAuthorInfo(author.email);
-			return {
-				...author,
-				username
-			};
-		}));
-	}
+	const commitAuthors = await resolveCommitAuthors(commits, githubClient);
 	const templateData = {
 		packageName,
 		version,
@@ -432,27 +424,12 @@ async function generateChangelogEntry(options) {
 		groups: groups.map((group) => {
 			const commitsInGroup = grouped.get(group.name) ?? [];
 			if (commitsInGroup.length > 0) logger.verbose(`Found ${commitsInGroup.length} commits for group "${group.name}".`);
-			const formattedCommits = commitsInGroup.map((commit) => {
-				const commitUrl = `https://github.com/${owner}/${repo}/commit/${commit.hash}`;
-				let line = `${commit.description}`;
-				if (commit.references.length > 0) logger.verbose("Located references in commit", commit.references.length);
-				for (const ref of commit.references) {
-					if (!ref.value) continue;
-					const number = Number.parseInt(ref.value.replace(/^#/, ""), 10);
-					if (Number.isNaN(number)) continue;
-					if (ref.type === "issue") {
-						line += ` ([Issue ${ref.value}](https://github.com/${owner}/${repo}/issues/${number}))`;
-						continue;
-					}
-					line += ` ([PR ${ref.value}](https://github.com/${owner}/${repo}/pull/${number}))`;
-				}
-				line += ` ([${commit.shortHash}](${commitUrl}))`;
-				if (commit.authors.length > 0) {
-					console.log(commit.resolvedAuthors);
-					line += ` (by ${commit.authors.map((a) => a.name).join(", ")})`;
-				}
-				return { line };
-			});
+			const formattedCommits = commitsInGroup.map((commit) => ({ line: formatCommitLine({
+				commit,
+				owner,
+				repo,
+				authors: commitAuthors.get(commit.hash) ?? []
+			}) }));
 			return {
 				name: group.name,
 				title: group.title,
@@ -465,7 +442,7 @@ async function generateChangelogEntry(options) {
 	return eta.renderString(templateToUse, templateData).trim();
 }
 async function updateChangelog(options) {
-	const { version, previousVersion, commits, date, normalizedOptions, workspacePackage } = options;
+	const { version, previousVersion, commits, date, normalizedOptions, workspacePackage, githubClient } = options;
 	const changelogPath = join(workspacePackage.path, "CHANGELOG.md");
 	const changelogRelativePath = relative(normalizedOptions.workspaceRoot, join(workspacePackage.path, "CHANGELOG.md"));
 	const existingContent = await readFileFromGit(normalizedOptions.workspaceRoot, normalizedOptions.branch.default, changelogRelativePath);
@@ -480,7 +457,7 @@ async function updateChangelog(options) {
 		repo: normalizedOptions.repo,
 		groups: normalizedOptions.groups,
 		template: normalizedOptions.changelog?.template,
-		githubClient: options.githubClient
+		githubClient
 	});
 	let updatedContent;
 	if (!existingContent) {
@@ -514,6 +491,52 @@ async function updateChangelog(options) {
 	}
 	await writeFile(changelogPath, updatedContent, "utf-8");
 }
+async function resolveCommitAuthors(commits, githubClient) {
+	const authorsByEmail = /* @__PURE__ */ new Map();
+	const commitAuthors = /* @__PURE__ */ new Map();
+	for (const commit of commits) {
+		const authorsForCommit = [];
+		commit.authors.forEach((author, idx) => {
+			if (!author.email || !author.name) return;
+			if (!authorsByEmail.has(author.email)) authorsByEmail.set(author.email, {
+				commits: [],
+				name: author.name,
+				email: author.email
+			});
+			const info = authorsByEmail.get(author.email);
+			if (idx === 0) info.commits.push(commit.shortHash);
+			authorsForCommit.push(info);
+		});
+		commitAuthors.set(commit.hash, authorsForCommit);
+	}
+	await Promise.all(Array.from(authorsByEmail.values()).map((info) => githubClient.resolveAuthorInfo(info)));
+	return commitAuthors;
+}
+function formatCommitLine({ commit, owner, repo, authors }) {
+	const commitUrl = `https://github.com/${owner}/${repo}/commit/${commit.hash}`;
+	let line = `${commit.description}`;
+	const references = commit.references ?? [];
+	if (references.length > 0) logger.verbose("Located references in commit", references.length);
+	for (const ref of references) {
+		if (!ref.value) continue;
+		const number = Number.parseInt(ref.value.replace(/^#/, ""), 10);
+		if (Number.isNaN(number)) continue;
+		if (ref.type === "issue") {
+			line += ` ([Issue ${ref.value}](https://github.com/${owner}/${repo}/issues/${number}))`;
+			continue;
+		}
+		line += ` ([PR ${ref.value}](https://github.com/${owner}/${repo}/pull/${number}))`;
+	}
+	line += ` ([${commit.shortHash}](${commitUrl}))`;
+	if (authors.length > 0) {
+		const authorList = authors.map((author) => {
+			if (author.login) return `[@${author.login}](https://github.com/${author.login})`;
+			return author.name;
+		}).join(", ");
+		line += ` (by ${authorList})`;
+	}
+	return line;
+}
 function parseChangelog(content) {
 	const lines = content.split("\n");
 	let packageName = null;
@@ -647,11 +670,24 @@ var GitHubClient = class {
 		});
 		logger.info(`Commit status set to ${farver.cyan(state)} for ${farver.gray(sha.substring(0, 7))}`);
 	}
-	async resolveAuthorInfo(email) {
-		const q = encodeURIComponent(`${email} type:user in:email`);
-		const data = await this.request(`/search/users?q=${q}`);
-		if (!data.items || data.items.length === 0) return null;
-		return data.items[0].login;
+	async resolveAuthorInfo(info) {
+		if (info.login) return info;
+		try {
+			const q = encodeURIComponent(`${info.email} type:user in:email`);
+			const data = await this.request(`/search/users?q=${q}`);
+			if (!data.items || data.items.length === 0) return info;
+			info.login = data.items[0].login;
+		} catch (err) {
+			logger.warn(`Failed to resolve author info for email ${info.email}: ${err.message}`);
+		}
+		if (info.login) return info;
+		if (info.commits.length > 0) try {
+			const data = await this.request(`/repos/${this.owner}/${this.repo}/commits/${info.commits[0]}`);
+			if (data.author && data.author.login) info.login = data.author.login;
+		} catch (err) {
+			logger.warn(`Failed to resolve author info from commits for email ${info.email}: ${err.message}`);
+		}
+		return info;
 	}
 };
 function createGitHubClient(options) {
@@ -1396,7 +1432,10 @@ async function normalizeReleaseOptions(options) {
 			title: options.pullRequest?.title ?? "chore: release new version",
 			body: options.pullRequest?.body ?? DEFAULT_PR_BODY_TEMPLATE
 		},
-		changelog: { enabled: options.changelog?.enabled ?? true }
+		changelog: {
+			enabled: options.changelog?.enabled ?? true,
+			template: options.changelog?.template ?? DEFAULT_CHANGELOG_TEMPLATE
+		}
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.16",
+  "version": "0.1.0-beta.17",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",