typeorm 1.0.0-beta.1 → 1.0.0-beta.2

package/browser/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 error_1 = require("../error");
 const ObjectUtils_1 = require("../util/ObjectUtils");
 /**
  * Entity manager supposed to work with any entity, automatically find its repository and call its methods,
@@ -35,6 +36,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      */
     /**
      * Finds entities that match given find options or conditions.
+     *
      * @param entityClassOrName
      * @param optionsOrConditions
      */
@@ -45,7 +47,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const deleteDateColumn = metadata.deleteDateColumn;
         if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
             if (optionsOrConditions.select)
-                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select, metadata));
             if (optionsOrConditions.skip)
                 cursor.skip(optionsOrConditions.skip);
             if (optionsOrConditions.take)
@@ -65,6 +67,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * 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).
+     *
      * @param entityClassOrName
      * @param options
      */
@@ -73,6 +76,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Finds entities that match given where conditions.
+     *
      * @param entityClassOrName
      * @param where
      */
@@ -81,6 +85,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Finds entities that match given WHERE conditions.
+     *
      * @param entityClassOrName
      * @param where
      */
@@ -90,13 +95,14 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Finds entities by ids.
      * Optionally find options can be applied.
+     *
      * @param entityClassOrName
      * @param ids
      * @param optionsOrConditions
      */
     async findByIds(entityClassOrName, ids, optionsOrConditions) {
         const metadata = this.dataSource.getMetadata(entityClassOrName);
-        const query = this.convertFindManyOptionsOrConditionsToMongodbQuery(optionsOrConditions) || {};
+        const query = this.convertFindManyOptionsOrConditionsToMongodbQuery(optionsOrConditions) ?? {};
         const objectIdClass = PlatformTools_1.PlatformTools.load("mongodb").ObjectId;
         query["_id"] = {
             $in: ids.map((id) => {
@@ -117,7 +123,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const cursor = this.createEntityCursor(entityClassOrName, query);
         if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
             if (optionsOrConditions.select)
-                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select, metadata));
             if (optionsOrConditions.skip)
                 cursor.skip(optionsOrConditions.skip);
             if (optionsOrConditions.take)
@@ -129,6 +135,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Finds first entity that matches given conditions and/or find options.
+     *
      * @param entityClassOrName
      * @param options
      */
@@ -137,6 +144,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Finds first entity that matches given WHERE conditions.
+     *
      * @param entityClassOrName
      * @param where
      */
@@ -149,6 +157,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * Executes fast and efficient INSERT query.
      * Does not check if entity exist in the database, so query will fail if duplicate entity is being inserted.
      * You can execute bulk inserts using this method.
+     *
      * @param target
      * @param entity
      */
@@ -175,6 +184,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
      * Executes fast and efficient UPDATE query.
      * Does not check if entity exist in the database.
+     *
      * @param target
      * @param criteria
      * @param partialEntity
@@ -187,7 +197,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
             }));
             result.raw = updateResults.map((r) => r.raw);
             result.affected = updateResults
-                .map((r) => r.affected || 0)
+                .map((r) => r.affected ?? 0)
                 .reduce((c, r) => c + r, 0);
             result.generatedMaps = updateResults.reduce((c, r) => c.concat(r.generatedMaps), []);
         }
@@ -204,6 +214,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * 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.
+     *
      * @param target
      * @param criteria
      */
@@ -215,7 +226,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
             }));
             result.raw = deleteResults.map((r) => r.raw);
             result.affected = deleteResults
