@chevre/factory 5.2.0-alpha.8 → 5.2.0

package/lib/action/reserve.d.ts

@@ -37,7 +37,14 @@ export interface IPotentialActions {
 }
 export type IOrderAsInstrument = Pick<IOrder, 'orderNumber' | 'typeOf'>;
 export type IPlaceOrderAsInstrument = Pick<IPlaceOrder, 'id' | 'typeOf'>;
-export type IInstrument = IOrderAsInstrument | IPlaceOrderAsInstrument;
+/**
+ * 興行オファーチケット
+ */
+export interface ITicketAsInstrument {
+    ticketToken: string;
+    typeOf: 'Ticket';
+}
+export type IInstrument = IOrderAsInstrument | IPlaceOrderAsInstrument | ITicketAsInstrument;
 export interface IAttributes extends Pick<ActionFactory.IAttributes<ActionType.ReserveAction, IObject, IResult>, 'agent' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf' | 'error' | 'instrument'> {
     agent: IAgent;
     potentialActions?: IPotentialActions;

package/lib/assetTransaction/reserve.d.ts

@@ -26,7 +26,7 @@ export interface IStartParams extends AssetTransactionFactory.IStartParams<Asset
     /**
      * add(2025-02-17~)
      */
-    instrument?: IInstrument[];
+    instrument: IInstrument[];
 }
 export interface IPermitIssuedThroughFaceToFace {
     /**
@@ -313,21 +313,7 @@ export interface IObjectWithoutDetail {
     reservationFor?: {
         id: string;
         offers?: {
-            /**
-             * メンバープログラムティアトークン
-             * メンバープログラムティアごとにオファー有効期間が管理されている場合、検証されたトークンに基づいて有効期間が検証されます
-             */
-            validForMemberTier?: ITokenizedMemberProgramTier;
-            /**
-             * support オファートークン
-             * 2025-10-21~
-             */
-            token?: IOfferToken;
-            /**
-             * アプリケーションオファーコード
-             * オファートークン指定の場合、必須
-             */
-            identifier?: string;
+            validForMemberTier?: never;
         };
     };
 }

package/lib/authorization.d.ts

@@ -1,53 +1,112 @@
 import { CreativeWorkType } from './creativeWorkType';
 import { IMember, IMemberOfRole } from './iam';
 import { IInvoice } from './invoice';
+import { OfferType } from './offerType';
 import { IOrder } from './order';
 import { OrganizationType } from './organizationType';
-import { IOwnershipInfo, IPermitAsGood, IPermitIssuedThroughAsCreditCard, IPermitIssuedThroughAsFaceToFace, IPermitIssuedThroughAsProduct } from './ownershipInfo';
+import { IOwnershipInfo, IPermitAsGood, IPermitIssuedThroughAsProduct } from './ownershipInfo';
 import { PersonType } from './personType';
+import { ProductType } from './product';
 import { IProject } from './project';
