@eagleoutice/flowr 2.8.13 → 2.8.15

package/control-flow/extract-cfg.js

@@ -79,7 +79,7 @@ function extractCfgQuick(ast) {
 function getCallsInCfg(cfg, graph) {
     const calls = new Map();
     for (const vertexId of cfg.graph.vertices().keys()) {
-        const vertex = graph.getVertex(vertexId, true);
+        const vertex = graph.getVertex(vertexId);
         if ((0, vertex_1.isFunctionCallVertex)(vertex)) {
             calls.set(vertexId, vertex);
         }

package/dataflow/environments/reference-to-maybe.js

@@ -34,7 +34,7 @@ function makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd = u
             }
         }
     }
-    const node = graph.getVertex(ref.nodeId, true);
+    const node = graph.getVertex(ref.nodeId);
     if (node) {
         if (node.cds) {
             appToCdsUnique(node.cds, defaultCd);

package/dataflow/fn/exceptions-of-function.d.ts

@@ -9,5 +9,7 @@ export interface ExceptionPoint {
  * Collect exception sources of a function in the call graph.
  * This returns the `NodeId`s of functions that may throw exceptions when called by the given function.
  * Please be aware, that these are restricted to functions known by flowR.
+ * With `knownThrower` you can provide additional functions that are known to throw exceptions.
+ * @returns A record mapping all `NodeId`s of functions that may throw exceptions to their exception points.
  */
-export declare function calculateExceptionsOfFunction(id: NodeId, graph: CallGraph): ExceptionPoint[];
+export declare function calculateExceptionsOfFunction(id: NodeId, graph: CallGraph, knownThrower?: Record<NodeId, ExceptionPoint[]>): Record<NodeId, ExceptionPoint[]>;

package/dataflow/fn/exceptions-of-function.js

@@ -8,9 +8,12 @@ const CatchHandlers = new Set([built_in_1.BuiltInProcName.Try]);
  * Collect exception sources of a function in the call graph.
  * This returns the `NodeId`s of functions that may throw exceptions when called by the given function.
  * Please be aware, that these are restricted to functions known by flowR.
+ * With `knownThrower` you can provide additional functions that are known to throw exceptions.
+ * @returns A record mapping all `NodeId`s of functions that may throw exceptions to their exception points.
  */
-function calculateExceptionsOfFunction(id, graph) {
-    const collectedExceptions = [];
+function calculateExceptionsOfFunction(id, graph, knownThrower = {}) {
+    const collectedExceptions = {};
+    const mine = [];
     const visited = new Set();
     const toVisit = [id];
     while (toVisit.length > 0) {
@@ -19,6 +22,15 @@ function calculateExceptionsOfFunction(id, graph) {
             continue;
         }
         visited.add(currentId);
+        const kt = knownThrower[currentId];
+        if (kt) {
+            for (const e of kt) {
+                if (!mine.includes(e)) {
+                    mine.push(e);
+                }
+            }
+            continue;
+        }
         const vtx = graph.getVertex(currentId);
         if (!vtx) {
             continue;
@@ -27,11 +39,13 @@ function calculateExceptionsOfFunction(id, graph) {
             continue;
         }
         if (vtx.tag === vertex_1.VertexType.FunctionDefinition) {
-            for (const e of vtx.exitPoints.filter(e => e.type === 4 /* ExitPointType.Error */)) {
-                if (!collectedExceptions.some(x => x.id === e.nodeId)) {
-                    collectedExceptions.push({ id: e.nodeId, cds: e.cds });
+            const es = vtx.exitPoints.filter(e => e.type === 4 /* ExitPointType.Error */).map(e => ({ id: e.nodeId, cds: e.cds }));
+            for (const e of es) {
+                if (!mine.includes(e)) {
+                    mine.push(e);
                 }
             }
+            collectedExceptions[vtx.id] = es;
         }
         else if (vtx.tag === vertex_1.VertexType.FunctionCall && vtx.origin !== 'unnamed' && vtx.origin.some(c => CatchHandlers.has(c))) {
             // skip the try-catch handlers as they catch all exceptions within their body
@@ -39,9 +53,12 @@ function calculateExceptionsOfFunction(id, graph) {
         }
         const outEdges = graph.outgoingEdges(currentId) ?? [];
         for (const [out] of outEdges) {
-            toVisit.push(out);
+            if (!visited.has(out)) {
+                toVisit.push(out);
+            }
         }
     }
+    collectedExceptions[id] = mine;
     return collectedExceptions;
 }
 //# sourceMappingURL=exceptions-of-function.js.map

package/dataflow/fn/higher-order-function.js

@@ -9,7 +9,7 @@ const config_1 = require("../../config");
 const r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const general_1 = require("../eval/values/general");
 function isAnyReturnAFunction(def, graph) {
-    const workingQueue = def.exitPoints.map(d => graph.getVertex(d.nodeId, true)).filter(assert_1.isNotUndefined);
+    const workingQueue = def.exitPoints.map(d => graph.getVertex(d.nodeId)).filter(assert_1.isNotUndefined);
     const seen = new Set();
     while (workingQueue.length > 0) {
         const current = workingQueue.pop();
@@ -23,7 +23,7 @@ function isAnyReturnAFunction(def, graph) {
         const next = graph.outgoingEdges(current.id) ?? [];
         for (const [t, { types }] of next) {
             if ((0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.Returns)) {
-                const v = graph.getVertex(t, true);
+                const v = graph.getVertex(t);
                 if (v) {
                     workingQueue.push(v);
                 }
@@ -38,7 +38,7 @@ function inspectCallSitesArgumentsFns(def, graph, ctx) {
         if (!(0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.Calls)) {
             continue;
         }
-        const caller = graph.getVertex(callerId, true);
+        const caller = graph.getVertex(callerId);
         if (!caller || !(0, vertex_1.isFunctionCallVertex)(caller)) {
             continue;
         }

package/dataflow/graph/call-graph.d.ts

@@ -1,17 +1,30 @@
 import { DataflowGraph } from './graph';
 import type { DataflowGraphVertexFunctionCall, DataflowGraphVertexFunctionDefinition } from './vertex';
 import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { DefaultMap } from '../../util/collections/defaultmap';
 /**
  * A call graph is a dataflow graph where all vertices are function calls.
  * You can create a call graph from a dataflow graph using {@link computeCallGraph}.
  * If you want to extract a sub call graph, use {@link getSubCallGraph}.
+ * @see {@link dropTransitiveEdges} - to reduce the call graph by dropping transitive edges
  */
 export type CallGraph = DataflowGraph<Required<DataflowGraphVertexFunctionCall | DataflowGraphVertexFunctionDefinition>>;
 /**
  * Extracts the sub call graph from the given call graph, starting from the given entry points.
  */
 export declare function getSubCallGraph(graph: CallGraph, entryPoints: Set<NodeId>): CallGraph;
+/**
+ *
+ */
+export declare function reaches(from: NodeId, to: NodeId, graph: DataflowGraph, knownReachability?: DefaultMap<NodeId, Set<NodeId>>): boolean;
+/**
+ * Reduces the call graph by dropping all transitive edges.
+ */
+export declare function dropTransitiveEdges(graph: CallGraph): CallGraph;
 /**
  * Computes the call graph from the given dataflow graph.
+ * @see {@link CallGraph} - for details
+ * @see {@link getSubCallGraph} - to extract sub call graphs
+ * @see {@link dropTransitiveEdges} - to reduce the call graph by dropping transitive edges
  */
 export declare function computeCallGraph(graph: DataflowGraph): CallGraph;

package/dataflow/graph/call-graph.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSubCallGraph = getSubCallGraph;
+exports.reaches = reaches;
+exports.dropTransitiveEdges = dropTransitiveEdges;
 exports.computeCallGraph = computeCallGraph;
 const graph_1 = require("./graph");
 const vertex_1 = require("./vertex");
@@ -21,7 +23,7 @@ function getSubCallGraph(graph, entryPoints) {
             continue;
         }
         visited.add(currentId);
-        const currentVtx = graph.getVertex(currentId, true);
+        const currentVtx = graph.getVertex(currentId);
         if (!currentVtx) {
             continue;
         }
@@ -35,7 +37,10 @@ function getSubCallGraph(graph, entryPoints) {
     }
     return result;
 }
-function reaches(from, to, graph, knownReachability) {
+/**
+ *
+ */
+function reaches(from, to, graph, knownReachability = new defaultmap_1.DefaultMap(() => new Set())) {
     const visited = new Set();
     const toVisit = [from];
     while (toVisit.length > 0) {
@@ -58,15 +63,34 @@ function reaches(from, to, graph, knownReachability) {
     }
     return false;
 }
+/**
+ * Reduces the call graph by dropping all transitive edges.
+ */
+function dropTransitiveEdges(graph) {
+    const newCg = new graph_1.DataflowGraph(graph.idMap);
+    newCg.mergeVertices(graph);
+    const knownReachability = new defaultmap_1.DefaultMap(() => new Set());
+    // heuristically sort by dif in ids
+    const es = Array.from(graph.edges(), ([e, ts]) => ts.entries().map(([t, { types }]) => [e, t, types]).toArray()).flat()
+        .sort((a, b) => String(a[0]).localeCompare(String(a[1])) - String(b[0]).localeCompare(String(b[1])));
+    for (const [from, to, types] of es) {
+        if (!reaches(from, to, newCg, knownReachability)) {
+            newCg.addEdge(from, to, types);
+        }
+    }
+    return newCg;
+}
 /**
  * Computes the call graph from the given dataflow graph.
+ * @see {@link CallGraph} - for details
+ * @see {@link getSubCallGraph} - to extract sub call graphs
+ * @see {@link dropTransitiveEdges} - to reduce the call graph by dropping transitive edges
  */
 function computeCallGraph(graph) {
     const result = new graph_1.DataflowGraph(graph.idMap);
     const state = {
         visited: new Set(),
-        potentials: [],
-        knownReachability: new defaultmap_1.DefaultMap(() => new Set())
+        potentials: []
     };
     for (const [, vert] of graph.vertices(false)) {
         if (vert.tag === vertex_1.VertexType.FunctionCall) {
@@ -79,7 +103,7 @@ function computeCallGraph(graph) {
     for (const [from, tos] of state.potentials) {
         for (const to of tos) {
             if (!result.hasVertex(to)) {
-                const v = graph.getVertex(to, true);
+                const v = graph.getVertex(to);
                 if (v) {
                     processUnknown(v, from, graph, result, state);
                     if (v.tag === vertex_1.VertexType.FunctionDefinition) {
@@ -87,7 +111,7 @@ function computeCallGraph(graph) {
                     }
                 }
             }
-            else if (!reaches(from, to, result, state.knownReachability)) {
+            else {
                 result.addEdge(from, to, edge_1.EdgeType.Calls);
             }
         }
@@ -96,7 +120,7 @@ function computeCallGraph(graph) {
 }
 function processCds(vtx, graph, result, state) {
     for (const tar of vtx.cds ?? []) {
-        const targetVtx = graph.getVertex(tar.id, true);
+        const targetVtx = graph.getVertex(tar.id);
         if (targetVtx) {
             processUnknown(targetVtx, undefined, graph, result, state);
         }
@@ -118,7 +142,7 @@ function fallbackUntargetedCall(vtx, graph) {
             continue;
         }
         visited.add(currentId);
-        const currentVtx = graph.getVertex(currentId, true);
+        const currentVtx = graph.getVertex(currentId);
         if (!currentVtx) {
             continue;
         }
@@ -138,7 +162,7 @@ function fallbackUntargetedCall(vtx, graph) {
 }
 function processCall(vtx, from, graph, result, state) {
     const vid = vtx.id;
-    if (from && !reaches(from, vid, result, state.knownReachability)) {
+    if (from) {
         result.addEdge(from, vid, edge_1.EdgeType.Calls);
     }
     if (state.visited.has(vid)) {
@@ -156,7 +180,7 @@ function processCall(vtx, from, graph, result, state) {
             addedTarget = true;
             continue;
         }
-        const targetVtx = graph.getVertex(tar, true);
+        const targetVtx = graph.getVertex(tar);
         if (targetVtx?.tag !== vertex_1.VertexType.FunctionDefinition) {
             continue;
         }
@@ -174,7 +198,7 @@ function processCall(vtx, from, graph, result, state) {
     if (!addedTarget) {
         const origs = fallbackUntargetedCall(vtx, graph);
         for (const ori of origs) {
-            const oriVtx = graph.getVertex(ori, true);
+            const oriVtx = graph.getVertex(ori);
             if (!oriVtx) {
                 continue;
             }
@@ -197,7 +221,7 @@ function processCall(vtx, from, graph, result, state) {
         if ((0, edge_1.edgeDoesNotIncludeType)(types, edge_1.EdgeType.Reads | edge_1.EdgeType.Returns | edge_1.EdgeType.Argument)) {
             continue;
         }
-        const tVtx = graph.getVertex(tar, true);
+        const tVtx = graph.getVertex(tar);
         if (!tVtx) {
             continue;
         }
@@ -231,7 +255,7 @@ function processFunctionDefinition(vtx, from, graph, result, state) {
     const exits = new Set(vtx.exitPoints);
     state.potentials.push([vtx.id, vtx.subflow.graph.difference(exits)]);
     for (const { nodeId } of exits) {
-        const v = graph.getVertex(nodeId, true);
+        const v = graph.getVertex(nodeId);
         if (v) {
             processUnknown(v, vtx.id, graph, result, state);
         }

package/dataflow/graph/graph.d.ts

@@ -118,11 +118,19 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
     /**
      * Get the {@link DataflowGraphVertexInfo} attached to a vertex.
      * @param id                      - The id of the node to get
-     * @param includeDefinedFunctions - If true this will search function definitions as well and not just the toplevel
      * @returns the node info for the given id (if it exists)
      * @see #get
+     * @see #getRootVertex
+     */
+    getVertex(id: NodeId): Vertex | undefined;
+    /**
+     * Get the {@link DataflowGraphVertexInfo} attached to a root-level vertex.
+     * @param id - The id of the node to get
+     * @returns the node info for the given id (if it exists)
+     * @see #get
+     * @see #getVertex
      */
-    getVertex(id: NodeId, includeDefinedFunctions?: boolean): Vertex | undefined;
+    getRootVertex(id: NodeId): Vertex | undefined;
     outgoingEdges(id: NodeId): OutgoingEdges | undefined;
     ingoingEdges(id: NodeId): IngoingEdges | undefined;
     /**
@@ -185,6 +193,7 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
      *                            in the context of function definitions
      */
     mergeWith(otherGraph: DataflowGraph<Vertex, Edge> | undefined, mergeRootVertices?: boolean): this;
+    mergeVertices(otherGraph: DataflowGraph<Vertex, Edge>, mergeRootVertices?: boolean): void;
     private mergeEdges;
     /**
      * Marks a vertex in the graph to be a definition

package/dataflow/graph/graph.js

@@ -84,18 +84,31 @@ class DataflowGraph {
      */
     get(id, includeDefinedFunctions = true) {
         // if we do not want to include function definitions, only retrieve the value if the id is part of the root vertices
-        const vertex = this.getVertex(id, includeDefinedFunctions);
+        const vertex = includeDefinedFunctions ? this.getVertex(id) : this.getRootVertex(id);
         return vertex === undefined ? undefined : [vertex, this.outgoingEdges(id) ?? new Map()];
     }
     /**
      * Get the {@link DataflowGraphVertexInfo} attached to a vertex.
      * @param id                      - The id of the node to get
-     * @param includeDefinedFunctions - If true this will search function definitions as well and not just the toplevel
      * @returns the node info for the given id (if it exists)
      * @see #get
+     * @see #getRootVertex
      */
-    getVertex(id, includeDefinedFunctions = true) {
-        return includeDefinedFunctions || this.rootVertices.has(id) ? this.vertexInformation.get(id) : undefined;
+    getVertex(id) {
+        return this.vertexInformation.get(id);
+    }
+    /**
+     * Get the {@link DataflowGraphVertexInfo} attached to a root-level vertex.
+     * @param id - The id of the node to get
+     * @returns the node info for the given id (if it exists)
+     * @see #get
+     * @see #getVertex
+     */
+    getRootVertex(id) {
+        if (!this.rootVertices.has(id)) {
+            return undefined;
+        }
+        return this.vertexInformation.get(id);
     }
     outgoingEdges(id) {
         return this.edgeInformation.get(id);
@@ -254,6 +267,15 @@ class DataflowGraph {
         if (otherGraph === undefined) {
             return this;
         }
+        this.mergeVertices(otherGraph, mergeRootVertices);
+        for (const [type, ids] of otherGraph.types) {
+            const existing = this.types.get(type);
+            this.types.set(type, existing ? existing.concat(ids) : ids.slice());
+        }
+        this.mergeEdges(otherGraph);
+        return this;
+    }
+    mergeVertices(otherGraph, mergeRootVertices = true) {
         // merge root ids
         if (mergeRootVertices) {
             for (const root of otherGraph.rootVertices) {
@@ -267,12 +289,6 @@ class DataflowGraph {
             const currentInfo = this.vertexInformation.get(id);
             this.vertexInformation.set(id, currentInfo === undefined ? info : mergeNodeInfos(currentInfo, info));
         }
-        for (const [type, ids] of otherGraph.types) {
-            const existing = this.types.get(type);
-            this.types.set(type, existing ? existing.concat(ids) : ids.slice());
-        }
-        this.mergeEdges(otherGraph);
-        return this;
     }
     mergeEdges(otherGraph) {
         for (const [id, edges] of otherGraph.edgeInformation.entries()) {
@@ -298,7 +314,7 @@ class DataflowGraph {
      * @param reference - The reference to the vertex to mark as definition
      */
     setDefinitionOfVertex(reference) {
-        const vertex = this.getVertex(reference.nodeId, true);
+        const vertex = this.getVertex(reference.nodeId);
         (0, assert_1.guard)(vertex !== undefined, () => `node must be defined for ${JSON.stringify(reference)} to set reference`);
         if (vertex.tag === vertex_1.VertexType.FunctionDefinition || vertex.tag === vertex_1.VertexType.VariableDefinition) {
             vertex.cds = reference.cds;
@@ -314,7 +330,7 @@ class DataflowGraph {
      * @param info - The information about the new function call node
      */
     updateToFunctionCall(info) {
-        const vertex = this.getVertex(info.id, true);
+        const vertex = this.getVertex(info.id);
         (0, assert_1.guard)(vertex !== undefined && (vertex.tag === vertex_1.VertexType.Use || vertex.tag === vertex_1.VertexType.Value), () => `node must be a use or value node for ${JSON.stringify(info.id)} to update it to a function call but is ${vertex?.tag}`);
         const previousTag = vertex.tag;
         this.vertexInformation.set(info.id, { ...vertex, ...info, tag: vertex_1.VertexType.FunctionCall });
@@ -324,7 +340,7 @@ class DataflowGraph {
     /** If you do not pass the `to` node, this will just mark the node as maybe */
     addControlDependency(from, to, when) {
         to = to ? (0, node_id_1.normalizeIdToNumberIfPossible)(to) : undefined;
-        const vertex = this.getVertex(from, true);
+        const vertex = this.getVertex(from);
         (0, assert_1.guard)(vertex !== undefined, () => `node must be defined for ${from} to add control dependency`);
         vertex.cds ??= [];
         if (to) {

package/dataflow/graph/vertex.d.ts

@@ -218,6 +218,8 @@ export interface DataflowGraphVertexVariableDefinition extends DataflowGraphVert
     readonly tag: VertexType.VariableDefinition;
     /** Does not require an environment, those are attached to the call */
     readonly environment?: undefined;
+    /** Indicates whether the variable definition is a *partial* definition (e.g,. in `x[a] <- b`) */
+    readonly par?: true;
 }
 /**
  * Arguments required to construct a vertex which represents the definition of a function in the {@link DataflowGraph|dataflow graph}.

package/dataflow/internal/linker.js

@@ -42,7 +42,7 @@ function findNonLocalReads(graph, ignore) {
         }
         const outgoing = graph.outgoingEdges(nodeId);
         const name = (0, node_id_1.recoverName)(nodeId, graph.idMap);
-        const origin = graph.getVertex(nodeId, true);
+        const origin = graph.getVertex(nodeId);
         const type = origin?.tag === vertex_1.VertexType.FunctionCall ? identifier_1.ReferenceType.Function : identifier_1.ReferenceType.Variable;
         if (outgoing === undefined) {
             nonLocalReads.push({ name, nodeId, type });
@@ -363,7 +363,6 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
     const visited = new Set();
     while (potential.length !== 0) {
         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);
@@ -388,7 +387,7 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
                 }
             }
         }
-        if (vertex.tag === vertex_1.VertexType.FunctionCall || hasReturnEdge) {
+        if (vertex.tag === vertex_1.VertexType.FunctionCall || hasReturnEdge || (vertex.tag === vertex_1.VertexType.VariableDefinition && vertex.par)) {
             continue;
         }
         for (const [target, { types }] of edges) {

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

@@ -271,7 +271,7 @@ function processAssignmentToString(target, args, name, rootId, data, config, sou
     });
 }
 function checkTargetReferenceType(source, sourceInfo) {
-    const vert = sourceInfo.graph.getVertex(source.info.id, true);
+    const vert = sourceInfo.graph.getVertex(source.info.id);
     switch (vert?.tag) {
         case vertex_1.VertexType.FunctionDefinition:
             return identifier_1.ReferenceType.Function;

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

@@ -84,7 +84,7 @@ function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextG
                     };
                 }
                 if (callDependencies === null) {
-                    callDependencies = nextGraph.getVertex(functionCall, true)?.cds;
+                    callDependencies = nextGraph.getVertex(functionCall)?.cds;
                 }
                 inputEnvironment = (0, overwrite_1.overwriteEnvironment)(inputEnvironment, environment, callDependencies);
             }

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

@@ -22,7 +22,7 @@ function processPipe(name, args, rootId, data) {
     const [lhs, rhs] = args.map(e => (0, unpack_argument_1.unpackNonameArg)(e));
     (0, assert_1.guard)(lhs !== undefined && rhs !== undefined, () => `lhs and rhs must be present, but ${JSON.stringify(lhs)} and ${JSON.stringify(rhs)} were found instead.`);
     if (rhs.type === type_1.RType.FunctionCall) {
-        const functionCallNode = information.graph.getVertex(rhs.info.id, true);
+        const functionCallNode = information.graph.getVertex(rhs.info.id);
         (0, assert_1.guard)(functionCallNode?.tag === vertex_1.VertexType.FunctionCall, () => `Expected function call node with id ${rhs.info.id} to be a function call node, but got ${functionCallNode?.tag} instead.`);
         // make the lhs an argument node:
         const argId = lhs.info.id;

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

@@ -45,6 +45,10 @@ args, rootId, data, config) {
     if (createdVert?.tag === vertex_1.VertexType.FunctionCall) {
         createdVert.origin = [built_in_1.BuiltInProcName.Replacement];
     }
+    const targetVert = res.graph.getVertex((0, unpack_argument_1.unpackArg)(args[0])?.info.id);
+    if (targetVert?.tag === vertex_1.VertexType.VariableDefinition) {
+        targetVert.par = true;
+    }
     const convertedArgs = config.readIndices ? args.slice(1, -1) : (0, built_in_access_1.symbolArgumentsToStrings)(args.slice(1, -1), 0);
     /* now, we soft-inject other arguments, so that calls like `x[y] <- 3` are linked correctly */
     const { callArgs } = (0, common_1.processAllArguments)({

package/documentation/wiki-dataflow-graph.js

@@ -392,6 +392,7 @@ ${(0, doc_structure_1.details)('Example: Super Definition (<code><<-</code>)', a
 The implementation is relatively sparse and similar to the other marker vertices:
 
 ${ctx.hierarchy('DataflowGraphVertexVariableDefinition')}
+Of only interest is \`par\`, which signals that the definitions is partial (e.g., in the case of \`x[a] <- 1\`).
 
 Of course, there are not just operators that define variables, but also functions, like \`assign\`.
 

package/linter/linter-rules.d.ts

@@ -5,7 +5,7 @@ import type { LintingRule } from './linter-format';
  */
 export declare const LintingRules: {
     readonly 'deprecated-functions': {
-        readonly createSearch: (config: import("./rules/function-finder-util").FunctionsToDetectConfig) => import("../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter"], import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+        readonly createSearch: (config: import("./rules/function-finder-util").FunctionsToDetectConfig) => import("../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
         readonly processSearchResult: <T extends import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>(elements: import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, T>, _config: unknown, _data: unknown, refineSearch?: (elements: T) => T) => {
             results: {
                 certainty: import("./linter-format").LintingResultCertainty;
@@ -57,7 +57,7 @@ export declare const LintingRules: {
         };
     };
     readonly 'seeded-randomness': {
-        readonly createSearch: (config: import("./rules/seeded-randomness").SeededRandomnessConfig) => import("../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter", "with"], import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+        readonly createSearch: (config: import("./rules/seeded-randomness").SeededRandomnessConfig) => import("../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter", "with"], import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
         readonly processSearchResult: (elements: import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, config: import("./rules/seeded-randomness").SeededRandomnessConfig, { dataflow, analyzer }: {
             normalize: import("../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
             dataflow: import("../dataflow/info").DataflowInformation;
@@ -186,7 +186,7 @@ export declare const LintingRules: {
         };
     };
     readonly 'network-functions': {
-        readonly createSearch: (config: import("./rules/network-functions").NetworkFunctionsConfig) => import("../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter"], import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+        readonly createSearch: (config: import("./rules/network-functions").NetworkFunctionsConfig) => import("../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
         readonly processSearchResult: (e: import("../search/flowr-search").FlowrSearchElements<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../search/flowr-search").FlowrSearchElement<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, c: import("./rules/network-functions").NetworkFunctionsConfig, d: {
             normalize: import("../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
             dataflow: import("../dataflow/info").DataflowInformation;

package/linter/rules/deprecated-functions.d.ts

@@ -2,7 +2,7 @@ import { LintingRuleCertainty } from '../linter-format';
 import { LintingRuleTag } from '../linter-tags';
 import { type FunctionsMetadata, type FunctionsResult, type FunctionsToDetectConfig } from './function-finder-util';
 export declare const DEPRECATED_FUNCTIONS: {
-    readonly createSearch: (config: FunctionsToDetectConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+    readonly createSearch: (config: FunctionsToDetectConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
     readonly processSearchResult: <T extends import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>(elements: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, T>, _config: unknown, _data: unknown, refineSearch?: (elements: T) => T) => {
         results: {
             certainty: import("../linter-format").LintingResultCertainty;

package/linter/rules/function-finder-util.d.ts

@@ -25,7 +25,7 @@ export interface FunctionsToDetectConfig extends MergeableRecord {
  * This helper object collects utility functions used to create linting rules that search for specific functions.
  */
 export declare const functionFinderUtil: {
-    createSearch: (functions: readonly string[]) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter"], ParentInformation, Promise<FlowrSearchElements<ParentInformation, [] | FlowrSearchElement<ParentInformation>[]>>>;
+    createSearch: (functions: readonly string[]) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], ParentInformation, Promise<FlowrSearchElements<ParentInformation, [] | FlowrSearchElement<ParentInformation>[]>>>;
     processSearchResult: <T extends FlowrSearchElement<ParentInformation>[]>(elements: FlowrSearchElements<ParentInformation, T>, _config: unknown, _data: unknown, refineSearch?: (elements: T) => T) => {
         results: {
             certainty: LintingResultCertainty;

package/linter/rules/function-finder-util.js

@@ -15,7 +15,7 @@ const dependencies_query_format_1 = require("../../queries/catalog/dependencies-
  */
 exports.functionFinderUtil = {
     createSearch: (functions) => {
-        return (flowr_search_builder_1.Q.all()
+        return (flowr_search_builder_1.Q.all().filter(vertex_1.VertexType.FunctionCall)
             .with(search_enrichers_1.Enrichment.CallTargets, { onlyBuiltin: true })
             .filter({
             name: flowr_search_filters_1.FlowrFilter.MatchesEnrichment,

package/linter/rules/network-functions.d.ts

@@ -9,7 +9,7 @@ export interface NetworkFunctionsConfig extends MergeableRecord {
     onlyTriggerWithArgument?: RegExp | string;
 }
 export declare const NETWORK_FUNCTIONS: {
-    readonly createSearch: (config: NetworkFunctionsConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+    readonly createSearch: (config: NetworkFunctionsConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
     readonly processSearchResult: (e: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, c: NetworkFunctionsConfig, d: {
         normalize: import("../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         dataflow: import("../../dataflow/info").DataflowInformation;

package/linter/rules/seeded-randomness.d.ts

@@ -30,7 +30,7 @@ export interface SeededRandomnessMeta extends MergeableRecord {
     callsWithOtherBranchProducers: number;
 }
 export declare const SEEDED_RANDOMNESS: {
-    readonly createSearch: (config: SeededRandomnessConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "filter", "with"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+    readonly createSearch: (config: SeededRandomnessConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter", "with"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
     readonly processSearchResult: (elements: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, config: SeededRandomnessConfig, { dataflow, analyzer }: {
         normalize: import("../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         dataflow: import("../../dataflow/info").DataflowInformation;

package/linter/rules/seeded-randomness.js

@@ -14,12 +14,13 @@ const linter_tags_1 = require("../linter-tags");
 const alias_tracking_1 = require("../../dataflow/eval/resolve/alias-tracking");
 const general_1 = require("../../dataflow/eval/values/general");
 const config_1 = require("../../config");
+const vertex_1 = require("../../dataflow/graph/vertex");
 const r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const r_value_1 = require("../../dataflow/eval/values/r-value");
 const info_1 = require("../../dataflow/info");
 const built_in_1 = require("../../dataflow/environments/built-in");
 exports.SEEDED_RANDOMNESS = {
-    createSearch: (config) => flowr_search_builder_1.Q.all()
+    createSearch: (config) => flowr_search_builder_1.Q.all().filter(vertex_1.VertexType.FunctionCall)
         .with(search_enrichers_1.Enrichment.CallTargets, { onlyBuiltin: true })
         .filter({
         name: flowr_search_filters_1.FlowrFilter.MatchesEnrichment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.8.13",
+  "version": "2.8.15",
   "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/identify-link-to-last-call-relation.js

@@ -139,7 +139,7 @@ function identifyLinkToLastCallRelationSync(from, cfg, graph, { callName, cascad
     const getVertex = knownCalls ?
         (node) => knownCalls.get(node) :
         (node) => {
-            const v = graph.getVertex(node, true);
+            const v = graph.getVertex(node);
             return (0, vertex_1.isFunctionCallVertex)(v) ? v : undefined;
         };
     (0, simple_visitor_1.visitCfgInReverseOrder)(cfg, [from], node => {

package/queries/catalog/inspect-exceptions-query/inspect-exception-query-executor.d.ts

@@ -10,7 +10,7 @@ export declare function getFunctionsToConsiderInCallGraph(queries: readonly {
     filter?: readonly SingleSlicingCriterion[];
 }[], analyzer: ReadonlyFlowrAnalysisProvider, onlyDefinitions?: boolean): Promise<{
     cg: import("../../../dataflow/graph/call-graph").CallGraph;
-    fns: IteratorObject<[NodeId, Required<import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionCall | import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionDefinition>], undefined, unknown>;
+    fns: MapIterator<[NodeId, Required<import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionCall | import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionDefinition>]>;
 }>;
 /**
  * Execute exception function inspection queries on the given analyzer.

package/queries/catalog/inspect-exceptions-query/inspect-exception-query-executor.js

@@ -32,8 +32,10 @@ async function getFunctionsToConsiderInCallGraph(queries, analyzer, onlyDefiniti
         }
     }
     const cg = await analyzer.callGraph();
-    const fns = (onlyDefinitions || filterFor.size === 0 ? cg.verticesOfType(vertex_1.VertexType.FunctionDefinition) : cg.vertices(true))
-        .filter(([, v]) => filterFor.size === 0 || filterFor.has(v.id));
+    let fns = (onlyDefinitions || filterFor.size === 0 ? cg.verticesOfType(vertex_1.VertexType.FunctionDefinition) : cg.vertices(true));
+    if (filterFor.size > 0) {
+        fns = fns.filter(([id,]) => filterFor.has(id));
+    }
     return { cg, fns };
 }
 /**
@@ -44,7 +46,15 @@ async function executeExceptionQuery({ analyzer }, queries) {
     const { cg, fns } = await getFunctionsToConsiderInCallGraph(queries, analyzer);
     const result = {};
     for (const [id,] of fns) {
-        result[id] = (0, exceptions_of_function_1.calculateExceptionsOfFunction)(id, cg);
+        if (result[id]) {
+            continue;
+        }
+        const res = (0, exceptions_of_function_1.calculateExceptionsOfFunction)(id, cg, result);
+        for (const [k, v] of Object.entries(res)) {
+            if (!result[k]) {
+                result[k] = v;
+            }
+        }
     }
     return {
         '.meta': {

package/r-bridge/lang-4.x/ast/model/processing/stateful-fold.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.foldAstStateful = foldAstStateful;
-const assert_1 = require("../../../../../util/assert");
 const type_1 = require("../type");
 const r_function_call_1 = require("../nodes/r-function-call");
+const assert_1 = require("../../../../../util/assert");
 /**
  * Folds in old functional-fashion over the AST structure but allowing for a down function which can pass context to child nodes.
  */

package/search/flowr-search-filters.d.ts

@@ -2,7 +2,7 @@ import { RType } from '../r-bridge/lang-4.x/ast/model/type';
 import { VertexType } from '../dataflow/graph/vertex';
 import type { ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { FlowrSearchElement } from './flowr-search';
-import { type Enrichment } from './search-executor/search-enrichers';
+import { Enrichment } from './search-executor/search-enrichers';
 import type { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { DataflowInformation } from '../dataflow/info';
 export type FlowrFilterName = keyof typeof FlowrFilters;

package/search/flowr-search-filters.js

@@ -34,8 +34,25 @@ exports.FlowrFilters = {
         return e.node.type !== type_1.RType.Argument || e.node.name !== undefined;
     }),
     [FlowrFilter.MatchesEnrichment]: ((e, args) => {
-        const content = JSON.stringify((0, search_enrichers_1.enrichmentContent)(e, args.enrichment));
-        return content !== undefined && args.test.test(content);
+        if (args.enrichment === search_enrichers_1.Enrichment.CallTargets) {
+            const c = (0, search_enrichers_1.enrichmentContent)(e, search_enrichers_1.Enrichment.CallTargets);
+            if (c === undefined || c.targets === undefined) {
+                return false;
+            }
+            for (const fn of c.targets) {
+                if (typeof fn === 'string' && args.test.test(fn)) {
+                    return true;
+                }
+                if (typeof fn === 'object' && 'node' in fn && fn.node.type === type_1.RType.FunctionCall && fn.node.named && args.test.test(fn.node.functionName.content)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else {
+            const content = JSON.stringify((0, search_enrichers_1.enrichmentContent)(e, args.enrichment));
+            return content !== undefined && args.test.test(content);
+        }
     }),
     [FlowrFilter.OriginKind]: ((e, args, data) => {
         const dfgNode = data.dataflow.graph.getVertex(e.node.info.id);
@@ -53,7 +70,7 @@ exports.FlowrFilters = {
  * Helper to create a regular expression that matches function names, ignoring their package.
  */
 function testFunctionsIgnoringPackage(functions) {
-    return new RegExp(`"(.+:::?)?(${functions.join('|')})"`);
+    return new RegExp(`^(.+:::?)?(${functions.join('|')})$`);
 }
 /**
  * @see {@link FlowrFilterCombinator.is}
@@ -185,8 +202,21 @@ function evalTree(tree, data) {
  * Evaluates the given filter expression against the provided data.
  */
 function evalFilter(filter, data) {
-    /* common lift, this can be improved easily :D */
-    const tree = FlowrFilterCombinator.is(filter);
-    return evalTree(tree.get(), data);
+    if (filter instanceof FlowrFilterCombinator) {
+        return evalTree(filter.get(), data);
+    }
+    else if (typeof filter === 'string' && exports.ValidFlowrFilters.has(filter)) {
+        const handler = exports.FlowrFilters[filter];
+        return handler(data.element, undefined, data.data);
+    }
+    else if (typeof filter === 'object' && 'name' in filter) {
+        const handler = exports.FlowrFilters[filter.name];
+        const args = ('args' in filter ? filter.args : undefined);
+        return handler(data.element, args, data.data);
+    }
+    else {
+        const tree = FlowrFilterCombinator.is(filter);
+        return evalTree(tree.get(), data);
+    }
 }
 //# sourceMappingURL=flowr-search-filters.js.map

package/search/search-executor/search-enrichers.js

@@ -11,7 +11,7 @@ const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id"
 const cfg_simplification_1 = require("../../control-flow/cfg-simplification");
 const call_context_query_executor_1 = require("../../queries/catalog/call-context-query/call-context-query-executor");
 const cfg_kind_1 = require("../../project/cfg-kind");
-const identify_link_to_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-relation");
+const identify_link_to_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 /**
  * An enumeration that stores the names of the available enrichments that can be applied to a set of search elements.
  * See {@link FlowrSearchBuilder.with} for more information on how to apply enrichments.
@@ -75,12 +75,13 @@ exports.Enrichments = {
         enrichElement: async (e, _s, analyzer, args, prev) => {
             (0, assert_1.guard)(args && args.length, `${Enrichment.LastCall} enrichment requires at least one argument`);
             const content = prev ?? { linkedIds: [] };
-            const df = await analyzer.dataflow();
-            const n = await analyzer.normalize();
-            const vertex = df.graph.get(e.node.info.id);
-            if (vertex !== undefined && vertex[0].tag === vertex_1.VertexType.FunctionCall) {
+            const df = (await analyzer.dataflow()).graph;
+            const vertex = df.getVertex(e.node.info.id);
+            if (vertex?.tag === vertex_1.VertexType.FunctionCall) {
+                const n = await analyzer.normalize();
+                const cfg = (await analyzer.controlflow(undefined, cfg_kind_1.CfgKind.Quick)).graph;
                 for (const arg of args) {
-                    const lastCalls = await (0, identify_link_to_relation_1.identifyLinkToRelation)(vertex[0].id, analyzer, {
+                    const lastCalls = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelationSync)(vertex.id, cfg, df, {
                         ...arg,
                         callName: (0, call_context_query_executor_1.promoteCallName)(arg.callName),
                         type: 'link-to-last-call',

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