js-code-detector 0.0.33 → 0.0.35

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, cloneType?: 'ssh'): Promise<{
+export declare function getUpstreamDependenceJson(inputUrl: string, cloneType?: CloneType): Promise<{
     [k: string]: string[];
 } | undefined>;

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

@@ -11,3 +11,4 @@ export declare function parseGitLabCompareUrl(compareUrl: 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,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/util/parseGitLabDiffUril.ts
 var parseGitLabDiffUril_exports = {};
 __export(parseGitLabDiffUril_exports, {
+  getGitRepoUrlByToken: () => getGitRepoUrlByToken,
   getSshGitRepoUrl: () => getSshGitRepoUrl,
   parseGitLabCompareUrl: () => parseGitLabCompareUrl
 });
@@ -61,8 +62,22 @@ function parseGitLabCompareUrl(compareUrl) {
 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, cloneType?: 'ssh'): Promise<{
-    failed: boolean;
-    stderr: string;
+export type CloneType = 'ssh' | 'token';
+export declare function cloneGitRepo(gitUrl: string, branchName: string, tempDirPath: string, folder: string, cloneType?: CloneType): Promise<{
+    failed: boolean | undefined;
+    stderr: string | undefined;
 }>;
-export declare function cloneGitRepoAndGetDiff(gitRepoUrl: string, branchName: string, cloneType?: 'ssh'): 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

@@ -48,14 +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");
+var import_gitUtil = require("./gitUtil");
 async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder, cloneType) {
   import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${tempDirPath}/${folder} 文件夹`);
   let stderr, failed;
   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 }));
+    await (0, import_gitUtil.cloneRepoWithBranchAndDefault)(gitUrl, `${tempDirPath}/${folder}`, branchName);
   }
   (0, import_handleExecaError.handleExecaError)({ failed, stderr });
   import_utils.logger.info("源代码clone完成");

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

@@ -0,0 +1,8 @@
+/**
+ * 克隆 Git 仓库，同时获取目标分支和默认分支的代码
+ * @param {string} repoUrl - 仓库地址（带认证信息的 HTTPS/SSH 地址）
+ * @param {string} targetBranch - 主要目标分支（如 dev）
+ * @param {string} targetDir - 本地目标目录
+ * @returns {Promise<string>} 克隆目录路径
+ */
+export declare function cloneRepoWithBranchAndDefault(repoUrl: string, targetBranch: string, targetDir: string): Promise<string>;

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

@@ -0,0 +1,51 @@
+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/gitUtil.ts
+var gitUtil_exports = {};
+__export(gitUtil_exports, {
+  cloneRepoWithBranchAndDefault: () => cloneRepoWithBranchAndDefault
+});
+module.exports = __toCommonJS(gitUtil_exports);
+var simpleGit = require("simple-git");
+async function cloneRepoWithBranchAndDefault(repoUrl, targetBranch, targetDir) {
+  try {
+    const git = simpleGit();
+    await git.clone(repoUrl, targetDir, [
+      `--branch=${targetBranch}`
+      // 初始检出目标分支
+      // 不添加 --single-branch，默认会拉取所有分支的引用
+    ]);
+    const repoGit = simpleGit(targetDir);
+    const remoteInfo = await repoGit.remote(["show", "origin"]);
+    const defaultBranchMatch = remoteInfo.match(/HEAD branch: (\S+)/);
+    const defaultBranch = defaultBranchMatch ? defaultBranchMatch[1] : "main";
+    await repoGit.checkout(defaultBranch);
+    await repoGit.pull("origin", defaultBranch);
+    await repoGit.checkout(targetBranch);
+    console.log(`克隆完成：目标分支 ${targetBranch} + 默认分支 ${defaultBranch}，路径：${targetDir}`);
+    return targetDir;
+  } catch (error) {
+    console.error(`克隆失败：${error.message}`);
+    throw error;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cloneRepoWithBranchAndDefault
+});

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-code-detector",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -42,6 +42,7 @@
     "dayjs": "^1.11.13",
     "lodash": "^4.17.21",
     "madge": "^8.0.0",
+    "simple-git": "^3.28.0",
     "vue-eslint-parser": "^10.2.0"
   }
 }