@coze-arch/rush-publish-plugin 0.0.5-alpha.a5f14f → 0.0.5-alpha.d99d0c

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

@@ -6,6 +6,7 @@ var commander = require('commander');
 var shelljs = require('shelljs');
 var fs = require('fs/promises');
 var rushSdk = require('@rushstack/rush-sdk');
+var minimatch = require('minimatch');
 var crypto = require('crypto');
 var semver = require('semver');
 var chalk = require('chalk');
@@ -148,11 +149,6 @@ const logger = {
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
-/**
- * 默认的 NPM registry 地址
- */
-const DEFAULT_NPM_REGISTRY = 'https://registry.npmjs.org';
-
 /**
  * 默认的 Git 分支名前缀
  */
@@ -241,11 +237,6 @@ const getCurrentCommitHash = async () => {
   return stdout.trim();
 };
 
-const isMainBranch = async () => {
-  const currentBranchName = await getCurrentBranchName();
-  return currentBranchName === 'main';
-};
-
 const getChangedFiles = async () => {
   const output = await exec('git diff --name-only --diff-filter=ACMR');
   return serializeFilesName(output.stdout);
@@ -360,6 +351,59 @@ const buildMergeRequestUrl = (
   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
 
@@ -472,7 +516,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')
@@ -480,15 +524,16 @@ const publishPackage = async (
     : version.includes('beta')
       ? 'beta'
       : 'latest';
-  const setToken = `npm config set //bnpm.byted.org/:_authToken ${token}`;
-  await exec(setToken, {
-    cwd: project.projectFolder,
-  });
 
+  // 解析 registry：CLI 参数 > package.json publishConfig > npm 配置
+  const registry = resolveRegistry(project, releaseOptions.registry);
+
+  // 使用环境变量传递 authToken，npm 会自动应用到任何 registry
   const args = [`NODE_AUTH_TOKEN=${token}`, 'npm', 'publish', `--tag ${tag}`];
   if (dryRun) {
     args.push('--dry-run');
   }
+  // 只有明确指定了 registry 才传递参数，否则使用 npm 配置的默认值
   if (registry) {
     args.push(`--registry=${registry}`);
   }
@@ -531,6 +576,12 @@ const releasePackages = async (
   );
 };
 
+//  Copyright (c) 2025 coze-dev
+//  SPDX-License-Identifier: MIT
+
+
+
+
 var ReleaseType; (function (ReleaseType) {
   const ALPHA = 'alpha'; ReleaseType["ALPHA"] = ALPHA;
   const BETA = 'beta'; ReleaseType["BETA"] = BETA;
@@ -557,6 +608,36 @@ const calReleasePlan = (releaseManifests) => {
   return ReleaseType.ALPHA;
 };
 
+/**
+ * Check if a branch name matches any of the allowed patterns.
+ * Supports exact matches, glob patterns (using minimatch), and regex patterns.
+ *
+ * @param branchName - The current branch name
+ * @param allowPatterns - Array of patterns (exact strings, glob patterns, or regex strings starting with '/')
+ * @returns true if the branch matches any pattern, false otherwise
+ */
+const isBranchAllowed = (
+  branchName,
+  allowPatterns,
+) =>
+  allowPatterns.some(pattern => {
+    // Check if it's a regex pattern (enclosed in forward slashes)
+    if (pattern.startsWith('/') && pattern.endsWith('/')) {
+      const regexPattern = pattern.slice(1, -1);
+      try {
+        // eslint-disable-next-line security/detect-non-literal-regexp -- User-provided patterns are validated
+        const regex = new RegExp(regexPattern);
+        return regex.test(branchName);
+      } catch (e) {
+        // Invalid regex, fall back to exact match
+        return pattern === branchName;
+      }
+    }
+
+    // Use minimatch for glob patterns and exact matches
+    return minimatch.minimatch(branchName, pattern);
+  });
+
 const checkReleasePlan = (
   releaseManifests,
   branchName,
@@ -565,7 +646,7 @@ const checkReleasePlan = (
   const releasePlan = calReleasePlan(releaseManifests);
   if (
     releasePlan === ReleaseType.LATEST &&
-    !allowBranches.includes(branchName)
+    !isBranchAllowed(branchName, allowBranches)
   ) {
     throw new Error(
       `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}. Current Branch: ${branchName}`,
@@ -708,8 +789,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...>',
@@ -847,19 +927,20 @@ const calculateNewVersion = (
       return semver.inc(cc, bumpType) || currentVersion;
     }
     case BumpType.BETA: {
-      // 如果当前已经是 beta 版本，增加 beta 版本号
+      // If already a beta version, increment beta number
       if (prerelease[0] === 'beta') {
         const nextVersion = semver.inc(currentVersion, 'prerelease', 'beta');
         return nextVersion || currentVersion;
       }
-      // 否则基于当前版本创建新的 beta 版本
-      const baseVersion = `${major}.${minor}.${patch}`;
+      // Based on the next patch version to create beta version
+      const nextPatch = prerelease.length > 0 ? patch : patch + 1;
+      const baseVersion = `${major}.${minor}.${nextPatch}`;
       return `${baseVersion}-beta.1`;
     }
     case BumpType.ALPHA: {
-      // 否则基于当前版本创建新的 alpha 版本
-      const baseVersion = `${major}.${minor}.${patch}`;
-      // 生成随机哈希值
+      // Based on the next patch version to create alpha version
+      const nextPatch = prerelease.length > 0 ? patch : patch + 1;
+      const baseVersion = `${major}.${minor}.${nextPatch}`;
       return `${baseVersion}-alpha.${sessionId || randomHash(6)}`;
     }
     default: {
@@ -1382,7 +1463,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);
   }
 
@@ -1755,8 +1836,10 @@ const applyPublishManifest = async (
 // 2. beta: 本分支直接切换版本号，并发布
 // 3. 正式版本：发起MR，MR 合入 main 后，触发发布
 
+const SESSION_ID_LENGTH = 6;
+
 const publish = async (options) => {
-  const sessionId = randomHash(6);
+  const sessionId = randomHash(SESSION_ID_LENGTH);
   const rushConfiguration = getRushConfiguration$1();
   const rushFolder = rushConfiguration.rushJsonFolder;
   if (
@@ -1787,24 +1870,13 @@ const publish = async (options) => {
   const isBetaPublish = [BumpType.BETA, BumpType.ALPHA].includes(
     bumpPolicy ,
   );
-  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.',
-    );
-    return;
-  }
 
   const continuePublish = await confirmForPublish(
     publishManifests,
     !!options.dryRun,
     {
       isReleaseMode: !!options.release,
-      registry: options.registry || DEFAULT_NPM_REGISTRY,
+      registry: options.registry,
     },
   );
 
@@ -1840,13 +1912,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({
@@ -1903,8 +1978,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/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.a5f14f",
+  "version": "0.0.5-alpha.d99d0c",
   "description": "rush plugin to generate change log and publish packages",
   "keywords": [
     "rush",
@@ -13,6 +13,7 @@
   "author": "tecvan.fe@gmail.com",
   "maintainers": [],
   "main": "./lib/index.js",
+  "types": "lib/index.d.ts",
   "bin": {
     "rush-publish": "./lib/index.js"
   },
@@ -36,6 +37,7 @@
     "conventional-changelog-angular": "^5.0.13",
     "conventional-commits-parser": "^3.2.4",
     "dayjs": "^1.11.13",
+    "minimatch": "^10.0.0",
     "open": "~10.1.0",
     "semver": "^7.7.1",
     "shelljs": "^0.9.2"
@@ -70,6 +72,5 @@
     },
     "main": "./lib/index.js",
     "types": "lib/index.d.ts"
-  },
-  "types": "lib/index.d.ts"
+  }
 }

package/lib/utils/get-plugin-config.d.ts

@@ -1,8 +0,0 @@
-export interface IPublishPluginConfig {
-    branchPrefix?: string;
-}
-/**
- * Read plugin configuration from common/config/rush-plugins/@coze-arch/rush-publish-plugin.json
- * @returns Plugin configuration object
- */
-export declare function getPluginConfig(): IPublishPluginConfig;