@chevre/factory 11.1.0-alpha.2 → 11.1.0-alpha.4

package/lib/chevre/acceptedOffer.d.ts

@@ -8,7 +8,7 @@ import { IPropertyValue } from './propertyValue';
 import { IReservation as IRawReservation, IReservedTicket as IRawReservedTicket } from './reservation/event';
 import { Identifier } from './service/webAPI';
 export type IWorkPerformed = Pick<IOptimizedWorkPerformedLegacy, 'typeOf' | 'id' | 'identifier' | 'name' | 'duration'>;
-export type ISuperEvent = Pick<IOptimizedSuperEventLegacy, 'id' | 'location' | 'name' | 'soundFormat' | 'typeOf' | 'headline'> & {
+export type ISuperEvent = Pick<IOptimizedSuperEventLegacy, 'id' | 'location' | 'name' | 'typeOf' | 'headline'> & {
     workPerformed: IWorkPerformed;
     identifier?: never;
     alternativeHeadline?: never;
@@ -18,7 +18,7 @@ export type ISuperEvent = Pick<IOptimizedSuperEventLegacy, 'id' | 'location' | '
 /**
  * COAの場合の施設コンテンツ
  */
-export type ICOASuperEvent = Pick<IOptimizedSuperEventLegacy, 'id' | 'location' | 'name' | 'soundFormat' | 'typeOf' | 'headline'> & Pick<IEventSeries, 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
+export type ICOASuperEvent = Pick<IOptimizedSuperEventLegacy, 'id' | 'location' | 'name' | 'typeOf' | 'headline'> & Pick<IEventSeries, 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
     workPerformed: IWorkPerformed;
 };
 export type IEventAsReservationFor = Omit<IReservationForLegacy, 'superEvent' | 'identifier' | 'coaInfo'> & {

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

@@ -1,6 +1,6 @@
 import { IParticipantAsProject, IAction as IBaseAction, IAttributes as IBaseAttributes } from '../../action';
 import { ActionType } from '../../actionType';
-import { IEvent as IEventSeries } from '../../event/eventSeries';
+import { IEvent as IEventSeries } from '../../eventSeries';
 import { IAggregateOffer } from '../../offer/aggregateOffer';
 import { IOfferCatalog } from '../../offerCatalog';
 import { IPlace as IMovieTheater } from '../../place/movieTheater';

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

@@ -1,6 +1,6 @@
 import { ICreativeWork as IMovie } from '../../../creativeWork/movie';
 import { CreativeWorkType } from '../../../creativeWorkType';
-import { IEvent as IEventSeries } from '../../../event/eventSeries';
+import { IEvent as IEventSeries } from '../../../eventSeries';
 import { EventType } from '../../../eventType';
 import { IOfferCatalog } from '../../../offerCatalog';
 import { IOrder } from '../../../order';

package/lib/chevre/action/update/update/result.d.ts

@@ -1,6 +1,6 @@
 import { ICreativeWork as IMovie } from '../../../creativeWork/movie';
 import { CreativeWorkType } from '../../../creativeWorkType';
-import { IEvent as IEventSeries } from '../../../event/eventSeries';
+import { IEvent as IEventSeries } from '../../../eventSeries';
 import { EventType } from '../../../eventType';
 import { IOfferCatalog } from '../../../offerCatalog';
 import { IOrder } from '../../../order';

package/lib/chevre/action/update/update/targetCollection.d.ts

@@ -1,7 +1,7 @@
 import { ICreativeWork as IMovie } from '../../../creativeWork/movie';
 import { IAbout as INoteAbout } from '../../../creativeWork/noteDigitalDocument';
 import { CreativeWorkType } from '../../../creativeWorkType';
-import { IEvent as IEventSeries } from '../../../event/eventSeries';
+import { IEvent as IEventSeries } from '../../../eventSeries';
 import { EventType } from '../../../eventType';
 import { IOfferCatalog } from '../../../offerCatalog';
 import { OrderType } from '../../../order';

package/lib/chevre/assetTransaction/reserve.d.ts

@@ -2,7 +2,7 @@ import { IInstrument as IReserveActionInstrument } from '../action/reserve';
 import { IAgent, ISearchConditions as IBaseSearchConditions, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IWorkPerformed } from '../event/eventSeries';
+import { IWorkPerformed } from '../eventSeries';
 import { ILocation as IEventLocation, IName as IEventName, ISuperEvent } from '../event/screeningEvent';
 import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';

package/lib/chevre/event/screeningEvent.d.ts

@@ -1,7 +1,6 @@
 import type { COAFactory } from '@coasystems/factory';
-import { IEvent as IBaseEvent, ISearchConditions as IBaseSearchConditions, ISortOrder, IAttributes as IBaseAttributes } from '../event';
 import { EventStatusType } from '../eventStatusType';
-import { IEvent as IEventSeries, IUnacceptedPaymentMethodType } from './eventSeries';
+import { IEvent as IEventSeries, IUnacceptedPaymentMethodType } from '../eventSeries';
 import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';
 import { IEligibleQuantity } from '../offer';
@@ -9,9 +8,12 @@ import { OfferType } from '../offerType';
 import { OrganizationType } from '../organizationType';
 import { PlaceType } from '../placeType';
 import { ProductType } from '../product';
+import { IProject } from '../project';
+import { IPropertyValue } from '../propertyValue';
 import { TicketType } from '../reservation';
 import { ReservationType } from '../reservationType';
 import { Identifier as WebAPIIdentifier, IService as IWebAPIService } from '../service/webAPI';
+import { SortType } from '../sortType';
 import { IAggregateReservation, IOfferWithAggregateReservation, IAggregateOffer, IOfferAvailableAtOrFrom, ISellerMakesOffer, IServiceType, ISellerMakesOffer4create } from './anyEvent';
 export { IAggregateReservation, IOfferWithAggregateReservation, IAggregateOffer, IOfferAvailableAtOrFrom, ISellerMakesOffer, IServiceType, IEligibleQuantity, ISellerMakesOffer4create };
 export interface IServiceOutput {
@@ -150,7 +152,7 @@ export type ICOAOffer = COAFactory.reserve.IUpdReserveTicket & {
      */
     usePoint: number;
 };
-export type ISuperEvent = Pick<IEventSeries, 'typeOf' | 'id' | 'soundFormat' | 'workPerformed' | 'location' | 'kanaName' | 'name' | 'additionalProperty' | 'description' | 'headline' | 'dubLanguage' | 'subtitleLanguage' | 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
+export type ISuperEvent = Pick<IEventSeries, 'typeOf' | 'id' | 'workPerformed' | 'location' | 'kanaName' | 'name' | 'additionalProperty' | 'description' | 'headline' | 'dubLanguage' | 'subtitleLanguage' | 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
     startDate?: Date;
     endDate?: Date;
 };
@@ -189,7 +191,23 @@ export type IName = IMultilingualString;
 /**
  * イベント属性
  */
-interface IAnyEventAttributes extends Pick<IBaseAttributes<EventType.ScreeningEvent>, 'additionalProperty' | 'project' | 'identifier' | 'eventStatus' | 'name' | 'typeOf'> {
+interface IAnyEventAttributes {
+    project: Pick<IProject, 'id' | 'typeOf'>;
+    /**
+     * イベントタイプ
+     */
+    typeOf: EventType.ScreeningEvent;
+    /**
+     * イベント識別子
+     * プロジェクト内でユニーク必須
+     */
+    identifier?: string;
+    /**
+     * イベントステータス
+     * イベントがキャンセル、あるいは、延期された場合に主に使用されます。
+     */
+    eventStatus: EventStatusType;
+    additionalProperty?: IPropertyValue<string>[];
     /**
      * 予約集計結果としてのキャパシティ
      */
@@ -264,7 +282,9 @@ export interface IAttributes extends Pick<IAnyEventAttributes, 'maximumPhysicalA
 /**
  * イベント
  */
-export type IEvent = IBaseEvent<IAttributes>;
+export type IEvent = IAttributes & {
+    id: string;
+};
 export type IOffers4create = Pick<IOffer, 'unacceptedPaymentMethod' | 'identifier'> & {
     /**
      * 最大予約数を指定
@@ -317,10 +337,6 @@ export type IUpdateByIdentifierParams = Pick<IUpdateByIdParams, 'additionalPrope
     location?: never;
     superEvent?: never;
 };
-/**
- * ソート条件
- */
-export { ISortOrder };
 export interface IOfferSearchConditions {
     itemOffered?: {
         id?: {
@@ -361,10 +377,64 @@ export interface IOfferSearchConditions {
         };
     };
 }
+/**
+ * ソート条件
+ */
+export interface ISortOrder {
+    startDate?: SortType;
+}
 /**
  * イベント検索条件
  */
-export interface ISearchConditions extends IBaseSearchConditions {
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: ISortOrder;
+    id?: {
+        $eq?: string;
+        $in?: string[];
+    };
+    identifiers?: string[];
+    organizer?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    /**
+     * 開催中 from
+     * ISO 8601 date format
+     */
+    inSessionFrom?: Date;
+    /**
+     * 開催中 through
+     * ISO 8601 date format
+     */
+    inSessionThrough?: Date;
+    /**
+     * 開始日時 from
+     * ISO 8601 date format
+     */
+    startFrom?: Date;
+    /**
+     * 開始日時 through
+     * ISO 8601 date format
+     */
+    startThrough?: Date;
+    /**
+     * 終了日時 from
+     * ISO 8601 date format
+     */
+    endFrom?: Date;
+    /**
+     * 終了日時 through
+     * ISO 8601 date format
+     */
+    endThrough?: Date;
     additionalProperty?: {
         $elemMatch?: {
             name?: {

package/lib/chevre/{event/eventSeries.d.ts → eventSeries.d.ts}

@@ -1,11 +1,14 @@
 import type { COAFactory } from '@coasystems/factory';
-import { ICreativeWork as IMovie } from '../creativeWork/movie';
-import { IEvent as IBaseEvent, IAttributes as IBaseAttributes, ISearchConditions as IBaseSearchConditions } from '../event';
-import { EventType } from '../eventType';
-import { ILanguage } from '../language';
-import { IMultilingualString } from '../multilingualString';
-import { OfferType } from '../offerType';
-import { PlaceType } from '../placeType';
+import { ICreativeWork as IMovie } from './creativeWork/movie';
+import { EventStatusType } from './eventStatusType';
+import { EventType } from './eventType';
+import { ILanguage } from './language';
+import { IMultilingualString } from './multilingualString';
+import { OfferType } from './offerType';
+import { PlaceType } from './placeType';
+import { IProject } from './project';
+import { IPropertyValue } from './propertyValue';
+import { SortType } from './sortType';
 export type IUnacceptedPaymentMethodType = 'MovieTicket';
 /**
  * 施設コンテンツに対する単一オファー
@@ -17,14 +20,6 @@ export interface ISingleOffer {
      */
     unacceptedPaymentMethod?: IUnacceptedPaymentMethodType[];
 }
-export interface IVideoFormat {
-    typeOf: string;
-    name: string;
-}
-export interface ISoundFormat {
-    typeOf: string;
-    name: string;
-}
 /**
  * サブイベント
  * 施設コンテンツに所属するScreeningEventの属性など
@@ -94,7 +89,20 @@ export interface ILocation {
      */
     name?: IMultilingualString;
 }
-export interface IAttributes extends Pick<IBaseAttributes<EventType.ScreeningEventSeries>, 'project' | 'typeOf' | 'identifier' | 'name' | 'description' | 'eventStatus' | 'additionalProperty'> {
+export interface IAttributes {
+    project: Pick<IProject, 'id' | 'typeOf'>;
+    typeOf: EventType.ScreeningEventSeries;
+    /**
+     * 施設コンテンツ識別子(COAのみ)
+     * プロジェクト内でユニーク必須
+     */
+    identifier?: string;
+    /**
+     * イベント説明
+     */
+    description?: IMultilingualString;
+    eventStatus: EventStatusType.EventScheduled;
+    additionalProperty?: IPropertyValue<string>[];
     alternativeHeadline?: IMultilingualString | string;
     headline?: IMultilingualString;
     /**
@@ -110,10 +118,6 @@ export interface IAttributes extends Pick<IBaseAttributes<EventType.ScreeningEve
      * 吹替利用可能言語
      */
     dubLanguage?: ILanguage;
-    /**
-     * 音響方式
-     */
-    soundFormat?: ISoundFormat[];
     subEvent?: ISubEvent;
     /**
      * コンテンツ
@@ -154,7 +158,9 @@ export interface IAttributes extends Pick<IBaseAttributes<EventType.ScreeningEve
 /**
  * 施設コンテンツ
  */
-export type IEvent = IBaseEvent<IAttributes>;
+export type IEvent = IAttributes & {
+    id: string;
+};
 /**
  * 施設コンテンツ追加時の利用不可決済方法区分指定
  * offerType:AggregateOfferの場合、指定は無視される
@@ -188,10 +194,64 @@ export type ICreateParams = Pick<IAttributes, 'name' | 'duration' | 'endDate' |
         typeOf: string;
     }[];
 };
+/**
+ * ソート条件
+ */
+export interface ISortOrder {
+    startDate?: SortType;
+}
 /**
  * 検索条件
  */
-export interface ISearchConditions extends Pick<IBaseSearchConditions, 'endFrom' | 'endThrough' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> {
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: ISortOrder;
+    id?: {
+        $eq?: string;
+        $in?: string[];
+    };
+    identifiers?: string[];
+    organizer?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    /**
+     * 開催中 from
+     * ISO 8601 date format
+     */
+    inSessionFrom?: Date;
+    /**
+     * 開催中 through
+     * ISO 8601 date format
+     */
+    inSessionThrough?: Date;
+    /**
+     * 開始日時 from
+     * ISO 8601 date format
+     */
+    startFrom?: Date;
+    /**
+     * 開始日時 through
+     * ISO 8601 date format
+     */
+    startThrough?: Date;
+    /**
+     * 終了日時 from
+     * ISO 8601 date format
+     */
+    endFrom?: Date;
+    /**
+     * 終了日時 through
+     * ISO 8601 date format
+     */
+    endThrough?: Date;
     additionalProperty?: {
         $elemMatch?: {
             name?: {
@@ -202,7 +262,6 @@ export interface ISearchConditions extends Pick<IBaseSearchConditions, 'endFrom'
             };
         };
     };
-    typeOf?: EventType.ScreeningEventSeries;
     name?: string;
     location?: {
         branchCode?: {
@@ -230,13 +289,13 @@ export interface ISearchConditions extends Pick<IBaseSearchConditions, 'endFrom'
             $in?: string[];
         };
     };
-    workPerformed?: {
-        /**
-         * コンテンツコード
-         */
-        identifiers?: string[];
-        version?: {
-            $eq?: string;
-        };
-    };
+    workPerformed?: never;
+    /**
+     * コンテンツコード
+     */
+    movieIdentifier?: string;
+    /**
+     * コンテンツバージョン
+     */
+    movieVersion?: string;
 }

package/lib/chevre/index.d.ts

@@ -51,7 +51,7 @@ import * as CustomerFactory from './customer';
 import * as EncodingFormat from './encodingFormat';
 import * as entryPoint from './entryPoint';
 import * as ScreeningEventFactory from './event/screeningEvent';
-export * as eventSeries from './event/eventSeries';
+export * as eventSeries from './eventSeries';
 import { EventStatusType } from './eventStatusType';
 import { EventType } from './eventType';
 import * as IAMFactory from './iam';

package/lib/chevre/index.js

@@ -56,7 +56,7 @@ const EncodingFormat = require("./encodingFormat");
 const entryPoint = require("./entryPoint");
 exports.entryPoint = entryPoint;
 const ScreeningEventFactory = require("./event/screeningEvent");
-exports.eventSeries = require("./event/eventSeries");
+exports.eventSeries = require("./eventSeries");
 const eventStatusType_1 = require("./eventStatusType");
 const eventType_1 = require("./eventType");
 const IAMFactory = require("./iam");

package/lib/chevre/notification/eventSeries.d.ts

@@ -1,9 +1,16 @@
-import { IEvent as IEventSeries, IVideoFormat } from '../event/eventSeries';
+import { IEvent as IEventSeries } from '../eventSeries';
+export interface IVideoFormat {
+    typeOf: string;
+    name: string;
+}
 /**
  * 外部への施設コンテンツ通知
  * redefine(2025-11-01~)
  */
-export type IEventSeriesAsNotification = Pick<IEventSeries, 'project' | 'organizer' | 'typeOf' | 'name' | 'endDate' | 'location' | 'startDate' | 'id' | 'additionalProperty' | 'subtitleLanguage' | 'dubLanguage' | 'soundFormat' | 'workPerformed' | 'kanaName' | 'alternativeHeadline' | 'description' | 'duration' | 'eventStatus' | 'headline'> & {
+export type IEventSeriesAsNotification = Pick<IEventSeries, 'project' | 'organizer' | 'typeOf' | 'name' | 'endDate' | 'location' | 'startDate' | 'id' | 'additionalProperty' | 'subtitleLanguage' | 'dubLanguage' | 'workPerformed' | 'kanaName' | 'alternativeHeadline' | 'description' | 'duration' | 'eventStatus' | 'headline'> & {
     offers?: never;
-    videoFormat: IVideoFormat[];
+    /**
+     * 上映方式区分リスト
+     */
+    videoFormat: IVideoFormat[] | string[];
 };

package/lib/chevre/reservation/event.d.ts

@@ -1,5 +1,5 @@
 import { ILocation as IEventLocation, ISuperEvent } from '../event/screeningEvent';
-import { IWorkPerformed } from '../event/eventSeries';
+import { IWorkPerformed } from '../eventSeries';
 import { EventType } from '../eventType';
 import { TicketType, ISeat as IReservationSeat, IReservation as IBaseReservation, IAvailableReservationStatusType, ITicket } from '../reservation';
 import { ReservationStatusType } from '../reservationStatusType';
@@ -22,7 +22,6 @@ export type IMinimizedSuperEvent = Pick<ISuperEvent, 'id' | 'typeOf'> & {
 } & {
     additionalProperty?: never;
     name?: never;
-    soundFormat?: never;
     headline?: never;
 };
 export type IMinimizedRoom = Pick<IEventLocation, 'branchCode' | 'typeOf'> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "11.1.0-alpha.2",
+  "version": "11.1.0-alpha.4",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [

package/lib/chevre/event.d.ts

@@ -1,94 +0,0 @@
-import { EventStatusType } from './eventStatusType';
-import { EventType } from './eventType';
-import { IMultilingualString } from './multilingualString';
-import { IProject } from './project';
-import { IPropertyValue } from './propertyValue';
-import { SortType } from './sortType';
-export interface IAttributes<T extends EventType> {
-    project: Pick<IProject, 'id' | 'typeOf'>;
-    /**
-     * イベントタイプ
-     */
-    typeOf: T;
-    /**
-     * イベント識別子
-     * プロジェクト内でユニーク必須
-     */
-    identifier?: string;
-    /**
-     * イベント名称
-     */
-    name: IMultilingualString;
-    /**
-     * イベント説明
-     */
-    description?: IMultilingualString;
-    /**
-     * イベントステータス
-     * イベントがキャンセル、あるいは、延期された場合に主に使用されます。
-     */
-    eventStatus: EventStatusType;
-    additionalProperty?: IPropertyValue<string>[];
-}
-/**
- * イベント
- */
-export type IEvent<T extends IAttributes<EventType>> = T & {
-    id: string;
-};
-/**
- * ソート条件
- */
-export interface ISortOrder {
-    startDate?: SortType;
-}
-export interface ISearchConditions {
-    limit?: number;
-    page?: number;
-    sort?: ISortOrder;
-    id?: {
-        $eq?: string;
-        $in?: string[];
-    };
-    identifiers?: string[];
-    organizer?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    project?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    /**
-     * 開催中 from
-     * ISO 8601 date format
-     */
-    inSessionFrom?: Date;
-    /**
-     * 開催中 through
-     * ISO 8601 date format
-     */
-    inSessionThrough?: Date;
-    /**
-     * 開始日時 from
-     * ISO 8601 date format
-     */
-    startFrom?: Date;
-    /**
-     * 開始日時 through
-     * ISO 8601 date format
-     */
-    startThrough?: Date;
-    /**
-     * 終了日時 from
-     * ISO 8601 date format
-     */
-    endFrom?: Date;
-    /**
-     * 終了日時 through
-     * ISO 8601 date format
-     */
-    endThrough?: Date;
-}

package/lib/chevre/event.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });