lint(query): fix linting errors - #1107

Author: gigalasr

src/queries/catalog/resolve-value-query/resolve-value-query-executor.ts

@@ -1,8 +1,4 @@
 import type { ResolveValueQuery, ResolveValueQueryResult } from './resolve-value-query-format';
-import { staticSlicing } from '../../../slicing/static/static-slicer';
-import { reconstructToCode } from '../../../reconstruct/reconstruct';
-import { doNotAutoSelect } from '../../../reconstruct/auto-select/auto-select-defaults';
-import { makeMagicCommentHandler } from '../../../reconstruct/auto-select/magic-comments';
 import { log } from '../../../util/log';
 import type { BasicQueryData } from '../../base-query-format';
 import { slicingCriterionToId } from '../../../slicing/criterion/parse';
@@ -13,30 +9,33 @@ export function fingerPrintOfQuery(query: ResolveValueQuery): string {
 	return JSON.stringify(query);
 }
 
-export function executeResolveValueQuery({ dataflow: { graph, environment }, ast }: BasicQueryData, queries: readonly ResolveValueQuery[]): ResolveValueQueryResult {
+export function executeResolveValueQuery({ dataflow: { graph, environment } }: BasicQueryData, queries: readonly ResolveValueQuery[]): ResolveValueQueryResult {
+	const idMap = graph.idMap;
+
+	if(!idMap) {
+		throw new Error('idMap was undefined');
+	}
+
 	const start = Date.now();
-	const results: ResolveValueQueryResult['results'] = [];
+	const results: ResolveValueQueryResult['results'] = {};
 	for(const query of queries) {
 		const key = fingerPrintOfQuery(query);
 
 		if(results[key]) {
 			log.warn(`Duplicate Key for slicing-query: ${key}, skipping...`);
 		}
 
-		const ids = query.criteria.map(criteria => slicingCriterionToId(criteria, graph.idMap!));
+		const ids = query.criteria.map(criteria => slicingCriterionToId(criteria, idMap));
 		const values = new Set<unknown>();
 
-		const resolveStart = Date.now();
 		for(const id of ids) {
-			resolveToValues(recoverName(id, graph.idMap),  environment, graph)
-			?.forEach(values.add);
+			resolveToValues(recoverName(id, idMap),  environment, graph)
+				?.forEach(v => values.add(v));
 		}
-		const resolveEnd = Date.now();
 
 		results[key] = {
-			values: values.values(),
-			'.meta': { timing: resolveEnd - resolveStart }
-		}
+			values: [...values]
+		};
 	}
 	return {
 		'.meta': {

src/queries/catalog/resolve-value-query/resolve-value-query-format.ts

@@ -1,27 +1,22 @@
 import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
-import type { PipelineOutput } from '../../../core/steps/pipeline/pipeline';
-import type {
-	DEFAULT_DATAFLOW_PIPELINE, DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE,
-	DEFAULT_SLICING_PIPELINE
-} from '../../../core/steps/pipeline/default-pipelines';
+
 import type { SlicingCriteria } from '../../../slicing/criterion/parse';
 import type { QueryResults, SupportedQuery } from '../../query';
 import { bold } from '../../../util/ansi';
 import { printAsMs } from '../../../util/time';
 import Joi from 'joi';
 
-import { summarizeIdsIfTooLong } from '../../query-print';
 import { executeResolveValueQuery } from './resolve-value-query-executor';
 
 
 export interface ResolveValueQuery extends BaseQueryFormat {
-	readonly type:              'resolve-value';
+	readonly type:     'resolve-value';
 	/** The slicing criteria to use */
-	readonly criteria:          SlicingCriteria,
+	readonly criteria: SlicingCriteria,
 }
 
 export interface ResolveValueQueryResult extends BaseQueryResult {
-	results: Record<string, any>
+	results: Record<string, {values: unknown[]}>
 }
 
 export const ResolveValueQueryDefinition = {
@@ -37,7 +32,7 @@ export const ResolveValueQueryDefinition = {
 		return true;
 	},
 	schema: Joi.object({
-		type:             Joi.string().valid('resolve-value').required().description('The type of the query.'),
-		criteria:         Joi.array().items(Joi.string()).min(0).required().description('The slicing criteria to use.'),
+		type:     Joi.string().valid('resolve-value').required().description('The type of the query.'),
+		criteria: Joi.array().items(Joi.string()).min(0).required().description('The slicing criteria to use.'),
 	}).description('Resolve Value query used to get definitions of an identifier')
 } as const satisfies SupportedQuery<'resolve-value'>;

src/queries/query.ts

@@ -35,7 +35,8 @@ import type {
 import {
 	HappensBeforeQueryDefinition
 } from './catalog/happens-before-query/happens-before-query-format';
-import { ResolveValueQuery, ResolveValueQueryDefinition } from './catalog/resolve-value-query/resolve-value-query-format';
+import type { ResolveValueQuery } from './catalog/resolve-value-query/resolve-value-query-format';
+import { ResolveValueQueryDefinition } from './catalog/resolve-value-query/resolve-value-query-format';
 
 export type Query = CallContextQuery
 	| ConfigQuery
@@ -79,7 +80,7 @@ export const SupportedQueries = {
 	'location-map':     LocationMapQueryDefinition,
 	'search':           SearchQueryDefinition,
 	'happens-before':   HappensBeforeQueryDefinition,
-	'resolve-value': ResolveValueQueryDefinition
+	'resolve-value':    ResolveValueQueryDefinition
 } as const satisfies SupportedQueries;
 
 export type SupportedQueryTypes = keyof typeof SupportedQueries;