@eagleoutice/flowr 2.9.12 → 2.9.14

package/queries/query.d.ts

@@ -23,7 +23,7 @@ import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type ControlFlowQuery } from './catalog/control-flow-query/control-flow-query-format';
 import { type DfShapeQuery } from './catalog/df-shape-query/df-shape-query-format';
 import type { AsyncOrSync } from 'ts-essentials';
-import type { FlowrConfigOptions } from '../config';
+import type { FlowrConfig } from '../config';
 import { type InspectHigherOrderQuery } from './catalog/inspect-higher-order-query/inspect-higher-order-query-format';
 import type { ReadonlyFlowrAnalysisProvider } from '../project/flowr-analyzer';
 import type { ReplOutput } from '../cli/repl/commands/repl-main';
@@ -33,10 +33,11 @@ import type { CallGraphQuery } from './catalog/call-graph-query/call-graph-query
 import type { InspectRecursionQuery } from './catalog/inspect-recursion-query/inspect-recursion-query-format';
 import type { DoesCallQuery } from './catalog/does-call-query/does-call-query-format';
 import type { InspectExceptionQuery } from './catalog/inspect-exceptions-query/inspect-exception-query-format';
+import type { ProvenanceQuery } from './catalog/provenance-query/provenance-query-format';
 /**
  * These are all queries that can be executed from within flowR
  */
-export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | DoesCallQuery | CallGraphQuery | ControlFlowQuery | DataflowLensQuery | FilesQuery | DfShapeQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | InspectExceptionQuery | InspectHigherOrderQuery | InspectRecursionQuery | ResolveValueQuery | ProjectQuery | OriginQuery | LinterQuery;
+export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | DoesCallQuery | CallGraphQuery | ControlFlowQuery | DataflowLensQuery | FilesQuery | DfShapeQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | InspectExceptionQuery | InspectHigherOrderQuery | InspectRecursionQuery | ResolveValueQuery | ProjectQuery | OriginQuery | LinterQuery | ProvenanceQuery;
 export type QueryArgumentsWithType<QueryType extends BaseQueryFormat['type']> = Query & {
     type: QueryType;
 };
