@chevre/domain 21.15.0-alpha.0 → 21.15.0-alpha.1

package/example/src/chevre/aggregateAllEvents.ts

@@ -14,14 +14,18 @@ async function main() {
 
     const now = new Date();
 
-    const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>({
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        project: { id: { $eq: project.id } },
-        startFrom: now
-        // startFrom: moment().add(-1, 'day').toDate(),
-        // startThrough: moment().add(1, 'day').toDate(),
-        // startThrough: now
-    });
+    const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
+        {
+            typeOf: chevre.factory.eventType.ScreeningEvent,
+            project: { id: { $eq: project.id } },
+            startFrom: now
+            // startFrom: moment().add(-1, 'day').toDate(),
+            // startThrough: moment().add(1, 'day').toDate(),
+            // startThrough: now
+        },
+        [],
+        []
+    );
 
     // console.log(events);
     console.log(events.length);

package/example/src/chevre/searchEvents.ts

@@ -15,18 +15,16 @@ async function main() {
 
     const events = await eventRepo.search(
         {
-            // limit: 100,
-            // page: 1,
+            limit: 100,
+            page: 1,
             // sort: { startDate: 1 },
             // typeOf: chevre.factory.eventType.ScreeningEvent,
             project: { id: { $eq: PROJECT_ID } },
-            id: { $eq: 'al6aff83y' },
+            // id: { $eq: 'al6aff83y' },
             typeOfIn: [chevre.factory.eventType.Event, chevre.factory.eventType.ScreeningEvent]
         },
-        {
-            _id: 1
-            // name: 1
-        }
+        ['_id', 'name'],
+        []
     );
     console.log(events);
     console.log(events.length, 'events found');

package/lib/chevre/repo/event.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate<T extends factory.eventType> {
@@ -78,8 +78,8 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
-type IProjection<T extends factory.eventType> = {
-    [key in IKeyOfProjection<T>]?: 0 | 1;
+type IUnset<T extends factory.eventType> = {
+    [key in keyof factory.event.IEvent<T>]?: 1;
 };
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
 export declare const keyOfMinimizedScreeningEvent: IKeyOfProjection<factory.eventType.ScreeningEvent>[];
@@ -90,7 +90,7 @@ export declare const keyOfMinimizedEvent: IKeyOfProjection<factory.eventType.Eve
 export declare class MongoRepository {
     private readonly eventModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends factory.eventType>(conditions: ISearchConditions<T>): any[];
+    static CREATE_MONGO_CONDITIONS<T extends factory.eventType>(conditions: ISearchConditions<T>): FilterQuery<factory.event.IEvent<T>>[];
     /**
      * 複数イベントを作成する
      */
@@ -135,13 +135,13 @@ export declare class MongoRepository {
     save<T extends factory.eventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection<T>;
+        $unset?: IUnset<T>;
         upsert?: boolean;
     }): Promise<factory.event.IEvent<T>>;
     saveMany<T extends factory.eventType>(params: {
         id: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection<T>;
+        $unset?: IUnset<T>;
         upsert: boolean;
     }[]): Promise<void>;
     save4ttts(params: {
@@ -282,10 +282,10 @@ export declare class MongoRepository {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
-        filter: any;
-        $unset: any;
+        filter: FilterQuery<any>;
+        $unset: IUnset<any>;
     }): Promise<import("mongodb").UpdateResult>;
     /**
      * 既存施設コンテンツの最大バージョンを集計する

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.15.0-alpha.0"
+  "version": "21.15.0-alpha.1"
 }