@eagleoutice/flowr 2.2.15 → 2.3.0

package/control-flow/semantic-cfg-guided-visitor.js

@@ -35,7 +35,7 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * A helper function to get the normalized AST node for the given id or fail if it does not exist.
      */
     getNormalizedAst(id) {
-        return this.config.normalizedAst.idMap.get(id);
+        return id !== undefined ? this.config.normalizedAst.idMap.get(id) : undefined;
     }
     /**
      * See {@link DataflowAwareCfgGuidedVisitor#visitValue} for the base implementation.
@@ -52,8 +52,15 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
             case type_1.RType.Number: return this.onNumberConstant({ vertex: val, node: astNode });
             case type_1.RType.Logical: return this.onLogicalConstant({ vertex: val, node: astNode });
             case type_1.RType.Symbol:
-                (0, assert_1.guard)(astNode.lexeme === 'NULL', `Expected NULL constant, got ${astNode.lexeme}`);
-                return this.onNullConstant({ vertex: val, node: astNode });
+                if (astNode.lexeme === 'NULL') {
+                    return this.onNullConstant({
+                        vertex: val,
+                        node: astNode
+                    });
+                }
+                else {
+                    return this.onSymbolConstant({ vertex: val, node: astNode });
+                }
         }
         (0, assert_1.guard)(false, `Unexpected value type ${astNode.type} for value ${astNode.lexeme}`);
     }
@@ -266,7 +273,11 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
     getOrigins(id) {
         return (0, dfg_get_origin_1.getOriginInDfg)(this.config.dfg, id);
     }
-    /** Called for every occurrence of a `NULL` in the program. */
+    /**
+     * Called for every occurrence of a `NULL` in the program.
+     *
+     * For other symbols that are not referenced as a variable, see {@link SemanticCfgGuidedVisitor#onSymbolConstant|`onSymbolConstant`}.
+     */
     onNullConstant(_data) { }
     /**
      * Called for every constant string value in the program.
@@ -286,6 +297,15 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * For example, `TRUE` in `if(TRUE) { ... }`.
      */
     onLogicalConstant(_data) { }
+    /**
+     * Called for every constant symbol value in the program.
+     *
+     * For example, `foo` in `library(foo)` or `a` in `l$a`. This most likely happens as part of non-standard-evaluation, i.e., the symbol is not evaluated to a value,
+     * but used as a symbol in and of itself.
+     *
+     * Please note, that due to its special behaviors, `NULL` is handled in {@link SemanticCfgGuidedVisitor#onNullConstant|`onNullConstant`} and not here.
+     */
+    onSymbolConstant(_data) { }
     /**
      * Called for every variable that is read within the program.
      * You can use {@link getOrigins} to get the origins of the variable.

package/core/pipeline-executor.d.ts

@@ -1,6 +1,7 @@
 import type { PipelineStepName } from './steps/pipeline-step';
 import { PipelineStepStage } from './steps/pipeline-step';
 import type { Pipeline, PipelineInput, PipelineOutput, PipelinePerRequestInput, PipelineStepOutputWithName } from './steps/pipeline/pipeline';
+import type { FlowrConfigOptions } from '../config';
 /**
  * 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
@@ -91,6 +92,7 @@ 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`.
@@ -99,8 +101,9 @@ export declare class PipelineExecutor<P extends Pipeline> {
      *
      * @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
      */
-    constructor(pipeline: P, input: PipelineInput<P>);
+    constructor(pipeline: P, input: PipelineInput<P>, flowrConfig: FlowrConfigOptions);
     /**
      * Retrieve the {@link Pipeline|pipeline} that is currently being.
      */

package/core/pipeline-executor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PipelineExecutor = void 0;
 const assert_1 = require("../util/assert");
-const config_1 = require("../config");
 const built_in_1 = require("../dataflow/environments/built-in");
 const built_in_config_1 = require("../dataflow/environments/built-in-config");
 /**
@@ -95,6 +94,7 @@ 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`.
@@ -103,13 +103,14 @@ class PipelineExecutor {
      *
      * @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
      */
