@uql/mongo - npm Package Compare versions

Comparing version 0.4.66 to 0.4.67

mongodbQuerier.js

@@ -113,4 +113,4 @@ "use strict";
         let changes;
-        if (meta.softDeleteKey && !opts.softDelete) {
-            const updateResult = await this.collection(entity).updateMany({ _id: { $in: ids } }, { $set: { [meta.softDeleteKey]: meta.fields[meta.softDeleteKey].onDelete() } }, {
+        if (meta.softDelete && !opts.softDelete) {
+            const updateResult = await this.collection(entity).updateMany({ _id: { $in: ids } }, { $set: { [meta.softDelete]: meta.fields[meta.softDelete].onDelete() } }, {
                 session: this.session,
@@ -171,2 +171,2 @@ });
 exports.MongodbQuerier = MongodbQuerier;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mongodbQuerier.js","sourceRoot":"","sources":["../src/mongodbQuerier.ts"],"names":[],"mappings":"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","sourcesContent":["import { MongoClient, ClientSession } from 'mongodb';\nimport { Query, Type, QueryCriteria, QueryOptions, QuerySearch, IdValue, FieldValue, Logger, QueryUnique } from '@uql/core/type';\nimport { BaseQuerier } from '@uql/core/querier';\nimport { getMeta } from '@uql/core/entity/decorator';\nimport { clone, getPersistable, getPersistables, hasKeys, isProjectingRelations } from '@uql/core/util';\n\nimport { MongoDialect } from './mongoDialect';\n\nexport class MongodbQuerier extends BaseQuerier {\n  private session: ClientSession;\n\n  constructor(readonly dialect: MongoDialect, readonly conn: MongoClient, readonly logger?: Logger) {\n    super();\n  }\n\n  override count<E>(entity: Type<E>, qm: QuerySearch<E> = {}) {\n    const filter = this.dialect.filter(entity, qm.$filter);\n    this.logger?.('count', entity.name, filter);\n    return this.collection(entity).countDocuments(filter, {\n      session: this.session,\n    });\n  }\n\n  override findOneById<E>(entity: Type<E>, id: IdValue<E>, qm: QueryUnique<E>) {\n    return this.findOne(entity, { ...qm, $filter: id });\n  }\n\n  override async findMany<E>(entity: Type<E>, qm: Query<E>) {\n    const meta = getMeta(entity);\n\n    let documents: E[];\n    const hasProjectRelations = isProjectingRelations(meta, qm.$project);\n\n    if (hasProjectRelations) {\n      const pipeline = this.dialect.aggregationPipeline(entity, qm);\n      if (this.logger) {\n        this.logger('findMany', entity.name, JSON.stringify(pipeline, null, 2));\n      }\n      documents = await this.collection(entity).aggregate<E>(pipeline, { session: this.session }).toArray();\n      documents = this.dialect.normalizeIds(meta, documents);\n      await this.findToManyRelations(entity, documents, qm.$project);\n    } else {\n      const cursor = this.collection(entity).find<E>({}, { session: this.session });\n\n      const filter = this.dialect.filter(entity, qm.$filter);\n      if (hasKeys(filter)) {\n        cursor.filter(filter);\n      }\n      const project = this.dialect.project(entity, qm.$project);\n      if (hasKeys(project)) {\n        cursor.project(project);\n      }\n      const sort = this.dialect.sort(entity, qm.$sort);\n      if (hasKeys(sort)) {\n        cursor.sort(sort);\n      }\n      if (qm.$skip) {\n        cursor.skip(qm.$skip);\n      }\n      if (qm.$limit) {\n        cursor.limit(qm.$limit);\n      }\n\n      this.logger?.('findMany', entity.name, qm);\n\n      documents = await cursor.toArray();\n      documents = this.dialect.normalizeIds(meta, documents);\n    }\n\n    return documents;\n  }\n\n  override async insertMany<E>(entity: Type<E>, payload: E[]) {\n    if (!payload.length) {\n      return;\n    }\n\n    payload = clone(payload);\n\n    const meta = getMeta(entity);\n    const payloads = Array.isArray(payload) ? payload : [payload];\n    const persistables = getPersistables(meta, payload, 'onInsert');\n\n    this.logger?.('insertMany', entity.name, persistables);\n\n    const { insertedIds } = await this.collection(entity).insertMany(persistables, { session: this.session });\n\n    const ids: IdValue<E>[] = Object.values(insertedIds);\n\n    for (const [index, it] of payloads.entries()) {\n      it[meta.id] = ids[index] as FieldValue<E>;\n    }\n\n    await this.insertRelations(entity, payloads);\n\n    return ids;\n  }\n\n  override async updateMany<E>(entity: Type<E>, qm: QueryCriteria<E>, payload: E) {\n    payload = clone(payload);\n    const meta = getMeta(entity);\n    const persistable = getPersistable(meta, payload, 'onUpdate');\n    const filter = this.dialect.filter(entity, qm.$filter);\n    const update = { $set: persistable };\n\n    this.logger?.('updateMany', entity.name, filter, update);\n\n    const { matchedCount } = await this.collection(entity).updateMany(filter, update, {\n      session: this.session,\n    });\n\n    await this.updateRelations(entity, qm, payload);\n\n    return matchedCount;\n  }\n\n  override async deleteMany<E>(entity: Type<E>, qm: QueryCriteria<E>, opts: QueryOptions = {}) {\n    const meta = getMeta(entity);\n    const filter = this.dialect.filter(entity, qm.$filter);\n    this.logger?.('deleteMany', entity.name, filter, opts);\n    const founds: E[] = await this.collection(entity)\n      .find(filter, {\n        projection: { _id: true },\n        session: this.session,\n      })\n      .toArray();\n    if (!founds.length) {\n      return 0;\n    }\n    const ids: IdValue<E>[] = this.dialect.normalizeIds(meta, founds).map((found) => found[meta.id]);\n    let changes: number;\n    if (meta.softDeleteKey && !opts.softDelete) {\n      const updateResult = await this.collection(entity).updateMany(\n        { _id: { $in: ids } },\n        { $set: { [meta.softDeleteKey]: meta.fields[meta.softDeleteKey].onDelete() } },\n        {\n          session: this.session,\n        }\n      );\n      changes = updateResult.matchedCount;\n    } else {\n      const deleteResult = await this.collection(entity).deleteMany(\n        { _id: { $in: ids } },\n        {\n          session: this.session,\n        }\n      );\n      changes = deleteResult.deletedCount;\n    }\n    await this.deleteRelations(entity, ids, opts);\n    return changes;\n  }\n\n  override get hasOpenTransaction() {\n    return this.session?.inTransaction();\n  }\n\n  collection<E>(entity: Type<E>) {\n    const meta = getMeta(entity);\n    return this.conn.db().collection(meta.name);\n  }\n\n  override async beginTransaction() {\n    if (this.session?.inTransaction()) {\n      throw new TypeError('pending transaction');\n    }\n    this.logger?.('beginTransaction');\n    this.session = this.conn.startSession();\n    this.session.startTransaction();\n  }\n\n  override async commitTransaction() {\n    if (!this.session?.inTransaction()) {\n      throw new TypeError('not a pending transaction');\n    }\n    this.logger?.('commitTransaction');\n    await this.session.commitTransaction();\n  }\n\n  override async rollbackTransaction() {\n    if (!this.session?.inTransaction()) {\n      throw new TypeError('not a pending transaction');\n    }\n    this.logger?.('rollbackTransaction');\n    await this.session.abortTransaction();\n  }\n\n  override async release(force?: boolean) {\n    if (this.session?.inTransaction()) {\n      throw new TypeError('pending transaction');\n    }\n    await this.conn.close(force);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mongodbQuerier.js","sourceRoot":"","sources":["../src/mongodbQuerier.ts"],"names":[],"mappings":"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","sourcesContent":["import { MongoClient, ClientSession } from 'mongodb';\nimport { Query, Type, QueryCriteria, QueryOptions, QuerySearch, IdValue, FieldValue, Logger, QueryUnique } from '@uql/core/type';\nimport { BaseQuerier } from '@uql/core/querier';\nimport { getMeta } from '@uql/core/entity/decorator';\nimport { clone, getPersistable, getPersistables, hasKeys, isProjectingRelations } from '@uql/core/util';\n\nimport { MongoDialect } from './mongoDialect';\n\nexport class MongodbQuerier extends BaseQuerier {\n  private session: ClientSession;\n\n  constructor(readonly dialect: MongoDialect, readonly conn: MongoClient, readonly logger?: Logger) {\n    super();\n  }\n\n  override count<E>(entity: Type<E>, qm: QuerySearch<E> = {}) {\n    const filter = this.dialect.filter(entity, qm.$filter);\n    this.logger?.('count', entity.name, filter);\n    return this.collection(entity).countDocuments(filter, {\n      session: this.session,\n    });\n  }\n\n  override findOneById<E>(entity: Type<E>, id: IdValue<E>, qm: QueryUnique<E>) {\n    return this.findOne(entity, { ...qm, $filter: id });\n  }\n\n  override async findMany<E>(entity: Type<E>, qm: Query<E>) {\n    const meta = getMeta(entity);\n\n    let documents: E[];\n    const hasProjectRelations = isProjectingRelations(meta, qm.$project);\n\n    if (hasProjectRelations) {\n      const pipeline = this.dialect.aggregationPipeline(entity, qm);\n      if (this.logger) {\n        this.logger('findMany', entity.name, JSON.stringify(pipeline, null, 2));\n      }\n      documents = await this.collection(entity).aggregate<E>(pipeline, { session: this.session }).toArray();\n      documents = this.dialect.normalizeIds(meta, documents);\n      await this.findToManyRelations(entity, documents, qm.$project);\n    } else {\n      const cursor = this.collection(entity).find<E>({}, { session: this.session });\n\n      const filter = this.dialect.filter(entity, qm.$filter);\n      if (hasKeys(filter)) {\n        cursor.filter(filter);\n      }\n      const project = this.dialect.project(entity, qm.$project);\n      if (hasKeys(project)) {\n        cursor.project(project);\n      }\n      const sort = this.dialect.sort(entity, qm.$sort);\n      if (hasKeys(sort)) {\n        cursor.sort(sort);\n      }\n      if (qm.$skip) {\n        cursor.skip(qm.$skip);\n      }\n      if (qm.$limit) {\n        cursor.limit(qm.$limit);\n      }\n\n      this.logger?.('findMany', entity.name, qm);\n\n      documents = await cursor.toArray();\n      documents = this.dialect.normalizeIds(meta, documents);\n    }\n\n    return documents;\n  }\n\n  override async insertMany<E>(entity: Type<E>, payload: E[]) {\n    if (!payload.length) {\n      return;\n    }\n\n    payload = clone(payload);\n\n    const meta = getMeta(entity);\n    const payloads = Array.isArray(payload) ? payload : [payload];\n    const persistables = getPersistables(meta, payload, 'onInsert');\n\n    this.logger?.('insertMany', entity.name, persistables);\n\n    const { insertedIds } = await this.collection(entity).insertMany(persistables, { session: this.session });\n\n    const ids: IdValue<E>[] = Object.values(insertedIds);\n\n    for (const [index, it] of payloads.entries()) {\n      it[meta.id] = ids[index] as FieldValue<E>;\n    }\n\n    await this.insertRelations(entity, payloads);\n\n    return ids;\n  }\n\n  override async updateMany<E>(entity: Type<E>, qm: QueryCriteria<E>, payload: E) {\n    payload = clone(payload);\n    const meta = getMeta(entity);\n    const persistable = getPersistable(meta, payload, 'onUpdate');\n    const filter = this.dialect.filter(entity, qm.$filter);\n    const update = { $set: persistable };\n\n    this.logger?.('updateMany', entity.name, filter, update);\n\n    const { matchedCount } = await this.collection(entity).updateMany(filter, update, {\n      session: this.session,\n    });\n\n    await this.updateRelations(entity, qm, payload);\n\n    return matchedCount;\n  }\n\n  override async deleteMany<E>(entity: Type<E>, qm: QueryCriteria<E>, opts: QueryOptions = {}) {\n    const meta = getMeta(entity);\n    const filter = this.dialect.filter(entity, qm.$filter);\n    this.logger?.('deleteMany', entity.name, filter, opts);\n    const founds: E[] = await this.collection(entity)\n      .find(filter, {\n        projection: { _id: true },\n        session: this.session,\n      })\n      .toArray();\n    if (!founds.length) {\n      return 0;\n    }\n    const ids: IdValue<E>[] = this.dialect.normalizeIds(meta, founds).map((found) => found[meta.id]);\n    let changes: number;\n    if (meta.softDelete && !opts.softDelete) {\n      const updateResult = await this.collection(entity).updateMany(\n        { _id: { $in: ids } },\n        { $set: { [meta.softDelete]: meta.fields[meta.softDelete].onDelete() } },\n        {\n          session: this.session,\n        }\n      );\n      changes = updateResult.matchedCount;\n    } else {\n      const deleteResult = await this.collection(entity).deleteMany(\n        { _id: { $in: ids } },\n        {\n          session: this.session,\n        }\n      );\n      changes = deleteResult.deletedCount;\n    }\n    await this.deleteRelations(entity, ids, opts);\n    return changes;\n  }\n\n  override get hasOpenTransaction() {\n    return this.session?.inTransaction();\n  }\n\n  collection<E>(entity: Type<E>) {\n    const meta = getMeta(entity);\n    return this.conn.db().collection(meta.name);\n  }\n\n  override async beginTransaction() {\n    if (this.session?.inTransaction()) {\n      throw new TypeError('pending transaction');\n    }\n    this.logger?.('beginTransaction');\n    this.session = this.conn.startSession();\n    this.session.startTransaction();\n  }\n\n  override async commitTransaction() {\n    if (!this.session?.inTransaction()) {\n      throw new TypeError('not a pending transaction');\n    }\n    this.logger?.('commitTransaction');\n    await this.session.commitTransaction();\n  }\n\n  override async rollbackTransaction() {\n    if (!this.session?.inTransaction()) {\n      throw new TypeError('not a pending transaction');\n    }\n    this.logger?.('rollbackTransaction');\n    await this.session.abortTransaction();\n  }\n\n  override async release(force?: boolean) {\n    if (this.session?.inTransaction()) {\n      throw new TypeError('pending transaction');\n    }\n    await this.conn.close(force);\n  }\n}\n"]}

mongoDialect.js

@@ -11,4 +11,4 @@ "use strict";
         filter = util_1.getQueryFilterAsMap(meta, filter);
-        if (meta.softDeleteKey && (softDelete || softDelete === undefined) && !filter[meta.softDeleteKey]) {
-            filter[meta.softDeleteKey] = null;
+        if (meta.softDelete && (softDelete || softDelete === undefined) && !filter[meta.softDelete]) {
+            filter[meta.softDelete] = null;
         }
@@ -75,3 +75,3 @@ return util_1.getKeys(filter).reduce((acc, key) => {
                         from: relMeta.name,
-                        localField: relOpts.references[0].source,
+                        localField: relOpts.references[0].local,
                         foreignField: '_id',
@@ -83,6 +83,6 @@ as: relKey,
             else {
-                const referenceKey = relOpts.mappedBy ? relOpts.references[0].target : relOpts.references[0].source;
+                const foreignField = relOpts.references[0].foreign;
                 const referenceFilter = this.filter(relEntity, qm.$filter);
                 const referenceSort = this.sort(relEntity, qm.$sort);
-                const referencePipelineEntry = { $match: { [referenceKey]: referenceFilter._id } };
+                const referencePipelineEntry = { $match: { [foreignField]: referenceFilter._id } };
                 if (util_1.hasKeys(referenceSort)) {
@@ -134,2 +134,2 @@ referencePipelineEntry.$sort = referenceSort;
 exports.MongoDialect = MongoDialect;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mongoDialect.js","sourceRoot":"","sources":["../src/mongoDialect.ts"],"names":[],"mappings":"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","sourcesContent":["import { FilterQuery, ObjectId, SortOptionObject } from 'mongodb';\nimport {\n  QueryFilter,\n  Query,\n  EntityMeta,\n  Type,\n  QueryProject,\n  QueryProjectMap,\n  QueryOptions,\n  QuerySort,\n  FieldValue,\n  RelationKey,\n} from '@uql/core/type';\nimport { getMeta } from '@uql/core/entity/decorator';\nimport { getKeys, hasKeys, buildSortMap, getProjectRelationKeys, getQueryFilterAsMap } from '@uql/core/util';\n\nexport class MongoDialect {\n  filter<E>(entity: Type<E>, filter: QueryFilter<E> = {}, { softDelete }: QueryOptions = {}): FilterQuery<E> {\n    const meta = getMeta(entity);\n\n    filter = getQueryFilterAsMap(meta, filter);\n\n    if (meta.softDeleteKey && (softDelete || softDelete === undefined) && !filter[meta.softDeleteKey as string]) {\n      filter[meta.softDeleteKey as string] = null;\n    }\n\n    return getKeys(filter).reduce((acc, key) => {\n      let value = filter[key];\n      if (key === '$and' || key === '$or') {\n        acc[key] = value.map((filterIt: QueryFilter<E>) => this.filter(entity, filterIt));\n      } else {\n        if (key === '_id' || key === meta.id) {\n          key = '_id';\n          value = this.getIdValue(value);\n        } else if (Array.isArray(value)) {\n          value = {\n            $in: value,\n          };\n        }\n        acc[key as keyof FilterQuery<E>] = value;\n      }\n      return acc;\n    }, {} as FilterQuery<E>);\n  }\n\n  project<E>(entity: Type<E>, project: QueryProject<E>): QueryProjectMap<E> {\n    if (Array.isArray(project)) {\n      return project.reduce((acc, it) => {\n        acc[it as string] = true;\n        return acc;\n      }, {} as QueryProjectMap<E>);\n    }\n    return project as QueryProjectMap<E>;\n  }\n\n  sort<E>(entity: Type<E>, sort: QuerySort<E>): MongoSort<E> {\n    return buildSortMap(sort) as MongoSort<E>;\n  }\n\n  aggregationPipeline<E>(entity: Type<E>, qm: Query<E>): MongoAggregationPipelineEntry<E>[] {\n    const meta = getMeta(entity);\n\n    const filter = this.filter(entity, qm.$filter);\n    const sort = this.sort(entity, qm.$sort);\n    const firstPipelineEntry: MongoAggregationPipelineEntry<E> = {};\n\n    if (hasKeys(filter)) {\n      firstPipelineEntry.$match = filter;\n    }\n    if (hasKeys(sort)) {\n      firstPipelineEntry.$sort = sort;\n    }\n\n    const pipeline: MongoAggregationPipelineEntry<E>[] = [];\n\n    if (hasKeys(firstPipelineEntry)) {\n      pipeline.push(firstPipelineEntry);\n    }\n\n    const relations = getProjectRelationKeys(meta, qm.$project);\n\n    for (const relKey of relations) {\n      const relOpts = meta.relations[relKey];\n\n      if (relOpts.cardinality === '1m' || relOpts.cardinality === 'mm') {\n        // '1m' and 'mm' should be resolved in a higher layer because they will need multiple queries\n        continue;\n      }\n\n      const relEntity = relOpts.entity();\n      const relMeta = getMeta(relEntity);\n\n      if (relOpts.cardinality === 'm1') {\n        pipeline.push({\n          $lookup: {\n            from: relMeta.name,\n            localField: relOpts.references[0].source,\n            foreignField: '_id',\n            as: relKey,\n          },\n        });\n      } else {\n        const referenceKey = relOpts.mappedBy ? relOpts.references[0].target : relOpts.references[0].source;\n        const referenceFilter = this.filter(relEntity, qm.$filter);\n        const referenceSort = this.sort(relEntity, qm.$sort);\n        const referencePipelineEntry: MongoAggregationPipelineEntry<FieldValue<E>> = { $match: { [referenceKey]: referenceFilter._id } };\n        if (hasKeys(referenceSort)) {\n          referencePipelineEntry.$sort = referenceSort;\n        }\n        pipeline.push({\n          $lookup: {\n            from: relMeta.name,\n            pipeline: [referencePipelineEntry],\n            as: relKey,\n          },\n        });\n      }\n\n      pipeline.push({ $unwind: { path: `$${relKey}`, preserveNullAndEmptyArrays: true } });\n    }\n\n    return pipeline;\n  }\n\n  normalizeIds<E>(meta: EntityMeta<E>, docs: E[]): E[] {\n    return docs?.map((doc) => this.normalizeId(meta, doc));\n  }\n\n  normalizeId<E>(meta: EntityMeta<E>, doc: E): E {\n    if (!doc) {\n      return;\n    }\n\n    const res = doc as E & { _id: any };\n\n    if (res._id) {\n      res[meta.id] = res._id;\n      delete res._id;\n    }\n\n    const relKeys = getKeys(meta.relations).filter((key) => doc[key]);\n\n    for (const relKey of relKeys) {\n      const relOpts = meta.relations[relKey];\n      const relMeta = getMeta(relOpts.entity());\n      res[relKey] = Array.isArray(res[relKey]) ? this.normalizeIds(relMeta, res[relKey]) : this.normalizeId(relMeta, res[relKey]);\n    }\n\n    return res as E;\n  }\n\n  getIdValue<T extends string | string[] | ObjectId | ObjectId[]>(value: T): T {\n    if (value instanceof ObjectId) {\n      return value;\n    }\n    if (Array.isArray(value)) {\n      return value.map((it) => this.getIdValue(it)) as T;\n    }\n    return new ObjectId(value) as T;\n  }\n}\n\ntype MongoAggregationPipelineEntry<E> = {\n  readonly $lookup?: MongoAggregationLookup<E>;\n  $match?: FilterQuery<E> | Record<string, any>;\n  $sort?: MongoSort<E>;\n  readonly $unwind?: MongoAggregationUnwind;\n};\n\ntype MongoAggregationLookup<E> = {\n  readonly from?: string;\n  readonly foreignField?: string;\n  readonly localField?: string;\n  readonly pipeline?: MongoAggregationPipelineEntry<FieldValue<E>>[];\n  readonly as?: RelationKey<E>;\n};\n\ntype MongoAggregationUnwind = {\n  readonly path?: string;\n  readonly preserveNullAndEmptyArrays?: boolean;\n};\n\ntype MongoSort<E> = [string, number][] | SortOptionObject<E>;\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mongoDialect.js","sourceRoot":"","sources":["../src/mongoDialect.ts"],"names":[],"mappings":"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","sourcesContent":["import { FilterQuery, ObjectId, SortOptionObject } from 'mongodb';\nimport {\n  QueryFilter,\n  Query,\n  EntityMeta,\n  Type,\n  QueryProject,\n  QueryProjectMap,\n  QueryOptions,\n  QuerySort,\n  FieldValue,\n  RelationKey,\n} from '@uql/core/type';\nimport { getMeta } from '@uql/core/entity/decorator';\nimport { getKeys, hasKeys, buildSortMap, getProjectRelationKeys, getQueryFilterAsMap } from '@uql/core/util';\n\nexport class MongoDialect {\n  filter<E>(entity: Type<E>, filter: QueryFilter<E> = {}, { softDelete }: QueryOptions = {}): FilterQuery<E> {\n    const meta = getMeta(entity);\n\n    filter = getQueryFilterAsMap(meta, filter);\n\n    if (meta.softDelete && (softDelete || softDelete === undefined) && !filter[meta.softDelete as string]) {\n      filter[meta.softDelete as string] = null;\n    }\n\n    return getKeys(filter).reduce((acc, key) => {\n      let value = filter[key];\n      if (key === '$and' || key === '$or') {\n        acc[key] = value.map((filterIt: QueryFilter<E>) => this.filter(entity, filterIt));\n      } else {\n        if (key === '_id' || key === meta.id) {\n          key = '_id';\n          value = this.getIdValue(value);\n        } else if (Array.isArray(value)) {\n          value = {\n            $in: value,\n          };\n        }\n        acc[key as keyof FilterQuery<E>] = value;\n      }\n      return acc;\n    }, {} as FilterQuery<E>);\n  }\n\n  project<E>(entity: Type<E>, project: QueryProject<E>): QueryProjectMap<E> {\n    if (Array.isArray(project)) {\n      return project.reduce((acc, it) => {\n        acc[it as string] = true;\n        return acc;\n      }, {} as QueryProjectMap<E>);\n    }\n    return project as QueryProjectMap<E>;\n  }\n\n  sort<E>(entity: Type<E>, sort: QuerySort<E>): MongoSort<E> {\n    return buildSortMap(sort) as MongoSort<E>;\n  }\n\n  aggregationPipeline<E>(entity: Type<E>, qm: Query<E>): MongoAggregationPipelineEntry<E>[] {\n    const meta = getMeta(entity);\n\n    const filter = this.filter(entity, qm.$filter);\n    const sort = this.sort(entity, qm.$sort);\n    const firstPipelineEntry: MongoAggregationPipelineEntry<E> = {};\n\n    if (hasKeys(filter)) {\n      firstPipelineEntry.$match = filter;\n    }\n    if (hasKeys(sort)) {\n      firstPipelineEntry.$sort = sort;\n    }\n\n    const pipeline: MongoAggregationPipelineEntry<E>[] = [];\n\n    if (hasKeys(firstPipelineEntry)) {\n      pipeline.push(firstPipelineEntry);\n    }\n\n    const relations = getProjectRelationKeys(meta, qm.$project);\n\n    for (const relKey of relations) {\n      const relOpts = meta.relations[relKey];\n\n      if (relOpts.cardinality === '1m' || relOpts.cardinality === 'mm') {\n        // '1m' and 'mm' should be resolved in a higher layer because they will need multiple queries\n        continue;\n      }\n\n      const relEntity = relOpts.entity();\n      const relMeta = getMeta(relEntity);\n\n      if (relOpts.cardinality === 'm1') {\n        pipeline.push({\n          $lookup: {\n            from: relMeta.name,\n            localField: relOpts.references[0].local,\n            foreignField: '_id',\n            as: relKey,\n          },\n        });\n      } else {\n        const foreignField = relOpts.references[0].foreign;\n        const referenceFilter = this.filter(relEntity, qm.$filter);\n        const referenceSort = this.sort(relEntity, qm.$sort);\n        const referencePipelineEntry: MongoAggregationPipelineEntry<FieldValue<E>> = { $match: { [foreignField]: referenceFilter._id } };\n        if (hasKeys(referenceSort)) {\n          referencePipelineEntry.$sort = referenceSort;\n        }\n        pipeline.push({\n          $lookup: {\n            from: relMeta.name,\n            pipeline: [referencePipelineEntry],\n            as: relKey,\n          },\n        });\n      }\n\n      pipeline.push({ $unwind: { path: `$${relKey}`, preserveNullAndEmptyArrays: true } });\n    }\n\n    return pipeline;\n  }\n\n  normalizeIds<E>(meta: EntityMeta<E>, docs: E[]): E[] {\n    return docs?.map((doc) => this.normalizeId(meta, doc));\n  }\n\n  normalizeId<E>(meta: EntityMeta<E>, doc: E): E {\n    if (!doc) {\n      return;\n    }\n\n    const res = doc as E & { _id: any };\n\n    if (res._id) {\n      res[meta.id] = res._id;\n      delete res._id;\n    }\n\n    const relKeys = getKeys(meta.relations).filter((key) => doc[key]);\n\n    for (const relKey of relKeys) {\n      const relOpts = meta.relations[relKey];\n      const relMeta = getMeta(relOpts.entity());\n      res[relKey] = Array.isArray(res[relKey]) ? this.normalizeIds(relMeta, res[relKey]) : this.normalizeId(relMeta, res[relKey]);\n    }\n\n    return res as E;\n  }\n\n  getIdValue<T extends string | string[] | ObjectId | ObjectId[]>(value: T): T {\n    if (value instanceof ObjectId) {\n      return value;\n    }\n    if (Array.isArray(value)) {\n      return value.map((it) => this.getIdValue(it)) as T;\n    }\n    return new ObjectId(value) as T;\n  }\n}\n\ntype MongoAggregationPipelineEntry<E> = {\n  readonly $lookup?: MongoAggregationLookup<E>;\n  $match?: FilterQuery<E> | Record<string, any>;\n  $sort?: MongoSort<E>;\n  readonly $unwind?: MongoAggregationUnwind;\n};\n\ntype MongoAggregationLookup<E> = {\n  readonly from?: string;\n  readonly foreignField?: string;\n  readonly localField?: string;\n  readonly pipeline?: MongoAggregationPipelineEntry<FieldValue<E>>[];\n  readonly as?: RelationKey<E>;\n};\n\ntype MongoAggregationUnwind = {\n  readonly path?: string;\n  readonly preserveNullAndEmptyArrays?: boolean;\n};\n\ntype MongoSort<E> = [string, number][] | SortOptionObject<E>;\n"]}

package.json

@@ -6,3 +6,3 @@ {
   "license": "MIT",
-  "version": "0.4.66",
+  "version": "0.4.67",
   "main": "index.js",
@@ -20,8 +20,8 @@ "types": "index.d.ts",
   "peerDependencies": {
-    "@uql/core": "^0.4.64"
+    "@uql/core": "^0.4.66"
   },
   "devDependencies": {
     "@types/mongodb": "^3.6.20",
-    "@types/node": "^16.4.8",
-    "@uql/core": "^0.4.66",
+    "@types/node": "^16.4.10",
+    "@uql/core": "^0.4.67",
     "copyfiles": "^2.4.1",
@@ -28,0 +28,0 @@ "rimraf": "^3.0.2",

README.md

@@ -324,3 +324,3 @@ # [uql](https://uql.io) · [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/impensables/uql/blob/master/LICENSE) [![tests](https://github.com/impensables/uql/actions/workflows/tests.yml/badge.svg)](https://github.com/impensables/uql) [![coverage status](https://coveralls.io/repos/impensables/uql/badge.svg?branch=master)](https://coveralls.io/r/impensables/uql?branch=master) [![npm version](https://badge.fury.io/js/%40uql%2Fcore.svg)](https://badge.fury.io/js/%40uql%2Fcore)
 import { augmentFilter } from '@uql/core/util';
-import { Query, EntityMeta } from '@uql/core/type';
+import { Query, QueryFilter, EntityMeta } from '@uql/core/type';
 import { querierMiddleware } from '@uql/express';
@@ -345,4 +345,4 @@
       augmentQuery: <E>(meta: EntityMeta<E>, qm: Query<E>, req: express.Request): Query<E> => {
-        // ensure the user can only see the data that belongs to the related company.
-        qm.$filter = augmentFilter(qm.$filter, { companyId: req.identity.companyId });
+        // ensure the user can only see the data that belongs to his company.
+        qm.$filter = augmentFilter(meta, qm.$filter, { companyId: req.identity.companyId } as QueryFilter<E>);
         return qm;
@@ -349,0 +349,0 @@ },

No alert changes

Worsened metrics

Total package byte prevSize

63873

decreased by-0.38%

No dependency changes