bk-press 0.0.2 → 0.0.4

package/README.md

@@ -1,6 +1,6 @@
 # bk-press
 
-一个用于 Cypress 自动化测试的 CLI 工具，帮助快速初始化和运行自动化测试。
+一个用于 Cypress 自动化测试的 CLI 工具，帮助快速初始化测试环境和并行运行自动化测试。
 
 ## 📋 目录
 
@@ -58,7 +58,7 @@ pnpm add bk-press
    bkpress login
    ```
 
-4. **运行自动化测试**
+4. **并行运行自动化测试**
    ```bash
    bkpress run
    ```
@@ -153,7 +153,7 @@ bkpress init
 bkpress login
 # 在浏览器中完成登录，然后按回车
 
-# 4. 运行测试
+# 4. 并行运行测试
 bkpress run
 ```
 

package/bkcodeai.json

@@ -0,0 +1,30 @@
+{
+  "crignore_file_patterns": [
+    "out/",
+    "dist/",
+    "assets/",
+    "images/",
+    "package.json",
+    "package-lock.json",
+    "yarn.lock",
+    ".env.*",
+    "*.env",
+    "*.map",
+    "*.yml",
+    "*.yaml",
+    "*.min.js",
+    "libs/",
+    "static/",
+    "doc/",
+    "docs/",
+    "*.mo",
+    "*.po",
+    "*.ini",
+    "*.toml",
+    "*.json",
+    "*.xml",
+    "*.lock",
+    "*.md",
+    "*.txt"
+  ]
+}

package/lib/command/init.js

