@eagleoutice/flowr 2.8.10 → 2.8.12

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.8.9, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.10, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -51,9 +51,9 @@ It offers a wide variety of features, for example:
        ╰ Naming Convention (naming-convention):
            ╰ Metadata: numMatches: 0, numBreak: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Network Functions (network-functions):
-           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0
+           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Dataframe Access Validation (dataframe-access-validation):
-           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 1
        ╰ Dead Code (dead-code):
            ╰ Metadata: consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0
        ╰ Useless Loops (useless-loop):
@@ -92,13 +92,13 @@ It offers a wide variety of features, for example:
        ╰ **Absolute Paths** (absolute-file-paths):\
            ╰ certain:\
                ╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 0, 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):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numMatches: 0, numBreak: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Network Functions** (network-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dataframe Access Validation** (dataframe-access-validation):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dead Code** (dead-code):\
@@ -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.2 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _2.3 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.
@@ -181,7 +181,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalConsidered": 1,
               "totalUnknown": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -207,7 +207,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalCalls": 0,
               "totalFunctionDefinitions": 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.8.9, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.10, 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 Jan 18, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">119.8 ms</span></i> (as of Jan 27, 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/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.8.9, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.10, 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/control-flow/cfg-simplification.js

@@ -62,10 +62,8 @@ function toBasicBlocks(cfg, _info) {
  * @param cfg - The control flow graph whose reachable nodes to find.
  */
 function cfgFindAllReachable(cfg) {
-    const reachable = new Set();
-    (0, simple_visitor_1.visitCfgInOrder)(cfg.graph, cfg.entryPoints, node => {
-        reachable.add(node);
+    return (0, simple_visitor_1.visitCfgInOrder)(cfg.graph, cfg.entryPoints, () => {
+        /* do nothing */
     });
-    return reachable;
 }
 //# sourceMappingURL=cfg-simplification.js.map

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

@@ -0,0 +1,5 @@
+import { ControlFlowGraph } from './control-flow-graph';
+/**
+ * Inverts the given dataflow graph by reversing all edges.
+ */
+export declare function invertCfg(graph: ControlFlowGraph): ControlFlowGraph;

package/control-flow/invert-cfg.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.invertCfg = invertCfg;
+const control_flow_graph_1 = require("./control-flow-graph");
+/**
+ * Inverts the given dataflow graph by reversing all edges.
+ */
+function invertCfg(graph) {
+    const invertedGraph = new control_flow_graph_1.ControlFlowGraph();
+    for (const [, v] of graph.vertices(true)) {
+        invertedGraph.addVertex(v);
+    }
+    for (const [from, targets] of graph.edges()) {
+        for (const [to, t] of targets) {
+            invertedGraph.addEdge(to, from, t);
+        }
+    }
+    return invertedGraph;
+}
+//# sourceMappingURL=invert-cfg.js.map

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

@@ -20,7 +20,7 @@ export declare function visitCfgInReverseOrder(graph: ControlFlowGraph, startNod
  * 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): void;
+export declare function visitCfgInOrder(graph: ControlFlowGraph, startNodes: readonly NodeId[], visitor: (node: NodeId) => boolean | void): Set<NodeId>;
 /**
  * Check if a node can reach another node in the control flow graph.
  */

package/control-flow/simple-visitor.js

@@ -4,6 +4,7 @@ exports.visitCfgInReverseOrder = visitCfgInReverseOrder;
 exports.visitCfgInOrder = visitCfgInOrder;
 exports.canReach = canReach;
 const control_flow_graph_1 = require("./control-flow-graph");
+const invert_cfg_1 = require("./invert-cfg");
 /**
  * Visit all nodes reachable from the start node in the control flow graph, traversing the dependencies but ignoring cycles.
  * @param graph     - The control flow graph.
@@ -55,6 +56,7 @@ visitor) {
     const visited = new Set();
     let queue = startNodes.slice();
     const hasBb = graph.mayHaveBasicBlocks();
+    const g = (0, invert_cfg_1.invertCfg)(graph);
     while (queue.length > 0) {
         const current = queue.shift();
         if (visited.has(current)) {
@@ -65,16 +67,17 @@ visitor) {
             continue;
         }
         else if (hasBb) {
-            const get = graph.getVertex(current);
+            const get = g.getVertex(current);
             if (get?.type === control_flow_graph_1.CfgVertexType.Block) {
                 queue = queue.concat(get.elems.map(e => e.id));
             }
         }
-        const outgoing = graph.ingoingEdges(current) ?? [];
+        const outgoing = g.outgoingEdges(current) ?? [];
         for (const [to] of outgoing) {
             queue.push(to);
         }
     }
+    return visited;
 }
 /**
  * Check if a node can reach another node in the control flow graph.

package/package.json

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

package/project/plugins/file-plugins/files/flowr-description-file.d.ts

@@ -6,6 +6,10 @@ import { Package, type PackageType } from '../../package-version-plugins/package
 export type DCF = Map<string, string[]>;
 /**
  * This decorates a text file and provides access to its content as a DCF (Debian Control File)-like structure.
+ * Please use the static {@link FlowrDescriptionFile.from} method to create instances of this class.
+ * To access description specific fields, use the provided methods like {@link license}, {@link authors}, {@link suggests}, and {@link collate}.
+ * These methods parse and return the relevant information in structured formats.
+ * To access raw fields, use the {@link content} method inherited from {@link FlowrFile}.
  */
 export declare class FlowrDescriptionFile extends FlowrFile<DeepReadonly<DCF>> {
     private readonly wrapped;
@@ -31,7 +35,22 @@ export declare class FlowrDescriptionFile extends FlowrFile<DeepReadonly<DCF>> {
      * Returns the parsed authors from the `Authors@R` field in the DESCRIPTION file.
      */
     authors(): RAuthorInfo[] | undefined;
+    /**
+     * Returns the parsed suggested packages from the 'Suggests' field in the DESCRIPTION file.
+     */
     suggests(): Package[] | undefined;
+    /**
+     * Returns the 'Collate' field from the DESCRIPTION file.
+     */
+    collate(): readonly string[] | undefined;
+    /**
+     * Returns the parsed dependencies from the 'Depends' field in the DESCRIPTION file.
+     */
+    depends(): readonly Package[] | undefined;
+    /**
+     * Returns the parsed imports from the 'Imports' field in the DESCRIPTION file.
+     */
+    imports(): readonly Package[] | undefined;
 }
 /**
  * Parses the 'License' field from an R DESCRIPTION file into SPDX license expressions.

package/project/plugins/file-plugins/files/flowr-description-file.js

@@ -8,8 +8,13 @@ const r_author_1 = require("../../../../util/r-author");
 const args_1 = require("../../../../util/text/args");
 const r_license_1 = require("../../../../util/r-license");
 const package_1 = require("../../package-version-plugins/package");
+const retriever_1 = require("../../../../r-bridge/retriever");
 /**
  * This decorates a text file and provides access to its content as a DCF (Debian Control File)-like structure.
+ * Please use the static {@link FlowrDescriptionFile.from} method to create instances of this class.
+ * To access description specific fields, use the provided methods like {@link license}, {@link authors}, {@link suggests}, and {@link collate}.
+ * These methods parse and return the relevant information in structured formats.
+ * To access raw fields, use the {@link content} method inherited from {@link FlowrFile}.
  */
 class FlowrDescriptionFile extends flowr_file_1.FlowrFile {
     wrapped;
@@ -59,10 +64,35 @@ class FlowrDescriptionFile extends flowr_file_1.FlowrFile {
         const parsedAuthors = authors?.flatMap(a => (0, r_author_1.parseTextualAuthorString)(a, [r_author_1.AuthorRole.Author])) ?? [];
         return parsedAuthors.concat(this.content().get('Maintainer')?.flatMap(m => (0, r_author_1.parseTextualAuthorString)(m, [r_author_1.AuthorRole.Creator])) ?? []);
     }
+    /**
+     * Returns the parsed suggested packages from the 'Suggests' field in the DESCRIPTION file.
+     */
     suggests() {
         const suggests = this.content().get('Suggests');
         return suggests ? parsePackagesWithVersions(suggests, 'package') : undefined;
     }
+    /**
+     * Returns the 'Collate' field from the DESCRIPTION file.
+     */
+    collate() {
+        const c = this.content().get('Collate');
+        // we join newlines, and then split quote sensitive:
+        return c ? (0, args_1.splitAtEscapeSensitive)(c.join(' '), true, ' ').map(s => (0, retriever_1.removeRQuotes)(s).trim()).filter(s => s.length > 0) : undefined;
+    }
+    /**
+     * Returns the parsed dependencies from the 'Depends' field in the DESCRIPTION file.
+     */
+    depends() {
+        const deps = this.content().get('Depends');
+        return deps ? parsePackagesWithVersions(deps, 'r') : undefined;
+    }
+    /**
+     * Returns the parsed imports from the 'Imports' field in the DESCRIPTION file.
+     */
+    imports() {
+        const imps = this.content().get('Imports');
+        return imps ? parsePackagesWithVersions(imps, 'package') : undefined;
+    }
 }
 exports.FlowrDescriptionFile = FlowrDescriptionFile;
 /**
@@ -117,25 +147,26 @@ function cleanValues(values) {
         .map(s => s.trim())
         .filter(s => s.length > 0);
 }
-const VersionRegex = /^([a-zA-Z0-9.]+)(?:\s*\(([><=~!]+)\s*([^)]+)\))?$/;
+const VersionRegex = /([a-zA-Z0-9.]+)(?:\s*\(([><=~!]+)\s*([^)]+)\))?\s*/;
 /**
  * Parses package strings with optional version constraints into Package objects.
  * @param packageStrings - The package strings to parse
  * @param type           - The type of the packages (e.g., 'r' or 'package')
  */
 function parsePackagesWithVersions(packageStrings, type) {
+    let str = packageStrings.join(' ');
+    let match;
     const packages = [];
-    for (const entry of packageStrings) {
-        const match = VersionRegex.exec(entry);
-        if (match) {
-            const [, name, operator, version] = match;
-            const range = package_1.Package.parsePackageVersionRange(operator, version);
-            packages.push(new package_1.Package({
-                name: name,
-                type: type,
-                versionConstraints: range ? [range] : undefined
-            }));
-        }
+    // match until exhaustion
+    while ((match = VersionRegex.exec(str)) !== null) {
+        const [, name, operator, version] = match;
+        const range = package_1.Package.parsePackageVersionRange(operator, version);
+        packages.push(new package_1.Package({
+            name: name,
+            type: type,
+            versionConstraints: range ? [range] : undefined
+        }));
+        str = str.slice(match.index + match[0].length);
     }
     return packages;
 }

package/project/plugins/loading-order-plugins/flowr-analyzer-loading-order-description-file-plugin.js

@@ -5,7 +5,6 @@ const flowr_analyzer_description_file_plugin_1 = require("../file-plugins/flowr-
 const semver_1 = require("semver");
 const flowr_analyzer_loading_order_plugin_1 = require("./flowr-analyzer-loading-order-plugin");
 const flowr_file_1 = require("../../context/flowr-file");
-const retriever_1 = require("../../../r-bridge/retriever");
 /**
  * This plugin extracts loading order information from R `DESCRIPTION` files.
  * It looks at the `Collate` field to determine the order in which files should be loaded.
@@ -25,10 +24,8 @@ class FlowrAnalyzerLoadingOrderDescriptionFilePlugin extends flowr_analyzer_load
             flowr_analyzer_description_file_plugin_1.descriptionFileLog.warn(`Found ${descFiles.length} description files, expected exactly one.`);
         }
         /** this will do the caching etc. for me */
-        const deps = descFiles[0].content();
-        if (deps.has('Collate')) {
-            const collate = deps.get('Collate')?.map(f => (0, retriever_1.removeRQuotes)(f))
-                ?? [];
+        const collate = descFiles[0].collate();
+        if (collate) {
             /* we probably have to do some more guesswork here */
             const unordered = ctx.files.loadingOrder.getUnorderedRequests();
             // sort them by their path index in the Collate field

package/project/plugins/package-version-plugins/flowr-analyzer-package-versions-description-file-plugin.js

@@ -5,7 +5,6 @@ const flowr_analyzer_package_versions_plugin_1 = require("./flowr-analyzer-packa
 const flowr_analyzer_description_file_plugin_1 = require("../file-plugins/flowr-analyzer-description-file-plugin");
 const semver_1 = require("semver");
 const flowr_file_1 = require("../../context/flowr-file");
-const flowr_description_file_1 = require("../file-plugins/files/flowr-description-file");
 /**
  * This plugin extracts package versions from R `DESCRIPTION` files.
  * It looks at the `Depends` and `Imports` fields to find package names and their version constraints.
@@ -24,12 +23,12 @@ class FlowrAnalyzerPackageVersionsDescriptionFilePlugin extends flowr_analyzer_p
             flowr_analyzer_description_file_plugin_1.descriptionFileLog.warn(`Found ${descFiles.length} description files, expected exactly one.`);
         }
         /** this will do the caching etc. for me */
-        const deps = descFiles[0].content();
-        this.retrieveVersionsFromField(ctx, deps, 'Depends', 'r');
-        this.retrieveVersionsFromField(ctx, deps, 'Imports', 'package');
+        const deps = descFiles[0];
+        this.retrieveVersionsFromField(ctx, deps.depends() ?? []);
+        this.retrieveVersionsFromField(ctx, deps.imports() ?? []);
     }
-    retrieveVersionsFromField(ctx, file, field, type) {
-        for (const pkg of (0, flowr_description_file_1.parsePackagesWithVersions)(file.get(field) ?? [], type)) {
+    retrieveVersionsFromField(ctx, pkgs) {
+        for (const pkg of pkgs) {
             ctx.deps.addDependency(pkg);
         }
     }

package/queries/catalog/dependencies-query/dependencies-query-executor.js

@@ -36,12 +36,13 @@ async function executeDependenciesQuery({ analyzer, }, queries) {
     }
     const queryResults = functions.values().toArray().flat().length === 0 ? { kinds: {}, '.meta': { timing: 0 } } :
         await (0, query_1.executeQueriesOfSameType)(data, functions.entries().map(([c, f]) => makeCallContextQuery(f, c)).toArray().flat());
+    const g = (0, dependencies_query_format_1.getAllCategories)(queries);
     const results = Object.fromEntries(await Promise.all(functions.entries().map(async ([c, f]) => {
         const results = getResults(queries, { dataflow, config, normalize }, queryResults, c, f, data);
         // only default categories allow additional analyses, so we null-coalesce here!
         const enabled = query.enabledCategories;
         if (enabled === undefined || (enabled?.length > 0 && enabled.includes(c))) {
-            await dependencies_query_format_1.DefaultDependencyCategories[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
+            await g[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
         }
         return [c, results];
     })));

package/queries/catalog/dependencies-query/dependencies-query-format.d.ts

@@ -5,7 +5,7 @@ import { executeDependenciesQuery } from './dependencies-query-executor';
 import type { FunctionInfo } from './function-info/function-info';
 import type { CallContextQueryResult } from '../call-context-query/call-context-query-format';
 import type { Range } from 'semver';
-import type { AsyncOrSync } from 'ts-essentials';
+import type { AsyncOrSync, MarkOptional } from 'ts-essentials';
 import type { NamespaceInfo } from '../../../project/plugins/file-plugins/files/flowr-namespace-file';
 export declare const Unknown = "unknown";
 export interface DependencyCategorySettings {
@@ -13,6 +13,15 @@ export interface DependencyCategorySettings {
     functions: FunctionInfo[];
     /** this describes the global default value for this category, e.g., 'stdout' for write operations, please be aware, that this can be overwritten by a by-function default value */
     defaultValue?: string;
+    /**
+     * An optional additional analysis step that is executed after the main function-based analysis has been performed.
+     * To add or modify dependency info entries, simply modify the `result` array.
+     * @param data  - The basic query data.
+     * @param ignoreDefault - Whether the default functions were ignored.
+     * @param functions - The functions used for this category.
+     * @param queryResults - The results of the call context query.
+     * @param result - The current result array to which additional dependency info can be added.
+     */
     additionalAnalysis?: (data: BasicQueryData, ignoreDefault: boolean, functions: FunctionInfo[], queryResults: CallContextQueryResult, result: DependencyInfo[]) => AsyncOrSync<void>;
 }
 export declare const DefaultDependencyCategories: {
@@ -52,7 +61,7 @@ export interface DependenciesQuery extends BaseQueryFormat, Partial<Record<`${De
     readonly type: 'dependencies';
     readonly enabledCategories?: DependencyCategoryName[];
     readonly ignoreDefaultFunctions?: boolean;
-    readonly additionalCategories?: Record<string, Omit<DependencyCategorySettings, 'additionalAnalysis'>>;
+    readonly additionalCategories?: Record<string, MarkOptional<DependencyCategorySettings, 'additionalAnalysis'>>;
 }
 export type DependenciesQueryResult = BaseQueryResult & {
     [C in DefaultDependencyCategoryName]: DependencyInfo[];

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.8.10';
+const version = '2.8.12';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */