@varlet/release 2.0.0 → 2.1.0

package/dist/cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { c as release, i as lockfileSyncCheck, p as commitLint, s as publish, u as changelog } from "./src-CkbCVkad.js";
+import { c as release, i as lockfileCheck, p as commitLint, s as publish, u as changelog } from "./src-_TFLfQjD.js";
 import { cli, command } from "cleye";
 //#endregion
 //#region src/cli.ts
 cli({
 	name: "vr",
-	version: "2.0.0",
+	version: "2.1.0",
 	commands: [
 		command({
 			name: "release",
@@ -102,7 +102,7 @@ cli({
 			help: { description: "Lint commit message" }
 		}, (argv) => commitLint(argv.flags)),
 		command({
-			name: "lockfile-sync-check",
+			name: "lockfile-check",
 			flags: {
 				packageManager: {
 					type: String,
@@ -117,7 +117,7 @@ cli({
 				}
 			},
 			help: { description: "Check if lockfile has been updated and optionally install dependencies" }
-		}, (argv) => lockfileSyncCheck(argv.flags))
+		}, (argv) => lockfileCheck(argv.flags))
 	]
 });
 //#endregion

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Commit, Params } from "conventional-changelog";
+import { ConventionalChangelog } from "standard-changelog";
 
 //#region src/release.d.ts
 interface PackageJsonConfig {
@@ -38,20 +38,34 @@ interface ReleaseCommandOptions {
 declare function release(options: ReleaseCommandOptions): Promise<void>;
 //#endregion
 //#region src/changelog.d.ts
-interface ChangelogCommandOptions {
+declare const COMMIT_TYPE_MAP: {
+  readonly feat: "Features";
+  readonly fix: "Bug Fixes";
+  readonly perf: "Performance Improvements";
+  readonly revert: "Reverts";
+  readonly refactor: "Refactoring";
+  readonly docs: "Documentation";
+  readonly style: "Styles";
+  readonly test: "Tests";
+  readonly build: "Build System";
+  readonly ci: "Continuous Integration";
+};
+interface ChangelogOptions {
   cwd?: string;
-  file?: string;
   releaseCount?: number;
-  mainTemplate?: string;
-  transformCommit?: (commit: Commit, params: Params) => Partial<Commit> | Promise<Partial<Commit> | null> | null;
+  file?: string;
+  showTypes?: (keyof typeof COMMIT_TYPE_MAP)[];
+  outputUnreleased?: boolean;
+  writerOpt?: Parameters<ConventionalChangelog["writer"]>[0];
 }
 declare function changelog({
   cwd,
   releaseCount,
   file,
-  mainTemplate,
-  transformCommit
-}?: ChangelogCommandOptions): Promise<void>;
+  showTypes,
+  outputUnreleased,
+  writerOpt
+}?: ChangelogOptions): Promise<void>;
 //#endregion
 //#region src/commitLint.d.ts
 declare const COMMIT_HEADER_RE: RegExp;
@@ -66,15 +80,15 @@ interface CommitLintCommandOptions {
 }
 declare function commitLint(options: CommitLintCommandOptions): void;
 //#endregion
-//#region src/lockfileSyncCheck.d.ts
+//#region src/lockfileCheck.d.ts
 type PackageManager = "npm" | "yarn" | "pnpm";
-interface LockfileSyncCheckOptions {
+interface LockfileCheckOptions {
   packageManager?: PackageManager;
   install?: boolean;
 }
 declare function getLockfilePath(packageManager: PackageManager): string;
 declare function checkLockfileSync(packageManager: PackageManager): Promise<boolean>;
 declare function installDependencies(packageManager: PackageManager): Promise<void>;
-declare function lockfileSyncCheck(options?: LockfileSyncCheckOptions): Promise<void>;
+declare function lockfileCheck(options?: LockfileCheckOptions): Promise<void>;
 //#endregion
-export { COMMIT_HEADER_RE, COMMIT_MESSAGE_RE, ChangelogCommandOptions, CommitLintCommandOptions, LockfileSyncCheckOptions, PackageManager, PublishCommandOptions, ReleaseCommandOptions, changelog, checkLockfileSync, commitLint, getCommitMessage, getLockfilePath, getPackageJsons, installDependencies, isSameVersion, isVersionCommitMessage, lockfileSyncCheck, publish, release, updateVersion };
+export { COMMIT_HEADER_RE, COMMIT_MESSAGE_RE, ChangelogOptions, CommitLintCommandOptions, LockfileCheckOptions, PackageManager, PublishCommandOptions, ReleaseCommandOptions, changelog, checkLockfileSync, commitLint, getCommitMessage, getLockfilePath, getPackageJsons, installDependencies, isSameVersion, isVersionCommitMessage, lockfileCheck, publish, release, updateVersion };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as getPackageJsons, c as release, d as COMMIT_HEADER_RE, f as COMMIT_MESSAGE_RE, h as isVersionCommitMessage, i as lockfileSyncCheck, l as updateVersion, m as getCommitMessage, n as getLockfilePath, o as isSameVersion, p as commitLint, r as installDependencies, s as publish, t as checkLockfileSync, u as changelog } from "./src-CkbCVkad.js";
-export { COMMIT_HEADER_RE, COMMIT_MESSAGE_RE, changelog, checkLockfileSync, commitLint, getCommitMessage, getLockfilePath, getPackageJsons, installDependencies, isSameVersion, isVersionCommitMessage, lockfileSyncCheck, publish, release, updateVersion };
+import { a as getPackageJsons, c as release, d as COMMIT_HEADER_RE, f as COMMIT_MESSAGE_RE, h as isVersionCommitMessage, i as lockfileCheck, l as updateVersion, m as getCommitMessage, n as getLockfilePath, o as isSameVersion, p as commitLint, r as installDependencies, s as publish, t as checkLockfileSync, u as changelog } from "./src-_TFLfQjD.js";
+export { COMMIT_HEADER_RE, COMMIT_MESSAGE_RE, changelog, checkLockfileSync, commitLint, getCommitMessage, getLockfilePath, getPackageJsons, installDependencies, isSameVersion, isVersionCommitMessage, lockfileCheck, publish, release, updateVersion };

package/dist/{src-CkbCVkad.js → src-_TFLfQjD.js}

@@ -5,7 +5,7 @@ import { cancel, confirm, isCancel, select, spinner } from "@clack/prompts";
 import { logger } from "rslog";
 import semver from "semver";
 import { x } from "tinyexec";
-import { ConventionalChangelog } from "conventional-changelog";
+import { StandardChangelog } from "standard-changelog";
 //#region src/commitLint.ts
 const COMMIT_HEADER_RE = /^(revert|fix|feat|docs|perf|test|types|style|build|chore|release|refactor|merge|wip)(?:\(([^)]+)\))?(!)?:\s(.+)$/;
 const COMMIT_MESSAGE_RE = new RegExp(COMMIT_HEADER_RE.source.replace(/\$$/, "") + "(?:\\n[\\s\\S]+)?$");
@@ -76,13 +76,14 @@ const COMMIT_TYPE_MAP = {
 	build: "Build System",
 	ci: "Continuous Integration"
 };
-const ALWAYS_SHOW_TYPES = new Set([
+const ALWAYS_SHOW_TYPES = [
 	"feat",
 	"fix",
 	"perf",
 	"revert",
 	"refactor"
-]);
+];
+const BREAKING_CHANGE_RE = /BREAKING CHANGES?:\s*([\s\S]+)/;
 const MAIN_TEMPLATE = `{{> header}}
 
 {{> footer}}
@@ -111,6 +112,15 @@ function linkify(text, context, issues) {
 	if (context.host) result = result.replace(/\B@([a-z0-9](?:-?[a-z0-9/]){0,38})/g, (_, username) => username.includes("/") ? `@${username}` : `[@${username}](${context.host}/${username})`);
 	return result;
 }
+function extractBreakingText(commit) {
+	const body = typeof commit.body === "string" ? commit.body : "";
+	const footer = typeof commit.footer === "string" ? commit.footer : "";
+	const match = BREAKING_CHANGE_RE.exec(`${footer}\n${body}`);
+	if (match?.[1]) return match[1].trim();
+	if (typeof commit.subject === "string" && commit.subject) return commit.subject;
+	if (typeof commit.header === "string" && commit.header) return commit.header;
+	return "";
+}
 function tryParseHeader(commit) {
 	if (typeof commit.header !== "string") return null;
 	const match = COMMIT_HEADER_RE.exec(commit.header.trim());
@@ -124,24 +134,19 @@ function tryParseHeader(commit) {
 }
 function processBreakingChanges(commit, context, issues) {
 	let discard = true;
-	commit.notes = [];
-	const getCommitHashLink = () => {
-		if (!commit.hash) return "";
-		const shortHash = commit.hash.substring(0, 7);
-		const repoUrl = context.repository ? `${context.host}/${context.owner}/${context.repository}` : context.repoUrl;
-		return repoUrl ? ` ([${shortHash}](${repoUrl}/commit/${commit.hash}))` : ` (${shortHash})`;
-	};
-	const hashLink = getCommitHashLink();
+	commit.notes.forEach((note) => {
+		note.title = "BREAKING CHANGES";
+		discard = false;
+	});
+	const hadBreakingNotes = commit.notes.length > 0;
 	const addBreakingNote = () => {
-		let text = linkify(typeof commit.subject === "string" && commit.subject ? commit.subject : typeof commit.header === "string" && commit.header ? commit.header : "", context, issues) + hashLink;
-		if (commit.body) {
-			const indentedBody = linkify(commit.body, context, issues).split("\n").map((line) => line.trim() ? `  ${line}` : "").join("\n");
-			text += `\n\n${indentedBody}`;
+		if (!hadBreakingNotes) {
+			const text = linkify(extractBreakingText(commit), context, issues);
+			commit.notes.push({
+				title: "BREAKING CHANGES",
+				text
+			});
 		}
-		commit.notes.push({
-			title: "BREAKING CHANGES",
-			text
-		});
 		discard = false;
 	};
 	const parsed = tryParseHeader(commit);
@@ -157,51 +162,42 @@ function processBreakingChanges(commit, context, issues) {
 	}
 	return discard;
 }
-function mapCommitType(commit, discard) {
-	if (commit.revert) {
-		commit.type = "Reverts";
-		return true;
-	}
+function mapCommitType(commit, discard, showTypes) {
+	if (commit.revert) commit.type = "revert";
+	if (!commit.type) return false;
 	const mapped = COMMIT_TYPE_MAP[commit.type];
 	if (mapped) {
-		if (ALWAYS_SHOW_TYPES.has(commit.type) || !discard) {
+		if (showTypes.includes(commit.type) || !discard) {
 			commit.type = mapped;
 			return true;
 		}
 	}
 	return !discard;
 }
-function createDefaultTransformCommit() {
-	return (commit, params) => {
-		const context = {
-			host: params.context?.host,
-			owner: params.context?.owner,
-			repository: typeof params.repository === "object" && params.repository !== null ? params.repository.project : void 0,
-			repoUrl: params.context?.repoUrl
-		};
-		const issues = [];
-		const mutableCommit = { ...commit };
-		if (mutableCommit.notes) mutableCommit.notes = [...mutableCommit.notes];
-		if (!mapCommitType(mutableCommit, processBreakingChanges(mutableCommit, context, issues))) return null;
-		if (mutableCommit.scope === "*") mutableCommit.scope = "";
-		if (typeof mutableCommit.hash === "string") mutableCommit.shortHash = mutableCommit.hash.substring(0, 7);
-		if (typeof mutableCommit.subject === "string") mutableCommit.subject = linkify(mutableCommit.subject, context, issues);
-		if (mutableCommit.references) mutableCommit.references = mutableCommit.references.filter((ref) => !issues.includes(ref.issue));
-		return mutableCommit;
+function createDefaultWriterOpts({ showTypes }) {
+	return {
+		mainTemplate: MAIN_TEMPLATE,
+		transform(_commit, context) {
+			const commit = JSON.parse(JSON.stringify(_commit));
+			const issues = [];
+			if (!mapCommitType(commit, processBreakingChanges(commit, context, issues), showTypes)) return null;
+			if (commit.scope === "*") commit.scope = "";
+			if (typeof commit.hash === "string") commit.shortHash = commit.hash.substring(0, 7);
+			if (typeof commit.subject === "string") commit.subject = linkify(commit.subject, context, issues);
+			commit.references = commit.references.filter((ref) => !issues.includes(ref.issue));
+			return commit;
+		}
 	};
 }
-function changelog({ cwd = process.cwd(), releaseCount = 0, file = "CHANGELOG.md", mainTemplate = MAIN_TEMPLATE, transformCommit = createDefaultTransformCommit() } = {}) {
+function changelog({ cwd = process.cwd(), releaseCount = 0, file = "CHANGELOG.md", showTypes = ALWAYS_SHOW_TYPES, outputUnreleased, writerOpt } = {}) {
 	const s = spinner();
 	s.start("Generating changelog");
+	const defaultWriterOpts = writerOpt || createDefaultWriterOpts({ showTypes });
 	return new Promise((resolve$1) => {
-		new ConventionalChangelog(cwd).readPackage().loadPreset("angular").options({
+		new StandardChangelog(cwd).readPackage().options({
 			releaseCount,
-			transformCommit,
-			outputUnreleased: true
-		}).writer({
-			mainTemplate,
-			transform: (commit) => commit
-		}).writeStream().pipe(createWriteStream(resolve(cwd, file))).on("close", () => {
+			outputUnreleased
+		}).writer(defaultWriterOpts).writeStream().pipe(createWriteStream(resolve(cwd, file))).on("close", () => {
 			s.stop("Changelog generated successfully!");
 			resolve$1();
 		});
@@ -236,8 +232,8 @@ function unwrapPromptResult(result) {
 	}
 	return result;
 }
-function execGit(...args) {
-	return x("git", args, { throwOnError: true });
+async function execGit(...args) {
+	return await x("git", args, { throwOnError: true });
 }
 function logStdout(ret) {
 	if (ret.stdout) logger.log(ret.stdout);
@@ -420,7 +416,7 @@ async function release(options) {
 	}
 }
 //#endregion
-//#region src/lockfileSyncCheck.ts
+//#region src/lockfileCheck.ts
 function getLockfilePath(packageManager) {
 	switch (packageManager) {
 		case "pnpm": return "pnpm-lock.yaml";
@@ -461,7 +457,7 @@ async function installDependencies(packageManager) {
 		throw error;
 	}
 }
-async function lockfileSyncCheck(options = {}) {
+async function lockfileCheck(options = {}) {
 	try {
 		const pkgManager = options.packageManager || "pnpm";
 		const installFlag = options.install || false;
@@ -474,4 +470,4 @@ async function lockfileSyncCheck(options = {}) {
 	}
 }
 //#endregion
-export { getPackageJsons as a, release as c, COMMIT_HEADER_RE as d, COMMIT_MESSAGE_RE as f, isVersionCommitMessage as h, lockfileSyncCheck as i, updateVersion as l, getCommitMessage as m, getLockfilePath as n, isSameVersion as o, commitLint as p, installDependencies as r, publish as s, checkLockfileSync as t, changelog as u };
+export { getPackageJsons as a, release as c, COMMIT_HEADER_RE as d, COMMIT_MESSAGE_RE as f, isVersionCommitMessage as h, lockfileCheck as i, updateVersion as l, getCommitMessage as m, getLockfilePath as n, isSameVersion as o, commitLint as p, installDependencies as r, publish as s, checkLockfileSync as t, changelog as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/release",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "publish all packages, generate changelogs and check commit messages",
   "keywords": [
     "changelog",
@@ -32,9 +32,9 @@
   "dependencies": {
     "@clack/prompts": "^1.2.0",
     "cleye": "^2.3.0",
-    "conventional-changelog": "^7.2.0",
     "rslog": "^2.1.1",
     "semver": "^7.7.4",
+    "standard-changelog": "^7.0.1",
     "tinyexec": "^1.1.1"
   },
   "devDependencies": {