-    constructor(pipeline, input) {
+    constructor(pipeline, input, flowrConfig) {
         this.pipeline = pipeline;
         this.length = pipeline.order.length;
         this.input = input;
-        const config = (0, config_1.getConfig)();
-        const builtIns = config.semantics.environment.overwriteBuiltIns;
+        this.flowrConfig = flowrConfig;
+        const builtIns = flowrConfig.semantics.environment.overwriteBuiltIns;
         if (!builtIns.loadDefaults) {
             built_in_1.BuiltInMemory.clear();
             built_in_1.EmptyBuiltInMemory.clear();
@@ -190,7 +191,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)];
+        return [step.name, step.processor(this.output, this.input, this.flowrConfig)];
     }
     /**
      * 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/steps/all/core/10-normalize.d.ts

@@ -9,6 +9,8 @@ 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;
 }
 export declare function getCurrentRequestFile(request: RParseRequests | undefined): string | undefined;
 declare function processor(results: {

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

@@ -17,7 +17,7 @@ function getCurrentRequestFile(request) {
     }
 }
 function processor(results, input) {
-    return (0, parser_1.normalize)(results.parse, input.getId, getCurrentRequestFile(input.request));
+    return (0, parser_1.normalize)(results.parse, input.getId, input.overwriteFilePath ?? getCurrentRequestFile(input.request));
 }
 exports.NORMALIZE = {
     name: 'normalize',

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

@@ -3,9 +3,10 @@ import { normalizedAstToJson, normalizedAstToQuads, printNormalizedAstToMermaid,
 import { PipelineStepStage } from '../../pipeline-step';
 import type { NormalizeRequiredInput } from './10-normalize';
 import type { ParseStepOutputTS } from './01-parse-tree-sitter';
+import type { FlowrConfigOptions } from '../../../../config';
 declare function processor(results: {
     'parse'?: ParseStepOutputTS;
-}, 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>, 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>>;
 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

@@ -5,8 +5,8 @@ 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) {
-    return (0, parser_1.normalizeTreeSitter)(results['parse'], input.getId, (0, _10_normalize_1.getCurrentRequestFile)(input.request));
+function processor(results, input, config) {
+    return (0, parser_1.normalizeTreeSitter)(results['parse'], input.getId, config, input.overwriteFilePath ?? (0, _10_normalize_1.getCurrentRequestFile)(input.request));
 }
 exports.NORMALIZE_TREE_SITTER = {
     name: 'normalize',

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

@@ -4,12 +4,13 @@ import { dataflowGraphToJson, dataflowGraphToMermaid, dataflowGraphToMermaidUrl,
 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';
 declare function processor(results: {
     normalize?: NormalizedAst;
 }, input: {
     request?: RParseRequests;
     parser?: Parser<KnownParserType>;
-}): import("../../../../dataflow/info").DataflowInformation;
+}, config: FlowrConfigOptions): import("../../../../dataflow/info").DataflowInformation;
 export declare const STATIC_DATAFLOW: {
     readonly humanReadableName: "dataflow";
     readonly processor: typeof processor;

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

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

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

@@ -3,6 +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';
 export interface SliceRequiredInput {
     /** The slicing criterion is only of interest if you actually want to slice the R code */
     readonly criterion: SlicingCriteria;
@@ -12,7 +13,7 @@ export interface SliceRequiredInput {
 declare function processor(results: {
     dataflow?: DataflowInformation;
     normalize?: NormalizedAst;
-}, input: Partial<SliceRequiredInput>): Readonly<import("../../../../slicing/static/slicer-types").SliceResult>;
+}, input: Partial<SliceRequiredInput>, config: FlowrConfigOptions): 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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.STATIC_SLICE = void 0;
 const print_1 = require("../../../print/print");
 const static_slicer_1 = require("../../../../slicing/static/static-slicer");
-function processor(results, input) {
-    return (0, static_slicer_1.staticSlicing)(results.dataflow.graph, results.normalize, input.criterion, input.threshold);
+function processor(results, input, config) {
+    return (0, static_slicer_1.staticSlicing)(results.dataflow.graph, results.normalize, input.criterion, input.threshold ?? config.solver.slicer?.threshold);
 }
 exports.STATIC_SLICE = {
     name: 'slice',

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

@@ -6,6 +6,7 @@ import type { KnownParser, Parser } from '../../../r-bridge/parser';
 import { PipelineExecutor } from '../../pipeline-executor';
 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: "parse";
     readonly humanReadableName: "parse with R shell";
@@ -46,7 +47,7 @@ export declare const DEFAULT_SLICING_PIPELINE: import("./pipeline").Pipeline<{
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -66,7 +67,7 @@ export declare const DEFAULT_SLICING_PIPELINE: import("./pipeline").Pipeline<{
     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>) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    }, 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;
@@ -128,7 +129,7 @@ export declare const DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipeline"
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -148,7 +149,7 @@ export declare const DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipeline"
     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>) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    }, 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;
