@eagleoutice/flowr 2.6.2 → 2.6.3

package/control-flow/useless-loop.js

@@ -17,10 +17,10 @@ exports.loopyFunctions = new Set(['builtin:for-loop', 'builtin:while-loop', 'bui
  * @param dataflow    - dataflow graph
  * @param controlflow - control flow graph
  * @param ast         - normalized ast
- * @param config      - current flowr config
+ * @param ctx      - current flowr analyzer context
  * @returns true if the given loop only iterates once
  */
-function onlyLoopsOnce(loop, dataflow, controlflow, ast, config) {
+function onlyLoopsOnce(loop, dataflow, controlflow, ast, ctx) {
     const vertex = dataflow.getVertex(loop);
     if (!vertex) {
         return undefined;
@@ -36,7 +36,11 @@ function onlyLoopsOnce(loop, dataflow, controlflow, ast, config) {
         if (vectorOfLoop === r_function_call_1.EmptyArgument) {
             return undefined;
         }
-        const values = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(vectorOfLoop.nodeId, { graph: dataflow, idMap: dataflow.idMap, resolve: config.solver.variables }));
+        const values = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(vectorOfLoop.nodeId, {
+            graph: dataflow,
+            idMap: dataflow.idMap,
+            resolve: ctx.config.solver.variables
+        }));
         if (values === undefined || values.elements.length !== 1 || values.elements[0].type !== 'vector' || !(0, r_value_1.isValue)(values.elements[0].elements)) {
             return undefined;
         }
@@ -49,7 +53,7 @@ function onlyLoopsOnce(loop, dataflow, controlflow, ast, config) {
         controlFlow: controlflow,
         normalizedAst: ast,
         dfg: dataflow,
-        flowrConfig: config,
+        ctx: ctx,
         defaultVisitingOrder: 'forward'
     });
     return visitor.loopsOnlyOnce();
@@ -67,7 +71,12 @@ class CfgSingleIterationLoopDetector extends semantic_cfg_guided_visitor_1.Seman
         if (data.call.args.length !== 1 || data.call.args[0] === r_function_call_1.EmptyArgument) {
             return undefined;
         }
-        const values = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(data.call.args[0].nodeId, { graph: this.config.dfg, full: true, idMap: this.config.normalizedAst.idMap, resolve: this.config.flowrConfig.solver.variables }));
+        const values = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(data.call.args[0].nodeId, {
+            graph: this.config.dfg,
+            full: true,
+            idMap: this.config.normalizedAst.idMap,
+            resolve: this.config.ctx.config.solver.variables
+        }));
         if (values === undefined || values.elements.length !== 1 || values.elements[0].type != 'logical' || !(0, r_value_1.isValue)(values.elements[0].value)) {
             return undefined;
         }

package/core/pipeline-executor.d.ts

@@ -1,6 +1,5 @@
 import { type PipelineStepName, 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}
@@ -93,18 +92,16 @@ export declare class PipelineExecutor<P extends Pipeline> {
     private output;
     private currentExecutionStage;
     private stepCounter;
-    private readonly flowrConfig;
     /**
      * Construct a new pipeline executor.
      * 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.
-     * @param flowrConfig   - The flowr config containing the built-in definitions
+     * @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.
      */
-    constructor(pipeline: P, input: PipelineInput<P>, flowrConfig: FlowrConfigOptions);
+    constructor(pipeline: P, input: PipelineInput<P>);
     /**
      * Retrieve the {@link Pipeline|pipeline} that is currently being.
      */

package/core/pipeline-executor.js

@@ -94,22 +94,19 @@ class PipelineExecutor {
     output = {};
     currentExecutionStage = 0 /* PipelineStepStage.OncePerFile */;
     stepCounter = 0;
-    flowrConfig;
     /**
      * Construct a new pipeline executor.
      * 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.
-     * @param flowrConfig   - The flowr config containing the built-in definitions
+     * @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.
      */
-    constructor(pipeline, input, flowrConfig) {
+    constructor(pipeline, input) {
         this.pipeline = pipeline;
         this.length = pipeline.order.length;
         this.input = input;
-        this.flowrConfig = flowrConfig;
     }
     /**
      * Retrieve the {@link Pipeline|pipeline} that is currently being.
@@ -181,7 +178,7 @@ class PipelineExecutor {
         if (expectedStepName !== undefined) {
             (0, assert_1.guard)(step.name === expectedStepName, () => `Cannot execute next step, expected step ${JSON.stringify(expectedStepName)} but got ${step.name}.`);
         }
-        return [step.name, step.processor(this.output, this.input, this.flowrConfig)];
+        return [step.name, step.processor(this.output, this.input)];
     }
     /**
      * This only makes sense if you have already run a request and want to re-use the per-file results for a new one.

package/core/print/normalize-printer.d.ts

@@ -3,7 +3,7 @@ import type { NormalizedAst } from '../../r-bridge/lang-4.x/ast/model/processing
 /** Should work with larger things as well */
 export declare function normalizedAstToJson(ast: NormalizedAst): string;
 /**
- * Normalized AST to quads serialization
+ * Normalized AST to quads serialization this does not have multi-file support
  * @see {@link serialize2quads}
  * @see {@link QuadSerializationConfiguration}
  * @see {@link normalizedAstToMermaid}

package/core/print/normalize-printer.js

@@ -18,7 +18,7 @@ function normalizedAstToJson(ast) {
     });
 }
 /**
- * Normalized AST to quads serialization
+ * Normalized AST to quads serialization this does not have multi-file support
  * @see {@link serialize2quads}
  * @see {@link QuadSerializationConfiguration}
  * @see {@link normalizedAstToMermaid}
@@ -26,7 +26,7 @@ function normalizedAstToJson(ast) {
  * @see {@link printNormalizedAstToMermaidUrl}
  */
 function normalizedAstToQuads(ast, config) {
-    return (0, quads_1.serialize2quads)(ast.ast, config);
+    return (0, quads_1.serialize2quads)(ast.ast.files[0].root, config);
 }
 /**
  * Serialize the normalized AST to mermaid format

package/core/steps/all/core/00-parse.d.ts

@@ -14,7 +14,7 @@ export declare const PARSE_WITH_R_SHELL_STEP: {
             (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: QuadSerializationConfiguration) => string;
+        readonly 5: (p: import("../../../../r-bridge/parser").ParseStepOutput<string>, config: QuadSerializationConfiguration) => string;
     };
     readonly dependencies: readonly [];
     readonly requiredInput: ParseRequiredInput<string>;

package/core/steps/all/core/00-parse.js

@@ -13,7 +13,7 @@ exports.PARSE_WITH_R_SHELL_STEP = {
     printer: {
         [0 /* StepOutputFormat.Internal */]: print_1.internalPrinter,
         [2 /* StepOutputFormat.Json */]: JSON.stringify,
-        [5 /* StepOutputFormat.RdfQuads */]: ({ parsed }, config) => (0, parse_printer_1.parseToQuads)(parsed, config)
+        [5 /* StepOutputFormat.RdfQuads */]: (p, config) => (0, parse_printer_1.parseToQuads)(p.files[0].parsed, config)
     },
     dependencies: [],
     requiredInput: undefined

package/core/steps/all/core/10-normalize.d.ts

@@ -3,22 +3,16 @@ import { normalizedAstToJson, normalizedAstToQuads, printNormalizedAstToMermaid,
 import { PipelineStepStage } from '../../pipeline-step';
 import type { IdGenerator } from '../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { NoInfo } from '../../../../r-bridge/lang-4.x/ast/model/model';
-import type { RParseRequests } from '../../../../r-bridge/retriever';
 import type { ParseStepOutput } from '../../../../r-bridge/parser';
+import type { FlowrAnalyzerContext } from '../../../../project/context/flowr-analyzer-context';
 export interface NormalizeRequiredInput {
     /** This id generator is only necessary if you want to retrieve a dataflow from the parsed R AST, it determines the id generator to use and by default uses the {@link deterministicCountingIdGenerator}*/
     readonly getId?: IdGenerator<NoInfo>;
-    readonly request: RParseRequests;
-    /** assume the input stems from a file and use the given path as the file path for the AST */
-    readonly overwriteFilePath?: string;
+    readonly context: FlowrAnalyzerContext;
 }
-/**
- * Get the file attached to the current request, if any
- */
-export declare function getCurrentRequestFile(request: RParseRequests | undefined): string | undefined;
 declare function processor(results: {
     parse?: ParseStepOutput<string>;
-}, input: Partial<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>>;
+}, input: Partial<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/nodes/r-project").RProject<import("../../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
 export declare const NORMALIZE: {
     readonly name: "normalize";
     readonly humanReadableName: "normalize";

package/core/steps/all/core/10-normalize.js

@@ -1,26 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NORMALIZE = void 0;
-exports.getCurrentRequestFile = getCurrentRequestFile;
 const print_1 = require("../../../print/print");
 const normalize_printer_1 = require("../../../print/normalize-printer");
 const parser_1 = require("../../../../r-bridge/lang-4.x/ast/parser/json/parser");
-/**
- * Get the file attached to the current request, if any
- */
-function getCurrentRequestFile(request) {
-    if (request === undefined) {
-        return undefined;
-    }
-    else if (Array.isArray(request)) {
-        return request[0].request === 'file' ? request[0].content : undefined;
-    }
-    else {
-        return request.request === 'file' ? request.content : undefined;
-    }
-}
 function processor(results, input) {
-    return (0, parser_1.normalize)(results.parse, input.getId, input.overwriteFilePath ?? getCurrentRequestFile(input.request));
+    return (0, parser_1.normalize)(results.parse, input.getId);
 }
 exports.NORMALIZE = {
     name: 'normalize',

package/core/steps/all/core/11-normalize-tree-sitter.d.ts

@@ -2,12 +2,11 @@ import { internalPrinter } from '../../../print/print';
 import { normalizedAstToJson, normalizedAstToQuads, printNormalizedAstToMermaid, printNormalizedAstToMermaidUrl } from '../../../print/normalize-printer';
 import { PipelineStepStage } from '../../pipeline-step';
 import { type NormalizeRequiredInput } from './10-normalize';
-import type { FlowrConfigOptions } from '../../../../config';
 import type { ParseStepOutput } from '../../../../r-bridge/parser';
 import type { Tree } from 'web-tree-sitter';
 declare function processor(results: {
-    'parse'?: ParseStepOutput<Tree>;
-}, input: Partial<NormalizeRequiredInput>, config: FlowrConfigOptions): 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>>;
+    parse?: ParseStepOutput<Tree>;
+}, input: Partial<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/nodes/r-project").RProject<import("../../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
 export declare const NORMALIZE_TREE_SITTER: {
     readonly name: "normalize";
     readonly humanReadableName: "normalize tree-sitter tree";

package/core/steps/all/core/11-normalize-tree-sitter.js

@@ -4,9 +4,8 @@ exports.NORMALIZE_TREE_SITTER = void 0;
 const print_1 = require("../../../print/print");
 const normalize_printer_1 = require("../../../print/normalize-printer");
 const parser_1 = require("../../../../r-bridge/lang-4.x/ast/parser/json/parser");
-const _10_normalize_1 = require("./10-normalize");
-function processor(results, input, config) {
-    return (0, parser_1.normalizeTreeSitter)(results['parse'], input.getId, config, input.overwriteFilePath ?? (0, _10_normalize_1.getCurrentRequestFile)(input.request));
+function processor(results, input) {
+    return (0, parser_1.normalizeTreeSitter)(results.parse, input.getId, input.context.config);
 }
 exports.NORMALIZE_TREE_SITTER = {
     name: 'normalize',

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

@@ -2,15 +2,14 @@ import { internalPrinter } from '../../../print/print';
 import { PipelineStepStage } from '../../pipeline-step';
 import { dataflowGraphToJson, dataflowGraphToMermaid, dataflowGraphToMermaidUrl, dataflowGraphToQuads } from '../../../print/dataflow-printer';
 import type { NormalizedAst } 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 { FlowrConfigOptions } from '../../../../config';
+import type { FlowrAnalyzerContext } from '../../../../project/context/flowr-analyzer-context';
 declare function processor(results: {
     normalize?: NormalizedAst;
 }, input: {
-    request?: RParseRequests;
     parser?: Parser<KnownParserType>;
-}, config: FlowrConfigOptions): import("../../../../dataflow/info").DataflowInformation & {
+    context?: FlowrAnalyzerContext;
+}): import("../../../../dataflow/info").DataflowInformation & {
     cfgQuick: import("../../../../control-flow/control-flow-graph").ControlFlowInformation | undefined;
 };
 export declare const STATIC_DATAFLOW: {

package/core/steps/all/core/20-dataflow.js

@@ -17,8 +17,8 @@ const staticDataflowCommon = {
     },
     dependencies: ['normalize'],
 };
-function processor(results, input, config) {
-    return (0, extractor_1.produceDataFlowGraph)(input.parser, input.request, results.normalize, config);
+function processor(results, input) {
+    return (0, extractor_1.produceDataFlowGraph)(input.parser, results.normalize, input.context);
 }
 exports.STATIC_DATAFLOW = {
     ...staticDataflowCommon,

package/core/steps/all/static-slicing/00-slice.d.ts

@@ -3,7 +3,6 @@ import { PipelineStepStage } from '../../pipeline-step';
 import type { DataflowInformation } from '../../../../dataflow/info';
 import type { SlicingCriteria } from '../../../../slicing/criterion/parse';
 import type { NormalizedAst } from '../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
-import type { FlowrConfigOptions } from '../../../../config';
 export interface SliceRequiredInput {
     /** The slicing criterion is only of interest if you actually want to slice the R code */
     readonly criterion: SlicingCriteria;
@@ -19,7 +18,7 @@ export declare enum SliceDirection {
 declare function processor(results: {
     dataflow?: DataflowInformation;
     normalize?: NormalizedAst;
-}, input: Partial<SliceRequiredInput>, _config: FlowrConfigOptions): Readonly<import("../../../../slicing/static/slicer-types").SliceResult>;
+}, input: Partial<SliceRequiredInput>): Readonly<import("../../../../slicing/static/slicer-types").SliceResult>;
 export declare const STATIC_SLICE: {
     readonly name: "slice";
     readonly humanReadableName: "static slice";

package/core/steps/all/static-slicing/00-slice.js

@@ -8,7 +8,7 @@ var SliceDirection;
     SliceDirection["Backward"] = "backward";
     SliceDirection["Forward"] = "forward";
 })(SliceDirection || (exports.SliceDirection = SliceDirection = {}));
-function processor(results, input, _config) {
+function processor(results, input) {
     const direction = input.direction ?? SliceDirection.Backward;
     return (0, static_slicer_1.staticSlice)(results.dataflow, results.normalize, input.criterion, direction, input.threshold);
 }

package/core/steps/all/static-slicing/10-reconstruct.d.ts

@@ -5,6 +5,14 @@ import type { NormalizedAst } from '../../../../r-bridge/lang-4.x/ast/model/proc
 import type { AutoSelectPredicate } from '../../../../reconstruct/auto-select/auto-select-defaults';
 export interface ReconstructRequiredInput {
     autoSelectIf?: AutoSelectPredicate;
+    /**
+     * When confronted with a project of multiple files the question for reconstruct arises wrt. which files to rebuild.
+     * This option can be used to either reconstruct all files or only specific files by their index in the project.
+     * By default, (for legacy) this will reconstruct the *first* file (index 0).
+     *
+     * Either you can set this to `'all'` to reconstruct all files or provide an array of file indices in the files context to reconstruct only those files.
+     */
+    reconstructFiles?: 'all' | number[];
 }
 declare function processor(results: {
     normalize?: NormalizedAst;

package/core/steps/all/static-slicing/10-reconstruct.js

@@ -4,7 +4,10 @@ exports.NAIVE_RECONSTRUCT = void 0;
 const print_1 = require("../../../print/print");
 const reconstruct_1 = require("../../../../reconstruct/reconstruct");
 function processor(results, input) {
-    return (0, reconstruct_1.reconstructToCode)(results.normalize, results.slice.result, input.autoSelectIf);
+    return (0, reconstruct_1.reconstructToCode)(results.normalize, {
+        nodes: results.slice.result,
+        reconstructFiles: input.reconstructFiles
+    }, input.autoSelectIf);
 }
 exports.NAIVE_RECONSTRUCT = {
     name: 'reconstruct',