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

package/lib/assetTransaction/reserve.d.ts

@@ -9,7 +9,7 @@ import { PermitType } from '../permit';
 import { ProductType } from '../product';
 import { IPropertyValue } from '../propertyValue';
 import * as ReservationFactory from '../reservation';
-import { IIssuedThrough as IEventReservationIssuedThrough, IReservation as IEventReservation, IReservationFor as IEventReservationReservationFor, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
+import { IIssuedThrough as IEventReservationIssuedThrough, IPrice as IReservationPrice, IReservation as IEventReservation, IReservationFor as IEventReservationReservationFor, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
@@ -298,7 +298,9 @@ export interface IObjectWithoutDetail {
     };
 }
 export type IReservationFor = IEventReservationReservationFor;
-export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'price' | 'priceCurrency' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'>;
+export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'priceCurrency' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'> & {
+    price?: IReservationPrice;
+};
 export type IObjectSubReservation = IEventReservationAsSubReservation;
 export type IIssuedThrough = IEventReservationIssuedThrough;
 export interface IObject extends Pick<IReservationPackage, 'broker' | 'provider' | 'reservationStatus' | 'underName' | 'typeOf'> {

package/lib/invoice.d.ts

@@ -6,7 +6,6 @@ import { IAccounting } from './priceSpecification';
 import { IPriceSpecification as ICategoryCodeChargeSpecification } from './priceSpecification/categoryCodeChargeSpecification';
 import { IAppliesToMovieTicket, IPriceSpecification as IMovieTicketTypeChargeSpecification } from './priceSpecification/movieTicketTypeChargeSpecification';
 import { IAppliesToAddOn as IUnitPriceSpecAppliesToAddOn, IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
-import { IPriceSpecification } from './reservation/event';
 import { ISeller } from './seller';
 import { PaymentServiceType } from './service/paymentService';
 export type IBroker = Pick<ISeller, 'id' | 'typeOf'> | IPerson;
@@ -22,7 +21,7 @@ export type IMinimizedUnitPriceSpecification = Pick<IUnitPriceSpecification, 'ty
     appliesToAddOn?: IAppliesToAddOn[];
 };
 export type IPriceComponentSpecification = IMinimizedCategoryCodeChargeSpecification | IMinimizedMovieTicketTypeChargeSpecification | IMinimizedUnitPriceSpecification;
-export type IReservationPriceSpecification = Pick<IPriceSpecification, 'typeOf'> & {
+export type IReservationPriceSpecification = Pick<OrderFactory.ITicketPriceSpecification, 'typeOf'> & {
     priceComponent: IPriceComponentSpecification[];
 };
 export interface IReservation {

package/lib/ownershipInfo.d.ts

@@ -1,4 +1,3 @@
-import { CreativeWorkType } from './creativeWorkType';
 import { IInvoice } from './invoice';
 import { OrganizationType } from './organizationType';
 import * as PermitFactory from './permit';
@@ -7,9 +6,7 @@ import * as ProductFactory from './product';
 import { IProject } from './project';
 import { ReservationType } from './reservationType';
 import { PaymentServiceType } from './service/paymentService';
-import * as WebAPIFactory from './service/webAPI';
 import { SortType } from './sortType';
-export type IBookingService = Pick<WebAPIFactory.IService<WebAPIFactory.Identifier>, 'identifier' | 'typeOf'>;
 export interface IEventReservationAsGood {
     typeOf: ReservationType.EventReservation;
     /**
@@ -22,11 +19,7 @@ export interface IEventReservationAsGood {
     /**
      * 予約番号
      */
-    reservationNumber?: string;
-    /**
-     * ブッキングサービス(API)
-     */
-    bookingService?: IBookingService;
+    reservationNumber: string;
 }
 /**
  * 予約
@@ -36,9 +29,11 @@ export type IPermitIssuedThroughAsFaceToFace = Pick<PermitFactory.IIssuedThrough
 export type IPermitIssuedThroughAsCreditCard = Pick<PermitFactory.IIssuedThroughAsCreditCard, 'id' | 'typeOf'>;
 export type IPermitIssuedThroughAsProduct = Pick<PermitFactory.IIssuedThroughAsProduct, 'id' | 'typeOf' | 'serviceType'>;
 export type IPermitIssuedThrough = IPermitIssuedThroughAsFaceToFace | IPermitIssuedThroughAsCreditCard | IPermitIssuedThroughAsProduct;
-export type IPermitAsGood = Pick<PermitFactory.IPermit, 'identifier' | 'typeOf' | 'name' | 'validFor'> & {
+export type IPermitAsGood = Pick<PermitFactory.IPermit, 'typeOf'> & {
     identifier: string;
     issuedThrough?: IPermitIssuedThrough;
+    name?: never;
+    validFor?: never;
 };
 /**
  * 所有対象としての請求
@@ -75,23 +70,15 @@ export interface IFaceToFacePaymentMethodAsGood {
  * 所有対象物 (Product or Service)
  */
 export type IGood = IReservation | IPermitAsGood | InvoiceAsGood | IPaymentMethodAsGood | IFaceToFacePaymentMethodAsGood;
-export interface IOwnerAsOrganization {
-    typeOf: OrganizationType.Organization;
-    id: string;
-}
 export interface IOwnerAsPerson {
     typeOf: PersonType;
     id: string;
 }
-export interface IOwnerAsWebApplication {
-    typeOf: CreativeWorkType.WebApplication;
-    id: string;
-}
 /**
  * 所有者
  * 個人情報排除するように
  */
-export type IOwner = IOwnerAsOrganization | IOwnerAsPerson | IOwnerAsWebApplication;
+export type IOwner = IOwnerAsPerson;
 export interface IAcquiredFrom {
     id: string;
     typeOf: OrganizationType.Corporation;
@@ -116,10 +103,10 @@ export interface IOwnershipInfo<T extends IGood> {
      */
     identifier?: string;
     /**
-     * owned by whom
+     * A person or organization who owns this Thing.
      * Array対応(2022-07-25~)
      */
-    ownedBy: IOwner | IOwner[];
+    ownedBy: IOwner[];
     /**
      * The organization or person from which the product was acquired.
      */

package/lib/reservation/event.d.ts

@@ -39,7 +39,8 @@ export type ICategoryChargePriceComponent = Pick<ICategoryCodeChargeSpecificatio
 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 IPriceSpecification = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
+export type IPrice = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
+export type IPriceSpecification = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'> | never;
 export interface ISubReservation {
     reservedTicket: {
         typeOf: ReservationFactory.TicketType;

package/lib/reservation.d.ts

@@ -206,7 +206,7 @@ export interface IIssuedThrough {
      * プロダクト管理をしている場合のみ
      */
     id?: string;
-    availableChannel: IServiceChannel;
+    availableChannel?: IServiceChannel;
 }
 export type IAvailableReservationStatusType = ReservationStatusType.ReservationCancelled | ReservationStatusType.ReservationConfirmed | ReservationStatusType.ReservationPending;
 export interface IProvider {

package/package.json

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