@eagleoutice/flowr 2.5.0 → 2.6.1

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.4.8, R v4.5.0 (r-shell engine)
+    flowR repl using flowR v2.6.0, R v4.5.0 (r-shell engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -33,30 +33,32 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    Query: linter (3 ms)
+    Query: linter (6 ms)
        ╰ **Deprecated Functions** (deprecated-functions):
-           ╰ _Metadata_: <code>{"totalDeprecatedCalls":0,"totalDeprecatedFunctionDefinitions":0,"searchTimeMs":0,"processTimeMs":0}</code>
+           ╰ _Metadata_: <code>{"totalCalls":0,"totalFunctionDefinitions":0,"searchTimeMs":3,"processTimeMs":0}</code>
        ╰ **File Path Validity** (file-path-validity):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
            ╰ _Metadata_: <code>{"totalReads":1,"totalUnknown":0,"totalWritesBeforeAlways":0,"totalValid":0,"searchTimeMs":1,"processTimeMs":0}</code>
        ╰ **Seeded Randomness** (seeded-randomness):
-           ╰ _Metadata_: <code>{"consumerCalls":0,"callsWithFunctionProducers":0,"callsWithAssignmentProducers":0,"callsWithNonConstantProducers":0,"searchTimeMs":0,"processTimeMs":0}</code>
+           ╰ _Metadata_: <code>{"consumerCalls":0,"callsWithFunctionProducers":0,"callsWithAssignmentProducers":0,"callsWithNonConstantProducers":0,"searchTimeMs":1,"processTimeMs":0}</code>
        ╰ **Absolute Paths** (absolute-file-paths):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
-           ╰ _Metadata_: <code>{"totalConsidered":1,"totalUnknown":0,"searchTimeMs":1,"processTimeMs":0}</code>
+           ╰ _Metadata_: <code>{"totalConsidered":1,"totalUnknown":0,"searchTimeMs":0,"processTimeMs":0}</code>
        ╰ **Unused Definitions** (unused-definitions):
            ╰ _Metadata_: <code>{"totalConsidered":0,"searchTimeMs":0,"processTimeMs":0}</code>
        ╰ **Naming Convention** (naming-convention):
            ╰ _Metadata_: <code>{"numMatches":0,"numBreak":0,"searchTimeMs":0,"processTimeMs":0}</code>
+       ╰ **Network Functions** (network-functions):
+           ╰ _Metadata_: <code>{"totalCalls":0,"totalFunctionDefinitions":0,"searchTimeMs":0,"processTimeMs":0}</code>
        ╰ **Dataframe Access Validation** (dataframe-access-validation):
-           ╰ _Metadata_: <code>{"numOperations":0,"numAccesses":0,"totalAccessed":0,"searchTimeMs":0,"processTimeMs":0}</code>
+           ╰ _Metadata_: <code>{"numOperations":0,"numAccesses":0,"totalAccessed":0,"searchTimeMs":1,"processTimeMs":0}</code>
        ╰ **Dead Code** (dead-code):
            ╰ _Metadata_: <code>{"consideredNodes":5,"searchTimeMs":0,"processTimeMs":0}</code>
        ╰ **Useless Loops** (useless-loop):
            ╰ _Metadata_: <code>{"numOfUselessLoops":0,"searchTimeMs":0,"processTimeMs":0}</code>
-    All queries together required ≈3 ms (1ms accuracy, total 9 ms)
+    All queries together required ≈6 ms (1ms accuracy, total 9 ms)
     ```
     
     
@@ -78,15 +80,15 @@ It offers a wide variety of features, for example:
     
     _Results (prettified and summarized):_
     
-    Query: **linter** (15 ms)\
+    Query: **linter** (213 ms)\
     &nbsp;&nbsp;&nbsp;╰ **Deprecated Functions** (deprecated-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"totalDeprecatedCalls":0,"totalDeprecatedFunctionDefinitions":0,"searchTimeMs":2,"processTimeMs":0}</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"totalCalls":0,"totalFunctionDefinitions":0,"searchTimeMs":199,"processTimeMs":1}</code>\
     &nbsp;&nbsp;&nbsp;╰ **File Path Validity** (file-path-validity):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"totalReads":1,"totalUnknown":0,"totalWritesBeforeAlways":0,"totalValid":0,"searchTimeMs":5,"processTimeMs":0}</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"totalReads":1,"totalUnknown":0,"totalWritesBeforeAlways":0,"totalValid":0,"searchTimeMs":4,"processTimeMs":1}</code>\
     &nbsp;&nbsp;&nbsp;╰ **Seeded Randomness** (seeded-randomness):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"consumerCalls":0,"callsWithFunctionProducers":0,"callsWithAssignmentProducers":0,"callsWithNonConstantProducers":0,"searchTimeMs":1,"processTimeMs":0}</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"consumerCalls":0,"callsWithFunctionProducers":0,"callsWithAssignmentProducers":0,"callsWithNonConstantProducers":0,"searchTimeMs":0,"processTimeMs":1}</code>\
     &nbsp;&nbsp;&nbsp;╰ **Absolute Paths** (absolute-file-paths):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
@@ -95,17 +97,19 @@ It offers a wide variety of features, for example:
     &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":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":4}</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"numOperations":0,"numAccesses":0,"totalAccessed":0,"searchTimeMs":0,"processTimeMs":3}</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dead Code** (dead-code):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"consideredNodes":5,"searchTimeMs":1,"processTimeMs":0}</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"consideredNodes":5,"searchTimeMs":0,"processTimeMs":1}</code>\
     &nbsp;&nbsp;&nbsp;╰ **Useless Loops** (useless-loop):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>{"numOfUselessLoops":0,"searchTimeMs":0,"processTimeMs":0}</code>\
-    _All queries together required ≈16 ms (1ms accuracy, total 209 ms)_
+    _All queries together required ≈213 ms (1ms accuracy, total 214 ms)_
     
     <details> <summary style="color:gray">Show Detailed Results as Json</summary>
     
-    The analysis required _209.2 ms_ (including parsing and normalization and the query) within the generation environment.	
+    The analysis required _214.2 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.
@@ -120,10 +124,10 @@ It offers a wide variety of features, for example:
           "deprecated-functions": {
             "results": [],
             ".meta": {
-              "totalDeprecatedCalls": 0,
-              "totalDeprecatedFunctionDefinitions": 0,
-              "searchTimeMs": 2,
-              "processTimeMs": 0
+              "totalCalls": 0,
+              "totalFunctionDefinitions": 0,
+              "searchTimeMs": 199,
+              "processTimeMs": 1
             }
           },
           "file-path-validity": {
@@ -144,8 +148,8 @@ It offers a wide variety of features, for example:
               "totalUnknown": 0,
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
-              "searchTimeMs": 5,
-              "processTimeMs": 0
+              "searchTimeMs": 4,
+              "processTimeMs": 1
             }
           },
           "seeded-randomness": {
@@ -155,8 +159,8 @@ It offers a wide variety of features, for example:
               "callsWithFunctionProducers": 0,
               "callsWithAssignmentProducers": 0,
               "callsWithNonConstantProducers": 0,
-              "searchTimeMs": 1,
-              "processTimeMs": 0
+              "searchTimeMs": 0,
+              "processTimeMs": 1
             }
           },
           "absolute-file-paths": {
@@ -196,6 +200,15 @@ It offers a wide variety of features, for example:
               "processTimeMs": 0
             }
           },
+          "network-functions": {
+            "results": [],
+            ".meta": {
+              "totalCalls": 0,
+              "totalFunctionDefinitions": 0,
+              "searchTimeMs": 1,
+              "processTimeMs": 0
+            }
+          },
           "dataframe-access-validation": {
             "results": [],
             ".meta": {
@@ -203,15 +216,15 @@ It offers a wide variety of features, for example:
               "numAccesses": 0,
               "totalAccessed": 0,
               "searchTimeMs": 0,
-              "processTimeMs": 4
+              "processTimeMs": 3
             }
           },
           "dead-code": {
             "results": [],
             ".meta": {
               "consideredNodes": 5,
-              "searchTimeMs": 1,
-              "processTimeMs": 0
+              "searchTimeMs": 0,
+              "processTimeMs": 1
             }
           },
           "useless-loop": {
@@ -224,11 +237,11 @@ It offers a wide variety of features, for example:
           }
         },
         ".meta": {
-          "timing": 15
+          "timing": 213
         }
       },
       ".meta": {
-        "timing": 16
+        "timing": 213
       }
     }
     ```
@@ -241,8 +254,6 @@ It offers a wide variety of features, for example:
     
     
     
-    
-    
     	
     		
     
@@ -295,7 +306,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.4.8, R v4.5.0 (r-shell engine)
+    flowR repl using flowR v2.6.0, R v4.5.0 (r-shell engine)
     R> :slicer test/testfiles/example.R --criterion "11@sum"
     ```
     
@@ -342,7 +353,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!">135.1 ms</span></i> (as of Aug 20, 2025), 
+  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">136.9 ms</span></i> (as of Oct 13, 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.
 
@@ -378,7 +389,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.4.8, R v4.5.0 (r-shell engine)
+    flowR repl using flowR v2.6.0, R v4.5.0 (r-shell engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -683,7 +694,7 @@ It offers a wide variety of features, for example:
     ```
     
     	
-    (The analysis required _14.2 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 _15.0 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     
@@ -753,7 +764,7 @@ We welcome every contribution! Please check out the [developer onboarding](https
 
 ----
 
-*flowr* is actively developed by [Florian Sihler](https://eagleoutice.github.io/portfolio/) under the
+*flowr* is actively developed by [Florian Sihler](https://eagleoutice.github.io/portfolio/) and (since October 1st 2025) [Oliver Gerstl](https://www.linkedin.com/in/oliver-gerstl) under the
 [GPLv3 License](LICENSE).\
 It is partially supported by the German Research Foundation (DFG) under the grant [504226141](https://gepris.dfg.de/gepris/projekt/504226141) ("CodeInspector").
 

package/abstract-interpretation/data-frame/absint-visitor.d.ts

@@ -22,7 +22,7 @@ export declare class DataFrameShapeInferenceVisitor<OtherInfo = NoInfo, ControlF
     private oldDomain;
     /**
      * The new domain of an AST node during and after processing the node.
-     * This information is stored in the {@link AbstractInterpretationInfo} afterwards.
+     * This information is stored in the {@link AbstractInterpretationInfo} afterward.
      */
     private newDomain;
     constructor(config: Config);

package/abstract-interpretation/data-frame/absint-visitor.js

@@ -23,7 +23,7 @@ class DataFrameShapeInferenceVisitor extends semantic_cfg_guided_visitor_1.Seman
     oldDomain = new Map();
     /**
      * The new domain of an AST node during and after processing the node.
-     * This information is stored in the {@link AbstractInterpretationInfo} afterwards.
+     * This information is stored in the {@link AbstractInterpretationInfo} afterward.
      */
     newDomain = new Map();
     constructor(config) {

package/cli/flowr.js

@@ -14,16 +14,15 @@ const command_line_args_1 = __importDefault(require("command-line-args"));
 const config_1 = require("../config");
 const assert_1 = require("../util/assert");
 const scripts_info_1 = require("./common/scripts-info");
-const shell_1 = require("../r-bridge/shell");
 const execute_1 = require("./repl/execute");
 const repl_main_1 = require("./repl/commands/repl-main");
 const core_1 = require("./repl/core");
-const repl_version_1 = require("./repl/commands/repl-version");
 const print_version_1 = require("./repl/print-version");
 const flowr_main_options_1 = require("./flowr-main-options");
-const tree_sitter_executor_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-executor");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const engines_1 = require("../engines");
+const flowr_analyzer_builder_1 = require("../project/flowr-analyzer-builder");
 exports.toolName = 'flowr';
 exports.optionHelp = [
     {
@@ -92,31 +91,6 @@ function createConfig() {
     });
     return config;
 }
-async function retrieveEngineInstances(config) {
-    const engines = {};
-    if ((0, config_1.getEngineConfig)(config, 'r-shell')) {
-        // we keep an active shell session to allow other parse investigations :)
-        engines['r-shell'] = new shell_1.RShell((0, config_1.getEngineConfig)(config, 'r-shell'), {
-            revive: 2 /* RShellReviveOptions.Always */,
-            onRevive: (code, signal) => {
-                const signalText = signal == null ? '' : ` and signal ${signal}`;
-                console.log(ansi_1.formatter.format(`R process exited with code ${code}${signalText}. Restarting...`, { color: 5 /* Colors.Magenta */, effect: ansi_1.ColorEffect.Foreground }));
-                console.log((0, ansi_1.italic)(`If you want to exit, press either Ctrl+C twice, or enter ${(0, ansi_1.bold)(':quit')}`));
-            }
-        });
-    }
-    if ((0, config_1.getEngineConfig)(config, 'tree-sitter')) {
-        await tree_sitter_executor_1.TreeSitterExecutor.initTreeSitter((0, config_1.getEngineConfig)(config, 'tree-sitter'));
-        engines['tree-sitter'] = new tree_sitter_executor_1.TreeSitterExecutor();
-    }
-    let defaultEngine = config.defaultEngine;
-    if (!defaultEngine || !engines[defaultEngine]) {
-        // if a default engine isn't specified, we just take the first one we have
-        defaultEngine = Object.keys(engines)[0];
-    }
-    log_1.log.info(`Using engines ${Object.keys(engines).join(', ')} with default ${defaultEngine}`);
-    return { engines, default: defaultEngine };
-}
 function hookSignalHandlers(engines) {
     const end = () => {
         if (options.execute === undefined) {
@@ -142,29 +116,33 @@ async function mainRepl() {
         console.log((0, command_line_usage_1.default)(exports.optionHelp));
         process.exit(0);
     }
-    const engines = await retrieveEngineInstances(config);
+    const engines = await (0, engines_1.retrieveEngineInstances)(config);
     const defaultEngine = engines.engines[engines.default];
     if (options.version) {
         for (const engine of Object.values(engines.engines)) {
-            await (0, repl_version_1.printVersionInformation)(repl_main_1.standardReplOutput, engine);
+            await (0, version_1.printVersionInformation)(repl_main_1.standardReplOutput, engine);
             engine?.close();
         }
         process.exit(0);
     }
     hookSignalHandlers(engines);
+    const analyzer = new flowr_analyzer_builder_1.FlowrAnalyzerBuilder()
+        .setParser(defaultEngine)
+        .setConfig(config)
+        .buildSync();
     const allowRSessionAccess = options['r-session-access'] ?? false;
     if (options.execute) {
-        await (0, core_1.replProcessAnswer)(config, repl_main_1.standardReplOutput, options.execute, defaultEngine, allowRSessionAccess);
+        await (0, core_1.replProcessAnswer)(analyzer, repl_main_1.standardReplOutput, options.execute, allowRSessionAccess);
     }
     else {
         await (0, print_version_1.printVersionRepl)(defaultEngine);
-        await (0, core_1.repl)(config, { parser: defaultEngine, allowRSessionAccess });
+        await (0, core_1.repl)({ analyzer: analyzer, allowRSessionAccess });
     }
     process.exit(0);
 }
 async function mainServer(backend = new net_1.NetServer()) {
     const config = createConfig();
-    const engines = await retrieveEngineInstances(config);
+    const engines = await (0, engines_1.retrieveEngineInstances)(config);
     hookSignalHandlers(engines);
     await new server_1.FlowRServer(engines.engines, engines.default, options['r-session-access'], config, backend).start(options.port);
 }

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

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

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

@@ -34,27 +34,18 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 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_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, config) {
-    return await (0, default_pipelines_1.createDataflowPipeline)(parser, {
-        request: (0, retriever_1.requestFromInput)(remainingLine.trim())
-    }, config).allRemainingSteps();
-}
-function handleString(code) {
-    return code.startsWith('"') ? JSON.parse(code) : code;
-}
+const core_1 = require("../core");
 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, config) {
-    const result = await controlflow(shell, handleString(remainingLine), config);
-    const cfg = (0, extract_cfg_1.extractCfg)(result.normalize, config, result.dataflow.graph, [...cfg_simplification_1.DefaultCfgSimplificationOrder, ...simplifications]);
-    const mermaid = cfgConverter(cfg, result.normalize);
+async function produceAndPrintCfg(analyzer, output, simplifications, cfgConverter) {
+    const cfg = await analyzer.controlflow([...cfg_simplification_1.DefaultCfgSimplificationOrder, ...simplifications]);
+    const normalizedAst = await analyzer.normalize();
+    const mermaid = cfgConverter(cfg, normalizedAst);
     output.stdout(mermaid);
     try {
         const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
@@ -66,38 +57,46 @@ async function produceAndPrintCfg(shell, remainingLine, output, simplifications,
 }
 exports.controlflowCommand = {
     description: `Get mermaid code for the control-flow graph of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
+    isCodeCommand: true,
     usageExample: ':controlflow',
     aliases: ['cfg', 'cf'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        await produceAndPrintCfg(parser, remainingLine, output, [], cfg_1.cfgToMermaid, config);
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        await produceAndPrintCfg(analyzer, output, [], cfg_1.cfgToMermaid);
     }
 };
 exports.controlflowStarCommand = {
     description: 'Returns the URL to mermaid.live',
+    isCodeCommand: true,
     usageExample: ':controlflow*',
     aliases: ['cfg*', 'cf*'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        await produceAndPrintCfg(parser, remainingLine, output, [], cfg_1.cfgToMermaidUrl, config);
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        await produceAndPrintCfg(analyzer, 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`,
+    isCodeCommand: true,
     usageExample: ':controlflowbb',
     aliases: ['cfgb', 'cfb'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        await produceAndPrintCfg(parser, remainingLine, output, ['to-basic-blocks'], cfg_1.cfgToMermaid, config);
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        await produceAndPrintCfg(analyzer, output, ['to-basic-blocks'], cfg_1.cfgToMermaid);
     }
 };
 exports.controlflowBbStarCommand = {
     description: 'Returns the URL to mermaid.live',
+    isCodeCommand: true,
     usageExample: ':controlflowbb*',
     aliases: ['cfgb*', 'cfb*'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        await produceAndPrintCfg(parser, remainingLine, output, ['to-basic-blocks'], cfg_1.cfgToMermaidUrl, config);
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        await produceAndPrintCfg(analyzer, output, ['to-basic-blocks'], cfg_1.cfgToMermaidUrl);
     }
 };
 //# sourceMappingURL=repl-cfg.js.map

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

@@ -1,6 +1,6 @@
-import type { ReplCommand } from './repl-main';
+import type { ReplCodeCommand, ReplCommand } from './repl-main';
 export declare const helpCommand: ReplCommand;
-export declare function getReplCommands(): Record<string, ReplCommand>;
+export declare function getReplCommands(): Record<string, ReplCommand | ReplCodeCommand>;
 /**
  * The names of all commands including their aliases (but without the leading `:`)
  */
@@ -9,7 +9,7 @@ export declare function getCommandNames(): string[];
  * Get the command for a given command name or alias.
  * @param command - The name of the command (without the leading `:`)
  */
-export declare function getCommand(command: string): ReplCommand | undefined;
+export declare function getCommand(command: string): ReplCodeCommand | ReplCommand | undefined;
 export declare function asOptionName(argument: string): string;
 export declare function longestCommandName(): number;
 export declare function padCmd<T>(string: T): string;

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

@@ -47,6 +47,7 @@ function printCommandHelp(formatter) {
 }
 exports.helpCommand = {
     description: 'Show help information',
+    isCodeCommand: false,
     script: false,
     usageExample: ':help',
     aliases: ['h', '?'],
@@ -113,6 +114,7 @@ function getReplCommands() {
                 aliases: [],
                 script: true,
                 usageExample: `:${script} --help`,
+                isCodeCommand: false,
                 fn: async ({ output, remainingLine }) => {
                     // check if the target *module* exists in the current directory, else try two dirs up, otherwise, fail with a message
                     let path = `${__dirname}/${target}`;

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

@@ -1,5 +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;
+import type { ReplCodeCommand } from './repl-main';
+export declare const dataflowCommand: ReplCodeCommand;
+export declare const dataflowStarCommand: ReplCodeCommand;
+export declare const dataflowSimplifiedCommand: ReplCodeCommand;
+export declare const dataflowSimpleStarCommand: ReplCodeCommand;

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

@@ -34,88 +34,85 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 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/text/ansi");
-/**
- * Obtain the dataflow graph using a known parser (such as the {@link RShell} or {@link TreeSitterExecutor}).
- */
-async function replGetDataflow(config, parser, code) {
-    return await (0, default_pipelines_1.createDataflowPipeline)(parser, {
-        request: (0, retriever_1.requestFromInput)(code.trim())
-    }, config).allRemainingSteps();
-}
-function handleString(code) {
-    return code.startsWith('"') ? JSON.parse(code) : code;
-}
-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 */ });
+const core_1 = require("../core");
+function formatInfo(out, type, meta) {
+    return out.formatter.format(`Copied ${type} to clipboard (dataflow: ${meta['.meta'].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, start with '${retriever_1.fileProtocol}' to indicate a file`,
+    isCodeCommand: true,
     usageExample: ':dataflow',
     aliases: ['d', 'df'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        const result = await replGetDataflow(config, parser, handleString(remainingLine));
-        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.dataflow.graph, includeEnvironments: false }).string;
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        const result = await analyzer.dataflow();
+        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.graph, includeEnvironments: false }).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));
+            output.stdout(formatInfo(output, 'mermaid code', result));
         }
         catch { /* do nothing this is a service thing */ }
     }
 };
 exports.dataflowStarCommand = {
     description: 'Returns the URL to mermaid.live',
+    isCodeCommand: true,
     usageExample: ':dataflow*',
     aliases: ['d*', 'df*'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        const result = await replGetDataflow(config, parser, handleString(remainingLine));
-        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.dataflow.graph, false);
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        const result = await analyzer.dataflow();
+        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.graph, false);
         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));
+            output.stdout(formatInfo(output, 'mermaid url', result));
         }
         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`,
+    isCodeCommand: true,
     usageExample: ':dataflowsimple',
     aliases: ['ds', 'dfs'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        const result = await replGetDataflow(config, parser, handleString(remainingLine));
-        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.dataflow.graph, includeEnvironments: false, simplified: true }).string;
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        const result = await analyzer.dataflow();
+        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.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));
+            output.stdout(formatInfo(output, 'mermaid code', result));
         }
         catch { /* do nothing this is a service thing */ }
     }
 };
 exports.dataflowSimpleStarCommand = {
     description: 'Returns the URL to mermaid.live',
+    isCodeCommand: true,
     usageExample: ':dataflowsimple*',
     aliases: ['ds*', 'dfs*'],
     script: false,
-    fn: async ({ output, parser, remainingLine, config }) => {
-        const result = await replGetDataflow(config, parser, handleString(remainingLine));
-        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.dataflow.graph, false, undefined, true);
+    argsParser: (args) => (0, core_1.handleString)(args),
+    fn: async ({ output, analyzer }) => {
+        const result = await analyzer.dataflow();
+        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.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));
+            output.stdout(formatInfo(output, 'mermaid url', result));
         }
         catch { /* do nothing this is a service thing */ }
     }

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

@@ -1,3 +1,3 @@
 import type { ReplCommand, ReplCommandInformation } from './repl-main';
-export declare function tryExecuteRShellCommand({ output, parser, allowRSessionAccess, remainingLine }: ReplCommandInformation): Promise<void>;
+export declare function tryExecuteRShellCommand({ output, analyzer, allowRSessionAccess, remainingLine }: ReplCommandInformation): Promise<void>;
 export declare const executeCommand: ReplCommand;