@eagleoutice/flowr 2.9.0 → 2.9.2

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

@@ -74,8 +74,8 @@ function convertTreeNode(node) {
             children: [],
             grouping: undefined,
             info: {
-                fullRange: (0, range_1.invalidRange)(),
-                additionalTokens: [],
+                fullRange: undefined,
+                adToks: [],
                 treeSitterId: -1,
             }
         };
@@ -87,7 +87,7 @@ function convertTreeNode(node) {
         const defaultInfo = {
             info: {
                 fullRange: range,
-                additionalTokens: [],
+                adToks: [],
                 fullLexeme: node.text,
                 treeSitterId: node.id
             }
@@ -103,7 +103,7 @@ function convertTreeNode(node) {
                     grouping: undefined,
                     lexeme: undefined,
                     info: {
-                        additionalTokens: remainingComments.map(c => c[1]),
+                        adToks: remainingComments.map(c => c[1]),
                         treeSitterId: node.id
                     }
                 };
@@ -136,7 +136,7 @@ function convertTreeNode(node) {
                         }
                     ],
                     info: {
-                        additionalTokens: remainingComments.map(c => c[1]),
+                        adToks: remainingComments.map(c => c[1]),
                         treeSitterId: node.id
                     }
                 };
@@ -185,7 +185,7 @@ function convertTreeNode(node) {
                         named: true,
                         infixSpecial: true,
                         info: {
-                            additionalTokens: comments,
+                            adToks: comments,
                             treeSitterId: node.id
                         }
                     };
@@ -200,7 +200,7 @@ function convertTreeNode(node) {
                         ...defaultInfo,
                         info: {
                             fullRange: range,
-                            additionalTokens: comments,
+                            adToks: comments,
                             fullLexeme: node.text,
                             treeSitterId: node.id
                         }
@@ -215,7 +215,7 @@ function convertTreeNode(node) {
                         lexeme: op.text,
                         info: {
                             fullRange: range,
-                            additionalTokens: comments,
+                            adToks: comments,
                             fullLexeme: node.text,
                             treeSitterId: node.id
                         }
@@ -288,7 +288,7 @@ function convertTreeNode(node) {
                         lexeme: variableNode.text,
                         info: {
                             fullRange: undefined,
-                            additionalTokens: [],
+                            adToks: [],
                             fullLexeme: undefined,
                             treeSitterId: variableNode.id
                         }
@@ -299,7 +299,7 @@ function convertTreeNode(node) {
                     lexeme: forNode.text,
                     info: {
                         fullRange: range,
-                        additionalTokens: variableComments.concat(sequenceComments).map(c => c[1]),
+                        adToks: variableComments.concat(sequenceComments).map(c => c[1]),
                         fullLexeme: node.text,
                         treeSitterId: node.id
                     }
@@ -347,7 +347,7 @@ function convertTreeNode(node) {
                     ...defaultInfo,
                     info: {
                         ...defaultInfo.info,
-                        additionalTokens: comments.map(c => c[1]),
+                        adToks: comments.map(c => c[1]),
                     }
                 };
                 if (func.type === tree_sitter_types_1.TreeSitterType.Identifier || func.type === tree_sitter_types_1.TreeSitterType.String || func.type === tree_sitter_types_1.TreeSitterType.NamespaceOperator || func.type === tree_sitter_types_1.TreeSitterType.Return) {
@@ -366,7 +366,7 @@ function convertTreeNode(node) {
                             ...funcNode,
                             info: {
                                 fullRange: range,
-                                additionalTokens: [],
+                                adToks: [],
                                 fullLexeme: node.text,
                                 treeSitterId: node.id
                             }
@@ -395,7 +395,7 @@ function convertTreeNode(node) {
                     lexeme: name.text,
                     info: {
                         ...defaultInfo.info,
-                        additionalTokens: comments.map(c => c[1]),
+                        adToks: comments.map(c => c[1]),
                     }
                 };
             }
@@ -471,7 +471,7 @@ function convertTreeNode(node) {
                             lexeme: rhs?.text,
                             info: {
                                 fullRange: rhsRange,
-                                additionalTokens: [],
+                                adToks: [],
                                 fullLexeme: rhs?.text,
                                 treeSitterId: rhs?.id
                             }
@@ -498,7 +498,7 @@ function convertTreeNode(node) {
                         lexeme: name.text,
                         info: {
                             fullRange: range,
-                            additionalTokens: [],
+                            adToks: [],
                             fullLexeme: name.text,
                             treeSitterId: name.id
                         }
@@ -509,7 +509,7 @@ function convertTreeNode(node) {
                     lexeme: name.text,
                     info: {
                         fullRange: range,
-                        additionalTokens: [],
+                        adToks: [],
                         fullLexeme: name.text,
                         treeSitterId: name.id
                     }
@@ -551,7 +551,7 @@ function convertTreeNode(node) {
                         lexeme: nameNode.text,
                         info: {
                             fullRange: nameRange,
-                            additionalTokens: [],
+                            adToks: [],
                             fullLexeme: nameNode.text,
                             treeSitterId: nameNode.id
                         }
@@ -586,8 +586,8 @@ function convertTreeNode(node) {
         children: [],
         grouping: undefined,
         info: {
-            fullRange: (0, range_1.invalidRange)(),
-            additionalTokens: [],
+            fullRange: undefined,
+            adToks: [],
             treeSitterId: -1,
         }
     };
@@ -622,7 +622,7 @@ function splitComments(nodes) {
                     location: makeSourceRange(node),
                     lexeme: node.text,
                     info: {
-                        additionalTokens: [],
+                        adToks: [],
                         fullLexeme: node.text,
                         treeSitterId: node.id
                     }
@@ -651,8 +651,8 @@ function linkCommentsToNextNodes(nodes, comments) {
         // if there is no valid sibling, we just link the comment to the first node (see normalize-expressions.ts)
         const [, node] = (sibling ? nodes.find(([s]) => s.equals(sibling)) : undefined) ?? nodes[0] ?? [];
         if (node) {
-            node.info.additionalTokens ??= [];
-            node.info.additionalTokens.push(commentNode);
+            node.info.adToks ??= [];
+            node.info.adToks.push(commentNode);
         }
         else {
             remain.push([commentSyntaxNode, commentNode]);

package/r-bridge/roxygen2/roxygen-parse.js

@@ -35,7 +35,7 @@ function parseRoxygenCommentsOfNode(node, idMap) {
     let comments;
     let cur = node;
     do {
-        comments = cur?.info.additionalTokens
+        comments = cur?.info.adToks
             ?.filter(r_comment_1.isRComment).filter(r => (0, assert_1.isNotUndefined)(r.lexeme));
         cur = cur?.info.parent ? idMap?.get(cur.info.parent) : undefined;
     } while ((comments === undefined || comments.length === 0) && cur !== undefined);

package/reconstruct/auto-select/magic-comments.js

@@ -53,7 +53,7 @@ function makeMagicCommentHandler(and) {
             lines = new Set();
             const startLineStack = [];
             (0, visitor_1.visitAst)(normalizedAst.ast.files.map(f => f.root), n => {
-                const comments = n.info.additionalTokens;
+                const comments = n.info.adToks;
                 if (!comments) {
                     return;
                 }

package/slicing/static/slice-call.d.ts

@@ -10,7 +10,7 @@ import type { ReadOnlyFlowrAnalyzerContext } from '../../project/context/flowr-a
 /**
  * Returns the function call targets (definitions) by the given caller
  */
-export declare function getAllFunctionCallTargets(dataflowGraph: DataflowGraph, callerInfo: DataflowGraphVertexFunctionCall, baseEnvironment: REnvironmentInformation, queue: VisitingQueue, ctx: ReadOnlyFlowrAnalyzerContext): [Set<DataflowGraphVertexInfo>, REnvironmentInformation];
+export declare function getAllFunctionCallTargetsForSlice(dataflowGraph: DataflowGraph, callerInfo: DataflowGraphVertexFunctionCall, baseEnvironment: REnvironmentInformation, queue: VisitingQueue, ctx: ReadOnlyFlowrAnalyzerContext): [Set<DataflowGraphVertexInfo>, REnvironmentInformation];
 /** returns the new threshold hit count */
 export declare function sliceForCall(current: NodeToSlice, callerInfo: DataflowGraphVertexFunctionCall, { graph }: DataflowInformation, queue: VisitingQueue, ctx: ReadOnlyFlowrAnalyzerContext): void;
 /** Returns true if we found at least one return edge */

package/slicing/static/slice-call.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllFunctionCallTargets = getAllFunctionCallTargets;
+exports.getAllFunctionCallTargetsForSlice = getAllFunctionCallTargetsForSlice;
 exports.sliceForCall = sliceForCall;
 exports.handleReturns = handleReturns;
 const assert_1 = require("../../util/assert");
@@ -16,7 +16,7 @@ const static_slicer_1 = require("./static-slicer");
 /**
  * Returns the function call targets (definitions) by the given caller
  */
-function getAllFunctionCallTargets(dataflowGraph, callerInfo, baseEnvironment, queue, ctx) {
+function getAllFunctionCallTargetsForSlice(dataflowGraph, callerInfo, baseEnvironment, queue, ctx) {
     // bind with call-local environments during slicing
     const outgoingEdges = dataflowGraph.get(callerInfo.id, true);
     (0, assert_1.guard)(outgoingEdges !== undefined, () => `outgoing edges of id: ${callerInfo.id} must be in graph but can not be found, keep in slice to be sure`);
@@ -34,7 +34,7 @@ function getAllFunctionCallTargets(dataflowGraph, callerInfo, baseEnvironment, q
     return [functionCallTargets, activeEnvironment];
 }
 function includeArgumentFunctionCallClosure(arg, activeEnvironment, queue, dataflowGraph) {
-    const valueRoot = (0, graph_1.getReferenceOfArgument)(arg);
+    const valueRoot = graph_1.FunctionArgument.getReference(arg);
     if (!valueRoot) {
         return;
     }
@@ -60,7 +60,7 @@ function linkCallTargets(onlyForSideEffects, functionCallTargets, activeEnvironm
 }
 /** returns the new threshold hit count */
 function sliceForCall(current, callerInfo, { graph }, queue, ctx) {
-    const [functionCallTargets, activeEnvironment] = getAllFunctionCallTargets(graph, callerInfo, current.baseEnvironment, queue, ctx);
+    const [functionCallTargets, activeEnvironment] = getAllFunctionCallTargetsForSlice(graph, callerInfo, current.baseEnvironment, queue, ctx);
     if (functionCallTargets.size === 0) {
         /*
          * if we do not have any call to resolve this function, we have to assume that every function passed is actually called!

package/util/mermaid/dfg.js

@@ -84,11 +84,11 @@ function printArg(arg) {
     else if (arg === r_function_call_1.EmptyArgument) {
         return '[empty]';
     }
-    else if ((0, graph_1.isNamedArgument)(arg)) {
+    else if (graph_1.FunctionArgument.isNamed(arg)) {
         const deps = arg.cds ? ', :may:' + arg.cds.map(c => c.id + (c.when ? '+' : '-')).join(',') : '';
         return `${arg.name} (${arg.nodeId}${deps})`;
     }
-    else if ((0, graph_1.isPositionalArgument)(arg)) {
+    else if (graph_1.FunctionArgument.isPositional(arg)) {
         const deps = arg.cds ? ' (:may:' + arg.cds.map(c => c.id + (c.when ? '+' : '-')).join(',') + ')' : '';
         return `${arg.nodeId}${deps}`;
     }
@@ -99,12 +99,12 @@ function printArg(arg) {
 function displayFunctionArgMapping(argMapping) {
     const result = [];
     for (const arg of argMapping) {
-        result.push(printArg(arg));
+        result.push((0, mermaid_1.escapeMarkdown)(printArg(arg)));
     }
     return result.length === 0 ? '' : `\n    (${result.join(', ')})`;
 }
 function encodeEdge(from, to, types) {
-    return `${from}->${to}["${[...types].join(':')}"]`;
+    return `${from}->${to}["${Array.from(types).join(':')}"]`;
 }
 function mermaidNodeBrackets(tag) {
     let open;
@@ -169,7 +169,7 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
         const deps = info.cds ? ', :may:' + info.cds.map(c => c.id + (c.when ? '+' : '-')).join(',') : '';
         const lnks = info.link?.origin ? ', :links:' + info.link.origin.join(',') : '';
         const n = node?.info.fullRange ?? node?.location ?? (node?.type === type_1.RType.ExpressionList ? node?.grouping?.[0].location : undefined);
-        mermaid.nodeLines.push(`    ${idPrefix}${id}${open}"\`${escapedName}${escapedName.length > 10 ? '\n      ' : ' '}(${id}${deps}${lnks})\n      *${formatRange(n)}*${fCall ? displayFunctionArgMapping(info.args) : ''}\`"${close}`);
+        mermaid.nodeLines.push(`    ${idPrefix}${id}${open}"\`${escapedName}${escapedName.length > 10 ? '\n      ' : ' '}(${id}${deps}${lnks})\n      *${formatRange(n)}*${fCall ? displayFunctionArgMapping(info.args) : '' + (info.tag === vertex_1.VertexType.FunctionDefinition && info.mode && info.mode.length > 0 ? (0, mermaid_1.escapeMarkdown)(JSON.stringify(info.mode)) : '')}\`"${close}`);
     }
     if (mark?.has(id)) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} ${mermaid.markStyle.vertex} `);

package/util/r-value.d.ts

@@ -1,4 +1,4 @@
-import { type Value, type ValueInterval, type ValueLogical, type ValueNumber, type ValueString, type ValueVector } from '../dataflow/eval/values/r-value';
+import { type ValueNull, type Value, type ValueInterval, type ValueLogical, type ValueNumber, type ValueString, type ValueVector } from '../dataflow/eval/values/r-value';
 import type { RLogicalValue } from '../r-bridge/lang-4.x/ast/model/nodes/r-logical';
 import { type RNumberValue, type RStringValue } from '../r-bridge/lang-4.x/convert-values';
 /**
@@ -25,8 +25,9 @@ export declare function unwrapRVector(value: RStringValue[] | RNumberValue[] | R
 export declare function unwrapRVector(value: unknown): string[] | number[] | boolean[] | (string | number | boolean)[] | undefined;
 export declare function unwrapRValueToString(value: RStringValue | RNumberValue | RLogicalValue | string | number): string;
 export declare function unwrapRValueToString(value: unknown): string | undefined;
+export declare function unliftRValue(value: ValueNull): null;
 export declare function unliftRValue(value: ValueString): RStringValue | undefined;
 export declare function unliftRValue(value: ValueNumber | ValueInterval): RNumberValue | undefined;
 export declare function unliftRValue(value: ValueLogical): RLogicalValue | undefined;
 export declare function unliftRValue(value: ValueVector): (RStringValue | RNumberValue | RLogicalValue)[] | undefined;
-export declare function unliftRValue(value: Value): RStringValue | RNumberValue | 'fn-def' | boolean | ('fn-def' | RStringValue | RNumberValue | RLogicalValue)[] | undefined;
+export declare function unliftRValue(value: Value): RStringValue | RNumberValue | 'fn-def' | boolean | ('fn-def' | RStringValue | RNumberValue | RLogicalValue | null)[] | null | undefined;

package/util/r-value.js

@@ -103,6 +103,9 @@ function unliftRValue(value) {
     }
     const type = value.type;
     switch (type) {
+        case 'null': {
+            return null;
+        }
         case 'string': {
             return (0, r_value_1.isValue)(value.value) ? value.value : undefined;
         }

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.9.0';
+const version = '2.9.2';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */