@chevre/factory 4.267.0 → 4.268.0-alpha.1

package/lib/account/action/moneyTransfer.d.ts

@@ -1,3 +1,4 @@
+import { AccountType } from '../../accountType';
 import * as ActionFactory from '../../action';
 import { ActionStatusType } from '../../actionStatusType';
 import { ActionType } from '../../actionType';
@@ -8,7 +9,7 @@ import { AccountTransactionType } from '../transactionType';
 export declare type IAgent = ActionFactory.IParticipant;
 export declare type IRecipient = ActionFactory.IParticipant;
 /**
- * 口座以外の匿名場所インターフェース
+ * 口座以外の匿名ロケーション
  */
 export interface IAnonymousLocation extends Pick<IThing, 'identifier' | 'name'> {
     /**
@@ -21,10 +22,10 @@ export interface IAnonymousLocation extends Pick<IThing, 'identifier' | 'name'>
     id?: string;
 }
 /**
- * 口座インターフェース
+ * 口座
  */
 export interface IAccount {
-    typeOf: string;
+    typeOf: AccountType.Account;
     /**
      * 通貨
      */
@@ -39,14 +40,14 @@ export interface IAccount {
     name?: string;
 }
 /**
- * 転送元あるいは転送先の場所インターフェース
+ * 転送元あるいは転送先の場所
  */
 export declare type ILocation = IAnonymousLocation | IAccount;
 export declare type IObject = any;
 export declare type IResult = any;
 export declare type IPotentialActions = any;
 /**
- * アクションの目的インターフェース
+ * アクションの目的
  * ここでは、取引が目的となる
  */
 export interface IPurpose {
@@ -67,6 +68,7 @@ export interface IPurpose {
      */
     identifier?: string;
 }
+export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyTransfer, IObject, IResult> {
     typeOf: ActionType.MoneyTransfer;
     /**
@@ -76,7 +78,7 @@ export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyT
     /**
      * 金額
      */
-    amount: IMonetaryAmount;
+    amount: IAmount;
     /**
      * 転送元
      */
@@ -88,7 +90,7 @@ export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyT
 }
 export declare type IAction = ActionFactory.IAction<IAttributes>;
 /**
- * ソート条件インターフェース
+ * ソート条件
  */
 export interface ISortOrder {
     /**
@@ -103,7 +105,7 @@ export interface IProjectSearchConditions {
     };
 }
 /**
- * 検索条件インターフェース
+ * 検索条件
  */
 export interface ISearchConditions {
     limit?: number;

package/lib/account/transaction/deposit.d.ts

@@ -1,40 +1,20 @@
 import { IExtendId } from '../../autoGenerated';
-import { IClientUser } from '../../clientUser';
-import { IAccount, IAnonymousLocation, IAttributes as IMoneyTransferActionAttributes } from '../action/moneyTransfer';
+import { IAccount, IAnonymousLocation } from '../action/moneyTransfer';
 import * as TransactionFactory from '../transaction';
 import { AccountTransactionType } from '../transactionType';
-export declare type IRecipient = TransactionFactory.IRecipient;
-export declare type IAgent = TransactionFactory.IAgent;
-export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Deposit, IAgent, IRecipient, IObjectWithoutDetail>;
+export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Deposit, IObjectWithoutDetail>;
 /**
- * 取引開始パラメーターインターフェース
+ * 取引開始パラメーター
  */
-export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Deposit, IAgent, IRecipient, IObject>;
-export declare type IResult = any;
-/**
- * エラーインターフェース
- */
-export declare type IError = any;
-export interface IObjectWithoutDetail {
-    clientUser?: IClientUser;
-    amount: {
-        value: number;
-    };
+export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Deposit, IObject>;
+export interface IObjectWithoutDetail extends TransactionFactory.IObjectWithoutDetail {
     fromLocation?: IAnonymousLocation;
     toLocation: TransactionFactory.ISimpleAccount;
-    description?: string;
 }
 /**
- * 取引対象物インターフェース
+ * 取引対象物
  */
-export interface IObject {
-    clientUser?: IClientUser;
-    /**
-     * 金額
-     */
-    amount: {
-        value: number;
-    };
+export interface IObject extends TransactionFactory.IObject {
     /**
      * 入金元
      */
@@ -43,14 +23,10 @@ export interface IObject {
      * 入金先
      */
     toLocation: IAccount;
-    description?: string;
 }
-export interface IPotentialActions {
-    moneyTransfer: IMoneyTransferActionAttributes;
-}
-export declare type ITransaction = IExtendId<IAttributes>;
 /**
- * 入金取引属性インターフェース
+ * 入金取引属性
  */
-export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
+export interface IAttributes extends TransactionFactory.IAttributes<IStartParams> {
 }
+export declare type ITransaction = IExtendId<IAttributes>;

package/lib/account/transaction/transfer.d.ts

@@ -1,40 +1,20 @@
 import { IExtendId } from '../../autoGenerated';
-import { IClientUser } from '../../clientUser';
-import { IAccount, IAttributes as IMoneyTransferActionAttributes } from '../action/moneyTransfer';
+import { IAccount } from '../action/moneyTransfer';
 import * as TransactionFactory from '../transaction';
 import { AccountTransactionType } from '../transactionType';
-export declare type IRecipient = TransactionFactory.IRecipient;
-export declare type IAgent = TransactionFactory.IAgent;
-export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Transfer, IAgent, IRecipient, IObjectWithoutDetail>;
+export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Transfer, IObjectWithoutDetail>;
 /**
- * 取引開始パラメーターインターフェース
+ * 取引開始パラメーター
  */
-export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Transfer, IAgent, IRecipient, IObject>;
-export declare type IResult = any;
-/**
- * エラーインターフェース
- */
-export declare type IError = any;
-export interface IObjectWithoutDetail {
-    clientUser?: IClientUser;
-    amount: {
-        value: number;
-    };
+export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Transfer, IObject>;
+export interface IObjectWithoutDetail extends TransactionFactory.IObjectWithoutDetail {
     fromLocation: TransactionFactory.ISimpleAccount;
     toLocation: TransactionFactory.ISimpleAccount;
-    description?: string;
 }
 /**
- * 取引対象物インターフェース
+ * 取引対象物
  */
-export interface IObject {
-    clientUser?: IClientUser;
-    /**
-     * 金額
-     */
-    amount: {
-        value: number;
-    };
+export interface IObject extends TransactionFactory.IObject {
     /**
      * 転送元
      */
@@ -43,14 +23,10 @@ export interface IObject {
      * 転送先
      */
     toLocation: IAccount;
-    description?: string;
 }
-export interface IPotentialActions {
-    moneyTransfer: IMoneyTransferActionAttributes;
-}
-export declare type ITransaction = IExtendId<IAttributes>;
 /**
- * 転送取引インターフェース
+ * 転送取引
  */
-export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
+export interface IAttributes extends TransactionFactory.IAttributes<IStartParams> {
 }
+export declare type ITransaction = IExtendId<IAttributes>;

package/lib/account/transaction/withdraw.d.ts

@@ -1,44 +1,24 @@
 import { IExtendId } from '../../autoGenerated';
-import { IClientUser } from '../../clientUser';
-import { IAccount, IAnonymousLocation, IAttributes as IMoneyTransferActionAttributes } from '../action/moneyTransfer';
+import { IAccount, IAnonymousLocation } from '../action/moneyTransfer';
 import * as TransactionFactory from '../transaction';
 import { AccountTransactionType } from '../transactionType';
-export declare type IRecipient = TransactionFactory.IRecipient;
-export declare type IAgent = TransactionFactory.IAgent;
-export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Withdraw, IAgent, IRecipient, IObjectWithoutDetail>;
+export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Withdraw, IObjectWithoutDetail>;
 /**
- * 取引開始パラメーターインターフェース
+ * 取引開始パラメーター
  */
-export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Withdraw, IAgent, IRecipient, IObject>;
-export declare type IResult = any;
-/**
- * エラーインターフェース
- */
-export declare type IError = any;
-export interface IObjectWithoutDetail {
-    clientUser?: IClientUser;
-    amount: {
-        value: number;
-    };
+export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Withdraw, IObject>;
+export interface IObjectWithoutDetail extends TransactionFactory.IObjectWithoutDetail {
     fromLocation: TransactionFactory.ISimpleAccount;
     toLocation?: IAnonymousLocation;
-    description?: string;
     /**
      * 利用可能金額確認をしない場合、force: true
      */
     force?: boolean;
 }
 /**
- * 取引対象物インターフェース
+ * 取引対象物
  */
-export interface IObject {
-    clientUser?: IClientUser;
-    /**
-     * 金額
-     */
-    amount: {
-        value: number;
-    };
+export interface IObject extends TransactionFactory.IObject {
     /**
      * 出金元
      */
@@ -47,14 +27,11 @@ export interface IObject {
      * 出金先
      */
     toLocation?: IAnonymousLocation;
-    description?: string;
 }
-export interface IPotentialActions {
-    moneyTransfer: IMoneyTransferActionAttributes;
-}
-export declare type ITransaction = IExtendId<IAttributes>;
+export import IPotentialActions = TransactionFactory.IPotentialActions;
 /**
- * 出金取引インターフェース
+ * 出金取引
  */
-export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
+export interface IAttributes extends TransactionFactory.IAttributes<IStartParams> {
 }
+export declare type ITransaction = IExtendId<IAttributes>;

package/lib/account/transaction.d.ts

@@ -13,10 +13,25 @@ export interface IProject {
     id: string;
     typeOf: OrganizationType.Project;
 }
+export interface IObjectWithoutDetail {
+    amount: {
+        value: number;
+    };
+    description?: string;
+}
+export interface IObject {
+    /**
+     * 金額
+     */
+    amount: {
+        value: number;
+    };
+    description?: string;
+}
 /**
  * 口座取引開始パラメータ
  */
-export interface IStartParams<T extends AccountTransactionType, TAgent extends IAgent, TRecipient extends IRecipient, TObject> {
+export interface IStartParams<T extends AccountTransactionType, TObject extends IObject> {
     project: IProject;
     /**
      * 取引タイプ
@@ -30,16 +45,17 @@ export interface IStartParams<T extends AccountTransactionType, TAgent extends I
     /**
      * 取引番号
      * サービス使用側が指定するグローバルユニークな番号
+     * 必須化(2022-09-26~)
      */
-    transactionNumber?: string;
+    transactionNumber: string;
     /**
      * 取引主体
      */
-    agent: TAgent;
+    agent: IAgent;
     /**
      * 取引物受取者
      */
-    recipient: TRecipient;
+    recipient: IRecipient;
     /**
      * 取引対象
      */
@@ -49,14 +65,19 @@ export interface IStartParams<T extends AccountTransactionType, TAgent extends I
      */
     expires: Date;
 }
+export interface IPotentialActions {
+    moneyTransfer: MoneyTransferActionFactory.IAttributes;
+}
 /**
- * 口座取引
+ * エラー
  */
-export declare type ITransaction<TStartParams, TResult, TError, TPotentialActions> = IExtendId<IAttributes<TStartParams, TResult, TError, TPotentialActions>>;
+export declare type IError = any;
+export interface IResult {
+}
 /**
  * 口座取引属性
  */
-export declare type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TStartParams & {
+export declare type IAttributes<TStartParams> = TStartParams & {
     /**
      * 取引状態
      */
@@ -64,15 +85,15 @@ export declare type IAttributes<TStartParams, TResult, TError, TPotentialActions
     /**
      * 取引結果
      */
-    result?: TResult;
+    result?: IResult;
     /**
      * 取引エラー
      */
-    error?: TError;
+    error?: IError;
     /**
      * 取引開始日時
      */
-    startDate?: Date;
+    startDate: Date;
     /**
      * 取引終了日時
      */
@@ -88,5 +109,9 @@ export declare type IAttributes<TStartParams, TResult, TError, TPotentialActions
     /**
      * 事後に発生するアクション
      */
-    potentialActions?: TPotentialActions;
+    potentialActions?: IPotentialActions;
 };
+/**
+ * 口座取引
+ */
+export declare type ITransaction<TStartParams> = IExtendId<IAttributes<TStartParams>>;

package/lib/account.d.ts

@@ -24,11 +24,14 @@ export declare namespace action {
     export import moneyTransfer = MoneyTransferActionFactory;
 }
 export declare namespace transaction {
-    type IStartParams<T extends AccountTransactionType> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IStartParams : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IStartParams : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IStartParams : TransactionFactory.IStartParams<AccountTransactionType, any, any, any>;
-    type IAttributes<T> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IAttributes : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IAttributes : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IAttributes : TransactionFactory.IAttributes<any, any, any, any>;
-    type ITransaction<T> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.ITransaction : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.ITransaction : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.ITransaction : TransactionFactory.ITransaction<any, any, any, any>;
-    type IResult<T> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IResult : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IResult : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IResult : any;
-    type IPotentialActions<T> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IPotentialActions : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IPotentialActions : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IPotentialActions : any;
+    export import IAgent = TransactionFactory.IAgent;
+    export import IRecipient = TransactionFactory.IRecipient;
+    export import IPotentialActions = TransactionFactory.IPotentialActions;
+    export import IResult = TransactionFactory.IResult;
+    type IStartParamsWithoutDetail<T extends AccountTransactionType> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IStartParamsWithoutDetail : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IStartParamsWithoutDetail : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IStartParamsWithoutDetail : never;
+    type IStartParams<T extends AccountTransactionType> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IStartParams : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IStartParams : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IStartParams : never;
+    type IAttributes<T> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IAttributes : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IAttributes : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IAttributes : never;
+    type ITransaction<T> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.ITransaction : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.ITransaction : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.ITransaction : never;
     export import withdraw = WithdrawTransactionFactory;
     export import deposit = DepositTransactionFactory;
     export import transfer = TransferTransactionFactory;
@@ -68,15 +71,15 @@ export interface IAccount {
     /**
      * 口座名義
      */
-    name?: string;
+    name: string;
     /**
      * 残高
      */
-    balance?: number;
+    balance: number;
     /**
      * 利用可能残高
      */
-    availableBalance?: number;
+    availableBalance: number;
     /**
      * 進行中取引リスト
      */
@@ -84,7 +87,7 @@ export interface IAccount {
     /**
      * 口座開設日時
      */
-    openDate?: Date;
+    openDate: Date;
     /**
      * 口座閉鎖日時
      */
@@ -92,7 +95,7 @@ export interface IAccount {
     /**
      * 口座ステータス
      */
-    status?: AccountStatusType;
+    status: AccountStatusType;
 }
 /**
  * ソート条件

package/lib/action/authorize/offer/seatReservation.d.ts

@@ -1,10 +1,10 @@
 import * as COA from '@motionpicture/coa-service';
 import * as ActionFactory from '../../../action';
+import { ITotalPaymentDue } from '../../../action/trade/pay';
 import { ActionType } from '../../../actionType';
 import * as ReserveTransactionFactory from '../../../assetTransaction/reserve';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import * as ScreeningEventFactory from '../../../event/screeningEvent';
-import { IMonetaryAmount } from '../../../monetaryAmount';
 import * as OfferFactory from '../../../offer';
 import * as OrderFactory from '../../../order';
 import { PriceCurrency } from '../../../priceCurrency';
@@ -33,7 +33,7 @@ export interface IResult<T extends WebAPIFactory.Identifier> {
      * オファーに対して必要な金額
      * currencyを口座タイプとして扱う
      */
-    amount: IMonetaryAmount[];
+    amount: ITotalPaymentDue[];
     /**
      * 外部リクエストエンドポイント
      */

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

@@ -1,15 +1,15 @@
 import * as ActionFactory from '../../../action';
 import * as CheckMovieTicketActionFactory from '../../../action/check/paymentMethod/movieTicket';
+import { ITotalPaymentDue } from '../../../action/trade/pay';
 import * as MoneyTransferActionFactory from '../../../action/transfer/moneyTransfer';
 import { ActionType } from '../../../actionType';
 import * as PayTransactionFactory from '../../../assetTransaction/pay';
 import { AssetTransactionType } from '../../../assetTransactionType';
-import { IMonetaryAmount } from '../../../monetaryAmount';
+import { IPaymentMethodIssuedThrough } from '../../../order';
 import * as CreditCardFactory from '../../../paymentMethod/paymentCard/creditCard';
 import * as MovieTicketFactory from '../../../paymentMethod/paymentCard/movieTicket';
 import { PaymentStatusType } from '../../../paymentStatusType';
 import { IPropertyValue } from '../../../propertyValue';
-import { PaymentServiceType } from '../../../service/paymentService';
 import { TransactionType } from '../../../transactionType';
 import * as AuthorizeActionFactory from '../../authorize';
 export declare type IAgent = ActionFactory.IParticipantAsWebApplication | ActionFactory.IParticipantAsPerson;
@@ -111,23 +111,6 @@ export interface IObject {
     movieTickets?: IMovieTicket[];
 }
 export declare type IPaymentServiceOutput = IMovieTicket[];
-/**
- * 決済方法の発行サービス
- */
-export interface IPaymentMethodIssuedThrough {
-    /**
-     * 決済サービスタイプ
-     */
-    typeOf: PaymentServiceType;
-    /**
-     * サービスID
-     */
-    id: string;
-    /**
-     * 決済サービスによって発行された決済カード
-     */
-    serviceOutput?: IPaymentServiceOutput;
-}
 export interface IResult {
     /**
      * The identifier for the account the payment will be applied to.
@@ -156,7 +139,7 @@ export interface IResult {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: IMonetaryAmount;
+    totalPaymentDue?: ITotalPaymentDue;
     /**
      * 追加特性
      */
@@ -211,3 +194,4 @@ export interface IAttributes extends AuthorizeActionFactory.IAttributes<IObject,
  * 決済承認アクション
  */
 export declare type IAction = ActionFactory.IAction<IAttributes>;
+export { ITotalPaymentDue };

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

@@ -2,12 +2,6 @@ import { AssetTransactionType } from '../../../assetTransactionType';
 import { ISimpleOrder } from '../../../order';
 import { TransactionType } from '../../../transactionType';
 import * as ConfirmActionFactory from '../confirm';
-/**
- * 匿名ロケーションインターフェース
- */
-/**
- * 決済方法インターフェース
- */
 /**
  * 転送元あるいは転送先の場所インターフェース
  */

package/lib/action/trade/pay.d.ts

@@ -4,8 +4,7 @@ import * as ActionFactory from '../../action';
 import { IAttributes as IReturnOrderActionAttributes } from '../../action/transfer/return/order';
 import { ActionType } from '../../actionType';
 import { AssetTransactionType } from '../../assetTransactionType';
-import { IPaymentServiceOutput } from '../../invoice';
-import { IMonetaryAmount } from '../../monetaryAmount';
+import { IPaymentServiceOutput, ITotalPaymentDue } from '../../invoice';
 import { OrderType } from '../../order';
 import { IMovieTicket } from '../../paymentMethod/paymentCard/movieTicket';
 import { IPropertyValue } from '../../propertyValue';
@@ -69,7 +68,7 @@ export interface IPaymentMethod {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: IMonetaryAmount;
+    totalPaymentDue?: ITotalPaymentDue;
     /**
      * 追加特性
      */
@@ -126,3 +125,4 @@ export interface IAttributes extends ActionFactory.IAttributes<ActionType.PayAct
  * 決済アクション
  */
 export declare type IAction = ActionFactory.IAction<IAttributes>;
+export { ITotalPaymentDue };

package/lib/action/transfer/moneyTransfer.d.ts

@@ -11,7 +11,7 @@ export interface IPendingTransaction {
     typeOf: AccountFactory.transactionType;
     id: string;
     identifier?: string;
-    transactionNumber?: string;
+    transactionNumber: string;
 }
 export declare type IAgent = ActionFactory.IParticipantAsProject | ActionFactory.IParticipantAsPerson | ActionFactory.IParticipantAsSeller;
 export declare type IRecipient = ActionFactory.IParticipant;
@@ -43,6 +43,7 @@ export interface ITransactionPurpose {
     identifier?: string;
 }
 export declare type IPurpose = ITransactionPurpose;
+export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyTransfer, IObject, IResult> {
     typeOf: ActionType.MoneyTransfer;
     agent: IAgent;
@@ -51,7 +52,7 @@ export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyT
     /**
      * 金額
      */
-    amount: IMonetaryAmount;
+    amount: IAmount;
     /**
      * 転送元
      */

package/lib/assetTransaction/moneyTransfer.d.ts

@@ -1,8 +1,7 @@
-import { IAttributes as IMoneyTransferActionAttributes, ILocation, IPendingTransaction, IRecipient as IMoneyTransferRecipient } from '../action/transfer/moneyTransfer';
+import { IAmount as IMoneyTransferAmount, IAttributes as IMoneyTransferActionAttributes, ILocation, IPendingTransaction, IRecipient as IMoneyTransferRecipient } from '../action/transfer/moneyTransfer';
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IMonetaryAmount } from '../monetaryAmount';
 import { OrderType } from '../order';
 import { PermitType } from '../permit';
 export import IAgent = AssetTransactionFactory.IAgent;
@@ -47,7 +46,7 @@ export interface IObject {
     /**
      * 金額
      */
-    amount: IMonetaryAmount;
+    amount: IMoneyTransferAmount;
     /**
      * 転送元
      */
@@ -71,7 +70,7 @@ export interface IObjectBeforeStart {
     /**
      * 金額
      */
-    amount: IMonetaryAmount;
+    amount: IMoneyTransferAmount;
     /**
      * 転送元
      */
@@ -84,7 +83,10 @@ export interface IObjectBeforeStart {
      * 取引説明
      */
     description?: string;
-    pendingTransaction?: IPendingTransaction;
+    /**
+     * 口座取引タイプの確認ために指定
+     */
+    pendingTransaction: Pick<IPendingTransaction, 'typeOf'>;
     /**
      * 負の残高でも強制的に出金するかどうか
      */

package/lib/assetTransaction/pay.d.ts

@@ -1,9 +1,8 @@
 import * as GMO from '@motionpicture/gmo-service';
-import { IAttributes as IPayActionAttributes, IOrderAsPayPurpose, IPayPurpose, IPendingTransaction, IRecipient as IPayRecipient } from '../action/trade/pay';
+import { IAttributes as IPayActionAttributes, IOrderAsPayPurpose, IPayPurpose, IPendingTransaction, IRecipient as IPayRecipient, ITotalPaymentDue } from '../action/trade/pay';
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IMonetaryAmount } from '../monetaryAmount';
 import { IUnauthorizedCardOfMember, IUncheckedCardRaw, IUncheckedCardTokenized } from '../paymentMethod/paymentCard/creditCard';
 import { IMovieTicket } from '../paymentMethod/paymentCard/movieTicket';
 import { IOnPaymentStatusChanged } from '../project';
@@ -53,7 +52,7 @@ export interface IPaymentMethod {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: IMonetaryAmount;
+    totalPaymentDue?: ITotalPaymentDue;
     /**
      * 決済方法タイプ
      */

package/lib/invoice.d.ts

@@ -33,6 +33,7 @@ export interface IPaymentMethod {
     typeOf: PaymentServiceType;
     serviceOutput?: IPaymentServiceOutput;
 }
+export declare type ITotalPaymentDue = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 /**
  * インボイスインターフェース
  * {@link https://schema.org/Invoice}
@@ -101,7 +102,7 @@ export interface IInvoice {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: IMonetaryAmount;
+    totalPaymentDue?: ITotalPaymentDue;
 }
 /**
  * ソート条件インターフェース

package/lib/merchantReturnPolicy.d.ts

@@ -41,6 +41,7 @@ export declare enum MerchantReturnEnumeration {
      */
     MerchantReturnUnspecified = "MerchantReturnUnspecified"
 }
+export declare type IRestockingFee = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 export interface IMerchantReturnPolicy extends Pick<IThing, 'name' | 'url'> {
     typeOf: 'MerchantReturnPolicy';
     /**
@@ -72,7 +73,7 @@ export interface IMerchantReturnPolicy extends Pick<IThing, 'name' | 'url'> {
      * Use MonetaryAmount to specify a fixed restocking fee for product returns,
      * or use Number to specify a percentage of the product price paid by the customer.
      */
-    restockingFee?: IMonetaryAmount | number;
+    restockingFee?: IRestockingFee | number;
     /**
      * Indicates (via enumerated options) the return fees policy for a MerchantReturnPolicy
      */

package/lib/offer.d.ts

@@ -4,6 +4,7 @@ import { ItemAvailability } from './itemAvailability';
 import { IMonetaryAmount } from './monetaryAmount';
 import { OfferType } from './offerType';
 import { OrganizationType } from './organizationType';
+import { IAmount as IPermitAmount, IDepositAmount, IPaymentAmount } from './permit';
 import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification } from './priceSpecification';
 import { IPriceSpecification as ICategoryCodeChargeSpecification } from './priceSpecification/categoryCodeChargeSpecification';
@@ -11,7 +12,7 @@ import { IPriceSpecification as ICompoundPriceSpecification } from './priceSpeci
 import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from './priceSpecification/movieTicketTypeChargeSpecification';
 import { IAppliesToMovieTicket, IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { PriceSpecificationType } from './priceSpecificationType';
-import { ProductType } from './product';
+import { IPointAwardAmount, ProductType } from './product';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
 import { IQuantitativeValue } from './quantitativeValue';
@@ -34,7 +35,7 @@ export interface ICategory {
  */
 export declare type IAddOn = IOffer;
 export declare type IEligibleCategoryCode = Pick<ICategoryCode, 'project' | 'typeOf' | 'id' | 'codeValue' | 'inCodeSet'>;
-export declare type IEligibleMonetaryAmount = IMonetaryAmount;
+export declare type IEligibleMonetaryAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 /**
  * 適用サブ予約条件
  */
@@ -208,15 +209,15 @@ export interface IItemOffered {
         /**
          * ペイメントカード初期金額
          */
-        amount?: IMonetaryAmount;
+        amount?: IPermitAmount;
         /**
          * ペイメントカード入金設定
          */
-        depositAmount?: IMonetaryAmount;
+        depositAmount?: IDepositAmount;
         /**
          * ペイメントカード決済設定
          */
-        paymentAmount?: IMonetaryAmount;
+        paymentAmount?: IPaymentAmount;
     };
     /**
      * 特典
@@ -225,7 +226,7 @@ export interface IItemOffered {
         /**
          * 付与金額
          */
-        amount?: IMonetaryAmount;
+        amount?: IPointAwardAmount;
         /**
          * 特典説明
          */

package/lib/order.d.ts

@@ -1,12 +1,11 @@
 import { IParticipant } from './action';
-import { IPaymentMethodIssuedThrough } from './action/authorize/paymentMethod/any';
+import { IPaymentService, ITotalPaymentDue } from './action/trade/pay';
+import { IAmount as IMoneyTransferAmount, IPaymentCard as IPaymentCardAsMoneyTransferToLocation } from './action/transfer/moneyTransfer';
 import { ActionType } from './actionType';
-import { IPaymentCard } from './assetTransaction/moneyTransfer';
 import { AssetTransactionType } from './assetTransactionType';
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
 import { ICustomer as ICustomerOrganization } from './customer';
 import { EventType } from './eventType';
-import * as MonetaryAmountFactory from './monetaryAmount';
 import { IMultilingualString } from './multilingualString';
 import { IOffer, ITicketPriceSpecification } from './offer';
 import { OrderStatus } from './orderStatus';
@@ -30,6 +29,7 @@ export interface IProject {
 export declare enum OrderType {
     Order = "Order"
 }
+export declare type IPaymentMethodIssuedThrough = Pick<IPaymentService, 'typeOf' | 'id' | 'serviceOutput'>;
 /**
  * 決済方法
  */
@@ -53,7 +53,7 @@ export interface IPaymentMethod {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: MonetaryAmountFactory.IMonetaryAmount;
+    totalPaymentDue?: ITotalPaymentDue;
     /**
      * 追加特性
      */
@@ -105,17 +105,18 @@ export interface IMoneyTransferPendingTransaction {
      */
     transactionNumber: string;
 }
+export declare type IMoneyTransferToLocation = Pick<IPaymentCardAsMoneyTransferToLocation, 'typeOf' | 'identifier' | 'issuedThrough'>;
 export interface IMoneyTransfer {
     typeOf: ActionType.MoneyTransfer;
     /**
      * 金額
      */
-    amount: MonetaryAmountFactory.IMonetaryAmount;
+    amount: IMoneyTransferAmount;
     description?: string;
     /**
      * 転送先
      */
-    toLocation: IPaymentCard;
+    toLocation: IMoneyTransferToLocation;
     object: {
         /**
          * 入金処理の資産取引

package/lib/paymentMethod/paymentCard.d.ts

@@ -1,5 +1,6 @@
 import { IMonetaryAmount } from '../monetaryAmount';
 import { IPaymentMethod } from '../paymentMethod';
+export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'validThrough'>;
 /**
  * payment card interface
  */
@@ -12,7 +13,7 @@ export interface IPaymentCard extends IPaymentMethod {
     /**
      * The amount of money.
      */
-    amount?: IMonetaryAmount;
+    amount?: IAmount;
     serviceOutput?: any;
     serviceType?: any;
 }

package/lib/permit.d.ts

@@ -9,6 +9,11 @@ export declare enum PermitType {
     Permit = "Permit"
 }
 export declare type IIssuedThrough = Pick<IProduct, 'id' | 'project' | 'serviceType' | 'typeOf'>;
+export declare type IPaymentAccount = Pick<IAccount, 'project' | 'typeOf' | 'accountNumber' | 'accountType'>;
+export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
+export declare type IDepositAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'maxValue' | 'minValue'>;
+export declare type IPaymentAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'maxValue' | 'minValue'>;
+export declare type IIssuedBy = Pick<IOrganization, 'typeOf' | 'id' | 'name'>;
 /**
  * A permit issued by an organization, e.g. a parking pass.
  * {@link https://schema.org/Permit}
@@ -19,15 +24,15 @@ export interface IPermit extends Pick<IThing, 'name'> {
     identifier?: string;
     accessCode?: string;
     additionalProperty?: IPropertyValue<string>[];
-    amount?: IMonetaryAmount;
-    depositAmount?: IMonetaryAmount;
-    paymentAmount?: IMonetaryAmount;
-    paymentAccount?: IAccount;
+    amount?: IAmount;
+    depositAmount?: IDepositAmount;
+    paymentAmount?: IPaymentAmount;
+    paymentAccount?: IPaymentAccount;
     dateIssued?: Date;
     /**
      * The organization issuing the ticket or permit.
      */
-    issuedBy?: IOrganization;
+    issuedBy?: IIssuedBy;
     /**
      * The service through with the permit was granted.
      */

package/lib/product.d.ts

@@ -37,12 +37,13 @@ export declare type IServiceOutput = IPermit & {
     membershipPointsEarned?: IQuantitativeValue<any>;
     automaticRenewal?: boolean;
 };
+export declare type IPointAwardAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 /**
  * ポイント特典インターフェース
  */
 export interface IPointAward {
     typeOf: ActionType.MoneyTransfer;
-    amount?: IMonetaryAmount;
+    amount?: IPointAwardAmount;
     /**
      * 特典付与先
      */

package/lib/transaction/moneyTransfer.d.ts

@@ -1,10 +1,10 @@
 import * as waiter from '@waiter/factory';
 import { IAction as IAuthorizeAction, IAttributes as IAuthorizeActionAttributes } from '../action/authorize';
 import { IAttributes as IMoneyTransferActionAttributes } from '../action/interact/confirm/moneyTransfer';
+import { IAmount as IMoneyTransferAmount } from '../action/transfer/moneyTransfer';
 import * as MoneyTransferAssetTransactionFactory from '../assetTransaction/moneyTransfer';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IMonetaryAmount } from '../monetaryAmount';
 import { PersonType } from '../personType';
 import { IProject } from '../project';
 import * as TransactionFactory from '../transaction';
@@ -57,7 +57,7 @@ export interface IStartParamsWithoutDetail {
         /**
          * 金額
          */
-        amount: IMonetaryAmount;
+        amount: IMoneyTransferAmount;
         /**
          * 転送元
          */
@@ -98,7 +98,7 @@ export interface IObject {
     /**
      * 金額
      */
-    amount: IMonetaryAmount;
+    amount: IMoneyTransferAmount;
     /**
      * 転送元
      */

package/package.json

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