@eagleoutice/flowr 2.3.0 → 2.4.1

package/dataflow/eval/resolve/alias-tracking.js

@@ -78,9 +78,9 @@ function getUseAlias(sourceId, dataflow, environment) {
  * us later, in the {@link trackAliasInEnvironments} function, to get all the
  * aliases of an identifier.
  *
- * @param sourceIds    - node ids to get the definitions for
- * @param dataflow     - dataflow graph
- * @param environment  - environment
+ * @param sourceIds          - node ids to get the definitions for
+ * @param dataflow           - dataflow graph
+ * @param environment        - environment
  * @returns node id of alias
  */
 function getAliases(sourceIds, dataflow, environment) {
@@ -110,12 +110,12 @@ function getAliases(sourceIds, dataflow, environment) {
  * to resolve values. For e.g. in the Dependency Query it is used to resolve calls
  * like `lapply(c("a", "b", "c"), library, character.only = TRUE)`
  *
- * @param id          - The node id or node to resolve
- * @param environment - The current environment used for name resolution
- * @param graph       - The graph to resolve in
- * @param idMap       - The id map to resolve the node if given as an id
- * @param full        - Whether to track aliases on resolve
- * @param resolve     - Variable resolve mode
+ * @param id                 - The node id or node to resolve
+ * @param environment        - The current environment used for name resolution
+ * @param graph              - The graph to resolve in
+ * @param idMap              - The id map to resolve the node if given as an id
+ * @param full               - Whether to track aliases on resolve
+ * @param resolve            - Variable resolve mode
  */
 function resolveIdToValue(id, { environment, graph, idMap, full = true, resolve }) {
     if (id === undefined) {
@@ -160,7 +160,7 @@ function resolveIdToValue(id, { environment, graph, idMap, full = true, resolve
  * @param resolve    - Variable resolve mode
  * @param identifier - Identifier to resolve
  * @param use        - Environment to use
- * @param graph      - Dataflow graph
+ * @param graph      - dataflow graph
  * @param idMap      - id map of Dataflow graph
  * @returns Value of Identifier or Top
  */
@@ -333,8 +333,8 @@ function trackAliasesInGraph(id, graph, idMap) {
  *
  * Resolve an Identifier to a constant, if the identifier is a constant
  *
- * @param name        - Identifier to resolve
- * @param environment - Environment to use
+ * @param name               - Identifier to resolve
+ * @param environment        - Environment to use
  * @returns Value of Constant or Top
  */
 function resolveToConstants(name, environment) {

package/dataflow/eval/resolve/resolve.js

@@ -59,7 +59,7 @@ function resolveNode(resolve, a, env, graph, map) {
         else {
             return r_value_2.Top;
         }
-        if (Object.prototype.hasOwnProperty.call(built_in_1.BuiltInEvalHandlerMapper, builtInName)) {
+        if (Object.hasOwn(built_in_1.BuiltInEvalHandlerMapper, builtInName)) {
             const handler = built_in_1.BuiltInEvalHandlerMapper[builtInName];
             return handler(resolve, a, env, graph, map);
         }

package/dataflow/extractor.js

@@ -20,6 +20,7 @@ const extract_cfg_1 = require("../control-flow/extract-cfg");
 const edge_1 = require("./graph/edge");
 const identify_link_to_last_call_relation_1 = require("../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 const built_in_function_definition_1 = require("./internal/process/functions/call/built-in/built-in-function-definition");
+const built_in_config_1 = require("./environments/built-in-config");
 /**
  * The best friend of {@link produceDataFlowGraph} and {@link processDataflowFor}.
  * Maps every {@link RType} in the normalized AST to a processor.
@@ -89,10 +90,14 @@ function produceDataFlowGraph(parser, request, completeAst, config) {
     else {
         firstRequest = request;
     }
+    const builtInsConfig = config.semantics.environment.overwriteBuiltIns;
+    const builtIns = (0, built_in_config_1.getBuiltInDefinitions)(builtInsConfig.definitions, builtInsConfig.loadDefaults);
+    const env = (0, environment_1.initializeCleanEnvironments)(builtIns.builtInMemory);
     const dfData = {
         parser,
         completeAst,
-        environment: (0, environment_1.initializeCleanEnvironments)(),
+        environment: env,
+        builtInEnvironment: env.current.parent,
         processors: exports.processors,
         currentRequest: firstRequest,
         controlDependencies: undefined,

package/dataflow/graph/dataflowgraph-builder.d.ts

@@ -2,7 +2,7 @@ import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-i
 import type { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { DataflowFunctionFlowInformation, FunctionArgument } from './graph';
 import { DataflowGraph } from './graph';
-import type { REnvironmentInformation } from '../environments/environment';
+import type { IEnvironment, REnvironmentInformation } from '../environments/environment';
 import type { DataflowGraphVertexAstLink, DataflowGraphVertexUse, FunctionOriginInformation } from './vertex';
 import type { ControlDependency } from '../info';
 import type { LinkTo } from '../../queries/catalog/call-context-query/call-context-query-format';
@@ -29,6 +29,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
      */
     defineFunction(id: NodeId, exitPoints: readonly NodeId[], subflow: DataflowFunctionFlowInformation, info?: {
         environment?: REnvironmentInformation;
+        builtInEnvironment?: IEnvironment;
         controlDependencies?: ControlDependency[];
     }, asRoot?: boolean): this;
     /**
@@ -46,6 +47,7 @@ export declare class DataflowGraphBuilder extends DataflowGraph {
         reads?: readonly NodeId[];
         onlyBuiltIn?: boolean;
         environment?: REnvironmentInformation;
+        builtInEnvironment?: IEnvironment;
         controlDependencies?: ControlDependency[];
         origin?: FunctionOriginInformation[];
         link?: DataflowGraphVertexAstLink;

package/dataflow/graph/dataflowgraph-builder.js

@@ -180,7 +180,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
             fromId = from.nodeId;
         }
         else {
-            const result = (0, flowr_search_executor_1.runSearch)(from.query, data);
+            const result = (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);
+            const result = (0, flowr_search_executor_1.runSearch)(to.query, data).getElements();
             toIds = result.map(r => r.node.info.id);
         }
         return this.edgeHelper(fromId, toIds, type);

package/dataflow/graph/graph.d.ts

@@ -160,7 +160,7 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
      *
      * @see #edges
      */
-    vertices(includeDefinedFunctions: boolean): IterableIterator<[NodeId, Vertex]>;
+    vertices(includeDefinedFunctions: boolean): MapIterator<[NodeId, Vertex]>;
     /**
      * @returns the ids of all edges in the graph together with their edge information
      *
@@ -231,5 +231,6 @@ export interface IEnvironmentJson {
     readonly id: number;
     parent: IEnvironmentJson;
     memory: Record<Identifier, IdentifierDefinition[]>;
+    builtInEnv: true | undefined;
 }
 export {};

package/dataflow/graph/graph.js

@@ -376,7 +376,7 @@ function mergeNodeInfos(current, next) {
     }
     else if (current.tag === vertex_1.VertexType.FunctionDefinition) {
         (0, assert_1.guard)(current.scope === next.scope, 'nodes to be joined for the same id must have the same scope');
-        (0, assert_1.guard)((0, arrays_1.arrayEqual)(current.exitPoints, next.exitPoints), 'nodes to be joined must have same exist points');
+        current.exitPoints = (0, arrays_1.uniqueArrayMerge)(current.exitPoints, next.exitPoints);
     }
     return current;
 }
@@ -394,11 +394,15 @@ function envFromJson(json) {
     for (const [key, value] of Object.entries(json.memory)) {
         memory.set(key, value);
     }
-    return {
+    const obj = {
         id: json.id,
         parent: parent,
         memory
     };
+    if (json.builtInEnv) {
+        obj.builtInEnv = true;
+    }
+    return obj;
 }
 function renvFromJson(json) {
     const current = envFromJson(json.current);

package/dataflow/graph/invert-dfg.d.ts

@@ -0,0 +1,2 @@
+import { DataflowGraph } from './graph';
+export declare function invertDfg(graph: DataflowGraph): DataflowGraph;

package/dataflow/graph/invert-dfg.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.invertDfg = invertDfg;
+const graph_1 = require("./graph");
+function invertDfg(graph) {
+    const invertedGraph = new graph_1.DataflowGraph(graph.idMap);
+    for (const [, v] of graph.vertices(true)) {
+        invertedGraph.addVertex(v);
+    }
+    for (const [from, targets] of graph.edges()) {
+        for (const [to, { types }] of targets) {
+            invertedGraph.addEdge(to, from, types);
+        }
+    }
+    return invertedGraph;
+}
+//# sourceMappingURL=invert-dfg.js.map

package/dataflow/info.d.ts

@@ -109,7 +109,7 @@ export interface DataflowInformation extends DataflowCfgInformation {
  *
  * @see {@link DataflowInformation}
  */
-export declare function initializeCleanDataflowInformation<T>(entryPoint: NodeId, data: Pick<DataflowProcessorInformation<T>, 'environment' | 'completeAst'>): DataflowInformation;
+export declare function initializeCleanDataflowInformation<T>(entryPoint: NodeId, data: Pick<DataflowProcessorInformation<T>, 'environment' | 'builtInEnvironment' | 'completeAst'>): DataflowInformation;
 /**
  * Checks whether the given control dependencies are exhaustive (i.e. if for every control dependency on a boolean,
  * the list contains a dependency on the `true` and on the `false` case).

package/dataflow/internal/linker.js

@@ -25,7 +25,7 @@ const built_in_1 = require("../environments/built-in");
 const prefix_1 = require("../../util/prefix");
 function findNonLocalReads(graph, ignore) {
     const ignores = new Set(ignore.map(i => i.nodeId));
-    const ids = new Set([...graph.vertices(true)]
+    const ids = new Set(graph.vertices(true)
         .filter(([_, info]) => info.tag === vertex_1.VertexType.Use || info.tag === vertex_1.VertexType.FunctionCall)
         .map(([id, _]) => id));
     /* find all variable use ids which do not link to a given id */
@@ -74,27 +74,27 @@ function produceNameSharedIdMap(references) {
 }
 function linkArgumentsOnCall(args, params, graph) {
     const nameArgMap = new Map(args.filter(graph_1.isNamedArgument).map(a => [a.name, a]));
-    const nameParamMap = new Map(params.filter(p => p !== undefined && p.name !== undefined && p.name.content !== undefined).map(p => [p.name.content, p]));
+    const nameParamMap = new Map(params.filter(p => p?.name?.content !== undefined).map(p => [p.name.content, p]));
     const specialDotParameter = params.find(p => p.special);
     // all parameters matched by name
     const matchedParameters = new Set();
     // first map names
     for (const [name, arg] of nameArgMap) {
-        const pmatchName = (0, prefix_1.findByPrefixIfUnique)(name, [...nameParamMap.keys()]) ?? name;
+        const pmatchName = (0, prefix_1.findByPrefixIfUnique)(name, nameParamMap.keys()) ?? name;
         const param = nameParamMap.get(pmatchName);
-        if (param !== undefined && param.name) {
+        if (param?.name) {
             logger_1.dataflowLogger.trace(`mapping named argument "${name}" to parameter "${param.name.content}"`);
             graph.addEdge(arg.nodeId, param.name.info.id, edge_1.EdgeType.DefinesOnCall);
             graph.addEdge(param.name.info.id, arg.nodeId, edge_1.EdgeType.DefinedByOnCall);
             matchedParameters.add(name);
         }
-        else if (specialDotParameter !== undefined && specialDotParameter.name) {
+        else if (specialDotParameter?.name) {
             logger_1.dataflowLogger.trace(`mapping named argument "${name}" to dot-dot-dot parameter`);
             graph.addEdge(arg.nodeId, specialDotParameter.name.info.id, edge_1.EdgeType.DefinesOnCall);
             graph.addEdge(specialDotParameter.name.info.id, arg.nodeId, edge_1.EdgeType.DefinedByOnCall);
         }
     }
-    const remainingParameter = params.filter(p => !p || !p.name || !matchedParameters.has(p.name.content));
+    const remainingParameter = params.filter(p => !p?.name || !matchedParameters.has(p.name.content));
     const remainingArguments = args.filter(a => !(0, graph_1.isNamedArgument)(a));
     for (let i = 0; i < remainingArguments.length; i++) {
         const arg = remainingArguments[i];
@@ -169,14 +169,14 @@ function linkFunctionCall(graph, id, info, idMap, thisGraph, calledFunctionDefin
         return;
     }
     const readBits = edge_1.EdgeType.Reads | edge_1.EdgeType.Calls;
-    const functionDefinitionReadIds = [...edges].filter(([_, e]) => (0, edge_1.edgeDoesNotIncludeType)(e.types, edge_1.EdgeType.Argument)
+    const functionDefinitionReadIds = edges.entries().filter(([_, e]) => (0, edge_1.edgeDoesNotIncludeType)(e.types, edge_1.EdgeType.Argument)
         && (0, edge_1.edgeIncludesType)(e.types, readBits)).map(([target, _]) => target);
     const functionDefs = getAllLinkedFunctionDefinitions(new Set(functionDefinitionReadIds), graph)[0];
     for (const def of functionDefs.values()) {
         (0, assert_1.guard)(def.tag === vertex_1.VertexType.FunctionDefinition, () => `expected function definition, but got ${def.tag}`);
         linkFunctionCallWithSingleTarget(graph, def, info, idMap);
     }
-    if (thisGraph.isRoot(id)) {
+    if (thisGraph.isRoot(id) && functionDefs.size > 0) {
         calledFunctionDefinitions.push({ functionCall: id, called: [...functionDefs.values()] });
     }
 }
@@ -189,7 +189,7 @@ function linkFunctionCall(graph, id, info, idMap, thisGraph, calledFunctionDefin
  * @param thisGraph - The graph to search for function calls in
  */
 function linkFunctionCalls(graph, idMap, thisGraph) {
-    const functionCalls = [...thisGraph.vertices(true)]
+    const functionCalls = thisGraph.vertices(true)
         .filter(([_, info]) => info.tag === vertex_1.VertexType.FunctionCall);
     const calledFunctionDefinitions = [];
     for (const [id, info] of functionCalls) {

package/dataflow/internal/process/functions/call/built-in/built-in-access.js

@@ -112,7 +112,7 @@ function processNumberBasedAccess(data, name, args, rootId, config, head) {
         data.environment.current.memory.set(':=', existing);
     }
     if (head.value && outInfo.definitionRootNodes.length > 0) {
-        (0, built_in_assignment_1.markAsAssignment)(fnCall.information, { type: identifier_1.ReferenceType.Variable, name: head.value.lexeme ?? '', nodeId: head.value.info.id, definedAt: rootId, controlDependencies: [] }, outInfo.definitionRootNodes, rootId, data.flowrConfig);
+        (0, built_in_assignment_1.markAsAssignment)(fnCall.information, { type: identifier_1.ReferenceType.Variable, name: head.value.lexeme ?? '', nodeId: head.value.info.id, definedAt: rootId, controlDependencies: [] }, outInfo.definitionRootNodes, rootId, data);
     }
     if (data.flowrConfig.solver.pointerTracking) {
         referenceAccessedIndices(args, data, fnCall, rootId, true);

package/dataflow/internal/process/functions/call/built-in/built-in-assignment.d.ts

@@ -10,7 +10,6 @@ import type { ContainerIndicesCollection } from '../../../../../graph/vertex';
 import type { ForceArguments } from '../common';
 import type { REnvironmentInformation } from '../../../../../environments/environment';
 import type { DataflowGraph } from '../../../../../graph/graph';
-import type { FlowrConfigOptions } from '../../../../../../config';
 export interface AssignmentConfiguration extends ForceArguments {
     readonly superAssignment?: boolean;
     readonly swapSourceAndTarget?: boolean;
@@ -44,10 +43,10 @@ export interface AssignmentToSymbolParameters<OtherInfo> extends AssignmentConfi
  * @param nodeToDefine       - `x`
  * @param sourceIds          - `v`
  * @param rootIdOfAssignment - `<-`
- * @param config             - The flowr config
+ * @param data               - The dataflow analysis fold backpack
  * @param assignmentConfig   - configuration for the assignment processing
  */
-export declare function markAsAssignment(information: {
+export declare function markAsAssignment<OtherInfo>(information: {
     environment: REnvironmentInformation;
     graph: DataflowGraph;
-}, nodeToDefine: InGraphIdentifierDefinition, sourceIds: readonly NodeId[], rootIdOfAssignment: NodeId, config: FlowrConfigOptions, assignmentConfig?: AssignmentConfiguration): void;
+}, nodeToDefine: InGraphIdentifierDefinition, sourceIds: readonly NodeId[], rootIdOfAssignment: NodeId, data: DataflowProcessorInformation<OtherInfo>, assignmentConfig?: AssignmentConfiguration): void;

package/dataflow/internal/process/functions/call/built-in/built-in-assignment.js

@@ -215,11 +215,11 @@ function checkTargetReferenceType(source, sourceInfo) {
  * @param nodeToDefine       - `x`
  * @param sourceIds          - `v`
  * @param rootIdOfAssignment - `<-`
- * @param config             - The flowr config
+ * @param data               - The dataflow analysis fold backpack
  * @param assignmentConfig   - configuration for the assignment processing
  */
-function markAsAssignment(information, nodeToDefine, sourceIds, rootIdOfAssignment, config, assignmentConfig) {
-    if (config.solver.pointerTracking) {
+function markAsAssignment(information, nodeToDefine, sourceIds, rootIdOfAssignment, data, assignmentConfig) {
+    if (data.flowrConfig.solver.pointerTracking) {
         let indicesCollection = undefined;
         if (sourceIds.length === 1) {
             // support for tracking indices.
@@ -248,7 +248,7 @@ function markAsAssignment(information, nodeToDefine, sourceIds, rootIdOfAssignme
         }
         nodeToDefine.indicesCollection ??= indicesCollection;
     }
-    information.environment = (0, define_1.define)(nodeToDefine, assignmentConfig?.superAssignment, information.environment, config);
+    information.environment = (0, define_1.define)(nodeToDefine, assignmentConfig?.superAssignment, information.environment, data.flowrConfig);
     information.graph.setDefinitionOfVertex(nodeToDefine);
     if (!assignmentConfig?.quoteSource) {
         for (const sourceId of sourceIds) {
@@ -285,7 +285,7 @@ function processAssignmentToSymbol(config) {
     information.environment = (0, overwrite_1.overwriteEnvironment)(sourceArg.environment, targetArg.environment);
     // install assigned variables in environment
     for (const write of writeNodes) {
-        markAsAssignment(information, write, [source.info.id], rootId, data.flowrConfig, config);
+        markAsAssignment(information, write, [source.info.id], rootId, data, config);
     }
     information.graph.addEdge(rootId, targetArg.entryPoint, edge_1.EdgeType.Returns);
     if (quoteSource) {

package/dataflow/internal/process/functions/call/built-in/built-in-expression-list.js

@@ -50,24 +50,24 @@ function linkReadNameToWriteIfPossible(read, environments, listEnvironments, rem
 }
 function processNextExpression(currentElement, environment, listEnvironments, remainingRead, nextGraph) {
     // all inputs that have not been written until now are read!
-    for (const read of [...currentElement.in, ...currentElement.unknownReferences]) {
+    for (const read of currentElement.in.concat(currentElement.unknownReferences)) {
         linkReadNameToWriteIfPossible(read, environment, listEnvironments, remainingRead, nextGraph);
     }
 }
 function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextGraph, localDefs) {
     for (const { functionCall, called } of calledEnvs) {
-        const callDependencies = nextGraph.getVertex(functionCall, true)?.cds;
+        let callDependencies = null;
         for (const calledFn of called) {
             (0, assert_1.guard)(calledFn.tag === vertex_1.VertexType.FunctionDefinition, 'called function must be a function definition');
             // only merge the environments they have in common
-            let environment = calledFn.environment;
+            let environment = calledFn.subflow.environment;
             while (environment.level > inputEnvironment.level) {
                 environment = (0, scoping_1.popLocalEnvironment)(environment);
             }
             // update alle definitions to be defined at this function call
             let current = environment.current;
             let hasUpdate = false;
-            while (current !== undefined && current.id !== environment_1.BuiltInEnvironment.id) {
+            while (!current?.builtInEnv) {
                 for (const definitions of current.memory.values()) {
                     for (const def of definitions) {
                         if (!(0, built_in_1.isBuiltIn)(def.definedAt)) {
@@ -84,6 +84,9 @@ function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextG
                 if (localDefs.length > 0) {
                     environment = (0, remove_1.removeAll)(localDefs, environment);
                 }
+                if (callDependencies === null) {
+                    callDependencies = nextGraph.getVertex(functionCall, true)?.cds;
+                }
                 inputEnvironment = (0, overwrite_1.overwriteEnvironment)(inputEnvironment, environment, callDependencies);
             }
         }
@@ -110,7 +113,7 @@ function processExpressionList(name, args, rootId, data) {
             continue;
         }
         // use the current environments for processing
-        data = { ...data, environment: environment };
+        data.environment = environment;
         const processed = (0, processor_1.processDataflowFor)(expression, data);
         processedExpressions.push(processed);
         nextGraph.mergeWith(processed.graph);
@@ -140,7 +143,6 @@ function processExpressionList(name, args, rootId, data) {
             break;
         }
     }
-    logger_1.dataflowLogger.trace(`expression list exits with ${remainingRead.size} remaining read names`);
     if (defaultReturnExpr) {
         exitPoints.push({
             type: 0 /* ExitPointType.Default */,
@@ -148,7 +150,7 @@ function processExpressionList(name, args, rootId, data) {
             controlDependencies: data.controlDependencies
         });
     }
-    const ingoing = [...remainingRead.values()].flat();
+    const ingoing = [...remainingRead.values().flatMap(v => v)];
     const rootNode = data.completeAst.idMap.get(rootId);
     const withGroup = rootNode?.grouping;
     if (withGroup) {

package/dataflow/internal/process/functions/call/built-in/built-in-function-definition.js

@@ -107,7 +107,7 @@ function processFunctionDefinition(name, args, rootId, data) {
 // this is no longer necessary when we update environments to be back to front (e.g., with a list of environments)
 // this favors the bigger environment
 function retrieveActiveEnvironment(callerEnvironment, baseEnvironment) {
-    callerEnvironment ??= (0, environment_1.initializeCleanEnvironments)(true);
+    callerEnvironment ??= (0, environment_1.initializeCleanEnvironments)(undefined, true);
     let level = callerEnvironment.level ?? 0;
     if (baseEnvironment.level !== level) {
         while (baseEnvironment.level < level) {
@@ -212,7 +212,7 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
     }
 }
 function prepareFunctionEnvironment(data) {
-    let env = (0, environment_1.initializeCleanEnvironments)();
+    let env = (0, environment_1.initializeCleanEnvironments)(data.builtInEnvironment.memory);
     for (let i = 0; i < data.environment.level + 1 /* add another env */; i++) {
         env = (0, scoping_1.pushLocalEnvironment)(env);
     }

package/dataflow/internal/process/functions/call/built-in/built-in-rm.js

@@ -31,7 +31,7 @@ function processRm(name, args, rootId, data) {
     }
     let env = res.environment;
     for (const name of names) {
-        env = (0, remove_1.remove)(name, env);
+        env = (0, remove_1.remove)(name, env, data.builtInEnvironment);
     }
     return {
         ...res,

package/dataflow/processor.d.ts

@@ -3,7 +3,7 @@
  */
 import type { ControlDependency, DataflowInformation } from './info';
 import type { NormalizedAst, ParentInformation, RNodeWithParent } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
-import type { REnvironmentInformation } from './environments/environment';
+import type { IEnvironment, REnvironmentInformation } from './environments/environment';
 import type { RParseRequest } from '../r-bridge/retriever';
 import type { RNode } from '../r-bridge/lang-4.x/ast/model/model';
 import type { KnownParserType, Parser } from '../r-bridge/parser';
@@ -36,6 +36,10 @@ export interface DataflowProcessorInformation<OtherInfo> {
      * The chain of control-flow {@link NodeId}s that lead to the current node (e.g., of known ifs).
      */
     readonly controlDependencies: ControlDependency[] | undefined;
+    /**
+     * The built-in environment
+     */
+    readonly builtInEnvironment: IEnvironment;
     /**
      * The flowr configuration used for environment seeding, and precision control
      */

package/documentation/doc-util/doc-env.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printEnvironmentToMarkdown = printEnvironmentToMarkdown;
-const environment_1 = require("../../dataflow/environments/environment");
 const dfg_1 = require("../../util/mermaid/dfg");
 function printEnvironmentToMarkdown(env) {
     if (env === undefined) {
         return '?? (error)';
     }
-    else if (env.id === environment_1.BuiltInEnvironment.id) {
+    else if (env.builtInEnv) {
         return `_Built-in Environment (${env.memory.size} entries)_`;
     }
     const lines = ['| Name | Definitions |', '|------|-------------|'];

package/documentation/doc-util/doc-query.js

@@ -25,7 +25,7 @@ async function showQuery(shell, code, queries, { showCode, collapseResult, colla
         parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }, config_1.defaultConfigOptions).allRemainingSteps();
-    const results = (0, query_1.executeQueries)({ dataflow: analysis.dataflow, ast: analysis.normalize, config: config_1.defaultConfigOptions }, queries);
+    const results = await Promise.resolve((0, query_1.executeQueries)({ dataflow: analysis.dataflow, ast: analysis.normalize, config: config_1.defaultConfigOptions }, queries));
     const duration = performance.now() - now;
     const metaInfo = `
 The analysis required _${(0, time_1.printAsMs)(duration)}_ (including parsing and normalization and the query) within the generation environment.

package/documentation/doc-util/doc-search.js

@@ -53,13 +53,13 @@ ${(0, doc_code_1.codeBlock)('json', JSON.stringify(search, null, 2))}
 ${collapseResult ? ' <details> <summary style="color:gray">Show Results</summary>' : ''}
 
 The query returns the following vetices (all references to \`x\` in the code):
-${result.map(({ node }) => `<b>${node.info.id} ('${(0, node_id_1.recoverContent)(node.info.id, analysis.dataflow.graph)}')</b> at L${(0, dfg_1.formatRange)(node.location)}`).join(', ')}
+${result.getElements().map(({ node }) => `<b>${node.info.id} ('${(0, node_id_1.recoverContent)(node.info.id, analysis.dataflow.graph)}')</b> at L${(0, dfg_1.formatRange)(node.location)}`).join(', ')}
 
 ${metaInfo}	
 
 The returned results are highlighted thick and blue within the dataflow graph:
 
-${await (0, doc_dfg_1.printDfGraphForCode)(shell, code, { showCode: false, switchCodeAndGraph: false, mark: new Set(result.map(({ node }) => node.info.id)) })}
+${await (0, doc_dfg_1.printDfGraphForCode)(shell, code, { showCode: false, switchCodeAndGraph: false, mark: new Set(result.getElements().map(({ node }) => node.info.id)) })}
 
 
 ${collapseResult ? '</details>' : ''}

package/documentation/print-cfg-wiki.js

@@ -224,8 +224,7 @@ ${Object.entries(control_flow_graph_1.CfgVertexType).map(([key, value]) => `- \`
 We use the ${(0, doc_types_1.shortLink)('CfgBasicBlockVertex', types.info)} to represent [basic blocks](#cfg-basic-blocks) and separate
 expressions (${(0, doc_types_1.shortLink)('CfgExpressionVertex', types.info)}) and statements (${(0, doc_types_1.shortLink)('CfgStatementVertex', types.info)}) 
 as control flow units with and without side effects (if you want to, you can see view statements as effectful expressions).
-The markers (${(0, doc_types_1.shortLink)('CfgMidMarkerVertex', types.info)} and ${(0, doc_types_1.shortLink)('CfgEndMarkerVertex', types.info)})
-indicate specific segments of larger expressions/statements (e.g., an \`if\` which has a condition and its branches). 
+The markers (${(0, doc_types_1.shortLink)('CfgEndMarkerVertex', types.info)}) indicate the end of larger expressions/statements. 
 
 To signal these links, the expressions and statements contain information about the attached markers:
 
@@ -235,7 +234,7 @@ Similarly, the markers contain a link to their root:
 
 ${(0, doc_types_1.printHierarchy)({ info: types.info, root: 'CfgWithRoot', program: types.program, openTop: true })}
 
-In mermaid visualizations, we use rectangles for statements, rounded rectangles for expressions, circles for exit markers and double-lined rectangles for mid markers.
+In mermaid visualizations, we use rectangles for statements, rounded rectangles for expressions and circles for exit markers.
 Blocks are visualized as boxes around the contained vertices.
 
 ${(0, doc_structure_1.block)({
@@ -554,7 +553,7 @@ Hence, you may rely on the corresponding exit point(s) to identify all exits of
 
 ${(0, doc_structure_1.block)({
         type: 'WARNING',
-        content: 'Using basic blocks, this works just the same. However please keep in mind that the corresponding exit markers do not (and for control statements usually will not) be part of the same basic block.'
+        content: 'Using basic blocks, this works just the same. However, please keep in mind that the corresponding exit markers do not (and for control statements usually will not) be part of the same basic block.'
     })}
 
 `;

package/documentation/print-core-wiki.js

@@ -28,7 +28,6 @@ const built_in_access_1 = require("../dataflow/internal/process/functions/call/b
 const built_in_for_loop_1 = require("../dataflow/internal/process/functions/call/built-in/built-in-for-loop");
 const built_in_repeat_loop_1 = require("../dataflow/internal/process/functions/call/built-in/built-in-repeat-loop");
 const linker_1 = require("../dataflow/internal/linker");
-const static_slicer_1 = require("../slicing/static/static-slicer");
 const info_1 = require("../dataflow/info");
 const processor_1 = require("../dataflow/processor");
 const default_pipelines_1 = require("../core/steps/pipeline/default-pipelines");
@@ -42,6 +41,7 @@ const normalize_for_1 = require("../r-bridge/lang-4.x/ast/parser/main/internal/l
 const doc_issue_1 = require("./doc-util/doc-issue");
 const pipeline_executor_1 = require("../core/pipeline-executor");
 const pipeline_1 = require("../core/steps/pipeline/pipeline");
+const static_slicer_1 = require("../slicing/static/static-slicer");
 const config_1 = require("../config");
 async function getText(shell) {
     const rversion = (await shell.usedRVersion())?.format() ?? 'unknown';
@@ -373,7 +373,7 @@ Of course, all of these endeavors work not just with the ${(0, doc_types_1.short
 The slicing is available as an extra step as you can see by inspecting he ${(0, doc_types_1.shortLink)('DEFAULT_SLICING_PIPELINE', info)}.
 Besides ${(0, doc_types_1.shortLink)('STATIC_SLICE', info)} it contains a ${(0, doc_types_1.shortLink)('NAIVE_RECONSTRUCT', info)} to print the slice as (executable) R code.
 
-Your main point of interesting here is the ${(0, doc_types_1.shortLink)(static_slicer_1.staticSlicing.name, info)} function which relies on a modified
+Your main point of interesting here is the ${(0, doc_types_1.shortLink)(static_slicer_1.staticSlice.name, info)} function which relies on a modified
 breadth-first search to collect all nodes which are part of the slice. 
 For more information on how the slicing works, please refer to the [tool demonstration (Section 3.2)](https://doi.org/10.1145/3691620.3695359),
 or the [original master's thesis (Chapter 4)](https://doi.org/10.18725/OPARU-50107).

package/documentation/print-dataflow-graph-wiki.js

@@ -835,6 +835,13 @@ The following sections present details on the different types of vertices and ed
 ${(0, doc_general_1.prefixLines)((0, doc_code_1.codeBlock)('ts', 'const node = graph.idMap.get(id);'), '> ')}
 > In case you just need the name (\`lexeme\`) of the respective vertex, ${(0, doc_types_1.shortLink)(node_id_1.recoverName.name, vertexType.info)} can help you out:
 ${(0, doc_general_1.prefixLines)((0, doc_code_1.codeBlock)('ts', `const name = ${node_id_1.recoverName.name}(id, graph.idMap);`), '> ')}
+>
+> Please note that not every node in the normalized AST is represented in the dataflow graph.
+> For example, if the node is unreachable in a way that can be detected during the analysis and flowR
+> is configured to ignore dead code. Likewise, empty argument wrappers do not have a corresponding
+> dataflow graph vertex (as they are not relevant for the dataflow graph). It depends on the scenario what to do in such a case. 
+> For argument wrappers you can access the dataflow information for their value. For dead code, however, flowR currently contains
+> some core heuristics that remove it which cannot be reversed easily. So please open [an issue](${doc_issue_1.NewIssueUrl}) if you encounter such a case and require the node to be present in the dataflow graph.
 
 ${(0, doc_structure_1.section)('Vertices', 2, 'vertices')}
 

package/documentation/print-faq-wiki.js

@@ -39,6 +39,10 @@ With \`npm\` you have to pass arguments in a specific way. The \`--\` operator i
 ${(0, doc_code_1.codeBlock)('shell', 'npm run flowR -- --help')}
 `)}
 
+${qAndA('How to do logging in flowR?', `
+Check out the [Logging Section in the Linting and Testing wiki page](${doc_files_1.FlowrWikiBaseRef}/Linting-and-Testing#logging) for more information on how to do logging in *flowR*.
+`)}
+
 ## 🇷 R FAQ
 
 ### 📦 R Packages