@chevre/factory 6.1.0 → 6.2.0-alpha.1

package/lib/assetTransaction/reserve.d.ts

@@ -105,7 +105,7 @@ export interface IEventReservatonAsItemOfferedServiceOutput {
          * /^[0-9a-zA-Z]{8,16}$/
          */
         identifier?: string;
-        issuedBy?: ReservationFactory.IUnderName;
+        issuedBy?: Pick<ReservationFactory.ITicketIssuedBy, 'name' | 'typeOf'>;
         typeOf: ReservationFactory.TicketType;
         /**
          * 座席指定
@@ -310,7 +310,17 @@ export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additio
 };
 export type IObjectSubReservation = IEventReservationAsSubReservation;
 export type IIssuedThrough = IEventReservationIssuedThrough;
-export interface IObject extends Pick<IReservationPackage, 'broker' | 'provider' | 'reservationStatus' | 'underName' | 'typeOf'> {
+/**
+ * 予約取引に保管される予約者情報
+ */
+export type IUnderName = Pick<ReservationFactory.IUnderName, 'email' | 'givenName' | 'familyName' | 'id' | 'identifier' | 'name' | 'telephone' | 'typeOf'> & {
+    address?: string;
+    age?: string;
+    gender?: string;
+    url?: string;
+};
+export interface IObject extends Pick<IReservationPackage, 'broker' | 'provider' | 'reservationStatus' | 'typeOf'> {
+    underName?: IUnderName;
     acceptedOffer?: IAcceptedOffer4object[];
     issuedThrough?: IIssuedThrough;
     reservationFor?: IReservationFor;

package/lib/reservation.d.ts

@@ -1,5 +1,4 @@
 import { CreativeWorkType } from './creativeWorkType';
-import { IMultilingualString } from './multilingualString';
 import { OrganizationType } from './organizationType';
 import { PersonType } from './personType';
 import * as SeatFactory from './place/seat';
@@ -23,22 +22,22 @@ export type IUnderNameType = CreativeWorkType.WebApplication | PersonType.Person
  */
 export interface IUnderName {
     typeOf: IUnderNameType;
+    id?: string;
     name: string;
-    additionalName?: string;
-    address?: string;
-    age?: string;
-    description?: string | IMultilingualString;
-    email?: string;
     familyName?: string;
-    gender?: string;
     givenName?: string;
-    id?: string;
+    email?: string;
+    telephone?: string;
     /**
      * システム利用識別子のみ継承
      */
     identifier?: IPropertyValue<string>[];
-    telephone?: string;
-    url?: string;
+    additionalName?: never;
+    address?: never;
+    age?: never;
+    description?: never;
+    gender?: never;
+    url?: never;
 }
 /**
  * seat interface

package/lib/service/paymentService.d.ts

@@ -1,13 +1,12 @@
 import { IInvoice } from '../invoice';
 import { IMultilingualString } from '../multilingualString';
+import { OrganizationType } from '../organizationType';
 import { IPermit } from '../permit';
 import { IPotentialInformAction as IPotentialInformActionTemplate } from '../potentialAction';
 import { IAvailableChannel as IProductAvailableChannel, IServiceType } from '../product';
 import { IProject } from '../project';
 import { IPropertyValue } from '../propertyValue';
-import { ISeller } from '../seller';
 import { SortType } from '../sortType';
-import { IThing } from '../thing';
 export declare enum PaymentServiceType {
     CreditCard = "CreditCard",
     FaceToFace = "FaceToFace",
@@ -25,7 +24,7 @@ export interface IPaymentUrlSettings {
     use3DS?: boolean;
 }
 export type ICallbackType3ds = 'GET' | 'POST';
-export interface IProviderCredentials {
+export interface IProviderCredentialsCreditCard {
     /**
      * ショップID
      */
@@ -46,7 +45,14 @@ export interface IProviderCredentials {
      * 3Dセキュアコールバック方法
      */
     callbackType3ds?: ICallbackType3ds;
+    /**
+     * 外部決済URL設定
+     */
     paymentUrl?: IPaymentUrlSettings;
+    kgygishCd?: never;
+    stCd?: never;
+}
+export interface IProviderCredentialsMovieTicket {
     /**
      * 決済カード興行会社コード
      */
@@ -55,8 +61,19 @@ export interface IProviderCredentials {
      * 決済カードサイトコード
      */
     stCd?: string;
+    shopId?: never;
+    shopPass?: never;
+    tokenizationCode?: never;
+    returnUrls3ds?: never;
+    callbackType3ds?: never;
+    paymentUrl?: never;
 }
-export interface IProvider extends Pick<ISeller, 'typeOf'> {
+export type IProviderCredentials = IProviderCredentialsCreditCard | IProviderCredentialsMovieTicket;
+/**
+ * 決済方法提供者
+ */
+export interface IProvider {
+    typeOf: OrganizationType.Corporation;
     /**
      * 販売者ID
      */
@@ -66,16 +83,26 @@ export interface IProvider extends Pick<ISeller, 'typeOf'> {
      */
     credentials?: IProviderCredentials;
 }
-export type IAvailableChannel = Pick<IProductAvailableChannel, 'typeOf'> & {
+export interface IAvailableChannelCreditCard {
+    typeOf: IProductAvailableChannel['typeOf'];
     /**
      * add paymentServiceChannel ID(2025-02-21~)
      */
-    id?: string;
+    id: string;
+    credentials?: never;
+    totalPaymentDue?: never;
+}
+export interface IAvailableChannelMovieTicket {
+    typeOf: IProductAvailableChannel['typeOf'];
+    /**
+     * add paymentServiceChannel ID(2025-02-21~)
+     */
+    id: string;
     credentials?: never;
     totalPaymentDue?: {
         maxValue?: number;
     };
-};
+}
 /**
  * CreditCardIF決済サービスのカード属性
  * ポイントカード情報など
@@ -112,15 +139,9 @@ export type IPermitAsServiceOutput = Pick<IPermit, 'typeOf'> & {
 export type IServiceOutput = (IInvoiceAsServiceOutput | IPermitAsServiceOutput)[];
 export type IPotentialInformAction = Pick<IPotentialInformActionTemplate, 'id' | 'typeOf'>;
 export type IPotentialAction = IPotentialInformAction;
-/**
- * 決済サービス
- * {@link https://schema.org/Service}
- */
-export interface IService extends Pick<IThing, 'name' | 'description'> {
+export interface ICommonAttributes {
     project: Pick<IProject, 'id' | 'typeOf'>;
-    typeOf: PaymentServiceType;
     id?: string;
-    availableChannel?: IAvailableChannel;
     description?: Pick<IMultilingualString, 'en' | 'ja'>;
     name?: Pick<IMultilingualString, 'en' | 'ja'>;
     /**
@@ -139,8 +160,22 @@ export interface IService extends Pick<IThing, 'name' | 'description'> {
      */
     serviceType: IServiceType;
     additionalProperty?: IPropertyValue<string>[];
-    potentialAction?: IPotentialAction[];
 }
+export type ICreditCardPaymentMethod = ICommonAttributes & {
+    typeOf: PaymentServiceType.CreditCard;
+    availableChannel?: IAvailableChannelCreditCard;
+    potentialAction?: IPotentialAction[];
+};
+export type IMovieTicketPaymentMethod = ICommonAttributes & {
+    typeOf: PaymentServiceType.MovieTicket;
+    availableChannel?: IAvailableChannelMovieTicket;
+    potentialAction?: IPotentialAction[];
+};
+/**
+ * 決済サービス
+ * {@link https://schema.org/PaymentService}
+ */
+export type IService = ICreditCardPaymentMethod | IMovieTicketPaymentMethod;
 export interface ISortOrder {
     productID?: SortType;
 }

package/package.json

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