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

package/lib/{creativeWork → chevre/creativeWork}/certification/softwareApplication.d.ts

@@ -1,4 +1,4 @@
-import * as CreativeWorkFactory from '../../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
 import { IProject } from '../../project';
 import { IIssuedBy, ISearchConditions, ISortOrder } from './webApplication';
@@ -14,7 +14,7 @@ export type IAbout = ISubjectAsSoftwareApplication;
 /**
  * マシーンアイデンティティ
  */
-export interface ICertification extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'typeOf'> {
+export interface ICertification extends Pick<IBaseCreativeWork, 'id' | 'typeOf'> {
     /**
      * IDP
      * 複数存在する場合、どのIDPでも受け入れる想定

package/lib/{creativeWork → chevre/creativeWork}/certification/webApplication.d.ts

@@ -1,4 +1,4 @@
-import * as CreativeWorkFactory from '../../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
 import { OrganizationType } from '../../organizationType';
 import { IProject } from '../../project';
@@ -21,7 +21,7 @@ export interface IIssuedBy {
 /**
  * アプリケーションアイデンティティ
  */
-export interface ICertification extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'typeOf'> {
+export interface ICertification extends Pick<IBaseCreativeWork, 'id' | 'typeOf'> {
     /**
      * IDP
      * 複数存在する場合、どのIDPでも受け入れる想定

package/lib/{creativeWork → chevre/creativeWork}/certification/webSite.d.ts

@@ -1,5 +1,5 @@
 import { CertificationStatusEnumeration } from '../../certificationStatusEnumeration';
-import * as CreativeWorkFactory from '../../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
 import { IProject } from '../../project';
 import { SortType } from '../../sortType';
@@ -8,7 +8,7 @@ export interface ISubjectAsWebSite {
     typeOf: CreativeWorkType.WebSite;
 }
 export type IAbout = ISubjectAsWebSite;
-export interface ICertification extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'typeOf'> {
+export interface ICertification extends Pick<IBaseCreativeWork, 'id' | 'typeOf'> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     /**
      * subject

package/lib/{creativeWork → chevre/creativeWork}/comment.d.ts

@@ -1,4 +1,4 @@
-import * as CreativeWorkFactory from '../creativeWork';
+import { ICreativeWork } from '../creativeWork';
 import { CreativeWorkType } from '../creativeWorkType';
 import { IPerson } from '../person';
 import { IProject } from '../project';
@@ -13,7 +13,7 @@ export type IMention = Pick<IPerson, 'id' | 'name' | 'typeOf'>;
  * コメント
  * {@link https://schema.org/Comment}
  */
-export interface IComment extends Pick<CreativeWorkFactory.ICreativeWork, 'additionalProperty' | 'id' | 'typeOf'> {
+export interface IComment extends Pick<ICreativeWork, 'additionalProperty' | 'id' | 'typeOf'> {
     about: IAbout;
     author: IPerson;
     commentCount?: number;

package/lib/{creativeWork → chevre/creativeWork}/message/email.d.ts

@@ -1,4 +1,4 @@
-import * as CreativeWorkFactory from '../../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
 import { IProject } from '../../project';
 import { IThing } from '../../thing';
@@ -21,7 +21,7 @@ export interface IAbout extends Pick<IThing, 'name'> {
 /**
  * Eメールメッセージ
  */
-export interface ICreativeWork extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'identifier' | 'name' | 'typeOf'> {
+export interface ICreativeWork extends Pick<IBaseCreativeWork, 'id' | 'identifier' | 'name' | 'typeOf'> {
     project?: Pick<IProject, 'id' | 'typeOf'>;
     typeOf: CreativeWorkType.EmailMessage;
     sender: IParticipant;

package/lib/{creativeWork → chevre/creativeWork}/movie.d.ts

@@ -1,14 +1,14 @@
-import * as CreativeWorkFactory from '../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../creativeWork';
 import { CreativeWorkType } from '../creativeWorkType';
 import { IMultilingualString } from '../multilingualString';
-import * as OfferFactory from '../offer';
+import { IOffer as IBaseOffer } from '../offer';
 import { IProject } from '../project';
 import { SortType } from '../sortType';
 /**
  * コンテンツに対するオファー
  * 最適化(2023-08-01~)
  */
-export type IOffer = Pick<OfferFactory.IOffer, 'typeOf' | 'availabilityEnds' | 'availabilityStarts'>;
+export type IOffer = Pick<IBaseOffer, 'typeOf' | 'availabilityEnds' | 'availabilityStarts'>;
 /**
  * 配給者
  */
@@ -20,7 +20,7 @@ export interface IDistributor {
  * コンテンツ
  * {@link https://schema.org/Movie}
  */
-export interface ICreativeWork extends Pick<CreativeWorkFactory.ICreativeWork, 'additionalProperty' | 'alternativeHeadline' | 'contentRating' | 'datePublished' | 'headline' | 'thumbnailUrl' | 'typeOf' | 'name' | 'identifier' | 'id'> {
+export interface ICreativeWork extends Pick<IBaseCreativeWork, 'additionalProperty' | 'alternativeHeadline' | 'contentRating' | 'datePublished' | 'headline' | 'thumbnailUrl' | 'typeOf' | 'name' | 'identifier' | 'id'> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     identifier: string;
     /**

package/lib/{creativeWork → chevre/creativeWork}/noteDigitalDocument.d.ts

@@ -1,4 +1,4 @@
-import * as CreativeWorkFactory from '../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../creativeWork';
 import { CreativeWorkType } from '../creativeWorkType';
 import { IOrder } from '../order';
 import { OrganizationType } from '../organizationType';
@@ -51,7 +51,7 @@ export interface IDigitalDocumentPermission {
     permissionType: DigitalDocumentPermissionType;
     grantee: IPermissionGrantee;
 }
-export interface INoteCommonAttributes extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'typeOf'> {
+export interface INoteCommonAttributes extends Pick<IBaseCreativeWork, 'id' | 'typeOf'> {
     /**
      * メモ識別子
      */

package/lib/{creativeWork → chevre/creativeWork}/softwareApplication/webApplication.d.ts

@@ -1,10 +1,10 @@
-import * as CreativeWorkFactory from '../../creativeWork';
+import { ICreativeWork as IBaseCreativeWork } from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
 import { IIdentifier } from '../../thing';
 /**
  * ウェブアプリケーション
  */
-export interface ICreativeWork extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'identifier' | 'typeOf'> {
+export interface ICreativeWork extends Pick<IBaseCreativeWork, 'id' | 'identifier' | 'typeOf'> {
     typeOf: CreativeWorkType.WebApplication;
     /**
      * アプリケーションクライアントID

package/lib/chevre/creativeWork/softwareApplication.d.ts

@@ -0,0 +1,9 @@
+import { ICreativeWork as IBaseCreativeWork } from '../creativeWork';
+import { CreativeWorkType } from '../creativeWorkType';
+/**
+ * ソフトウェア
+ */
+export interface ISoftwareApplication extends Pick<IBaseCreativeWork, 'id' | 'typeOf'> {
+    id: string;
+    typeOf: CreativeWorkType.SoftwareApplication;
+}

package/lib/chevre/error/alreadyInUse.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AlreadyInUseError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * AlreadyInUseError
+ */
+class AlreadyInUseError extends chevre_1.ChevreError {
+    entityName;
+    fieldNames;
+    constructor(entityName, fieldNames, message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = `The specified '${entityName}' value is already in use for: ${fieldNames.join(', ')}.`;
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.AlreadyInUse, actualMessage);
+        this.entityName = entityName;
+        this.fieldNames = fieldNames;
+    }
+}
+exports.AlreadyInUseError = AlreadyInUseError;

package/lib/chevre/error/argument.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArgumentError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * ArgumentError
+ */
+class ArgumentError extends chevre_1.ChevreError {
+    argumentName;
+    constructor(argumentName, message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = `Invalid or missing argument supplied: ${argumentName}.`;
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.Argument, actualMessage);
+        this.argumentName = argumentName;
+    }
+}
+exports.ArgumentError = ArgumentError;

package/lib/chevre/error/argumentNull.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArgumentNullError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * ArgumentNullError
+ */
+class ArgumentNullError extends chevre_1.ChevreError {
+    argumentName;
+    constructor(argumentName, message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = `Missing argument: ${argumentName}.`;
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.ArgumentNull, actualMessage);
+        this.argumentName = argumentName;
+    }
+}
+exports.ArgumentNullError = ArgumentNullError;

package/lib/chevre/error/chevre.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChevreError = void 0;
+/**
+ * ChevreError
+ */
+class ChevreError extends Error {
+    reason;
+    /* istanbul ignore next */
+    constructor(code, message) {
+        super(message);
+        this.name = 'ChevreError';
+        this.reason = code;
+    }
+}
+exports.ChevreError = ChevreError;

package/lib/chevre/error/forbidden.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ForbiddenError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * ForbiddenError
+ */
+class ForbiddenError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Forbidden.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.Forbidden, actualMessage);
+    }
+}
+exports.ForbiddenError = ForbiddenError;

package/lib/chevre/error/gatewayTimeout.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GatewayTimeoutError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * GatewayTimeoutError
+ */
+class GatewayTimeoutError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Gateway Timeout';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.GatewayTimeout, actualMessage);
+    }
+}
+exports.GatewayTimeoutError = GatewayTimeoutError;

package/lib/chevre/error/internal.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InternalError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * InternalError
+ */
+class InternalError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Internal server error.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.Internal, actualMessage);
+    }
+}
+exports.InternalError = InternalError;

package/lib/chevre/error/notFound.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotFoundError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * NotFoundError
+ */
+class NotFoundError extends chevre_1.ChevreError {
+    entityName;
+    constructor(entityName, message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = `Not Found: ${entityName}.`;
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.NotFound, actualMessage);
+        this.entityName = entityName;
+    }
+}
+exports.NotFoundError = NotFoundError;

package/lib/chevre/error/notImplemented.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotImplementedError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * NotImplementedError
+ */
+class NotImplementedError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Method is not yet implemented.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.NotImplemented, actualMessage);
+    }
+}
+exports.NotImplementedError = NotImplementedError;

