@travetto/model-query 4.1.4 → 5.0.0-rc.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query",
-  "version": "4.1.4",
+  "version": "5.0.0-rc.0",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
     "datastore",
@@ -27,12 +27,12 @@
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/di": "^4.1.1",
-    "@travetto/model": "^4.1.3",
-    "@travetto/schema": "^4.1.1"
+    "@travetto/di": "^5.0.0-rc.0",
+    "@travetto/model": "^5.0.0-rc.0",
+    "@travetto/schema": "^5.0.0-rc.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^4.1.1"
+    "@travetto/test": "^5.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/internal/query/verifier.ts

@@ -1,5 +1,5 @@
-import { SchemaRegistry, ValidationResultError, ValidationError } from '@travetto/schema';
-import { Class, ObjectUtil } from '@travetto/base';
+import { DataUtil, SchemaRegistry, ValidationResultError, ValidationError } from '@travetto/schema';
+import { Class } from '@travetto/base';
 
 import { ModelQuery, Query, PageableModelQuery } from '../../model/query';
 
@@ -120,7 +120,7 @@ export class QueryVerifier {
       }
     }
 
-    if (!ObjectUtil.isPlainObject(value)) {
+    if (!DataUtil.isPlainObject(value)) {
       // Handle literal
       const actualType = TypeUtil.getActualType(value);
       if (!this.typesMatch(declaredType, actualType)) {
@@ -196,7 +196,7 @@ export class QueryVerifier {
             return true;
           }
         } else if (firstKey === '$not') {
-          if (ObjectUtil.isPlainObject(sub)) {
+          if (DataUtil.isPlainObject(sub)) {
             this.processWhereClause(state, cls, sub);
             return true;
           } else {

package/src/internal/service/query.ts

@@ -19,9 +19,8 @@ export class ModelQueryUtil {
    * @returns
    */
   static resolveComparator(val: unknown): unknown {
-    if (typeof val === 'string') {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      return TimeUtil.timeFromNow(val as '1m');
+    if (typeof val === 'string' && TimeUtil.isTimeSpan(val)) {
+      return TimeUtil.fromNow(val);
     } else {
       return val;
     }

package/src/model/where-clause.ts

@@ -1,4 +1,5 @@
-import { TimeSpan, Primitive } from '@travetto/base';
+import { TimeSpan } from '@travetto/base';
+import { Primitive } from '@travetto/schema';
 
 /**
  * Point as [number,number] with validation and binding support

package/support/test/query.ts

@@ -254,7 +254,7 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
   async verifyDateRange() {
     const service = await this.service;
     await this.saveAll(Aged, (['-5d', '-4d', '-3d', '-2d', '-1d', '0d', '1d', '2d', '3d', '4d', '5d'] as const).map(delta =>
-      Aged.from({ createdAt: TimeUtil.timeFromNow(delta) })
+      Aged.from({ createdAt: TimeUtil.fromNow(delta) })
     ));
 
     const simple = await service.queryCount(Aged, {
@@ -280,18 +280,18 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     const simple3 = await service.queryCount(Aged, {
       where: {
         createdAt: {
-          $gt: '-1d',
-          $lt: '3d'
+          $gt: '-.9d',
+          $lt: '2.9d'
         }
       }
     });
-    assert(simple3 === 4);
+    assert(simple3 === 3);
 
     const simple4 = await service.queryCount(Aged, {
       where: {
         createdAt: {
-          $gt: new Date(),
-          $lt: TimeUtil.timeFromNow('3d')
+          $gt: TimeUtil.fromNow('-0.1d'),
+          $lt: TimeUtil.fromNow('2.9d')
         }
       }
     });