refactor(rest-crud): use defineCrudRepositoryClass from `@loopback/…

…repository` Drop our own implementation in favor of the new generic version. Co-authored-by: Miroslav Bajtoš <[email protected]>
loopbackio · May 3, 2020 · aaf77df · aaf77df
1 parent faa0240
commit aaf77df
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 61 deletions.
diff --git a/packages/rest-crud/README.md b/packages/rest-crud/README.md
@@ -64,9 +64,9 @@ class defined without the need for a repository or controller class file.
 
 If you would like more flexibility, e.g. if you would only like to define a
 default `CrudRest` controller or repository, you can use the two helper methods
-(`defineCrudRestController` and `defineCrudRepositoryClass`) exposed from
-`@loopback/rest-crud`. These functions will help you create controllers and
-respositories using code.
+(`defineCrudRestController` from `@loopback/rest-crud` and
+`defineCrudRepositoryClass` from `@loopback/repository`). These functions will
+help you create controllers and repositories using code.
 
 For the examples in the following sections, we are also assuming a model named
 `Product`, and a datasource named `db` have already been created.
@@ -106,6 +106,8 @@ on the Model) for your app.
 Usage example:
 
 ```ts
+import {defineCrudRepositoryClass} from '@loopback/repository';
+
 const ProductRepository = defineCrudRepositoryClass(Product);
 this.repository(ProductRepository);
 inject('datasources.db')(ProductRepository, undefined, 0);
@@ -118,6 +120,8 @@ Here is an example of an app which uses `defineCrudRepositoryClass` and
 requirements.
 
 ```ts
+import {defineCrudRepositoryClass} from '@loopback/repository';
+
 export class TryApplication extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
 ) {

diff --git a/packages/rest-crud/src/__tests__/acceptance/default-model-crud-rest.acceptance.ts b/packages/rest-crud/src/__tests__/acceptance/default-model-crud-rest.acceptance.ts
@@ -4,6 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {
+  defineCrudRepositoryClass,
   Entity,
   EntityCrudRepository,
   juggler,
@@ -18,7 +19,7 @@ import {
   givenHttpServerConfig,
   toJSON,
 } from '@loopback/testlab';
-import {defineCrudRepositoryClass, defineCrudRestController} from '../..';
+import {defineCrudRestController} from '../..';
 
 // In this test scenario, we create a product with a required & an optional
 // property and use the default model settings (strict mode, forceId).

diff --git a/packages/rest-crud/src/crud-rest.api-builder.ts b/packages/rest-crud/src/crud-rest.api-builder.ts
@@ -18,12 +18,13 @@ import {
 import {
   ApplicationWithRepositories,
   Class,
+  defineCrudRepositoryClass,
   Entity,
   EntityCrudRepository,
 } from '@loopback/repository';
 import {Model} from '@loopback/rest';
 import debugFactory from 'debug';
-import {defineCrudRepositoryClass, defineCrudRestController} from '.';
+import {defineCrudRestController} from '.';
 
 const debug = debugFactory('loopback:boot:crud-rest');
 

diff --git a/packages/rest-crud/src/index.ts b/packages/rest-crud/src/index.ts
@@ -13,7 +13,8 @@
  * @packageDocumentation
  */
 
+// Re-export `defineCrudRepositoryClass` for backward-compatibility
+export {defineCrudRepositoryClass} from '@loopback/repository';
 export * from './crud-rest.api-builder';
 export * from './crud-rest.component';
 export * from './crud-rest.controller';
-export * from './repository-builder';
diff --git a/packages/rest-crud/src/repository-builder.ts b/packages/rest-crud/src/repository-builder.ts