@eagleoutice/flowr 2.8.12 → 2.8.13

package/README.md

@@ -24,7 +24,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.8.10, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.12, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -33,13 +33,13 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    Query: linter (2 ms)
+    Query: linter (1 ms)
        ╰ Deprecated Functions (deprecated-functions):
-           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0
+           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ File Path Validity (file-path-validity):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
-           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 1, processTimeMs: 0
        ╰ Seeded Randomness (seeded-randomness):
            ╰ Metadata: consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Absolute Paths (absolute-file-paths):
@@ -53,12 +53,12 @@ It offers a wide variety of features, for example:
        ╰ Network Functions (network-functions):
            ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Dataframe Access Validation (dataframe-access-validation):
-           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 1
+           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Dead Code (dead-code):
            ╰ Metadata: consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0
        ╰ Useless Loops (useless-loop):
            ╰ Metadata: numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0
-    All queries together required ≈2 ms (1ms accuracy, total 2 ms)
+    All queries together required ≈1 ms (1ms accuracy, total 1 ms)
     ```
     
     
@@ -80,13 +80,13 @@ It offers a wide variety of features, for example:
     
     _Results (prettified and summarized):_
     
-    Query: **linter** (2 ms)\
+    Query: **linter** (1 ms)\
        ╰ **Deprecated Functions** (deprecated-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **File Path Validity** (file-path-validity):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 1</code>\
     &nbsp;&nbsp;&nbsp;╰ **Seeded Randomness** (seeded-randomness):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Absolute Paths** (absolute-file-paths):\
@@ -98,18 +98,18 @@ It offers a wide variety of features, for example:
     &nbsp;&nbsp;&nbsp;╰ **Naming Convention** (naming-convention):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numMatches: 0, numBreak: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Network Functions** (network-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dataframe Access Validation** (dataframe-access-validation):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dead Code** (dead-code):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Useless Loops** (useless-loop):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0</code>\
-    _All queries together required ≈2 ms (1ms accuracy, total 2 ms)_
+    _All queries together required ≈1 ms (1ms accuracy, total 2 ms)_
     
     <details> <summary style="color:gray">Show Detailed Results as Json</summary>
     
-    The analysis required _2.3 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _1.9 ms_ (including parsing and normalization and the query) within the generation environment.
     
     In general, the JSON contains the Ids of the nodes in question as they are present in the normalized AST or the dataflow graph of flowR.
     Please consult the [Interface](https://github.com/flowr-analysis/flowr/wiki/Interface) wiki page for more information on how to get those.
@@ -126,7 +126,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalCalls": 0,
               "totalFunctionDefinitions": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -150,7 +150,7 @@ It offers a wide variety of features, for example:
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
               "searchTimeMs": 0,
-              "processTimeMs": 0
+              "processTimeMs": 1
             }
           },
           "seeded-randomness": {
@@ -207,7 +207,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalCalls": 0,
               "totalFunctionDefinitions": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -239,11 +239,11 @@ It offers a wide variety of features, for example:
           }
         },
         ".meta": {
-          "timing": 2
+          "timing": 1
         }
       },
       ".meta": {
-        "timing": 2
+        "timing": 1
       }
     }
     ```
@@ -308,7 +308,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.8.10, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.12, R grammar v14 (tree-sitter engine)
     R> :query @static-slice (11@sum) file://test/testfiles/example.R
     ```
     
@@ -322,7 +322,7 @@ It offers a wide variety of features, for example:
     N <- 10
     for(i in 1:(N-1)) sum <- sum + i + w
     sum
-    All queries together required ≈3 ms (1ms accuracy, total 4 ms)
+    All queries together required ≈2 ms (1ms accuracy, total 3 ms)
     ```
     
     
@@ -356,7 +356,7 @@ It offers a wide variety of features, for example:
          
 
 * 🚀 **fast call-graph, data-, and control-flow graphs**\