@@ -53,9 +54,9 @@ export interface ParsedQueryLine<QueryType extends BaseQueryFormat['type']> {
 export interface SupportedQuery<QueryType extends BaseQueryFormat['type'] = BaseQueryFormat['type']> {
     executor: QueryExecutor<QueryArgumentsWithType<QueryType>, Promise<BaseQueryResult>>;
     /** optional completion in, e.g., the repl */
-    completer?: (splitLine: readonly string[], startingNewArg: boolean, config: FlowrConfigOptions) => CommandCompletions;
+    completer?: (splitLine: readonly string[], startingNewArg: boolean, config: FlowrConfig) => CommandCompletions;
     /** optional query construction from an, e.g., repl line */
-    fromLine?: (output: ReplOutput, splitLine: readonly string[], config: FlowrConfigOptions) => ParsedQueryLine<QueryType>;
+    fromLine?: (output: ReplOutput, splitLine: readonly string[], config: FlowrConfig) => ParsedQueryLine<QueryType>;
     /**
      * Generates an ASCII summary of the query result to be printed in, e.g., the REPL.
      * @returns whether a summary was produced (`true` if so, `false` if not, in this case a default/generic summary will be created)
@@ -79,8 +80,8 @@ export declare const SupportedQueries: {
     readonly config: {
         readonly executor: typeof import("./catalog/config-query/config-query-executor").executeConfigQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;
-        readonly completer: (partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfigOptions) => CommandCompletions;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"config">;
+        readonly completer: (partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfig) => CommandCompletions;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"config">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
@@ -105,7 +106,7 @@ export declare const SupportedQueries: {
     readonly 'does-call': {
         readonly executor: typeof import("./catalog/does-call-query/does-call-query-executor").executeDoesCallQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"does-call">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"does-call">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
@@ -119,15 +120,15 @@ export declare const SupportedQueries: {
         readonly executor: typeof import("./catalog/df-shape-query/df-shape-query-executor").executeDfShapeQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly jsonFormatter: (queryResults: BaseQueryResult) => object;
-        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"df-shape">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"df-shape">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly files: {
         readonly executor: typeof import("./catalog/files-query/files-query-executor").executeFileQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions) => CommandCompletions;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"files">;
+        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfig) => CommandCompletions;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"files">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (_: BaseQueryResult) => NodeId[];
     };
@@ -152,7 +153,14 @@ export declare const SupportedQueries: {
     readonly 'static-slice': {
         readonly executor: typeof import("./catalog/static-slice-query/static-slice-query-executor").executeStaticSliceQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"static-slice">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"static-slice">;
+        readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
+    };
+    readonly provenance: {
+        readonly executor: typeof import("./catalog/provenance-query/provenance-query-executor").executeProvenanceQuery;
+        readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"provenance">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
@@ -165,7 +173,7 @@ export declare const SupportedQueries: {
     readonly 'location-map': {
         readonly executor: typeof import("./catalog/location-map-query/location-map-query-executor").executeLocationMapQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"location-map">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"location-map">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
@@ -184,28 +192,28 @@ export declare const SupportedQueries: {
     readonly 'inspect-exception': {
         readonly executor: typeof import("./catalog/inspect-exceptions-query/inspect-exception-query-executor").executeExceptionQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
-        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"inspect-exception">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"inspect-exception">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'inspect-higher-order': {
         readonly executor: typeof import("./catalog/inspect-higher-order-query/inspect-higher-order-query-executor").executeHigherOrderQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
-        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"inspect-higher-order">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"inspect-higher-order">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'inspect-recursion': {
         readonly executor: typeof import("./catalog/inspect-recursion-query/inspect-recursion-query-executor").executeRecursionQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"inspect-recursion">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"inspect-recursion">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'resolve-value': {
         readonly executor: typeof import("./catalog/resolve-value-query/resolve-value-query-executor").executeResolveValueQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"resolve-value">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"resolve-value">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
@@ -218,15 +226,15 @@ export declare const SupportedQueries: {
     readonly origin: {
         readonly executor: typeof import("./catalog/origin-query/origin-query-executor").executeResolveValueQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"origin">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"origin">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly linter: {
         readonly executor: typeof import("./catalog/linter-query/linter-query-executor").executeLinterQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions) => CommandCompletions;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"linter">;
+        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfig) => CommandCompletions;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"linter">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => ((string & {
             __brand?: "node-id";

package/queries/query.js

@@ -40,6 +40,7 @@ const call_graph_query_format_1 = require("./catalog/call-graph-query/call-graph
 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");
+const provenance_query_format_1 = require("./catalog/provenance-query/provenance-query-format");
 exports.SupportedQueries = {
     'call-context': call_context_query_format_1.CallContextQueryDefinition,
     'config': config_query_format_1.ConfigQueryDefinition,
@@ -54,6 +55,7 @@ exports.SupportedQueries = {
     'normalized-ast': normalized_ast_query_format_1.NormalizedAstQueryDefinition,
     'dataflow-cluster': cluster_query_format_1.ClusterQueryDefinition,
     'static-slice': static_slice_query_format_1.StaticSliceQueryDefinition,
+    'provenance': provenance_query_format_1.ProvenanceQueryDefinition,
     'dependencies': dependencies_query_format_1.DependenciesQueryDefinition,
     'location-map': location_map_query_format_1.LocationMapQueryDefinition,
     'search': search_query_format_1.SearchQueryDefinition,

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

@@ -28,6 +28,7 @@ import type { ParentInformation } from './processing/decorate';
 import type { NodeId } from './processing/node-id';
 import type { OnEnter, OnExit } from './processing/visitor';
 import type { SingleOrArrayOrNothing } from '../../../../abstract-interpretation/normalized-ast-fold';
+import { getDocumentationOf } from '../../../roxygen2/documentation-provider';
 /** Simply an empty type constraint used to say that there are additional decorations (see {@link RAstNodeBase}). */
 export type NoInfo = object;
 /**
@@ -258,13 +259,18 @@ export declare const RNode: {
      * Returns the direct parent of a node.
      * Usually, only root nodes do not have a parent, and you can assume that there is a
      * linear chain of parents leading to the root node.
+     * @see {@link iterateParents} - to get all parents of a node
      */
-    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & ParentInformation>, idMap: Map<NodeId, RNode<OtherInfo>>) => RNode<OtherInfo> | undefined;
+    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & ParentInformation>, idMap: Map<NodeId, RNode<OtherInfo & ParentInformation>>) => RNode<OtherInfo & ParentInformation> | undefined;
+    /**
+     * Returns an iterable of all parents of a node, starting with the direct parent and ending with the root node.
+     */
+    readonly iterateParents: <OtherInfo>(this: void, node: RNode<OtherInfo & ParentInformation> | undefined, idMap: Map<NodeId, RNode<OtherInfo & ParentInformation>>) => Generator<RNode<OtherInfo & ParentInformation>>;
     /**
      * In contrast to the nesting stored in the {@link RNode} structure,
      * this function calculates the depth of a node by counting the number of parents until the root node is reached.
      */
