@eagleoutice/flowr 2.2.14 → 2.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/queries/catalog/control-flow-query/control-flow-query-executor.d.ts

@@ -0,0 +1,3 @@
+import type { ControlFlowQuery, ControlFlowQueryResult } from './control-flow-query-format';
+import type { BasicQueryData } from '../../base-query-format';
+export declare function executeControlFlowQuery({ dataflow: { graph }, ast }: BasicQueryData, queries: readonly ControlFlowQuery[]): ControlFlowQueryResult;

package/queries/catalog/control-flow-query/control-flow-query-executor.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeControlFlowQuery = executeControlFlowQuery;
+const log_1 = require("../../../util/log");
+const extract_cfg_1 = require("../../../control-flow/extract-cfg");
+function executeControlFlowQuery({ dataflow: { graph }, ast }, queries) {
+    if (queries.length !== 1) {
+        log_1.log.warn('The control flow query expects only up to one query, but got', queries.length);
+    }
+    const query = queries[0];
+    const start = Date.now();
+    const controlFlow = (0, extract_cfg_1.extractCfg)(ast, graph, query.config?.simplificationPasses);
+    return {
+        '.meta': {
+            timing: Date.now() - start
+        },
+        controlFlow
+    };
+}
+//# sourceMappingURL=control-flow-query-executor.js.map

package/queries/catalog/control-flow-query/control-flow-query-format.d.ts

@@ -0,0 +1,81 @@
+import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
+import Joi from 'joi';
+import { executeControlFlowQuery } from './control-flow-query-executor';
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { ControlFlowInformation } from '../../../control-flow/control-flow-graph';
+import type { CfgSimplificationPassName } from '../../../control-flow/cfg-simplification';
+/**
+ * Provides the control flow graph with an optional, fixed configuration
+ */
+export interface ControlFlowQuery extends BaseQueryFormat {
+    readonly type: 'control-flow';
+    readonly config?: {
+        /**
+         * If set, the control flow graph will be simplified using the given passes.
+         * Defaults to the default simplification order.
+         */
+        simplificationPasses?: readonly CfgSimplificationPassName[];
+    };
+}
+export interface ControlFlowQueryResult extends BaseQueryResult {
+    readonly controlFlow: ControlFlowInformation;
+}
+export declare const ControlFlowQueryDefinition: {
+    readonly executor: typeof executeControlFlowQuery;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, processed: import("../../../core/steps/pipeline/pipeline").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[];
+};

