From 2f2baf4b6513d671425296994c99bc5a9d790171 Mon Sep 17 00:00:00 2001 From: Vincenzo Scamporlino Date: Sat, 28 Jan 2023 00:04:46 +0100 Subject: [PATCH] catalog-client: remove undefined from GetPaginatedEntitiesInitialRequest Signed-off-by: Vincenzo Scamporlino --- packages/catalog-client/api-report.md | 16 +++++++--------- packages/catalog-client/src/CatalogClient.ts | 4 ++-- packages/catalog-client/src/types/api.ts | 16 +++++++--------- packages/catalog-client/src/utils.ts | 3 --- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/packages/catalog-client/api-report.md b/packages/catalog-client/api-report.md index 416f1bc4fd..47c6ff7f36 100644 --- a/packages/catalog-client/api-report.md +++ b/packages/catalog-client/api-report.md @@ -251,15 +251,13 @@ export type GetPaginatedEntitiesCursorRequest = { }; // @alpha -export type GetPaginatedEntitiesInitialRequest = - | { - fields?: string[]; - limit?: number; - filter?: EntityFilterQuery; - sortFields?: EntityOrderQuery; - query?: string; - } - | undefined; +export type GetPaginatedEntitiesInitialRequest = { + fields?: string[]; + limit?: number; + filter?: EntityFilterQuery; + sortFields?: EntityOrderQuery; + query?: string; +}; // @alpha export type GetPaginatedEntitiesRequest = diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts index ba410beb92..7347535ca6 100644 --- a/packages/catalog-client/src/CatalogClient.ts +++ b/packages/catalog-client/src/CatalogClient.ts @@ -211,13 +211,13 @@ export class CatalogClient implements CatalogApi { * @alpha */ async getPaginatedEntities?( - request?: GetPaginatedEntitiesRequest, + request: GetPaginatedEntitiesRequest = {}, options?: CatalogRequestOptions, ): Promise { const params: string[] = []; if (isPaginatedEntitiesInitialRequest(request)) { - const { fields = [], filter, limit, sortFields, query } = request ?? {}; + const { fields = [], filter, limit, sortFields, query } = request; params.push(...this.getParams(filter)); if (limit !== undefined) { diff --git a/packages/catalog-client/src/types/api.ts b/packages/catalog-client/src/types/api.ts index d6aeba5d1d..4e7f679072 100644 --- a/packages/catalog-client/src/types/api.ts +++ b/packages/catalog-client/src/types/api.ts @@ -396,15 +396,13 @@ export type GetPaginatedEntitiesRequest = * * @alpha */ -export type GetPaginatedEntitiesInitialRequest = - | { - fields?: string[]; - limit?: number; - filter?: EntityFilterQuery; - sortFields?: EntityOrderQuery; - query?: string; - } - | undefined; +export type GetPaginatedEntitiesInitialRequest = { + fields?: string[]; + limit?: number; + filter?: EntityFilterQuery; + sortFields?: EntityOrderQuery; + query?: string; +}; /** * A request type for {@link CatalogClient.getPaginatedEntities}. diff --git a/packages/catalog-client/src/utils.ts b/packages/catalog-client/src/utils.ts index 5a26053fb9..8a2eb9c06d 100644 --- a/packages/catalog-client/src/utils.ts +++ b/packages/catalog-client/src/utils.ts @@ -23,9 +23,6 @@ import { export function isPaginatedEntitiesInitialRequest( request: GetPaginatedEntitiesInitialRequest, ): request is GetPaginatedEntitiesInitialRequest { - if (!request) { - return true; - } return !(request as GetPaginatedEntitiesCursorRequest).cursor; }