@chevre/factory 11.0.0-alpha.1 → 11.0.0-alpha.3

package/lib/chevre/event/eventSeries.d.ts

@@ -191,7 +191,17 @@ export type ICreateParams = Pick<IAttributes, 'name' | 'duration' | 'endDate' |
 /**
  * 検索条件
  */
-export interface ISearchConditions extends Pick<IBaseSearchConditions, 'additionalProperty' | 'endFrom' | 'endThrough' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> {
+export interface ISearchConditions extends Pick<IBaseSearchConditions, 'endFrom' | 'endThrough' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> {
+    additionalProperty?: {
+        $elemMatch?: {
+            name?: {
+                /**
+                 * 一致する名称の追加特性がひとつでも存在する
+                 */
+                $eq?: string;
+            };
+        };
+    };
     typeOf?: EventType.ScreeningEventSeries;
     name?: string;
     location?: {

package/lib/chevre/event/screeningEvent.d.ts

@@ -365,7 +365,16 @@ export interface IOfferSearchConditions {
  * イベント検索条件
  */
 export interface ISearchConditions extends IBaseSearchConditions {
-    typeOf?: EventType.ScreeningEvent;
+    additionalProperty?: {
+        $elemMatch?: {
+            name?: {
+                /**
+                 * 一致する名称の追加特性がひとつでも存在する
+                 */
+                $eq?: string;
+            };
+        };
+    };
     /**
      * イベントステータス
      */

package/lib/chevre/event.d.ts

@@ -91,16 +91,4 @@ export interface ISearchConditions {
      * ISO 8601 date format
      */
     endThrough?: Date;
-    additionalProperty?: {
-        $elemMatch?: {
-            name?: {
-                /**
-                 * 一致する名称の追加特性がひとつでも存在する
-                 */
-                $eq?: string;
-            };
-        };
-    };
-    typeOfIn?: never;
-    name?: never;
 }

package/lib/chevre/index.d.ts

@@ -490,7 +490,6 @@ export declare namespace transaction {
     export import IAgent = TransactionFactory.IAgent;
     export import IPassportBeforeStart = TransactionFactory.IPassportBeforeStart;
     export import ISendEmailMessageParams = TransactionFactory.ISendEmailMessageParams;
-    export import ITasksExportAction = TransactionFactory.ITasksExportAction;
     export import placeOrder = PlaceOrderTransactionFactory;
     export import returnOrder = ReturnOrderTransactionFactory;
 }

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

@@ -2,16 +2,12 @@ import { ActionStatusType } from '../actionStatusType';
 import { IExtendId } from '../autoGenerated';
 import { IClientUser } from '../clientUser';
 import { CreativeWorkType } from '../creativeWorkType';
+import { OrganizationType } from '../organizationType';
 import { IIdentifier } from '../person';
-import { PersonType } from '../personType';
 import { SortType } from '../sortType';
-import { IAgent as IBaseAgent, ISeller as IBaseSeller, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../transaction';
+import { IAgent as IBaseAgent, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../transaction';
 import { TransactionStatusType } from '../transactionStatusType';
 import { TransactionType } from '../transactionType';
-export interface IMemberOfPayload {
-    iss: string;
-    sub: string;
-}
 /**
  * 取引人
  */
@@ -50,12 +46,14 @@ export interface IObject {
     broker?: never;
 }
 export type IClientUserBeforeStart = Pick<IClientUser, 'aud' | 'client_id' | 'exp' | 'iat' | 'iss' | 'jti' | 'sub' | 'token_use' | 'username'>;
-export type ISeller = Pick<IBaseSeller, 'id' | 'typeOf'> & {
+export interface ISeller {
+    typeOf: OrganizationType.Corporation;
+    id: string;
     name: {
         ja?: string;
     };
     additionalProperty?: never;
-};
+}
 export interface IInstrument {
     typeOf: CreativeWorkType.WebApplication;
     /**
@@ -66,7 +64,7 @@ export interface IInstrument {
 /**
  * 取引開始パラメーター
  */
-export interface IStartParams extends Pick<IBaseStartParams<TransactionType.PlaceOrder, IAgent, undefined, IObject>, 'agent' | 'project' | 'object' | 'typeOf'> {
+export interface IStartParams extends Pick<IBaseStartParams<TransactionType.PlaceOrder, IAgent, IObject>, 'agent' | 'project' | 'object' | 'typeOf'> {
     /**
      * 販売者
      */
@@ -105,12 +103,20 @@ export interface IResult {
     order?: never;
     numAcceptedOffers?: never;
 }
-/**
- * エラー
- */
-export type IError = any;
-export type IPotentialActions = never;
-export interface IAttributes extends IBaseAttributes<Omit<IStartParams, 'expiresInSeconds'>, IResult, IError, IPotentialActions> {
+export interface ITasksExportAction {
+    actionStatus: ActionStatusType;
+    agent?: {
+        name: string;
+    };
+    startDate?: Date;
+    endDate?: Date;
+}
+export interface IAttributes extends Pick<IBaseAttributes<Omit<IStartParams, 'expiresInSeconds'>>, 'agent' | 'endDate' | 'expires' | 'instrument' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'> {
+    /**
+     * 取引結果
+     */
+    result?: IResult;
+    tasksExportAction?: ITasksExportAction;
 }
 /**
  * 注文取引
@@ -135,10 +141,6 @@ export interface ISearchConditions {
      * IDリスト
      */
     ids?: string[];
-    /**
-     * ステータスリスト
-     * @deprecated use tasksExportAction
-     */
     statuses?: TransactionStatusType[];
     status?: {
         $in?: TransactionStatusType[];
@@ -152,9 +154,9 @@ export interface ISearchConditions {
      */
     startThrough?: Date;
     agent?: {
-        typeOf?: PersonType.Person | CreativeWorkType.WebApplication;
-        ids?: string[];
         identifiers?: IIdentifier;
+        typeOf?: never;
+        ids?: never;
     };
     seller?: {
         ids?: string[];
@@ -167,10 +169,4 @@ export interface ISearchConditions {
             $eq?: string;
         };
     };
-    tasksExportAction?: {
-        actionStatus?: {
-            $eq?: ActionStatusType;
-            $in?: ActionStatusType[];
-        };
-    };
 }

package/lib/chevre/transaction/placeOrder.js

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+;

package/lib/chevre/transaction/returnOrder.d.ts

@@ -28,7 +28,7 @@ export interface IReturnableOrder {
 /**
  * 取引開始パラメータ
  */
-export interface IStartParams extends Pick<IBaseStartParams<TransactionType.ReturnOrder, IAgent, undefined, IObject>, 'project' | 'typeOf' | 'object' | 'agent'> {
+export interface IStartParams extends Pick<IBaseStartParams<TransactionType.ReturnOrder, IAgent, IObject>, 'project' | 'typeOf' | 'object' | 'agent'> {
     expiresInSeconds: number;
     seller?: never;
 }
@@ -100,7 +100,11 @@ export interface IPotentialActions {
      */
     returnOrder: IReturnOrderPotentialAction[];
 }
-export interface IAttributes extends IBaseAttributes<Pick<IStartParams, 'project' | 'typeOf' | 'object' | 'agent'>, never, never, IPotentialActions> {
+export interface IAttributes extends Pick<IBaseAttributes<Pick<IStartParams, 'project' | 'typeOf' | 'object' | 'agent'>>, 'agent' | 'expires' | 'object' | 'project' | 'startDate' | 'status' | 'typeOf'> {
+    /**
+     * 事後に発生するアクション
+     */
+    potentialActions?: IPotentialActions;
 }
 /**
  * 返品取引

package/lib/chevre/transaction.d.ts

@@ -1,9 +1,6 @@
 import { passport } from '@waiter/factory';
-import { ActionStatusType } from './actionStatusType';
-import { IExtendId } from './autoGenerated';
 import { ICustomization as IEmailICustomization } from './creativeWork/message/email';
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
-import { IMultilingualString } from './multilingualString';
 import { OrganizationType } from './organizationType';
 import { IPersonAttributes } from './person';
 import { TransactionStatusType } from './transactionStatusType';
@@ -15,14 +12,6 @@ export interface IAgentAsPerson extends Pick<IPersonAttributes, 'id' | 'identifi
     name?: string;
 }
 export type IAgent = IAgentAsWebApplication | IAgentAsPerson;
-/**
- * 販売者
- */
-export interface ISeller {
-    typeOf: OrganizationType.Corporation;
-    id: string;
-    name: IMultilingualString;
-}
 /**
  * Eメール送信パラメータ
  */
@@ -45,18 +34,10 @@ export interface IProject {
     id: string;
     typeOf: OrganizationType.Project;
 }
-export interface ITasksExportAction {
-    actionStatus: ActionStatusType;
-    agent?: {
-        name: string;
-    };
-    startDate?: Date;
-    endDate?: Date;
-}
 /**
  * 取引開始パラメータ
  */
-export interface IStartParams<T extends TransactionType, TAgent, TRecipient, TObject> {
+export interface IStartParams<T extends TransactionType, TAgent, TObject> {
     project: IProject;
     /**
      * 取引タイプ
@@ -66,10 +47,6 @@ export interface IStartParams<T extends TransactionType, TAgent, TRecipient, TOb
      * 取引主体
      */
     agent: TAgent;
-    /**
-     * 取引物受取者
-     */
-    recipient?: TRecipient;
     /**
      * 取引対象
      */
@@ -79,19 +56,11 @@ export interface IStartParams<T extends TransactionType, TAgent, TRecipient, TOb
      */
     expires: Date;
 }
-export type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TStartParams & {
+export type IAttributes<TStartParams> = TStartParams & {
     /**
      * 取引状態
      */
     status: TransactionStatusType;
-    /**
-     * 取引結果
-     */
-    result?: TResult;
-    /**
-     * 取引エラー
-     */
-    error?: TError;
     /**
      * 取引進行期限
      */
@@ -104,10 +73,4 @@ export type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TSta
      * 取引終了日時
      */
     endDate?: Date;
-    tasksExportAction?: ITasksExportAction;
-    /**
-     * 事後に発生するアクション
-     */
-    potentialActions?: TPotentialActions;
 };
-export type ITransaction<TStartParams, TResult, TError, TPotentialActions> = IExtendId<IAttributes<TStartParams, TResult, TError, TPotentialActions>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "11.0.0-alpha.1",
+  "version": "11.0.0-alpha.3",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [