@eagleoutice/flowr 2.5.0 → 2.6.1

package/project/plugins/package-version-plugins/package.d.ts

@@ -0,0 +1,15 @@
+import { Range } from 'semver';
+export type PackageType = 'package' | 'system' | 'r';
+export declare class Package {
+    name: string;
+    derivedVersion?: Range;
+    type?: PackageType;
+    dependencies?: Package[];
+    versionConstraints: Range[];
+    constructor(name: string, type?: PackageType, dependencies?: Package[], ...versionConstraints: readonly (Range | undefined)[]);
+    mergeInPlace(other: Package): void;
+    addInfo(type?: PackageType, dependencies?: Package[], ...versionConstraints: readonly Range[]): void;
+    getInfo(): this;
+    deriveVersion(): Range | undefined;
+    static parsePackageVersionRange(constraint?: string, version?: string): Range | undefined;
+}

package/project/plugins/package-version-plugins/package.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Package = void 0;
+const semver_1 = require("semver");
+const assert_1 = require("../../../util/assert");
+class Package {
+    name;
+    derivedVersion;
+    type;
+    dependencies;
+    versionConstraints = [];
+    constructor(name, type, dependencies, ...versionConstraints) {
+        this.name = name;
+        this.addInfo(type, dependencies, ...(versionConstraints ?? []).filter(assert_1.isNotUndefined));
+    }
+    mergeInPlace(other) {
+        (0, assert_1.guard)(this.name === other.name, 'Can only merge packages with the same name');
+        this.addInfo(other.type, other.dependencies, ...other.versionConstraints);
+    }
+    addInfo(type, dependencies, ...versionConstraints) {
+        if (type !== undefined) {
+            this.type = type;
+        }
+        if (dependencies !== undefined) {
+            this.dependencies = dependencies;
+        }
+        if (versionConstraints !== undefined) {
+            this.derivedVersion ??= versionConstraints[0];
+            for (const constraint of versionConstraints) {
+                if (!this.derivedVersion?.intersects(constraint)) {
+                    throw Error('Version constraint mismatch!');
+                }
+                this.versionConstraints.push(constraint);
+                this.derivedVersion = this.deriveVersion();
+            }
+        }
+    }
+    getInfo() {
+        return this;
+    }
+    deriveVersion() {
+        return this.versionConstraints.length > 0
+            ? new semver_1.Range(this.versionConstraints.map(c => c.raw).join(' '))
+            : undefined;
+    }
+    static parsePackageVersionRange(constraint, version) {
+        if (version) {
+            return constraint ? new semver_1.Range(constraint + version) : new semver_1.Range(version);
+        }
+        else {
+            return undefined;
+        }
+    }
+}
+exports.Package = Package;
+//# sourceMappingURL=package.js.map

package/project/plugins/project-discovery/flowr-analyzer-project-discovery-plugin.d.ts

@@ -0,0 +1,15 @@
+import { FlowrAnalyzerPlugin, PluginType } from '../flowr-analyzer-plugin';
+import type { RParseRequest } from '../../../r-bridge/retriever';
+import type { RProjectAnalysisRequest } from '../../context/flowr-analyzer-files-context';
+import type { FlowrFile } from '../../context/flowr-file';
+/**
+ * This is the base class for all plugins that discover files in a project for analysis.
+ * These plugins interplay with the {@link FlowrAnalyzerFilesContext} to gather information about the files in the project.
+ * See {@link DefaultFlowrAnalyzerProjectDiscoveryPlugin} for the dummy default implementation.
+ *
+ * In general, these plugins only trigger for a {@link RProjectAnalysisRequest} with the idea to discover all files in a project.
+ */
+export declare abstract class FlowrAnalyzerProjectDiscoveryPlugin extends FlowrAnalyzerPlugin<RProjectAnalysisRequest, (RParseRequest | FlowrFile<string>)[]> {
+    readonly type = PluginType.ProjectDiscovery;
+    static defaultPlugin(): FlowrAnalyzerProjectDiscoveryPlugin;
+}

package/project/plugins/project-discovery/flowr-analyzer-project-discovery-plugin.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlowrAnalyzerProjectDiscoveryPlugin = void 0;
+const flowr_analyzer_plugin_1 = require("../flowr-analyzer-plugin");
+const semver_1 = require("semver");
+const flowr_file_1 = require("../../context/flowr-file");
+const files_1 = require("../../../util/files");
+/**
+ * This is the base class for all plugins that discover files in a project for analysis.
+ * These plugins interplay with the {@link FlowrAnalyzerFilesContext} to gather information about the files in the project.
+ * See {@link DefaultFlowrAnalyzerProjectDiscoveryPlugin} for the dummy default implementation.
+ *
+ * In general, these plugins only trigger for a {@link RProjectAnalysisRequest} with the idea to discover all files in a project.
+ */
+class FlowrAnalyzerProjectDiscoveryPlugin extends flowr_analyzer_plugin_1.FlowrAnalyzerPlugin {
+    type = flowr_analyzer_plugin_1.PluginType.ProjectDiscovery;
+    static defaultPlugin() {
+        return new DefaultFlowrAnalyzerProjectDiscoveryPlugin();
+    }
+}
+exports.FlowrAnalyzerProjectDiscoveryPlugin = FlowrAnalyzerProjectDiscoveryPlugin;
+/**
+ * This is the default dummy implementation of the {@link FlowrAnalyzerProjectDiscoveryPlugin}.
+ * It simply collects all files in the given folder and returns them as either {@link RParseRequest} (for R and Rmd files) or {@link FlowrTextFile} (for all other files).
+ */
+class DefaultFlowrAnalyzerProjectDiscoveryPlugin extends FlowrAnalyzerProjectDiscoveryPlugin {
+    name = 'default-project-discovery-plugin';
+    description = 'This is the default project discovery plugin that does nothing.';
+    version = new semver_1.SemVer('0.0.0');
+    process(_context, args) {
+        const requests = [];
+        /* the dummy approach of collecting all files, group R and Rmd files, and be done with it */
+        for (const file of (0, files_1.getAllFilesSync)(args.content)) {
+            if (file.endsWith('.R') || file.endsWith('.r') || file.endsWith('.Rmd') || file.endsWith('.rmd')) {
+                requests.push({ content: file, request: 'file' });
+            }
+            else {
+                requests.push(new flowr_file_1.FlowrTextFile(file));
+            }
+        }
+        return requests;
+    }
+}
+//# sourceMappingURL=flowr-analyzer-project-discovery-plugin.js.map

package/queries/base-query-format.d.ts

@@ -1,7 +1,4 @@
-import type { NormalizedAst } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
-import type { DataflowInformation } from '../dataflow/info';
-import type { FlowrConfigOptions } from '../config';
-import type { SemVer } from 'semver';
+import type { FlowrAnalysisProvider } from '../project/flowr-analyzer';
 export interface BaseQueryFormat {
     /** used to select the query type :) */
     readonly type: string;
@@ -14,8 +11,5 @@ export interface BaseQueryResult {
     readonly '.meta': BaseQueryMeta;
 }
 export interface BasicQueryData {
-    readonly lib?: Record<string, SemVer>;
-    readonly ast: NormalizedAst;
-    readonly dataflow: DataflowInformation;
-    readonly config: FlowrConfigOptions;
+    readonly analyzer: FlowrAnalysisProvider;
 }

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

@@ -13,4 +13,4 @@ export type PromotedLinkTo = Omit<LinkTo, 'callName'> & {
  *    This happens during the main resolution!
  * 4. Attach `linkTo` calls to the respective calls.
  */
-export declare function executeCallContextQueries({ dataflow: { graph }, ast, config }: BasicQueryData, queries: readonly CallContextQuery[]): CallContextQueryResult;
+export declare function executeCallContextQueries({ analyzer }: BasicQueryData, queries: readonly CallContextQuery[]): Promise<CallContextQueryResult>;

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

@@ -5,17 +5,17 @@ exports.executeCallContextQueries = executeCallContextQueries;
 const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const vertex_1 = require("../../../dataflow/graph/vertex");
 const edge_1 = require("../../../dataflow/graph/edge");
-const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const two_layer_collector_1 = require("../../two-layer-collector");
 const objects_1 = require("../../../util/objects");
 const identify_link_to_last_call_relation_1 = require("./identify-link-to-last-call-relation");
+const cfg_kind_1 = require("../../../project/cfg-kind");
 /* if the node is effected by nse, we have an ingoing nse edge */
 function isQuoted(node, graph) {
     const vertex = graph.ingoingEdges(node);
     if (vertex === undefined) {
         return false;
     }
-    return [...vertex.values()].some(({ types }) => (0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.NonStandardEvaluation));
+    return vertex.values().some(({ types }) => (0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.NonStandardEvaluation));
 }
 function makeReport(collector) {
     const result = {};
@@ -109,9 +109,10 @@ function retrieveAllCallAliases(nodeId, graph) {
         }
         const [info, outgoing] = vertex;
         if (info.tag !== vertex_1.VertexType.FunctionCall) {
-            const x = [...outgoing]
+            const x = outgoing.entries()
                 .filter(([, { types }]) => (0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.Reads | edge_1.EdgeType.DefinedBy | edge_1.EdgeType.DefinedByOnCall))
-                .map(([t]) => [(0, node_id_1.recoverContent)(t, graph) ?? '', t]);
+                .map(([t]) => [(0, node_id_1.recoverContent)(t, graph) ?? '', t])
+                .toArray();
             /** only follow defined-by and reads */
             queue = queue.concat(x);
             continue;
@@ -120,7 +121,7 @@ function retrieveAllCallAliases(nodeId, graph) {
         if (id !== nodeId) {
             track |= edge_1.EdgeType.Returns;
         }
-        const out = [...outgoing]
+        const out = outgoing.entries()
             .filter(([, e]) => (0, edge_1.edgeIncludesType)(e.types, track) && (nodeId !== id || !(0, edge_1.edgeIncludesType)(e.types, edge_1.EdgeType.Argument)))
             .map(([t]) => t);
         for (const call of out) {
@@ -173,7 +174,9 @@ function isParameterDefaultValue(nodeId, ast) {
  *    This happens during the main resolution!
  * 4. Attach `linkTo` calls to the respective calls.
  */
-function executeCallContextQueries({ dataflow: { graph }, ast, config }, queries) {
+async function executeCallContextQueries({ analyzer }, queries) {
+    const dataflow = await analyzer.dataflow();
+    const ast = await analyzer.normalize();
     /* omit performance page load */
     const now = Date.now();
     /* the node id and call targets if present */
@@ -182,10 +185,10 @@ function executeCallContextQueries({ dataflow: { graph }, ast, config }, queries
     const { promotedQueries, requiresCfg } = promoteQueryCallNames(queries);
     let cfg = undefined;
     if (requiresCfg) {
-        cfg = (0, extract_cfg_1.extractCfg)(ast, config, graph, []);
+        cfg = await analyzer.controlflow([], cfg_kind_1.CfgKind.WithDataflow);
     }
     const queriesWhichWantAliases = promotedQueries.filter(q => q.includeAliases);
-    for (const [nodeId, info] of graph.vertices(true)) {
+    for (const [nodeId, info] of dataflow.graph.vertices(true)) {
         if (info.tag !== vertex_1.VertexType.FunctionCall) {
             continue;
         }
@@ -196,7 +199,7 @@ function executeCallContextQueries({ dataflow: { graph }, ast, config }, queries
              * by checking all of these queries would be satisfied otherwise,
              * in general, we first want a call to happen, i.e., trace the called targets of this!
              */
-            const targets = retrieveAllCallAliases(nodeId, graph);
+            const targets = retrieveAllCallAliases(nodeId, dataflow.graph);
             for (const [l, ids] of targets.entries()) {
                 for (const query of queriesWhichWantAliases) {
                     if (query.callName instanceof RegExp ? query.callName.test(l) : query.callName.has(l)) {
@@ -212,12 +215,12 @@ function executeCallContextQueries({ dataflow: { graph }, ast, config }, queries
             }
             let targets = undefined;
             if (query.callTargets) {
-                targets = (0, identify_link_to_last_call_relation_1.satisfiesCallTargets)(nodeId, graph, query.callTargets);
+                targets = (0, identify_link_to_last_call_relation_1.satisfiesCallTargets)(nodeId, dataflow.graph, query.callTargets);
                 if (targets === 'no') {
                     continue;
                 }
             }
-            if (isQuoted(nodeId, graph)) {
+            if (isQuoted(nodeId, dataflow.graph)) {
                 /* if the call is quoted, we do not want to link to it */
                 continue;
             }
@@ -229,7 +232,7 @@ function executeCallContextQueries({ dataflow: { graph }, ast, config }, queries
                 const linked = Array.isArray(query.linkTo) ? query.linkTo : [query.linkTo];
                 for (const link of linked) {
                     /* if we have a linkTo query, we have to find the last call */
-                    const lastCall = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(nodeId, cfg.graph, graph, link);
+                    const lastCall = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(nodeId, cfg.graph, dataflow.graph, link);
                     if (lastCall) {
                         linkedIds ??= new Set();
                         for (const l of lastCall) {
@@ -243,7 +246,12 @@ function executeCallContextQueries({ dataflow: { graph }, ast, config }, queries
                     }
                 }
             }
-            initialIdCollector.add(query.kind ?? '.', query.subkind ?? '.', (0, objects_1.compactRecord)({ id: nodeId, name: info.name, calls: targets, linkedIds: linkedIds ? [...linkedIds] : undefined }));
+            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

@@ -3,13 +3,12 @@ import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/nod
 import { executeCallContextQueries } from './call-context-query-executor';
 import type { OutputFormatter } from '../../../util/text/ansi';
 import Joi from 'joi';
-import type { PipelineOutput } from '../../../core/steps/pipeline/pipeline';
-import type { DEFAULT_DATAFLOW_PIPELINE } from '../../../core/steps/pipeline/default-pipelines';
 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';
+import type { FlowrAnalysisProvider } from '../../../project/flowr-analyzer';
 export interface FileFilter<FilterType> {
     /**
      * Regex that a node's file attribute must match to be considered
@@ -109,7 +108,7 @@ export interface CallContextQueryResult extends BaseQueryResult {
 export type CallContextQuery<CallName extends CallNameTypes = CallNameTypes, 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;
+    readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

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

@@ -19,10 +19,10 @@ const CallContextQueryLinkTo = joi_1.default.object({
 });
 exports.CallContextQueryDefinition = {
     executor: call_context_query_executor_1.executeCallContextQueries,
-    asciiSummarizer: (formatter, processed, queryResults, result) => {
+    asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('call-context', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
-        result.push((0, query_print_1.asciiCallContext)(formatter, out, processed));
+        result.push((0, query_print_1.asciiCallContext)(formatter, out, (await analyzer.normalize()).idMap));
         return true;
     },
     schema: joi_1.default.object({

package/queries/catalog/cluster-query/cluster-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { DataflowClusterQuery, DataflowClusterQueryResult } from './cluster-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeDataflowClusterQuery({ dataflow: { graph } }: BasicQueryData, queries: readonly DataflowClusterQuery[]): DataflowClusterQueryResult;
+export declare function executeDataflowClusterQuery({ analyzer }: BasicQueryData, queries: readonly DataflowClusterQuery[]): Promise<DataflowClusterQueryResult>;

package/queries/catalog/cluster-query/cluster-query-executor.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDataflowClusterQuery = executeDataflowClusterQuery;
 const log_1 = require("../../../util/log");
 const cluster_1 = require("../../../dataflow/cluster");
-function executeDataflowClusterQuery({ dataflow: { graph } }, queries) {
+async function executeDataflowClusterQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('The dataflow cluster query expects only up to one query, but got', queries.length);
     }
     const start = Date.now();
-    const clusters = (0, cluster_1.findAllClusters)(graph);
+    const clusters = (0, cluster_1.findAllClusters)((await analyzer.dataflow()).graph);
     return {
         '.meta': {
             timing: Date.now() - start

package/queries/catalog/cluster-query/cluster-query-format.d.ts

@@ -15,60 +15,7 @@ export interface DataflowClusterQueryResult extends BaseQueryResult {
 }
 export declare const ClusterQueryDefinition: {
     readonly executor: typeof executeDataflowClusterQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/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>;
-        }, config: import("../../../config").FlowrConfigOptions) => 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 asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

package/queries/catalog/cluster-query/cluster-query-format.js

@@ -11,7 +11,7 @@ const dfg_1 = require("../../../util/mermaid/dfg");
 const query_print_1 = require("../../query-print");
 exports.ClusterQueryDefinition = {
     executor: cluster_query_executor_1.executeDataflowClusterQuery,
-    asciiSummarizer: (formatter, processed, queryResults, result) => {
+    asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dataflow-cluster', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         result.push(`   ╰ Found ${out.clusters.length} cluster${out.clusters.length === 1 ? '' : 's'}`);
@@ -19,7 +19,7 @@ exports.ClusterQueryDefinition = {
             const unknownSideEffects = cluster.hasUnknownSideEffects ? '(has unknown side effect)' : '';
             let suffix = '';
             if (formatter === ansi_1.markdownFormatter) {
-                suffix = `([marked](${(0, dfg_1.graphToMermaidUrl)(processed.dataflow.graph, false, new Set(cluster.members))}))`;
+                suffix = `([marked](${(0, dfg_1.graphToMermaidUrl)((await analyzer.dataflow()).graph, false, new Set(cluster.members))}))`;
             }
             result.push(`      ╰ ${unknownSideEffects} {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, cluster.members)}} ${suffix}`);
         }

package/queries/catalog/config-query/config-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { ConfigQuery, ConfigQueryResult } from './config-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeConfigQuery({ config }: BasicQueryData, queries: readonly ConfigQuery[]): ConfigQueryResult;
+export declare function executeConfigQuery({ analyzer }: BasicQueryData, queries: readonly ConfigQuery[]): Promise<ConfigQueryResult>;

package/queries/catalog/config-query/config-query-executor.js

@@ -4,20 +4,20 @@ exports.executeConfigQuery = executeConfigQuery;
 const log_1 = require("../../../util/log");
 const assert_1 = require("../../../util/assert");
 const objects_1 = require("../../../util/objects");
-function executeConfigQuery({ config }, queries) {
+function executeConfigQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Config query usually expects only up to one query, but got', queries.length);
     }
     const updates = queries.map(q => q.update).filter(assert_1.isNotUndefined);
     for (const update of updates) {
-        (0, objects_1.deepMergeObjectInPlace)(config, update);
+        (0, objects_1.deepMergeObjectInPlace)(analyzer.flowrConfig, update);
     }
-    return {
+    return Promise.resolve({
         '.meta': {
             /* there is no sense in measuring a get */
             timing: 0
         },
-        config: config
-    };
+        config: analyzer.flowrConfig
+    });
 }
 //# sourceMappingURL=config-query-executor.js.map

package/queries/catalog/config-query/config-query-format.d.ts

@@ -15,7 +15,7 @@ declare function configReplCompleter(partialLine: readonly string[], config: Flo
 declare function configQueryLineParser(line: readonly string[], _config: FlowrConfigOptions): [ConfigQuery];
 export declare const ConfigQueryDefinition: {
     readonly executor: typeof executeConfigQuery;
-    readonly asciiSummarizer: (formatter: OutputFormatter, _processed: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
+    readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => true;
     readonly completer: typeof configReplCompleter;
     readonly fromLine: typeof configQueryLineParser;
     readonly schema: Joi.ObjectSchema<any>;

package/queries/catalog/config-query/config-query-format.js

@@ -79,7 +79,7 @@ function configQueryLineParser(line, _config) {
 }
 exports.ConfigQueryDefinition = {
     executor: config_query_executor_1.executeConfigQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('config', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(`   ╰ Config:\n${JSON.stringify(out.config, json_1.jsonReplacer, 4)}`);

package/queries/catalog/control-flow-query/control-flow-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { ControlFlowQuery, ControlFlowQueryResult } from './control-flow-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeControlFlowQuery({ dataflow: { graph }, ast, config }: BasicQueryData, queries: readonly ControlFlowQuery[]): ControlFlowQueryResult;
+export declare function executeControlFlowQuery({ analyzer }: BasicQueryData, queries: readonly ControlFlowQuery[]): Promise<ControlFlowQueryResult>;

package/queries/catalog/control-flow-query/control-flow-query-executor.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeControlFlowQuery = executeControlFlowQuery;
 const log_1 = require("../../../util/log");
-const extract_cfg_1 = require("../../../control-flow/extract-cfg");
-function executeControlFlowQuery({ dataflow: { graph }, ast, config }, queries) {
+const cfg_kind_1 = require("../../../project/cfg-kind");
+async function executeControlFlowQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('The control flow query expects only up to one query, but got', queries.length);
     }
     const query = queries[0];
     const start = Date.now();
-    const controlFlow = (0, extract_cfg_1.extractCfg)(ast, config, graph, query.config?.simplificationPasses);
+    const controlFlow = await analyzer.controlflow(query.config?.simplificationPasses, cfg_kind_1.CfgKind.WithDataflow);
     return {
         '.meta': {
             timing: Date.now() - start

package/queries/catalog/control-flow-query/control-flow-query-format.d.ts

@@ -22,60 +22,7 @@ export interface ControlFlowQueryResult extends BaseQueryResult {
 }
 export declare const ControlFlowQueryDefinition: {
     readonly executor: typeof executeControlFlowQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/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>;
-        }, config: import("../../../config").FlowrConfigOptions) => 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 asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

package/queries/catalog/control-flow-query/control-flow-query-format.js

@@ -12,10 +12,10 @@ const cfg_1 = require("../../../util/mermaid/cfg");
 const cfg_simplification_1 = require("../../../control-flow/cfg-simplification");
 exports.ControlFlowQueryDefinition = {
     executor: control_flow_query_executor_1.executeControlFlowQuery,
-    asciiSummarizer: (formatter, processed, queryResults, result) => {
+    asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('control-flow', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
-        result.push(`   ╰ CFG: ${(0, cfg_1.cfgToMermaidUrl)(out.controlFlow, processed.normalize)}`);
+        result.push(`   ╰ CFG: ${(0, cfg_1.cfgToMermaidUrl)(out.controlFlow, await analyzer.normalize())}`);
         return true;
     },
     schema: joi_1.default.object({

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

@@ -1,3 +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;
+export declare function executeDataflowLensQuery({ analyzer }: BasicQueryData, queries: readonly DataflowLensQuery[]): Promise<DataflowLensQueryResult>;

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

@@ -4,12 +4,12 @@ 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) {
+async function executeDataflowLensQuery({ analyzer }, 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, {
+    const simplifiedGraph = (0, dfg_view_1.reduceDfg)((await analyzer.dataflow()).graph, {
         vertices: {
             keepEnv: false,
             keepCd: true,