@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.71

package/lib/chevre/service/payment/creditCard/authorize/handleAuthorizeError.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleAuthorizeError = handleAuthorizeError;
 const debug_1 = __importDefault(require("debug"));
 const http_status_1 = require("http-status");
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:payment');
 function handleAuthorizeError(error) {
     debug('handling creditCard authorizeError:', error);
@@ -42,28 +19,30 @@ function handleAuthorizeError(error) {
             // オーダーID重複エラーの場合
             const duplicateError = gmoErrors.find((gmoError) => gmoError.info?.match(/^E01040010$/));
             if (serviceUnavailableError !== undefined) {
-                handledError = new factory.errors.RateLimitExceeded(serviceUnavailableError.userMessage);
+                handledError = new factory_1.factory.errors.RateLimitExceeded(serviceUnavailableError.userMessage);
             }
             else if (duplicateError !== undefined) {
-                handledError = new factory.errors.AlreadyInUse('payment', ['orderId'], duplicateError.userMessage);
+                handledError = new factory_1.factory.errors.AlreadyInUse('payment', ['orderId'], duplicateError.userMessage);
             }
             else {
                 const userMessages = gmoErrors.map((gmoError) => gmoError.userMessage)
                     .join(',');
-                handledError = new factory.errors.Argument('payment', userMessages);
+                handledError = new factory_1.factory.errors.Argument('payment', userMessages);
             }
         }
         else {
             // その他の場合、なんらかのクライアントエラー
-            handledError = new factory.errors.Argument('payment', 'unexpected bad request');
+            handledError = new factory_1.factory.errors.Argument('payment', 'unexpected bad request');
         }
     }
     else if (error.name === 'RequestError') {
         // タイムアウト設定によって中止されたリクエストの場合
         // const uri: string | undefined = error.requestOptions?.uri;
-        handledError = new factory.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
+        handledError = new factory_1.factory.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
     }
-    else if (error.name === 'AbortError') {
+    else if (error.name === 'AbortError'
+        || error.name === 'TimeoutError' // native AbortSignalの場合(2026-04-07~)
+    ) {
         // タイムアウト設定によって中止されたリクエストの場合
         // AbortErrorハンドリング(2024-03-27~)
         // {
@@ -71,11 +50,11 @@ function handleAuthorizeError(error) {
         //     "message": "The user aborted a request.",
         //     "name": "AbortError"
         // }
-        handledError = new factory.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
+        handledError = new factory_1.factory.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
     }
     // 決済代行側が4xxを返却した場合
     if (typeof error.code === 'number' && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
-        handledError = new factory.errors.Argument('payment', `bad request code:${error.code} message:${error.message}`);
+        handledError = new factory_1.factory.errors.Argument('payment', `bad request code:${error.code} message:${error.message}`);
     }
     return handledError;
 }

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts

@@ -1,13 +1,18 @@
-import * as GMO from '@motionpicture/gmo-service';
-import { ActionRepo } from '../../../../repo/action';
-import * as factory from '../../../../factory';
+import { GMO } from '@motionpicture/gmo-service';
+import { AuthorizeInvoiceActionRepo } from '../../../../repo/action/authorizeInvoice';
+import { factory } from '../../../../factory';
 interface ICreditCardPaymentAgencyTransaction {
-    entryTranArgs: GMO.factory.credit.IEntryTranArgs;
-    entryTranResult: GMO.factory.credit.IEntryTranResult;
-    execTranArgs: GMO.factory.credit.IExecTranArgs;
-    execTranResult: GMO.factory.credit.IExecTranResult | GMO.factory.credit.IExecTran3dsResult;
+    entryTranArgs: GMO.factory.service.credit.IEntryTranArgs;
+    entryTranResult: GMO.factory.service.credit.IEntryTranResult;
+    execTranArgs: GMO.factory.service.credit.IExecTranArgs;
+    execTranResult: GMO.factory.service.credit.IExecTranResult | GMO.factory.service.credit.IExecTran3dsResult;
     secureTran2Result?: never;
 }
+interface IProcessAuthorizeCreditCardRepos {
+    action?: never;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
+    creditCardService: GMO.service.Credit;
+}
 declare function processAuthorizeCreditCard(params: {
     project: {
         id: string;
@@ -26,8 +31,5 @@ declare function processAuthorizeCreditCard(params: {
      * 決済URL発行処理かどうか
      */
     processPublishPaymentUrl: boolean;
-}): (repos: {
-    action: ActionRepo;
-    creditCardService: GMO.service.Credit;
-}) => Promise<ICreditCardPaymentAgencyTransaction>;
-export { ICreditCardPaymentAgencyTransaction, processAuthorizeCreditCard };
+}): (repos: IProcessAuthorizeCreditCardRepos) => Promise<ICreditCardPaymentAgencyTransaction>;
+export { ICreditCardPaymentAgencyTransaction, IProcessAuthorizeCreditCardRepos, processAuthorizeCreditCard };

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js

@@ -1,31 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAuthorizeCreditCard = processAuthorizeCreditCard;
-const GMO = __importStar(require("@motionpicture/gmo-service"));
-const factory = __importStar(require("../../../../factory"));
+const gmo_service_1 = require("@motionpicture/gmo-service");
+const factory_1 = require("../../../../factory");
 const processAuthorizeCreditCardResult2recipe_1 = require("./processAuthorizeCreditCardResult2recipe");
 function processAuthorizeCreditCard(params) {
     return async (repos) => {
@@ -35,7 +12,7 @@ function processAuthorizeCreditCard(params) {
         let execTranResult;
         const { shopId, shopPass, orderId } = params;
         const creditCard = params.object.creditCard;
-        const { cardSeq, memberId } = creditCard;
+        // const { cardSeq, memberId } = creditCard as IUnauthorizedCardOfMember; // 会員カード廃止(2026-04-07~)
         const { cardNo, cardPass, expire } = creditCard;
         const { token } = creditCard;
         const retUrl = creditCard?.retUrl;
@@ -45,24 +22,24 @@ function processAuthorizeCreditCard(params) {
             try {
                 returnUrlObject = new URL(retUrl);
             }
-            catch (error) {
-                throw new factory.errors.Argument('object.creditCard.retUrl', 'retUrl unparsable');
+            catch (_error) {
+                throw new factory_1.factory.errors.Argument('object.creditCard.retUrl', 'retUrl unparsable');
             }
             const returnUrlShouldBeIncluded = `${returnUrlObject.origin}${returnUrlObject.pathname}`;
             if (!params.returnUrls3ds.includes(returnUrlShouldBeIncluded)) {
-                throw new factory.errors.Argument('object.creditCard.retUrl', 'invalid returnUrl');
+                throw new factory_1.factory.errors.Argument('object.creditCard.retUrl', 'invalid returnUrl');
             }
             entryTranArgs = {
                 shopId, shopPass, orderId,
-                jobCd: GMO.utils.util.JobCd.Auth,
+                jobCd: gmo_service_1.GMO.factory.util.JobCd.Auth,
                 amount: (typeof params.object.amount === 'number')
                     ? params.object.amount
                     : params.object.amount.value,
                 // siteId: params.availableChannel.credentials?.siteId,
                 // sitePass: params.availableChannel.credentials?.sitePass,
-                tdFlag: GMO.utils.util.TdFlag.Version2,
+                tdFlag: gmo_service_1.GMO.factory.util.TdFlag.Version2,
                 // tdTenantName: '',
-                tds2Type: GMO.utils.util.Tds2Type.Error
+                tds2Type: gmo_service_1.GMO.factory.util.Tds2Type.Error
             };
             entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
             execTranArgs = {
@@ -72,22 +49,22 @@ function processAuthorizeCreditCard(params) {
                 method: params.object.method,
                 siteId: params.availableChannel.credentials?.siteId,
                 sitePass: params.availableChannel.credentials?.sitePass,
-                seqMode: GMO.utils.util.SeqMode.Physics,
+                seqMode: gmo_service_1.GMO.factory.util.SeqMode.Physics,
                 retUrl,
-                callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post,
+                callbackType: (params.callbackType3ds === 'GET') ? gmo_service_1.GMO.factory.util.CallbackType.Get : gmo_service_1.GMO.factory.util.CallbackType.Post,
                 ...(typeof cardNo === 'string') ? { cardNo } : undefined,
                 ...(typeof cardPass === 'string') ? { cardPass } : undefined,
                 ...(typeof expire === 'string') ? { expire } : undefined,
                 ...(typeof token === 'string') ? { token } : undefined,
-                ...(typeof memberId === 'string') ? { memberId } : undefined,
-                ...(typeof cardSeq === 'number') ? { cardSeq } : undefined
+                // ...(typeof memberId === 'string') ? { memberId } : undefined, // 会員カード廃止(2026-04-07~)
+                // ...(typeof cardSeq === 'number') ? { cardSeq } : undefined // 会員カード廃止(2026-04-07~)
             };
             execTranResult = await repos.creditCardService.execTran3ds(execTranArgs);
         }
         else {
             entryTranArgs = {
                 shopId, shopPass, orderId,
-                jobCd: GMO.utils.util.JobCd.Auth,
+                jobCd: gmo_service_1.GMO.factory.util.JobCd.Auth,
                 amount: (typeof params.object.amount === 'number')
                     ? params.object.amount
                     : params.object.amount.value,
@@ -99,17 +76,17 @@ function processAuthorizeCreditCard(params) {
                 result: { entryTranArgs }
             });
             const actionAttributes = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                typeOf: factory.actionType.AuthorizeAction,
-                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                typeOf: factory_1.factory.actionType.AuthorizeAction,
+                agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 object: {
                     paymentMethodId: orderId,
                     typeOf: 'Invoice'
                 },
-                sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
+                sameAs: { id: params.payTransaction.id, typeOf: factory_1.factory.assetTransactionType.Pay }
             };
             // add action(2024-06-12~)
-            const action = await repos.action.start(actionAttributes, { recipe });
+            const action = await repos.authorizeInvoiceAction.start(actionAttributes, { recipe });
             try {
                 entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
                 execTranArgs = {
@@ -119,19 +96,19 @@ function processAuthorizeCreditCard(params) {
                     method: params.object.method,
                     siteId: params.availableChannel.credentials?.siteId,
                     sitePass: params.availableChannel.credentials?.sitePass,
-                    seqMode: GMO.utils.util.SeqMode.Physics,
+                    seqMode: gmo_service_1.GMO.factory.util.SeqMode.Physics,
                     ...(typeof cardNo === 'string') ? { cardNo } : undefined,
                     ...(typeof cardPass === 'string') ? { cardPass } : undefined,
                     ...(typeof expire === 'string') ? { expire } : undefined,
                     ...(typeof token === 'string') ? { token } : undefined,
-                    ...(typeof memberId === 'string') ? { memberId } : undefined,
-                    ...(typeof cardSeq === 'number') ? { cardSeq } : undefined
+                    // ...(typeof memberId === 'string') ? { memberId } : undefined, // 会員カード廃止(2026-04-07~)
+                    // ...(typeof cardSeq === 'number') ? { cardSeq } : undefined // 会員カード廃止(2026-04-07~)
                 };
                 execTranResult = await repos.creditCardService.execTran(execTranArgs);
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                    await repos.authorizeInvoiceAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -146,7 +123,7 @@ function processAuthorizeCreditCard(params) {
                 }
             });
             const actionResult = {};
-            await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+            await repos.authorizeInvoiceAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
     };

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.d.ts

@@ -1,12 +1,17 @@
-import type * as GMO from '@motionpicture/gmo-service';
-import { ActionRepo } from '../../../../repo/action';
-import * as factory from '../../../../factory';
+import type { GMO } from '@motionpicture/gmo-service';
+import { AuthorizeInvoiceActionRepo } from '../../../../repo/action/authorizeInvoice';
+import { factory } from '../../../../factory';
 interface ICreditCardPaymentAgencyTransaction3ds {
-    entryTranArgs: GMO.factory.credit.IEntryTranArgs;
-    entryTranResult: GMO.factory.credit.IEntryTranResult;
-    execTranArgs: GMO.factory.credit.IExecTranArgs;
-    execTranResult: GMO.factory.credit.IExecTranResult | GMO.factory.credit.IExecTran3dsResult;
-    secureTran2Result: GMO.factory.credit.ISecureTran2Result;
+    entryTranArgs: GMO.factory.service.credit.IEntryTranArgs;
+    entryTranResult: GMO.factory.service.credit.IEntryTranResult;
+    execTranArgs: GMO.factory.service.credit.IExecTranArgs;
+    execTranResult: GMO.factory.service.credit.IExecTranResult | GMO.factory.service.credit.IExecTran3dsResult;
+    secureTran2Result: GMO.factory.service.credit.ISecureTran2Result;
+}
+interface IProcessAuthorizeCreditCard3dsRepos {
+    action?: never;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
+    creditCardService: GMO.service.Credit;
 }
 declare function processAuthorizeCreditCard3ds(params: {
     project: {
@@ -17,8 +22,5 @@ declare function processAuthorizeCreditCard3ds(params: {
     };
     availableChannel: Pick<factory.serviceChannel.IServiceChannelCreditCard, 'credentials' | 'serviceUrl'>;
     pendingPaymentAgencyTransaction: Pick<ICreditCardPaymentAgencyTransaction3ds, 'entryTranArgs' | 'entryTranResult' | 'execTranArgs' | 'execTranResult'>;
-}): (repos: {
-    action: ActionRepo;
-    creditCardService: GMO.service.Credit;
-}) => Promise<ICreditCardPaymentAgencyTransaction3ds>;
-export { ICreditCardPaymentAgencyTransaction3ds, processAuthorizeCreditCard3ds };
+}): (repos: IProcessAuthorizeCreditCard3dsRepos) => Promise<ICreditCardPaymentAgencyTransaction3ds>;
+export { IProcessAuthorizeCreditCard3dsRepos, ICreditCardPaymentAgencyTransaction3ds, processAuthorizeCreditCard3ds };

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.js

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAuthorizeCreditCard3ds = processAuthorizeCreditCard3ds;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 const processAuthorizeCreditCard3dsResult2recipe_1 = require("./processAuthorizeCreditCard3dsResult2recipe");
 function processAuthorizeCreditCard3ds(params) {
     return async (repos) => {
@@ -37,23 +14,23 @@ function processAuthorizeCreditCard3ds(params) {
             result: { secureTran2Args }
         });
         const actionAttributes = {
-            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-            typeOf: factory.actionType.AuthorizeAction,
-            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+            typeOf: factory_1.factory.actionType.AuthorizeAction,
+            agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             object: {
                 paymentMethodId: entryTranArgs.orderId,
                 typeOf: 'Invoice'
             },
-            sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
+            sameAs: { id: params.payTransaction.id, typeOf: factory_1.factory.assetTransactionType.Pay }
         };
         // add action(2024-06-12~)
-        const action = await repos.action.start(actionAttributes, { recipe });
+        const action = await repos.authorizeInvoiceAction.start(actionAttributes, { recipe });
         try {
             secureTran2Result = await repos.creditCardService.secureTran2(secureTran2Args);
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.authorizeInvoiceAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -65,7 +42,7 @@ function processAuthorizeCreditCard3ds(params) {
             result: { secureTran2Args, secureTran2Result }
         });
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.authorizeInvoiceAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
     };
 }

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3dsResult2recipe.d.ts

@@ -1,8 +1,8 @@
-import type * as GMO from '@motionpicture/gmo-service';
-import * as factory from '../../../../factory';
+import type { GMO } from '@motionpicture/gmo-service';
+import { factory } from '../../../../factory';
 interface IProcessAuthorizeCreditCard3dsResult {
-    secureTran2Args?: GMO.factory.credit.ISecureTran2Args;
-    secureTran2Result?: GMO.factory.credit.ISecureTran2Result;
+    secureTran2Args?: GMO.factory.service.credit.ISecureTran2Args;
+    secureTran2Result?: GMO.factory.service.credit.ISecureTran2Result;
 }
 declare function processAuthorizeCreditCard3dsResult2recipe(params: {
     project: {

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3dsResult2recipe.js

@@ -1,43 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAuthorizeCreditCard3dsResult2recipe = processAuthorizeCreditCard3dsResult2recipe;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 function processAuthorizeCreditCard3dsResult2recipe(params) {
     const { project, result } = params;
     const { secureTran2Args, secureTran2Result } = result;
     return {
-        project: { id: project.id, typeOf: factory.organizationType.Project },
+        project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
         typeOf: 'Recipe',
-        recipeCategory: factory.recipe.RecipeCategory.authorizeInvoice3ds,
+        recipeCategory: factory_1.factory.recipe.RecipeCategory.authorizeInvoice3ds,
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.secureTran2,
+                        identifier: factory_1.factory.recipe.StepIdentifier.secureTran2,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(secureTran2Args !== undefined) ? { beforeMedia: secureTran2Args } : undefined,

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCardResult2recipe.d.ts

@@ -1,10 +1,10 @@
-import type * as GMO from '@motionpicture/gmo-service';
-import * as factory from '../../../../factory';
+import type { GMO } from '@motionpicture/gmo-service';
+import { factory } from '../../../../factory';
 interface IProcessAuthorizeCreditCardResult {
-    entryTranArgs?: GMO.factory.credit.IEntryTranArgs;
-    entryTranResult?: GMO.factory.credit.IEntryTranResult;
-    execTranArgs?: GMO.factory.credit.IExecTranArgs;
-    execTranResult?: GMO.factory.credit.IExecTranResult;
+    entryTranArgs?: GMO.factory.service.credit.IEntryTranArgs;
+    entryTranResult?: GMO.factory.service.credit.IEntryTranResult;
+    execTranArgs?: GMO.factory.service.credit.IExecTranArgs;
+    execTranResult?: GMO.factory.service.credit.IExecTranResult;
 }
 declare function processAuthorizeCreditCardResult2recipe(params: {
     project: {

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCardResult2recipe.js

@@ -1,43 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAuthorizeCreditCardResult2recipe = processAuthorizeCreditCardResult2recipe;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 function processAuthorizeCreditCardResult2recipe(params) {
     const { project, result } = params;
     const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = result;
     return {
-        project: { id: project.id, typeOf: factory.organizationType.Project },
+        project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
         typeOf: 'Recipe',
-        recipeCategory: factory.recipe.RecipeCategory.authorizeInvoice,
+        recipeCategory: factory_1.factory.recipe.RecipeCategory.authorizeInvoice,
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.entryTran,
+                        identifier: factory_1.factory.recipe.StepIdentifier.entryTran,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(entryTranArgs !== undefined) ? { beforeMedia: entryTranArgs } : undefined,
@@ -46,7 +23,7 @@ function processAuthorizeCreditCardResult2recipe(params) {
                     },
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.execTran,
+                        identifier: factory_1.factory.recipe.StepIdentifier.execTran,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(execTranArgs !== undefined) ? { beforeMedia: execTranArgs } : undefined,

package/lib/chevre/service/payment/creditCard/authorize.d.ts

@@ -1,6 +1,6 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
@@ -41,7 +41,8 @@ payTransaction: IPayTransactionAsAuthorizeInvoiceAction, paymentServiceId: strin
         id?: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/payment/creditCard/authorize.js

@@ -1,35 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
-const GMO = __importStar(require("@motionpicture/gmo-service"));
+const gmo_service_1 = require("@motionpicture/gmo-service");
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const handleAuthorizeError_1 = require("./authorize/handleAuthorizeError");
 const processAuthorizeCreditCard_1 = require("./authorize/processAuthorizeCreditCard");
 const processAuthorizeCreditCard3ds_1 = require("./authorize/processAuthorizeCreditCard3ds");
@@ -47,7 +24,7 @@ payTransaction, paymentServiceId, options) {
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = payTransaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: payTransaction.project,
@@ -55,7 +32,7 @@ payTransaction, paymentServiceId, options) {
         });
         const sellerId = payTransaction.recipient?.id;
         if (typeof sellerId !== 'string') {
-            throw new factory.errors.ArgumentNull('recipient.id');
+            throw new factory_1.factory.errors.ArgumentNull('recipient.id');
         }
         const { shopId, shopPass, returnUrls3ds, callbackType3ds } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
@@ -64,7 +41,7 @@ payTransaction, paymentServiceId, options) {
         // GMOオーダーIDはカスタム指定可能
         const orderId = payTransaction.transactionNumber;
         if (typeof orderId !== 'string') {
-            throw new factory.errors.ArgumentNull('transactionNumber');
+            throw new factory_1.factory.errors.ArgumentNull('transactionNumber');
         }
         let authorizeResult;
         try {
@@ -75,9 +52,8 @@ payTransaction, paymentServiceId, options) {
                 ? settings.gmo.timeoutBackground
                 : settings.gmo.timeout;
             debug('processAuthorizeCreditCard processing... executor:', options.executor?.id, 'timeout:', timeout);
-            const creditCardService = new GMO.service.Credit({
-                endpoint: String(availableChannel.serviceUrl),
-                useFetch: settings.gmo.useFetch
+            const creditCardService = new gmo_service_1.GMO.service.Credit({
+                endpoint: String(availableChannel.serviceUrl)
             }, { timeout });
             const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
             const redirectUrl = pendingPaymentAgencyTransaction?.execTranResult?.redirectUrl;
@@ -88,7 +64,7 @@ payTransaction, paymentServiceId, options) {
                     payTransaction: { id: payTransaction.id },
                     availableChannel,
                     pendingPaymentAgencyTransaction
-                })({ action: repos.action, creditCardService });
+                })({ authorizeInvoiceAction: repos.authorizeInvoiceAction, creditCardService });
             }
             else {
                 authorizeResult = await (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)({
@@ -97,7 +73,7 @@ payTransaction, paymentServiceId, options) {
                     shopId, shopPass, returnUrls3ds, callbackType3ds, orderId, availableChannel,
                     object: payTransaction.object.paymentMethod,
                     processPublishPaymentUrl: options.processPublishPaymentUrl
-                })({ action: repos.action, creditCardService });
+                })({ authorizeInvoiceAction: repos.authorizeInvoiceAction, creditCardService });
             }
         }
         catch (error) {