@eagleoutice/flowr 2.9.3 → 2.9.5

package/README.md

@@ -24,7 +24,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.9.2, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.4, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -82,17 +82,17 @@ It offers a wide variety of features, for example:
     
     Query: **linter** (3 ms)\
        ╰ **Deprecated Functions** (deprecated-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **File Path Validity** (file-path-validity):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 1, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Seeded Randomness** (seeded-randomness):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Absolute Paths** (absolute-file-paths):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 1, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Unused Definitions** (unused-definitions):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Naming Convention** (naming-convention):\
@@ -109,7 +109,7 @@ It offers a wide variety of features, for example:
     
     <details> <summary style="color:gray">Show Detailed Results as Json</summary>
     
-    The analysis required _2.9 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _3.5 ms_ (including parsing and normalization and the query) within the generation environment.
     
     In general, the JSON contains the Ids of the nodes in question as they are present in the normalized AST or the dataflow graph of flowR.
     Please consult the [Interface](https://github.com/flowr-analysis/flowr/wiki/Interface) wiki page for more information on how to get those.
@@ -126,7 +126,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalCalls": 0,
               "totalFunctionDefinitions": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -149,7 +149,7 @@ It offers a wide variety of features, for example:
               "totalUnknown": 0,
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
-              "searchTimeMs": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -181,7 +181,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalConsidered": 1,
               "totalUnknown": 0,
-              "searchTimeMs": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -308,7 +308,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.9.2, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.4, R grammar v14 (tree-sitter engine)
     R> :query @static-slice (11@sum) file://test/testfiles/example.R
     ```
     
@@ -322,7 +322,7 @@ It offers a wide variety of features, for example:
     N <- 10
     for(i in 1:(N-1)) sum <- sum + i + w
     sum
-    All queries together required ≈3 ms (1ms accuracy, total 3 ms)
+    All queries together required ≈3 ms (1ms accuracy, total 4 ms)
     ```
     
     
@@ -356,7 +356,7 @@ It offers a wide variety of features, for example:
          
 
 * 🚀 **fast call-graph, data-, and control-flow graphs**\
-  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">117 ms</span></i> (as of Feb 3, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">111.1 ms</span></i> (as of Feb 5, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
   _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/wiki/dataflow-graph) for more details on the dataflow graphs as well as call graphs.
 
@@ -392,7 +392,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.9.2, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.4, R grammar v14 (tree-sitter engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -697,7 +697,7 @@ It offers a wide variety of features, for example:
     ```
     
     	
-    (The analysis required _2.0 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _4.5 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/cli/flowr.js

@@ -105,8 +105,10 @@ function hookSignalHandlers(engines) {
 async function mainRepl() {
     const config = createConfig();
     if (options.script) {
-        const target = scripts_info_1.scripts[options.script].target;
-        (0, assert_1.guard)(target !== undefined, `Unknown script ${options.script}, pick one of ${(0, flowr_main_options_1.getScriptsText)()}.`);
+        const script = scripts_info_1.scripts[options.script];
+        (0, assert_1.guard)(script !== undefined, `Unknown script target "${options.script}", pick one of ${(0, flowr_main_options_1.getScriptsText)()}.`);
+        const target = script.target;
+        (0, assert_1.guard)(target !== undefined, `Unknown script target "${options.script}", pick one of ${(0, flowr_main_options_1.getScriptsText)()}.`);
         console.log(`Running script '${ansi_1.formatter.format(options.script, { style: 1 /* FontStyles.Bold */ })}'`);
         log_1.log.debug(`Script maps to "${target}"`);
         await (0, execute_1.waitOnScript)(`${__dirname}/${target}`, process.argv.slice(3), undefined, true);

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicCfgGuidedVisitor = void 0;
 const control_flow_graph_1 = require("./control-flow-graph");
 const assert_1 = require("../util/assert");
+const invert_cfg_1 = require("./invert-cfg");
 /**
  * In contrast to {@link visitCfgInOrder} and {@link visitCfgInReverseOrder}, this visitor is not a simple visitor
  * and serves as the basis for a variety of more complicated visiting orders of the control flow graph.
@@ -31,10 +32,15 @@ class BasicCfgGuidedVisitor {
     }
     startVisitor(start) {
         const graph = this.config.controlFlow.graph;
-        const getNext = this.config.defaultVisitingOrder === 'forward' ?
-            (node) => graph.ingoingEdges(node)?.keys().toArray().toReversed() :
-            (node) => graph.outgoingEdges(node)?.keys().toArray();
-        const stack = [...start];
+        let getNext;
+        if (this.config.defaultVisitingOrder === 'forward') {
+            const inverseGraph = (0, invert_cfg_1.invertCfg)(graph);
+            getNext = (node) => inverseGraph.outgoingEdges(node)?.keys().toArray().reverse();
+        }
+        else {
+            getNext = (node) => graph.outgoingEdges(node)?.keys();
+        }
+        const stack = Array.from(start);
         while (stack.length > 0) {
             const current = stack.pop();
             if (!this.visitNode(current)) {

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

@@ -9,10 +9,12 @@ const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-functi
 const general_1 = require("../dataflow/eval/values/general");
 const r_value_1 = require("../dataflow/eval/values/r-value");
 const simple_visitor_1 = require("./simple-visitor");
+const invert_cfg_1 = require("./invert-cfg");
 class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.SemanticCfgGuidedVisitor {
     cachedConditions = new Map();
     cachedStatements = new Map();
     inTry = new Set();
+    invertedCfg;
     getValue(id) {
         const has = this.cachedConditions.get(id);
         if (has) {
@@ -39,6 +41,7 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
         this.cachedConditions.set(id, value ? logic_1.Ternary.Always : logic_1.Ternary.Never);
     }
     startVisitor() {
+        this.invertedCfg = (0, invert_cfg_1.invertCfg)(this.config.controlFlow.graph);
         for (const [from, targets] of this.config.controlFlow.graph.edges()) {
             for (const [target, edge] of targets) {
                 if (edge.label === 1 /* CfgEdgeType.Cd */) {
@@ -53,7 +56,7 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
                 else if (edge.label === 0 /* CfgEdgeType.Fd */ && this.isUnconditionalJump(target)) {
                     // for each unconditional jump, we find the corresponding end/exit nodes and remove any flow edges
                     for (const end of this.getCfgVertex(target)?.end ?? []) {
-                        for (const [target, edge] of this.config.controlFlow.graph.ingoingEdges(end) ?? []) {
+                        for (const [target, edge] of this.invertedCfg.outgoingEdges(end) ?? []) {
                             if (edge.label === 0 /* CfgEdgeType.Fd */) {
                                 this.config.controlFlow.graph.removeEdge(target, end);
                             }
@@ -130,7 +133,7 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
             }
             this.inTry.add(n);
             return false;
-        });
+        }, this.invertedCfg);
     }
 }
 /** Breaks unsatisfiable control dependencies */
@@ -144,7 +147,7 @@ function cfgAnalyzeDeadCode(cfg, info) {
         normalizedAst: info.ast,
         dfg: info.dfg,
         ctx: info.ctx,
-        defaultVisitingOrder: 'forward',
+        defaultVisitingOrder: 'backward'
     });
     visitor.start();
     return cfg;

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

@@ -132,8 +132,9 @@ class ControlFlowGraph {
     ingoingEdges(id) {
         const edges = new Map();
         for (const [source, outgoing] of this.edgeInformation.entries()) {
-            if (outgoing.has(id)) {
-                edges.set(source, outgoing.get(id));
+            const o = outgoing.get(id);
+            if (o) {
+                edges.set(source, o);
             }
         }
         return edges;

package/control-flow/simple-visitor.d.ts

@@ -16,11 +16,12 @@ export declare function visitCfgInReverseOrder(graph: ControlFlowGraph, startNod
  * @param graph      - The control flow graph.
  * @param startNodes - The nodes to start the traversal from.
  * @param visitor    - The visitor function to call for each node, if you return true the traversal from this node will be stopped.
+ * @param invertedCfg  - Optionally provide an inverted control flow graph, if not provided the function will create one by inverting the given graph, which can be expensive for large graphs.
  *
  * This function is of type {@link SimpleCfgVisitor}.
  * @see {@link visitCfgInReverseOrder} for a traversal in reversed order
  */
-export declare function visitCfgInOrder(graph: ControlFlowGraph, startNodes: readonly NodeId[], visitor: (node: NodeId) => boolean | void): Set<NodeId>;
+export declare function visitCfgInOrder(graph: ControlFlowGraph, startNodes: readonly NodeId[], visitor: (node: NodeId) => boolean | void, invertedCfg?: ControlFlowGraph): Set<NodeId>;
 /**
  * Check if a node can reach another node in the control flow graph.
  */

package/control-flow/simple-visitor.js

@@ -35,11 +35,9 @@ visitor) {
                 queue = queue.concat(get.elems.toReversed().map(e => e.id));
             }
         }
-        const incoming = graph.outgoingEdges(current);
-        if (incoming) {
-            for (const c of incoming.keys()) {
-                queue.push(c);
-            }
+        const incoming = graph.outgoingEdges(current) ?? [];
+        for (const c of incoming.keys()) {
+            queue.push(c);
         }
     }
 }
@@ -48,17 +46,18 @@ visitor) {
  * @param graph      - The control flow graph.
  * @param startNodes - The nodes to start the traversal from.
  * @param visitor    - The visitor function to call for each node, if you return true the traversal from this node will be stopped.
+ * @param invertedCfg  - Optionally provide an inverted control flow graph, if not provided the function will create one by inverting the given graph, which can be expensive for large graphs.
  *
  * This function is of type {@link SimpleCfgVisitor}.
  * @see {@link visitCfgInReverseOrder} for a traversal in reversed order
  */
 function visitCfgInOrder(graph, startNodes, 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type -- void is used to indicate that the return value is ignored/we never stop
-visitor) {
+visitor, invertedCfg) {
     const visited = new Set();
     let queue = startNodes.slice();
     const hasBb = graph.mayHaveBasicBlocks();
-    const g = (0, invert_cfg_1.invertCfg)(graph);
+    const g = invertedCfg ?? (0, invert_cfg_1.invertCfg)(graph);
     while (queue.length > 0) {
         const current = queue.shift();
         if (visited.has(current)) {

package/dataflow/environments/append.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uniqueMergeValuesInDefinitions = uniqueMergeValuesInDefinitions;
 exports.appendEnvironment = appendEnvironment;
-const assert_1 = require("../../util/assert");
+const scoping_1 = require("./scoping");
 /**
  * Merges two arrays of identifier definitions, ensuring uniqueness based on `nodeId` and `definedAt`.
  */
@@ -23,7 +23,14 @@ function appendEnvironment(base, next) {
     else if (next === undefined) {
         return base;
     }
-    (0, assert_1.guard)(base.level === next.level, 'environments must have the same level to be handled, it is up to the caller to ensure that');
+    if (base.level !== next.level) {
+        while (next.level < base.level) {
+            next = (0, scoping_1.pushLocalEnvironment)(next);
+        }
+        while (next.level > base.level) {
+            base = (0, scoping_1.pushLocalEnvironment)(base);
+        }
+    }
     return {
         current: base.current.append(next.current),
         level: base.level,

package/dataflow/environments/environment.js

@@ -110,7 +110,7 @@ class Environment {
         }
         // navigate to parent until either before built-in or matching namespace
         const newEnvironment = this.clone(false);
-        const current = newEnvironment;
+        let current = newEnvironment;
         do {
             if (current.n === ns) {
                 current.define(definition);
@@ -119,6 +119,7 @@ class Environment {
             else if (current.parent && !current.parent.builtInEnv) {
                 // clone parent
                 current.parent = current.parent.clone(false);
+                current = current.parent;
             }
             else {
                 break;
@@ -163,7 +164,7 @@ class Environment {
      * This always recurses parents.
      */
     overwrite(other, applyCds) {
-        if (!other || this.builtInEnv) {
+        if (this.builtInEnv || this === other || !other || this.n !== other.n) {
             return this;
         }
         const map = new Map(this.memory);
@@ -171,25 +172,29 @@ class Environment {
             const hasMaybe = applyCds === undefined ? values.length === 0 || values.some(v => v.cds !== undefined) : true;
             if (hasMaybe) {
                 const old = map.get(key);
+                if (!old && applyCds === undefined) {
+                    map.set(key, values);
+                    continue;
+                }
                 // we need to make a copy to avoid side effects for old reference in other environments
-                const updatedOld = old?.slice() ?? [];
+                const updated = old?.slice() ?? [];
                 for (const v of values) {
                     const { nodeId, definedAt } = v;
-                    const index = updatedOld.find(o => o.nodeId === nodeId && o.definedAt === definedAt);
+                    const index = updated.find(o => o.nodeId === nodeId && o.definedAt === definedAt);
                     if (index) {
                         continue;
                     }
                     if (applyCds === undefined) {
-                        updatedOld.push(v);
+                        updated.push(v);
                     }
                     else {
-                        updatedOld.push({
+                        updated.push({
                             ...v,
                             cds: v.cds ? applyCds.concat(v.cds) : applyCds.slice()
                         });
                     }
                 }
-                map.set(key, updatedOld);
+                map.set(key, updated);
             }
             else {
                 map.set(key, values);
@@ -206,7 +211,7 @@ class Environment {
      * This always recurses parents.
      */
     append(other) {
-        if (!other || this.builtInEnv) {
+        if (!other || this.builtInEnv || this === other || this.n !== other.n) {
             return this;
         }
         const map = new Map(this.memory);

package/dataflow/environments/overwrite.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.overwriteEnvironment = overwriteEnvironment;
-const assert_1 = require("../../util/assert");
+const scoping_1 = require("./scoping");
 /**
  * Assumes, that all definitions within next replace those within base (given the same name).
  * <b>But</b> if all definitions within next are maybe, then they are appended to the base definitions (updating them to be `maybe` from now on as well), similar to {@link appendEnvironment}.
@@ -14,7 +14,14 @@ function overwriteEnvironment(base, next, applyCds) {
     else if (next === undefined) {
         return base;
     }
-    (0, assert_1.guard)(next.level === base.level, `cannot overwrite environments with differently nested local scopes, base ${base.level} vs. next ${next.level}. This should not happen.`);
+    if (base.level !== next.level) {
+        while (next.level < base.level) {
+            next = (0, scoping_1.pushLocalEnvironment)(next);
+        }
+        while (next.level > base.level) {
+            base = (0, scoping_1.pushLocalEnvironment)(base);
+        }
+    }
     return {
         current: base.current.overwrite(next.current, applyCds),
         level: base.level

package/dataflow/fn/higher-order-function.d.ts

@@ -6,5 +6,6 @@ import type { ReadOnlyFlowrAnalyzerContext } from '../../project/context/flowr-a
  * either takes a function as an argument or (may) returns a function.
  * If the return is an identity, e.g., `function(x) x`, this is not considered higher-order,
  * if no function is passed as an argument.
+ * Please note that inspecting higher order functions can be sped up (if queries multiple times) by providing an inverted graph as well!
  */
-export declare function isFunctionHigherOrder(id: NodeId, graph: DataflowGraph, ctx: ReadOnlyFlowrAnalyzerContext): boolean;
+export declare function isFunctionHigherOrder(id: NodeId, graph: DataflowGraph, ctx: ReadOnlyFlowrAnalyzerContext, invertedGraph?: DataflowGraph): boolean;

package/dataflow/fn/higher-order-function.js

@@ -32,8 +32,8 @@ function isAnyReturnAFunction(def, graph) {
     }
     return false;
 }
-function inspectCallSitesArgumentsFns(def, graph, ctx) {
-    const callSites = graph.ingoingEdges(def.id);
+function inspectCallSitesArgumentsFns(def, graph, ctx, invertedGraph) {
+    const callSites = invertedGraph?.outgoingEdges(def.id) ?? graph.ingoingEdges(def.id);
     for (const [callerId, e] of callSites ?? []) {
         if (!edge_1.DfEdge.includesType(e, edge_1.EdgeType.Calls)) {
             continue;
@@ -59,8 +59,9 @@ function inspectCallSitesArgumentsFns(def, graph, ctx) {
  * either takes a function as an argument or (may) returns a function.
  * If the return is an identity, e.g., `function(x) x`, this is not considered higher-order,
  * if no function is passed as an argument.
+ * Please note that inspecting higher order functions can be sped up (if queries multiple times) by providing an inverted graph as well!
  */
-function isFunctionHigherOrder(id, graph, ctx) {
+function isFunctionHigherOrder(id, graph, ctx, invertedGraph) {
     const vert = graph.getVertex(id);
     if (!vert || !(0, vertex_1.isFunctionDefinitionVertex)(vert)) {
         return false;
@@ -70,6 +71,6 @@ function isFunctionHigherOrder(id, graph, ctx) {
         return true;
     }
     // 2. check whether any of the callsites passes a function
-    return inspectCallSitesArgumentsFns(vert, graph, ctx);
+    return inspectCallSitesArgumentsFns(vert, graph, ctx, invertedGraph);
 }
 //# sourceMappingURL=higher-order-function.js.map

package/dataflow/graph/graph.js

@@ -169,8 +169,9 @@ class DataflowGraph {
     ingoingEdges(id) {
         const edges = new Map();
         for (const [source, outgoing] of this.edgeInformation.entries()) {
-            if (outgoing.has(id)) {
-                edges.set(source, outgoing.get(id));
+            const o = outgoing.get(id);
+            if (o) {
+                edges.set(source, o);
             }
         }
         return edges;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/queries/catalog/inspect-higher-order-query/inspect-higher-order-query-executor.js

@@ -4,6 +4,7 @@ exports.executeHigherOrderQuery = executeHigherOrderQuery;
 const higher_order_function_1 = require("../../../dataflow/fn/higher-order-function");
 const parse_1 = require("../../../slicing/criterion/parse");
 const vertex_1 = require("../../../dataflow/graph/vertex");
+const invert_dfg_1 = require("../../../dataflow/graph/invert-dfg");
 /**
  * Execute higher-order function inspection queries on the given analyzer.
  */
@@ -34,9 +35,13 @@ async function executeHigherOrderQuery({ analyzer }, queries) {
     const graph = (await analyzer.dataflow()).graph;
     const fns = graph.verticesOfType(vertex_1.VertexType.FunctionDefinition)
         .filter(([, v]) => filterFor.size === 0 || filterFor.has(v.id));
+    let invertedGraph;
+    if (filterFor.size === 0 || filterFor.size > 10) {
+        invertedGraph = (0, invert_dfg_1.invertDfg)(graph, analyzer.inspectContext().env.makeCleanEnv());
+    }
     const result = {};
     for (const [id] of fns) {
-        result[id] = (0, higher_order_function_1.isFunctionHigherOrder)(id, graph, analyzer.inspectContext());
+        result[id] = (0, higher_order_function_1.isFunctionHigherOrder)(id, graph, analyzer.inspectContext(), invertedGraph);
     }
     return {
         '.meta': {

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.9.3';
+const version = '2.9.5';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */