@chevre/domain 28.2.0-alpha.2 → 28.2.0-alpha.3

package/lib/chevre/repo/identityProvider.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, QueryOptions } from 'mongoose';
+import { Connection, QueryOptions } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/identityProvider';
 export type ISavingIdentityProvider = Pick<factory.identityProvider.IIdentityProvider, 'identifier' | 'project' | 'typeOf'> & {
@@ -17,7 +18,7 @@ type IKeyOfProjection = keyof factory.identityProvider.IIdentityProvider;
 export declare class IdentityProviderRepo {
     private readonly identityProviderModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.identityProvider.ISearchConditions): FilterQuery<factory.identityProvider.IIdentityProvider>[];
+    static CREATE_FILTER_QUERY(params: factory.identityProvider.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: ISavingIdentityProvider & IUnset;

package/lib/chevre/repo/issuer.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/issuer';
 type IIssuer = factory.issuer.IIssuer;
@@ -9,7 +10,7 @@ type ISearchConditions = factory.issuer.ISearchConditions;
 export declare class IssuerRepo {
     private readonly issuerModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<factory.issuer.IIssuer>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     saveIssuer(params: IIssuer): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/issuer.js

@@ -34,21 +34,20 @@ class IssuerRepo {
     }
     async saveIssuer(params) {
         let savedId;
-        let doc;
         if (params.id === '') {
             const { id, ...creatingParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.issuerModel.create(creatingParams);
-            savedId = doc.id;
+            const createdDoc = await this.issuerModel.create(creatingParams);
+            savedId = createdDoc.id;
         }
         else {
             const { id, identifier, project, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
+            const doc = await this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.issuerModel.modelName);
+            }
             savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.issuerModel.modelName);
-        }
         return { id: savedId };
     }
     async renameIssuerIdentifier(params) {

package/lib/chevre/repo/member.d.ts

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IGlobalMember } from './mongoose/schemas/member/global';
+import { IGlobalMember, IDocType } from './mongoose/schemas/member/global';
 type IKeyOfProjection = keyof factory.iam.IMember;
 export type ICustomerMember = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'name' | 'memberOf'> & {
     /**
@@ -16,7 +17,7 @@ export declare class MemberRepo {
     private readonly globalMemberModel;
     private readonly memberModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): FilterQuery<factory.iam.IMember>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * プロジェクト指定で検索する
      */

package/lib/chevre/repo/message.d.ts

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IEmailMessage } from './mongoose/schemas/message';
+import { IEmailMessage, IDocType } from './mongoose/schemas/message';
 type IFindByIdentifierResult = Pick<IEmailMessage, 'about' | 'identifier' | 'name' | 'sender' | 'text' | 'toRecipient' | 'typeOf'>;
 interface ISearchConditions {
     limit?: number;
@@ -39,7 +40,7 @@ type IKeyOfProjection = keyof IEmailMessage;
 export declare class MessageRepo {
     private readonly messageModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IEmailMessage>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 検索
      */

package/lib/chevre/repo/mongoose/types.d.ts

@@ -0,0 +1,2 @@
+import type { FilterQuery } from 'mongoose';
+export { FilterQuery };

package/lib/chevre/repo/mongoose/types.js

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

package/lib/chevre/repo/movieTicketType.d.ts

@@ -1,4 +1,5 @@
-import { AnyExpression, Connection, FilterQuery } from 'mongoose';
+import { AnyExpression, Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/movieTicketTypes';
 import { factory } from '../factory';
 type IUnset = {

package/lib/chevre/repo/movieTicketType.js

@@ -178,7 +178,6 @@ class MovieTicketTypeRepo {
     }
     async saveMovieTicketType(params) {
         let savedId;
-        // let doc: HydratedDocument<{ _id: Types.ObjectId }> | null;
         if (typeof params.id !== 'string') {
             const { id, $unset, ...creatingDoc } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const createResult = await this.categoryCodeModel.create(creatingDoc);
@@ -201,9 +200,6 @@ class MovieTicketTypeRepo {
             }
             savedId = params.id;
         }
-        // if (doc === null) {
-        //     throw new factory.errors.NotFound(this.categoryCodeModel.modelName);
-        // }
         return { id: savedId };
     }
     /**

package/lib/chevre/repo/note.d.ts

@@ -1,5 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/note';
 type INoteDigitalDocument = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
 type IKeyOfProjection = keyof INoteDigitalDocument;
 /**
@@ -8,7 +10,7 @@ type IKeyOfProjection = keyof INoteDigitalDocument;
 export declare class NoteRepo {
     private readonly noteModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/creativeWork/noteDigitalDocument").INoteDigitalDocument>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<IDocType>[];
     findNotes(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
         id: string;
     })[]>;

package/lib/chevre/repo/noteAboutOrder.d.ts

@@ -1,5 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/note';
 type INoteAboutOrder = factory.creativeWork.noteDigitalDocument.INoteAboutOrder;
 type IKeyOfProjection = keyof INoteAboutOrder;
 /**
@@ -8,7 +10,7 @@ type IKeyOfProjection = keyof INoteAboutOrder;
 export declare class NoteAboutOrderRepo {
     private readonly noteModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/creativeWork/noteDigitalDocument").INoteAboutOrder>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 検索
      */
@@ -26,7 +28,7 @@ export declare class NoteAboutOrderRepo {
         attributes: Pick<INoteAboutOrder, 'text' | 'editor'>;
     }): Promise<void>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.creativeWork.noteDigitalDocument.INoteAboutOrder>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/noteAboutOrder.js

@@ -174,7 +174,7 @@ class NoteAboutOrderRepo {
             throw new factory_1.factory.errors.NotFound(this.noteModel.modelName);
         }
     }
-    // public getCursor(conditions: FilterQuery<factory.creativeWork.noteDigitalDocument.INoteAboutOrder>, projection: any) {
+    // public getCursor(conditions: FilterQuery<IDocType>, projection: any) {
     //     return this.noteModel.find(
     //         {
     //             ...conditions,

package/lib/chevre/repo/offerCatalog.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/offerCatalog';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered'> & {
@@ -184,7 +185,7 @@ export declare class OfferCatalogRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateItemList(params: {

package/lib/chevre/repo/offerCatalog.js

@@ -126,27 +126,26 @@ class OfferCatalogRepo {
     }
     async save(params) {
         let savedId;
-        let doc;
         if (typeof params.id !== 'string' || params.id === '') {
             const { default: uniqid } = await import('uniqid');
             const newId = uniqid();
             const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogModel.create({ ...creatingDoc, _id: newId });
+            await this.offerCatalogModel.create({ ...creatingDoc, _id: newId });
             savedId = newId;
         }
         else {
             // 上書き禁止属性を除外
             const { id, identifier, itemOffered, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const doc = await this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.offerCatalogModel.modelName);
+            }
             savedId = id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.offerCatalogModel.modelName);
-        }
         return { id: savedId };
     }
     /**

package/lib/chevre/repo/offerCatalogItem.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, mongo } from 'mongoose';
+import { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/offerCatalogItem';
 type IOfferCatalogItem = Pick<factory.offerCatalog.IOfferCatalog, 'description' | 'identifier' | 'itemListElement' | 'itemOffered' | 'name' | 'project' | 'relatedOffer' | 'typeOf' | 'id'>;

package/lib/chevre/repo/offerCatalogItem.js

@@ -101,23 +101,25 @@ class OfferCatalogItemRepo {
         return andConditions;
     }
     async save(params) {
-        let doc;
+        let savedId;
         if (typeof params.id !== 'string' || params.id.length === 0) {
             const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogItemModel.create(creatingDoc);
+            const createdDoc = await this.offerCatalogItemModel.create(creatingDoc);
+            savedId = createdDoc.id;
         }
         else {
             const { id, identifier, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const doc = await this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.offerCatalogItemModel.modelName);
+            }
+            savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.offerCatalogItemModel.modelName);
-        }
-        return { id: doc.id };
+        return { id: savedId };
     }
     /**
      * プロジェクトとコードから冪等保管

package/lib/chevre/repo/order.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/order';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
@@ -33,7 +34,7 @@ type ISearchConditions = Pick<factory.order.ISearchConditions, 'acceptedOffers'
 export declare class OrderRepo {
     private readonly orderModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<factory.order.IOrder>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 注文ステータスを変更する
      */
@@ -150,7 +151,7 @@ export declare class OrderRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.order.IOrder>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
         arrayFilters?: any[];
     }): Promise<import("mongoose").UpdateWriteOpResult>;

package/lib/chevre/repo/paymentService.d.ts

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/paymentService';
+import { IModel, IDocType } from './mongoose/schemas/paymentService';
 type IUnsetKey = keyof Pick<factory.service.paymentService.IService, 'additionalProperty' | 'availableChannel' | 'serviceOutput' | 'serviceType'>;
 type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService;
 /**
@@ -14,7 +15,7 @@ export declare class PaymentServiceRepo {
     private readonly paymentServiceModel;
     private readonly paymentServiceChannelModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4paymentService): FilterQuery<import("@chevre/factory/lib/chevre/service/paymentService").IService>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4paymentService): FilterQuery<IDocType>[];
     /**
      * 決済サービスを保管する
      */

package/lib/chevre/repo/paymentServiceProvider.d.ts

@@ -1,4 +1,6 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType } from './mongoose/schemas/paymentService';
 import { factory } from '../factory';
 type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
 export type IPublicPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
@@ -77,7 +79,7 @@ export declare class PaymentServiceProviderRepo {
         };
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.service.paymentService.IService>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/place/movieTheater.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/civicStructure';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
@@ -28,7 +29,7 @@ interface IUpsertOptions {
 export declare class MovieTheaterRepo {
     private readonly civicStructureModel;
     constructor(connection: Connection);
-    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace>[];
+    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 施設を保管する
      */
@@ -94,7 +95,7 @@ export declare class MovieTheaterRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace, "id"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
         hasEntranceGate?: factory.place.movieTheater.IEntranceGate[];
     } & {

package/lib/chevre/repo/place/movieTheater.js

@@ -80,14 +80,13 @@ class MovieTheaterRepo {
      */
     async saveMovieTheater(params) {
         let savedId;
-        let doc;
         if (params.id === '') {
             const { 
             // 入場ゲートを保管しない(2026-01-11~)
             id, hasEntranceGate, // eslint-disable-line @typescript-eslint/no-unused-vars
             ...creatingParams } = params; // omit id(2024-09-12~)
-            doc = await this.civicStructureModel.create(creatingParams);
-            savedId = doc.id;
+            const createdDoc = await this.civicStructureModel.create(creatingParams);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
@@ -95,13 +94,13 @@ class MovieTheaterRepo {
             // 入場ゲートを保管しない(2026-01-11~)
             id, branchCode, project, typeOf, hasEntranceGate, // eslint-disable-line @typescript-eslint/no-unused-vars
             ...updateFields } = params;
-            doc = await this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+            const doc = await this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.civicStructureModel.modelName);
+            }
             savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.civicStructureModel.modelName);
-        }
         return { id: savedId };
     }
     async saveMovieTheaterByBranchCode4coa(params) {

package/lib/chevre/repo/place/screeningRoom.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery, PipelineStage, mongo } from 'mongoose';
+import type { Connection, PipelineStage, mongo } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/place';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
@@ -145,7 +146,7 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/screeningRoom").IPlace, "containsPlace"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;

package/lib/chevre/repo/place/section.js

@@ -338,7 +338,7 @@ class SectionRepo {
     //     if (!Array.isArray(containsPlace)) {
     //         throw new factory.errors.ArgumentNull('containsPlace');
     //     }
-    //     const doc = await this.placeModel.findOneAndUpdate<HydratedDocument<IUpdateSectionResult>>(
+    //     const doc = await this.placeModel.findOneAndUpdate(
     //         {
     //             typeOf: { $eq: factory.placeType.ScreeningRoom },
     //             'project.id': { $eq: project.id },

package/lib/chevre/repo/potentialAction.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, QueryOptions } from 'mongoose';
+import { Connection, QueryOptions } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/potentialAction';
 export type ISavingPotentialAction = Pick<factory.potentialAction.IPotentialAction, 'target' | 'project' | 'typeOf' | 'identifier'> & {
@@ -14,7 +15,7 @@ type IKeyOfProjection = keyof factory.potentialAction.IPotentialAction;
 export declare class PotentialActionRepo {
     private readonly potentialActionModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.potentialAction.ISearchConditions): FilterQuery<factory.potentialAction.IPotentialInformAction>[];
+    static CREATE_FILTER_QUERY(params: factory.potentialAction.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: ISavingPotentialAction & IUnset;

package/lib/chevre/repo/product.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, Types, mongo } from 'mongoose';
+import { Connection, Types, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
@@ -13,7 +14,7 @@ type IUnsetKey = keyof Pick<factory.product.IProduct, 'additionalProperty' | 'av
 export declare class ProductRepo {
     private readonly productModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4product): FilterQuery<factory.product.IProduct>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4product): FilterQuery<IDocType>[];
     /**
      * プロダクトを検索する
      */
@@ -98,7 +99,7 @@ export declare class ProductRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.product.IProduct>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     migrateHasOfferCatalogItemListElement(params: {

package/lib/chevre/repo/project.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/project';
 import { factory } from '../factory';
 type IKeyOfProjection = keyof factory.project.IProject;
@@ -9,7 +10,7 @@ type IKeyOfProjection = keyof factory.project.IProject;
 export declare class ProjectRepo {
     private readonly projectModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.project.ISearchConditions): FilterQuery<factory.project.IProject>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.project.ISearchConditions): FilterQuery<IDocType>[];
     findById(params: {
         id: string;
         inclusion: IKeyOfProjection[];
@@ -43,7 +44,7 @@ export declare class ProjectRepo {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
         _id: string;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{

package/lib/chevre/repo/role.d.ts

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/role';
 type IRole = IDocType;

package/lib/chevre/repo/seller.d.ts

@@ -1,4 +1,5 @@
-import { AnyExpression, Connection, FilterQuery, QueryOptions, Types } from 'mongoose';
+import { AnyExpression, Connection, QueryOptions, Types } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/seller';
 import { factory } from '../factory';
 export type ISellerWithId = Pick<factory.seller.ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'makesOffer' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
@@ -32,7 +33,7 @@ type IKeyOfProjection = keyof ISellerWithId;
 export declare class SellerRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<IDocType>[];
     static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions: (Exclude<keyof ISellerByAggregate, 'id'>)[]): Record<string, AnyExpression>;
     /**
      * 販売者を保管する
@@ -75,7 +76,7 @@ export declare class SellerRepo {
         id: string;
         makesOffer: factory.seller.IMakesOffer;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "name" | "typeOf" | "branchCode" | "additionalProperty" | "project" | "url" | "telephone" | "makesOffer" | "hasMerchantReturnPolicy"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "name" | "typeOf" | "branchCode" | "additionalProperty" | "project" | "url" | "telephone" | "makesOffer" | "hasMerchantReturnPolicy"> & {
         paymentAccepted?: factory.seller.IPaymentAccepted[];
     } & {
         _id: Types.ObjectId;

package/lib/chevre/repo/sellerReturnPolicy.d.ts

@@ -1,4 +1,6 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType } from './mongoose/schemas/sellerReturnPolicy';
 import { factory } from '../factory';
 export type ISavingReturnPolicy = Pick<factory.sellerReturnPolicy.ISellerReturnPolicy, 'applicablePaymentMethod' | 'identifier' | 'itemCondition' | 'merchantReturnDays' | 'name' | 'project' | 'restockingFee' | 'typeOf'> & {
     id?: never;
@@ -16,7 +18,7 @@ type IKeyOfProjection = keyof ISellerReturnPolicyWithId;
 export declare class SellerReturnPolicyRepo {
     private readonly sellerReturnPolicyModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.sellerReturnPolicy.ISearchConditions): FilterQuery<factory.sellerReturnPolicy.ISellerReturnPolicy>[];
+    static CREATE_FILTER_QUERY(params: factory.sellerReturnPolicy.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: ISavingReturnPolicy & IUnset;

package/lib/chevre/repo/setting.d.ts

@@ -1,5 +1,6 @@
-import type { Connection, FilterQuery } from 'mongoose';
-import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType, ISetting, IStorageSettings } from './mongoose/schemas/setting';
 type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
 type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'orderNumber' | 'quota' | 'storage' | 'transactionNumber' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
 export { IGlobalSetting as ISetting };
@@ -25,7 +26,7 @@ export declare class SettingRepo {
         value: number;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<ISetting>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/ticket.d.ts

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { ITicket, ITicketIssuedBy } from './mongoose/schemas/ticket';
+import { ITicket, ITicketIssuedBy, IDocType } from './mongoose/schemas/ticket';
 export { ITicket };
 type IIssueParams = Pick<ITicket, 'ticketToken'> & {
     project: {
@@ -33,7 +34,7 @@ type IKeyOfProjection = keyof ITicket;
 export declare class TicketRepo {
     private readonly ticketModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<ITicket>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 承認コードからチケットを発行する
      */