@eagleoutice/flowr 2.2.13 → 2.2.15

package/README.md

@@ -51,7 +51,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.2.12, R v4.4.3 (r-shell engine)
+    flowR repl using flowR v2.2.14, R v4.4.3 (r-shell engine)
     R> :slicer test/testfiles/example.R --criterion "11@sum"
     ```
     
@@ -98,7 +98,7 @@ It offers a wide variety of features, for example:
         
 
 * 🚀 **fast data- and control-flow graphs**\
-  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">124.8 ms</span></i> (as of Mar 17, 2025), 
+  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">133.8 ms</span></i> (as of May 31, 2025), 
   _flowR_ can analyze the data- and control-flow of the average real-world R script. See the [benchmarks](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark) for more information,
   and consult the [wiki pages](https://github.com/flowr-analysis/flowr/wiki/Dataflow-Graph) for more details on the dataflow graph.
 
@@ -134,7 +134,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.2.12, R v4.4.3 (r-shell engine)
+    flowR repl using flowR v2.2.14, R v4.4.3 (r-shell engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -435,7 +435,7 @@ It offers a wide variety of features, for example:
     ```
     
     	
-    (The analysis required _22.6 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _22.8 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/cli/repl/commands/repl-cfg.d.ts

@@ -1,5 +1,5 @@
 import type { ReplCommand } from './repl-main';
 export declare const controlflowCommand: ReplCommand;
 export declare const controlflowStarCommand: ReplCommand;
-export declare const controlflowBBCommand: ReplCommand;
-export declare const controlflowBBStarCommand: ReplCommand;
+export declare const controlflowBbCommand: ReplCommand;
+export declare const controlflowBbStarCommand: ReplCommand;

package/cli/repl/commands/repl-cfg.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.controlflowBBStarCommand = exports.controlflowBBCommand = exports.controlflowStarCommand = exports.controlflowCommand = void 0;
+exports.controlflowBbStarCommand = exports.controlflowBbCommand = exports.controlflowStarCommand = exports.controlflowCommand = void 0;
 const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
@@ -53,7 +53,7 @@ function formatInfo(out, type) {
 }
 async function produceAndPrintCfg(shell, remainingLine, output, simplifications, cfgConverter) {
     const result = await controlflow(shell, handleString(remainingLine));
-    const cfg = (0, extract_cfg_1.extractCFG)(result.normalize, result.dataflow.graph, [...cfg_simplification_1.DefaultCfgSimplificationOrder, ...simplifications]);
+    const cfg = (0, extract_cfg_1.extractCfg)(result.normalize, result.dataflow.graph, [...cfg_simplification_1.DefaultCfgSimplificationOrder, ...simplifications]);
     const mermaid = cfgConverter(cfg, result.normalize);
     output.stdout(mermaid);
     try {
@@ -82,7 +82,7 @@ exports.controlflowStarCommand = {
         await produceAndPrintCfg(shell, remainingLine, output, [], cfg_1.cfgToMermaidUrl);
     }
 };
-exports.controlflowBBCommand = {
+exports.controlflowBbCommand = {
     description: `Get mermaid code for the control-flow graph with basic blocks, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':controlflowbb',
     aliases: ['cfgb', 'cfb'],
@@ -91,7 +91,7 @@ exports.controlflowBBCommand = {
         await produceAndPrintCfg(shell, remainingLine, output, ['to-basic-blocks'], cfg_1.cfgToMermaid);
     }
 };
-exports.controlflowBBStarCommand = {
+exports.controlflowBbStarCommand = {
     description: 'Returns the URL to mermaid.live',
     usageExample: ':controlflowbb*',
     aliases: ['cfgb*', 'cfb*'],

package/cli/repl/commands/repl-commands.js

@@ -53,7 +53,7 @@ exports.helpCommand = {
     fn: output => {
         initCommandMapping();
         output.stdout(`
-If enabled ('--r-session-access'), you can just enter R expressions which get evaluated right away:
+If enabled ('--r-session-access' and if using the 'r-shell' engine), you can just enter R expressions which get evaluated right away:
 ${prompt_1.rawPrompt} ${(0, ansi_1.bold)('1 + 1', output.formatter)}
 ${(0, ansi_1.italic)('[1] 2', output.formatter)}
 
@@ -85,8 +85,8 @@ const _commands = {
     'dataflowsimple*': repl_dataflow_1.dataflowSimpleStarCommand,
     'controlflow': repl_cfg_1.controlflowCommand,
     'controlflow*': repl_cfg_1.controlflowStarCommand,
-    'controlflowbb': repl_cfg_1.controlflowBBCommand,
-    'controlflowbb*': repl_cfg_1.controlflowBBStarCommand,
+    'controlflowbb': repl_cfg_1.controlflowBbCommand,
+    'controlflowbb*': repl_cfg_1.controlflowBbStarCommand,
     'lineage': repl_lineage_1.lineageCommand,
     'query': repl_query_1.queryCommand,
     'query*': repl_query_1.queryStarCommand

package/cli/repl/commands/repl-execute.js

@@ -6,7 +6,8 @@ const ansi_1 = require("../../../util/text/ansi");
 const shell_1 = require("../../../r-bridge/shell");
 async function tryExecuteRShellCommand(output, parser, statement, allowRSessionAccess) {
     if (!allowRSessionAccess) {
-        output.stderr(`${output.formatter.format('You are not allowed to execute arbitrary R code.', { style: 1 /* FontStyles.Bold */, color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground })}\nIf you want to do so, please restart flowR with the ${output.formatter.format('--r-session-access', { style: 1 /* FontStyles.Bold */ })} flag. Please be careful of the security implications of this action.`);
+        output.stderr(`${output.formatter.format('You are not allowed to execute arbitrary R code.', { style: 1 /* FontStyles.Bold */, color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground })} 
+If you want to do so, please restart flowR with the ${output.formatter.format('--r-session-access', { style: 1 /* FontStyles.Bold */ })} flag${parser.name !== 'r-shell' ? '. Additionally, please enable the r-shell engine, e.g., with ' + output.formatter.format('--default-engine r-shell', { style: 1 /* FontStyles.Bold */ }) : ''}. Please be careful of the security implications of this action.`);
     }
     else if (parser instanceof shell_1.RShell) {
         await executeRShellCommand(output, parser, statement);

package/cli/repl/server/connection.js

@@ -160,7 +160,7 @@ class FlowRServerConnection {
     async sendFileAnalysisResponse(slicer, results, message) {
         let cfg = undefined;
         if (message.cfg) {
-            cfg = (0, extract_cfg_1.extractCFG)(results.normalize, results.dataflow?.graph);
+            cfg = (0, extract_cfg_1.extractCfg)(results.normalize, results.dataflow?.graph);
         }
         const config = () => ({ context: message.filename ?? 'unknown', getId: (0, quads_1.defaultQuadIdGenerator)() });
         const sanitizedResults = sanitizeAnalysisResults(results);

package/cli/script-core/statistics-helper-core.js

@@ -58,7 +58,7 @@ async function getStatsForSingleFile(options) {
     if (stats.outputs.size === 1) {
         if (options['dump-json']) {
             const [, output] = [...stats.outputs.entries()][0];
-            const cfg = (0, extract_cfg_1.extractCFG)(output.normalize, output.dataflow.graph);
+            const cfg = (0, extract_cfg_1.extractCfg)(output.normalize, output.dataflow.graph);
             statistics_file_1.statisticsFileProvider.append('output-json', 'parse', await (0, print_1.printStepResult)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, output.parse, 2 /* StepOutputFormat.Json */));
             statistics_file_1.statisticsFileProvider.append('output-json', 'normalize', await (0, print_1.printStepResult)(_10_normalize_1.NORMALIZE, output.normalize, 2 /* StepOutputFormat.Json */));
             statistics_file_1.statisticsFileProvider.append('output-json', 'dataflow', await (0, print_1.printStepResult)(_20_dataflow_1.STATIC_DATAFLOW, output.dataflow, 2 /* StepOutputFormat.Json */));

package/config.js

@@ -67,7 +67,7 @@ exports.defaultConfigOptions = {
         }
     },
     engines: [],
-    defaultEngine: 'r-shell',
+    defaultEngine: 'tree-sitter',
     solver: {
         variables: VariableResolve.Alias,
         evalStrings: true,

package/control-flow/basic-cfg-guided-visitor.d.ts

@@ -1,7 +1,7 @@
 import type { CfgBasicBlockVertex, CfgEndMarkerVertex, CfgExpressionVertex, CfgMidMarkerVertex, CfgSimpleVertex, CfgStatementVertex, ControlFlowInformation } from './control-flow-graph';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
-export interface BasicCfgGuidedVisitorConfiguration<Cfg extends ControlFlowInformation = ControlFlowInformation> {
-    readonly controlFlow: Cfg;
+export interface BasicCfgGuidedVisitorConfiguration<ControlFlow extends ControlFlowInformation = ControlFlowInformation> {
+    readonly controlFlow: ControlFlow;
     readonly defaultVisitingOrder: 'forward' | 'backward';
 }
 /**
@@ -11,7 +11,7 @@ export interface BasicCfgGuidedVisitorConfiguration<Cfg extends ControlFlowInfor
  *
  * Use {@link BasicCfgGuidedVisitor#start} to start the traversal.
  */
-export declare class BasicCfgGuidedVisitor<Cfg extends ControlFlowInformation = ControlFlowInformation, Config extends BasicCfgGuidedVisitorConfiguration<Cfg> = BasicCfgGuidedVisitorConfiguration<Cfg>> {
+export declare class BasicCfgGuidedVisitor<ControlFlow extends ControlFlowInformation = ControlFlowInformation, Config extends BasicCfgGuidedVisitorConfiguration<ControlFlow> = BasicCfgGuidedVisitorConfiguration<ControlFlow>> {
     protected readonly config: Config;
     protected readonly visited: Map<NodeId, number>;
     constructor(config: Config);

package/control-flow/cfg-dead-code.d.ts

@@ -0,0 +1,4 @@
+import type { ControlFlowInformation } from './control-flow-graph';
+import type { CfgPassInfo } from './cfg-simplification';
+/** Breaks unsatisfiable control dependencies */
+export declare function cfgAnalyzeDeadCode(cfg: ControlFlowInformation, info: CfgPassInfo): ControlFlowInformation;

package/control-flow/cfg-dead-code.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cfgAnalyzeDeadCode = cfgAnalyzeDeadCode;
+const logic_1 = require("../util/logic");
+const semantic_cfg_guided_visitor_1 = require("./semantic-cfg-guided-visitor");
+const alias_tracking_1 = require("../dataflow/eval/resolve/alias-tracking");
+const log_1 = require("../util/log");
+const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const general_1 = require("../dataflow/eval/values/general");
+const r_value_1 = require("../dataflow/eval/values/r-value");
+class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.SemanticCfgGuidedVisitor {
+    cachedConditions = new Map();
+    getValue(id) {
+        const has = this.cachedConditions.get(id);
+        if (has) {
+            return has;
+        }
+        this.visitNode(id);
+        return this.cachedConditions.get(id) ?? logic_1.Ternary.Maybe;
+    }
+    unableToCalculateValue(id) {
+        this.cachedConditions.set(id, logic_1.Ternary.Maybe);
+    }
+    storeDefiniteValue(id, value) {
+        this.cachedConditions.set(id, value ? logic_1.Ternary.Always : logic_1.Ternary.Never);
+    }
+    startVisitor() {
+        for (const [from, targets] of this.config.controlFlow.graph.edges()) {
+            for (const [target, edge] of targets) {
+                if (edge.label === 1 /* CfgEdgeType.Cd */) {
+                    const og = this.getValue(edge.caused);
+                    if (og === logic_1.Ternary.Always && edge.when === 'FALSE') {
+                        this.config.controlFlow.graph.removeEdge(from, target);
+                    }
+                    else if (og === logic_1.Ternary.Never && edge.when === 'TRUE') {
+                        this.config.controlFlow.graph.removeEdge(from, target);
+                    }
+                }
+            }
+        }
+    }
+    handleValuesFor(id, valueId) {
+        const values = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(valueId, { graph: this.config.dfg, full: true, idMap: this.config.normalizedAst.idMap }));
+        if (values === undefined || values.elements.length !== 1 || values.elements[0].type != 'logical' || !(0, r_value_1.isValue)(values.elements[0].value)) {
+            this.unableToCalculateValue(id);
+            return;
+        }
+        /* we should translate this to truthy later */
+        this.storeDefiniteValue(id, Boolean(values.elements[0].value));
+    }
+    handleWithCondition(data) {
+        const id = data.call.id;
+        if (data.condition === undefined || data.condition === r_function_call_1.EmptyArgument) {
+            this.unableToCalculateValue(id);
+            return;
+        }
+        this.handleValuesFor(id, typeof data.condition === 'object' ? data.condition.nodeId : data.condition);
+    }
+    onIfThenElseCall(data) {
+        this.handleWithCondition(data);
+    }
+    onWhileLoopCall(data) {
+        this.handleWithCondition(data);
+    }
+}
+/** Breaks unsatisfiable control dependencies */
+function cfgAnalyzeDeadCode(cfg, info) {
+    if (!info.ast || !info.dfg) {
+        log_1.log.warn('cfgAnalyzeDeadCode called without ast or dfg, skipping dead code analysis');
+        return cfg;
+    }
+    const visitor = new CfgConditionalDeadCodeRemoval({
+        controlFlow: cfg,
+        normalizedAst: info.ast,
+        dfg: info.dfg,
+        defaultVisitingOrder: 'forward'
+    });
+    visitor.start();
+    return cfg;
+}
+//# sourceMappingURL=cfg-dead-code.js.map

package/control-flow/cfg-simplification.d.ts

@@ -1,7 +1,15 @@
 import type { ControlFlowInformation } from './control-flow-graph';
-export type CfgSimplificationPass = (cfg: ControlFlowInformation) => ControlFlowInformation;
-declare const CfgSimplificationPasses: {
+import type { NormalizedAst } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { DataflowGraph } from '../dataflow/graph/graph';
+import { cfgAnalyzeDeadCode } from './cfg-dead-code';
+export interface CfgPassInfo {
+    ast?: NormalizedAst;
+    dfg?: DataflowGraph;
+}
+export type CfgSimplificationPass = (cfg: ControlFlowInformation, info: CfgPassInfo) => ControlFlowInformation;
+export declare const CfgSimplificationPasses: {
     readonly 'unique-cf-sets': typeof uniqueControlFlowSets;
+    readonly 'analyze-dead-code': typeof cfgAnalyzeDeadCode;
     readonly 'remove-dead-code': typeof cfgRemoveDeadCode;
     readonly 'to-basic-blocks': typeof toBasicBlocks;
 };
@@ -11,8 +19,11 @@ export declare const DefaultCfgSimplificationOrder: ["unique-cf-sets"];
  * Simplify the control flow information by applying the given passes.
  * This may reduce the vertex count, in- and outgoing edges, entry and exit points, etc.
  */
-export declare function simplifyControlFlowInformation(cfg: ControlFlowInformation, passes?: readonly CfgSimplificationPassName[]): ControlFlowInformation;
-declare function uniqueControlFlowSets(cfg: ControlFlowInformation): ControlFlowInformation;
-declare function cfgRemoveDeadCode(cfg: ControlFlowInformation): ControlFlowInformation;
-declare function toBasicBlocks(cfg: ControlFlowInformation): ControlFlowInformation;
+export declare function simplifyControlFlowInformation(cfg: ControlFlowInformation, info: CfgPassInfo, passes?: readonly CfgSimplificationPassName[]): ControlFlowInformation;
+/**
+ * removes dead vertices and edges from the control flow graph.
+ */
+declare function cfgRemoveDeadCode(cfg: ControlFlowInformation, _info?: CfgPassInfo): ControlFlowInformation;
+declare function uniqueControlFlowSets(cfg: ControlFlowInformation, _info?: CfgPassInfo): ControlFlowInformation;
+declare function toBasicBlocks(cfg: ControlFlowInformation, _info?: CfgPassInfo): ControlFlowInformation;
 export {};

package/control-flow/cfg-simplification.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultCfgSimplificationOrder = void 0;
+exports.DefaultCfgSimplificationOrder = exports.CfgSimplificationPasses = void 0;
 exports.simplifyControlFlowInformation = simplifyControlFlowInformation;
-const simple_visitor_1 = require("./simple-visitor");
 const cfg_to_basic_blocks_1 = require("./cfg-to-basic-blocks");
-const CfgSimplificationPasses = {
+const simple_visitor_1 = require("./simple-visitor");
+const cfg_dead_code_1 = require("./cfg-dead-code");
+exports.CfgSimplificationPasses = {
     'unique-cf-sets': uniqueControlFlowSets,
+    'analyze-dead-code': cfg_dead_code_1.cfgAnalyzeDeadCode,
     'remove-dead-code': cfgRemoveDeadCode,
     'to-basic-blocks': toBasicBlocks
 };
@@ -18,25 +20,17 @@ exports.DefaultCfgSimplificationOrder = [
  * Simplify the control flow information by applying the given passes.
  * This may reduce the vertex count, in- and outgoing edges, entry and exit points, etc.
  */
-function simplifyControlFlowInformation(cfg, passes = exports.DefaultCfgSimplificationOrder) {
+function simplifyControlFlowInformation(cfg, info, passes = exports.DefaultCfgSimplificationOrder) {
     for (const pass of passes) {
-        const passFn = CfgSimplificationPasses[pass];
-        cfg = passFn(cfg);
+        const passFn = exports.CfgSimplificationPasses[pass];
+        cfg = passFn(cfg, info);
     }
     return cfg;
 }
-function uniqueControlFlowSets(cfg) {
-    return {
-        returns: [...new Set(cfg.returns)],
-        entryPoints: [...new Set(cfg.entryPoints)],
-        exitPoints: [...new Set(cfg.exitPoints)],
-        breaks: [...new Set(cfg.breaks)],
-        nexts: [...new Set(cfg.nexts)],
-        graph: cfg.graph
-    };
-}
-/* currently this does not do work on function definitions */
-function cfgRemoveDeadCode(cfg) {
+/**
+ * removes dead vertices and edges from the control flow graph.
+ */
+function cfgRemoveDeadCode(cfg, _info) {
     // remove every root level node and accompanying vertices that can not be reached from the entry points
     const reachable = new Set();
     (0, simple_visitor_1.visitCfgInOrder)(cfg.graph, cfg.entryPoints, node => {
@@ -49,7 +43,17 @@ function cfgRemoveDeadCode(cfg) {
     }
     return cfg;
 }
-function toBasicBlocks(cfg) {
+function uniqueControlFlowSets(cfg, _info) {
+    return {
+        returns: [...new Set(cfg.returns)],
+        entryPoints: [...new Set(cfg.entryPoints)],
+        exitPoints: [...new Set(cfg.exitPoints)],
+        breaks: [...new Set(cfg.breaks)],
+        nexts: [...new Set(cfg.nexts)],
+        graph: cfg.graph
+    };
+}
+function toBasicBlocks(cfg, _info) {
     return (0, cfg_to_basic_blocks_1.convertCfgToBasicBlocks)(cfg);
 }
 //# sourceMappingURL=cfg-simplification.js.map

package/control-flow/control-flow-graph.d.ts

@@ -70,7 +70,7 @@ export declare function equalVertex(a: CfgSimpleVertex, b: CfgSimpleVertex): boo
 interface CfgFlowDependencyEdge extends MergeableRecord {
     label: CfgEdgeType.Fd;
 }
-interface CfgControlDependencyEdge extends MergeableRecord {
+export interface CfgControlDependencyEdge extends MergeableRecord {
     label: CfgEdgeType.Cd;
     /** the id which caused the control dependency */
     caused: NodeId;
@@ -166,6 +166,7 @@ export interface ReadOnlyControlFlowGraph {
  */
 export declare class ControlFlowGraph<Vertex extends CfgSimpleVertex = CfgSimpleVertex> implements ReadOnlyControlFlowGraph {
     private readonly rootVertices;
+    /** Nesting-Independent vertex information, mapping the id to the vertex */
     private readonly vertexInformation;
     /** the basic block children map contains a mapping of ids to all vertices that are nested in basic blocks, mapping them to the Id of the block they appear in */
     private readonly bbChildren;

package/control-flow/control-flow-graph.js

@@ -55,6 +55,7 @@ function equalVertex(a, b) {
  */
 class ControlFlowGraph {
     rootVertices = new Set();
+    /** Nesting-Independent vertex information, mapping the id to the vertex */
     vertexInformation = new Map();
     /** the basic block children map contains a mapping of ids to all vertices that are nested in basic blocks, mapping them to the Id of the block they appear in */
     bbChildren = new Map();

package/control-flow/dfg-cfg-guided-visitor.d.ts

@@ -1,18 +1,18 @@
 import type { CfgExpressionVertex, CfgStatementVertex, ControlFlowInformation } from './control-flow-graph';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
-import type { DataflowInformation } from '../dataflow/info';
 import type { DataflowGraphVertexArgument, DataflowGraphVertexFunctionCall, DataflowGraphVertexFunctionDefinition, DataflowGraphVertexUse, DataflowGraphVertexValue, DataflowGraphVertexVariableDefinition } from '../dataflow/graph/vertex';
 import type { BasicCfgGuidedVisitorConfiguration } from './basic-cfg-guided-visitor';
 import { BasicCfgGuidedVisitor } from './basic-cfg-guided-visitor';
-export interface DataflowCfgGuidedVisitorConfiguration<Cfg extends ControlFlowInformation = ControlFlowInformation, Dfg extends DataflowInformation = DataflowInformation> extends BasicCfgGuidedVisitorConfiguration<Cfg> {
-    readonly dataflow: Dfg;
+import type { DataflowGraph } from '../dataflow/graph/graph';
+export interface DataflowCfgGuidedVisitorConfiguration<ControlFlow extends ControlFlowInformation = ControlFlowInformation, Dfg extends DataflowGraph = DataflowGraph> extends BasicCfgGuidedVisitorConfiguration<ControlFlow> {
+    readonly dfg: Dfg;
 }
 /**
  * This visitor extends on the {@link BasicCfgGuidedVisitor} by dispatching visitors based on the dataflow graph.
  *
  * Use {@link BasicCfgGuidedVisitor#start} to start the traversal.
  */
-export declare class DataflowAwareCfgGuidedVisitor<Cfg extends ControlFlowInformation = ControlFlowInformation, Dfg extends DataflowInformation = DataflowInformation, Config extends DataflowCfgGuidedVisitorConfiguration<Cfg, Dfg> = DataflowCfgGuidedVisitorConfiguration<Cfg, Dfg>> extends BasicCfgGuidedVisitor<Cfg, Config> {
+export declare class DataflowAwareCfgGuidedVisitor<ControlFlow extends ControlFlowInformation = ControlFlowInformation, Dfg extends DataflowGraph = DataflowGraph, Config extends DataflowCfgGuidedVisitorConfiguration<ControlFlow, Dfg> = DataflowCfgGuidedVisitorConfiguration<ControlFlow, Dfg>> extends BasicCfgGuidedVisitor<ControlFlow, Config> {
     /**
      * Get the dataflow graph vertex for the given id
      */

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

@@ -14,7 +14,7 @@ class DataflowAwareCfgGuidedVisitor extends basic_cfg_guided_visitor_1.BasicCfgG
      * Get the dataflow graph vertex for the given id
      */
     getDataflowGraph(id) {
-        return this.config.dataflow.graph.getVertex(id);
+        return this.config.dfg.getVertex(id);
     }
     onStatementNode(node) {
         super.onStatementNode(node);

package/control-flow/extract-cfg.d.ts

@@ -14,9 +14,9 @@ import type { CfgSimplificationPassName } from './cfg-simplification';
  *
  * @see {@link extractSimpleCfg} - for a simplified version of this function
  */
-export declare function extractCFG<Info = ParentInformation>(ast: NormalizedAst<Info>, graph?: DataflowGraph, simplifications?: readonly CfgSimplificationPassName[]): ControlFlowInformation;
+export declare function extractCfg<Info = ParentInformation>(ast: NormalizedAst<Info & ParentInformation>, graph?: DataflowGraph, simplifications?: readonly CfgSimplificationPassName[]): ControlFlowInformation;
 /**
- * Simplified version of {@link extractCFG} that is much quicker, but much simpler!
+ * Simplified version of {@link extractCfg} that is much quicker, but much simpler!
  */
 export declare function extractSimpleCfg<Info = ParentInformation>(ast: NormalizedAst<Info>): ControlFlowInformation<import("./control-flow-graph").CfgSimpleVertex>;
 export declare const ResolvedCallSuffix = "-resolved-call-exit";