@eagleoutice/flowr 2.2.11 → 2.2.13

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");
@@ -85,7 +85,10 @@ function summarizeAllSummarizedStats(stats) {
             numberOfFunctionDefinitions: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.numberOfFunctionDefinitions)),
             numberOfCalls: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.numberOfCalls)),
             numberOfEdges: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.numberOfEdges)),
-            sizeOfObject: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.sizeOfObject))
+            sizeOfObject: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.sizeOfObject)),
+            storedVertexIndices: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.storedVertexIndices)),
+            storedEnvIndices: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.storedEnvIndices)),
+            overwrittenIndices: (0, summarizer_1.summarizeMeasurement)(dataflows.map(d => d.overwrittenIndices)),
         }
     };
 }
@@ -125,7 +128,10 @@ function summarizeAllUltimateStats(stats) {
             numberOfFunctionDefinitions: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.numberOfFunctionDefinitions)),
             numberOfCalls: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.numberOfCalls)),
             numberOfEdges: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.numberOfEdges)),
-            sizeOfObject: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.sizeOfObject))
+            sizeOfObject: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.sizeOfObject)),
+            storedVertexIndices: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.storedVertexIndices)),
+            storedEnvIndices: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.storedEnvIndices)),
+            overwrittenIndices: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataflow.overwrittenIndices)),
         }
     };
 }

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/benchmark-app.d.ts

@@ -9,4 +9,9 @@ export interface BenchmarkCliOptions {
     limit?: number;
     runs?: number;
     parser: KnownParserName;
+    'enable-pointer-tracking': boolean;
+    'max-file-slices': number;
+    threshold?: number;
+    'per-file-time-limit'?: number;
+    'sampling-strategy': string;
 }

package/cli/benchmark-app.js

@@ -42,10 +42,17 @@ async function benchmark() {
     console.log(`Using ${options.parallel} parallel executors`);
     // we do not use the limit argument to be able to pick the limit randomly
     const files = [];
-    for (const input of options.input) {
-        for await (const file of (0, files_1.allRFiles)(input)) {
-            files.push({ request: file, baseDir: input });
-        }
+    const firstFile = options.input[0];
+    // Check whether input is single JSON file containing a list of paths
+    if (options.input.length === 1 && fs_1.default.statSync(firstFile).isFile() && firstFile.endsWith('.json')) {
+        console.log('Input is a single JSON file. Assuming it contains a list of files to process');
+        const content = fs_1.default.readFileSync(firstFile, 'utf8');
+        const paths = JSON.parse(content);
+        const baseDir = findCommonBaseDir(paths);
+        await collectFiles(files, paths, () => baseDir);
+    }
+    else {
+        await collectFiles(files, options.input, (p) => p);
     }
     if (options.limit) {
         log_1.log.info(`limiting to ${options.limit} files`);
@@ -59,18 +66,54 @@ async function benchmark() {
         '--file-id', `${i}`,
         '--output', path_1.default.join(options.output, path_1.default.relative(f.baseDir, `${f.request.content}.json`)),
         '--slice', options.slice, ...verboseAdd,
-        '--parser', options.parser
+        '--parser', options.parser,
+        ...(options['enable-pointer-tracking'] ? ['--enable-pointer-tracking'] : []),
+        '--max-slices', `${options['max-file-slices']}`,
+        ...(options.threshold ? ['--threshold', `${options.threshold}`] : []),
+        '--sampling-strategy', options['sampling-strategy'],
     ]);
     const runs = options.runs ?? 1;
     for (let i = 1; i <= runs; i++) {
         console.log(`Run ${i} of ${runs}`);
         const pool = new parallel_1.LimitedThreadPool(`${__dirname}/benchmark-helper-app`, 
         // we reverse here "for looks", since the helper pops from the end, and we want file ids to be ascending :D
-        args.map(a => [...a, '--run-num', `${i}`]).reverse(), limit, options.parallel);
+        args.map(a => [...a, '--run-num', `${i}`]).reverse(), limit, options.parallel, options['per-file-time-limit']);
         await pool.run();
         const stats = pool.getStats();
         console.log(`Run ${i} of ${runs}: Benchmarked ${stats.counter} files, skipped ${stats.skipped.length} files due to errors`);
     }
 }
+/**
+ * Collect all R files from the given paths.
+ *
+ * @param files - list of files to append to
+ * @param paths - list of paths to search for R files
+ * @param getBaseDir - function to get the base directory of a path
+ */
+async function collectFiles(files, paths, getBaseDir) {
+    for (const input of paths) {
+        for await (const file of (0, files_1.allRFiles)(input)) {
+            files.push({ request: file, baseDir: getBaseDir(input) });
+        }
+    }
+}
+/**
+ * Find the common base directory of a list of paths.
+ *
+ * @param paths - list of paths
+ * @returns the common base directory
+ */
+function findCommonBaseDir(paths) {
+    const baseDirs = paths.map(f => path_1.default.dirname(f));
+    return baseDirs.reduce((acc, dir) => {
+        const split = dir.split(path_1.default.sep);
+        const accSplit = acc.split(path_1.default.sep);
+        let i = 0;
+        while (i < split.length && i < accSplit.length && split[i] === accSplit[i]) {
+            i++;
+        }
+        return split.slice(0, i).join(path_1.default.sep);
+    }, baseDirs[0]);
+}
 void benchmark();
 //# sourceMappingURL=benchmark-app.js.map

package/cli/benchmark-helper-app.d.ts

@@ -8,4 +8,8 @@ export interface SingleBenchmarkCliOptions {
     slice: string;
     output?: string;
     parser: KnownParserName;
+    'enable-pointer-tracking': boolean;
+    'max-slices': number;
+    threshold?: number;
+    'sampling-strategy': string;
 }

package/cli/benchmark-helper-app.js

@@ -11,6 +11,7 @@ const script_1 = require("./common/script");
 const slicer_1 = require("../benchmark/slicer");
 const all_variables_1 = require("../slicing/criterion/filters/all-variables");
 const path_1 = __importDefault(require("path"));
