@eagleoutice/flowr 2.7.5 → 2.8.0

package/queries/query.js

@@ -36,11 +36,17 @@ const df_shape_query_format_1 = require("./catalog/df-shape-query/df-shape-query
 const inspect_higher_order_query_format_1 = require("./catalog/inspect-higher-order-query/inspect-higher-order-query-format");
 const log_1 = require("../util/log");
 const files_query_format_1 = require("./catalog/files-query/files-query-format");
+const call_graph_query_format_1 = require("./catalog/call-graph-query/call-graph-query-format");
+const inspect_recursion_query_format_1 = require("./catalog/inspect-recursion-query/inspect-recursion-query-format");
+const does_call_query_format_1 = require("./catalog/does-call-query/does-call-query-format");
+const inspect_exception_query_format_1 = require("./catalog/inspect-exceptions-query/inspect-exception-query-format");
 exports.SupportedQueries = {
     'call-context': call_context_query_format_1.CallContextQueryDefinition,
     'config': config_query_format_1.ConfigQueryDefinition,
     'control-flow': control_flow_query_format_1.ControlFlowQueryDefinition,
+    'call-graph': call_graph_query_format_1.CallGraphQueryDefinition,
     'dataflow': dataflow_query_format_1.DataflowQueryDefinition,
+    'does-call': does_call_query_format_1.DoesCallQueryDefinition,
     'dataflow-lens': dataflow_lens_query_format_1.DataflowLensQueryDefinition,
     'df-shape': df_shape_query_format_1.DfShapeQueryDefinition,
     'files': files_query_format_1.FilesQueryDefinition,
@@ -52,7 +58,9 @@ exports.SupportedQueries = {
     'location-map': location_map_query_format_1.LocationMapQueryDefinition,
     'search': search_query_format_1.SearchQueryDefinition,
     'happens-before': happens_before_query_format_1.HappensBeforeQueryDefinition,
+    'inspect-exception': inspect_exception_query_format_1.InspectExceptionQueryDefinition,
     'inspect-higher-order': inspect_higher_order_query_format_1.InspectHigherOrderQueryDefinition,
+    'inspect-recursion': inspect_recursion_query_format_1.InspectRecursionQueryDefinition,
     'resolve-value': resolve_value_query_format_1.ResolveValueQueryDefinition,
     'project': project_query_format_1.ProjectQueryDefinition,
     'origin': origin_query_format_1.OriginQueryDefinition,
@@ -161,6 +169,7 @@ async function genericWrapReplFailIfNoRequest(fn, output, analyzer) {
             output.stderr(output.formatter.format('No requests to analyze were found.', { color: 1 /* Colors.Red */, style: 1 /* FontStyles.Bold */, effect: ansi_1.ColorEffect.Foreground })
                 + '\nIf you consider this an error, please report a bug: '
                 + (0, assert_1.getGuardIssueUrl)('analyzer found no requests to analyze'));
+            output.stderr((e instanceof Error) ? e.message : String(e));
         }
         else {
             throw e;

package/r-bridge/data/data.d.ts

@@ -162,6 +162,11 @@ export declare const flowrCapabilities: {
                     readonly supported: "partially";
                     readonly description: "_Handle side-effects of function calls (e.g., `setXTo(3)`, ...) for example achieved with the super assignment._ We need more tests and handlings. Furthermore, we do not detect side effects with external files, network, logging, etc.";
                 }];
+            }, {
+                readonly name: "Recursion";
+                readonly id: "recursion";
+                readonly supported: "fully";
+                readonly description: "_Recognize and resolve recursive calls like `f(3)` inside the definition of `f`, ..._";
             }, {
                 readonly name: "Anonymous Calls";
                 readonly id: "call-anonymous";
@@ -349,9 +354,9 @@ export declare const flowrCapabilities: {
                     readonly supported: "fully";
                     readonly description: "_Handle `return(3)`, ... in function definitions_";
                 }, {
-                    readonly name: "exceptions";
-                    readonly id: "exceptions";
-                    readonly supported: "not";
+                    readonly name: "Exceptions and Errors";
+                    readonly id: "exceptions-and-errors";
+                    readonly supported: "partially";
                     readonly description: "_Handle `try`, `stop`, ..._";
                 }];
             }, {
@@ -513,7 +518,7 @@ export declare const flowrCapabilities: {
         }, {
             readonly name: "Hooks";
             readonly id: "hooks";
-            readonly supported: "not";
+            readonly supported: "partially";
             readonly description: "_Handle hooks like [`userhooks`](https://stat.ethz.ch/R-manual/R-devel/library/base/html/userhooks.html) and [`on.exit`](https://www.rdocumentation.org/packages/base/versions/3.6.2/topics/on.exit)._ We do not support hooks.";
         }, {
             readonly name: "Precedence";
@@ -577,7 +582,7 @@ export declare const flowrCapabilities: {
                     readonly name: string;
                     readonly href: "https://adv-r.hadley.nz/s4.html";
                 }];
-                readonly supported: "not";
+                readonly supported: "partially";
                 readonly description: "_Handle S4 classes and methods as one unit. Including Dispatch and Inheritance_ We do not support typing currently and do not handle objects of these classes \"as units.\"";
             }, {
                 readonly name: "R6";

package/r-bridge/data/data.js

@@ -217,6 +217,12 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                                 }
                             ]
                         },
