@eagleoutice/flowr 2.9.9 → 2.9.10

package/util/mermaid/ast.js

@@ -31,7 +31,7 @@ function normalizedAstToMermaid(ast, { prefix = 'flowchart TD\n', markStyle = in
         }
         if (n.info.parent !== undefined && (!includeOnlyIds || includeOnlyIds.has(n.info.parent))) {
             const context = n.info;
-            const roleSuffix = context.role === "expr-list-child" /* RoleInParent.ExpressionListChild */ || context.role === "call-arg" /* RoleInParent.FunctionCallArgument */ || context.role === "param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
+            const roleSuffix = context.role === "el-c" /* RoleInParent.ExpressionListChild */ || context.role === "call-arg" /* RoleInParent.FunctionCallArgument */ || context.role === "param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
             output += `    n${n.info.parent} -->|"${context.role}${roleSuffix}"| n${n.info.id}\n`;
         }
         if (n.type === type_1.RType.ExpressionList && n.grouping !== undefined) {

package/util/mermaid/dfg.js

@@ -134,6 +134,7 @@ function printEnvironmentToLines(env) {
 function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
     const fCall = info.tag === vertex_1.VertexType.FunctionCall;
     const { open, close } = mermaidNodeBrackets(info.tag);
+    const origId = id;
     id = (0, mermaid_1.escapeId)(id);
     if (info.environment && mermaid.includeEnvironments) {
         if (info.environment.level > 0 || info.environment.current.memory.size !== 0) {
@@ -157,17 +158,17 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
     if (mark?.has(id)) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} ${mermaid.markStyle.vertex} `);
     }
-    if ([...mermaid.rootGraph.unknownSideEffects].some(l => (0, node_id_1.normalizeIdToNumberIfPossible)(l) === (0, node_id_1.normalizeIdToNumberIfPossible)(id))) {
+    if (mermaid.rootGraph.unknownSideEffects.values().some(l => (0, node_id_1.normalizeIdToNumberIfPossible)(l) === (0, node_id_1.normalizeIdToNumberIfPossible)(origId))) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} stroke:red,stroke-width:5px; `);
     }
-    const edges = mermaid.rootGraph.get((0, node_id_1.normalizeIdToNumberIfPossible)(id), true);
+    const edges = mermaid.rootGraph.outgoingEdges((0, node_id_1.normalizeIdToNumberIfPossible)(origId));
     if (edges === undefined) {
         mermaid.nodeLines.push('   %% No edges found for ' + id);
         return;
     }
-    const artificialCdEdges = (info.cds ?? []).map(x => [x.id, { types: new Set([x.when ? 'CD-True' : 'CD-False']) }]);
+    const artificialCdEdges = (info.cds ?? []).map(x => [x.id, { types: new Set([x.when ? 'CD-True' : 'CD-False']), file: x.file }]);
     // eslint-disable-next-line prefer-const
-    for (let [target, edge] of [...edges[1], ...artificialCdEdges]) {
+    for (let [target, edge] of [...edges, ...artificialCdEdges]) {
         if (includeOnlyIds && !includeOnlyIds.has(target)) {
             continue;
         }
@@ -178,7 +179,7 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
         if (!mermaid.presentEdges.has(edgeId)) {
             mermaid.presentEdges.add(edgeId);
             const style = (0, built_in_1.isBuiltIn)(target) ? '-.->' : '-->';
-            mermaid.edgeLines.push(`    ${idPrefix}${id} ${style}|"${[...edgeTypes].map(e => typeof e === 'number' ? edge_1.DfEdge.typeToName(e) : e).join(', ')}"| ${idPrefix}${target}`);
+            mermaid.edgeLines.push(`    ${idPrefix}${id} ${style}|"${[...edgeTypes].map(e => typeof e === 'number' ? edge_1.DfEdge.typeToName(e) : e).join(', ')}${'file' in edge && edge.file ? `, from: ${edge.file}` : ''}"| ${idPrefix}${target}`);
             if (mermaid.mark?.has(id + '->' + target)) {
                 // who invented this syntax?!
                 mermaid.edgeLines.push(`    linkStyle ${mermaid.presentEdges.size - 1} ${mermaid.markStyle.edge}`);

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.9.9';
+const version = '2.9.10';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */