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

#1295 Lint fixes

Browse Source
This commit is contained in:
Knut Sveidqvist
2020-04-16 19:57:56 +02:00
parent c3f2e8dde1
commit e8e7b419b5
3 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dagre-wrapper/index.js
View File

@@ -9,7 +9,7 @@ import {
findNonClusterChild
} from './mermaid-graphlib';
import { insertNode, positionNode, clear as clearNodes, setNodeElem } from './nodes';
import { insertCluster, clear as clearClusters, positionCluster } from './clusters';
import { insertCluster, clear as clearClusters } from './clusters';
import { insertEdgeLabel, positionEdgeLabel, insertEdge, clear as clearEdges } from './edges';
import { logger as log } from '../logger';
@@ -73,22 +73,8 @@ const recursiveRender = (_elem, graph, diagramtype, parentCluster) => {
log.trace('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(e));
log.trace('Edge ' + e.v + ' -> ' + e.w + ': ', e, ' ', JSON.stringify(graph.edge(e)));
let v = e.v;
let w = e.w;
// Check if link is either from or to a cluster
log.trace('Fix', clusterDb, 'ids:', e.v, e.w, 'Translateing: ', clusterDb[e.v], clusterDb[e.w]);
// Todo handle case with links
// if (clusterDb[e.v] || clusterDb[e.w]) {
// log.trace('Fixing and trixing - removing', e.v, e.w, e.name);
// v = getAnchorId(e.v, graph, nodes);
// w = getAnchorId(e.w, graph, nodes);
// graph.removeEdge(e.v, e.w, e.name);
// if (v !== e.v) edge.fromCluster = e.v;
// if (w !== e.w) edge.toCluster = e.w;
// log.trace('Fixing Replacing with', v, w, e.name);
// graph.setEdge(v, w, edge, e.name);
// }
insertEdgeLabel(edgeLabels, edge);
});

4
src/dagre-wrapper/mermaid-graphlib.js
View File

@@ -7,13 +7,11 @@ import graphlib from 'graphlib';
export let clusterDb = {};
let decendants = {};
let parents = {};
let graphs = {};
export const clear = () => {
decendants = {};
parents = {};
clusterDb = {};
graphs = {};
};
const isDecendant = (id, ancenstorId) => {
@@ -37,7 +35,7 @@ const edgeInCluster = (edge, clusterId) => {
if (!(edge.v === clusterId || edge.w === clusterId)) return false;
if (!decendants[clusterId]) {
log.debug('Tilt, ', clustedId, ',not in decendants');
log.debug('Tilt, ', clusterId, ',not in decendants');
return false;
}

31
src/dagre-wrapper/mermaid-graphlib.spec.js
View File

@@ -1,6 +1,6 @@
import graphlib from 'graphlib';
import dagre from 'dagre';
import { validate, adjustClustersAndEdges, extractGraphFromCluster, extractDecendants } from './mermaid-graphlib';
import { validate, adjustClustersAndEdges, extractDecendants } from './mermaid-graphlib';
import { setLogLevel, logger } from '../logger';
describe('Graphlib decorations', () => {
@@ -72,35 +72,6 @@ describe('Graphlib decorations', () => {
expect(validate(g)).toBe(true);
});
it('It is possible to copy a cluster to a new graph 1', function () {
/*
a --> b
subgraph C1
subgraph C2
a
end
b
end
C1 --> c
*/
g.setNode('a', { data: 1 });
g.setNode('b', { data: 2 });
g.setNode('c', { data: 3 });
g.setParent('a', 'C2');
g.setParent('b', 'C1');
g.setParent('C2', 'C1');
g.setEdge('a', 'b', { name: 'C1-internal-link' });
g.setEdge('C1', 'c', { name: 'C1-external-link' });
const newGraph = extractGraphFromCluster('C1', g);
expect(newGraph.nodes().length).toBe(4);
expect(newGraph.edges().length).toBe(1);
logger.info(newGraph.children('C1'));
expect(newGraph.children('C2')).toEqual(['a']);
expect(newGraph.children('C1')).toEqual(['b', 'C2']);
expect(newGraph.edges('a')).toEqual([{ v: 'a', w: 'b' }]);
});
it('Validate should detect edges between clusters and transform clusters GLB4', function () {
/*
a --> b