+const config_1 = require("../config");
 const options = (0, script_1.processCommandLineArgs)('benchmark-helper', [], {
     subtitle: 'Will slice for all possible variables, signal by exit code if slicing was successful, and can be run standalone',
     examples: [
@@ -23,6 +24,7 @@ if (options.verbose) {
 }
 const numberRegex = /^\d+$/;
 (0, assert_1.guard)(options.slice === 'all' || options.slice === 'no' || numberRegex.test(options.slice), 'slice must be either all, no, or a number');
+(0, assert_1.guard)(options['sampling-strategy'] === 'random' || options['sampling-strategy'] === 'equidistant', 'sample-strategy must be either random or equidistant');
 async function benchmark() {
     // we do not use the limit argument to be able to pick the limit randomly
     (0, assert_1.guard)(options.input !== undefined, 'No input file given');
@@ -31,18 +33,31 @@ async function benchmark() {
     // prefix for printing to console, includes file id and run number if present
     const prefix = `[${options.input}${options['file-id'] !== undefined ? ` (file ${options['file-id']}, run ${options['run-num']})` : ''}]`;
     console.log(`${prefix} Appending output to ${options.output}`);
-    fs_1.default.mkdirSync(path_1.default.parse(options.output).dir, { recursive: true });
+    const directory = path_1.default.parse(options.output).dir;
+    // ensure the directory exists if path contains one
+    if (directory !== '') {
+        fs_1.default.mkdirSync(directory, { recursive: true });
+    }
+    // Enable pointer analysis if requested, otherwise disable it
+    if (options['enable-pointer-tracking']) {
+        (0, config_1.amendConfig)({ solver: { ...(0, config_1.getConfig)().solver, pointerTracking: true, } });
+    }
+    else {
+        (0, config_1.amendConfig)({ solver: { ...(0, config_1.getConfig)().solver, pointerTracking: false, } });
+    }
     // ensure the file exists
     const fileStat = fs_1.default.statSync(options.input);
     (0, assert_1.guard)(fileStat.isFile(), `File ${options.input} does not exist or is no file`);
     const request = { request: 'file', content: options.input };
+    const maxSlices = options['max-slices'] ?? -1;
     const slicer = new slicer_1.BenchmarkSlicer(options.parser);
     try {
-        await slicer.init(request);
+        await slicer.init(request, undefined, options.threshold);
         // ${escape}1F${escape}1G${escape}2K for line reset
         if (options.slice === 'all') {
-            const count = await slicer.sliceForAll(all_variables_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`${prefix} Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`));
+            const count = await slicer.sliceForAll(all_variables_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`${prefix} Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`), { maxSliceCount: maxSlices });
             console.log(`${prefix} Completed Slicing`);
+            (0, assert_1.guard)(count >= 0, `Number of slices exceeded limit of ${maxSlices} with ${-count} slices, skipping in count`);
             (0, assert_1.guard)(count > 0, `No possible slices found for ${options.input}, skipping in count`);
         }
         else if (options.slice === 'no') {
@@ -51,8 +66,9 @@ async function benchmark() {
         else {
             const limit = parseInt(options.slice);
             console.log(`${prefix} Slicing up to ${limit} possible slices`);
-            const count = await slicer.sliceForAll(all_variables_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`${prefix} Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`), limit);
+            const count = await slicer.sliceForAll(all_variables_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`${prefix} Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`), { sampleCount: limit, maxSliceCount: maxSlices, sampleStrategy: options['sampling-strategy'] });
             console.log(`${prefix} Completed Slicing`);
+            (0, assert_1.guard)(count >= 0, `Number of slices exceeded limit of ${maxSlices} with ${-count} slices, skipping in count`);
             (0, assert_1.guard)(count > 0, `No possible slices found for ${options.input}, skipping in count`);
         }
         const { stats } = slicer.finish();

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 = [
@@ -16,11 +16,16 @@ exports.benchmarkOptions = [
     { name: 'help', alias: 'h', type: Boolean, description: 'Print this usage guide' },
     { name: 'limit', alias: 'l', type: Number, description: 'Limit the number of files to process (if given, this will choose these files randomly and add the chosen names to the output' },
     { name: 'runs', alias: 'r', type: Number, description: 'The amount of benchmark runs that should be done, out of which an average will be calculated' },
-    { name: 'input', alias: 'i', type: String, description: 'Pass a folder or file as src to read from', multiple: true, defaultOption: true, defaultValue: [], typeLabel: '{underline files/folders}' },
+    { name: 'input', alias: 'i', type: String, description: 'Pass a folder or file as src to read from. Alternatively, pass a single JSON file that contains a list of paths.', multiple: true, defaultOption: true, defaultValue: [], typeLabel: '{underline files/folders}' },
     { name: 'parallel', alias: 'p', type: String, description: 'Number of parallel executors (defaults to {italic max(cpu.count-1, 1)})', defaultValue: Math.max(os_1.default.cpus().length - 1, 1), typeLabel: '{underline number}' },
     { name: 'slice', alias: 's', type: String, description: 'Automatically slice for *all* variables (default) or *no* slicing and only parsing/dataflow construction. Numbers will indicate: sample X random slices from all.', defaultValue: 'all', typeLabel: '{underline all/no}' },
-    { name: 'output', alias: 'o', type: String, description: `Directory to write all the measurements to in a per-file-basis (defaults to {italic benchmark-${StartTimeString}})`, defaultValue: `benchmark-${StartTimeString}`, typeLabel: '{underline file}' },
-    { name: 'parser', type: String, description: 'The parser to use for the benchmark', defaultValue: 'r-shell', typeLabel: '{underline parser}' }
+    { name: 'output', alias: 'o', type: String, description: `Folder to write all the measurements to in a per-file-basis (defaults to {italic benchmark-${StartTimeString}})`, defaultValue: `benchmark-${StartTimeString}`, typeLabel: '{underline folder}' },
+    { name: 'parser', type: String, description: 'The parser to use for the benchmark', defaultValue: 'r-shell', typeLabel: '{underline parser}' },
+    { name: 'enable-pointer-tracking', type: Boolean, description: 'Run dataflow analysis with pointer tracking', defaultValue: false },
+    { 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/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]' },
@@ -30,7 +35,11 @@ exports.benchmarkHelperOptions = [
     { name: 'run-num', alias: 'r', type: Number, description: 'The n-th time that the file with the given file-id is being benchmarked' },
     { name: 'slice', alias: 's', type: String, description: 'Automatically slice for *all* variables (default) or *no* slicing and only parsing/dataflow construction. Numbers will indicate: sample X random slices from all.', defaultValue: 'all', typeLabel: '{underline all/no}' },
     { name: 'output', alias: 'o', type: String, description: 'File to write the measurements to (appends a single line in JSON format)', typeLabel: '{underline file}' },
-    { name: 'parser', type: String, description: 'The parser to use for the benchmark', defaultValue: 'r-shell', typeLabel: '{underline parser}' }
+    { name: 'parser', type: String, description: 'The parser to use for the benchmark', defaultValue: 'r-shell', typeLabel: '{underline parser}' },
+    { 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/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");
@@ -81,8 +81,12 @@ const _commands = {
     'normalize*': repl_normalize_1.normalizeStarCommand,
     'dataflow': repl_dataflow_1.dataflowCommand,
     'dataflow*': repl_dataflow_1.dataflowStarCommand,
+    'dataflowsimple': repl_dataflow_1.dataflowSimplifiedCommand,
+    '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.d.ts

@@ -1,3 +1,5 @@
 import type { ReplCommand } from './repl-main';
 export declare const dataflowCommand: ReplCommand;
 export declare const dataflowStarCommand: ReplCommand;
+export declare const dataflowSimplifiedCommand: ReplCommand;
+export declare const dataflowSimpleStarCommand: ReplCommand;

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

@@ -33,11 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dataflowStarCommand = exports.dataflowCommand = void 0;
+exports.dataflowSimpleStarCommand = exports.dataflowSimplifiedCommand = exports.dataflowStarCommand = exports.dataflowCommand = void 0;
 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,
@@ -86,4 +86,38 @@ exports.dataflowStarCommand = {
         catch { /* do nothing this is a service thing */ }
     }
 };
+exports.dataflowSimplifiedCommand = {
+    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,
+    fn: async (output, shell, remainingLine) => {
+        const result = await replGetDataflow(shell, handleString(remainingLine));
+        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.dataflow.graph, includeEnvironments: false, simplified: true }).string;
+        output.stdout(mermaid);
+        try {
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid code', result.dataflow['.meta'].timing));
+        }
+        catch { /* do nothing this is a service thing */ }
+    }
+};
+exports.dataflowSimpleStarCommand = {
+    description: 'Returns the URL to mermaid.live',
+    usageExample: ':dataflowsimple*',
+    aliases: ['ds*', 'dfs*'],
+    script: false,
+    fn: async (output, shell, remainingLine) => {
+        const result = await replGetDataflow(shell, handleString(remainingLine));
+        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.dataflow.graph, false, undefined, true);
+        output.stdout(mermaid);
+        try {
+            const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
+            clipboard.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid url', result.dataflow['.meta'].timing));
+        }
+        catch { /* do nothing this is a service thing */ }
+    }
+};
 //# sourceMappingURL=repl-dataflow.js.map

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 })} `;

package/cli/repl/server/connection.js

@@ -45,10 +45,10 @@ const message_slice_1 = require("./messages/message-slice");
 const server_1 = require("./server");
 const message_repl_1 = require("./messages/message-repl");
 const core_1 = require("../core");
-const cfg_1 = require("../../../util/cfg/cfg");
+const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const quads_1 = require("../../../util/quads");
 const print_1 = require("../../../core/print/print");
-const ansi_1 = require("../../../util/ansi");
+const ansi_1 = require("../../../util/text/ansi");
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const graph_1 = require("../../../dataflow/graph/graph");
 const tmp = __importStar(require("tmp"));
@@ -160,7 +160,7 @@ class FlowRServerConnection {
     async sendFileAnalysisResponse(slicer, results, message) {
         let cfg = undefined;
         if (message.cfg) {
-            cfg = (0, 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);
@@ -174,7 +174,7 @@ class FlowRServerConnection {
                 type: 'response-file-analysis',
                 format: 'n-quads',
                 id: message.id,
-                cfg: cfg ? (0, cfg_1.cfg2quads)(cfg, config()) : undefined,
+                cfg: cfg ? (0, extract_cfg_1.cfg2quads)(cfg, config()) : undefined,
                 results: {
                     parse: await (0, print_1.printStepResult)(parseStep, sanitizedResults.parse, 5 /* StepOutputFormat.RdfQuads */, config()),
                     normalize: await (0, print_1.printStepResult)(normalizedStep, sanitizedResults.normalize, 5 /* StepOutputFormat.RdfQuads */, config()),

package/cli/repl/server/messages/message-analysis.d.ts

@@ -1,7 +1,7 @@
 import type { IdMessageBase, MessageDefinition } from './all-messages';
-import type { ControlFlowInformation } from '../../../../util/cfg/cfg';
 import type { DEFAULT_DATAFLOW_PIPELINE } from '../../../../core/steps/pipeline/default-pipelines';
 import type { PipelineOutput } from '../../../../core/steps/pipeline/pipeline';
+import type { ControlFlowInformation } from '../../../../control-flow/control-flow-graph';
 /**
  * Send by the client to request an analysis of a given file.
  * Answered by either an {@link FlowrErrorMessage} or a {@link FileAnalysisResponseMessageJson}.

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

@@ -15,7 +15,7 @@ const log_1 = require("../../util/log");
 const statistics_helper_core_1 = require("./statistics-helper-core");
 const command_line_args_1 = __importDefault(require("command-line-args"));
 const scripts_info_1 = require("../common/scripts-info");
-const ansi_1 = require("../../util/ansi");
+const ansi_1 = require("../../util/text/ansi");
 const testRegex = /[^/]*\/test/i;
 const exampleRegex = /[^/]*\/example/i;
 function getPrefixForFile(file) {