+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<IPermitIssuedThroughAsFaceToFace, 'typeOf'> | Pick<IPermitIssuedThroughAsCreditCard, 'id' | 'typeOf'> | Pick<IPermitIssuedThroughAsProduct, 'id' | 'typeOf'>;
-export type IPermitAsObjectTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> & {
+export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThroughAsProduct, 'id' | 'typeOf'>;
+export type IPermitAsTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> & {
     issuedThrough?: IPermitIssuedThroughOfObjectTypeOfGood;
 };
-/**
- * MovieTicket決済サービス発行のチケット
- */
-export type IInvoiceAsObjectTypeOfGood = Pick<IInvoice, 'paymentMethodId' | 'typeOf'> & {
-    issuedThrough: {
-        id: string;
-        typeOf: PaymentServiceType.MovieTicket;
-    };
-};
 /**
  * 決済サービス発行のチケット
  * new(2025-11-11~)
  */
-export interface IPaymentMethodAsObjectTypeOfGood {
+export interface IPaymentMethodAsTypeOfGood {
     id: string;
     typeOf: PaymentServiceType.CreditCard | PaymentServiceType.MovieTicket;
     serviceOutput: Pick<IInvoice, 'paymentMethodId' | 'typeOf'>;
     issuedThrough?: never;
 }
-export type IPermitOwnershipInfoAsObject = Pick<IOwnershipInfo<IPermitAsObjectTypeOfGood>, 'typeOf' | 'typeOfGood'>;
-export type IInvoiceOwnershipInfoAsObject = Pick<IOwnershipInfo<IInvoiceAsObjectTypeOfGood>, 'typeOf' | 'typeOfGood'>;
+/**
+ * 対面決済サービス発行のチケット
+ */
+export interface IFaceToFacePaymentMethodAsTypeOfGood {
+    /**
+     * 対面決済サービスIDはなし
+     */
+    id?: never;
+    typeOf: PaymentServiceType.FaceToFace;
+    serviceOutput: Pick<IInvoice, 'paymentMethodId' | 'typeOf'>;
+    issuedThrough?: never;
+}
+export type IPermitOwnershipInfo = Pick<IOwnershipInfo<IPermitAsTypeOfGood>, 'typeOf' | 'typeOfGood'>;
 /**
  * 決済方法所有権
  * support(2025-11-11~)
  */
-export type IPaymentMethodOwnershipInfoAsObject = Pick<IOwnershipInfo<IPaymentMethodAsObjectTypeOfGood>, 'typeOf' | 'typeOfGood'>;
-export type IOwnershipInfoAsObject = IPermitOwnershipInfoAsObject | IInvoiceOwnershipInfoAsObject | IPaymentMethodOwnershipInfoAsObject;
+export type IPaymentMethodOwnershipInfo = Pick<IOwnershipInfo<IPaymentMethodAsTypeOfGood>, 'typeOf' | 'typeOfGood'>;
+/**
+ * 対面決済方法所有権
+ * support(2025-11-12~)
+ */
+export type IFaceToFacePaymentMethodOwnershipInfo = Pick<IOwnershipInfo<IFaceToFacePaymentMethodAsTypeOfGood>, 'typeOf' | 'typeOfGood'>;
+export type IOwnershipInfoAsObject = IPermitOwnershipInfo | IPaymentMethodOwnershipInfo | IFaceToFacePaymentMethodOwnershipInfo;
 /**
  * 承認対象としてのIAMメンバー
  */
 export type IRoleAsObject = Pick<IMember, 'member' | 'typeOf'> & {
     member: Pick<IMemberOfRole, 'hasRole' | 'id' | 'memberOf' | 'typeOf'>;
 };
-export type IObject = IOrderAsObject | IOwnershipInfoAsObject | IRoleAsObject;
+/**
+ * トークン化されたメンバープログラムティア
+ */
+export interface ITokenizedMemberProgramTier {
+    /**
+     * ティアトークン
+     */
+    token: string;
+    isTierOf: {
+        /**
+         * メンバープログラムコード
+         */
+        identifier: string;
+    };
+}
+export type IOfferToken = string;
+/**
+ * 承認対象としての興行オファー
+ */
+export interface IOfferAsObject {
+    typeOf: OfferType.Offer;
+    itemOffered: {
+        typeOf: ProductType.EventService;
+        serviceOutput: {
+            typeOf: ReservationType.ReservationPackage;
+            reservationFor: {
+                /**
+                 * イベントID
+                 */
+                id: string;
+            };
+        };
+    };
+    /**
+     * 拡張イベントオファーID
+     * 拡張イベントオファー使用の場合、必須
+     */
+    id?: string;
+    /**
+     * support オファートークン
+     * 2025-10-21~
+     */
+    token?: IOfferToken;
+    /**
+     * メンバープログラムティアトークン
+     * メンバープログラムティアごとにオファー有効期間が管理されている場合、検証されたトークンに基づいて有効期間が検証されます
+     */
+    validForMemberTier?: ITokenizedMemberProgramTier;
+}
+export type IObject = IOrderAsObject | IOwnershipInfoAsObject | IRoleAsObject | IOfferAsObject;
 export interface IAudienceAsPlaceOrder {
     /**
      * 取引ID

package/lib/event/screeningEvent.d.ts

@@ -183,7 +183,7 @@ export type IOffers4create = Pick<IOffer, 'unacceptedPaymentMethod' | 'identifie
      */
     itemOffered: Pick<IItemOffered, 'id' | 'serviceOutput'>;
     /**
-     * 販売者IDとアプリケーション設定
+     * アプリケーション設定
      */
     seller: ISeller4create;
 };
@@ -192,12 +192,6 @@ export type ICreateParams = Pick<IAttributes, 'doorTime' | 'startDate' | 'endDat
     superEvent?: never;
     offers: IOffers4create;
 };
-/**
- * イベント更新パラメータ
- */
-export type IUpdateParams = Pick<ICreateParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'offers' | 'startDate' | 'maximumPhysicalAttendeeCapacity'> & {
-    location?: never;
-};
 export type IOffer4update = Pick<IOffers4create, 'eligibleQuantity' | 'identifier' | 'unacceptedPaymentMethod'> & {
     /**
      * 興行IDを指定
@@ -210,9 +204,27 @@ export type IOffer4update = Pick<IOffers4create, 'eligibleQuantity' | 'identifie
 /**
  * 単一イベント編集パラメータ
  */
-export type IUpdateByIdParams = Pick<IUpdateParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'startDate' | 'maximumPhysicalAttendeeCapacity' | 'location'> & {
+export type IUpdateByIdParams = Pick<ICreateParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'startDate' | 'maximumPhysicalAttendeeCapacity'> & {
+    location?: never;
     offers: IOffer4update;
 };
+/**
+ * 識別子によるイベント編集パラメータ
+ */
+export type IUpdateByIdentifierParams = Pick<IUpdateByIdParams, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'startDate' | 'maximumPhysicalAttendeeCapacity'> & {
+    /**
+     * イベント識別子
+     */
+    identifier: string;
+    offers: Pick<IOffer4update, 'eligibleQuantity' | 'unacceptedPaymentMethod' | 'itemOffered'> & {
+        /**
+         * アプリケーション設定
+         */
+        seller: Pick<ISeller4create, 'makesOffer'>;
+    };
+    location?: never;
+    superEvent?: never;
+};
 /**
  * ソート条件
  */

package/lib/iam.d.ts

@@ -21,6 +21,10 @@ export interface IMemberOfRole {
      * クライアントID or Person ID
      */
     id: string;
+    /**
+     * アプリケーションコード
+     */
+    identifier?: string;
     image?: string;
     name?: string;
     username?: string;
@@ -71,6 +75,12 @@ export interface ISearchConditions {
             $eq?: string;
             $in?: string[];
         };
+        /**
+         * アプリケーションコード
+         */
+        identifier?: {
+            $eq?: string;
+        };
         name?: {
             $regex?: string;
         };

package/lib/offer/eventOffer.d.ts

@@ -1,17 +1,22 @@
 import { EventType } from '../eventType';
-import { IAvailableAtOrFrom, IOffer } from '../offer';
+import { IOffer } from '../offer';
 import { OfferType } from '../offerType';
 import { OrganizationType } from '../organizationType';
 import { SortType } from '../sortType';
-type IOfferAvailableAtOrFrom = Pick<IAvailableAtOrFrom, 'id'>;
+interface IOfferAvailableAtOrFrom {
+    /**
+     * アプリケーションコード
+     */
+    identifier: string;
+}
 interface ISeller {
     id: string;
     typeOf: OrganizationType.Corporation;
 }
 /**
- * 拡張されたイベントアプリケーションオファー
+ * 拡張可能なイベントオファー
  */
-interface IExtendedEventOffer extends Pick<IOffer, 'typeOf' | 'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'> {
+interface IEventOffer extends Pick<IOffer, 'typeOf' | 'validFrom' | 'validThrough'> {
     project: {
         id: string;
         typeOf: OrganizationType.Project;
@@ -26,13 +31,23 @@ interface IExtendedEventOffer extends Pick<IOffer, 'typeOf' | 'availabilityEnds'
      * いつまで承認可能か
      */
     validThrough: Date;
+    /**
+     * 利用可能アプリケーション
+     */
     availableAtOrFrom: IOfferAvailableAtOrFrom;
+    id: string;
     /**
-     * アプリケーションオファーコード
-     * イベント内でユニーク必須
+     * オファーコード
+     * イベントID内でユニーク必須
      */
     identifier: string;
+    /**
+     * イベント
+     */
     itemOffered: {
+        /**
+         * イベントID
+         */
         id: string;
         typeOf: EventType.ScreeningEvent;
     };
@@ -51,10 +66,6 @@ interface IExtendedEventOffer extends Pick<IOffer, 'typeOf' | 'availabilityEnds'
     availabilityEnds?: never;
     availabilityStarts?: never;
 }
-/**
- * 拡張されたイベントアプリケーションオファー
- */
-type IEventOffer = IExtendedEventOffer;
 interface ISearchConditions {
     limit?: number;
     page?: number;
@@ -85,6 +96,11 @@ interface ISearchConditions {
             $in?: string[];
         };
     };
+    availableAtOrFrom?: {
+        identifier?: {
+            $eq?: string;
+        };
+    };
     offeredBy?: {
         /**
          * オファー提供者ID

package/lib/ownershipInfo.d.ts

@@ -6,6 +6,7 @@ import { PersonType } from './personType';
 import * as ProductFactory from './product';
 import { IProject } from './project';
 import { ReservationType } from './reservationType';
+import { PaymentServiceType } from './service/paymentService';
 import * as WebAPIFactory from './service/webAPI';
 import { SortType } from './sortType';
 export type IBookingService = Pick<WebAPIFactory.IService<WebAPIFactory.Identifier>, 'identifier' | 'typeOf'>;
@@ -77,13 +78,21 @@ export interface IPaymentMethodAsGood {
      * 決済サービスID
      */
     id: string;
-    typeOf: IInvoice['paymentMethod']['typeOf'];
+    typeOf: PaymentServiceType.CreditCard | PaymentServiceType.MovieTicket;
+    serviceOutput: Pick<IInvoice, 'paymentMethodId' | 'typeOf'>;
+}
+export interface IFaceToFacePaymentMethodAsGood {
+    /**
+     * 対面決済サービスIDはなし
+     */
+    id?: never;
+    typeOf: PaymentServiceType.FaceToFace;
     serviceOutput: Pick<IInvoice, 'paymentMethodId' | 'typeOf'>;
 }
 /**
  * 所有対象物 (Product or Service)
  */
-export type IGood = IReservation | IPermitAsGood | InvoiceAsGood | IPaymentMethodAsGood;
+export type IGood = IReservation | IPermitAsGood | InvoiceAsGood | IPaymentMethodAsGood | IFaceToFacePaymentMethodAsGood;
 export interface IOwnerAsOrganization {
     typeOf: OrganizationType.Organization;
     id: string;

package/package.json

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