typeorm 0.3.15-dev.3a72e35 → 0.3.15-dev.f6a3ce7

package/entity-manager/MongoEntityManager.d.ts

@@ -1,18 +1,18 @@
-import { DataSource } from "../data-source/DataSource";
 import { EntityManager } from "./EntityManager";
 import { EntityTarget } from "../common/EntityTarget";
-import { AggregationCursor, BulkWriteOpResultObject, ChangeStream, ChangeStreamOptions, Code, Collection, CollectionAggregationOptions, CollectionBulkWriteOptions, CollectionInsertManyOptions, CollectionInsertOneOptions, CollectionOptions, CollStats, CommandCursor, Cursor, DeleteWriteOpResultObject, FindAndModifyWriteOpResultObject, FindOneAndReplaceOption, GeoHaystackSearchOptions, GeoNearOptions, InsertOneWriteOpResult, InsertWriteOpResult, MapReduceOptions, MongoCountPreferences, MongodbIndexOptions, ObjectID, OrderedBulkOperation, ParallelCollectionScanOptions, ReadPreference, ReplaceOneOptions, UnorderedBulkOperation, UpdateWriteOpResult } from "../driver/mongodb/typings";
 import { ObjectLiteral } from "../common/ObjectLiteral";
 import { MongoQueryRunner } from "../driver/mongodb/MongoQueryRunner";
+import { FindManyOptions } from "../find-options/FindManyOptions";
 import { QueryDeepPartialEntity } from "../query-builder/QueryPartialEntity";
 import { InsertResult } from "../query-builder/result/InsertResult";
 import { UpdateResult } from "../query-builder/result/UpdateResult";
 import { DeleteResult } from "../query-builder/result/DeleteResult";
 import { EntityMetadata } from "../metadata/EntityMetadata";
-import { FindOptionsWhere } from "../find-options/FindOptionsWhere";
-import { FindOptionsSelect, FindOptionsSelectByString } from "../find-options/FindOptionsSelect";
+import { BulkWriteResult, AggregationCursor, Collection, FindCursor, Document, AggregateOptions, AnyBulkWriteOperation, BulkWriteOptions, Filter, CountOptions, IndexSpecification, CreateIndexesOptions, IndexDescription, DeleteResult as DeleteResultMongoDb, DeleteOptions, CommandOperationOptions, FindOneAndDeleteOptions, FindOneAndReplaceOptions, UpdateFilter, FindOneAndUpdateOptions, RenameOptions, ReplaceOptions, UpdateResult as UpdateResultMongoDb, CollStats, CollStatsOptions, ChangeStreamOptions, ChangeStream, UpdateOptions, ListIndexesOptions, ListIndexesCursor, OptionalId, InsertOneOptions, InsertOneResult, InsertManyResult, UnorderedBulkOperation, OrderedBulkOperation, IndexInformationOptions, ObjectId, FilterOperators } from "../driver/mongodb/typings";
+import { DataSource } from "../data-source/DataSource";
 import { MongoFindManyOptions } from "../find-options/mongodb/MongoFindManyOptions";
 import { MongoFindOneOptions } from "../find-options/mongodb/MongoFindOneOptions";
+import { FindOptionsSelect, FindOptionsSelectByString } from "../find-options/FindOptionsSelect";
 import { ColumnMetadata } from "../metadata/ColumnMetadata";
 /**
  * Entity manager supposed to work with any entity, automatically find its repository and call its methods,
@@ -27,13 +27,14 @@ export declare class MongoEntityManager extends EntityManager {
     /**
      * Finds entities that match given find options.
      */
-    find<Entity>(entityClassOrName: EntityTarget<Entity>, options?: MongoFindManyOptions<Entity>): Promise<Entity[]>;
     /**
-     * Finds entities that match given conditions.
+     * Finds entities that match given find options or conditions.
      */
-    findBy<Entity>(entityClassOrName: EntityTarget<Entity>, where: any): Promise<Entity[]>;
+    find<Entity>(entityClassOrName: EntityTarget<Entity>, optionsOrConditions?: FindManyOptions<Entity> | Partial<Entity> | FilterOperators<Entity>): Promise<Entity[]>;
     /**
-     * Finds entities that match given find options.
+     * Finds entities that match given find options or conditions.
+     * Also counts all entities that match given conditions,
+     * but ignores pagination settings (from and take options).
      */
     findAndCount<Entity>(entityClassOrName: EntityTarget<Entity>, options?: MongoFindManyOptions<Entity>): Promise<[Entity[], number]>;
     /**
@@ -46,9 +47,9 @@ export declare class MongoEntityManager extends EntityManager {
      *
      * @deprecated use `findBy` method instead.
      */
-    findByIds<Entity>(entityClassOrName: EntityTarget<Entity>, ids: any[], optionsOrConditions?: any): Promise<Entity[]>;
+    findByIds<Entity>(entityClassOrName: EntityTarget<Entity>, ids: any[], optionsOrConditions?: FindManyOptions<Entity> | Partial<Entity>): Promise<Entity[]>;
     /**
-     * Finds first entity that matches given find options.
+     * Finds first entity that matches given conditions and/or find options.
      */
     findOne<Entity>(entityClassOrName: EntityTarget<Entity>, options: MongoFindOneOptions<Entity>): Promise<Entity | null>;
     /**
@@ -64,7 +65,7 @@ export declare class MongoEntityManager extends EntityManager {
      *     id: 1 // where "id" is your primary column name
      * })
      */
-    findOneById<Entity>(entityClassOrName: EntityTarget<Entity>, id: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[]): Promise<Entity | null>;
+    findOneById<Entity>(entityClassOrName: EntityTarget<Entity>, id: string | number | Date | ObjectId): Promise<Entity | null>;
     /**
      * Inserts a given entity into the database.
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
@@ -79,72 +80,70 @@ export declare class MongoEntityManager extends EntityManager {
      * Executes fast and efficient UPDATE query.
      * Does not check if entity exist in the database.
      */
-    update<Entity>(target: EntityTarget<Entity>, criteria: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindOptionsWhere<Entity>, partialEntity: QueryDeepPartialEntity<Entity>): Promise<UpdateResult>;
+    update<Entity>(target: EntityTarget<Entity>, criteria: string | string[] | number | number[] | Date | Date[] | ObjectId | ObjectId[] | ObjectLiteral, partialEntity: QueryDeepPartialEntity<Entity>): Promise<UpdateResult>;
     /**
      * Deletes entities by a given conditions.
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
      * Executes fast and efficient DELETE query.
      * Does not check if entity exist in the database.
      */
-    delete<Entity>(target: EntityTarget<Entity>, criteria: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindOptionsWhere<Entity>): Promise<DeleteResult>;
+    delete<Entity>(target: EntityTarget<Entity>, criteria: string | string[] | number | number[] | Date | Date[] | ObjectId | ObjectId[] | ObjectLiteral[]): Promise<DeleteResult>;
     /**
      * Creates a cursor for a query that can be used to iterate over results from MongoDB.
      */
-    createCursor<Entity, T = any>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral): Cursor<T>;
+    createCursor<Entity, T = any>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral): FindCursor<T>;
     /**
      * Creates a cursor for a query that can be used to iterate over results from MongoDB.
      * This returns modified version of cursor that transforms each result into Entity model.
      */
-    createEntityCursor<Entity>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral): Cursor<Entity>;
+    createEntityCursor<Entity>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral): FindCursor<Entity>;
     /**
      * Execute an aggregation framework pipeline against the collection.
      */
-    aggregate<Entity, R = any>(entityClassOrName: EntityTarget<Entity>, pipeline: ObjectLiteral[], options?: CollectionAggregationOptions): AggregationCursor<R>;
+    aggregate<Entity, R = any>(entityClassOrName: EntityTarget<Entity>, pipeline: Document[], options?: AggregateOptions): AggregationCursor<R>;
     /**
      * Execute an aggregation framework pipeline against the collection.
      * This returns modified version of cursor that transforms each result into Entity model.
      */
-    aggregateEntity<Entity>(entityClassOrName: EntityTarget<Entity>, pipeline: ObjectLiteral[], options?: CollectionAggregationOptions): AggregationCursor<Entity>;
+    aggregateEntity<Entity>(entityClassOrName: EntityTarget<Entity>, pipeline: Document[], options?: AggregateOptions): AggregationCursor<Entity>;
     /**
      * Perform a bulkWrite operation without a fluent API.
      */
-    bulkWrite<Entity>(entityClassOrName: EntityTarget<Entity>, operations: ObjectLiteral[], options?: CollectionBulkWriteOptions): Promise<BulkWriteOpResultObject>;
+    bulkWrite<Entity>(entityClassOrName: EntityTarget<Entity>, operations: AnyBulkWriteOperation<Document>[], options?: BulkWriteOptions): Promise<BulkWriteResult>;
     /**
      * Count number of matching documents in the db to a query.
      */
-    count<Entity>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral, options?: MongoCountPreferences): Promise<number>;
+    count<Entity>(entityClassOrName: EntityTarget<Entity>, query?: Filter<Document>, options?: CountOptions): Promise<number>;
     /**
      * Count number of matching documents in the db to a query.
      */
-    countBy<Entity>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral, options?: MongoCountPreferences): Promise<number>;
+    countBy<Entity>(entityClassOrName: EntityTarget<Entity>, query?: ObjectLiteral, options?: CountOptions): Promise<number>;
     /**
      * Creates an index on the db and collection.
      */
-    createCollectionIndex<Entity>(entityClassOrName: EntityTarget<Entity>, fieldOrSpec: string | any, options?: MongodbIndexOptions): Promise<string>;
+    createCollectionIndex<Entity>(entityClassOrName: EntityTarget<Entity>, fieldOrSpec: IndexSpecification, options?: CreateIndexesOptions): Promise<string>;
     /**
      * Creates multiple indexes in the collection, this method is only supported for MongoDB 2.6 or higher.
      * Earlier version of MongoDB will throw a command not supported error.
      * Index specifications are defined at http://docs.mongodb.org/manual/reference/command/createIndexes/.
      */
-    createCollectionIndexes<Entity>(entityClassOrName: EntityTarget<Entity>, indexSpecs: ObjectLiteral[]): Promise<void>;
+    createCollectionIndexes<Entity>(entityClassOrName: EntityTarget<Entity>, indexSpecs: IndexDescription[]): Promise<string[]>;
     /**
      * Delete multiple documents on MongoDB.
      */
-    deleteMany<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, options?: CollectionOptions): Promise<DeleteWriteOpResultObject>;
+    deleteMany<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, options?: DeleteOptions): Promise<DeleteResultMongoDb>;
     /**
      * Delete a document on MongoDB.
      */
-    deleteOne<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, options?: CollectionOptions): Promise<DeleteWriteOpResultObject>;
+    deleteOne<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, options?: DeleteOptions): Promise<DeleteResultMongoDb>;
     /**
      * The distinct command returns returns a list of distinct values for the given key across a collection.
      */
-    distinct<Entity>(entityClassOrName: EntityTarget<Entity>, key: string, query: ObjectLiteral, options?: {
-        readPreference?: ReadPreference | string;
-    }): Promise<any>;
+    distinct<Entity>(entityClassOrName: EntityTarget<Entity>, key: string, query: Filter<Document>, options?: CommandOperationOptions): Promise<any>;
     /**
      * Drops an index from this collection.
      */
-    dropCollectionIndex<Entity>(entityClassOrName: EntityTarget<Entity>, indexName: string, options?: CollectionOptions): Promise<any>;
+    dropCollectionIndex<Entity>(entityClassOrName: EntityTarget<Entity>, indexName: string, options?: CommandOperationOptions): Promise<any>;
     /**
      * Drops all indexes from the collection.
      */
@@ -152,37 +151,19 @@ export declare class MongoEntityManager extends EntityManager {
     /**
      * Find a document and delete it in one atomic operation, requires a write lock for the duration of the operation.
      */
-    findOneAndDelete<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, options?: {
-        projection?: Object;
-        sort?: Object;
-        maxTimeMS?: number;
-    }): Promise<FindAndModifyWriteOpResultObject>;
+    findOneAndDelete<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, options?: FindOneAndDeleteOptions): Promise<Document>;
     /**
      * Find a document and replace it in one atomic operation, requires a write lock for the duration of the operation.
      */
-    findOneAndReplace<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
+    findOneAndReplace<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, replacement: Document, options?: FindOneAndReplaceOptions): Promise<Document>;
     /**
      * Find a document and update it in one atomic operation, requires a write lock for the duration of the operation.
      */
-    findOneAndUpdate<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
-    /**
-     * Execute a geo search using a geo haystack index on a collection.
-     */
-    geoHaystackSearch<Entity>(entityClassOrName: EntityTarget<Entity>, x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
-    /**
-     * Execute the geoNear command to search for items in the collection.
-     */
-    geoNear<Entity>(entityClassOrName: EntityTarget<Entity>, x: number, y: number, options?: GeoNearOptions): Promise<any>;
-    /**
-     * Run a group command across a collection.
-     */
-    group<Entity>(entityClassOrName: EntityTarget<Entity>, keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options?: {
-        readPreference?: ReadPreference | string;
-    }): Promise<any>;
+    findOneAndUpdate<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, update: UpdateFilter<Document>, options?: FindOneAndUpdateOptions): Promise<Document>;
     /**
      * Retrieve all the indexes on the collection.
      */
-    collectionIndexes<Entity>(entityClassOrName: EntityTarget<Entity>): Promise<any>;
+    collectionIndexes<Entity>(entityClassOrName: EntityTarget<Entity>): Promise<Document>;
     /**
      * Retrieve all the indexes on the collection.
      */
@@ -190,25 +171,23 @@ export declare class MongoEntityManager extends EntityManager {
     /**
      * Retrieves this collections index info.
      */
-    collectionIndexInformation<Entity>(entityClassOrName: EntityTarget<Entity>, options?: {
-        full: boolean;
-    }): Promise<any>;
+    collectionIndexInformation<Entity>(entityClassOrName: EntityTarget<Entity>, options?: IndexInformationOptions): Promise<any>;
     /**
      * Initiate an In order bulk write operation, operations will be serially executed in the order they are added, creating a new operation for each switch in types.
      */
-    initializeOrderedBulkOp<Entity>(entityClassOrName: EntityTarget<Entity>, options?: CollectionOptions): OrderedBulkOperation;
+    initializeOrderedBulkOp<Entity>(entityClassOrName: EntityTarget<Entity>, options?: BulkWriteOptions): OrderedBulkOperation;
     /**
      * Initiate a Out of order batch write operation. All operations will be buffered into insert/update/remove commands executed out of order.
      */
-    initializeUnorderedBulkOp<Entity>(entityClassOrName: EntityTarget<Entity>, options?: CollectionOptions): UnorderedBulkOperation;
+    initializeUnorderedBulkOp<Entity>(entityClassOrName: EntityTarget<Entity>, options?: BulkWriteOptions): UnorderedBulkOperation;
     /**
      * Inserts an array of documents into MongoDB.
      */
-    insertMany<Entity>(entityClassOrName: EntityTarget<Entity>, docs: ObjectLiteral[], options?: CollectionInsertManyOptions): Promise<InsertWriteOpResult>;
+    insertMany<Entity>(entityClassOrName: EntityTarget<Entity>, docs: OptionalId<Document>[], options?: BulkWriteOptions): Promise<InsertManyResult>;
     /**
      * Inserts a single document into MongoDB.
      */
-    insertOne<Entity>(entityClassOrName: EntityTarget<Entity>, doc: ObjectLiteral, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
+    insertOne<Entity>(entityClassOrName: EntityTarget<Entity>, doc: OptionalId<Document>, options?: InsertOneOptions): Promise<InsertOneResult>;
     /**
      * Returns if the collection is a capped collection.
      */
@@ -216,57 +195,32 @@ export declare class MongoEntityManager extends EntityManager {
     /**
      * Get the list of all indexes information for the collection.
      */
-    listCollectionIndexes<Entity>(entityClassOrName: EntityTarget<Entity>, options?: {
-        batchSize?: number;
-        readPreference?: ReadPreference | string;
-    }): CommandCursor;
-    /**
-     * Run Map Reduce across a collection. Be aware that the inline option for out will return an array of results not a collection.
-     */
-    mapReduce<Entity>(entityClassOrName: EntityTarget<Entity>, map: Function | string, reduce: Function | string, options?: MapReduceOptions): Promise<any>;
-    /**
-     * Return N number of parallel cursors for a collection allowing parallel reading of entire collection.
-     * There are no ordering guarantees for returned results.
-     */
-    parallelCollectionScan<Entity>(entityClassOrName: EntityTarget<Entity>, options?: ParallelCollectionScanOptions): Promise<Cursor<Entity>[]>;
-    /**
-     * Reindex all indexes on the collection Warning: reIndex is a blocking operation (indexes are rebuilt in the foreground) and will be slow for large collections.
-     */
-    reIndex<Entity>(entityClassOrName: EntityTarget<Entity>): Promise<any>;
+    listCollectionIndexes<Entity>(entityClassOrName: EntityTarget<Entity>, options?: ListIndexesOptions): ListIndexesCursor;
     /**
      * Reindex all indexes on the collection Warning: reIndex is a blocking operation (indexes are rebuilt in the foreground) and will be slow for large collections.
      */
-    rename<Entity>(entityClassOrName: EntityTarget<Entity>, newName: string, options?: {
-        dropTarget?: boolean;
-    }): Promise<Collection<any>>;
+    rename<Entity>(entityClassOrName: EntityTarget<Entity>, newName: string, options?: RenameOptions): Promise<Collection<Document>>;
     /**
      * Replace a document on MongoDB.
      */
-    replaceOne<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, doc: ObjectLiteral, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    replaceOne<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, doc: Document, options?: ReplaceOptions): Promise<Document | UpdateResultMongoDb>;
     /**
      * Get all the collection statistics.
      */
-    stats<Entity>(entityClassOrName: EntityTarget<Entity>, options?: {
-        scale: number;
-    }): Promise<CollStats>;
-    watch<Entity>(entityClassOrName: EntityTarget<Entity>, pipeline?: Object[], options?: ChangeStreamOptions): ChangeStream;
+    stats<Entity>(entityClassOrName: EntityTarget<Entity>, options?: CollStatsOptions): Promise<CollStats>;
+    watch<Entity>(entityClassOrName: EntityTarget<Entity>, pipeline?: Document[], options?: ChangeStreamOptions): ChangeStream;
     /**
      * Update multiple documents on MongoDB.
      */
-    updateMany<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, update: ObjectLiteral, options?: {
-        upsert?: boolean;
-        w?: any;
-        wtimeout?: number;
-        j?: boolean;
-    }): Promise<UpdateWriteOpResult>;
+    updateMany<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, update: UpdateFilter<Document>, options?: UpdateOptions): Promise<Document | UpdateResultMongoDb>;
     /**
      * Update a single document on MongoDB.
      */
