@chevre/factory 4.360.0 → 4.362.0-alpha.0

package/lib/action/authorize/paymentMethod/any.d.ts

@@ -14,14 +14,6 @@ export type IRecipient = ActionFactory.IParticipantAsSeller;
 export declare enum ResultType {
     Payment = "Payment"
 }
-/**
- * 進行中取引
- */
-export interface IObjectPendingTransaction {
-    typeOf: AssetTransactionType.MoneyTransfer;
-    id?: string;
-    transactionNumber?: string;
-}
 export { ICreditCard, IFromLocation, ITokenizedPaymentCard };
 export import IPurchaseNumberAuthResult = CheckMovieTicketActionFactory.IPurchaseNumberAuthResult;
 /**
@@ -64,10 +56,6 @@ export interface IObject {
          */
         id: string;
     };
-    /**
-     * 進行中取引(ペイメントカード決済)
-     */
-    pendingTransaction?: IObjectPendingTransaction;
     /**
      * 転送元(PaymentCard決済)
      */
@@ -140,11 +128,16 @@ export interface IPurpose {
 export declare enum ServiceIdentifier {
     Chevre = "Chevre"
 }
-export interface IService {
+export interface IInstrumentAsService {
     typeOf: 'WebAPI';
     identifier: ServiceIdentifier;
 }
-export type IInstrument = IService;
+export interface IInstrumentAsAssetTransaction {
+    typeOf: AssetTransactionType.Pay;
+    transactionNumber: string;
+    identifier: ServiceIdentifier;
+}
+export type IInstrument = IInstrumentAsAssetTransaction | IInstrumentAsService;
 /**
  * 決済承認アクション属性
  */

package/lib/action/interact/confirm/moneyTransfer.d.ts

@@ -1,7 +1,9 @@
+import { IParticipantAsProject } from '../../../action';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { ISimpleOrder } from '../../../order';
 import { TransactionType } from '../../../transactionType';
 import * as ConfirmActionFactory from '../confirm';
+export type IAgent = IParticipantAsProject;
 export interface IObject {
     transactionNumber: string;
     typeOf: AssetTransactionType.MoneyTransfer;
@@ -13,6 +15,7 @@ export interface ITransactionPurpose {
 }
 export type IPurpose = ITransactionPurpose | ISimpleOrder;
 export interface IAttributes extends ConfirmActionFactory.IAttributes<IObject, IResult> {
+    agent: IAgent;
     /**
      * 注文取引から発生した場合はISimpleOrder
      */

package/lib/action/interact/confirm/pay.d.ts

@@ -11,6 +11,9 @@ export interface IPayAssetTransaction {
     transactionNumber: string;
     object?: {
         paymentMethod?: {
+            /**
+             * 決済方法区分
+             */
             identifier?: string;
         };
     };

package/lib/action/interact/confirm/registerService.d.ts

@@ -1,7 +1,9 @@
+import { IParticipantAsProject } from '../../../action';
 import * as RegisterServiceFactory from '../../../assetTransaction/registerService';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { ISimpleOrder } from '../../../order';
 import * as ConfirmActionFactory from '../confirm';
+export type IAgent = IParticipantAsProject;
 export type IObject = Pick<RegisterServiceFactory.IConfirmParams, 'transactionNumber' | 'endDate'> & {
     transactionNumber: string;
     typeOf: AssetTransactionType.RegisterService;
@@ -15,10 +17,8 @@ export type IObject = Pick<RegisterServiceFactory.IConfirmParams, 'transactionNu
 };
 export type IPurpose = ISimpleOrder;
 export type IResult = any;
-export interface IPotentialActions {
-}
 export interface IAttributes extends ConfirmActionFactory.IAttributes<IObject, IResult> {
-    potentialActions?: IPotentialActions;
+    agent: IAgent;
     purpose: IPurpose;
 }
 /**

package/lib/action/interact/confirm/reservation.d.ts

@@ -1,9 +1,11 @@
 import type * as COA from '@motionpicture/coa-service';
+import { IParticipantAsProject } from '../../../action';
 import * as ReserveTransactionFactory from '../../../assetTransaction/reserve';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { ISimpleOrder } from '../../../order';
 import * as WebAPIFactory from '../../../service/webAPI';
 import * as ConfirmActionFactory from '../confirm';
+export type IAgent = IParticipantAsProject;
 export type IObject4COA = COA.factory.reserve.IUpdReserveArgs & {
     transactionNumber: string;
     typeOf: 'COAReserveTransaction';
@@ -17,10 +19,11 @@ export type IPurpose = ISimpleOrder;
 export type IResult = any;
 export type IInstrument<T extends WebAPIFactory.Identifier> = WebAPIFactory.IService<T>;
 export interface IAttributes<T extends WebAPIFactory.Identifier> extends ConfirmActionFactory.IAttributes<IObject<T>, IResult> {
+    agent: IAgent;
     instrument: IInstrument<T>;
     purpose: IPurpose;
 }
 /**
- * 予約確定アクション
+ * 予約取引確定アクション
  */
 export type IAction<T extends WebAPIFactory.Identifier> = ConfirmActionFactory.IAction<IAttributes<T>>;

package/lib/action/interact/confirm.d.ts

@@ -2,16 +2,21 @@ import * as ActionFactory from '../../action';
 import { ActionType } from '../../actionType';
 import * as OrderFactory from '../../order';
 import { TransactionType } from '../../transactionType';
-export type IAgent = ActionFactory.IParticipantAsProject;
+/**
+ * 確定アクション主体
+ * Projectに統一(2022-05-16~)
+ * 決済取引に関してはクライアントによる確定がありうるので拡張(2024-03-11~)
+ */
+export type IAgent = ActionFactory.IParticipantAsPerson | ActionFactory.IParticipantAsProject | ActionFactory.IParticipantAsWebApplication;
 export type IObject = any;
 export interface ITransactionPurpose {
-    typeOf: TransactionType;
+    typeOf: TransactionType.MoneyTransfer | TransactionType.PlaceOrder;
     id: string;
 }
 export type IPurpose = ITransactionPurpose | OrderFactory.ISimpleOrder;
 export type IResult = any;
 export type IPotentialActions = any;
-export interface IAttributes<TObject, TResult> extends Omit<ActionFactory.IAttributes<ActionType.ConfirmAction, TObject, TResult>, 'description' | 'location' | 'recipient'> {
+export interface IAttributes<TObject, TResult> extends Pick<ActionFactory.IAttributes<ActionType.ConfirmAction, TObject, TResult>, 'agent' | 'error' | 'instrument' | 'object' | 'project' | 'purpose' | 'result' | 'typeOf'> {
     agent: IAgent;
     purpose: IPurpose;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.360.0",
+  "version": "4.362.0-alpha.0",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",