chore: upgrade to TypeScript 3.5

loopbackio · May 30, 2019 · 1ccbeee · 1ccbeee
1 parent bf07ff9
commit 1ccbeee
Show file tree

Hide file tree

Showing 35 changed files with 101 additions and 86 deletions.
diff --git a/examples/express-composition/package-lock.json b/examples/express-composition/package-lock.json
diff --git a/examples/express-composition/package.json b/examples/express-composition/package.json
@@ -61,6 +61,6 @@
     "@types/express": "^4.16.1",
     "@types/node": "^10.11.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   }
 }
diff --git a/examples/express-composition/src/controllers/note.controller.ts b/examples/express-composition/src/controllers/note.controller.ts
@@ -11,14 +11,14 @@ import {
   Where,
 } from '@loopback/repository';
 import {
-  post,
-  param,
+  del,
   get,
   getFilterSchemaFor,
   getWhereSchemaFor,
+  param,
   patch,
+  post,
   put,
-  del,
   requestBody,
 } from '@loopback/rest';
 import {Note} from '../models';
@@ -51,7 +51,7 @@ export class NoteController {
     },
   })
   async count(
-    @param.query.object('where', getWhereSchemaFor(Note)) where?: Where,
+    @param.query.object('where', getWhereSchemaFor(Note)) where?: Where<Note>,
   ): Promise<Count> {
     return await this.noteRepository.count(where);
   }
@@ -69,7 +69,8 @@ export class NoteController {
     },
   })
   async find(
-    @param.query.object('filter', getFilterSchemaFor(Note)) filter?: Filter,
+    @param.query.object('filter', getFilterSchemaFor(Note))
+    filter?: Filter<Note>,
   ): Promise<Note[]> {
     return await this.noteRepository.find(filter);
   }
@@ -84,7 +85,7 @@ export class NoteController {
   })
   async updateAll(
     @requestBody() note: Note,
-    @param.query.object('where', getWhereSchemaFor(Note)) where?: Where,
+    @param.query.object('where', getWhereSchemaFor(Note)) where?: Where<Note>,
   ): Promise<Count> {
     return await this.noteRepository.updateAll(note, where);
   }

diff --git a/examples/greeter-extension/package-lock.json b/examples/greeter-extension/package-lock.json
diff --git a/examples/greeter-extension/package.json b/examples/greeter-extension/package.json
@@ -49,7 +49,7 @@
     "@types/debug": "4.1.4",
     "@types/node": "^10.11.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "dependencies": {
     "@loopback/context": "^1.16.0",

diff --git a/examples/hello-world/package-lock.json b/examples/hello-world/package-lock.json
diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
@@ -46,7 +46,7 @@
     "@loopback/tslint-config": "^2.0.4",
     "@types/node": "^10.11.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "keywords": [
     "loopback",

diff --git a/examples/lb3-application/package-lock.json b/examples/lb3-application/package-lock.json
diff --git a/examples/lb3-application/package.json b/examples/lb3-application/package.json
@@ -59,7 +59,7 @@
     "@types/node": "^10.11.2",
     "lodash": "^4.17.11",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "keywords": [
     "loopback",

diff --git a/examples/log-extension/package-lock.json b/examples/log-extension/package-lock.json
diff --git a/examples/log-extension/package.json b/examples/log-extension/package.json
@@ -48,7 +48,7 @@
     "@types/debug": "^4.1.4",
     "@types/node": "^10.11.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "dependencies": {
     "@loopback/context": "^1.16.0",

diff --git a/examples/rpc-server/package-lock.json b/examples/rpc-server/package-lock.json
diff --git a/examples/rpc-server/package.json b/examples/rpc-server/package.json
@@ -50,6 +50,6 @@
     "@types/express": "^4.11.1",
     "@types/node": "^10.11.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   }
 }
diff --git a/examples/soap-calculator/package-lock.json b/examples/soap-calculator/package-lock.json
diff --git a/examples/soap-calculator/package.json b/examples/soap-calculator/package.json
@@ -60,6 +60,6 @@
     "mocha": "^6.1.3",
     "source-map-support": "^0.5.5",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   }
 }
