@eagleoutice/flowr 2.8.14 → 2.9.0

package/queries/catalog/does-call-query/does-call-query-executor.js

@@ -4,6 +4,7 @@ exports.executeDoesCallQuery = executeDoesCallQuery;
 const log_1 = require("../../../util/log");
 const parse_1 = require("../../../slicing/criterion/parse");
 const built_in_1 = require("../../../dataflow/environments/built-in");
+const identifier_1 = require("../../../dataflow/environments/identifier");
 /**
  * Execute does call queries on the given analyzer.
  */
@@ -43,7 +44,7 @@ function makeCallMatcher(constraint) {
             }
             else {
                 const regex = new RegExp(constraint.name);
-                return (vtx) => 'name' in vtx && vtx.name ? regex.test(vtx.name) : false;
+                return (vtx) => 'name' in vtx && vtx.name ? regex.test(identifier_1.Identifier.getName(vtx.name)) : false;
             }
         case 'and': {
             let matchersAndRemain = constraint.calls.map(makeCallMatcher);

package/queries/catalog/inspect-exceptions-query/inspect-exception-query-executor.d.ts

@@ -10,7 +10,7 @@ export declare function getFunctionsToConsiderInCallGraph(queries: readonly {
     filter?: readonly SingleSlicingCriterion[];
 }[], analyzer: ReadonlyFlowrAnalysisProvider, onlyDefinitions?: boolean): Promise<{
     cg: import("../../../dataflow/graph/call-graph").CallGraph;
-    fns: IteratorObject<[NodeId, Required<import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionCall | import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionDefinition>], undefined, unknown>;
+    fns: MapIterator<[NodeId, Required<import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionCall | import("../../../dataflow/graph/vertex").DataflowGraphVertexFunctionDefinition>]>;
 }>;
 /**
  * Execute exception function inspection queries on the given analyzer.

package/queries/catalog/inspect-exceptions-query/inspect-exception-query-executor.js

@@ -32,8 +32,10 @@ async function getFunctionsToConsiderInCallGraph(queries, analyzer, onlyDefiniti
         }
     }
     const cg = await analyzer.callGraph();
-    const fns = (onlyDefinitions || filterFor.size === 0 ? cg.verticesOfType(vertex_1.VertexType.FunctionDefinition) : cg.vertices(true))
-        .filter(([, v]) => filterFor.size === 0 || filterFor.has(v.id));
+    let fns = (onlyDefinitions || filterFor.size === 0 ? cg.verticesOfType(vertex_1.VertexType.FunctionDefinition) : cg.vertices(true));
+    if (filterFor.size > 0) {
+        fns = fns.filter(([id]) => filterFor.has(id));
+    }
     return { cg, fns };
 }
 /**
@@ -43,8 +45,16 @@ async function executeExceptionQuery({ analyzer }, queries) {
     const start = Date.now();
     const { cg, fns } = await getFunctionsToConsiderInCallGraph(queries, analyzer);
     const result = {};
-    for (const [id,] of fns) {
-        result[id] = (0, exceptions_of_function_1.calculateExceptionsOfFunction)(id, cg);
+    for (const [id] of fns) {
+        if (result[id]) {
+            continue;
+        }
+        const res = (0, exceptions_of_function_1.calculateExceptionsOfFunction)(id, cg, result);
+        for (const [k, v] of Object.entries(res)) {
+            if (!result[k]) {
+                result[k] = v;
+            }
+        }
     }
     return {
         '.meta': {

package/queries/catalog/inspect-higher-order-query/inspect-higher-order-query-executor.js

@@ -35,7 +35,7 @@ async function executeHigherOrderQuery({ analyzer }, queries) {
     const fns = graph.verticesOfType(vertex_1.VertexType.FunctionDefinition)
         .filter(([, v]) => filterFor.size === 0 || filterFor.has(v.id));
     const result = {};
-    for (const [id,] of fns) {
+    for (const [id] of fns) {
         result[id] = (0, higher_order_function_1.isFunctionHigherOrder)(id, graph, analyzer.inspectContext());
     }
     return {

package/queries/catalog/inspect-recursion-query/inspect-recursion-query-executor.js

@@ -10,7 +10,7 @@ async function executeRecursionQuery({ analyzer }, queries) {
     const start = Date.now();
     const { cg, fns } = await (0, inspect_exception_query_executor_1.getFunctionsToConsiderInCallGraph)(queries, analyzer);
     const result = {};
-    for (const [id,] of fns) {
+    for (const [id] of fns) {
         result[id] = (0, recursive_function_1.isFunctionRecursive)(id, cg);
     }
     return {

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

@@ -86,12 +86,12 @@ export declare const flowrCapabilities: {
             }, {
                 readonly name: "Search Path";
                 readonly id: "search-path";
-                readonly supported: "not";
+                readonly supported: "partially";
                 readonly description: "_Handling [R's search path](https://cran.r-project.org/doc/manuals/r-release/R-lang.html#Search-path) as explained in [Advanced R](https://adv-r.hadley.nz/environments.html#search-path)._ Currently, _flowR_ does not support dynamic modifications with `attach`, `search`, or `fn_env` and tests are definitely missing. Yet, theoretically, the tooling is all there.";
             }, {
                 readonly name: "Namespaces";
                 readonly id: "namespaces";
-                readonly supported: "not";
+                readonly supported: "partially";
                 readonly description: "_Handling R's namespaces as explained in [Advanced R](https://adv-r.hadley.nz/environments.html#namespaces)_";
             }, {
                 readonly name: "Accessing Exported Names";
@@ -101,7 +101,7 @@ export declare const flowrCapabilities: {
             }, {
                 readonly name: "Accessing Internal Names";
                 readonly id: "accessing-internal-names";
-                readonly supported: "not";
+                readonly supported: "partially";
                 readonly description: "_Similar to `::` but for internal names._";
             }, {
                 readonly name: "Library Loading";
@@ -113,6 +113,11 @@ export declare const flowrCapabilities: {
                 readonly id: "dynamic-scope-changes";
                 readonly supported: "partially";
                 readonly description: "_Manually changing scopes like [`local`](https://www.rdocumentation.org/packages/base/versions/3.6.2/topics/eval)_";
+            }, {
+                readonly name: "Anonymous Bindings";
+                readonly id: "anonymous-bindings";
+                readonly supported: "fully";
+                readonly description: "_Support for [`Recall`](https://www.rdocumentation.org/packages/base/versions/3.6.2/topics/Recall)_";
             }];
         }];
     }, {

package/r-bridge/data/data.js

@@ -122,13 +122,13 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                         {
                             name: 'Search Path',
                             id: 'search-path',
-                            supported: 'not',
+                            supported: 'partially',
                             description: "_Handling [R's search path](https://cran.r-project.org/doc/manuals/r-release/R-lang.html#Search-path) as explained in [Advanced R](https://adv-r.hadley.nz/environments.html#search-path)._ Currently, _flowR_ does not support dynamic modifications with `attach`, `search`, or `fn_env` and tests are definitely missing. Yet, theoretically, the tooling is all there."
                         },
                         {
                             name: 'Namespaces',
                             id: 'namespaces',
-                            supported: 'not',
+                            supported: 'partially',
                             description: "_Handling R's namespaces as explained in [Advanced R](https://adv-r.hadley.nz/environments.html#namespaces)_"
                         },
                         {
@@ -140,7 +140,7 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                         {
                             name: 'Accessing Internal Names',
                             id: 'accessing-internal-names',
-                            supported: 'not',
+                            supported: 'partially',
                             description: '_Similar to `::` but for internal names._'
                         },
                         {
@@ -155,6 +155,12 @@ ${await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { simplified: true })}
                             supported: 'partially',
                             description: '_Manually changing scopes like [`local`](https://www.rdocumentation.org/packages/base/versions/3.6.2/topics/eval)_'
                         },
+                        {
+                            name: 'Anonymous Bindings',
+                            id: 'anonymous-bindings',
+                            supported: 'fully',
+                            description: '_Support for [`Recall`](https://www.rdocumentation.org/packages/base/versions/3.6.2/topics/Recall)_'
+                        }
                     ]
                 }
             ]

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

@@ -93,17 +93,6 @@ export interface Location {
  * At the moment, this is only the name of the namespace.
  */
 export type NamespaceIdentifier = string;
-/**
- * Similar to {@link Location} this is an interface that indicates that
- * the respective {@link RAstNodeBase} node has a respective property (a namespace).
- */
-export interface Namespace {
-    /**
-     * The namespace attached to the given node
-     * (e.g., a namespaced symbol in `x::y`).
-     */
-    namespace?: NamespaceIdentifier;
-}
 /**
  * This subtype of {@link RNode} represents all types of constants
  * represented in the normalized AST.

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

@@ -4,12 +4,13 @@ import type { RSymbol } from './r-symbol';
 import type { ParentInformation } from '../processing/decorate';
 import type { NodeId } from '../processing/node-id';
 import type { RFunctionArgument } from './r-function-call';
+import type { BrandedIdentifier } from '../../../../../dataflow/environments/identifier';
 /**
  * Represents a named or unnamed argument of a function definition in R.
  */
 export interface RArgument<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly type: RType.Argument;
-    name: RSymbol<Info> | undefined;
+    name: RSymbol<Info, BrandedIdentifier> | undefined;
     value: RNode<Info> | undefined;
 }
 export interface RUnnamedArgument<Info = NoInfo> extends RArgument<Info> {

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

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

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

@@ -1,13 +1,17 @@
-import type { Leaf, Location, Namespace, NoInfo } from '../model';
+import type { Leaf, Location, NoInfo } from '../model';
 import type { RType } from '../type';
+import type { Identifier } from '../../../../../dataflow/environments/identifier';
 /**
  *
  */
 export declare function isSpecialSymbol(symbol: RSymbol): boolean;
 /**
- * Represents identifiers (variables).
+ * Represents identifiers (variables) such as `x` in `x <- 42` or `a::foo` in `a::foo()`.
+ * See {@link Identifier} for more information about how identifiers are represented.
+ * @typeParam Info - can be used to store additional information about the node
+ * @typeParam T    - the type used to represent the identifier, by default {@link Identifier}
  */
-export interface RSymbol<Info = NoInfo, T extends string = string> extends Leaf<Info>, Namespace, Location {
+export interface RSymbol<Info = NoInfo, T extends Identifier = Identifier> extends Leaf<Info>, Location {
     readonly type: RType.Symbol;
     content: T;
 }

package/r-bridge/lang-4.x/ast/model/processing/node-id.js

@@ -5,6 +5,7 @@ exports.recoverName = recoverName;
 exports.recoverContent = recoverContent;
 const vertex_1 = require("../../../../../dataflow/graph/vertex");
 const retriever_1 = require("../../../../retriever");
+const identifier_1 = require("../../../../../dataflow/environments/identifier");
 const numIdRegex = /^\d+$/;
 /** used so that we do not have to store strings for the default numeric ids */
 function normalizeIdToNumberIfPossible(id) {
@@ -27,7 +28,7 @@ function recoverName(id, idMap) {
 function recoverContent(id, graph) {
     const vertex = graph.getVertex(id);
     if (vertex && vertex.tag === vertex_1.VertexType.FunctionCall && vertex.name) {
-        return vertex.name;
+        return identifier_1.Identifier.toString(vertex.name);
     }
     const node = graph.idMap?.get(id);
     if (node === undefined) {

package/r-bridge/lang-4.x/ast/model/processing/stateful-fold.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.foldAstStateful = foldAstStateful;
-const assert_1 = require("../../../../../util/assert");
 const type_1 = require("../type");
 const r_function_call_1 = require("../nodes/r-function-call");
+const assert_1 = require("../../../../../util/assert");
 /**
  * Folds in old functional-fashion over the AST structure but allowing for a down function which can pass context to child nodes.
  */

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-argument.js

@@ -32,7 +32,6 @@ function tryToNormalizeArgument(data, objs) {
             type: type_1.RType.Symbol,
             location,
             content: symbolOrExpr.name === type_1.RawRType.StringConst ? content.slice(1, -1) : ((0, strings_1.startAndEndsWith)(content, '`') ? content.slice(1, -1) : content),
-            namespace: undefined,
             lexeme: content,
             info: {
                 fullRange: location,

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-call.js

@@ -109,7 +109,6 @@ function parseNamedFunctionCall(data, symbolContent, mappedWithName, location, c
         const stringBase = (0, normalize_string_1.normalizeString)(data, symbolContent[0].content);
         functionName = {
             type: type_1.RType.Symbol,
-            namespace: undefined,
             lexeme: stringBase.lexeme,
             info: stringBase.info,
             location: stringBase.location,

package/r-bridge/lang-4.x/ast/parser/main/internal/operators/normalize-binary.js

@@ -48,7 +48,6 @@ function parseBinaryOp(data, lhs, operator, rhs) {
                 location,
                 lexeme: content,
                 content,
-                namespace: undefined,
                 info: {}
             },
             arguments: [

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-number.js

@@ -26,7 +26,6 @@ function normalizeNumber(data, obj) {
     if ((0, convert_values_1.isNA)(content)) {
         return {
             ...common,
-            namespace: undefined,
             type: type_1.RType.Symbol,
             content
         };

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-symbol.d.ts

@@ -3,10 +3,9 @@ import type { RSymbol } from '../../../../model/nodes/r-symbol';
 import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Normalize the given object as an R symbol (incorporating namespace information).
- * <p>
- * The special symbols `T` and `F` are parsed as logic values.
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - The JSON object to extract the meta-information from
  * @returns The parsed symbol (with populated namespace information) or `undefined` if the given object is not a symbol.
+ * @see {@link RSymbol} for more information about R symbols.
  */
 export declare function tryNormalizeSymbol(data: NormalizerData, objs: readonly NamedJsonEntry[]): RSymbol | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-symbol.js

@@ -3,41 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeSymbol = tryNormalizeSymbol;
 const assert_1 = require("../../../../../../../util/assert");
 const normalize_meta_1 = require("../../normalize-meta");
-const strings_1 = require("../../../../../../../util/text/strings");
 const type_1 = require("../../../../model/type");
+const identifier_1 = require("../../../../../../../dataflow/environments/identifier");
 /**
  * Normalize the given object as an R symbol (incorporating namespace information).
- * <p>
- * The special symbols `T` and `F` are parsed as logic values.
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - The JSON object to extract the meta-information from
  * @returns The parsed symbol (with populated namespace information) or `undefined` if the given object is not a symbol.
+ * @see {@link RSymbol} for more information about R symbols.
  */
 function tryNormalizeSymbol(data, objs) {
     (0, assert_1.guard)(objs.length > 0, 'to parse symbols we need at least one object to work on!');
-    let location, content, namespace;
+    let content, location;
+    let meta;
     if (objs.length === 1 && (0, type_1.isSymbol)(objs[0].name)) {
-        const meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[0].content);
+        meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[0].content);
         location = meta.location;
-        content = meta.content;
-        namespace = undefined;
+        content = identifier_1.Identifier.make(meta.content);
     }
     else if (objs.length === 3 && (0, type_1.isSymbol)(objs[2].name)) {
-        const meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[2].content);
+        meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[2].content);
         location = meta.location;
-        content = meta.content;
-        namespace = (0, normalize_meta_1.retrieveMetaStructure)(objs[0].content).content;
+        const namespace = objs[0].content.text;
+        const internal = objs[1].content.text === ':::';
+        content = identifier_1.Identifier.make(meta.content, namespace, internal);
     }
     else {
         return undefined;
     }
     return {
         type: type_1.RType.Symbol,
-        namespace,
         location,
         // remove backticks from symbol
-        content: (0, strings_1.startAndEndsWith)(content, '`') ? content.substring(1, content.length - 1) : content,
-        lexeme: content,
+        content,
+        lexeme: meta.content,
         info: {
             fullRange: data.currentRange,
             additionalTokens: [],

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

@@ -15,6 +15,7 @@ const r_function_call_1 = require("../ast/model/nodes/r-function-call");
 const strings_1 = require("../../../util/text/strings");
 const log_1 = require("../../../util/log");
 const parser_1 = require("../ast/parser/json/parser");
+const identifier_1 = require("../../../dataflow/environments/identifier");
 /**
  * @param tree - The tree to normalize
  * @param lax - Whether to use lax parsing (i.e., ignore errors) or strict parsing (i.e., fail on errors)
@@ -125,14 +126,12 @@ function convertTreeNode(node) {
                             location: makeSourceRange(opening),
                             content: (0, retriever_1.removeRQuotes)(opening.text),
                             lexeme: opening.text,
-                            namespace: undefined,
                             ...defaultInfo
                         }, {
                             type: type_1.RType.Symbol,
                             location: makeSourceRange(closing),
                             content: (0, retriever_1.removeRQuotes)(closing.text),
                             lexeme: closing.text,
-                            namespace: undefined,
                             ...defaultInfo
                         }
                     ],
@@ -169,7 +168,6 @@ function convertTreeNode(node) {
                             location: opSource,
                             lexeme: op.text,
                             content: op.text,
-                            namespace: undefined,
                             info: {
                                 treeSitterId: op.id
                             }
@@ -236,13 +234,12 @@ function convertTreeNode(node) {
                 };
             }
             case tree_sitter_types_1.TreeSitterType.NamespaceOperator: {
-                const [lhs, /* :: or ::: */ , rhs] = nonErrorChildren(node);
+                const [lhs, int, rhs] = nonErrorChildren(node);
                 return {
                     type: type_1.RType.Symbol,
                     location: makeSourceRange(rhs),
-                    content: rhs.text,
+                    content: identifier_1.Identifier.make(rhs.text, lhs.text, int.text === ':::'),
                     lexeme: rhs.text,
-                    namespace: lhs.text,
                     ...defaultInfo
                 };
             }
@@ -259,7 +256,6 @@ function convertTreeNode(node) {
                     location: range,
                     content: (0, strings_1.startAndEndsWith)(node.text, '`') ? node.text.slice(1, -1) : (0, retriever_1.removeRQuotes)(node.text),
                     lexeme: node.text,
-                    namespace: undefined,
                     ...defaultInfo
                 };
             case tree_sitter_types_1.TreeSitterType.IfStatement: {
@@ -290,7 +286,6 @@ function convertTreeNode(node) {
                         location: makeSourceRange(variableNode),
                         content: (0, retriever_1.removeRQuotes)(variableNode.text),
                         lexeme: variableNode.text,
-                        namespace: undefined,
                         info: {
                             fullRange: undefined,
                             additionalTokens: [],
@@ -361,7 +356,6 @@ function convertTreeNode(node) {
                         funcNode = {
                             ...funcNode,
                             type: type_1.RType.Symbol,
-                            namespace: undefined,
                             content: (0, retriever_1.removeRQuotes)(func.text)
                         };
                     }
@@ -542,8 +536,7 @@ function convertTreeNode(node) {
                         name = {
                             ...name,
                             type: type_1.RType.Symbol,
-                            content: name.content.str,
-                            namespace: undefined
+                            content: name.content.str
                         };
                     }
                     else if ((0, strings_1.startAndEndsWith)(name.content, '`')) {

package/reconstruct/reconstruct.js

@@ -13,8 +13,9 @@ const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const stateful_fold_1 = require("../r-bridge/lang-4.x/ast/model/processing/stateful-fold");
 const auto_select_defaults_1 = require("./auto-select/auto-select-defaults");
+const identifier_1 = require("../dataflow/environments/identifier");
 function plain(text) {
-    return [{ line: text, indent: 0 }];
+    return [{ line: Array.isArray(text) ? identifier_1.Identifier.toString(text) : text, indent: 0 }];
 }
 exports.reconstructLogger = log_1.log.getSubLogger({ name: 'reconstruct' });
 function getLexeme(n) {
@@ -49,8 +50,8 @@ function reconstructExpressionList(exprList, _grouping, expressions, config) {
         if (g && fst.length > 0) {
             const start = g[0].content;
             const end = g[1].content;
-            fst[0].line = `${start}${start === '{' ? ' ' : ''}${fst[0].line}`;
-            fst[fst.length - 1].line = `${fst[fst.length - 1].line}${end === '}' ? ' ' : ''}${end}`;
+            fst[0].line = `${identifier_1.Identifier.toString(start)}${start === '{' ? ' ' : ''}${fst[0].line}`;
+            fst[fst.length - 1].line = `${fst[fst.length - 1].line}${end === '}' ? ' ' : ''}${identifier_1.Identifier.toString(end)}`;
         }
         return fst;
     }
@@ -323,13 +324,13 @@ function reconstructSpecialInfixFunctionCall(args, call) {
         const lhsText = lhs.map(l => `${getIndentString(l.indent)}${l.line}`).join('\n');
         if (rhs !== r_function_call_1.EmptyArgument && rhs.length > 0) {
             const rhsText = rhs.map(l => `${getIndentString(l.indent)}${l.line}`).join('\n');
-            return plain(`${lhsText} ${call.functionName.content} ${rhsText}`);
+            return plain(`${lhsText} ${identifier_1.Identifier.toString(call.functionName.content)} ${rhsText}`);
         }
         else {
             return plain(lhsText);
         }
     }
-    return plain(`${getLexeme(call.arguments[0])} ${call.functionName.content} ${getLexeme(call.arguments[1])}`);
+    return plain(`${getLexeme(call.arguments[0])} ${identifier_1.Identifier.toString(call.functionName.content)} ${getLexeme(call.arguments[1])}`);
 }
 function reconstructFunctionCall(call, functionName, args, configuration) {
     const selected = isSelected(configuration, call);

package/search/flowr-search-filters.d.ts

@@ -2,7 +2,7 @@ import { RType } from '../r-bridge/lang-4.x/ast/model/type';
 import { VertexType } from '../dataflow/graph/vertex';
 import type { ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { FlowrSearchElement } from './flowr-search';
-import { type Enrichment } from './search-executor/search-enrichers';
+import { Enrichment } from './search-executor/search-enrichers';
 import type { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { DataflowInformation } from '../dataflow/info';
 export type FlowrFilterName = keyof typeof FlowrFilters;

package/search/flowr-search-filters.js

@@ -8,6 +8,7 @@ exports.evalFilter = evalFilter;
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 const vertex_1 = require("../dataflow/graph/vertex");
 const search_enrichers_1 = require("./search-executor/search-enrichers");
+const identifier_1 = require("../dataflow/environments/identifier");
 var FlowrFilter;
 (function (FlowrFilter) {
     /**
@@ -34,8 +35,25 @@ exports.FlowrFilters = {
         return e.node.type !== type_1.RType.Argument || e.node.name !== undefined;
     }),
     [FlowrFilter.MatchesEnrichment]: ((e, args) => {
-        const content = JSON.stringify((0, search_enrichers_1.enrichmentContent)(e, args.enrichment));
-        return content !== undefined && args.test.test(content);
+        if (args.enrichment === search_enrichers_1.Enrichment.CallTargets) {
+            const c = (0, search_enrichers_1.enrichmentContent)(e, search_enrichers_1.Enrichment.CallTargets);
+            if (c === undefined || c.targets === undefined) {
+                return false;
+            }
+            for (const fn of c.targets) {
+                if (typeof fn === 'string' && args.test.test(fn)) {
+                    return true;
+                }
+                if (typeof fn === 'object' && 'node' in fn && fn.node.type === type_1.RType.FunctionCall && fn.node.named && args.test.test(identifier_1.Identifier.getName(fn.node.functionName.content))) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else {
+            const content = JSON.stringify((0, search_enrichers_1.enrichmentContent)(e, args.enrichment));
+            return content !== undefined && args.test.test(content);
+        }
     }),
     [FlowrFilter.OriginKind]: ((e, args, data) => {
         const dfgNode = data.dataflow.graph.getVertex(e.node.info.id);
@@ -53,7 +71,7 @@ exports.FlowrFilters = {
  * Helper to create a regular expression that matches function names, ignoring their package.
  */
 function testFunctionsIgnoringPackage(functions) {
-    return new RegExp(`"(.+:::?)?(${functions.join('|')})"`);
+    return new RegExp(`^(.+:::?)?(${functions.join('|')})$`);
 }
 /**
  * @see {@link FlowrFilterCombinator.is}
@@ -185,8 +203,21 @@ function evalTree(tree, data) {
  * Evaluates the given filter expression against the provided data.
  */
 function evalFilter(filter, data) {
-    /* common lift, this can be improved easily :D */
-    const tree = FlowrFilterCombinator.is(filter);
-    return evalTree(tree.get(), data);
+    if (filter instanceof FlowrFilterCombinator) {
+        return evalTree(filter.get(), data);
+    }
+    else if (typeof filter === 'string' && exports.ValidFlowrFilters.has(filter)) {
+        const handler = exports.FlowrFilters[filter];
+        return handler(data.element, undefined, data.data);
+    }
+    else if (typeof filter === 'object' && 'name' in filter) {
+        const handler = exports.FlowrFilters[filter.name];
+        const args = ('args' in filter ? filter.args : undefined);
+        return handler(data.element, args, data.data);
+    }
+    else {
+        const tree = FlowrFilterCombinator.is(filter);
+        return evalTree(tree.get(), data);
+    }
 }
 //# sourceMappingURL=flowr-search-filters.js.map

package/search/search-executor/search-enrichers.d.ts

@@ -1,7 +1,6 @@
 import type { FlowrSearchElement, FlowrSearchElements } from '../flowr-search';
 import type { ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type MergeableRecord } from '../../util/objects';
-import type { Identifier } from '../../dataflow/environments/identifier';
 import type { LinkToLastCall } from '../../queries/catalog/call-context-query/call-context-query-format';
 import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { ControlFlowInformation } from '../../control-flow/control-flow-graph';
@@ -39,7 +38,7 @@ export interface CallTargetsContent extends MergeableRecord {
      * The call targets of the function call.
      * For identifier call targets, the identifier is the name of the library function being called.
      */
-    targets: (FlowrSearchElement<ParentInformation> | Identifier)[];
+    targets: (FlowrSearchElement<ParentInformation> | string)[];
 }
 export interface LastCallContent extends MergeableRecord {
     linkedIds: FlowrSearchElement<ParentInformation>[];

package/search/search-executor/search-enrichers.js

@@ -11,7 +11,8 @@ const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id"
 const cfg_simplification_1 = require("../../control-flow/cfg-simplification");
 const call_context_query_executor_1 = require("../../queries/catalog/call-context-query/call-context-query-executor");
 const cfg_kind_1 = require("../../project/cfg-kind");
-const identify_link_to_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-relation");
+const identify_link_to_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
+const identifier_1 = require("../../dataflow/environments/identifier");
 /**
  * An enumeration that stores the names of the available enrichments that can be applied to a set of search elements.
  * See {@link FlowrSearchBuilder.with} for more information on how to apply enrichments.
@@ -49,7 +50,7 @@ exports.Enrichments = {
                                     node: n.idMap.get(o.id),
                                 };
                             case 3 /* OriginType.BuiltInFunctionOrigin */:
-                                return o.fn.name;
+                                return identifier_1.Identifier.toString(o.fn.name);
                             default:
                                 return undefined;
                         }
@@ -75,12 +76,13 @@ exports.Enrichments = {
         enrichElement: async (e, _s, analyzer, args, prev) => {
             (0, assert_1.guard)(args && args.length, `${Enrichment.LastCall} enrichment requires at least one argument`);
             const content = prev ?? { linkedIds: [] };
-            const df = await analyzer.dataflow();
-            const n = await analyzer.normalize();
-            const vertex = df.graph.get(e.node.info.id);
-            if (vertex !== undefined && vertex[0].tag === vertex_1.VertexType.FunctionCall) {
+            const df = (await analyzer.dataflow()).graph;
+            const vertex = df.getVertex(e.node.info.id);
+            if (vertex?.tag === vertex_1.VertexType.FunctionCall) {
+                const n = await analyzer.normalize();
+                const cfg = (await analyzer.controlflow(undefined, cfg_kind_1.CfgKind.Quick)).graph;
                 for (const arg of args) {
-                    const lastCalls = await (0, identify_link_to_relation_1.identifyLinkToRelation)(vertex[0].id, analyzer, {
+                    const lastCalls = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelationSync)(vertex.id, cfg, df, {
                         ...arg,
                         callName: (0, call_context_query_executor_1.promoteCallName)(arg.callName),
                         type: 'link-to-last-call',