js-code-detector 0.0.38 → 0.0.40

package/dist/cjs/index.d.ts

@@ -20,7 +20,7 @@ export declare function gitDiffDetect(): Promise<{
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "modify" | "add" | "delete";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;
@@ -42,7 +42,7 @@ export declare function gitDiffDetectByUrl(inputUrl: string): Promise<{
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "modify" | "add" | "delete";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;

package/dist/cjs/util/report_util/generateGitDiffReport.d.ts

@@ -21,7 +21,7 @@ export declare function generateGitDiffReport(arg: {
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "modify" | "add" | "delete";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;

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

@@ -35,7 +35,7 @@ export declare function createDetectReport(arg: Arg): {
             effectsDownstream: string[];
         }[];
     }[];
-    type: "modify" | "add" | "delete";
+    type: "add" | "delete" | "modify";
     filesDependsOnMe: string[];
     undefinedIdentifiers: string[];
     filePath: string;

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

@@ -1,2 +1,3 @@
+import { semver } from "@umijs/utils";
 export declare function getRepoType(jsonPath: string): "umi" | null | undefined;
-export declare function getRepoSupportFlag(jsonPath: string): boolean;
+export declare function getMinVersion(jsonPath: string, depName: string): semver.SemVer | null | undefined;

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

@@ -19,11 +19,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/util/shared/getRepoSupportFlag.ts
 var getRepoSupportFlag_exports = {};
 __export(getRepoSupportFlag_exports, {
-  getRepoSupportFlag: () => getRepoSupportFlag,
+  getMinVersion: () => getMinVersion,
   getRepoType: () => getRepoType
 });
 module.exports = __toCommonJS(getRepoSupportFlag_exports);
 var import_fs = require("fs");
+var import_utils = require("@umijs/utils");
 function getRepoType(jsonPath) {
   var _a;
   const isExist = (0, import_fs.existsSync)(jsonPath);
@@ -41,24 +42,23 @@ function getRepoType(jsonPath) {
     return null;
   }
 }
-function getRepoSupportFlag(jsonPath) {
-  var _a;
-  const isExist = (0, import_fs.existsSync)(jsonPath);
-  if (!isExist)
-    return false;
+function getMinVersion(jsonPath, depName) {
+  var _a, _b;
   const packageJson = (0, import_fs.readFileSync)(jsonPath, "utf-8");
   if (!packageJson)
-    return false;
+    return null;
   try {
     const packageJsonObj = JSON.parse(packageJson);
-    const supportFlag = !!((_a = packageJsonObj.dependencies) == null ? void 0 : _a["@umijs/max"]);
-    return supportFlag;
+    const v = ((_a = packageJsonObj == null ? void 0 : packageJsonObj.dependencies) == null ? void 0 : _a[depName]) || ((_b = packageJsonObj == null ? void 0 : packageJsonObj.devDependencies) == null ? void 0 : _b[depName]);
+    if (v) {
+      return import_utils.semver.minVersion(v);
+    }
   } catch (e) {
-    return false;
+    return null;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getRepoSupportFlag,
+  getMinVersion,
   getRepoType
 });

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

@@ -1,12 +1,5 @@
 import { generateGitDiffReport } from "../report_util/generateGitDiffReport";
 export type CloneType = 'ssh' | 'token';
-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, extra?: {
     cloneType?: CloneType;
     token?: string;
@@ -35,7 +28,7 @@ export declare function gitDiffTool(arg: {
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "modify" | "add" | "delete";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;

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

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/util/shared/gitDiffTool.ts
 var gitDiffTool_exports = {};
 __export(gitDiffTool_exports, {
-  cloneGitRepo: () => cloneGitRepo,
   cloneGitRepoAndGetDiff: () => cloneGitRepoAndGetDiff,
   gitDiffTool: () => gitDiffTool
 });
@@ -49,31 +48,8 @@ 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, 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, 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);
-  }
-  (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: true }));
-    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
-    import_utils.logger.info("源代码切换分支完成");
-  }
-  return { failed, stderr };
-}
 async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName, extra = {}) {
-  const { cloneType, token } = extra;
+  const { 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 }));
@@ -84,8 +60,9 @@ async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName, extra = {}) {
   import_utils.logger.info("临时目录建立完成");
   try {
     let stderr, failed;
-    ({ stderr, failed } = await cloneGitRepo(gitRepoUrl, branchName, today, import_constants.TARGET, { cloneType, token }));
-    (0, import_handleExecaError.handleExecaError)({ failed, stderr });
+    import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${today}/${import_constants.TARGET} 文件夹`);
+    const repoUrl = (0, import_parseGitLabDiffUril.getGitRepoUrlByToken)(gitRepoUrl, token || "");
+    await (0, import_gitUtil.cloneRepoWithBranchAndDefault)(repoUrl, branchName, (0, import_path.join)(today, import_constants.TARGET));
     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 }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
@@ -176,7 +153,6 @@ async function gitDiffTool(arg) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  cloneGitRepo,
   cloneGitRepoAndGetDiff,
   gitDiffTool
 });

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

@@ -26,6 +26,7 @@ var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_getMadgeInstance = require("../report_util/getMadgeInstance");
+var import_getRepoSupportFlag = require("./getRepoSupportFlag");
 var userAliasGetter = (cwd, appData) => {
   var _a;
   return ((_a = appData.config) == null ? void 0 : _a.alias) || {
@@ -36,11 +37,13 @@ var userAliasGetter = (cwd, appData) => {
   };
 };
 async function umi4SetUp({ targetDirPath }) {
-  const shellExeResult = await import_utils.execa.execa(`cd ${targetDirPath} && npx max setup`, { shell: true });
+  const minVersion = (0, import_getRepoSupportFlag.getMinVersion)((0, import_path.join)(targetDirPath, "package.json"), "@umijs/max");
+  import_utils.logger.info(`正在安装 @umijs/max@ 并执行 setup 脚本...`);
+  const shellExeResult = await import_utils.execa.execa(`cd ${targetDirPath} && yarn remove @umijs/max && yarn add @umijs/max && 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 };
   try {
+    const appDataContent = (0, import_fs.readFileSync)((0, import_path.join)(targetDirPath, "src", ".umi", "appData.json"), "utf-8");
     appData = JSON.parse(appDataContent);
   } catch (e) {
     console.warn("appData.json 解析失败，将使用默认别名");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-code-detector",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -35,7 +35,6 @@
   },
   "dependencies": {
     "@babel/parser": "^7.28.3",
-    "@umijs/max": "^4.5.3",
     "@umijs/utils": "^4.4.12",
     "await-to-js": "^3.0.0",
     "crypto-js": "^4.2.0",