feat-fix: vapply arg location (#2136)

* feat-fix: vapply arg location

* feat-fix: wrong cyclic edge account

Author: EagleoutIce

src/dataflow/internal/linker.ts

@@ -8,7 +8,7 @@ import type { RParameter } from '../../r-bridge/lang-4.x/ast/model/nodes/r-param
 import type { AstIdMap, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { dataflowLogger } from '../logger';
 import { EmptyArgument } from '../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
-import { edgeIncludesType, EdgeType } from '../graph/edge';
+import { edgeDoesNotIncludeType, edgeIncludesType, EdgeType } from '../graph/edge';
 import { RType } from '../../r-bridge/lang-4.x/ast/model/type';
 import {
 	type DataflowGraphVertexFunctionCall,
@@ -214,7 +214,7 @@ function linkFunctionCall(
 
 	const functionDefinitionReadIds = new Set<NodeId>();
 	for(const [t, { types }] of edges.entries()) {
-		if(!isBuiltIn(t) && edgeIncludesType(types, FCallLinkReadBits)) {
+		if(!isBuiltIn(t) && edgeDoesNotIncludeType(types, EdgeType.Argument) && edgeIncludesType(types, FCallLinkReadBits)) {
 			functionDefinitionReadIds.add(t);
 		}
 	}

src/dataflow/internal/process/functions/call/built-in/built-in-apply.ts

@@ -64,7 +64,19 @@ export function processApply<OtherInfo>(
 			index = mayFn;
 		}
 	}
-
+	// shift the index to point to the index'd unnamed argument
+	let posArgsFound = 0;
+	for(let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if(arg !== EmptyArgument && arg.name) {
+			// do nothing
+		} else if(posArgsFound === index) {
+			index = i;
+			break;
+		} else {
+			posArgsFound++;
+		}
+	}
 
 	/* validate, that we indeed have so many arguments to fill this one :D */
 	if(index >= args.length) {
@@ -96,7 +108,8 @@ export function processApply<OtherInfo>(
 		if(resolveValue) {
 			const resolved = valueSetGuard(resolveIdToValue(val.info.id, { environment: data.environment, idMap: data.completeAst.idMap , resolve: data.ctx.config.solver.variables, ctx: data.ctx }));
 			if(resolved?.elements.length === 1 && resolved.elements[0].type === 'string') {
-				functionName = isValue(resolved.elements[0].value) ? resolved.elements[0].value.str : undefined;
+				const r = resolved.elements[0];
+				functionName = isValue(r.value) ? r.value.str : undefined;
 			}
 		} else {
 			functionName = val.content;

test/functionality/_helper/shell.ts

@@ -625,7 +625,7 @@ export function assertSliced(
 					const decodedExpected = expected.map(e => slicingCriterionToId(e, result.normalize.idMap))
 						.sort((a, b) => String(a).localeCompare(String(b)))
 						.map(n => normalizeIdToNumberIfPossible(n));
-					const inSlice = [...result.slice.result]
+					const inSlice = Array.from(result.slice.result)
 						.sort((a, b) => String(a).localeCompare(String(b)))
 						.map(n => normalizeIdToNumberIfPossible(n));
 					assert.deepStrictEqual(inSlice, decodedExpected, `expected ids ${JSON.stringify(decodedExpected)} are not in the slice result ${JSON.stringify(inSlice)}, for input ${input} (slice for ${printIdMapping(result.slice.decodedCriteria.map(({ id }) => id), result.normalize.idMap)}), url: ${graphToMermaidUrl(result.dataflow.graph, true, result.slice.result)}`);
@@ -635,6 +635,7 @@ export function assertSliced(
 						`got: ${result.reconstruct.code as string}, vs. expected: ${JSON.stringify(expected)}, for input ${input} (slice for ${JSON.stringify(criteria)}: ${printIdMapping(result.slice.decodedCriteria.map(({ id }) => id), result.normalize.idMap)}), url: ${graphToMermaidUrl(result.dataflow.graph, true, result.slice.result)}`
 					);
 				}
+				assert.strictEqual(result.slice.timesHitThreshold, 0, 'the slice shall not hit the threshold');
 			} /* v8 ignore start */ catch(e) {
 				if(printError) {
 					console.error(`got:\n${result.reconstruct.code as string}\nvs. expected:\n${JSON.stringify(expected)}`);

test/functionality/slicing/backward/static-backward-program-slices/calls.test.ts

@@ -753,6 +753,18 @@ x`);
 				'foo <- bar()\nres <- lapply(1:3, function(x) foo * 2)'
 				);
 			});
+			describe('With FUN.VALUE', () => {
+				assertSliced(label('Force-Including Call Reference', [
+					'name-normal', ...OperatorDatabase['<-'].capabilities, 'numbers', 'normal-definition', 'newlines', 'unnamed-arguments', 'call-normal', 'implicit-return', 'closures'
+				]), shell,
+				`themed <- vapply(defaults, FUN.VALUE = logical(1), function(x) {
+    is_quosure(x) && quo_is_call(x, name = "from_theme")
+  })`, ['1@themed'],
+				`themed <- vapply(defaults, FUN.VALUE = logical(1), function(x) {
+    is_quosure(x) && quo_is_call(x, name = "from_theme")
+  })`
+				);
+			});
 			describe('nested ddply', () => {
 				assertSliced(label('Force-Including Call Reference', [
 					'name-normal', ...OperatorDatabase['<-'].capabilities, 'numbers', 'normal-definition', 'newlines', 'unnamed-arguments', 'call-normal', 'implicit-return', 'closures'

test/functionality/slicing/backward/static-backward-program-slices/magic-comments.test.ts

@@ -1,5 +1,5 @@
 import { label } from '../../../_helper/label';
-import { type TestConfigurationWithOutput , assertSliced, withShell } from '../../../_helper/shell';
+import { type TestConfigurationWithOutput, assertSliced, withShell } from '../../../_helper/shell';
 import { makeMagicCommentHandler } from '../../../../../src/reconstruct/auto-select/magic-comments';
 import { describe } from 'vitest';