@chevre/factory 4.215.0 → 4.218.0

package/lib/factory/action/trade/pay.d.ts

@@ -7,14 +7,18 @@ import { AssetTransactionType } from '../../assetTransactionType';
 import { IPaymentServiceOutput } from '../../invoice';
 import { IMonetaryAmount } from '../../monetaryAmount';
 import { OrderType } from '../../order';
+import { OrganizationType } from '../../organizationType';
 import { IMovieTicket } from '../../paymentMethod/paymentCard/movieTicket';
 import { IPropertyValue } from '../../propertyValue';
 import { ISeller } from '../../seller';
 import { PaymentServiceType } from '../../service/paymentService';
 import { TransactionType } from '../../transactionType';
 import { IAttributes as IInformActionAttributes } from '../interact/inform';
-export declare type IAgent = ActionFactory.IParticipant;
-export declare type IRecipient = ISeller;
+export interface IAgent {
+    id: string;
+    typeOf: OrganizationType.Project;
+}
+export declare type IRecipient = Omit<ISeller, 'branchCode' | 'paymentAccepted'>;
 export interface IOrderAsPayPurpose {
     typeOf: OrderType.Order;
     confirmationNumber?: string;
@@ -116,12 +120,13 @@ export interface IResult {
     seatInfoSyncResult?: any;
 }
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.PayAction, IObject, IResult> {
+    agent: IAgent;
     instrument?: IInstrument;
     potentialActions?: IPotentialActions;
     purpose: IPurpose;
-    recipient?: IRecipient;
+    recipient: IRecipient;
 }
 /**
- * 決済アクションインターフェース
+ * 決済アクション
  */
 export declare type IAction = ActionFactory.IAction<IAttributes>;

package/lib/factory/action/trade/refund.d.ts

@@ -1,7 +1,15 @@
 import * as ActionFactory from '../../action';
 import { ActionType } from '../../actionType';
+import { ISeller } from '../../seller';
 import { IAttributes as IInformActionAttributes } from '../interact/inform';
 import { IPaymentService as IPaymentServiceOnPay, IPayPurpose } from './pay';
+/**
+ * agentはSeller
+ */
+export interface IAgentAsSeller extends Omit<ISeller, 'branchCode' | 'paymentAccepted'> {
+    name: string;
+}
+export declare type IAgent = IAgentAsSeller | ActionFactory.IParticipant;
 export declare type IRecipient = ActionFactory.IParticipant;
 export declare type IPaymentService = IPaymentServiceOnPay & {
     refundFee?: number;
@@ -14,6 +22,7 @@ export interface IPotentialActions {
 }
 export declare type IPurpose = IPayPurpose;
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.RefundAction, IObject, IResult> {
+    agent: IAgent;
     recipient?: IRecipient;
     purpose: IPurpose;
     potentialActions?: IPotentialActions;

package/lib/factory/action/transfer/return/order.d.ts

@@ -1,16 +1,12 @@
 import * as ActionFactory from '../../../action';
 import * as OrderFactory from '../../../order';
-import { OrganizationType } from '../../../organizationType';
 import { IAttributes as IRefundActionAttributes } from '../../transfer/return/paymentMethod';
 import { IAttributes as ICancelActionAttributes } from '../../transfer/return/reservation';
 import * as ReturnActionFactory from '../return';
 import { IAttributes as ISendEmailMessageActionAttributes } from '../send/message/email';
 import * as ReturnMoneyTransferActionFactory from './moneyTransfer';
 import * as ReturnPointAwardActionFactory from './pointAward';
-export interface IAgent {
-    id: string;
-    typeOf: OrganizationType.Project;
-}
+export declare type IAgent = ActionFactory.IParticipant;
 export declare type IRecipient = ActionFactory.IParticipant;
 /**
  * 返却対象は注文

package/lib/factory/action.d.ts

@@ -2,16 +2,21 @@ import { ActionStatusType } from './actionStatusType';
 import { ActionType } from './actionType';
 import { IExtendId } from './autoGenerated';
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
+import { ICustomer } from './customer';
+import { IMultilingualString } from './multilingualString';
 import { IPerson } from './person';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
 import { ISeller } from './seller';
 import { SortType } from './sortType';
+export declare type ICustomerParticipant = ICustomer & {
+    name?: string | IMultilingualString;
+};
 /**
  * アクションへの関係者インターフェース
  * 継承先にて、インターフェースが強化される可能性あり
  */
-export declare type IParticipant = IWebApplication | IPerson | ISeller | IProject;
+export declare type IParticipant = IWebApplication | IPerson | ISeller | IProject | ICustomerParticipant;
 /**
  * アクション目的インターフェース
  */

package/lib/factory/assetTransaction/moneyTransfer.d.ts

@@ -1,16 +1,16 @@
-import { IAttributes as IMoneyTransferActionAttributes, ILocation, IPendingTransaction, IRecipient as IMoneyTransferRecipient } from '../action/transfer/moneyTransfer';
+import { IAgent as IMoneyTransferAgent, IAttributes as IMoneyTransferActionAttributes, ILocation, IPendingTransaction, IRecipient as IMoneyTransferRecipient } from '../action/transfer/moneyTransfer';
 import * as TransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { IMonetaryAmount } from '../monetaryAmount';
 import { OrderType } from '../order';
 import { PermitType } from '../permit';
-export declare type IAgent = any;
+export declare type IAgent = IMoneyTransferAgent;
 export declare type IRecipient = IMoneyTransferRecipient;
 export declare type IFromLocation = ILocation;
 export declare type IToLocation = ILocation;
 /**
- * ペイメントカードインターフェース
+ * ペイメントカード
  */
 export interface IPaymentCard {
     typeOf: PermitType;
@@ -29,7 +29,7 @@ export interface IPaymentCard {
  */
 export declare type ITokenizedPaymentCard = string;
 /**
- * 転送元としての注文インターフェース
+ * 転送元としての注文
  */
 export interface IOrderAsFromLocation {
     typeOf: OrderType;
@@ -39,7 +39,7 @@ export interface IOrderAsFromLocation {
 export declare type IFromLocationBeforeStart = IOrderAsFromLocation | IPaymentCard | ITokenizedPaymentCard;
 export declare type IToLocationBeforeStart = IOrderAsFromLocation | IPaymentCard;
 /**
- * 取引対象物インターフェース
+ * 取引対象物
  */
 export interface IObject {
     /**
@@ -105,12 +105,12 @@ export interface IPotentialActions {
      */
     moneyTransfer: IMoneyTransferActionAttributes[];
 }
-export declare type ITransaction = IExtendId<IAttributes>;
-/**
- * 転送取引インターフェース
- */
 export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
 }
+/**
+ * 転送取引
+ */
+export declare type ITransaction = IExtendId<IAttributes>;
 export interface ISearchConditions extends TransactionFactory.ISearchConditions<AssetTransactionType.MoneyTransfer> {
     object?: {
         fromLocation?: {

package/lib/factory/assetTransaction/pay.d.ts

@@ -1,5 +1,6 @@
 import * as GMO from '@motionpicture/gmo-service';
-import { IAgent as IPayAgent, IAttributes as IPayActionAttributes, IOrderAsPayPurpose, IPayPurpose, IPendingTransaction, IRecipient as IPayRecipient } from '../action/trade/pay';
+import { IParticipant } from '../action';
+import { IAttributes as IPayActionAttributes, IOrderAsPayPurpose, IPayPurpose, IPendingTransaction, IRecipient as IPayRecipient } from '../action/trade/pay';
 import * as TransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
@@ -9,13 +10,15 @@ import { IMovieTicket } from '../paymentMethod/paymentCard/movieTicket';
 import { IOnPaymentStatusChanged } from '../project';
 import { IPropertyValue } from '../propertyValue';
 import { PaymentServiceType } from '../service/paymentService';
-export declare type IAgent = IPayAgent;
+export declare type IAgent = IParticipant;
 export declare type IRecipient = IPayRecipient;
 export declare type IObjectWithoutDetail = IObject;
 export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObject> & {
+    recipient: IRecipient;
     purpose?: IPayPurpose;
 };
 export interface IStartParams extends TransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObject> {
+    recipient: IRecipient;
 }
 export interface IPotentialActionsParams {
     pay: {

package/lib/factory/assetTransaction/refund.d.ts

@@ -4,8 +4,9 @@ import * as TransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { IOnPaymentStatusChanged } from '../project';
+import { ISeller } from '../seller';
 import { PaymentServiceType } from '../service/paymentService';
-export declare type IAgent = any;
+export declare type IAgent = ISeller;
 export declare type IRecipient = IRefundRecipient;
 export interface IObjectWithoutDetail {
     typeOf: PaymentServiceType;
@@ -25,7 +26,7 @@ export interface IPotentialActionsParams {
     };
 }
 /**
- * 確定パラメーターインターフェース
+ * 確定パラメーター
  */
 export interface IConfirmParams {
     id?: string;
@@ -37,7 +38,7 @@ export declare type IResult = any;
 export declare type IError = any;
 export declare type IAnyPaymentMethod = AvailablePaymentMethodType;
 /**
- * 取引対象物インターフェース
+ * 取引対象物
  */
 export interface IObject {
     typeOf: PaymentServiceType;
@@ -57,7 +58,7 @@ export interface IPotentialActions {
 }
 export declare type ITransaction = IExtendId<IAttributes>;
 /**
- * 返金取引インターフェース
+ * 返金取引
  */
 export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
 }

package/lib/factory/creativeWork/softwareApplication/webApplication.d.ts

@@ -1,10 +1,9 @@
 import * as CreativeWorkFactory from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
-export interface IAttributes {
+/**
+ * ウェブアプリケーション
+ */
+export interface ICreativeWork extends CreativeWorkFactory.ICreativeWork {
     typeOf: CreativeWorkType.WebApplication;
     id: string;
 }
-/**
- * ウェブアプリケーションインターフェース
- */
-export declare type ICreativeWork = IAttributes & CreativeWorkFactory.ICreativeWork;

package/lib/factory/order.d.ts

@@ -21,7 +21,6 @@ import { IPropertyValue } from './propertyValue';
 import { IProgramMembershipUsedSearchConditions } from './reservation';
 import * as EventReservationFactory from './reservation/event';
 import { ReservationType } from './reservationType';
-import { ISeller as ISellerOrganization } from './seller';
 import { IServiceType } from './serviceType';
 import { SortType } from './sortType';
 import { IThing } from './thing';
@@ -129,13 +128,29 @@ export interface IAcceptedOffer<T extends IItemOffered> extends IOfferOptimized4
     /**
      * 販売者
      */
-    seller: ISeller;
+    seller: {
+        project: {
+            id: string;
+            typeOf: OrganizationType.Project;
+        };
+        typeOf: OrganizationType.Corporation;
+        name?: string | IMultilingualString;
+    };
     priceSpecification?: ITicketPriceSpecification;
 }
 /**
  * 販売者
  */
-export declare type ISeller = ISellerOrganization;
+export interface ISeller {
+    project: {
+        id: string;
+        typeOf: OrganizationType.Project;
+    };
+    id: string;
+    typeOf: OrganizationType.Corporation;
+    name?: string | IMultilingualString;
+    url?: string;
+}
 /**
  * ウェブアプリケーションとしてのカスタマー
  */

package/lib/factory/ownershipInfo.d.ts

@@ -1,15 +1,18 @@
-import { ICustomer } from './order';
+import { CreativeWorkType } from './creativeWorkType';
+import { OrganizationType } from './organizationType';
 import * as PermitFactory from './permit';
+import { IMemberOf } from './person';
+import { PersonType } from './personType';
 import * as ProductFactory from './product';
 import { IProject } from './project';
+import { IPropertyValue } from './propertyValue';
 import { IReservation as IEventReservation } from './reservation/event';
 import { ReservationType } from './reservationType';
-import { ISeller } from './seller';
 import * as WebAPIFactory from './service/webAPI';
 import { SortType } from './sortType';
 export declare type IBookingService = WebAPIFactory.IService<WebAPIFactory.Identifier>;
 /**
- * 予約インターフェース
+ * 予約
  */
 export interface IReservation {
     typeOf: ReservationType.EventReservation;
@@ -32,21 +35,49 @@ export interface IReservation {
 export declare type IReservationWithDetail = IReservation & IEventReservation;
 export declare type IPermit = PermitFactory.IPermit;
 /**
- * 所有対象物インターフェース (Product or Service)
+ * 所有対象物 (Product or Service)
  */
 export declare type IGood = IReservation | IPermit;
 /**
- * 所有対象物インターフェース(対象物詳細有)
+ * 所有対象物(対象物詳細有)
  */
 export declare type IGoodWithDetail = IReservationWithDetail | IPermit;
 /**
- * 所有者インターフェース
+ * 所有者
  */
-export declare type IOwner = Omit<ICustomer, 'name'>;
-export declare type IAcquiredFrom = ISeller;
+export interface IOwnerAsOrganization {
+    typeOf: OrganizationType.Organization;
+    id: string;
+    project: {
+        id: string;
+        typeOf: OrganizationType.Project;
+    };
+    identifier?: IPropertyValue<string>[];
+}
+export interface IOwnerAsPerson {
+    typeOf: PersonType;
+    id: string;
+    identifier?: IPropertyValue<string>[];
+    memberOf?: IMemberOf;
+}
+export interface IOwnerAsWebApplication {
+    typeOf: CreativeWorkType.WebApplication;
+    id: string;
+    identifier?: IPropertyValue<string>[];
+}
+export declare type IOwner = IOwnerAsOrganization | IOwnerAsPerson | IOwnerAsWebApplication;
+export interface IAcquiredFrom {
+    project: {
+        id: string;
+        typeOf: OrganizationType.Project;
+    };
+    id: string;
+    typeOf: OrganizationType.Corporation;
+    name: string;
+}
 export declare type OwnershipInfoType = 'OwnershipInfo';
 /**
- * 所有権インターフェース
+ * 所有権
  */
 export interface IOwnershipInfo<T extends IGood | IGoodWithDetail> {
     project: IProject;
@@ -84,7 +115,7 @@ export interface IOwnershipInfo<T extends IGood | IGoodWithDetail> {
     typeOfGood: T;
 }
 /**
- * ソート条件インターフェース
+ * ソート条件
  */
 export interface ISortOrder {
     /**
@@ -93,7 +124,7 @@ export interface ISortOrder {
     ownedFrom?: SortType;
 }
 /**
- * 所有対象物検索条件インターフェース
+ * 所有対象物検索条件
  */
 export interface ITypeOfGoodSearchConditions {
     typeOf?: string | {
@@ -117,7 +148,7 @@ export interface ITypeOfGoodSearchConditions {
     };
 }
 /**
- * 所有権検索条件インターフェース
+ * 所有権検索条件
  */
 export interface ISearchConditions {
     limit?: number;

package/lib/factory/person.d.ts

@@ -7,6 +7,7 @@ import * as ThingFactory from './thing';
  */
 export declare type IAdditionalProperty = IPropertyValue<string>[];
 export import IIdentifier = ThingFactory.IIdentifier;
+export declare type IMemberOf = IProgramMembership;
 /**
  * プロフィールインターフェース
  */
@@ -53,6 +54,6 @@ export declare type IPerson = IProfile & {
     /**
      * An Organization (or ProgramMembership) to which this Person or Organization belongs.
      */
-    memberOf?: IProgramMembership;
+    memberOf?: IMemberOf;
     typeOf: PersonType;
 };

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

@@ -1,7 +1,10 @@
 import { IAction as IPayAction } from '../action/trade/pay';
 import { IAction as IRefundAction } from '../action/trade/refund';
 import { IOrder } from '../order';
-export declare type IAction = IPayAction | IRefundAction;
+export declare type IExpludedActionAttributes = 'additionalProperty' | 'agent' | 'description' | 'error' | 'identifier' | 'instrument' | 'potentialActions' | 'recipient' | 'result';
+export declare type IOptimizedPayAction = Omit<IPayAction, IExpludedActionAttributes>;
+export declare type IOptimizedRefundAction = Omit<IRefundAction, IExpludedActionAttributes>;
+export declare type IAction = IOptimizedPayAction | IOptimizedRefundAction;
 /**
  * 経理レポートインターフェース
  */

package/lib/factory/seller.d.ts

@@ -25,7 +25,7 @@ export interface ISeller extends IOrganization {
      * A pointer to products or services offered by the organization or person.
      */
     paymentAccepted?: IPaymentAccepted[];
-    typeOf: OrganizationType;
+    typeOf: OrganizationType.Corporation;
 }
 /**
  * ソート条件インターフェース

package/lib/factory/transaction/placeOrder.d.ts

@@ -11,7 +11,6 @@ import { IInformParams, IProject } from '../project';
 import * as WebAPIFactory from '../service/webAPI';
 import * as TransactionFactory from '../transaction';
 import { TransactionType } from '../transactionType';
-export import ISeller = TransactionFactory.ISeller;
 /**
  * 取引人インターフェース
  */
@@ -91,6 +90,9 @@ export interface IStartParamsWithoutDetail {
         name?: string;
     };
 }
+export interface ISeller extends TransactionFactory.ISeller {
+    id: string;
+}
 /**
  * 取引開始パラメーターインターフェース
  */

package/package.json

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