@eagleoutice/flowr 2.5.0 → 2.6.1

package/cli/repl/print-version.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.versionReplString = versionReplString;
 exports.printVersionRepl = printVersionRepl;
-const repl_version_1 = require("./commands/repl-version");
+const version_1 = require("../../util/version");
 async function versionReplString(parser) {
-    const version = await (0, repl_version_1.retrieveVersionInformation)(parser);
+    const version = await (0, version_1.retrieveVersionInformation)(parser);
     const rVersion = version.r === 'none' ? '' : version.r === 'unknown' ? ', R version unknown' : `, R v${version.r}`;
     const treeSitterVer = parser.name === 'tree-sitter' ? `, R grammar v${parser.treeSitterVersion()}` : '';
     return `flowR repl using flowR v${version.flowr}${rVersion}${treeSitterVer} (${version.engine} engine)`;

package/cli/repl/server/connection.d.ts

@@ -1,9 +1,13 @@
 import type { Socket } from './net';
+import type { TREE_SITTER_DATAFLOW_PIPELINE } from '../../../core/steps/pipeline/default-pipelines';
 import { DEFAULT_SLICING_PIPELINE } from '../../../core/steps/pipeline/default-pipelines';
 import type { PipelineOutput } from '../../../core/steps/pipeline/pipeline';
 import type { DeepPartial } from 'ts-essentials';
-import type { KnownParser } from '../../../r-bridge/parser';
+import type { KnownParser, ParseStepOutput } from '../../../r-bridge/parser';
 import type { FlowrConfigOptions } from '../../../config';
+import type { NormalizedAst } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { DataflowInformation } from '../../../dataflow/info';
+import type { Tree } from 'web-tree-sitter';
 /**
  * Each connection handles a single client, answering to its requests.
  * There is no need to construct this class manually, {@link FlowRServer} will do it for you.
@@ -21,10 +25,10 @@ export declare class FlowRServerConnection {
     private handleData;
     private handleFileAnalysisRequest;
     private sendFileAnalysisResponse;
-    private createPipelineExecutorForRequest;
+    private createAnalyzerForRequest;
     private handleSliceRequest;
     private handleRepl;
     private handleLineageRequest;
     private handleQueryRequest;
 }
-export declare function sanitizeAnalysisResults(results: Partial<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>>): DeepPartial<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>>;
+export declare function sanitizeAnalysisResults(parse: ParseStepOutput<string | Tree>, normalize: NormalizedAst, dataflow: DataflowInformation): DeepPartial<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE | typeof TREE_SITTER_DATAFLOW_PIPELINE>>;

package/cli/repl/server/connection.js

@@ -48,20 +48,20 @@ const core_1 = require("../core");
 const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const quads_1 = require("../../../util/quads");
 const print_1 = require("../../../core/print/print");
+const _00_parse_1 = require("../../../core/steps/all/core/00-parse");
+const _10_normalize_1 = require("../../../core/steps/all/core/10-normalize");
+const _20_dataflow_1 = require("../../../core/steps/all/core/20-dataflow");
 const ansi_1 = require("../../../util/text/ansi");
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const graph_1 = require("../../../dataflow/graph/graph");
 const tmp = __importStar(require("tmp"));
 const fs_1 = __importDefault(require("fs"));
-const magic_comments_1 = require("../../../reconstruct/auto-select/magic-comments");
 const message_lineage_1 = require("./messages/message-lineage");
 const repl_lineage_1 = require("../commands/repl-lineage");
-const assert_1 = require("../../../util/assert");
-const auto_select_defaults_1 = require("../../../reconstruct/auto-select/auto-select-defaults");
 const message_query_1 = require("./messages/message-query");
-const query_1 = require("../../../queries/query");
 const compact_1 = require("./compact");
 const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
+const flowr_analyzer_builder_1 = require("../../../project/flowr-analyzer-builder");
 /**
  * Each connection handles a single client, answering to its requests.
  * There is no need to construct this class manually, {@link FlowRServer} will do it for you.
@@ -117,7 +117,7 @@ class FlowRServerConnection {
                 this.handleRepl(request.message);
                 break;
             case 'request-lineage':
-                this.handleLineageRequest(request.message);
+                void this.handleLineageRequest(request.message);
                 break;
             case 'request-query':
                 this.handleQueryRequest(request.message);
@@ -146,9 +146,11 @@ class FlowRServerConnection {
             this.fileMap.delete(message.filetoken);
         }
         const tempFile = tmp.fileSync({ postfix: '.R' });
-        const slicer = this.createPipelineExecutorForRequest(message, tempFile.name);
-        await slicer.allRemainingSteps(false).then(async (results) => await this.sendFileAnalysisResponse(slicer, results, message))
-            .catch(e => {
+        const analyzer = await this.createAnalyzerForRequest(message, tempFile.name);
+        try {
+            await this.sendFileAnalysisResponse(analyzer, message);
+        }
+        catch (e) {
             this.logger.error(`[${this.name}] Error while analyzing file ${message.filename ?? 'unknown file'}: ${String(e)}`);
             (0, send_1.sendMessage)(this.socket, {
                 id: message.id,
@@ -156,22 +158,17 @@ class FlowRServerConnection {
                 fatal: false,
                 reason: `Error while analyzing file ${message.filename ?? 'unknown file'}: ${String(e)}`
             });
-        });
+        }
         // this is an interestingly named function that means "I am a callback that removes a file" - so this deletes the file
         tempFile.removeCallback();
     }
-    async sendFileAnalysisResponse(slicer, results, message) {
+    async sendFileAnalysisResponse(analyzer, message) {
         let cfg = undefined;
         if (message.cfg) {
-            cfg = (0, extract_cfg_1.extractCfg)(results.normalize, this.config, results.dataflow?.graph);
+            cfg = await analyzer.controlflow();
         }
         const config = () => ({ context: message.filename ?? 'unknown', getId: (0, quads_1.defaultQuadIdGenerator)() });
-        const sanitizedResults = sanitizeAnalysisResults(results);
-        const pipeline = slicer.getPipeline();
-        const parseStep = pipeline.steps.get('parse');
-        const normalizedStep = pipeline.steps.get('normalize');
-        const dataflowStep = pipeline.steps.get('dataflow');
-        (0, assert_1.guard)(parseStep !== undefined && normalizedStep !== undefined && dataflowStep !== undefined, 'All steps must be present');
+        const sanitizedResults = sanitizeAnalysisResults(await analyzer.parse(), await analyzer.normalize(), await analyzer.dataflow());
         if (message.format === 'n-quads') {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'response-file-analysis',
@@ -179,9 +176,9 @@ class FlowRServerConnection {
                 id: message.id,
                 cfg: cfg ? (0, extract_cfg_1.cfg2quads)(cfg, config()) : undefined,
                 results: {
-                    parse: await (0, print_1.printStepResult)(parseStep, sanitizedResults.parse, 5 /* StepOutputFormat.RdfQuads */, config()),
-                    normalize: await (0, print_1.printStepResult)(normalizedStep, sanitizedResults.normalize, 5 /* StepOutputFormat.RdfQuads */, config()),
-                    dataflow: await (0, print_1.printStepResult)(dataflowStep, sanitizedResults.dataflow, 5 /* StepOutputFormat.RdfQuads */, config())
+                    parse: await (0, print_1.printStepResult)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, await analyzer.parse(), 5 /* StepOutputFormat.RdfQuads */, config()),
+                    normalize: await (0, print_1.printStepResult)(_10_normalize_1.NORMALIZE, await analyzer.normalize(), 5 /* StepOutputFormat.RdfQuads */, config()),
+                    dataflow: await (0, print_1.printStepResult)(_20_dataflow_1.STATIC_DATAFLOW, await analyzer.dataflow(), 5 /* StepOutputFormat.RdfQuads */, config())
                 }
             });
         }
