js-code-detector 0.0.39 → 0.0.41

package/dist/cjs/util/report_util/getMadgeInstance.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/util/report_util/getMadgeInstance.ts
@@ -23,16 +33,9 @@ __export(getMadgeInstance_exports, {
 });
 module.exports = __toCommonJS(getMadgeInstance_exports);
 var import_path = require("path");
-var import_utils = require("@umijs/utils");
-var MADGE_NAME = "madge";
+var import_madge = __toESM(require("madge"));
 async function getMadgeInstance(devTmpDir, targetDirPath, exclude, filteredAlias, tsconfig = {}) {
   const exportsFile = (0, import_path.join)(devTmpDir, "exports.ts");
-  const madgePkg = (0, import_path.dirname)(
-    import_utils.resolve.sync(`${MADGE_NAME}/package.json`, {
-      basedir: process.cwd()
-    })
-  );
-  const madge = require(madgePkg);
   const madgeConfig = {
     tsConfig: {
       compilerOptions: {
@@ -58,7 +61,7 @@ async function getMadgeInstance(devTmpDir, targetDirPath, exclude, filteredAlias
     excludeRegExp: exclude,
     baseDir: targetDirPath
   };
-  const res = await madge((0, import_path.join)(devTmpDir, "umi.ts"), madgeConfig);
+  const res = await (0, import_madge.default)((0, import_path.join)(devTmpDir, "umi.ts"), madgeConfig);
   return res;
 }
 // Annotate the CommonJS export names for ESM import in node:

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/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;

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,7 +26,6 @@ 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) || {
@@ -37,7 +36,6 @@ var userAliasGetter = (cwd, appData) => {
   };
 };
 async function umi4SetUp({ targetDirPath }) {
-  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);

package/package.json

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