@eagleoutice/flowr 2.2.13 → 2.2.15

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

@@ -21,6 +21,7 @@ exports.ProjectQueryDefinition = {
     },
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('project').required().description('The type of the query.'),
-    }).description('The project query provides information on the analyzed project.')
+    }).description('The project query provides information on the analyzed project.'),
+    flattenInvolvedNodes: () => []
 };
 //# sourceMappingURL=project-query-format.js.map

package/queries/catalog/resolve-value-query/resolve-value-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 resolve_by_name_1 = require("../../../dataflow/environments/resolve-by-name");
+const alias_tracking_1 = require("../../../dataflow/eval/resolve/alias-tracking");
 function fingerPrintOfQuery(query) {
     return JSON.stringify(query);
 }
@@ -18,9 +18,9 @@ function executeResolveValueQuery({ dataflow: { graph }, ast }, queries) {
         }
         const values = query.criteria
             .map(criteria => (0, parse_1.slicingCriterionToId)(criteria, ast.idMap))
-            .flatMap(ident => (0, resolve_by_name_1.resolveIdToValue)(ident, { graph, full: true, idMap: ast.idMap }) ?? []);
+            .flatMap(ident => (0, alias_tracking_1.resolveIdToValue)(ident, { graph, full: true, idMap: ast.idMap }));
         results[key] = {
-            values: values ? [...new Set(values)] : []
+            values: values
         };
     }
     return {

package/queries/catalog/resolve-value-query/resolve-value-query-format.d.ts

@@ -2,6 +2,7 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import type { SlicingCriteria } from '../../../slicing/criterion/parse';
 import Joi from 'joi';
 import { executeResolveValueQuery } from './resolve-value-query-executor';
+import type { ResolveResult } from '../../../dataflow/eval/resolve/alias-tracking';
 export interface ResolveValueQuery extends BaseQueryFormat {
     readonly type: 'resolve-value';
     /** The slicing criteria to use */
@@ -9,7 +10,7 @@ export interface ResolveValueQuery extends BaseQueryFormat {
 }
 export interface ResolveValueQueryResult extends BaseQueryResult {
     results: Record<string, {
-        values: unknown[];
+        values: ResolveResult[];
     }>;
 }
 export declare const ResolveValueQueryDefinition: {
@@ -69,4 +70,5 @@ export declare const ResolveValueQueryDefinition: {
         readonly dependencies: readonly ["normalize"];
     }>>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
+    readonly flattenInvolvedNodes: () => never[];
 };

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

@@ -8,27 +8,7 @@ const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
 const joi_1 = __importDefault(require("joi"));
 const resolve_value_query_executor_1 = require("./resolve-value-query-executor");
-function rValueToAscii(value) {
-    if (value === null || value === undefined) {
-        return 'undefined';
-    }
-    else if (typeof value === 'string') {
-        return value;
-    }
-    else if (typeof value === 'object') {
-        if ('num' in value) {
-            return value.num.toString();
-        }
-        else if ('str' in value) {
-            return `${value.quotes}${value.str}${value.quotes}`;
-        }
-        else {
-            console.warn('omega lul');
-            return JSON.stringify(value);
-        }
-    }
-    return value;
-}
+const r_value_1 = require("../../../dataflow/eval/values/r-value");
 exports.ResolveValueQueryDefinition = {
     executor: resolve_value_query_executor_1.executeResolveValueQuery,
     asciiSummarizer: (formatter, _processed, queryResults, result) => {
@@ -37,13 +17,14 @@ exports.ResolveValueQueryDefinition = {
         for (const [fingerprint, obj] of Object.entries(out.results)) {
             const { criteria } = JSON.parse(fingerprint);
             result.push(`   ╰ Values for {${criteria.join(', ')}}`);
-            result.push(`   	╰ ${obj.values.map(v => rValueToAscii(v)).join(', ')}`);
+            result.push(`   	╰ ${obj.values.map(v => (0, r_value_1.stringifyValue)(v)).join(', ')}`);
         }
         return true;
     },
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('resolve-value').required().description('The type of the query.'),
         criteria: joi_1.default.array().items(joi_1.default.string()).min(1).required().description('The slicing criteria to use.'),
-    }).description('The resolve value query used to get definitions of an identifier')
+    }).description('The resolve value query used to get definitions of an identifier'),
+    flattenInvolvedNodes: () => []
 };
 //# sourceMappingURL=resolve-value-query-format.js.map

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

@@ -70,4 +70,5 @@ export declare const SearchQueryDefinition: {
         readonly dependencies: readonly ["normalize"];
     }>>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
+    readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

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

@@ -24,6 +24,10 @@ exports.SearchQueryDefinition = {
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('search').required().description('The type of the query.'),
         search: joi_1.default.object().required().description('The search query to execute.')
-    }).description('The search query searches the normalized AST and dataflow graph for nodes that match the given search query.')
+    }).description('The search query searches the normalized AST and dataflow graph for nodes that match the given search query.'),
+    flattenInvolvedNodes: (queryResults) => {
+        const out = queryResults;
+        return out.results.flatMap(({ ids }) => ids);
+    }
 };
 //# sourceMappingURL=search-query-format.js.map

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

@@ -4,6 +4,7 @@ import type { DEFAULT_DATAFLOW_PIPELINE, DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPEL
 import type { SlicingCriteria } from '../../../slicing/criterion/parse';
 import Joi from 'joi';
 import { executeStaticSliceQuery } from './static-slice-query-executor';
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 /** Calculates and returns all clusters encountered in the dataflow graph. */
 export interface StaticSliceQuery extends BaseQueryFormat {
     readonly type: 'static-slice';
@@ -81,4 +82,5 @@ export declare const StaticSliceQueryDefinition: {
         readonly dependencies: readonly ["normalize"];
     }>>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
+    readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

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

@@ -38,6 +38,14 @@ 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?')
-    }).description('Slice query used to slice the dataflow graph')
+    }).description('Slice query used to slice the dataflow graph'),
+    flattenInvolvedNodes: (queryResults) => {
+        const flattened = [];
+        const out = queryResults;
+        for (const [_, obj] of Object.entries(out.results)) {
+            flattened.push(...obj.slice.result);
+        }
+        return flattened;
+    }
 };
 //# sourceMappingURL=static-slice-query-format.js.map

package/queries/query.d.ts

@@ -21,7 +21,10 @@ import type { ResolveValueQuery } from './catalog/resolve-value-query/resolve-va
 import type { DataflowLensQuery } from './catalog/dataflow-lens-query/dataflow-lens-query-format';
 import type { ProjectQuery } from './catalog/project-query/project-query-format';
 import type { OriginQuery } from './catalog/origin-query/origin-query-format';
-export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | DataflowLensQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | LineageQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | ResolveValueQuery | ProjectQuery | OriginQuery;
+import type { LinterQuery } from './catalog/linter-query/linter-query-format';
+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';
+export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | ControlFlowQuery | DataflowLensQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | LineageQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | ResolveValueQuery | ProjectQuery | OriginQuery | LinterQuery;
 export type QueryArgumentsWithType<QueryType extends BaseQueryFormat['type']> = Query & {
     type: QueryType;
 };
