js-code-detector 0.0.32 → 0.0.34

package/dist/cjs/index.d.ts

@@ -1,3 +1,4 @@
+import { CloneType } from "./util/shared/gitDiffTool";
 export declare const gitDiffFileName = "git_diff.txt";
 export declare function getGitRepositoryAndBranch(): Promise<{
     gitUrl: string;
@@ -48,6 +49,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?: CloneType): Promise<{
     [k: string]: string[];
 } | undefined>;

package/dist/cjs/index.js

@@ -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,5 @@ export declare function parseGitLabCompareUrl(compareUrl: string): {
     baseBranch: string;
     targetBranch: string;
 };
+export declare function getSshGitRepoUrl(gitRepoUrl: string): string;
+export declare function getGitRepoUrlByToken(gitRepoUrl: string): string;

package/dist/cjs/util/parseGitLabDiffUril.js

@@ -19,6 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/util/parseGitLabDiffUril.ts
 var parseGitLabDiffUril_exports = {};
 __export(parseGitLabDiffUril_exports, {
+  getGitRepoUrlByToken: () => getGitRepoUrlByToken,
+  getSshGitRepoUrl: () => getSshGitRepoUrl,
   parseGitLabCompareUrl: () => parseGitLabCompareUrl
 });
 module.exports = __toCommonJS(parseGitLabDiffUril_exports);
@@ -57,7 +59,25 @@ function parseGitLabCompareUrl(compareUrl) {
     targetBranch
   };
 }
+function getSshGitRepoUrl(gitRepoUrl) {
+  return gitRepoUrl.replace(/https?:\/\/[^/]+/, "git@");
+}
+function getGitRepoUrlByToken(gitRepoUrl) {
+  const urlObj = new URL(gitRepoUrl);
+  const gitlabToken = process.env.GITLAB_ACCESS_TOKEN;
+  const gitlabDomain = process.env.GITLAB_DOMAIN || urlObj.hostname;
+  const projectPath = urlObj.pathname.replace(/\.git/, "");
+  if (!gitlabToken) {
+    throw new Error("未配置 GitLab accessToken，请通过 GITLAB_ACCESS_TOKEN 环境变量传入");
+  }
+  if (!projectPath) {
+    throw new Error("请传入 GitLab 项目路径（如 dev-team/my-project）");
+  }
+  return `http://${gitlabToken}@${gitlabDomain}/${projectPath}.git`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getGitRepoUrlByToken,
+  getSshGitRepoUrl,
   parseGitLabCompareUrl
 });

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

@@ -1,9 +1,10 @@
 import { generateGitDiffReport } from "../report_util/generateGitDiffReport";
-export declare function cloneGitRepo(gitUrl: string, branchName: string, tempDirPath: string, folder: string): Promise<{
+export type CloneType = 'ssh' | 'token';
+export declare function cloneGitRepo(gitUrl: string, branchName: string, tempDirPath: string, folder: string, cloneType?: CloneType): Promise<{
     failed: boolean;
     stderr: string;
 }>;
-export declare function cloneGitRepoAndGetDiff(gitRepoUrl: string, branchName: string): Promise<{
+export declare function cloneGitRepoAndGetDiff(gitRepoUrl: string, branchName: string, cloneType?: CloneType): 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,10 +48,18 @@ 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: true }));
+  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 if (cloneType === "token") {
+    const repoUrl = (0, import_parseGitLabDiffUril.getGitRepoUrlByToken)(gitUrl);
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${repoUrl} ${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") {
@@ -61,7 +70,7 @@ async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder) {
   }
   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: true }));
@@ -72,7 +81,7 @@ async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName) {
   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: true }));

package/package.json

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