@eagleoutice/flowr 2.2.4 → 2.2.6

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

@@ -3,15 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDependenciesQuery = executeDependenciesQuery;
 const query_1 = require("../../query");
 const dependencies_query_format_1 = require("./dependencies-query-format");
+const vertex_1 = require("../../../dataflow/graph/vertex");
 const graph_1 = require("../../../dataflow/graph/graph");
 const log_1 = require("../../../util/log");
 const type_1 = require("../../../r-bridge/lang-4.x/ast/model/type");
-const retriever_1 = require("../../../r-bridge/retriever");
 const r_function_call_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 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 SupportedVertexTypes = [type_1.RType.String, type_1.RType.Logical, type_1.RType.Number];
+const resolve_by_name_1 = require("../../../dataflow/environments/resolve-by-name");
+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 => {
+        if (n.type === type_1.RType.Symbol && n.namespace) {
+            /* we should improve the identification of ':::' */
+            libraries.push({
+                nodeId: n.info.id,
+                functionName: (n.info.fullLexeme ?? n.lexeme).includes(':::') ? ':::' : '::',
+                libraryName: n.namespace
+            });
+        }
+    });
+}
 function executeDependenciesQuery(data, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Dependencies query expects only up to one query, but got ', queries.length, 'only using the first query');
@@ -25,58 +38,46 @@ function executeDependenciesQuery(data, queries) {
     const writeFunctions = getFunctionsToCheck(query.writeFunctions, ignoreDefault, dependencies_query_format_1.WriteFunctions);
     const numberOfFunctions = libraryFunctions.length + sourceFunctions.length + readFunctions.length + writeFunctions.length;
     const results = numberOfFunctions === 0 ? { kinds: {}, '.meta': { timing: 0 } } : (0, query_1.executeQueriesOfSameType)(data, ...makeCallContextQuery(libraryFunctions, 'library'), ...makeCallContextQuery(sourceFunctions, 'source'), ...makeCallContextQuery(readFunctions, 'read'), ...makeCallContextQuery(writeFunctions, 'write'));
-    const getLexeme = (argument, id) => {
+    function getLexeme(argument, id) {
         if ((argument && argument !== dependencies_query_format_1.Unknown) || !id) {
             return undefined;
         }
         let get = data.ast.idMap.get(id);
-        if (!get) {
-            return undefined;
-        }
-        if (get.type === type_1.RType.Argument) {
+        if (get?.type === type_1.RType.Argument) {
             get = get.value;
         }
         return get?.info.fullLexeme ?? get?.lexeme;
-    };
-    const libraries = getResults(data, results, 'library', libraryFunctions, (id, vertex, argId, argument) => ({
+    }
+    const libraries = getResults(data, results, 'library', libraryFunctions, (id, vertex, argId, value, linkedIds) => ({
         nodeId: id,
         functionName: vertex.name,
-        lexemeOfArgument: getLexeme(argument, argId),
-        libraryName: argument ?? dependencies_query_format_1.Unknown
-    }), [type_1.RType.Symbol]);
+        lexemeOfArgument: getLexeme(value, argId),
+        libraryName: value ?? dependencies_query_format_1.Unknown,
+        linkedIds: linkedIds?.length ? linkedIds : undefined
+    }));
     if (!ignoreDefault) {
-        /* 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 => {
-            if (n.type === type_1.RType.Symbol && n.namespace) {
-                /* we should improve the identification of ':::' */
-                libraries.push({
-                    nodeId: n.info.id,
-                    functionName: (n.info.fullLexeme ?? n.lexeme).includes(':::') ? ':::' : '::',
-                    libraryName: n.namespace
-                });
-            }
-        });
+        collectNamespaceAccesses(data, libraries);
     }