@@ -33,17 +36,83 @@ export interface SupportedQuery<QueryType extends BaseQueryFormat['type']> {
     executor: QueryExecutor<QueryArgumentsWithType<QueryType>, BaseQueryResult>;
     asciiSummarizer: (formatter: OutputFormatter, processed: PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>, queryResults: BaseQueryResult, resultStrings: string[]) => boolean;
     schema: Joi.ObjectSchema;
+    /**
+     * Flattens the involved query nodes to be added to a flowR search when the {@link fromQuery} function is used based on the given result after this query is executed.
+     * If this query does not involve any nodes, an empty array can be returned.
+     */
+    flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 }
 export declare const SupportedQueries: {
     readonly 'call-context': {
         readonly executor: typeof import("./catalog/call-context-query/call-context-query-executor").executeCallContextQueries;
         readonly asciiSummarizer: (formatter: OutputFormatter, processed: PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>, queryResults: BaseQueryResult, result: string[]) => boolean;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly config: {
         readonly executor: typeof import("./catalog/config-query/config-query-executor").executeConfigQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _processed: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
+    };
+    readonly 'control-flow': {
+        readonly executor: typeof import("./catalog/control-flow-query/control-flow-query-executor").executeControlFlowQuery;
+        readonly asciiSummarizer: (formatter: OutputFormatter, processed: PipelineOutput<import("../core/steps/pipeline/pipeline").Pipeline<{
+            readonly name: "parse";
+            readonly humanReadableName: "parse with R shell";
+            readonly description: "Parse the given R code into an AST";
+            readonly processor: (_results: unknown, input: Partial<import("../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../r-bridge/parser").ParseStepOutput<string>>;
+            readonly executed: import("../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+            readonly printer: {
+                readonly 0: typeof import("../core/print/print").internalPrinter;
+                readonly 2: {
+                    (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
+                    (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
+                };
+                readonly 5: ({ parsed }: import("../r-bridge/parser").ParseStepOutput<string>, config: import("../util/quads").QuadSerializationConfiguration) => string;
+            };
+            readonly dependencies: readonly [];
+            readonly requiredInput: import("../r-bridge/parser").ParseRequiredInput<string>;
+        } | {
+            readonly name: "normalize";
+            readonly humanReadableName: "normalize";
+            readonly description: "Normalize the AST to flowR's AST";
+            readonly processor: (results: {
+                parse?: import("../r-bridge/parser").ParseStepOutput<string>;
+            }, input: Partial<import("../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../r-bridge/lang-4.x/ast/model/model").RNode<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
+            readonly executed: import("../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+            readonly printer: {
+                readonly 0: typeof import("../core/print/print").internalPrinter;
+                readonly 2: typeof import("../core/print/normalize-printer").normalizedAstToJson;
+                readonly 5: typeof import("../core/print/normalize-printer").normalizedAstToQuads;
+                readonly 3: typeof import("../core/print/normalize-printer").printNormalizedAstToMermaid;
+                readonly 4: typeof import("../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
+            };
+            readonly dependencies: readonly ["parse"];
+            readonly requiredInput: import("../core/steps/all/core/10-normalize").NormalizeRequiredInput;
+        } | {
+            readonly humanReadableName: "dataflow";
+            readonly processor: (results: {
+                normalize?: import("../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+            }, input: {
+                request?: import("../r-bridge/retriever").RParseRequests;
+                parser?: import("../r-bridge/parser").Parser<import("../r-bridge/parser").KnownParserType>;
+            }) => import("../dataflow/info").DataflowInformation;
+            readonly requiredInput: {};
+            readonly name: "dataflow";
+            readonly description: "Construct the dataflow graph";
+            readonly executed: import("../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+            readonly printer: {
+                readonly 0: typeof import("../core/print/print").internalPrinter;
+                readonly 2: typeof import("../core/print/dataflow-printer").dataflowGraphToJson;
+                readonly 5: typeof import("../core/print/dataflow-printer").dataflowGraphToQuads;
+                readonly 3: typeof import("../core/print/dataflow-printer").dataflowGraphToMermaid;
+                readonly 4: typeof import("../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
+            };
+            readonly dependencies: readonly ["normalize"];
+        }>>, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly dataflow: {
         readonly executor: typeof import("./catalog/dataflow-query/dataflow-query-executor").executeDataflowQuery;
@@ -102,6 +171,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'dataflow-lens': {
         readonly executor: typeof import("./catalog/dataflow-lens-query/dataflow-lens-query-executor").executeDataflowLensQuery;
@@ -160,6 +230,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'id-map': {
         readonly executor: typeof import("./catalog/id-map-query/id-map-query-executor").executeIdMapQuery;
@@ -218,6 +289,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'normalized-ast': {
         readonly executor: typeof import("./catalog/normalized-ast-query/normalized-ast-query-executor").executeNormalizedAstQuery;
@@ -276,6 +348,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'dataflow-cluster': {
         readonly executor: typeof import("./catalog/cluster-query/cluster-query-executor").executeDataflowClusterQuery;
@@ -334,6 +407,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'static-slice': {
         readonly executor: typeof import("./catalog/static-slice-query/static-slice-query-executor").executeStaticSliceQuery;
@@ -392,6 +466,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly lineage: {
         readonly executor: typeof import("./catalog/lineage-query/lineage-query-executor").executeLineageQuery;
@@ -450,6 +525,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly dependencies: {
         readonly executor: typeof import("./catalog/dependencies-query/dependencies-query-executor").executeDependenciesQuery;
@@ -508,11 +584,13 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'location-map': {
         readonly executor: typeof import("./catalog/location-map-query/location-map-query-executor").executeLocationMapQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _processed: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly search: {
         readonly executor: typeof import("./catalog/search-query/search-query-executor").executeSearch;
@@ -571,6 +649,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'happens-before': {
         readonly executor: typeof import("./catalog/happens-before-query/happens-before-query-executor").executeHappensBefore;
@@ -629,6 +708,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'resolve-value': {
         readonly executor: typeof import("./catalog/resolve-value-query/resolve-value-query-executor").executeResolveValueQuery;
@@ -687,6 +767,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly project: {
         readonly executor: typeof import("./catalog/project-query/project-query-executor").executeProjectQuery;
@@ -745,6 +826,7 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
     readonly origin: {
         readonly executor: typeof import("./catalog/origin-query/origin-query-executor").executeResolveValueQuery;
@@ -803,6 +885,66 @@ export declare const SupportedQueries: {
             readonly dependencies: readonly ["normalize"];
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         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, _processed: PipelineOutput<import("../core/steps/pipeline/pipeline").Pipeline<{
+            readonly name: "parse";
+            readonly humanReadableName: "parse with R shell";
+            readonly description: "Parse the given R code into an AST";
+            readonly processor: (_results: unknown, input: Partial<import("../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../r-bridge/parser").ParseStepOutput<string>>;
+            readonly executed: import("../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+            readonly printer: {
+                readonly 0: typeof import("../core/print/print").internalPrinter;
+                readonly 2: {
+                    (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
+                    (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
+                };
+                readonly 5: ({ parsed }: import("../r-bridge/parser").ParseStepOutput<string>, config: import("../util/quads").QuadSerializationConfiguration) => string;
+            };
+            readonly dependencies: readonly [];
+            readonly requiredInput: import("../r-bridge/parser").ParseRequiredInput<string>;
+        } | {
+            readonly name: "normalize";
+            readonly humanReadableName: "normalize";
+            readonly description: "Normalize the AST to flowR's AST";
+            readonly processor: (results: {
+                parse?: import("../r-bridge/parser").ParseStepOutput<string>;
+            }, input: Partial<import("../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../r-bridge/lang-4.x/ast/model/model").RNode<import("../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
+            readonly executed: import("../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+            readonly printer: {
+                readonly 0: typeof import("../core/print/print").internalPrinter;
+                readonly 2: typeof import("../core/print/normalize-printer").normalizedAstToJson;
+                readonly 5: typeof import("../core/print/normalize-printer").normalizedAstToQuads;
+                readonly 3: typeof import("../core/print/normalize-printer").printNormalizedAstToMermaid;
+                readonly 4: typeof import("../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
+            };
+            readonly dependencies: readonly ["parse"];
+            readonly requiredInput: import("../core/steps/all/core/10-normalize").NormalizeRequiredInput;
+        } | {
+            readonly humanReadableName: "dataflow";
+            readonly processor: (results: {
+                normalize?: import("../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+            }, input: {
+                request?: import("../r-bridge/retriever").RParseRequests;
+                parser?: import("../r-bridge/parser").Parser<import("../r-bridge/parser").KnownParserType>;
+            }) => import("../dataflow/info").DataflowInformation;
+            readonly requiredInput: {};
+            readonly name: "dataflow";
+            readonly description: "Construct the dataflow graph";
+            readonly executed: import("../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+            readonly printer: {
+                readonly 0: typeof import("../core/print/print").internalPrinter;
+                readonly 2: typeof import("../core/print/dataflow-printer").dataflowGraphToJson;
+                readonly 5: typeof import("../core/print/dataflow-printer").dataflowGraphToQuads;
+                readonly 3: typeof import("../core/print/dataflow-printer").dataflowGraphToMermaid;
+                readonly 4: typeof import("../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
+            };
+            readonly dependencies: readonly ["normalize"];
+        }>>, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: () => never[];
     };
 };
 export type SupportedQueryTypes = keyof typeof SupportedQueries;

package/queries/query.js

@@ -29,9 +29,12 @@ const resolve_value_query_format_1 = require("./catalog/resolve-value-query/reso
 const dataflow_lens_query_format_1 = require("./catalog/dataflow-lens-query/dataflow-lens-query-format");
 const project_query_format_1 = require("./catalog/project-query/project-query-format");
 const origin_query_format_1 = require("./catalog/origin-query/origin-query-format");
+const linter_query_format_1 = require("./catalog/linter-query/linter-query-format");
+const control_flow_query_format_1 = require("./catalog/control-flow-query/control-flow-query-format");
 exports.SupportedQueries = {
     'call-context': call_context_query_format_1.CallContextQueryDefinition,
     'config': config_query_format_1.ConfigQueryDefinition,
+    'control-flow': control_flow_query_format_1.ControlFlowQueryDefinition,
     'dataflow': dataflow_query_format_1.DataflowQueryDefinition,
     'dataflow-lens': dataflow_lens_query_format_1.DataflowLensQueryDefinition,
     'id-map': id_map_query_format_1.IdMapQueryDefinition,
@@ -46,6 +49,7 @@ exports.SupportedQueries = {
     'resolve-value': resolve_value_query_format_1.ResolveValueQueryDefinition,
     'project': project_query_format_1.ProjectQueryDefinition,
     'origin': origin_query_format_1.OriginQueryDefinition,
+    'linter': linter_query_format_1.LinterQueryDefinition
 };
 function executeQueriesOfSameType(data, ...queries) {
     (0, assert_1.guard)(queries.length > 0, 'At least one query must be provided');

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

@@ -293,13 +293,20 @@ function convertTreeNode(node) {
                     ...defaultInfo
                 };
             }
-            const args = (0, arrays_1.splitArrayOn)(nonErrorChildren(argsParentheses).slice(1, -1), x => x.type === 'comma');
+            const rawArgs = nonErrorChildren(argsParentheses);
+            const [comments, noCommentrawArgs] = splitComments(rawArgs);
+            const args = (0, arrays_1.splitArrayOn)(noCommentrawArgs.slice(1, -1), x => x.type === 'comma');
             const funcRange = makeSourceRange(func);
+            const mappedArgs = args.map(n => n.length == 0 ? r_function_call_1.EmptyArgument : convertTreeNode(n[0]));
             const call = {
-                arguments: args.map(n => n.length == 0 ? r_function_call_1.EmptyArgument : convertTreeNode(n[0])),
+                arguments: mappedArgs,
                 location: funcRange,
                 lexeme: func.text,
-                ...defaultInfo
+                ...defaultInfo,
+                info: {
+                    ...defaultInfo.info,
+                    additionalTokens: comments.map(c => c[1]),
+                }
             };
             if (func.type === tree_sitter_types_1.TreeSitterType.Identifier || func.type === tree_sitter_types_1.TreeSitterType.String || func.type === tree_sitter_types_1.TreeSitterType.NamespaceOperator || func.type === tree_sitter_types_1.TreeSitterType.Return) {
                 let funcNode = convertTreeNode(func);
@@ -491,7 +498,7 @@ function convertTreeNode(node) {
                 const nameRange = makeSourceRange(nameNode);
                 return {
                     type: type_1.RType.Argument,
-                    name: name,
+                    name,
                     value: valueNode ? convertTreeNode(valueNode) : undefined,
                     location: nameRange,
                     lexeme: nameNode.text,

package/r-bridge/retriever.js

@@ -72,7 +72,7 @@ function requestProviderFromText(text) {
             if (ignoreCase) {
                 return Object.keys(text).find(p => p.toLowerCase() === path.toLowerCase());
             }
-            return text[path] ? path : undefined;
+            return text[path] !== undefined ? path : undefined;
         },
         createRequest(path) {
             return {

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

@@ -1,10 +1,14 @@
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
-import type { FlowrSearchElement, FlowrSearchElements, FlowrSearchGetFilter } from './flowr-search';
+import type { FlowrSearchElement, FlowrSearchElementFromQuery, FlowrSearchElements, FlowrSearchGetFilter } from './flowr-search';
 import type { FlowrFilterExpression } from './flowr-search-filters';
 import type { FlowrSearchGeneratorNode, GeneratorNames } from './search-executor/search-generators';
 import type { FlowrSearchTransformerNode, GetOutputOfTransformer, TransformerNames } from './search-executor/search-transformer';
 import type { SlicingCriteria } from '../slicing/criterion/parse';
 import type { ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { Enrichment, EnrichmentArguments } from './search-executor/search-enrichers';
+import type { MapperArguments } from './search-executor/search-mappers';
+import { Mapper } from './search-executor/search-mappers';
+import type { Query } from '../queries/query';
 type FlowrCriteriaReturn<C extends SlicingCriteria> = FlowrSearchElements<ParentInformation, C extends [] ? never : C extends [infer _] ? [
     FlowrSearchElement<ParentInformation>
 ] : FlowrSearchElement<ParentInformation>[]>;
@@ -19,6 +23,12 @@ export declare const FlowrSearchGenerator: {
      * see {@link FlowrSearchGenerator.criterion} for a serializable alternative (passing the ids with `$id`).
      */
     readonly from: (from: FlowrSearchElement<ParentInformation> | FlowrSearchElement<ParentInformation>[]) => FlowrSearchBuilder<"from">;
+    /**
+     * Initializes a new search query based on the results of the given JSON query or queries.
+     * Internally, the {@link SupportedQuery#flattenInvolvedNodes} function is used to flatten the resulting nodes of the query.
+     * Please note that, due to the fact that not every query involves dataflow nodes, the search may not contain any elements at all for certain queries.
+     */
+    readonly fromQuery: (...from: readonly Query[]) => FlowrSearchBuilder<"from-query", [], ParentInformation, FlowrSearchElements<ParentInformation, FlowrSearchElementFromQuery<ParentInformation>[]>>;
     /**
      * Returns all elements (nodes/dataflow vertices) from the given data.
      */
@@ -71,6 +81,12 @@ export declare const Q: {
      * see {@link FlowrSearchGenerator.criterion} for a serializable alternative (passing the ids with `$id`).
      */
     readonly from: (from: FlowrSearchElement<ParentInformation> | FlowrSearchElement<ParentInformation>[]) => FlowrSearchBuilder<"from">;
+    /**
+     * Initializes a new search query based on the results of the given JSON query or queries.
+     * Internally, the {@link SupportedQuery#flattenInvolvedNodes} function is used to flatten the resulting nodes of the query.
+     * Please note that, due to the fact that not every query involves dataflow nodes, the search may not contain any elements at all for certain queries.
+     */
+    readonly fromQuery: (...from: readonly Query[]) => FlowrSearchBuilder<"from-query", [], ParentInformation, FlowrSearchElements<ParentInformation, FlowrSearchElementFromQuery<ParentInformation>[]>>;
     /**
      * Returns all elements (nodes/dataflow vertices) from the given data.
      */
@@ -168,6 +184,19 @@ export declare class FlowrSearchBuilder<Generator extends GeneratorNames, Transf
      * select returns only the elements at the given indices.
      */
     select<Select extends number[]>(...select: Select): FlowrSearchBuilderOut<Generator, Transformers, Info, 'select'>;
+    /**
+     * Adds the given enrichment to each element of the search.
+     * Added enrichments can later be retrieved using the {@link enrichmentContent} function.
+     */
+    with<ConcreteEnrichment extends Enrichment>(enrichment: ConcreteEnrichment, args?: EnrichmentArguments<ConcreteEnrichment>): FlowrSearchBuilderOut<Generator, Transformers, Info, 'with'>;
+    /**
+     * Maps the elements of the search to new values using the given mapper function.
+     */
+    map<MapperType extends Mapper>(mapper: MapperType, args: MapperArguments<MapperType>): FlowrSearchBuilderOut<Generator, Transformers, Info, 'map'>;
+    /**
+     * A convenience function that combines {@link with} and the {@link Mapper.Enrichment} mapper to immediately add an enrichment and then map to its value(s).
+     */
+    get<ConcreteEnrichment extends Enrichment>(enrichment: ConcreteEnrichment, args?: EnrichmentArguments<ConcreteEnrichment>): FlowrSearchBuilderOut<Generator, Transformers, Info, 'with' | 'map'>;
     /**
      * merge combines the search results with those of another search.
      */
@@ -183,7 +212,7 @@ export declare class FlowrSearchBuilder<Generator extends GeneratorNames, Transf
  * This type summarizes all types that can be used in places in which the API expects you to provide a search query.
  * @see {@link FlowrSearch}
  */
-export type FlowrSearchLike = FlowrSearch | FlowrSearchBuilderType;
+export type FlowrSearchLike<Info = ParentInformation, Generator extends GeneratorNames = GeneratorNames, Transformers extends TransformerNames[] = TransformerNames[], ElementType = FlowrSearchElements<Info, FlowrSearchElement<Info>[]>> = FlowrSearch<Info, Generator, Transformers, ElementType> | FlowrSearchBuilderType<Generator, Transformers, Info, ElementType>;
 export type SearchOutput<Search> = Search extends FlowrSearch ? Search : Search extends FlowrSearchBuilderType<infer Generator, infer Transformers, infer Info, infer Elements> ? FlowrSearch<Info, Generator, Transformers, Elements> : never;
 /**
  * Freezes any accepted {@link FlowrSearchLike} into a {@link FlowrSearch}.

package/search/flowr-search-builder.js

@@ -4,6 +4,7 @@ exports.FlowrSearchBuilder = exports.Q = exports.FlowrSearchGenerator = void 0;
 exports.getFlowrSearch = getFlowrSearch;
 const search_optimizer_1 = require("./search-optimizer/search-optimizer");
 const assert_1 = require("../util/assert");
+const search_mappers_1 = require("./search-executor/search-mappers");
 /**
  * This object holds all the methods to generate search queries.
  * For compatibility, please use the {@link Q} identifier object to access these methods.
@@ -17,6 +18,14 @@ exports.FlowrSearchGenerator = {
     from(from) {
         return new FlowrSearchBuilder({ type: 'generator', name: 'from', args: { from } });
     },
+    /**
+     * Initializes a new search query based on the results of the given JSON query or queries.
+     * Internally, the {@link SupportedQuery#flattenInvolvedNodes} function is used to flatten the resulting nodes of the query.
+     * Please note that, due to the fact that not every query involves dataflow nodes, the search may not contain any elements at all for certain queries.
+     */
+    fromQuery(...from) {
+        return new FlowrSearchBuilder({ type: 'generator', name: 'from-query', args: { from } });
+    },
     /**
      * Returns all elements (nodes/dataflow vertices) from the given data.
      */
@@ -158,6 +167,27 @@ class FlowrSearchBuilder {
         this.search.push({ type: 'transformer', name: 'select', args: { select } });
         return this;
     }
+    /**
+     * Adds the given enrichment to each element of the search.
+     * Added enrichments can later be retrieved using the {@link enrichmentContent} function.
+     */
+    with(enrichment, args) {
+        this.search.push({ type: 'transformer', name: 'with', args: { info: enrichment, args: args } });
+        return this;
+    }
+    /**
+     * Maps the elements of the search to new values using the given mapper function.
+     */
+    map(mapper, args) {
+        this.search.push({ type: 'transformer', name: 'map', args: { mapper: mapper, args: args } });
+        return this;
+    }
+    /**
+     * A convenience function that combines {@link with} and the {@link Mapper.Enrichment} mapper to immediately add an enrichment and then map to its value(s).
+     */
+    get(enrichment, args) {
+        return this.with(enrichment, args).map(search_mappers_1.Mapper.Enrichment, enrichment);
+    }
     /**
      * merge combines the search results with those of another search.
      */

package/search/flowr-search.d.ts

@@ -3,6 +3,8 @@ import type { Pipeline, PipelineOutput, PipelineStepOutputWithName } from '../co
 import type { NormalizedAst } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { DataflowInformation } from '../dataflow/info';
+import type { BaseQueryResult } from '../queries/base-query-format';
+import type { Query } from '../queries/query';
 /**
  * Yes, for now we do technically not need a wrapper around the RNode, but this allows us to attach caches etc.
  * just for the respective search.
@@ -10,6 +12,10 @@ import type { DataflowInformation } from '../dataflow/info';
 export interface FlowrSearchElement<Info> {
     readonly node: RNode<Info>;
 }
+export interface FlowrSearchElementFromQuery<Info> extends FlowrSearchElement<Info> {
+    readonly query: Query['type'];
+    readonly queryResult: BaseQueryResult;
+}
 export interface FlowrSearchNodeBase<Type extends string, Name extends string, Args extends Record<string, unknown> | undefined> {
     readonly type: Type;
     readonly name: Name;
@@ -52,7 +58,7 @@ export declare class FlowrSearchElements<Info = NoInfo, Elements extends FlowrSe
     constructor(elements?: Elements);
     add(element: FlowrSearchElement<Info>): this;
     addAll(elements: FlowrSearchElement<Info>[]): this;
-    getElements(): readonly FlowrSearchElement<Info>[];
+    getElements(): Readonly<Elements>;
     mutate<OutElements extends Elements>(mutator: (elements: Elements) => OutElements): this;
 }
 export {};