js-code-detector 0.0.30 → 0.0.32

package/dist/cjs/index.js

@@ -47,9 +47,9 @@ var import_parseGitLabDiffUril = require("./util/parseGitLabDiffUril");
 var import_gitDiffTool = require("./util/shared/gitDiffTool");
 var gitDiffFileName = "git_diff.txt";
 async function getGitRepositoryAndBranch() {
-  const res = await import_utils.execa.execa("git remote get-url origin", { shell: "/bin/bash" });
+  const res = await import_utils.execa.execa("git remote get-url origin", { shell: true });
   import_utils.chalk.green(["仓库地址：", res.stdout]);
-  const branch = await import_utils.execa.execa("git rev-parse --abbrev-ref HEAD", { shell: "/bin/bash" });
+  const branch = await import_utils.execa.execa("git rev-parse --abbrev-ref HEAD", { shell: true });
   import_utils.chalk.green(["分支名称：", branch.stdout]);
   return {
     gitUrl: res.stdout,

package/dist/cjs/util/ast_util/AstFeatUtil.js

@@ -32,7 +32,7 @@ __export(AstFeatUtil_exports, {
   default: () => AstFeatUtil
 });
 module.exports = __toCommonJS(AstFeatUtil_exports);
-var import_lodash_es = require("lodash-es");
+var import_lodash = require("lodash");
 var import_sha1 = __toESM(require("crypto-js/sha1"));
 var import_enc_base64 = __toESM(require("crypto-js/enc-base64"));
 var import_featureLevel = require("../shared/featureLevel");
@@ -202,7 +202,7 @@ var AstFeatUtil = class {
     let listOfCollection = listOfNodeInfo.map((e) => e.edgeNodeCollection);
     for (let i = 1; i <= maxDepth; i++) {
       const hashKeyList = listOfCollection.map((nodes) => nodes.map((node) => node._util.mapDepthDiffToHashKey.get(1)).filter(Boolean));
-      const commonHashKeyList = (0, import_lodash_es.intersection)(...hashKeyList);
+      const commonHashKeyList = (0, import_lodash.intersection)(...hashKeyList);
       listOfCollection = listOfCollection.map((nodes) => nodes.filter((node) => commonHashKeyList.includes(node._util.mapDepthDiffToHashKey.get(1))));
       if (listOfCollection.every((collection) => collection.length > 0)) {
         listOfCollection.forEach((col, index) => {

package/dist/cjs/util/ast_util/Core.js

@@ -32,7 +32,7 @@ __export(Core_exports, {
   default: () => Core
 });
 module.exports = __toCommonJS(Core_exports);
-var import_lodash_es = require("lodash-es");
+var import_lodash = require("lodash");
 var import_FileUtil = __toESM(require("./FileUtil"));
 var import_AstFeatUtil = __toESM(require("./AstFeatUtil"));
 var Core = class {
@@ -86,13 +86,13 @@ ${content}
       const newList = listOfNodeInfo.map(({ rootNode, edgeNodeCollection }) => {
         var _a;
         const { filePath, startLine, endLine } = rootNode._util;
-        const linesNums = (0, import_lodash_es.range)(startLine, endLine + 1);
+        const linesNums = (0, import_lodash.range)(startLine, endLine + 1);
         const edgeNodesLines = edgeNodeCollection.map((edgeNode) => {
           const { startLine: itemStartLine, endLine: itemEndLine } = edgeNode._util;
           if (itemStartLine === startLine || itemEndLine === endLine) {
             return [];
           }
-          return itemStartLine + 1 >= itemEndLine ? [] : (0, import_lodash_es.range)(itemStartLine + 1, itemEndLine);
+          return itemStartLine + 1 >= itemEndLine ? [] : (0, import_lodash.range)(itemStartLine + 1, itemEndLine);
         }).flat();
         const listOfRatedContent = [
           {

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

@@ -50,12 +50,12 @@ var import_format_git_diff_content = require("../format_git_diff_content");
 async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder) {
   import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${tempDirPath}/${folder} 文件夹`);
   let stderr, failed;
-  ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${tempDirPath}/${folder}`, { shell: "/bin/bash" }));
+  ({ 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") {
     import_utils.logger.ready("准备切换到分支");
-    ({ stderr, failed } = await import_utils.execa.execa(`cd ${tempDirPath}/${folder} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: "/bin/bash" }));
+    ({ 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("源代码切换分支完成");
   }
@@ -64,18 +64,18 @@ async function cloneGitRepo(gitUrl, branchName, tempDirPath, folder) {
 async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName) {
   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: "/bin/bash" }));
+  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: true }));
   if (err) {
     import_utils.logger.error("临时目录删除失败");
   }
-  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: "/bin/bash" });
+  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: true });
   import_utils.logger.info("临时目录建立完成");
   try {
     let stderr, failed;
     ({ stderr, failed } = await cloneGitRepo(gitRepoUrl, branchName, today, import_constants.TARGET));
     (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: "/bin/bash" }));
+    ({ 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 });
     const repoType = await (0, import_getRepoSupportFlag.getRepoType)((0, import_path.join)(process.cwd(), today, import_constants.TARGET, "package.json"));
     import_utils.logger.info(`项目类型为: ${repoType}`);
@@ -103,16 +103,16 @@ async function cloneGitRepoAndGetDiff(gitRepoUrl, branchName) {
 async function gitDiffTool(arg) {
   const { gitRepoUrl: gitUrl, baseBranch, targetBranch: branchName, tempDirPath: today, generateFile } = arg;
   import_utils.logger.ready("准备生成临时工作目录...");
-  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: "/bin/bash" }));
+  const [err] = await (0, import_await_to_js.default)(import_utils.execa.execa(`rm -rf ${today}`, { shell: true }));
   if (err) {
     import_utils.logger.error("临时目录删除失败");
   }
-  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: "/bin/bash" });
+  await import_utils.execa.execa(`mkdir -p ${today}`, { shell: true });
   import_utils.logger.info("临时目录建立完成");
   try {
     import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${import_constants.TARGET} 文件夹`);
     let stderr, failed;
-    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.TARGET}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.TARGET}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("源代码clone完成");
     import_utils.logger.wait("检测项目类型");
@@ -126,21 +126,21 @@ async function gitDiffTool(arg) {
       return;
     }
     import_utils.logger.ready(`准备clone 源代码到临时目录下的 ${import_constants.SOURCE} 文件夹`);
-    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.SOURCE}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`git clone ${gitUrl} ${today}/${import_constants.SOURCE}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("源代码clone完成");
     if (baseBranch !== "master") {
       import_utils.logger.ready("准备切换到基准分支");
-      ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.SOURCE} && git fetch origin ${baseBranch}:${baseBranch} && git checkout ${baseBranch}`, { shell: "/bin/bash" }));
+      ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.SOURCE} && git fetch origin ${baseBranch}:${baseBranch} && git checkout ${baseBranch}`, { shell: true }));
       (0, import_handleExecaError.handleExecaError)({ failed, stderr });
       import_utils.logger.info("源代码切换到基准分支完成");
     }
     import_utils.logger.ready("准备切换到目标分支");
-    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git fetch origin ${branchName}:${branchName} && git checkout ${branchName}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("分支切换完成");
     import_utils.logger.ready("准备生成git_diff.txt文件");
-    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff ${baseBranch}..${branchName} --unified=0 --output=${import__.gitDiffFileName}`, { shell: "/bin/bash" }));
+    ({ stderr, failed } = await import_utils.execa.execa(`cd ${today}/${import_constants.TARGET} && git diff ${baseBranch}..${branchName} --unified=0 --output=${import__.gitDiffFileName}`, { shell: true }));
     (0, import_handleExecaError.handleExecaError)({ failed, stderr });
     import_utils.logger.info("git_diff.txt文件生成完成");
     if (repoType === "umi") {

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

@@ -36,7 +36,7 @@ var userAliasGetter = (cwd, appData) => {
   };
 };
 async function umi4SetUp({ targetDirPath }) {
-  const shellExeResult = await import_utils.execa.execa(`cd ${targetDirPath} && npx max setup`, { shell: "/bin/bash" });
+  const shellExeResult = await import_utils.execa.execa(`cd ${targetDirPath} && 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 };

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

@@ -27,7 +27,7 @@ var import_fs = require("fs");
 var import_utils = require("@umijs/utils");
 var webpackConfigFileName = "__webpack.config.js";
 async function vueSetUp({ targetDir }) {
-  const shellExeResult = await import_utils.execa.execa(`cd ${targetDir} && npx vue-cli-service inspect --verbose`, { shell: "/bin/bash" });
+  const shellExeResult = await import_utils.execa.execa(`cd ${targetDir} && npx vue-cli-service inspect --verbose`, { shell: true });
   const { failed, stdout } = shellExeResult;
   const filePath = (0, import_path.join)(targetDir, webpackConfigFileName);
   if (!failed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-code-detector",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
+    "@types/lodash": "^4.17.20",
     "@types/madge": "^5.0.3",
     "father": "^4.6.3"
   },
@@ -40,7 +40,7 @@
     "await-to-js": "^3.0.0",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.13",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "madge": "^8.0.0",
     "vue-eslint-parser": "^10.2.0"
   }