From f7b84ca7eab2d9be82ff84b9e620fc8318b96aec Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 23 Oct 2024 15:32:07 +0100 Subject: [PATCH] Fix some type skullduggery. --- packages/shared-core/src/filters.ts | 13 ++++++------- packages/shared-core/src/utils.ts | 5 ----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts index e6cab22911..003e6b5082 100644 --- a/packages/shared-core/src/filters.ts +++ b/packages/shared-core/src/filters.ts @@ -455,19 +455,18 @@ export function splitFiltersArray(filters: LegacyFilter[]) { * Legacy support remains for the old **SearchFilter[]** format. * These will be migrated to an appropriate **SearchFilters** object, if encountered */ -export function buildQuery(filter: undefined): undefined -export function buildQuery( - filter: UISearchFilter | LegacyFilter[] -): SearchFilters export function buildQuery( filter?: UISearchFilter | LegacyFilter[] -): SearchFilters | undefined { +): SearchFilters { if (!filter) { - return + return {} } if (Array.isArray(filter)) { - filter = processSearchFilters(filter) ?? [] + filter = processSearchFilters(filter) + if (!filter) { + return {} + } } const operator = logicalOperatorFromUI( diff --git a/packages/shared-core/src/utils.ts b/packages/shared-core/src/utils.ts index 01afbc2539..0e49db9c7c 100644 --- a/packages/shared-core/src/utils.ts +++ b/packages/shared-core/src/utils.ts @@ -139,11 +139,6 @@ export function isSupportedUserSearch(query: SearchFilters) { return true } -export function processSearchFilters(filterArray: undefined): undefined -export function processSearchFilters(filterArray: []): undefined -export function processSearchFilters( - filterArray: LegacyFilter[] -): Required export function processSearchFilters( filterArray?: LegacyFilter[] ): Required | undefined {