-    const sourcedFiles = getResults(data, results, 'source', sourceFunctions, (id, vertex, argId, argument, linkedIds) => ({
+    const sourcedFiles = getResults(data, results, 'source', sourceFunctions, (id, vertex, argId, value, linkedIds) => ({
         nodeId: id,
         functionName: vertex.name,
-        file: argument ?? dependencies_query_format_1.Unknown,
-        lexemeOfArgument: getLexeme(argument, argId),
+        file: value ?? dependencies_query_format_1.Unknown,
+        lexemeOfArgument: getLexeme(value, argId),
         linkedIds: linkedIds?.length ? linkedIds : undefined
     }));
-    const readData = getResults(data, results, 'read', readFunctions, (id, vertex, argId, argument, linkedIds) => ({
+    const readData = getResults(data, results, 'read', readFunctions, (id, vertex, argId, value, linkedIds) => ({
         nodeId: id,
         functionName: vertex.name,
-        source: argument ?? dependencies_query_format_1.Unknown,
-        lexemeOfArgument: getLexeme(argument, argId),
+        source: value ?? dependencies_query_format_1.Unknown,
+        lexemeOfArgument: getLexeme(value, argId),
         linkedIds: linkedIds?.length ? linkedIds : undefined
     }));
-    const writtenData = getResults(data, results, 'write', writeFunctions, (id, vertex, argId, argument, linkedIds) => ({
+    const writtenData = getResults(data, results, 'write', writeFunctions, (id, vertex, argId, value, linkedIds) => ({
         nodeId: id,
         functionName: vertex.name,
         // write functions that don't have argIndex are assumed to write to stdout
-        destination: argument ?? (linkedIds?.length ? dependencies_query_format_1.Unknown : 'stdout'),
-        lexemeOfArgument: getLexeme(argument, argId),
+        destination: value ?? (linkedIds?.length ? dependencies_query_format_1.Unknown : 'stdout'),
+        lexemeOfArgument: getLexeme(value, argId),
         linkedIds: linkedIds?.length ? linkedIds : undefined
     }));
     return {
@@ -93,31 +94,32 @@ function makeCallContextQuery(functions, kind) {
         includeAliases: false,
         callNameExact: true,
         subkind: f.name,
-        linkTo: f.linkTo ? { type: 'link-to-last-call', callName: f.linkTo } : undefined,
+        linkTo: f.linkTo,
         kind
     }));
 }
-function getResults(data, results, kind, functions, makeInfo, additionalAllowedTypes) {
+function dropInfoOnLinkedIds(linkedIds) {
+    if (!linkedIds) {
+        return undefined;
+    }
+    return linkedIds.map(id => typeof id === 'object' ? id.id : id);
+}
+function getResults(data, results, kind, functions, makeInfo) {
     const kindEntries = Object.entries(results?.kinds[kind]?.subkinds ?? {});
     return kindEntries.flatMap(([name, results]) => results.flatMap(({ id, linkedIds }) => {
         const vertex = data.dataflow.graph.getVertex(id);
         const info = functions.find(f => f.name === name);
-        let index = info.argIdx;
-        if (info.argName) {
-            const arg = vertex?.args.findIndex(arg => arg !== r_function_call_1.EmptyArgument && arg.name === info.argName);
-            if (arg >= 0) {
-                index = arg;
-            }
-        }
-        const args = index !== undefined ? getArgumentValue(data, vertex, index, additionalAllowedTypes) : undefined;
-        if (!args) {
-            const record = (0, objects_1.compactRecord)(makeInfo(id, vertex, undefined, undefined, linkedIds));
+        const args = getArgumentValue(data, vertex, info.argIdx, info.argName, info.resolveValue);
+        const linkedArgs = collectValuesFromLinks(args, data, linkedIds);
+        const foundValues = linkedArgs ?? args;
+        if (!foundValues) {
+            const record = (0, objects_1.compactRecord)(makeInfo(id, vertex, undefined, undefined, dropInfoOnLinkedIds(linkedIds)));
             return record ? [record] : [];
         }
         const results = [];
-        for (const [arg, values] of args.entries()) {
+        for (const [arg, values] of foundValues.entries()) {
             for (const value of values) {
-                const result = (0, objects_1.compactRecord)(makeInfo(id, vertex, arg, value, linkedIds));
+                const result = (0, objects_1.compactRecord)(makeInfo(id, vertex, arg, value, dropInfoOnLinkedIds(linkedIds)));
                 if (result) {
                     results.push(result);
                 }
@@ -126,11 +128,110 @@ function getResults(data, results, kind, functions, makeInfo, additionalAllowedT
         return results;
     })) ?? [];
 }
+function collectValuesFromLinks(args, data, linkedIds) {
+    if (!linkedIds || linkedIds.length === 0) {
+        return undefined;
+    }
+    const hasAtLeastAValue = args !== undefined && [...args.values()].some(set => [...set].some(v => v !== dependencies_query_format_1.Unknown && v !== undefined));
+    const map = new Map();
+    for (const linkedId of linkedIds) {
+        if (typeof linkedId !== 'object' || !linkedId.info) {
+            continue;
+        }
+        const info = linkedId.info;
+        // do not collect this one
+        if (hasAtLeastAValue && info.when !== dependencies_query_format_1.DependencyInfoLinkConstraint.Always) {
+            continue;
+        }
+        // collect this one!
+        const vertex = data.dataflow.graph.getVertex(linkedId.id);
+        if (vertex === undefined || vertex.tag !== vertex_1.VertexType.FunctionCall) {
+            continue;
+        }
+        const args = getArgumentValue(data, vertex, info.argIdx, info.argName, info.resolveValue);
+        if (args === undefined) {
+            continue;
+        }
+        for (const [arg, values] of args.entries()) {
+            const set = map.get(arg) ?? new Set();
+            map.set(arg, set);
+            for (const value of values) {
+                set.add(value);
+            }
+        }
+    }
+    return map;
+}
+function hasCharacterOnly(data, vertex, idMap) {
+    if (!vertex.args || vertex.args.length === 0 || !idMap) {
+        return false;
+    }
+    const treatAsChar = getArgumentValue(data, vertex, 5, 'character.only', true);
+    if (!treatAsChar) {
+        return false;
+    }
+    const hasTrue = [...treatAsChar.values()].some(set => set?.has('TRUE'));
+    const hasFalse = hasTrue ? [...treatAsChar.values()].some(set => set === undefined || set.has('FALSE')) : false;
+    if (hasTrue && hasFalse) {
+        return 'maybe';
+    }
+    else {
+        return hasTrue;
+    }
+}
+function resolveBasedOnConfig(data, vertex, argument, environment, idMap, resolveValue) {
+    let full = true;
+    if (!resolveValue) {
+        full = false;
+    }
+    if (resolveValue === 'library') {
+        const hasChar = hasCharacterOnly(data, vertex, idMap);
+        if (hasChar === false) {
+            if (argument.type === type_1.RType.Symbol) {
+                return [argument.lexeme];
+            }
+            full = false;
+        }
+    }
+    return (0, resolve_by_name_1.resolve)(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);
+    }
+}
 /**
  * Get the values of all arguments matching the criteria.
  */
-function getArgumentValue({ dataflow: { graph } }, vertex, argumentIndex, additionalAllowedTypes) {
-    if (!vertex) {
+function getArgumentValue(data, vertex, argumentIndex, argumentName, resolveValue) {
+    const graph = data.dataflow.graph;
+    if (argumentName) {
+        const arg = vertex?.args.findIndex(arg => arg !== r_function_call_1.EmptyArgument && arg.name === argumentName);
+        if (arg >= 0) {
+            argumentIndex = arg;
+        }
+    }
+    if (!vertex || argumentIndex === undefined) {
         return undefined;
     }
     if (argumentIndex === 'unnamed') {
@@ -143,9 +244,11 @@ function getArgumentValue({ dataflow: { graph } }, vertex, argumentIndex, additi
                 valueNode = valueNode.value;
             }
             if (valueNode) {
-                const allowedTypes = [...SupportedVertexTypes, ...additionalAllowedTypes ?? []];
-                const value = allowedTypes.includes(valueNode.type) ? (0, retriever_1.removeRQuotes)(valueNode.lexeme) : dependencies_query_format_1.Unknown;
-                map.set(ref, new Set([value]));
+                // 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];
+                map.set(ref, new Set(values));
             }
         }
         return map;
@@ -160,8 +263,9 @@ function getArgumentValue({ dataflow: { graph } }, vertex, argumentIndex, additi
             valueNode = valueNode.value;
         }
         if (valueNode) {
-            const allowedTypes = [...SupportedVertexTypes, ...additionalAllowedTypes ?? []];
-            return new Map([[arg, new Set([allowedTypes.includes(valueNode.type) ? (0, retriever_1.removeRQuotes)(valueNode.lexeme) : dependencies_query_format_1.Unknown])]]);
+            const values = resolveBasedOnConfig(data, vertex, valueNode, vertex.environment, graph.idMap, resolveValue)
+                ?.map(unwrapRValue) ?? [dependencies_query_format_1.Unknown];
+            return new Map([[arg, new Set(values)]]);
         }
     }
     return undefined;

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

@@ -2,7 +2,21 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import Joi from 'joi';
 import { executeDependenciesQuery } from './dependencies-query-executor';
+import type { LinkTo } from '../call-context-query/call-context-query-format';
 export declare const Unknown = "unknown";
+/** when to read the argument value from a linked function */
+export declare enum DependencyInfoLinkConstraint {
+    Always = "always",
+    IfUnknown = "if-unknown"
+}
+/**
+ * A dependency link may have attached information. If you pass it, we try to resolve the argument value from the linked function
+ * if the `when` constraint is met.
+ */
+export type DependencyInfoLink = LinkTo<RegExp | string, Omit<FunctionInfo, 'name' | 'linkTo'> & {
+    when: DependencyInfoLinkConstraint;
+} | undefined>;
+export type DependencyInfoLinkAttachedInfo = DependencyInfoLink['attachLinkInfo'];
 export declare const LibraryFunctions: FunctionInfo[];
 export declare const SourceFunctions: FunctionInfo[];
 export declare const ReadFunctions: FunctionInfo[];
@@ -11,7 +25,8 @@ export interface FunctionInfo {
     name: string;
     argIdx?: number | 'unnamed';
     argName?: string;
-    linkTo?: string;
+    linkTo?: DependencyInfoLink[];
+    resolveValue?: boolean | 'library';
 }
 export interface DependenciesQuery extends BaseQueryFormat {
     readonly type: 'dependencies';

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

@@ -3,146 +3,155 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DependenciesQueryDefinition = exports.WriteFunctions = exports.ReadFunctions = exports.SourceFunctions = exports.LibraryFunctions = exports.Unknown = void 0;
+exports.DependenciesQueryDefinition = exports.WriteFunctions = exports.ReadFunctions = exports.SourceFunctions = exports.LibraryFunctions = exports.DependencyInfoLinkConstraint = exports.Unknown = void 0;
 const ansi_1 = require("../../../util/ansi");
 const time_1 = require("../../../util/time");
 const joi_1 = __importDefault(require("joi"));
 const dependencies_query_executor_1 = require("./dependencies-query-executor");
 exports.Unknown = 'unknown';
+/** when to read the argument value from a linked function */
+var DependencyInfoLinkConstraint;
+(function (DependencyInfoLinkConstraint) {
+    DependencyInfoLinkConstraint["Always"] = "always";
+    DependencyInfoLinkConstraint["IfUnknown"] = "if-unknown";
+})(DependencyInfoLinkConstraint || (exports.DependencyInfoLinkConstraint = DependencyInfoLinkConstraint = {}));
 // these lists are originally based on https://github.com/duncantl/CodeDepends/blob/7fd96dfee16b252e5f642c77a7ababf48e9326f8/R/codeTypes.R
 exports.LibraryFunctions = [
-    { name: 'library', argIdx: 0, argName: 'package' },
-    { name: 'require', argIdx: 0, argName: 'package' },
-    { name: 'loadNamespace', argIdx: 0, argName: 'package' },
-    { name: 'attachNamespace', argIdx: 0, argName: 'ns' },
-    { name: 'attach', argIdx: 0, argName: 'what' },
-    { name: 'groundhog.library', argIdx: 0, argName: 'pkg' },
-    { name: 'p_load', argIdx: 'unnamed' }, // pacman
-    { name: 'p_load_gh', argIdx: 'unnamed' }, // pacman
-    { name: 'from_import', argIdx: 0, argName: 'package' }, // easypackages
-    { name: 'libraries', argIdx: 'unnamed' }, // easypackages
-    { name: 'shelf', argIdx: 'unnamed' } // librarian
+    { name: 'library', argIdx: 0, argName: 'package', resolveValue: 'library' },
+    { name: 'require', argIdx: 0, argName: 'package', resolveValue: true },
+    { name: 'loadNamespace', argIdx: 0, argName: 'package', resolveValue: true },
+    { name: 'attachNamespace', argIdx: 0, argName: 'ns', resolveValue: true },
+    { name: 'attach', argIdx: 0, argName: 'what', resolveValue: true },
+    { name: 'groundhog.library', argIdx: 0, argName: 'pkg', resolveValue: true },
+    { name: 'p_load', argIdx: 'unnamed', resolveValue: 'library' }, // pacman
+    { name: 'p_load_gh', argIdx: 'unnamed', resolveValue: 'library' }, // pacman
+    { name: 'from_import', argIdx: 0, argName: 'package', resolveValue: true }, // easypackages
+    { name: 'libraries', argIdx: 'unnamed', resolveValue: true }, // easypackages
+    { name: 'shelf', argIdx: 'unnamed', resolveValue: true } // librarian
 ];
 exports.SourceFunctions = [
-    { name: 'source', argIdx: 0, argName: 'file' },
-    { name: 'sys.source', argIdx: 0, argName: 'file' }
+    { name: 'source', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'sys.source', argIdx: 0, argName: 'file', resolveValue: true }
 ];
 exports.ReadFunctions = [
-    { name: 'read.table', argIdx: 0, argName: 'file' },
-    { name: 'read.csv', argIdx: 0, argName: 'file' },
-    { name: 'read.csv2', argIdx: 0, argName: 'file' },
-    { name: 'read.delim', argIdx: 0, argName: 'file' },
-    { name: 'read.dcf', argIdx: 0, argName: 'file' },
-    { name: 'scan', argIdx: 0, argName: 'file' },
-    { name: 'read.fwf', argIdx: 0, argName: 'file' },
-    { name: 'file', argIdx: 1, argName: 'open' },
-    { name: 'url', argIdx: 1, argName: 'open' },
-    { name: 'load', argIdx: 0, argName: 'file' },
-    { name: 'gzfile', argIdx: 1, argName: 'open' },
-    { name: 'bzfile', argIdx: 1, argName: 'open' },
-    { name: 'download.file', argIdx: 0, argName: 'url' },
-    { name: 'pipe', argIdx: 1, argName: 'open' },
-    { name: 'fifo', argIdx: 1, argName: 'open' },
-    { name: 'unz', argIdx: 1, argName: 'open' },
-    { name: 'matrix', argIdx: 0, argName: 'data' },
-    { name: 'readRDS', argIdx: 0, argName: 'file' },
-    { name: 'readLines', argIdx: 0, argName: 'con' },
-    { name: 'readRenviron', argIdx: 0, argName: 'path' },
+    { name: 'read.table', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.csv', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.csv2', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.delim', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.dcf', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'scan', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.fwf', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'file', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'url', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'load', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'gzfile', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'bzfile', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'download.file', argIdx: 0, argName: 'url', resolveValue: true },
+    { name: 'pipe', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'fifo', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'unz', argIdx: 1, argName: 'open', resolveValue: true },
+    { name: 'matrix', argIdx: 0, argName: 'data', resolveValue: true },
+    { name: 'readRDS', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'readLines', argIdx: 0, argName: 'con', resolveValue: true },
+    { name: 'readRenviron', argIdx: 0, argName: 'path', resolveValue: true },
     // readr
-    { name: 'read_csv', argIdx: 0, argName: 'file' },
-    { name: 'read_csv2', argIdx: 0, argName: 'file' },
-    { name: 'read_lines', argIdx: 0, argName: 'file' },
-    { name: 'read_delim', argIdx: 0, argName: 'file' },
-    { name: 'read_dsv', argIdx: 0, argName: 'file' },
-    { name: 'read_fwf', argIdx: 0, argName: 'file' },
-    { name: 'read_tsv', argIdx: 0, argName: 'file' },
-    { name: 'read_table', argIdx: 0, argName: 'file' },
-    { name: 'read_log', argIdx: 0, argName: 'file' },
-    { name: 'read_lines', argIdx: 0, argName: 'file' },
-    { name: 'read_lines_chunked', argIdx: 0, argName: 'file' },
+    { name: 'read_csv', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_csv2', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_lines', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_delim', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_dsv', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_fwf', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_tsv', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_table', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_log', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_lines', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_lines_chunked', argIdx: 0, argName: 'file', resolveValue: true },
     // xlsx
-    { name: 'read.xlsx', argIdx: 0, argName: 'file' },
-    { name: 'read.xlsx2', argIdx: 0, argName: 'file' },
+    { name: 'read.xlsx', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.xlsx2', argIdx: 0, argName: 'file', resolveValue: true },
     // data.table
-    { name: 'fread', argIdx: 0, argName: 'file' },
+    { name: 'fread', argIdx: 0, argName: 'file', resolveValue: true },
     // haven
-    { name: 'read_sas', argIdx: 0, argName: 'file' },
-    { name: 'read_sav', argIdx: 0, argName: 'file' },
-    { name: 'read_por', argIdx: 0, argName: 'file' },
-    { name: 'read_dta', argIdx: 0, argName: 'file' },
-    { name: 'read_xpt', argIdx: 0, argName: 'file' },
+    { name: 'read_sas', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_sav', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_por', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_dta', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read_xpt', argIdx: 0, argName: 'file', resolveValue: true },
     // feather
-    { name: 'read_feather', argIdx: 0, argName: 'file' },
+    { name: 'read_feather', argIdx: 0, argName: 'file', resolveValue: true },
     // foreign
-    { name: 'read.arff', argIdx: 0, argName: 'file' },
-    { name: 'read.dbf', argIdx: 0, argName: 'file' },
-    { name: 'read.dta', argIdx: 0, argName: 'file' },
-    { name: 'read.epiinfo', argIdx: 0, argName: 'file' },
-    { name: 'read.mtp', argIdx: 0, argName: 'file' },
-    { name: 'read.octave', argIdx: 0, argName: 'file' },
-    { name: 'read.spss', argIdx: 0, argName: 'file' },
-    { name: 'read.ssd', argIdx: 0, argName: 'file' },
-    { name: 'read.systat', argIdx: 0, argName: 'file' },
-    { name: 'read.xport', argIdx: 0, argName: 'file' },
+    { name: 'read.arff', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.dbf', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.dta', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.epiinfo', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.mtp', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.octave', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.spss', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.ssd', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.systat', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'read.xport', argIdx: 0, argName: 'file', resolveValue: true },
     // car
-    { name: 'Import', argIdx: 0, argName: 'file' },
+    { name: 'Import', argIdx: 0, argName: 'file', resolveValue: true },
+];
+const OutputRedirects = [
+    { type: 'link-to-last-call', callName: 'sink', attachLinkInfo: { argIdx: 0, argName: 'file', when: DependencyInfoLinkConstraint.IfUnknown, resolveValue: true } }
 ];
 exports.WriteFunctions = [
-    { name: 'save', argIdx: 2, argName: 'file' },
-    { name: 'save.image', argIdx: 0, argName: 'file' },
-    { name: 'write', argIdx: 1, argName: 'file' },
-    { name: 'dput', argIdx: 1, argName: 'file' },
-    { name: 'dump', argIdx: 1, argName: 'file' },
-    { name: 'write.table', argIdx: 1, argName: 'file' },
-    { name: 'write.csv', argIdx: 1, argName: 'file' },
-    { name: 'saveRDS', argIdx: 1, argName: 'file' },
+    { name: 'save', argName: 'file', resolveValue: true },
+    { name: 'save.image', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'dput', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'dump', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write.table', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write.csv', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'saveRDS', argIdx: 1, argName: 'file', resolveValue: true },
     // write functions that don't have argIndex are assumed to write to stdout
-    { name: 'print', linkTo: 'sink' },
-    { name: 'cat', linkTo: 'sink', argIdx: 1, argName: 'file' },
-    { name: 'message', linkTo: 'sink' },
-    { name: 'warning', linkTo: 'sink' },
+    { name: 'print', linkTo: OutputRedirects, resolveValue: true },
+    { name: 'cat', linkTo: OutputRedirects, argName: 'file', resolveValue: true },
+    { name: 'message', linkTo: OutputRedirects, resolveValue: true },
+    { name: 'warning', linkTo: OutputRedirects, resolveValue: true },
     // readr
-    { name: 'write_csv', argIdx: 1, argName: 'file' },
-    { name: 'write_csv2', argIdx: 1, argName: 'file' },
-    { name: 'write_delim', argIdx: 1, argName: 'file' },
-    { name: 'write_dsv', argIdx: 1, argName: 'file' },
-    { name: 'write_fwf', argIdx: 1, argName: 'file' },
-    { name: 'write_tsv', argIdx: 1, argName: 'file' },
-    { name: 'write_table', argIdx: 1, argName: 'file' },
-    { name: 'write_log', argIdx: 1, argName: 'file' },
+    { name: 'write_csv', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_csv2', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_delim', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_dsv', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_fwf', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_tsv', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_table', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_log', argIdx: 1, argName: 'file', resolveValue: true },
     // heaven
-    { name: 'write_sas', argIdx: 1, argName: 'file' },
-    { name: 'write_sav', argIdx: 1, argName: 'file' },
-    { name: 'write_por', argIdx: 1, argName: 'file' },
-    { name: 'write_dta', argIdx: 1, argName: 'file' },
-    { name: 'write_xpt', argIdx: 1, argName: 'file' },
+    { name: 'write_sas', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_sav', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_por', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_dta', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write_xpt', argIdx: 1, argName: 'file', resolveValue: true },
     // feather
-    { name: 'write_feather', argIdx: 1, argName: 'file' },
+    { name: 'write_feather', argIdx: 1, argName: 'file', resolveValue: true },
     // foreign
-    { name: 'write.arff', argIdx: 1, argName: 'file' },
-    { name: 'write.dbf', argIdx: 1, argName: 'file' },
-    { name: 'write.dta', argIdx: 1, argName: 'file' },
-    { name: 'write.foreign', argIdx: 1, argName: 'file' },
+    { name: 'write.arff', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write.dbf', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write.dta', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write.foreign', argIdx: 1, argName: 'file', resolveValue: true },
     // xlsx
-    { name: 'write.xlsx', argIdx: 1, argName: 'file' },
-    { name: 'write.xlsx2', argIdx: 1, argName: 'file' },
+    { name: 'write.xlsx', argIdx: 1, argName: 'file', resolveValue: true },
+    { name: 'write.xlsx2', argIdx: 1, argName: 'file', resolveValue: true },
     // graphics
-    { name: 'pdf', argIdx: 0, argName: 'file' },
-    { name: 'jpeg', argIdx: 0, argName: 'file' },
-    { name: 'png', argIdx: 0, argName: 'file' },
-    { name: 'windows', argIdx: 0, argName: 'file' },
-    { name: 'postscript', argIdx: 0, argName: 'file' },
-    { name: 'xfix', argIdx: 0, argName: 'file' },
-    { name: 'bitmap', argIdx: 0, argName: 'file' },
-    { name: 'pictex', argIdx: 0, argName: 'file' },
-    { name: 'cairo_pdf', argIdx: 0, argName: 'file' },
-    { name: 'svg', argIdx: 0, argName: 'file' },
-    { name: 'bmp', argIdx: 0, argName: 'file' },
-    { name: 'tiff', argIdx: 0, argName: 'file' },
-    { name: 'X11', argIdx: 0, argName: 'file' },
-    { name: 'quartz', argIdx: 0, argName: 'file' },
+    { name: 'pdf', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'jpeg', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'png', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'windows', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'postscript', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'xfix', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'bitmap', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'pictex', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'cairo_pdf', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'svg', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'bmp', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'tiff', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'X11', argIdx: 0, argName: 'file', resolveValue: true },
+    { name: 'quartz', argIdx: 0, argName: 'file', resolveValue: true },
     // car
-    { name: 'Export', argIdx: 0, argName: 'file' },
+    { name: 'Export', argIdx: 0, argName: 'file', resolveValue: true },
 ];
 function printResultSection(title, infos, result, sectionSpecifics) {
     if (infos.length <= 0) {

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

@@ -1,4 +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;
+export declare function executeResolveValueQuery({ dataflow: { graph }, ast }: BasicQueryData, queries: readonly ResolveValueQuery[]): ResolveValueQueryResult;

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

@@ -5,11 +5,10 @@ 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) {
+function executeResolveValueQuery({ dataflow: { graph }, ast }, queries) {
     const start = Date.now();
     const results = {};
     for (const query of queries) {
@@ -18,8 +17,8 @@ function executeResolveValueQuery({ dataflow: { graph, environment }, ast }, que
             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.idMap ?? ast.idMap));
+            .map(criteria => (0, parse_1.slicingCriterionToId)(criteria, ast.idMap))
+            .flatMap(ident => (0, resolve_by_name_1.resolve)(ident, { graph, full: true, idMap: ast.idMap }));
         results[key] = {
             values: [...new Set(values)]
         };