@eagleoutice/flowr 2.1.12 → 2.2.0

package/core/steps/pipeline/default-pipelines.js

@@ -1,25 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_PARSE_PIPELINE = exports.DEFAULT_NORMALIZE_PIPELINE = exports.DEFAULT_DATAFLOW_PIPELINE = exports.DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE = exports.DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE = exports.DEFAULT_SLICING_PIPELINE = void 0;
-/**
- * Contains the default pipeline for working with flowr
- */
+exports.TREE_SITTER_PARSE_PIPELINE = exports.DEFAULT_PARSE_PIPELINE = exports.TREE_SITTER_NORMALIZE_PIPELINE = exports.DEFAULT_NORMALIZE_PIPELINE = exports.TREE_SITTER_DATAFLOW_PIPELINE = exports.DEFAULT_DATAFLOW_PIPELINE = exports.TREE_SITTER_SLICE_WITHOUT_RECONSTRUCT_PIPELINE = exports.TREE_SITTER_SLICE_AND_RECONSTRUCT_PIPELINE = exports.TREE_SITTER_SLICING_PIPELINE = exports.DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE = exports.DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE = exports.DEFAULT_SLICING_PIPELINE = void 0;
+exports.createParsePipeline = createParsePipeline;
+exports.createSlicePipeline = createSlicePipeline;
+exports.createNormalizePipeline = createNormalizePipeline;
+exports.createDataflowPipeline = createDataflowPipeline;
 const pipeline_1 = require("./pipeline");
 const _00_parse_1 = require("../all/core/00-parse");
 const _10_normalize_1 = require("../all/core/10-normalize");
 const _20_dataflow_1 = require("../all/core/20-dataflow");
 const _00_slice_1 = require("../all/static-slicing/00-slice");
 const _10_reconstruct_1 = require("../all/static-slicing/10-reconstruct");
+const _01_parse_tree_sitter_1 = require("../all/core/01-parse-tree-sitter");
+const _11_normalize_tree_sitter_1 = require("../all/core/11-normalize-tree-sitter");
+const pipeline_executor_1 = require("../../pipeline-executor");
 exports.DEFAULT_SLICING_PIPELINE = (0, pipeline_1.createPipeline)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, _10_normalize_1.NORMALIZE, _20_dataflow_1.STATIC_DATAFLOW, _00_slice_1.STATIC_SLICE, _10_reconstruct_1.NAIVE_RECONSTRUCT);
 exports.DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE = exports.DEFAULT_SLICING_PIPELINE;
 exports.DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE = (0, pipeline_1.createPipeline)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, _10_normalize_1.NORMALIZE, _20_dataflow_1.STATIC_DATAFLOW, _00_slice_1.STATIC_SLICE);
+exports.TREE_SITTER_SLICING_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tree_sitter_1.PARSE_WITH_TREE_SITTER_STEP, _11_normalize_tree_sitter_1.NORMALIZE_TREE_SITTER, _20_dataflow_1.STATIC_DATAFLOW, _00_slice_1.STATIC_SLICE, _10_reconstruct_1.NAIVE_RECONSTRUCT);
+exports.TREE_SITTER_SLICE_AND_RECONSTRUCT_PIPELINE = exports.TREE_SITTER_SLICING_PIPELINE;
+exports.TREE_SITTER_SLICE_WITHOUT_RECONSTRUCT_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tree_sitter_1.PARSE_WITH_TREE_SITTER_STEP, _11_normalize_tree_sitter_1.NORMALIZE_TREE_SITTER, _20_dataflow_1.STATIC_DATAFLOW, _00_slice_1.STATIC_SLICE);
 /**
  * The default pipeline for working with flowr, including the dataflow step,
  * see the {@link DEFAULT_NORMALIZE_PIPELINE} for the pipeline without the dataflow step,
  * and the {@link DEFAULT_SLICE_AND_RECONSTRUCT_PIPELINE} for the pipeline with slicing and reconstructing steps
  */
 exports.DEFAULT_DATAFLOW_PIPELINE = (0, pipeline_1.createPipeline)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, _10_normalize_1.NORMALIZE, _20_dataflow_1.STATIC_DATAFLOW);
+exports.TREE_SITTER_DATAFLOW_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tree_sitter_1.PARSE_WITH_TREE_SITTER_STEP, _11_normalize_tree_sitter_1.NORMALIZE_TREE_SITTER, _20_dataflow_1.STATIC_DATAFLOW);
 /** The pipeline to use when you want to parse and normalize your R file, see {@link DEFAULT_DATAFLOW_PIPELINE} for the additional `dataflow` step */
 exports.DEFAULT_NORMALIZE_PIPELINE = (0, pipeline_1.createPipeline)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, _10_normalize_1.NORMALIZE);
+exports.TREE_SITTER_NORMALIZE_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tree_sitter_1.PARSE_WITH_TREE_SITTER_STEP, _11_normalize_tree_sitter_1.NORMALIZE_TREE_SITTER);
 exports.DEFAULT_PARSE_PIPELINE = (0, pipeline_1.createPipeline)(_00_parse_1.PARSE_WITH_R_SHELL_STEP);
+exports.TREE_SITTER_PARSE_PIPELINE = (0, pipeline_1.createPipeline)(_01_parse_tree_sitter_1.PARSE_WITH_TREE_SITTER_STEP);
+function createParsePipeline(parser, inputs) {
+    const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_PARSE_PIPELINE : exports.DEFAULT_PARSE_PIPELINE;
+    return new pipeline_executor_1.PipelineExecutor(base, {
+        parser: parser,
+        ...inputs
+    });
+}
+function createSlicePipeline(parser, inputs) {
+    const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_SLICING_PIPELINE : exports.DEFAULT_SLICING_PIPELINE;
+    return new pipeline_executor_1.PipelineExecutor(base, {
+        parser: parser,
+        ...inputs
+    });
+}
+function createNormalizePipeline(parser, inputs) {
+    const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_NORMALIZE_PIPELINE : exports.DEFAULT_NORMALIZE_PIPELINE;
+    return new pipeline_executor_1.PipelineExecutor(base, {
+        parser: parser,
+        ...inputs
+    });
+}
+function createDataflowPipeline(parser, inputs) {
+    const base = parser.name === 'tree-sitter' ? exports.TREE_SITTER_DATAFLOW_PIPELINE : exports.DEFAULT_DATAFLOW_PIPELINE;
+    return new pipeline_executor_1.PipelineExecutor(base, {
+        parser: parser,
+        ...inputs
+    });
+}
 //# sourceMappingURL=default-pipelines.js.map

package/dataflow/extractor.d.ts

@@ -2,5 +2,6 @@ import type { DataflowInformation } from './info';
 import type { DataflowProcessors } from './processor';
 import type { NormalizedAst, ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RParseRequests } from '../r-bridge/retriever';
+import type { KnownParserType, Parser } from '../r-bridge/parser';
 export declare const processors: DataflowProcessors<ParentInformation>;
-export declare function produceDataFlowGraph<OtherInfo>(request: RParseRequests, ast: NormalizedAst<OtherInfo & ParentInformation>): DataflowInformation;
+export declare function produceDataFlowGraph<OtherInfo>(parser: Parser<KnownParserType>, request: RParseRequests, ast: NormalizedAst<OtherInfo & ParentInformation>): DataflowInformation;

package/dataflow/extractor.js

@@ -68,7 +68,7 @@ function resolveLinkToSideEffects(ast, graph) {
         }
     }
 }
