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

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 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,11 @@
 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 +115,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[];
     };

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.2",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [