feat-fix(dep-qry): fix collection of arguments - #1496

Author: gigalasr

src/queries/catalog/dependencies-query/dependencies-query-executor.ts

@@ -32,8 +32,8 @@ import { WriteFunctions } from './function-info/write-functions';
 import type { DependencyInfoLinkAttachedInfo, FunctionInfo } from './function-info/function-info';
 import { DependencyInfoLinkConstraint } from './function-info/function-info';
 import { CallTargets } from '../call-context-query/identify-link-to-last-call-relation';
+import { isValue } from '../../../dataflow/eval/values/r-value';
 import { valueSetGuard } from '../../../dataflow/eval/values/general';
-import { collectStrings } from '../../../dataflow/eval/values/string/string-constants';
 
 function collectNamespaceAccesses(data: BasicQueryData, libraries: LibraryInfo[]) {
 	/* for libraries, we have to additionally track all uses of `::` and `:::`, for this we currently simply traverse all uses */
@@ -251,7 +251,21 @@ function resolveBasedOnConfig(data: BasicQueryData, vertex: DataflowGraphVertexF
 
 	const resolved = valueSetGuard(resolveIdToValue(argument, { environment, graph: data.dataflow.graph, full }));
 	if(resolved) {
-		return collectStrings(resolved.elements);
+		const values: string[] = [];
+		for(const value of resolved.elements) {
+			if(!isValue(value)) {
+				return undefined;
+			}
+
+			if(value.type === 'string' && isValue(value.value)) {
+				values.push(value.value.str);
+			} else if(value.type === 'logical' && isValue(value.value)) {
+				values.push(value.value.valueOf() ? 'TRUE' : 'FALSE');
+			} else {
+				return undefined;
+			}
+		}
+		return values;
 	}
 }
 

test/functionality/dataflow/environments/resolve.test.ts

@@ -9,23 +9,9 @@ import { valueFromTsValue } from '../../../../src/dataflow/eval/values/general';
 import { setFrom } from '../../../../src/dataflow/eval/values/sets/set-constants';
 import { Top } from '../../../../src/dataflow/eval/values/r-value';
 
-// async function get(code: string) {
-// 	const result = await new PipelineExecutor(DEFAULT_DATAFLOW_PIPELINE, {
-// 		parser:  new RShell(),
-// 		request: requestFromInput(code.trim())
-// 	}).allRemainingSteps();
-// 	return result;
-// }
-
 describe('Resolve', () => {
 	describe('ByName', () => {
 
-		// test('Resolve Vector', async() => {
-		// 	const { dataflow } = await get('x <- c("a", "b", "c")');
-		// 	const result = resolveValueOfVariable('x', dataflow.environment, dataflow.graph.idMap);
-		// 	assert.equal(result, ['a', 'b', 'c']);
-		// });
-
 		test(label('Locally without distracting elements', ['global-scope', 'lexicographic-scope'], ['other']), () => {
 			const xVar = variable('x', '_1');
 			const env = defaultEnv().defineInEnv(xVar);