@eagleoutice/flowr 2.2.1 → 2.2.2

package/documentation/print-query-wiki.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const shell_1 = require("../r-bridge/shell");
 const doc_dfg_1 = require("./doc-util/doc-dfg");
@@ -29,6 +32,8 @@ const config_query_executor_1 = require("../queries/catalog/config-query/config-
 const search_query_executor_1 = require("../queries/catalog/search-query/search-query-executor");
 const flowr_search_builder_1 = require("../search/flowr-search-builder");
 const vertex_1 = require("../dataflow/graph/vertex");
+const doc_types_1 = require("./doc-util/doc-types");
+const path_1 = __importDefault(require("path"));
 (0, doc_query_1.registerQueryDocumentation)('call-context', {
     name: 'Call-Context Query',
     type: 'active',
@@ -194,6 +199,25 @@ ${await (0, doc_query_1.showQuery)(shell, example_query_code_1.exampleQueryCode,
 		`;
     }
 });
+(0, doc_query_1.registerQueryDocumentation)('resolve-value', {
+    name: 'Resolve Value Query',
+    type: 'active',
+    shortDescription: 'Provides access to flowR\'s value tracking (which is configurable)',
+    functionName: search_query_executor_1.executeSearch.name,
+    functionFile: '../queries/catalog/resolve-value-query/resolve-value-query-executor.ts',
+    buildExplanation: async (shell) => {
+        const exampleCode = 'x <- 1\nprint(x)';
+        return `
+With this query you can use flowR's value-tracking capabilities to resolve identifiers to all potential values they may have at runtime (if possible). The extend to which flowR traces values (e.g. built-ins vs. constants) can be configured in flowR's Configuration file (see the [Interface](${doc_files_1.FlowrWikiBaseRef}/Interface) wiki page for more information). 
+
+Using the example code \`${exampleCode}\`, the following query returns all values of 'x' in the code:
+${await (0, doc_query_1.showQuery)(shell, exampleCode, [{
+                type: 'resolve-value',
+                criteria: ['2@x']
+            }], { showCode: true })}
+		`;
+    }
+});
 (0, doc_query_1.registerQueryDocumentation)('search', {
     name: 'Search Query',
     type: 'active',
@@ -419,6 +443,10 @@ ${await (0, doc_query_1.showQuery)(shell, longerCode, [{
     functionName: location_map_query_executor_1.executeLocationMapQuery.name,
     functionFile: '../queries/catalog/location-map-query/location-map-query-executor.ts',
     buildExplanation: async (shell) => {
+        const types = (0, doc_types_1.getTypesFromFolderAsMermaid)({
+            files: [path_1.default.resolve('./src/util/range.ts')],
+            typeName: 'SourceRange'
+        });
         const exampleCode = 'x + 1\nx * 2';
         return `
 A query like the ${(0, doc_query_1.linkToQueryOfName)('id-map')} query can return a really big result, especially for larger scripts.
@@ -434,6 +462,8 @@ ${await (0, doc_query_1.showQuery)(shell, exampleCode, [{
                 type: 'location-map'
             }], { showCode: false, collapseQuery: true })}
 
+All locations are given as a ${(0, doc_types_1.shortLink)('SourceRange', types.info)} in the format \`[start-line, start-column, end-line, end-column]\`.	
+
 		`;
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -21,7 +21,7 @@
     "stats-helper": "ts-node src/cli/statistics-helper-app.ts",
     "slicer": "ts-node src/cli/slicer-app.ts",
     "benchmark-helper": "ts-node src/cli/benchmark-helper-app.ts",
-    "benchmark": "npm run build && npm run build:copy-wasm && node dist/src/cli/benchmark-app.js",
+    "benchmark": "npm run build-dev && node dist/src/cli/benchmark-app.js",
     "summarizer": "ts-node src/cli/summarizer-app.ts",
     "export-quads": "ts-node src/cli/export-quads-app.ts",
     "capabilities-markdown": "ts-node src/documentation/print-capabilities-markdown.ts",
@@ -33,9 +33,10 @@
     "wiki:linting-and-testing": "ts-node src/documentation/print-linting-and-testing-wiki.ts",
     "wiki:interface": "ts-node src/documentation/print-interface-wiki.ts",
     "build": "tsc --project .",
-    "build:bundle-flowr": "npm run build && esbuild --bundle dist/src/cli/flowr.js --platform=node --bundle --minify --target=node22 --outfile=dist/src/cli/flowr.min.js && npm run build:copy-wasm-min",
-    "build:copy-wasm": "cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm dist/src/r-bridge/lang-4.x/tree-sitter/ && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/r-bridge/lang-4.x/tree-sitter/",
-    "build:copy-wasm-min": "cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm dist/src/cli && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/cli",
+    "build-dev": "npm run build && npm run build:copy-wasm",
+    "build:bundle-flowr": "npm run build && esbuild --bundle dist/src/cli/flowr.js --platform=node --bundle --minify --external:clipboardy --target=node22 --outfile=dist/src/cli/flowr.min.js && npm run build:copy-wasm-min",
+    "build:copy-wasm": "mkdir -p dist/src/r-bridge/lang-4.x/tree-sitter/ && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/r-bridge/lang-4.x/tree-sitter/",
+    "build:copy-wasm-min": "mkdir -p dist/src/cli && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/cli",
     "lint-local": "npx eslint --version && npx eslint src/ test/ --rule \"no-warning-comments: off\"",
     "lint": "npm run license-compat -- --summary && npx eslint --version && npx eslint src/ test/",
     "license-compat": "license-checker --onlyAllow 'MIT;MIT OR X11;GPLv2;LGPL;GNUGPL;ISC;Apache-2.0;FreeBSD;BSD-2-Clause;clearbsd;ModifiedBSD;BSD-3-Clause;Python-2.0;Unlicense;WTFPL;BlueOak-1.0.0;CC-BY-4.0;CC-BY-3.0;CC0-1.0;0BSD'",
@@ -166,7 +167,7 @@
         "npm run lint",
         "npm run test-full"
       ],
-      "after:bump": "npm run build && npm run build:copy-wasm",
+      "after:bump": "npm run build-dev",
       "after:git:release": "echo After git push, before github release",
       "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
     },
@@ -210,6 +211,7 @@
   },
   "dependencies": {
     "@xmldom/xmldom": "^0.9.2",
+    "clipboardy": "^4.0.0",
     "command-line-args": "^6.0.0",
     "command-line-usage": "^7.0.3",
     "joi": "^17.13.3",

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

@@ -167,7 +167,7 @@ function executeCallContextQueries({ dataflow: { graph }, ast }, queries) {
     const { promotedQueries, requiresCfg } = promoteQueryCallNames(queries);
     let cfg = undefined;
     if (requiresCfg) {
-        cfg = (0, cfg_1.extractCFG)(ast);
+        cfg = (0, cfg_1.extractCFG)(ast, graph);
     }
     const queriesWhichWantAliases = promotedQueries.filter(q => q.includeAliases);
     for (const [nodeId, info] of graph.vertices(true)) {

package/queries/catalog/happens-before-query/happens-before-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { BasicQueryData } from '../../base-query-format';
 import type { HappensBeforeQuery, HappensBeforeQueryResult } from './happens-before-query-format';
-export declare function executeHappensBefore({ ast }: BasicQueryData, queries: readonly HappensBeforeQuery[]): HappensBeforeQueryResult;
+export declare function executeHappensBefore({ ast, dataflow }: BasicQueryData, queries: readonly HappensBeforeQuery[]): HappensBeforeQueryResult;

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

@@ -6,10 +6,10 @@ const log_1 = require("../../../util/log");
 const cfg_1 = require("../../../util/cfg/cfg");
 const happens_before_1 = require("../../../util/cfg/happens-before");
 const parse_1 = require("../../../slicing/criterion/parse");
-function executeHappensBefore({ ast }, queries) {
+function executeHappensBefore({ ast, dataflow }, queries) {
     const start = Date.now();
     const results = {};
-    const cfg = (0, cfg_1.extractCFG)(ast);
+    const cfg = (0, cfg_1.extractCFG)(ast, dataflow.graph);
     for (const query of queries) {
         const { a, b } = query;
         const fingerprint = `${a}<${b}`;

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

@@ -0,0 +1,4 @@
+import type { ResolveValueQuery, ResolveValueQueryResult } from './resolve-value-query-format';
+import type { BasicQueryData } from '../../base-query-format';
+export declare function fingerPrintOfQuery(query: ResolveValueQuery): string;
+export declare function executeResolveValueQuery({ dataflow: { graph, environment }, ast }: BasicQueryData, queries: readonly ResolveValueQuery[]): ResolveValueQueryResult;

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

@@ -0,0 +1,34 @@
+"use strict";
+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 resolve_by_name_1 = require("../../../dataflow/environments/resolve-by-name");
+const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
+function fingerPrintOfQuery(query) {
+    return JSON.stringify(query);
+}
+function executeResolveValueQuery({ dataflow: { graph, environment }, ast }, queries) {
+    const start = Date.now();
+    const results = {};
+    for (const query of queries) {
+        const key = fingerPrintOfQuery(query);
+        if (results[key]) {
+            log_1.log.warn(`Duplicate Key for resolve-value-query: ${key}, skipping...`);
+        }
+        const values = query.criteria
+            .map(criteria => (0, node_id_1.recoverName)((0, parse_1.slicingCriterionToId)(criteria, ast.idMap), ast.idMap))
+            .flatMap(ident => (0, resolve_by_name_1.resolveToValues)(ident, environment, graph));
+        results[key] = {
+            values: [...new Set(values)]
+        };
+    }
+    return {
+        '.meta': {
+            timing: Date.now() - start
+        },
+        results
+    };
+}
+//# sourceMappingURL=resolve-value-query-executor.js.map

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

@@ -0,0 +1,72 @@
+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';
+export interface ResolveValueQuery extends BaseQueryFormat {
+    readonly type: 'resolve-value';
+    /** The slicing criteria to use */
+    readonly criteria: SlicingCriteria;
+}
+export interface ResolveValueQueryResult extends BaseQueryResult {
+    results: Record<string, {
+        values: unknown[];
+    }>;
+}
+export declare const ResolveValueQueryDefinition: {
+    readonly executor: typeof executeResolveValueQuery;
+    readonly asciiSummarizer: (formatter: import("../../../util/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>;
+};

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

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResolveValueQueryDefinition = void 0;
+const ansi_1 = require("../../../util/ansi");
+const time_1 = require("../../../util/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;
+}
+exports.ResolveValueQueryDefinition = {
+    executor: resolve_value_query_executor_1.executeResolveValueQuery,
+    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+        const out = queryResults;
+        result.push(`Query: ${(0, ansi_1.bold)('resolve-value', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
+        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(', ')}`);
+        }
+        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('Resolve Value query used to get definitions of an identifier')
+};
+//# sourceMappingURL=resolve-value-query-format.js.map

package/queries/query.d.ts

@@ -17,7 +17,8 @@ import type { LocationMapQuery } from './catalog/location-map-query/location-map
 import type { ConfigQuery } from './catalog/config-query/config-query-format';
 import type { SearchQuery } from './catalog/search-query/search-query-format';
 import type { HappensBeforeQuery } from './catalog/happens-before-query/happens-before-query-format';
-export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | LineageQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery;
+import type { ResolveValueQuery } from './catalog/resolve-value-query/resolve-value-query-format';
+export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | LineageQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | ResolveValueQuery;
 export type QueryArgumentsWithType<QueryType extends BaseQueryFormat['type']> = Query & {
     type: QueryType;
 };
@@ -568,6 +569,64 @@ export declare const SupportedQueries: {
         }>>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
     };
+    readonly 'resolve-value': {
+        readonly executor: typeof import("./catalog/resolve-value-query/resolve-value-query-executor").executeResolveValueQuery;
+        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>;
+    };
 };
 export type SupportedQueryTypes = keyof typeof SupportedQueries;
 export type QueryResult<Type extends Query['type']> = ReturnType<typeof SupportedQueries[Type]['executor']>;

package/queries/query.js

@@ -25,6 +25,7 @@ const location_map_query_format_1 = require("./catalog/location-map-query/locati
 const config_query_format_1 = require("./catalog/config-query/config-query-format");
 const search_query_format_1 = require("./catalog/search-query/search-query-format");
 const happens_before_query_format_1 = require("./catalog/happens-before-query/happens-before-query-format");
+const resolve_value_query_format_1 = require("./catalog/resolve-value-query/resolve-value-query-format");
 exports.SupportedQueries = {
     'call-context': call_context_query_format_1.CallContextQueryDefinition,
     'config': config_query_format_1.ConfigQueryDefinition,
@@ -37,7 +38,8 @@ exports.SupportedQueries = {
     'dependencies': dependencies_query_format_1.DependenciesQueryDefinition,
     'location-map': location_map_query_format_1.LocationMapQueryDefinition,
     'search': search_query_format_1.SearchQueryDefinition,
-    'happens-before': happens_before_query_format_1.HappensBeforeQueryDefinition
+    'happens-before': happens_before_query_format_1.HappensBeforeQueryDefinition,
+    'resolve-value': resolve_value_query_format_1.ResolveValueQueryDefinition
 };
 function executeQueriesOfSameType(data, ...queries) {
     (0, assert_1.guard)(queries.length > 0, 'At least one query must be provided');

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

@@ -190,8 +190,8 @@ export declare const flowrCapabilities: {
                     readonly supported: "fully";
                     readonly description: "_Detect calls like `x[]`, `x[2,,42]`, ..._";
                 }, {
-                    readonly name: "Subsetting";
-                    readonly id: "subsetting";
+                    readonly name: "Subsetting (Multiple Indices)";
+                    readonly id: "subsetting-multiple";
                     readonly supported: "fully";
                     readonly description: "_Detect calls like `x[i > 3]`, `x[c(1,3)]`, ..._";
                 }];

package/r-bridge/data/data.js

@@ -237,8 +237,8 @@ exports.flowrCapabilities = {
                                     description: '_Detect calls like `x[]`, `x[2,,42]`, ..._'
                                 },
                                 {
-                                    name: 'Subsetting',
-                                    id: 'subsetting',
+                                    name: 'Subsetting (Multiple Indices)',
+                                    id: 'subsetting-multiple',
                                     supported: 'fully',
                                     description: '_Detect calls like `x[i > 3]`, `x[c(1,3)]`, ..._'
                                 }