@chevre/factory 8.1.0-alpha.6 → 8.1.0

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

@@ -2,12 +2,20 @@ 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 { IOrder } from '../order';
+import { IMultilingualString } from '../multilingualString';
+import { ICategory as IOfferCategory, IValidRateLimit } from '../offer';
+import { OfferType } from '../offerType';
+import { OrderType } from '../orderType';
 import { PermitType } from '../permit';
 import { PriceCurrency } from '../priceCurrency';
+import { IPriceSpecification as ICategoryCodeChargeSpecification } from '../priceSpecification/categoryCodeChargeSpecification';
+import { IPriceSpecification as ICompoundPriceSpecification } from '../priceSpecification/compoundPriceSpecification';
+import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from '../priceSpecification/movieTicketTypeChargeSpecification';
+import { IPriceSpecification as IUnitPriceOfferPriceSpecification } from '../priceSpecification/unitPriceSpecification';
+import { IServiceType, ProductType } from '../product';
 import { IPropertyValue } from '../propertyValue';
 import { ITicketIssuedBy, TicketType, IUnderName as IReservationUnderName, IBroker, ISeat as IReservationSeat } from '../reservation';
-import { IIssuedThrough as IEventReservationIssuedThrough, IPrice as IReservationPrice, IReservation as IEventReservation, IReservationForLegacy as IEventReservationReservationFor, IReservedTicket, ISubReservation as ISubReservation4eventReservation, ITicketType } from '../reservation/event';
+import { IReservation as IEventReservation, IReservationForLegacy as IEventReservationReservationFor, IReservedTicket, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
@@ -191,7 +199,11 @@ export interface IAcceptedOffer4object {
     id: string;
     itemOffered: IAcceptedTicketOfferItemOffered4object;
 }
-export type IOrderAsReservePurpose = Pick<IOrder, 'confirmationNumber' | 'orderNumber' | 'typeOf'>;
+export interface IOrderAsReservePurpose {
+    confirmationNumber: string;
+    orderNumber: string;
+    typeOf: OrderType;
+}
 export interface IPotentialActionsParams {
     reserve?: {
         purpose?: IOrderAsReservePurpose;
@@ -274,19 +286,47 @@ export interface IObjectWithoutDetail {
     };
 }
 export type IReservationFor = IEventReservationReservationFor;
+/**
+ * 予約取引に保管されるticketType
+ */
+export interface ITicketType {
+    additionalProperty?: IPropertyValue<string>[];
+    category?: IOfferCategory;
+    color?: string;
+    description?: string | IMultilingualString;
+    id?: string;
+    identifier: string;
+    name?: IMultilingualString;
+    typeOf: OfferType.Offer;
+    validRateLimit?: IValidRateLimit;
+}
 export type ISubReservationReservedTicket = Omit<IReservedTicket, 'ticketType'> & {
     /**
      * 予約側ではticketType廃止予定であり、予約取引には残す
      */
     ticketType: ITicketType;
 };
-export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'programMembershipUsed' | 'subReservation' | 'typeOf'> & {
-    price?: IReservationPrice;
+export type ICategoryChargePriceComponent = Pick<ICategoryCodeChargeSpecification, 'accounting' | 'appliesToCategoryCode' | 'name' | 'price' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
+export type IMovieTicketTypeChargePriceComponent = Pick<IMovieTicketTypeChargeSpecification, 'accounting' | 'appliesToMovieTicket' | 'appliesToVideoFormat' | 'name' | 'price' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
+export type IUnitPriceComponent = Pick<IUnitPriceOfferPriceSpecification, 'accounting' | 'appliesToMovieTicket' | 'appliesToAddOn' | 'name' | 'price' | 'priceCurrency' | 'referenceQuantity' | 'typeOf' | 'valueAddedTaxIncluded'>;
+export type ITicketPriceComponent = ICategoryChargePriceComponent | IMovieTicketTypeChargePriceComponent | IUnitPriceComponent;
+export type IPrice = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
+export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'programMembershipUsed' | 'subReservation' | 'typeOf'> & {
+    numSeats?: number;
+    price?: IPrice;
     priceCurrency?: PriceCurrency;
     reservedTicket: ISubReservationReservedTicket;
 };
 export type IObjectSubReservation = IEventReservationAsSubReservation;
-export type IIssuedThrough = IEventReservationIssuedThrough;
+export type IServiceTypeOfIssuedThrough = Pick<IServiceType, 'codeValue' | 'inCodeSet' | 'typeOf'>;
+export interface IIssuedThrough {
+    typeOf: ProductType.EventService;
+    serviceType?: IServiceTypeOfIssuedThrough;
+    /**
+     * 興行id
+     */
+    id: string;
+}
 /**
  * 予約取引に保管される予約者情報
  */

package/lib/chevre/assetTransaction/reserve.js

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

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

@@ -1,6 +1,7 @@
 import { ActionType } from '../actionType';
+import { IIssuedThrough, IPrice } from '../assetTransaction/reserve';
 import { IProvider, ITicket, IUnderName } from '../reservation';
-import { IIssuedThrough, IReservation as IEventReservation, IReservationForLegacy, IPrice } from '../reservation/event';
+import { IReservation as IEventReservation, IReservationForLegacy } from '../reservation/event';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
 import { ISubReservationReservedTicket } from '../assetTransaction/reserve';

package/lib/chevre/order.d.ts

@@ -1,5 +1,6 @@
 import type { COAFactory } from '@coasystems/factory';
 import { IParticipantAsPerson, IParticipantAsProject, IParticipantAsWebApplication } from './action';
+import { ICategoryChargePriceComponent, IMovieTicketTypeChargePriceComponent, IUnitPriceComponent, IIssuedThrough, IServiceTypeOfIssuedThrough, ITicketType } from './assetTransaction/reserve';
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
 import { ICustomer as ICustomerOrganization } from './customer';
 import { ICOAInfo, ISuperEvent as IEventSeries } from './event/screeningEvent';
@@ -8,6 +9,7 @@ import { IMonetaryAmount } from './monetaryAmount';
 import { IMultilingualString } from './multilingualString';
 import { IOffer } from './offer';
 import { OrderStatus } from './orderStatus';
+import { OrderType } from './orderType';
 import { OrganizationType } from './organizationType';
 import { PaymentStatusType } from './paymentStatusType';
 import { IPerson, IProfile } from './person';
@@ -17,19 +19,17 @@ import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification as ICompoundPriceSpecification } from './priceSpecification/compoundPriceSpecification';
 import { ProductType } from './product';
 import { IPropertyValue } from './propertyValue';
-import { ICategoryChargePriceComponent, IIssuedThrough, IMovieTicketTypeChargePriceComponent, IOptimizedSuperEventLegacy, IOptimizedWorkPerformedLegacy, IReservation as IRawReservation, IReservationForLegacy, IReservedTicket as IRawReservedTicket, ITicketType, IUnitPriceComponent, IServiceTypeOfIssuedThrough } from './reservation/event';
+import { IOptimizedSuperEventLegacy, IOptimizedWorkPerformedLegacy, IReservation as IRawReservation, IReservationForLegacy, IReservedTicket as IRawReservedTicket } from './reservation/event';
 import { ReservationType } from './reservationType';
 import { ISeller as IBaseSeller } from './seller';
 import { IPaymentMethodAsServiceOutput, PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 import { UnitCode } from './unitCode';
+export { OrderType };
 export interface IProject {
     typeOf: OrganizationType.Project;
     id: string;
 }
-export declare enum OrderType {
-    Order = "Order"
-}
 export interface IOrderPaymentMethodIssuedThrough {
     typeOf: PaymentServiceType;
     /**
@@ -151,27 +151,29 @@ export type ICOATicketInfoWithDetails = COAFactory.reserve.IUpdReserveTicket & {
      */
     usePoint: number;
 };
-export type IReservedTicket = Pick<IRawReservedTicket, 'typeOf' | 'ticketedSeat' | 'identifier' | // 追加(2024-04-15~)
-'ticketNumber'> & {
-    ticketType: ITicketType;
+export type ITicketTypeInOrder = Pick<ITicketType, 'id' | 'identifier' | 'name' | 'typeOf' | 'additionalProperty' | 'description'>;
+export type IReservedTicket = Pick<IRawReservedTicket, 'typeOf' | 'ticketedSeat' | 'identifier'> & {
+    ticketType: ITicketTypeInOrder;
+    ticketNumber?: never;
     dateIssued?: never;
     ticketToken?: never;
     coaTicketInfo?: never;
     coaReserveAmount?: never;
 };
+export type ICOATicketType = Pick<ITicketType, 'id' | 'identifier' | 'name' | 'typeOf'>;
 /**
  * COAの場合の予約チケット
  */
 export type ICOAReservedTicket = Pick<IRawReservedTicket, 'typeOf' | 'ticketedSeat' | 'identifier' | // 追加(2024-04-15~)
 'ticketNumber' | 'dateIssued' | 'ticketToken'> & {
-    ticketType: ITicketType;
+    ticketType: ICOATicketType;
     /**
      * COA券種情報
      */
     coaTicketInfo?: ICOATicketInfoWithDetails;
     coaReserveAmount?: number;
 };
-export interface ICOAIssuedThrough extends Pick<IIssuedThrough, 'typeOf'> {
+export interface ICOAIssuedThrough {
     typeOf: ProductType.EventService;
     serviceType?: never;
     /**

package/lib/chevre/order.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderType = void 0;
-var OrderType;
-(function (OrderType) {
-    OrderType["Order"] = "Order";
-})(OrderType || (exports.OrderType = OrderType = {}));
+const orderType_1 = require("./orderType");
+Object.defineProperty(exports, "OrderType", { enumerable: true, get: function () { return orderType_1.OrderType; } });

package/lib/chevre/orderType.d.ts

@@ -0,0 +1,3 @@
+export declare enum OrderType {
+    Order = "Order"
+}

package/lib/chevre/orderType.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrderType = void 0;
+var OrderType;
+(function (OrderType) {
+    OrderType["Order"] = "Order";
+})(OrderType || (exports.OrderType = OrderType = {}));

package/lib/chevre/report/accountingReport.d.ts

@@ -58,7 +58,6 @@ export interface IReportDocument {
 export interface ISearchConditions {
     limit?: number;
     page?: number;
-    $unwindAcceptedOffers?: '1';
     project?: {
         id?: {
             $eq?: string;

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

@@ -2,15 +2,7 @@ import { ILocation as IEventLocation, IName as IEventName, ISuperEvent } from '.
 import { IWorkPerformed } from '../event/eventSeries';
 import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';
-import { ICategory as IOfferCategory, IValidRateLimit } from '../offer';
-import { OfferType } from '../offerType';
-import { IPriceSpecification as ICategoryCodeChargeSpecification } from '../priceSpecification/categoryCodeChargeSpecification';
-import { IPriceSpecification as ICompoundPriceSpecification } from '../priceSpecification/compoundPriceSpecification';
-import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from '../priceSpecification/movieTicketTypeChargeSpecification';
-import { IPriceSpecification as IUnitPriceOfferPriceSpecification } from '../priceSpecification/unitPriceSpecification';
-import { ProductType } from '../product';
-import { IPropertyValue } from '../propertyValue';
-import { TicketType, ISeat as IReservationSeat, IServiceTypeOfIssuedThrough, IReservation as IBaseReservation, IAvailableReservationStatusType, ITicket } from '../reservation';
+import { TicketType, ISeat as IReservationSeat, IReservation as IBaseReservation, IAvailableReservationStatusType, ITicket } from '../reservation';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
 import { SortType } from '../sortType';
@@ -99,38 +91,12 @@ export interface IReservationForMinimized {
     name?: never;
     doorTime?: never;
 }
-export type ICategoryChargePriceComponent = Pick<ICategoryCodeChargeSpecification, 'accounting' | 'appliesToCategoryCode' | 'name' | 'price' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
-export type IMovieTicketTypeChargePriceComponent = Pick<IMovieTicketTypeChargeSpecification, 'accounting' | 'appliesToMovieTicket' | 'appliesToVideoFormat' | 'name' | 'price' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
-export type IUnitPriceComponent = Pick<IUnitPriceOfferPriceSpecification, 'accounting' | 'appliesToMovieTicket' | 'appliesToAddOn' | 'name' | 'price' | 'priceCurrency' | 'referenceQuantity' | 'typeOf' | 'valueAddedTaxIncluded'>;
-export type ITicketPriceComponent = ICategoryChargePriceComponent | IMovieTicketTypeChargePriceComponent | IUnitPriceComponent;
-export type IPrice = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
-export type IPriceSpecification = never;
 export interface ISubReservation {
     reservedTicket: {
         typeOf: TicketType;
         ticketedSeat: IReservationSeat;
     };
 }
-export { IServiceTypeOfIssuedThrough };
-export interface IIssuedThrough {
-    typeOf: ProductType.EventService;
-    serviceType?: IServiceTypeOfIssuedThrough;
-    /**
-     * 興行id
-     */
-    id: string;
-}
-export interface ITicketType {
-    additionalProperty?: IPropertyValue<string>[];
-    category?: IOfferCategory;
-    color?: string;
-    description?: string | IMultilingualString;
-    id?: string;
-    identifier: string;
-    name?: IMultilingualString;
-    typeOf: OfferType.Offer;
-    validRateLimit?: IValidRateLimit;
-}
 export type IReservedTicket = ITicket & {
     /**
      * 予約ドキュメント内のticketTypeは廃止済(2026-03-26~)
@@ -140,7 +106,7 @@ export type IReservedTicket = ITicket & {
 /**
  * イベント予約
  */
-export interface IReservation extends IBaseReservation<IPriceSpecification> {
+export interface IReservation extends IBaseReservation {
     bookingTime: Date;
     id: string;
     reservationFor: IReservationForMinimized;
@@ -151,6 +117,7 @@ export interface IReservation extends IBaseReservation<IPriceSpecification> {
     typeOf: ReservationType.EventReservation;
     issuedThrough?: never;
     priceCurrency?: never;
+    numSeats?: never;
 }
 export interface IReservationForSearchConditions {
     typeOf?: EventType;

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

@@ -1,11 +1,10 @@
 import { IReservation as IBaseReservation } from '../reservation';
 import { ReservationType } from '../reservationType';
-type IPriceSpecification = never;
-type ISubReservation = IBaseReservation<IPriceSpecification>;
+type ISubReservation = IBaseReservation;
 /**
  * 予約パッケージインターフェース
  */
-export interface IReservation extends IBaseReservation<IPriceSpecification> {
+export interface IReservation extends IBaseReservation {
     /**
      * The individual reservations included in the package. Typically a repeated property.
      */

package/lib/chevre/reservation.d.ts

@@ -5,7 +5,6 @@ import { ISeatingType } from './place/seat';
 import { PlaceType } from './placeType';
 import { IPriceSpecification as IGenericPriceSpecification } from './priceSpecification';
 import { PriceSpecificationType } from './priceSpecificationType';
-import { IServiceType } from './product';
 import { IProgramMembership } from './programMembership';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
@@ -109,7 +108,9 @@ export interface IBroker {
 export type IProgramMembershipIssuedThroughFaceToFace = Pick<IProgramMembership, 'typeOf'> & {
     identifier: string;
     issuedThrough: {
-        serviceType: Pick<IServiceType, 'codeValue'>;
+        serviceType: {
+            codeValue: string;
+        };
         typeOf: PaymentServiceType.FaceToFace;
     };
 };
@@ -117,12 +118,13 @@ export type IProgramMembershipIssuedThroughCreditCard = Pick<IProgramMembership,
     identifier: string;
     issuedThrough: {
         id: string;
-        serviceType: Pick<IServiceType, 'codeValue'>;
+        serviceType: {
+            codeValue: string;
+        };
         typeOf: PaymentServiceType.CreditCard;
     };
 };
 export type IProgramMembershipUsed = IProgramMembershipIssuedThroughFaceToFace | IProgramMembershipIssuedThroughCreditCard;
-export type IServiceTypeOfIssuedThrough = Pick<IServiceType, 'codeValue' | 'inCodeSet' | 'typeOf'>;
 export type IAvailableReservationStatusType = ReservationStatusType.ReservationCancelled | ReservationStatusType.ReservationConfirmed | ReservationStatusType.ReservationPending;
 export interface IProvider {
     /**
@@ -139,7 +141,7 @@ export interface IProvider {
  * For offers of tickets, restaurant reservations, flights, or rental cars, use Offer.
  * {@link https://schema.org/Reservation}
  */
-export interface IReservation<T extends Omit<IPriceSpecification, 'project'>> {
+export interface IReservation {
     project: Pick<IProject, 'id' | 'typeOf'>;
     /**
      * type of object
@@ -153,10 +155,6 @@ export interface IReservation<T extends Omit<IPriceSpecification, 'project'>> {
      * Any additional text to appear on a ticket, such as additional privileges or identifiers.
      */
     additionalTicketText?: string;
-    /**
-     * Who made the reservation.
-     * SupersededBy broker(2022-05-13~)
-     */
     /**
      * Date the reservation was made.
      */
@@ -170,17 +168,6 @@ export interface IReservation<T extends Omit<IPriceSpecification, 'project'>> {
      * Time the reservation was last modified.
      */
     modifiedTime?: Date;
-    /**
-     * Web page where reservation can be modified.
-     */
-    /**
-     * Number of seats if unreserved seating.
-     */
-    numSeats?: number;
-    /**
-     * Total price of the Reservation.
-     */
-    price?: T;
     /**
      * Any membership in a frequent flyer, hotel loyalty program, etc. being applied to the reservation.
      */

package/lib/chevre/reservationType.js

@@ -6,7 +6,6 @@ exports.ReservationType = void 0;
  */
 var ReservationType;
 (function (ReservationType) {
-    // BusReservation = 'BusReservation',
     ReservationType["EventReservation"] = "EventReservation";
     ReservationType["ReservationPackage"] = "ReservationPackage";
 })(ReservationType || (exports.ReservationType = ReservationType = {}));

package/package.json

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