@@ -210,7 +211,7 @@ export declare const DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./pipel
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -230,7 +231,7 @@ export declare const DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./pipel
     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>) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    }, 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;
@@ -245,7 +246,7 @@ export declare const TREE_SITTER_SLICING_PIPELINE: import("./pipeline").Pipeline
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -265,7 +266,7 @@ export declare const TREE_SITTER_SLICING_PIPELINE: import("./pipeline").Pipeline
     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>) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    }, 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;
@@ -307,7 +308,7 @@ export declare const TREE_SITTER_SLICING_PIPELINE: import("./pipeline").Pipeline
     readonly description: "Normalize the AST to flowR's AST";
     readonly processor: (results: {
         "parse"?: import("../all/core/01-parse-tree-sitter").ParseStepOutputTS;
-    }, input: Partial<import("../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>>;
+    }, input: Partial<import("../all/core/10-normalize").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>>;
     readonly executed: import("../pipeline-step").PipelineStepStage.OncePerFile;
     readonly printer: {
         readonly 0: typeof import("../../print/print").internalPrinter;
@@ -326,7 +327,7 @@ export declare const TREE_SITTER_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipel
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -346,7 +347,7 @@ export declare const TREE_SITTER_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipel
     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>) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    }, 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;
@@ -388,7 +389,7 @@ export declare const TREE_SITTER_SLICE_AND_RECONSTRUCT_PIPELINE: import("./pipel
     readonly description: "Normalize the AST to flowR's AST";
     readonly processor: (results: {
         "parse"?: import("../all/core/01-parse-tree-sitter").ParseStepOutputTS;
-    }, input: Partial<import("../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>>;
+    }, input: Partial<import("../all/core/10-normalize").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>>;
     readonly executed: import("../pipeline-step").PipelineStepStage.OncePerFile;
     readonly printer: {
         readonly 0: typeof import("../../print/print").internalPrinter;
@@ -407,7 +408,7 @@ export declare const TREE_SITTER_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./p
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -427,7 +428,7 @@ export declare const TREE_SITTER_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./p
     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>) => Readonly<import("../../../slicing/static/slicer-types").SliceResult>;
+    }, 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;
@@ -455,7 +456,7 @@ export declare const TREE_SITTER_SLICE_WITHOUT_RECONSTRUCT_PIPELINE: import("./p
     readonly description: "Normalize the AST to flowR's AST";
     readonly processor: (results: {
         "parse"?: import("../all/core/01-parse-tree-sitter").ParseStepOutputTS;
-    }, input: Partial<import("../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>>;
+    }, input: Partial<import("../all/core/10-normalize").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>>;
     readonly executed: import("../pipeline-step").PipelineStepStage.OncePerFile;
     readonly printer: {
         readonly 0: typeof import("../../print/print").internalPrinter;
@@ -512,7 +513,7 @@ export declare const DEFAULT_DATAFLOW_PIPELINE: import("./pipeline").Pipeline<{
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -533,7 +534,7 @@ export declare const TREE_SITTER_DATAFLOW_PIPELINE: import("./pipeline").Pipelin
     }, input: {
         request?: import("../../../r-bridge/retriever").RParseRequests;
         parser?: Parser<import("../../../r-bridge/parser").KnownParserType>;
-    }) => import("../../../dataflow/info").DataflowInformation;
+    }, config: FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
     readonly requiredInput: {};
     readonly name: "dataflow";
     readonly description: "Construct the dataflow graph";
@@ -567,7 +568,7 @@ export declare const TREE_SITTER_DATAFLOW_PIPELINE: import("./pipeline").Pipelin
     readonly description: "Normalize the AST to flowR's AST";
     readonly processor: (results: {
         "parse"?: import("../all/core/01-parse-tree-sitter").ParseStepOutputTS;
-    }, input: Partial<import("../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>>;
+    }, input: Partial<import("../all/core/10-normalize").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>>;
     readonly executed: import("../pipeline-step").PipelineStepStage.OncePerFile;
     readonly printer: {
         readonly 0: typeof import("../../print/print").internalPrinter;
@@ -635,7 +636,7 @@ export declare const TREE_SITTER_NORMALIZE_PIPELINE: import("./pipeline").Pipeli
     readonly description: "Normalize the AST to flowR's AST";
     readonly processor: (results: {
         "parse"?: import("../all/core/01-parse-tree-sitter").ParseStepOutputTS;
-    }, input: Partial<import("../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>>;
+    }, input: Partial<import("../all/core/10-normalize").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>>;
     readonly executed: import("../pipeline-step").PipelineStepStage.OncePerFile;
     readonly printer: {
         readonly 0: typeof import("../../print/print").internalPrinter;
@@ -680,15 +681,15 @@ export declare const TREE_SITTER_PARSE_PIPELINE: import("./pipeline").Pipeline<{
     readonly dependencies: readonly [];
     readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<import("web-tree-sitter").Tree>;
 }>;
-export declare function createParsePipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_PARSE_PIPELINE>, 'parser'>): PipelineExecutor<typeof TREE_SITTER_PARSE_PIPELINE>;
-export declare function createParsePipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_PARSE_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_PARSE_PIPELINE>;
-export declare function createParsePipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_PARSE_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_PARSE_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_PARSE_PIPELINE>;
-export declare function createSlicePipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_SLICING_PIPELINE>, 'parser'>): PipelineExecutor<typeof TREE_SITTER_SLICING_PIPELINE>;
-export declare function createSlicePipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_SLICING_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_SLICING_PIPELINE>;
-export declare function createSlicePipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_SLICING_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_SLICING_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_SLICING_PIPELINE>;
-export declare function createNormalizePipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_NORMALIZE_PIPELINE>, 'parser'>): PipelineExecutor<typeof TREE_SITTER_NORMALIZE_PIPELINE>;
-export declare function createNormalizePipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_NORMALIZE_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_NORMALIZE_PIPELINE>;
-export declare function createNormalizePipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_NORMALIZE_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_NORMALIZE_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_NORMALIZE_PIPELINE>;
-export declare function createDataflowPipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_DATAFLOW_PIPELINE>, 'parser'>): PipelineExecutor<typeof TREE_SITTER_DATAFLOW_PIPELINE>;
-export declare function createDataflowPipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_DATAFLOW_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_DATAFLOW_PIPELINE>;
-export declare function createDataflowPipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_DATAFLOW_PIPELINE>, 'parser'>): PipelineExecutor<typeof DEFAULT_DATAFLOW_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_DATAFLOW_PIPELINE>;
+export declare function createParsePipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_PARSE_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof TREE_SITTER_PARSE_PIPELINE>;
+export declare function createParsePipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_PARSE_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_PARSE_PIPELINE>;
+export declare function createParsePipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_PARSE_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_PARSE_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_PARSE_PIPELINE>;
+export declare function createSlicePipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_SLICING_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof TREE_SITTER_SLICING_PIPELINE>;
+export declare function createSlicePipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_SLICING_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_SLICING_PIPELINE>;
+export declare function createSlicePipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_SLICING_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_SLICING_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_SLICING_PIPELINE>;
+export declare function createNormalizePipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_NORMALIZE_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof TREE_SITTER_NORMALIZE_PIPELINE>;
+export declare function createNormalizePipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_NORMALIZE_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_NORMALIZE_PIPELINE>;
+export declare function createNormalizePipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_NORMALIZE_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_NORMALIZE_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_NORMALIZE_PIPELINE>;
+export declare function createDataflowPipeline(parser: TreeSitterExecutor, inputs: Omit<PipelineInput<typeof DEFAULT_DATAFLOW_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof TREE_SITTER_DATAFLOW_PIPELINE>;
+export declare function createDataflowPipeline(parser: RShell, inputs: Omit<PipelineInput<typeof DEFAULT_DATAFLOW_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_DATAFLOW_PIPELINE>;
+export declare function createDataflowPipeline(parser: KnownParser, inputs: Omit<PipelineInput<typeof DEFAULT_DATAFLOW_PIPELINE>, 'parser'>, config: FlowrConfigOptions): PipelineExecutor<typeof DEFAULT_DATAFLOW_PIPELINE> | PipelineExecutor<typeof TREE_SITTER_DATAFLOW_PIPELINE>;

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

@@ -37,36 +37,36 @@ exports.TREE_SITTER_PARSE_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tr
  *
  * @see {@link createNormalizePipeline}, {@link createDataflowPipeline}, {@link createSlicePipeline}
  */
-function createParsePipeline(parser, inputs) {
+function createParsePipeline(parser, inputs, config) {
     const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_PARSE_PIPELINE : exports.DEFAULT_PARSE_PIPELINE;
     return new pipeline_executor_1.PipelineExecutor(base, {
         parser: parser,
         ...inputs
-    });
+    }, config);
 }
 /**
  * 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}
  */
-function createSlicePipeline(parser, inputs) {
+function createSlicePipeline(parser, inputs, config) {
     const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_SLICING_PIPELINE : exports.DEFAULT_SLICING_PIPELINE;
     return new pipeline_executor_1.PipelineExecutor(base, {
         parser: parser,
         ...inputs
-    });
+    }, config);
 }
 /**
  * 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}
  */
-function createNormalizePipeline(parser, inputs) {
+function createNormalizePipeline(parser, inputs, config) {
     const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_NORMALIZE_PIPELINE : exports.DEFAULT_NORMALIZE_PIPELINE;
     return new pipeline_executor_1.PipelineExecutor(base, {
         parser: parser,
         ...inputs
-    });
+    }, config);
 }
 /**
  * Returns either a {@link DEFAULT_DATAFLOW_PIPELINE} or a {@link TREE_SITTER_DATAFLOW_PIPELINE} depending on the parser used.
@@ -74,11 +74,11 @@ function createNormalizePipeline(parser, inputs) {
  * @see {@link createParsePipeline}, {@link createNormalizePipeline}, {@link createSlicePipeline}
  *
  */
