js-code-detector 0.0.31 → 0.0.33

package/dist/cjs/index.d.ts

@@ -48,6 +48,6 @@ export declare function gitDiffDetectByUrl(inputUrl: string): Promise<{
         filePath: string;
     }[];
 } | undefined>;
-export declare function getUpstreamDependenceJson(inputUrl: string): Promise<{
+export declare function getUpstreamDependenceJson(inputUrl: string, cloneType?: 'ssh'): Promise<{
     [k: string]: string[];
 } | undefined>;

package/dist/cjs/index.js

@@ -47,9 +47,9 @@ var import_parseGitLabDiffUril = require("./util/parseGitLabDiffUril");
 var import_gitDiffTool = require("./util/shared/gitDiffTool");
 var gitDiffFileName = "git_diff.txt";
 async function getGitRepositoryAndBranch() {
-  const res = await import_utils.execa.execa("git remote get-url origin", { shell: "/bin/bash" });
+  const res = await import_utils.execa.execa("git remote get-url origin", { shell: true });
   import_utils.chalk.green(["仓库地址：", res.stdout]);
-  const branch = await import_utils.execa.execa("git rev-parse --abbrev-ref HEAD", { shell: "/bin/bash" });
+  const branch = await import_utils.execa.execa("git rev-parse --abbrev-ref HEAD", { shell: true });
   import_utils.chalk.green(["分支名称：", branch.stdout]);
   return {
     gitUrl: res.stdout,
@@ -75,9 +75,9 @@ async function gitDiffDetectByUrl(inputUrl) {
   const gitInfo = (0, import_parseGitLabDiffUril.parseGitLabCompareUrl)(inputUrl);
   return (0, import_gitDiffTool.gitDiffTool)({ ...gitInfo, tempDirPath: today, generateFile: [] });
 }
-async function getUpstreamDependenceJson(inputUrl) {
+async function getUpstreamDependenceJson(inputUrl, cloneType) {
   const gitInfo = (0, import_parseGitLabDiffUril.parseGitLabCompareUrl)(inputUrl);
-  return (0, import_gitDiffTool.cloneGitRepoAndGetDiff)(gitInfo.gitRepoUrl, gitInfo.targetBranch);
+  return (0, import_gitDiffTool.cloneGitRepoAndGetDiff)(gitInfo.gitRepoUrl, gitInfo.targetBranch, cloneType);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -10,3 +10,4 @@ export declare function parseGitLabCompareUrl(compareUrl: string): {
     baseBranch: string;
     targetBranch: string;
 };
+export declare function getSshGitRepoUrl(gitRepoUrl: string): string;

package/dist/cjs/util/parseGitLabDiffUril.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/util/parseGitLabDiffUril.ts
 var parseGitLabDiffUril_exports = {};
 __export(parseGitLabDiffUril_exports, {
+  getSshGitRepoUrl: () => getSshGitRepoUrl,
   parseGitLabCompareUrl: () => parseGitLabCompareUrl
 });
 module.exports = __toCommonJS(parseGitLabDiffUril_exports);
@@ -57,7 +58,11 @@ function parseGitLabCompareUrl(compareUrl) {
     targetBranch
   };
 }
+function getSshGitRepoUrl(gitRepoUrl) {
+  return gitRepoUrl.replace(/https?:\/\/[^/]+/, "git@");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getSshGitRepoUrl,
   parseGitLabCompareUrl
 });

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

@@ -1,9 +1,9 @@
 import { generateGitDiffReport } from "../report_util/generateGitDiffReport";
-export declare function cloneGitRepo(gitUrl: string, branchName: string, tempDirPath: string, folder: string): Promise<{
+export declare function cloneGitRepo(gitUrl: string, branchName: string, tempDirPath: string, folder: string, cloneType?: 'ssh'): Promise<{
     failed: boolean;
     stderr: string;
 }>;
-export declare function cloneGitRepoAndGetDiff(gitRepoUrl: string, branchName: string): Promise<{
+export declare function cloneGitRepoAndGetDiff(gitRepoUrl: string, branchName: string, cloneType?: 'ssh'): Promise<{
     [k: string]: string[];
 } | undefined>;
 export declare function gitDiffTool(arg: {

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

@@ -34,6 +34,7 @@ __export(gitDiffTool_exports, {
   gitDiffTool: () => gitDiffTool
 });
 module.exports = __toCommonJS(gitDiffTool_exports);
+var import_parseGitLabDiffUril = require("../parseGitLabDiffUril");
 var import_utils = require("@umijs/utils");
 var import_await_to_js = __toESM(require("await-to-js"));
 var import_constants = require("../constants");
@@ -47,35 +48,40 @@ var import__ = require("../../index");
 var import_dayjs = __toESM(require("dayjs"));
 var import_fs = require("fs");
 var import_format_git_diff_content = require("../format_git_diff_content");
-async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder) {
+async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder, cloneType) {
   import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${tempDirPath}/${folder} 文件夹`);
   let stderr, failed;
-  ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${tempDirPath}/${folder}`, { shell: "/bin/bash" }));
+  if (cloneType === "ssh") {
+    const sshGitRepoUrl = (0, import_parseGitLabDiffUril.getSshGitRepoUrl)(gitUrl);
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${sshGitRepoUrl} ${tempDirPath}/${folder}`, { shell: true }));
+  } else {
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${tempDirPath}/${folder}`, { shell: true }));
+  }
   (0, import_handleExecaError.handleExecaError)({ failed, stderr });
   import_utils.logger.info("源代码clone完成");
   if (branchName !== "master") {
     import_utils.logger.ready("准备切换到分支");
-    ({ stderr, failed } = await import_utils.execa.execa(`cd ${tempDirPath}/${folder} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${tempDirPath}/${folder} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("源代码切换分支完成");
   }
   return { failed, stderr };
 }
-async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName) {
+async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName, cloneType) {
   const today = (0, import_dayjs.default)().format("YYYYMDD_HHmmss") + Math.random().toString(36).slice(-5);
   import_utils.logger.ready("准备生成临时工作目录...");
-  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: "/bin/bash" }));
+  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: true }));
   if (err) {
     import_utils.logger.error("临时目录删除失败");
   }
-  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: "/bin/bash" });
+  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: true });
   import_utils.logger.info("临时目录建立完成");
   try {
     let stderr, failed;
-    ({ stderr, failed } = await cloneGitRepo(gitRepoUrl, branchName, today, import_constants.TARGET));
+    ({ stderr, failed } = await cloneGitRepo(gitRepoUrl, branchName, today, import_constants.TARGET, cloneType));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.ready("准备生成git_diff.txt文件");
-    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff master..${branchName} --unified=0 --output=${import__.gitDiffFileName}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff master..${branchName} --unified=0 --output=${import__.gitDiffFileName}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     const repoType = await (0, import_getRepoSupportFlag.getRepoType)((0, import_path.join)(process.cwd(), today, import_constants.TARGET, "package.json"));
     import_utils.logger.info(`项目类型为: ${repoType}`);
@@ -103,16 +109,16 @@ async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName) {
 async function gitDiffTool(arg) {
   const { gitRepoUrl: gitUrl, baseBranch, targetBranch: branchName, tempDirPath: today, generateFile } = arg;
   import_utils.logger.ready("准备生成临时工作目录...");
-  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: "/bin/bash" }));
+  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: true }));
   if (err) {
     import_utils.logger.error("临时目录删除失败");
   }
-  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: "/bin/bash" });
+  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: true });
   import_utils.logger.info("临时目录建立完成");
   try {
     import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${import_constants.TARGET} 文件夹`);
     let stderr, failed;
-    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.TARGET}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.TARGET}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("源代码clone完成");
     import_utils.logger.wait("检测项目类型");
@@ -126,21 +132,21 @@ async function gitDiffTool(arg) {
       return;
     }
     import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${import_constants.SOURCE} 文件夹`);
-    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.SOURCE}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.SOURCE}`, { shell: true }));
     (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" }));
+      ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.SOURCE} && git fetch origin ${baseBranch}:${baseBranch} && git checkout ${baseBranch}`, { shell: true }));
       (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" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: true }));
     (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=${import__.gitDiffFileName}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff ${baseBranch}..${branchName} --unified=0 --output=${import__.gitDiffFileName}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("git_diff.txt文件生成完成");
     if (repoType === "umi") {

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

@@ -36,7 +36,7 @@ var userAliasGetter = (cwd, appData) => {
   };
 };
 async function umi4SetUp({ targetDirPath }) {
-  const shellExeResult = await import_utils.execa.execa(`cd ${targetDirPath} && npx max setup`, { shell: "/bin/bash" });
+  const shellExeResult = await import_utils.execa.execa(`cd ${targetDirPath} && npx max setup`, { shell: true });
   const tsconfig = await import_utils.tsconfigPaths.loadConfig(targetDirPath);
   const appDataContent = (0, import_fs.readFileSync)((0, import_path.join)(targetDirPath, "src", ".umi", "appData.json"), "utf-8");
   let appData = { config: null };

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

@@ -27,7 +27,7 @@ var import_fs = require("fs");
 var import_utils = require("@umijs/utils");
 var webpackConfigFileName = "__webpack.config.js";
 async function vueSetUp({ targetDir }) {
-  const shellExeResult = await import_utils.execa.execa(`cd ${targetDir} && npx vue-cli-service inspect --verbose`, { shell: "/bin/bash" });
+  const shellExeResult = await import_utils.execa.execa(`cd ${targetDir} && npx vue-cli-service inspect --verbose`, { shell: true });
   const { failed, stdout } = shellExeResult;
   const filePath = (0, import_path.join)(targetDir, webpackConfigFileName);
   if (!failed) {

package/package.json

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