package/lib/chevre/error/rateLimitExceeded.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RateLimitExceededError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * RateLimitExceededError
+ */
+class RateLimitExceededError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Rate limit exceeded.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.RateLimitExceeded, actualMessage);
+    }
+}
+exports.RateLimitExceededError = RateLimitExceededError;

package/lib/chevre/error/serviceUnavailable.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceUnavailableError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * ServiceUnavailableError
+ */
+class ServiceUnavailableError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Service unavailable temporarily.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.ServiceUnavailable, actualMessage);
+    }
+}
+exports.ServiceUnavailableError = ServiceUnavailableError;

package/lib/chevre/error/unauthorized.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnauthorizedError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * UnauthorizedError
+ */
+class UnauthorizedError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Unauthorized.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.Unauthorized, actualMessage);
+    }
+}
+exports.UnauthorizedError = UnauthorizedError;

package/lib/chevre/error/unknown.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnknownError = void 0;
+const errorCode_1 = require("../errorCode");
+const chevre_1 = require("./chevre");
+/**
+ * UnknownError
+ */
+class UnknownError extends chevre_1.ChevreError {
+    constructor(message) {
+        let actualMessage = message;
+        if (message === undefined || message.length === 0) {
+            actualMessage = 'Unknown server error.';
+        }
+        /* istanbul ignore next */
+        super(errorCode_1.ErrorCode.Unknown, actualMessage);
+    }
+}
+exports.UnknownError = UnknownError;