+                        {
+                            name: 'Recursion',
+                            id: 'recursion',
+                            supported: 'fully',
+                            description: '_Recognize and resolve recursive calls like `f(3)` inside the definition of `f`, ..._'
+                        },
                         {
                             name: 'Anonymous Calls',
                             id: 'call-anonymous',
@@ -446,9 +452,9 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                                     description: '_Handle `return(3)`, ... in function definitions_'
                                 },
                                 {
-                                    name: 'exceptions',
-                                    id: 'exceptions',
-                                    supported: 'not',
+                                    name: 'Exceptions and Errors',
+                                    id: 'exceptions-and-errors',
+                                    supported: 'partially',
                                     description: '_Handle `try`, `stop`, ..._'
                                 }
                             ]
@@ -652,7 +658,7 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                 {
                     name: 'Hooks',
                     id: 'hooks',
-                    supported: 'not',
+                    supported: 'partially',
                     description: '_Handle hooks like [`userhooks`](https://stat.ethz.ch/R-manual/R-devel/library/base/html/userhooks.html) and [`on.exit`](https://www.rdocumentation.org/packages/base/versions/3.6.2/topics/on.exit)._ We do not support hooks.'
                 },
                 {
@@ -728,7 +734,7 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                             url: [
                                 { name: AdvancedR('S4'), href: 'https://adv-r.hadley.nz/s4.html' }
                             ],
-                            supported: 'not',
+                            supported: 'partially',
                             description: '_Handle S4 classes and methods as one unit. Including Dispatch and Inheritance_ We do not support typing currently and do not handle objects of these classes "as units."'
                         },
                         {

package/r-bridge/lang-4.x/ast/model/model.d.ts

@@ -23,7 +23,7 @@ import type { RUnaryOp } from './nodes/r-unary-op';
 import type { RBinaryOp } from './nodes/r-binary-op';
 import type { RPipe } from './nodes/r-pipe';
 import type { RDelimiter } from './nodes/info/r-delimiter';
-/** Simply an empty type constraint used to say that there are additional decorations (see {@link Base}). */
+/** Simply an empty type constraint used to say that there are additional decorations (see {@link RAstNodeBase}). */
 export type NoInfo = object;
 /**
  * Will be used to reconstruct the source of the given element in the R-ast.
@@ -57,27 +57,27 @@ interface Source {
  * @typeParam Info       - can be used to store additional information about the node
  * @typeParam LexemeType - the type of the lexeme, probably always a `string` or `string | undefined`
  */
-export interface Base<Info, LexemeType = string> extends MergeableRecord {
+export interface RAstNodeBase<Info, LexemeType = string> extends MergeableRecord {
     type: RType;
     /** the original string retrieved from R, can be used for further identification */
     lexeme: LexemeType;
     /** allows to attach additional information to the node */
     info: Info & Source;
 }
-export interface WithChildren<Info, Children extends Base<Info, string | undefined>> {
+export interface WithChildren<Info, Children extends RAstNodeBase<Info, string | undefined>> {
     children: readonly Children[];
 }
 /**
  * A helper interface we use to "mark" leaf nodes.
  * <p>
  * Please be aware, that this is not marking from a language perspective,
- * as it is equivalent to the {@link Base} interface.
+ * as it is equivalent to the {@link RAstNodeBase} interface.
  * It is intended to help humans understand the code.
  */
-export interface Leaf<Info = NoInfo, LexemeType = string> extends Base<Info, LexemeType> {
+export interface Leaf<Info = NoInfo, LexemeType = string> extends RAstNodeBase<Info, LexemeType> {
 }
 /**
- * Indicates, that the respective {@link Base} node has known source code
+ * Indicates, that the respective {@link RAstNodeBase} node has known source code
  * location information.
  */
 export interface Location {
@@ -95,7 +95,7 @@ export interface Location {
 export type NamespaceIdentifier = string;
 /**
  * Similar to {@link Location} this is an interface that indicates that
- * the respective {@link Base} node has a respective property (a namespace).
+ * the respective {@link RAstNodeBase} node has a respective property (a namespace).
  */
 export interface Namespace {
     /**

package/r-bridge/lang-4.x/ast/model/nodes/r-access.d.ts

@@ -1,11 +1,11 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RArgument, RUnnamedArgument } from './r-argument';
 import type { EmptyArgument } from './r-function-call';
 /**
  * Represents an R Indexing operation with `$`, `@`, `[[`, or `[`.
  */
-interface RAccessBase<Info = NoInfo> extends Base<Info>, Location {
+interface RAccessBase<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.Access;
     /** the accessed container/variable/expression */
     accessed: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-argument.d.ts

@@ -1,10 +1,10 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RSymbol } from './r-symbol';
 /**
  * Represents a named or unnamed argument of a function definition in R.
  */
-export interface RArgument<Info = NoInfo> extends Base<Info>, Location {
+export interface RArgument<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.Argument;
     name: RSymbol<Info> | undefined;
     value: RNode<Info> | undefined;

package/r-bridge/lang-4.x/ast/model/nodes/r-binary-op.d.ts

@@ -1,9 +1,9 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 /**
  * Operators like `+`, `==`, `&&`, etc.
  */
-export interface RBinaryOp<Info = NoInfo> extends Base<Info>, Location {
+export interface RBinaryOp<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.BinaryOp;
     operator: string;
     lhs: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-comment.d.ts

@@ -1,5 +1,5 @@
 import type { Leaf, Location, NoInfo } from '../model';
-import type { RType } from '../type';
+import { RType } from '../type';
 /**
  * ```r
  * # I am a line comment
@@ -7,5 +7,8 @@ import type { RType } from '../type';
  */
 export interface RComment<Info = NoInfo> extends Location, Leaf<Info> {
     readonly type: RType.Comment;
-    content: string;
 }
+/**
+ * Checks whether the given node is an R comment.
+ */
+export declare function isRComment<Info = NoInfo>(node: unknown): node is RComment<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-comment.js

@@ -1,3 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRComment = isRComment;
+const type_1 = require("../type");
+/**
+ * Checks whether the given node is an R comment.
+ */
+function isRComment(node) {
+    return typeof node === 'object' && node !== null && node.type === type_1.RType.Comment;
+}
 //# sourceMappingURL=r-comment.js.map

package/r-bridge/lang-4.x/ast/model/nodes/r-expression-list.d.ts

@@ -1,11 +1,11 @@
-import type { Base, Location, NoInfo, RNode, WithChildren } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode, WithChildren } from '../model';
 import type { RType } from '../type';
 import type { RSymbol } from './r-symbol';
 /**
  * Holds a list of expressions (and hence may be the root of an AST, summarizing all expressions in a file).
  * The `grouping` property holds information on if the expression list is structural or created by a wrapper like `{}` or `()`.
  */
-export interface RExpressionList<Info = NoInfo> extends WithChildren<Info, RNode<Info>>, Base<Info, string | undefined>, Partial<Location> {
+export interface RExpressionList<Info = NoInfo> extends WithChildren<Info, RNode<Info>>, RAstNodeBase<Info, string | undefined>, Partial<Location> {
     readonly type: RType.ExpressionList;
     /** encodes wrappers like `{}` or `()` */
     readonly grouping: undefined | [start: RSymbol<Info>, end: RSymbol<Info>];

package/r-bridge/lang-4.x/ast/model/nodes/r-for-loop.d.ts

@@ -1,4 +1,4 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RSymbol } from './r-symbol';
 import type { RExpressionList } from './r-expression-list';
@@ -7,7 +7,7 @@ import type { RExpressionList } from './r-expression-list';
  * for(<variable> in <vector>) <body>
  * ```
  */
-export interface RForLoop<Info = NoInfo> extends Base<Info>, Location {
+export interface RForLoop<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.ForLoop;
     /** variable used in for-loop: <p> `for(<variable> in ...) ...`*/
     variable: RSymbol<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-function-call.d.ts

@@ -1,4 +1,4 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RSymbol } from './r-symbol';
 import type { RArgument } from './r-argument';
@@ -8,7 +8,7 @@ export type RFunctionArgument<Info = NoInfo> = RArgument<Info> | typeof EmptyArg
  * Calls of functions like `a()` and `foo(42, "hello")`.
  * @see RUnnamedFunctionCall
  */
-export interface RNamedFunctionCall<Info = NoInfo> extends Base<Info>, Location {
+export interface RNamedFunctionCall<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.FunctionCall;
     readonly named: true;
     functionName: RSymbol<Info>;
@@ -19,7 +19,7 @@ export interface RNamedFunctionCall<Info = NoInfo> extends Base<Info>, Location
  * Direct calls of functions like `(function(x) { x })(3)`.
  * @see RNamedFunctionCall
  */
-export interface RUnnamedFunctionCall<Info = NoInfo> extends Base<Info>, Location {
+export interface RUnnamedFunctionCall<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.FunctionCall;
     readonly named: false | undefined;
     calledFunction: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-function-definition.d.ts

@@ -1,4 +1,4 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RParameter } from './r-parameter';
 /**
@@ -10,7 +10,7 @@ import type { RParameter } from './r-parameter';
  * \(<parameters>) <body>
  * ```
  */
-export interface RFunctionDefinition<Info = NoInfo> extends Base<Info>, Location {
+export interface RFunctionDefinition<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.FunctionDefinition;
     /** the R formals, to our knowledge, they must be unique */
     parameters: RParameter<Info>[];

package/r-bridge/lang-4.x/ast/model/nodes/r-if-then-else.d.ts

@@ -1,4 +1,4 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 /**
@@ -6,7 +6,7 @@ import type { RExpressionList } from './r-expression-list';
  * if(<condition>) <then> [else <otherwise>]
  * ```
  */
-export interface RIfThenElse<Info = NoInfo> extends Base<Info>, Location {
+export interface RIfThenElse<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.IfThenElse;
     condition: RNode<Info>;
     then: RExpressionList<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-parameter.d.ts

@@ -1,10 +1,10 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RSymbol } from './r-symbol';
 /**
  * Represents a parameter of a function definition in R.
  */
-export interface RParameter<Info = NoInfo> extends Base<Info>, Location {
+export interface RParameter<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.Parameter;
     name: RSymbol<Info>;
     /** is it the special ... parameter? */

package/r-bridge/lang-4.x/ast/model/nodes/r-pipe.d.ts

@@ -1,9 +1,9 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 /**
  * Variant of the binary operator, specifically for the new, built-in pipe operator.
  */
-export interface RPipe<Info = NoInfo> extends Base<Info>, Location {
+export interface RPipe<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.Pipe;
     readonly lhs: RNode<Info>;
     readonly rhs: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-repeat-loop.d.ts

@@ -1,4 +1,4 @@
-import type { Base, Location, NoInfo } from '../model';
+import type { RAstNodeBase, Location, NoInfo } from '../model';
 import type { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 /**
@@ -6,7 +6,7 @@ import type { RExpressionList } from './r-expression-list';
  * repeat <body>
  * ```
  */
-export interface RRepeatLoop<Info = NoInfo> extends Base<Info>, Location {
+export interface RRepeatLoop<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.RepeatLoop;
     body: RExpressionList<Info>;
 }

package/r-bridge/lang-4.x/ast/model/nodes/r-unary-op.d.ts

@@ -1,9 +1,9 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 /**
  * Unary operations like `+` and `-`
  */
-export interface RUnaryOp<Info = NoInfo> extends Base<Info>, Location {
+export interface RUnaryOp<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.UnaryOp;
     operator: string;
     operand: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-while-loop.d.ts

@@ -1,4 +1,4 @@
-import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
 import type { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 /**
@@ -6,7 +6,7 @@ import type { RExpressionList } from './r-expression-list';
  * while(<condition>) <body>
  * ```
  */
-export interface RWhileLoop<Info = NoInfo> extends Base<Info>, Location {
+export interface RWhileLoop<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.WhileLoop;
     condition: RNode<Info>;
     body: RExpressionList<Info>;

package/r-bridge/lang-4.x/ast/parser/main/internal/other/normalize-comment.js

@@ -16,7 +16,6 @@ function normalizeComment(data, obj) {
     return {
         type: type_1.RType.Comment,
         location,
-        content: content.slice(1),
         lexeme: content,
         info: {
             fullRange: data.currentRange,

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

@@ -552,7 +552,6 @@ function convertTreeNode(node) {
             return {
                 type: type_1.RType.Comment,
                 location: range,
-                content: node.text.slice(1),
                 lexeme: node.text,
                 ...defaultInfo
             };
@@ -594,7 +593,6 @@ function splitComments(nodes) {
             comments.push([node, {
                     type: type_1.RType.Comment,
                     location: makeSourceRange(node),
-                    content: node.text.slice(1),
                     lexeme: node.text,
                     info: {
                         additionalTokens: [],