@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/assetTransaction/refund/factory.js

@@ -6,30 +6,29 @@ exports.createStartParams = createStartParams;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const { instrument } = params;
-    const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+    const paymentMethodType = params.object.paymentMethod?.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
     }
-    const paymentMethodId = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
+    const paymentMethodId = params.object.paymentMethod?.paymentMethodId;
     if (typeof paymentMethodId !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
     }
-    const additionalProperty = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.additionalProperty;
-    const name = (_d = params.object.paymentMethod) === null || _d === void 0 ? void 0 : _d.name;
+    const additionalProperty = params.object.paymentMethod?.additionalProperty;
+    const name = params.object.paymentMethod?.name;
     // const informPaymentParams = createInformPaymentParams({ paymentService: params.paymentService });
-    const accountId = (_f = (_e = params.payAction.object[0]) === null || _e === void 0 ? void 0 : _e.paymentMethod) === null || _f === void 0 ? void 0 : _f.accountId;
+    const accountId = params.payAction.object[0]?.paymentMethod?.accountId;
     // 手数料は、CreditCardIFかつカード通貨区分が存在しない場合のみ設定すればよい
     let refundFee;
-    if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
+    if (params.paymentService?.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
         const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
-            ? params.paymentService.serviceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === 'Invoice')
+            ? params.paymentService.serviceOutput.find((output) => output?.typeOf === 'Invoice')
             : params.paymentService.serviceOutput;
         let paymentServiceOutputAmountCurrency;
-        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
-            paymentServiceOutputAmountCurrency = (_j = (_h = invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        if (invoiceAsServiceOutput?.typeOf === 'Invoice') {
+            paymentServiceOutputAmountCurrency = invoiceAsServiceOutput?.paymentMethod?.amount?.currency;
         }
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
@@ -43,14 +42,35 @@ function createStartParams(params) {
             potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
         }
     });
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Refund, agent: params.agent, recipient: params.recipient, object: Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: paymentMethodId, typeOf: params.paymentServiceType, id: (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
+    return {
+        project: { typeOf: factory.organizationType.Project, id: params.project.id },
+        transactionNumber: params.transactionNumber,
+        typeOf: factory.assetTransactionType.Refund,
+        agent: params.agent,
+        recipient: params.recipient,
+        object: {
+            accountId: (typeof accountId === 'string') ? accountId : '',
+            paymentMethodId: paymentMethodId,
+            typeOf: params.paymentServiceType,
+            id: (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
                 ? params.payAction.object[0].id
-                : '', 
+                : '',
             // onPaymentStatusChanged: { informPayment: params.informActions }, // discontinue(2025-02-09~)
-            paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: (typeof name === 'string') ? name : paymentMethodType, paymentMethodId: paymentMethodId, typeOf: paymentMethodType }, (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
-                ? { totalPaymentDue: params.payAction.object[0].paymentMethod.totalPaymentDue }
-                : undefined) }, (typeof refundFee === 'number') ? { refundFee } : undefined), expires: params.expires, instrument: (Array.isArray(instrument)) ? instrument : [] }, (potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
-    );
+            paymentMethod: {
+                additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [],
+                name: (typeof name === 'string') ? name : paymentMethodType,
+                paymentMethodId: paymentMethodId,
+                typeOf: paymentMethodType,
+                ...(Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
+                    ? { totalPaymentDue: params.payAction.object[0].paymentMethod.totalPaymentDue }
+                    : undefined
+            },
+            ...(typeof refundFee === 'number') ? { refundFee } : undefined
+        },
+        expires: params.expires,
+        instrument: (Array.isArray(instrument)) ? instrument : [], // add potentialAction(2025-02-05~)
+        ...(potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
+    };
 }
 // function createInformPaymentParams(params: {
 //     paymentService?: factory.product.IProduct

package/lib/chevre/service/assetTransaction/refund/potentialActions.js

