@eagleoutice/flowr 2.8.11 → 2.8.13

package/project/plugins/file-plugins/files/flowr-description-file.js

@@ -8,8 +8,13 @@ const r_author_1 = require("../../../../util/r-author");
 const args_1 = require("../../../../util/text/args");
 const r_license_1 = require("../../../../util/r-license");
 const package_1 = require("../../package-version-plugins/package");
+const retriever_1 = require("../../../../r-bridge/retriever");
 /**
  * This decorates a text file and provides access to its content as a DCF (Debian Control File)-like structure.
+ * Please use the static {@link FlowrDescriptionFile.from} method to create instances of this class.
+ * To access description specific fields, use the provided methods like {@link license}, {@link authors}, {@link suggests}, and {@link collate}.
+ * These methods parse and return the relevant information in structured formats.
+ * To access raw fields, use the {@link content} method inherited from {@link FlowrFile}.
  */
 class FlowrDescriptionFile extends flowr_file_1.FlowrFile {
     wrapped;
@@ -59,10 +64,35 @@ class FlowrDescriptionFile extends flowr_file_1.FlowrFile {
         const parsedAuthors = authors?.flatMap(a => (0, r_author_1.parseTextualAuthorString)(a, [r_author_1.AuthorRole.Author])) ?? [];
         return parsedAuthors.concat(this.content().get('Maintainer')?.flatMap(m => (0, r_author_1.parseTextualAuthorString)(m, [r_author_1.AuthorRole.Creator])) ?? []);
     }
+    /**
+     * Returns the parsed suggested packages from the 'Suggests' field in the DESCRIPTION file.
+     */
     suggests() {
         const suggests = this.content().get('Suggests');
         return suggests ? parsePackagesWithVersions(suggests, 'package') : undefined;
     }
+    /**
+     * Returns the 'Collate' field from the DESCRIPTION file.
+     */
+    collate() {
+        const c = this.content().get('Collate');
+        // we join newlines, and then split quote sensitive:
+        return c ? (0, args_1.splitAtEscapeSensitive)(c.join(' '), true, ' ').map(s => (0, retriever_1.removeRQuotes)(s).trim()).filter(s => s.length > 0) : undefined;
+    }
+    /**
+     * Returns the parsed dependencies from the 'Depends' field in the DESCRIPTION file.
+     */
+    depends() {
+        const deps = this.content().get('Depends');
+        return deps ? parsePackagesWithVersions(deps, 'r') : undefined;
+    }
+    /**
+     * Returns the parsed imports from the 'Imports' field in the DESCRIPTION file.
+     */
+    imports() {
+        const imps = this.content().get('Imports');
+        return imps ? parsePackagesWithVersions(imps, 'package') : undefined;
+    }
 }
 exports.FlowrDescriptionFile = FlowrDescriptionFile;
 /**
@@ -117,25 +147,26 @@ function cleanValues(values) {
         .map(s => s.trim())
         .filter(s => s.length > 0);
 }
-const VersionRegex = /^([a-zA-Z0-9.]+)(?:\s*\(([><=~!]+)\s*([^)]+)\))?$/;
+const VersionRegex = /([a-zA-Z0-9.]+)(?:\s*\(([><=~!]+)\s*([^)]+)\))?\s*/;
 /**
  * Parses package strings with optional version constraints into Package objects.
  * @param packageStrings - The package strings to parse
  * @param type           - The type of the packages (e.g., 'r' or 'package')
  */
 function parsePackagesWithVersions(packageStrings, type) {
+    let str = packageStrings.join(' ');
+    let match;
     const packages = [];
-    for (const entry of packageStrings) {
-        const match = VersionRegex.exec(entry);
-        if (match) {
-            const [, name, operator, version] = match;
-            const range = package_1.Package.parsePackageVersionRange(operator, version);
-            packages.push(new package_1.Package({
-                name: name,
-                type: type,
-                versionConstraints: range ? [range] : undefined
-            }));
-        }
+    // match until exhaustion
+    while ((match = VersionRegex.exec(str)) !== null) {
+        const [, name, operator, version] = match;
+        const range = package_1.Package.parsePackageVersionRange(operator, version);
+        packages.push(new package_1.Package({
+            name: name,
+            type: type,
+            versionConstraints: range ? [range] : undefined
+        }));
+        str = str.slice(match.index + match[0].length);
     }
     return packages;
 }

package/project/plugins/loading-order-plugins/flowr-analyzer-loading-order-description-file-plugin.js

@@ -5,7 +5,6 @@ const flowr_analyzer_description_file_plugin_1 = require("../file-plugins/flowr-
 const semver_1 = require("semver");
 const flowr_analyzer_loading_order_plugin_1 = require("./flowr-analyzer-loading-order-plugin");
 const flowr_file_1 = require("../../context/flowr-file");
-const retriever_1 = require("../../../r-bridge/retriever");
 /**
  * This plugin extracts loading order information from R `DESCRIPTION` files.
  * It looks at the `Collate` field to determine the order in which files should be loaded.
@@ -25,10 +24,8 @@ class FlowrAnalyzerLoadingOrderDescriptionFilePlugin extends flowr_analyzer_load
             flowr_analyzer_description_file_plugin_1.descriptionFileLog.warn(`Found ${descFiles.length} description files, expected exactly one.`);
         }
         /** this will do the caching etc. for me */
-        const deps = descFiles[0].content();
-        if (deps.has('Collate')) {
-            const collate = deps.get('Collate')?.map(f => (0, retriever_1.removeRQuotes)(f))
-                ?? [];
+        const collate = descFiles[0].collate();
+        if (collate) {
             /* we probably have to do some more guesswork here */
             const unordered = ctx.files.loadingOrder.getUnorderedRequests();
             // sort them by their path index in the Collate field

package/project/plugins/package-version-plugins/flowr-analyzer-package-versions-description-file-plugin.js

@@ -5,7 +5,6 @@ const flowr_analyzer_package_versions_plugin_1 = require("./flowr-analyzer-packa
 const flowr_analyzer_description_file_plugin_1 = require("../file-plugins/flowr-analyzer-description-file-plugin");
 const semver_1 = require("semver");
 const flowr_file_1 = require("../../context/flowr-file");
-const flowr_description_file_1 = require("../file-plugins/files/flowr-description-file");
 /**
  * This plugin extracts package versions from R `DESCRIPTION` files.
  * It looks at the `Depends` and `Imports` fields to find package names and their version constraints.
@@ -24,12 +23,12 @@ class FlowrAnalyzerPackageVersionsDescriptionFilePlugin extends flowr_analyzer_p
             flowr_analyzer_description_file_plugin_1.descriptionFileLog.warn(`Found ${descFiles.length} description files, expected exactly one.`);
         }
         /** this will do the caching etc. for me */
-        const deps = descFiles[0].content();
-        this.retrieveVersionsFromField(ctx, deps, 'Depends', 'r');
-        this.retrieveVersionsFromField(ctx, deps, 'Imports', 'package');
+        const deps = descFiles[0];
+        this.retrieveVersionsFromField(ctx, deps.depends() ?? []);
+        this.retrieveVersionsFromField(ctx, deps.imports() ?? []);
     }
-    retrieveVersionsFromField(ctx, file, field, type) {
-        for (const pkg of (0, flowr_description_file_1.parsePackagesWithVersions)(file.get(field) ?? [], type)) {
+    retrieveVersionsFromField(ctx, pkgs) {
+        for (const pkg of pkgs) {
             ctx.deps.addDependency(pkg);
         }
     }

package/queries/catalog/call-context-query/call-context-query-executor.d.ts

@@ -4,7 +4,7 @@ import type { BasicQueryData } from '../../base-query-format';
  *
  */
 export declare function promoteCallName(callName: CallNameTypes, exact?: boolean): RegExp | Set<string>;
-export type PromotedLinkTo = Omit<LinkTo, 'callName'> & {
+export type PromotedLinkTo<LT = LinkTo> = Omit<LT, 'callName'> & {
     callName: RegExp | Set<string>;
 };
 /**

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

@@ -10,6 +10,7 @@ const objects_1 = require("../../../util/objects");
 const identify_link_to_last_call_relation_1 = require("./identify-link-to-last-call-relation");
 const cfg_kind_1 = require("../../../project/cfg-kind");
 const extract_cfg_1 = require("../../../control-flow/extract-cfg");
+const identify_link_to_relation_1 = require("./identify-link-to-relation");
 /* if the node is effected by nse, we have an ingoing nse edge */
 function isQuoted(node, graph) {
     const vertex = graph.ingoingEdges(node);
@@ -239,10 +240,10 @@ async function executeCallContextQueries({ analyzer }, queries) {
                 const linked = Array.isArray(query.linkTo) ? query.linkTo : [query.linkTo];
                 for (const link of linked) {
                     /* if we have a linkTo query, we have to find the last call */
-                    const lastCall = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(nodeId, cfg.graph, dataflow.graph, link, calls);
-                    if (lastCall) {
+                    const linkTos = await (0, identify_link_to_relation_1.identifyLinkToRelation)(nodeId, analyzer, link, calls);
+                    if (linkTos) {
                         linkedIds ??= new Set();
-                        for (const l of lastCall) {
+                        for (const l of linkTos) {
                             if (link.attachLinkInfo) {
                                 linkedIds.add({ id: l, info: link.attachLinkInfo });
                             }

package/queries/catalog/call-context-query/call-context-query-format.d.ts

@@ -47,6 +47,7 @@ export type CallNameTypes = RegExp | string | string[];
  * This way, you can link a call like `points` to the latest graphics plot etc.
  * For now, this uses the static Control-Flow-Graph produced by flowR as the FD over-approximation is still not stable (see #1005).
  * In short, this means that we are unable to detect origins over function call boundaries but plan on being more precise in the future.
+ * @see LinkToNestedCall
  */
 export interface LinkToLastCall<CallName extends CallNameTypes = CallNameTypes> extends BaseQueryFormat {
     readonly type: 'link-to-last-call';
@@ -63,7 +64,26 @@ export interface LinkToLastCall<CallName extends CallNameTypes = CallNameTypes>
      */
     readonly cascadeIf?: (target: DataflowGraphVertexInfo, from: NodeId, graph: DataflowGraph) => CascadeAction;
 }
-export type LinkTo<CallName extends CallNameTypes = CallNameTypes, AttachLinkInfo = NoInfo> = (LinkToLastCall<CallName>) & {
+/**
+ * Allows to link nested calls to their parent calls.
+ * This way, you can link an `assert_equal` call to the parent `test_that` call etc:
+ * ```r
+ * test_that("my test", {
+ *    assert_equal(1 + 1, 2)
+ * })
+ * ```
+ */
+export interface LinkToNestedCall<CallName extends CallNameTypes = CallNameTypes> extends BaseQueryFormat {
+    readonly type: 'link-to-nested-call';
+    /** Regex regarding the function name of the last call. Similar to {@link DefaultCallContextQueryFormat#callName}, strings are interpreted as a `RegExp`. */
+    readonly callName: CallName;
+    /**
+     * Should we ignore this (source) call?
+     * Currently, there is no well working serialization for this.
+     */
+    readonly ignoreIf?: (id: NodeId, graph: DataflowGraph) => boolean;
+}
+export type LinkTo<CallName extends CallNameTypes = CallNameTypes, AttachLinkInfo = NoInfo> = (LinkToLastCall<CallName> | LinkToNestedCall<CallName>) & {
     attachLinkInfo?: AttachLinkInfo;
 };
 export interface SubCallContextQueryFormat<CallName extends CallNameTypes = CallNameTypes, AttachLinkInfo = NoInfo> extends DefaultCallContextQueryFormat<CallName> {

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

@@ -10,13 +10,21 @@ const time_1 = require("../../../util/text/time");
 const joi_1 = __importDefault(require("joi"));
 const query_print_1 = require("../../query-print");
 const identify_link_to_last_call_relation_1 = require("./identify-link-to-last-call-relation");
-const CallContextQueryLinkTo = joi_1.default.object({
-    type: joi_1.default.string().valid('link-to-last-call').required().description('The type of the linkTo sub-query.'),
-    callName: joi_1.default.alternatives(joi_1.default.string(), joi_1.default.array().items(joi_1.default.string())).required().description('Test regarding the function name of the last call. Similar to `callName`, strings are interpreted as a regular expression, and string arrays are checked for containment.'),
-    ignoreIf: joi_1.default.function().optional().description('Should we ignore this (source) call? Currently, there is no well working serialization for this.'),
-    cascadeIf: joi_1.default.function().optional().description('Should we continue searching after the link was created? Currently, there is no well working serialization for this.'),
-    attachLinkInfo: joi_1.default.object().optional().description('Additional information to attach to the link.')
-});
+const CallContextQueryLinkTo = joi_1.default.alternatives([
+    joi_1.default.object({
+        type: joi_1.default.string().valid('link-to-last-call').required().description('The type of the linkTo sub-query.'),
+        callName: joi_1.default.alternatives(joi_1.default.string(), joi_1.default.array().items(joi_1.default.string())).required().description('Test regarding the function name of the last call. Similar to `callName`, strings are interpreted as a regular expression, and string arrays are checked for containment.'),
+        ignoreIf: joi_1.default.function().optional().description('Should we ignore this (source) call? Currently, there is no well working serialization for this.'),
+        cascadeIf: joi_1.default.function().optional().description('Should we continue searching after the link was created? Currently, there is no well working serialization for this.'),
+        attachLinkInfo: joi_1.default.object().optional().description('Additional information to attach to the link.')
+    }).description('Links the current call to the last call of the given kind. This way, you can link a call like `points` to the latest graphics plot etc.'),
+    joi_1.default.object({
+        type: joi_1.default.string().valid('link-to-nested-call').required().description('The type of the linkTo sub-query.'),
+        callName: joi_1.default.alternatives(joi_1.default.string(), joi_1.default.array().items(joi_1.default.string())).required().description('Test regarding the function name of the last call. Similar to `callName`, strings are interpreted as a regular expression, and string arrays are checked for containment.'),
+        ignoreIf: joi_1.default.function().optional().description('Should we ignore this (source) call? Currently, there is no well working serialization for this.'),
+        attachLinkInfo: joi_1.default.object().optional().description('Additional information to attach to the link.')
+    }).description('Allows to link nested calls to their parent calls. This way, you can link an `assert_equal` call to the parent `test_that` call etc.')
+]);
 exports.CallContextQueryDefinition = {
     executor: call_context_query_executor_1.executeCallContextQueries,
     asciiSummarizer: async (formatter, analyzer, queryResults, result) => {

package/queries/catalog/call-context-query/identify-link-to-last-call-relation.d.ts

@@ -3,9 +3,10 @@ import { type DataflowGraph } from '../../../dataflow/graph/graph';
 import { type DataflowGraphVertexFunctionCall } from '../../../dataflow/graph/vertex';
 import { RType } from '../../../r-bridge/lang-4.x/ast/model/type';
 import type { RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
-import type { LinkTo } from './call-context-query-format';
-import type { ControlFlowGraph } from '../../../control-flow/control-flow-graph';
+import type { LinkToLastCall } from './call-context-query-format';
 import type { PromotedLinkTo } from './call-context-query-executor';
+import type { ReadonlyFlowrAnalysisProvider } from '../../../project/flowr-analyzer';
+import type { ControlFlowGraph } from '../../../control-flow/control-flow-graph';
 export declare enum CallTargets {
     /** call targets a function that is not defined locally in the script (e.g., the call targets a library function) */
     OnlyGlobal = "global",
@@ -32,9 +33,16 @@ export declare function getValueOfArgument<Types extends readonly RType[] = read
     type: Types[number];
 }) | undefined;
 /**
+ * **Please refer to {@link identifyLinkToRelation}.**
+ *
  * Identifies nodes that link to the last call of a specified function from a given starting node in the control flow graph.
  * If you pass on `knownCalls` (e.g., produced by {@link getCallsInCfg}), this will only respect the functions
  * listed there and ignore any other calls. This can be also used to speed up the process if you already have
  * the known calls available.
+ * @see {@link identifyLinkToLastCallRelationSync} for the synchronous version.
+ */
+export declare function identifyLinkToLastCallRelation(from: NodeId, analyzer: ReadonlyFlowrAnalysisProvider, l: LinkToLastCall<RegExp> | PromotedLinkTo<LinkToLastCall<RegExp>>, knownCalls?: Map<NodeId, Required<DataflowGraphVertexFunctionCall>>): Promise<NodeId[]>;
+/**
+ * Synchronous version of {@link identifyLinkToLastCallRelation}.
  */
-export declare function identifyLinkToLastCallRelation(from: NodeId, cfg: ControlFlowGraph, graph: DataflowGraph, { callName, ignoreIf, cascadeIf }: LinkTo<RegExp> | PromotedLinkTo, knownCalls?: Map<NodeId, Required<DataflowGraphVertexFunctionCall>>): NodeId[];
+export declare function identifyLinkToLastCallRelationSync(from: NodeId, cfg: ControlFlowGraph, graph: DataflowGraph, { callName, cascadeIf, ignoreIf }: LinkToLastCall<RegExp> | PromotedLinkTo<LinkToLastCall<RegExp>>, knownCalls?: Map<NodeId, Required<DataflowGraphVertexFunctionCall>>): NodeId[];

package/queries/catalog/call-context-query/identify-link-to-last-call-relation.js

@@ -4,6 +4,7 @@ exports.CallTargets = void 0;
 exports.satisfiesCallTargets = satisfiesCallTargets;
 exports.getValueOfArgument = getValueOfArgument;
 exports.identifyLinkToLastCallRelation = identifyLinkToLastCallRelation;
+exports.identifyLinkToLastCallRelationSync = identifyLinkToLastCallRelationSync;
 const graph_1 = require("../../../dataflow/graph/graph");
 const simple_visitor_1 = require("../../../control-flow/simple-visitor");
 const vertex_1 = require("../../../dataflow/graph/vertex");
@@ -15,6 +16,7 @@ const assert_1 = require("../../../util/assert");
 const type_1 = require("../../../r-bridge/lang-4.x/ast/model/type");
 const r_function_call_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const cascade_action_1 = require("./cascade-action");
+const cfg_kind_1 = require("../../../project/cfg-kind");
 var CallTargets;
 (function (CallTargets) {
     /** call targets a function that is not defined locally in the script (e.g., the call targets a library function) */
@@ -111,12 +113,23 @@ function getValueOfArgument(graph, call, argument, additionalAllowedTypes) {
     }
 }
 /**
+ * **Please refer to {@link identifyLinkToRelation}.**
+ *
  * Identifies nodes that link to the last call of a specified function from a given starting node in the control flow graph.
  * If you pass on `knownCalls` (e.g., produced by {@link getCallsInCfg}), this will only respect the functions
  * listed there and ignore any other calls. This can be also used to speed up the process if you already have
  * the known calls available.
+ * @see {@link identifyLinkToLastCallRelationSync} for the synchronous version.
  */
-function identifyLinkToLastCallRelation(from, cfg, graph, { callName, ignoreIf, cascadeIf }, knownCalls) {
+async function identifyLinkToLastCallRelation(from, analyzer, l, knownCalls) {
+    const graph = (await analyzer.dataflow()).graph;
+    const cfg = (await analyzer.controlflow([], cfg_kind_1.CfgKind.WithDataflow)).graph;
+    return identifyLinkToLastCallRelationSync(from, cfg, graph, l, knownCalls);
+}
+/**
+ * Synchronous version of {@link identifyLinkToLastCallRelation}.
+ */
+function identifyLinkToLastCallRelationSync(from, cfg, graph, { callName, cascadeIf, ignoreIf }, knownCalls) {
     if (ignoreIf?.(from, graph)) {
         return [];
     }

package/queries/catalog/call-context-query/identify-link-to-nested-call-relation.d.ts

@@ -0,0 +1,12 @@
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { LinkToNestedCall } from './call-context-query-format';
+import type { PromotedLinkTo } from './call-context-query-executor';
+import type { ReadonlyFlowrAnalysisProvider } from '../../../project/flowr-analyzer';
+/**
+ * **Please refer to {@link identifyLinkToRelation}.**
+ *
+ * Links to the nested call context of the current function call.
+ * This is useful for identifying calls made within nested functions
+ * that should be associated with their parent function's call context.
+ */
+export declare function identifyLinkToNestedRelation(from: NodeId, analyzer: ReadonlyFlowrAnalysisProvider, { callName, ignoreIf }: LinkToNestedCall<RegExp> | PromotedLinkTo<LinkToNestedCall<RegExp>>): Promise<NodeId[]>;

package/queries/catalog/call-context-query/identify-link-to-nested-call-relation.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.identifyLinkToNestedRelation = identifyLinkToNestedRelation;
+const call_graph_1 = require("../../../dataflow/graph/call-graph");
+/**
+ * **Please refer to {@link identifyLinkToRelation}.**
+ *
+ * Links to the nested call context of the current function call.
+ * This is useful for identifying calls made within nested functions
+ * that should be associated with their parent function's call context.
+ */
+async function identifyLinkToNestedRelation(from, analyzer, { callName, ignoreIf }) {
+    const df = await analyzer.dataflow();
+    if (ignoreIf?.(from, df.graph)) {
+        return [];
+    }
+    const found = [];
+    const cg = await analyzer.callGraph();
+    const subCg = (0, call_graph_1.getSubCallGraph)(cg, new Set([from]));
+    for (const [, { id, name }] of subCg.vertices(true)) {
+        if (typeof name !== 'string') {
+            continue;
+        }
+        if (callName instanceof RegExp ? callName.test(name) : callName.has(name)) {
+            found.push(id);
+        }
+    }
+    return found;
+}
+//# sourceMappingURL=identify-link-to-nested-call-relation.js.map

package/queries/catalog/call-context-query/identify-link-to-relation.d.ts

@@ -0,0 +1,10 @@
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { LinkTo } from './call-context-query-format';
+import type { PromotedLinkTo } from './call-context-query-executor';
+import type { DataflowGraphVertexFunctionCall } from '../../../dataflow/graph/vertex';
+import type { ReadonlyFlowrAnalysisProvider } from '../../../project/flowr-analyzer';
+/**
+ * This facade selects the appropriate link-to relation identification function
+ * based on the type of link-to relation specified.
+ */
+export declare function identifyLinkToRelation(from: NodeId, analyzer: ReadonlyFlowrAnalysisProvider, l: LinkTo | PromotedLinkTo, knownCalls?: Map<NodeId, Required<DataflowGraphVertexFunctionCall>>): Promise<NodeId[]>;

package/queries/catalog/call-context-query/identify-link-to-relation.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.identifyLinkToRelation = identifyLinkToRelation;
+const identify_link_to_last_call_relation_1 = require("./identify-link-to-last-call-relation");
+const identify_link_to_nested_call_relation_1 = require("./identify-link-to-nested-call-relation");
+const assert_1 = require("../../../util/assert");
+/**
+ * This facade selects the appropriate link-to relation identification function
+ * based on the type of link-to relation specified.
+ */
+async function identifyLinkToRelation(from, analyzer, l, knownCalls) {
+    switch (l.type) {
+        case 'link-to-last-call':
+            return (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(from, analyzer, l, knownCalls);
+        case 'link-to-nested-call':
+            return (0, identify_link_to_nested_call_relation_1.identifyLinkToNestedRelation)(from, analyzer, l);
+        default:
+            (0, assert_1.assertUnreachable)(l);
+    }
+}
+//# sourceMappingURL=identify-link-to-relation.js.map

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

@@ -36,12 +36,13 @@ async function executeDependenciesQuery({ analyzer, }, queries) {
     }
     const queryResults = functions.values().toArray().flat().length === 0 ? { kinds: {}, '.meta': { timing: 0 } } :
         await (0, query_1.executeQueriesOfSameType)(data, functions.entries().map(([c, f]) => makeCallContextQuery(f, c)).toArray().flat());
+    const g = (0, dependencies_query_format_1.getAllCategories)(queries);
     const results = Object.fromEntries(await Promise.all(functions.entries().map(async ([c, f]) => {
         const results = getResults(queries, { dataflow, config, normalize }, queryResults, c, f, data);
         // only default categories allow additional analyses, so we null-coalesce here!
         const enabled = query.enabledCategories;
         if (enabled === undefined || (enabled?.length > 0 && enabled.includes(c))) {
-            await dependencies_query_format_1.DefaultDependencyCategories[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
+            await g[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
         }
         return [c, results];
     })));

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

@@ -5,7 +5,7 @@ import { executeDependenciesQuery } from './dependencies-query-executor';
 import type { FunctionInfo } from './function-info/function-info';
 import type { CallContextQueryResult } from '../call-context-query/call-context-query-format';
 import type { Range } from 'semver';
-import type { AsyncOrSync } from 'ts-essentials';
+import type { AsyncOrSync, MarkOptional } from 'ts-essentials';
 import type { NamespaceInfo } from '../../../project/plugins/file-plugins/files/flowr-namespace-file';
 export declare const Unknown = "unknown";
 export interface DependencyCategorySettings {
@@ -13,6 +13,15 @@ export interface DependencyCategorySettings {
     functions: FunctionInfo[];
     /** this describes the global default value for this category, e.g., 'stdout' for write operations, please be aware, that this can be overwritten by a by-function default value */
     defaultValue?: string;
+    /**
+     * An optional additional analysis step that is executed after the main function-based analysis has been performed.
+     * To add or modify dependency info entries, simply modify the `result` array.
+     * @param data  - The basic query data.
+     * @param ignoreDefault - Whether the default functions were ignored.
+     * @param functions - The functions used for this category.
+     * @param queryResults - The results of the call context query.
+     * @param result - The current result array to which additional dependency info can be added.
+     */
     additionalAnalysis?: (data: BasicQueryData, ignoreDefault: boolean, functions: FunctionInfo[], queryResults: CallContextQueryResult, result: DependencyInfo[]) => AsyncOrSync<void>;
 }
 export declare const DefaultDependencyCategories: {
@@ -52,7 +61,7 @@ export interface DependenciesQuery extends BaseQueryFormat, Partial<Record<`${De
     readonly type: 'dependencies';
     readonly enabledCategories?: DependencyCategoryName[];
     readonly ignoreDefaultFunctions?: boolean;
-    readonly additionalCategories?: Record<string, Omit<DependencyCategorySettings, 'additionalAnalysis'>>;
+    readonly additionalCategories?: Record<string, MarkOptional<DependencyCategorySettings, 'additionalAnalysis'>>;
 }
 export type DependenciesQueryResult = BaseQueryResult & {
     [C in DefaultDependencyCategoryName]: DependencyInfo[];

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

@@ -84,7 +84,7 @@ function printResultSection(title, infos, result) {
     }, new Map());
     for (const [functionName, infos] of grouped) {
         result.push(`       ╰ \`${functionName}\``);
-        result.push(infos.map(i => `           ╰ Node Id: ${i.nodeId}${i.value !== undefined ? `, \`${i.value}\`` : ''}${i.derivedVersion !== undefined ? `, Version: \`${i.derivedVersion.format()}\`` : ''}`).join('\n'));
+        result.push(infos.map(i => `           ╰ Node Id: ${i.nodeId}${i.value !== undefined ? `, \`${i.value}\`` : ''}${i.derivedVersion !== undefined ? `, Version: \`${i.derivedVersion.format()}\`` : ''}${i.linkedIds ? `, linked: [${i.linkedIds.join(', ')}]` : ''}`).join('\n'));
     }
 }
 /**