@eagleoutice/flowr 2.2.12 → 2.2.13

package/README.md

@@ -4,9 +4,12 @@
 [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/eagleoutice/flowr?logo=docker&logoColor=white&label=dockerhub)](https://hub.docker.com/r/eagleoutice/flowr)
 [![latest tag](https://badgen.net/github/tag/flowr-analysis/flowr?label=latest&color=purple)](https://github.com/flowr-analysis/flowr/releases/latest)
 [![Marketplace](https://badgen.net/vs-marketplace/v/code-inspect.vscode-flowr)](https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr)
+[![Marketplace](https://badgen.net/open-vsx/version/code-inspect/vscode-flowr?label=Positron/Open%20VSX)](https://open-vsx.org/extension/code-inspect/vscode-flowr)
 [![DOI](https://zenodo.org/badge/624819038.svg)](https://zenodo.org/doi/10.5281/zenodo.13319290)
 
-_flowR_ is a sophisticated, static [dataflow analyzer](https://en.wikipedia.org/wiki/Data-flow_analysis) for the [R programming language](https://www.r-project.org/).
+_flowR_ is a sophisticated, static [dataflow analyzer](https://en.wikipedia.org/wiki/Data-flow_analysis) for the [R programming language](https://www.r-project.org/),
+available for [VSCode](https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr), [Positron](https://open-vsx.org/extension/code-inspect/vscode-flowr), [RStudio](https://github.com/flowr-analysis/rstudio-addin-flowr),
+and [Docker](https://hub.docker.com/r/eagleoutice/flowr).
 It offers a wide variety of features, for example:
 
 * 🍕 **program slicing**\
@@ -48,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.11, R v4.4.3 (r-shell engine)
+    flowR repl using flowR v2.2.12, R v4.4.3 (r-shell engine)
     R> :slicer test/testfiles/example.R --criterion "11@sum"
     ```
     
@@ -95,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!">117.9 ms</span></i> (as of Mar 2, 2025), 
+  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">124.8 ms</span></i> (as of Mar 17, 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.
 
@@ -104,7 +107,7 @@ It offers a wide variety of features, for example:
     
     
     You can investigate flowR's analyses using the [REPL](https://github.com/flowr-analysis/flowr/wiki/Interface#using-the-repl).
-    Commands like <span title="Description (Repl Command, starred version): Returns the URL to mermaid.live; Base Command: Get mermaid code for the dataflow graph of R code, start with 'file://' to indicate a file (aliases: :d*, :df*)">`:dataflow*`</span> allow you to view a dataflow graph for a given R script.
+    Commands like <span title="Description (Repl Command, starred version): Returns the URL to mermaid.live; Base Command: Get mermaid code for the dataflow graph, start with 'file://' to indicate a file (aliases: :d*, :df*)">`:dataflow*`</span> allow you to view a dataflow graph for a given R script.
     
     Let's have a look at the following example:
     
@@ -131,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.11, R v4.4.3 (r-shell engine)
+    flowR repl using flowR v2.2.12, R v4.4.3 (r-shell engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -140,7 +143,7 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    https://mermaid.live/view#base64:eyJjb2RlIjoiZmxvd2NoYXJ0IEJUXG4gICAgMChbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RcbiAgICAgICgwKVxuICAgICAgKjEuMS00KmBcIl0pXG4gICAgMShbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RmaWxlc1xuICAgICAgKDEpXG4gICAgICAqMS42LTE0KmBcIl0pXG4gICAgMltbXCJgIzkxO1JCaW5hcnlPcCM5MzsgL1xuICAgICAgKDIpXG4gICAgICAqMS4xLTE0KlxuICAgICgwLCAxKWBcIl1dXG4gICAgMyhbXCJgIzkxO1JTeW1ib2wjOTM7IGV4YW1wbGUuUlxuICAgICAgKDMpXG4gICAgICAqMS4xNi0yNCpgXCJdKVxuICAgIDRbW1wiYCM5MTtSQmluYXJ5T3AjOTM7IC9cbiAgICAgICg0KVxuICAgICAgKjEuMS0yNCpcbiAgICAoMiwgMylgXCJdXVxuICAgIDIgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDBcbiAgICAyIC0tPnxcInJlYWRzLCBhcmd1bWVudFwifCAxXG4gICAgNCAtLT58XCJyZWFkcywgYXJndW1lbnRcInwgMlxuICAgIDQgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDMiLCJtZXJtYWlkIjp7ImF1dG9TeW5jIjp0cnVlfX0=
+    https://mermaid.live/view#base64:eyJjb2RlIjoiZmxvd2NoYXJ0IEJUXG4gICAgMChbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RcbiAgICAgICgwKVxuICAgICAgKjEuMS00KmBcIl0pXG4gICAgMShbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RmaWxlc1xuICAgICAgKDEpXG4gICAgICAqMS42LTE0KmBcIl0pXG4gICAgMltbXCJgIzkxO1JCaW5hcnlPcCM5MzsgL1xuICAgICAgKDIpXG4gICAgICAqMS4xLTE0KlxuICAgICgwLCAxKWBcIl1dXG4gICAgYnVpbHQtaW46X1tcImBCdWlsdC1Jbjpcbi9gXCJdXG4gICAgc3R5bGUgYnVpbHQtaW46XyBzdHJva2U6Z3JheSxmaWxsOmxpZ2h0Z3JheSxzdHJva2Utd2lkdGg6MnB4LG9wYWNpdHk6Ljg7XG4gICAgMyhbXCJgIzkxO1JTeW1ib2wjOTM7IGV4YW1wbGUuUlxuICAgICAgKDMpXG4gICAgICAqMS4xNi0yNCpgXCJdKVxuICAgIDRbW1wiYCM5MTtSQmluYXJ5T3AjOTM7IC9cbiAgICAgICg0KVxuICAgICAgKjEuMS0yNCpcbiAgICAoMiwgMylgXCJdXVxuICAgIDIgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDBcbiAgICAyIC0tPnxcInJlYWRzLCBhcmd1bWVudFwifCAxXG4gICAgMiAtLi0+fFwicmVhZHMsIGNhbGxzXCJ8IGJ1aWx0LWluOl9cbiAgICBsaW5rU3R5bGUgMiBzdHJva2U6Z3JheTtcbiAgICA0IC0tPnxcInJlYWRzLCBhcmd1bWVudFwifCAyXG4gICAgNCAtLT58XCJyZWFkcywgYXJndW1lbnRcInwgM1xuICAgIDQgLS4tPnxcInJlYWRzLCBjYWxsc1wifCBidWlsdC1pbjpfXG4gICAgbGlua1N0eWxlIDUgc3Ryb2tlOmdyYXk7IiwibWVybWFpZCI6eyJhdXRvU3luYyI6dHJ1ZX19
     ```
     
     
@@ -162,6 +165,9 @@ It offers a wide variety of features, for example:
           (2)
           *1.1-8*
         (0, 1)`"]]
+        built-in:_-["`Built-In:
+    #60;#45;`"]
+        style built-in:_- stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         4{{"`#91;RNumber#93; 1
           (4)
           *2.12*`"}}
@@ -208,14 +214,23 @@ It offers a wide variety of features, for example:
           (18)
           *6.14-16*
         (16, 17)`"]]
+        built-in:-["`Built-In:
+    #45;`"]
+        style built-in:- stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         19[["`#91;RExpressionList#93; (
           (19)
           *6.13*
         (18)`"]]
+        built-in:_["`Built-In:
+    (`"]
+        style built-in:_ stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         20[["`#91;RBinaryOp#93; #58;
           (20)
           *6.11-17*
         (13, 19)`"]]
+        built-in::["`Built-In:
+    #58;`"]
+        style built-in:: stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         24(["`#91;RSymbol#93; sum
           (24, :may:36+)
           *7.10-12*`"])
@@ -265,12 +280,18 @@ It offers a wide variety of features, for example:
           (36)
           *6.1-9.1*
         (12, 20, 35)`"]]
+        built-in:for["`Built-In:
+    for`"]
+        style built-in:for stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         38{{"`#91;RString#93; #34;Sum#58;#34;
           (38)
           *11.5-10*`"}}
         40(["`#91;RSymbol#93; sum
           (40)
           *11.13-15*`"])
+        built-in:sum["`Built-In:
+    sum`"]
+        style built-in:sum stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         42{{"`#91;RString#93; #34;
     #34;
           (42)
@@ -279,6 +300,9 @@ It offers a wide variety of features, for example:
           (44)
           *11.1-22*
         (38, 40, 42)`"]]
+        built-in:cat["`Built-In:
+    cat`"]
+        style built-in:cat stroke:gray,fill:lightgray,stroke-width:2px,opacity:.8;
         46{{"`#91;RString#93; #34;Product#58;#34;
           (46)
           *12.5-14*`"}}
@@ -297,87 +321,121 @@ It offers a wide variety of features, for example:
         0 -->|"defined-by"| 2
         2 -->|"argument"| 1
         2 -->|"returns, argument"| 0
+        2 -.->|"reads, calls"| built-in:_-
+        linkStyle 4 stroke:gray;
         3 -->|"defined-by"| 4
         3 -->|"defined-by"| 5
         5 -->|"argument"| 4
         5 -->|"returns, argument"| 3
+        5 -.->|"reads, calls"| built-in:_-
+        linkStyle 9 stroke:gray;
         6 -->|"defined-by"| 7
         6 -->|"defined-by"| 8
         8 -->|"argument"| 7
         8 -->|"returns, argument"| 6
+        8 -.->|"reads, calls"| built-in:_-
+        linkStyle 14 stroke:gray;
         9 -->|"defined-by"| 10
         9 -->|"defined-by"| 11
         11 -->|"argument"| 10
         11 -->|"returns, argument"| 9
+        11 -.->|"reads, calls"| built-in:_-
+        linkStyle 19 stroke:gray;
         12 -->|"defined-by"| 20
         16 -->|"reads"| 9
         18 -->|"reads, argument"| 16
         18 -->|"reads, argument"| 17
+        18 -.->|"reads, calls"| built-in:-
+        linkStyle 24 stroke:gray;
         19 -->|"returns, argument"| 18
+        19 -.->|"reads"| built-in:_
+        linkStyle 26 stroke:gray;
         20 -->|"reads, argument"| 13
         20 -->|"reads, argument"| 19
+        20 -.->|"reads, calls"| built-in::
+        linkStyle 29 stroke:gray;
         24 -->|"reads"| 0
         24 -->|"reads"| 23
         24 -->|"CD-True"| 36
-        linkStyle 25 stroke:gray,color:gray;
+        linkStyle 32 stroke:gray,color:gray;
         25 -->|"reads"| 12
         25 -->|"CD-True"| 36
-        linkStyle 27 stroke:gray,color:gray;
+        linkStyle 34 stroke:gray,color:gray;
         26 -->|"reads, argument"| 24
         26 -->|"reads, argument"| 25
+        26 -.->|"reads, calls"| built-in:_
+        linkStyle 37 stroke:gray;
         26 -->|"CD-True"| 36
-        linkStyle 30 stroke:gray,color:gray;
+        linkStyle 38 stroke:gray,color:gray;
         27 -->|"reads"| 6
         27 -->|"CD-True"| 36
-        linkStyle 32 stroke:gray,color:gray;
+        linkStyle 40 stroke:gray,color:gray;
         28 -->|"reads, argument"| 26
         28 -->|"reads, argument"| 27
+        28 -.->|"reads, calls"| built-in:_
+        linkStyle 43 stroke:gray;
         28 -->|"CD-True"| 36
-        linkStyle 35 stroke:gray,color:gray;
+        linkStyle 44 stroke:gray,color:gray;
         23 -->|"defined-by"| 28
         23 -->|"defined-by"| 29
         29 -->|"argument"| 28
         29 -->|"returns, argument"| 23
+        29 -.->|"reads, calls"| built-in:_-
+        linkStyle 49 stroke:gray;
         29 -->|"CD-True"| 36
-        linkStyle 40 stroke:gray,color:gray;
+        linkStyle 50 stroke:gray,color:gray;
         31 -->|"reads"| 3
         31 -->|"reads"| 30
         31 -->|"CD-True"| 36
-        linkStyle 43 stroke:gray,color:gray;
+        linkStyle 53 stroke:gray,color:gray;
         32 -->|"reads"| 12
         32 -->|"CD-True"| 36
-        linkStyle 45 stroke:gray,color:gray;
+        linkStyle 55 stroke:gray,color:gray;
         33 -->|"reads, argument"| 31
         33 -->|"reads, argument"| 32
+        33 -.->|"reads, calls"| built-in:_
+        linkStyle 58 stroke:gray;
         33 -->|"CD-True"| 36
-        linkStyle 48 stroke:gray,color:gray;
+        linkStyle 59 stroke:gray,color:gray;
         30 -->|"defined-by"| 33
         30 -->|"defined-by"| 34
         34 -->|"argument"| 33
         34 -->|"returns, argument"| 30
+        34 -.->|"reads, calls"| built-in:_-
+        linkStyle 64 stroke:gray;
         34 -->|"CD-True"| 36
-        linkStyle 53 stroke:gray,color:gray;
+        linkStyle 65 stroke:gray,color:gray;
         35 -->|"argument"| 29
         35 -->|"returns, argument"| 34
+        35 -.->|"reads, calls"| built-in:_
+        linkStyle 68 stroke:gray;
         35 -->|"CD-True"| 36
-        linkStyle 56 stroke:gray,color:gray;
+        linkStyle 69 stroke:gray,color:gray;
         36 -->|"reads, argument"| 12
         36 -->|"reads, argument"| 20
         36 -->|"argument, non-standard-evaluation"| 35
+        36 -.->|"reads, calls"| built-in:for
+        linkStyle 73 stroke:gray;
         40 -->|"reads"| 0
         40 -->|"reads"| 23
+        40 -.->|"reads"| built-in:sum
+        linkStyle 76 stroke:gray;
         44 -->|"argument"| 38
         44 -->|"reads, argument"| 40
         44 -->|"argument"| 42
+        44 -.->|"reads, calls"| built-in:cat
+        linkStyle 80 stroke:gray;
         48 -->|"reads"| 3
         48 -->|"reads"| 30
         52 -->|"argument"| 46
         52 -->|"reads, argument"| 48
         52 -->|"argument"| 50
+        52 -.->|"reads, calls"| built-in:cat
+        linkStyle 86 stroke:gray;
     ```
     
     	
-    (The analysis required _22.14 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.6 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     
@@ -392,12 +450,16 @@ It offers a wide variety of features, for example:
 
 If you want to use flowR and the features it provides, feel free to check out the:
 
-- [Visual Studio Code extension](https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr): provides access to flowR directly in VS Code (or [vscode.dev](https://vscode.dev/))
+- [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr)/[Positron](https://open-vsx.org/extension/code-inspect/vscode-flowr): provides access to flowR directly in VS Code and Positron (or [vscode.dev](https://vscode.dev/))
 - [RStudio Addin](https://github.com/flowr-analysis/rstudio-addin-flowr): integrates flowR into [RStudio](https://posit.co/downloads/)
 - [R package](https://github.com/flowr-analysis/flowr-r-adapter): use flowR in your R scripts
 - [Docker image](https://hub.docker.com/r/eagleoutice/flowr): run flowR in a container, this also includes [flowR's server](https://github.com/flowr-analysis/flowr/wiki/Interface#communicating-with-the-server)
 - [NPM package](https://www.npmjs.com/package/@eagleoutice/flowr): include flowR in your TypeScript and JavaScript projects
  
+
+If you are already using flowR and want to give feedback, please consider filling out our [feedback form](https://docs.google.com/forms/d/e/1FAIpQLScKFhgnh9LGVU7QzqLvFwZe1oiv_5jNhkIO-G-zND0ppqsMxQ/viewform).
+
+ 
 ## ⭐ Getting Started
 
 To get started with _flowR_ and its features, please check out the [Overview](https://github.com/flowr-analysis/flowr/wiki/Overview) wiki page. 
@@ -427,7 +489,7 @@ as well as the deployed [code documentation](https://flowr-analysis.github.io/fl
 
 ## 🚀 Contributing
 
-We welcome every contribution! Please check out the [contributing guidelines](https://github.com/flowr-analysis/flowr/tree/main/.github/CONTRIBUTING.md) for more information.
+We welcome every contribution! Please check out the [developer onboarding](https://github.com/flowr-analysis/flowr/wiki/Onboarding) section in the wiki for all the information you will need.
 
 ### Contributors
 

package/benchmark/slicer.js

@@ -12,7 +12,7 @@ const stopwatch_1 = require("./stopwatch");
 const fs_1 = __importDefault(require("fs"));
 const log_1 = require("../util/log");
 const assert_1 = require("../util/assert");
-const strings_1 = require("../util/strings");
+const strings_1 = require("../util/text/strings");
 const default_pipelines_1 = require("../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../r-bridge/retriever");
 const collect_all_1 = require("../slicing/criterion/collect-all");
@@ -23,7 +23,7 @@ const shell_1 = require("../r-bridge/shell");
 const tree_sitter_types_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-types");
 const tree_sitter_executor_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-executor");
 const vertex_1 = require("../dataflow/graph/vertex");
-const arrays_1 = require("../util/arrays");
+const arrays_1 = require("../util/collections/arrays");
 /**
  * The logger to be used for benchmarking as a global object.
  */

package/benchmark/summarizer/first-phase/input.js

@@ -9,7 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const process_1 = require("../second-phase/process");
 const process_2 = require("./process");
 const assert_1 = require("../../../util/assert");
-const ansi_1 = require("../../../util/ansi");
+const ansi_1 = require("../../../util/text/ansi");
 const json_1 = require("../../../util/json");
 const print_1 = require("../../stats/print");
 async function processRunMeasurement(line, fileNum, lineNum, textOutputAppendPath, rawOutputPath) {

package/benchmark/summarizer/first-phase/process.js

@@ -43,16 +43,16 @@ exports.summarizeSummarizedTimePerToken = summarizeSummarizedTimePerToken;
 exports.summarizeTimePerToken = summarizeTimePerToken;
 const tmp = __importStar(require("tmp"));
 const fs_1 = __importDefault(require("fs"));
-const defaultmap_1 = require("../../../util/defaultmap");
+const defaultmap_1 = require("../../../util/collections/defaultmap");
 const log_1 = require("../../../util/log");
-const strings_1 = require("../../../util/strings");
+const strings_1 = require("../../../util/text/strings");
 const summarizer_1 = require("../../../util/summarizer");
 const assert_1 = require("../../../util/assert");
 const shell_1 = require("../../../r-bridge/shell");
 const retriever_1 = require("../../../r-bridge/retriever");
 const visitor_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const type_1 = require("../../../r-bridge/lang-4.x/ast/model/type");
-const arrays_1 = require("../../../util/arrays");
+const arrays_1 = require("../../../util/collections/arrays");
 const tempfile = (() => {
     let _tempfile = undefined;
     return () => {

package/benchmark/summarizer/second-phase/process.js

@@ -5,7 +5,7 @@ exports.summarizeAllUltimateStats = summarizeAllUltimateStats;
 exports.processNextSummary = processNextSummary;
 exports.processNextUltimateSummary = processNextUltimateSummary;
 const process_1 = require("../first-phase/process");
-const defaultmap_1 = require("../../../util/defaultmap");
+const defaultmap_1 = require("../../../util/collections/defaultmap");
 const summarizer_1 = require("../../../util/summarizer");
 const assert_1 = require("../../../util/assert");
 const stats_1 = require("../../stats/stats");

package/benchmark/summarizer/summarizer.js

@@ -13,7 +13,7 @@ const summarizer_1 = require("../../util/summarizer");
 const files_1 = require("../../util/files");
 const json_1 = require("../../util/json");
 const print_1 = require("../stats/print");
-const defaultmap_1 = require("../../util/defaultmap");
+const defaultmap_1 = require("../../util/collections/defaultmap");
 const log_1 = require("../../util/log");
 class BenchmarkSummarizer extends summarizer_1.Summarizer {
     constructor(config) {

package/cli/common/options.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.summarizerOptions = exports.statisticHelperOptions = exports.statisticOptions = exports.slicerOptions = exports.exportQuadsOptions = exports.benchmarkHelperOptions = exports.benchmarkOptions = void 0;
 const os_1 = __importDefault(require("os"));
-const time_1 = require("../../util/time");
+const time_1 = require("../../util/text/time");
 const feature_1 = require("../../statistics/features/feature");
 /**
- * This string contains a string representation of the loading time of this module.
+ * This string contains a string representation of the time this module was loaded.
  */
 const StartTimeString = (0, time_1.date2string)(new Date());
 exports.benchmarkOptions = [
@@ -25,7 +25,7 @@ exports.benchmarkOptions = [
     { name: 'max-file-slices', type: Number, description: 'If file has more than passed number of slices, the file is not processed', defaultValue: -1, typeLabel: '{underline number}' },
     { name: 'threshold', alias: 't', type: Number, description: 'How many re-visits of the same node are ok?', defaultValue: undefined, typeLabel: '{underline number}' },
     { name: 'per-file-time-limit', type: Number, description: 'Time limit in milliseconds to process single file (disabled by default)', defaultValue: undefined, typeLabel: '{underline number}' },
-    { name: 'sampling-strategy', type: String, description: 'Which strategy to use, when sampling is enabled', defaultValue: 'random', typeLabel: '{underline random/edquidistant}' },
+    { name: 'sampling-strategy', type: String, description: 'Which strategy to use, when sampling is enabled', defaultValue: 'random', typeLabel: '{underline random/equidistant}' },
 ];
 exports.benchmarkHelperOptions = [
     { name: 'verbose', alias: 'v', type: Boolean, description: 'Run with verbose logging [do not use for the real benchmark as this affects the time measurements, but only to find errors]' },
@@ -39,7 +39,7 @@ exports.benchmarkHelperOptions = [
     { name: 'enable-pointer-tracking', type: Boolean, description: 'Run dataflow analysis with pointer tracking', defaultValue: false },
     { name: 'max-slices', type: Number, description: 'If file has more than passed number of slices, the file is not processed', defaultValue: -1, typeLabel: '{underline number}' },
     { name: 'threshold', alias: 't', type: Number, description: 'How many re-visits of the same node are ok?', defaultValue: undefined, typeLabel: '{underline number}' },
-    { name: 'sampling-strategy', type: String, description: 'Which strategy to use, when sampling is enabled', defaultValue: 'random', typeLabel: '{underline random/edquidistant}' },
+    { name: 'sampling-strategy', type: String, description: 'Which strategy to use, when sampling is enabled', defaultValue: 'random', typeLabel: '{underline random/equidistant}' },
 ];
 exports.exportQuadsOptions = [
     { name: 'verbose', alias: 'v', type: Boolean, description: 'Run with verbose logging' },

package/cli/common/script.js

@@ -13,7 +13,7 @@ exports.processCommandLineArgs = processCommandLineArgs;
 const scripts_info_1 = require("./scripts-info");
 const command_line_usage_1 = __importDefault(require("command-line-usage"));
 const command_line_args_1 = __importDefault(require("command-line-args"));
-const ansi_1 = require("../../util/ansi");
+const ansi_1 = require("../../util/text/ansi");
 const log_1 = require("../../util/log");
 /**
  * Automatically generates a uniform help from a given script (see {@link scripts}).

package/cli/flowr.js

@@ -9,7 +9,7 @@ const net_1 = require("./repl/server/net");
 const version_1 = require("../util/version");
 const command_line_usage_1 = __importDefault(require("command-line-usage"));
 const log_1 = require("../util/log");
-const ansi_1 = require("../util/ansi");
+const ansi_1 = require("../util/text/ansi");
 const command_line_args_1 = __importDefault(require("command-line-args"));
 const config_1 = require("../config");
 const assert_1 = require("../util/assert");

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

@@ -1,3 +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;

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

@@ -33,12 +33,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.controlflowStarCommand = exports.controlflowCommand = void 0;
-const cfg_1 = require("../../../util/cfg/cfg");
+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");
-const cfg_2 = require("../../../util/mermaid/cfg");
-const ansi_1 = require("../../../util/ansi");
+const cfg_1 = require("../../../util/mermaid/cfg");
+const ansi_1 = require("../../../util/text/ansi");
+const cfg_simplification_1 = require("../../../control-flow/cfg-simplification");
 async function controlflow(parser, remainingLine) {
     return await (0, default_pipelines_1.createDataflowPipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(remainingLine.trim())
@@ -50,22 +51,26 @@ function handleString(code) {
 function formatInfo(out, type) {
     return out.formatter.format(`Copied ${type} to clipboard.`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
 }
+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 mermaid = cfgConverter(cfg, result.normalize);
+    output.stdout(mermaid);
+    try {
+        const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+        clipboard.default.writeSync(mermaid);
+        output.stdout(formatInfo(output, 'mermaid code'));
+    }
+    catch { /* do nothing this is a service thing */
+    }
+}
 exports.controlflowCommand = {
     description: `Get mermaid code for the control-flow graph of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':controlflow',
     aliases: ['cfg', 'cf'],
     script: false,
     fn: async (output, shell, remainingLine) => {
-        const result = await controlflow(shell, handleString(remainingLine));
-        const cfg = (0, cfg_1.extractCFG)(result.normalize, result.dataflow.graph);
-        const mermaid = (0, cfg_2.cfgToMermaid)(cfg, result.normalize);
-        output.stdout(mermaid);
-        try {
-            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
-            clipboard.default.writeSync(mermaid);
-            output.stdout(formatInfo(output, 'mermaid code'));
-        }
-        catch { /* do nothing this is a service thing */ }
+        await produceAndPrintCfg(shell, remainingLine, output, [], cfg_1.cfgToMermaid);
     }
 };
 exports.controlflowStarCommand = {
@@ -74,16 +79,25 @@ exports.controlflowStarCommand = {
     aliases: ['cfg*', 'cf*'],
     script: false,
     fn: async (output, shell, remainingLine) => {
-        const result = await controlflow(shell, handleString(remainingLine));
-        const cfg = (0, cfg_1.extractCFG)(result.normalize, result.dataflow.graph);
-        const mermaid = (0, cfg_2.cfgToMermaidUrl)(cfg, result.normalize);
-        output.stdout(mermaid);
-        try {
-            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
-            clipboard.default.writeSync(mermaid);
-            output.stdout(formatInfo(output, 'mermaid url'));
-        }
-        catch { /* do nothing this is a service thing */ }
+        await produceAndPrintCfg(shell, remainingLine, output, [], cfg_1.cfgToMermaidUrl);
+    }
+};
+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'],
+    script: false,
+    fn: async (output, shell, remainingLine) => {
+        await produceAndPrintCfg(shell, remainingLine, output, ['to-basic-blocks'], cfg_1.cfgToMermaid);
+    }
+};
+exports.controlflowBBStarCommand = {
+    description: 'Returns the URL to mermaid.live',
+    usageExample: ':controlflowbb*',
+    aliases: ['cfgb*', 'cfb*'],
+    script: false,
+    fn: async (output, shell, remainingLine) => {
+        await produceAndPrintCfg(shell, remainingLine, output, ['to-basic-blocks'], cfg_1.cfgToMermaidUrl);
     }
 };
 //# sourceMappingURL=repl-cfg.js.map

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

@@ -16,8 +16,8 @@ const repl_execute_1 = require("./repl-execute");
 const repl_normalize_1 = require("./repl-normalize");
 const repl_dataflow_1 = require("./repl-dataflow");
 const repl_cfg_1 = require("./repl-cfg");
-const ansi_1 = require("../../../util/ansi");
-const args_1 = require("../../../util/args");
+const ansi_1 = require("../../../util/text/ansi");
+const args_1 = require("../../../util/text/args");
 const assert_1 = require("../../../util/assert");
 const scripts_info_1 = require("../../common/scripts-info");
 const repl_lineage_1 = require("./repl-lineage");
@@ -85,6 +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,
     'lineage': repl_lineage_1.lineageCommand,
     'query': repl_query_1.queryCommand,
     'query*': repl_query_1.queryStarCommand

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

@@ -37,7 +37,7 @@ exports.dataflowSimpleStarCommand = exports.dataflowSimplifiedCommand = exports.
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const dfg_1 = require("../../../util/mermaid/dfg");
-const ansi_1 = require("../../../util/ansi");
+const ansi_1 = require("../../../util/text/ansi");
 /**
  * Obtain the dataflow graph using a known parser (such as the {@link RShell} or {@link TreeSitterExecutor}).
  */
@@ -53,7 +53,7 @@ function formatInfo(out, type, timing) {
     return out.formatter.format(`Copied ${type} to clipboard (dataflow: ${timing}ms).`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
 }
 exports.dataflowCommand = {
-    description: `Get mermaid code for the dataflow graph of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
+    description: `Get mermaid code for the dataflow graph, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':dataflow',
     aliases: ['d', 'df'],
     script: false,
@@ -87,7 +87,7 @@ exports.dataflowStarCommand = {
     }
 };
 exports.dataflowSimplifiedCommand = {
-    description: `Get simplified mermaid code for the dataflow graph of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
+    description: `Get mermaid code for the simplified dataflow graph, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':dataflowsimple',
     aliases: ['ds', 'dfs'],
     script: false,

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = void 0;
 exports.tryExecuteRShellCommand = tryExecuteRShellCommand;
-const ansi_1 = require("../../../util/ansi");
+const ansi_1 = require("../../../util/text/ansi");
 const shell_1 = require("../../../r-bridge/shell");
 async function tryExecuteRShellCommand(output, parser, statement, allowRSessionAccess) {
     if (!allowRSessionAccess) {

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

@@ -1,4 +1,4 @@
-import type { OutputFormatter } from '../../../util/ansi';
+import type { OutputFormatter } from '../../../util/text/ansi';
 import type { KnownParser } from '../../../r-bridge/parser';
 /**
  * Defines the main interface for output of the repl.

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.standardReplOutput = void 0;
-const ansi_1 = require("../../../util/ansi");
+const ansi_1 = require("../../../util/text/ansi");
 /**
  * Default repl output that redirects everything to the stdout and stderror channels (linked to `console`).
  * @see ReplOutput

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

@@ -37,7 +37,7 @@ exports.normalizeStarCommand = exports.normalizeCommand = void 0;
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const ast_1 = require("../../../util/mermaid/ast");
-const ansi_1 = require("../../../util/ansi");
+const ansi_1 = require("../../../util/text/ansi");
 async function normalize(parser, remainingLine) {
     return await (0, default_pipelines_1.createNormalizePipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(remainingLine.trim())

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryStarCommand = exports.queryCommand = void 0;
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
-const args_1 = require("../../../util/args");
-const ansi_1 = require("../../../util/ansi");
+const args_1 = require("../../../util/text/args");
+const ansi_1 = require("../../../util/text/ansi");
 const schema_1 = require("../../../util/schema");
 const query_1 = require("../../../queries/query");
 const json_1 = require("../../../util/json");

package/cli/repl/core.js

@@ -52,7 +52,7 @@ const repl_execute_1 = require("./commands/repl-execute");
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const args_1 = require("../../util/args");
+const args_1 = require("../../util/text/args");
 const repl_commands_1 = require("./commands/repl-commands");
 const scripts_info_1 = require("../common/scripts-info");
 const retriever_1 = require("../../r-bridge/retriever");

package/cli/repl/prompt.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prompt = exports.rawPrompt = void 0;
-const ansi_1 = require("../../util/ansi");
+const ansi_1 = require("../../util/text/ansi");
 exports.rawPrompt = 'R>';
 // is a function as the 'formatter' is configured only after the cli options have been read
 const prompt = () => `${ansi_1.formatter.format(exports.rawPrompt, { color: 6 /* Colors.Cyan */, effect: ansi_1.ColorEffect.Foreground })} `;