package/lib/{errors.js → chevre/errors.js}

@@ -4,29 +4,29 @@ exports.Unknown = exports.Unauthorized = exports.ServiceUnavailable = exports.Ra
 /**
  * errors
  */
-var alreadyInUse_1 = require("./error/alreadyInUse");
+const alreadyInUse_1 = require("./error/alreadyInUse");
 Object.defineProperty(exports, "AlreadyInUse", { enumerable: true, get: function () { return alreadyInUse_1.AlreadyInUseError; } });
-var argument_1 = require("./error/argument");
+const argument_1 = require("./error/argument");
 Object.defineProperty(exports, "Argument", { enumerable: true, get: function () { return argument_1.ArgumentError; } });
-var argumentNull_1 = require("./error/argumentNull");
+const argumentNull_1 = require("./error/argumentNull");
 Object.defineProperty(exports, "ArgumentNull", { enumerable: true, get: function () { return argumentNull_1.ArgumentNullError; } });
-var chevre_1 = require("./error/chevre");
+const chevre_1 = require("./error/chevre");
 Object.defineProperty(exports, "Chevre", { enumerable: true, get: function () { return chevre_1.ChevreError; } });
-var forbidden_1 = require("./error/forbidden");
+const forbidden_1 = require("./error/forbidden");
 Object.defineProperty(exports, "Forbidden", { enumerable: true, get: function () { return forbidden_1.ForbiddenError; } });
