@eagleoutice/flowr 2.2.5 → 2.2.7

package/README.md

@@ -48,7 +48,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.2.4, R v4.4.0 (r-shell engine)
+    flowR repl using flowR v2.2.5, R v4.4.0 (r-shell engine)
     R> :slicer test/testfiles/example.R --criterion "11@sum"
     ```
     
@@ -94,8 +94,8 @@ It offers a wide variety of features, for example:
     </details>
         
 
-* 🚀 **fast data and control-flow graphs**\
-  Within just <i><span title="This measurement is automatically fetched from the latest benchmarks!">119.8 ms</i></span> (as of Feb 16, 2025), 
+* 🚀 **fast data- and control-flow graphs**\
+  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">117.7 ms</i></span> (as of Feb 17, 2025), 
   _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 graph.
 
@@ -131,7 +131,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.2.4, R v4.4.0 (r-shell engine)
+    flowR repl using flowR v2.2.5, R v4.4.0 (r-shell engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -375,7 +375,7 @@ It offers a wide variety of features, for example:
         52 -->|"argument"| 50
     ```
     	
-    (The analysis required _22.93 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _24.34 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     
@@ -390,11 +390,11 @@ It offers a wide variety of features, for example:
 
 If you want to use flowR and the features it provides, feel free to check out the:
 
-- [Visual Studio Code extension](https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr): provides access to flowR's capabilities directly in VS Code (also works in [vscode.dev](https://vscode.dev/))
+- [Visual Studio Code extension](https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr): provides access to flowR directly in VS Code (or [vscode.dev](https://vscode.dev/))
 - [RStudio Addin](https://github.com/flowr-analysis/rstudio-addin-flowr): integrates flowR into [RStudio](https://posit.co/downloads/)
-- [R package](https://github.com/flowr-analysis/flowr-r-adapter): allows you to use flowR in your R scripts
+- [R package](https://github.com/flowr-analysis/flowr-r-adapter): use flowR in your R scripts
 - [Docker image](https://hub.docker.com/r/eagleoutice/flowr): run flowR in a container, this also includes [flowR's server](https://github.com/flowr-analysis/flowr/wiki/Interface#communicating-with-the-server)
-- [NPM package](https://www.npmjs.com/package/@eagleoutice/flowr): include flowR in your TypeScript and JavaScript projects (e.g., used for the VS Code extension)
+- [NPM package](https://www.npmjs.com/package/@eagleoutice/flowr): include flowR in your TypeScript and JavaScript projects
  
 ## ⭐ Getting Started
 

package/cli/repl/commands/repl-cfg.js

@@ -39,7 +39,6 @@ const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipeli
 const retriever_1 = require("../../../r-bridge/retriever");
 const cfg_2 = require("../../../util/mermaid/cfg");
 const ansi_1 = require("../../../util/ansi");
-const clipboard = Promise.resolve().then(() => __importStar(require('clipboardy')));
 async function controlflow(parser, remainingLine) {
     return await (0, default_pipelines_1.createDataflowPipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(remainingLine.trim())
@@ -62,7 +61,8 @@ exports.controlflowCommand = {
         const mermaid = (0, cfg_2.cfgToMermaid)(cfg, result.normalize);
         output.stdout(mermaid);
         try {
-            (await clipboard).default.writeSync(mermaid);
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
             output.stdout(formatInfo(output, 'mermaid code'));
         }
         catch { /* do nothing this is a service thing */ }
@@ -79,7 +79,8 @@ exports.controlflowStarCommand = {
         const mermaid = (0, cfg_2.cfgToMermaidUrl)(cfg, result.normalize);
         output.stdout(mermaid);
         try {
-            (await clipboard).default.writeSync(mermaid);
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
             output.stdout(formatInfo(output, 'mermaid url'));
         }
         catch { /* do nothing this is a service thing */ }

package/cli/repl/commands/repl-dataflow.js

@@ -37,7 +37,6 @@ exports.dataflowStarCommand = exports.dataflowCommand = void 0;
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const dfg_1 = require("../../../util/mermaid/dfg");
-const clipboard = Promise.resolve().then(() => __importStar(require('clipboardy')));
 const ansi_1 = require("../../../util/ansi");
 /**
  * Obtain the dataflow graph using a known parser (such as the {@link RShell} or {@link TreeSitterExecutor}).
@@ -63,7 +62,8 @@ exports.dataflowCommand = {
         const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.dataflow.graph, includeEnvironments: false }).string;
         output.stdout(mermaid);
         try {
-            (await clipboard).default.writeSync(mermaid);
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
             output.stdout(formatInfo(output, 'mermaid code', result.dataflow['.meta'].timing));
         }
         catch { /* do nothing this is a service thing */ }
@@ -79,7 +79,8 @@ exports.dataflowStarCommand = {
         const mermaid = (0, dfg_1.graphToMermaidUrl)(result.dataflow.graph, false);
         output.stdout(mermaid);
         try {
-            (await clipboard).default.writeSync(mermaid);
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
             output.stdout(formatInfo(output, 'mermaid url', result.dataflow['.meta'].timing));
         }
         catch { /* do nothing this is a service thing */ }

package/cli/repl/commands/repl-normalize.js

@@ -37,7 +37,6 @@ exports.normalizeStarCommand = exports.normalizeCommand = void 0;
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const ast_1 = require("../../../util/mermaid/ast");
-const clipboard = Promise.resolve().then(() => __importStar(require('clipboardy')));
 const ansi_1 = require("../../../util/ansi");
 async function normalize(parser, remainingLine) {
     return await (0, default_pipelines_1.createNormalizePipeline)(parser, {
@@ -60,7 +59,8 @@ exports.normalizeCommand = {
         const mermaid = (0, ast_1.normalizedAstToMermaid)(result.normalize.ast);
         output.stdout(mermaid);
         try {
-            (await clipboard).default.writeSync(mermaid);
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
             output.stdout(formatInfo(output, 'mermaid url', result.normalize['.meta'].timing));
         }
         catch { /* do nothing this is a service thing */ }
@@ -76,7 +76,8 @@ exports.normalizeStarCommand = {
         const mermaid = (0, ast_1.normalizedAstToMermaidUrl)(result.normalize.ast);
         output.stdout(mermaid);
         try {
-            (await clipboard).default.writeSync(mermaid);
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
             output.stdout(formatInfo(output, 'mermaid url', result.normalize['.meta'].timing));
         }
         catch { /* do nothing this is a service thing */ }

package/dataflow/environments/resolve-by-name.d.ts

@@ -4,7 +4,7 @@ import type { Identifier, IdentifierDefinition } from './identifier';
 import { ReferenceType } from './identifier';
 import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { DataflowGraph } from '../graph/graph';
-import type { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { AstIdMap, RNodeWithParent } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 /**
  * Resolves a given identifier name to a list of its possible definition location using R scoping and resolving rules.
  *
@@ -21,9 +21,32 @@ export declare function resolvesToBuiltInConstant(name: Identifier | undefined,
 export declare function resolveToConstants(name: Identifier | undefined, environment: REnvironmentInformation): unknown[] | undefined;
 export declare function getAliases(sourceIds: readonly NodeId[], dataflow: DataflowGraph, environment: REnvironmentInformation): NodeId[] | undefined;
 /** Please use {@link resolveValueOfVariable} */
-export declare function resolveToValues(identifier: Identifier | undefined, environment: REnvironmentInformation, idMap?: AstIdMap): unknown[] | undefined;
+export declare function trackAliasInEnvironments(identifier: Identifier | undefined, use: REnvironmentInformation, idMap?: AstIdMap): unknown[] | undefined;
+export declare function trackAliasesInGraph(id: NodeId, graph: DataflowGraph, idMap?: AstIdMap): unknown[] | undefined;
 /**
  * Convenience function using the variable resolver as specified within the configuration file
  * In the future we may want to have this set once at the start of the analysis
+ *
+ * @see {@link resolveIdToValue} - for a more general approach which "evaluates" a node based on value resolve
  */
 export declare function resolveValueOfVariable(identifier: Identifier | undefined, environment: REnvironmentInformation, idMap?: AstIdMap): unknown[] | undefined;
+export interface ResolveInfo {
+    /** The current environment used for name resolution */
+    environment?: REnvironmentInformation;
+    /** The id map to resolve the node if given as an id */
+    idMap?: AstIdMap;
+    /** The graph to resolve in */
+    graph?: DataflowGraph;
+    /** Whether to track variables */
+    full?: boolean;
+}
+/**
+ * Generalized {@link resolveValueOfVariable} function which evaluates a node based on the value resolve
+ *
+ * @param id          - The node id or node to resolve
+ * @param environment - The current environment used for name resolution
+ * @param graph       - The graph to resolve in
+ * @param idMap       - The id map to resolve the node if given as an id
+ * @param full        - Whether to track variables
+ */
+export declare function resolveIdToValue(id: NodeId | RNodeWithParent, { environment, graph, idMap, full }: ResolveInfo): unknown[] | undefined;

package/dataflow/environments/resolve-by-name.js

@@ -4,8 +4,10 @@ exports.resolveByName = resolveByName;
 exports.resolvesToBuiltInConstant = resolvesToBuiltInConstant;
 exports.resolveToConstants = resolveToConstants;
 exports.getAliases = getAliases;
-exports.resolveToValues = resolveToValues;
+exports.trackAliasInEnvironments = trackAliasInEnvironments;
+exports.trackAliasesInGraph = trackAliasesInGraph;
 exports.resolveValueOfVariable = resolveValueOfVariable;
+exports.resolveIdToValue = resolveIdToValue;
 const environment_1 = require("./environment");
 const logic_1 = require("../../util/logic");
 const identifier_1 = require("./identifier");
@@ -14,6 +16,10 @@ const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id"
 const vertex_1 = require("../graph/vertex");
 const config_1 = require("../../config");
 const assert_1 = require("../../util/assert");
+const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
+const visiting_queue_1 = require("../../slicing/static/visiting-queue");
+const fingerprint_1 = require("../../slicing/static/fingerprint");
+const edge_1 = require("../graph/edge");
 const FunctionTargetTypes = identifier_1.ReferenceType.Function | identifier_1.ReferenceType.BuiltInFunction | identifier_1.ReferenceType.Unknown | identifier_1.ReferenceType.Argument | identifier_1.ReferenceType.Parameter;
 const VariableTargetTypes = identifier_1.ReferenceType.Variable | identifier_1.ReferenceType.Parameter | identifier_1.ReferenceType.Argument | identifier_1.ReferenceType.Unknown;
 const ConstantTargetTypes = identifier_1.ReferenceType.Constant | identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.Unknown;
@@ -149,11 +155,11 @@ function getAliases(sourceIds, dataflow, environment) {
     return [...definitions];
 }
 /** Please use {@link resolveValueOfVariable} */
-function resolveToValues(identifier, environment, idMap) {
+function trackAliasInEnvironments(identifier, use, idMap) {
     if (identifier === undefined) {
         return undefined;
     }
-    const defs = resolveByName(identifier, environment);
+    const defs = resolveByName(identifier, use);
     if (defs === undefined) {
         return undefined;
     }
@@ -183,17 +189,126 @@ function resolveToValues(identifier, environment, idMap) {
     }
     return values;
 }
+function isNestedInLoop(node, ast) {
+    const parent = node?.info.parent;
+    if (node === undefined || !parent) {
+        return false;
+    }
+    const parentNode = ast.get(parent);
+    if (parentNode === undefined) {
+        return false;
+    }
+    if (parentNode.type === type_1.RType.WhileLoop || parentNode.type === type_1.RType.RepeatLoop) {
+        return true;
+    }
+    return isNestedInLoop(parentNode, ast);
+}
+function trackAliasesInGraph(id, graph, idMap) {
+    idMap ??= graph.idMap;
+    (0, assert_1.guard)(idMap !== undefined, 'The ID map is required to get the lineage of a node');
+    const start = graph.getVertex(id);
+    (0, assert_1.guard)(start !== undefined, 'Unable to find start for alias tracking');
+    const queue = new visiting_queue_1.VisitingQueue(25);
+    const clean = (0, environment_1.initializeCleanEnvironments)();
+    const cleanFingerprint = (0, fingerprint_1.envFingerprint)(clean);
+    queue.add(id, clean, cleanFingerprint, false);
+    let forceBot = false;
+    const resultIds = [];
+    while (queue.nonEmpty()) {
+        const { id, baseEnvironment } = queue.next();
+        const res = graph.get(id);
+        if (!res) {
+            continue;
+        }
+        const [vertex, outgoingEdges] = res;
+        const cds = vertex.controlDependencies;
+        for (const cd of cds ?? []) {
+            const target = graph.idMap?.get(cd.id);
+            if (target === undefined) {
+                continue;
+            }
+            if (target.type === type_1.RType.WhileLoop || target.type === type_1.RType.RepeatLoop) {
+                forceBot = true;
+                break;
+            }
+        }
+        if (!forceBot && (cds?.length === 0 && isNestedInLoop(idMap.get(id), idMap))) {
+            forceBot = true;
+        }
+        if (forceBot) {
+            break;
+        }
+        if (vertex.tag === vertex_1.VertexType.Value) {
+            resultIds.push(id);
+            continue;
+        }
+        // travel all read and defined-by edges
+        for (const [targetId, edge] of outgoingEdges) {
+            // currently, they have to be exact!
+            if (edge.types === edge_1.EdgeType.Reads || edge.types === edge_1.EdgeType.DefinedBy || edge.types === edge_1.EdgeType.DefinedByOnCall) {
+                queue.add(targetId, baseEnvironment, cleanFingerprint, false);
+            }
+        }
+    }
+    if (forceBot || resultIds.length === 0) {
+        return undefined;
+    }
+    const values = [];
+    for (const id of resultIds) {
+        const node = idMap.get(id);
+        if (node !== undefined) {
+            values.push(node.content);
+        }
+    }
+    return values;
+}
 /**
  * Convenience function using the variable resolver as specified within the configuration file
  * In the future we may want to have this set once at the start of the analysis
+ *
+ * @see {@link resolveIdToValue} - for a more general approach which "evaluates" a node based on value resolve
  */
 function resolveValueOfVariable(identifier, environment, idMap) {
     const resolve = (0, config_1.getConfig)().solver.variables;
     switch (resolve) {
-        case config_1.VariableResolve.Alias: return resolveToValues(identifier, environment, idMap);
+        case config_1.VariableResolve.Alias: return trackAliasInEnvironments(identifier, environment, idMap);
         case config_1.VariableResolve.Builtin: return resolveToConstants(identifier, environment);
         case config_1.VariableResolve.Disabled: return [];
         default: (0, assert_1.assertUnreachable)(resolve);
     }
 }
+/**
+ * Generalized {@link resolveValueOfVariable} function which evaluates a node based on the value resolve
+ *
+ * @param id          - The node id or node to resolve
+ * @param environment - The current environment used for name resolution
+ * @param graph       - The graph to resolve in
+ * @param idMap       - The id map to resolve the node if given as an id
+ * @param full        - Whether to track variables
+ */
+function resolveIdToValue(id, { environment, graph, idMap, full }) {
+    idMap ??= graph?.idMap;
+    const node = typeof id === 'object' ? id : idMap?.get(id);
+    if (node === undefined) {
+        return undefined;
+    }
+    switch (node.type) {
+        case type_1.RType.Symbol:
+            if (environment) {
+                return full ? resolveValueOfVariable(node.lexeme, environment, idMap) : undefined;
+            }
+            else if (graph && (0, config_1.getConfig)().solver.variables === config_1.VariableResolve.Alias) {
+                return full ? trackAliasesInGraph(node.info.id, graph, idMap) : undefined;
+            }
+            else {
+                return undefined;
+            }
+        case type_1.RType.String:
+        case type_1.RType.Number:
+        case type_1.RType.Logical:
+            return [node.content];
+        default:
+            return undefined;
+    }
+}
 //# sourceMappingURL=resolve-by-name.js.map

package/documentation/print-query-wiki.js

@@ -208,9 +208,10 @@ ${await (0, doc_query_1.showQuery)(shell, example_query_code_1.exampleQueryCode,
     buildExplanation: async (shell) => {
         const exampleCode = 'x <- 1\nprint(x)';
         return `
-With this query you can use flowR's value-tracking capabilities to resolve identifiers to all potential values they may have at runtime (if possible). The extend to which flowR traces values (e.g. built-ins vs. constants) can be configured in flowR's Configuration file (see the [Interface](${doc_files_1.FlowrWikiBaseRef}/Interface) wiki page for more information). 
+With this query you can use flowR's value-tracking capabilities to resolve identifiers to all potential values they may have at runtime (if possible).
+The extent to which flowR traces values (e.g., built-ins vs. constants) can be configured in flowR's Configuration file (see the [Interface](${doc_files_1.FlowrWikiBaseRef}/Interface) wiki page for more information).
 
-Using the example code \`${exampleCode}\`, the following query returns all values of 'x' in the code:
+Using the example code \`${exampleCode}\` (with the \`print(x)\` in the second line), the following query returns all values of \`x\` in the code:
 ${await (0, doc_query_1.showQuery)(shell, exampleCode, [{
                 type: 'resolve-value',
                 criteria: ['2@x']
@@ -419,7 +420,7 @@ ${await (0, doc_query_1.showQuery)(shell, longerCode, [{
                 type: 'dependencies'
             }], { showCode: false, collapseQuery: true, collapseResult: true })}
 
-Currently the dependency extraction may fail as it is essentially a set of heuristics guessing the dependencies.
+Currently, the dependency extraction may fail as it is essentially a set of heuristics guessing the dependencies.
 We welcome any feedback on this (consider opening a [new issue](${doc_issue_1.NewIssueUrl})).
 
 In the meantime we offer several properties to overwrite the default behavior (e.g., function names that should be collected)
@@ -427,12 +428,13 @@ In the meantime we offer several properties to overwrite the default behavior (e
 ${await (0, doc_query_1.showQuery)(shell, longerCode, [{
                 type: 'dependencies',
                 ignoreDefaultFunctions: true,
-                libraryFunctions: [{ name: 'print', argIdx: 0, argName: 'library' }],
+                libraryFunctions: [{ name: 'print', argIdx: 0, argName: 'library', resolveValue: true }],
                 sourceFunctions: [],
                 readFunctions: [],
                 writeFunctions: []
             }], { showCode: false, collapseQuery: false, collapseResult: true })}
 
+Here, \`resolveValue\` tells the dependency query to resolve the value of this argument in case it is not a constant.
 		`;
     }
 });

package/documentation/print-readme.js

@@ -64,8 +64,8 @@ The following showcases the dependency view of the [Visual Studio Code extension
   
   `), '    ')}
 
-* 🚀 **fast data and control-flow graphs**\\
-  Within just ${'<i>' + (0, html_hover_over_1.textWithTooltip)((0, numbers_1.roundToDecimals)(await (0, doc_benchmarks_1.getLatestDfAnalysisTime)('"social-science" Benchmark Suite (tree-sitter)'), 1) + ' ms</i>', 'This measurement is automatically fetched from the latest benchmarks!')} (as of ${new Date(await (0, doc_benchmarks_1.getLastBenchmarkUpdate)()).toLocaleDateString('en-US', dateOptions)}), 
+* 🚀 **fast data- and control-flow graphs**\\
+  Within just ${'<i>' + (0, html_hover_over_1.textWithTooltip)((0, numbers_1.roundToDecimals)(await (0, doc_benchmarks_1.getLatestDfAnalysisTime)('"social-science" Benchmark Suite (tree-sitter)'), 1) + ' ms</i>', 'This measurement is automatically fetched from the latest benchmark!')} (as of ${new Date(await (0, doc_benchmarks_1.getLastBenchmarkUpdate)()).toLocaleDateString('en-US', dateOptions)}), 
   _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](${doc_files_1.FlowrWikiBaseRef}/Dataflow-Graph) for more details on the dataflow graph.
 
@@ -90,11 +90,11 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(shell, (0, doc_files_1.getFileContent
 
 If you want to use flowR and the features it provides, feel free to check out the:
 
-- [Visual Studio Code extension](${doc_files_1.FlowrVsCode}): provides access to flowR's capabilities directly in VS Code (also works in [vscode.dev](https://vscode.dev/))
+- [Visual Studio Code extension](${doc_files_1.FlowrVsCode}): provides access to flowR directly in VS Code (or [vscode.dev](https://vscode.dev/))
 - [RStudio Addin](${doc_files_1.FlowrGithubBaseRef}/rstudio-addin-flowr): integrates flowR into [RStudio](https://posit.co/downloads/)
-- [R package](${doc_files_1.FlowrGithubBaseRef}/flowr-r-adapter): allows you to use flowR in your R scripts
+- [R package](${doc_files_1.FlowrGithubBaseRef}/flowr-r-adapter): use flowR in your R scripts
 - [Docker image](${doc_files_1.FlowrDockerRef}): run flowR in a container, this also includes [flowR's server](${doc_files_1.FlowrWikiBaseRef}/Interface#communicating-with-the-server)
-- [NPM package](${doc_files_1.FlowrNpmRef}): include flowR in your TypeScript and JavaScript projects (e.g., used for the VS Code extension)
+- [NPM package](${doc_files_1.FlowrNpmRef}): include flowR in your TypeScript and JavaScript projects
  
 ## ⭐ Getting Started
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "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.js

@@ -55,7 +55,10 @@ function promoteQueryCallNames(queries) {
                     ...q.fileFilter,
                     filter: new RegExp(q.fileFilter.filter)
                 },
-                linkTo: {
+                linkTo: Array.isArray(q.linkTo) ? q.linkTo.map(l => ({
+                    ...l,
+                    callName: new RegExp(l.callName)
+                })) : {
                     ...q.linkTo,
                     /* we have to add another promotion layer whenever we add something without this call name */
                     callName: new RegExp(q.linkTo.callName)
@@ -208,13 +211,24 @@ function executeCallContextQueries({ dataflow: { graph }, ast }, queries) {
             }
             let linkedIds = undefined;
             if (cfg && isSubCallQuery(query)) {
-                /* 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, graph, query.linkTo);
-                if (lastCall) {
-                    linkedIds = lastCall;
+                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, graph, link);
+                    if (lastCall) {
+                        linkedIds ??= new Set();
+                        for (const l of lastCall) {
+                            if (link.attachLinkInfo) {
+                                linkedIds.add({ id: l, info: link.attachLinkInfo });
+                            }
+                            else {
+                                linkedIds.add(l);
+                            }
+                        }
+                    }
                 }
             }
-            initialIdCollector.add(query.kind ?? '.', query.subkind ?? '.', (0, objects_1.compactRecord)({ id: nodeId, name: info.name, calls: targets, linkedIds }));
+            initialIdCollector.add(query.kind ?? '.', query.subkind ?? '.', (0, objects_1.compactRecord)({ id: nodeId, name: info.name, calls: targets, linkedIds: linkedIds ? [...linkedIds] : undefined }));
         }
     }
     removeIdenticalDuplicates(initialIdCollector);

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

@@ -9,6 +9,7 @@ import { CallTargets } from './identify-link-to-last-call-relation';
 import type { DataflowGraph } from '../../../dataflow/graph/graph';
 import type { DataflowGraphVertexInfo } from '../../../dataflow/graph/vertex';
 import type { CascadeAction } from './cascade-action';
+import type { NoInfo } from '../../../r-bridge/lang-4.x/ast/model/model';
 export interface FileFilter<FilterType> {
     /**
      * Regex that a node's file attribute must match to be considered
@@ -66,9 +67,11 @@ interface LinkToLastCall<CallName extends RegExp | string = RegExp | string> ext
      */
     readonly cascadeIf?: (target: DataflowGraphVertexInfo, from: NodeId, graph: DataflowGraph) => CascadeAction;
 }
-export type LinkTo<CallName extends RegExp | string> = LinkToLastCall<CallName>;
-export interface SubCallContextQueryFormat<CallName extends RegExp | string = RegExp | string> extends DefaultCallContextQueryFormat<CallName> {
-    readonly linkTo: LinkTo<CallName>;
+export type LinkTo<CallName extends RegExp | string = RegExp | string, AttachLinkInfo = NoInfo> = (LinkToLastCall<CallName>) & {
+    attachLinkInfo?: AttachLinkInfo;
+};
+export interface SubCallContextQueryFormat<CallName extends RegExp | string = RegExp | string, AttachLinkInfo = NoInfo> extends DefaultCallContextQueryFormat<CallName> {
+    readonly linkTo: LinkTo<CallName, AttachLinkInfo> | LinkTo<CallName, AttachLinkInfo>[];
 }
 export interface CallContextQuerySubKindResult {
     /** The id of the call vertex identified within the supplied dataflow graph */
@@ -81,8 +84,11 @@ export interface CallContextQuerySubKindResult {
      * An empty array means that the call targets only non-local functions.
      */
     readonly calls?: readonly NodeId[];
-    /** ids attached by the linkTo query */
-    readonly linkedIds?: readonly NodeId[];
+    /** ids attached by the linkTo query, if you attached information with the `attachLinkInfo` field you can find it here */
+    readonly linkedIds?: readonly (NodeId | {
+        id: NodeId;
+        info: object;
+    })[];
     /**
      * (Direct) alias locations this call stems from
      */
@@ -95,7 +101,7 @@ export type CallContextQueryKindResult = Record<string, {
 export interface CallContextQueryResult extends BaseQueryResult {
     readonly kinds: CallContextQueryKindResult;
 }
-export type CallContextQuery<CallName extends RegExp | string = RegExp | string> = DefaultCallContextQueryFormat<CallName> | SubCallContextQueryFormat<CallName>;
+export type CallContextQuery<CallName extends RegExp | string = RegExp | string, AttachLinkInfo = NoInfo> = DefaultCallContextQueryFormat<CallName> | SubCallContextQueryFormat<CallName, AttachLinkInfo>;
 export declare const CallContextQueryDefinition: {
     readonly executor: typeof executeCallContextQueries;
     readonly asciiSummarizer: (formatter: OutputFormatter, processed: PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>, queryResults: BaseQueryResult, result: string[]) => boolean;

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

@@ -10,6 +10,13 @@ const time_1 = require("../../../util/time");
 const joi_1 = __importDefault(require("joi"));
 const query_print_1 = require("../../query-print");
 const identify_link_to_last_call_relation_1 = require("./identify-link-to-last-call-relation");
+const CallContextQueryLinkTo = joi_1.default.object({
+    type: joi_1.default.string().valid('link-to-last-call').required().description('The type of the linkTo sub-query.'),
+    callName: joi_1.default.string().required().description('Regex regarding the function name of the last call. Similar to `callName`, strings are interpreted as a regular expression.'),
+    ignoreIf: joi_1.default.function().optional().description('Should we ignore this (source) call? Currently, there is no well working serialization for this.'),
+    cascadeIf: joi_1.default.function().optional().description('Should we continue searching after the link was created? Currently, there is no well working serialization for this.'),
+    attachLinkInfo: joi_1.default.object().optional().description('Additional information to attach to the link.')
+});
 exports.CallContextQueryDefinition = {
     executor: call_context_query_executor_1.executeCallContextQueries,
     asciiSummarizer: (formatter, processed, queryResults, result) => {
@@ -30,12 +37,7 @@ exports.CallContextQueryDefinition = {
             fileFilter: joi_1.default.string().required().description('Regex that a node\'s file attribute must match to be considered'),
             includeUndefinedFiles: joi_1.default.boolean().optional().description('If `fileFilter` is set, but a nodes `file` attribute is `undefined`, should we include it in the results? Defaults to `true`.')
         }).optional().description('Filter that, when set, a node\'s file attribute must match to be considered'),
-        linkTo: joi_1.default.object({
-            type: joi_1.default.string().valid('link-to-last-call').required().description('The type of the linkTo sub-query.'),
-            callName: joi_1.default.string().required().description('Regex regarding the function name of the last call. Similar to `callName`, strings are interpreted as a regular expression.'),
-            ignoreIf: joi_1.default.function().optional().description('Should we ignore this (source) call? Currently, there is no well working serialization for this.'),
-            cascadeIf: joi_1.default.function().optional().description('Should we continue searching after the link was created? Currently, there is no well working serialization for this.')
-        }).optional().description('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.')
+        linkTo: joi_1.default.alternatives(CallContextQueryLinkTo, joi_1.default.array().items(CallContextQueryLinkTo)).optional().description('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.')
     }).description('Call context query used to find calls in the dataflow graph')
 };
 //# sourceMappingURL=call-context-query-format.js.map