@coze-arch/rush-publish-plugin 0.0.5-alpha.8b5f6f → 0.0.5-alpha.bba657

package/lib/action/release/release.d.ts

@@ -1,2 +1,2 @@
-import { type ReleaseOptions, type ReleaseManifest } from './types';
+import { type ReleaseManifest, type ReleaseOptions } from './types';
 export declare const releasePackages: (releaseManifests: ReleaseManifest[], releaseOptions: ReleaseOptions) => Promise<void>;

package/lib/action/release/types.d.ts

@@ -2,7 +2,7 @@ import { type RushConfigurationProject } from '@rushstack/rush-sdk';
 export interface ReleaseOptions {
     commit?: string;
     dryRun?: boolean;
-    registry: string;
+    registry?: string;
     packages?: PackageToPublish[];
     allowBranches?: string[];
 }

package/lib/const/index.d.ts

@@ -1,7 +1,3 @@
-/**
- * 默认的 NPM registry 地址
- */
-export declare const DEFAULT_NPM_REGISTRY = "https://registry.npmjs.org";
 /**
  * 默认的 Git 分支名前缀
  */

package/lib/index.js

@@ -148,11 +148,6 @@ const logger = {
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
-/**
- * 默认的 NPM registry 地址
- */
-const DEFAULT_NPM_REGISTRY = 'https://registry.npmjs.org';
-
 /**
  * 默认的 Git 分支名前缀
  */
@@ -282,6 +277,140 @@ const getCurrentOrigin = async (
   }
 };
 
+/**
+ * 解析 Git 远程仓库 URL，提取主机和仓库路径
+ * 支持 HTTP/HTTPS 和 SSH 格式
+ * @param gitUrl Git 仓库 URL
+ * @returns 包含主机和仓库路径的对象，解析失败返回 null
+ */
+const parseGitRemoteUrl = (
+  gitUrl,
+) => {
+  if (!gitUrl) {
+    return null;
+  }
+
+  const trimmedUrl = gitUrl.trim().replace(/\.git$/, '');
+
+  // 匹配 SSH 格式: git@github.com:owner/repo.git
+  const sshMatch = trimmedUrl.match(/^git@([^:]+):(.+)$/);
+  if (sshMatch) {
+    const host = sshMatch[1];
+    const path = sshMatch[2];
+    return {
+      host,
+      path,
+      fullUrl: `https://${host}/${path}`,
+    };
+  }
+
+  // 匹配 HTTP/HTTPS 格式: https://github.com/owner/repo.git
+  const httpMatch = trimmedUrl.match(/^https?:\/\/([^/]+)\/(.+)$/);
+  if (httpMatch) {
+    const host = httpMatch[1];
+    const path = httpMatch[2];
+    return {
+      host,
+      path,
+      fullUrl: `https://${host}/${path}`,
+    };
+  }
+
+  return null;
+};
+
+/**
+ * 根据仓库信息构建 MR/PR 创建链接
+ * @param repoInfo 仓库信息
+ * @param branchName 分支名称
+ * @returns MR/PR 创建链接，如果无法构建则返回 null
+ */
+const buildMergeRequestUrl = (
+  repoInfo,
+  branchName,
+) => {
+  const { host, fullUrl } = repoInfo;
+
+  // GitHub
+  if (host.includes('github.com')) {
+    return `${fullUrl}/compare/${branchName}?expand=1`;
+  }
+
+  // GitLab
+  if (host.includes('gitlab')) {
+    return `${fullUrl}/-/merge_requests/new?merge_request[source_branch]=${branchName}`;
+  }
+
+  // Gitee
+  if (host.includes('gitee.com')) {
+    return `${fullUrl}/compare/${branchName}...master`;
+  }
+
+  // Bitbucket
+  if (host.includes('bitbucket')) {
+    return `${fullUrl}/pull-requests/new?source=${branchName}`;
+  }
+
+  // 无法识别的平台
+  return null;
+};
+
+function _optionalChain$3(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+/**
+ * package.json 的类型定义
+ */
+
+
+
+
+
+
+
+
+/**
+ * 解析发布 registry 的优先级：
+ * 1. 命令行参数 --registry (最高优先级)
+ * 2. package.json 中的 publishConfig.registry
+ * 3. 使用 npm 配置的默认 registry (不传 --registry 参数)
+ *
+ * @param project - Rush 项目配置
+ * @param registryFromCli - 命令行参数传入的 registry
+ * @returns 解析后的 registry URL，如果为 undefined 则使用 npm 默认配置
+ */
+function resolveRegistry(
+  project,
+  registryFromCli,
+) {
+  // 1. 优先使用命令行参数
+  if (registryFromCli) {
+    logger.info(
+      `Using registry from CLI: ${registryFromCli} (${project.packageName})`,
+      false,
+    );
+    return registryFromCli;
+  }
+
+  // 2. 尝试读取 package.json 中的 publishConfig.registry
+  const packageJson = project.packageJson ;
+  const registryFromPackageJson = _optionalChain$3([packageJson, 'access', _ => _.publishConfig, 'optionalAccess', _2 => _2.registry]);
+
+  if (registryFromPackageJson) {
+    logger.info(
+      `Using registry from publishConfig: ${registryFromPackageJson} (${project.packageName})`,
+      false,
+    );
+    return registryFromPackageJson;
+  }
+
+  // 3. 返回 undefined，让 npm 使用自己配置的 registry
+  logger.info(
+    `Using npm configured registry (${project.packageName})`,
+    false,
+  );
+  return undefined;
+}
+
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
@@ -323,8 +452,7 @@ const getRushConfiguration$1 = (() => {
   };
 })();
 
-//  Copyright (c) 2025 coze-dev
-//  SPDX-License-Identifier: MIT
+function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }//  Copyright (c) 2025 coze-dev
 
 
 
@@ -355,14 +483,21 @@ const updateDependencyVersions = async (
   return Promise.resolve(packageJson);
 };
 
-const applyCozePublishConfig = async (
+/**
+ * 应用发布配置
+ * 优先使用 botPublishConfig，如果不存在则使用 cozePublishConfig
+ */
+const applyPublishConfigSettings = async (
   packageJson,
 ) => {
-  const { cozePublishConfig } = packageJson;
-  if (cozePublishConfig) {
-    const keys = Object.keys(cozePublishConfig);
+  // 优先使用 botPublishConfig，如果不存在则回退到 cozePublishConfig
+  const publishConfig =
+    _nullishCoalesce(packageJson.botPublishConfig, () => ( packageJson.cozePublishConfig));
+
+  if (publishConfig) {
+    const keys = Object.keys(publishConfig);
     for (const key of keys) {
-      packageJson[key] = cozePublishConfig[key];
+      packageJson[key] = publishConfig[key];
     }
   }
   return Promise.resolve(packageJson);
@@ -371,7 +506,7 @@ const applyCozePublishConfig = async (
 const applyPublishConfig = async (project) => {
   const jobs = [
     updateDependencyVersions,
-    applyCozePublishConfig,
+    applyPublishConfigSettings,
   ];
   const packageJsonPath = path.join(project.projectFolder, 'package.json');
   let packageJson = await readJsonFile(packageJsonPath);
@@ -388,7 +523,7 @@ const publishPackage = async (
   project,
   releaseOptions,
 ) => {
-  const { dryRun, registry } = releaseOptions;
+  const { dryRun } = releaseOptions;
   const token = process.env.NPM_AUTH_TOKEN;
   const { version } = project.packageJson;
   const tag = version.includes('alpha')
@@ -396,6 +531,10 @@ const publishPackage = async (
     : version.includes('beta')
       ? 'beta'
       : 'latest';
+
+  // 解析 registry：CLI 参数 > package.json publishConfig > npm 配置
+  const registry = resolveRegistry(project, releaseOptions.registry);
+
   const setToken = `npm config set //bnpm.byted.org/:_authToken ${token}`;
   await exec(setToken, {
     cwd: project.projectFolder,
@@ -405,6 +544,7 @@ const publishPackage = async (
   if (dryRun) {
     args.push('--dry-run');
   }
+  // 只有明确指定了 registry 才传递参数，否则使用 npm 配置的默认值
   if (registry) {
     args.push(`--registry=${registry}`);
   }
@@ -484,7 +624,7 @@ const checkReleasePlan = (
     !allowBranches.includes(branchName)
   ) {
     throw new Error(
-      `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}.`,
+      `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}. Current Branch: ${branchName}`,
     );
   }
   return true;
@@ -624,8 +764,7 @@ const installAction$2 = (program) => {
     .option('--dry-run', '是否只执行不真实发布', false)
     .option(
       '-r, --registry <string>',
-      `发布到的 registry (默认: ${DEFAULT_NPM_REGISTRY})`,
-      DEFAULT_NPM_REGISTRY,
+      '发布到的 registry (优先级: CLI参数 > package.json publishConfig.registry > npm config)',
     )
     .option(
       '--allow-branches <branches...>',
@@ -910,6 +1049,144 @@ async function push({ refs, cwd, repoUrl }) {
 
 
 
+/**
+ * 获取或创建发布分支
+ */
+const getOrCreateBranch = async (params
+
+
+
+
+) => {
+  const { bumpPolicy, sessionId, branchPrefix, cwd } = params;
+
+  if (bumpPolicy === BumpType.BETA) {
+    return await getCurrentBranchName();
+  }
+
+  const date = dayjs().format('YYYYMMDD');
+  const branchName = `${branchPrefix}/${date}-${sessionId}`;
+  await exec(`git checkout -b ${branchName}`, { cwd });
+  return branchName;
+};
+
+/**
+ * 处理 Beta 发布流程：询问并执行 git push
+ */
+const handleBetaPublish = async (
+  branchName,
+  cwd,
+) => {
+  logger.success(`Changes have been committed to branch "${branchName}".`);
+
+  const shouldPush = await prompts.confirm({
+    message: 'Do you want to push the changes now?',
+    default: true,
+  });
+
+  if (shouldPush) {
+    logger.info('Pushing changes to remote...');
+    await exec('git push', { cwd });
+    logger.success('Changes pushed successfully!');
+  } else {
+    logger.info('Please run "git push" manually when you are ready.');
+  }
+};
+
+/**
+ * 显示手动创建 MR 的提示消息
+ */
+const showManualMrMessage = (
+  branchName,
+  repositoryUrl,
+) => {
+  const baseMessage = `Please create a merge request from branch "${branchName}" to the main branch`;
+  const suffix =
+    'The release will be triggered after the merge request is merged.';
+
+  if (repositoryUrl) {
+    logger.success(
+      `Repository: ${repositoryUrl}\n${baseMessage}.\n${suffix}`,
+      false,
+    );
+  } else {
+    logger.success(`${baseMessage} in your repository.\n${suffix}`);
+  }
+};
+
+/**
+ * 显示 MR/PR 创建链接并打开浏览器
+ */
+const showMrLinkAndOpenBrowser = async (mrUrl) => {
+  const log = [
+    '************************************************',
+    '*',
+    `* Please create MR/PR: ${mrUrl}`,
+    '*',
+    '* The release will be triggered after the MR is merged.',
+    '*',
+    '************************************************',
+  ];
+  logger.success(log.join('\n'), false);
+
+  const open = await import('open');
+  await open.default(mrUrl);
+};
+
+/**
+ * 处理正式版本发布流程：提示创建 MR/PR
+ */
+const handleProductionPublish = async (
+  branchName,
+  cwd,
+) => {
+  const originUrl = await getCurrentOrigin(cwd);
+  if (!originUrl) {
+    showManualMrMessage(branchName);
+    return;
+  }
+
+  const repoInfo = parseGitRemoteUrl(originUrl);
+  if (!repoInfo) {
+    showManualMrMessage(branchName);
+    return;
+  }
+
+  const mrUrl = buildMergeRequestUrl(repoInfo, branchName);
+  if (!mrUrl) {
+    showManualMrMessage(branchName, repoInfo.fullUrl);
+    return;
+  }
+
+  await showMrLinkAndOpenBrowser(mrUrl);
+};
+
+/**
+ * 根据发布类型处理后续提示
+ */
+const handlePostPushPrompts = async (
+  bumpPolicy,
+  branchName,
+  cwd,
+) => {
+  const isAlphaPublish = bumpPolicy === BumpType.ALPHA;
+  const isBetaPublish = bumpPolicy === BumpType.BETA;
+
+  // Alpha 发布：不需要提示（会自动触发 CI 发布）
+  if (isAlphaPublish) {
+    return;
+  }
+
+  // Beta 发布：询问用户是否立即执行 git push
+  if (isBetaPublish) {
+    await handleBetaPublish(branchName, cwd);
+    return;
+  }
+
+  // 正式版本发布：提示创建 MR/PR
+  await handleProductionPublish(branchName, cwd);
+};
+
 const pushToRemote = async (options) => {
   const {
     sessionId,
@@ -921,65 +1198,39 @@ const pushToRemote = async (options) => {
     repoUrl,
     branchPrefix = 'release',
   } = options;
+
   if (skipCommit) {
     return;
   }
 
-  // 获取仓库 URL
-  const actualRepoUrl = repoUrl;
-
-  let branchName;
-  if (bumpPolicy === BumpType.BETA) {
-    branchName = await getCurrentBranchName();
-  } else {
-    const date = dayjs().format('YYYYMMDD');
-    branchName = `${branchPrefix}/${date}-${sessionId}`;
-    await exec(`git checkout -b ${branchName}`, { cwd });
-  }
-  const isTestPublish = [BumpType.ALPHA, BumpType.BETA].includes(
-    bumpPolicy ,
-  );
+  // 1. 获取或创建发布分支
+  const branchName = await getOrCreateBranch({
+    bumpPolicy,
+    sessionId,
+    branchPrefix,
+    cwd,
+  });
 
-  // 4. 创建并推送发布分支
+  // 2. 提交变更
   const { effects } = await commitChanges({
     files: changedFiles,
     cwd,
     branchName,
   });
+
   if (skipPush) {
     return;
   }
+
+  // 3. 推送变更
   await push({
     refs: effects,
     cwd,
-    repoUrl: actualRepoUrl,
+    repoUrl,
   });
 
-  // 从 git URL 提取组织和仓库名称，用于构建 GitHub 链接
-  const repoInfoMatch = actualRepoUrl.match(GIT_REPO_URL_REGEX);
-  if (!repoInfoMatch) {
-    throw new Error('Invalid git repository URL');
-  }
-  const repoOwner = repoInfoMatch[1];
-  const repoName = repoInfoMatch[2];
-
-  if (isTestPublish) {
-    logger.success(
-      `Please refer to https://github.com/${repoOwner}/${repoName}/actions/workflows/release.yml for the release progress.`,
-    );
-  } else {
-    const prUrl = `https://github.com/${repoOwner}/${repoName}/compare/${branchName}?expand=1`;
-    const log = [
-      '************************************************',
-      '*',
-      `* Please create PR: ${prUrl}`,
-      '*',
-      '************************************************',
-    ];
-    logger.success(log.join('\n'), false);
-    const open = await import('open');
-    await open.default(prUrl);
-  }
+  // 4. 根据发布类型显示不同提示
+  await handlePostPushPrompts(bumpPolicy, branchName, cwd);
 };
 
 //  Copyright (c) 2025 coze-dev
@@ -1186,7 +1437,7 @@ const confirmForPublish = async (
   if (_optionalChain$1([options, 'optionalAccess', _ => _.isReleaseMode])) {
     logger.info('', false);
     logger.warn(chalk.yellow.bold('⚠️  Release Mode Enabled:'), false);
-    const registryMsg = `   Packages will be published directly to: ${chalk.bold(options.registry || 'default registry')}`;
+    const registryMsg = `   Packages will be published directly to: ${chalk.bold(options.registry || 'npm configured registry')}`;
     logger.warn(chalk.yellow(registryMsg), false);
   }
 
@@ -1591,7 +1842,11 @@ const publish = async (options) => {
   const isBetaPublish = [BumpType.BETA, BumpType.ALPHA].includes(
     bumpPolicy ,
   );
-  if (isBetaPublish === false && (await isMainBranch()) === false) {
+  if (
+    process.env.SKIP_BRANCH_CHECK !== 'true' &&
+    isBetaPublish === false &&
+    (await isMainBranch()) === false
+  ) {
     // 只允许在主分支发布
     logger.error(
       'You are not in main branch, please switch to main branch and try again.',
@@ -1604,7 +1859,7 @@ const publish = async (options) => {
     !!options.dryRun,
     {
       isReleaseMode: !!options.release,
-      registry: options.registry || DEFAULT_NPM_REGISTRY,
+      registry: options.registry,
     },
   );
 
@@ -1640,13 +1895,16 @@ const publish = async (options) => {
     // Release 模式：直接发布
     logger.info('Running in direct release mode...');
     logger.info('Starting package release...');
-    const registry = options.registry || DEFAULT_NPM_REGISTRY;
     // 将 PublishManifest[] 转换为 PackageToPublish[]
     const packages = publishManifests.map(manifest => ({
       packageName: manifest.project.packageName,
       version: manifest.newVersion,
     }));
-    await release({ dryRun: !!options.dryRun, registry, packages });
+    await release({
+      dryRun: !!options.dryRun,
+      registry: options.registry,
+      packages,
+    });
   } else {
     // 普通模式：创建并推送发布分支
     await pushToRemote({
@@ -1703,8 +1961,7 @@ const installAction$1 = (program) => {
     )
     .option(
       '--registry <url>',
-      `NPM registry URL (default: ${DEFAULT_NPM_REGISTRY})`,
-      DEFAULT_NPM_REGISTRY,
+      'NPM registry URL (优先级: CLI参数 > package.json publishConfig.registry > npm config)',
     )
     .action(async (options) => {
       try {

package/lib/utils/git.d.ts

@@ -22,3 +22,25 @@ export declare const ensureNotUncommittedChanges: () => Promise<boolean>;
  */
 export declare const getCurrentOrigin: (cwd?: string) => Promise<string | undefined>;
 export declare const convertGitSchemaToHttp: (gitUrl: string) => string;
+/**
+ * 解析 Git 远程仓库 URL，提取主机和仓库路径
+ * 支持 HTTP/HTTPS 和 SSH 格式
+ * @param gitUrl Git 仓库 URL
+ * @returns 包含主机和仓库路径的对象，解析失败返回 null
+ */
+export declare const parseGitRemoteUrl: (gitUrl: string) => {
+    host: string;
+    path: string;
+    fullUrl: string;
+} | null;
+/**
+ * 根据仓库信息构建 MR/PR 创建链接
+ * @param repoInfo 仓库信息
+ * @param branchName 分支名称
+ * @returns MR/PR 创建链接，如果无法构建则返回 null
+ */
+export declare const buildMergeRequestUrl: (repoInfo: {
+    host: string;
+    path: string;
+    fullUrl: string;
+}, branchName: string) => string | null;

package/lib/utils/resolve-registry.d.ts

@@ -0,0 +1,12 @@
+import { type RushConfigurationProject } from '@rushstack/rush-sdk';
+/**
+ * 解析发布 registry 的优先级：
+ * 1. 命令行参数 --registry (最高优先级)
+ * 2. package.json 中的 publishConfig.registry
+ * 3. 使用 npm 配置的默认 registry (不传 --registry 参数)
+ *
+ * @param project - Rush 项目配置
+ * @param registryFromCli - 命令行参数传入的 registry
+ * @returns 解析后的 registry URL，如果为 undefined 则使用 npm 默认配置
+ */
+export declare function resolveRegistry(project: RushConfigurationProject, registryFromCli?: string): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/rush-publish-plugin",
-  "version": "0.0.5-alpha.8b5f6f",
+  "version": "0.0.5-alpha.bba657",
   "description": "rush plugin to generate change log and publish packages",
   "keywords": [
     "rush",