@chevre/factory 5.4.0-alpha.8 → 6.0.0-alpha.0

package/lib/action/cancel/reservation.d.ts

@@ -7,12 +7,11 @@ import { ProductType } from '../../product';
 import { IAvailableReservationStatusType } from '../../reservation';
 import { ReservationType } from '../../reservationType';
 import { ITransaction as IPlaceOrder } from '../../transaction/placeOrder';
-import { TripType } from '../../tripType';
 import { IAction as IReturnReserveTransactionAction } from '../transfer/return/reserveTransaction';
 export type IAgent = ActionFactory.IParticipantAsProject;
 export interface IReservationPackageAsObject {
     reservationFor: {
-        typeOf: EventType.ScreeningEvent | TripType.BusTrip;
+        typeOf: EventType.ScreeningEvent;
         id: string;
     };
     reservationNumber: string;
@@ -22,22 +21,6 @@ export interface IReservationPackageAsObject {
     reservationStatus: IAvailableReservationStatusType;
     typeOf: ReservationType.ReservationPackage;
 }
-export interface IBusReservationAsObject {
-    id: string;
-    issuedThrough?: {
-        typeOf?: ProductType.Transportation;
-    };
-    reservationFor: {
-        typeOf: TripType.BusTrip;
-        id: string;
-    };
-    reservationNumber: string;
-    /**
-     * previousReservationStatusを変更時に指定するために必要
-     */
-    reservationStatus: IAvailableReservationStatusType;
-    typeOf: ReservationType.BusReservation;
-}
 export interface IEventReservationAsObject {
     id: string;
     issuedThrough?: {
@@ -54,7 +37,7 @@ export interface IEventReservationAsObject {
     reservationStatus: IAvailableReservationStatusType;
     typeOf: ReservationType.EventReservation;
 }
-export type IObject = IBusReservationAsObject | IEventReservationAsObject | IReservationPackageAsObject;
+export type IObject = IEventReservationAsObject | IReservationPackageAsObject;
 export interface IResult {
 }
 export interface IPurpose {

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

@@ -10,7 +10,7 @@ import { TransactionType } from '../../transactionType';
 export type IAgent = ActionFactory.IParticipantAsPerson | ActionFactory.IParticipantAsProject | ActionFactory.IParticipantAsWebApplication;
 export type IObject = any;
 export interface ITransactionPurpose {
-    typeOf: TransactionType.MoneyTransfer | TransactionType.PlaceOrder;
+    typeOf: TransactionType.PlaceOrder;
     id: string;
 }
 export type IPurpose = ITransactionPurpose | OrderFactory.ISimpleOrder;

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

@@ -13,7 +13,7 @@ import { IOfferCatalogAsNotification } from '../../notification/offerCatalog';
 import { IOrder4inform } from '../../notification/order';
 import { IPayAction4inform } from '../../notification/payAction';
 import { IPersonAsNotification } from '../../notification/person';
-import { IHasPOSAsNotification, IMovieTheaterAsNotification } from '../../notification/place';
+import { IEntranceGateAsNotification, IHasPOSAsNotification, IMovieTheaterAsNotification, IRoomAsNotification } from '../../notification/place';
 import { IProductAsNotification } from '../../notification/product';
 import { IRefundAction4inform } from '../../notification/refundAction';
 import { IReservation4inform } from '../../notification/reservation';
@@ -34,7 +34,10 @@ export type IRecipient = Pick<ActionFactory.IParticipantAsWebApplication, 'name'
     id?: never;
     url?: never;
 };
-export type IAnyResourceAsObject = IPlaceOrderAsNotification | IOfferCatalogAsNotification | IHasPOSAsNotification | IMovieTheaterAsNotification | IOfferAsNotification | IAccountTitleAsNotification | IProductAsNotification | ICategoryCodeAsNotification | IMovieAsNotification | INoteDigitalDocumentAsNotification | IPersonAsNotification | IEvent4inform2agg | IEventAsNotification | IEventSeriesAsNotification;
+/**
+ * 取引、タスク以外の通知対象リソース
+ */
+export type IAnyResourceAsObject = IPlaceOrderAsNotification | IOfferCatalogAsNotification | IEntranceGateAsNotification | IHasPOSAsNotification | IMovieTheaterAsNotification | IRoomAsNotification | IOfferAsNotification | IAccountTitleAsNotification | IProductAsNotification | ICategoryCodeAsNotification | IMovieAsNotification | INoteDigitalDocumentAsNotification | IPersonAsNotification | IEvent4inform2agg | IEventAsNotification | IEventSeriesAsNotification;
 export type IObject = IAnyResourceAsObject | IOrder4inform | IReservation4inform | IPayAction4inform | IRefundAction4inform | ITask4inform;
 export interface IPayTransactionAsPurpose {
     id: string;

package/lib/action/reserve.d.ts

@@ -3,13 +3,12 @@ import { ActionType } from '../actionType';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IOrder } from '../order';
 import { IAvailableReservationStatusType } from '../reservation';
-import { IReservationFor as IBusReservationFor } from '../reservation/busReservation';
 import { IReservationFor as IEventReservationFor } from '../reservation/event';
 import { ReservationType } from '../reservationType';
 import { ITransaction as IPlaceOrder } from '../transaction/placeOrder';
 import { IAttributes as IMoneyTransferActionAttributes } from './transfer/moneyTransfer';
 export type IAgent = ActionFactory.IParticipantAsProject;
-export type IReservationFor = (Pick<IBusReservationFor, 'id' | 'typeOf'> | Pick<IEventReservationFor, 'id' | 'typeOf'>) & {
+export type IReservationFor = Pick<IEventReservationFor, 'id' | 'typeOf'> & {
     optimized: boolean;
 };
 export interface IObject {

package/lib/action/update/add/object.d.ts

@@ -1,5 +1,4 @@
 import { CreativeWorkType } from '../../../creativeWorkType';
-import { IAttributes as IEventSeriesAttributes } from '../../../event/screeningEventSeries';
 import { EventType } from '../../../eventType';
 import { OfferType } from '../../../offerType';
 import { ProductType } from '../../../product';
@@ -14,15 +13,4 @@ export interface IObjectAsProduct {
 export interface IObjectAsSingleResource {
     typeOf: OfferType.Offer | 'ProductModel' | CreativeWorkType.Movie | EventType;
 }
-export type IObjectAsEventSeriesAttributes = IEventSeriesAttributes;
-export interface IObjectAsEventBySchedule {
-    /**
-     * スケジュールを作成し始める日(Asia/Tokyoでこの日から作成される)
-     */
-    startDate?: Date;
-    eventSchedule: {
-        id: string;
-    };
-    typeOf: EventType.ScreeningEvent;
-}
-export type IObject = IObjectAsSingleResource | IObjectAsNote[] | IObjectAsProduct[] | IObjectAsEventSeriesAttributes[] | IObjectAsEventBySchedule;
+export type IObject = IObjectAsSingleResource | IObjectAsNote[] | IObjectAsProduct[];

package/lib/action/update/add/object.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// | IObjectAsEventSeriesAttributes[]
+// | IObjectAsEventBySchedule;

package/lib/action/update/add.d.ts

@@ -14,16 +14,7 @@ export interface IAddedObject {
     typeOf: CreativeWorkType.NoteDigitalDocument | ProductType | OfferType.Offer | 'ProductModel' | CreativeWorkType.Movie | EventType;
 }
 export type IResult = IAddedObject[];
-export interface IInstrumentWithAddEventSeriesOption {
-    typeOf: CreativeWorkType.WebApplication;
-    id: string;
-    createScreeningEventSeriesIfNotExistByWorkPerformed: true;
-    /**
-     * 全施設に施設コンテンツを作成するかどうか
-     */
-    createScreeningEventSeriesOnAllLocation?: boolean;
-}
-export type IInstrument = IInstrumentAsApplication | IInstrumentWithAddEventSeriesOption;
+export type IInstrument = IInstrumentAsApplication;
 export interface ITargetCollectionAsNote {
     typeOf: CreativeWorkType.NoteDigitalDocument;
     about: Pick<INoteAbout, 'typeOf'>;

package/lib/action/update/delete.d.ts

@@ -12,7 +12,6 @@ import { IPlace as IMovieTheater } from '../../place/movieTheater';
 import { IPlace as IRoom } from '../../place/screeningRoom';
 import { IProduct } from '../../product';
 import { ISeller } from '../../seller';
-import { IObject as IMoneyTransferObject, ITransaction as IMoneyTransfer } from '../../transaction/moneyTransfer';
 import { IObject as IPlaceOrderObject, ITransaction as IPlaceOrder } from '../../transaction/placeOrder';
 import { IObject as IReturnOrderObject, ITransaction as IReturnOrder } from '../../transaction/returnOrder';
 import { TransactionType } from '../../transactionType';
@@ -53,10 +52,6 @@ export declare enum ObjectAsTransactionSpecifyingMethod {
     Id = "Id",
     AgentId = "AgentId"
 }
-export type IObjectAsMoneyTransfer = Pick<IMoneyTransfer, 'project' | 'id' | 'typeOf' | 'startDate' | 'endDate'> & {
-    object: Pick<IMoneyTransferObject, 'pendingTransaction'>;
-    specifyingMethod?: ObjectAsTransactionSpecifyingMethod.Id;
-};
 export type IObjectAsPlaceOrder = Pick<IPlaceOrder, 'project' | 'id' | 'typeOf' | 'startDate' | 'endDate'> & {
     object: Pick<IPlaceOrderObject, 'confirmationNumber' | 'orderNumber'>;
     specifyingMethod?: ObjectAsTransactionSpecifyingMethod.Id;
@@ -75,7 +70,7 @@ export interface IObjectAsTransactionByAgentId {
         id: string;
     };
 }
-export type IObject = IObjectAsProduct | IObjectAsOfferCatalog | IObjectAsAggregateOffer | IObjectAsSeller | IObjectAsMovieTheater | IObjectAsRoom | IObjectAsEventSeries | IObjectAsPerson | IObjectAsOwnershipInfo | IObjectAsMoneyTransfer | IObjectAsPlaceOrder | IObjectAsReturnOrder | IObjectAsTransactionByAgentId;
+export type IObject = IObjectAsProduct | IObjectAsOfferCatalog | IObjectAsAggregateOffer | IObjectAsSeller | IObjectAsMovieTheater | IObjectAsRoom | IObjectAsEventSeries | IObjectAsPerson | IObjectAsOwnershipInfo | IObjectAsPlaceOrder | IObjectAsReturnOrder | IObjectAsTransactionByAgentId;
 export interface IResultAsPerson {
     existingPeople?: any;
 }

package/lib/assetTransaction/cancelReservation.d.ts

@@ -3,7 +3,6 @@ import * as AssetTransactionFactory from '../assetTransaction';
 import { ITransaction as IReserveTransaction } from '../assetTransaction/reserve';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IReservation as IBusReservation, IReservationFor as IBusReservationFor } from '../reservation/busReservation';
 import { IReservation as IEventReservation, IReservationFor as IEventReservationFor } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 export import IAgent = AssetTransactionFactory.IAgent;
@@ -35,12 +34,9 @@ export interface IObjectWithoutDetail {
 }
 export type IReserveTransactionAsObject = Pick<IReserveTransaction, 'typeOf' | 'id' | 'transactionNumber'> & {
     object: {
-        reservationFor: Pick<IEventReservationFor | IBusReservationFor, 'id' | 'typeOf'>;
+        reservationFor: Pick<IEventReservationFor, 'id' | 'typeOf'>;
     };
 };
-export type IBusReservationAsObject = Pick<IBusReservation, 'id' | 'issuedThrough' | 'reservationNumber' | 'typeOf'> & {
-    reservationFor: Pick<IBusReservationFor, 'id' | 'typeOf'>;
-};
 export type IEventReservationAsObject = Pick<IEventReservation, 'id' | 'issuedThrough' | 'reservationNumber' | 'typeOf'> & {
     reservationFor: Pick<IEventReservationFor, 'id' | 'typeOf'>;
 };
@@ -49,7 +45,7 @@ export type IEventReservationAsObject = Pick<IEventReservation, 'id' | 'issuedTh
  */
 export interface IObject extends Pick<IReservationPackage, 'reservationNumber' | 'typeOf'> {
     transaction?: IReserveTransactionAsObject;
-    reservations?: IBusReservationAsObject[] | IEventReservationAsObject[];
+    reservations?: IEventReservationAsObject[];
     /**
      * 予約番号
      */

package/lib/assetTransaction/reserve.d.ts

@@ -9,7 +9,6 @@ import { PermitType } from '../permit';
 import { ProductType } from '../product';
 import { IPropertyValue } from '../propertyValue';
 import * as ReservationFactory from '../reservation';
-import { IIssuedThrough as IBusReservationIssuedThrough, IReservation as IBusReservation, IReservationFor as IBusReservationReservationFor } from '../reservation/busReservation';
 import { IIssuedThrough as IEventReservationIssuedThrough, IReservation as IEventReservation, IReservationFor as IEventReservationReservationFor, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 import { ReservationStatusType } from '../reservationStatusType';
@@ -88,33 +87,6 @@ export interface IAcceptedPointAward {
         };
     };
 }
-export interface IBusReservatonAsItemOfferedServiceOutput {
-    typeOf: ReservationType.BusReservation;
-    /**
-     * 追加特性
-     */
-    additionalProperty?: IPropertyValue<string>[];
-    /**
-     * 予約追加テキスト
-     */
-    additionalTicketText?: string;
-    programMembershipUsed?: IAcceptedProgramMembershipUsed;
-    reservedTicket?: {
-        /**
-         * チケット識別子
-         * 指定された場合、決済カードの対象チケット識別子と関連付けされます
-         * /^[0-9a-zA-Z]{8,16}$/
-         */
-        identifier?: string;
-        issuedBy?: ReservationFactory.IUnderName;
-        typeOf: ReservationFactory.TicketType;
-        /**
-         * 座席指定
-         */
-        ticketedSeat?: ReservationFactory.ISeat;
-    };
-    subReservation?: IAcceptedSubReservation[];
-}
 export interface IEventReservatonAsItemOfferedServiceOutput {
     typeOf: ReservationType.EventReservation;
     /**
@@ -142,7 +114,7 @@ export interface IEventReservatonAsItemOfferedServiceOutput {
     };
     subReservation?: IAcceptedSubReservation[];
 }
-export type IItemOfferedServiceOutput = IBusReservatonAsItemOfferedServiceOutput | IEventReservatonAsItemOfferedServiceOutput;
+export type IItemOfferedServiceOutput = IEventReservatonAsItemOfferedServiceOutput;
 /**
  * 受け入れられたオファーのアイテム
  */
@@ -325,11 +297,10 @@ export interface IObjectWithoutDetail {
         };
     };
 }
-export type IReservationFor = IBusReservationReservationFor | IEventReservationReservationFor;
-export type IBusReservationAsSubReservation = Pick<IBusReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'price' | 'priceCurrency' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'>;
+export type IReservationFor = IEventReservationReservationFor;
 export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'price' | 'priceCurrency' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'>;
-export type IObjectSubReservation = IBusReservationAsSubReservation | IEventReservationAsSubReservation;
-export type IIssuedThrough = IBusReservationIssuedThrough | IEventReservationIssuedThrough;
+export type IObjectSubReservation = IEventReservationAsSubReservation;
+export type IIssuedThrough = IEventReservationIssuedThrough;
 export interface IObject extends Pick<IReservationPackage, 'broker' | 'provider' | 'reservationStatus' | 'underName' | 'typeOf'> {
     acceptedOffer?: IAcceptedOffer4object[];
     issuedThrough?: IIssuedThrough;

package/lib/creativeWork/movie.d.ts

@@ -87,6 +87,7 @@ export interface ISearchConditions {
     identifier?: string | {
         $eq?: string;
         $in?: string[];
+        $regex?: string;
     };
     name?: string;
     datePublishedFrom?: Date;

package/lib/event/anyEvent.d.ts

@@ -57,19 +57,6 @@ export interface IAggregateOfferOfPlace {
         aggregateReservation?: Pick<IAggregateReservation, 'typeOf' | 'useActionCount'>;
     }[];
 }
-export interface IPlaceWithAggregateOffer {
-    typeOf: PlaceType;
-    identifier?: string;
-    aggregateOffer?: IAggregateOfferOfPlace;
-}
-/**
- * 入場ゲート集計
- */
-export interface IAggregateEntranceGate {
-    typeOf: PlaceType.AggregatePlace;
-    aggregateDate: Date;
-    places: IPlaceWithAggregateOffer[];
-}
 export type IServiceType = IProductServiceType & {
     id?: string;
 };

package/lib/event/screeningEvent.d.ts

@@ -12,7 +12,6 @@ import * as AnyEventFactory from './anyEvent';
 export import IAggregateReservation = AnyEventFactory.IAggregateReservation;
 export import IOfferWithAggregateReservation = AnyEventFactory.IOfferWithAggregateReservation;
 export import IAggregateOffer = AnyEventFactory.IAggregateOffer;
-export import IAggregateEntranceGate = AnyEventFactory.IAggregateEntranceGate;
 export import IOfferAvailableAtOrFrom = AnyEventFactory.IOfferAvailableAtOrFrom;
 export import IEventOfferForMemberTier = AnyEventFactory.IEventOfferForMemberTier;
 export import ISellerMakesOffer = AnyEventFactory.ISellerMakesOffer;
@@ -142,7 +141,7 @@ export type ICOAOffer = COA.factory.reserve.IUpdReserveTicket & {
     usePoint: number;
 };
 export import ILocation = AnyEventFactory.ILocation;
-export type ISuperEvent = Pick<IEventSeries, 'typeOf' | 'id' | 'videoFormat' | 'soundFormat' | 'workPerformed' | 'location' | 'kanaName' | 'name' | 'additionalProperty' | 'description' | 'headline' | 'dubLanguage' | 'subtitleLanguage' | 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
+export type ISuperEvent = Pick<IEventSeries, 'typeOf' | 'id' | 'soundFormat' | 'workPerformed' | 'location' | 'kanaName' | 'name' | 'additionalProperty' | 'description' | 'headline' | 'dubLanguage' | 'subtitleLanguage' | 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
     startDate?: Date;
     endDate?: Date;
 };
@@ -179,9 +178,9 @@ export type IOffers4create = Pick<IOffer, 'unacceptedPaymentMethod' | 'identifie
      */
     eligibleQuantity: Pick<IEligibleQuantity, 'maxValue'>;
     /**
-     * 興行IDと座席有無を指定
+     * 興行ID
      */
-    itemOffered: Pick<IItemOffered, 'id' | 'serviceOutput'>;
+    itemOffered: Pick<IItemOffered, 'id'>;
     /**
      * アプリケーション設定
      */

package/lib/event/screeningEventSeries.d.ts

@@ -33,6 +33,23 @@ export interface ISoundFormat {
     typeOf: string;
     name: string;
 }
+/**
+ * サブイベント
+ * 施設コンテンツに所属するScreeningEventの属性など
+ */
+export interface ISubEvent {
+    typeOf: EventType.ScreeningEvent;
+    /**
+     * 上映方式区分コードリスト
+     */
+    videoFormat?: string[];
+}
+export interface IOrganizer {
+    /**
+     * 販売者ID
+     */
+    id: string;
+}
 /**
  * コンテンツ
  * contentRatingはCOAのみ存在
@@ -101,15 +118,12 @@ export interface IAttributes extends Pick<EventFactory.IAttributes<EventType.Scr
      * 吹替利用可能言語
      */
     dubLanguage?: ILanguage;
-    /**
-     * 上映方式
-     * discontinue ICOAKubun(2024-09-18~)
-     */
-    videoFormat: IVideoFormat[];
+    videoFormat?: never;
     /**
      * 音響方式
      */
-    soundFormat: ISoundFormat[];
+    soundFormat?: ISoundFormat[];
+    subEvent?: ISubEvent;
     /**
      * コンテンツ
      */
@@ -150,23 +164,20 @@ export interface IAttributes extends Pick<EventFactory.IAttributes<EventType.Scr
  * 施設コンテンツ
  */
 export type IEvent = EventFactory.IEvent<IAttributes>;
+/**
+ * 施設コンテンツ追加時の利用不可決済方法区分指定
+ * offerType:AggregateOfferの場合、指定は無視される
+ */
 export type IOffers4create = Pick<ISingleOffer, 'unacceptedPaymentMethod'> & {
     typeOf?: never;
-} | Pick<IAggregateOffer, 'typeOf'> & {
-    unacceptedPaymentMethod?: never;
 };
 /**
  * 施設コンテンツ作成パラメータ
  */
-export type ICreateParams = Pick<IAttributes, 'typeOf' | 'name' | 'duration' | 'endDate' | 'headline' | 'startDate' | 'additionalProperty' | 'kanaName' | 'eventStatus' | 'description'> & {
+export type ICreateParams = Pick<IAttributes, 'name' | 'duration' | 'endDate' | 'headline' | 'startDate' | 'additionalProperty' | 'kanaName' | 'description'> & {
     subtitleLanguage?: Pick<ILanguage, 'name'>;
     dubLanguage?: Pick<ILanguage, 'name'>;
-    location: {
-        /**
-         * 施設ID
-         */
-        id: string;
-    };
+    location?: never;
     offers?: IOffers4create;
     workPerformed: {
         /**
@@ -175,9 +186,9 @@ export type ICreateParams = Pick<IAttributes, 'typeOf' | 'name' | 'duration' | '
         identifier: string;
         /**
          * 同コンテンツに対する複数施設コンテンツのバージョン
-         * identifier+versionでuniqueな想定
+         * 施設+コンテンツ+バージョンでuniqueな想定
          */
-        version?: string;
+        version: string;
     };
     videoFormat: {
         /**