-var gatewayTimeout_1 = require("./error/gatewayTimeout");
+const gatewayTimeout_1 = require("./error/gatewayTimeout");
 Object.defineProperty(exports, "GatewayTimeout", { enumerable: true, get: function () { return gatewayTimeout_1.GatewayTimeoutError; } });
-var internal_1 = require("./error/internal");
+const internal_1 = require("./error/internal");
 Object.defineProperty(exports, "Internal", { enumerable: true, get: function () { return internal_1.InternalError; } });
-var notFound_1 = require("./error/notFound");
+const notFound_1 = require("./error/notFound");
 Object.defineProperty(exports, "NotFound", { enumerable: true, get: function () { return notFound_1.NotFoundError; } });
-var notImplemented_1 = require("./error/notImplemented");
+const notImplemented_1 = require("./error/notImplemented");
 Object.defineProperty(exports, "NotImplemented", { enumerable: true, get: function () { return notImplemented_1.NotImplementedError; } });
-var rateLimitExceeded_1 = require("./error/rateLimitExceeded");
+const rateLimitExceeded_1 = require("./error/rateLimitExceeded");
 Object.defineProperty(exports, "RateLimitExceeded", { enumerable: true, get: function () { return rateLimitExceeded_1.RateLimitExceededError; } });
-var serviceUnavailable_1 = require("./error/serviceUnavailable");
+const serviceUnavailable_1 = require("./error/serviceUnavailable");
 Object.defineProperty(exports, "ServiceUnavailable", { enumerable: true, get: function () { return serviceUnavailable_1.ServiceUnavailableError; } });
-var unauthorized_1 = require("./error/unauthorized");
+const unauthorized_1 = require("./error/unauthorized");
 Object.defineProperty(exports, "Unauthorized", { enumerable: true, get: function () { return unauthorized_1.UnauthorizedError; } });
-var unknown_1 = require("./error/unknown");
+const unknown_1 = require("./error/unknown");
 Object.defineProperty(exports, "Unknown", { enumerable: true, get: function () { return unknown_1.UnknownError; } });

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

@@ -1,7 +1,7 @@
-import * as EventFactory from '../event';
+import { IAttributes as IBaseAttributes } from '../event';
 import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';
-import * as OfferFactory from '../offer';
+import { IAvailableAtOrFrom, ICategory as IOfferCategory, IEligibleQuantity } from '../offer';
 import { OfferType } from '../offerType';
 import { OrganizationType } from '../organizationType';
 import { PlaceType } from '../placeType';
@@ -31,7 +31,7 @@ export interface IOfferWithAggregateReservation {
         attendeeCount?: never;
         checkInCount?: never;
     };
-    category?: OfferFactory.ICategory;
+    category?: IOfferCategory;
     maximumAttendeeCapacity?: number;
     remainingAttendeeCapacity?: number;
 }
@@ -53,7 +53,7 @@ export interface IAggregateOfferOfPlace {
         typeOf: OfferType.Offer;
         id: string;
         identifier?: string;
-        category?: OfferFactory.ICategory;
+        category?: IOfferCategory;
         aggregateReservation?: Pick<IAggregateReservation, 'typeOf' | 'useActionCount'>;
     }[];
 }
@@ -61,7 +61,7 @@ export type IServiceType = IProductServiceType & {
     id?: string;
 };
 export type IOfferedThrough = Pick<IWebAPIService<WebAPIIdentifier.Chevre>, 'identifier' | 'typeOf'>;
-export type IOfferAvailableAtOrFrom = Pick<OfferFactory.IAvailableAtOrFrom, 'id'>;
+export type IOfferAvailableAtOrFrom = Pick<IAvailableAtOrFrom, 'id'>;
 export interface ISeller {
     typeOf: OrganizationType.Corporation;
     /**
@@ -74,7 +74,7 @@ export interface ISeller {
      */
     makesOffer: ISellerMakesOffer[];
 }
-export import IEligibleQuantity = OfferFactory.IEligibleQuantity;
+export { IEligibleQuantity };
 /**
  * イベントのルーム
  */
