feat: use egg-orm latest version (#124)

Author: fengmk2

todomvc/.autod.conf.js

@@ -1,3 +1,7 @@
 {
-  "extends": "eslint-config-egg"
+  "root": true,
+  "extends": "eslint-config-egg",
+  "parserOptions": {
+    "ecmaVersion": 2022
+  }
 }

todomvc/.eslintrc

@@ -1,5 +1,3 @@
-'use strict';
-
 const initDatabase = require('./config/database/init');
 
 class AppBootHook {

todomvc/.travis.yml

@@ -1,5 +1,3 @@
-'use strict';
-
 const { Controller } = require('egg');
 
 class HomeController extends Controller {

todomvc/app.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const { Controller } = require('egg');
 
 class TodoController extends Controller {

todomvc/app/controller/home.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = options => {
   return async function responseTime(ctx, next) {
     const start = Date.now();

todomvc/app/controller/todo.js

@@ -1,18 +1,16 @@
-'use strict';
+module.exports = app => {
+  const { Bone, DataTypes: { DATE, STRING, BOOLEAN } } = app.model;
 
-module.exports = (app, Model) => {
-  const { INTEGER, DATE, STRING, BOOLEAN } = Model.DataTypes;
-
-  class Todo extends Model {}
-
-  Todo.init({
-    id: { type: INTEGER, primaryKey: true, autoIncrement: true },
-    title: STRING(1000),
-    createdAt: DATE,
-    updatedAt: DATE,
-    deletedAt: DATE,
-    completed: BOOLEAN,
-  });
+  class Todo extends Bone {
+    static table = 'todos';
+    static attributes = {
+      title: STRING(1000),
+      createdAt: DATE,
+      updatedAt: DATE,
+      deletedAt: DATE,
+      completed: BOOLEAN,
+    };
+  }
 
   return Todo;
 };

todomvc/app/middleware/response_time.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * @param {Egg.Application} app - egg application
  */

todomvc/app/model/todo.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const { Service } = require('egg');
 
 /**

todomvc/app/router.js

@@ -39,7 +39,7 @@
     </div>
     {% endraw %}
   </body>
-  <script src="//cdn.jsdelivr.net/npm/vue"></script>
+  <script src="//cdn.jsdelivr.net/npm/vue@2"></script>
   <script src="//cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
   <script src="//cdn.jsdelivr.net/npm/js-cookie/src/js.cookie.min.js"></script>
   <script src="/public/main.js"></script>

todomvc/app/service/todo.js

@@ -1,7 +1,5 @@
 /* eslint valid-jsdoc: "off" */
 
-'use strict';
-
 const path = require('path');
 
 /**

todomvc/app/view/home.tpl

@@ -1,7 +1,5 @@
 /* eslint valid-jsdoc: "off" */
 
-'use strict';
-
 const path = require('path');
 
 module.exports = () => {

todomvc/appveyor.yml

@@ -1,5 +1,3 @@
-'use strict';
-
 // init database here
 module.exports = async app => {
   // sync database defines
@@ -8,9 +6,11 @@ module.exports = async app => {
   if (app.config.env === 'unittest') {
     await app.model.Todo.remove({}, true);
     await app.model.Todo.bulkCreate([
-      { id: 1, title: 'Read history of Node.js', completed: true },
-      { id: 2, title: 'Learn Koa', completed: true },
-      { id: 3, title: 'Star Egg', completed: false },
+      { title: 'Read history of Node.js', completed: true },
+      { title: 'Learn Koa', completed: true },
+      { title: 'Star Egg', completed: false },
     ]);
+    const rows = await app.model.Todo.findAll();
+    console.log(rows);
   }
 };

todomvc/config/config.default.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /** @type Egg.EggPlugin */
 module.exports = {
   nunjucks: {

todomvc/config/config.unittest.js

@@ -7,24 +7,21 @@
     "declarations": true
   },
   "dependencies": {
-    "egg": "^2.15.1",
-    "egg-orm": "^1.0.0",
-    "egg-scripts": "^2.11.0",
+    "egg": "^3.11.0",
+    "egg-orm": "^2.3.0",
+    "egg-scripts": "^2.17.0",
     "egg-validate": "^2.0.2",
-    "egg-view-nunjucks": "^2.2.0",
-    "sqlite3": "^4.1.1"
+    "egg-view-nunjucks": "^2.3.0",
+    "sqlite3": "^5.1.4"
   },
   "devDependencies": {
-    "autod": "^3.0.1",
-    "autod-egg": "^1.1.0",
-    "egg-bin": "^4.11.0",
-    "egg-ci": "^1.11.0",
-    "egg-mock": "^3.21.0",
-    "eslint": "^5.13.0",
-    "eslint-config-egg": "^7.1.0"
+    "egg-bin": "^5.9.0",
+    "egg-mock": "^5.5.0",
+    "eslint": "^8.31.0",
+    "eslint-config-egg": "^12.1.0"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=16.0.0"
   },
   "scripts": {
     "start": "egg-scripts start --daemon --title=egg-server-todomvc",
@@ -35,16 +32,12 @@
     "test-local": "DEBUG=leoric egg-bin test",
     "cov": "DEBUG=leoric egg-bin cov",
     "lint": "eslint .",
-    "ci": "npm run lint && npm run cov",
-    "autod": "autod"
+    "ci": "npm run lint && npm run cov"
   },
   "repository": {
     "type": "git",
     "url": ""
   },
-  "ci": {
-    "version": "10, 12"
-  },
   "author": "TZ <[email protected]>",
   "license": "MIT"
 }

todomvc/config/database/init.js

@@ -1,11 +1,10 @@
-'use strict';
-
-const { app, assert } = require('egg-mock/bootstrap');
+const { app, assert, mock } = require('egg-mock/bootstrap');
 
 describe('test/app/controller/home.test.js', () => {
   beforeEach(() => {
     app.mockCsrf();
   });
+  afterEach(mock.restore);
 
   it('should GET /', () => {
     return app.httpRequest()
@@ -69,9 +68,13 @@ describe('test/app/controller/home.test.js', () => {
   });
 
   it('should update todo', async () => {
+    const res = await app.httpRequest()
+      .get('/api/todo');
+    const row = res.body[0];
+
     await app.httpRequest()
-      .put('/api/todo/1')
-      .send({ id: '1', title: 'Modify Node.js' })
+      .put(`/api/todo/${row.id}`)
+      .send({ id: row.id, title: 'Modify Node.js' })
       .expect('X-Response-Time', /\d+ms/)
       .expect(204);
 
@@ -86,7 +89,7 @@ describe('test/app/controller/home.test.js', () => {
 
   it('should update todo fail', () => {
     return app.httpRequest()
-      .put('/api/todo/999')
+      .put('/api/todo/999999999999')
       .set('Accept', 'application/json')
       .send({ id: '1', title: undefined })
       .expect(422)
@@ -103,18 +106,22 @@ describe('test/app/controller/home.test.js', () => {
 
   it('should update todo fail with not found', () => {
     return app.httpRequest()
-      .put('/api/todo/999')
+      .put('/api/todo/999999999999')
       .set('Accept', 'application/json')
-      .send({ id: '999', title: 'Modify Node.js' })
+      .send({ id: '999999999999', title: 'Modify Node.js' })
       .expect(500)
       .then(res => {
-        assert(res.body.message === 'task#999 not found');
+        assert(res.body.message === 'task#999999999999 not found');
       });
   });
 
   it('should delete todo', async () => {
+    const res = await app.httpRequest()
+      .get('/api/todo');
+    const row = res.body[0];
+
     await app.httpRequest()
-      .delete('/api/todo/1')
+      .delete(`/api/todo/${row.id}`)
       .expect(204);
 
     // validate
@@ -129,11 +136,11 @@ describe('test/app/controller/home.test.js', () => {
 
   it('should delete todo fail', () => {
     return app.httpRequest()
-      .delete('/api/todo/999')
+      .delete('/api/todo/999999999999')
       .set('Accept', 'application/json')
       .expect(500)
       .then(res => {
-        assert(res.body.message === 'task#999 not found');
+        assert(res.body.message === 'task#999999999999 not found');
       });
   });
 });