@modern-js/monorepo-tools 2.0.0-beta.0 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @modern-js/monorepo-tools
 
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- d4a4566: chore: rename plugin-jarvis to plugin-lint
+
+  chore: 重命名 plugin-jarvis 为 plugin-lint
+
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [85edee888c]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [d4a4566]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/core@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/plugin-lint@2.0.0-beta.1
+  - @modern-js/plugin@2.0.0-beta.1
+  - @modern-js/plugin-changeset@2.0.0-beta.1
+  - @modern-js/plugin-i18n@2.0.0-beta.1
+  - @modern-js/new-action@2.0.0-beta.1
+  - @modern-js/upgrade@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/cli/new.js

@@ -1,9 +1,6 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { MonorepoNewAction } from '@modern-js/new-action';
 import { i18n, localeKeys } from "../locale";
 export const newCli = (program, locale) => {

package/dist/js/modern/commands/build.js

@@ -1,13 +1,11 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { getMonorepoBaseData } from "../parse-config/monorepo";
 import { runBuildTask, runAllBuildTask } from "../features/build";
 import { getProjects } from "../projects/get-projects";
-import { initDAG } from "../dag"; // import { clearProjectsMemoryFile } from './projects/clear-memory-files';
+import { initDAG } from "../dag";
+// import { clearProjectsMemoryFile } from './projects/clear-memory-files';
 
 export const build = async (targetProjectName, option, api) => {
   const {
@@ -34,13 +32,11 @@ export const build = async (targetProjectName, option, api) => {
     packageManager
   } = getMonorepoBaseData(appDirectory);
   const overrideConfig = {};
-
   if (all) {
     overrideConfig.disableWithDeps = false;
     overrideConfig.withSelf = true;
     overrideConfig.withDept = true;
   }
-
   if (targetProjectName) {
     runBuildTask(targetProjectName, operator, _objectSpread({
       rootPath,
@@ -55,7 +51,6 @@ export const build = async (targetProjectName, option, api) => {
     }, overrideConfig));
   } else {
     const currentDir = process.cwd();
-
     if (currentDir === appDirectory) {
       await runAllBuildTask(operator, {
         rootPath: currentDir,
@@ -63,7 +58,7 @@ export const build = async (targetProjectName, option, api) => {
         disableContentHash: !contentHash,
         enableGitHash: gitHash
       });
-    } // TODO: 没有指定项目名称的构建任务如何处理
-
+    }
+    // TODO: 没有指定项目名称的构建任务如何处理
   }
 };

package/dist/js/modern/dag/create.js

@@ -1,49 +1,42 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const initProjectDependencyAndDependent = (project, projectsName, projectsMap) => {
   // dependencies、devDependencies、peerDependencies
   const dependencies = project.extra.dependencies || {};
   const devDependencies = project.extra.devDependencies || {};
   const optionalDependencies = project.extra.optionalDependencies || {};
-  const DependencyProjectsName = Object.keys(_objectSpread(_objectSpread(_objectSpread({}, dependencies), devDependencies), optionalDependencies)).filter(depName => projectsName.includes(depName)); // init dependent key
-
-  project.dependent = project.dependent || []; // get dependency ProjectNode
+  const DependencyProjectsName = Object.keys(_objectSpread(_objectSpread(_objectSpread({}, dependencies), devDependencies), optionalDependencies)).filter(depName => projectsName.includes(depName));
 
+  // init dependent key
+  project.dependent = project.dependent || [];
+  // get dependency ProjectNode
   project.dependency = DependencyProjectsName.map(projectName => {
     // 在遍历该项目的 dependency 的时候，顺便更新这些 dependency 的 dependent
     const dependencyProject = projectsMap.get(projectName);
     const dependent = (dependencyProject === null || dependencyProject === void 0 ? void 0 : dependencyProject.dependent) || [];
-
-    if ( // 消除重复添加的情况
+    if (
+    // 消除重复添加的情况
     !dependent.some(p => p.name === project.name)) {
       dependencyProject.dependent = [...dependent, project];
       dependencyProject.dependentEdge = dependencyProject.dependent.length;
     }
-
     return dependencyProject;
-  }); // NOTE: 一个节点有多少依赖，就代表有多少的入度或者叫指向该节点的边
+  });
+  // NOTE: 一个节点有多少依赖，就代表有多少的入度或者叫指向该节点的边
   // project.dagNodeEdge = project.dependency.length;
-
   project.dependencyEdge = project.dependency.length;
 };
-
 export const create = projects => {
   const projectsName = [];
   const projectsMap = new Map();
-
   for (const project of projects) {
     projectsMap.set(project.name, project);
     projectsName.push(project.name);
   }
-
   for (const project of projects) {
     initProjectDependencyAndDependent(project, projectsName, projectsMap);
   }
-
   return {
     projectsMap,
     projectList: projectsName

package/dist/js/modern/dag/edge-manager.js

@@ -1,38 +1,28 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 export class EdgeManager {
   constructor() {
     _defineProperty(this, "_dependencyEdgeHash", void 0);
-
     this._dependencyEdgeHash = {};
   }
-
   reduceOneEdge(project) {
     if (!(project.name in this._dependencyEdgeHash)) {
       this._dependencyEdgeHash[project.name] = project.dependencyEdge;
     }
-
     this._dependencyEdgeHash[project.name]--;
   }
-
   reduceEdges(project, edges) {
     if (!(project.name in this._dependencyEdgeHash)) {
       this._dependencyEdgeHash[project.name] = project.dependencyEdge;
     }
-
     this._dependencyEdgeHash[project.name] -= edges;
   }
-
   getEdge(project) {
     if (project.name in this._dependencyEdgeHash) {
       return this._dependencyEdgeHash[project.name];
     }
-
     return NaN;
   }
-
   setEdge(project) {
     this._dependencyEdgeHash[project.name] = project.dependencyEdge;
   }
-
 }

package/dist/js/modern/dag/operator.js

@@ -1,9 +1,6 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import pMap from 'p-map';
 import { errorLog } from "../log/error";
 import { TaskRunner } from "./task";
@@ -11,27 +8,22 @@ import { EdgeManager } from "./edge-manager";
 import { recursiveGetDependency, sortProjects } from "./utils";
 export class DagOperator {
   // 排序好的项目列表
+
   constructor(projects, projectsMap) {
     _defineProperty(this, "_projects", void 0);
-
     _defineProperty(this, "_projectsMap", void 0);
-
     _defineProperty(this, "_sortedProjects", void 0);
-
     _defineProperty(this, "_createTask", (project, task) => async (stopTask = () => undefined) => {
       await task(project, project.dependency || [], () => stopTask());
       return project.name;
     });
-
     this._projects = projects;
     this._projectsMap = projectsMap;
     this._sortedProjects = [];
   }
-
   checkNodeDataExist(name) {
     return this._projectsMap.has(name);
   }
-
   getNodeData(name, option = {
     checkExist: false
   }) {
@@ -42,42 +34,31 @@ export class DagOperator {
         errorLog(`No '${name}' project exist`);
       }
     }
-
     return this._projectsMap.get(name);
   }
-
   getNodeDependencyData(name) {
     var _this$_projectsMap$ge;
-
     return ((_this$_projectsMap$ge = this._projectsMap.get(name)) === null || _this$_projectsMap$ge === void 0 ? void 0 : _this$_projectsMap$ge.dependency) || [];
   }
-
   getNodeDependentData(name) {
     var _this$_projectsMap$ge2;
-
     return ((_this$_projectsMap$ge2 = this._projectsMap.get(name)) === null || _this$_projectsMap$ge2 === void 0 ? void 0 : _this$_projectsMap$ge2.dependent) || [];
   }
-
   getNodeAllDependencyData(name, option = {
     skipCircleCheck: false
   }) {
     const {
       skipCircleCheck
     } = option;
-
     if (!skipCircleCheck) {
       this.checkCircle();
     }
-
     if (!this._projectsMap.has(name)) {
       errorLog(`No '${name}' project exist`);
     }
-
     const currentNode = this._projectsMap.get(name);
-
     return recursiveGetDependency(currentNode, skipCircleCheck);
   }
-
   setNodeData(name, task) {
     if (this._projectsMap.has(name)) {
       task(this._projectsMap.get(name));
@@ -85,19 +66,17 @@ export class DagOperator {
       errorLog(`No '${name}' project exist`);
     }
   }
-
   async traverseAllNodes(task) {
     const sortedNodes = this._sortedProjects.length > 0 ? this._sortedProjects : sortProjects(this._projects);
     const finishTaskHash = {};
     let preNodes = [];
     let earlyFinish = false;
-
     for (const projects of sortedNodes) {
       if (earlyFinish) {
         break;
       }
-
-      await pMap(projects, // eslint-disable-next-line @typescript-eslint/no-loop-func
+      await pMap(projects,
+      // eslint-disable-next-line @typescript-eslint/no-loop-func
       async project => {
         if (!finishTaskHash[project.name]) {
           finishTaskHash[project.name] = true;
@@ -109,18 +88,17 @@ export class DagOperator {
       preNodes = [...projects];
     }
   }
-
   checkCircle() {
     // this._sortedProjects = sortProjects(this._projects);
     this._checkForCyclicDependencies(this._projects, [], new Set());
   }
-
   async traverseDependenciesToProjectToDependent(name, task, config = {}) {
     await this.traverseDependenciesToProject(name, task, config);
     await this.traverseProjectToDependent(name, task, _objectSpread(_objectSpread({}, config), {}, {
       withSelf: false
     }));
   }
+
   /**
    * 1. 把目标节点当做叶子节点集合 A 中的元素
    * 2. 当叶子节点集合中某个 a 元素结束任务的时候进行如下操作：
@@ -130,7 +108,6 @@ export class DagOperator {
    * 4. 根据情况（是否存在空闲的进程）选择是否执行新加入的节点对应的任务。
    */
 
-
   async traverseProjectToDependent(name, task, {
     withSelf = false,
     runTaskConcurrency
@@ -138,9 +115,7 @@ export class DagOperator {
     if (!this._projectsMap.has(name)) {
       errorLog(`No '${name}' project exist`);
     }
-
     const traverseTargetNode = this._projectsMap.get(name);
-
     const leafNodeTasks = [withSelf ? this._createTask(traverseTargetNode, task) : async () => Promise.resolve(traverseTargetNode.name)];
     const taskRunner = new TaskRunner(leafNodeTasks, {
       concurrency: runTaskConcurrency
@@ -149,12 +124,11 @@ export class DagOperator {
     taskRunner.on(TaskRunner.TASK_FINISH, projectName => {
       const projectNode = this.getNodeData(projectName);
       const dependent = projectNode.dependent || [];
-
       for (const dependentProject of dependent) {
         const dependency = dependentProject.dependency || [];
         const removeNodes = dependency.filter(dependencyProject => ![projectName, ...dependent.map(p => p.name)].includes(dependencyProject.name));
-        edgeManager.reduceEdges(dependentProject, removeNodes.length + 1); // 变成叶子节点，就加入执行任务的队列中
-
+        edgeManager.reduceEdges(dependentProject, removeNodes.length + 1);
+        // 变成叶子节点，就加入执行任务的队列中
         if (edgeManager.getEdge(dependentProject) === 0) {
           taskRunner.addTask(this._createTask(dependentProject, task));
         }
@@ -162,6 +136,7 @@ export class DagOperator {
     });
     await taskRunner.run();
   }
+
   /**
    * 1. 找到叶子节点集合 A
    * 2. 找到直接连接叶子节点的节点集合 B
@@ -169,9 +144,8 @@ export class DagOperator {
    * 4. 检查 B 集合中是否存在入度为0的节点，则此节点为叶子节点，并加入叶子节点集合 A
    * 5. 根据情况（是否存在空闲的进程）选择是否执行新加入的节点对应的任务。
    */
-  // TODO: 执行顺序还需要再确定一下
-
 
+  // TODO: 执行顺序还需要再确定一下
   async traverseDependenciesToProject(name, task, {
     withSelf = false,
     runTaskConcurrency
@@ -179,16 +153,12 @@ export class DagOperator {
     if (!this._projectsMap.has(name)) {
       errorLog(`No '${name}' project exist`);
     }
-
     const traverseTargetNode = this._projectsMap.get(name);
-
     const leafNodes = this._getDependencyLeafNodes(traverseTargetNode);
-
     if ((leafNodes === null || leafNodes === void 0 ? void 0 : leafNodes.length) === 0) {
       await this._createTask(traverseTargetNode, task)();
       return;
     }
-
     const leafNodeTasks = leafNodes.map(project => this._createTask(project, task));
     const taskRunner = new TaskRunner(leafNodeTasks, {
       concurrency: runTaskConcurrency
@@ -197,20 +167,17 @@ export class DagOperator {
     taskRunner.on(TaskRunner.TASK_FINISH, projectName => {
       const projectNode = this.getNodeData(projectName);
       const dependent = projectNode.dependent || [];
-
       for (const dependentProject of dependent) {
         // 只处理在叶子节点/目标项目的所有依赖集合的节点
         if (![traverseTargetNode, ...leafNodes].some(n => n.name === dependentProject.name)) {
           continue;
         }
-
         edgeManager.reduceOneEdge(dependentProject);
-
         if (dependentProject.name === traverseTargetNode.name && !withSelf) {
           continue;
-        } // 变成叶子节点，就加入执行任务的队列中
-
+        }
 
+        // 变成叶子节点，就加入执行任务的队列中
         if (edgeManager.getEdge(dependentProject) === 0) {
           taskRunner.addTask(this._createTask(dependentProject, task));
         }
@@ -218,6 +185,7 @@ export class DagOperator {
     });
     await taskRunner.run();
   }
+
   /**
    * Copyright (c) Microsoft Corporation. All rights reserved.
    *
@@ -228,49 +196,38 @@ export class DagOperator {
   /**
    * Checks for projects that indirectly depend on themselves.
    */
-
-
   _checkForCyclicDependencies(projects, dependencyChain, alreadyCheckedProjects) {
     for (const project of projects) {
       if (dependencyChain.includes(project.name)) {
         throw new Error(`${'A cyclic dependency was encountered:\n'}    ${[...dependencyChain, project.name].reverse().join('\n  -> ')}\n`);
       }
-
       if (!alreadyCheckedProjects.has(project.name)) {
         alreadyCheckedProjects.add(project.name);
         dependencyChain.push(project.name);
-
         this._checkForCyclicDependencies(project.dependent, dependencyChain, alreadyCheckedProjects);
-
         dependencyChain.pop();
       }
     }
   }
-
   _getDependencyLeafNodes(node) {
     const dependency = node.dependency;
-
     if (dependency.length === 0) {
       return [];
     }
-
     let leafNodes = [...dependency];
-
     for (const dependencyNode of dependency) {
       leafNodes = [...leafNodes, ...this._getDependencyLeafNodes(dependencyNode)];
     }
-
     return leafNodes;
   }
-
   _getProjectPreviousNode(searchProjects, preNodes) {
     return searchProjects.filter(p => preNodes.map(preP => preP.name).includes(p.name));
-  } // public async getOrderTasks() {
+  }
+
+  // public async getOrderTasks() {
   //     // Precalculate the number of dependent packages
   //   for (const project of this._projects) {
   //     calculateCriticalPaths(project);
   //   }
   // }
-
-
 }

package/dist/js/modern/dag/task.js

@@ -1,5 +1,4 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { EventEmitter } from 'events';
 import pMap from 'p-map';
 export class TaskRunner extends EventEmitter {
@@ -7,24 +6,17 @@ export class TaskRunner extends EventEmitter {
     concurrency
   }) {
     super();
-
     _defineProperty(this, "_tasks", void 0);
-
     _defineProperty(this, "_concurrency", void 0);
-
     _defineProperty(this, "_usableConcurrency", void 0);
-
     _defineProperty(this, "_stopFlag", void 0);
-
     this._tasks = tasks;
     this._concurrency = concurrency || TaskRunner.DefaultConcurrency;
     this._usableConcurrency = this._concurrency;
     this._stopFlag = false;
   }
-
   async run() {
     const tasks = this._tasks.splice(0, this._concurrency);
-
     this._usableConcurrency = this._concurrency - tasks.length;
     await pMap(tasks, async task => {
       await this._runTask(task);
@@ -32,25 +24,19 @@ export class TaskRunner extends EventEmitter {
       concurrency: tasks.length
     });
   }
-
   addTask(task) {
     this._tasks.push(task);
   }
-
   async _runTask(task) {
     if (this._stopFlag) {
       return;
     }
-
     const emitValue = await task(this._stopTask.bind(this));
     this._usableConcurrency--;
     this.emit(TaskRunner.TASK_FINISH, emitValue);
-
     if (this._tasks.length > 0) {
       const nextTasks = this._tasks.splice(0, this._usableConcurrency);
-
       this._usableConcurrency -= nextTasks.length;
-
       if (nextTasks.length > 0) {
         await pMap(nextTasks, async _task => {
           await this._runTask(_task);
@@ -60,13 +46,9 @@ export class TaskRunner extends EventEmitter {
       }
     }
   }
-
   _stopTask() {
     this._stopFlag = true;
   }
-
 }
-
 _defineProperty(TaskRunner, "DefaultConcurrency", 10);
-
 _defineProperty(TaskRunner, "TASK_FINISH", 'task-finish');

package/dist/js/modern/dag/utils.js

@@ -1,25 +1,23 @@
 import { errorLog } from "../log/error";
 import { EdgeManager } from "./edge-manager";
+
 /**
  * Calculate the number of packages which must be built before we reach
  * the furthest away "root" node
  */
-
 export const calculateCriticalPaths = project => {
   var _project$dependent;
-
   // Return the memoized value
   if (project.criticalPathLength !== undefined) {
     return project.criticalPathLength;
-  } // If no dependents, we are in a "root"
-
+  }
 
+  // If no dependents, we are in a "root"
   if (((_project$dependent = project.dependent) === null || _project$dependent === void 0 ? void 0 : _project$dependent.length) === 0) {
     project.criticalPathLength = 0;
     return project.criticalPathLength;
   } else {
     var _project$dependent2;
-
     // Otherwise we are as long as the longest package + 1
     const depsLengths = [];
     (_project$dependent2 = project.dependent) === null || _project$dependent2 === void 0 ? void 0 : _project$dependent2.forEach(dependentProject => depsLengths.push(calculateCriticalPaths(dependentProject)));
@@ -27,16 +25,13 @@ export const calculateCriticalPaths = project => {
     return project.criticalPathLength;
   }
 };
-
 const _recursiveGetDependencySkipCircleDeps = node => {
   let allDeps = [];
   const foundDepsNameSet = new Set([node.name]);
   let queue = [node];
-
   while (queue.length > 0) {
     const checkNode = queue.pop();
     const checkNodeDeps = checkNode.dependency || [];
-
     if (checkNodeDeps.length > 0) {
       const willIntoQueue = checkNodeDeps.filter(dep => !foundDepsNameSet.has(dep.name));
       allDeps = [...allDeps, ...willIntoQueue];
@@ -44,71 +39,60 @@ const _recursiveGetDependencySkipCircleDeps = node => {
       queue = [...queue, ...willIntoQueue];
     }
   }
-
   return allDeps;
 };
-
 export const recursiveGetDependency = (project, skipCircleProjects = false) => {
   if (skipCircleProjects) {
     return _recursiveGetDependencySkipCircleDeps(project);
   }
-
   const dependency = project.dependency || [];
   let allDependency = [...dependency];
-
   for (const dependencyProject of dependency) {
     allDependency = [...allDependency, ...recursiveGetDependency(dependencyProject)];
   }
-
   return allDependency;
-}; // 拓扑排序
+};
 
+// 拓扑排序
 export const sortProjects = projects => {
   const sortedQueue = []; // 排好序的队列
-
   let readyIntoSortedQueue = []; // 用来准备放入 sortedQueue的数组
-
   let queue = []; // 用来存放入度为0的节点
-
-  const edgeManager = new EdgeManager(); // 初始化队列queue
-
+  const edgeManager = new EdgeManager();
+  // 初始化队列queue
   for (const project of projects) {
-    edgeManager.setEdge(project); // 入度为0进队列
+    edgeManager.setEdge(project);
+    // 入度为0进队列
     // TODO 可能存在多个 dagNodeFrom === 0 的节点
-
     if (edgeManager.getEdge(project) === 0) {
       queue.push(project);
     }
-  } // 加入最初入度为0的节点
-
+  }
 
+  // 加入最初入度为0的节点
   sortedQueue.push([...queue]);
   let shiftNodesCount = 0; // 计算出队列的节点数量，用于在最后判断是否存在环/依赖循环
 
   while (queue.length > 0) {
     const checkNode = queue.shift();
     shiftNodesCount++;
-
     for (const toNode of checkNode.dependent) {
       edgeManager.reduceOneEdge(toNode);
-
       if (edgeManager.getEdge(toNode) === 0) {
         readyIntoSortedQueue.push(toNode);
       }
     }
-
     if (queue.length === 0 && readyIntoSortedQueue.length > 0) {
       queue = [...readyIntoSortedQueue];
       sortedQueue.push([...readyIntoSortedQueue]);
       readyIntoSortedQueue = [];
     }
   }
-
   if (shiftNodesCount < projects.length) {
     errorLog('Items with a dependency loop');
-  } else {// console.info('No dependency loop');
+  } else {
+    // console.info('No dependency loop');
   }
-
   return sortedQueue;
 };
 export const findCircle = projects => {
@@ -116,11 +100,9 @@ export const findCircle = projects => {
     if (project.dependencyEdge > 0) {
       return [...circleNodes, project];
     }
-
     return circleNodes;
   }, []);
   result = result.sort((a, b) => a.dependencyEdge - b.dependencyEdge);
-
   while (result.length > 0) {
     const checkNode = result.shift();
     checkNode.dependencyEdge--;