-function createDataflowPipeline(parser, inputs) {
+function createDataflowPipeline(parser, inputs, config) {
     const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_DATAFLOW_PIPELINE : exports.DEFAULT_DATAFLOW_PIPELINE;
     return new pipeline_executor_1.PipelineExecutor(base, {
         parser: parser,
         ...inputs
-    });
+    }, config);
 }
 //# sourceMappingURL=default-pipelines.js.map

package/core/steps/pipeline-step.d.ts

@@ -5,6 +5,7 @@
  */
 import type { MergeableRecord } from '../../util/objects';
 import type { InternalStepPrinter, IPipelineStepPrinter, StepOutputFormat } from '../print/print';
+import type { FlowrConfigOptions } from '../../config';
 /**
  * This represents the format of a step processor which retrieves two things:
  *
@@ -16,7 +17,7 @@ import type { InternalStepPrinter, IPipelineStepPrinter, StepOutputFormat } from
  * list all steps that you require as your {@link IPipelineStepOrder#dependencies|dependencies}, even if they would be
  * already covered transitively.
  */
-export type StepProcessingFunction = (results: Record<string, unknown>, input: Record<string, unknown>) => unknown;
+export type StepProcessingFunction = (results: Record<string, unknown>, input: Record<string, unknown>, config: FlowrConfigOptions) => unknown;
 /**
  * This represents the required execution frequency of a step.
  */

