@chevre/factory 5.3.0-alpha.0 → 5.3.0-alpha.2

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

@@ -23,6 +23,14 @@ export interface IPurpose {
     typeOf: TransactionType.PlaceOrder;
     id: string;
 }
+/**
+ * 決済方法チケット
+ */
+export interface ITicketAsInstrument {
+    ticketToken: string;
+    typeOf: 'Ticket';
+}
+export type IInstrument = ITicketAsInstrument;
 /**
  * 決済採用アクション属性
  */
@@ -36,6 +44,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

@@ -4,7 +4,7 @@ import { AvailablePaymentMethodType, IMovieTicket } from '../../../action/trade/
 import { ActionType } from '../../../actionType';
 import { ICreditCard, IFromLocation, ITokenizedPaymentCard } from '../../../assetTransaction/pay';
 import { AssetTransactionType } from '../../../assetTransactionType';
-import { IOrderPaymentMethodIssuedThrough, ITotalPaymentDue } from '../../../order';
+import { IEventServiceAsOrderedItem, IOrder, IOrderPaymentMethodIssuedThrough, IReservationFor4EventServiceOrderedItem, ITotalPaymentDue } from '../../../order';
 import { PaymentStatusType } from '../../../paymentStatusType';
 import { IPropertyValue } from '../../../propertyValue';
 import { IPermitAsServiceOutput } from '../../../service/paymentService';
@@ -77,8 +77,9 @@ export interface IObjectIncludingPaymentMethodDetails {
      */
     movieTickets?: IMovieTicket[];
     /**
-     * メンバーシップチケット指定の場合
-     * 2024-08-13~
+     * 決済方法チケット
+     * 当初はメンバーシップチケットとして使用(2024-08-13~)
+     * メンバーシップチケットに限らず、承認前に発行された決済方法チケットを指定すると、paymentMethodIdはチケットに依存する
      */
     ticketToken?: string;
 }
@@ -132,6 +133,34 @@ export interface IResultPaymentMethod {
         currency?: string;
     };
 }
+/**
+ * 決済承認結果としての請求書に関連する注文アイテムとしての興行
+ */
+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 interface IResultAsInvoice {
     /**
      * The identifier for the account the payment will be applied to.
@@ -166,6 +195,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 +215,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/authorization.d.ts

@@ -1,6 +1,6 @@
+import { IResultAsInvoice } from './action/authorize/paymentMethod/any';
 import { IEventOfferToken } from './assetTransaction/reserve';
 import { CreativeWorkType } from './creativeWorkType';
-import { IMember, IMemberOfRole } from './iam';
 import { IInvoice } from './invoice';
 import { OfferType } from './offerType';
 import { IOrder } from './order';
@@ -13,11 +13,20 @@ import { ReservationType } from './reservationType';
 import { PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 import { TransactionType } from './transactionType';
+/**
+ * 発券対象の注文
+ */
 export type IOrderAsObject = Pick<IOrder, 'orderNumber' | 'typeOf'>;
 export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThroughAsProduct, 'id' | 'typeOf'>;
 export type IPermitAsTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> & {
     issuedThrough?: IPermitIssuedThroughOfObjectTypeOfGood;
 };
+/**
+ * 決済方法チケットの請求情報
+ */
+export interface IInvoiceAsPaymentMethodServiceOutput extends Pick<IResultAsInvoice, 'paymentMethodId' | 'referencesOrder'> {
+    typeOf: IInvoice['typeOf'];
+}
 /**
  * 決済サービス発行のチケット
  * new(2025-11-11~)
@@ -25,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;
 }
 /**
@@ -37,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'>;
@@ -51,13 +60,10 @@ export type IPaymentMethodOwnershipInfo = Pick<IOwnershipInfo<IPaymentMethodAsTy
  * support(2025-11-12~)
  */
 export type IFaceToFacePaymentMethodOwnershipInfo = Pick<IOwnershipInfo<IFaceToFacePaymentMethodAsTypeOfGood>, 'typeOf' | 'typeOfGood'>;
-export type IOwnershipInfoAsObject = IPermitOwnershipInfo | IPaymentMethodOwnershipInfo | IFaceToFacePaymentMethodOwnershipInfo;
 /**
- * 承認対象としてのIAMメンバー
+ * Permit所有権あるいは決済方法所有権
  */
-export type IRoleAsObject = Pick<IMember, 'member' | 'typeOf'> & {
-    member: Pick<IMemberOfRole, 'hasRole' | 'id' | 'memberOf' | 'typeOf'>;
-};
+export type IOwnershipInfoAsObject = IPermitOwnershipInfo | IPaymentMethodOwnershipInfo | IFaceToFacePaymentMethodOwnershipInfo;
 /**
  * トークン化されたメンバープログラムティア
  */
@@ -106,7 +112,7 @@ export interface IOfferAsObject {
      */
     validForMemberTier?: ITokenizedMemberProgramTier;
 }
-export type IObject = IOrderAsObject | IOwnershipInfoAsObject | IRoleAsObject | IOfferAsObject;
+export type IObject = IOrderAsObject | IOwnershipInfoAsObject | IOfferAsObject;
 export interface IAudienceAsPlaceOrder {
     /**
      * 取引ID
@@ -122,16 +128,24 @@ export interface IAudienceAsApplication {
     typeOf: CreativeWorkType.SoftwareApplication | CreativeWorkType.WebApplication;
 }
 export type IAudience = IAudienceAsApplication | IAudienceAsPlaceOrder;
+/**
+ * 承認作成者
+ * 現時点でSoftwareApplicationは認めない
+ */
 export interface IAuthor {
     id: string;
     typeOf: PersonType.Person | CreativeWorkType.WebApplication;
 }
+/**
+ * 承認発行組織
+ */
 export interface IIssuedBy {
     id: string;
     typeOf: OrganizationType.Corporation | OrganizationType.Project;
 }
 /**
  * 承認
+ * 任意の情報をチケット化するために使用
  */
 export interface IAuthorization {
     project: Pick<IProject, 'id' | 'typeOf'>;
@@ -154,8 +168,14 @@ export interface IAuthorization {
      */
     validUntil: Date;
     audience?: IAudience;
-    author?: IAuthor;
-    issuedBy?: IIssuedBy;
+    /**
+     * 承認作成者
+     */
+    author: IAuthor;
+    /**
+     * 承認発行組織
+     */
+    issuedBy: IIssuedBy;
 }
 /**
  * ソート条件

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/package.json

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