js-code-detector 0.0.36 → 0.0.38

package/dist/cjs/index.d.ts

@@ -1,4 +1,3 @@
-import { CloneType } from "./util/shared/gitDiffTool";
 export declare const gitDiffFileName = "git_diff.txt";
 export declare function getGitRepositoryAndBranch(): Promise<{
     gitUrl: string;
@@ -49,6 +48,6 @@ export declare function gitDiffDetectByUrl(inputUrl: string): Promise<{
         filePath: string;
     }[];
 } | undefined>;
-export declare function getUpstreamDependenceJson(inputUrl: string, cloneType?: CloneType): Promise<{
+export declare function getUpstreamDependenceJson(inputUrl: string, token: string): 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, cloneType) {
+async function getUpstreamDependenceJson(inputUrl, token) {
   const gitInfo = (0, import_parseGitLabDiffUril.parseGitLabCompareUrl)(inputUrl);
-  return (0, import_gitDiffTool.cloneGitRepoAndGetDiff)(gitInfo.gitRepoUrl, gitInfo.targetBranch, cloneType);
+  return (0, import_gitDiffTool.cloneGitRepoAndGetDiff)(gitInfo.gitRepoUrl, gitInfo.targetBranch, { cloneType: token ? "token" : void 0, token });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -11,4 +11,4 @@ export declare function parseGitLabCompareUrl(compareUrl: string): {
     targetBranch: string;
 };
 export declare function getSshGitRepoUrl(gitRepoUrl: string): string;
-export declare function getGitRepoUrlByToken(gitRepoUrl: string): string;
+export declare function getGitRepoUrlByToken(gitRepoUrl: string, gitlabToken: string): string;

package/dist/cjs/util/parseGitLabDiffUril.js

@@ -62,10 +62,9 @@ function parseGitLabCompareUrl(compareUrl) {
 function getSshGitRepoUrl(gitRepoUrl) {
   return gitRepoUrl.replace(/https?:\/\/[^/]+/, "git@");
 }
-function getGitRepoUrlByToken(gitRepoUrl) {
+function getGitRepoUrlByToken(gitRepoUrl, gitlabToken) {
   const urlObj = new URL(gitRepoUrl);
-  const gitlabToken = process.env.GITLAB_ACCESS_TOKEN;
-  const gitlabDomain = process.env.GITLAB_DOMAIN || urlObj.hostname;
+  const gitlabDomain = urlObj.hostname;
   const projectPath = urlObj.pathname.replace(/\.git/, "");
   if (!gitlabToken) {
     throw new Error("未配置 GitLab accessToken，请通过 GITLAB_ACCESS_TOKEN 环境变量传入");

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

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

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

@@ -49,14 +49,15 @@ 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) {
+async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder, extra = {}) {
+  const { cloneType, token = "" } = extra;
   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);
+    const repoUrl = (0, import_parseGitLabDiffUril.getGitRepoUrlByToken)(gitUrl, token);
     ({ stderr, failed } = await import_utils.execa.execa(`git clone ${repoUrl} ${tempDirPath}/${folder}`, { shell: true }));
   } else {
     await (0, import_gitUtil.cloneRepoWithBranchAndDefault)(gitUrl, `${tempDirPath}/${folder}`, branchName);
@@ -71,7 +72,8 @@ async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder, cloneType)
   }
   return { failed, stderr };
 }
-async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName, cloneType) {
+async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName, extra = {}) {
+  const { cloneType, token } = extra;
   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 }));
@@ -82,7 +84,7 @@ async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName, cloneType) {
   import_utils.logger.info("临时目录建立完成");
   try {
     let stderr, failed;
-    ({ stderr, failed } = await cloneGitRepo(gitRepoUrl, branchName, today, import_constants.TARGET, cloneType));
+    ({ stderr, failed } = await cloneGitRepo(gitRepoUrl, branchName, today, import_constants.TARGET, { cloneType, token }));
     (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.36",
+  "version": "0.0.38",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",