-    updateOne<Entity>(entityClassOrName: EntityTarget<Entity>, query: ObjectLiteral, update: ObjectLiteral, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    updateOne<Entity>(entityClassOrName: EntityTarget<Entity>, query: Filter<Document>, update: UpdateFilter<Document>, options?: UpdateOptions): Promise<Document | UpdateResultMongoDb>;
     /**
      * Converts FindManyOptions to mongodb query.
      */
-    protected convertFindManyOptionsOrConditionsToMongodbQuery<Entity>(optionsOrConditions: MongoFindManyOptions<Entity> | Partial<Entity> | any[] | undefined): ObjectLiteral | undefined;
+    protected convertFindManyOptionsOrConditionsToMongodbQuery<Entity>(optionsOrConditions: MongoFindManyOptions<Entity> | Partial<Entity> | FilterOperators<Entity> | any[] | undefined): ObjectLiteral | undefined;
     /**
      * Converts FindOneOptions to mongodb query.
      */
@@ -286,8 +240,8 @@ export declare class MongoEntityManager extends EntityManager {
     /**
      * Overrides cursor's toArray and next methods to convert results to entity automatically.
      */
-    protected applyEntityTransformationToCursor<Entity extends ObjectLiteral>(metadata: EntityMetadata, cursor: Cursor<Entity> | AggregationCursor<Entity>): void;
-    protected filterSoftDeleted<Entity>(cursor: Cursor<Entity>, deleteDateColumn: ColumnMetadata, query?: ObjectLiteral): void;
+    protected applyEntityTransformationToCursor<Entity extends ObjectLiteral>(metadata: EntityMetadata, cursor: FindCursor<Entity> | AggregationCursor<Entity>): void;
+    protected filterSoftDeleted<Entity>(cursor: FindCursor<Entity>, deleteDateColumn: ColumnMetadata, query?: ObjectLiteral): void;
     /**
      * Finds first entity that matches given conditions and/or find options.
      */

package/entity-manager/MongoEntityManager.js

@@ -8,6 +8,7 @@ const PlatformTools_1 = require("../platform/PlatformTools");
 const InsertResult_1 = require("../query-builder/result/InsertResult");
 const UpdateResult_1 = require("../query-builder/result/UpdateResult");
 const DeleteResult_1 = require("../query-builder/result/DeleteResult");
+const typings_1 = require("../driver/mongodb/typings");
 const ObjectUtils_1 = require("../util/ObjectUtils");
 /**
  * Entity manager supposed to work with any entity, automatically find its repository and call its methods,
@@ -33,17 +34,35 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Finds entities that match given find options.
      */
-    async find(entityClassOrName, options) {
-        return this.executeFind(entityClassOrName, options);
-    }
     /**
-     * Finds entities that match given conditions.
+     * Finds entities that match given find options or conditions.
      */
-    async findBy(entityClassOrName, where) {
-        return this.executeFind(entityClassOrName, where);
+    async find(entityClassOrName, optionsOrConditions) {
+        const query = this.convertFindManyOptionsOrConditionsToMongodbQuery(optionsOrConditions);
+        const cursor = this.createEntityCursor(entityClassOrName, query);
+        const deleteDateColumn = this.connection.getMetadata(entityClassOrName).deleteDateColumn;
+        if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
+            if (optionsOrConditions.select)
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
+            if (optionsOrConditions.skip)
+                cursor.skip(optionsOrConditions.skip);
+            if (optionsOrConditions.take)
+                cursor.limit(optionsOrConditions.take);
+            if (optionsOrConditions.order)
+                cursor.sort(this.convertFindOptionsOrderToOrderCriteria(optionsOrConditions.order));
+            if (deleteDateColumn && !optionsOrConditions.withDeleted) {
+                this.filterSoftDeleted(cursor, deleteDateColumn, query);
+            }
+        }
+        else if (deleteDateColumn) {
+            this.filterSoftDeleted(cursor, deleteDateColumn, query);
+        }
+        return cursor.toArray();
     }
     /**
-     * Finds entities that match given find options.
+     * Finds entities that match given find options or conditions.
+     * Also counts all entities that match given conditions,
+     * but ignores pagination settings (from and take options).
      */
     async findAndCount(entityClassOrName, options) {
         return this.executeFindAndCount(entityClassOrName, options);
@@ -63,13 +82,13 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     async findByIds(entityClassOrName, ids, optionsOrConditions) {
         const metadata = this.connection.getMetadata(entityClassOrName);
         const query = this.convertFindManyOptionsOrConditionsToMongodbQuery(optionsOrConditions) || {};
-        const objectIdInstance = PlatformTools_1.PlatformTools.load("mongodb").ObjectID;
+        const objectIdInstance = PlatformTools_1.PlatformTools.load("mongodb").ObjectId;
         query["_id"] = {
             $in: ids.map((id) => {
                 if (typeof id === "string") {
                     return new objectIdInstance(id);
                 }
-                if (ObjectUtils_1.ObjectUtils.isObject(id)) {
+                if (typeof id === "object") {
                     if (id instanceof objectIdInstance) {
                         return id;
                     }
@@ -80,8 +99,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
                 }
             }),
         };
-        const cursor = await this.createEntityCursor(entityClassOrName, query);
-        const deleteDateColumn = this.connection.getMetadata(entityClassOrName).deleteDateColumn;
+        const cursor = this.createEntityCursor(entityClassOrName, query);
         if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
             if (optionsOrConditions.select)
                 cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
@@ -91,17 +109,11 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
                 cursor.limit(optionsOrConditions.take);
             if (optionsOrConditions.order)
                 cursor.sort(this.convertFindOptionsOrderToOrderCriteria(optionsOrConditions.order));
-            if (deleteDateColumn && !optionsOrConditions.withDeleted) {
-                this.filterSoftDeleted(cursor, deleteDateColumn, query);
-            }
-        }
-        else if (deleteDateColumn) {
-            this.filterSoftDeleted(cursor, deleteDateColumn, query);
         }
-        return await cursor.toArray();
+        return cursor.toArray();
     }
     /**
-     * Finds first entity that matches given find options.
+     * Finds first entity that matches given conditions and/or find options.
      */
     async findOne(entityClassOrName, options) {
         return this.executeFindOne(entityClassOrName, options);
@@ -205,7 +217,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Creates a cursor for a query that can be used to iterate over results from MongoDB.
      */
-    createCursor(entityClassOrName, query) {
+    createCursor(entityClassOrName, query = {}) {
         const metadata = this.connection.getMetadata(entityClassOrName);
         return this.mongoQueryRunner.cursor(metadata.tableName, query);
     }
@@ -213,7 +225,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * Creates a cursor for a query that can be used to iterate over results from MongoDB.
      * This returns modified version of cursor that transforms each result into Entity model.
      */
-    createEntityCursor(entityClassOrName, query) {
+    createEntityCursor(entityClassOrName, query = {}) {
         const metadata = this.connection.getMetadata(entityClassOrName);
         const cursor = this.createCursor(entityClassOrName, query);
         this.applyEntityTransformationToCursor(metadata, cursor);
@@ -246,7 +258,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Count number of matching documents in the db to a query.
      */
-    count(entityClassOrName, query, options) {
+    count(entityClassOrName, query = {}, options = {}) {
         const metadata = this.connection.getMetadata(entityClassOrName);
         return this.mongoQueryRunner.count(metadata.tableName, query, options);
     }
@@ -275,14 +287,14 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Delete multiple documents on MongoDB.
      */
-    deleteMany(entityClassOrName, query, options) {
+    deleteMany(entityClassOrName, query, options = {}) {
         const metadata = this.connection.getMetadata(entityClassOrName);
         return this.mongoQueryRunner.deleteMany(metadata.tableName, query, options);
     }
     /**
      * Delete a document on MongoDB.
      */
-    deleteOne(entityClassOrName, query, options) {
+    deleteOne(entityClassOrName, query, options = {}) {
         const metadata = this.connection.getMetadata(entityClassOrName);
         return this.mongoQueryRunner.deleteOne(metadata.tableName, query, options);
     }
@@ -328,27 +340,6 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const metadata = this.connection.getMetadata(entityClassOrName);
         return this.mongoQueryRunner.findOneAndUpdate(metadata.tableName, query, update, options);
     }
-    /**
-     * Execute a geo search using a geo haystack index on a collection.
-     */
-    geoHaystackSearch(entityClassOrName, x, y, options) {
-        const metadata = this.connection.getMetadata(entityClassOrName);
-        return this.mongoQueryRunner.geoHaystackSearch(metadata.tableName, x, y, options);
-    }
-    /**
-     * Execute the geoNear command to search for items in the collection.
-     */
-    geoNear(entityClassOrName, x, y, options) {
-        const metadata = this.connection.getMetadata(entityClassOrName);
-        return this.mongoQueryRunner.geoNear(metadata.tableName, x, y, options);
-    }
-    /**
-     * Run a group command across a collection.
-     */
-    group(entityClassOrName, keys, condition, initial, reduce, finalize, command, options) {
-        const metadata = this.connection.getMetadata(entityClassOrName);
-        return this.mongoQueryRunner.group(metadata.tableName, keys, condition, initial, reduce, finalize, command, options);
-    }
     /**
      * Retrieve all the indexes on the collection.
      */
@@ -412,28 +403,6 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const metadata = this.connection.getMetadata(entityClassOrName);
         return this.mongoQueryRunner.listCollectionIndexes(metadata.tableName, options);
     }
-    /**
-     * Run Map Reduce across a collection. Be aware that the inline option for out will return an array of results not a collection.
-     */
-    mapReduce(entityClassOrName, map, reduce, options) {
-        const metadata = this.connection.getMetadata(entityClassOrName);
-        return this.mongoQueryRunner.mapReduce(metadata.tableName, map, reduce, options);
-    }
-    /**
-     * Return N number of parallel cursors for a collection allowing parallel reading of entire collection.
-     * There are no ordering guarantees for returned results.
-     */
-    parallelCollectionScan(entityClassOrName, options) {
-        const metadata = this.connection.getMetadata(entityClassOrName);
-        return this.mongoQueryRunner.parallelCollectionScan(metadata.tableName, options);
-    }
-    /**
-     * Reindex all indexes on the collection Warning: reIndex is a blocking operation (indexes are rebuilt in the foreground) and will be slow for large collections.
-     */
-    reIndex(entityClassOrName) {
-        const metadata = this.connection.getMetadata(entityClassOrName);
-        return this.mongoQueryRunner.reIndex(metadata.tableName);
-    }
     /**
      * Reindex all indexes on the collection Warning: reIndex is a blocking operation (indexes are rebuilt in the foreground) and will be slow for large collections.
      */
@@ -541,7 +510,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * Ensures given id is an id for query.
      */
     convertMixedCriteria(metadata, idMap) {
-        const objectIdInstance = PlatformTools_1.PlatformTools.load("mongodb").ObjectID;
+        const objectIdInstance = PlatformTools_1.PlatformTools.load("mongodb").ObjectId;
         // check first if it's ObjectId compatible:
         // string, number, Buffer, ObjectId or ObjectId-like
         if (objectIdInstance.isValid(idMap)) {
@@ -559,7 +528,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
                 return query;
             }, {});
         }
-        // last resort: try to convert it to an ObjectID anyway
+        // last resort: try to convert it to an ObjectId anyway
         // most likely it will fail, but we want to be backwards compatible and keep the same thrown Errors.
         // it can still pass with null/undefined
         return {
@@ -570,68 +539,32 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * Overrides cursor's toArray and next methods to convert results to entity automatically.
      */
     applyEntityTransformationToCursor(metadata, cursor) {
-        // mongdb-3.7 exports Cursor, mongodb-4.2 exports FindCursor, provide support for both.
-        const ParentCursor = PlatformTools_1.PlatformTools.load("mongodb").Cursor ||
-            PlatformTools_1.PlatformTools.load("mongodb").FindCursor;
         const queryRunner = this.mongoQueryRunner;
-        cursor.toArray = function (callback) {
-            if (callback) {
-                ParentCursor.prototype.toArray.call(this, (error, results) => {
-                    if (error) {
-                        callback(error, results);
-                        return;
-                    }
-                    const transformer = new DocumentToEntityTransformer_1.DocumentToEntityTransformer();
-                    const entities = transformer.transformAll(results, metadata);
-                    // broadcast "load" events
-                    queryRunner.broadcaster
-                        .broadcast("Load", metadata, entities)
-                        .then(() => callback(error, entities));
-                });
-            }
-            else {
-                return ParentCursor.prototype.toArray
-                    .call(this)
-                    .then((results) => {
-                    const transformer = new DocumentToEntityTransformer_1.DocumentToEntityTransformer();
-                    const entities = transformer.transformAll(results, metadata);
-                    // broadcast "load" events
-                    return queryRunner.broadcaster
-                        .broadcast("Load", metadata, entities)
-                        .then(() => entities);
-                });
-            }
-        };
-        cursor.next = function (callback) {
-            if (callback) {
-                ParentCursor.prototype.next.call(this, (error, result) => {
-                    if (error || !result) {
-                        callback(error, result);
-                        return;
-                    }
-                    const transformer = new DocumentToEntityTransformer_1.DocumentToEntityTransformer();
-                    const entity = transformer.transform(result, metadata);
-                    // broadcast "load" events
-                    queryRunner.broadcaster
-                        .broadcast("Load", metadata, [entity])
-                        .then(() => callback(error, entity));
-                });
-            }
-            else {
-                return ParentCursor.prototype.next
-                    .call(this)
-                    .then((result) => {
-                    if (!result)
-                        return result;
-                    const transformer = new DocumentToEntityTransformer_1.DocumentToEntityTransformer();
-                    const entity = transformer.transform(result, metadata);
-                    // broadcast "load" events
-                    return queryRunner.broadcaster
-                        .broadcast("Load", metadata, [entity])
-                        .then(() => entity);
-                });
+        cursor.toArray = () => cursor
+            .clone()
+            .toArray()
+            .then(async (results) => {
+            const transformer = new DocumentToEntityTransformer_1.DocumentToEntityTransformer();
+            const entities = transformer.transformAll(results, metadata);
+            // broadcast "load" events
+            await queryRunner.broadcaster.broadcast("Load", metadata, entities);
+            return entities;
+        });
+        cursor.next = () => cursor
+            .clone()
+            .next()
+            .then(async (result) => {
+            if (!result) {
+                return result;
             }
-        };
+            const transformer = new DocumentToEntityTransformer_1.DocumentToEntityTransformer();
+            const entity = transformer.transform(result, metadata);
+            // broadcast "load" events
+            await queryRunner.broadcaster.broadcast("Load", metadata, [
+                entity,
+            ]);
+            return entity;
+        });
     }
     filterSoftDeleted(cursor, deleteDateColumn, query) {
         const { $or, ...restQuery } = query !== null && query !== void 0 ? query : {};
@@ -647,7 +580,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * Finds first entity that matches given conditions and/or find options.
      */
     async executeFindOne(entityClassOrName, optionsOrConditions, maybeOptions) {
-        const objectIdInstance = PlatformTools_1.PlatformTools.load("mongodb").ObjectID;
+        const objectIdInstance = PlatformTools_1.PlatformTools.load("mongodb").ObjectId;
         const id = optionsOrConditions instanceof objectIdInstance ||
             typeof optionsOrConditions === "string"
             ? optionsOrConditions
@@ -656,9 +589,9 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const query = this.convertFindOneOptionsOrConditionsToMongodbQuery(findOneOptionsOrConditions) || {};
         if (id) {
             query["_id"] =
-                id instanceof objectIdInstance ? id : new objectIdInstance(id);
+                id instanceof objectIdInstance ? id : new typings_1.ObjectId(id);
         }
-        const cursor = await this.createEntityCursor(entityClassOrName, query);
+        const cursor = this.createEntityCursor(entityClassOrName, query);
         const deleteDateColumn = this.connection.getMetadata(entityClassOrName).deleteDateColumn;
         if (FindOptionsUtils_1.FindOptionsUtils.isFindOneOptions(findOneOptionsOrConditions)) {
             if (findOneOptionsOrConditions.select)
@@ -678,7 +611,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     async executeFind(entityClassOrName, optionsOrConditions) {
         const query = this.convertFindManyOptionsOrConditionsToMongodbQuery(optionsOrConditions);
-        const cursor = await this.createEntityCursor(entityClassOrName, query);
+        const cursor = this.createEntityCursor(entityClassOrName, query);
         const deleteDateColumn = this.connection.getMetadata(entityClassOrName).deleteDateColumn;
         if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
             if (optionsOrConditions.select)