-    readonly depth: (this: void, node: RNode, idMap: Map<NodeId, RNode>) => number;
+    readonly depth: (this: void, node: RNode<ParentInformation>, idMap: Map<NodeId, RNode<ParentInformation>>) => number;
     /**
      * Collects all node ids within a tree given by a respective root node, but stops collecting at nodes where the given `stop` function returns `true`.
      * <p>
@@ -282,5 +288,10 @@ export declare const RNode: {
     readonly lexeme: <R extends RNode<ParentInformation>>(this: void, node: R | undefined) => R extends {
         lexeme: string;
     } ? string : string | undefined;
+    /**
+     * Return the (roxygen) documentation associated with the given node, if available.
+     * @see {@link getDocumentationOf}
+     */
+    readonly documentation: typeof getDocumentationOf;
 };
 export type OtherInfoNode = RNode | RDelimiter;

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

@@ -6,6 +6,7 @@ const type_1 = require("./type");
 const r_access_1 = require("./nodes/r-access");
 const visitor_1 = require("./processing/visitor");
 const assert_1 = require("../../../../util/assert");
+const documentation_provider_1 = require("../../../roxygen2/documentation-provider");
 /**
  * Helper object to provide helper functions for {@link RConstant|RConstants}.
  * @see {@link RNode} - for more general helper functions for all nodes
@@ -200,6 +201,7 @@ exports.RNode = {
      * Returns the direct parent of a node.
      * Usually, only root nodes do not have a parent, and you can assume that there is a
      * linear chain of parents leading to the root node.
+     * @see {@link iterateParents} - to get all parents of a node
      */
     directParent(node, idMap) {
         const parentId = node.info.parent;
@@ -208,6 +210,18 @@ exports.RNode = {
         }
         return idMap.get(parentId);
     },
+    /**
+     * Returns an iterable of all parents of a node, starting with the direct parent and ending with the root node.
+     */
+    *iterateParents(node, idMap) {
+        let currentNode = node;
+        while (currentNode) {
+            currentNode = exports.RNode.directParent(currentNode, idMap);
+            if (currentNode) {
+                yield currentNode;
+            }
+        }
+    },
     /**
      * In contrast to the nesting stored in the {@link RNode} structure,
      * this function calculates the depth of a node by counting the number of parents until the root node is reached.
@@ -247,6 +261,11 @@ exports.RNode = {
      */
     lexeme(node) {
         return node?.info.fullLexeme ?? node?.lexeme;
-    }
+    },
+    /**
+     * Return the (roxygen) documentation associated with the given node, if available.
+     * @see {@link getDocumentationOf}
+     */
+    documentation: documentation_provider_1.getDocumentationOf
 };
 //# sourceMappingURL=model.js.map

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

@@ -1,6 +1,8 @@
-import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo } from '../model';
+import { RNode } from '../model';
 import { RType } from '../type';
 import type { RParameter } from './r-parameter';
+import type { AstIdMap, ParentInformation } from '../processing/decorate';
 /**
  * ```r
  * function(<parameters>) <body>
@@ -25,4 +27,9 @@ export declare const RFunctionDefinition: {
      * Type guard for {@link RFunctionDefinition} nodes.
      */
     readonly is: <Info = object>(this: void, node: RNode<Info> | undefined) => node is RFunctionDefinition<Info>;
+    /**
+     * Checks whether the given id is part of a function definition, and if so, this returns the id of the
+     * inner-most function definition.
+     */
+    readonly wrappingFunctionDefinition: <Info = object>(this: void, n: RNode<ParentInformation & Info> | undefined, idMap: AstIdMap<ParentInformation & Info>) => RFunctionDefinition<ParentInformation & Info> | undefined;
 };

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RFunctionDefinition = void 0;
+const model_1 = require("../model");
 const type_1 = require("../type");
 /**
  * Helper for working with {@link RFunctionDefinition} AST nodes.
@@ -12,6 +13,18 @@ exports.RFunctionDefinition = {
      */
     is(node) {
         return node?.type === type_1.RType.FunctionDefinition;
+    },
+    /**
+     * Checks whether the given id is part of a function definition, and if so, this returns the id of the
+     * inner-most function definition.
+     */
+    wrappingFunctionDefinition(n, idMap) {
+        for (const p of model_1.RNode.iterateParents(n, idMap)) {
+            if (exports.RFunctionDefinition.is(p)) {
+                return p;
+            }
+        }
+        return undefined;
     }
 };
 //# sourceMappingURL=r-function-definition.js.map

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

@@ -1,7 +1,7 @@
 import { type IdGenerator, type NormalizedAst } from '../../model/processing/decorate';
 import type { NoInfo } from '../../model/model';
 import type { ParseStepOutput, ParseStepOutputSingleFile } from '../../../../parser';
-import { type FlowrConfigOptions } from '../../../../../config';
+import { FlowrConfig } from '../../../../../config';
 import type { Tree } from 'web-tree-sitter';
 import { RProject } from '../../model/nodes/r-project';
 export declare const parseLog: import("tslog").Logger<import("tslog").ILogObj>;
