@eagleoutice/flowr 2.9.9 → 2.9.11

package/util/mermaid/cfg.js

@@ -8,11 +8,11 @@ const control_flow_graph_1 = require("../../control-flow/control-flow-graph");
 const reconstruct_1 = require("../../reconstruct/reconstruct");
 const auto_select_defaults_1 = require("../../reconstruct/auto-select/auto-select-defaults");
 const info_1 = require("./info");
-const collect_1 = require("../../r-bridge/lang-4.x/ast/model/collect");
+const model_1 = require("../../r-bridge/lang-4.x/ast/model/model");
 exports.MermaidEntryPointDefaultMarkStyle = 'stroke:cyan,stroke-width:6.5px;';
 exports.MermaidExitPointDefaultMarkStyle = 'stroke:green,stroke-width:6.5px;';
 function getLexeme(n) {
-    return n ? n.info.fullLexeme ?? n.lexeme ?? '' : undefined;
+    return n ? model_1.RNode.lexeme(n) ?? '' : undefined;
 }
 function cfgOfNode(vert, normalizedVertex, id, content, output) {
     if (normalizedVertex && content !== undefined) {
@@ -58,8 +58,7 @@ function cfgToMermaid(cfg, normalizedAst, { prefix = 'flowchart BT\n', simplify
             if (!nastNode) {
                 continue;
             }
-            const ids = (0, collect_1.collectAllIds)(nastNode);
-            for (const childId of ids) {
+            for (const childId of model_1.RNode.collectAllIds(nastNode)) {
                 completed.add(childId);
             }
         }

package/util/mermaid/dfg.d.ts

@@ -1,5 +1,5 @@
 import { type DataflowGraph } from '../../dataflow/graph/graph';
-import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type IdentifierDefinition } from '../../dataflow/environments/identifier';
 import { type MermaidMarkdownMark, type MermaidMarkStyle } from './info';
 interface MermaidGraph {

package/util/mermaid/dfg.js

@@ -13,9 +13,9 @@ const r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-fun
 const edge_1 = require("../../dataflow/graph/edge");
 const vertex_1 = require("../../dataflow/graph/vertex");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
-const built_in_1 = require("../../dataflow/environments/built-in");
 const info_1 = require("./info");
 const range_1 = require("../range");
+const model_1 = require("../../r-bridge/lang-4.x/ast/model/model");
 function subflowToMermaid(nodeId, subflow, mermaid, idPrefix = '') {
     if (subflow === undefined) {
         return;
@@ -25,7 +25,7 @@ function subflowToMermaid(nodeId, subflow, mermaid, idPrefix = '') {
         // get parent
         const idMap = mermaid.rootGraph.idMap;
         const node = idMap?.get(nodeId);
-        const nodeLexeme = node?.info.fullLexeme ?? node?.lexeme ?? 'function';
+        const nodeLexeme = model_1.RNode.lexeme(node) ?? 'function';
         const location = node?.location?.[0] ? ` (L. ${node?.location?.[0]})` : '';
         mermaid.nodeLines.push(`\nsubgraph "${subflowId}" ["${(0, mermaid_1.escapeMarkdown)(nodeLexeme)}${location}"]`);
     }
@@ -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,20 @@ 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 => node_id_1.NodeId.normalize(l) === node_id_1.NodeId.normalize(origId))) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} stroke:red,stroke-width:5px; `);
     }
-    const edges = mermaid.rootGraph.get((0, node_id_1.normalizeIdToNumberIfPossible)(id), true);
+    if (info.tag === vertex_1.VertexType.FunctionDefinition) {
+        subflowToMermaid(id, info.subflow, mermaid, idPrefix);
+    }
+    const edges = mermaid.rootGraph.outgoingEdges(node_id_1.NodeId.normalize(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;
         }
@@ -177,8 +181,8 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
         const edgeId = encodeEdge(idPrefix + id, idPrefix + target, edgeTypes);
         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}`);
+            const style = node_id_1.NodeId.isBuiltIn(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}`);
@@ -186,7 +190,7 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
             if (edgeTypes.has('CD-True') || edgeTypes.has('CD-False')) {
                 mermaid.edgeLines.push(`    linkStyle ${mermaid.presentEdges.size - 1} stroke:gray,color:gray;`);
             }
-            if ((0, built_in_1.isBuiltIn)(target)) {
+            if (node_id_1.NodeId.isBuiltIn(target)) {
                 mermaid.edgeLines.push(`    linkStyle ${mermaid.presentEdges.size - 1} stroke:gray;`);
                 if (!mermaid.presentVertices.has(target)) {
                     mermaid.nodeLines.push(`    ${idPrefix}${target}["\`Built-In:\n${(0, mermaid_1.escapeMarkdown)(String(originalTarget).replace('built-in:', ''))}\`"]`);
@@ -196,9 +200,6 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
             }
         }
     }
-    if (info.tag === vertex_1.VertexType.FunctionDefinition) {
-        subflowToMermaid(id, info.subflow, mermaid, idPrefix);
-    }
 }
 // make the passing of root ids more performant again
 function graphToMermaidGraph(rootIds, { simplified, graph, prefix = 'flowchart BT', idPrefix = '', includeEnvironments = !simplified, mark, rootGraph, presentEdges = new Set(), markStyle = info_1.MermaidDefaultMarkStyle, includeOnlyIds }) {

package/util/simple-df/dfg-ascii.js

@@ -156,7 +156,7 @@ function renderVertices(dfg, g, canvas) {
         const label = node.label;
         const x = Math.round(node.x);
         const y = Math.round(node.y);
-        const tag = dfg.getVertex((0, node_id_1.normalizeIdToNumberIfPossible)(nodeId))?.tag;
+        const tag = dfg.getVertex(node_id_1.NodeId.normalize(nodeId))?.tag;
         let e = '+';
         if (tag && tag in type2Edge) {
             e = type2Edge[tag];

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.11';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */

package/r-bridge/lang-4.x/ast/model/collect.d.ts

@@ -1,10 +0,0 @@
-import type { RNode } from './model';
-import type { NodeId } from './processing/node-id';
-import type { ParentInformation } from './processing/decorate';
-import type { RProject } from './nodes/r-project';
-/**
- * Collects all node ids within a tree given by a respective root node
- * @param nodes - The root id nodes to start collecting from
- * @param stop  - A function that determines whether to stop collecting at a given node, does not stop by default
- */
-export declare function collectAllIds<OtherInfo>(nodes: RProject<OtherInfo & ParentInformation> | RNode<OtherInfo & ParentInformation> | (RNode<OtherInfo & ParentInformation> | null | undefined)[] | undefined, stop?: (node: RNode<OtherInfo & ParentInformation>) => boolean): Set<NodeId>;

package/r-bridge/lang-4.x/ast/model/collect.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectAllIds = collectAllIds;
-const visitor_1 = require("./processing/visitor");
-const type_1 = require("./type");
-/**
- * Collects all node ids within a tree given by a respective root node
- * @param nodes - The root id nodes to start collecting from
- * @param stop  - A function that determines whether to stop collecting at a given node, does not stop by default
- */
-function collectAllIds(nodes, stop = () => false) {
-    if (nodes && 'type' in nodes && nodes.type === type_1.RType.Project) {
-        nodes = nodes.files.map(f => f.root);
-    }
-    const ids = new Set();
-    (0, visitor_1.visitAst)(nodes, (node) => {
-        if (stop(node)) {
-            return true;
-        }
-        ids.add(node.info.id);
-        return false;
-    });
-    return ids;
-}
-//# sourceMappingURL=collect.js.map