-  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">119.8 ms</span></i> (as of Jan 27, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">122.5 ms</span></i> (as of Jan 28, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
   _flowR_ can analyze the data- and control-flow of the average real-world R script. See the [benchmarks](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark) for more information,
   and consult the [wiki pages](https://github.com/flowr-analysis/flowr/wiki/dataflow-graph) for more details on the dataflow graphs as well as call graphs.
 
@@ -392,7 +392,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.8.10, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.12, R grammar v14 (tree-sitter engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -402,6 +402,7 @@ It offers a wide variety of features, for example:
     
     ```text
     https://mermaid.live/view#base64:eyJjb2RlIjoiZmxvd2NoYXJ0IEJUXG4gICAgMChbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RcbiAgICAgICgwKVxuICAgICAgKjEuMS00KmBcIl0pXG4gICAgMShbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RmaWxlc1xuICAgICAgKDEpXG4gICAgICAqMS42LTE0KmBcIl0pXG4gICAgMltbXCJgIzkxO1JCaW5hcnlPcCM5MzsgL1xuICAgICAgKDIpXG4gICAgICAqMS4xLTE0KlxuICAgICgwLCAxKWBcIl1dXG4gICAgYnVpbHQtaW46X1tcImBCdWlsdC1Jbjpcbi9gXCJdXG4gICAgc3R5bGUgYnVpbHQtaW46XyBzdHJva2U6Z3JheSxmaWxsOmdyYXksc3Ryb2tlLXdpZHRoOjJweCxvcGFjaXR5Oi44O1xuICAgIDMoW1wiYCM5MTtSU3ltYm9sIzkzOyBleGFtcGxlLlJcbiAgICAgICgzKVxuICAgICAgKjEuMTYtMjQqYFwiXSlcbiAgICA0W1tcImAjOTE7UkJpbmFyeU9wIzkzOyAvXG4gICAgICAoNClcbiAgICAgICoxLjEtMjQqXG4gICAgKDIsIDMpYFwiXV1cbiAgICAyIC0tPnxcInJlYWRzLCBhcmd1bWVudFwifCAwXG4gICAgMiAtLT58XCJyZWFkcywgYXJndW1lbnRcInwgMVxuICAgIDIgLS4tPnxcInJlYWRzLCBjYWxsc1wifCBidWlsdC1pbjpfXG4gICAgbGlua1N0eWxlIDIgc3Ryb2tlOmdyYXk7XG4gICAgNCAtLT58XCJyZWFkcywgYXJndW1lbnRcInwgMlxuICAgIDQgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDNcbiAgICA0IC0uLT58XCJyZWFkcywgY2FsbHNcInwgYnVpbHQtaW46X1xuICAgIGxpbmtTdHlsZSA1IHN0cm9rZTpncmF5OyIsIm1lcm1haWQiOnsiYXV0b1N5bmMiOnRydWV9fQ==
+    Copied mermaid url to clipboard (dataflow: 0ms).
     ```
     
     
@@ -697,7 +698,7 @@ It offers a wide variety of features, for example:
     ```
     
     	
-    (The analysis required _4.5 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _1.2 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/control-flow/simple-visitor.js

@@ -37,7 +37,9 @@ visitor) {
         }
         const incoming = graph.outgoingEdges(current);
         if (incoming) {
-            queue = queue.concat(incoming.keys().toArray());
+            for (const c of incoming.keys()) {
+                queue.push(c);
+            }
         }
     }
 }

package/dataflow/environments/default-builtin-config.d.ts

@@ -293,7 +293,7 @@ export declare const DefaultBuiltinConfig: [{
     readonly assumePrimitive: true;
 }, {
     readonly type: "function";
-    readonly names: ["stopifnot"];
+    readonly names: ["stopifnot", "assert_that"];
     readonly processor: BuiltInProcName.StopIfNot;
     readonly config: {};
     readonly assumePrimitive: false;

package/dataflow/environments/default-builtin-config.js

@@ -242,7 +242,7 @@ exports.DefaultBuiltinConfig = [
     },
     { type: 'function', names: ['try'], processor: built_in_1.BuiltInProcName.Try, config: { block: 'expr', handlers: {} }, assumePrimitive: true },
     { type: 'function', names: ['tryCatch', 'tryCatchLog'], processor: built_in_1.BuiltInProcName.Try, config: { block: 'expr', handlers: { error: 'error', finally: 'finally' } }, assumePrimitive: true },
-    { type: 'function', names: ['stopifnot'], processor: built_in_1.BuiltInProcName.StopIfNot, config: {}, assumePrimitive: false },
+    { type: 'function', names: ['stopifnot', 'assert_that'], processor: built_in_1.BuiltInProcName.StopIfNot, config: {}, assumePrimitive: false },
     { type: 'function', names: ['break'], processor: built_in_1.BuiltInProcName.Default, config: { useAsProcessor: built_in_1.BuiltInProcName.Break, cfg: 2 /* ExitPointType.Break */ }, assumePrimitive: false },
     { type: 'function', names: ['next'], processor: built_in_1.BuiltInProcName.Default, config: { cfg: 3 /* ExitPointType.Next */ }, assumePrimitive: false },
     { type: 'function', names: ['{'], processor: built_in_1.BuiltInProcName.ExpressionList, config: {}, assumePrimitive: true },

package/dataflow/extractor.js

@@ -89,7 +89,7 @@ function resolveLinkToSideEffects(ast, graph) {
             continue;
         }
         /* this has to change whenever we add a new link to relations because we currently offer no abstraction for the type */
-        const potentials = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(s.id, cf?.graph, graph, s.linkTo, knownCalls);
+        const potentials = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelationSync)(s.id, cf.graph, graph, s.linkTo, knownCalls);
         for (const pot of potentials) {
             graph.addEdge(s.id, pot, edge_1.EdgeType.Reads);
         }

package/dataflow/graph/graph.d.ts

@@ -177,20 +177,7 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
      * @see DataflowGraphVertexArgument
      */
     addVertex(vertex: DataflowGraphVertexArgument & Omit<Vertex, keyof DataflowGraphVertexArgument>, fallbackEnv: REnvironmentInformation, asRoot?: boolean, overwrite?: boolean): this;
-    /** {@inheritDoc} */
-    addEdge(from: NodeId, to: NodeId, type: EdgeType | number): this;
-    /** {@inheritDoc} */
-    addEdge(from: {
-        nodeId: NodeId;
-    }, to: {
-        nodeId: NodeId;
-    }, type: EdgeType | number): this;
-    /** {@inheritDoc} */
-    addEdge(from: NodeId | {
-        nodeId: NodeId;
-    }, to: NodeId | {
-        nodeId: NodeId;
-    }, type: EdgeType | number): this;
+    addEdge(fromId: NodeId, toId: NodeId, type: EdgeType | number): this;
     /**
      * Merges the other graph into *this* one (in-place). The return value is only for convenience.
      * @param otherGraph        - The graph to merge into this one

package/dataflow/graph/graph.js

@@ -222,8 +222,7 @@ class DataflowGraph {
         }
         return this;
     }
-    addEdge(from, to, type) {
-        const [fromId, toId] = extractEdgeIds(from, to);
+    addEdge(fromId, toId, type) {
         if (fromId === toId) {
             return this;
         }
@@ -390,14 +389,6 @@ function mergeNodeInfos(current, next) {
     }
     return current;
 }
-/**
- * Returns the ids of the dataflow vertices referenced.
- */
-function extractEdgeIds(from, to) {
-    const fromId = typeof from === 'object' ? from.nodeId : from;
-    const toId = typeof to === 'object' ? to.nodeId : to;
-    return [fromId, toId];
-}
 function envFromJson(json) {
     const parent = json.parent ? envFromJson(json.parent) : undefined;
     const memory = new Map();

package/dataflow/internal/linker.d.ts

@@ -63,6 +63,18 @@ export declare function linkFunctionCalls(graph: DataflowGraph, idMap: AstIdMap,
 export declare function getAllFunctionCallTargets(call: NodeId, graph: DataflowGraph, environment?: REnvironmentInformation): NodeId[];
 /**
  * Finds all linked function definitions starting from the given set of read ids.
+ * This is a complicated function, please only call it if you know what you are doing.
+ * For example, if you are interested in the called functions of a function call, use {@link getAllFunctionCallTargets} instead.
+ * This function here expects you to handle the accessed objects yourself (e.g,. already resolve the first layer of reads/returns/calls/... or resolve the identifier by name)
+ * and then pass in the relevant read ids.
+ * @example
+ * Consider a scenario like this:
+ * ```R
+ * x <- function() 3
+ * x()
+ * ```
+ * To resolve the call `x` in the second line, use {@link getAllFunctionCallTargets}!
+ * To know what fdefs the definition of `x` in the first line links to, you can use {@link getAllLinkedFunctionDefinitions|this function}.
  */
 export declare function getAllLinkedFunctionDefinitions(functionDefinitionReadIds: ReadonlySet<NodeId>, dataflowGraph: DataflowGraph): [Set<Required<DataflowGraphVertexFunctionDefinition>>, Set<BuiltIn>];
 /**

package/dataflow/internal/linker.js

@@ -230,10 +230,10 @@ function linkFunctionCallWithSingleTarget(graph, { subflow: fnSubflow, exitPoint
             if (defs === undefined) {
                 continue;
             }
-            for (const def of defs) {
-                if (!(0, built_in_1.isBuiltIn)(def.nodeId)) {
-                    graph.addEdge(ingoing, def, edge_1.EdgeType.DefinedByOnCall);
-                    graph.addEdge(id, def, edge_1.EdgeType.DefinesOnCall);
+            for (const { nodeId } of defs) {
+                if (!(0, built_in_1.isBuiltIn)(nodeId)) {
+                    graph.addEdge(ingoing.nodeId, nodeId, edge_1.EdgeType.DefinedByOnCall);
+                    graph.addEdge(id, nodeId, edge_1.EdgeType.DefinesOnCall);
                 }
             }
         }
@@ -340,6 +340,18 @@ function getAllFunctionCallTargets(call, graph, environment) {
 const LinkedFnFollowBits = edge_1.EdgeType.Reads | edge_1.EdgeType.DefinedBy | edge_1.EdgeType.DefinedByOnCall;
 /**
  * Finds all linked function definitions starting from the given set of read ids.
+ * This is a complicated function, please only call it if you know what you are doing.
+ * For example, if you are interested in the called functions of a function call, use {@link getAllFunctionCallTargets} instead.
+ * This function here expects you to handle the accessed objects yourself (e.g,. already resolve the first layer of reads/returns/calls/... or resolve the identifier by name)
+ * and then pass in the relevant read ids.
+ * @example
+ * Consider a scenario like this:
+ * ```R
+ * x <- function() 3
+ * x()
+ * ```
+ * To resolve the call `x` in the second line, use {@link getAllFunctionCallTargets}!
+ * To know what fdefs the definition of `x` in the first line links to, you can use {@link getAllLinkedFunctionDefinitions|this function}.
  */
 function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGraph) {
     const result = new Set();
@@ -350,13 +362,14 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
     const potential = Array.from(functionDefinitionReadIds);
     const visited = new Set();
     while (potential.length !== 0) {
-        const currentId = potential.pop();
-        visited.add(currentId);
-        if ((0, built_in_1.isBuiltIn)(currentId)) {
-            builtIns.add(currentId);
+        const cid = potential.pop();
+        // console.log(`visiting ${recoverName(cid, dataflowGraph.idMap)} ${cid}`);
+        visited.add(cid);
+        if ((0, built_in_1.isBuiltIn)(cid)) {
+            builtIns.add(cid);
             continue;
         }
-        const currentInfo = dataflowGraph.get(currentId, true);
+        const currentInfo = dataflowGraph.get(cid, true);
         if (currentInfo === undefined) {
             continue;
         }
@@ -375,7 +388,7 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
                 }
             }
         }
-        if (hasReturnEdge) {
+        if (vertex.tag === vertex_1.VertexType.FunctionCall || hasReturnEdge) {
             continue;
         }
         for (const [target, { types }] of edges) {
@@ -409,7 +422,7 @@ function linkInputs(referencesToLinkAgainstEnvironment, environmentInformation,
             let allBuiltIn = true;
             for (const target of probableTarget) {
                 // we can stick with maybe even if readId.attribute is always
-                graph.addEdge(bodyInput, target, edge_1.EdgeType.Reads);
+                graph.addEdge(bodyInput.nodeId, target.nodeId, edge_1.EdgeType.Reads);
                 if (!(0, identifier_1.isReferenceType)(target.type, identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.BuiltInFunction)) {
                     allBuiltIn = false;
                 }

package/dataflow/internal/process/functions/call/built-in/built-in-apply.js

@@ -145,10 +145,11 @@ function processApply(name, args, rootId, data, config) {
                 }
                 (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found ${resolved.length} references to open ref ${ingoing.nodeId} in closure of function definition ${rootId}`);
                 let allBuiltIn = true;
-                for (const ref of resolved) {
-                    information.graph.addEdge(ingoing, ref, edge_1.EdgeType.Reads);
-                    information.graph.addEdge(rootId, ref, edge_1.EdgeType.Reads); // because the def. is the anonymous call
-                    if (!(0, identifier_1.isReferenceType)(ref.type, identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.BuiltInFunction)) {
+                const inId = ingoing.nodeId;
+                for (const { nodeId, type } of resolved) {
+                    information.graph.addEdge(inId, nodeId, edge_1.EdgeType.Reads);
+                    information.graph.addEdge(rootId, nodeId, edge_1.EdgeType.Reads); // because the def. is the anonymous call
+                    if (!(0, identifier_1.isReferenceType)(type, identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.BuiltInFunction)) {
                         allBuiltIn = false;
                     }
                 }

package/dataflow/internal/process/functions/call/built-in/built-in-assignment.js

@@ -323,12 +323,13 @@ function markAsAssignment(information, nodeToDefine, sourceIds, rootIdOfAssignme
     }
     information.environment = (0, define_1.define)(nodeToDefine, assignmentConfig?.superAssignment, information.environment, data.ctx.config);
     information.graph.setDefinitionOfVertex(nodeToDefine);
+    const nid = nodeToDefine.nodeId;
     if (!assignmentConfig?.quoteSource) {
         for (const sourceId of sourceIds) {
-            information.graph.addEdge(nodeToDefine, sourceId, edge_1.EdgeType.DefinedBy);
+            information.graph.addEdge(nid, sourceId, edge_1.EdgeType.DefinedBy);
         }
     }
-    information.graph.addEdge(nodeToDefine, rootIdOfAssignment, edge_1.EdgeType.DefinedBy);
+    information.graph.addEdge(nid, rootIdOfAssignment, edge_1.EdgeType.DefinedBy);
     // kinda dirty, but we have to remove existing read edges for the symbol, added by the child
     const out = information.graph.outgoingEdges(nodeToDefine.nodeId);
     for (const [id, edge] of (out ?? [])) {

package/dataflow/internal/process/functions/call/built-in/built-in-expression-list.js

@@ -39,11 +39,14 @@ function linkReadNameToWriteIfPossible(read, environments, listEnvironments, rem
     if (probableTarget === undefined) {
         return;
     }
+    const rid = read.nodeId;
     for (const target of probableTarget) {
-        // we can stick with maybe even if readId.attribute is always
-        nextGraph.addEdge(read, target, edge_1.EdgeType.Reads);
-        if ((read.type === identifier_1.ReferenceType.Function || read.type === identifier_1.ReferenceType.BuiltInFunction) && ((0, built_in_1.isBuiltIn)(target.definedAt))) {
-            nextGraph.addEdge(read, target, edge_1.EdgeType.Calls);
+        const tid = target.nodeId;
+        if ((read.type === identifier_1.ReferenceType.Function || read.type === identifier_1.ReferenceType.BuiltInFunction) && (0, built_in_1.isBuiltIn)(target.definedAt)) {
+            nextGraph.addEdge(rid, tid, edge_1.EdgeType.Reads | edge_1.EdgeType.Calls);
+        }
+        else {
+            nextGraph.addEdge(rid, tid, edge_1.EdgeType.Reads);
         }
     }
 }

package/dataflow/internal/process/functions/call/built-in/built-in-function-definition.js

@@ -204,10 +204,11 @@ function updateNestedFunctionClosures(graph, outEnvironment, fnId) {
                 remainingIn.push(ingoing);
                 continue;
             }
+            const inId = ingoing.nodeId;
             (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found ${resolved.length} references to open ref ${id} in closure of function definition ${fnId}`);
             let allBuiltIn = true;
             for (const ref of resolved) {
-                graph.addEdge(ingoing, ref, edge_1.EdgeType.Reads);
+                graph.addEdge(inId, ref.nodeId, edge_1.EdgeType.Reads);
                 if (!(0, identifier_1.isReferenceType)(ref.type, identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.BuiltInFunction)) {
                     allBuiltIn = false;
                 }
@@ -259,6 +260,9 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
                 continue;
             }
             graph.addEdge(id, target, edge_1.EdgeType.Calls);
+            for (const exitPoint of targetVertex.exitPoints) {
+                graph.addEdge(id, exitPoint.nodeId, edge_1.EdgeType.Returns);
+            }
             const ingoingRefs = targetVertex.subflow.in;
             const remainingIn = [];
             for (const ingoing of ingoingRefs) {
@@ -267,11 +271,12 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
                     remainingIn.push(ingoing);
                     continue;
                 }
+                const inId = ingoing.nodeId;
                 (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found ${resolved.length} references to open ref ${id} in closure of function definition ${id}`);
-                for (const def of resolved) {
-                    if (!(0, built_in_1.isBuiltIn)(def.nodeId)) {
-                        graph.addEdge(ingoing, def, edge_1.EdgeType.DefinedByOnCall);
-                        graph.addEdge(id, def, edge_1.EdgeType.DefinesOnCall);
+                for (const { nodeId } of resolved) {
+                    if (!(0, built_in_1.isBuiltIn)(nodeId)) {
+                        graph.addEdge(inId, nodeId, edge_1.EdgeType.DefinedByOnCall);
+                        graph.addEdge(id, nodeId, edge_1.EdgeType.DefinesOnCall);
                     }
                 }
             }
@@ -305,9 +310,10 @@ function findPromiseLinkagesForParameters(parameters, readInParameters, paramete
     const remainingRead = [];
     for (const read of readInParameters) {
         const resolved = read.name ? (0, resolve_by_name_1.resolveByName)(read.name, parameterEnvs, read.type) : undefined;
+        const rid = read.nodeId;
         if (resolved !== undefined) {
-            for (const ref of resolved) {
-                parameters.addEdge(read, ref, edge_1.EdgeType.Reads);
+            for (const { nodeId } of resolved) {
+                parameters.addEdge(rid, nodeId, edge_1.EdgeType.Reads);
             }
             continue;
         }
@@ -320,11 +326,11 @@ function findPromiseLinkagesForParameters(parameters, readInParameters, paramete
             continue;
         }
         if (writingOuts[0].cds === undefined) {
-            parameters.addEdge(read, writingOuts[0], edge_1.EdgeType.Reads);
+            parameters.addEdge(rid, writingOuts[0].nodeId, edge_1.EdgeType.Reads);
             continue;
         }
-        for (const out of writingOuts) {
-            parameters.addEdge(read, out, edge_1.EdgeType.Reads);
+        for (const { nodeId } of writingOuts) {
+            parameters.addEdge(rid, nodeId, edge_1.EdgeType.Reads);
         }
     }
     return remainingRead;

package/dataflow/internal/process/functions/call/built-in/built-in-get.js

@@ -40,7 +40,7 @@ function processGet(name, args, rootId, data) {
     const firstArg = processedArguments[0];
     if (firstArg) {
         // get 'reads' its first argument
-        information.graph.addEdge(rootId, firstArg.entryPoint, edge_1.EdgeType.Reads);
+        information.graph.addEdge(rootId, firstArg.entryPoint, edge_1.EdgeType.Returns | edge_1.EdgeType.Reads);
     }
     return information;
 }

package/dataflow/internal/process/functions/call/built-in/built-in-try-catch.js

@@ -132,8 +132,9 @@ function promoteCallToFunction(call, arg, info, data) {
                 (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found ${resolved.length} references to open ref ${ingoing.nodeId} in closure of function definition ${call}`);
                 let allBuiltIn = true;
                 for (const ref of resolved) {
-                    info.graph.addEdge(ingoing, ref, edge_1.EdgeType.Reads);
-                    info.graph.addEdge(call, ref, edge_1.EdgeType.Reads); // because the def. is the anonymous call
+                    const rid = ref.nodeId;
+                    info.graph.addEdge(ingoing.nodeId, rid, edge_1.EdgeType.Reads);
+                    info.graph.addEdge(call, rid, edge_1.EdgeType.Reads); // because the def. is the anonymous call
                     if (!(0, identifier_1.isReferenceType)(ref.type, identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.BuiltInFunction)) {
                         allBuiltIn = false;
                     }

package/dataflow/internal/process/functions/process-argument.js

@@ -14,9 +14,10 @@ const vertex_1 = require("../../../graph/vertex");
 function linkReadsForArgument(root, ingoingRefs, graph) {
     const allIdsBeforeArguments = new Set((0, collect_1.collectAllIds)(root, n => n.type === type_1.RType.Argument && n.info.id !== root.info.id));
     const ingoingBeforeArgs = ingoingRefs.filter(r => allIdsBeforeArguments.has(r.nodeId));
+    const rid = root.info.id;
     for (const ref of ingoingBeforeArgs) {
         // link against the root reference currently I do not know how to deal with nested function calls otherwise
-        graph.addEdge(root.info.id, ref, edge_1.EdgeType.Reads);
+        graph.addEdge(rid, ref.nodeId, edge_1.EdgeType.Reads);
     }
 }
 /**

package/dataflow/internal/process/functions/process-parameter.js

@@ -21,17 +21,18 @@ function processFunctionParameter(parameter, data) {
     }));
     let environment = name.environment;
     for (const writtenNode of writtenNodes) {
-        (0, log_1.expensiveTrace)(log_1.log, () => `parameter ${writtenNode.name} (${writtenNode.nodeId}) is defined at id ${writtenNode.definedAt} with ${defaultValue === undefined ? 'no default value' : ' a default value'}`);
+        const wid = writtenNode.nodeId;
+        (0, log_1.expensiveTrace)(log_1.log, () => `parameter ${writtenNode.name} (${wid}) is defined at id ${writtenNode.definedAt} with ${defaultValue === undefined ? 'no default value' : ' a default value'}`);
         graph.setDefinitionOfVertex(writtenNode);
         environment = (0, define_1.define)(writtenNode, false, environment, data.ctx.config);
         if (defaultValue !== undefined) {
             if (parameter.defaultValue?.type === type_1.RType.FunctionDefinition) {
-                graph.addEdge(writtenNode, parameter.defaultValue.info.id, edge_1.EdgeType.DefinedBy);
+                graph.addEdge(wid, parameter.defaultValue.info.id, edge_1.EdgeType.DefinedBy);
             }
             else {
                 const definedBy = defaultValue.in.concat(defaultValue.unknownReferences);
                 for (const node of definedBy) {
-                    graph.addEdge(writtenNode, node, edge_1.EdgeType.DefinedBy);
+                    graph.addEdge(wid, node.nodeId, edge_1.EdgeType.DefinedBy);
                 }
             }
         }

package/documentation/wiki-query.js

@@ -57,8 +57,7 @@ Besides this, we provide the following ways to automatically categorize and link
 
 1. **Kind**         (\`kind\`): This is a general category that can be used to group calls together. For example, you may want to link all calls to \`plot\` to \`visualize\`.
 2. **Subkind**      (\`subkind\`): This is used to uniquely identify the respective call type when grouping the output. For example, you may want to link all calls to \`ggplot\` to \`plot\`.
-3. **Linked Calls** (\`linkTo\`): This links the current call to the last call of the given kind. This way, you can link a call like \`points\` to the latest graphics plot etc.
-   For now, we _only_ offer support for linking to the last call, as the current flow dependency over-approximation is not stable.
+3. **Linked Calls** (\`linkTo\`): This links the current call to the last/nested/.. call of the given kind. This way, you can link a call like \`points\` to the latest graphics plot etc.
 4. **Aliases**      (\`includeAliases\`): Consider a case like \`f <- function_of_interest\`, do you want calls to \`f\` to be included in the results? There is probably no need to combine this with a global call target!
 
 It's also possible to filter the results based on the following properties:
@@ -804,7 +803,7 @@ ${(0, doc_query_1.tocForQueryType)('virtual')}
 
 <summary>Detailed Query Format (Automatically Generated)</summary>
 
-Although it is probably better to consult the detailed explanations below, if you want to have a look at the schema, here is its description:
+Although it is probably better to consult the detailed explanations, if you want to have a look at the schema, here is its description:
 
 ${(0, schema_1.describeSchema)((0, query_1.QueriesSchema)(), ansi_1.markdownFormatter)}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.8.12",
+  "version": "2.8.13",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/queries/catalog/call-context-query/call-context-query-executor.d.ts

@@ -4,7 +4,7 @@ import type { BasicQueryData } from '../../base-query-format';
  *
  */
 export declare function promoteCallName(callName: CallNameTypes, exact?: boolean): RegExp | Set<string>;
-export type PromotedLinkTo = Omit<LinkTo, 'callName'> & {
+export type PromotedLinkTo<LT = LinkTo> = Omit<LT, 'callName'> & {
     callName: RegExp | Set<string>;
 };
 /**

package/queries/catalog/call-context-query/call-context-query-executor.js

@@ -10,6 +10,7 @@ const objects_1 = require("../../../util/objects");
 const identify_link_to_last_call_relation_1 = require("./identify-link-to-last-call-relation");
 const cfg_kind_1 = require("../../../project/cfg-kind");
 const extract_cfg_1 = require("../../../control-flow/extract-cfg");
+const identify_link_to_relation_1 = require("./identify-link-to-relation");
 /* if the node is effected by nse, we have an ingoing nse edge */
 function isQuoted(node, graph) {
     const vertex = graph.ingoingEdges(node);
@@ -239,10 +240,10 @@ async function executeCallContextQueries({ analyzer }, queries) {
                 const linked = Array.isArray(query.linkTo) ? query.linkTo : [query.linkTo];
                 for (const link of linked) {
                     /* if we have a linkTo query, we have to find the last call */
-                    const lastCall = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(nodeId, cfg.graph, dataflow.graph, link, calls);
-                    if (lastCall) {
+                    const linkTos = await (0, identify_link_to_relation_1.identifyLinkToRelation)(nodeId, analyzer, link, calls);
+                    if (linkTos) {
                         linkedIds ??= new Set();
-                        for (const l of lastCall) {
+                        for (const l of linkTos) {
                             if (link.attachLinkInfo) {
                                 linkedIds.add({ id: l, info: link.attachLinkInfo });
                             }