@chevre/domain 22.10.0-alpha.17 → 22.10.0-alpha.18

package/lib/chevre/eventEmitter/task.d.ts

@@ -1,20 +1,32 @@
 import { EventEmitter } from 'events';
+import type { Connection } from 'mongoose';
+import type { RedisClientType } from 'redis';
 import * as factory from '../factory';
-type ICustomFunction = () => Promise<void>;
+interface IExecuteSettings {
+    /**
+     * MongoDBコネクション
+     */
+    connection: Connection;
+    /**
+     * Redisクライアント
+     */
+    redisClient?: RedisClientType;
+}
+type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
+type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id'>) => IOperationExecute<void>;
 interface IListenArgsOnTaskStatusChanged {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready | factory.taskStatus.Running;
     expires?: Date;
-    customFunction?: ICustomFunction;
 }
-type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged) => void;
+type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged, next: INextFunction) => void;
 /**
  * タスクイベントエミッター
  */
 declare class TaskEventEmitter extends EventEmitter {
     onTaskStatusChanged(listner: IOnTaskStatusChangedListener): void;
-    emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged): void;
+    emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged, next?: INextFunction): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { ICustomFunction, IListenArgsOnTaskStatusChanged, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IExecuteSettings, INextFunction, IListenArgsOnTaskStatusChanged, IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/eventEmitter/task.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskEventEmitter = void 0;
 const events_1 = require("events");
@@ -6,6 +15,11 @@ var EventName;
 (function (EventName) {
     EventName["OnTaskStatusChanged"] = "OnTaskStatusChanged";
 })(EventName || (EventName = {}));
+const defaultNextFunction = () => {
+    return () => __awaiter(void 0, void 0, void 0, function* () {
+        // no op
+    });
+};
 /**
  * タスクイベントエミッター
  */
@@ -13,8 +27,9 @@ class TaskEventEmitter extends events_1.EventEmitter {
     onTaskStatusChanged(listner) {
         this.on(EventName.OnTaskStatusChanged, listner);
     }
-    emitTaskStatusChanged(args) {
-        this.emit(EventName.OnTaskStatusChanged, args);
+    // support next function required(2025-05-25~)
+    emitTaskStatusChanged(args, next) {
+        this.emit(EventName.OnTaskStatusChanged, args, (typeof next === 'function') ? next : defaultNextFunction);
     }
 }
 const taskEventEmitter = new TaskEventEmitter();

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

@@ -1,5 +1,5 @@
 import type { AnyKeys, Connection, FilterQuery, ProjectionType, UpdateWriteOpResult } from 'mongoose';
-import { IListenArgsOnTaskStatusChanged } from '../eventEmitter/task';
+import { INextFunction } from '../eventEmitter/task';
 import * as factory from '../factory';
 import { IModel } from './mongoose/schemas/task';
 interface IAggregationByStatus {
@@ -38,7 +38,7 @@ export declare class TaskRepo {
         alternateName?: never;
         identifier?: never;
         expires: Date;
-    }, options: Pick<IListenArgsOnTaskStatusChanged, 'customFunction'>): Promise<{
+    }, next: INextFunction): Promise<{
         id: string;
     }>;
     saveMany(taskAttributes: ICreatingTask[], options: IOptionOnCreate): Promise<{

package/lib/chevre/repo/task.js

@@ -158,7 +158,7 @@ class TaskRepo {
     // resolve uniqueness of identifier(2025-03-27~)
     params, 
     // support customr function(2025-05-25~)
-    options) {
+    next) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const { expires } = params;
@@ -171,7 +171,11 @@ class TaskRepo {
             if (typeof id !== 'string') {
                 throw new factory.errors.Internal('task not saved');
             }
-            task_1.taskEventEmitter.emitTaskStatusChanged(Object.assign({ id, status: factory.taskStatus.Ready, expires }, (typeof options.customFunction === 'function') ? { customFunction: options.customFunction } : undefined));
+            task_1.taskEventEmitter.emitTaskStatusChanged({
+                id,
+                status: factory.taskStatus.Ready,
+                expires // emit expires(2025-03-31~)
+            }, next);
             return { id };
         });
     }

package/lib/chevre/service/task.d.ts

@@ -1,6 +1,5 @@
-import type { Connection } from 'mongoose';
-import type { RedisClientType } from 'redis';
 import { SendGridCredentials } from '../credentials/sendGrid';
+import type { IExecuteSettings as IMinimumExecuteSettings } from '../eventEmitter/task';
 import * as factory from '../factory';
 import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
@@ -8,15 +7,7 @@ import { AggregationSettings } from '../settings/aggregation';
 interface ICredentialSettings {
     sendGrid: SendGridCredentials;
 }
-interface IExecuteSettings {
-    /**
-     * MongoDBコネクション
-     */
-    connection: Connection;
-    /**
-     * Redisクライアント
-     */
-    redisClient?: RedisClientType;
+interface IExecuteSettings extends IMinimumExecuteSettings {
     credentials: ICredentialSettings;
     settings: Settings;
     aggregationSettings?: AggregationSettings;

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.10.0-alpha.17"
+  "version": "22.10.0-alpha.18"
 }