@chevre/factory 4.272.0 → 4.274.0-alpha.0

package/lib/action/authorize/offer/product.d.ts

@@ -2,6 +2,7 @@ import * as ActionFactory from '../../../action';
 import { ActionType } from '../../../actionType';
 import * as RegisterServiceTransactionFactory from '../../../assetTransaction/registerService';
 import { AssetTransactionType } from '../../../assetTransactionType';
+import { ITicketPriceSpecification } from '../../../event/screeningEvent';
 import { IOffer } from '../../../offer';
 import * as OrderFactory from '../../../order';
 import { IPermit } from '../../../permit';
@@ -9,7 +10,6 @@ import { PriceCurrency } from '../../../priceCurrency';
 import { IProduct, IServiceOutput as IProductServiceOutput } from '../../../product';
 import { ISeller } from '../../../seller';
 import { TransactionType } from '../../../transactionType';
-import { ITicketPriceSpecification } from '../../../unitPriceOffer';
 import * as AuthorizeActionFactory from '../../authorize';
 export declare type IAgent = ActionFactory.IParticipantAsSeller;
 export declare type IRecipient = ActionFactory.IParticipantAsWebApplication | ActionFactory.IParticipantAsPerson;
@@ -18,7 +18,7 @@ export declare type IItemOffered = Pick<IProduct, 'project' | 'typeOf' | 'id' |
 };
 export declare type IAcceptedOfferWithoutDetail = RegisterServiceTransactionFactory.IAcceptedOfferWithoutDetail;
 export declare type ISellerMakesOffer = Pick<ISeller, 'project' | 'id' | 'name' | 'typeOf'>;
