js-code-detector 0.0.26 → 0.0.27

package/dist/cjs/index.js

@@ -49,6 +49,7 @@ var import_await_to_js = __toESM(require("await-to-js"));
 var import_generateGitDiffReport = require("./util/report_util/generateGitDiffReport");
 var import_parseGitLabDiffUril = require("./util/parseGitLabDiffUril");
 var import_getRepoSupportFlag = require("./util/shared/getRepoSupportFlag");
+var import_handleExecaError = require("./util/shared/handleExecaError");
 var gitDiffFileName = "git_diff.txt";
 var eslintJsonName = "eslint-report.json";
 var eslintFinalJsonName = "eslint-final-report.json";
@@ -134,8 +135,8 @@ async function getEslintCheckResult(today) {
   import_utils.logger.info(`${eslintFinalJsonName} 文件生成`);
 }
 async function gitDiffDetectByUrl(inputUrl) {
-  const today = (0, import_dayjs.default)().format("YYYYMDD_HHmmss");
-  const { gitRepoUrl: gitUrl, targetBranch: branchName, baseBranch } = (0, import_parseGitLabDiffUril.parseGitLabCompareUrl)(inputUrl);
+  const today = (0, import_dayjs.default)().format("YYYYMDD_HHmmss") + Math.random().toString(36).slice(-5);
+  const { gitRepoUrl: gitUrl, targetBranch: branchName, baseBranch, projectPathPart } = (0, import_parseGitLabDiffUril.parseGitLabCompareUrl)(inputUrl);
   import_utils.logger.ready("准备生成临时工作目录...");
   const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: "/bin/bash" }));
   if (err) {
@@ -143,41 +144,53 @@ async function gitDiffDetectByUrl(inputUrl) {
   }
   await import_utils.execa.execa(`mkdir -p ${today}`, { shell: "/bin/bash" });
   import_utils.logger.info("临时目录建立完成");
-  import_utils.logger.ready(`准备clone源代码到临时目录下的 ${import_constants.TARGET} 文件夹`);
-  await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.TARGET}`, { shell: "/bin/bash" });
-  import_utils.logger.info("源代码clone完成");
-  const supportFlag = (0, import_getRepoSupportFlag.getRepoSupportFlag)((0, import_path.join)(process.cwd(), today, import_constants.TARGET, "package.json"));
-  if (!supportFlag) {
-    import_utils.logger.error("该项目不支持检测");
+  try {
+    import_utils.logger.ready(`准备clone ${projectPathPart} 源代码到临时目录下的 ${import_constants.TARGET} 文件夹`);
+    let stderr, failed;
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.TARGET}`, { shell: "/bin/bash" }));
+    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+    import_utils.logger.info("源代码clone完成");
+    const supportFlag = (0, import_getRepoSupportFlag.getRepoSupportFlag)((0, import_path.join)(process.cwd(), today, import_constants.TARGET, "package.json"));
+    if (!supportFlag) {
+      import_utils.logger.error("该项目不支持检测");
+      (0, import_utils.rimraf)((0, import_path.join)(process.cwd(), today), () => {
+        import_utils.logger.info("临时目录已删除");
+      });
+      return;
+    }
+    import_utils.logger.ready(`准备clone ${projectPathPart} 源代码到临时目录下的 ${import_constants.SOURCE} 文件夹`);
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.SOURCE}`, { shell: "/bin/bash" }));
+    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+    import_utils.logger.info("源代码clone完成");
+    if (baseBranch !== "master") {
+      import_utils.logger.ready("准备切换到基准分支");
+      ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.SOURCE} && git fetch origin ${baseBranch}:${baseBranch} && git checkout ${baseBranch}`, { shell: "/bin/bash" }));
+      (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+      import_utils.logger.info("源代码切换到基准分支完成");
+    }
+    import_utils.logger.ready("准备切换到目标分支");
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: "/bin/bash" }));
+    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+    import_utils.logger.info("分支切换完成");
+    import_utils.logger.ready("准备生成git_diff.txt文件");
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff ${baseBranch}..${branchName} --unified=0 --output=${gitDiffFileName}`, { shell: "/bin/bash" }));
+    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+    import_utils.logger.info("git_diff.txt文件生成完成");
+    import_utils.logger.wait("准备生成 入口文件");
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && npx max setup`, { shell: "/bin/bash" }));
+    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+    import_utils.logger.info("入口文件 生成完成！");
+    import_utils.logger.ready("准备生成报告");
+    const res = await (0, import_generateGitDiffReport.generateGitDiffReport)({ targetDirPath: (0, import_path.join)(process.cwd(), today, import_constants.TARGET), generateFile: [] });
+    import_utils.logger.info("报告完成");
+    return res;
+  } catch (error) {
+    import_utils.logger.error(error.message);
+  } finally {
     (0, import_utils.rimraf)((0, import_path.join)(process.cwd(), today), () => {
       import_utils.logger.info("临时目录已删除");
     });
-    return;
-  }
-  import_utils.logger.ready(`准备clone源代码到临时目录下的 ${import_constants.SOURCE} 文件夹`);
-  await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.SOURCE}`, { shell: "/bin/bash" });
-  import_utils.logger.info("源代码clone完成");
-  if (baseBranch !== "master") {
-    import_utils.logger.ready("准备切换到基准分支");
-    await import_utils.execa.execa(`cd ${today}/${import_constants.SOURCE} && git fetch origin ${baseBranch}:${baseBranch} && git checkout ${baseBranch}`, { shell: "/bin/bash" });
-    import_utils.logger.info("源代码切换到基准分支完成");
   }
-  import_utils.logger.ready("准备切换到目标分支");
-  await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: "/bin/bash" });
-  import_utils.logger.info("分支切换完成");
-  import_utils.logger.ready("准备生成git_diff.txt文件");
-  await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff ${baseBranch}..${branchName} --unified=0 --output=${gitDiffFileName}`, { shell: "/bin/bash" });
-  import_utils.logger.info("git_diff.txt文件生成完成");
-  import_utils.logger.wait("准备生成 入口文件");
-  await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && npx max setup`, { shell: "/bin/bash" });
-  import_utils.logger.info("入口文件 生成完成！");
-  import_utils.logger.ready("准备生成报告");
-  const res = await (0, import_generateGitDiffReport.generateGitDiffReport)({ targetDirPath: (0, import_path.join)(process.cwd(), today, import_constants.TARGET), generateFile: [] });
-  import_utils.logger.info("报告完成");
-  (0, import_utils.rimraf)((0, import_path.join)(process.cwd(), today), () => {
-    import_utils.logger.info("临时目录已删除");
-  });
-  return res;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/util/parseGitLabDiffUril.d.ts

@@ -5,6 +5,7 @@
  * @throws 当输入链接格式不符合要求时抛出错误
  */
 export declare function parseGitLabCompareUrl(compareUrl: string): {
+    projectPathPart: string;
     gitRepoUrl: string;
     baseBranch: string;
     targetBranch: string;

package/dist/cjs/util/parseGitLabDiffUril.js

@@ -51,6 +51,7 @@ function parseGitLabCompareUrl(compareUrl) {
   const targetBranch = decodeURIComponent(encodedTargetBranch);
   const gitRepoUrl = `${urlObj.origin}${projectPathPart}.git`;
   return {
+    projectPathPart,
     gitRepoUrl,
     baseBranch,
     targetBranch

package/dist/cjs/util/shared/getRepoSupportFlag.js

@@ -25,10 +25,19 @@ module.exports = __toCommonJS(getRepoSupportFlag_exports);
 var import_fs = require("fs");
 function getRepoSupportFlag(jsonPath) {
   var _a;
+  const isExist = (0, import_fs.existsSync)(jsonPath);
+  if (!isExist)
+    return false;
   const packageJson = (0, import_fs.readFileSync)(jsonPath, "utf-8");
-  const packageJsonObj = JSON.parse(packageJson);
-  const supportFlag = !!((_a = packageJsonObj.dependencies) == null ? void 0 : _a["@umijs/max"]);
-  return supportFlag;
+  if (!packageJson)
+    return false;
+  try {
+    const packageJsonObj = JSON.parse(packageJson);
+    const supportFlag = !!((_a = packageJsonObj.dependencies) == null ? void 0 : _a["@umijs/max"]);
+    return supportFlag;
+  } catch (e) {
+    return false;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/util/shared/handleExecaError.d.ts

@@ -0,0 +1,4 @@
+export declare function handleExecaError({ failed, stderr }: {
+    failed: boolean;
+    stderr: string;
+}): void;

package/dist/cjs/util/shared/handleExecaError.js

@@ -0,0 +1,35 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/util/shared/handleExecaError.ts
+var handleExecaError_exports = {};
+__export(handleExecaError_exports, {
+  handleExecaError: () => handleExecaError
+});
+module.exports = __toCommonJS(handleExecaError_exports);
+var import_utils = require("@umijs/utils");
+function handleExecaError({ failed, stderr }) {
+  if (failed) {
+    import_utils.logger.error(stderr);
+    throw new Error(stderr);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handleExecaError
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-code-detector",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",