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

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 ISortOrder = TransactionFactory.ISortOrder;
     export import ITasksExportAction = TransactionFactory.ITasksExportAction;
     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.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": "11.0.0-alpha.0",
+  "version": "11.0.0-alpha.1",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [