@eagleoutice/flowr 2.2.5 → 2.2.7

package/queries/query-print.js

@@ -8,15 +8,18 @@ const query_1 = require("./query");
 const html_hover_over_1 = require("../util/html-hover-over");
 const time_1 = require("../util/time");
 const built_in_1 = require("../dataflow/environments/built-in");
-function nodeString(id, formatter, processed) {
+function nodeString(nodeId, formatter, processed) {
+    const isObj = typeof nodeId === 'object' && nodeId !== null && 'id' in nodeId;
+    const id = isObj ? nodeId.id : nodeId;
+    const info = isObj ? nodeId.info : undefined;
     if (id === built_in_1.BuiltIn) {
-        return (0, ansi_1.italic)('built-in', formatter);
+        return (0, ansi_1.italic)('built-in', formatter) + (info ? ` (${JSON.stringify(info)})` : '');
     }
     const node = processed.normalize.idMap.get(id);
     if (node === undefined) {
-        return `UNKNOWN: ${id}`;
+        return `UNKNOWN: ${id} (info: ${JSON.stringify(info)})`;
     }
-    return `${(0, ansi_1.italic)('`' + (node.lexeme ?? node.info.fullLexeme ?? 'UNKNOWN') + '`', formatter)} (L.${node.location?.[0]})`;
+    return `${(0, ansi_1.italic)('`' + (node.lexeme ?? node.info.fullLexeme ?? 'UNKNOWN') + '`', formatter)} (L.${node.location?.[0]}${info ? ', ' + JSON.stringify(info) : ''})`;
 }
 function asciiCallContextSubHit(formatter, results, processed) {
     const result = [];

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

@@ -10,7 +10,12 @@ export declare class TreeSitterExecutor implements SyncParser<Parser.Tree> {
     readonly name = "tree-sitter";
     readonly parser: Parser;
     private static language;
-    static initTreeSitter(): Promise<void>;
+    /**
+     * Initializes the underlying tree-sitter parser. This only needs to be called once globally.
+     * @param overrideWasmPath - The path to the tree-sitter-r wasm file, which takes precedence over the config and default paths if set.
+     * @param overrideTreeSitterWasmPath - The path to the tree-sitter wasm file, which takes precedence over the config and default paths if set.
+     */
+    static initTreeSitter(overrideWasmPath?: string, overrideTreeSitterWasmPath?: string): Promise<void>;
     constructor();
     rVersion(): Promise<string | 'unknown' | 'none'>;
     treeSitterVersion(): number;

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

@@ -7,8 +7,10 @@ exports.TreeSitterExecutor = exports.DEFAULT_TREE_SITTER_WASM_PATH = exports.DEF
 const web_tree_sitter_1 = __importDefault(require("web-tree-sitter"));
 const fs_1 = __importDefault(require("fs"));
 const config_1 = require("../../../config");
+const log_1 = require("../../../util/log");
 exports.DEFAULT_TREE_SITTER_R_WASM_PATH = `${__dirname}/tree-sitter-r.wasm`;
 exports.DEFAULT_TREE_SITTER_WASM_PATH = `${__dirname}/tree-sitter.wasm`;
+const wasmLog = log_1.log.getSubLogger({ name: 'tree-sitter-wasm' });
 /**
  * Synchronous and (way) faster alternative to the {@link RShell} using tree-sitter.
  */
@@ -16,9 +18,13 @@ class TreeSitterExecutor {
     name = 'tree-sitter';
     parser;
     static language;
-    static async initTreeSitter() {
-        const config = (0, config_1.getEngineConfig)('tree-sitter');
-        const treeSitterWasmPath = config?.treeSitterWasmPath ?? exports.DEFAULT_TREE_SITTER_WASM_PATH;
+    /**
+     * Initializes the underlying tree-sitter parser. This only needs to be called once globally.
+     * @param overrideWasmPath - The path to the tree-sitter-r wasm file, which takes precedence over the config and default paths if set.
+     * @param overrideTreeSitterWasmPath - The path to the tree-sitter wasm file, which takes precedence over the config and default paths if set.
+     */
+    static async initTreeSitter(overrideWasmPath, overrideTreeSitterWasmPath) {
+        const treeSitterWasmPath = overrideTreeSitterWasmPath ?? (0, config_1.getEngineConfig)('tree-sitter')?.treeSitterWasmPath ?? exports.DEFAULT_TREE_SITTER_WASM_PATH;
         // noinspection JSUnusedGlobalSymbols - this is used by emscripten, see https://emscripten.org/docs/api_reference/module.html
         await web_tree_sitter_1.default.init({
             locateFile: (path, prefix) => {
@@ -27,9 +33,12 @@ class TreeSitterExecutor {
                     return treeSitterWasmPath;
                 }
                 return prefix + path;
-            }
+            },
+            onAbort: (s) => wasmLog.error(`Tree-sitter wasm aborted: ${s}`),
+            print: (s) => wasmLog.debug(s),
+            printErr: (s) => wasmLog.error(s)
         });
-        const wasmPath = config?.wasmPath ?? exports.DEFAULT_TREE_SITTER_R_WASM_PATH;
+        const wasmPath = overrideWasmPath ?? (0, config_1.getEngineConfig)('tree-sitter')?.wasmPath ?? exports.DEFAULT_TREE_SITTER_R_WASM_PATH;
         TreeSitterExecutor.language = await web_tree_sitter_1.default.Language.load(wasmPath);
     }
     constructor() {

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.5';
+const version = '2.2.7';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }