@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

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

@@ -12,9 +12,9 @@ function handleAuthorizeError(error) {
         if (Array.isArray(error.errors) && error.errors.length > 0) {
             const gmoErrors = error.errors;
             // 流量制限オーバーエラーの場合
-            const serviceUnavailableError = gmoErrors.find((gmoError) => { var _a; return (_a = gmoError.info) === null || _a === void 0 ? void 0 : _a.match(/^E92000001|E92000002$/); });
+            const serviceUnavailableError = gmoErrors.find((gmoError) => gmoError.info?.match(/^E92000001|E92000002$/));
             // オーダーID重複エラーの場合
-            const duplicateError = gmoErrors.find((gmoError) => { var _a; return (_a = gmoError.info) === null || _a === void 0 ? void 0 : _a.match(/^E01040010$/); });
+            const duplicateError = gmoErrors.find((gmoError) => gmoError.info?.match(/^E01040010$/));
             if (serviceUnavailableError !== undefined) {
                 handledError = new factory.errors.RateLimitExceeded(serviceUnavailableError.userMessage);
             }

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

@@ -1,22 +1,11 @@
 "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.processAuthorizeCreditCard = processAuthorizeCreditCard;
 const GMO = require("@motionpicture/gmo-service");
 const factory = require("../../../../factory");
 const processAuthorizeCreditCardResult2recipe_1 = require("./processAuthorizeCreditCardResult2recipe");
 function processAuthorizeCreditCard(params) {
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos) => {
         let entryTranArgs;
         let entryTranResult;
         let execTranArgs;
@@ -26,7 +15,7 @@ function processAuthorizeCreditCard(params) {
         const { cardSeq, memberId } = creditCard;
         const { cardNo, cardPass, expire } = creditCard;
         const { token } = creditCard;
-        const retUrl = creditCard === null || creditCard === void 0 ? void 0 : creditCard.retUrl;
+        const retUrl = creditCard?.retUrl;
         // 3DS拡張(2024-01-02~)
         if (params.processPublishPaymentUrl === true && typeof retUrl === 'string' && retUrl.length > 0) {
             let returnUrlObject;
@@ -52,9 +41,25 @@ function processAuthorizeCreditCard(params) {
                 // tdTenantName: '',
                 tds2Type: GMO.utils.util.Tds2Type.Error
             };
-            entryTranResult = yield repos.creditCardService.entryTran(entryTranArgs);
-            execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId, method: params.object.method, siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId, sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass, seqMode: GMO.utils.util.SeqMode.Physics, retUrl, callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.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);
-            execTranResult = yield repos.creditCardService.execTran3ds(execTranArgs);
+            entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
+            execTranArgs = {
+                accessId: entryTranResult.accessId,
+                accessPass: entryTranResult.accessPass,
+                orderId,
+                method: params.object.method,
+                siteId: params.availableChannel.credentials?.siteId,
+                sitePass: params.availableChannel.credentials?.sitePass,
+                seqMode: GMO.utils.util.SeqMode.Physics,
+                retUrl,
+                callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.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
+            };
+            execTranResult = await repos.creditCardService.execTran3ds(execTranArgs);
         }
         else {
             entryTranArgs = {
@@ -63,8 +68,8 @@ function processAuthorizeCreditCard(params) {
                 amount: (typeof params.object.amount === 'number')
                     ? params.object.amount
                     : params.object.amount.value,
-                siteId: (_c = params.availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                siteId: params.availableChannel.credentials?.siteId,
+                sitePass: params.availableChannel.credentials?.sitePass
             };
             let action;
             let recipe = (0, processAuthorizeCreditCardResult2recipe_1.processAuthorizeCreditCardResult2recipe)({
@@ -82,15 +87,29 @@ function processAuthorizeCreditCard(params) {
                 sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
             };
             // add action(2024-06-12~)
-            action = yield repos.action.start(actionAttributes, { recipe });
+            action = await repos.action.start(actionAttributes, { recipe });
             try {
-                entryTranResult = yield repos.creditCardService.entryTran(entryTranArgs);
-                execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId, method: params.object.method, siteId: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId, sitePass: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass, seqMode: GMO.utils.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);
-                execTranResult = yield repos.creditCardService.execTran(execTranArgs);
+                entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
+                execTranArgs = {
+                    accessId: entryTranResult.accessId,
+                    accessPass: entryTranResult.accessPass,
+                    orderId,
+                    method: params.object.method,
+                    siteId: params.availableChannel.credentials?.siteId,
+                    sitePass: params.availableChannel.credentials?.sitePass,
+                    seqMode: GMO.utils.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
+                };
+                execTranResult = await repos.creditCardService.execTran(execTranArgs);
             }
             catch (error) {
                 try {
-                    yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                    await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -105,8 +124,8 @@ function processAuthorizeCreditCard(params) {
                 }
             });
             const actionResult = {};
-            yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+            await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
-    });
+    };
 }

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

@@ -1,19 +1,10 @@
 "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.processAuthorizeCreditCard3ds = processAuthorizeCreditCard3ds;
 const factory = require("../../../../factory");
 const processAuthorizeCreditCard3dsResult2recipe_1 = require("./processAuthorizeCreditCard3dsResult2recipe");
 function processAuthorizeCreditCard3ds(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = params.pendingPaymentAgencyTransaction;
         const { accessId, accessPass } = entryTranResult;
         const secureTran2Args = { accessId, accessPass };
@@ -34,13 +25,13 @@ function processAuthorizeCreditCard3ds(params) {
             sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
         };
         // add action(2024-06-12~)
-        action = yield repos.action.start(actionAttributes, { recipe });
+        action = await repos.action.start(actionAttributes, { recipe });
         try {
-            secureTran2Result = yield repos.creditCardService.secureTran2(secureTran2Args);
+            secureTran2Result = await repos.creditCardService.secureTran2(secureTran2Args);
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -52,7 +43,7 @@ function processAuthorizeCreditCard3ds(params) {
             result: { secureTran2Args, secureTran2Result }
         });
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
-    });
+    };
 }

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

@@ -15,7 +15,11 @@ function processAuthorizeCreditCard3dsResult2recipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.secureTran2,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (secureTran2Args !== undefined) ? { beforeMedia: secureTran2Args } : undefined), (secureTran2Result !== undefined) ? { afterMedia: secureTran2Result } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(secureTran2Args !== undefined) ? { beforeMedia: secureTran2Args } : undefined,
+                                ...(secureTran2Result !== undefined) ? { afterMedia: secureTran2Result } : undefined
+                            }]
                     }
                 ]
             }]

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

@@ -15,12 +15,20 @@ function processAuthorizeCreditCardResult2recipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.entryTran,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (entryTranArgs !== undefined) ? { beforeMedia: entryTranArgs } : undefined), (entryTranResult !== undefined) ? { afterMedia: entryTranResult } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(entryTranArgs !== undefined) ? { beforeMedia: entryTranArgs } : undefined,
+                                ...(entryTranResult !== undefined) ? { afterMedia: entryTranResult } : undefined
+                            }]
                     },
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.execTran,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (execTranArgs !== undefined) ? { beforeMedia: execTranArgs } : undefined), (execTranResult !== undefined) ? { afterMedia: execTranResult } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(execTranArgs !== undefined) ? { beforeMedia: execTranArgs } : undefined,
+                                ...(execTranResult !== undefined) ? { afterMedia: execTranResult } : undefined
+                            }]
                     }
                 ]
             }]

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

@@ -1,13 +1,4 @@
 "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.authorize = authorize;
 const GMO = require("@motionpicture/gmo-service");
@@ -26,22 +17,21 @@ function authorize(
  * 承認開始元の決済取引
  */
 payTransaction, paymentServiceId, options) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos, settings) => {
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = payTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+        const paymentMethodType = payTransaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: payTransaction.project,
             id: paymentServiceId
         });
-        const sellerId = (_b = payTransaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
+        const sellerId = payTransaction.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const { shopId, shopPass, returnUrls3ds, callbackType3ds } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+        const { shopId, shopPass, returnUrls3ds, callbackType3ds } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted: true
         })(repos);
@@ -53,21 +43,21 @@ payTransaction, paymentServiceId, options) {
         let authorizeResult;
         try {
             // タスクによって実行されているかどうか
-            const executedByTask = typeof ((_c = options.executor) === null || _c === void 0 ? void 0 : _c.id) === 'string' && options.executor.id !== '';
+            const executedByTask = typeof options.executor?.id === 'string' && options.executor.id !== '';
             // 非同期承認時に長時間対応(2024-05-18~)
             const timeout = (executedByTask && typeof settings.gmo.timeoutBackground === 'number')
                 ? settings.gmo.timeoutBackground
                 : settings.gmo.timeout;
-            debug('processAuthorizeCreditCard processing... executor:', (_d = options.executor) === null || _d === void 0 ? void 0 : _d.id, 'timeout:', timeout);
+            debug('processAuthorizeCreditCard processing... executor:', options.executor?.id, 'timeout:', timeout);
             const creditCardService = new GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl),
                 useFetch: settings.gmo.useFetch
             }, { timeout });
             const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
-            const redirectUrl = (_e = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _e === void 0 ? void 0 : _e.redirectUrl;
+            const redirectUrl = pendingPaymentAgencyTransaction?.execTranResult?.redirectUrl;
             if (pendingPaymentAgencyTransaction !== undefined
                 && typeof redirectUrl === 'string' && redirectUrl.length > 0) {
-                authorizeResult = yield (0, processAuthorizeCreditCard3ds_1.processAuthorizeCreditCard3ds)({
+                authorizeResult = await (0, processAuthorizeCreditCard3ds_1.processAuthorizeCreditCard3ds)({
                     project: { id: payTransaction.project.id },
                     payTransaction: { id: payTransaction.id },
                     availableChannel,
@@ -75,7 +65,7 @@ payTransaction, paymentServiceId, options) {
                 })({ action: repos.action, creditCardService });
             }
             else {
-                authorizeResult = yield (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)({
+                authorizeResult = await (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)({
                     project: { id: payTransaction.project.id },
                     payTransaction: { id: payTransaction.id },
                     shopId, shopPass, returnUrls3ds, callbackType3ds, orderId, availableChannel,
@@ -93,6 +83,14 @@ payTransaction, paymentServiceId, options) {
         // const searchTrade4accountId = options?.searchTrade4accountId === true;
         // if (searchTrade4accountId) {
         // }
-        return Object.assign({ accountId: '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
-    });
+        return {
+            accountId: '',
+            paymentMethodId: orderId,
+            entryTranArgs: authorizeResult.entryTranArgs,
+            entryTranResult: authorizeResult.entryTranResult,
+            execTranArgs: authorizeResult.execTranArgs,
+            execTranResult: authorizeResult.execTranResult,
+            ...(authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined
+        };
+    };
 }

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

@@ -16,12 +16,20 @@ function processAlterTranResult2payRecipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.searchTrade,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { afterMedia: searchTradeResult } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined,
+                                ...(searchTradeResult !== undefined) ? { afterMedia: searchTradeResult } : undefined
+                            }]
                     },
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.alterTran,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined), (alterTranResult !== undefined) ? { afterMedia: alterTranResult } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined,
+                                ...(alterTranResult !== undefined) ? { afterMedia: alterTranResult } : undefined
+                            }]
                     }
                 ]
             };
@@ -41,12 +49,22 @@ function processAlterTranResult2refundRecipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.searchTrade,
-                        itemListElement: [Object.assign(Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { afterMedia: searchTradeResult } : undefined), (searchTradeResultAsError !== undefined) ? { afterMedia: searchTradeResultAsError } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined,
+                                ...(searchTradeResult !== undefined) ? { afterMedia: searchTradeResult } : undefined,
+                                // suuport searchTradeResultAsError(2025-02-20~)
+                                ...(searchTradeResultAsError !== undefined) ? { afterMedia: searchTradeResultAsError } : undefined
+                            }]
                     },
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.alterTran,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined), (alterTranResult !== undefined) ? { afterMedia: alterTranResult } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined,
+                                ...(alterTranResult !== undefined) ? { afterMedia: alterTranResult } : undefined
+                            }]
                     }
                 ]
             }]

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

@@ -1,21 +1,11 @@
 "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.getGMOInfoFromSeller = getGMOInfoFromSeller;
 const factory = require("../../../factory");
 function getGMOInfoFromSeller(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         if (params.requirePaymentAccepted) {
-            const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+            const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: params.seller.id },
                 codeValue: params.paymentMethodType
             });
@@ -24,7 +14,7 @@ function getGMOInfoFromSeller(params) {
             }
         }
         // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.paymentServiceProvider.search({
+        const paymentServices = await repos.paymentServiceProvider.search({
             limit: 1,
             page: 1,
             provider: { id: { $eq: params.seller.id } },
@@ -35,14 +25,14 @@ function getGMOInfoFromSeller(params) {
             throw new factory.errors.NotFound('PaymentService');
         }
         const provider = paymentService.provider;
-        const shopId = (_a = provider.credentials) === null || _a === void 0 ? void 0 : _a.shopId;
-        const shopPass = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.shopPass;
+        const shopId = provider.credentials?.shopId;
+        const shopPass = provider.credentials?.shopPass;
         if (typeof shopId !== 'string' || typeof shopPass !== 'string') {
             throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
         }
-        const returnUrls3dsSetting = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.returnUrls3ds;
+        const returnUrls3dsSetting = provider.credentials?.returnUrls3ds;
         const returnUrls3ds = (Array.isArray(returnUrls3dsSetting)) ? returnUrls3dsSetting : [];
-        const callbackType3ds = (_d = provider.credentials) === null || _d === void 0 ? void 0 : _d.callbackType3ds;
+        const callbackType3ds = provider.credentials?.callbackType3ds;
         return { shopId, shopPass, returnUrls3ds, callbackType3ds };
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "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.payCreditCard = payCreditCard;
 const GMO = require("@motionpicture/gmo-service");
@@ -19,8 +10,7 @@ const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
  * クレジットカード決済
  */
 function payCreditCard(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos, settings) => {
         const payObject = params.object;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = payObject[0].paymentMethod.typeOf;
@@ -28,21 +18,21 @@ function payCreditCard(params) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
         const paymentServiceId = payObject[0].id;
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: params.project,
             // typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
+        const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
         const requirePaymentAccepted = false;
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+        const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted
         })(repos);
-        const action = yield repos.action.start(params);
+        const action = await repos.action.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];
         let recipe;
@@ -51,8 +41,8 @@ function payCreditCard(params) {
                 endpoint: String(availableChannel.serviceUrl),
                 useFetch: settings.gmo.useFetch
             }, { timeout: settings.gmo.timeout });
-            yield Promise.all(payObject.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
-                const processAlterTranResult = yield processAlterTran({
+            await Promise.all(payObject.map(async (paymentMethod) => {
+                const processAlterTranResult = await processAlterTran({
                     shopId, shopPass, availableChannel, paymentMethod
                 })({ creditService });
                 processAlterTranResults.push(processAlterTranResult);
@@ -65,7 +55,7 @@ function payCreditCard(params) {
                     // 代行決済連携中にエラーがあればそのままthrow
                     throw processAlterTranResult.processAlterTranError;
                 }
-            })));
+            }));
             // add recipe(2024-06-03~)
             recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
         }
@@ -73,7 +63,7 @@ function payCreditCard(params) {
             try {
                 // add recipe(2024-06-29~)
                 recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -83,8 +73,8 @@ function payCreditCard(params) {
         const actionResult = {
         // creditCardSales: alterTranResults // discontinue(2024-06-10~)
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
-        yield (0, onPayActionCompleted_1.onPayActionCompleted)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -94,11 +84,10 @@ function payCreditCard(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }
 function processAlterTran(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+    return async (repos) => {
         let searchTradeArgs;
         let searchTradeResult;
         let alterTranArgs;
@@ -111,12 +100,12 @@ function processAlterTran(params) {
             // 取引状態参照
             searchTradeArgs = {
                 shopId, shopPass, orderId,
-                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
+                siteId: params.availableChannel.credentials?.siteId,
+                sitePass: params.availableChannel.credentials?.sitePass
             };
-            searchTradeResult = yield repos.creditService.searchTrade(searchTradeArgs);
+            searchTradeResult = await repos.creditService.searchTrade(searchTradeArgs);
             const { accessId, accessPass, forward, approve, tranId, jobCd } = searchTradeResult;
-            const amount = (_c = paymentMethod.paymentMethod.totalPaymentDue) === null || _c === void 0 ? void 0 : _c.value;
+            const amount = paymentMethod.paymentMethod.totalPaymentDue?.value;
             if (typeof amount !== 'number') {
                 throw new factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
             }
@@ -132,11 +121,11 @@ function processAlterTran(params) {
                         shopId, shopPass, accessId, accessPass,
                         jobCd: GMO.utils.util.JobCd.Capture,
                         amount, // 手数料を指定
-                        siteId: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                        sitePass: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass,
+                        siteId: params.availableChannel.credentials?.siteId,
+                        sitePass: params.availableChannel.credentials?.sitePass,
                         method: GMO.utils.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
                     };
-                    alterTranResult = yield repos.creditService.alterTran(alterTranArgs);
+                    alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     break;
                 case GMO.utils.util.JobCd.Auth:
                     alterTranArgs = {
@@ -144,10 +133,10 @@ function processAlterTran(params) {
                         accessId, accessPass,
                         jobCd: GMO.utils.util.JobCd.Sales,
                         amount: amount,
-                        siteId: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
-                        sitePass: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
+                        siteId: params.availableChannel.credentials?.siteId,
+                        sitePass: params.availableChannel.credentials?.sitePass
                     };
-                    alterTranResult = yield repos.creditService.alterTran(alterTranArgs);
+                    alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     break;
                 default:
                     throw new factory.errors.NotImplemented(`jobCd '${jobCd}' not implemented`);
@@ -156,6 +145,12 @@ function processAlterTran(params) {
         catch (error) {
             processAlterTranError = error;
         }
-        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { searchTradeResult } : undefined), (alterTranArgs !== undefined) ? { alterTranArgs } : undefined), (alterTranResult !== undefined) ? { alterTranResult } : undefined), (processAlterTranError !== undefined) ? { processAlterTranError } : undefined);
-    });
+        return {
+            ...(searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined,
+            ...(searchTradeResult !== undefined) ? { searchTradeResult } : undefined,
+            ...(alterTranArgs !== undefined) ? { alterTranArgs } : undefined,
+            ...(alterTranResult !== undefined) ? { alterTranResult } : undefined,
+            ...(processAlterTranError !== undefined) ? { processAlterTranError } : undefined
+        };
+    };
 }