jj.js 1.0.0-rc.3 → 1.0.0-rc.5

package/lib/controller.js

@@ -50,30 +50,33 @@ class Controller extends Middleware
      * 获取文件内容并输出
      * @public
      * @param {string} [template]
+     * @returns {Promise<'__EXIT__'>}
      */
     async $load(template) {
         const content = await this._$view.load(template);
-        this.$show(content);
+        return this.$show(content);
     }
 
     /**
      * 渲染(解析数据)内容并输出
      * @public
      * @param {string} content
+     * @returns {Promise<'__EXIT__'>}
      */
     async $render(content) {
         const html = await this._$view.render(content);
-        this.$show(html);
+        return this.$show(html);
     }
 
     /**
      * 渲染(解析数据)文件并输出
      * @public
      * @param {string} [template]
+     * @returns {Promise<'__EXIT__'>}
      */
     async $fetch(template) {
         const content = await this._$view.fetch(template);
-        this.$show(content);
+        return this.$show(content);
     }
 
     /**

package/lib/middleware.js

@@ -26,9 +26,10 @@ class Middleware extends Context
      * 直接输出内容
      * @public
      * @param {*} data
+     * @returns {'__EXIT__'}
      */
     $show(data) {
-        this._$response.show(data);
+        return this._$response.show(data);
     }
  
     /**
@@ -36,9 +37,10 @@ class Middleware extends Context
      * @public
      * @param {(string|object)} url
      * @param {number} [status]
+     * @returns {'__EXIT__'}
      */
     $redirect(url, status) {
-        this._$response.redirect(url, status);
+        return this._$response.redirect(url, status);
     }
 
     /**
@@ -46,9 +48,10 @@ class Middleware extends Context
      * @public
      * @param {(string|object)} [msg]
      * @param {(string|object)} [url]
+     * @returns {'__EXIT__'}
      */
     $success(msg, url) {
-        this._$response.success(msg, url);
+        return this._$response.success(msg, url);
     }
 
     /**
@@ -56,9 +59,10 @@ class Middleware extends Context
      * @public
      * @param {(string|object)} [msg]
      * @param {(string|object)} [url]
+     * @returns {'__EXIT__'}
      */
     $error(msg, url) {
-        this._$response.error(msg, url);
+        return this._$response.error(msg, url);
     }
 
     /**

package/lib/response.js

@@ -29,9 +29,11 @@ class Response extends Context
      * 直接输出内容
      * @public
      * @param {*} data
+     * @returns {'__EXIT__'}
      */
     show(data) {
         this.ctx.body = data;
+        return '__EXIT__';
     }
 
     /**
@@ -39,10 +41,12 @@ class Response extends Context
      * @public
      * @param {*} url
      * @param {number} status
+     * @returns {'__EXIT__'}
      */
     redirect(url, status=302) {
         this.ctx.status = status;
         this.ctx.redirect(this._$url.build(url));
+        return '__EXIT__';
     }
 
     /**
@@ -50,11 +54,12 @@ class Response extends Context
      * @public
      * @param {(string|object)} [msg]
      * @param {(string|object)} [url]
+     * @returns {'__EXIT__'}
      */
     success(msg='操作成功！', url) {
         typeof msg == 'object' && ([msg, url] = ['操作成功！', msg]);
         url = typeof url == 'string' ? this._$url.build(url) : (url || this.ctx.header.referer || '');
-        this.jump(msg, url, 1);
+        return this.jump(msg, url, 1);
     }
 
     /**
@@ -62,11 +67,12 @@ class Response extends Context
      * @public
      * @param {(string|object)} [msg]
      * @param {(string|object)} [url]
+     * @returns {'__EXIT__'}
      */
     error(msg='操作失败！', url) {
         typeof msg == 'object' && ([msg, url] = ['操作失败！', msg]);
         url = typeof url == 'string' ? this._$url.build(url) : (url || 'javascript:history.back(-1);');
-        this.jump(msg, url, 0);
+        return this.jump(msg, url, 0);
     }
 
     /**
@@ -75,6 +81,7 @@ class Response extends Context
      * @param {(string|object)} msg
      * @param {(string|object)} url
      * @param {number} state 
+     * @returns {'__EXIT__'}
      */
     jump(msg, url, state=1) {
         const tplData = {state, msg, url, wait: this._wait};
@@ -82,6 +89,7 @@ class Response extends Context
             // @ts-ignore
             return tplData[args[1]];
         });
+        return '__EXIT__';
     }
 
     /**
@@ -99,6 +107,7 @@ class Response extends Context
      * 输出异常信息（html|json）
      * @public
      * @param {Error} err
+     * @returns {'__EXIT__'}
      */
     exception(err) {
         const escapeHtml = require('./utils/escape-html');
@@ -112,6 +121,7 @@ class Response extends Context
             // @ts-ignore
             return tplData[args[1]];
         });
+        return '__EXIT__';
     }
 
     /**

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "jj.js",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.5",
   "description": "A super simple lightweight NodeJS MVC framework（一个超级简单轻量的NodeJS MVC框架）",
   "main": "jj.js",
   "bin": {
-    "init": "./bin/jj.js"
+    "jj-cli": "./bin/jj.js"
   },
   "scripts": {
     "demo": "node ./tests/_demo/server.js",