-                .map((r) => r.affected || 0)
+                .map((r) => r.affected ?? 0)
                 .reduce((c, r) => c + r, 0);
         }
         else {
@@ -230,6 +241,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     // -------------------------------------------------------------------------
     /**
      * Creates a cursor for a query that can be used to iterate over results from MongoDB.
+     *
      * @param entityClassOrName
      * @param query
      */
@@ -240,6 +252,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.
+     *
      * @param entityClassOrName
      * @param query
      */
@@ -251,6 +264,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Execute an aggregation framework pipeline against the collection.
+     *
      * @param entityClassOrName
      * @param pipeline
      * @param options
@@ -262,6 +276,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Execute an aggregation framework pipeline against the collection.
      * This returns modified version of cursor that transforms each result into Entity model.
+     *
      * @param entityClassOrName
      * @param pipeline
      * @param options
@@ -274,6 +289,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Perform a bulkWrite operation without a fluent API.
+     *
      * @param entityClassOrName
      * @param operations
      * @param options
@@ -284,6 +300,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Count number of matching documents in the db to a query.
+     *
      * @param entityClassOrName
      * @param query
      * @param options
@@ -294,6 +311,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Count number of matching documents in the db to a query.
+     *
      * @param entityClassOrName
      * @param query
      * @param options
@@ -304,6 +322,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Count number of matching documents in the db to a query.
+     *
      * @param entityClassOrName
      * @param query
      * @param options
@@ -313,6 +332,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Creates an index on the db and collection.
+     *
      * @param entityClassOrName
      * @param fieldOrSpec
      * @param options
@@ -325,6 +345,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
      * 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/.
+     *
      * @param entityClassOrName
      * @param indexSpecs
      */
@@ -334,6 +355,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Delete multiple documents on MongoDB.
+     *
      * @param entityClassOrName
      * @param query
      * @param options
@@ -344,6 +366,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Delete a document on MongoDB.
+     *
      * @param entityClassOrName
      * @param query
      * @param options
@@ -354,6 +377,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * The distinct command returns returns a list of distinct values for the given key across a collection.
+     *
      * @param entityClassOrName
      * @param key
      * @param query
@@ -365,6 +389,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Drops an index from this collection.
+     *
      * @param entityClassOrName
      * @param indexName
      * @param options
@@ -375,6 +400,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Drops all indexes from the collection.
+     *
      * @param entityClassOrName
      */
     dropCollectionIndexes(entityClassOrName) {
@@ -383,6 +409,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Find a document and delete it in one atomic operation, requires a write lock for the duration of the operation.
+     *
      * @param entityClassOrName
      * @param query
      * @param options
@@ -393,6 +420,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Find a document and replace it in one atomic operation, requires a write lock for the duration of the operation.
+     *
      * @param entityClassOrName
      * @param query
      * @param replacement
@@ -404,6 +432,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Find a document and update it in one atomic operation, requires a write lock for the duration of the operation.
+     *
      * @param entityClassOrName
      * @param query
      * @param update
@@ -415,6 +444,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Retrieve all the indexes on the collection.
+     *
      * @param entityClassOrName
      */
     collectionIndexes(entityClassOrName) {
@@ -423,6 +453,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Retrieve all the indexes on the collection.
+     *
      * @param entityClassOrName
      * @param indexes
      */
@@ -432,6 +463,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Retrieves this collections index info.
+     *
      * @param entityClassOrName
      * @param options
      */
@@ -441,6 +473,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * 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.
+     *
      * @param entityClassOrName
      * @param options
      */
@@ -450,6 +483,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Initiate a Out of order batch write operation. All operations will be buffered into insert/update/remove commands executed out of order.
+     *
      * @param entityClassOrName
      * @param options
      */
@@ -459,6 +493,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Inserts an array of documents into MongoDB.
+     *
      * @param entityClassOrName
      * @param docs
      * @param options
@@ -469,6 +504,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Inserts a single document into MongoDB.
+     *
      * @param entityClassOrName
      * @param doc
      * @param options
@@ -479,6 +515,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Returns if the collection is a capped collection.
+     *
      * @param entityClassOrName
      */
     isCapped(entityClassOrName) {
@@ -487,6 +524,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Get the list of all indexes information for the collection.
+     *
      * @param entityClassOrName
      * @param options
      */
@@ -496,6 +534,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * 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.
+     *
      * @param entityClassOrName
      * @param newName
      * @param options
@@ -506,6 +545,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Replace a document on MongoDB.
+     *
      * @param entityClassOrName
      * @param query
      * @param doc
@@ -521,6 +561,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Update multiple documents on MongoDB.
+     *
      * @param entityClassOrName
      * @param query
      * @param update
@@ -532,6 +573,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Update a single document on MongoDB.
+     *
      * @param entityClassOrName
      * @param query
      * @param update
@@ -547,6 +589,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Replaces the entity's ObjectId property name (e.g. "id") with "_id" in a
      * query object so that `findOneBy({ id: value })` works as expected.
+     *
      * @param metadata
      * @param query
      */
@@ -571,6 +614,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Recursively rewrites a query object, renaming the given property to
      * "_id" and converting values to ObjectId instances. Walks into $or/$and.
+     *
      * @param obj
      * @param propertyName
      * @param objectIdClass
@@ -596,6 +640,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     /**
      * Converts a query value to ObjectId, handling scalars, arrays, and
      * MongoDB operator objects (e.g. { $in: [...] }, { $ne: ... }).
+     *
      * @param value
      * @param objectIdClass
      */
@@ -619,6 +664,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Converts FindManyOptions to mongodb query.
+     *
      * @param optionsOrConditions
      */
     convertFindManyOptionsOrConditionsToMongodbQuery(optionsOrConditions) {
@@ -637,6 +683,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Converts FindOneOptions to mongodb query.
+     *
      * @param optionsOrConditions
      */
     convertFindOneOptionsOrConditionsToMongodbQuery(optionsOrConditions) {
@@ -655,6 +702,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Converts FindOptions into mongodb order by criteria.
+     *
      * @param order
      */
     convertFindOptionsOrderToOrderCriteria(order) {
@@ -674,14 +722,54 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Converts FindOptions into mongodb select by criteria.
+     *
      * @param selects
+     * @param metadata
      */
-    convertFindOptionsSelectToProjectCriteria(selects) {
-        // todo: implement
-        return {};
+    convertFindOptionsSelectToProjectCriteria(selects, metadata) {
+        const projection = {};
+        const build = (obj, embedPrefix) => {
+            for (const key of Object.keys(obj)) {
+                const value = obj[key];
+                if (value === undefined || value === false)
+                    continue;
+                const propertyPath = embedPrefix ? `${embedPrefix}.${key}` : key;
+                if (metadata.findColumnWithPropertyPathStrict(propertyPath)) {
+                    projection[propertyPath] = 1;
+                    continue;
+                }
+                const embed = metadata.findEmbeddedWithPropertyPath(propertyPath);
+                if (embed) {
+                    if (value === true) {
+                        for (const subColumn of embed.columnsFromTree) {
+                            projection[subColumn.propertyPath] = 1;
+                        }
+                    }
+                    else if (typeof value === "object") {
+                        build(value, propertyPath);
+                    }
+                    continue;
+                }
+                if (metadata.findRelationWithPropertyPath(propertyPath))
+                    continue;
+                throw new error_1.EntityPropertyNotFoundError(propertyPath, metadata);
+            }
+        };
+        build(selects, "");
+        // Translate ObjectIdColumn property name (e.g. "id") to "_id" for MongoDB
+        if (metadata.objectIdColumn) {
+            const propertyName = metadata.objectIdColumn.propertyName;
+            if (propertyName !== "_id" &&
+                projection[propertyName] !== undefined) {
+                projection["_id"] = projection[propertyName];
+                delete projection[propertyName];
+            }
+        }
+        return projection;
     }
     /**
      * Ensures given id is an id for query.
+     *
      * @param metadata
      * @param idMap
      */
@@ -713,6 +801,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Overrides cursor's toArray and next methods to convert results to entity automatically.
+     *
      * @param metadata
      * @param cursor
      */
@@ -752,6 +841,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Finds first entity that matches given conditions and/or find options.
+     *
      * @param entityClassOrName
      * @param optionsOrConditions
      * @param maybeOptions
@@ -764,7 +854,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
             : undefined;
         const findOneOptionsOrConditions = (id ? maybeOptions : optionsOrConditions);
         const metadata = this.dataSource.getMetadata(entityClassOrName);
-        const query = this.replaceObjectIdProperty(metadata, this.convertFindOneOptionsOrConditionsToMongodbQuery(findOneOptionsOrConditions)) || {};
+        const query = this.replaceObjectIdProperty(metadata, this.convertFindOneOptionsOrConditionsToMongodbQuery(findOneOptionsOrConditions)) ?? {};
         if (id) {
             query["_id"] =
                 id instanceof objectIdClass ? id : new objectIdClass(id);
@@ -773,7 +863,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const deleteDateColumn = this.dataSource.getMetadata(entityClassOrName).deleteDateColumn;
         if (FindOptionsUtils_1.FindOptionsUtils.isFindOneOptions(findOneOptionsOrConditions)) {
             if (findOneOptionsOrConditions.select)
-                cursor.project(this.convertFindOptionsSelectToProjectCriteria(findOneOptionsOrConditions.select));
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(findOneOptionsOrConditions.select, metadata));
             if (findOneOptionsOrConditions.order)
                 cursor.sort(this.convertFindOptionsOrderToOrderCriteria(findOneOptionsOrConditions.order));
             if (deleteDateColumn && !findOneOptionsOrConditions.withDeleted) {
@@ -794,7 +884,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const deleteDateColumn = metadata.deleteDateColumn;
         if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
             if (optionsOrConditions.select)
-                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select, metadata));
             if (optionsOrConditions.skip)
                 cursor.skip(optionsOrConditions.skip);
             if (optionsOrConditions.take)
@@ -812,6 +902,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
     }
     /**
      * Finds entities that match given find options or conditions.
+     *
      * @param entityClassOrName
      * @param optionsOrConditions
      */
@@ -822,7 +913,7 @@ class MongoEntityManager extends EntityManager_1.EntityManager {
         const deleteDateColumn = metadata.deleteDateColumn;
         if (FindOptionsUtils_1.FindOptionsUtils.isFindManyOptions(optionsOrConditions)) {
             if (optionsOrConditions.select)
-                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select, metadata));
             if (optionsOrConditions.skip)
                 cursor.skip(optionsOrConditions.skip);
             if (optionsOrConditions.take)