Add default parameters for AggregationInput and Output #10101

`never` is used as the default type parameter for the `aggregation` properties in the different QueryParams. `undefined` is used as the default type parameter for `aggregations` in different query results. The reason `never` is not used is that since the property is not optional, we are not able to construct this object independently of the library functions. (cherry picked from commit 8d1c425)
enonic · Apr 5, 2023 · f6f273c · f6f273c
1 parent 6d21006
commit f6f273c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/modules/lib/lib-content/src/main/resources/lib/xp/content.ts b/modules/lib/lib-content/src/main/resources/lib/xp/content.ts
@@ -432,7 +432,7 @@ export {
 
 export interface ContentsResult<
     Hit extends Content<unknown>,
-    AggregationOutput extends Record<string, AggregationsResult>
+    AggregationOutput extends Record<string, AggregationsResult> | undefined = undefined
 > {
     total: number;
     count: number;
@@ -608,7 +608,7 @@ export function create<
     return __.toNativeObject(bean.execute<Data, Type>());
 }
 
-export interface QueryContentParams<AggregationInput extends Aggregations> {
+export interface QueryContentParams<AggregationInput extends Aggregations = never> {
     start?: number;
     count?: number;
     query?: QueryDsl | string;

diff --git a/modules/lib/lib-node/src/main/resources/lib/xp/node.ts b/modules/lib/lib-node/src/main/resources/lib/xp/node.ts
@@ -138,15 +138,15 @@ export interface SuggestionResult {
     }[];
 }
 
-export interface NodeQueryResult<AggregationOutput extends Record<string, AggregationsResult>> {
+export interface NodeQueryResult<AggregationOutput extends Record<string, AggregationsResult> | undefined = undefined> {
     total: number;
     count: number;
     hits: NodeQueryResultHit[];
     aggregations: AggregationOutput;
     suggestions?: Record<string, SuggestionResult[]>;
 }
 
-export interface NodeMultiRepoQueryResult<AggregationOutput extends Record<string, AggregationsResult>> {
+export interface NodeMultiRepoQueryResult<AggregationOutput extends Record<string, AggregationsResult> | undefined = undefined> {
     total: number;
     count: number;
     hits: (NodeQueryResultHit & {
@@ -346,7 +346,7 @@ export interface SetChildOrderParams {
     childOrder: string;
 }
 
-export interface QueryNodeParams<AggregationInput extends Aggregations> {
+export interface QueryNodeParams<AggregationInput extends Aggregations = never> {
     start?: number;
     count?: number;
     query?: QueryDsl | string;