-export interface IAcceptedOffer extends Pick<IOffer, 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'name' | 'priceCurrency' | 'priceSpecification' | 'seller'> {
+export interface IAcceptedOffer extends Pick<IOffer, 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'name' | 'priceCurrency' | 'seller'> {
     /**
      * オファーコード
      */

package/lib/action/authorize/offer/seatReservation.d.ts

@@ -62,7 +62,6 @@ export declare type IAcceptedOfferPriceSpecification = ScreeningEventFactory.ITi
 export declare type IAcceptedOffer4chevre = Pick<ScreeningEventFactory.ITicketOffer, 'id' | 'identifier' | 'typeOf' | 'priceCurrency' | 'itemOffered' | 'addOn' | 'additionalProperty'> & Pick<ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail, 'id' | 'addOn' | 'additionalProperty' | 'paymentMethod'> & {
     itemOffered?: ReserveTransactionFactory.IAcceptedTicketOfferItemOffered;
     priceSpecification: IAcceptedOfferPriceSpecification;
-    movieTicketIdentifire?: string;
 };
 export declare type IAcceptedOfferWithoutDetail4chevre = ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail;
 export declare type IObjectWithoutDetail4chevre = ReserveTransactionFactory.IObjectWithoutDetail;

package/lib/event/screeningEvent.d.ts

@@ -8,6 +8,10 @@ import { OfferType } from '../offerType';
 import { OrganizationType } from '../organizationType';
 import { PlaceType } from '../placeType';
 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 IUnitPriceSpecification } from '../priceSpecification/unitPriceSpecification';
 import { IServiceType as IProductServiceType } from '../product';
 import { IProject } from '../project';
 import { IQuantitativeValue } from '../quantitativeValue';
@@ -145,12 +149,16 @@ export interface IOffer {
     seller: ISeller;
 }
 export declare type IOffer4COA = Pick<IOffer, 'project' | 'typeOf' | 'offeredThrough' | 'priceCurrency'>;
-export import ITicketPriceComponent = UnitPriceOfferFactory.ITicketPriceComponent;
-export import ITicketPriceSpecification = UnitPriceOfferFactory.ITicketPriceSpecification;
+export declare type ITicketUnitPriceComponent = Omit<IUnitPriceSpecification, 'project'>;
+export declare type ITicketPriceComponent = Omit<ICategoryCodeChargeSpecification, 'project'> | Omit<IMovieTicketTypeChargeSpecification, 'project'> | ITicketUnitPriceComponent;
 /**
- * チケットオファー
+ * 興行オファーの価格仕様
  */
-export interface ITicketOffer extends OfferFactory.IOffer {
+export declare type ITicketPriceSpecification = Omit<ICompoundPriceSpecification<ITicketPriceComponent>, 'project'>;
+/**
+ * 興行オファー
+ */
+export interface ITicketOffer extends Omit<OfferFactory.IOffer, 'priceSpecification'> {
     identifier: string;
     priceSpecification: ITicketPriceSpecification;
     itemOffered?: UnitPriceOfferFactory.IItemOffered;

package/lib/index.d.ts

@@ -347,7 +347,6 @@ export declare namespace priceSpecification {
 }
 export declare namespace compoundPriceSpecification {
     type IPriceSpecification<T extends PriceSpecificationType> = CompoundPriceSpecificationFactory.IPriceSpecification<priceSpecification.IPriceSpecification<T>>;
-    type ISearchConditions<T extends PriceSpecificationType> = CompoundPriceSpecificationFactory.ISearchConditions<T>;
 }
 export import priceSpecificationType = PriceSpecificationType;
 export import programMembership = ProgramMembershipFactory;

package/lib/invoice.d.ts

@@ -5,7 +5,7 @@ import * as PersonFactory from './person';
 import { IAccounting } from './priceSpecification';
 import { IPriceSpecification as ICategoryCodeChargeSpecification } from './priceSpecification/categoryCodeChargeSpecification';
 import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from './priceSpecification/movieTicketTypeChargeSpecification';
-import { IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
+import { IAppliesToAddOn as IUnitPriceSpecAppliesToAddOn, IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { IPriceSpecification } from './reservation/event';
 import * as SellerFactory from './seller';
 import { PaymentServiceType } from './service/paymentService';
@@ -15,8 +15,10 @@ export interface IReferenceOrder extends OrderFactory.IOrder {
     acceptedOffers: OrderFactory.IAcceptedOffer<OrderFactory.IItemOffered>[];
 }
 export declare type IReservationPriceAccounting = Pick<IAccounting, 'accountsReceivable'>;
-export declare type IPriceComponentSpecification = Pick<ICategoryCodeChargeSpecification, 'typeOf' | 'price'> | Pick<IMovieTicketTypeChargeSpecification, 'typeOf' | 'price'> | Pick<IUnitPriceSpecification, 'typeOf' | 'price' | 'referenceQuantity' | 'appliesToAddOn'> & {
+export declare type IAppliesToAddOn = Pick<IUnitPriceSpecAppliesToAddOn, 'typeOf'>;
+export declare type IPriceComponentSpecification = Pick<ICategoryCodeChargeSpecification, 'typeOf' | 'price'> | Pick<IMovieTicketTypeChargeSpecification, 'typeOf' | 'price'> | Pick<IUnitPriceSpecification, 'typeOf' | 'price' | 'referenceQuantity'> & {
     accounting?: IReservationPriceAccounting;
+    appliesToAddOn?: IAppliesToAddOn[];
 };
 export declare type IReservationPriceSpecification = Pick<IPriceSpecification, 'typeOf'> & {
     priceComponent: IPriceComponentSpecification[];

package/lib/order.d.ts

@@ -130,7 +130,7 @@ export interface IMoneyTransfer {
  * 注文アイテム
  */
 export declare type IItemOffered = IMoneyTransfer | IReservation | IPermit;
-export declare type IOfferOptimized4acceptedOffer = Pick<IOffer, 'project' | 'typeOf' | 'id' | 'itemOffered' | 'offeredThrough' | 'priceCurrency' | 'priceSpecification'>;
+export declare type IOfferOptimized4acceptedOffer = Pick<IOffer, 'project' | 'typeOf' | 'id' | 'itemOffered' | 'offeredThrough' | 'priceCurrency'>;
 /**
  * 受け入れオファー
  */

package/lib/place/seat.d.ts

@@ -16,7 +16,7 @@ export declare type IPriceSpecification = ICompoundPriceSpecification<IPriceComp
 /**
  * 座席オファーインターフェース
  */
-export interface IOffer extends OfferFactory.IOffer {
+export interface IOffer extends Omit<OfferFactory.IOffer, 'priceSpecification'> {
     availability: ItemAvailability;
     priceSpecification?: IPriceSpecification;
 }

package/lib/priceSpecification/compoundPriceSpecification.d.ts

@@ -1,22 +1,12 @@
-import { IPriceSpecification as BaseSpecification, ISearchConditions as IBaseSearchConditions } from '../priceSpecification';
+import { IPriceSpecification as BaseSpecification } from '../priceSpecification';
 import { PriceSpecificationType } from '../priceSpecificationType';
+export declare type IPriceComponent = Omit<BaseSpecification<PriceSpecificationType>, 'project'>;
 /**
- * 複合価格仕様インターフェース
+ * 複合価格仕様
  */
-export declare type IPriceSpecification<T extends BaseSpecification<PriceSpecificationType>> = BaseSpecification<PriceSpecificationType.CompoundPriceSpecification> & {
+export declare type IPriceSpecification<T extends IPriceComponent> = Pick<BaseSpecification<PriceSpecificationType.CompoundPriceSpecification>, 'typeOf' | 'priceCurrency' | 'valueAddedTaxIncluded'> & {
     /**
      * 価格要素
      */
     priceComponent: T[];
 };
-/**
- * 検索条件インターフェース
- */
-export interface ISearchConditions<T extends PriceSpecificationType> extends IBaseSearchConditions<PriceSpecificationType.CompoundPriceSpecification> {
-    /**
-     * 価格仕様要素
-     */
-    priceComponent?: {
-        typeOf: T;
-    };
-}

package/lib/priceSpecification/unitPriceSpecification.d.ts

@@ -12,7 +12,7 @@ export declare type IAppliesToMovieTicket = Pick<IMovieTicketTypeChargeSpecAppli
     identifier?: string;
 };
 export declare type IReferenceQuantity = Pick<IQuantitativeValue<UnitCode>, 'typeOf' | 'value' | 'unitCode'>;
-export declare type IAppliesToAddOnItemOffered = Pick<IProduct, 'id' | 'name' | 'productID' | 'project' | 'typeOf'>;
+export declare type IAppliesToAddOnItemOffered = Pick<IProduct, 'id' | 'name' | 'productID' | 'typeOf'>;
 export interface IAppliesToAddOn {
     typeOf: OfferType.Offer;
     id?: string;

package/lib/reservation/event.d.ts

@@ -2,14 +2,11 @@ import { ICOAInfo, ILocation as IEventLocation, IName as IEventName, ISuperEvent
 import { EventStatusType } from '../eventStatusType';
 import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';
-import { IPriceSpecification as ICategoryCodeChargeSpecification } from '../priceSpecification/categoryCodeChargeSpecification';
-import { IPriceSpecification as ICompoundPriceSpecification } from '../priceSpecification/compoundPriceSpecification';
-import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from '../priceSpecification/movieTicketTypeChargeSpecification';
-import { IPriceSpecification as IUnitPriceSpecification } from '../priceSpecification/unitPriceSpecification';
 import { IProject } from '../project';
 import * as ReservationFactory from '../reservation';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
+import { ITicketPriceComponent, ITicketPriceSpecification } from '../unitPriceOffer';
 export declare type IOptimizedWorkPerformed = Omit<IWorkPerformed, 'name'> & {
     name?: string | IMultilingualString;
 };
@@ -37,8 +34,8 @@ export interface IReservationFor {
     typeOf: EventType.ScreeningEvent;
     doorTime?: Date;
 }
-export declare type IPriceComponentSpecification = ICategoryCodeChargeSpecification | IMovieTicketTypeChargeSpecification | IUnitPriceSpecification;
-export declare type IPriceSpecification = ICompoundPriceSpecification<IPriceComponentSpecification>;
+export declare type IPriceComponentSpecification = ITicketPriceComponent;
+export declare type IPriceSpecification = ITicketPriceSpecification;
 export interface ISubReservation {
     reservedTicket: {
         typeOf: ReservationFactory.TicketType;

package/lib/reservation/reservationPackage.d.ts

@@ -2,7 +2,7 @@ import { IPriceSpecification as IGenericPriceSpecification } from '../priceSpeci
 import { PriceSpecificationType } from '../priceSpecificationType';
 import * as ReservationFactory from '../reservation';
 import { ReservationType } from '../reservationType';
-export declare type IPriceSpecification = IGenericPriceSpecification<PriceSpecificationType>;
+export declare type IPriceSpecification = Omit<IGenericPriceSpecification<PriceSpecificationType>, 'project'>;
 export declare type ISubReservation = ReservationFactory.IReservation<IPriceSpecification>;
 /**
  * 予約パッケージインターフェース

package/lib/reservation.d.ts

@@ -180,7 +180,7 @@ export interface IIssuedThrough {
  * For offers of tickets, restaurant reservations, flights, or rental cars, use Offer.
  * {@link https://schema.org/Reservation}
  */
-export interface IReservation<T extends IPriceSpecification> extends Pick<IThing, 'identifier' | 'name'> {
+export interface IReservation<T extends Omit<IPriceSpecification, 'project'>> extends Pick<IThing, 'identifier' | 'name'> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     /**
      * type of object

package/lib/unitPriceOffer.d.ts

@@ -205,11 +205,14 @@ export interface ISearchConditions {
         };
     };
 }
+export declare type ICategoryChargePriceComponent = Omit<ICategoryCodeChargeSpecification, 'project'>;
+export declare type IMovieTicketTypeChargePriceComponent = Omit<IMovieTicketTypeChargeSpecification, 'project'>;
+export declare type IUnitPriceComponent = Pick<IUnitPriceOfferPriceSpecification, 'accounting' | 'appliesToMovieTicket' | 'appliesToAddOn' | 'name' | 'price' | 'priceCurrency' | 'referenceQuantity' | 'typeOf' | 'valueAddedTaxIncluded'>;
 /**
  * 承認時に提供される価格仕様要素
  */
-export declare type ITicketPriceComponent = ICategoryCodeChargeSpecification | IMovieTicketTypeChargeSpecification | IUnitPriceOfferPriceSpecification;
+export declare type ITicketPriceComponent = ICategoryChargePriceComponent | IMovieTicketTypeChargePriceComponent | IUnitPriceComponent;
 /**
  * 承認時に提供される価格仕様
  */
-export declare type ITicketPriceSpecification = ICompoundPriceSpecification<ITicketPriceComponent>;
+export declare type ITicketPriceSpecification = Omit<ICompoundPriceSpecification<ITicketPriceComponent>, 'project'>;

package/package.json

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