@@ -1,18 +1,8 @@
 "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.createPotentialActions = createPotentialActions;
 const factory = require("../../../factory");
 function createReundActions(params) {
-    var _a, _b;
     const { transaction, seller } = params;
     const refundActions = [];
     const informPaymentActions = createInformPaymentActions(params);
@@ -22,8 +12,12 @@ function createReundActions(params) {
     //     name: String(params.transaction.agent.name),
     //     typeOf: params.transaction.agent.typeOf
     // };
-    const agent = Object.assign({ id: seller.id, typeOf: seller.typeOf }, (typeof seller.name === 'string') ? { name: seller.name } : undefined);
-    const purpose = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.refund) === null || _b === void 0 ? void 0 : _b.purpose;
+    const agent = {
+        id: seller.id,
+        typeOf: seller.typeOf,
+        ...(typeof seller.name === 'string') ? { name: seller.name } : undefined
+    };
+    const purpose = params.potentialActions?.refund?.purpose;
     if (purpose.typeOf !== factory.actionType.ReturnAction) {
         throw new factory.errors.Argument('potentialActions?.refund?.purpose.typeOf', `must be ${factory.actionType.ReturnAction}`);
     }
@@ -45,12 +39,11 @@ function createReundActions(params) {
     return refundActions;
 }
 function createInformPaymentActions(params) {
-    var _a, _b;
     const transaction = params.transaction;
     const informPaymentActions = [];
     // 取引に指定があれば設定
     // const informPayment = transaction.object.onPaymentStatusChanged?.informPayment;
-    const potentialInformActionId = (_b = (_a = transaction.potentialAction) === null || _a === void 0 ? void 0 : _a.find(({ typeOf }) => typeOf === factory.actionType.InformAction)) === null || _b === void 0 ? void 0 : _b.id;
+    const potentialInformActionId = transaction.potentialAction?.find(({ typeOf }) => typeOf === factory.actionType.InformAction)?.id;
     if (typeof potentialInformActionId === 'string') {
         // const recipient: factory.action.trade.refund.IInformPayment['recipient'] = {
         //     typeOf: transaction.agent.typeOf,
@@ -71,11 +64,9 @@ function createInformPaymentActions(params) {
 /**
  * 取引のポストアクションを作成する
  */
-function createPotentialActions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const refundActionAttributesList = createReundActions(params);
-        return {
-            refund: refundActionAttributesList
-        };
-    });
+async function createPotentialActions(params) {
+    const refundActionAttributesList = createReundActions(params);
+    return {
+        refund: refundActionAttributesList
+    };
 }

package/lib/chevre/service/assetTransaction/refund.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.start = start;
 exports.confirm = confirm;
@@ -25,21 +16,20 @@ const potentialActions_1 = require("./refund/potentialActions");
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const paymentMethodId = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
+    return async (repos) => {
+        const paymentMethodId = params.object.paymentMethod?.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
         }
-        let paymentServiceType = (_b = params.object) === null || _b === void 0 ? void 0 : _b.typeOf;
+        let paymentServiceType = params.object?.typeOf;
         // 必ず、決済取引からpaymentServiceTypeを取得する
-        const payTransaction = yield repos.assetTransaction.findByTransactionNumber({
+        const payTransaction = await repos.assetTransaction.findByTransactionNumber({
             typeOf: factory.assetTransactionType.Pay,
             transactionNumber: paymentMethodId
         });
         paymentServiceType = payTransaction.object.typeOf;
         // PayActionを確認する
-        const payAction = yield repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+        const payAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
         if (payAction === undefined) {
             throw new factory.errors.NotFound(factory.actionType.PayAction);
         }
@@ -48,20 +38,23 @@ function start(params) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // 決済サービス確認
-        const paymentService = yield fixPaymentService({ payAction, paymentServiceType })(repos);
-        const informActions = yield (0, fixInformAction_1.fixInformAction)({
+        const paymentService = await fixPaymentService({ payAction, paymentServiceType })(repos);
+        const informActions = await (0, fixInformAction_1.fixInformAction)({
             paymentService,
             project: { id: params.project.id }
         })(repos);
         // 取引開始
         let transaction;
-        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { transactionNumber,
+        const startParams = (0, factory_1.createStartParams)({
+            ...params,
+            transactionNumber,
             payAction,
             paymentService,
             paymentServiceType,
-            informActions }));
+            informActions
+        });
         try {
-            transaction = yield repos.assetTransaction.start(startParams);
+            transaction = await repos.assetTransaction.start(startParams);
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
                     break;
@@ -79,10 +72,10 @@ function start(params) {
             throw error;
         }
         return transaction;
-    });
+    };
 }
 function fixPaymentService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const paymentServiceId = (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
             ? params.payAction.object[0].id
             : '';
@@ -94,7 +87,7 @@ function fixPaymentService(params) {
                 break;
             // PaymentCardの場合、プロダクト検索
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                paymentService = (yield repos.product.projectFields({
+                paymentService = (await repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
@@ -108,7 +101,7 @@ function fixPaymentService(params) {
                 }
                 break;
             default:
-                paymentService = (yield repos.paymentService.projectFields({
+                paymentService = (await repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
@@ -120,23 +113,23 @@ function fixPaymentService(params) {
                 }
         }
         return paymentService;
-    });
+    };
 }
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.Refund,
                 id: params.id
             });
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.Refund,
                 transactionNumber: params.transactionNumber
             });
@@ -144,7 +137,7 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const payTransaction = (yield repos.assetTransaction.search({
+        const payTransaction = (await repos.assetTransaction.search({
             limit: 1,
             page: 1,
             typeOf: factory.assetTransactionType.Pay,
@@ -153,37 +146,37 @@ function confirm(params) {
         if (payTransaction === undefined) {
             throw new factory.errors.NotFound(factory.assetTransactionType.Pay);
         }
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
+        const potentialActions = await (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
             seller: payTransaction.recipient,
             potentialActions: params.potentialActions
         });
-        yield repos.assetTransaction.confirm({
+        await repos.assetTransaction.confirm({
             typeOf: factory.assetTransactionType.Refund,
             id: transaction.id,
             result: {},
             potentialActions: potentialActions
         });
-    });
+    };
 }
 /**
  * 取引中止
  */
 function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+    return async (repos) => {
+        await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Refund,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-    });
+    };
 }
 /**
  * 取引のタスク出力
  */
 function exportTasksById(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.findById({
+    return async (repos) => {
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Refund,
             id: params.id
         });
@@ -205,7 +198,10 @@ function exportTasksById(params) {
                     /* istanbul ignore else */
                     if (Array.isArray(potentialActions.refund)) {
                         const refundTasks = potentialActions.refund.map((a) => {
-                            const data = Object.assign(Object.assign({}, a), { instrument: (Array.isArray(transaction.instrument)) ? transaction.instrument : [] });
+                            const data = {
+                                ...a,
+                                instrument: (Array.isArray(transaction.instrument)) ? transaction.instrument : []
+                            };
                             return {
                                 project: transaction.project,
                                 name: factory.taskName.Refund,
@@ -228,5 +224,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/registerService/factory.js

@@ -8,23 +8,29 @@ const factory = require("../../../factory");
  * ポイント特典を作成する
  */
 function createPointAward(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     let pointAward;
-    const pointAwardAmount = (_b = (_a = params.offer.itemOffered) === null || _a === void 0 ? void 0 : _a.pointAward) === null || _b === void 0 ? void 0 : _b.amount;
-    const pointAwardDescription = (_d = (_c = params.offer.itemOffered) === null || _c === void 0 ? void 0 : _c.pointAward) === null || _d === void 0 ? void 0 : _d.description;
-    const pointAwardToLocation = (_f = (_e = params.acceptedOffer.itemOffered) === null || _e === void 0 ? void 0 : _e.pointAward) === null || _f === void 0 ? void 0 : _f.toLocation;
-    const pointAwardRecipient = (_h = (_g = params.acceptedOffer.itemOffered) === null || _g === void 0 ? void 0 : _g.pointAward) === null || _h === void 0 ? void 0 : _h.recipient;
-    const pointAwardPurposeIdentifier = (_l = (_k = (_j = params.acceptedOffer.itemOffered) === null || _j === void 0 ? void 0 : _j.pointAward) === null || _k === void 0 ? void 0 : _k.purpose) === null || _l === void 0 ? void 0 : _l.identifier;
+    const pointAwardAmount = params.offer.itemOffered?.pointAward?.amount;
+    const pointAwardDescription = params.offer.itemOffered?.pointAward?.description;
+    const pointAwardToLocation = params.acceptedOffer.itemOffered?.pointAward?.toLocation;
+    const pointAwardRecipient = params.acceptedOffer.itemOffered?.pointAward?.recipient;
+    const pointAwardPurposeIdentifier = params.acceptedOffer.itemOffered?.pointAward?.purpose?.identifier;
     // オファーのpointAward設定が適切にされていれば、指定されたtoLocationを反映する
-    if (typeof (pointAwardAmount === null || pointAwardAmount === void 0 ? void 0 : pointAwardAmount.value) === 'number'
-        && typeof (pointAwardAmount === null || pointAwardAmount === void 0 ? void 0 : pointAwardAmount.currency) === 'string'
-        && typeof (pointAwardToLocation === null || pointAwardToLocation === void 0 ? void 0 : pointAwardToLocation.identifier) === 'string'
-        && typeof (pointAwardToLocation === null || pointAwardToLocation === void 0 ? void 0 : pointAwardToLocation.issuedThrough.id) === 'string') {
-        pointAward = Object.assign(Object.assign(Object.assign({ amount: pointAwardAmount, toLocation: {
+    if (typeof pointAwardAmount?.value === 'number'
+        && typeof pointAwardAmount?.currency === 'string'
+        && typeof pointAwardToLocation?.identifier === 'string'
+        && typeof pointAwardToLocation?.issuedThrough.id === 'string') {
+        pointAward = {
+            amount: pointAwardAmount,
+            toLocation: {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: pointAwardToLocation.identifier,
                 issuedThrough: { id: pointAwardToLocation.issuedThrough.id }
-            }, typeOf: factory.actionType.MoneyTransfer }, (typeof pointAwardDescription === 'string') ? { description: pointAwardDescription } : undefined), (pointAwardRecipient !== undefined) ? { recipient: pointAwardRecipient } : undefined), (typeof pointAwardPurposeIdentifier === 'string') ? { purpose: { identifier: pointAwardPurposeIdentifier } } : undefined);
+            },
+            typeOf: factory.actionType.MoneyTransfer,
+            ...(typeof pointAwardDescription === 'string') ? { description: pointAwardDescription } : undefined,
+            ...(pointAwardRecipient !== undefined) ? { recipient: pointAwardRecipient } : undefined,
+            ...(typeof pointAwardPurposeIdentifier === 'string') ? { purpose: { identifier: pointAwardPurposeIdentifier } } : undefined
+        };
     }
     return pointAward;
 }
@@ -32,21 +38,20 @@ function createPointAward(params) {
  * サービスアウトプットを作成する
  */
 function createServiceOutput(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const product = params.product;
     const acceptedOffer = params.acceptedOffer;
-    const serviceOutputType = (_a = product.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf;
+    const serviceOutputType = product.serviceOutput?.typeOf;
     if (typeof serviceOutputType !== 'string' || serviceOutputType.length === 0) {
         throw new factory.errors.NotFound('Product serviceOutput type undefined');
     }
-    const identifier = (_c = (_b = acceptedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.identifier;
+    const identifier = acceptedOffer.itemOffered?.serviceOutput?.identifier;
     if (typeof identifier !== 'string' || identifier.length === 0) {
         throw new factory.errors.ArgumentNull('object.itemOffered.serviceOutput.identifier');
     }
-    const accessCode = (_e = (_d = acceptedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.accessCode;
-    const name = (_g = (_f = acceptedOffer.itemOffered) === null || _f === void 0 ? void 0 : _f.serviceOutput) === null || _g === void 0 ? void 0 : _g.name;
-    const additionalProperty = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.additionalProperty;
-    const issuedBy = (_l = (_k = acceptedOffer.itemOffered) === null || _k === void 0 ? void 0 : _k.serviceOutput) === null || _l === void 0 ? void 0 : _l.issuedBy;
+    const accessCode = acceptedOffer.itemOffered?.serviceOutput?.accessCode;
+    const name = acceptedOffer.itemOffered?.serviceOutput?.name;
+    const additionalProperty = acceptedOffer.itemOffered?.serviceOutput?.additionalProperty;
+    const issuedBy = acceptedOffer.itemOffered?.serviceOutput?.issuedBy;
     const { amount, depositAmount, paymentAmount } = createServiceOutputMonetaryAmount({ product, offer: params.offer });
     const validFor = offer2validFor({ offer: params.offer });
     // 決済口座
@@ -74,24 +79,56 @@ function createServiceOutput(params) {
         default:
             throw new factory.errors.NotImplemented(`Product type ${product.typeOf} not implemented`);
     }
-    const issuedThrough = Object.assign({ 
+    const issuedThrough = {
         // 廃止(2023-02-20~)
         // project: { typeOf: product.project.typeOf, id: product.project.id },
-        typeOf: product.typeOf, id: product.id }, (typeof ((_m = product.serviceType) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') ? { serviceType: product.serviceType } : undefined);
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project: { typeOf: product.project.typeOf, id: product.project.id }, identifier: identifier, issuedThrough, typeOf: serviceOutputType, dateIssued: params.dateIssued }, (typeof accessCode === 'string') ? { accessCode } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof validFor === 'string') ? { validFor } : undefined), (name !== undefined) ? { name } : undefined), (amount !== undefined) ? { amount } : undefined), (depositAmount !== undefined) ? { depositAmount } : undefined), (paymentAmount !== undefined) ? { paymentAmount } : undefined), (paymentAccount !== undefined) ? { paymentAccount } : undefined), (issuedBy !== undefined) ? { issuedBy } : undefined);
+        typeOf: product.typeOf,
+        id: product.id,
+        ...(typeof product.serviceType?.typeOf === 'string') ? { serviceType: product.serviceType } : undefined
+    };
+    return {
+        project: { typeOf: product.project.typeOf, id: product.project.id },
+        identifier: identifier,
+        issuedThrough,
+        typeOf: serviceOutputType,
+        dateIssued: params.dateIssued,
+        ...(typeof accessCode === 'string') ? { accessCode } : undefined,
+        ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+        ...(typeof validFor === 'string') ? { validFor } : undefined,
+        ...(name !== undefined) ? { name } : undefined,
+        ...(amount !== undefined) ? { amount } : undefined,
+        ...(depositAmount !== undefined) ? { depositAmount } : undefined,
+        ...(paymentAmount !== undefined) ? { paymentAmount } : undefined,
+        ...(paymentAccount !== undefined) ? { paymentAccount } : undefined,
+        ...(issuedBy !== undefined) ? { issuedBy } : undefined
+    };
 }
 function createServiceOutputMonetaryAmount(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const product = params.product;
-    const currency = (typeof ((_b = (_a = product.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === 'string')
-        ? (_c = product.serviceOutput) === null || _c === void 0 ? void 0 : _c.amount.currency
+    const currency = (typeof product.serviceOutput?.amount?.currency === 'string')
+        ? product.serviceOutput?.amount.currency
         : factory.priceCurrency.JPY;
     // 初期金額
-    const amount = Object.assign(Object.assign(Object.assign({}, (_d = product.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount), (_f = (_e = params.offer.itemOffered) === null || _e === void 0 ? void 0 : _e.serviceOutput) === null || _f === void 0 ? void 0 : _f.amount), { currency, typeOf: 'MonetaryAmount' });
+    const amount = {
+        ...product.serviceOutput?.amount,
+        ...params.offer.itemOffered?.serviceOutput?.amount,
+        currency,
+        typeOf: 'MonetaryAmount'
+    };
     // 入金設定
-    const depositAmount = Object.assign(Object.assign({}, (_h = (_g = params.offer.itemOffered) === null || _g === void 0 ? void 0 : _g.serviceOutput) === null || _h === void 0 ? void 0 : _h.depositAmount), { currency, typeOf: 'MonetaryAmount' });
+    const depositAmount = {
+        // ...product.serviceOutput?.depositAmount,
+        ...params.offer.itemOffered?.serviceOutput?.depositAmount,
+        currency,
+        typeOf: 'MonetaryAmount'
+    };
     // 取引設定
-    const paymentAmount = Object.assign(Object.assign({}, (_k = (_j = params.offer.itemOffered) === null || _j === void 0 ? void 0 : _j.serviceOutput) === null || _k === void 0 ? void 0 : _k.paymentAmount), { currency, typeOf: 'MonetaryAmount' });
+    const paymentAmount = {
+        // ...product.serviceOutput?.paymentAmount,
+        ...params.offer.itemOffered?.serviceOutput?.paymentAmount,
+        currency,
+        typeOf: 'MonetaryAmount'
+    };
     return { amount, depositAmount, paymentAmount };
 }
 function offer2validFor(params) {

package/lib/chevre/service/assetTransaction/registerService/potentialActions.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.createPotentialActions = createPotentialActions;
 // import * as pecorinoapi from '@pecorino/api-nodejs-client';
@@ -49,12 +40,11 @@ function createMoneyTransferActions(__) {
 function createRegisterServiceActions(params) {
     const validFrom = (params.endDate instanceof Date) ? params.endDate : new Date();
     return params.transaction.object.map((o) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const pointAward = o.itemOffered.pointAward;
         const serviceOutput = o.itemOffered.serviceOutput;
         // validFor:undefinedに対応
         let validUntil;
-        if (typeof (serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.validFor) === 'string') {
+        if (typeof serviceOutput?.validFor === 'string') {
             // オファーの単価単位で有効期限を決定
             validUntil = moment(validFrom)
                 .add(moment.duration(serviceOutput.validFor))
@@ -66,40 +56,61 @@ function createRegisterServiceActions(params) {
         }
         const moneyTransfer = [];
         // ポイント特典があれば適用
-        const pointAwardToLocationIdentifier = (_a = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _a === void 0 ? void 0 : _a.identifier;
-        const pointAwardToLocationTypeOf = (_b = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _b === void 0 ? void 0 : _b.typeOf;
-        if (typeof ((_c = pointAward === null || pointAward === void 0 ? void 0 : pointAward.amount) === null || _c === void 0 ? void 0 : _c.value) === 'number'
+        const pointAwardToLocationIdentifier = pointAward?.toLocation?.identifier;
+        const pointAwardToLocationTypeOf = pointAward?.toLocation?.typeOf;
+        if (typeof pointAward?.amount?.value === 'number'
             && typeof pointAwardToLocationIdentifier === 'string'
             && typeof pointAwardToLocationTypeOf === 'string') {
             const fromLocation = {
-                typeOf: (typeof ((_d = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-                    ? (_e = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _e === void 0 ? void 0 : _e.typeOf
+                typeOf: (typeof serviceOutput?.issuedBy?.typeOf === 'string')
+                    ? serviceOutput?.issuedBy?.typeOf
                     : params.transaction.typeOf,
-                name: (((_f = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _f === void 0 ? void 0 : _f.name) !== undefined)
-                    ? (typeof ((_g = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
-                        ? (_h = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _h === void 0 ? void 0 : _h.name
-                        : (_j = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _j === void 0 ? void 0 : _j.name.ja
+                name: (serviceOutput?.issuedBy?.name !== undefined)
+                    ? (typeof serviceOutput?.issuedBy?.name === 'string')
+                        ? serviceOutput?.issuedBy?.name
+                        : serviceOutput?.issuedBy?.name.ja
                     : params.transaction.id
             };
             const toLocation = {
                 identifier: pointAwardToLocationIdentifier,
                 typeOf: factory.permit.PermitType.Permit,
-                issuedThrough: { id: String((_l = (_k = pointAward.toLocation) === null || _k === void 0 ? void 0 : _k.issuedThrough) === null || _l === void 0 ? void 0 : _l.id) }
+                issuedThrough: { id: String(pointAward.toLocation?.issuedThrough?.id) }
             };
             const recipient = {
                 typeOf: factory.personType.Person,
                 id: '',
                 name: String(fromLocation)
             };
-            moneyTransfer.push(Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.MoneyTransfer, agent: params.transaction.project, recipient, object: {
+            moneyTransfer.push({
+                project: params.transaction.project,
+                typeOf: factory.actionType.MoneyTransfer,
+                agent: params.transaction.project,
+                recipient,
+                object: {
                     typeOf: factory.account.transactionType.Deposit
-                }, purpose: Object.assign({ typeOf: params.transaction.typeOf, id: params.transaction.id }, (typeof ((_m = pointAward.purpose) === null || _m === void 0 ? void 0 : _m.identifier) === 'string') ? { identifier: pointAward.purpose.identifier } : undefined), amount: {
+                },
+                purpose: {
+                    typeOf: params.transaction.typeOf,
+                    id: params.transaction.id,
+                    // 入金取引に識別子を指定する
+                    ...(typeof pointAward.purpose?.identifier === 'string') ? { identifier: pointAward.purpose.identifier } : undefined
+                },
+                amount: {
                     typeOf: 'MonetaryAmount',
-                    value: (_o = pointAward.amount) === null || _o === void 0 ? void 0 : _o.value,
-                    currency: (_p = pointAward.amount) === null || _p === void 0 ? void 0 : _p.currency
-                }, fromLocation: fromLocation, toLocation: toLocation }, (typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined), (pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined));
+                    value: pointAward.amount?.value,
+                    currency: pointAward.amount?.currency
+                },
+                fromLocation: fromLocation,
+                toLocation: toLocation,
+                ...(typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined,
+                ...(pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined
+            });
         }
-        const object = Object.assign(Object.assign({}, serviceOutput), { validFrom: validFrom, validUntil: validUntil });
+        const object = {
+            ...serviceOutput,
+            validFrom: validFrom,
+            validUntil: validUntil
+        };
         return {
             project: params.transaction.project,
             typeOf: factory.actionType.RegisterAction,
@@ -122,18 +133,16 @@ function createRegisterServiceActions(params) {
 /**
  * 取引のポストアクションを作成する
  */
-function createPotentialActions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // 通貨転送アクション属性作成
-        const moneyTransferActionAttributesList = createMoneyTransferActions(params);
-        // まずは1転送アクションのみ対応
-        if (moneyTransferActionAttributesList.length > 1) {
-            throw new factory.errors.Argument('Transaction', 'Number of moneyTransfer actions must be 1');
-        }
-        const registerServiceActionAttributes = createRegisterServiceActions(params);
-        return {
-            moneyTransfer: moneyTransferActionAttributesList,
-            registerService: registerServiceActionAttributes
-        };
-    });
+async function createPotentialActions(params) {
+    // 通貨転送アクション属性作成
+    const moneyTransferActionAttributesList = createMoneyTransferActions(params);
+    // まずは1転送アクションのみ対応
+    if (moneyTransferActionAttributesList.length > 1) {
+        throw new factory.errors.Argument('Transaction', 'Number of moneyTransfer actions must be 1');
+    }
+    const registerServiceActionAttributes = createRegisterServiceActions(params);
+    return {
+        moneyTransfer: moneyTransferActionAttributesList,
+        registerService: registerServiceActionAttributes
+    };
 }