Merge pull request #18 from 19majkel94/feature/generic-repository-decorator

Generic repository decorator

Author: pleerock

README.md

@@ -111,9 +111,8 @@ Optionally, you can specify a connection name in the decorator parameters.
 
 ### @OrmRepository
 
-Injects `Repository` of some Entity.
-
-If you want to inject custom Repository (class decorated with `@EntityRepository` decorator), use `OrmCustomRepository` instead.
+Injects `Repository`, `MongoRepository`, `TreeRepository` or custom repository of some Entity.
+Be aware that the property or param decorated with `@OrmRepository` has to be annotated with repository type!
 
 Example using property injection:
 
@@ -143,16 +142,27 @@ import "../entity/Post";
 @Service()
 export class PostRepository {
 
-    constructor(@OrmRepository(Post) private repository: Repository<Post>) {
-    }
+    constructor(
+        @OrmRepository(Post)
+        private repository: Repository<Post>
+    ) {}
 
 }
 ```
-Optionally, you can specify a connection name in the decorator parameters.
+Optionally, you can specify a connection name in the decorator parameters:
 
-### @OrmCustomRepository
+```ts
+@Service()
+export class PostRepository {
+    
+    @OrmRepository(Post, "custom-con-name")
+    private repository: Repository<Post>;
+    
+}
+```
 
-Injects custom `Repository` of some Entity. Be aware that you have to create the class which extends the generic `Repository<T>` and decorate it with `EntityRepository<T>` decorator.
+You can also inject custom `Repository` of some Entity. 
+Be aware that you have to create the class which extends the generic `Repository<T>` and decorate it with `EntityRepository<T>` decorator.
 
 Example using constructor injection:
 
@@ -178,9 +188,9 @@ export class PostService {
 
     // using constructor injection
     constructor(
-        @OrmCustomRepository(UserRepository)
-        private readonly userRepository: UserRepository
-    )
+        @OrmRepository()
+        private readonly userRepository: UserRepository,
+    ) {}
 
     public userExist(user: User): boolean {
         return this.userRepository.findByEmail(user.email) ? true : false;
@@ -191,86 +201,16 @@ export class PostService {
 
 Optionally, you can specify a connection name in the decorator parameters.
 
-### @OrmTreeRepository
-
-Injects `TreeRepository` of some Entity.
-
-Example using property injection:
-
-```typescript
-import {Service} from "typedi";
-import {TreeRepository} from "typeorm";
-import {OrmTreeRepository} from "typeorm-typedi-extensions";
-import "../entity/Post";
-
-@Service()
-export class PostRepository {
-    
-    @OrmTreeRepository(Post)
-    private repository: TreeRepository<Post>;
-    
-}
-```
-
-Example using constructor injection:
-
-```typescript
-import {Service} from "typedi";
-import {TreeRepository} from "typeorm";
-import {OrmTreeRepository} from "typeorm-typedi-extensions";
-import "../entity/Post";
-
-@Service()
-export class PostRepository {
-    
-    constructor(@OrmTreeRepository(Post) private repository: TreeRepository<Post>) {
-    }
-    
-}
-```
-
-Optionally, you can specify a connection name in the decorator parameters.
-
-### @OrmSpecificRepository
-
-Injects `SpecificRepository` of some Entity.
-
-Example using property injection:
-
-```typescript
-import {Service} from "typedi";
-import {SpecificRepository} from "typeorm";
-import {OrmSpecificRepository} from "typeorm-typedi-extensions";
-import "../entity/Post";
-
-@Service()
-export class PostRepository {
-    
-    @OrmSpecificRepository(Post)
-    private repository: SpecificRepository<Post>;
-    
-}
-```
-
-Example using constructor injection:
-
-```typescript
-import {Service} from "typedi";
-import {SpecificRepository} from "typeorm";
-import {OrmSpecificRepository} from "typeorm-typedi-extensions";
-import "../entity/Post";
-
+```ts
 @Service()
-export class PostRepository {
+export class PostService {
 
-    constructor(@OrmSpecificRepository(Post) private repository: SpecificRepository<Post>) {
-    }
+    @OrmRepository("custom-con-name")
+    private userRepository: UserRepository;
 
 }
 ```
 
-Optionally, you can specify a connection name in the decorator parameters.
-
 ## Samples
 
 Take a look on samples in [./sample](sample) for examples of usages.

package.json

@@ -1,13 +1,19 @@
 {
   "name": "typeorm-typedi-extensions",
-  "version": "0.0.12",
+  "version": "0.1.0",
   "description": "Dependancy injection and service container integration with TypeORM using typedi library.",
   "license": "MIT",
   "readmeFilename": "README.md",
   "author": {
     "name": "Umed Khudoiberdiev",
     "email": "[email protected]"
   },
+  "contributors": [
+    {
+      "name": "Michał Lytek",
+      "url": "https://github.com/19majkel94"
+    }
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/typeorm/typeorm-typedi-extensions.git"
@@ -38,12 +44,12 @@
     "ts-node": "^1.3.0",
     "tslint": "^3.15.1",
     "tslint-stylish": "^2.1.0-beta",
-    "typedi": "^0.5.0",
-    "typeorm": "^0.0.11",
-    "typescript": "^2.1.5"
+    "typedi": "^0.5.2",
+    "typeorm": "^0.1.0-alpha.47",
+    "typescript": "^2.5.2"
   },
   "peerDependencies": {
-    "typeorm": "^0.0.11",
-    "typedi": "^0.5.0"
+    "typeorm": "^0.1.0-alpha.47",
+    "typedi": "^0.5.2"
   }
 }

sample/sample1-simple-usage/app.ts

@@ -6,14 +6,12 @@ import {Post} from "./entity/Post";
 
 useContainer(Container);
 createConnection({
-    driver: {
-        type: "postgres",
-        host: "localhost",
-        port: 5432,
-        username: "test",
-        password: "admin",
-        database: "test"
-    },
+    type: "postgres",
+    host: "localhost",
+    port: 5432,
+    username: "test",
+    password: "admin",
+    database: "test",
     entities: [
         __dirname + "/entity/*.js"
     ],

sample/sample1-simple-usage/entity/Post.ts

@@ -1,9 +1,9 @@
-import {Table, PrimaryColumn, Column} from "typeorm";
+import {Entity, PrimaryGeneratedColumn, Column} from "typeorm";
 
-@Table()
+@Entity()
 export class Post {
 
-    @PrimaryColumn("int", { generated: true })
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()