From 3f2e8233305cc05e52971210205025c894dbe59f Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sat, 29 Jun 2024 16:09:05 +0530 Subject: [PATCH] chore: Remove orphaned files --- .../mermaid/src/dagre-wrapper/intersect.js | 7 - .../mermaid/src/dagre-wrapper/patterns.js | 52 --- .../src/diagrams/git/gitGraphRenderer-old.js | 366 ------------------ packages/mermaid/src/diagrams/git/layout.js | 21 - packages/mermaid/src/diagrams/git/mockDb.js | 198 ---------- packages/mermaid/tsconfig.eslint.json | 9 +- 6 files changed, 1 insertion(+), 652 deletions(-) delete mode 100644 packages/mermaid/src/dagre-wrapper/intersect.js delete mode 100644 packages/mermaid/src/dagre-wrapper/patterns.js delete mode 100644 packages/mermaid/src/diagrams/git/gitGraphRenderer-old.js delete mode 100644 packages/mermaid/src/diagrams/git/layout.js delete mode 100644 packages/mermaid/src/diagrams/git/mockDb.js diff --git a/packages/mermaid/src/dagre-wrapper/intersect.js b/packages/mermaid/src/dagre-wrapper/intersect.js deleted file mode 100644 index 41bcb5a53..000000000 --- a/packages/mermaid/src/dagre-wrapper/intersect.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - node: require('./intersect-node'), - circle: require('./intersect-circle'), - ellipse: require('./intersect-ellipse'), - polygon: require('./intersect-polygon'), - rect: require('./intersect-rect'), -}; diff --git a/packages/mermaid/src/dagre-wrapper/patterns.js b/packages/mermaid/src/dagre-wrapper/patterns.js deleted file mode 100644 index 3025f8ef9..000000000 --- a/packages/mermaid/src/dagre-wrapper/patterns.js +++ /dev/null @@ -1,52 +0,0 @@ -/** Setup arrow head and define the marker. The result is appended to the svg. */ - -// import { log } from '../logger.js'; - -// Only add the number of markers that the diagram needs -const insertPatterns = (elem, patternArray, type, id) => { - patternArray.forEach((patternName) => { - patterns[patternName](elem, type, id); - }); -}; - -{ - /* - {' '} - - {' '} - - {' '} - - {' '} - {' '} - {' '} - {' '} -; */ -} - -const dots = (elem, type) => { - elem - .append('defs') - .append('marker') - .attr('id', type + '-barbEnd') - .attr('refX', 19) - .attr('refY', 7) - .attr('markerWidth', 20) - .attr('markerHeight', 14) - .attr('markerUnits', 0) - .attr('orient', 'auto') - .append('path') - .attr('d', 'M 19,7 L9,13 L14,7 L9,1 Z'); -}; - -// TODO rename the class diagram markers to something shape descriptive and semantic free -const patterns = { - dots, -}; -export default insertPatterns; diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer-old.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer-old.js deleted file mode 100644 index d8b34ac85..000000000 --- a/packages/mermaid/src/diagrams/git/gitGraphRenderer-old.js +++ /dev/null @@ -1,366 +0,0 @@ -import { curveBasis, line, select } from 'd3'; - -import db from './gitGraphAst.js'; -import { logger } from '../../logger.js'; -import { interpolateToCurve } from '../../utils.js'; - -let allCommitsDict = {}; -let branchNum; -let config = { - nodeSpacing: 150, - nodeFillColor: 'yellow', - nodeStrokeWidth: 2, - nodeStrokeColor: 'grey', - lineStrokeWidth: 4, - branchOffset: 50, - lineColor: 'grey', - leftMargin: 50, - branchColors: ['#442f74', '#983351', '#609732', '#AA9A39'], - nodeRadius: 10, - nodeLabel: { - width: 75, - height: 100, - x: -25, - y: 0, - }, -}; -let apiConfig = {}; -export const setConf = function (c) { - apiConfig = c; -}; - -/** @param svg */ -function svgCreateDefs(svg) { - svg - .append('defs') - .append('g') - .attr('id', 'def-commit') - .append('circle') - .attr('r', config.nodeRadius) - .attr('cx', 0) - .attr('cy', 0); - svg - .select('#def-commit') - .append('foreignObject') - .attr('width', config.nodeLabel.width) - .attr('height', config.nodeLabel.height) - .attr('x', config.nodeLabel.x) - .attr('y', config.nodeLabel.y) - .attr('class', 'node-label') - .attr('requiredFeatures', 'http://www.w3.org/TR/SVG11/feature#Extensibility') - .append('p') - .html(''); -} - -/** - * @param svg - * @param points - * @param colorIdx - * @param interpolate - */ -function svgDrawLine(svg, points, colorIdx, interpolate) { - const curve = interpolateToCurve(interpolate, curveBasis); - const color = config.branchColors[colorIdx % config.branchColors.length]; - const lineGen = line() - .x(function (d) { - return Math.round(d.x); - }) - .y(function (d) { - return Math.round(d.y); - }) - .curve(curve); - - svg - .append('svg:path') - .attr('d', lineGen(points)) - .style('stroke', color) - .style('stroke-width', config.lineStrokeWidth) - .style('fill', 'none'); -} - -// Pass in the element and its pre-transform coords -/** - * @param element - * @param coords - */ -function getElementCoords(element, coords) { - coords = coords || element.node().getBBox(); - const ctm = element.node().getCTM(); - const xn = ctm.e + coords.x * ctm.a; - const yn = ctm.f + coords.y * ctm.d; - return { - left: xn, - top: yn, - width: coords.width, - height: coords.height, - }; -} - -/** - * @param svg - * @param fromId - * @param toId - * @param direction - * @param color - */ -function svgDrawLineForCommits(svg, fromId, toId, direction, color) { - logger.debug('svgDrawLineForCommits: ', fromId, toId); - const fromBbox = getElementCoords(svg.select('#node-' + fromId + ' circle')); - const toBbox = getElementCoords(svg.select('#node-' + toId + ' circle')); - switch (direction) { - case 'LR': - // (toBbox) - // +-------- - // + (fromBbox) - if (fromBbox.left - toBbox.left > config.nodeSpacing) { - const lineStart = { - x: fromBbox.left - config.nodeSpacing, - y: toBbox.top + toBbox.height / 2, - }; - const lineEnd = { x: toBbox.left + toBbox.width, y: toBbox.top + toBbox.height / 2 }; - svgDrawLine(svg, [lineStart, lineEnd], color, 'linear'); - svgDrawLine( - svg, - [ - { x: fromBbox.left, y: fromBbox.top + fromBbox.height / 2 }, - { x: fromBbox.left - config.nodeSpacing / 2, y: fromBbox.top + fromBbox.height / 2 }, - { x: fromBbox.left - config.nodeSpacing / 2, y: lineStart.y }, - lineStart, - ], - color - ); - } else { - svgDrawLine( - svg, - [ - { - x: fromBbox.left, - y: fromBbox.top + fromBbox.height / 2, - }, - { - x: fromBbox.left - config.nodeSpacing / 2, - y: fromBbox.top + fromBbox.height / 2, - }, - { - x: fromBbox.left - config.nodeSpacing / 2, - y: toBbox.top + toBbox.height / 2, - }, - { - x: toBbox.left + toBbox.width, - y: toBbox.top + toBbox.height / 2, - }, - ], - color - ); - } - break; - case 'BT': - // + (fromBbox) - // | - // | - // + (toBbox) - if (toBbox.top - fromBbox.top > config.nodeSpacing) { - const lineStart = { - x: toBbox.left + toBbox.width / 2, - y: fromBbox.top + fromBbox.height + config.nodeSpacing, - }; - const lineEnd = { x: toBbox.left + toBbox.width / 2, y: toBbox.top }; - svgDrawLine(svg, [lineStart, lineEnd], color, 'linear'); - svgDrawLine( - svg, - [ - { x: fromBbox.left + fromBbox.width / 2, y: fromBbox.top + fromBbox.height }, - { - x: fromBbox.left + fromBbox.width / 2, - y: fromBbox.top + fromBbox.height + config.nodeSpacing / 2, - }, - { x: toBbox.left + toBbox.width / 2, y: lineStart.y - config.nodeSpacing / 2 }, - lineStart, - ], - color - ); - } else { - svgDrawLine( - svg, - [ - { - x: fromBbox.left + fromBbox.width / 2, - y: fromBbox.top + fromBbox.height, - }, - { - x: fromBbox.left + fromBbox.width / 2, - y: fromBbox.top + config.nodeSpacing / 2, - }, - { - x: toBbox.left + toBbox.width / 2, - y: toBbox.top - config.nodeSpacing / 2, - }, - { - x: toBbox.left + toBbox.width / 2, - y: toBbox.top, - }, - ], - color - ); - } - break; - } -} - -/** - * @param svg - * @param selector - */ -function cloneNode(svg, selector) { - return svg.select(selector).node().cloneNode(true); -} - -/** - * @param svg - * @param commitId - * @param branches - * @param direction - */ -function renderCommitHistory(svg, commitId, branches, direction) { - let commit; - const numCommits = Object.keys(allCommitsDict).length; - if (typeof commitId === 'string') { - do { - commit = allCommitsDict[commitId]; - logger.debug('in renderCommitHistory', commit.id, commit.seq); - if (svg.select('#node-' + commitId).size() > 0) { - return; - } - svg - .append(function () { - return cloneNode(svg, '#def-commit'); - }) - .attr('class', 'commit') - .attr('id', function () { - return 'node-' + commit.id; - }) - .attr('transform', function () { - switch (direction) { - case 'LR': - return ( - 'translate(' + - (commit.seq * config.nodeSpacing + config.leftMargin) + - ', ' + - branchNum * config.branchOffset + - ')' - ); - case 'BT': - return ( - 'translate(' + - (branchNum * config.branchOffset + config.leftMargin) + - ', ' + - (numCommits - commit.seq) * config.nodeSpacing + - ')' - ); - } - }) - .attr('fill', config.nodeFillColor) - .attr('stroke', config.nodeStrokeColor) - .attr('stroke-width', config.nodeStrokeWidth); - - let branch; - for (let branchName in branches) { - if (branches[branchName].commit === commit) { - branch = branches[branchName]; - break; - } - } - if (branch) { - logger.debug('found branch ', branch.name); - svg - .select('#node-' + commit.id + ' p') - .append('xhtml:span') - .attr('class', 'branch-label') - .text(branch.name + ', '); - } - svg - .select('#node-' + commit.id + ' p') - .append('xhtml:span') - .attr('class', 'commit-id') - .text(commit.id); - if (commit.message !== '' && direction === 'BT') { - svg - .select('#node-' + commit.id + ' p') - .append('xhtml:span') - .attr('class', 'commit-msg') - .text(', ' + commit.message); - } - commitId = commit.parent; - } while (commitId && allCommitsDict[commitId]); - } - - if (Array.isArray(commitId)) { - logger.debug('found merge commit', commitId); - renderCommitHistory(svg, commitId[0], branches, direction); - branchNum++; - renderCommitHistory(svg, commitId[1], branches, direction); - branchNum--; - } -} - -/** - * @param svg - * @param commit - * @param direction - * @param branchColor - */ -function renderLines(svg, commit, direction, branchColor = 0) { - while (commit.seq > 0 && !commit.lineDrawn) { - if (typeof commit.parent === 'string') { - svgDrawLineForCommits(svg, commit.id, commit.parent, direction, branchColor); - commit.lineDrawn = true; - commit = allCommitsDict[commit.parent]; - } else if (Array.isArray(commit.parent)) { - svgDrawLineForCommits(svg, commit.id, commit.parent[0], direction, branchColor); - svgDrawLineForCommits(svg, commit.id, commit.parent[1], direction, branchColor + 1); - renderLines(svg, allCommitsDict[commit.parent[1]], direction, branchColor + 1); - commit.lineDrawn = true; - commit = allCommitsDict[commit.parent[0]]; - } - } -} - -export const draw = function (txt, id, ver) { - try { - logger.debug('in gitgraph renderer', txt + '\n', 'id:', id, ver); - - config = Object.assign(config, apiConfig, db.getOptions()); - logger.debug('effective options', config); - const direction = db.getDirection(); - allCommitsDict = db.getCommits(); - const branches = db.getBranchesAsObjArray(); - if (direction === 'BT') { - config.nodeLabel.x = branches.length * config.branchOffset; - config.nodeLabel.width = '100%'; - config.nodeLabel.y = -1 * 2 * config.nodeRadius; - } - const svg = select(`[id="${id}"]`); - svgCreateDefs(svg); - branchNum = 1; - for (let branch in branches) { - const v = branches[branch]; - renderCommitHistory(svg, v.commit.id, branches, direction); - renderLines(svg, v.commit, direction); - branchNum++; - } - svg.attr('height', function () { - if (direction === 'BT') { - return Object.keys(allCommitsDict).length * config.nodeSpacing; - } - return (branches.length + 1) * config.branchOffset; - }); - } catch (e) { - logger.error('Error while rendering gitgraph'); - logger.error(e.message); - } -}; - -export default { - setConf, - draw, -}; diff --git a/packages/mermaid/src/diagrams/git/layout.js b/packages/mermaid/src/diagrams/git/layout.js deleted file mode 100644 index 2a782a079..000000000 --- a/packages/mermaid/src/diagrams/git/layout.js +++ /dev/null @@ -1,21 +0,0 @@ -import { getConfig } from '../../diagram-api/diagramAPI.js'; - -export default (dir, _branches) => { - const config = getConfig().gitGraph; - const branches = []; - const commits = []; - - for (const [i, _branch] of _branches.entries()) { - const branch = Object.assign({}, _branch); - if (dir === 'TB' || dir === 'BT') { - branch.x = config.branchOffset * i; - branch.y = -1; - } else { - branch.y = config.branchOffset * i; - branch.x = -1; - } - branches.push(branch); - } - - return { branches, commits }; -}; diff --git a/packages/mermaid/src/diagrams/git/mockDb.js b/packages/mermaid/src/diagrams/git/mockDb.js deleted file mode 100644 index dbca4dcdb..000000000 --- a/packages/mermaid/src/diagrams/git/mockDb.js +++ /dev/null @@ -1,198 +0,0 @@ -export const getDirection = () => 'LR'; -export const getCommits = () => { - return { - '0000001': { - id: '0000001', - seq: 1, - message: '', - branch: 'master', - parents: null, - tag: 'v0.1', - commitType: 'normal', - note: null, - }, - '0000002': { - id: '0000002', - seq: 2, - message: '', - branch: 'develop', - parents: ['0000001'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000003': { - id: '0000003', - seq: 3, - message: '', - branch: 'featureB', - parents: ['0000002'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000004': { - id: '0000004', - seq: 4, - message: '', - branch: 'hotfix', - parents: ['0000001'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000005': { - id: '0000005', - seq: 5, - message: '', - branch: 'develop', - parents: ['0000002'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000006': { - id: '0000006', - seq: 6, - message: '', - branch: 'featureB', - parents: ['0000003'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000007': { - id: '0000007', - seq: 7, - message: '', - branch: 'master', - parents: ['0000004'], - tag: 'v0.2', - commitType: 'normal', - note: null, - }, - '0000008': { - id: '0000008', - seq: 8, - message: '', - branch: 'featureB', - parents: ['0000006'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000009': { - id: '0000009', - seq: 9, - message: '', - branch: 'featureA', - parents: ['0000005'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000010': { - id: '0000010', - seq: 10, - message: '', - branch: 'develop', - parents: ['0000004', '0000005'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000011': { - id: '0000011', - seq: 11, - message: '', - branch: 'featureA', - parents: ['0000009'], - tag: null, - commitType: 'normal', - note: '', - }, - '0000012': { - id: '0000012', - seq: 12, - message: '', - branch: 'featureB', - parents: ['0000008'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000013': { - id: '0000013', - seq: 13, - message: '', - branch: 'develop', - parents: ['0000010', '0000011'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000014': { - id: '0000014', - seq: 14, - message: '', - branch: 'release', - parents: ['0000013'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000015': { - id: '0000015', - seq: 15, - message: '', - branch: 'master', - parents: ['0000007'], - tag: null, - commitType: 'normal', - note: null, - }, - '0000016': { - id: '0000016', - seq: 16, - message: '', - branch: 'release', - parents: ['0000014', '0000015'], - tag: 'v1.0', - commitType: 'normal', - note: null, - }, - '0000017': { - id: '0000017', - seq: 17, - message: '', - branch: 'develop', - parents: ['0000013', '0000016'], - tag: null, - commitType: 'normal', - note: null, - }, - }; -}; -export const clear = () => { - //no-op -}; -export const getBranchesAsObjArray = () => [ - { - name: 'master', - }, - { - name: 'hotfix', - }, - { - name: 'release', - }, - { - name: 'develop', - }, - { - name: 'featureA', - }, - { - name: 'featureB', - }, -]; diff --git a/packages/mermaid/tsconfig.eslint.json b/packages/mermaid/tsconfig.eslint.json index eae6ca79f..9df160d20 100644 --- a/packages/mermaid/tsconfig.eslint.json +++ b/packages/mermaid/tsconfig.eslint.json @@ -8,13 +8,6 @@ "./src/**/*.spec.js", "./src/**/*.spec.ts", // test files "./scripts", - "./.lintstagedrc.mjs", - // These seem to be orphaned files - // Can we delete them? - "./src/dagre-wrapper/intersect.js", - "./src/dagre-wrapper/patterns.js", - "./src/diagrams/git/gitGraphRenderer-old.js", - "./src/diagrams/git/layout.js", - "./src/diagrams/git/mockDb.js" + "./.lintstagedrc.mjs" ] }