@chevre/factory 4.391.0 → 4.392.0-alpha.1

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

@@ -9,7 +9,6 @@ import * as OrderFactory from '../../../order';
 import { PriceCurrency } from '../../../priceCurrency';
 import { IPriceSpecification as IUnitPriceSpecification } from '../../../priceSpecification/unitPriceSpecification';
 import { ITicketOffer } from '../../../product';
-import * as WebAPIFactory from '../../../service/webAPI';
 import { TransactionType } from '../../../transactionType';
 import * as AuthorizeActionFactory from '../../authorize';
 export type IAgent = ActionFactory.IParticipantAsSeller;
@@ -17,22 +16,24 @@ export type IRecipient = ActionFactory.IParticipantAsWebApplication | ActionFact
 export declare enum ObjectType {
     SeatReservation = "SeatReservation"
 }
-export type IInstrumentAsAssetTransaction<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? {
+export interface IInstrumentAsCOAReserveTransaction {
     typeOf: AssetTransactionType.COAReserveTransaction;
-    identifier: T;
+    identifier?: never;
     /**
      * 仮予約番号
      * ある時期(2023-09-12頃)以前では空文字のケースがあるので中止
      */
     transactionNumber: string;
-} : T extends WebAPIFactory.Identifier.Chevre ? {
+}
+export interface IInstrumentAsReserveTransaction {
     typeOf: AssetTransactionType.Reserve;
-    identifier: T;
+    identifier?: never;
     /**
      * 予約取引番号
      */
     transactionNumber: string;
-} : never;
+}
+export type IInstrumentAsAssetTransaction = IInstrumentAsCOAReserveTransaction | IInstrumentAsReserveTransaction;
 export interface IAcceptedOfferInResult extends Pick<ITicketOffer, 'acceptedPaymentMethod' | 'id' | 'typeOf'> {
     typeOf: OfferType.Offer;
     id: string;
@@ -104,15 +105,15 @@ export interface IPurpose {
     id: string;
 }
 export type IError = any;
-export interface IAttributes<T extends WebAPIFactory.Identifier> extends AuthorizeActionFactory.IAttributes<IObject, IResult> {
+export interface IAttributes extends AuthorizeActionFactory.IAttributes<IObject, IResult> {
     typeOf: ActionType.AuthorizeAction;
     agent: IAgent;
     recipient: IRecipient;
     object: IObject;
     purpose: IPurpose;
-    instrument: IInstrumentAsAssetTransaction<T>;
+    instrument: IInstrumentAsAssetTransaction;
 }
 /**
  * 興行オファー承認アクション
  */
-export type IAction<T extends WebAPIFactory.Identifier> = ActionFactory.IAction<IAttributes<T>>;
+export type IAction = ActionFactory.IAction<IAttributes>;

package/lib/action/interact/confirm/reservation.d.ts

@@ -3,7 +3,6 @@ import * as ReserveTransactionFactory from '../../../assetTransaction/reserve';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { ISimpleOrder } from '../../../order';
 import { IRecipe, IUpdReserveArgs } from '../../../recipe/confirmCOAReserve';
-import * as WebAPIFactory from '../../../service/webAPI';
 import * as ConfirmActionFactory from '../confirm';
 export { IRecipe as IConfirmCOAReserveRecipe };
 export type IAgent = IParticipantAsProject;
@@ -21,15 +20,15 @@ export type IObject4Chevre = Pick<ReserveTransactionFactory.IConfirmParams, 'tra
     transactionNumber: string;
     typeOf: AssetTransactionType.Reserve;
 };
-export type IObject<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? IObject4COA : IObject4Chevre;
+export type IObject = IObject4COA | IObject4Chevre;
 export type IPurpose = ISimpleOrder;
 export interface IResult {
 }
-export interface IAttributes<T extends WebAPIFactory.Identifier> extends ConfirmActionFactory.IAttributes<IObject<T>, IResult> {
+export interface IAttributes extends ConfirmActionFactory.IAttributes<IObject, IResult> {
     agent: IAgent;
     purpose: IPurpose;
 }
 /**
  * 予約取引確定アクション
  */
-export type IAction<T extends WebAPIFactory.Identifier> = ConfirmActionFactory.IAction<IAttributes<T>>;
+export type IAction = ConfirmActionFactory.IAction<IAttributes>;

package/lib/action/transfer/return/reserveTransaction.d.ts

@@ -2,7 +2,6 @@ import * as ActionFactory from '../../../action';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { ISimpleOrder } from '../../../order';
 import { IRecipe, IStateReserveArgs } from '../../../recipe/returnCOAReserve';
-import { Identifier as WebAPIIdentifier, IService } from '../../../service/webAPI';
 import * as ReturnActionFactory from '../return';
 export { IRecipe as IReturnCOAReserveRecipe };
 export type IAgent = ActionFactory.IParticipantAsProject;
@@ -14,18 +13,17 @@ export interface IObject4Chevre {
     typeOf: AssetTransactionType.Reserve;
     transactionNumber: string;
 }
-export type IObject<T extends WebAPIIdentifier> = T extends WebAPIIdentifier.COA ? IObject4COA : IObject4Chevre;
+export type IObject = IObject4COA | IObject4Chevre;
 export type IPurpose = ISimpleOrder;
 export interface IResult {
 }
-export type IInstrument<T extends WebAPIIdentifier> = Pick<IService<T>, 'identifier' | 'typeOf'>;
-export interface IAttributes<T extends WebAPIIdentifier> extends Pick<ReturnActionFactory.IAttributes<IObject<T>, IResult>, 'typeOf' | 'sameAs' | 'result' | 'recipient' | 'purpose' | 'project' | 'object' | 'instrument' | 'error' | 'agent'> {
+export interface IAttributes extends Pick<ReturnActionFactory.IAttributes<IObject, IResult>, 'typeOf' | 'sameAs' | 'result' | 'recipient' | 'purpose' | 'project' | 'object' | 'error' | 'agent'> {
     agent: IAgent;
-    instrument: IInstrument<T>;
+    instrument?: never;
     purpose: IPurpose;
     recipient: IRecipient;
 }
 /**
  * 予約取引返却アクション
  */
-export type IAction<T extends WebAPIIdentifier> = ReturnActionFactory.IAction<IAttributes<T>>;
+export type IAction = ReturnActionFactory.IAction<IAttributes>;

package/lib/ownershipInfo.d.ts

@@ -5,8 +5,6 @@ import * as PermitFactory from './permit';
 import { PersonType } from './personType';
 import * as ProductFactory from './product';
 import { IProject } from './project';
-import { IReservation as IBusReservation } from './reservation/busReservation';
-import { IReservation as IEventReservation } from './reservation/event';
 import { ReservationType } from './reservationType';
 import * as WebAPIFactory from './service/webAPI';
 import { SortType } from './sortType';
@@ -51,7 +49,6 @@ export interface IEventReservationAsGood {
  * 予約
  */
 export type IReservation = IBusReservationAsGood | IEventReservationAsGood;
-export type IReservationWithDetail = (IEventReservationAsGood & IEventReservation) | (IBusReservationAsGood & IBusReservation);
 export type IPermitIssuedThroughAsFaceToFace = Pick<PermitFactory.IIssuedThroughAsFaceToFace, 'typeOf'>;
 export type IPermitIssuedThroughAsProduct = Pick<PermitFactory.IIssuedThroughAsProduct, 'id' | 'typeOf' | 'serviceType'> | Pick<PermitFactory.IIssuedThroughAsCreditCard, 'id' | 'typeOf' | 'serviceType'>;
 export type IPermitIssuedThrough = IPermitIssuedThroughAsFaceToFace | IPermitIssuedThroughAsProduct;
@@ -73,10 +70,6 @@ export type InvoiceAsGood = Pick<IInvoice, 'paymentMethodId' | 'typeOf'> & {
  * 所有対象物 (Product or Service)
  */
 export type IGood = IReservation | IPermitAsGood | InvoiceAsGood;
-/**
- * 所有対象物(対象物詳細有)
- */
-export type IGoodWithDetail = IReservationWithDetail | PermitFactory.IPermit;
 export interface IOwnerAsOrganization {
     typeOf: OrganizationType.Organization;
     id: string;
@@ -103,7 +96,7 @@ export type OwnershipInfoType = 'OwnershipInfo';
 /**
  * 所有権
  */
-export interface IOwnershipInfo<T extends IGood | IGoodWithDetail> {
+export interface IOwnershipInfo<T extends IGood> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     /**
      * object type
@@ -198,11 +191,6 @@ export interface ISearchConditions {
         id?: string | {
             $in?: string[];
         };
-        memberOf?: {
-            membershipNumber?: {
-                $in?: string[];
-            };
-        };
         typeOf?: {
             $eq?: string;
         };

package/lib/task/confirmReserveTransaction.d.ts

@@ -1,14 +1,13 @@
 import { IAttributes as IConfirmReservationActionAttributes, IObject4Chevre, IObject4COA } from '../action/interact/confirm/reservation';
 import { IExtendId } from '../autoGenerated';
-import * as WebAPIFactory from '../service/webAPI';
 import * as TaskFactory from '../task';
 import { TaskName } from '../taskName';
 export type IObject4COAOptimized = Pick<IObject4COA, 'transactionNumber' | 'typeOf'> & {
     optimized: boolean;
 };
-export type IObject<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? IObject4COAOptimized : IObject4Chevre;
-export type IData = Pick<IConfirmReservationActionAttributes<WebAPIFactory.Identifier>, 'agent' | 'project' | 'purpose' | 'typeOf'> & {
-    object: IObject<WebAPIFactory.Identifier>;
+export type IObject = IObject4COAOptimized | IObject4Chevre;
+export type IData = Pick<IConfirmReservationActionAttributes, 'agent' | 'project' | 'purpose' | 'typeOf'> & {
+    object: IObject;
 };
 export interface IAttributes extends TaskFactory.IAttributes {
     name: TaskName.ConfirmReserveTransaction;

package/lib/task/returnReserveTransaction.d.ts

@@ -1,9 +1,8 @@
 import { IAttributes as IReturnActionAttributes } from '../action/transfer/return/reserveTransaction';
 import { IExtendId } from '../autoGenerated';
-import * as WebAPIFactory from '../service/webAPI';
 import * as TaskFactory from '../task';
 import { TaskName } from '../taskName';
-export type IData = Pick<IReturnActionAttributes<WebAPIFactory.Identifier>, 'agent' | 'instrument' | 'object' | 'project' | 'purpose' | 'recipient' | 'typeOf'>;
+export type IData = Pick<IReturnActionAttributes, 'agent' | 'object' | 'project' | 'purpose' | 'recipient' | 'typeOf'>;
 export interface IAttributes extends TaskFactory.IAttributes {
     name: TaskName.ReturnReserveTransaction;
     data: IData;

package/package.json

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