fix(typeorm): Update typescript version and change typeorm version se…

…mver pattern

Related #738

examples/typeorm/package.json

@@ -66,6 +66,6 @@
     "supertest": "4.0.2",
     "ts-node": "8.5.2",
     "tslint": "5.20.1",
-    "typescript": "3.5.3"
+    "typescript": "3.7.4"
   }
 }

examples/typeorm/src/Server.ts

@@ -5,9 +5,9 @@ import "@tsed/typeorm";
 import * as bodyParser from "body-parser";
 import * as compress from "compression";
 import * as cookieParser from "cookie-parser";
-import * as methodOverride from "method-override";
 import * as cors from "cors";
 import * as session from "express-session";
+import * as methodOverride from "method-override";
 
 const rootDir = __dirname;
 
@@ -19,6 +19,10 @@ const rootDir = __dirname;
   mount: {
     "/v1": `${rootDir}/controllers/**/**Ctrl.{ts,js}`
   },
+  componentsScan: [
+    `${rootDir}/services/*{.ts,.js}`,
+    `${rootDir}/repositories/*{.ts,.js}`
+  ],
   typeorm: [
     {
       name: "default",
@@ -31,7 +35,7 @@ const rootDir = __dirname;
       logging: false,
       synchronize: true,
       entities: [
-        `${rootDir}/entity/*{.ts,.js}`
+        `${rootDir}/entities/*{.ts,.js}`
       ],
       migrations: [
         `${rootDir}/migrations/*{.ts,.js}`

examples/typeorm/src/controllers/users/UsersCtrl.ts

@@ -1,22 +1,26 @@
-import {BodyParams, Controller, Get, Post} from "@tsed/common";
+import {BodyParams, Controller, Get, PathParams, Post} from "@tsed/common";
 import {ReturnsArray} from "@tsed/swagger";
-import {User} from "../../entity/User";
-import {UsersService} from "../../services/UsersService";
+import {User} from "../../entities/User";
+import {UserRepository} from "../../repositories/UserRepository";
 
 @Controller("/users")
 export class UsersCtrl {
-
-  constructor(private usersService: UsersService) {
+  constructor(private userRepository: UserRepository) {
   }
 
   @Post("/")
   create(@BodyParams() user: User): Promise<User> {
-    return this.usersService.create(user);
+    return this.userRepository.save(user);
+  }
+
+  @Get("/:id")
+  async get(@PathParams() id: string): Promise<User> {
+    return this.userRepository.findByID(id);
   }
 
   @Get("/")
   @ReturnsArray(User)
   async getList(): Promise<User[]> {
-    return this.usersService.find();
+    return this.userRepository.find();
   }
 }

examples/typeorm/src/repositories/UserRepository.ts

@@ -0,0 +1,10 @@
+import {Repository} from "typeorm";
+import {EntityRepository} from "@tsed/typeorm";
+import {User} from "../entities/User";
+
+@EntityRepository(User)
+export class UserRepository extends Repository<User> {
+  findByID(id: string): Promise<User> {
+    return this.findOne(id);
+  }
+}

examples/typeorm/yarn.lock

@@ -3965,10 +3965,10 @@ typeorm@0.2.22:
     yargonaut "^1.1.2"
     yargs "^13.2.1"
 
-typescript@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
-  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+typescript@3.7.4:
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19"
+  integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==
 
 uid-safe@~2.1.5:
   version "2.1.5"

package.json

@@ -162,7 +162,7 @@
     "tsconfig-paths": "3.9.0",
     "tslint": "5.20.1",
     "type-graphql": "0.17.5",
-    "typeorm": "0.2.20",
+    "typeorm": "0.2.22",
     "typescript": "3.5.3",
     "vue-analytics": "5.17.2",
     "vuepress-theme-tsed": "2.1.11",
@@ -177,4 +177,4 @@
       "packages/*"
     ]
   }
-}
+}

packages/typeorm/package.json

@@ -12,9 +12,9 @@
     "@tsed/common": "5.38.1",
     "@tsed/core": "5.38.1",
     "tslib": "1.10.0",
-    "typeorm": "0.2.20"
+    "typeorm": "^0.2.22"
   },
   "private": false,
   "devDependencies": {},
   "peerDependencies": {}
-}
+}

yarn.lock

@@ -2975,10 +2975,10 @@ apollo-utilities@^1.0.1, apollo-utilities@^1.3.0:
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-app-root-path@^2.0.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
-  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
+app-root-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
+  integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
 
 append-buffer@^1.0.2:
   version "1.0.2"
@@ -15023,12 +15023,12 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@0.2.20:
-  version "0.2.20"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.20.tgz#efb60f2e55a7d08fc365f281ec2a71c87a9ebba5"
-  integrity sha512-VxB+9qH8D+PM19MIx18Zs3Fqv/ZINnnQvUGmBEiLYDrB9etdSdamgSTCIhWdFNndeJ6ldH4jbD0Z6HWsepMPlA==
+typeorm@0.2.22, typeorm@~0.2.22:
+  version "0.2.22"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.22.tgz#e85166e29ee4e4248ed73b2b8c977f364ffba606"
+  integrity sha512-mDEnMtzRwX4zMYbyzM9xDn7jvGs8hfQ2ymOBq36Zxq1RVM642numwlRbr4W8dU7ZYx8CQUE9rmk+sU0baHD9Rw==
   dependencies:
-    app-root-path "^2.0.1"
+    app-root-path "^3.0.0"
     buffer "^5.1.0"
     chalk "^2.4.2"
     cli-highlight "^2.0.0"