@eagleoutice/flowr 2.2.7 → 2.2.9

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

@@ -51,7 +51,7 @@ function processNextExpression(currentElement, environment, listEnvironments, re
 }
 function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextGraph) {
     for (const { functionCall, called } of calledEnvs) {
-        const callDependencies = nextGraph.getVertex(functionCall, true)?.controlDependencies;
+        const callDependencies = nextGraph.getVertex(functionCall, true)?.cds;
         for (const calledFn of called) {
             (0, assert_1.guard)(calledFn.tag === vertex_1.VertexType.FunctionDefinition, 'called function must be a function definition');
             // only merge the environments they have in common

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

@@ -68,7 +68,7 @@ function processFunctionDefinition(name, args, rootId, data) {
                 tag: vertex_1.VertexType.Use,
                 id: read.nodeId,
                 environment: undefined,
-                controlDependencies: undefined
+                cds: undefined
             });
         }
     }
@@ -87,7 +87,7 @@ function processFunctionDefinition(name, args, rootId, data) {
         tag: vertex_1.VertexType.FunctionDefinition,
         id: name.info.id,
         environment: (0, scoping_1.popLocalEnvironment)(outEnvironment),
-        controlDependencies: data.controlDependencies,
+        cds: data.controlDependencies,
         subflow: flow,
         exitPoints: exitPoints?.filter(e => e.type === 1 /* ExitPointType.Return */ || e.type === 0 /* ExitPointType.Default */).map(e => e.nodeId) ?? []
     });

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

@@ -10,7 +10,7 @@ const vertex_1 = require("../../../../../graph/vertex");
 const edge_1 = require("../../../../../graph/edge");
 const identifier_1 = require("../../../../../environments/identifier");
 function processPipe(name, args, rootId, data) {
-    const { information } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data });
+    const { information, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data });
     if (args.length !== 2) {
         logger_1.dataflowLogger.warn(`Pipe ${name.content} has something else than 2 arguments, skipping`);
         return information;
@@ -32,8 +32,15 @@ function processPipe(name, args, rootId, data) {
             controlDependencies: data.controlDependencies,
             type: identifier_1.ReferenceType.Function
         });
-        information.graph.addEdge(functionCallNode.id, argId, edge_1.EdgeType.Argument);
+        information.graph.addEdge(functionCallNode.id, argId, edge_1.EdgeType.Argument | edge_1.EdgeType.Reads);
     }
-    return information;
+    const firstArgument = processedArguments[0];
+    return {
+        ...information,
+        in: [...information.in, ...firstArgument.in],
+        out: [...information.out, ...firstArgument.out],
+        unknownReferences: [...information.unknownReferences, ...firstArgument.unknownReferences],
+        entryPoint: rootId
+    };
 }
 //# sourceMappingURL=built-in-pipe.js.map

package/dataflow/internal/process/functions/call/built-in/built-in-source.d.ts

@@ -1,12 +1,22 @@
 import { type DataflowProcessorInformation } from '../../../../../processor';
 import type { DataflowInformation } from '../../../../../info';
-import type { RParseRequestProvider, RParseRequest } from '../../../../../../r-bridge/retriever';
+import { InferWorkingDirectory } from '../../../../../../config';
+import type { RParseRequest, RParseRequestProvider } from '../../../../../../r-bridge/retriever';
 import type { IdGenerator, ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RFunctionArgument } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
 import type { RSymbol } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
 import type { NodeId } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { NoInfo } from '../../../../../../r-bridge/lang-4.x/ast/model/model';
 export declare function setSourceProvider(provider: RParseRequestProvider): void;
+export declare function inferWdFromScript(option: InferWorkingDirectory, referenceChain: readonly RParseRequest[]): string[];
+/**
+ * Tries to find sourced by a source request and returns the first path that exists
+ * @param seed - the path originally requested in the `source` call
+ * @param data - more information on the loading context
+ */
+export declare function findSource(seed: string, data: {
+    referenceChain: readonly RParseRequest[];
+}): string[] | undefined;
 export declare function processSourceCall<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, config: {
     /** should this produce an explicit source function call in the graph? */
     includeFunctionCall?: boolean;

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

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setSourceProvider = setSourceProvider;
+exports.inferWdFromScript = inferWdFromScript;
+exports.findSource = findSource;
 exports.processSourceCall = processSourceCall;
 exports.sourceRequest = sourceRequest;
 exports.standaloneSourceFile = standaloneSourceFile;
@@ -23,10 +25,83 @@ const parser_1 = require("../../../../../../r-bridge/lang-4.x/ast/parser/json/pa
 const shell_executor_1 = require("../../../../../../r-bridge/shell-executor");
 const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
 const assert_1 = require("../../../../../../util/assert");
+const path_1 = __importDefault(require("path"));
 let sourceProvider = (0, retriever_1.requestProviderFromFile)();
 function setSourceProvider(provider) {
     sourceProvider = provider;
 }
+function inferWdFromScript(option, referenceChain) {
+    switch (option) {
+        case config_1.InferWorkingDirectory.MainScript:
+            return referenceChain[0]?.request === 'file' ? [platformDirname(referenceChain[0].content)] : [];
+        case config_1.InferWorkingDirectory.ActiveScript:
+            return referenceChain[referenceChain.length - 1] ? [platformDirname(referenceChain[referenceChain.length - 1].content)] : [];
+        case config_1.InferWorkingDirectory.AnyScript:
+            return referenceChain.filter(e => e.request === 'file').map(e => platformDirname(e.content));
+        case config_1.InferWorkingDirectory.No:
+        default:
+            return [];
+    }
+}
+const AnyPathSeparator = /[/\\]/g;
+function platformBasename(p) {
+    const normalized = p.replaceAll(path_1.default.win32.sep, path_1.default.posix.sep);
+    return path_1.default.posix.basename(normalized);
+}
+function platformDirname(p) {
+    const normalized = p.replaceAll(path_1.default.win32.sep, path_1.default.posix.sep);
+    return path_1.default.posix.dirname(normalized);
+}
+function returnPlatformPath(p) {
+    return p.replaceAll(AnyPathSeparator, path_1.default.sep);
+}
+/**
+ * Tries to find sourced by a source request and returns the first path that exists
+ * @param seed - the path originally requested in the `source` call
+ * @param data - more information on the loading context
+ */
+function findSource(seed, data) {
+    const config = (0, config_1.getConfig)().solver.resolveSource;
+    const capitalization = config?.ignoreCapitalization ?? false;
+    const explorePaths = [
+        ...(config?.searchPath ?? []),
+        ...(inferWdFromScript(config?.inferWorkingDirectory ?? config_1.InferWorkingDirectory.No, data.referenceChain))
+    ];
+    const tryPaths = [seed];
+    switch (config?.dropPaths ?? config_1.DropPathsOption.No) {
+        case config_1.DropPathsOption.Once: {
+            const first = platformBasename(seed);
+            tryPaths.push(first);
+            break;
+        }
+        case config_1.DropPathsOption.All: {
+            const paths = platformDirname(seed).split(AnyPathSeparator);
+            const basename = platformBasename(seed);
+            if (paths.length === 1 && paths[0] === '.') {
+                break;
+            }
+            for (let i = 0; i < paths.length; i++) {
+                tryPaths.push(path_1.default.join(...paths.slice(i), basename));
+            }
+            break;
+        }
+        default:
+        case config_1.DropPathsOption.No:
+            break;
+    }
+    const found = [];
+    for (const explore of [undefined, ...explorePaths]) {
+        for (const tryPath of tryPaths) {
+            const effectivePath = explore ? path_1.default.join(explore, tryPath) : tryPath;
+            const get = sourceProvider.exists(effectivePath, capitalization) ?? sourceProvider.exists(returnPlatformPath(effectivePath), capitalization);
+            if (get && !found.includes(effectivePath)) {
+                found.push(returnPlatformPath(effectivePath));
+            }
+        }
+    }
+    log_1.log.info(`Found sourced file ${JSON.stringify(seed)} at ${JSON.stringify(found)}`);
+    return found;
+}
 function processSourceCall(name, args, rootId, data, config) {
     const information = config.includeFunctionCall ?
         (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data }).information
@@ -53,20 +128,24 @@ function processSourceCall(name, args, rootId, data, config) {
     }
     if (sourceFile && sourceFile.length === 1) {
         const path = (0, retriever_1.removeRQuotes)(sourceFile[0]);
-        const request = sourceProvider.createRequest(path);
-        // check if the sourced file has already been dataflow analyzed, and if so, skip it
-        if (data.referenceChain.includes((0, retriever_1.requestFingerprint)(request))) {
-            (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found loop in dataflow analysis for ${JSON.stringify(request)}: ${JSON.stringify(data.referenceChain)}, skipping further dataflow analysis`);
-            information.graph.markIdForUnknownSideEffects(rootId);
-            return information;
+        let filepath = path ? findSource(path, data) : path;
+        if (Array.isArray(filepath)) {
+            filepath = filepath?.[0];
+        }
+        if (filepath !== undefined) {
+            const request = sourceProvider.createRequest(filepath);
+            // check if the sourced file has already been dataflow analyzed, and if so, skip it
+            if (data.referenceChain.find(e => e.request === request.request && e.content === request.content)) {
+                (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found loop in dataflow analysis for ${JSON.stringify(request)}: ${JSON.stringify(data.referenceChain)}, skipping further dataflow analysis`);
+                information.graph.markIdForUnknownSideEffects(rootId);
+                return information;
+            }
+            return sourceRequest(rootId, request, data, information, (0, decorate_1.sourcedDeterministicCountingIdGenerator)(path, name.location));
         }
-        return sourceRequest(rootId, request, data, information, (0, decorate_1.sourcedDeterministicCountingIdGenerator)(path, name.location));
-    }
-    else {
-        (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Non-constant argument ${JSON.stringify(sourceFile)} for source is currently not supported, skipping`);
-        information.graph.markIdForUnknownSideEffects(rootId);
-        return information;
     }
+    (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Non-constant argument ${JSON.stringify(sourceFile)} for source is currently not supported, skipping`);
+    information.graph.markIdForUnknownSideEffects(rootId);
+    return information;
 }
 function sourceRequest(rootId, request, data, information, getId) {
     if (request.request === 'file') {
@@ -89,7 +168,7 @@ function sourceRequest(rootId, request, data, information, getId) {
             ...data,
             currentRequest: request,
             environment: information.environment,
-            referenceChain: [...data.referenceChain, (0, retriever_1.requestFingerprint)(request)]
+            referenceChain: [...data.referenceChain, request]
         });
     }
     catch (e) {
@@ -118,9 +197,8 @@ function standaloneSourceFile(inputRequest, data, uniqueSourceId, information) {
     const path = inputRequest.request === 'file' ? inputRequest.content : '-inline-';
     /* this way we can still pass content */
     const request = inputRequest.request === 'file' ? sourceProvider.createRequest(inputRequest.content) : inputRequest;
-    const fingerprint = (0, retriever_1.requestFingerprint)(request);
     // check if the sourced file has already been dataflow analyzed, and if so, skip it
-    if (data.referenceChain.includes(fingerprint)) {
+    if (data.referenceChain.find(e => e.request === request.request && e.content === request.content)) {
         logger_1.dataflowLogger.info(`Found loop in dataflow analysis for ${JSON.stringify(request)}: ${JSON.stringify(data.referenceChain)}, skipping further dataflow analysis`);
         information.graph.markIdForUnknownSideEffects(uniqueSourceId);
         return information;
@@ -129,7 +207,7 @@ function standaloneSourceFile(inputRequest, data, uniqueSourceId, information) {
         ...data,
         currentRequest: request,
         environment: information.environment,
-        referenceChain: [...data.referenceChain, fingerprint]
+        referenceChain: [...data.referenceChain, inputRequest]
     }, information, (0, decorate_1.deterministicPrefixIdGenerator)(path + '@' + uniqueSourceId));
 }
 //# sourceMappingURL=built-in-source.js.map

package/dataflow/internal/process/functions/call/common.js

@@ -109,7 +109,7 @@ function patchFunctionCall({ nextGraph, rootId, name, data, argumentProcessResul
         environment: data.environment,
         /* will be overwritten accordingly */
         onlyBuiltin: false,
-        controlDependencies: data.controlDependencies,
+        cds: data.controlDependencies,
         args: argumentProcessResult.map(arg => arg === undefined ? r_function_call_1.EmptyArgument : { nodeId: arg.entryPoint, controlDependencies: undefined, call: undefined, type: identifier_1.ReferenceType.Argument }),
     });
     for (const arg of argumentProcessResult) {

package/dataflow/internal/process/functions/call/known-call-handling.js

@@ -40,7 +40,7 @@ function processKnownFunctionCall({ name, args, rootId, data, reverseOrder = fal
         name: functionCallName,
         /* will be overwritten accordingly */
         onlyBuiltin: false,
-        controlDependencies: data.controlDependencies,
+        cds: data.controlDependencies,
         args: reverseOrder ? [...callArgs].reverse() : callArgs,
         indicesCollection: indicesCollection,
     });

package/dataflow/internal/process/functions/call/unnamed-call-handling.js

@@ -20,8 +20,7 @@ function processUnnamedFunctionCall(functionCall, data) {
     const functionCallName = `${exports.UnnamedFunctionCallPrefix}${functionRootId}`;
     logger_1.dataflowLogger.debug(`Using ${functionRootId} as root for the unnamed function call`);
     // we know that it calls the toplevel:
-    finalGraph.addEdge(functionRootId, calledRootId, edge_1.EdgeType.Calls);
-    finalGraph.addEdge(functionRootId, calledRootId, edge_1.EdgeType.Reads);
+    finalGraph.addEdge(functionRootId, calledRootId, edge_1.EdgeType.Calls | edge_1.EdgeType.Reads);
     // keep the defined function
     finalGraph.mergeWith(calledFunction.graph);
     const { finalEnv, callArgs, remainingReadInArgs } = (0, common_1.processAllArguments)({
@@ -39,7 +38,7 @@ function processUnnamedFunctionCall(functionCall, data) {
         name: functionCallName,
         /* can never be a direct built-in-call */
         onlyBuiltin: false,
-        controlDependencies: data.controlDependencies,
+        cds: data.controlDependencies,
         args: callArgs // same reference
     });
     const inIds = remainingReadInArgs;

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

@@ -27,7 +27,7 @@ function processFunctionArgument(argument, data) {
         graph.addVertex({
             tag: vertex_1.VertexType.Use,
             id: argument.info.id,
-            controlDependencies: data.controlDependencies
+            cds: data.controlDependencies
         });
         entryPoint = argument.info.id;
     }

package/dataflow/internal/process/process-symbol.js

@@ -18,7 +18,7 @@ function processSymbol(symbol, data) {
         graph: new graph_1.DataflowGraph(data.completeAst.idMap).addVertex({
             tag: vertex_1.VertexType.Use,
             id: symbol.info.id,
-            controlDependencies: data.controlDependencies
+            cds: data.controlDependencies
         }),
         entryPoint: symbol.info.id,
         exitPoints: [{ nodeId: symbol.info.id, type: 0 /* ExitPointType.Default */, controlDependencies: data.controlDependencies }]

package/dataflow/internal/process/process-value.d.ts

@@ -1,4 +1,4 @@
 import { type DataflowInformation } from '../../info';
 import type { DataflowProcessorInformation } from '../../processor';
 import type { RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
-export declare function processValue<OtherInfo>(value: RNodeWithParent, data: DataflowProcessorInformation<OtherInfo>): DataflowInformation;
+export declare function processValue<OtherInfo>({ info: { id } }: RNodeWithParent, data: DataflowProcessorInformation<OtherInfo>): DataflowInformation;

package/dataflow/internal/process/process-value.js

@@ -4,19 +4,19 @@ exports.processValue = processValue;
 const graph_1 = require("../../graph/graph");
 const vertex_1 = require("../../graph/vertex");
 const identifier_1 = require("../../environments/identifier");
-function processValue(value, data) {
+function processValue({ info: { id } }, data) {
     return {
         unknownReferences: [],
-        in: [{ nodeId: value.info.id, name: undefined, controlDependencies: data.controlDependencies, type: identifier_1.ReferenceType.Constant }],
+        in: [{ nodeId: id, name: undefined, controlDependencies: data.controlDependencies, type: identifier_1.ReferenceType.Constant }],
         out: [],
         environment: data.environment,
         graph: new graph_1.DataflowGraph(data.completeAst.idMap).addVertex({
             tag: vertex_1.VertexType.Value,
-            id: value.info.id,
-            controlDependencies: data.controlDependencies
+            id: id,
+            cds: data.controlDependencies
         }),
-        exitPoints: [{ nodeId: value.info.id, type: 0 /* ExitPointType.Default */, controlDependencies: data.controlDependencies }],
-        entryPoint: value.info.id
+        exitPoints: [{ nodeId: id, type: 0 /* ExitPointType.Default */, controlDependencies: data.controlDependencies }],
+        entryPoint: id
     };
 }
 //# sourceMappingURL=process-value.js.map

package/dataflow/processor.d.ts

@@ -27,10 +27,10 @@ export interface DataflowProcessorInformation<OtherInfo> {
      */
     readonly currentRequest: RParseRequest;
     /**
-     * The chain of {@link RParseRequests} fingerprints ({@link requestFingerprint}) that lead to the {@link currentRequest}.
+     * The chain of {@link RParseRequests} that lead to the {@link currentRequest}.
      * The most recent (last) entry is expected to always be the {@link currentRequest}.
      */
-    readonly referenceChain: string[];
+    readonly referenceChain: RParseRequest[];
     /**
      * The chain of control-flow {@link NodeId}s that lead to the current node (e.g., of known ifs).
      */

package/documentation/data/server/doc-data-server-messages.js

@@ -195,6 +195,37 @@ ${await (0, doc_server_message_1.documentServerMessageResponse)({
 Please note, that the base message format is still JSON. Only the individual results get converted. 
 While the context is derived from the \`filename\`, we currently offer no way to customize other parts of the quads 
 (please open a [new issue](${doc_issue_1.NewIssueUrl}) if you require this).
+
+			`
+                    }]
+            })}
+
+<a id="analysis-format-compact"></a>
+**Retrieve the Output in a compactedForm**
+
+The default response is formatted as JSON. But this can get very big quickly.
+By specifying \`format: "compact"\`, you can retrieve the results heavily compacted (using [msgpack](https://www.npmjs.com/package/@msgpack/msgpack)).
+This works with and without the control flow graph as described [above](#analysis-include-cfg).
+
+${await (0, doc_server_message_1.documentServerMessageResponse)({
+                shell,
+                title: 'Requesting Compacted Results',
+                messages: [{
+                        type: 'request',
+                        message: {
+                            type: 'request-file-analysis',
+                            id: '1',
+                            filetoken: 'x',
+                            content: 'x <- 1\nx + 1',
+                            format: 'compact',
+                            cfg: true
+                        },
+                        mark: true
+                    }, {
+                        type: 'response',
+                        expectedType: 'response-file-analysis',
+                        description: `
+Please note, that the base message format is still JSON. Only the individual results are printed as binary objects.
 			`
                     }]
             })}

package/documentation/doc-util/doc-dfg.js

@@ -14,16 +14,15 @@ const diff_1 = require("../../dataflow/graph/diff");
 const assert_1 = require("../../util/assert");
 const time_1 = require("../../util/time");
 const doc_files_1 = require("./doc-files");
+const doc_code_1 = require("./doc-code");
 function printDfGraph(graph, mark, simplified = false) {
     return `
-\`\`\`mermaid
-${(0, dfg_1.graphToMermaid)({
+${(0, doc_code_1.codeBlock)('mermaid', (0, dfg_1.graphToMermaid)({
         graph,
         prefix: 'flowchart LR',
         mark,
         simplified
-    }).string}
-\`\`\`
+    }).string)}
 	`;
 }
 function formatSideEffect(ef) {
@@ -48,9 +47,7 @@ async function printDfGraphForCode(parser, code, { simplified = false, mark, sho
     const simplyText = simplified ? '(simplified) ' : '';
     let resultText = '\n\n';
     if (showCode) {
-        const codeText = `\`\`\`r
-${code}
-\`\`\``;
+        const codeText = (0, doc_code_1.codeBlock)('r', code);
         resultText += switchCodeAndGraph ? codeText : dfGraph;
         resultText += `
 <details${codeOpen ? ' open' : ''}>

package/documentation/print-engines-wiki.js

@@ -39,6 +39,7 @@ are exposed with some command line options (e.g., when using the docker image of
 - ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.r-shell.disabled', false)} to disable the ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)} engine
 - ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.r-shell.r-path', false)} (which is the canonical version of ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'r-path')})
 - ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.disabled', false)} to disable the ${(0, doc_types_1.shortLink)(tree_sitter_executor_1.TreeSitterExecutor.name, types.info)} engine
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.lax', false)} to use lax parsing with tree-sitter
 - ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.wasm-path', false)} pass the path to the wasm of the r grammar of tree-sitter (see [below](#tree-sitter))
 - ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.tree-sitter-wasm-path', false)} pass the path to the wasm of tree-sitter (see [below](#tree-sitter))
 - ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'default-engine', false)} to set the default engine to use

package/documentation/print-interface-wiki.js

@@ -203,7 +203,13 @@ ${(0, doc_code_1.codeBlock)('json', JSON.stringify({
         engines: [{ type: 'r-shell' }],
         solver: {
             variables: config_1.VariableResolve.Alias,
-            pointerTracking: true
+            pointerTracking: true,
+            resolveSource: {
+                dropPaths: config_1.DropPathsOption.No,
+                ignoreCapitalization: true,
+                inferWorkingDirectory: config_1.InferWorkingDirectory.ActiveScript,
+                searchPath: []
+            }
         }
     }, null, 2))}
 

package/documentation/print-normalized-ast-wiki.js

@@ -86,10 +86,10 @@ ${(0, doc_structure_1.details)('Normalized AST Node Types', (0, doc_types_1.prin
 
 The following segments intend to give you an overview of how to work with the normalized AST:
 
-* [How to get a normalized AST](#how-get-a-normalized-ast)
+* [How to get a Normalized AST](#how-to-get-a-normalized-ast)
 * [Visitors and Folds](#visitors-and-folds)
 
-## How Get a Normalized AST
+## How to Get a Normalized AST
 
 As explained alongside the [Interface](${doc_files_1.FlowrWikiBaseRef}/Interface#the-pipeline-executor) wiki page, you can use the 
 ${(0, doc_types_1.shortLink)(pipeline_executor_1.PipelineExecutor.name, types.info)} to get the ${(0, doc_types_1.shortLink)('NormalizedAst', types.info)}. If you are only interested in the normalization,
@@ -115,7 +115,7 @@ We provide two ways to traverse the normalized AST: [Visitors](#visitors) and [F
 If you want a simple visitor which traverses the AST, the ${(0, doc_types_1.shortLink)(visitor_1.visitAst.name, types.info)} function is a good starting point.
 You may specify functions to be called whenever you enter and exit a node during the traversal, and any
 computation is to be done by side effects.
-For example, if you want to collect all the \`id\`s present within a normalized (sub-)ast,
+For example, if you want to collect all the \`id\`s present within a normalized (sub-)AST,
 as it is done by the ${(0, doc_types_1.shortLink)(collect_1.collectAllIds.name, types.info)} function, you can use the following visitor:
 
 ${(0, doc_code_1.codeBlock)('ts', `

package/documentation/print-readme.js

@@ -65,7 +65,7 @@ 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 benchmark!')} (as of ${new Date(await (0, doc_benchmarks_1.getLastBenchmarkUpdate)()).toLocaleDateString('en-US', dateOptions)}), 
+  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', 'This measurement is automatically fetched from the latest benchmark!') + '</i>'} (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.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -184,7 +184,7 @@
     "@types/tmp": "^0.2.6",
     "@types/ws": "^8.5.14",
     "@typescript-eslint/eslint-plugin": "^8.24.0",
-    "@vitest/coverage-v8": "^3.0.5",
+    "@vitest/coverage-v8": "^3.0.6",
     "esbuild": "^0.25.0",
     "eslint": "^9.20.1",
     "license-checker": "^25.0.1",
@@ -196,9 +196,10 @@
     "typedoc-theme-hierarchy": "^5.0.4",
     "typedoc-umlclass": "^0.10.1",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.5"
+    "vitest": "^3.0.6"
   },
   "dependencies": {
+    "@msgpack/msgpack": "^3.0.1",
     "@xmldom/xmldom": "^0.9.7",
     "clipboardy": "^4.0.0",
     "command-line-args": "^6.0.1",

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-executor.d.ts

@@ -0,0 +1,3 @@
+import type { DataflowLensQuery, DataflowLensQueryResult } from './dataflow-lens-query-format';
+import type { BasicQueryData } from '../../base-query-format';
+export declare function executeDataflowLensQuery({ dataflow: { graph } }: BasicQueryData, queries: readonly DataflowLensQuery[]): DataflowLensQueryResult;

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-executor.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeDataflowLensQuery = executeDataflowLensQuery;
+const log_1 = require("../../../util/log");
+const dfg_view_1 = require("../../../util/simple-df/dfg-view");
+const vertex_1 = require("../../../dataflow/graph/vertex");
+function executeDataflowLensQuery({ dataflow: { graph } }, queries) {
+    if (queries.length !== 1) {
+        log_1.log.warn('Dataflow query expects only up to one query, but got', queries.length);
+    }
+    const now = Date.now();
+    const simplifiedGraph = (0, dfg_view_1.reduceDfg)(graph, {
+        vertices: {
+            keepEnv: false,
+            keepCd: true,
+            tags: [vertex_1.VertexType.Use, vertex_1.VertexType.VariableDefinition, vertex_1.VertexType.FunctionDefinition, vertex_1.VertexType.FunctionCall],
+            nameRegex: '<-|<<-|->|->>|=|+|-|*|/|\\|>|function|repeat|if|next|break',
+            blacklistWithName: true
+        }
+    });
+    const timing = Date.now() - now;
+    return {
+        '.meta': {
+            timing
+        },
+        simplifiedGraph
+    };
+}
+//# sourceMappingURL=dataflow-lens-query-executor.js.map

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-format.d.ts

@@ -0,0 +1,72 @@
+import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
+import type { DataflowGraph } from '../../../dataflow/graph/graph';
+import { executeDataflowLensQuery } from './dataflow-lens-query-executor';
+import Joi from 'joi';
+/**
+ * Returns a simplified view on the dataflow graph of the analysis
+ */
+export interface DataflowLensQuery extends BaseQueryFormat {
+    readonly type: 'dataflow-lens';
+}
+export interface DataflowLensQueryResult extends BaseQueryResult {
+    /** This is the simplified dataflow graph */
+    readonly simplifiedGraph: DataflowGraph;
+}
+export declare const DataflowLensQueryDefinition: {
+    readonly executor: typeof executeDataflowLensQuery;
+    readonly asciiSummarizer: (formatter: import("../../../util/ansi").OutputFormatter, _processed: import("../../../core/steps/pipeline/pipeline").PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
+        readonly name: "parse";
+        readonly humanReadableName: "parse with R shell";
+        readonly description: "Parse the given R code into an AST";
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
+        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+        readonly printer: {
+            readonly 0: typeof import("../../../core/print/print").internalPrinter;
+            readonly 2: {
+                (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
+                (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
+            };
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+        };
+        readonly dependencies: readonly [];
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
+    } | {
+        readonly name: "normalize";
+        readonly humanReadableName: "normalize";
+        readonly description: "Normalize the AST to flowR's AST";
+        readonly processor: (results: {
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
+        }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
+        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+        readonly printer: {
+            readonly 0: typeof import("../../../core/print/print").internalPrinter;
+            readonly 2: typeof import("../../../core/print/normalize-printer").normalizedAstToJson;
+            readonly 5: typeof import("../../../core/print/normalize-printer").normalizedAstToQuads;
+            readonly 3: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaid;
+            readonly 4: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
+        };
+        readonly dependencies: readonly ["parse"];
+        readonly requiredInput: import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput;
+    } | {
+        readonly humanReadableName: "dataflow";
+        readonly processor: (results: {
+            normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+        }, input: {
+            request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
+        }) => import("../../../dataflow/info").DataflowInformation;
+        readonly requiredInput: {};
+        readonly name: "dataflow";
+        readonly description: "Construct the dataflow graph";
+        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+        readonly printer: {
+            readonly 0: typeof import("../../../core/print/print").internalPrinter;
+            readonly 2: typeof import("../../../core/print/dataflow-printer").dataflowGraphToJson;
+            readonly 5: typeof import("../../../core/print/dataflow-printer").dataflowGraphToQuads;
+            readonly 3: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaid;
+            readonly 4: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
+        };
+        readonly dependencies: readonly ["normalize"];
+    }>>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly schema: Joi.ObjectSchema<any>;
+};