@chevre/factory 10.5.0-alpha.8 → 11.0.0-alpha.1

package/lib/chevre/index.d.ts

@@ -490,14 +490,7 @@ export declare namespace transaction {
     export import IAgent = TransactionFactory.IAgent;
     export import IPassportBeforeStart = TransactionFactory.IPassportBeforeStart;
     export import ISendEmailMessageParams = TransactionFactory.ISendEmailMessageParams;
-    export import ISortOrder = TransactionFactory.ISortOrder;
     export import ITasksExportAction = TransactionFactory.ITasksExportAction;
-    type ISearchConditions<T extends TransactionType> = T extends TransactionType.PlaceOrder ? PlaceOrderTransactionFactory.ISearchConditions : never;
-    type IStartParams<T extends TransactionType> = T extends TransactionType.PlaceOrder ? PlaceOrderTransactionFactory.IStartParams : never;
-    type IResult<T extends TransactionType> = T extends TransactionType.PlaceOrder ? PlaceOrderTransactionFactory.IResult : never;
-    type IPotentialActions<T extends TransactionType> = T extends TransactionType.PlaceOrder ? PlaceOrderTransactionFactory.IPotentialActions : never;
-    type IAttributes<T extends TransactionType> = T extends TransactionType.PlaceOrder ? PlaceOrderTransactionFactory.IAttributes : never;
-    type ITransaction<T extends TransactionType> = T extends TransactionType.PlaceOrder ? PlaceOrderTransactionFactory.ITransaction : never;
     export import placeOrder = PlaceOrderTransactionFactory;
     export import returnOrder = ReturnOrderTransactionFactory;
 }

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

@@ -1,7 +1,12 @@
+import { ActionStatusType } from '../actionStatusType';
 import { IExtendId } from '../autoGenerated';
 import { IClientUser } from '../clientUser';
 import { CreativeWorkType } from '../creativeWorkType';
-import { IAgent as IBaseAgent, ISeller as IBaseSeller, ISearchConditions as IBaseSearchConditions, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../transaction';
+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 { TransactionStatusType } from '../transactionStatusType';
 import { TransactionType } from '../transactionType';
 export interface IMemberOfPayload {
     iss: string;
@@ -111,7 +116,46 @@ export interface IAttributes extends IBaseAttributes<Omit<IStartParams, 'expires
  * 注文取引
  */
 export type ITransaction = IExtendId<IAttributes>;
-export interface ISearchConditions extends IBaseSearchConditions<TransactionType.PlaceOrder> {
+/**
+ * ソート条件
+ */
+export interface ISortOrder {
+    startDate?: SortType;
+}
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: ISortOrder;
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    /**
+     * IDリスト
+     */
+    ids?: string[];
+    /**
+     * ステータスリスト
+     * @deprecated use tasksExportAction
+     */
+    statuses?: TransactionStatusType[];
+    status?: {
+        $in?: TransactionStatusType[];
+    };
+    /**
+     * 開始日時(から)
+     */
+    startFrom?: Date;
+    /**
+     * 開始日時(まで)
+     */
+    startThrough?: Date;
+    agent?: {
+        typeOf?: PersonType.Person | CreativeWorkType.WebApplication;
+        ids?: string[];
+        identifiers?: IIdentifier;
+    };
     seller?: {
         ids?: string[];
     };
@@ -123,4 +167,10 @@ export interface ISearchConditions extends IBaseSearchConditions<TransactionType
             $eq?: string;
         };
     };
+    tasksExportAction?: {
+        actionStatus?: {
+            $eq?: ActionStatusType;
+            $in?: ActionStatusType[];
+        };
+    };
 }

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

@@ -1,11 +1,10 @@
 import { IAttributes as IReturnOrderActionAttributes, IReturnPolicy } from '../action/transfer/return/order';
 import { IExtendId } from '../autoGenerated';
