jj.js 0.9.0 → 0.11.0

package/lib/model.js

@@ -2,9 +2,9 @@ const Context = require('./context');
 const {toLine} = require('./utils/str');
 
 /**
- * @typedef {import('./types').OkPacket} OkPacket
- * @typedef {import('./types').RowData} RowData
- * @typedef {import('./types').ListData} ListData
+ * @typedef {import('../types').OkPacket} OkPacket
+ * @typedef {import('../types').RowData} RowData
+ * @typedef {import('../types').ListData} ListData
  */
 
 /**
@@ -15,7 +15,7 @@ class Model extends Context
     /**
      * Initialize a new `Model`
      * @public
-     * @param {import('./types').Context} ctx
+     * @param {import('../types').KoaCtx} ctx
      */
     constructor(ctx) {
         super(ctx);
@@ -32,7 +32,6 @@ class Model extends Context
      * @returns {Promise<OkPacket>}
      */
     async add(data) {
-        // @ts-ignore
         return await this.db.allowField().insert(data);
     }
 
@@ -49,7 +48,6 @@ class Model extends Context
                 condition[this.pk] = data[this.pk];
                 delete data[this.pk];
             }
-            // @ts-ignore
             return await this.db.allowField().update(data, condition);
         }
 
@@ -64,7 +62,6 @@ class Model extends Context
      * @returns {Promise<OkPacket>}
      */
     async del(condition) {
-        // @ts-ignore
         return await this.db.delete(condition);
     }
 
