@chevre/factory 5.3.0-alpha.1 → 5.3.0-alpha.3

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

@@ -7,10 +7,16 @@ import { TransactionType } from '../../transactionType';
 import * as AcceptActionFactory from '../accept';
 export { IExecTran3dsArgs, IExecTran3dsResult, IAgent, IRecipe };
 export type IPaymentMethod = Pick<IPaymentMethodWithoutDetail, 'amount' | 'creditCard' | 'identifier' | 'method'>;
-export type IPayObject = Pick<IObjectWithoutDetail, 'id' | 'typeOf'> & {
+/**
+ * 採用する決済方法
+ */
+export type IPayObject = Pick<IObjectWithoutDetail, 'id' | 'typeOf' | 'serviceOutput'> & {
     paymentMethod: IPaymentMethod;
 };
 export interface IObject {
+    /**
+     * 決済方法(決済サービス)
+     */
     object: IPayObject;
     transactionNumber: string;
     typeOf: AssetTransactionType.Pay;
@@ -23,6 +29,14 @@ export interface IPurpose {
     typeOf: TransactionType.PlaceOrder;
     id: string;
 }
+/**
+ * 決済方法チケット
+ */
+export interface ITicketAsInstrument {
+    ticketToken: string;
+    typeOf: 'Ticket';
+}
+export type IInstrument = ITicketAsInstrument;
 /**
  * 決済採用アクション属性
  */
@@ -36,6 +50,11 @@ export interface IAttributes extends Pick<AcceptActionFactory.IAttributes<IObjec
      * authorize payment action identifier
      */
     identifier?: string;
+    /**
+     * 決済採用に使用されるチケット
+     * 2025-11-22まではinstrument自体存在しない
+     */
+    instrument?: IInstrument[];
 }
 /**
  * 決済採用アクション

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

@@ -2,7 +2,7 @@ import * as ActionFactory from '../../../action';
 import * as CheckMovieTicketActionFactory from '../../../action/check/paymentMethod/movieTicket';
 import { AvailablePaymentMethodType, IMovieTicket } from '../../../action/trade/pay';
 import { ActionType } from '../../../actionType';
-import { ICreditCard, IFromLocation, ITokenizedPaymentCard } from '../../../assetTransaction/pay';
+import { ICreditCard, IFromLocation, IInvoiceReferenceOrder, ITokenizedPaymentCard } from '../../../assetTransaction/pay';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { IOrderPaymentMethodIssuedThrough, ITotalPaymentDue } from '../../../order';
 import { PaymentStatusType } from '../../../paymentStatusType';
@@ -77,10 +77,12 @@ export interface IObjectIncludingPaymentMethodDetails {
      */
     movieTickets?: IMovieTicket[];
     /**
-     * メンバーシップチケット指定の場合
-     * 2024-08-13~
+     * 決済方法チケット
+     * 当初はメンバーシップチケットとして使用(2024-08-13~)
+     * メンバーシップチケットに限らず、承認前に発行された決済方法チケットを指定すると、paymentMethodIdはチケットに依存する
      */
     ticketToken?: string;
+    referencesOrder: IInvoiceReferenceOrder;
 }
 export type IAuthorizeAnyPaymentObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'name' | 'additionalProperty' | 'ticketToken'> & {
     creditCard?: never;
@@ -88,16 +90,18 @@ export type IAuthorizeAnyPaymentObject = Pick<IObjectIncludingPaymentMethodDetai
     movieTickets?: never;
     paymentMethodId?: never;
     fromLocation?: never;
-    description?: string;
+    description?: never;
+    referencesOrder?: never;
 };
 export type IAuthorizeCreditCardObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'name' | 'additionalProperty' | 'ticketToken'> & {
     /**
      * 決済URL発行の場合、発行済のpaymentMethodIdを指定
      */
     paymentMethodId?: string;
+    referencesOrder?: IInvoiceReferenceOrder;
     movieTickets?: never;
     fromLocation?: never;
-    description?: string;
+    description?: never;
 };
 export type IAuthorizeMovieTicketObject = Pick<IObjectIncludingPaymentMethodDetails, 'issuedThrough' | 'paymentMethod' | 'movieTickets' | 'name' | 'additionalProperty' | 'ticketToken'> & {
     /**
@@ -108,7 +112,8 @@ export type IAuthorizeMovieTicketObject = Pick<IObjectIncludingPaymentMethodDeta
     method?: never;
     paymentMethodId?: never;
     fromLocation?: never;
-    description?: string;
+    description?: never;
+    referencesOrder?: never;
 };
 export type IAuthorizePaymentCardObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'fromLocation' | 'name' | 'additionalProperty'> & {
     description?: string;
@@ -117,7 +122,11 @@ export type IAuthorizePaymentCardObject = Pick<IObjectIncludingPaymentMethodDeta
     movieTickets?: never;
     ticketToken?: never;
     paymentMethodId?: never;
+    referencesOrder?: never;
 };
+/**
+ * 決済承認リクエストの承認対象オブジェクト
+ */
 export type IObjectWithoutDetail = IAuthorizeAnyPaymentObject | IAuthorizeCreditCardObject | IAuthorizeMovieTicketObject | IAuthorizePaymentCardObject;
 export type IObject = Pick<IObjectIncludingPaymentMethodDetails, 'typeOf' | 'paymentMethodId' | 'accountId'>;
 export interface IResultPaymentMethod {
@@ -166,6 +175,11 @@ export interface IResultAsInvoice {
     additionalProperty?: IPropertyValue<string>[];
     typeOf: ResultType;
     issuedThrough: IOrderPaymentMethodIssuedThrough;
+    /**
+     * 請求の関連注文
+     * support(2025-11-23~)
+     */
+    referencesOrder?: IInvoiceReferenceOrder;
 }
 export type IResultAsPermit = Pick<IPermitAsServiceOutput, 'typeOf' | 'issuedThrough'> & {
     /**
@@ -181,17 +195,12 @@ export interface IPurpose {
 export declare enum ServiceIdentifier {
     Chevre = "Chevre"
 }
-export interface IInstrumentAsService {
-    typeOf: 'WebAPI';
-    transactionNumber: never;
-    identifier: ServiceIdentifier;
-}
 export interface IInstrumentAsAssetTransaction {
     typeOf: AssetTransactionType.Pay;
     transactionNumber: string;
     identifier: ServiceIdentifier;
 }
-export type IInstrument = IInstrumentAsAssetTransaction | IInstrumentAsService;
+export type IInstrument = IInstrumentAsAssetTransaction;
 export interface IAttributes extends AuthorizeActionFactory.IAttributes<IObject, IResult> {
     typeOf: ActionType.AuthorizeAction;
     object: IObject;

package/lib/assetTransaction/pay.d.ts

@@ -2,8 +2,9 @@ import { IAction as IPayAction, IInstrument, ILocation, IMovieTicket, IOrderAsPa
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
+import { IInvoice } from '../invoice';
 import { IMonetaryAmount } from '../monetaryAmount';
-import { ITotalPaymentDue } from '../order';
+import { IEventServiceAsOrderedItem, IOrder, IReservationFor4EventServiceOrderedItem, ITotalPaymentDue } from '../order';
 import { ICreditCard3DS, IUnauthorizedCardOfMember, IUncheckedCardRaw, IUncheckedCardTokenized } from '../paymentMethod/paymentCard/creditCard';
 import { IPropertyValue } from '../propertyValue';
 import { IPotentialAction as IPotentialInformAction, PaymentServiceType } from '../service/paymentService';
@@ -75,10 +76,44 @@ export interface IAccountsReceivableByServiceType {
     accountsReceivable?: number;
 }
 export type IPayActionInObject = Pick<IPayAction, 'actionStatus' | 'id' | 'typeOf'>;
+/**
+ * 決済承認結果としての請求書に関連する注文アイテムとしての興行
+ */
+export type IEventServiceAsInvoiceOrderedItem = Pick<IEventServiceAsOrderedItem, 'typeOf'> & {
+    serviceOutput: {
+        /**
+         * 請求書に関連するイベント
+         * 興行オファー承認のイベントリストと完全に一致する必要がある
+         */
+        reservationFor: Pick<IReservationFor4EventServiceOrderedItem, 'id' | 'typeOf'>;
+    };
+};
+/**
+ * 決済承認結果としての請求書に関連する注文アイテム
+ */
+export interface IInvoiceOrderedItem {
+    typeOf: 'OrderItem';
+    orderedItem: IEventServiceAsInvoiceOrderedItem;
+}
+/**
+ * 決済承認結果としての請求書に関連する注文
+ */
+export interface IInvoiceReferenceOrder extends Pick<IOrder, 'typeOf'> {
+    /**
+     * 決済承認プロセスにおいて注文アイテムを指定された場合のみ定義される
+     */
+    orderedItem?: IInvoiceOrderedItem[];
+}
+/**
+ * 関連注文情報を含む請求情報
+ */
+export type IInvoiceAsPaymentServiceOutput = Pick<IInvoice, 'typeOf'> & {
+    referencesOrder: IInvoiceReferenceOrder;
+};
 /**
  * 取引対象物
  */
-export interface IObject {
+export interface IPaymentServiceAsObject {
     accountId: string;
     paymentMethodId: string;
     typeOf: PaymentServiceType;
@@ -96,14 +131,16 @@ export interface IObject {
     checkedAction?: {
         id: string;
     };
+    serviceOutput?: IInvoiceAsPaymentServiceOutput;
 }
+export type IObject = IPaymentServiceAsObject;
 export interface IPaymentMethodWithoutDetail extends IPaymentMethod {
     /**
      * 取引開始前の指定ではnumberに限定
      */
     amount: number;
 }
-export interface IObjectWithoutDetail extends Pick<IObject, 'typeOf' | 'id' | 'paymentMethod'> {
+export interface IObjectWithoutDetail extends Pick<IObject, 'serviceOutput' | 'typeOf' | 'id' | 'paymentMethod'> {
     paymentMethod: IPaymentMethodWithoutDetail;
 }
 export type IPotentialAction = IPotentialInformAction;

package/lib/authorization.d.ts

@@ -1,3 +1,4 @@
+import { IResultAsInvoice } from './action/authorize/paymentMethod/any';
 import { IEventOfferToken } from './assetTransaction/reserve';
 import { CreativeWorkType } from './creativeWorkType';
 import { IInvoice } from './invoice';
@@ -20,6 +21,12 @@ export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThroughAs
 export type IPermitAsTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> & {
     issuedThrough?: IPermitIssuedThroughOfObjectTypeOfGood;
 };
+/**
+ * 決済方法チケットの請求情報
+ */
+export interface IInvoiceAsPaymentMethodServiceOutput extends Pick<IResultAsInvoice, 'paymentMethodId' | 'referencesOrder'> {
+    typeOf: IInvoice['typeOf'];
+}
 /**
  * 決済サービス発行のチケット
  * new(2025-11-11~)
@@ -27,7 +34,7 @@ export type IPermitAsTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> &
 export interface IPaymentMethodAsTypeOfGood {
     id: string;
     typeOf: PaymentServiceType.CreditCard | PaymentServiceType.MovieTicket;
-    serviceOutput: Pick<IInvoice, 'paymentMethodId' | 'typeOf'>;
+    serviceOutput: IInvoiceAsPaymentMethodServiceOutput;
     issuedThrough?: never;
 }
 /**
@@ -39,7 +46,7 @@ export interface IFaceToFacePaymentMethodAsTypeOfGood {
      */
     id?: never;
     typeOf: PaymentServiceType.FaceToFace;
-    serviceOutput: Pick<IInvoice, 'paymentMethodId' | 'typeOf'>;
+    serviceOutput: IInvoiceAsPaymentMethodServiceOutput;
     issuedThrough?: never;
 }
 export type IPermitOwnershipInfo = Pick<IOwnershipInfo<IPermitAsTypeOfGood>, 'typeOf' | 'typeOfGood'>;

package/lib/invoice.d.ts

@@ -11,9 +11,6 @@ import { ISeller } from './seller';
 import { PaymentServiceType } from './service/paymentService';
 export type IBroker = Pick<ISeller, 'id' | 'typeOf'> | IPerson;
 export type IProvider = Pick<ISeller, 'id' | 'typeOf'> | IPerson;
-export interface IReferenceOrder extends OrderFactory.IOrder {
-    acceptedOffers: OrderFactory.IAcceptedOffer<OrderFactory.IItemOffered>[];
-}
 export type IReservationPriceAccounting = Pick<IAccounting, 'accountsReceivable'>;
 export type IAppliesToAddOn = Pick<IUnitPriceSpecAppliesToAddOn, 'typeOf'>;
 export type IMinimizedCategoryCodeChargeSpecification = Pick<ICategoryCodeChargeSpecification, 'typeOf' | 'price'>;
@@ -126,7 +123,6 @@ export interface IInvoice {
     /**
      * The Order(s) related to this Invoice. One or more Orders may be combined into a single Invoice.
      */
-    referencesOrder?: IReferenceOrder;
     /**
      * The date the invoice is scheduled to be paid.
      */

package/lib/order.d.ts

@@ -85,6 +85,7 @@ export interface IReferencedInvoice {
      */
     additionalProperty: IPropertyValue<string>[];
     issuedThrough: IOrderPaymentMethodIssuedThrough;
+    referencesOrder?: never;
 }
 export type IWorkPerformed = Pick<EventReservationFactory.IOptimizedWorkPerformed, 'typeOf' | 'id' | 'identifier' | 'name' | 'duration'>;
 export type ISuperEvent = Pick<EventReservationFactory.IOptimizedSuperEvent, 'id' | 'location' | 'name' | 'soundFormat' | 'typeOf' | 'videoFormat' | 'headline' | 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {

package/lib/task/publishPaymentUrl.d.ts

@@ -11,7 +11,7 @@ export interface IData {
     agent: {
         id: string;
     };
-    object: Pick<IAuthorizeCreditCardObject, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IAuthorizeCreditCardObject, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     purpose: IPurpose;
     paymentServiceType: PaymentServiceType;
     location: ILocation;

package/package.json

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