@@ -57,6 +57,11 @@ async function addScriptsToPackageJson() {
 }
 // 创建 cypress 文件夹并拉取模板文件
 async function addTemplateFiles() {
+    const isCypressExist = await (0, util_1.isFileOrFolderExist)(path_1.default.join(process.cwd(), "cypress"));
+    if (isCypressExist) {
+        console.log("cypress 文件夹已存在，跳过拉取模板文件");
+        return;
+    }
     const isTsProject = await checkIsTsProject();
     console.log("当前项目是否是 TypeScript 项目: ", isTsProject);
     await createCypressFolder();
@@ -113,6 +118,11 @@ async function copyTemplateFiles() {
 // 添加 cypress.config.ts 文件
 async function addCypressConfigFile() {
     const cypressConfigFile = path_1.default.join(process.cwd(), "cypress.config.ts");
+    const isExist = await (0, util_1.isFileOrFolderExist)(cypressConfigFile);
+    if (isExist) {
+        console.log("cypress.config.ts 文件已存在，跳过创建");
+        return;
+    }
     const fileContent = `import { defineConfig } from 'cypress';
 
 export default defineConfig({
@@ -141,6 +151,11 @@ async function addCypressEnvJsonFile() {
 async function addIgnoreToGitignoreFile() {
     const gitignoreFile = path_1.default.join(process.cwd(), ".gitignore");
     const oldFileContent = await (0, util_1.readFile)(gitignoreFile, false);
+    const isExist = oldFileContent.includes("cypress");
+    if (isExist) {
+        console.log(".gitignore 文件中已存在 cypress 相关文件，跳过添加忽略文件");
+        return;
+    }
     const fileContent = `${oldFileContent}\n
 cypress/parallel-weights.json
 cypress/screenshots
@@ -151,16 +166,19 @@ multi-reporter-config.json`;
 }
 // 添加 cypress 类型到 tsconfig.json 文件
 async function addCypressTypesToTsconfigJsonFile() {
-    const tsconfigJsonFile = path_1.default.join(process.cwd(), "tsconfig.json");
-    const tsconfigJson = (await (0, util_1.readFile)(tsconfigJsonFile));
+    const tsconfigJsonFilePath = path_1.default.join(process.cwd(), "tsconfig.json");
+    const tsconfigJson = (await (0, util_1.readFile)(tsconfigJsonFilePath));
     if (tsconfigJson.include) {
-        tsconfigJson.include.push("cypress/**/*");
+        if (!tsconfigJson.include.includes("cypress/**/*")) {
+            tsconfigJson.include.push("cypress/**/*");
+        }
     }
     else {
         tsconfigJson.include = ["cypress/**/*"];
     }
     if (tsconfigJson.compilerOptions) {
-        if (tsconfigJson.compilerOptions.types) {
+        if (tsconfigJson.compilerOptions.types &&
+            !tsconfigJson.compilerOptions.types.includes("cypress")) {
             tsconfigJson.compilerOptions.types.push("cypress");
         }
         else {
@@ -173,5 +191,5 @@ async function addCypressTypesToTsconfigJsonFile() {
         };
     }
     const fileContent = JSON.stringify(tsconfigJson, null, 2);
-    await (0, util_1.writeFile)(tsconfigJsonFile, fileContent);
+    await (0, util_1.writeFile)(tsconfigJsonFilePath, fileContent);
 }

package/lib/command/run.js

@@ -9,12 +9,17 @@ const login_1 = require("./login");
 const os_1 = __importDefault(require("os"));
 async function run() {
     console.log("开始运行自动化测试...");
+    console.log("当前工作目录: ", process.cwd());
     const config = await (0, login_1.readCypressEnvConfig)();
     const cpuCount = os_1.default.cpus().length;
     console.log("当前CPU核心数: ", cpuCount, ", 设置测试并发数: ", cpuCount);
     return new Promise((resolve, reject) => {
-        (0, child_process_1.exec)(`start-server-and-test dev ${config.localUrl} 'cypress-parallel -s e2e -t ${cpuCount} -d cypress/e2e'`, {
+        const child = (0, child_process_1.exec)(
+        // `npm run dev & npx wait-on ${config.localUrl} && npx cypress-parallel -s e2e -t ${cpuCount} -d cypress/e2e`,
+        `npx start-server-and-test dev ${config.localUrl} "cypress-parallel -s e2e -t ${cpuCount} -d cypress/e2e"`, {
             cwd: process.cwd(),
+            // @ts-ignore
+            stdio: "inherit",
         }, (error, stdout, stderr) => {
             if (error) {
                 console.error("运行自动化测试失败:", error);
@@ -24,5 +29,25 @@ async function run() {
             console.log("自动化测试运行成功!");
             resolve(stdout);
         });
+        child.stdout.setEncoding("utf8"); // 设置编码
+        child.stdout.on("data", (data) => {
+            // 通常不需要额外添加前缀，直接打印数据即可
+            process.stdout.write(data); // 使用 process.stdout.write 避免自动换行
+        });
+        child.stderr.setEncoding("utf8");
+        child.stderr.on("data", (data) => {
+            // 错误信息可以输出到标准错误流，方便区分
+            process.stderr.write(`STDERR: ${data}`);
+        });
+        child.on("error", (error) => {
+            reject(error);
+            console.error(`Failed to start subprocess: ${error}`);
+        });
+        child.on("close", (code) => {
+            if (code !== 0) {
+                reject(new Error(`命令执行失败，退出码: ${code}`));
+            }
+            resolve(1);
+        });
     });
 }

package/lib/index.js

@@ -7,7 +7,7 @@ const program = new commander_1.Command();
 program
     .name("bk-press")
     .description("一个用于 Cypress 自动化测试的 CLI 工具，帮助快速初始化和运行端到端测试")
-    .version("0.0.1");
+    .version("0.0.4");
 program.command("init").action(command_1.init);
 program.command("login").action(command_1.login);
 // @ts-ignore

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bk-press",
-  "version": "0.0.2",
-  "description": "A CLI for cypress automation testing",
+  "version": "0.0.4",
+  "description": "一个用于 Cypress 自动化测试的 CLI 工具，帮助快速初始化测试环境和并行运行自动化测试",
   "main": "lib/index.js",
   "bin": {
     "bkpress": "./lib/index.js"

package/src/command/init.ts

@@ -11,7 +11,7 @@ import {
 } from "../util";
 
 export async function init() {
-  console.log("开始初始化Cypress自动化测试...");
+  console.log("开始初始化Cypress自动化测试环境...");
   console.log("安装相关依赖...");
   await installDependencies();
   console.log("添加类型到 tsconfig.json 文件...");
@@ -68,6 +68,13 @@ async function addScriptsToPackageJson() {
 
 // 创建 cypress 文件夹并拉取模板文件
 async function addTemplateFiles() {
+  const isCypressExist = await isFileOrFolderExist(
+    path.join(process.cwd(), "cypress")
+  );
+  if (isCypressExist) {
+    console.log("cypress 文件夹已存在，跳过拉取模板文件");
+    return;
+  }
   const isTsProject = await checkIsTsProject();
   console.log("当前项目是否是 TypeScript 项目: ", isTsProject);
   await createCypressFolder();
@@ -134,6 +141,11 @@ async function copyTemplateFiles() {
 // 添加 cypress.config.ts 文件
 async function addCypressConfigFile() {
   const cypressConfigFile = path.join(process.cwd(), "cypress.config.ts");
+  const isExist = await isFileOrFolderExist(cypressConfigFile);
+  if (isExist) {
+    console.log("cypress.config.ts 文件已存在，跳过创建");
+    return;
+  }
   const fileContent = `import { defineConfig } from 'cypress';
 
 export default defineConfig({
@@ -164,6 +176,12 @@ async function addCypressEnvJsonFile() {
 async function addIgnoreToGitignoreFile() {
   const gitignoreFile = path.join(process.cwd(), ".gitignore");
   const oldFileContent = await readFile(gitignoreFile, false);
+  const isExist = oldFileContent.includes("cypress");
+  if (isExist) {
+    console.log(".gitignore 文件中已存在 cypress 相关文件，跳过添加忽略文件");
+    return;
+  }
+
   const fileContent = `${oldFileContent}\n
 cypress/parallel-weights.json
 cypress/screenshots
@@ -175,19 +193,24 @@ multi-reporter-config.json`;
 
 // 添加 cypress 类型到 tsconfig.json 文件
 async function addCypressTypesToTsconfigJsonFile() {
-  const tsconfigJsonFile = path.join(process.cwd(), "tsconfig.json");
-  const tsconfigJson = (await readFile(tsconfigJsonFile)) as Record<
+  const tsconfigJsonFilePath = path.join(process.cwd(), "tsconfig.json");
+  const tsconfigJson = (await readFile(tsconfigJsonFilePath)) as Record<
     string,
     any
   >;
   if (tsconfigJson.include) {
-    tsconfigJson.include.push("cypress/**/*");
+    if (!tsconfigJson.include.includes("cypress/**/*")) {
+      tsconfigJson.include.push("cypress/**/*");
+    }
   } else {
     tsconfigJson.include = ["cypress/**/*"];
   }
 
   if (tsconfigJson.compilerOptions) {
-    if (tsconfigJson.compilerOptions.types) {
+    if (
+      tsconfigJson.compilerOptions.types &&
+      !tsconfigJson.compilerOptions.types.includes("cypress")
+    ) {
       tsconfigJson.compilerOptions.types.push("cypress");
     } else {
       tsconfigJson.compilerOptions.types = ["cypress"];
@@ -198,5 +221,5 @@ async function addCypressTypesToTsconfigJsonFile() {
     };
   }
   const fileContent = JSON.stringify(tsconfigJson, null, 2);
-  await writeFile(tsconfigJsonFile, fileContent);
+  await writeFile(tsconfigJsonFilePath, fileContent);
 }

package/src/command/run.ts

@@ -4,16 +4,20 @@ import os from "os";
 
 export async function run() {
   console.log("开始运行自动化测试...");
+  // console.log("当前工作目录: ", process.cwd());
   const config = await readCypressEnvConfig();
   const cpuCount = os.cpus().length;
   console.log("当前CPU核心数: ", cpuCount, ", 设置测试并发数: ", cpuCount);
   return new Promise((resolve, reject) => {
-    exec(
-      `start-server-and-test dev ${config.localUrl} 'cypress-parallel -s e2e -t ${cpuCount} -d cypress/e2e'`,
+    const child = exec(
+      // `npm run dev & npx wait-on ${config.localUrl} && npx cypress-parallel -s e2e -t ${cpuCount} -d cypress/e2e`,
+      `npx start-server-and-test dev ${config.localUrl} "cypress-parallel -s e2e -t ${cpuCount} -d cypress/e2e"`,
       {
         cwd: process.cwd(),
+        // @ts-ignore
+        stdio: "inherit",
       },
-      (error, stdout, stderr) => {
+      (error: any, stdout: any, stderr: any) => {
         if (error) {
           console.error("运行自动化测试失败:", error);
           reject(stderr);
@@ -23,5 +27,29 @@ export async function run() {
         resolve(stdout);
       }
     );
+
+    child.stdout!.setEncoding("utf8"); // 设置编码
+    child.stdout!.on("data", (data) => {
+      // 通常不需要额外添加前缀，直接打印数据即可
+      process.stdout.write(data); // 使用 process.stdout.write 避免自动换行
+    });
+
+    child.stderr!.setEncoding("utf8");
+    child.stderr!.on("data", (data) => {
+      // 错误信息可以输出到标准错误流，方便区分
+      process.stderr.write(`STDERR: ${data}`);
+    });
+
+    child.on("error", (error) => {
+      reject(error);
+      console.error(`Failed to start subprocess: ${error}`);
+    });
+
+    child.on("close", (code) => {
+      if (code !== 0) {
+        reject(new Error(`命令执行失败，退出码: ${code}`));
+      }
+      resolve(1);
+    });
   });
 }

package/src/index.ts

@@ -10,7 +10,7 @@ program
   .description(
     "一个用于 Cypress 自动化测试的 CLI 工具，帮助快速初始化和运行端到端测试"
   )
-  .version("0.0.1");
+  .version("0.0.4");
 
 program.command("init").action(init);
 program.command("login").action(login);