package/queries/catalog/control-flow-query/control-flow-query-format.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ControlFlowQueryDefinition = void 0;
+const ansi_1 = require("../../../util/text/ansi");
+const joi_1 = __importDefault(require("joi"));
+const control_flow_query_executor_1 = require("./control-flow-query-executor");
+const control_flow_graph_1 = require("../../../control-flow/control-flow-graph");
+const cfg_1 = require("../../../util/mermaid/cfg");
+const cfg_simplification_1 = require("../../../control-flow/cfg-simplification");
+exports.ControlFlowQueryDefinition = {
+    executor: control_flow_query_executor_1.executeControlFlowQuery,
+    asciiSummarizer: (formatter, processed, queryResults, result) => {
+        const out = queryResults;
+        result.push(`Query: ${(0, ansi_1.bold)('control-flow', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
+        result.push(`   ╰ CFG: ${(0, cfg_1.cfgToMermaidUrl)(out.controlFlow, processed.normalize)}`);
+        return true;
+    },
+    schema: joi_1.default.object({
+        type: joi_1.default.string().valid('control-flow').required().description('The type of the query.'),
+        config: joi_1.default.object({
+            simplificationPasses: joi_1.default.array().items(joi_1.default.string().valid(...Object.keys(cfg_simplification_1.CfgSimplificationPasses))).description('The simplification passes to apply to the control flow graph. If unset, the default simplification order will be used.')
+        }).optional().description('Optional configuration for the control flow query.')
+    }).description('The control flow query provides the control flow graph of the analysis, optionally simplified.'),
+    flattenInvolvedNodes: (queryResults) => {
+        const out = queryResults;
+        return [...out.controlFlow.graph.vertices(true)]
+            .filter(([, v]) => v.type !== control_flow_graph_1.CfgVertexType.Block)
+            .map(v => v[0]);
+    }
+};
+//# sourceMappingURL=control-flow-query-format.js.map

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

@@ -11,13 +11,16 @@ const r_function_call_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-
 const visitor_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const assert_1 = require("../../../util/assert");
 const objects_1 = require("../../../util/objects");
-const resolve_by_name_1 = require("../../../dataflow/environments/resolve-by-name");
 const library_functions_1 = require("./function-info/library-functions");
 const source_functions_1 = require("./function-info/source-functions");
 const read_functions_1 = require("./function-info/read-functions");
 const write_functions_1 = require("./function-info/write-functions");
 const function_info_1 = require("./function-info/function-info");
 const identify_link_to_last_call_relation_1 = require("../call-context-query/identify-link-to-last-call-relation");
+const r_value_1 = require("../../../dataflow/eval/values/r-value");
+const general_1 = require("../../../dataflow/eval/values/general");
+const alias_tracking_1 = require("../../../dataflow/eval/resolve/alias-tracking");
+const string_constants_1 = require("../../../dataflow/eval/values/string/string-constants");
 function collectNamespaceAccesses(data, libraries) {
     /* for libraries, we have to additionally track all uses of `::` and `:::`, for this we currently simply traverse all uses */
     (0, visitor_1.visitAst)(data.ast.ast, n => {
@@ -203,31 +206,32 @@ function resolveBasedOnConfig(data, vertex, argument, environment, idMap, resolv
             full = false;
         }
     }
-    return (0, resolve_by_name_1.resolveIdToValue)(argument, { environment, graph: data.dataflow.graph, full });
-}
-function unwrapRValue(value) {
-    if (value === undefined) {
-        return undefined;
-    }
-    switch (typeof value) {
-        case 'string':
-            return value;
-        case 'number':
-            return value.toString();
-        case 'boolean':
-            return value ? 'TRUE' : 'FALSE';
-    }
-    if (typeof value !== 'object' || value === null) {
-        return JSON.stringify(value);
-    }
-    if ('str' in value) {
-        return value.str;
-    }
-    else if ('num' in value) {
-        return value.num.toString();
-    }
-    else {
-        return JSON.stringify(value);
+    full = true;
+    const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(argument, { environment, graph: data.dataflow.graph, full: full }));
+    if (resolved) {
+        const values = [];
+        for (const value of resolved.elements) {
+            if (!(0, r_value_1.isValue)(value)) {
+                return undefined;
+            }
+            if (value.type === 'string' && (0, r_value_1.isValue)(value.value)) {
+                values.push(value.value.str);
+            }
+            else if (value.type === 'logical' && (0, r_value_1.isValue)(value.value)) {
+                values.push(value.value.valueOf() ? 'TRUE' : 'FALSE');
+            }
+            else if (value.type === 'vector' && (0, r_value_1.isValue)(value.elements)) {
+                const elements = (0, string_constants_1.collectStrings)(value.elements);
+                if (elements === undefined) {
+                    return undefined;
+                }
+                values.push(...elements);
+            }
+            else {
+                return undefined;
+            }
+        }
+        return values;
     }
 }
 /**
@@ -254,16 +258,14 @@ function getArgumentValue(data, vertex, argumentIndex, argumentName, resolveValu
                 valueNode = valueNode.value;
             }
             if (valueNode) {
-                // TDODO: extend vector support etc.
                 // this should be evaluated in the callee-context
-                const values = resolveBasedOnConfig(data, vertex, valueNode, vertex.environment, graph.idMap, resolveValue)
-                    ?.map(unwrapRValue) ?? [dependencies_query_format_1.Unknown];
+                const values = resolveBasedOnConfig(data, vertex, valueNode, vertex.environment, graph.idMap, resolveValue) ?? [dependencies_query_format_1.Unknown];
                 map.set(ref, new Set(values));
             }
         }
         return map;
     }
-    if (vertex.args.length > argumentIndex) {
+    if (argumentIndex < vertex.args.length) {
         const arg = (0, graph_1.getReferenceOfArgument)(vertex.args[argumentIndex]);
         if (!arg) {
             return undefined;
@@ -273,8 +275,7 @@ function getArgumentValue(data, vertex, argumentIndex, argumentName, resolveValu
             valueNode = valueNode.value;
         }
         if (valueNode) {
-            const values = resolveBasedOnConfig(data, vertex, valueNode, vertex.environment, graph.idMap, resolveValue)
-                ?.map(unwrapRValue) ?? [dependencies_query_format_1.Unknown];
+            const values = resolveBasedOnConfig(data, vertex, valueNode, vertex.environment, graph.idMap, resolveValue) ?? [dependencies_query_format_1.Unknown];
             return new Map([[arg, new Set(values)]]);
         }
     }

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

@@ -10,6 +10,7 @@ const linter_rules_1 = require("../../../linter/linter-rules");
 const linter_format_1 = require("../../../linter/linter-format");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
+const doc_code_1 = require("../../../documentation/doc-util/doc-code");
 exports.LinterQueryDefinition = {
     executor: linter_query_executor_1.executeLinterQuery,
     asciiSummarizer: (formatter, _processed, queryResults, result) => {
@@ -27,7 +28,7 @@ exports.LinterQueryDefinition = {
                     }
                 }
             }
-            result.push(`       ╰ Metadata: ${JSON.stringify(results['.meta'])}`);
+            result.push(`       ╰ _Metadata_: ${(0, doc_code_1.codeInline)(JSON.stringify(results['.meta']))}`);
         }
         return true;
     },

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: {

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,7 +17,7 @@ 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;
     },

package/queries/query.d.ts

@@ -23,7 +23,8 @@ import type { ProjectQuery } from './catalog/project-query/project-query-format'
 import type { OriginQuery } from './catalog/origin-query/origin-query-format';
 import type { LinterQuery } from './catalog/linter-query/linter-query-format';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
-export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | DataflowLensQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | LineageQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | ResolveValueQuery | ProjectQuery | OriginQuery | LinterQuery;
+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;
 };
@@ -54,6 +55,65 @@ export declare const SupportedQueries: {
         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;
         readonly asciiSummarizer: (formatter: OutputFormatter, _processed: PipelineOutput<import("../core/steps/pipeline/pipeline").Pipeline<{

package/queries/query.js

@@ -30,9 +30,11 @@ const dataflow_lens_query_format_1 = require("./catalog/dataflow-lens-query/data
 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,

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/search/search-executor/search-enrichers.js

@@ -4,11 +4,11 @@ exports.Enrichments = exports.Enrichment = void 0;
 exports.enrichmentContent = enrichmentContent;
 exports.enrich = enrich;
 const vertex_1 = require("../../dataflow/graph/vertex");
-const log_1 = require("../../util/log");
 const identify_link_to_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 const assert_1 = require("../../util/assert");
 const extract_cfg_1 = require("../../control-flow/extract-cfg");
 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");
 /**
  * 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.
@@ -31,7 +31,7 @@ exports.Enrichments = {
             if (callVertex?.tag === vertex_1.VertexType.FunctionCall) {
                 const origins = (0, dfg_get_origin_1.getOriginInDfg)(data.dataflow.graph, callVertex.id);
                 if (!origins || origins.length === 0) {
-                    log_1.log.warn(`No origin found for call vertex ${callVertex.id}, cannot resolve call targets.`);
+                    content.targets = [(0, node_id_1.recoverName)(callVertex.id, data.normalize.idMap)];
                     return content;
                 }
                 // find call targets in user code (which have ids!)
@@ -47,6 +47,9 @@ exports.Enrichments = {
                             return undefined;
                     }
                 }).filter(assert_1.isNotUndefined));
+                if (content.targets.length === 0) {
+                    content.targets = [(0, node_id_1.recoverName)(callVertex.id, data.normalize.idMap)];
+                }
             }
             return content;
         },

package/slicing/criterion/parse.d.ts

@@ -11,8 +11,16 @@ export declare class CriteriaParseError extends Error {
 }
 /**
  * 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
  */
 export declare function slicingCriterionToId(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 slicingCriterionToId} for the version that throws an error
+ */
+export declare function tryResolveSliceCriterionToId(criterion: string | NodeId, idMap: AstIdMap): NodeId | undefined;
 export interface DecodedCriterion {
     criterion: SingleSlicingCriterion;
     id: NodeId;

package/slicing/criterion/parse.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CriteriaParseError = void 0;
 exports.slicingCriterionToId = slicingCriterionToId;
+exports.tryResolveSliceCriterionToId = tryResolveSliceCriterionToId;
 exports.convertAllSlicingCriteriaToIds = convertAllSlicingCriteriaToIds;
 const log_1 = require("../../util/log");
 const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
@@ -19,6 +20,8 @@ class CriteriaParseError extends Error {
 exports.CriteriaParseError = CriteriaParseError;
 /**
  * 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
  */
 function slicingCriterionToId(criterion, idMap) {
     let resolved;
@@ -38,6 +41,23 @@ function slicingCriterionToId(criterion, idMap) {
     }
     return resolved;
 }
+/**
+ * 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
+ */
+function tryResolveSliceCriterionToId(criterion, idMap) {
+    try {
+        return slicingCriterionToId(criterion, idMap);
+    }
+    catch (e) {
+        if (e instanceof CriteriaParseError) {
+            (0, log_1.expensiveTrace)(static_slicer_1.slicerLogger, () => `could not resolve slicing criterion ${criterion}: ${e.message}`);
+            return undefined;
+        }
+        throw e; // rethrow other errors
+    }
+}
 function locationToId(location, dataflowIdMap) {
     let candidate;
     for (const [id, nodeInfo] of dataflowIdMap.entries()) {

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = flowrVersion;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.2.14';
+const version = '2.2.15';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }