@loopback/repository 3.2.0 → 3.4.1

package/src/relations/has-many/has-many.repository.ts

@@ -11,8 +11,8 @@ import {
   constrainDataObject,
   constrainFilter,
   constrainWhere,
-} from '../../repositories/constraint-utils';
-import {EntityCrudRepository} from '../../repositories/repository';
+  EntityCrudRepository,
+} from '../../repositories';
 
 /**
  * CRUD operations for a target repository of a HasMany relation

package/src/relations/has-many/index.ts

@@ -3,8 +3,8 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-export * from './has-many-repository.factory';
-export * from './has-many-through-repository.factory';
+export * from './has-many.repository-factory';
+export * from './has-many-through.repository-factory';
 export * from './has-many-through.repository';
 export * from './has-many.decorator';
 export * from './has-many.inclusion-resolver';

package/src/relations/has-one/has-one.helpers.ts

@@ -9,7 +9,7 @@ import {InvalidRelationError} from '../../errors';
 import {isTypeResolver} from '../../type-resolver';
 import {HasOneDefinition, RelationType} from '../relation.types';
 
-const debug = debugFactory('loopback:repository:has-one-helpers');
+const debug = debugFactory('loopback:repository:relations:has-one:helpers');
 
 /**
  * Relation definition with optional metadata (e.g. `keyTo`) filled in.

package/src/relations/has-one/has-one.inclusion-resolver.ts

@@ -3,10 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Filter, Inclusion} from '@loopback/filter';
+import {Filter, InclusionFilter} from '@loopback/filter';
 import {AnyObject, Options} from '../../common-types';
 import {Entity} from '../../model';
-import {EntityCrudRepository} from '../../repositories/repository';
+import {EntityCrudRepository} from '../../repositories';
 import {
   findByForeignKeys,
   flattenTargetsOfOneToOneRelation,
@@ -39,7 +39,7 @@ export function createHasOneInclusionResolver<
 
   return async function fetchHasOneModel(
     entities: Entity[],
-    inclusion: Inclusion,
+    inclusion: InclusionFilter,
     options?: Options,
   ): Promise<((Target & TargetRelations) | undefined)[]> {
     if (!entities.length) return [];
@@ -48,12 +48,15 @@ export function createHasOneInclusionResolver<
     const sourceIds = entities.map(e => (e as AnyObject)[sourceKey]);
     const targetKey = relationMeta.keyTo as StringKeyOf<Target>;
 
+    const scope =
+      typeof inclusion === 'string' ? {} : (inclusion.scope as Filter<Target>);
+
     const targetRepo = await getTargetRepo();
     const targetsFound = await findByForeignKeys(
       targetRepo,
       targetKey,
       sourceIds,
-      inclusion.scope as Filter<Target>,
+      scope,
       options,
     );
 

package/src/relations/has-one/{has-one-repository.factory.ts → has-one.repository-factory.ts}

@@ -6,13 +6,15 @@
 import debugFactory from 'debug';
 import {DataObject} from '../../common-types';
 import {Entity} from '../../model';
-import {EntityCrudRepository} from '../../repositories/repository';
+import {EntityCrudRepository} from '../../repositories';
 import {Getter, HasOneDefinition, InclusionResolver} from '../relation.types';
 import {resolveHasOneMetadata} from './has-one.helpers';
 import {createHasOneInclusionResolver} from './has-one.inclusion-resolver';
 import {DefaultHasOneRepository, HasOneRepository} from './has-one.repository';
 
-const debug = debugFactory('loopback:repository:has-one-repository-factory');
+const debug = debugFactory(
+  'loopback:repository:relations:has-one:repository-factory',
+);
 
 export interface HasOneRepositoryFactory<
   Target extends Entity,

package/src/relations/has-one/index.ts

@@ -5,4 +5,4 @@
 
 export * from './has-one.decorator';
 export * from './has-one.repository';
-export * from './has-one-repository.factory';
+export * from './has-one.repository-factory';

package/src/relations/relation.helpers.ts

@@ -5,14 +5,14 @@
 
 import assert from 'assert';
 import debugFactory from 'debug';
-import _ from 'lodash';
+import _, {cloneDeep} from 'lodash';
 import {
   AnyObject,
   Entity,
   EntityCrudRepository,
   Filter,
   FilterBuilder,
-  Inclusion,
+  InclusionFilter,
   Options,
   Where,
 } from '..';
@@ -39,17 +39,11 @@ export async function findByForeignKeys<
   options?: Options,
 ): Promise<(Target & TargetRelations)[]> {
   let value;
+  scope = cloneDeep(scope);
 
   if (Array.isArray(fkValues)) {
     if (fkValues.length === 0) return [];
-    value =
-      fkValues.length === 1
-        ? fkValues[0]
-        : {
-            // Create a copy to prevent query coercion algorithm
-            // inside connectors from modifying the original values
-            inq: [...fkValues],
-          };
+    value = fkValues.length === 1 ? fkValues[0] : {inq: fkValues};
   } else {
     value = fkValues;
   }
@@ -84,9 +78,11 @@ export async function includeRelatedModels<
 >(
   targetRepository: EntityCrudRepository<T, unknown, Relations>,
   entities: T[],
-  include?: Inclusion[],
+  include?: InclusionFilter[],
   options?: Options,
 ): Promise<(T & Relations)[]> {
+  entities = cloneDeep(entities);
+  include = cloneDeep(include);
   const result = entities as (T & Relations)[];
   if (!include) return result;
 
@@ -102,12 +98,16 @@ export async function includeRelatedModels<
     const err = new Error(msg);
     Object.assign(err, {
       code: 'INVALID_INCLUSION_FILTER',
+      statusCode: 400,
     });
     throw err;
   }
 
   const resolveTasks = include.map(async inclusionFilter => {
-    const relationName = inclusionFilter.relation;
+    const relationName =
+      typeof inclusionFilter === 'string'
+        ? inclusionFilter
+        : inclusionFilter.relation;
     const resolver = targetRepository.inclusionResolvers.get(relationName)!;
     const targets = await resolver(entities, inclusionFilter, options);
 
@@ -130,9 +130,9 @@ export async function includeRelatedModels<
  */
 function isInclusionAllowed<T extends Entity, Relations extends object = {}>(
   targetRepository: EntityCrudRepository<T, unknown, Relations>,
-  include: Inclusion,
+  include: InclusionFilter,
 ): boolean {
-  const relationName = include.relation;
+  const relationName = typeof include === 'string' ? include : include.relation;
   if (!relationName) {
     debug('isInclusionAllowed for %j? No: missing relation name', include);
     return false;

package/src/relations/relation.types.ts

@@ -3,7 +3,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Inclusion} from '@loopback/filter';
+import {InclusionFilter} from '@loopback/filter';
 import {Options} from '../common-types';
 import {Entity} from '../model';
 import {TypeResolver} from '../type-resolver';
@@ -172,7 +172,7 @@ export type InclusionResolver<S extends Entity, T extends Entity> = (
   /**
    * Inclusion requested by the user (e.g. scope constraints to apply).
    */
-  inclusion: Inclusion,
+  inclusion: InclusionFilter,
   /**
    * Generic options object, e.g. carrying the Transaction object.
    */

package/src/repositories/kv.repository.bridge.ts

@@ -53,9 +53,10 @@ export class DefaultKeyValueRepository<T extends Model>
   }
 
   async get(key: string, options?: Options): Promise<T> {
-    const val = this.kvModelClass.get(key, options) as legacy.PromiseOrVoid<
-      legacy.ModelData
-    >;
+    const val = this.kvModelClass.get(
+      key,
+      options,
+    ) as legacy.PromiseOrVoid<legacy.ModelData>;
     const result = await ensurePromise(val);
     return this.toEntity(result);
   }

package/src/repositories/legacy-juggler-bridge.ts

@@ -4,7 +4,12 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {Getter} from '@loopback/core';
-import {Filter, FilterExcludingWhere, Inclusion, Where} from '@loopback/filter';
+import {
+  Filter,
+  FilterExcludingWhere,
+  InclusionFilter,
+  Where,
+} from '@loopback/filter';
 import assert from 'assert';
 import legacy from 'loopback-datasource-juggler';
 import {
@@ -695,7 +700,7 @@ export class DefaultCrudRepository<
    */
   protected async includeRelatedModels(
     entities: T[],
-    include?: Inclusion[],
+    include?: InclusionFilter[],
     options?: Options,
   ): Promise<(T & Relations)[]> {
     return includeRelatedModels<T, Relations>(this, entities, include, options);

package/dist/relations/has-many/has-many-repository.factory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-many-repository.factory.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-repository.factory.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,0DAAiC;AAKjC,yDAA0D;AAC1D,+EAA6E;AAC7E,+DAG+B;AAE/B,MAAM,KAAK,GAAG,eAAY,CAAC,iDAAiD,CAAC,CAAC;AAiB9E;;;;;;;;;;;;GAYG;AACH,SAAgB,8BAA8B,CAK5C,gBAAmC,EACnC,sBAAsE;IAEtE,MAAM,IAAI,GAAG,yCAAsB,CAAC,gBAAgB,CAAC,CAAC;IACtD,KAAK,CAAC,wCAAwC,EAAE,IAAI,CAAC,CAAC;IACtD,MAAM,MAAM,GAAqD,UAC/D,OAAuB;QAEvB,8DAA8D;QAC9D,MAAM,UAAU,GAAQ,EAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,EAAC,CAAC;QAChD,OAAO,IAAI,8CAAwB,CAIjC,sBAAsB,EAAE,UAAgC,CAAC,CAAC;IAC9D,CAAC,CAAC;IACF,MAAM,CAAC,iBAAiB,GAAG,4DAA8B,CACvD,IAAI,EACJ,sBAAsB,CACvB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,wEA0BC"}

package/dist/relations/has-one/has-one-repository.factory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-one-repository.factory.js","sourceRoot":"","sources":["../../../src/relations/has-one/has-one-repository.factory.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,0DAAiC;AAKjC,uDAAwD;AACxD,6EAA2E;AAC3E,6DAA+E;AAE/E,MAAM,KAAK,GAAG,eAAY,CAAC,gDAAgD,CAAC,CAAC;AAgB7E;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CAK3C,gBAAkC,EAClC,sBAAsE;IAEtE,MAAM,IAAI,GAAG,uCAAqB,CAAC,gBAAgB,CAAC,CAAC;IACrD,KAAK,CAAC,uCAAuC,EAAE,IAAI,CAAC,CAAC;IACrD,MAAM,MAAM,GAAoD,UAC9D,OAAuB;QAEvB,8DAA8D;QAC9D,MAAM,UAAU,GAAQ,EAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,EAAC,CAAC;QAChD,OAAO,IAAI,4CAAuB,CAIhC,sBAAsB,EAAE,UAAgC,CAAC,CAAC;IAC9D,CAAC,CAAC;IACF,MAAM,CAAC,iBAAiB,GAAG,0DAA6B,CACtD,IAAI,EACJ,sBAAsB,CACvB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,sEA0BC"}