@chevre/domain 24.0.0-alpha.75 → 24.0.0-alpha.77

package/lib/chevre/repo/action/actionProcess.d.ts

@@ -66,7 +66,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
     giveUp(params: {
         typeOf: TAction['typeOf'];
         id: string;
-        error: Error | Error[];
+        error: Error | Error[] | unknown;
         recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<void>;
     /**

package/lib/chevre/repo/action/actionProcess.js

@@ -32,6 +32,18 @@ exports.AVAILABLE_PROJECT_FIELDS = [
     'target',
     'identifier'
 ];
+// 内部で正規化関数を定義（または外部ヘルパーを呼び出す）
+function unknown2actionError(e) {
+    if (e instanceof Error) {
+        // Errorオブジェクトの場合は、既存のロジック通り展開
+        return { ...e, name: e.name, message: e.message };
+    }
+    else {
+        // Error以外（文字列など）が投げられた場合のハンドリング
+        return { name: 'UnknownError', message: String(e) };
+    }
+}
+;
 /**
  * アクション状態管理リポジトリ
  */
@@ -535,9 +547,12 @@ class ActionProcessRepo {
      * アクション失敗
      */
     async giveUp(params) {
-        const actionError = (Array.isArray(params.error))
-            ? params.error.map((e) => ({ ...e, message: e.message, name: e.name }))
-            : { ...params.error, message: params.error.message, name: params.error.name };
+        // const actionError: IActionError | IActionError[] = (Array.isArray(params.error))
+        //     ? params.error.map((e) => ({ ...e, message: e.message, name: e.name }))
+        //     : { ...params.error, message: params.error.message, name: params.error.name };
+        const actionError = Array.isArray(params.error)
+            ? params.error.map(unknown2actionError)
+            : unknown2actionError(params.error);
         if (params.recipe?.typeOf === 'Recipe') {
             await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
         }

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

@@ -1,6 +1,11 @@
 import type { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
-import type { ICallResult, ICallableTaskOperation, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
+import type { ICallResult, ICallableTaskOperation, ICallableTaskOperationSimple, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
+export declare const taskLoader: {
+    load: (taskName: string) => Promise<{
+        call: ICallableTaskOperationSimple | ICallableTaskOperation;
+    }>;
+};
 /**
  * タスクを実行する
  */

package/lib/chevre/service/taskHandler.js

@@ -3,12 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskLoader = void 0;
 exports.executeTask = executeTask;
 const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./taskHandler/onOperationFailed");
 const debug = (0, debug_1.default)('chevre-domain:service:taskHandler');
+exports.taskLoader = {
+    load: (taskName) => {
+        return import(`./task/${taskName}.js`);
+    }
+};
 /**
  * タスクを実行する
  */
@@ -36,7 +42,10 @@ function executeTask(task, next) {
             }
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             let callResult;
-            const { call } = await import(`./task/${task.name}`);
+            // const { call } = await import(`./task/${task.name}.js`) as {
+            //     call: ICallableTaskOperationSimple | ICallableTaskOperation;
+            // };
+            const { call } = await exports.taskLoader.load(task.name); // testが書きづらいのでtaskLoader経由で呼ぶ
             switch (task.name) {
                 case factory_1.factory.taskName.AcceptCOAOffer:
                 case factory_1.factory.taskName.AggregateOnSystem:

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.75"
+  "version": "24.0.0-alpha.77"
 }