@@ -204,7 +201,7 @@ class FlowRServerConnection {
             });
         }
     }
-    createPipelineExecutorForRequest(message, tempFile) {
+    async createAnalyzerForRequest(message, tempFile) {
         let request;
         if (message.content !== undefined) {
             // we store the code in a temporary file in case it's too big for the shell to handle
@@ -222,18 +219,18 @@ class FlowRServerConnection {
         else {
             throw new Error('Either content or filepath must be defined.');
         }
-        const slicer = (0, default_pipelines_1.createSlicePipeline)(this.parser, {
-            request,
-            criterion: [] // currently unknown
-        }, this.config);
+        const analyzer = await new flowr_analyzer_builder_1.FlowrAnalyzerBuilder(request)
+            .setConfig(this.config)
+            .setParser(this.parser)
+            .build();
         if (message.filetoken) {
             this.logger.info(`Storing file token ${message.filetoken}`);
             this.fileMap.set(message.filetoken, {
                 filename: message.filename,
-                pipeline: slicer
+                analyzer: analyzer
             });
         }
-        return slicer;
+        return analyzer;
     }
     handleSliceRequest(base) {
         const requestResult = (0, validate_1.validateMessage)(base, message_slice_1.requestSliceMessage);
@@ -253,16 +250,16 @@ class FlowRServerConnection {
             });
             return;
         }
-        fileInformation.pipeline.updateRequest({
-            criterion: request.criterion,
-            direction: request.direction,
-            autoSelectIf: request.noMagicComments ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect)
-        });
-        void fileInformation.pipeline.allRemainingSteps(true).then(results => {
+        void fileInformation.analyzer.query([{
+                type: 'static-slice',
+                criteria: request.criterion,
+                noMagicComments: request.noMagicComments,
+                direction: request.direction
+            }]).then(result => {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'response-slice',
                 id: request.id,
-                results: Object.fromEntries(Object.entries(results)
+                results: Object.fromEntries(Object.entries(result)
                     .filter(([k,]) => default_pipelines_1.DEFAULT_SLICING_PIPELINE.steps.get(k)?.executed === 1 /* PipelineStepStage.OncePerRequest */))
             });
         }).catch(e => {
@@ -290,18 +287,22 @@ class FlowRServerConnection {
                 stream
             });
         };
-        void (0, core_1.replProcessAnswer)(this.config, {
+        const analyzer = new flowr_analyzer_builder_1.FlowrAnalyzerBuilder()
+            .setConfig(this.config)
+            .setParser(this.parser)
+            .buildSync();
+        void (0, core_1.replProcessAnswer)(analyzer, {
             formatter: request.ansi ? ansi_1.ansiFormatter : ansi_1.voidFormatter,
             stdout: msg => out('stdout', msg),
             stderr: msg => out('stderr', msg)
-        }, request.expression, this.parser, this.allowRSessionAccess).then(() => {
+        }, request.expression, this.allowRSessionAccess).then(() => {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'end-repl-execution',
                 id: request.id
             });
         });
     }
-    handleLineageRequest(base) {
+    async handleLineageRequest(base) {
         const requestResult = (0, validate_1.validateMessage)(base, message_lineage_1.requestLineageMessage);
         if (requestResult.type === 'error') {
             (0, validate_1.answerForValidationError)(this.socket, requestResult, base.id);
@@ -319,10 +320,8 @@ class FlowRServerConnection {
             });
             return;
         }
-        const { dataflow: dfg, normalize: ast } = fileInformation.pipeline.getResults(true);
-        (0, assert_1.guard)(dfg !== undefined, `Dataflow graph must be present (request: ${request.filetoken})`);
-        (0, assert_1.guard)(ast !== undefined, `AST must be present (request: ${request.filetoken})`);
-        const lineageIds = (0, repl_lineage_1.getLineage)(request.criterion, dfg.graph, ast.idMap);
+        const analyzer = fileInformation.analyzer;
+        const lineageIds = (0, repl_lineage_1.getLineage)(request.criterion, (await analyzer.dataflow()).graph, (await analyzer.normalize()).idMap);
         (0, send_1.sendMessage)(this.socket, {
             type: 'response-lineage',
             id: request.id,
@@ -347,10 +346,7 @@ class FlowRServerConnection {
             });
             return;
         }
-        const { dataflow: dfg, normalize: ast } = fileInformation.pipeline.getResults(true);
-        (0, assert_1.guard)(dfg !== undefined, `Dataflow graph must be present (request: ${request.filetoken})`);
-        (0, assert_1.guard)(ast !== undefined, `AST must be present (request: ${request.filetoken})`);
-        void Promise.resolve((0, query_1.executeQueries)({ dataflow: dfg, ast, config: this.config }, request.query)).then(results => {
+        void Promise.resolve(fileInformation.analyzer.query(request.query)).then(results => {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'response-query',
                 id: request.id,
@@ -368,17 +364,17 @@ class FlowRServerConnection {
     }
 }
 exports.FlowRServerConnection = FlowRServerConnection;
-function sanitizeAnalysisResults(results) {
+function sanitizeAnalysisResults(parse, normalize, dataflow) {
     return {
-        ...results,
+        parse: parse,
         normalize: {
-            ...results.normalize,
+            ...normalize,
             idMap: undefined
         },
         dataflow: {
-            ...results.dataflow,
+            ...dataflow,
             // we want to keep the DataflowGraph type information, but not the idMap
-            graph: new graph_1.DataflowGraph(undefined).mergeWith(results.dataflow?.graph)
+            graph: new graph_1.DataflowGraph(undefined).mergeWith(dataflow?.graph)
         }
     };
 }

package/cli/repl/server/messages/message-hello.d.ts

@@ -1,5 +1,5 @@
-import type { VersionInformation } from '../../commands/repl-version';
 import type { IdMessageBase, MessageDefinition } from './all-messages';
+import type { VersionInformation } from '../../../../util/version';
 /**
  * The hello message is automatically sent by the sever upon connection.
  */

package/cli/repl/server/messages/message-slice.d.ts

@@ -17,7 +17,7 @@ export interface SliceRequestMessage extends IdMessageBase {
     /** The direction to slice in. Defaults to backward slicing if unset. */
     direction?: SliceDirection;
     /**
-     * Should the magic comments (force-including lines within the slice) be ignord?
+     * Should the magic comments (force-including lines within the slice) be ignored?
      */
     noMagicComments?: boolean;
 }

package/cli/repl/server/server.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowRServer = exports.serverLog = void 0;
-const repl_version_1 = require("../commands/repl-version");
 const connection_1 = require("./connection");
 const send_1 = require("./send");
 const net_1 = require("./net");
 const log_1 = require("../../../util/log");
+const version_1 = require("../../../util/version");
 // we detach from the main logger so that it can have its own switch
 exports.serverLog = new log_1.FlowrLogger({ name: 'server' });
 /**
@@ -32,7 +32,7 @@ class FlowRServer {
         this.config = config;
     }
     async start(port) {
-        this.versionInformation = await (0, repl_version_1.retrieveVersionInformation)(this.engines[this.defaultEngine]);
+        this.versionInformation = await (0, version_1.retrieveVersionInformation)(this.engines[this.defaultEngine]);
         this.server.start(port);
         exports.serverLog.info(`Server listening on port ${port}`);
     }

package/cli/slicer-app.js

@@ -32,7 +32,7 @@ async function getSlice() {
     (0, assert_1.guard)(options.criterion !== undefined, 'a slicing criterion must be given');
     const config = (0, config_1.getConfig)();
     await slicer.init(options['input-is-text']
-        ? { request: 'text', content: options.input.replaceAll('\\n', '\n') }
+        ? (0, adapter_1.requestFromText)(options.input.replaceAll('\\n', '\n'))
         : (0, adapter_1.requestFromFile)(options.input), config, options['no-magic-comments'] ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
     let mappedSlices = [];
     let reconstruct = undefined;

package/config.d.ts

@@ -209,7 +209,7 @@ export declare function parseConfig(jsonString: string): FlowrConfigOptions | un
 /**
  * Creates a new flowr config that has the updated values.
  */
-export declare function amendConfig(config: FlowrConfigOptions, amendmentFunc: (config: DeepWritable<FlowrConfigOptions>) => FlowrConfigOptions): FlowrConfigOptions;
+export declare function amendConfig(config: FlowrConfigOptions, amendmentFunc: (config: DeepWritable<FlowrConfigOptions>) => FlowrConfigOptions | void): FlowrConfigOptions;
 export declare function cloneConfig(config: FlowrConfigOptions): FlowrConfigOptions;
 export declare function getConfig(configFile?: string, configWorkingDirectory?: string): FlowrConfigOptions;
 export declare function getEngineConfig<T extends EngineConfig['type']>(config: FlowrConfigOptions, engine: T): EngineConfig & {

package/config.js

@@ -162,8 +162,11 @@ function parseConfig(jsonString) {
 /**
  * Creates a new flowr config that has the updated values.
  */
+// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 function amendConfig(config, amendmentFunc) {
-    return amendmentFunc(cloneConfig(config));
+    const newConfig = cloneConfig(config);
+    amendmentFunc(newConfig);
+    return newConfig;
 }
 function cloneConfig(config) {
     return JSON.parse(JSON.stringify(config));

package/control-flow/extract-cfg.d.ts

@@ -18,7 +18,7 @@ import type { FlowrConfigOptions } from '../config';
  */
 export declare function extractCfg<Info = ParentInformation>(ast: NormalizedAst<Info & ParentInformation>, config: FlowrConfigOptions, graph?: DataflowGraph, simplifications?: readonly CfgSimplificationPassName[]): ControlFlowInformation;
 /**
- * A version of {@link extractCfg} that is much quicker and does not apply any simplifciations or dataflow information.
+ * A version of {@link extractCfg} that is much quicker and does not apply any simplifications or dataflow information.
  */
 export declare function extractCfgQuick<Info = ParentInformation>(ast: NormalizedAst<Info>): ControlFlowInformation<import("./control-flow-graph").CfgSimpleVertex>;
 export declare const ResolvedCallSuffix = "-resolved-call-exit";

package/control-flow/extract-cfg.js

@@ -67,7 +67,7 @@ function extractCfg(ast, config, graph, simplifications) {
     return (0, cfg_simplification_1.simplifyControlFlowInformation)((0, fold_1.foldAst)(ast.ast, graph ? dataflowCfgFolds(graph) : cfgFolds), { ast, dfg: graph, config }, simplifications);
 }
 /**
- * A version of {@link extractCfg} that is much quicker and does not apply any simplifciations or dataflow information.
+ * A version of {@link extractCfg} that is much quicker and does not apply any simplifications or dataflow information.
  */
 function extractCfgQuick(ast) {
     return (0, fold_1.foldAst)(ast.ast, cfgFolds);

package/core/pipeline-executor.d.ts

@@ -3,6 +3,10 @@ import { PipelineStepStage } from './steps/pipeline-step';
 import type { Pipeline, PipelineInput, PipelineOutput, PipelinePerRequestInput, PipelineStepOutputWithName } from './steps/pipeline/pipeline';
 import type { FlowrConfigOptions } from '../config';
 /**
+ * **Please note:** The {@link PipelineExecutor} is now considered to be a rather low-level API for flowR. While it still works
+ * and is the basis for all other layers, we strongly recommend using the {@link FlowrAnalyzer} and its {@link FlowrAnalyzerBuilder|builder}
+ * to create and use an analyzer instance that is pre-configured for your use-case.
+ *
  * The pipeline executor allows to execute arbitrary {@link Pipeline|pipelines} in a step-by-step fashion.
  * If you are not yet in the possession of a {@link Pipeline|pipeline}, you can use the {@link createPipeline} function
  * to create one for yourself, based on the steps that you want to execute.
@@ -98,6 +102,7 @@ export declare class PipelineExecutor<P extends Pipeline> {
      * The required additional input is specified by the {@link IPipelineStep#requiredInput|required input configuration} of each step in the `pipeline`.
      *
      * Please see {@link createDataflowPipeline} and friends for engine agnostic shortcuts to create a pipeline executor.
+     * And in general, please prefer using the {@link FlowrAnalyzer} and its {@link FlowrAnalyzerBuilder|builder} to create and use an analyzer instance.
      *
      * @param pipeline - The {@link Pipeline} to execute, probably created with {@link createPipeline}.
      * @param input    - External {@link PipelineInput|configuration and input} required to execute the given pipeline.

package/core/pipeline-executor.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PipelineExecutor = void 0;
 const assert_1 = require("../util/assert");
 /**
+ * **Please note:** The {@link PipelineExecutor} is now considered to be a rather low-level API for flowR. While it still works
+ * and is the basis for all other layers, we strongly recommend using the {@link FlowrAnalyzer} and its {@link FlowrAnalyzerBuilder|builder}
+ * to create and use an analyzer instance that is pre-configured for your use-case.
+ *
  * The pipeline executor allows to execute arbitrary {@link Pipeline|pipelines} in a step-by-step fashion.
  * If you are not yet in the possession of a {@link Pipeline|pipeline}, you can use the {@link createPipeline} function
  * to create one for yourself, based on the steps that you want to execute.
@@ -98,6 +102,7 @@ class PipelineExecutor {
      * The required additional input is specified by the {@link IPipelineStep#requiredInput|required input configuration} of each step in the `pipeline`.
      *
      * Please see {@link createDataflowPipeline} and friends for engine agnostic shortcuts to create a pipeline executor.
+     * And in general, please prefer using the {@link FlowrAnalyzer} and its {@link FlowrAnalyzerBuilder|builder} to create and use an analyzer instance.
      *
      * @param pipeline - The {@link Pipeline} to execute, probably created with {@link createPipeline}.
      * @param input    - External {@link PipelineInput|configuration and input} required to execute the given pipeline.

package/core/steps/all/core/20-dataflow.d.ts

@@ -10,7 +10,9 @@ declare function processor(results: {
 }, input: {
     request?: RParseRequests;
     parser?: Parser<KnownParserType>;
-}, config: FlowrConfigOptions): import("../../../../dataflow/info").DataflowInformation;
+}, config: FlowrConfigOptions): import("../../../../dataflow/info").DataflowInformation & {
+    cfgQuick: import("../../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+};
 export declare const STATIC_DATAFLOW: {
     readonly humanReadableName: "dataflow";
     readonly processor: typeof processor;

package/core/steps/pipeline/create-pipeline.js

@@ -27,7 +27,7 @@ function verifyAndBuildPipeline(steps) {
     // now, we do the same for the per-request steps, keeping the per-file steps known
     initializeSteps(perRequestSteps, perRequestStepMap, initsPerRequest, visited);
     const sortedPerRequest = topologicalSort(initsPerRequest, perRequestStepMap, visited);
-    const sorted = [...sortedPerFile, ...sortedPerRequest];
+    const sorted = sortedPerFile.concat(sortedPerRequest);
     validateStepOutput(sorted, perRequestStepMap, steps);
     return {
         steps: perRequestStepMap,

package/core/steps/pipeline/default-pipelines.d.ts

@@ -61,7 +61,9 @@ export declare const DEFAULT_SLICING_PIPELINE: import("./pipeline").Pipeline<{
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -143,7 +145,9 @@ export declare const DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipeline"
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -225,7 +229,9 @@ export declare const DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./pipel
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -260,7 +266,9 @@ export declare const TREE_SITTER_SLICING_PIPELINE: import("./pipeline").Pipeline
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -341,7 +349,9 @@ export declare const TREE_SITTER_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipel
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -422,7 +432,9 @@ export declare const TREE_SITTER_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./p
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -513,7 +525,9 @@ export declare const DEFAULT_DATAFLOW_PIPELINE: import("./pipeline").Pipeline<{
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -534,7 +548,9 @@ export declare const TREE_SITTER_DATAFLOW_PIPELINE: import("./pipeline").Pipelin
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation & {
+        cfgQuick: import("../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
+    };
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";

package/core/steps/pipeline/default-pipelines.js

@@ -33,6 +33,7 @@ exports.TREE_SITTER_NORMALIZE_PIPELINE = (0, pipeline_1.createPipeline)(_01_pars
 exports.DEFAULT_PARSE_PIPELINE = (0, pipeline_1.createPipeline)(_00_parse_1.PARSE_WITH_R_SHELL_STEP);
 exports.TREE_SITTER_PARSE_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tree_sitter_1.PARSE_WITH_TREE_SITTER_STEP);
 /**
+ * **Please use {@link FlowrAnalyzer} instead of this directly unless you really know what you are doing.**
  * Returns either a {@link DEFAULT_PARSE_PIPELINE} or a {@link TREE_SITTER_PARSE_PIPELINE} depending on the parser used.
  *
  * @see {@link createNormalizePipeline}, {@link createDataflowPipeline}, {@link createSlicePipeline}
@@ -45,6 +46,7 @@ function createParsePipeline(parser, inputs, config) {
     }, config);
 }
 /**
+ * **Please use {@link FlowrAnalyzer} instead of this directly unless you really know what you are doing.**
  * Returns either a {@link DEFAULT_SLICING_PIPELINE} or a {@link TREE_SITTER_SLICING_PIPELINE} depending on the parser used.
  *
  * @see {@link createParsePipeline}, {@link createNormalizePipeline}, {@link createDataflowPipeline}
@@ -57,6 +59,7 @@ function createSlicePipeline(parser, inputs, config) {
     }, config);
 }
 /**
+ * **Please use {@link FlowrAnalyzer} instead of this directly unless you really know what you are doing.**
  * Returns either a {@link DEFAULT_NORMALIZE_PIPELINE} or a {@link TREE_SITTER_NORMALIZE_PIPELINE} depending on the parser used.
  *
  * @see {@link createParsePipeline}, {@link createDataflowPipeline}, {@link createSlicePipeline}
@@ -69,10 +72,10 @@ function createNormalizePipeline(parser, inputs, config) {
     }, config);
 }
 /**
+ * **Please use {@link FlowrAnalyzer} instead of this directly unless you really know what you are doing.**
  * Returns either a {@link DEFAULT_DATAFLOW_PIPELINE} or a {@link TREE_SITTER_DATAFLOW_PIPELINE} depending on the parser used.
  *
  * @see {@link createParsePipeline}, {@link createNormalizePipeline}, {@link createSlicePipeline}
- *
  */
 function createDataflowPipeline(parser, inputs, config) {
     const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_DATAFLOW_PIPELINE : exports.DEFAULT_DATAFLOW_PIPELINE;

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

@@ -212,6 +212,14 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: ['('], processor: 'builtin:default', config: { returnsNthArgument: 0 }, assumePrimitive: true },
     { type: 'function', names: ['load', 'load_all', 'setwd', 'set.seed'], processor: 'builtin:default', config: { hasUnknownSideEffects: true, forceArgs: [true] }, assumePrimitive: false },
     { type: 'function', names: ['body', 'formals', 'environment'], processor: 'builtin:default', config: { hasUnknownSideEffects: true, forceArgs: [true] }, assumePrimitive: true },
+    { type: 'function', names: ['.Call', '.External', '.C', '.Fortran'], processor: 'builtin:default', config: { hasUnknownSideEffects: true, forceArgs: [true],
+            treatAsFnCall: {
+                '.Call': ['.NAME'],
+                '.External': ['.NAME'],
+                '.C': ['.NAME'],
+                '.Fortran': ['.NAME']
+            }
+        }, assumePrimitive: true },
     { type: 'function', names: ['eval'], processor: 'builtin:eval', config: { includeFunctionCall: true }, assumePrimitive: true },
     { type: 'function', names: ['cat'], processor: 'builtin:default', config: { forceArgs: 'all', hasUnknownSideEffects: { type: 'link-to-last-call', callName: /^sink$/ } }, assumePrimitive: false },
     { type: 'function', names: ['switch'], processor: 'builtin:default', config: { forceArgs: [true] }, assumePrimitive: false },

package/dataflow/eval/resolve/alias-tracking.js

@@ -138,6 +138,8 @@ function resolveIdToValue(id, { environment, graph, idMap, full = true, resolve
             else {
                 return r_value_1.Top;
             }
+        case type_1.RType.FunctionDefinition:
+            return (0, set_constants_1.setFrom)({ type: 'function-definition' });
         case type_1.RType.FunctionCall:
         case type_1.RType.BinaryOp:
         case type_1.RType.UnaryOp:

package/dataflow/eval/resolve/resolve.js

@@ -41,6 +41,9 @@ function resolveNode(resolve, a, env, graph, map) {
     else if (a.type === type_1.RType.Logical) {
         return a.content.valueOf() ? logical_constants_1.ValueLogicalTrue : logical_constants_1.ValueLogicalFalse;
     }
+    else if (a.type === type_1.RType.FunctionDefinition) {
+        return { type: 'function-definition' };
+    }
     else if ((a.type === type_1.RType.FunctionCall || a.type === type_1.RType.BinaryOp || a.type === type_1.RType.UnaryOp) && graph) {
         const origin = (0, dfg_get_origin_1.getOriginInDfg)(graph, a.info.id)?.[0];
         if (origin === undefined || origin.type !== 3 /* OriginType.BuiltInFunctionOrigin */) {

package/dataflow/eval/values/r-value.d.ts

@@ -37,6 +37,9 @@ export interface ValueString<Str extends Lift<RStringValue> = Lift<RStringValue>
     type: 'string';
     value: Str;
 }
+export interface ValueFunctionDefinition {
+    type: 'function-definition';
+}
 export interface ValueMissing {
     type: 'missing';
 }
@@ -45,7 +48,7 @@ export interface ValueLogical {
     type: 'logical';
     value: Lift<TernaryLogical>;
 }
-export type Value = Lift<ValueInterval | ValueVector | ValueSet | ValueNumber | ValueString | ValueLogical | ValueMissing>;
+export type Value = Lift<ValueInterval | ValueVector | ValueSet | ValueNumber | ValueString | ValueLogical | ValueMissing | ValueFunctionDefinition>;
 export type ValueType<V> = V extends {
     type: infer T;
 } ? T : never;

package/dataflow/eval/values/r-value.js

@@ -82,6 +82,8 @@ function stringifyValue(value) {
                 return tryStringifyBoTop(v.value, l => l === 'maybe' ? 'maybe' : l ? 'TRUE' : 'FALSE', () => '⊤ (logical)', () => '⊥ (logical)');
             case 'missing':
                 return '(missing)';
+            case 'function-definition':
+                return 'fn-def';
             default:
                 (0, assert_1.assertUnreachable)(t);
         }

package/dataflow/extractor.d.ts

@@ -3,6 +3,7 @@ import type { DataflowProcessors } from './processor';
 import type { NormalizedAst, ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RParseRequests } from '../r-bridge/retriever';
 import type { KnownParserType, Parser } from '../r-bridge/parser';
+import type { ControlFlowInformation } from '../control-flow/control-flow-graph';
 import type { FlowrConfigOptions } from '../config';
 /**
  * The best friend of {@link produceDataFlowGraph} and {@link processDataflowFor}.
@@ -15,4 +16,6 @@ export declare const processors: DataflowProcessors<ParentInformation>;
  * (e.g., in the event of a `source` call).
  * For the actual, canonical fold entry point, see {@link processDataflowFor}.
  */
-export declare function produceDataFlowGraph<OtherInfo>(parser: Parser<KnownParserType>, request: RParseRequests, completeAst: NormalizedAst<OtherInfo & ParentInformation>, config: FlowrConfigOptions): DataflowInformation;
+export declare function produceDataFlowGraph<OtherInfo>(parser: Parser<KnownParserType>, request: RParseRequests, completeAst: NormalizedAst<OtherInfo & ParentInformation>, config: FlowrConfigOptions): DataflowInformation & {
+    cfgQuick: ControlFlowInformation | undefined;
+};