@peiyanlu/release 1.2.0 → 1.2.1

package/dist/cli.mjs

@@ -1,30 +1,30 @@
-import path, { join, resolve } from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
-import { bumpPackageVersion, canPublish, coloredStatus, eol, execAsync, getAuthenticatedUser, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLogSince, getPackageInfo, getPackageUrl, getPublishedVersion, getRemoteList, getRemoteNames, getShortStatus, gitAddAll, gitAddSync, gitAddTracked, gitBranchCurrent, gitCommitMessage, gitPushBranch, gitPushTag, gitResetHardSync, gitTagAnnotated, gitTagDeleteSync, hasWriteAccess, isGitRepo, isOtpError, isPrerelease, isValidVersion, isWorkingTreeClean, parseGitHubRepo, parseVersion, pingRegistry, publishPackage, resolveChangelogRange, resolvePublishTag } from "@peiyanlu/cli-utils";
+import { bold, compareUrl, each, heading, link, list, newline, segments, small, words } from "@conventional-changelog/template";
+import { bumpPackageVersion, coloredStatus, eol, execAsync, getAuthenticatedUser, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLogSince, getPackageInfo, getPackageUrl, getPublishedVersion, getRemoteList, getRemoteNames, getShortStatus, gitAddAll, gitAddSync, gitAddTracked, gitBranchCurrent, gitCommitMessage, gitPushBranch, gitPushTag, gitResetHardSync, gitTagAnnotated, gitTagDeleteSync, hasWriteAccess, isGitRepo, isOtpError, isPrerelease, isValidVersion, isWorkingTreeClean, parseGitHubRepo, parseVersion, pingRegistry, publishPackage, registryArg, resolveChangelogRange, resolvePublishTag, runNpm } from "@peiyanlu/cli-utils";
 import { copyDir, createMatcher, createTempDir, editFile, readJsonFile, readJsonFileSync, writeJsonFile } from "@peiyanlu/node-utils";
 import { dim, green, red, rgb, underline, yellow } from "ansis";
 import { program } from "commander";
 import { createReadStream, createWriteStream, existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { join, resolve } from "node:path";
 import { cancel, confirm, group, intro, isCancel, log, outro, select, tasks, text } from "@clack/prompts";
-import { castArray, isEmptyObject, isFunction, isPlainObject, isUndefined, isZero, mapObject, omit, partition, unset } from "@peiyanlu/ts-utils";
+import { castArray, isBoolean, isEmptyObject, isFunction, isNotEmpty, isNumber, isPlainObject, isUndefined, isZero, omit, partition, unset } from "@peiyanlu/ts-utils";
 import { publint } from "publint";
 import { formatMessage } from "publint/utils";
 import { inc, neq } from "semver";
+import { pathToFileURL } from "node:url";
 import { inspect } from "node:util";
 import { ConventionalChangelog } from "conventional-changelog";
 import createPreset from "conventional-changelog-conventionalcommits";
 import { Bumper } from "conventional-recommended-bump";
 import { writeFile } from "node:fs/promises";
 import { finished } from "node:stream/promises";
-import { bold, compareUrl, each, heading, link, list, newline, segments, small, words } from "@conventional-changelog/template";
 import { Octokit } from "@octokit/rest";
 import { contentType } from "mime-types";
 import open from "open";
 import { glob } from "tinyglobby";
-//#region node_modules/.pnpm/tsdown@0.22.13_publint@0.3.21_typescript@6.0.3/node_modules/tsdown/esm-shims.js
-const getFilename = () => fileURLToPath(import.meta.url);
-const getDirname = () => path.dirname(getFilename());
-const __dirname = /* @__PURE__ */ getDirname();
+//#region package.json
+var name = "@peiyanlu/release";
+var version = "1.2.0";
+var description = "Release project tool.";
 //#endregion
 //#region src/config.ts
 const findConfigFile = (cwd = process.cwd()) => {
@@ -1033,16 +1033,33 @@ Read full docs **[here](${homepage})**.`;
 };
 //#endregion
 //#region src/npm/publish.ts
+const canPublish = async (registry, cwd) => {
+	const res = await runNpm([
+		"publish",
+		"--dry-run",
+		"--access",
+		"public",
+		...registryArg(registry)
+	], {
+		error: "throw",
+		cwd
+	}).catch((err) => err);
+	const allowedErr = (err) => {
+		return [/previously published versions/i, /cannot publish over/i].some((reg) => reg.test(err.message));
+	};
+	if (!(res instanceof Error) || allowedErr(res)) return true;
+	throw res;
+};
 const npmCheck = async (ctx, config) => {
-	const { pkg: { name, current, publishConfig: { registry } } } = ctx;
-	const { npm: { skipChecks } } = config;
+	const { pkg: { name, current, publishConfig: { registry } }, selectedPkg } = ctx;
+	const { npm: { skipChecks }, getPkgDir } = config;
 	const tag = await resolvePublishTag(name, current);
 	Object.assign(ctx.npm, { tag });
 	if (skipChecks) return "";
 	const [pinged, username] = await Promise.all([
 		pingRegistry(registry),
 		getAuthenticatedUser(registry),
-		canPublish(registry)
+		canPublish(registry, getPkgDir(selectedPkg))
 	]);
 	if (!pinged) throw new Error(MSG.ERROR.NPM_REGISTRY(registry));
 	if (!username) throw new Error(MSG.ERROR.NPM_AUTH);
@@ -1100,7 +1117,7 @@ var Action = class {
 		taskEnd(MSG.OUTRO(ctx.dryRun));
 	}
 	async handlePrepareRelease(cmdArgs, options) {
-		const { ctx, config } = await this.createContext(cmdArgs, options, true);
+		const { ctx, config } = await this.createContext(cmdArgs, options);
 		await this.checkTask(ctx, config);
 		await this.bumpTask(ctx, config);
 		await this.changelogTask(ctx, config);
@@ -1108,27 +1125,12 @@ var Action = class {
 		if (ctx.dryRun) gitRollback(ctx);
 		taskEnd(MSG.OUTRO_PREPARE(ctx.dryRun));
 	}
-	async createContext(cmdArgs, options, prepare = false) {
-		const { version: cVersion, name: cName } = readJsonFileSync(join(__dirname, "../package.json"));
-		const { otp, package: defPkg, releaseCount, ...others } = options;
-		const { showChangelog, showRelease, ci, dryRun, onlyChangelog } = mapObject(others, (k, v) => [k, Boolean(v)]);
-		process.env["dryRun"] = String(dryRun);
-		const { configFile, config: local } = await resolveConfig(process.cwd());
-		const config = mergeConfig(createDefaultConfig(ci ? true : void 0), local);
-		info(MSG.INFO.TOOL(cName, cVersion));
+	async createContext(cmdArgs, options) {
+		const { configFile, config } = await this.createConfig(options);
+		info(MSG.INFO.TOOL(name, version));
 		info(MSG.INFO.CONFIG(configFile));
-		{
-			const { requireCleanWorkingTree, skipGit, skipNpm, skipGithub, isMonorepo, includeHidden } = mapObject(others, (k, v) => [k, Boolean(v)]);
-			const count = Number(releaseCount);
-			config.changelog.releaseCount = isNaN(count) ? 0 : count;
-			config.changelog.includeHidden = includeHidden;
-			config.git.requireCleanWorkingTree = requireCleanWorkingTree;
-			config.skipGit = skipGit;
-			config.skipNpm = skipNpm;
-			config.skipGithub = skipGithub;
-			config.isMonorepo = isMonorepo;
-		}
 		console.log();
+		const { otp, package: defPkg, prepare, showChangelog, showRelease, ci, dryRun, onlyChangelog } = options;
 		intro(prepare ? MSG.INTRO_PREPARE(dryRun) : MSG.INTRO(dryRun));
 		const { isMonorepo, packages, getPkgDir, skipNpm } = config;
 		if (isMonorepo) {
@@ -1153,7 +1155,7 @@ var Action = class {
 		const nextVersion = inc(pkgVersion, cmdArgs) ?? "";
 		const ctx = mergeConfig(createDefaultContext(), {
 			selectedPkg,
-			configFileExists: Object.keys(local).length > 0,
+			configFileExists: isNotEmpty(configFile),
 			dryRun,
 			showRelease,
 			showChangelog,
@@ -1189,6 +1191,34 @@ var Action = class {
 			config
 		};
 	}
+	async createConfig(options) {
+		const { ci, requireCleanWorkingTree, skipGit, skipNpm, skipGithub, isMonorepo, includeHidden, releaseCount } = options;
+		const toFalse = (value) => {
+			return isBoolean(value) && !value ? value : void 0;
+		};
+		const toNumber = (value) => {
+			return isNumber(value) ? value : void 0;
+		};
+		const defaultConfig = createDefaultConfig(ci ? true : void 0);
+		const { configFile, config: local } = await this.resolveUserConfig(process.cwd());
+		return {
+			configFile,
+			config: mergeConfig(mergeConfig(defaultConfig, local), {
+				changelog: {
+					releaseCount: toNumber(releaseCount),
+					includeHidden
+				},
+				git: { requireCleanWorkingTree: toFalse(requireCleanWorkingTree) },
+				skipGit,
+				skipNpm,
+				skipGithub,
+				isMonorepo
+			})
+		};
+	}
+	async resolveUserConfig(cwd = process.cwd()) {
+		return resolveConfig(cwd);
+	}
 	async printChangelog(ctx, config) {
 		const { showChangelog, selectedPkg, noGit, isIncrement } = ctx;
 		const { isMonorepo, getPkgDir, changelog: { tagPrefix, releaseCount, includeHidden, transformTypes } } = config;
@@ -1370,13 +1400,12 @@ var Action = class {
 };
 //#endregion
 //#region src/cli.ts
-const pkg = readJsonFileSync(join(__dirname, "..", "package.json"));
-program.name("release").description(pkg.description).version(pkg.version, "-v, --version", "Print the tool version and exit.").usage("[release-type] [options]").argument("[release-type]", "Version bump type: patch | minor | major").option("-n, --dry-run", "Run in dry mode", false).option("-m, --is-monorepo", "Mono-repo project", false).option("-p, --package <pkg>", "Specify package name (Mono-repo CI only).", "").option("--otp <code>", "One-time password for npm publish.", "").option("--prepare", "Prepare a release.", false).option("--ci", "Enable CI mode.", false).option("--show-changelog", "Print changelog and exit.", false).option("--show-release", "Print release version and exit.", false).option("-r, --release-count <count>", "Release count for release.", (value) => Number(value), 1).option("--include-hidden", "Include hidden commit types in the changelog.", false).option("--only-changelog", "Only update the changelog.", false).option("-C, --no-require-clean-working-tree", "Allow releasing with uncommitted changes.", true).option("--skip-git", "Skip all Git-related checks and operations.", false).option("--skip-npm", "Skip all npm-related checks and operations.", false).option("--skip-github", "Skip all GitHub-related checks and operations.", false).helpOption("-h, --help", "Display help information.").action(async (releaseType, options) => {
+program.name("release").description(description).version(version, "-v, --version", "Print the tool version and exit.").usage("[release-type] [options]").argument("[release-type]", "Version bump type: patch | minor | major").enablePositionalOptions().option("-n, --dry-run", "Run in dry mode", false).option("-p, --package <pkg>", "Specify package name (Mono-repo CI only).", "").option("--otp <code>", "One-time password for npm publish.", "").option("--prepare", "Prepare a release.", false).option("--ci", "Enable CI mode.", false).option("--show-changelog", "Print changelog and exit.", false).option("--show-release", "Print release version and exit.", false).option("--only-changelog", "Only update the changelog.", false).option("-r, --release-count <count>", "Release count for release.", (val) => Number(val)).option("--include-hidden", "Include hidden commit types in the changelog.").option("-C, --no-require-clean-working-tree", "Allow releasing with uncommitted changes.").option("--skip-git", "Skip all Git-related checks and operations.").option("--skip-npm", "Skip all npm-related checks and operations.").option("--skip-github", "Skip all GitHub-related checks and operations.").option("-m, --is-monorepo", "Mono-repo project").helpOption("-h, --help", "Display help information.").action(async (releaseType, options) => {
 	const { prepare } = options;
 	const action = new Action();
 	prepare ? await action.handlePrepareRelease(releaseType, options) : await action.handleRelease(releaseType, options);
 });
-program.command("init").description("Create a release configuration file").option("-f, --force", "Overwrite existing config file", false).option("-m, --monorepo", "Mono-repo project", false).option("-a, --add", "Automatically stage the config file.", false).action((options) => {
+program.command("init").description("Create a release configuration file").option("-f, --force", "Overwrite existing config file", false).option("-m, --monorepo", "Mono-repo project", false).option("-a, --add", "Automatically stage the config file.", false).action(async (options) => {
 	const { force = false, monorepo = false, add = false } = options;
 	const cwd = process.cwd();
 	const { type } = readJsonFileSync(join(cwd, "package.json"));
@@ -1390,15 +1419,15 @@ program.command("init").description("Create a release configuration file").optio
 	}
 	const monoConfigToString = () => `{
   isMonorepo: true,
-  packages: [ 'demo-a', 'demo-b' ],
+  packages: [],
   getPkgDir: (pkg) => \`packages/\${ pkg }\`,
   toTag: (pkg, version) => \`\${ pkg }@\${ version }\`,
   changelog: {
     tagPrefix: (pkg) => \`\${ pkg }@\`,
   },
 }`;
-	const content = [`import { defineConfig } from '@peiyanlu/release'`, `export default defineConfig(${monorepo ? monoConfigToString() : "{}"})`].join(eol(2));
-	writeFileSync(configFile, content, "utf-8");
+	const content = [`import { defineConfig } from '@peiyanlu/release'`, `export default defineConfig(${monorepo ? monoConfigToString() : "{}"})`].join(eol(3));
+	writeFileSync(configFile, content + newline(), "utf-8");
 	console.log(`Wrote to ${underline(dim(configFile))}`);
 	if (add) gitAddSync([infile]);
 	console.log(`\n${content}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peiyanlu/release",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Release project tool.",
   "license": "MIT",
   "type": "module",
@@ -23,9 +23,9 @@
     "@clack/prompts": "^1.7.0",
     "@conventional-changelog/template": "^1.2.1",
     "@octokit/rest": "^22.0.1",
-    "@peiyanlu/cli-utils": "^0.0.14",
-    "@peiyanlu/node-utils": "^0.0.2",
-    "@peiyanlu/ts-utils": "^0.0.11",
+    "@peiyanlu/cli-utils": "^0.0.15",
+    "@peiyanlu/node-utils": "^0.0.3",
+    "@peiyanlu/ts-utils": "^0.0.12",
     "ansis": "^4.3.1",
     "commander": "^15.0.0",
     "conventional-changelog": "^8.1.0",
@@ -34,7 +34,7 @@
     "mime-types": "^3.0.2",
     "minimatch": "^10.2.5",
     "open": "^11.0.0",
-    "publint": "^0.3.21",
+    "publint": "^0.3.22",
     "semver": "^7.8.5",
     "tinyglobby": "^0.2.17"
   },