diff --git a/examples/todo-list/package-lock.json b/examples/todo-list/package-lock.json
diff --git a/examples/todo-list/package.json b/examples/todo-list/package.json
@@ -56,7 +56,7 @@
     "@types/node": "^10.11.2",
     "lodash": "^4.17.10",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "keywords": [
     "loopback",

diff --git a/examples/todo-list/src/__tests__/unit/controllers/todo-list-todo.controller.unit.ts b/examples/todo-list/src/__tests__/unit/controllers/todo-list-todo.controller.unit.ts
@@ -4,6 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {
+  Count,
   DefaultHasManyRepository,
   HasManyRepository,
 } from '@loopback/repository';
@@ -32,7 +33,8 @@ describe('TodoController', () => {
   in our tests themselves.
   =============================================================================
    */
-  let todos: sinon.SinonStub;
+  // tslint:disable:no-any
+  let todos: sinon.SinonStub<any[], Todo[]>;
 
   /*
   =============================================================================
@@ -42,10 +44,11 @@ describe('TodoController', () => {
   in our tests themselves.
   =============================================================================
    */
-  let create: sinon.SinonStub;
-  let find: sinon.SinonStub;
-  let patch: sinon.SinonStub;
-  let del: sinon.SinonStub;
+  let create: sinon.SinonStub<any[], Promise<Todo>>;
+  let find: sinon.SinonStub<any[], Promise<Todo[]>>;
+  let patch: sinon.SinonStub<any[], Promise<Count>>;
+  let del: sinon.SinonStub<any[], Promise<Count>>;
+  // tslint:enable:no-any
 
   /*
   =============================================================================
@@ -98,22 +101,22 @@ describe('TodoController', () => {
 
   describe('patch()', () => {
     it('returns a number of todos updated', async () => {
-      patch.resolves([aChangedTodo].length);
+      patch.resolves({count: [aChangedTodo].length});
       const where = {title: aTodoWithId.title};
       expect(
         await controller.patch(aTodoListWithId.id!, aTodoToPatchTo, where),
-      ).to.eql(1);
+      ).to.eql({count: 1});
       sinon.assert.calledWith(todos, aTodoListWithId.id!);
       sinon.assert.calledWith(patch, aTodoToPatchTo, where);
     });
   });
 
   describe('deleteAll()', () => {
-    it('successfully deletes existing items', async () => {
-      del.resolves(aListOfTodos.length);
-      expect(await controller.delete(aTodoListWithId.id!)).to.eql(
-        aListOfTodos.length,
-      );
+    it('returns a number of todos deleted', async () => {
+      del.resolves({count: aListOfTodos.length});
+      expect(await controller.delete(aTodoListWithId.id!)).to.eql({
+        count: aListOfTodos.length,
+      });
       sinon.assert.calledWith(todos, aTodoListWithId.id!);
       sinon.assert.called(del);
     });
@@ -155,7 +158,8 @@ describe('TodoController', () => {
     (todoListRepo as any).todos = todos;
 
     // Setup CRUD fakes
-    ({create, find, patch, delete: del} = constrainedTodoRepo.stubs);
+    // tslint:disable-next-line:no-any
+    ({create, find, patch, delete: del} = constrainedTodoRepo.stubs as any);
 
     controller = new TodoListTodoController(todoListRepo);
   }

diff --git a/examples/todo-list/src/controllers/todo-list-todo.controller.ts b/examples/todo-list/src/controllers/todo-list-todo.controller.ts
@@ -56,7 +56,7 @@ export class TodoListTodoController {
   })
   async find(
     @param.path.number('id') id: number,
-    @param.query.object('filter') filter?: Filter,
+    @param.query.object('filter') filter?: Filter<Todo>,
   ): Promise<Todo[]> {
     return await this.todoListRepo.todos(id).find(filter);
   }
@@ -72,7 +72,7 @@ export class TodoListTodoController {
   async patch(
     @param.path.number('id') id: number,
     @requestBody() todo: Partial<Todo>,
-    @param.query.object('where', getWhereSchemaFor(Todo)) where?: Where,
+    @param.query.object('where', getWhereSchemaFor(Todo)) where?: Where<Todo>,
   ): Promise<Count> {
     return await this.todoListRepo.todos(id).patch(todo, where);
   }
@@ -87,7 +87,7 @@ export class TodoListTodoController {
   })
   async delete(
     @param.path.number('id') id: number,
-    @param.query.object('where', getWhereSchemaFor(Todo)) where?: Where,
+    @param.query.object('where', getWhereSchemaFor(Todo)) where?: Where<Todo>,
   ): Promise<Count> {
     return await this.todoListRepo.todos(id).delete(where);
   }

diff --git a/examples/todo-list/src/controllers/todo-list.controller.ts b/examples/todo-list/src/controllers/todo-list.controller.ts
@@ -50,7 +50,8 @@ export class TodoListController {
     },
   })
   async count(
-    @param.query.object('where', getWhereSchemaFor(TodoList)) where?: Where,
+    @param.query.object('where', getWhereSchemaFor(TodoList))
+    where?: Where<TodoList>,
   ): Promise<Count> {
     return await this.todoListRepository.count(where);
   }
@@ -64,7 +65,8 @@ export class TodoListController {
     },
   })
   async find(
-    @param.query.object('filter', getFilterSchemaFor(TodoList)) filter?: Filter,
+    @param.query.object('filter', getFilterSchemaFor(TodoList))
+    filter?: Filter<TodoList>,
   ): Promise<TodoList[]> {
     return await this.todoListRepository.find(filter);
   }
@@ -79,7 +81,8 @@ export class TodoListController {
   })
   async updateAll(
     @requestBody() obj: Partial<TodoList>,
-    @param.query.object('where', getWhereSchemaFor(TodoList)) where?: Where,
+    @param.query.object('where', getWhereSchemaFor(TodoList))
+    where?: Where<TodoList>,
   ): Promise<Count> {
     return await this.todoListRepository.updateAll(obj, where);
   }

diff --git a/examples/todo-list/src/controllers/todo.controller.ts b/examples/todo-list/src/controllers/todo.controller.ts
@@ -60,7 +60,8 @@ export class TodoController {
     },
   })
   async findTodos(
-    @param.query.object('filter', getFilterSchemaFor(Todo)) filter?: Filter,
+    @param.query.object('filter', getFilterSchemaFor(Todo))
+    filter?: Filter<Todo>,
   ): Promise<Todo[]> {
     return await this.todoRepo.find(filter);
   }

diff --git a/examples/todo/package-lock.json b/examples/todo/package-lock.json
diff --git a/examples/todo/package.json b/examples/todo/package.json
@@ -56,7 +56,7 @@
     "@types/node": "^10.11.2",
     "lodash": "^4.17.10",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "keywords": [
     "loopback",

diff --git a/examples/todo/src/__tests__/unit/controllers/todo.controller.unit.ts b/examples/todo/src/__tests__/unit/controllers/todo.controller.unit.ts
@@ -100,7 +100,7 @@ describe('TodoController', () => {
 
     it('uses the provided filter', async () => {
       const find = todoRepo.stubs.find;
-      const filter: Filter = {where: {isCompleted: false}};
+      const filter: Filter<Todo> = {where: {isComplete: false}};
 
       find.resolves(aListOfTodos);
       await controller.findTodos(filter);