@eagleoutice/flowr 2.9.13 → 2.9.14

package/dataflow/internal/process/functions/call/built-in/built-in-s-three-dispatch.js

@@ -5,7 +5,6 @@ const processor_1 = require("../../../../../processor");
 const info_1 = require("../../../../../info");
 const known_call_handling_1 = require("../known-call-handling");
 const logger_1 = require("../../../../../logger");
-const built_in_1 = require("../../../../../environments/built-in");
 const linker_1 = require("../../../../linker");
 const common_1 = require("../common");
 const unpack_argument_1 = require("../argument/unpack-argument");
@@ -15,6 +14,7 @@ const identifier_1 = require("../../../../../environments/identifier");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const range_1 = require("../../../../../../util/range");
 const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process an S3 dispatch call like `UseMethod`.
  */
@@ -28,13 +28,13 @@ function processS3Dispatch(name, args, rootId, data, config) {
         [config.args.object]: 'object',
         '...': '...'
     };
-    const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
+    const argMaps = (0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params);
     const generic = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('generic')?.[0]));
     if (!generic && !config.inferFromClosure) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
     const obj = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('object')?.[0]));
-    const dfObj = obj ? (0, processor_1.processDataflowFor)(obj, data) : (0, info_1.initializeCleanDataflowInformation)(rootId, data);
+    const dfObj = obj ? (0, processor_1.processDataflowFor)(obj, data) : info_1.DataflowInformation.initialize(rootId, data);
     if ((0, info_1.alwaysExits)(dfObj)) {
         (0, common_1.patchFunctionCall)({
             nextGraph: dfObj.graph,
@@ -42,7 +42,7 @@ function processS3Dispatch(name, args, rootId, data, config) {
             name,
             data,
             argumentProcessResult: [dfObj],
-            origin: built_in_1.BuiltInProcName.S3Dispatch
+            origin: built_in_proc_name_1.BuiltInProcName.S3Dispatch
         });
         return dfObj;
     }
@@ -53,7 +53,7 @@ function processS3Dispatch(name, args, rootId, data, config) {
             name,
             data,
             argumentProcessResult: [dfObj],
-            origin: built_in_1.BuiltInProcName.S3DispatchNext
+            origin: built_in_proc_name_1.BuiltInProcName.S3DispatchNext
         });
         const ingoing = dfObj.in.concat(dfObj.unknownReferences);
         ingoing.push({ nodeId: rootId, name: name.content, cds: data.cds, type: identifier_1.ReferenceType.Function });
@@ -95,7 +95,7 @@ function processS3Dispatch(name, args, rootId, data, config) {
         name: symbol,
         data,
         argumentProcessResult: [], // arguments will be attached by the accompanying enveloping function definition
-        origin: built_in_1.BuiltInProcName.S3Dispatch
+        origin: built_in_proc_name_1.BuiltInProcName.S3Dispatch
     });
     (0, common_1.patchFunctionCall)({
         nextGraph: dfGeneric.graph,
@@ -103,7 +103,7 @@ function processS3Dispatch(name, args, rootId, data, config) {
         name,
         data,
         argumentProcessResult: [dfGeneric, dfObj],
-        origin: built_in_1.BuiltInProcName.Function
+        origin: built_in_proc_name_1.BuiltInProcName.Function
     });
     const ingoing = dfObj.in.concat(dfGeneric.in, dfObj.unknownReferences, dfGeneric.unknownReferences);
     ingoing.push({ nodeId: rootId, name: name.content, cds: data.cds, type: identifier_1.ReferenceType.Function });

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

@@ -1,5 +1,5 @@
 import { type DataflowProcessorInformation } from '../../../../../processor';
-import { type DataflowInformation } from '../../../../../info';
+import { DataflowInformation } from '../../../../../info';
 import { type FlowrLaxSourcingOptions, InferWorkingDirectory } from '../../../../../../config';
 import { type RParseRequest } from '../../../../../../r-bridge/retriever';
 import { type IdGenerator, type ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';

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

@@ -29,8 +29,8 @@ const general_1 = require("../../../../../eval/values/general");
 const r_value_1 = require("../../../../../eval/values/r-value");
 const unknown_side_effect_1 = require("../../../../../graph/unknown-side-effect");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
-const built_in_1 = require("../../../../../environments/built-in");
 const edge_1 = require("../../../../../graph/edge");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Infers working directories based on the given option and reference chain
  */
@@ -137,8 +137,8 @@ function processSourceCall(name, args, rootId, data, config) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
     const information = config.includeFunctionCall ?
-        (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.Source }).information
-        : (0, info_1.initializeCleanDataflowInformation)(rootId, data);
+        (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.Source }).information
+        : info_1.DataflowInformation.initialize(rootId, data);
     const sourceFileArgument = args[0];
     if (!config.forceFollow && data.ctx.config.ignoreSourceCalls) {
         (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Skipping source call ${JSON.stringify(sourceFileArgument)} (disabled in config file)`);

package/dataflow/internal/process/functions/call/built-in/built-in-special-bin-op.js

@@ -4,8 +4,8 @@ exports.processSpecialBinOp = processSpecialBinOp;
 const known_call_handling_1 = require("../known-call-handling");
 const logger_1 = require("../../../../../logger");
 const edge_1 = require("../../../../../graph/edge");
-const built_in_1 = require("../../../../../environments/built-in");
 const identifier_1 = require("../../../../../environments/identifier");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a special built-in binary operator, possibly lazily.
  * For example, the logical AND `&&` and OR `||` operators only evaluate their right-hand side if necessary.
@@ -13,7 +13,7 @@ const identifier_1 = require("../../../../../environments/identifier");
  */
 function processSpecialBinOp(name, args, rootId, data, config) {
     if (!config.lazy) {
-        return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.SpecialBinOp }).information;
+        return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.SpecialBinOp }).information;
     }
     else if (args.length != 2) {
         logger_1.dataflowLogger.warn(`Logical bin-op ${identifier_1.Identifier.toString(name.content)} has something else than 2 arguments, skipping`);
@@ -26,7 +26,7 @@ function processSpecialBinOp(name, args, rootId, data, config) {
             }
             return d;
         },
-        origin: built_in_1.BuiltInProcName.SpecialBinOp
+        origin: built_in_proc_name_1.BuiltInProcName.SpecialBinOp
     });
     for (const arg of processedArguments) {
         if (arg) {

package/dataflow/internal/process/functions/call/built-in/built-in-stop-if-not.js

@@ -9,8 +9,8 @@ const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const general_1 = require("../../../../../eval/values/general");
 const assert_1 = require("../../../../../../util/assert");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
-const built_in_1 = require("../../../../../environments/built-in");
 const identifier_1 = require("../../../../../environments/identifier");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Processes a built-in 'stopifnot' function call.
  * This is special in that it may take a number of boolean expressions either via `...` or
@@ -26,7 +26,7 @@ const identifier_1 = require("../../../../../environments/identifier");
  * ```
  */
 function processStopIfNot(name, args, rootId, data) {
-    const res = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.StopIfNot }).information;
+    const res = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.StopIfNot }).information;
     if (args.length === 0) {
         logger_1.dataflowLogger.warn(`stopifnot (${identifier_1.Identifier.toString(name.content)}) has no argument, assuming trivially true and skipping`);
         return res;

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

@@ -11,20 +11,17 @@ const unpack_argument_1 = require("../argument/unpack-argument");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const assert_1 = require("../../../../../../util/assert");
 const edge_1 = require("../../../../../graph/edge");
-const built_in_1 = require("../../../../../environments/built-in");
 const unnamed_call_handling_1 = require("../unnamed-call-handling");
 const identifier_1 = require("../../../../../environments/identifier");
 const identifier_2 = require("../../../../../environments/identifier");
 const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
 const log_1 = require("../../../../../../util/log");
-function getArgsOfName(argMaps, name) {
-    return new Set(argMaps.entries().filter(([, v]) => v === name).map(([k]) => k));
-}
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a built-in try-catch or similar handler.
  */
 function processTryCatch(name, args, rootId, data, config) {
-    const res = (0, known_call_handling_1.processKnownFunctionCall)({ name, args: args.map(unpack_argument_1.tryUnpackNoNameArg), rootId, data, origin: built_in_1.BuiltInProcName.Try, forceArgs: 'all' });
+    const res = (0, known_call_handling_1.processKnownFunctionCall)({ name, args: args.map(unpack_argument_1.tryUnpackNoNameArg), rootId, data, origin: built_in_proc_name_1.BuiltInProcName.Try, forceArgs: 'all' });
     if (args.length < 1 || args[0] === r_function_call_1.EmptyArgument) {
         logger_1.dataflowLogger.warn(`TryCatch Handler ${identifier_1.Identifier.toString(name.content)} does not have 1 argument, skipping`);
         return res.information;
@@ -43,9 +40,9 @@ function processTryCatch(name, args, rootId, data, config) {
     // only remove exit points from the block
     const argMaps = (0, linker_1.pMatch)(res.callArgs, params);
     const info = res.information;
-    const blockArg = getArgsOfName(argMaps, 'block');
-    const errorArg = getArgsOfName(argMaps, 'error');
-    const finallyArg = getArgsOfName(argMaps, 'finally');
+    const blockArg = new Set(argMaps.get('block'));
+    const errorArg = new Set(argMaps.get('error'));
+    const finallyArg = new Set(argMaps.get('finally'));
     // only take those exit points from the block
     // check whether blockArg has *always* happening exceptions, if so we do not constrain the error handler
     const blockErrorExitPoints = [];
@@ -158,7 +155,7 @@ function promoteCallToFunction(call, arg, info, data) {
             environment: data.environment,
             onlyBuiltin: false,
             cds: data.cds,
-            origin: [built_in_1.BuiltInProcName.Function]
+            origin: [built_in_proc_name_1.BuiltInProcName.Function]
         });
         return functionId;
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVector = processVector;
 const known_call_handling_1 = require("../known-call-handling");
-const built_in_1 = require("../../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a vector call.
  *
@@ -12,6 +12,6 @@ const built_in_1 = require("../../../../../environments/built-in");
  * ```
  */
 function processVector(name, args, rootId, data) {
-    return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.Vector }).information;
+    return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.Vector }).information;
 }
 //# sourceMappingURL=built-in-vector.js.map

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

@@ -13,8 +13,8 @@ const identifier_1 = require("../../../../../environments/identifier");
 const general_1 = require("../../../../../eval/values/general");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
-const built_in_1 = require("../../../../../environments/built-in");
 const append_1 = require("../../../../../environments/append");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a while loop like `while(cond) { ... }`.
  */
@@ -44,7 +44,7 @@ function processWhileLoop(name, args, rootId, data) {
         rootId,
         data,
         markAsNSE: [1],
-        origin: built_in_1.BuiltInProcName.WhileLoop
+        origin: built_in_proc_name_1.BuiltInProcName.WhileLoop
     });
     const [condition, body] = processedArguments;
     // If the condition is always false, we don't include the body

package/dataflow/internal/process/functions/call/known-call-handling.js

@@ -10,7 +10,7 @@ const edge_1 = require("../../../../graph/edge");
 const logger_1 = require("../../../../logger");
 const vertex_1 = require("../../../../graph/vertex");
 const unknown_side_effect_1 = require("../../../../graph/unknown-side-effect");
-const built_in_1 = require("../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../environments/built-in-proc-name");
 /**
  * Marks the given arguments as being involved in R's non-standard evaluation.
  */
@@ -49,7 +49,7 @@ function processKnownFunctionCall({ name, args, rootId, data, reverseOrder = fal
         onlyBuiltin: false,
         cds: data.cds,
         args: reverseOrder ? callArgs.toReversed() : callArgs,
-        origin: origin === 'default' ? [built_in_1.BuiltInProcName.Function] : [origin]
+        origin: origin === 'default' ? [built_in_proc_name_1.BuiltInProcName.Function] : [origin]
     }, data.ctx.env.makeCleanEnv());
     if (hasUnknownSideEffect) {
         (0, unknown_side_effect_1.handleUnknownSideEffect)(finalGraph, data.environment, rootId);

package/dataflow/internal/process/functions/call/named-call-handling.d.ts

@@ -1,5 +1,5 @@
 import type { DataflowProcessorInformation } from '../../../../processor';
-import { type DataflowInformation } from '../../../../info';
+import { DataflowInformation } from '../../../../info';
 import type { ParentInformation } from '../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RFunctionArgument } from '../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
 import type { RSymbol } from '../../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';

package/dataflow/internal/process/functions/call/named-call-handling.js

@@ -64,6 +64,6 @@ function processNamedCall(name, args, rootId, data) {
         // mark the function call as built in only
         markAsOnlyBuiltIn(information.graph, rootId);
     }
-    return information ?? (0, info_1.initializeCleanDataflowInformation)(rootId, data);
+    return information ?? info_1.DataflowInformation.initialize(rootId, data);
 }
 //# sourceMappingURL=named-call-handling.js.map

package/dataflow/internal/process/functions/call/unnamed-call-handling.js

@@ -11,7 +11,7 @@ const vertex_1 = require("../../../../graph/vertex");
 const type_1 = require("../../../../../r-bridge/lang-4.x/ast/model/type");
 const logger_1 = require("../../../../logger");
 const identifier_1 = require("../../../../environments/identifier");
-const built_in_1 = require("../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../environments/built-in-proc-name");
 exports.UnnamedFunctionCallPrefix = 'unnamed-fc-';
 /**
  * Processes an unnamed function call.
@@ -45,7 +45,7 @@ function processUnnamedFunctionCall(functionCall, data) {
         onlyBuiltin: false,
         cds: data.cds,
         args: callArgs, // same reference
-        origin: [built_in_1.BuiltInProcName.Unnamed]
+        origin: [built_in_proc_name_1.BuiltInProcName.Unnamed]
     }, data.ctx.env.makeCleanEnv());
     let inIds = remainingReadInArgs;
     inIds.push({ nodeId: functionRootId, name: functionCallName, cds: data.cds, type: identifier_1.ReferenceType.Function });

package/dataflow/internal/process/process-uninteresting-leaf.d.ts

@@ -1,4 +1,4 @@
-import { type DataflowInformation } from '../../info';
+import { DataflowInformation } from '../../info';
 import type { DataflowProcessorInformation } from '../../processor';
 import type { RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 /**

package/dataflow/internal/process/process-uninteresting-leaf.js

@@ -8,6 +8,6 @@ const info_1 = require("../../info");
  * This can be used to ignore nodes that do not affect dataflow analysis.
  */
 function processUninterestingLeaf(leaf, info) {
-    return (0, info_1.initializeCleanDataflowInformation)(leaf.info.id, info);
+    return info_1.DataflowInformation.initialize(leaf.info.id, info);
 }
 //# sourceMappingURL=process-uninteresting-leaf.js.map

package/dataflow/origin/dfg-get-origin.d.ts

@@ -76,5 +76,5 @@ export type Origin = SimpleOrigin | FunctionCallOrigin | BuiltInFunctionOrigin;
  *
  * This returns undefined only if there is no dataflow correspondence (e.g. in case of unevaluated non-standard eval).
  */
-export declare function getOriginInDfg(dfg: DataflowGraph, id: NodeId): Origin[] | undefined;
+export declare function getOriginInDfg(this: void, dfg: DataflowGraph, id: NodeId): Origin[] | undefined;
 export {};

package/dataflow/origin/dfg-get-symbol-refs.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllRefsToSymbol = getAllRefsToSymbol;
 const edge_1 = require("../graph/edge");
 const info_1 = require("../info");
-const dfg_get_origin_1 = require("./dfg-get-origin");
+const df_helper_1 = require("../graph/df-helper");
 /**
  * Finds the definition of a variable and all other uses from that point on
  *
@@ -22,7 +22,7 @@ const dfg_get_origin_1 = require("./dfg-get-origin");
  */
 function getAllRefsToSymbol(graph, nodeId) {
     // Get all origins and filter for ones that happen for sure
-    const origins = (0, dfg_get_origin_1.getOriginInDfg)(graph, nodeId);
+    const origins = df_helper_1.Dataflow.origin(graph, nodeId);
     if (origins === undefined) {
         return undefined;
     }
@@ -32,13 +32,13 @@ function getAllRefsToSymbol(graph, nodeId) {
     }
     // Gather all the references
     const res = new Set();
-    for (const origin of definitiveOrigins) {
-        res.add(origin.id);
-        graph.ingoingEdges(origin.id)
+    for (const { id } of definitiveOrigins) {
+        res.add(id);
+        graph.ingoingEdges(id)
             ?.entries()
             .filter(([_, edge]) => edge_1.DfEdge.includesType(edge, edge_1.EdgeType.Reads))
             .forEach(([node, _]) => res.add(node));
-        graph.outgoingEdges(origin.id)
+        graph.outgoingEdges(id)
             ?.entries()
             .filter(([_, edge]) => edge_1.DfEdge.includesType(edge, edge_1.EdgeType.DefinedByOnCall))
             .forEach(([node, _]) => res.add(node));

package/documentation/doc-util/doc-dfg.d.ts

@@ -8,6 +8,9 @@ import type { MermaidMarkdownMark } from '../../util/mermaid/info';
  * Please use this only for documentation purposes, for programmatic usage use {@link graphToMermaid} directly.
  */
 export declare function printDfGraph(graph: DataflowGraph, mark?: ReadonlySet<MermaidMarkdownMark>, simplified?: boolean): string;
+/**
+ * Options for {@link printDfGraphForCode}.
+ */
 export interface PrintDataflowGraphOptions {
     readonly mark?: ReadonlySet<MermaidMarkdownMark>;
     readonly showCode?: boolean;

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

@@ -4,16 +4,14 @@ exports.printDfGraph = printDfGraph;
 exports.formatSideEffect = formatSideEffect;
 exports.printDfGraphForCode = printDfGraphForCode;
 exports.verifyExpectedSubgraph = verifyExpectedSubgraph;
-const dfg_1 = require("../../util/mermaid/dfg");
 const default_pipelines_1 = require("../../core/steps/pipeline/default-pipelines");
 const decorate_1 = require("../../r-bridge/lang-4.x/ast/model/processing/decorate");
-const resolve_graph_1 = require("../../dataflow/graph/resolve-graph");
-const diff_dataflow_graph_1 = require("../../dataflow/graph/diff-dataflow-graph");
 const assert_1 = require("../../util/assert");
 const time_1 = require("../../util/text/time");
 const doc_files_1 = require("./doc-files");
 const doc_code_1 = require("./doc-code");
 const flowr_analyzer_context_1 = require("../../project/context/flowr-analyzer-context");
+const df_helper_1 = require("../../dataflow/graph/df-helper");
 const call_graph_1 = require("../../dataflow/graph/call-graph");
 /**
  * Visualizes the dataflow graph as a mermaid graph inside a markdown code block.
@@ -21,7 +19,7 @@ const call_graph_1 = require("../../dataflow/graph/call-graph");
  */
 function printDfGraph(graph, mark, simplified = false) {
     return `
-${(0, doc_code_1.codeBlock)('mermaid', (0, dfg_1.graphToMermaid)({
+${(0, doc_code_1.codeBlock)('mermaid', df_helper_1.Dataflow.visualize.mermaid.convert({
         graph,
         prefix: 'flowchart LR',
         mark,
@@ -55,7 +53,7 @@ async function printDfGraphForCode(parser, code, { callGraph = false, simplified
         (0, assert_1.guard)(showCode, 'can not switch code and graph if code is not shown');
     }
     const metaInfo = `The analysis required _${(0, time_1.printAsMs)(duration)}_ (including parse and normalize, using the [${parser.name}](${doc_files_1.FlowrWikiBaseRef}/Engines) engine) within the generation environment.`;
-    const graph = callGraph ? (0, call_graph_1.computeCallGraph)(result.dataflow.graph) : result.dataflow.graph;
+    const graph = callGraph ? call_graph_1.CallGraph.compute(result.dataflow.graph) : result.dataflow.graph;
     const dfGraph = printDfGraph(graph, mark, simplified);
     const simplyText = simplified ? '(simplified) ' : '';
     const graphName = callGraph ? 'Call Graph' : 'Dataflow Graph';
@@ -92,8 +90,8 @@ async function verifyExpectedSubgraph(parser, code, expectedSubgraph) {
         getId: (0, decorate_1.deterministicCountingIdGenerator)(0)
     }).allRemainingSteps();
     expectedSubgraph.setIdMap(info.normalize.idMap);
-    expectedSubgraph = (0, resolve_graph_1.resolveDataflowGraph)(expectedSubgraph, context);
-    const report = (0, diff_dataflow_graph_1.diffOfDataflowGraphs)({ name: 'expected', graph: expectedSubgraph }, { name: 'got', graph: info.dataflow.graph }, {
+    expectedSubgraph = df_helper_1.Dataflow.resolveGraphCriteria(expectedSubgraph, context);
+    const report = df_helper_1.Dataflow.diffGraphs({ name: 'expected', graph: expectedSubgraph }, { name: 'got', graph: info.dataflow.graph }, {
         leftIsSubgraph: true
     });
     (0, assert_1.guard)(report.isEqual(), () => `report:\n * ${report.comments()?.join('\n * ') ?? ''}`);

package/documentation/doc-util/doc-normalized-ast.d.ts

@@ -1,5 +1,3 @@
-import type { DataflowGraph } from '../../dataflow/graph/graph';
-import type { RShell } from '../../r-bridge/shell';
 import { type ParentInformation, type RNodeWithParent } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { KnownParser } from '../../r-bridge/parser';
 import type { RProject } from '../../r-bridge/lang-4.x/ast/model/nodes/r-project';
@@ -17,7 +15,3 @@ export interface PrintNormalizedAstOptions {
  * This is intended for documentation purposes.
  */
 export declare function printNormalizedAstForCode(parser: KnownParser, code: string, { showCode, prefix }?: PrintNormalizedAstOptions): Promise<string>;
-/**
- * returns resolved expected df graph
- */
-export declare function verifyExpectedSubgraph(shell: RShell, code: string, expectedSubgraph: DataflowGraph): Promise<DataflowGraph>;

package/documentation/doc-util/doc-normalized-ast.js

@@ -2,12 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printNormalizedAst = printNormalizedAst;
 exports.printNormalizedAstForCode = printNormalizedAstForCode;
-exports.verifyExpectedSubgraph = verifyExpectedSubgraph;
 const default_pipelines_1 = require("../../core/steps/pipeline/default-pipelines");
-const decorate_1 = require("../../r-bridge/lang-4.x/ast/model/processing/decorate");
-const resolve_graph_1 = require("../../dataflow/graph/resolve-graph");
-const diff_dataflow_graph_1 = require("../../dataflow/graph/diff-dataflow-graph");
-const assert_1 = require("../../util/assert");
 const ast_1 = require("../../util/mermaid/ast");
 const time_1 = require("../../util/text/time");
 const doc_files_1 = require("./doc-files");
@@ -59,22 +54,4 @@ ${(0, ast_1.normalizedAstToMermaid)(result.normalize.ast, { prefix })}
 
 ` : '\n(' + metaInfo + ')\n\n');
 }
-/**
- * returns resolved expected df graph
- */
-async function verifyExpectedSubgraph(shell, code, expectedSubgraph) {
-    /* we verify that we get what we want first! */
-    const context = (0, flowr_analyzer_context_1.contextFromInput)(code);
-    const info = await (0, default_pipelines_1.createDataflowPipeline)(shell, {
-        context: context,
-        getId: (0, decorate_1.deterministicCountingIdGenerator)(0)
-    }).allRemainingSteps();
-    expectedSubgraph.setIdMap(info.normalize.idMap);
-    expectedSubgraph = (0, resolve_graph_1.resolveDataflowGraph)(expectedSubgraph, context);
-    const report = (0, diff_dataflow_graph_1.diffOfDataflowGraphs)({ name: 'expected', graph: expectedSubgraph }, { name: 'got', graph: info.dataflow.graph }, {
-        leftIsSubgraph: true
-    });
-    (0, assert_1.guard)(report.isEqual(), () => `report:\n * ${report.comments()?.join('\n * ') ?? ''}`);
-    return expectedSubgraph;
-}
 //# sourceMappingURL=doc-normalized-ast.js.map

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

@@ -5,8 +5,8 @@ exports.block = block;
 exports.section = section;
 exports.collapsibleToc = collapsibleToc;
 const doc_general_1 = require("./doc-general");
-const mermaid_1 = require("../../util/mermaid/mermaid");
 const strings_1 = require("../../util/text/strings");
+const mermaid_1 = require("../../util/mermaid/mermaid");
 /**
  *
  */
@@ -31,7 +31,7 @@ ${(0, doc_general_1.prefixLines)(content, '> ')}
 /**
  *
  */
-function section(title, depth = 2, anchor = (0, mermaid_1.escapeId)(title)) {
+function section(title, depth = 2, anchor = mermaid_1.Mermaid.escapeId(title)) {
     return `<h${depth} id="${anchor}">${title}</h${depth}>`;
 }
 function strToLink(str) {
@@ -40,7 +40,7 @@ function strToLink(str) {
         const [, name, link] = match;
         return `[${name}](${link})`;
     }
-    return `[${str}](#${(0, mermaid_1.escapeId)(str)})`;
+    return `[${str}](#${mermaid_1.Mermaid.escapeId(str)})`;
 }
 /**
  * Supported pattern: `Name@link`

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

@@ -54,11 +54,11 @@ const assert_1 = require("../../util/assert");
 const doc_files_1 = require("./doc-files");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const mermaid_1 = require("../../util/mermaid/mermaid");
 const doc_code_1 = require("./doc-code");
 const doc_structure_1 = require("./doc-structure");
 const html_hover_over_1 = require("../../util/html-hover-over");
 const doc_general_1 = require("./doc-general");
+const mermaid_1 = require("../../util/mermaid/mermaid");
 const options = {
     target: typescript_1.default.ScriptTarget.ESNext,
     skipLibCheck: true,
@@ -186,7 +186,7 @@ function formatNode(node, sourceFile, typeChecker) {
     }
     const type = getType(node, typeChecker);
     const typeAnnotation = type.includes('=>') ? type.replaceAll(/\s+=>\s+/g, ' ') : ': ' + type;
-    return `${prefix}${(0, mermaid_1.escapeMarkdown)(name + typeAnnotation)}${suffix}`;
+    return `${prefix}${mermaid_1.Mermaid.escape(name + typeAnnotation)}${suffix}`;
 }
 function getType(node, typeChecker) {
     const tryDirect = typeChecker.getTypeAtLocation(node);
@@ -381,7 +381,7 @@ function generateMermaidClassDiagram(hierarchyList, rootName, options, visited =
     if (node.kind === 'type') {
         collect.nodeLines.push(`style ${node.name} opacity:.35,fill:#FAFAFA`);
     }
-    collect.nodeLines.push(`click ${node.name} href "${getTypePathLink(node)}" "${(0, mermaid_1.escapeMarkdown)(node.comments?.join('; ').replace(/\n/g, ' ') ?? '')}"`);
+    collect.nodeLines.push(`click ${node.name} href "${getTypePathLink(node)}" "${mermaid_1.Mermaid.escape(node.comments?.join('; ').replace(/\n/g, ' ') ?? '')}"`);
     const inline = [...options.inlineTypes ?? [], ...defaultSkip];
     let baseTypes = node.extends;
     if (options.reverse) {

package/documentation/wiki-core.js

@@ -45,6 +45,7 @@ const doc_structure_1 = require("./doc-util/doc-structure");
 const shell_1 = require("../r-bridge/shell");
 const log_1 = require("../../test/functionality/_helper/log");
 const log_2 = require("../util/log");
+const model_1 = require("../r-bridge/lang-4.x/ast/model/model");
 async function makeAnalyzerExample() {
     const analyzer = await new flowr_analyzer_builder_1.FlowrAnalyzerBuilder()
         .configure('ignoreSourceCalls', true)
@@ -308,7 +309,7 @@ If you are interested in the raw token types that we may encounter, have a look
 The normalization function ${ctx.link(parser_2.normalize)} takes the output from the previous steps and uses the ${ctx.link(format_1.prepareParsedData)} and 
 ${ctx.link(format_1.convertPreparedParsedData)} functions to first transform the serialized parsing output to an object. 
 Next, ${ctx.link(normalize_root_1.normalizeRootObjToAst)} transforms this object to a normalized AST and ${ctx.link(decorate_1.decorateAst)} adds additional information to the AST (like roles, ids, depth, etc.).
-While looking at the mermaid visualization of such an AST is nice and usually sufficient, looking at the objects themselves shows you the full range of information the AST provides (all encompassed within the ${ctx.link('RNode')} type).
+While looking at the mermaid visualization of such an AST is nice and usually sufficient, looking at the objects themselves shows you the full range of information the AST provides (all encompassed within the ${ctx.link(model_1.RNode)} type).
 
 Let's have a look at the normalized AST for the sample code \`${sampleCode}\` (please refer to the [normalized AST](${doc_files_1.FlowrWikiBaseRef}/Normalized-AST) wiki page for more information):
 
@@ -358,7 +359,7 @@ We use the ${ctx.link(extractor_1.produceDataFlowGraph)} function as an entry po
 The function is mainly backed by its ${ctx.link('processors')} object which maps each type in the normalized AST to an appropriate handler ("fold-function").
 
 To understand these handlers, let's start with the simplest one, ${ctx.link(process_uninteresting_leaf_1.processUninterestingLeaf)} signals that 
-we do not care about this node and just produce an empty dataflow information (using ${ctx.link(info_1.initializeCleanDataflowInformation)}). 
+we do not care about this node and just produce an empty dataflow information (using ${ctx.linkO(info_1.DataflowInformation, 'initialize')}). 
 Looking at the function showcases the general structure of a processor:
 
 ${ctx.hierarchy(process_uninteresting_leaf_1.processUninterestingLeaf, { maxDepth: 2, openTop: true })}
@@ -384,7 +385,7 @@ ${ctx.hierarchy(process_value_1.processValue, { maxDepth: 2, openTop: true })}
 
 Please note, that we add the [value vertex](${doc_files_1.FlowrWikiBaseRef}/Dataflow-Graph#value-vertex) to the newly created dataflow graph,
 which holds a reference to the constant. If you are confused with the use of the ${ctx.link('ParentInformation')} type, 
-this stems from the [AST decoration](#normalization) and signals that we have a decorated ${ctx.link('RNode')} (which may have additional information in \`OtherInfo\`).
+this stems from the [AST decoration](#normalization) and signals that we have a decorated ${ctx.link(model_1.RNode)} (which may have additional information in \`OtherInfo\`).
 
 Yet again, this is not very interesting. When looking at the ${ctx.link('processors')} object you may be confused by
 many lines just mapping the node to the ${ctx.link(process_named_call_1.processAsNamedCall)} function.
@@ -424,7 +425,7 @@ to produce a new dataflow information.
 
 Given the [dataflow graph](${doc_files_1.FlowrWikiBaseRef}/Dataflow-Graph), you can do a lot more!
 You can issue [queries](${doc_files_1.FlowrWikiBaseRef}/Query-API) to explore the graph, [search](${doc_files_1.FlowrWikiBaseRef}/Search-API) for specific elements, or, for example, request a [static backward slice](#static-backward-slicing).
-Of course, all of these endeavors work not just with the ${ctx.link(shell_1.RShell.name)} but also with the [\`tree-sitter\` engine](${doc_files_1.FlowrWikiBaseRef}/Engines). 
+Of course, all of these endeavors work not just with the ${ctx.link(shell_1.RShell)} but also with the [\`tree-sitter\` engine](${doc_files_1.FlowrWikiBaseRef}/Engines). 
 
 ### Static Backward Slicing