package/dataflow/environments/built-in-config.d.ts

@@ -4,7 +4,7 @@ export interface BaseBuiltInDefinition {
     /** The type of the built-in configuration */
     readonly type: string;
     /** The function name to define to the given configuration */
-    readonly names: readonly Identifier[];
+    readonly names: Identifier[];
     /** Should we assume that the value is a primitive? */
     readonly assumePrimitive?: boolean;
 }
@@ -35,7 +35,7 @@ export interface BuiltInFunctionDefinition<BuiltInProcessor extends BuiltInMappi
  */
 export interface BuiltInReplacementDefinition extends BaseBuiltInDefinition {
     readonly type: 'replacement';
-    readonly suffixes: readonly ('<<-' | '<-')[];
+    readonly suffixes: ('<<-' | '<-')[];
     readonly config: {
         readIndices: boolean;
     };
@@ -44,7 +44,7 @@ export type BuiltInDefinition = BuiltInConstantDefinition<any> | BuiltInFunction
 /**
  * @see DefaultBuiltinConfig
  */
-export type BuiltInDefinitions = readonly BuiltInDefinition[];
+export type BuiltInDefinitions = BuiltInDefinition[];
 export declare function registerBuiltInFunctions<BuiltInProcessor extends BuiltInMappingName>({ names, processor, config, assumePrimitive }: BuiltInFunctionDefinition<BuiltInProcessor>): void;
 export declare function registerReplacementFunctions({ names, suffixes, assumePrimitive, config }: BuiltInReplacementDefinition): void;
 export declare function registerBuiltInDefinition(definition: BuiltInDefinition): void;

package/dataflow/environments/built-in.d.ts

@@ -30,8 +30,9 @@ import { processRm } from '../internal/process/functions/call/built-in/built-in-
 import { processEvalCall } from '../internal/process/functions/call/built-in/built-in-eval';
 import type { REnvironmentInformation } from './environment';
 import type { Value } from '../eval/values/r-value';
-import { resolveAsVector } from '../eval/resolve/resolve';
+import { resolveAsVector, resolveAsSeq, resolveAsMinus, resolveAsPlus } from '../eval/resolve/resolve';
 import type { DataflowGraph } from '../graph/graph';
+import type { VariableResolve } from '../../config';
 export type BuiltIn = `built-in:${string}`;
 export declare function builtInId(name: string): BuiltIn;
 export declare function isBuiltIn(name: NodeId | string): name is BuiltIn;
@@ -48,6 +49,7 @@ export interface BuiltInIdentifierConstant<T = unknown> extends IdentifierRefere
     definedAt: BuiltIn;
     value: T;
 }