-import { IProject } from '../project';
-import { IAgent, ISeller, ISendEmailMessageParams, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../transaction';
+import { IAgent as IBaseAgent, ISendEmailMessageParams, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../transaction';
 import { TransactionType } from '../transactionType';
-export { IAgent, ISeller };
-export type IResult = never;
-export type IError = any;
+export type IAgent = Pick<IBaseAgent, 'id' | 'typeOf'> & {
+    identifier?: never;
+};
 /**
  * 返品理由
  */
@@ -26,30 +25,12 @@ export interface IReturnableOrder {
     confirmationNumber: string;
     orderNumber: string;
 }
-/**
- * 注文返品開始パラメータ
- */
-export interface IStartParamsWithoutDetail {
-    project: Pick<IProject, 'id' | 'typeOf'>;
-    expiresInSeconds?: number;
-    agent: IAgent;
-    object: {
-        order: IReturnableOrder | IReturnableOrder[];
-        reason: Reason;
-    };
-    seller: {
-        id: string;
-    };
-}
 /**
  * 取引開始パラメータ
  */
-export interface IStartParams extends Omit<IBaseStartParams<TransactionType.ReturnOrder, IAgent, undefined, IObject>, 'expires'> {
-    /**
-     * 販売者
-     */
-    seller: ISeller;
+export interface IStartParams extends Pick<IBaseStartParams<TransactionType.ReturnOrder, IAgent, undefined, IObject>, 'project' | 'typeOf' | 'object' | 'agent'> {
     expiresInSeconds: number;
+    seller?: never;
 }
 /**
  * 返金アクションカスタムパラメータ
@@ -98,20 +79,7 @@ export interface IPotentialActionsParams {
     /**
      * 注文返品アクション
      */
-    returnOrder?: IReturnOrderActionParams | IReturnOrderActionParams[];
-}
-export interface IConfirmParams {
-    /**
-     * 取引ID
-     */
-    id: string;
-    agent?: {
-        id?: string;
-    };
-    /**
-     * 取引確定後アクション
-     */
-    potentialActions?: IPotentialActionsParams;
+    returnOrder?: IReturnOrderActionParams | [IReturnOrderActionParams];
 }
 /**
  * 取引対象物
@@ -132,7 +100,7 @@ export interface IPotentialActions {
      */
     returnOrder: IReturnOrderPotentialAction[];
 }
-export interface IAttributes extends IBaseAttributes<Omit<IStartParams, 'expiresInSeconds'>, IResult, IError, IPotentialActions> {
+export interface IAttributes extends IBaseAttributes<Pick<IStartParams, 'project' | 'typeOf' | 'object' | 'agent'>, never, never, IPotentialActions> {
 }
 /**
  * 返品取引

package/lib/chevre/transaction.d.ts

@@ -5,9 +5,7 @@ import { ICustomization as IEmailICustomization } from './creativeWork/message/e
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
 import { IMultilingualString } from './multilingualString';
 import { OrganizationType } from './organizationType';
-import { IIdentifier, IPersonAttributes } from './person';
-import { PersonType } from './personType';
-import { SortType } from './sortType';
+import { IPersonAttributes } from './person';
 import { TransactionStatusType } from './transactionStatusType';
 import { TransactionType } from './transactionType';
 export interface IAgentAsWebApplication extends Pick<IWebApplication, 'id' | 'identifier' | 'typeOf'> {
@@ -113,62 +111,3 @@ export type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TSta
     potentialActions?: TPotentialActions;
 };
 export type ITransaction<TStartParams, TResult, TError, TPotentialActions> = IExtendId<IAttributes<TStartParams, TResult, TError, TPotentialActions>>;
-/**
- * ソート条件
- */
-export interface ISortOrder {
-    startDate?: SortType;
-}
-export interface ISearchConditions<T extends TransactionType> {
-    limit?: number;
-    page?: number;
-    sort?: ISortOrder;
-    project?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    /**
-     * 取引タイプ
-     */
-    typeOf: T;
-    /**
-     * IDリスト
-     */
-    ids?: string[];
-    /**
-     * ステータスリスト
-     * @deprecated use tasksExportAction
-     */
-    statuses?: TransactionStatusType[];
-    status?: {
-        $in?: TransactionStatusType[];
-    };
-    /**
-     * 開始日時(から)
-     */
-    startFrom?: Date;
-    /**
-     * 開始日時(まで)
-     */
-    startThrough?: Date;
-    /**
-     * 終了日時(から)
-     */
-    endFrom?: Date;
-    /**
-     * 終了日時(まで)
-     */
-    endThrough?: Date;
-    agent?: {
-        typeOf?: PersonType.Person | IWebApplication['typeOf'];
-        ids?: string[];
-        identifiers?: IIdentifier;
-    };
-    tasksExportAction?: {
-        actionStatus?: {
-            $eq?: ActionStatusType;
-            $in?: ActionStatusType[];
-        };
-    };
-}

package/package.json

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