feat-fix: disabled library category

Author: EagleoutIce

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

@@ -66,7 +66,10 @@ export async function executeDependenciesQuery({
 	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!
-		await (DefaultDependencyCategories as Record<string, DependencyCategorySettings>)[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
+		const enabled = query.enabledCategories;
+		if(enabled === undefined || (enabled?.length > 0 && enabled.includes(c))) {
+			await (DefaultDependencyCategories as Record<string, DependencyCategorySettings>)[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
+		}
 		return [c, results];
 	}))) as {[C in DependencyCategoryName]?: DependencyInfo[]};
 
@@ -237,7 +240,7 @@ function collectValuesFromLinks(args: Map<NodeId, Set<string|undefined>> | undef
 
 function getFunctionsToCheck(customFunctions: readonly FunctionInfo[] | undefined, functionFlag: DependencyCategoryName, enabled: DependencyCategoryName[] | undefined, ignoreDefaultFunctions: boolean, defaultFunctions: readonly FunctionInfo[]): FunctionInfo[] {
 	// "If unset or empty, all function types are searched for."
-	if(enabled?.length && enabled.indexOf(functionFlag) < 0) {
+	if(enabled !== undefined && (enabled?.length === 0 || enabled.indexOf(functionFlag) < 0)) {
 		return [];
 	}
 	let functions: FunctionInfo[] = ignoreDefaultFunctions ? [] : [...defaultFunctions];

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

@@ -158,7 +158,7 @@ export const DependenciesQueryDefinition = {
 		type:                   Joi.string().valid('dependencies').required().description('The type of the query.'),
 		ignoreDefaultFunctions: Joi.boolean().optional().description('Should the set of functions that are detected by default be ignored/skipped? Defaults to false.'),
 		...Object.fromEntries(Object.keys(DefaultDependencyCategories).map(c => [`${c}Functions`, functionInfoSchema.description(`The set of ${c} functions to search for.`)])),
-		enabledCategories:      Joi.array().optional().items(Joi.string()).description('A set of flags that determines what types of dependencies are searched for. If unset or empty, all dependency types are searched for.'),
+		enabledCategories:      Joi.array().optional().items(Joi.string()).description('A set of flags that determines what types of dependencies are searched for. If unset, all dependency types are searched for.'),
 		additionalCategories:   Joi.object().allow(Joi.object({
 			queryDisplayName: Joi.string().description('The display name in the query result.'),
 			functions:        functionInfoSchema.description('The functions that this additional category should search for.'),

test/functionality/dataflow/query/dependencies-query.test.ts

@@ -199,12 +199,13 @@ describe('Dependencies Query', withTreeSitter(parser => {
 			testQuery('Custom (by name)', 'custom.library(num1 = 1, num2 = 2, file = "my-custom-file")', expected, readCustomFile);
 			testQuery('Ignore default', 'library(testLibrary)', {}, { ignoreDefaultFunctions: true });
 			testQuery('Disabled', 'library(testLibrary)', {}, { enabledCategories: ['source', 'read', 'write'] });
+			testQuery('Disabled', 'a::dep', {}, { enabledCategories: [] });
 			testQuery('Enabled', 'library(testLibrary)', {
 				library: [{ nodeId: '1@library', functionName: 'library', value: 'testLibrary' }]
 			}, { enabledCategories: ['library'] });
 			testQuery('Empty enabled', 'library(testLibrary)', {
 				library: [{ nodeId: '1@library', functionName: 'library', value: 'testLibrary' }]
-			}, { enabledCategories: [] });
+			}, { enabledCategories: undefined });
 		});
 	});