@@ -85,13 +82,12 @@ class Model extends Context
      * @returns {Promise<(ListData)>}
      */
     async all(condition) {
-        // @ts-ignore
         return await this.db.select(condition);
     }
 
     /**
      * 数据库实例
-     * @type {typeof import('./db').prototype}
+     * @type {import('../types').DbInstance}
      */
     get db() {
         if(!this._db){

package/lib/pagination.js

@@ -9,7 +9,7 @@ class Pagination extends Context
     /**
      * Initialize a new `Pagination`
      * @public
-     * @param {import('./types').Context} ctx
+     * @param {import('../types').KoaCtx} ctx
      */
     constructor(ctx) {
         super(ctx);
@@ -23,12 +23,12 @@ class Pagination extends Context
     /**
      * 分页配置
      * @public
-     * @param {import('./types').PageConfig} [options]
+     * @param {import('../types').PageConfig} [options]
      * @returns {this}
      */
     init(options) {
         /**
-         * @type {import('./types').PageConfig}
+         * @type {import('../types').PageConfig}
          * @private
          */
         this.options = {...cfg_page, ...options};

package/lib/response.js

@@ -10,7 +10,7 @@ class Response extends Context
     /**
      * Initialize a new `Response`
      * @public
-     * @param {import('./types').Context} ctx
+     * @param {import('../types').KoaCtx} ctx
      */
     constructor(ctx) {
         super(ctx);

package/lib/run.js

@@ -1,39 +1,43 @@
 const path = require('path');
 const loader = require('./loader');
-const {readFile} = require('./utils/fs');
+const {readFile} = require('fs').promises;
 const {toHump} = require('./utils/str');
-const {app: cfg_app, view: cfg_view, db, page, log, cache, cookie, tpl} = require('./config');
+const config = require('./config');
+const {app: cfg_app, view: cfg_view} = config;
 const compose = require('koa-compose');
 const Logger = require('./logger');
+const storage = require('./storage');
 
 async function run(ctx, next, control_type=cfg_app.controller_folder) {
     if(cfg_app.app_debug) {
-        Logger.debug(ctx.request);
-        Logger.debug(`Router(${control_type}): {APP: '${ctx.APP}', CONTROLLER: '${ctx.CONTROLLER}', ACTION: '${ctx.ACTION}'}`);
-        Object.keys(ctx.params).length && Logger.debug({Params: ctx.params});
-        Object.keys(ctx.query).length && Logger.debug({Get: ctx.query});
-        Object.keys(ctx.request.body || {}).length && Logger.debug({Post: ctx.request.body});
+        Logger.http('Request:', ctx.request);
+        Logger.http({Router: control_type, APP: ctx.APP, CONTROLLER: ctx.CONTROLLER, ACTION: ctx.ACTION});
+        Object.keys(ctx.params).length && Logger.http('Params:', ctx.params);
+        Object.keys(ctx.query).length && Logger.http('Get:', ctx.query);
+        Object.keys(ctx.request.body || {}).length && Logger.http('Post:', ctx.request.body);
     }
     
+    // 设置store
+    const store = storage.getStore();
+    store.APP = ctx.APP;
+    store.CONTROLLER = ctx.CONTROLLER;
+    store.ACTION = ctx.ACTION;
+    store.COMMON = cfg_app.common_app;
     // 设置根加载器
-    ctx.$ = loader('./', ctx);
-    ctx._ = loader(cfg_app.base_dir, ctx);
-    ctx._.config === undefined && (ctx._.config = {});
-    ctx._.config.app = cfg_app;
-    ctx._.config.view = cfg_view;
-    ctx._.config.db = db;
-    ctx._.config.page = page;
-    ctx._.config.log = log;
-    ctx._.config.cache = cache;
-    ctx._.config.cookie = cookie;
-    ctx._.config.tpl = tpl;
+    store.$ = loader('./', ctx);
+    store._ = loader(cfg_app.base_dir, ctx);
+    // 配置特殊处理
+    store._.config === undefined && (store._.config = {});
+    Object.entries(config).forEach(([key, value]) => {
+        store._.config[key] = value;
+    });
 
     // 应用、控制器、方法名字验证
     if(~ctx.APP.indexOf('.') || ~ctx.CONTROLLER.indexOf('.') || ~ctx.ACTION.indexOf('.')) {
         throw new Error(`RunError: 应用、控制器或方法名字不合法！`);
     }
 
-    if(ctx.APP[0] == '_' || ctx.APP[0] == '$' || !ctx._[ctx.APP]) {
+    if(ctx.APP[0] == '_' || ctx.APP[0] == '$' || !store._[ctx.APP]) {
         if(cfg_app.app_debug) {
             throw new Error(`RunError: 应用:${ctx.APP}不存在！`);
         } else {
@@ -41,7 +45,7 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
         }
     }
 
-    if(!ctx._[ctx.APP][control_type]) {
+    if(!store._[ctx.APP][control_type]) {
         if(cfg_app.app_debug) {
             throw new Error(`RunError: 目录:${ctx.APP}/${control_type}不存在！`);
         } else {
@@ -51,7 +55,7 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
 
     // 模版文件内容直接输出
     if(control_type == cfg_view.view_folder) {
-        const content = await readFile(path.join(ctx._[ctx.APP][control_type].__node.path, ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext));
+        const content = await readFile(path.join(cfg_app.base_dir, `${ctx.APP}/${control_type}`, ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext));
         if(!content) {
             throw new Error(`RunError: 模板文件:${ctx.APP}/${control_type}/${ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext}不存在！`);
         }
@@ -60,7 +64,7 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
     }
 
     // 控制器
-    const Controller = ctx._[ctx.APP][control_type][ctx.CONTROLLER] || ctx._[ctx.APP][control_type]['empty'];
+    const Controller = store._[ctx.APP][control_type][ctx.CONTROLLER] || store._[ctx.APP][control_type]['_empty'];
 
     if(ctx.CONTROLLER[0] == '_' || ctx.CONTROLLER[0] == '$' || typeof Controller != 'function') {
         if(cfg_app.app_debug) {
@@ -73,7 +77,7 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
     // 控制器实例
     const $controller = new Controller(ctx, next);
     const humpAction = toHump(ctx.ACTION);
-    const action = typeof $controller[humpAction] == 'function' ? humpAction : 'empty';
+    const action = typeof $controller[humpAction] == 'function' ? humpAction : '_empty';
 
     if(ctx.ACTION[0] == '_' || ctx.ACTION[0] == '$' || typeof $controller[action] != 'function') {
         if(cfg_app.app_debug) {
@@ -96,13 +100,13 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
                 }
                 return stack.concat(async (ctx, next) => {
                     const [METHOD = action, MIDDLEWARE = ctx.CONTROLLER, APP = ctx.APP] = middle.middleware.split('/').reverse();
-                    if(!ctx._[APP]) {
+                    if(!store._[APP]) {
                         throw new Error(`RunError: 中间件应用:${APP}不存在！`);
                     }
-                    if(!ctx._[APP]['middleware']) {
+                    if(!store._[APP]['middleware']) {
                         throw new Error(`RunError: 中间件目录:${APP}/middleware不存在！`);
                     }
-                    const Middleware = ctx._[APP]['middleware'][MIDDLEWARE];
+                    const Middleware = store._[APP]['middleware'][MIDDLEWARE];
                     if(!Middleware || typeof Middleware != 'function') {
                         throw new Error(`RunError: 中间件文件:${APP}/middleware/${MIDDLEWARE}不存在！`);
                     }

package/lib/storage.js

@@ -0,0 +1,5 @@
+const {AsyncLocalStorage} = require('async_hooks');
+
+const storage = new AsyncLocalStorage();
+
+module.exports = storage;

package/lib/tpl/types.js

@@ -0,0 +1,22 @@
+module.exports = `/**
+* @type {typeof import('jj.js/types')}
+*/
+const JJCtx = require('jj.js').Ctx;
+
+/**
+ * @typedef {import('jj.js/types').Config} JJConfig
+ */
+
+__TYPES__
+
+/**
+ * @class Ctx
+ */
+class Ctx extends JJCtx {
+__PROPERTY__
+}
+
+/**
+ * @module types
+ */
+module.exports = Ctx;`;