diff --git a/cypress/platform/ipsepcola_sample.html b/cypress/platform/ipsepcola_sample.html index 295f48e23..8575f647b 100644 --- a/cypress/platform/ipsepcola_sample.html +++ b/cypress/platform/ipsepcola_sample.html @@ -568,7 +568,7 @@ User --> Role look: 'classic ', // 'elk.nodePlacement.strategy': 'NETWORK_SIMPLEX', // layout: 'dagre', - layout: 'ipsecCola', + layout: 'ipsepCola', // layout: 'elk', // layout: 'sugiyama', // htmlLabels: false, diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/adjustLayout.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/adjustLayout.ts similarity index 81% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/adjustLayout.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/adjustLayout.ts index 02ebb3260..bdb94c3ae 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/adjustLayout.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/adjustLayout.ts @@ -1,8 +1,8 @@ -import type { LayoutData } from '../../types.js'; -import type { D3Selection } from '../../../types.js'; +import type { LayoutData } from '../../types.ts'; +import type { D3Selection } from '../../../types.ts'; import { insertCluster } from '../../rendering-elements/clusters.js'; import { insertEdge } from '../../rendering-elements/edges.js'; -import { positionNode } from '../../rendering-elements/nodes.js'; +import { positionNode } from '../../rendering-elements/nodes.ts'; export async function adjustLayout( data4Layout: LayoutData, diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/applyCola.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/applyCola.ts similarity index 99% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/applyCola.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/applyCola.ts index f8fdf54e6..fe780fcdd 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/applyCola.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/applyCola.ts @@ -1,5 +1,5 @@ -import type { Point } from '../../../types.js'; -import type { Edge, LayoutData, Node } from '../../types.js'; +import type { Point } from '../../../types.ts'; +import type { Edge, LayoutData, Node } from '../../types.ts'; interface ColaOptions { iterations?: number; diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/assignInitialPositioning.spec.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/assignInitialPositioning.spec.ts similarity index 96% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/assignInitialPositioning.spec.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/assignInitialPositioning.spec.ts index b7874e7ca..016332074 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/assignInitialPositioning.spec.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/assignInitialPositioning.spec.ts @@ -1,11 +1,11 @@ -import { FlowDB } from '../../../diagrams/flowchart/flowDb.js'; -import flow from '../../../diagrams/flowchart/parser/flowParser.js'; -import type { D3Selection } from '../../../types.js'; -import { createGraphWithElements } from '../../createGraph.js'; -import type { Node } from '../../types.js'; -import { assignInitialPositions } from './assignInitialPositions.js'; -import { layerAssignment } from './layerAssignment.js'; -import { assignNodeOrder } from './nodeOrdering.js'; +import { FlowDB } from '../../../diagrams/flowchart/flowDb.ts'; +import flow from '../../../diagrams/flowchart/parser/flowParser.ts'; +import type { D3Selection } from '../../../types.ts'; +import { createGraphWithElements } from '../../createGraph.ts'; +import type { Node } from '../../types.ts'; +import { assignInitialPositions } from './assignInitialPositions.ts'; +import { layerAssignment } from './layerAssignment.ts'; +import { assignNodeOrder } from './nodeOrdering.ts'; import * as d3 from 'd3'; describe('assignInitialPositioning', () => { diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/assignInitialPositions.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/assignInitialPositions.ts similarity index 91% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/assignInitialPositions.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/assignInitialPositions.ts index c57b03c87..2bc9b266f 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/assignInitialPositions.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/assignInitialPositions.ts @@ -1,4 +1,4 @@ -import type { LayoutData, Node } from '../../types.js'; +import type { LayoutData, Node } from '../../types.ts'; /** * Assigns initial x and y positions to each node diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/index.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/index.ts similarity index 84% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/index.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/index.ts index 81649cddb..8aac624f1 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/index.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/index.ts @@ -1,17 +1,17 @@ import insertMarkers from '../../rendering-elements/markers.js'; import { clear as clearGraphlib } from '../dagre/mermaid-graphlib.js'; -import { clear as clearNodes } from '../../rendering-elements/nodes.js'; +import { clear as clearNodes } from '../../rendering-elements/nodes.ts'; import { clear as clearClusters } from '../../rendering-elements/clusters.js'; import { clear as clearEdges } from '../../rendering-elements/edges.js'; -import type { LayoutData, Node } from '../../types.js'; -import { adjustLayout } from './adjustLayout.js'; -import { layerAssignment } from './layerAssignment.js'; -import { assignNodeOrder } from './nodeOrdering.js'; -import { assignInitialPositions } from './assignInitialPositions.js'; -import { applyCola } from './applyCola.js'; -import { createGraphWithElements } from '../../createGraph.js'; -import type { D3Selection } from '../../../types.js'; -import type { SVG } from '../../../mermaid.js'; +import type { LayoutData, Node } from '../../types.ts'; +import { adjustLayout } from './adjustLayout.ts'; +import { layerAssignment } from './layerAssignment.ts'; +import { assignNodeOrder } from './nodeOrdering.ts'; +import { assignInitialPositions } from './assignInitialPositions.ts'; +import { applyCola } from './applyCola.ts'; +import { createGraphWithElements } from '../../createGraph.ts'; +import type { D3Selection } from '../../../types.ts'; +import type { SVG } from '../../../mermaid.ts'; export async function render(data4Layout: LayoutData, svg: SVG): Promise { const element = svg.select('g') as unknown as D3Selection; diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/layerAssignment.spec.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/layerAssignment.spec.ts similarity index 95% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/layerAssignment.spec.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/layerAssignment.spec.ts index dda5fe67f..c4ff3fe2e 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/layerAssignment.spec.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/layerAssignment.spec.ts @@ -1,10 +1,10 @@ import * as d3 from 'd3'; -import { FlowDB } from '../../../diagrams/flowchart/flowDb.js'; -import flow from '../../../diagrams/flowchart/parser/flowParser.js'; -import { createGraphWithElements } from '../../createGraph.js'; -import { layerAssignment } from './layerAssignment.js'; -import type { D3Selection } from '../../../types.js'; -import type { Node } from '../../types.js'; +import { FlowDB } from '../../../diagrams/flowchart/flowDb.ts'; +import flow from '../../../diagrams/flowchart/parser/flowParser.ts'; +import { createGraphWithElements } from '../../createGraph.ts'; +import { layerAssignment } from './layerAssignment.ts'; +import type { D3Selection } from '../../../types.ts'; +import type { Node } from '../../types.ts'; describe('layerAssignment', () => { beforeEach(function () { diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/layerAssignment.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/layerAssignment.ts similarity index 97% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/layerAssignment.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/layerAssignment.ts index 8d5700cde..7f13f7cac 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/layerAssignment.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/layerAssignment.ts @@ -1,4 +1,4 @@ -import type { Edge, LayoutData } from '../../types.js'; +import type { Edge, LayoutData } from '../../types.ts'; export function layerAssignment(data4Layout: LayoutData): void { const removedEdges: Edge[] = []; diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/nodeOrdering.spec.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/nodeOrdering.spec.ts similarity index 95% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/nodeOrdering.spec.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/nodeOrdering.spec.ts index cc6366916..118d150c3 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/nodeOrdering.spec.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/nodeOrdering.spec.ts @@ -1,10 +1,10 @@ -import { FlowDB } from '../../../diagrams/flowchart/flowDb.js'; -import flow from '../../../diagrams/flowchart/parser/flowParser.js'; -import type { D3Selection } from '../../../types.js'; -import { createGraphWithElements } from '../../createGraph.js'; -import type { Node } from '../../types.js'; -import { layerAssignment } from './layerAssignment.js'; -import { assignNodeOrder } from './nodeOrdering.js'; +import { FlowDB } from '../../../diagrams/flowchart/flowDb.ts'; +import flow from '../../../diagrams/flowchart/parser/flowParser.ts'; +import type { D3Selection } from '../../../types.ts'; +import { createGraphWithElements } from '../../createGraph.ts'; +import type { Node } from '../../types.ts'; +import { layerAssignment } from './layerAssignment.ts'; +import { assignNodeOrder } from './nodeOrdering.ts'; import * as d3 from 'd3'; describe('nodeOrdering', () => { diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/nodeOrdering.ts b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/nodeOrdering.ts similarity index 98% rename from packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/nodeOrdering.ts rename to packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/nodeOrdering.ts index f4b8a42f6..6e977cedd 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/ipsecCola/nodeOrdering.ts +++ b/packages/mermaid/src/rendering-util/layout-algorithms/ipsepCola/nodeOrdering.ts @@ -1,4 +1,4 @@ -import type { Edge, LayoutData, Node } from '../../types.js'; +import type { Edge, LayoutData, Node } from '../../types.ts'; type LayerMap = Record; diff --git a/packages/mermaid/src/rendering-util/render.ts b/packages/mermaid/src/rendering-util/render.ts index 46339d560..56bccab94 100644 --- a/packages/mermaid/src/rendering-util/render.ts +++ b/packages/mermaid/src/rendering-util/render.ts @@ -40,8 +40,8 @@ const registerDefaultLayoutLoaders = () => { loader: async () => await import('./layout-algorithms/dagre/index.js'), }, { - name: 'ipsecCola', - loader: async () => await import('./layout-algorithms/ipsecCola/index.ts'), + name: 'ipsepCola', + loader: async () => await import('./layout-algorithms/ipsepCola/index.ts'), }, ]); }; diff --git a/packages/mermaid/tsconfig.json b/packages/mermaid/tsconfig.json index 8b9b5fca6..447a5bb0d 100644 --- a/packages/mermaid/tsconfig.json +++ b/packages/mermaid/tsconfig.json @@ -3,9 +3,7 @@ "compilerOptions": { "rootDir": "./src", "outDir": "./dist", - "types": ["vitest/importMeta", "vitest/globals"], - "allowImportingTsExtensions": true, - "noEmit": true + "types": ["vitest/importMeta", "vitest/globals"] }, "include": [ "./src/**/*.ts",