@@ -107,7 +107,7 @@ export interface IOrganizer {
 /**
  * イベント属性
  */
-export interface IAttributes extends Pick<EventFactory.IAttributes<EventType>, 'additionalProperty' | 'project' | 'identifier' | 'description' | 'eventStatus' | 'name' | 'typeOf'> {
+export interface IAttributes extends Pick<IBaseAttributes<EventType>, 'additionalProperty' | 'project' | 'identifier' | 'description' | 'eventStatus' | 'name' | 'typeOf'> {
     /**
      * 予約集計結果としてのキャパシティ
      */

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

@@ -1,24 +1,19 @@
 import type { COAFactory } from '@coasystems/factory';
-import * as EventFactory from '../event';
+import { IEvent as IBaseEvent, ISearchConditions as IBaseSearchConditions, ISortOrder } from '../event';
 import { IEvent as IEventSeries, IUnacceptedPaymentMethodType } from '../event/screeningEventSeries';
 import { EventType } from '../eventType';
 import { OfferType } from '../offerType';
 import { PlaceType } from '../placeType';
 import { ProductType } from '../product';
-import * as ReservationFactory from '../reservation';
+import { TicketType } from '../reservation';
 import { ReservationType } from '../reservationType';
 import { Identifier as WebAPIIdentifier, IService as IWebAPIService } from '../service/webAPI';
-import * as AnyEventFactory from './anyEvent';
-export import IAggregateReservation = AnyEventFactory.IAggregateReservation;
-export import IOfferWithAggregateReservation = AnyEventFactory.IOfferWithAggregateReservation;
-export import IAggregateOffer = AnyEventFactory.IAggregateOffer;
-export import IOfferAvailableAtOrFrom = AnyEventFactory.IOfferAvailableAtOrFrom;
-export import IEventOfferForMemberTier = AnyEventFactory.IEventOfferForMemberTier;
-export import ISellerMakesOffer = AnyEventFactory.ISellerMakesOffer;
+import { IAggregateReservation, IOfferWithAggregateReservation, IAggregateOffer, IOfferAvailableAtOrFrom, IEventOfferForMemberTier, ISellerMakesOffer, IServiceType, IOfferedThrough, ISeller, IEligibleQuantity, ILocation, IName, ISellerMakesOffer4create, ISeller4create, IAttributes as IAnyEventAttributes } from './anyEvent';
+export { IAggregateReservation, IOfferWithAggregateReservation, IAggregateOffer, IOfferAvailableAtOrFrom, IEventOfferForMemberTier, ISellerMakesOffer, IServiceType, IOfferedThrough, ISeller, IEligibleQuantity, ILocation, IName, ISellerMakesOffer4create, ISeller4create };
 export interface IServiceOutput {
     typeOf: ReservationType.EventReservation;
     reservedTicket?: {
-        typeOf: ReservationFactory.TicketType;
+        typeOf: TicketType;
         /**
          * チケットに割り当てられる座席
          * 指定席でない場合、存在しない
@@ -28,7 +23,6 @@ export interface IServiceOutput {
         };
     };
 }
-export import IServiceType = AnyEventFactory.IServiceType;
 /**
  * 興行
  */
@@ -54,9 +48,6 @@ export interface IItemOffered {
     typeOf: ProductType.EventService;
     availableChannel?: never;
 }
-export import IOfferedThrough = AnyEventFactory.IOfferedThrough;
-export import ISeller = AnyEventFactory.ISeller;
-export import IEligibleQuantity = AnyEventFactory.IEligibleQuantity;
 /**
  * イベントに対するオファー
  */
@@ -140,16 +131,14 @@ export type ICOAOffer = COAFactory.reserve.IUpdReserveTicket & {
      */
     usePoint: number;
 };
-export import ILocation = AnyEventFactory.ILocation;
 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;
 };
-export import IName = AnyEventFactory.IName;
 /**
  * イベント属性
  */
-export interface IAttributes extends Pick<AnyEventFactory.IAttributes, 'maximumPhysicalAttendeeCapacity' | 'additionalProperty' | 'project' | 'identifier' | 'description' | 'eventStatus' | 'maximumAttendeeCapacity' | 'remainingAttendeeCapacity' | 'location' | 'name' | 'doorTime' | 'endDate' | 'startDate' | 'aggregateReservation' | 'organizer' | 'checkInCount' | 'attendeeCount'> {
+export interface IAttributes extends Pick<IAnyEventAttributes, 'maximumPhysicalAttendeeCapacity' | 'additionalProperty' | 'project' | 'identifier' | 'description' | 'eventStatus' | 'maximumAttendeeCapacity' | 'remainingAttendeeCapacity' | 'location' | 'name' | 'doorTime' | 'endDate' | 'startDate' | 'aggregateReservation' | 'organizer' | 'checkInCount' | 'attendeeCount'> {
     /**
      * 親イベント
      * 施設コンテンツに相当
@@ -169,9 +158,7 @@ export interface IAttributes extends Pick<AnyEventFactory.IAttributes, 'maximumP
 /**
  * イベント
  */
-export type IEvent = EventFactory.IEvent<IAttributes>;
-export import ISellerMakesOffer4create = AnyEventFactory.ISellerMakesOffer4create;
-export import ISeller4create = AnyEventFactory.ISeller4create;
+export type IEvent = IBaseEvent<IAttributes>;
 export type IOffers4create = Pick<IOffer, 'unacceptedPaymentMethod' | 'identifier'> & {
     /**
      * 最大予約数を指定
@@ -227,7 +214,7 @@ export type IUpdateByIdentifierParams = Pick<IUpdateByIdParams, 'additionalPrope
 /**
  * ソート条件
  */
-export type ISortOrder = EventFactory.ISortOrder;
+export { ISortOrder };
 export interface IOfferSearchConditions {
     /**
      * apiリクエストクライアントがseller.makesOffer.$elemMatchに含まれるものを検索
@@ -289,7 +276,7 @@ export interface IOfferSearchConditions {
 /**
  * イベント検索条件
  */
-export interface ISearchConditions extends EventFactory.ISearchConditions<EventType.ScreeningEvent> {
+export interface ISearchConditions extends IBaseSearchConditions<EventType.ScreeningEvent> {
     location?: {
         /**
          * ルームコード