marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-13 12:29:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace lodash with specific implementations, #1389

Browse Source
This commit is contained in:
hikerpig
2020-05-07 21:32:58 +08:00
parent 8ef3aee7e7
commit 28ea68fe7f
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -54,7 +54,6 @@
"dagre-d3": "^0.6.4", "dagre-d3": "^0.6.4",
"graphlib": "^2.1.7", "graphlib": "^2.1.7",
"he": "^1.2.0", "he": "^1.2.0",
"lodash": "^4.17.11",
"minify": "^4.1.1", "minify": "^4.1.1",
"moment-mini": "^2.22.1", "moment-mini": "^2.22.1",
"scope-css": "^1.2.1" "scope-css": "^1.2.1"

23
src/diagrams/git/gitGraphAst.js
View File

@@ -1,4 +1,3 @@
import _ from 'lodash';
import randomString from 'crypto-random-string'; import randomString from 'crypto-random-string';
import { logger } from '../../logger'; import { logger } from '../../logger';
@@ -43,6 +42,18 @@ function isReachableFrom(currentCommit, otherCommit) {
return false; return false;
} }
function uniqBy(list, fn) {
const recordMap = Object.create(null);
return list.reduce((out, item) => {
const key = fn(item);
if (!recordMap[key]) {
recordMap[key] = true;
out.push(item);
}
return out;
}, []);
}
export const setDirection = function(dir) { export const setDirection = function(dir) {
direction = dir; direction = dir;
}; };
@@ -142,7 +153,10 @@ function upsert(arr, key, newval) {
} }
function prettyPrintCommitHistory(commitArr) { function prettyPrintCommitHistory(commitArr) {
const commit = _.maxBy(commitArr, 'seq'); const commit = commitArr.reduce((out, commit) => {
if (out.seq > commit.seq) return out;
return commit;
}, commitArr[0]);
let line = ''; let line = '';
commitArr.forEach(function(c) { commitArr.forEach(function(c) {
if (c === commit) { if (c === commit) {
@@ -166,7 +180,7 @@ function prettyPrintCommitHistory(commitArr) {
const nextCommit = commits[commit.parent]; const nextCommit = commits[commit.parent];
upsert(commitArr, commit, nextCommit); upsert(commitArr, commit, nextCommit);
} }
commitArr = _.uniqBy(commitArr, 'id'); commitArr = uniqBy(commitArr, c => c.id);
prettyPrintCommitHistory(commitArr); prettyPrintCommitHistory(commitArr);
} }
@@ -205,7 +219,8 @@ export const getCommitsArray = function() {
commitArr.forEach(function(o) { commitArr.forEach(function(o) {
logger.debug(o.id); logger.debug(o.id);
}); });
return _.orderBy(commitArr, ['seq'], ['desc']); commitArr.sort((a, b) => b.seq - a.seq);
return commitArr;
}; };
export const getCurrentBranch = function() { export const getCurrentBranch = function() {
return curBranch; return curBranch;

3
src/diagrams/git/gitGraphRenderer.js
View File

@@ -1,5 +1,4 @@
import * as d3 from 'd3'; import * as d3 from 'd3';
import _ from 'lodash';
import db from './gitGraphAst'; import db from './gitGraphAst';
import gitGraphParser from './parser/gitGraph'; import gitGraphParser from './parser/gitGraph';
@@ -308,7 +307,7 @@ export const draw = function(txt, id, ver) {
// Parse the graph definition // Parse the graph definition
parser.parse(txt + '\n'); parser.parse(txt + '\n');
config = _.assign(config, apiConfig, db.getOptions()); config = Object.assign(config, apiConfig, db.getOptions());
logger.debug('effective options', config); logger.debug('effective options', config);
const direction = db.getDirection(); const direction = db.getDirection();
allCommitsDict = db.getCommits(); allCommitsDict = db.getCommits();