@eagleoutice/flowr 2.6.2 → 2.7.0

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,7 @@ 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';
+import type { ReadOnlyFlowrAnalyzerContext } from '../../../../project/context/flowr-analyzer-context';
 export interface SliceRequiredInput {
     /** The slicing criterion is only of interest if you actually want to slice the R code */
     readonly criterion: SlicingCriteria;
@@ -11,6 +11,8 @@ export interface SliceRequiredInput {
     readonly threshold?: number;
     /** The direction to slice in. Defaults to backward slicing if unset. */
     readonly direction?: SliceDirection;
+    /** The context of the analysis */
+    readonly context?: ReadOnlyFlowrAnalyzerContext;
 }
 export declare enum SliceDirection {
     Backward = "backward",
@@ -19,7 +21,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,9 +8,10 @@ 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);
+    const threshold = input.threshold ?? input.context?.config.solver.slicer?.threshold;
+    return (0, static_slicer_1.staticSlice)(input.context, results.dataflow, results.normalize, input.criterion, direction, threshold);
 }
 exports.STATIC_SLICE = {
     name: 'slice',

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',