@chevre/domain 24.1.0-alpha.37 → 24.1.0-alpha.39

package/lib/chevre/credentials.d.ts

@@ -1,20 +1,8 @@
-import type { CustomSearchCredentials } from './credentials/customSearch';
-import type { LINENotifyCredentials } from './credentials/lineNotify';
-import type { SendGridCredentials } from './credentials/sendGrid';
 /**
  * 外部サービス認証情報
  */
-export declare namespace credentials {
-    type CustomSearch = CustomSearchCredentials;
-    namespace CustomSearch {
-        function createInstance(...params: ConstructorParameters<typeof CustomSearchCredentials>): Promise<CustomSearchCredentials>;
-    }
-    type LINENotify = LINENotifyCredentials;
-    namespace LINENotify {
-        function createInstance(...params: ConstructorParameters<typeof LINENotifyCredentials>): Promise<LINENotifyCredentials>;
-    }
-    type SendGrid = SendGridCredentials;
-    namespace SendGrid {
-        function createInstance(...params: ConstructorParameters<typeof SendGridCredentials>): Promise<SendGridCredentials>;
-    }
+import type { SendGridCredentials } from './credentials/sendGrid';
+export type SendGrid = SendGridCredentials;
+export declare namespace SendGrid {
+    function createInstance(...params: ConstructorParameters<typeof SendGridCredentials>): Promise<SendGridCredentials>;
 }

package/lib/chevre/credentials.js

@@ -1,42 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.credentials = void 0;
-/**
- * 外部サービス認証情報
- */
-var credentials;
-(function (credentials) {
-    let CustomSearch;
-    (function (CustomSearch) {
-        let cred;
-        async function createInstance(...params) {
-            if (cred === undefined) {
-                cred = (await import('./credentials/customSearch.js')).CustomSearchCredentials;
-            }
-            return new cred(...params);
+exports.SendGrid = void 0;
+var SendGrid;
+(function (SendGrid) {
+    let cred;
+    async function createInstance(...params) {
+        if (cred === undefined) {
+            cred = (await import('./credentials/sendGrid.js')).SendGridCredentials;
         }
-        CustomSearch.createInstance = createInstance;
-    })(CustomSearch = credentials.CustomSearch || (credentials.CustomSearch = {}));
-    let LINENotify;
-    (function (LINENotify) {
-        let cred;
-        async function createInstance(...params) {
-            if (cred === undefined) {
-                cred = (await import('./credentials/lineNotify.js')).LINENotifyCredentials;
-            }
-            return new cred(...params);
-        }
-        LINENotify.createInstance = createInstance;
-    })(LINENotify = credentials.LINENotify || (credentials.LINENotify = {}));
-    let SendGrid;
-    (function (SendGrid) {
-        let cred;
-        async function createInstance(...params) {
-            if (cred === undefined) {
-                cred = (await import('./credentials/sendGrid.js')).SendGridCredentials;
-            }
-            return new cred(...params);
-        }
-        SendGrid.createInstance = createInstance;
-    })(SendGrid = credentials.SendGrid || (credentials.SendGrid = {}));
-})(credentials || (exports.credentials = credentials = {}));
+        return new cred(...params);
+    }
+    SendGrid.createInstance = createInstance;
+})(SendGrid || (exports.SendGrid = SendGrid = {}));

package/lib/chevre/emailMessageBuilder.js

@@ -93,9 +93,7 @@ async function createEmailMessageAbout(params) {
     }
     return about;
 }
-function createEmailMessageSender(params, 
-// settings: Settings
-setting) {
+function createEmailMessageSender(params, setting) {
     if (typeof setting.defaultSenderEmail !== 'string') {
         throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
     }
@@ -113,9 +111,7 @@ setting) {
 /**
  * 注文配送メッセージを作成する
  */
-async function createSendOrderMessage(params, 
-// settings: Settings
-setting) {
+async function createSendOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
@@ -169,9 +165,7 @@ setting) {
 /**
  * 注文返品メッセージを作成する
  */
-async function createReturnOrderMessage(params, 
-// settings: Settings
-setting) {
+async function createReturnOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
@@ -225,9 +219,7 @@ setting) {
 /**
  * 返金メッセージを作成する
  */
-async function createRefundMessage(params, 
-// settings: Settings
-setting) {
+async function createRefundMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email

package/lib/chevre/index.d.ts

@@ -1,4 +1,4 @@
-import { credentials } from './credentials';
+import * as credentials from './credentials';
 import * as errorHandler from './errorHandler';
 import * as eventEmitter from './eventEmitter';
 import { factory } from './factory';

package/lib/chevre/index.js

@@ -34,8 +34,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskSettings = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
-const credentials_1 = require("./credentials");
-Object.defineProperty(exports, "credentials", { enumerable: true, get: function () { return credentials_1.credentials; } });
+const credentials = __importStar(require("./credentials"));
+exports.credentials = credentials;
 const errorHandler = __importStar(require("./errorHandler"));
 exports.errorHandler = errorHandler;
 const eventEmitter = __importStar(require("./eventEmitter"));

package/lib/chevre/service/notification/notifyByEmail.js

@@ -5,12 +5,6 @@ const client_1 = require("@sendgrid/client");
 const http_status_1 = require("http-status");
 const util_1 = require("util");
 const factory_1 = require("../../factory");
-// type ILineNotifyOperation<T> = (
-//     repos: undefined,
-//     credentials: {
-//         lineNotify: LINENotifyCredentials;
-//     }
-// ) => Promise<T>;
 function notifyByEmail(params) {
     return async (__, credentials) => {
         const { logLevel } = params;

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

@@ -1,14 +1,12 @@
 import { SendGridCredentials } from '../credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import { factory } from '../factory';
-import type { IntegrationSettingRepo as Settings } from '../repo/setting/integration';
 import type { AggregationSettings } from '../taskSettings';
 interface ICredentialSettings {
     sendGrid: SendGridCredentials;
 }
 interface IExecuteSettings extends IMinimumExecuteSettings {
     credentials: ICredentialSettings;
-    settings: Settings;
     aggregationSettings?: AggregationSettings;
 }
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;

package/lib/chevre/service/task.js

@@ -17,6 +17,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 function executeById(params, next) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         const { id, status, executor, expires } = params;
         let task = null;
         try {
@@ -34,7 +35,10 @@ function executeById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
+            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)({
+                ...settings,
+                settings: integrationSettingRepo
+            }, {
                 executeById: true,
                 executeByName: false
             });
@@ -44,6 +48,7 @@ function executeById(params, next) {
 function executeOneIfExists(params) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         // 未実行のタスクを取得
         let task = null;
         try {
@@ -61,7 +66,10 @@ function executeOneIfExists(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task)(settings, {
+            await (0, taskHandler_1.executeTask)(task)({
+                ...settings,
+                settings: integrationSettingRepo
+            }, {
                 executeById: false,
                 executeByName: (typeof params.name?.$eq === 'string')
             });

package/lib/chevre/taskSettings.d.ts

@@ -1,7 +1,7 @@
 import type { SendGridCredentials } from './credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings } from './eventEmitter/task';
 import { factory } from './factory';
-import type { IntegrationSettingRepo as Settings } from './repo/setting/integration';
+import type { IntegrationSettingRepo } from './repo/setting/integration';
 interface IOnOrderStatusChanged {
     informOrder2hub?: factory.project.IInformParams[];
 }
@@ -39,7 +39,10 @@ interface ICredentialSettings {
 }
 interface IExecuteSettings extends IMinimumExecuteSettings {
     credentials: ICredentialSettings;
-    settings: Settings;
+    /**
+     * 外部連携設定リポジトリ
+     */
+    settings: IntegrationSettingRepo;
     aggregationSettings?: AggregationSettings;
 }
 interface IExecuteOptions {

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.37"
+  "version": "24.1.0-alpha.39"
 }

package/lib/chevre/credentials/customSearch.d.ts

@@ -1,13 +0,0 @@
-interface IOptions {
-    engineId: string;
-    apiKey: string;
-}
-/**
- * GoogleCustomSearch認証情報
- */
-declare class CustomSearchCredentials {
-    readonly engineId: string;
-    readonly apiKey: string;
-    constructor(options: IOptions);
-}
-export { CustomSearchCredentials };

package/lib/chevre/credentials/customSearch.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomSearchCredentials = void 0;
-/**
- * GoogleCustomSearch認証情報
- */
-class CustomSearchCredentials {
-    engineId;
-    apiKey;
-    constructor(options) {
-        const { engineId, apiKey } = options;
-        this.engineId = engineId;
-        this.apiKey = apiKey;
-    }
-}
-exports.CustomSearchCredentials = CustomSearchCredentials;

package/lib/chevre/credentials/lineNotify.d.ts

@@ -1,17 +0,0 @@
-interface IOptions {
-    url: string;
-    accessToken: string;
-    accessTokenAlert: string;
-    accessTokenInfo: string;
-}
-/**
- * 通知認証情報
- */
-declare class LINENotifyCredentials {
-    readonly url: string;
-    readonly accessToken: string;
-    readonly accessTokenAlert: string;
-    readonly accessTokenInfo: string;
-    constructor(options: IOptions);
-}
-export { LINENotifyCredentials };

package/lib/chevre/credentials/lineNotify.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LINENotifyCredentials = void 0;
-/**
- * 通知認証情報
- */
-class LINENotifyCredentials {
-    url;
-    accessToken;
-    accessTokenAlert;
-    accessTokenInfo;
-    constructor(options) {
-        const { url, accessToken, accessTokenAlert, accessTokenInfo } = options;
-        this.url = url;
-        this.accessToken = accessToken;
-        this.accessTokenAlert = accessTokenAlert;
-        this.accessTokenInfo = accessTokenInfo;
-    }
-}
-exports.LINENotifyCredentials = LINENotifyCredentials;