@eagleoutice/flowr 2.9.13 → 2.9.14

package/queries/catalog/happens-before-query/happens-before-query-executor.js

@@ -22,8 +22,8 @@ async function executeHappensBefore({ analyzer }, queries) {
             log_1.log.warn('Duplicate happens-before query', query, 'ignoring');
         }
         try {
-            const resolvedA = (0, parse_1.slicingCriterionToId)(a, ast.idMap);
-            const resolvedB = (0, parse_1.slicingCriterionToId)(b, ast.idMap);
+            const resolvedA = parse_1.SingleSlicingCriterion.parse(a, ast.idMap);
+            const resolvedB = parse_1.SingleSlicingCriterion.parse(b, ast.idMap);
             results[fingerprint] = (0, happens_before_1.happensBefore)(cfg.graph, resolvedA, resolvedB);
         }
         catch (e) {

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

@@ -1,6 +1,6 @@
 import type { InspectExceptionQuery, InspectExceptionQueryResult } from './inspect-exception-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-import { type SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { ReadonlyFlowrAnalysisProvider } from '../../../project/flowr-analyzer';
 /**

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

@@ -25,7 +25,7 @@ async function getFunctionsToConsiderInCallGraph(queries, analyzer, onlyDefiniti
     const filterFor = new Set();
     if (filters) {
         for (const f of filters) {
-            const i = (0, parse_1.tryResolveSliceCriterionToId)(f, ast.idMap);
+            const i = parse_1.SingleSlicingCriterion.tryParse(f, ast.idMap);
             if (i !== undefined) {
                 filterFor.add(i);
             }

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

@@ -4,7 +4,7 @@ exports.executeHigherOrderQuery = executeHigherOrderQuery;
 const higher_order_function_1 = require("../../../dataflow/fn/higher-order-function");
 const parse_1 = require("../../../slicing/criterion/parse");
 const vertex_1 = require("../../../dataflow/graph/vertex");
-const invert_dfg_1 = require("../../../dataflow/graph/invert-dfg");
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
 /**
  * Execute higher-order function inspection queries on the given analyzer.
  */
@@ -26,7 +26,7 @@ async function executeHigherOrderQuery({ analyzer }, queries) {
     const filterFor = new Set();
     if (filters) {
         for (const f of filters) {
-            const i = (0, parse_1.tryResolveSliceCriterionToId)(f, ast.idMap);
+            const i = parse_1.SingleSlicingCriterion.tryParse(f, ast.idMap);
             if (i !== undefined) {
                 filterFor.add(i);
             }
@@ -37,7 +37,7 @@ async function executeHigherOrderQuery({ analyzer }, queries) {
         .filter(([, v]) => filterFor.size === 0 || filterFor.has(v.id));
     let invertedGraph;
     if (filterFor.size === 0 || filterFor.size > 10) {
-        invertedGraph = (0, invert_dfg_1.invertDfg)(graph, analyzer.inspectContext().env.makeCleanEnv());
+        invertedGraph = df_helper_1.Dataflow.invertGraph(graph, analyzer.inspectContext().env.makeCleanEnv());
     }
     const result = {};
     for (const [id] of fns) {

package/queries/catalog/location-map-query/location-map-query-executor.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeLocationMapQuery = executeLocationMapQuery;
-const parse_1 = require("../../../slicing/criterion/parse");
 const assert_1 = require("../../../util/assert");
+const parse_1 = require("../../../slicing/criterion/parse");
 const fileIdRegex = /^(?<file>.*(\.[rR]))-/;
 function fuzzyFindFile(node, idMap) {
     if (node?.info.file) {
@@ -31,7 +31,7 @@ async function executeLocationMapQuery({ analyzer }, queries) {
     const start = Date.now();
     const criteriaOfInterest = new Set(queries
         .flatMap(q => q.ids ?? [])
-        .map(c => (0, parse_1.tryResolveSliceCriterionToId)(c, ast.idMap))
+        .map(c => parse_1.SingleSlicingCriterion.tryParse(c, ast.idMap))
         .filter(assert_1.isNotUndefined));
     const locationMap = {
         files: {},

package/queries/catalog/origin-query/origin-query-executor.d.ts

@@ -1,5 +1,5 @@
 import type { BasicQueryData } from '../../base-query-format';
-import { type SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { OriginQuery, OriginQueryResult } from './origin-query-format';
 /**
  * Produce a fingerprint string for an origin query

package/queries/catalog/origin-query/origin-query-executor.js

@@ -4,7 +4,7 @@ exports.fingerPrintOfQuery = fingerPrintOfQuery;
 exports.executeResolveValueQuery = executeResolveValueQuery;
 const log_1 = require("../../../util/log");
 const parse_1 = require("../../../slicing/criterion/parse");
-const dfg_get_origin_1 = require("../../../dataflow/origin/dfg-get-origin");
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
 /**
  * Produce a fingerprint string for an origin query
  */
@@ -22,12 +22,12 @@ async function executeResolveValueQuery({ analyzer }, queries) {
         if (results[key]) {
             log_1.log.warn(`Duplicate Key for origin-query: ${key}, skipping...`);
         }
-        const astId = (0, parse_1.slicingCriterionToId)(key, (await analyzer.normalize()).idMap);
+        const astId = parse_1.SingleSlicingCriterion.tryParse(key, (await analyzer.normalize()).idMap);
         if (astId === undefined) {
             log_1.log.warn(`Could not resolve id for ${key}, skipping...`);
             continue;
         }
-        results[key] = (0, dfg_get_origin_1.getOriginInDfg)((await analyzer.dataflow()).graph, astId);
+        results[key] = df_helper_1.Dataflow.origin((await analyzer.dataflow()).graph, astId);
     }
     return {
         '.meta': {

package/queries/catalog/provenance-query/provenance-query-executor.d.ts

@@ -0,0 +1,9 @@
+import type { BasicQueryData } from '../../base-query-format';
+import type { ProvenanceQuery, ProvenanceQueryResult } from './provenance-query-format';
+/**
+ * Execute static slice queries, catching duplicates with the same fingerprint
+ * @param analyzer - The basic query data containing the analyzer
+ * @param queries - The static slice queries to execute
+ * @returns The results of the static slice queries
+ */
+export declare function executeProvenanceQuery({ analyzer }: BasicQueryData, queries: readonly ProvenanceQuery[]): Promise<ProvenanceQueryResult>;

package/queries/catalog/provenance-query/provenance-query-executor.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeProvenanceQuery = executeProvenanceQuery;
+const log_1 = require("../../../util/log");
+const r_function_definition_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-function-definition");
+const parse_1 = require("../../../slicing/criterion/parse");
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
+const model_1 = require("../../../r-bridge/lang-4.x/ast/model/model");
+/**
+ * Execute static slice queries, catching duplicates with the same fingerprint
+ * @param analyzer - The basic query data containing the analyzer
+ * @param queries - The static slice queries to execute
+ * @returns The results of the static slice queries
+ */
+async function executeProvenanceQuery({ analyzer }, queries) {
+    const start = Date.now();
+    const results = {};
+    const nast = await analyzer.normalize();
+    const df = await analyzer.dataflow();
+    for (const query of queries) {
+        const key = query.criterion;
+        if (results[key]) {
+            log_1.log.warn(`Duplicate Key for provenance query: ${key}, skipping...`);
+        }
+        const criterionId = parse_1.SingleSlicingCriterion.tryParse(key, nast.idMap) ?? key;
+        const provenanceNode = nast.idMap.get(criterionId);
+        const fdef = r_function_definition_1.RFunctionDefinition.wrappingFunctionDefinition(provenanceNode, nast.idMap);
+        results[key] = Array.from(df_helper_1.Dataflow.provenance(criterionId, df.graph, fdef ? model_1.RNode.collectAllIds(fdef) : undefined));
+    }
+    return {
+        '.meta': {
+            timing: Date.now() - start
+        },
+        results
+    };
+}
+//# sourceMappingURL=provenance-query-executor.js.map

package/queries/catalog/provenance-query/provenance-query-format.d.ts

@@ -0,0 +1,35 @@
+import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
+import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import type { ParsedQueryLine } from '../../query';
+import Joi from 'joi';
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
+import type { FlowrConfig } from '../../../config';
+import { executeProvenanceQuery } from './provenance-query-executor';
+/** Calculates the provenance starting from a given criterion */
+export interface ProvenanceQuery extends BaseQueryFormat {
+    readonly type: 'provenance';
+    /** The slicing criterion to use as a start*/
+    readonly criterion: SingleSlicingCriterion;
+    /** Whether to stop on fdef boundaries */
+    readonly restrictFdef?: boolean;
+}
+export interface ProvenanceQueryResult extends BaseQueryResult {
+    /**
+     * Maps the requested criteria to the returned ids
+     */
+    results: Record<string, NodeId[]>;
+}
+/**
+ * Checks whether the given argument represents a fdef boundary with an `f` suffix.
+ */
+export declare function fdefBoundaryParser(argument: string): boolean;
+declare function provenanceQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'provenance'>;
+export declare const ProvenanceQueryDefinition: {
+    readonly executor: typeof executeProvenanceQuery;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
+    readonly fromLine: typeof provenanceQueryLineParser;
+    readonly schema: Joi.ObjectSchema<any>;
+    readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
+};
+export {};

package/queries/catalog/provenance-query/provenance-query-format.js

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProvenanceQueryDefinition = void 0;
+exports.fdefBoundaryParser = fdefBoundaryParser;
+const ansi_1 = require("../../../util/text/ansi");
+const time_1 = require("../../../util/text/time");
+const joi_1 = __importDefault(require("joi"));
+const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+const provenance_query_executor_1 = require("./provenance-query-executor");
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
+/**
+ * Checks whether the given argument represents a fdef boundary with an `f` suffix.
+ */
+function fdefBoundaryParser(argument) {
+    const endBracket = argument.indexOf(')');
+    return argument[endBracket + 1] === 'f';
+}
+function provenanceQueryLineParser(output, line, _config) {
+    const criterion = (0, slice_query_parser_1.sliceCriteriaParser)(line[0]);
+    const stopFdef = fdefBoundaryParser(line[0]);
+    if (!criterion || criterion.length !== 1) {
+        output.stderr(output.formatter.format('Invalid provenance query format, a single slicing criterion must be given in the form "(criterion1)"', { color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground, style: 1 /* FontStyles.Bold */ }));
+        return { query: [] };
+    }
+    return { query: [{
+                type: 'provenance',
+                criterion: criterion[0],
+                restrictFdef: stopFdef
+            }], rCode: line[1] };
+}
+exports.ProvenanceQueryDefinition = {
+    executor: provenance_query_executor_1.executeProvenanceQuery,
+    asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
+        const out = queryResults;
+        const df = await analyzer.dataflow();
+        result.push(`Query: ${(0, ansi_1.bold)('provenance', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
+        for (const [key, obj] of Object.entries(out.results)) {
+            result.push(`   ╰ Provenance for ${key}`);
+            const dfg = df_helper_1.Dataflow.reduceGraph(df.graph, new Set(obj));
+            result.push(`     ╰ [Mermaid Url](${df_helper_1.Dataflow.visualize.mermaid.url(dfg)})`);
+        }
+        return true;
+    },
+    fromLine: provenanceQueryLineParser,
+    schema: joi_1.default.object({
+        type: joi_1.default.string().valid('provenance').required().description('The type of the query.'),
+        criterion: joi_1.default.string().required().description('The slicing criterion to use.'),
+        restrictFdef: joi_1.default.boolean().required().description('Whether to stop on fdef boundaries.')
+    }).description('Provenance query definition'),
+    flattenInvolvedNodes: (queryResults) => {
+        const flattened = [];
+        const out = queryResults;
+        for (const obj of Object.values(out.results)) {
+            flattened.push(...obj);
+        }
+        return flattened;
+    }
+};
+//# sourceMappingURL=provenance-query-format.js.map

package/queries/catalog/resolve-value-query/resolve-value-query-executor.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fingerPrintOfQuery = fingerPrintOfQuery;
 exports.executeResolveValueQuery = executeResolveValueQuery;
 const log_1 = require("../../../util/log");
-const parse_1 = require("../../../slicing/criterion/parse");
 const alias_tracking_1 = require("../../../dataflow/eval/resolve/alias-tracking");
+const parse_1 = require("../../../slicing/criterion/parse");
 /**
  * Naive fingerprint to filter out duplicate queries.
  */
@@ -25,7 +25,7 @@ async function executeResolveValueQuery({ analyzer }, queries) {
             log_1.log.warn(`Duplicate Key for resolve-value-query: ${key}, skipping...`);
         }
         const values = query.criteria
-            .map(criteria => (0, parse_1.slicingCriterionToId)(criteria, idMap))
+            .map(criteria => parse_1.SingleSlicingCriterion.parse(criteria, idMap))
             .flatMap(ident => (0, alias_tracking_1.resolveIdToValue)(ident, { graph, full: true, idMap, resolve: analyzer.flowrConfig.solver.variables, ctx: analyzer.inspectContext() }));
         results[key] = {
             values: values

package/queries/catalog/search-query/search-query-format.js

@@ -17,7 +17,7 @@ exports.SearchQueryDefinition = {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('search', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [, { ids, search }] of out.results.entries()) {
-            result.push(`   ╰ [query](${(0, mermaid_1.mermaidCodeToUrl)((0, flowr_search_printer_1.flowrSearchToMermaid)(search))}): {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, ids)}}`);
+            result.push(`   ╰ [query](${mermaid_1.Mermaid.codeToUrl((0, flowr_search_printer_1.flowrSearchToMermaid)(search))}): {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, ids)}}`);
         }
         return true;
     },

package/queries/catalog/static-slice-query/static-slice-query-executor.js

@@ -7,7 +7,8 @@ const reconstruct_1 = require("../../../reconstruct/reconstruct");
 const auto_select_defaults_1 = require("../../../reconstruct/auto-select/auto-select-defaults");
 const magic_comments_1 = require("../../../reconstruct/auto-select/magic-comments");
 const log_1 = require("../../../util/log");
-const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
+const slice_direction_1 = require("../../../util/slice-direction");
+const parse_1 = require("../../../slicing/criterion/parse");
 /**
  * Produce a fingerprint string for a static slice query
  */
@@ -30,7 +31,8 @@ async function executeStaticSliceQuery({ analyzer }, queries) {
         }
         const { criteria, noReconstruction, noMagicComments } = query;
         const sliceStart = Date.now();
-        const slice = (0, static_slicer_1.staticSlice)(analyzer.inspectContext(), await analyzer.dataflow(), await analyzer.normalize(), criteria, query.direction ?? _00_slice_1.SliceDirection.Backward, analyzer.flowrConfig.solver.slicer?.threshold);
+        const n = await analyzer.normalize();
+        const slice = (0, static_slicer_1.staticSlice)(analyzer.inspectContext(), await analyzer.dataflow(), n, parse_1.SlicingCriteria.convertAll(criteria, n.idMap), query.direction ?? slice_direction_1.SliceDirection.Backward, analyzer.flowrConfig.solver.slicer?.threshold);
         const sliceEnd = Date.now();
         if (noReconstruction) {
             results[key] = { slice: { ...slice, '.meta': { timing: sliceEnd - sliceStart } } };

package/queries/catalog/static-slice-query/static-slice-query-format.d.ts

@@ -5,11 +5,11 @@ import type { SlicingCriteria } from '../../../slicing/criterion/parse';
 import type { ParsedQueryLine } from '../../query';
 import Joi from 'joi';
 import { executeStaticSliceQuery } from './static-slice-query-executor';
-import { SliceDirection } from '../../../core/steps/all/static-slicing/00-slice';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
 import type { FlowrConfig } from '../../../config';
-/** Calculates and returns all clusters encountered in the dataflow graph. */
+import { SliceDirection } from '../../../util/slice-direction';
+/** Calculates and returns the static backward or forward slice from the given criteria */
 export interface StaticSliceQuery extends BaseQueryFormat {
     readonly type: 'static-slice';
     /** The slicing criteria to use */

package/queries/catalog/static-slice-query/static-slice-query-format.js

@@ -9,12 +9,12 @@ const time_1 = require("../../../util/text/time");
 const joi_1 = __importDefault(require("joi"));
 const static_slice_query_executor_1 = require("./static-slice-query-executor");
 const query_print_1 = require("../../query-print");
-const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
 const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+const slice_direction_1 = require("../../../util/slice-direction");
 function sliceQueryLineParser(output, line, _config) {
     const criteria = (0, slice_query_parser_1.sliceCriteriaParser)(line[0]);
     const direction = (0, slice_query_parser_1.sliceDirectionParser)(line[0]);
-    if (!criteria || criteria.length == 0) {
+    if (!criteria || criteria.length === 0) {
         output.stderr(output.formatter.format('Invalid static-slice query format, slicing criteria must be given in the form "(criterion1;criterion2;...)"', { color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground, style: 1 /* FontStyles.Bold */ }));
         return { query: [] };
     }
@@ -68,7 +68,7 @@ exports.StaticSliceQueryDefinition = {
         criteria: joi_1.default.array().items(joi_1.default.string()).min(0).required().description('The slicing criteria to use.'),
         noReconstruction: joi_1.default.boolean().optional().description('Do not reconstruct the slice into readable code.'),
         noMagicComments: joi_1.default.boolean().optional().description('Should the magic comments (force-including lines within the slice) be ignored?'),
-        direction: joi_1.default.string().valid(...Object.values(_00_slice_1.SliceDirection)).optional().description('The direction to slice in. Defaults to backward slicing if unset.')
+        direction: joi_1.default.string().valid(...Object.values(slice_direction_1.SliceDirection)).optional().description('The direction to slice in. Defaults to backward slicing if unset.')
     }).description('Slice query used to slice the dataflow graph'),
     flattenInvolvedNodes: (queryResults) => {
         const flattened = [];

package/queries/query.d.ts

@@ -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;
 };
@@ -156,6 +157,13 @@ export declare const SupportedQueries: {
         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[];
+    };
     readonly dependencies: {
         readonly executor: typeof import("./catalog/dependencies-query/dependencies-query-executor").executeDependenciesQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;

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;
 /**
@@ -287,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
@@ -260,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/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