Fix type to allow nested boolean filters

ItemConsulting · Oct 24, 2022 · aa1fd38 · aa1fd38
1 parent 85fe7bd
commit aa1fd38
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "enonic-types",
   "sideEffects": false,
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "TypeScript types for Enonic XP",
   "typings": "index.d.ts",
   "scripts": {

diff --git a/src/content.ts b/src/content.ts
@@ -287,7 +287,7 @@ declare module "*/lib/xp/content" {
       start?: number;
       count: number;
       query?: string | QueryDSL;
-      filters?: BasicFilters | BooleanFilter;
+      filters?: Filter | Filter[];
       aggregations?: Record<string, Aggregation>;
       contentTypes?: Array<string>;
       highlight?: Highlight;
@@ -474,13 +474,13 @@ declare module "*/lib/xp/content" {
       };
     }
 
-    export type BasicFilters = ExistsFilter | NotExistsFilter | HasValueFilter | IdsFilter;
+    export type Filter = ExistsFilter | NotExistsFilter | HasValueFilter | IdsFilter | BooleanFilter;
 
     export interface BooleanFilter {
       boolean: {
-        must?: BasicFilters | Array<BasicFilters>;
-        mustNot?: BasicFilters | Array<BasicFilters>;
-        should?: BasicFilters | Array<BasicFilters>;
+        must?: Filter[];
+        mustNot?: Filter[];
+        should?: Filter[];
       };
     }
 

diff --git a/src/node.ts b/src/node.ts
@@ -11,6 +11,8 @@ declare module "*/lib/xp/node" {
 
     export type PrincipalKey = import("/lib/xp/auth").PrincipalKey;
 
+    export type Filter = import("/lib/xp/content").Filter;
+
     export interface Source {
       repoId: string;
       branch: string;
@@ -82,7 +84,7 @@ declare module "*/lib/xp/node" {
       /**
        * Query filters
        */
-      filters?: import("/lib/xp/content").BasicFilters | import("/lib/xp/content").BooleanFilter;
+      filters?: Filter | Filter[];
 
       /**
        * Sorting expression.