@@ -19,4 +19,4 @@ export declare function normalizeButNotDecorated({ parsed, filePath }: ParseStep
 /**
  * Tree-Sitter pendant to {@link normalize}.
  */
-export declare function normalizeTreeSitter(parsed: ParseStepOutput<Tree>, getId: IdGenerator<NoInfo> | undefined, config: FlowrConfigOptions): NormalizedAst;
+export declare function normalizeTreeSitter(parsed: ParseStepOutput<Tree>, getId?: IdGenerator<NoInfo>, config?: FlowrConfig): NormalizedAst;

package/r-bridge/lang-4.x/ast/parser/json/parser.js

@@ -32,8 +32,8 @@ function normalizeButNotDecorated({ parsed, filePath }) {
 /**
  * Tree-Sitter pendant to {@link normalize}.
  */
-function normalizeTreeSitter(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), config) {
-    const lax = (0, config_1.getEngineConfig)(config, 'tree-sitter')?.lax;
+function normalizeTreeSitter(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), config = config_1.FlowrConfig.default()) {
+    const lax = config_1.FlowrConfig.getForEngine(config, 'tree-sitter')?.lax;
     const result = (0, decorate_1.decorateAst)((0, tree_sitter_normalize_1.normalizeTreeSitterTreeToAst)(parsed.files, lax), { getId });
     result.hasError = parsed.files.some(p => p.parsed.rootNode.hasError);
     return result;

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

@@ -224,14 +224,18 @@ function convertTreeNode(node) {
                 }
             }
             case tree_sitter_types_1.TreeSitterType.UnaryOperator: {
-                const [op, operand] = nonErrorChildren(node);
+                const [comments, children] = splitComments(nonErrorChildren(node));
+                const [op, operand] = children;
                 return {
                     type: type_1.RType.UnaryOp,
                     operand: convertTreeNode(operand),
                     location: makeSourceRange(op),
                     operator: op.text,
                     lexeme: op.text,
-                    ...defaultInfo
+                    info: {
+                        ...defaultInfo.info,
+                        adToks: comments.map(c => c[1]),
+                    }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.NamespaceOperator: {

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

@@ -3,8 +3,8 @@ 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 { Enrichment } from './search-executor/search-enrichers';
-import type { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { DataflowInformation } from '../dataflow/info';
+import type { BuiltInProcName } from '../dataflow/environments/built-in-proc-name';
 export type FlowrFilterName = keyof typeof FlowrFilters;
 interface FlowrFilterWithArgs<Filter extends FlowrFilterName, Args extends FlowrFilterArgs<Filter>> {
     name: Filter;

package/search/flowr-search-printer.js

@@ -4,10 +4,10 @@ exports.flowrSearchToMermaid = flowrSearchToMermaid;
 exports.flowrSearchToAscii = flowrSearchToAscii;
 exports.flowrSearchToCode = flowrSearchToCode;
 const flowr_search_traverse_1 = require("./flowr-search-traverse");
-const mermaid_1 = require("../util/mermaid/mermaid");
 const flowr_search_filters_1 = require("./flowr-search-filters");
 const vertex_1 = require("../dataflow/graph/vertex");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
+const mermaid_1 = require("../util/mermaid/mermaid");
 /**
  * Converts a {@link FlowrSearchLike} object to a mermaid flowchart.
  */
@@ -21,8 +21,8 @@ function argsToMermaidString(args) {
     if (args === undefined) {
         return '';
     }
-    return Object.entries(args).map(([key, value]) => `${key}: ${(0, flowr_search_filters_1.isBinaryTree)(value) ? '_' + (0, mermaid_1.escapeMarkdown)((0, flowr_search_filters_1.binaryTreeToString)(value.tree)) + '_'
-        : (0, mermaid_1.escapeMarkdown)(JSON.stringify(value))}`)
+    return Object.entries(args).map(([key, value]) => `${key}: ${(0, flowr_search_filters_1.isBinaryTree)(value) ? '_' + mermaid_1.Mermaid.escape((0, flowr_search_filters_1.binaryTreeToString)(value.tree)) + '_'
+        : mermaid_1.Mermaid.escape(JSON.stringify(value))}`)
         .join(', ');
 }
 function argsToAsciiString(args) {

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

@@ -6,13 +6,13 @@ exports.enrichElement = enrichElement;
 const objects_1 = require("../../util/objects");
 const vertex_1 = require("../../dataflow/graph/vertex");
 const assert_1 = require("../../util/assert");
-const dfg_get_origin_1 = require("../../dataflow/origin/dfg-get-origin");
 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_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 const identifier_1 = require("../../dataflow/environments/identifier");
+const df_helper_1 = require("../../dataflow/graph/df-helper");
 /**
  * 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.
@@ -37,7 +37,7 @@ exports.Enrichments = {
             const n = await analyzer.normalize();
             const callVertex = df.graph.getVertex(e.node.info.id);
             if (callVertex?.tag === vertex_1.VertexType.FunctionCall) {
-                const origins = (0, dfg_get_origin_1.getOriginInDfg)(df.graph, callVertex.id);
+                const origins = df_helper_1.Dataflow.origin(df.graph, callVertex.id);
                 if (!origins || origins.length === 0) {
                     content.targets = [(0, node_id_1.recoverName)(callVertex.id, n.idMap)];
                 }

package/search/search-executor/search-generators.js

@@ -133,7 +133,7 @@ async function generateSyntax(input, args) {
 }
 async function generateCriterion(input, args) {
     const idMap = (await input.normalize()).idMap;
-    return new flowr_search_1.FlowrSearchElements(args.criterion.map(c => ({ node: idMap.get((0, parse_1.slicingCriterionToId)(c, idMap)) })));
+    return new flowr_search_1.FlowrSearchElements(args.criterion.map(c => ({ node: idMap.get(parse_1.SingleSlicingCriterion.parse(c, idMap)) })));
 }
 /**
  * Gets the search generator function for the given name

package/slicing/criterion/parse.d.ts

@@ -2,30 +2,54 @@ import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 /** Either `line:column`, `line@variable-name`, or `$id` */
 export type SingleSlicingCriterion = `${number}:${number}` | `${number}@${string}` | `$${NodeId | number}`;
-export type SlicingCriteria = SingleSlicingCriterion[];
-/**
- * Thrown if the given slicing criteria can not be found
- */
-export declare class CriteriaParseError extends Error {
-    constructor(message: string);
-}
 /**
- * Takes a criterion in the form of `line:column` or `line@variable-name` and returns the corresponding node id
- * @see {@link tryResolveSliceCriterionToId} for a version that does not throw an error
+ * The helper object associated with {@link SingleSlicingCriterion} which makes it easy
+ * to parse, validate and resolve slicing criteria.
  */
-export declare function slicingCriterionToId(criterion: SingleSlicingCriterion, idMap: AstIdMap): NodeId;
+export declare const SingleSlicingCriterion: {
+    /**
+     * Takes a criterion in the form of `line:column` or `line@variable-name` and returns the corresponding node id
+     * @see {@link SingleSlicingCriterion.tryParse} for a version that does not throw an error
+     */
+    readonly parse: (this: void, criterion: SingleSlicingCriterion, idMap: AstIdMap) => NodeId;
+    /**
+     * Tries to resolve a slicing criterion to an id, but does not throw an error if it fails.
+     * @see {@link SingleSlicingCriterion.parse} for the version that throws an error
+     */
+    readonly tryParse: (this: void, criterion: SingleSlicingCriterion | NodeId, idMap: AstIdMap) => NodeId | undefined;
+    /**
+     * Converts a node id to a slicing criterion in the form of `$id`
+     */
+    readonly fromId: (this: void, id: NodeId) => SingleSlicingCriterion;
+};
 /**
- * Tries to resolve a slicing criterion to an id, but does not throw an error if it fails.
- * @see {@link slicingCriterionToId} for the version that throws an error
+ * A slicing criterion is a list of single slicing criteria, which can be in the form of `line:column`, `line@variable-name`, or `$id`.
  */
-export declare function tryResolveSliceCriterionToId(criterion: string | NodeId, idMap: AstIdMap): NodeId | undefined;
+export type SlicingCriteria = SingleSlicingCriterion[];
 export interface DecodedCriterion {
     criterion: SingleSlicingCriterion;
     id: NodeId;
 }
 export type DecodedCriteria = ReadonlyArray<DecodedCriterion>;
 /**
- * Converts all slicing criteria to their corresponding node ids
- * @throws CriteriaParseError if any of the criteria can not be resolved
+ * The helper object associated with {@link SlicingCriteria} which makes it easy to parse, validate and resolve slicing criteria.
+ */
+export declare const SlicingCriteria: {
+    /**
+     * Decodes all slicing criteria to their corresponding node ids
+     * @throws CriteriaParseError if any of the criteria can not be resolved
+     * @see {@link SlicingCriteria.convertAll}
+     */
+    readonly decodeAll: (this: void, criteria: SlicingCriteria, decorated: AstIdMap) => DecodedCriteria;
+    /**
+     * Converts all criteria to their id in the AST if possible, this keeps the original criterion if it can not be resolved.
+     * @see {@link SlicingCriteria.decodeAll}
+     */
+    readonly convertAll: (this: void, criteria: SlicingCriteria, decorated: AstIdMap) => NodeId[];
+};
+/**
+ * Thrown if the given slicing criteria can not be found
  */
-export declare function convertAllSlicingCriteriaToIds(criteria: SlicingCriteria, decorated: AstIdMap): DecodedCriteria;
+export declare class CriteriaParseError extends Error {
+    constructor(message: string);
+}