@vitarx/release-cli 1.0.0-alpha.0 → 1.0.0-alpha.2

package/dist/release.js

@@ -184,7 +184,7 @@ async function publishPackage(pkgDir, packageManager, isDryRun = false, args) {
         // -------------------- Step 8: 推送代码和标签到远程仓库 --------------------
         log.info('⬆️  Pushing to remote...');
         try {
-            runCommand(`git push${tagName ? '&& git push --tags' : ''}`, isDryRun);
+            runCommand(`git push${tagName ? ' && git push --tags' : ''}`, isDryRun);
         }
         catch {
             log.warn('包已发布到pnm，但推送代码和标签到远程仓库意外失败，请仔细核查npm仓库和远程仓库状态。');
@@ -299,7 +299,7 @@ export async function main() {
     }
     else {
         // 单包项目，发布根目录
-        await publishPackage(process.cwd(), packageManager, isDryRun, args);
+        await publishPackage('.', packageManager, isDryRun, args);
     }
 }
 // 执行主函数

package/dist/utils.js

@@ -197,23 +197,18 @@ export function getWorkspacePackages() {
     try {
         // 读取根目录的package.json文件
         const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
-        // 获取workspaces配置，如果没有则为空数组
-        const workspaces = pkg.workspaces || [];
+        // 获取workspaces配置，支持数组格式和对象格式（包含packages数组）
+        let workspaces = [];
+        if (Array.isArray(pkg.workspaces)) {
+            workspaces = pkg.workspaces;
+        }
+        else if (pkg.workspaces && Array.isArray(pkg.workspaces.packages)) {
+            workspaces = pkg.workspaces.packages;
+        }
         // 遍历所有workspace模式
         for (const workspacePattern of workspaces) {
-            // 获取所有目录
-            const workspaceDirs = fs
-                .readdirSync('.', { withFileTypes: true })
-                .filter((dirent) => dirent.isDirectory())
-                .map((dirent) => dirent.name)
-                .filter((dir) => {
-                // 简单的模式匹配（支持通配符）
-                if (workspacePattern.includes('*')) {
-                    const pattern = workspacePattern.replace(/\*/g, '.*');
-                    return new RegExp(`^${pattern}$`).test(dir);
-                }
-                return dir === workspacePattern;
-            });
+            // 获取所有匹配的目录
+            const workspaceDirs = findMatchingDirectories(workspacePattern);
             for (const dir of workspaceDirs) {
                 const pkgPath = path.join(dir, 'package.json');
                 if (fs.existsSync(pkgPath)) {
@@ -232,6 +227,60 @@ export function getWorkspacePackages() {
     }
     return packages;
 }
+/**
+ * 查找匹配通配符模式的所有目录
+ * @param pattern 通配符模式（如 "packages/*"）
+ * @returns 匹配的目录路径数组
+ */
+function findMatchingDirectories(pattern) {
+    const directories = [];
+    // 如果模式包含通配符，递归查找所有匹配的目录
+    if (pattern.includes('*')) {
+        const parts = pattern.split('/');
+        let currentPath = '.';
+        for (let i = 0; i < parts.length; i++) {
+            const part = parts[i];
+            if (part.includes('*')) {
+                // 通配符部分，查找所有匹配的子目录
+                const regexPattern = part.replace(/\*/g, '.*');
+                const regex = new RegExp(`^${regexPattern}$`);
+                const subDirs = fs
+                    .readdirSync(currentPath, { withFileTypes: true })
+                    .filter((dirent) => dirent.isDirectory())
+                    .map((dirent) => dirent.name)
+                    .filter((dir) => regex.test(dir))
+                    .map((dir) => path.join(currentPath, dir));
+                // 如果是最后一个部分，直接添加到结果
+                if (i === parts.length - 1) {
+                    directories.push(...subDirs);
+                }
+                else {
+                    // 继续递归查找下一级目录
+                    for (const subDir of subDirs) {
+                        const remainingPattern = parts.slice(i + 1).join('/');
+                        const nestedDirs = findMatchingDirectories(path.join(subDir, remainingPattern));
+                        directories.push(...nestedDirs);
+                    }
+                    break;
+                }
+            }
+            else {
+                // 非通配符部分，直接进入下一级目录
+                currentPath = path.join(currentPath, part);
+                if (!fs.existsSync(currentPath)) {
+                    break;
+                }
+            }
+        }
+    }
+    else {
+        // 简单目录名，直接检查是否存在
+        if (fs.existsSync(pattern)) {
+            directories.push(pattern);
+        }
+    }
+    return directories;
+}
 /**
  * 格式化版本号函数
  * 根据当前版本号和下一个版本类型或自定义版本号生成新的版本号

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitarx/release-cli",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.2",
   "description": "A CLI tool for automated npm package release with workspace support",
   "main": "dist/index.js",
   "type": "module",