@ez4/database 0.13.0 → 0.14.0

package/dist/services/database.d.ts

@@ -42,11 +42,11 @@ export declare namespace Database {
          */
         handler: (change: StreamChange<T>, context: Service.Context<Service<any>>) => void | Promise<void>;
         /**
-         * Variables associated to the route.
+         * Variables associated to the handler.
          */
         variables?: LinkedVariables;
         /**
-         * Max route execution time (in seconds) for the handler.
+         * Max execution time (in seconds) for the handler.
          */
         timeout?: number;
         /**

package/dist/services/query.d.ts

@@ -2,7 +2,7 @@ import type { RelationMetadata } from './relations.js';
 import type { Database } from './database.js';
 import type { Order } from './order.js';
 import type { DecomposeIndexName, DecomposePrimaryIndexNames, DecomposeUniqueIndexNames } from './indexes.js';
-import type { AnyObject, PartialProperties, PartialObject, FlatObject, OptionalObject, StrictObject, IsNullable, IsObjectEmpty, IsObject } from '@ez4/utils';
+import type { AnyObject, PartialProperties, PartialObject, FlatObject, OptionalObject, StrictObject, IsNullable, IsObjectEmpty, IsObject, IsArray } from '@ez4/utils';
 /**
  * Query builder types.
  */
@@ -82,13 +82,13 @@ export declare namespace Query {
         [P in DecomposeIndexName<keyof I>]?: Order;
     };
     export type WhereInput<T extends Database.Schema, I extends Database.Indexes<T>, R extends RelationMetadata> = WhereInputFilters<T, I, R> & WhereNot<WhereInputFilters<T, I, R>> & WhereAnd<WhereInputFilters<T, I, R>> & WhereOr<WhereInputFilters<T, I, R>>;
-    export type WhereOperators = keyof (WhereNegate<any> & WhereEqual<any> & WhereGreaterThan<any> & WhereGreaterThanOrEqual<any> & WhereLessThan<any> & WhereLessThanOrEqual<any> & WhereIn<any> & WhereBetween<any> & WhereIsMissing & WhereIsNull & WhereStartsWith & WhereContains);
+    export type WhereOperators = keyof (WhereNegate<any> & WhereEqual<any> & WhereGreaterThan<any> & WhereGreaterThanOrEqual<any> & WhereLessThan<any> & WhereLessThanOrEqual<any> & WhereIn<any> & WhereBetween<any> & WhereIsMissing & WhereIsNull & WhereStartsWith & WhereContains<any>);
     type IndexFields<R extends RelationMetadata> = string extends R['indexes'] ? never : R['indexes'];
     type SelectFields<T extends Database.Schema, R extends RelationMetadata> = IsObjectEmpty<R['selects']> extends true ? T : T & R['selects'];
     type IncludeFilters<T extends AnyObject, S extends AnyObject> = {
         [P in keyof T]?: P extends keyof S ? IsObject<T[P]> extends true ? null | WhereRelationField<NonNullable<T[P]>> : never : never;
     };
-    type WhereOperations<T> = WhereNegate<T> | WhereEqual<T> | WhereGreaterThan<T> | WhereGreaterThanOrEqual<T> | WhereLessThan<T> | WhereLessThanOrEqual<T> | WhereIn<T> | WhereBetween<T> | WhereIsMissing | WhereIsNull | WhereStartsWith | WhereContains;
+    type WhereOperations<T> = WhereNegate<T> | WhereEqual<T> | WhereGreaterThan<T> | WhereGreaterThanOrEqual<T> | WhereLessThan<T> | WhereLessThanOrEqual<T> | WhereIn<T> | WhereBetween<T> | WhereIsMissing | WhereIsNull | WhereStartsWith | WhereContains<T>;
     type WhereField<T> = IsObject<T> extends false ? T | WhereOperations<T> : IsNullable<T> extends true ? null | WhereObjectField<NonNullable<T>> : WhereObjectField<NonNullable<T>>;
     type WhereObjectField<T extends AnyObject> = {
         [P in keyof T]?: WhereField<T[P]>;
@@ -133,7 +133,7 @@ export declare namespace Query {
         lte: T;
     };
     type WhereIn<T> = {
-        isIn: T[];
+        isIn: IsArray<T> extends true ? T : IsObject<T> extends true ? T : T[];
     };
     type WhereBetween<T> = {
         isBetween: [T, T];
@@ -147,8 +147,8 @@ export declare namespace Query {
     type WhereStartsWith = {
         startsWith: string;
     };
-    type WhereContains = {
-        contains: string;
+    type WhereContains<T> = {
+        contains: IsObject<T> extends true ? Partial<T> : T;
     };
     export {};
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/database",
   "description": "EZ4: Components to build database services",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -42,10 +42,10 @@
     "live:publish": "npm run test && npm publish --access public"
   },
   "dependencies": {
-    "@ez4/common": "^0.13.0",
-    "@ez4/project": "^0.13.0",
-    "@ez4/reflection": "^0.13.0",
-    "@ez4/schema": "^0.13.0",
-    "@ez4/utils": "^0.13.0"
+    "@ez4/common": "^0.14.0",
+    "@ez4/project": "^0.14.0",
+    "@ez4/reflection": "^0.14.0",
+    "@ez4/schema": "^0.14.0",
+    "@ez4/utils": "^0.14.0"
   }
 }