-function produceDataFlowGraph(request, ast) {
+function produceDataFlowGraph(parser, request, ast) {
     const multifile = Array.isArray(request);
     let firstRequest;
     if (multifile) {
@@ -78,6 +78,7 @@ function produceDataFlowGraph(request, ast) {
         firstRequest = request;
     }
     const dfData = {
+        parser: parser,
         completeAst: ast,
         environment: (0, environment_1.initializeCleanEnvironments)(),
         processors: exports.processors,

package/dataflow/internal/process/functions/call/built-in/built-in-source.js

@@ -7,11 +7,9 @@ exports.setSourceProvider = setSourceProvider;
 exports.processSourceCall = processSourceCall;
 exports.sourceRequest = sourceRequest;
 exports.standaloneSourceFile = standaloneSourceFile;
-const shell_executor_1 = require("../../../../../../r-bridge/shell-executor");
 const processor_1 = require("../../../../../processor");
 const info_1 = require("../../../../../info");
 const config_1 = require("../../../../../../config");
-const parser_1 = require("../../../../../../r-bridge/lang-4.x/ast/parser/json/parser");
 const known_call_handling_1 = require("../known-call-handling");
 const retriever_1 = require("../../../../../../r-bridge/retriever");
 const decorate_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate");
@@ -21,6 +19,8 @@ const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const overwrite_1 = require("../../../../../environments/overwrite");
 const log_1 = require("../../../../../../util/log");
 const fs_1 = __importDefault(require("fs"));
+const parser_1 = require("../../../../../../r-bridge/lang-4.x/ast/parser/json/parser");
+const shell_executor_1 = require("../../../../../../r-bridge/shell-executor");
 let sourceProvider = (0, retriever_1.requestProviderFromFile)();
 function setSourceProvider(provider) {
     sourceProvider = provider;
@@ -61,13 +61,14 @@ function sourceRequest(rootId, request, data, information, getId) {
             return information;
         }
     }
-    const executor = new shell_executor_1.RShellExecutor();
     // parse, normalize and dataflow the sourced file
     let normalized;
     let dataflow;
     try {
-        const parsed = (0, retriever_1.retrieveParseDataFromRCode)(request, executor);
-        normalized = (0, parser_1.normalize)({ parsed }, getId, request.request === 'file' ? request.content : undefined);
+        const file = request.request === 'file' ? request.content : undefined;
+        const parsed = (!data.parser.async ? data.parser : new shell_executor_1.RShellExecutor()).parse(request);
+        normalized = (typeof parsed !== 'string' ?
+            (0, parser_1.normalizeTreeSitter)({ parsed }, getId, file) : (0, parser_1.normalize)({ parsed }, getId, file));
         dataflow = (0, processor_1.processDataflowFor)(normalized.ast, {
             ...data,
             currentRequest: request,

package/dataflow/processor.d.ts

@@ -6,7 +6,9 @@ import type { NormalizedAst, ParentInformation, RNodeWithParent } from '../r-bri
 import type { REnvironmentInformation } from './environments/environment';
 import type { RParseRequest } from '../r-bridge/retriever';
 import type { RNode } from '../r-bridge/lang-4.x/ast/model/model';
+import type { KnownParserType, Parser } from '../r-bridge/parser';
 export interface DataflowProcessorInformation<OtherInfo> {
+    readonly parser: Parser<KnownParserType>;
     /**
     * Initial and frozen ast-information
     */

package/documentation/doc-util/doc-auto-gen.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoGenHeader = autoGenHeader;
 const version_1 = require("../../util/version");
+const doc_files_1 = require("./doc-files");
 function autoGenHeader({ rVersion, filename, purpose, currentDateAndTime = new Date().toISOString().replace('T', ', ').replace(/\.\d+Z$/, ' UTC') }) {
     const shortenFilename = filename.replace(/^.*src\//, 'src/');
-    return `_This document was generated from '${shortenFilename}' on ${currentDateAndTime} presenting an overview of flowR's ${purpose} (v${(0, version_1.flowrVersion)().format()}${rVersion ? ', using R v' + rVersion : ''})._`;
+    return `_This document was generated from '${(0, doc_files_1.linkFlowRSourceFile)(shortenFilename)}' on ${currentDateAndTime} presenting an overview of flowR's ${purpose} (v${(0, version_1.flowrVersion)().format()}${rVersion ? ', using R v' + rVersion : ''}). Please do not edit this file/wiki page directly._`;
 }
 //# sourceMappingURL=doc-auto-gen.js.map

package/documentation/doc-util/doc-cfg.js

@@ -7,7 +7,7 @@ const default_pipelines_1 = require("../../core/steps/pipeline/default-pipelines
 const retriever_1 = require("../../r-bridge/retriever");
 async function getCfg(shell, code) {
     const steps = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_NORMALIZE_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     return {

package/documentation/doc-util/doc-dfg.js

@@ -35,7 +35,7 @@ function formatSideEffect(ef) {
 async function printDfGraphForCode(shell, code, { mark, showCode = true, codeOpen = false, exposeResult, switchCodeAndGraph = false } = {}) {
     const now = performance.now();
     const result = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     const duration = performance.now() - now;
@@ -74,7 +74,7 @@ ${switchCodeAndGraph ? dfGraph : codeText}
 async function verifyExpectedSubgraph(shell, code, expectedSubgraph) {
     /* we verify that we get what we want first! */
     const info = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)(code),
         getId: (0, decorate_1.deterministicCountingIdGenerator)(0)
     }).allRemainingSteps();

package/documentation/doc-util/doc-files.d.ts

@@ -7,3 +7,4 @@ export declare const FlowrDockerRef = "https://hub.docker.com/r/eagleoutice/flow
 export declare const FlowrCodecovRef = "https://app.codecov.io/gh/flowr-analysis/flowr";
 export declare function getFilePathMd(path: string): string;
 export declare function getFileContentFromRoot(path: string): string;
+export declare function linkFlowRSourceFile(path: string): string;

package/documentation/doc-util/doc-files.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowrCodecovRef = exports.FlowrDockerRef = exports.FlowrNpmRef = exports.FlowrWikiBaseRef = exports.RemoteFlowrFilePathBaseRef = exports.FlowrSiteBaseRef = exports.FlowrGithubBaseRef = void 0;
 exports.getFilePathMd = getFilePathMd;
 exports.getFileContentFromRoot = getFileContentFromRoot;
+exports.linkFlowRSourceFile = linkFlowRSourceFile;
 const fs_1 = __importDefault(require("fs"));
 exports.FlowrGithubBaseRef = 'https://github.com/flowr-analysis';
 exports.FlowrSiteBaseRef = 'https://flowr-analysis.github.io/flowr';
@@ -27,4 +28,7 @@ function getFileContentFromRoot(path) {
     const fullpath = require.resolve('../../../' + path);
     return fs_1.default.readFileSync(fullpath, 'utf-8');
 }
+function linkFlowRSourceFile(path) {
+    return `[${path}](${exports.RemoteFlowrFilePathBaseRef}/${path})`;
+}
 //# sourceMappingURL=doc-files.js.map

package/documentation/doc-util/doc-normalized-ast.js

@@ -22,7 +22,7 @@ ${(0, ast_1.normalizedAstToMermaid)(ast, prefix)}
 async function printNormalizedAstForCode(shell, code, { showCode = true, prefix = 'flowchart TD\n' } = {}) {
     const now = performance.now();
     const result = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_NORMALIZE_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     const duration = performance.now() - now;
@@ -55,8 +55,7 @@ ${(0, ast_1.normalizedAstToMermaid)(result.normalize.ast, prefix)}
 /** returns resolved expected df graph */
 async function verifyExpectedSubgraph(shell, code, expectedSubgraph) {
     /* we verify that we get what we want first! */
-    const info = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        shell,
+    const info = await (0, default_pipelines_1.createDataflowPipeline)(shell, {
         request: (0, retriever_1.requestFromInput)(code),
         getId: (0, decorate_1.deterministicCountingIdGenerator)(0)
     }).allRemainingSteps();

package/documentation/doc-util/doc-query.js

@@ -20,7 +20,7 @@ const query_print_1 = require("../../queries/query-print");
 async function showQuery(shell, code, queries, { showCode, collapseResult, collapseQuery } = {}) {
     const now = performance.now();
     const analysis = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     const results = (0, query_1.executeQueries)({ dataflow: analysis.dataflow, ast: analysis.normalize }, queries);

package/documentation/doc-util/doc-search.js

@@ -20,7 +20,7 @@ const dfg_1 = require("../../util/mermaid/dfg");
 async function showSearch(shell, code, search, { collapseResult = true } = {}) {
     const now = performance.now();
     const analysis = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     const result = (0, flowr_search_executor_1.runSearch)(search, analysis);

package/documentation/doc-util/doc-types.js

@@ -368,9 +368,9 @@ function shortLink(name, hierarchy, codeStyle = true) {
         return '';
     }
     const [pkg, mainName, node] = res;
-    const comments = node.comments?.join('\n').replace(/\\?\n|```[a-zA-Z]*|\s\s*/g, ' ').replace(/<\/?code>|/g, '') ?? '';
+    const comments = node.comments?.join('\n').replace(/\\?\n|```[a-zA-Z]*|\s\s*/g, ' ').replace(/<\/?code>|`/g, '').replace(/"/g, '\'') ?? '';
     return `[${codeStyle ? '<code>' : ''}${(node.comments?.length ?? 0) > 0 ?
-        (0, html_hover_over_1.textWithTooltip)(pkg ? `${pkg}::<b>${mainName}</b>` : mainName, (0, mermaid_1.escapeMarkdown)(comments.length > 400 ? comments.slice(0, 400) + '...' : comments)) : node.name}${codeStyle ? '</code>' : ''}](${getTypePathLink(node)})`;
+        (0, html_hover_over_1.textWithTooltip)(pkg ? `${pkg}::<b>${mainName}</b>` : mainName, comments.length > 400 ? comments.slice(0, 400) + '...' : comments) : node.name}${codeStyle ? '</code>' : ''}](${getTypePathLink(node)})`;
 }
 function getDocumentationForType(name, hierarchy) {
     const res = retrieveNode(name, hierarchy);

package/documentation/print-dataflow-graph-wiki.js

@@ -85,7 +85,7 @@ async function getVertexExplanations(shell, vertexType) {
     /* we use the map to ensure order easily :D */
     const vertexExplanations = new Map();
     vertexExplanations.set(vertex_1.VertexType.Value, [{
-            shell: shell,
+            shell,
             name: 'Value Vertex',
             type: vertex_1.VertexType.Value,
             description: `
@@ -113,7 +113,7 @@ ${(0, doc_structure_1.details)('Example: Semantics Create a Value', `In the foll
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().constant('0')
         }, []]);
     vertexExplanations.set(vertex_1.VertexType.Use, [{
-            shell: shell,
+            shell,
             name: 'Use Vertex',
             type: vertex_1.VertexType.Use,
             description: `
@@ -160,7 +160,7 @@ ${(0, doc_structure_1.details)('Example: Reads Edge Identifying Multiple Definit
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().use('1@x', 'x')
         }, []]);
     vertexExplanations.set(vertex_1.VertexType.FunctionCall, [{
-            shell: shell,
+            shell,
             name: 'Function Call Vertex',
             type: vertex_1.VertexType.FunctionCall,
             description: `
@@ -348,7 +348,7 @@ ${(0, doc_structure_1.details)('Example: Function Call with a Side-Effect', awai
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().call('1@foo', 'foo', [])
         }, []]);
     vertexExplanations.set(vertex_1.VertexType.VariableDefinition, [{
-            shell: shell,
+            shell,
             name: 'Variable Definition Vertex',
             type: vertex_1.VertexType.VariableDefinition,
             description: `
@@ -392,7 +392,7 @@ As you can see, _flowR_ is able to recognize that the initial definition of \`x\
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().defineVariable('1@x', 'x')
         }, []]);
     vertexExplanations.set(vertex_1.VertexType.FunctionDefinition, [{
-            shell: shell,
+            shell,
             name: 'Function Definition Vertex',
             type: vertex_1.VertexType.FunctionDefinition,
             description: `
@@ -484,7 +484,7 @@ Besides this being a theoretically "shorter" way of defining a function, this be
 async function getEdgesExplanations(shell) {
     const edgeExplanations = new Map();
     edgeExplanations.set(edge_1.EdgeType.Reads, [{
-            shell: shell,
+            shell,
             name: 'Reads Edge',
             type: edge_1.EdgeType.Reads,
             description: `
@@ -522,7 +522,7 @@ Please refer to the explanation of the respective vertices for more information.
                 expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().reads('1:20', '1@x')
             }]]);
     edgeExplanations.set(edge_1.EdgeType.DefinedBy, [{
-            shell: shell,
+            shell,
             name: 'DefinedBy Edge', /* concat for link generation */
             type: edge_1.EdgeType.DefinedBy,
             description: `
@@ -546,7 +546,7 @@ However, nested definitions can carry it (in the nested case, \`x\` is defined b
                 expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().definedBy('1@x', '1:8')
             }]]);
     edgeExplanations.set(edge_1.EdgeType.Calls, [{
-            shell: shell,
+            shell,
             name: 'Calls Edge',
             type: edge_1.EdgeType.Calls,
             description: 'Link the [function call](#function-call-vertex) to the [function definition](#function-definition-vertex) that is called.',
@@ -554,7 +554,7 @@ However, nested definitions can carry it (in the nested case, \`x\` is defined b
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().calls('2@foo', '1@function')
         }, []]);
     edgeExplanations.set(edge_1.EdgeType.Returns, [{
-            shell: shell,
+            shell,
             name: 'Returns Edge',
             type: edge_1.EdgeType.Returns,
             description: 'Link the [function call](#function-call-vertex)  to the exit points of the target definition (this may incorporate the call-context).',
@@ -568,7 +568,7 @@ f()
 	`.trim();
     const dfInfo = await (0, doc_dfg_1.printDfGraphForCode)(shell, lateBindingExample, { switchCodeAndGraph: true, codeOpen: true, mark: new Set([1, '1->5', '9->5']) });
     edgeExplanations.set(edge_1.EdgeType.DefinesOnCall, [{
-            shell: shell,
+            shell,
             name: 'DefinesOnCall Edge',
             type: edge_1.EdgeType.DefinesOnCall,
             description: `*This edge is usually joined with ${linkEdgeName(edge_1.EdgeType.DefinedByOnCall)}!*
@@ -592,7 +592,7 @@ ${dfInfo}
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().definesOnCall('$11', '$1').definedByOnCall('$1', '$11')
         }, []]);
     edgeExplanations.set(edge_1.EdgeType.DefinedByOnCall, [{
-            shell: shell,
+            shell,
             name: 'DefinedByOnCall Edge',
             type: edge_1.EdgeType.DefinedByOnCall,
             description: `*This edge is usually joined with ${linkEdgeName(edge_1.EdgeType.DefinesOnCall)}!*
@@ -602,7 +602,7 @@ ${dfInfo}
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().definesOnCall('$11', '$1').definedByOnCall('$1', '$11')
         }, []]);
     edgeExplanations.set(edge_1.EdgeType.Argument, [{
-            shell: shell,
+            shell,
             name: 'Argument Edge',
             type: edge_1.EdgeType.Argument,
             description: `Links a [function call](#function-call-vertex) to the entry point of its arguments. If we do not know the target of such a call, we automatically assume that all arguments are read by the call as well!
@@ -613,7 +613,7 @@ The exception to this is the [function definition](#function-definition-vertex)
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().argument('1@f', '1@x').reads('1@f', '1@x').argument('1@f', '1@y').reads('1@f', '1@y')
         }, []]);
     edgeExplanations.set(edge_1.EdgeType.SideEffectOnCall, [{
-            shell: shell,
+            shell,
             name: 'SideEffectOnCall Edge',
             type: edge_1.EdgeType.SideEffectOnCall,
             description: 'Links a global side effect to an affected function call (e.g., a super definition within the function body)',
@@ -621,7 +621,7 @@ The exception to this is the [function definition](#function-definition-vertex)
             expectedSubgraph: (0, dataflowgraph_builder_1.emptyGraph)().sideEffectOnCall('1@x', '2@f')
         }, []]);
     edgeExplanations.set(edge_1.EdgeType.NonStandardEvaluation, [{
-            shell: shell,
+            shell,
             name: 'NonStandardEvaluation Edge',
             type: edge_1.EdgeType.NonStandardEvaluation,
             description: `
@@ -668,7 +668,7 @@ ${(0, doc_structure_1.details)('Example: While-Loop Body', await (0, doc_dfg_1.p
 async function dummyDataflow() {
     const shell = new shell_1.RShell();
     const result = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        shell,
+        parser: shell,
         request: (0, retriever_1.requestFromInput)('x <- 1\nx + 1')
     }).allRemainingSteps();
     shell.close();

package/documentation/print-engines-wiki.d.ts

@@ -0,0 +1 @@
+export {};

package/documentation/print-engines-wiki.js

@@ -0,0 +1,82 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shell_1 = require("../r-bridge/shell");
+const log_1 = require("../../test/functionality/_helper/log");
+const doc_auto_gen_1 = require("./doc-util/doc-auto-gen");
+const doc_types_1 = require("./doc-util/doc-types");
+const path_1 = __importDefault(require("path"));
+const shell_executor_1 = require("../r-bridge/shell-executor");
+const tree_sitter_executor_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-executor");
+const doc_files_1 = require("./doc-util/doc-files");
+const doc_cli_option_1 = require("./doc-util/doc-cli-option");
+const doc_structure_1 = require("./doc-util/doc-structure");
+async function getText(shell) {
+    const rversion = (await shell.usedRVersion())?.format() ?? 'unknown';
+    const types = (0, doc_types_1.getTypesFromFolderAsMermaid)({
+        rootFolder: path_1.default.resolve('src/r-bridge/lang-4.x/tree-sitter/'),
+        files: [path_1.default.resolve('./src/config.ts'), path_1.default.resolve('./src/r-bridge/shell.ts'), path_1.default.resolve('./src/r-bridge/shell-executor.ts')],
+        typeName: 'FlowrConfigOptions',
+        inlineTypes: doc_types_1.mermaidHide
+    });
+    return `${(0, doc_auto_gen_1.autoGenHeader)({ filename: module.filename, purpose: 'engines', rVersion: rversion })}
+
+To analyze R scripts, flowR needs to parse the R code and for that, we require a parser.
+Originally, flowR shipped with a ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)}, an asynchronous interface to the R interpreter, still available today.
+Later we extended this with the ${(0, doc_types_1.shortLink)(shell_executor_1.RShellExecutor.name, types.info)}, the synchronous counterpart to the ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)}.
+However, these interfaces are relatively slow as they require communication with an underlying R interpreter. 
+Using [tree-sitter](https://tree-sitter.github.io/tree-sitter/), with its [node bindings](https://github.com/tree-sitter/node-tree-sitter)
+and [R grammar](https://github.com/r-lib/tree-sitter-r), we can provide the ${(0, doc_types_1.shortLink)(tree_sitter_executor_1.TreeSitterExecutor.name, types.info)} which
+is synchronous, faster, and no longer needs an R installation, but requires the appropriate bindings.
+To allow users of R to freely choose their backend between the R interpreter and the tree-sitter parser,
+we provide the concept of engines. 
+
+Engines can be loaded with [flowR's configuration file](${doc_files_1.FlowrWikiBaseRef}/Interface#configuring-flowr). Additionally, they
+are exposed with some command line options (e.g., when using the docker image of flowR):
+
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.r-shell.disabled', false)} to disable the ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)} engine
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.r-shell.r-path', false)} (which is the canonical version of ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'r-path')})
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.disabled', false)} to disable the ${(0, doc_types_1.shortLink)(tree_sitter_executor_1.TreeSitterExecutor.name, types.info)} engine
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.wasm-path', false)} pass the path to the wasm of the r grammar of tree-sitter (see [below](#tree-sitter))
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.tree-sitter-wasm-path', false)} pass the path to the wasm of tree-sitter (see [below](#tree-sitter))
+- ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'default-engine', false)} to set the default engine to use
+
+<a id="tree-sitter"></a>
+## Dealing with the Tree-Sitter Engine
+
+${(0, doc_structure_1.block)({
+        type: 'WARNING',
+        content: 'As the tree-sitter engine is only for parsing, it cannot execute R code.'
+    })}
+
+In general, there is no need for you to pass custom paths using either 
+${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.wasm-path', false)} or
+${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'engine.tree-sitter.tree-sitter-wasm-path', false)}.
+However, you may want to experiment with the R grammar or provide a newer
+one in case that of _flowR_ is outdated. 
+
+To use a newer [R grammar](https://github.com/r-lib/tree-sitter-r),
+you first must build the new wasm file. For this you have to:
+
+1. Install the dependencies with \`npm ci\` in the tree-sitter-r repository.
+2. Build the wasm using \`tree-sitter build --wasm .\` the [tree sitter cli](https://github.com/tree-sitter/tree-sitter)
+   which should be a dev dependency.
+3. Pass the \`tree-sitter-r.wasm\` to flowR. 
+
+For tree-sitter, please rely on the [releases](https://github.com/tree-sitter/tree-sitter/releases).
+
+`;
+}
+/** if we run this script, we want a Markdown representation of the capabilities */
+if (require.main === module) {
+    (0, log_1.setMinLevelOfAllLogs)(6 /* LogLevel.Fatal */);
+    const shell = new shell_1.RShell();
+    void getText(shell).then(str => {
+        console.log(str);
+    }).finally(() => {
+        shell.close();
+    });
+}
+//# sourceMappingURL=print-engines-wiki.js.map

package/documentation/print-interface-wiki.js

@@ -101,7 +101,7 @@ async function explainRepl(shell) {
     return `
 > [!NOTE]
 > To execute arbitrary R commands with a repl request, _flowR_ has to be started explicitly with ${(0, doc_cli_option_1.getCliLongOptionOf)('flowr', 'r-session-access')}.
-> Please be aware that this introduces a security risk.
+> Please be aware that this introduces a security risk and note that this relies on the [\`r-shell\` engine](${doc_files_1.FlowrWikiBaseRef}/Engines).
 
 
 Although primarily meant for users to explore, 
@@ -172,16 +172,16 @@ Within the REPL this works by running the following:
 
 ${(0, doc_code_1.codeBlock)('shell', ':query @config')}
 
-
 The following summarizes the configuration options:
 
-
 - \`ignoreSourceCalls\`: If set to \`true\`, _flowR_ will ignore source calls when analyzing the code, i.e., ignoring the inclusion of other files.
 - \`rPath\`: The path to the R executable. If not set, _flowR_ will try to find the R executable in the system's PATH.
 - \`semantics\`: allows to configure the way _flowR_ handles R, although we currently only support \`semantics/environment/overwriteBuiltIns\`. 
   You may use this to overwrite _flowR_'s handling of built-in function and even completely clear the preset definitions shipped with flowR. 
   See [Configure BuiltIn Semantics](#configure-builtin-semantics) for more information.
 - \`solver\`: allows to configure how _flowR_ resolves variables and their values (currently we support: ${Object.values(config_1.VariableResolve).map(v => `\`${v}\``).join(', ')}), as well as if pointer analysis should be active.
+- \`engines\`: allows to configure the engines used by _flowR_ to interact with R code. See the [Engines wiki page](${doc_files_1.FlowrWikiBaseRef}/Engines) for more information.
+- \`defaultEngine\`: allows to specify the default engine to use for interacting with R code. If not set, an arbitrary engine from the specified list will be used.
 
 So you can configure _flowR_ by adding a file like the following:
 
@@ -201,6 +201,7 @@ ${(0, doc_code_1.codeBlock)('json', JSON.stringify({
                 }
             }
         },
+        engines: [{ type: 'r-shell' }],
         solver: {
             variables: config_1.VariableResolve.Alias,
             pointerTracking: true
@@ -246,15 +247,13 @@ function explainWritingCode(shell) {
         inlineTypes: doc_types_1.mermaidHide
     });
     return `
-
-
 _flowR_ can be used as a [module](${doc_files_1.FlowrNpmRef}) and offers several main classes and interfaces that are interesting for extension writers 
 (see the [Visual Studio Code extension](${doc_files_1.FlowrGithubBaseRef}/vscode-flowr) or the [core](${doc_files_1.FlowrWikiBaseRef}/Core) wiki page for more information).
 
 ### Using the ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)} to Interact with R
 
 The ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)} class allows interfacing with the \`R\` ecosystem installed on the host system.
-For now, there are no (real) alternatives, although we plan on providing more flexible drop-in replacements.
+Please have a look at [flowR's engines](${doc_files_1.FlowrWikiBaseRef}/Engines) for more information on alterantives.
 
 > [!IMPORTANT]
 > Each ${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info)} controls a new instance of the R&nbsp;interpreter, make sure to call <code>${(0, doc_types_1.shortLink)(shell_1.RShell.name, types.info, false)}::${shell.close.name}()</code> when you’re done.
@@ -279,7 +278,7 @@ In short, if you still "just want to slice" you can do it like this with the ${(
 
 ${(0, doc_code_1.codeBlock)('ts', `
 const slicer = new ${pipeline_executor_1.PipelineExecutor.name}(DEFAULT_SLICING_PIPELINE, {
-  shell:     new ${shell_1.RShell.name}(),
+  parser:    new ${shell_1.RShell.name}(),
   request:   ${retriever_1.requestFromInput.name}('x <- 1\\nx + 1'),
   criterion: ['2@x']
 })

package/documentation/print-normalized-ast-wiki.js

@@ -100,7 +100,7 @@ a pipeline like the ${(0, doc_types_1.shortLink)('DEFAULT_NORMALIZE_PIPELINE', t
 ${(0, doc_code_1.codeBlock)('ts', `
 async function getAst(code: string): Promise<RNode> {
     const result = await new ${pipeline_executor_1.PipelineExecutor.name}(DEFAULT_NORMALIZE_PIPELINE, {
-        shell: new ${shell_1.RShell.name}(),
+        parser:  new ${shell_1.RShell.name}(),
         request: ${retriever_1.requestFromInput.name}(code.trim())
     }).allRemainingSteps();
     return result.normalize.ast;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.1.12",
+  "version": "2.2.0",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -21,18 +21,21 @@
     "stats-helper": "ts-node src/cli/statistics-helper-app.ts",
     "slicer": "ts-node src/cli/slicer-app.ts",
     "benchmark-helper": "ts-node src/cli/benchmark-helper-app.ts",
-    "benchmark": "npm run build && node dist/src/cli/benchmark-app.js",
+    "benchmark": "npm run build && npm run build:copy-wasm && node dist/src/cli/benchmark-app.js",
     "summarizer": "ts-node src/cli/summarizer-app.ts",
     "export-quads": "ts-node src/cli/export-quads-app.ts",
     "capabilities-markdown": "ts-node src/documentation/print-capabilities-markdown.ts",
     "wiki:df-graph": "ts-node src/documentation/print-dataflow-graph-wiki.ts",
     "wiki:normalized-ast": "ts-node src/documentation/print-normalized-ast-wiki.ts",
     "wiki:query-api": "ts-node src/documentation/print-query-wiki.ts",
+    "wiki:engines": "ts-node src/documentation/print-engines-wiki.ts",
     "wiki:search-api": "ts-node src/documentation/print-search-wiki.ts",
     "wiki:linting-and-testing": "ts-node src/documentation/print-linting-and-testing-wiki.ts",
     "wiki:interface": "ts-node src/documentation/print-interface-wiki.ts",
     "build": "tsc --project .",
-    "build:bundle-flowr": "npm run build && esbuild --bundle dist/src/cli/flowr.js --platform=node --bundle --minify --target=node22 --outfile=dist/src/cli/flowr.min.js",
+    "build:bundle-flowr": "npm run build && esbuild --bundle dist/src/cli/flowr.js --platform=node --bundle --minify --target=node22 --outfile=dist/src/cli/flowr.min.js && npm run build:copy-wasm-min",
+    "build:copy-wasm": "cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm dist/src/r-bridge/lang-4.x/tree-sitter/ && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/r-bridge/lang-4.x/tree-sitter/",
+    "build:copy-wasm-min": "cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm dist/src/cli && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/cli",
     "lint-local": "npx eslint --version && npx eslint src/ test/ --rule \"no-warning-comments: off\"",
     "lint": "npm run license-compat -- --summary && npx eslint --version && npx eslint src/ test/",
     "license-compat": "license-checker --onlyAllow 'MIT;MIT OR X11;GPLv2;LGPL;GNUGPL;ISC;Apache-2.0;FreeBSD;BSD-2-Clause;clearbsd;ModifiedBSD;BSD-3-Clause;Python-2.0;Unlicense;WTFPL;BlueOak-1.0.0;CC-BY-4.0;CC-BY-3.0;CC0-1.0;0BSD'",
@@ -40,7 +43,7 @@
     "test": "vitest --exclude \"test/system-tests/**\" --config test/vitest.config.mts",
     "test:system": "vitest --dir test/system-tests --config test/system-tests/vitest.config.mts",
     "test:coverage": "npm run test -- --coverage",
-    "performance-test": "func() { cd test/performance/ && bash run-all-suites.sh $1 $2 $3; cd ../../; }; func",
+    "performance-test": "func() { cd test/performance/ && bash run-all-suites.sh $1 $2 $3 $4; cd ../../; }; func",
     "test-full": "npm run test:coverage -- --no-watch -- --make-summary --test-installation",
     "detect-circular-deps": "npx madge  --extensions ts,tsx --circular src/",
     "checkup": "npm run flowr -- --execute \":version\" && npm run lint && npm run test-full -- --allowOnly=false && npm run test:system -- --no-watch && docker build -t test-flowr -f scripts/Dockerfile . && npm run doc && npm-run-all wiki:*"
@@ -163,7 +166,7 @@
         "npm run lint",
         "npm run test-full"
       ],
-      "after:bump": "npm run build",
+      "after:bump": "npm run build && npm run build:copy-wasm",
       "after:git:release": "echo After git push, before github release",
       "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
     },
@@ -220,6 +223,7 @@
     "tmp": "^0.2.3",
     "ts-essentials": "^10.0.2",
     "tslog": "^4.9.3",
+    "web-tree-sitter": "^0.24.7",
     "ws": "^8.18.0",
     "xpath-ts2": "^1.4.2"
   }