@travetto/model-query 3.1.7 → 3.1.9

package/README.md

@@ -158,7 +158,7 @@ One of the complexities of abstracting multiple storage mechanisms, is providing
 ### Array Fields
 
    *  `field: { $all: T[]] }` checks to see if the records value contains everything within `$all`
-   *  `field: { $empty: boolean }` to determine if an array is missing or is of zero length.  Due to the nature of this operation, this is only supported on lists at the top level of the document.
+   *  `field: { $empty: boolean }` to determine if an array is missing or is of zero length. 
 
 ### String Fields
 
@@ -167,7 +167,7 @@ One of the complexities of abstracting multiple storage mechanisms, is providing
 ### Geo Point Fields
 
    *  `field: { $geoWithin: Point[] }` determines if the value is within the bounding region of the points
-   *  `field: {$near: Point, $maxDistance: number, $unit: 'km' | 'm' | 'mi' | 'ft' }` searches at a point, and looks out radially
+   *  `field: { $near: Point, $maxDistance: number, $unit: 'km' | 'm' | 'mi' | 'ft' }` searches at a point, and looks out radially
 
 ### Groupings
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
     "datastore",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@travetto/di": "^3.1.1",
-    "@travetto/model": "^3.1.8",
-    "@travetto/schema": "^3.1.2"
+    "@travetto/model": "^3.1.9",
+    "@travetto/schema": "^3.1.3"
   },
   "peerDependencies": {
     "@travetto/test": "^3.1.1"

package/support/test/query.ts

@@ -5,7 +5,7 @@ import { BaseModelSuite } from '@travetto/model/support/test/base';
 import { ModelCrudSupport } from '@travetto/model/src/service/crud';
 import { TimeUtil } from '@travetto/base';
 
-import { Aged, Location, Names, Note, Person, SimpleList, WithNestedLists } from './types';
+import { Aged, Location, Names, Note, Person, SimpleList, WithNestedLists, WithNestedNestedLists } from './types';
 
 import { ModelQuerySupport } from '../../src/service/query';
 
@@ -368,5 +368,76 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
 
     assert(total === 1);
   }
+
+  @Test()
+  async verifyNestedArrayEmptyVsNot() {
+    const service = await this.service;
+    await service.create(WithNestedNestedLists, {
+      tags: ['a', 'b']
+    });
+
+    await service.create(WithNestedNestedLists, {
+      sub: { names: ['c', 'd'] },
+    });
+
+    await service.create(WithNestedNestedLists, {
+      sub: { names: ['c', 'd'] },
+      tags: ['e', 'f']
+    });
+
+    await service.create(WithNestedNestedLists, {
+      sub: { names: ['g', 'h'] },
+      tags: []
+    });
+
+    await service.create(WithNestedNestedLists, {
+      sub: {},
+      tags: []
+    });
+
+    let total = await service.queryCount(WithNestedNestedLists, {
+      where: {
+        sub: { names: { $empty: false } }
+      }
+    });
+    assert(total === 3);
+    total = await service.queryCount(WithNestedNestedLists, {
+      where: {
+        sub: { names: { $empty: true } }
+      }
+    });
+    assert(total === 2);
+
+    total = await service.queryCount(WithNestedNestedLists, {
+      where: {
+        tags: { $empty: true }
+      }
+    });
+    assert(total === 3);
+
+    total = await service.queryCount(WithNestedNestedLists, {
+      where: {
+        tags: { $empty: false }
+      }
+    });
+    assert(total === 2);
+
+    total = await service.queryCount(WithNestedNestedLists, {
+      where: {
+        tags: { $empty: true },
+        sub: { names: { $empty: true } }
+      }
+    });
+    assert(total === 1);
+
+    total = await service.queryCount(WithNestedNestedLists, {
+      where: {
+        tags: { $empty: false },
+        sub: { names: { $empty: false } }
+      }
+    });
+
+    assert(total === 1);
+  }
 }
 

package/support/test/types.ts

@@ -81,4 +81,16 @@ export class WithNestedLists {
   id: string;
   tags?: string[] = [];
   names?: string[] = [];
+}
+
+@Schema()
+class NamedSubNested {
+  names?: string[] = [];
+}
+
+@Model()
+export class WithNestedNestedLists {
+  id: string;
+  tags?: string[] = [];
+  sub?: NamedSubNested;
 }