+export type UseAsProcessors = 'builtin:default' | 'builtin:return' | 'builtin:stop';
 export interface DefaultBuiltInProcessorConfiguration extends ForceArguments {
     readonly returnsNthArgument?: number | 'last';
     readonly cfg?: ExitPointType;
@@ -55,8 +57,12 @@ export interface DefaultBuiltInProcessorConfiguration extends ForceArguments {
     readonly hasUnknownSideEffects?: boolean | LinkTo<RegExp | string>;
     /** record mapping the actual function name called to the arguments that should be treated as function calls */
     readonly treatAsFnCall?: Record<string, readonly string[]>;
+    /** Name that should be used for the origin (useful when needing to differentiate between
+     * functions like 'return' that use the default builtin processor)
+     */
+    readonly useAsProcessor?: UseAsProcessors;
 }
-export type BuiltInEvalHandler = (a: RNodeWithParent, env: REnvironmentInformation, graph?: DataflowGraph, map?: AstIdMap) => Value;
+export type BuiltInEvalHandler = (resolve: VariableResolve, a: RNodeWithParent, env?: REnvironmentInformation, graph?: DataflowGraph, map?: AstIdMap) => Value;
 declare function defaultBuiltInProcessor<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, config: DefaultBuiltInProcessorConfiguration): DataflowInformation;
 export declare function registerBuiltInFunctions<Config extends object, Proc extends BuiltInIdentifierProcessorWithConfig<Config>>(both: boolean, names: readonly Identifier[], processor: Proc, config: Config): void;
 export declare const BuiltInProcessorMapper: {
@@ -84,7 +90,9 @@ export declare const BuiltInProcessorMapper: {
 };
 export declare const BuiltInEvalHandlerMapper: {
     readonly 'built-in:c': typeof resolveAsVector;
-    readonly 'builtin:vector': typeof resolveAsVector;
+    readonly 'built-in::': typeof resolveAsSeq;
+    readonly 'built-in:+': typeof resolveAsPlus;
+    readonly 'built-in:-': typeof resolveAsMinus;
 };
 export type BuiltInMappingName = keyof typeof BuiltInProcessorMapper;
 export type ConfigOfBuiltInMappingName<N extends BuiltInMappingName> = Parameters<typeof BuiltInProcessorMapper[N]>[4];