@eagleoutice/flowr 2.4.8 → 2.6.0

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 => {
@@ -301,7 +298,7 @@ class FlowRServerConnection {
             });
         });
     }
-    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 +316,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 +342,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 +360,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-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/slicer-app.js

@@ -15,6 +15,7 @@ const print_1 = require("../benchmark/stats/print");
 const magic_comments_1 = require("../reconstruct/auto-select/magic-comments");
 const auto_select_defaults_1 = require("../reconstruct/auto-select/auto-select-defaults");
 const config_1 = require("../config");
+const adapter_1 = require("../util/formats/adapter");
 const options = (0, script_1.processCommandLineArgs)('slicer', ['input', 'criterion'], {
     subtitle: 'Slice R code based on a given slicing criterion',
     examples: [
@@ -31,8 +32,8 @@ 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') }
-        : { request: 'file', content: options.input }, config, options['no-magic-comments'] ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
+        ? (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;
     const doSlicing = options.criterion.trim() !== '';
@@ -74,7 +75,11 @@ async function getSlice() {
     }
     else {
         if (doSlicing && options.diff) {
-            const originalCode = options['input-is-text'] ? options.input : fs_1.default.readFileSync(options.input).toString();
+            let originalCode = options.input;
+            if (!options['input-is-text']) {
+                const request = (0, adapter_1.requestFromFile)(options.input);
+                originalCode = request.request === 'text' ? request.content : fs_1.default.readFileSync(request.content).toString();
+            }
             console.log((0, slice_diff_ansi_1.sliceDiffAnsi)(slice.result, normalize, new Set(mappedSlices.map(({ id }) => id)), originalCode));
         }
         if (options.stats) {

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/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

@@ -8,20 +8,6 @@ import type { RShell } from '../../../r-bridge/shell';
 import type { TreeSitterExecutor } from '../../../r-bridge/lang-4.x/tree-sitter/tree-sitter-executor';
 import type { FlowrConfigOptions } from '../../../config';
 export declare const DEFAULT_SLICING_PIPELINE: import("./pipeline").Pipeline<{
-    readonly name: "slice";
-    readonly humanReadableName: "static slice";
-    readonly description: "Calculate the actual static slice from the dataflow graph and the given slicing criteria";
-    readonly processor: (results: {
-        dataflow?: import("../../../dataflow/info").DataflowInformation;
-        normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
-    }, input: Partial<import("../all/static-slicing/00-slice").SliceRequiredInput>, _config: FlowrConfigOptions) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
-    readonly executed: import("../pipeline-step").PipelineStepStage.OncePerRequest;
-    readonly printer: {
-        readonly 0: typeof import("../../print/print").internalPrinter;
-    };
-    readonly dependencies: readonly ["dataflow"];
-    readonly requiredInput: import("../all/static-slicing/00-slice").SliceRequiredInput;
-} | {
     readonly name: "parse";
     readonly humanReadableName: "parse with R shell";
     readonly description: "Parse the given R code into an AST";
@@ -54,6 +40,20 @@ export declare const DEFAULT_SLICING_PIPELINE: import("./pipeline").Pipeline<{
     };
     readonly dependencies: readonly ["parse"];
     readonly requiredInput: import("../all/core/10-normalize").NormalizeRequiredInput;
+} | {
+    readonly name: "slice";
+    readonly humanReadableName: "static slice";
+    readonly description: "Calculate the actual static slice from the dataflow graph and the given slicing criteria";
+    readonly processor: (results: {
+        dataflow?: import("../../../dataflow/info").DataflowInformation;
+        normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+    }, input: Partial<import("../all/static-slicing/00-slice").SliceRequiredInput>, _config: FlowrConfigOptions) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    readonly executed: import("../pipeline-step").PipelineStepStage.OncePerRequest;
+    readonly printer: {
+        readonly 0: typeof import("../../print/print").internalPrinter;
+    };
+    readonly dependencies: readonly ["dataflow"];
+    readonly requiredInput: import("../all/static-slicing/00-slice").SliceRequiredInput;
 } | {
     readonly humanReadableName: "dataflow";
     readonly processor: (results: {
@@ -90,20 +90,6 @@ export declare const DEFAULT_SLICING_PIPELINE: import("./pipeline").Pipeline<{
     readonly requiredInput: import("../all/static-slicing/10-reconstruct").ReconstructRequiredInput;
 }>;
 export declare const DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipeline").Pipeline<{
-    readonly name: "slice";
-    readonly humanReadableName: "static slice";
-    readonly description: "Calculate the actual static slice from the dataflow graph and the given slicing criteria";
-    readonly processor: (results: {
-        dataflow?: import("../../../dataflow/info").DataflowInformation;
-        normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
-    }, input: Partial<import("../all/static-slicing/00-slice").SliceRequiredInput>, _config: FlowrConfigOptions) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
-    readonly executed: import("../pipeline-step").PipelineStepStage.OncePerRequest;
-    readonly printer: {
-        readonly 0: typeof import("../../print/print").internalPrinter;
-    };
-    readonly dependencies: readonly ["dataflow"];
-    readonly requiredInput: import("../all/static-slicing/00-slice").SliceRequiredInput;
-} | {
     readonly name: "parse";
     readonly humanReadableName: "parse with R shell";
     readonly description: "Parse the given R code into an AST";
@@ -136,6 +122,20 @@ export declare const DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipeline"
     };
     readonly dependencies: readonly ["parse"];
     readonly requiredInput: import("../all/core/10-normalize").NormalizeRequiredInput;
+} | {
+    readonly name: "slice";
+    readonly humanReadableName: "static slice";
+    readonly description: "Calculate the actual static slice from the dataflow graph and the given slicing criteria";
+    readonly processor: (results: {
+        dataflow?: import("../../../dataflow/info").DataflowInformation;
+        normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+    }, input: Partial<import("../all/static-slicing/00-slice").SliceRequiredInput>, _config: FlowrConfigOptions) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    readonly executed: import("../pipeline-step").PipelineStepStage.OncePerRequest;
+    readonly printer: {
+        readonly 0: typeof import("../../print/print").internalPrinter;
+    };
+    readonly dependencies: readonly ["dataflow"];
+    readonly requiredInput: import("../all/static-slicing/00-slice").SliceRequiredInput;
 } | {
     readonly humanReadableName: "dataflow";
     readonly processor: (results: {
@@ -172,20 +172,6 @@ export declare const DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipeline"
     readonly requiredInput: import("../all/static-slicing/10-reconstruct").ReconstructRequiredInput;
 }>;
 export declare const DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./pipeline").Pipeline<{
-    readonly name: "slice";
-    readonly humanReadableName: "static slice";
-    readonly description: "Calculate the actual static slice from the dataflow graph and the given slicing criteria";
-    readonly processor: (results: {
-        dataflow?: import("../../../dataflow/info").DataflowInformation;
-        normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
-    }, input: Partial<import("../all/static-slicing/00-slice").SliceRequiredInput>, _config: FlowrConfigOptions) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
-    readonly executed: import("../pipeline-step").PipelineStepStage.OncePerRequest;
-    readonly printer: {
-        readonly 0: typeof import("../../print/print").internalPrinter;
-    };
-    readonly dependencies: readonly ["dataflow"];
-    readonly requiredInput: import("../all/static-slicing/00-slice").SliceRequiredInput;
-} | {
     readonly name: "parse";
     readonly humanReadableName: "parse with R shell";
     readonly description: "Parse the given R code into an AST";
@@ -218,6 +204,20 @@ export declare const DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./pipel
     };
     readonly dependencies: readonly ["parse"];
     readonly requiredInput: import("../all/core/10-normalize").NormalizeRequiredInput;
+} | {
+    readonly name: "slice";
+    readonly humanReadableName: "static slice";
+    readonly description: "Calculate the actual static slice from the dataflow graph and the given slicing criteria";
+    readonly processor: (results: {
+        dataflow?: import("../../../dataflow/info").DataflowInformation;
+        normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+    }, input: Partial<import("../all/static-slicing/00-slice").SliceRequiredInput>, _config: FlowrConfigOptions) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    readonly executed: import("../pipeline-step").PipelineStepStage.OncePerRequest;
+    readonly printer: {
+        readonly 0: typeof import("../../print/print").internalPrinter;
+    };
+    readonly dependencies: readonly ["dataflow"];
+    readonly requiredInput: import("../all/static-slicing/00-slice").SliceRequiredInput;
 } | {
     readonly humanReadableName: "dataflow";
     readonly processor: (results: {

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/graph/dataflowgraph-builder.d.ts

@@ -7,8 +7,7 @@ import type { DataflowGraphVertexAstLink, DataflowGraphVertexUse, FunctionOrigin
 import type { ControlDependency } from '../info';
 import type { LinkTo } from '../../queries/catalog/call-context-query/call-context-query-format';
 import type { FlowrSearchLike } from '../../search/flowr-search-builder';
-import type { Pipeline } from '../../core/steps/pipeline/pipeline';
-import type { FlowrSearchInput } from '../../search/flowr-search';
+import type { FlowrAnalysisProvider } from '../../project/flowr-analyzer';
 export declare function emptyGraph(idMap?: AstIdMap): DataflowGraphBuilder;
 export type DataflowGraphEdgeTarget = NodeId | (readonly NodeId[]);
 /**
@@ -103,9 +102,9 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @param from - Either a node id or a query to find the node id.
      * @param to - Either a node id or a query to find the node id.
-     * @param data - The data to search in i.e. the dataflow graph.
+     * @param input - The input to search in i.e. the dataflow graph.
      */
-    readsQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    readsQuery(from: FromQueryParam, to: ToQueryParam, input: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **defined-by edge** with from as defined variable, and to
      * as a variable/function contributing to its definition.
@@ -118,7 +117,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    definedByQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    definedByQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **call edge** with from as caller, and to as callee.
      *
@@ -130,7 +129,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    callsQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    callsQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **return edge** with from as function, and to as exit point.
      *
@@ -142,7 +141,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    returnsQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    returnsQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **defines-on-call edge** with from as variable, and to as its definition
      *
@@ -154,7 +153,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    definesOnCallQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    definesOnCallQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **defined-by-on-call edge** with from as definition, and to as variable.
      *
@@ -166,7 +165,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    definedByOnCallQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    definedByOnCallQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds an **argument edge** with from as function call, and to as argument.
      *
@@ -178,7 +177,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    argumentQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    argumentQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **non-standard evaluation edge** with from as vertex, and to as vertex.
      *
@@ -190,7 +189,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    nseQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    nseQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * Adds a **side-effect-on-call edge** with from as vertex, and to as vertex.
      *
@@ -202,7 +201,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      *
      * @see {@link DataflowGraphBuilder#readsQuery|readsQuery} for parameters.
      */
-    sideEffectOnCallQuery<P extends Pipeline>(from: FromQueryParam, to: ToQueryParam, data: FlowrSearchInput<P>): this;
+    sideEffectOnCallQuery(from: FromQueryParam, to: ToQueryParam, data: FlowrAnalysisProvider): Promise<this>;
     /**
      * explicitly overwrite the root ids of the graph,
      * this is just an easier variant in case you working with a lot of functions this saves you a lot of `false` flags.

package/dataflow/graph/dataflowgraph-builder.js

@@ -174,13 +174,13 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
         }
         return this.addEdge((0, node_id_1.normalizeIdToNumberIfPossible)(from), (0, node_id_1.normalizeIdToNumberIfPossible)(to), type);
     }
-    queryHelper(from, to, data, type) {
+    async queryHelper(from, to, data, type) {
         let fromId;
         if ('nodeId' in from) {
             fromId = from.nodeId;
         }
         else {
-            const result = (0, flowr_search_executor_1.runSearch)(from.query, data).getElements();
+            const result = (await (0, flowr_search_executor_1.runSearch)(from.query, data)).getElements();
             (0, assert_1.guard)(result.length === 1, `from query result should yield exactly one node, but yielded ${result.length}`);
             fromId = result[0].node.info.id;
         }
@@ -189,7 +189,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
             toIds = to.target;
         }
         else {
-            const result = (0, flowr_search_executor_1.runSearch)(to.query, data).getElements();
+            const result = (await (0, flowr_search_executor_1.runSearch)(to.query, data)).getElements();
             toIds = result.map(r => r.node.info.id);
         }
         return this.edgeHelper(fromId, toIds, type);
@@ -209,10 +209,10 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
      *
      * @param from - Either a node id or a query to find the node id.
      * @param to - Either a node id or a query to find the node id.
-     * @param data - The data to search in i.e. the dataflow graph.
+     * @param input - The input to search in i.e. the dataflow graph.
      */
-    readsQuery(from, to, data) {
-        return this.queryHelper(from, to, data, edge_1.EdgeType.Reads);
+    readsQuery(from, to, input) {
+        return this.queryHelper(from, to, input, edge_1.EdgeType.Reads);
     }
     /**
      * Adds a **defined-by edge** with from as defined variable, and to