@eagleoutice/flowr 2.2.7 → 2.2.8

package/README.md

@@ -48,7 +48,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.2.5, R v4.4.0 (r-shell engine)
+    flowR repl using flowR v2.2.7, R v4.4.0 (r-shell engine)
     R> :slicer test/testfiles/example.R --criterion "11@sum"
     ```
     
@@ -95,7 +95,7 @@ It offers a wide variety of features, for example:
         
 
 * 🚀 **fast data- and control-flow graphs**\
-  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">117.7 ms</i></span> (as of Feb 17, 2025), 
+  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">118 ms</i></span> (as of Feb 19, 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.
 
@@ -131,7 +131,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.2.5, R v4.4.0 (r-shell engine)
+    flowR repl using flowR v2.2.7, R v4.4.0 (r-shell engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -375,7 +375,7 @@ It offers a wide variety of features, for example:
         52 -->|"argument"| 50
     ```
     	
-    (The analysis required _24.34 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 _23.15 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/cli/flowr-main-options.js

@@ -111,6 +111,12 @@ exports.flowrMainOptionDefinitions = [
         description: 'The path to the tree-sitter WASM binary to use. Defaults to the path specified by the tree-sitter package.',
         multiple: false
     },
+    {
+        name: 'engine.tree-sitter.lax',
+        type: Boolean,
+        description: 'Use the lax parser for parsing R code (allowing for syntax errors).',
+        multiple: false
+    },
     {
         name: 'default-engine',
         type: String,

package/cli/flowr.d.ts

@@ -20,6 +20,7 @@ export interface FlowrCliOptions {
     'engine.tree-sitter.disabled': boolean;
     'engine.tree-sitter.wasm-path': string | undefined;
     'engine.tree-sitter.tree-sitter-wasm-path': string | undefined;
+    'engine.tree-sitter.lax': boolean;
 }
 export declare const optionHelp: ({
     header: string;

package/cli/flowr.js

@@ -79,7 +79,8 @@ if (!options['engine.tree-sitter.disabled']) {
     (0, config_1.amendConfig)({ engines: [{
                 type: 'tree-sitter',
                 wasmPath: options['engine.tree-sitter.wasm-path'],
-                treeSitterWasmPath: options['engine.tree-sitter.tree-sitter-wasm-path']
+                treeSitterWasmPath: options['engine.tree-sitter.tree-sitter-wasm-path'],
+                lax: options['engine.tree-sitter.lax']
             }] });
 }
 if (options['default-engine']) {

package/config.d.ts

@@ -61,6 +61,10 @@ export interface TreeSitterEngineConfig extends MergeableRecord {
      * The path to the tree-sitter WASM binary to use. If this is undefined, the path specified by the tree-sitter package will be used.
      */
     readonly treeSitterWasmPath?: string;
+    /**
+     * Whether to use the lax parser for parsing R code (allowing for syntax errors). If this is undefined, the strict parser will be used.
+     */
+    readonly lax?: boolean;
 }
 export interface RShellEngineConfig extends MergeableRecord {
     readonly type: 'r-shell';

package/config.js

@@ -59,7 +59,8 @@ exports.flowrConfigFileSchema = joi_1.default.object({
     engines: joi_1.default.array().items(joi_1.default.alternatives(joi_1.default.object({
         type: joi_1.default.string().required().valid('tree-sitter').description('Use the tree sitter engine.'),
         wasmPath: joi_1.default.string().optional().description('The path to the tree-sitter-r WASM binary to use. If this is undefined, this uses the default path.'),
-        treeSitterWasmPath: joi_1.default.string().optional().description('The path to the tree-sitter WASM binary to use. If this is undefined, this uses the default path.')
+        treeSitterWasmPath: joi_1.default.string().optional().description('The path to the tree-sitter WASM binary to use. If this is undefined, this uses the default path.'),
+        lax: joi_1.default.boolean().optional().description('Whether to use the lax parser for parsing R code (allowing for syntax errors). If this is undefined, the strict parser will be used.')
     }).description('The configuration for the tree sitter engine.'), joi_1.default.object({
         type: joi_1.default.string().required().valid('r-shell').description('Use the R shell engine.'),
         rPath: joi_1.default.string().optional().description('The path to the R executable to use. If this is undefined, this uses the default path.')

package/documentation/print-engines-wiki.js

@@ -39,6 +39,7 @@ are exposed with some command line options (e.g., when using the docker image of
 - ${(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.lax', false)} to use lax parsing with tree-sitter
 - ${(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

package/package.json

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

package/r-bridge/lang-4.x/tree-sitter/tree-sitter-normalize.d.ts

@@ -1,3 +1,8 @@
 import type { RExpressionList } from '../ast/model/nodes/r-expression-list';
 import type { Tree } from 'web-tree-sitter';
+/**
+ * @param tree - The tree to normalize
+ */
 export declare function normalizeTreeSitterTreeToAst(tree: Tree): RExpressionList;
+export declare function makeTreeSitterLax(): void;
+export declare function makeTreeSitterStrict(): void;

package/r-bridge/lang-4.x/tree-sitter/tree-sitter-normalize.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeTreeSitterTreeToAst = normalizeTreeSitterTreeToAst;
+exports.makeTreeSitterLax = makeTreeSitterLax;
+exports.makeTreeSitterStrict = makeTreeSitterStrict;
 const normalizer_data_1 = require("../ast/parser/main/normalizer-data");
 const tree_sitter_types_1 = require("./tree-sitter-types");
 const type_1 = require("../ast/model/type");
@@ -10,20 +12,39 @@ const normalize_meta_1 = require("../ast/parser/main/normalize-meta");
 const arrays_1 = require("../../../util/arrays");
 const r_function_call_1 = require("../ast/model/nodes/r-function-call");
 const strings_1 = require("../../../util/strings");
+const config_1 = require("../../../config");
+const log_1 = require("../../../util/log");
+/**
+ * @param tree - The tree to normalize
+ */
 function normalizeTreeSitterTreeToAst(tree) {
+    const lax = (0, config_1.getEngineConfig)('tree-sitter')?.lax;
+    if (lax) {
+        makeTreeSitterLax();
+    }
+    else {
+        makeTreeSitterStrict();
+    }
     const root = convertTreeNode(tree.rootNode);
     if (root.type !== type_1.RType.ExpressionList) {
         throw new normalizer_data_1.ParseError(`expected root to resolve to an expression list, got a ${root.type}`);
     }
     return root;
 }
-function nonErrorChildren(node) {
-    if (node.hasError) {
-        return [];
-    }
-    else {
-        return node.children;
-    }
+function nonErrorChildrenStrict(node) {
+    return node.hasError ? [] : node.children;
+}
+function nonErrorChildrenLax(node) {
+    return node.hasError ? node.children.filter(n => n.type !== tree_sitter_types_1.TreeSitterType.Error) : node.children;
+}
+let nonErrorChildren = nonErrorChildrenStrict;
+function makeTreeSitterLax() {
+    log_1.log.info('[Tree-Sitter] Lax parsing active');
+    nonErrorChildren = nonErrorChildrenLax;
+}
+function makeTreeSitterStrict() {
+    log_1.log.info('[Tree-Sitter] Strict parsing active');
+    nonErrorChildren = nonErrorChildrenStrict;
 }
 function convertTreeNode(node) {
     // generally, the grammar source file dictates what children a node has in what order:

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = flowrVersion;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.2.7';
+const version = '2.2.8';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }