jj.js 0.18.0 → 0.20.0

package/lib/loader.js

@@ -1,82 +1,117 @@
 const pt = require('path');
+/** @type {function} */
+// @ts-ignore
 const isClass = require('is-class');
 const {isFileSync, isDirSync} = require('./utils/fs');
 
-const nodeType = {};
+/**
+ * @typedef {import('../types').NodeType} NodeType
+ * @typedef {import('../types').NodeInfo} NodeInfo
+ * @typedef {import('../types').ClassNode} ClassNode
+ * @typedef {import('../types').ObjectNode} ObjectNode
+ * @typedef {import('../types').Node} Node
+ */
 
-function loader(dir='./', ...args) {
-    // @ts-ignore
-    dir = pt.isAbsolute(dir) ? dir : pt.join(pt.dirname(module.parent.filename), dir);
+/**
+ * @type {Map<string, NodeType>}
+ */
+const typeStore = new Map();
+
+/**
+ * nodejs模块（‌CommonJS）自动加载器
+ * @param {string} path 根目录，需为绝对路径，最后不带斜杠
+ * @param {...any} args class自动实例化时的构造参数
+ * @return {Node}
+ */
+function loader(path, ...args) {
+    const dir = pt.normalize(path).replace(/[\/\\]+$/, '');
     const dirPath = pt.join(dir, './');
-    const dirType = isFileSync(dir + '.js') ? 'file' : 'dir';
-    const node = dirType == 'file' ? require(dir) : {};
-    const info = new Map();
-    info.set(node, {
+    /** @type {NodeType} */
+    let dirType = isFileSync(dir + '.js') ? 'file' : isFileSync(dir + '.json') ? 'json' : 'dir';
+    const node = dirType == 'dir' ? {} : require(dir);
+    
+    if(dirType == 'file' && isClass(node)) {
+        dirType = 'class';
+    }
+    /** @type {Map<object, NodeInfo>} */
+    const infoStore = new Map();
+    infoStore.set(node, {
         path: dirPath,
-        nodeType: dirType,
-        // @ts-ignore
-        isClass: isClass(node)
+        type: dirType
     });
     return creatLoader(node);
 
+    /**
+     * 创建代理对象
+     * @param {ClassNode & ObjectNode} node - 类型仅为防报错
+     * @return {Node} - 节点
+     */
     function creatLoader(node) {
+        // @ts-ignore
         return new Proxy(node, {
             get: (node, prop, receiver) => {
                 if(prop in node || typeof prop == 'symbol' || prop == 'inspect') {
                     return Reflect.get(node, prop, receiver);
                 }
-                const nodeInfo = info.get(node);
-                if(nodeInfo.isClass) {
+
+                /** @type {NodeInfo} */
+                // @ts-ignore
+                const nodeInfo = infoStore.get(node);
+                if(nodeInfo.type == 'class') {
                     if(!nodeInfo.instance) {
                         nodeInfo.instance = new node(...args);
                     }
-                    return prop in nodeInfo.instance ? nodeInfo.instance[prop] : (prop == '__node' ? nodeInfo : nodeInfo.instance[prop]);
-                } else if(prop == '__node') {
+                    // @ts-ignore
+                    return prop in nodeInfo.instance ? nodeInfo.instance[prop] : prop == '__NODE__' ? nodeInfo : prop == '__ISCLASS__' ? true : nodeInfo.instance[prop];
+                } else if(prop == '__NODE__') {
                     return nodeInfo;
+                } else if(prop == '__ISCLASS__') {
+                    return false;
                 }
 
-                let _node = {};
-                const _nodePath = nodeInfo.path + prop + '/';
+                const _nodePath = nodeInfo.path + prop + pt.sep;
                 const _nodeFile = nodeInfo.path + prop + '.js';
-                if(!nodeType[_nodePath]) {
-                    if(isFileSync(_nodeFile)) {
-                        nodeType[_nodePath] = 'file';
-                    } else if(isDirSync(_nodePath)) {
-                        nodeType[_nodePath] = 'dir';
-                    } else {
-                        // nodeType[_nodePath] = 'none';
+                const _nodeJson = nodeInfo.path + prop + '.json';
+                let _nodeType = typeStore.get(_nodePath);
+                if(_nodeType === undefined) {
+                    _nodeType = isFileSync(_nodeFile) ? 'file' : isFileSync(_nodeJson) ? 'json' : isDirSync(_nodePath) ? 'dir' : '';
+                    if(_nodeType == 'file' && isClass(require(_nodeFile))) {
+                        _nodeType = 'class';
                     }
+                    typeStore.set(_nodePath, _nodeType);
                 }
-                if(nodeType[_nodePath] == 'file') {
+                let _node = {};
+                if(_nodeType == '') {
+                    return undefined; // 直接返回
+                } else if(_nodeType == 'file' || _nodeType == 'class') {
                     _node = require(_nodeFile);
-                } else if(nodeType[_nodePath] != 'dir') {
-                    node[prop] = undefined;
-                    return node[prop];
+                } else if(_nodeType == 'json') {
+                    _node = require(_nodeJson);
                 }
-                info.set(_node, {
+                infoStore.set(_node, {
                     path: _nodePath,
-                    nodeType: nodeType[_nodePath],
-                    // @ts-ignore
-                    isClass: isClass(_node)
+                    type: _nodeType
                 });
-                node[prop] = creatLoader(_node);
-                return node[prop];
+                // @ts-ignore
+                return node[prop] = creatLoader(_node); // 代理，并缓存
             },
-            set: (_node, prop, value) => {
-                if(prop in node) {
-                    node[prop] = value;
-                    return true;
+            set: (node, prop, value, receiver) => {
+                if(prop in node || typeof prop == 'symbol' || prop == 'inspect') {
+                    return Reflect.set(node, prop, value, receiver);
                 }
-                const nodeInfo = info.get(_node);
-                if(nodeInfo.isClass) {
+
+                /** @type {NodeInfo} */
+                // @ts-ignore
+                const nodeInfo = infoStore.get(node);
+                if(nodeInfo.type == 'class') {
                     if(!nodeInfo.instance) {
                         nodeInfo.instance = new node(...args);
                     }
-                    nodeInfo.instance[prop] = value;
-                    return true;
+                    // @ts-ignore
+                    return Reflect.set(nodeInfo.instance, prop, value, nodeInfo.instance);
                 }
-                node[prop] = value;
-                return true;
+
+                return Reflect.set(node, prop, value, receiver);
             }
         });
     }

package/lib/logger.js

@@ -1,127 +1,125 @@
-const {app: cfg_app, log: cfg_log} = require('./config');
-
-/**
- * @typedef {import('../types').LogHandle} LogHandle
- */
-
-class Logger
-{
-    /**
-     * Creat a new `Logger` class
-     * @public
-     * @static
-     * @param {LogHandle} [handle]
-     */
-    constructor(handle) {
-        if(new.target) {
-            // @ts-ignore
-            class ClildLogger extends this.constructor {}
-            // @ts-ignore
-            ClildLogger.setHandle(handle);
-            return ClildLogger;
-        }
-    }
-
-    /**
-     * 输出system日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static system(...args) {
-        this.log('system', ...args);
-    }
-
-    /**
-     * 输出error日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static error(...args) {
-        this.log('error', ...args);
-    }
-
-    /**
-     * 输出warning日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static warning(...args) {
-        this.log('warning', ...args);
-    }
-
-    /**
-     * 输出info日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static info(...args) {
-        this.log('info', ...args);
-    }
-
-    /**
-     * 输出debug日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static debug(...args) {
-        this.log('debug', ...args);
-    }
-
-    /**
-     * 输出sql日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static sql(...args) {
-        this.log('sql', ...args);
-    }
-
-    /**
-     * 输出http日志
-     * @public
-     * @static
-     * @param  {...any} args
-     */
-    static http(...args) {
-        this.log('http', ...args);
-    }
-
-    /**
-     * 输出error日志
-     * @public
-     * @static
-     * @param  {string} level - 日志级别、标识
-     * @param  {...any} args - 日志内容
-     */
-    static log(level='info', ...args) {
-        (cfg_app.app_debug || ~cfg_log.log_level.indexOf(level)) && this.handle(level, ...args);
-    }
-
-    /**
-     * 设置日志handle
-     * @public
-     * @static
-     * @param {LogHandle} handle
-     * @returns {Logger}
-     */
-    static setHandle(handle) {
-        /**
-         * @type {LogHandle}
-         */
-        this.handle = typeof handle == 'function' ? handle : cfg_log.log_handle;
-        return this;
-    }
-}
-
-/**
- * 设置日志handle
- */
-Logger.setHandle(cfg_log.log_handle);
-
+const {app: cfg_app, log: cfg_log} = require('./config');
+
+/**
+ * @typedef {import('../types').LogLevel} LogLevel
+ * @typedef {import('../types').LogHandle} LogHandle
+ */
+
+class Logger
+{
+    static handle = cfg_log.log_handle;
+
+    /**
+     * Creat a new `Logger` class
+     * @public
+     * @static
+     * @param {LogHandle} [handle]
+     */
+    constructor(handle) {
+        if(new.target) {
+            // @ts-ignore
+            class ClildLogger extends this.constructor {
+                static handle = handle || cfg_log.log_handle;
+            }
+            return ClildLogger;
+        }
+    }
+
+    /**
+     * 输出system日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static system(...args) {
+        this.log('system', ...args);
+    }
+
+    /**
+     * 输出error日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static error(...args) {
+        this.log('error', ...args);
+    }
+
+    /**
+     * 输出warning日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static warning(...args) {
+        this.log('warning', ...args);
+    }
+
+    /**
+     * 输出info日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static info(...args) {
+        this.log('info', ...args);
+    }
+
+    /**
+     * 输出debug日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static debug(...args) {
+        this.log('debug', ...args);
+    }
+
+    /**
+     * 输出sql日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static sql(...args) {
+        this.log('sql', ...args);
+    }
+
+    /**
+     * 输出http日志
+     * @public
+     * @static
+     * @param  {...any} args
+     */
+    static http(...args) {
+        this.log('http', ...args);
+    }
+
+    /**
+     * 输出error日志
+     * @public
+     * @static
+     * @param  {LogLevel} level - 日志级别、标识
+     * @param  {...any} args - 日志内容
+     */
+    static log(level='info', ...args) {
+        (cfg_app.app_debug || ~cfg_log.log_level.indexOf(level)) && this.handle(level, ...args);
+    }
+
+    /**
+     * 设置日志handle
+     * @public
+     * @static
+     * @param {LogHandle} handle
+     * @returns {Logger}
+     */
+    static setHandle(handle) {
+        if(typeof handle != 'function') {
+            throw new Error('handle must be a function');
+        }
+        this.handle = handle;
+        return this;
+    }
+}
+
 module.exports = Logger;

package/lib/middleware.js

@@ -1,5 +1,11 @@
 const Context = require('./context');
 
+/**
+ * @typedef {import('../types').KoaCtx} KoaCtx
+ * @typedef {import('../types').AsyncNext} AsyncNext
+ * @typedef {import('../types').ResponseInstance} ResponseInstance
+ */
+
 /**
  * @extends Context
  */
@@ -8,8 +14,8 @@ class Middleware extends Context
     /**
      * Initialize a new `Middleware`
      * @public
-     * @param {import('../types').KoaCtx} ctx
-     * @param {import('../types').AsyncNext} [next]
+     * @param {KoaCtx} ctx
+     * @param {AsyncNext} [next]
      */
     constructor(ctx, next) {
         super(ctx);
@@ -22,7 +28,7 @@ class Middleware extends Context
      * @param {*} data
      */
     $show(data) {
-        this.$response.show(data);
+        this._$response.show(data);
     }
  
     /**
@@ -32,7 +38,7 @@ class Middleware extends Context
      * @param {number} [status]
      */
     $redirect(url, status) {
-        this.$response.redirect(url, status);
+        this._$response.redirect(url, status);
     }
 
     /**
@@ -42,7 +48,7 @@ class Middleware extends Context
      * @param {(string|object)} [url]
      */
     $success(msg, url) {
-        this.$response.success(msg, url);
+        this._$response.success(msg, url);
     }
 
     /**
@@ -52,7 +58,34 @@ class Middleware extends Context
      * @param {(string|object)} [url]
      */
     $error(msg, url) {
-        this.$response.error(msg, url);
+        this._$response.error(msg, url);
+    }
+
+    /**
+     * @type {ResponseInstance} Response实例
+     * @private
+     */
+    // @ts-ignore
+    __response = null;
+
+    /**
+     * @type {ResponseInstance} Response实例
+     */
+    get _$response() {
+        if(this.__response === null) {
+            if(this.$response && this.$response.__ISCLASS__) {
+                this.__response = this.$response;
+            } else if(this.$ && this.$.response) {
+                this.__response = this.$.response;
+            } else {
+                this.__response = new (require('./response'))(this.ctx);
+            }
+        }
+        return this.__response;
+    }
+
+    set _$response(response) {
+        this.__response = response;
     }
 }
 

package/lib/model.js

@@ -2,9 +2,14 @@ const Context = require('./context');
 const {toLine} = require('./utils/str');
 
 /**
+ * @typedef {import('../types').DbConfigItem} DbConfigItem
+ * @typedef {import('../types').DbInstance} DbInstance
  * @typedef {import('../types').OkPacket} OkPacket
  * @typedef {import('../types').RowData} RowData
  * @typedef {import('../types').ListData} ListData
+ * @typedef {import('../types').Where} Where
+ * @typedef {import('../types').DbData} DbData
+ * @typedef {import('../types').KoaCtx} KoaCtx
  */
 
 /**
@@ -15,10 +20,14 @@ class Model extends Context
     /**
      * Initialize a new `Model`
      * @public
-     * @param {import('../types').KoaCtx} ctx
+     * @param {KoaCtx} ctx
      */
     constructor(ctx) {
         super(ctx);
+        /**
+         * @type {DbConfigItem}
+         */
+        // @ts-ignore
         this.connection = null;
         this.table = toLine(this.constructor.name);
         this.pk = 'id';
@@ -28,7 +37,7 @@ class Model extends Context
     /**
      * 插入一条数据
      * @public
-     * @param {object} data - 待插入数据
+     * @param {DbData} data - 待插入数据
      * @returns {Promise<OkPacket>}
      */
     async add(data) {
@@ -38,12 +47,12 @@ class Model extends Context
     /**
      * 更新或插入一条数据
      * @public
-     * @param {object} data - 更新或插入数据
-     * @param {object} [condition] - 更新条件，不为空或data包含主键则更新数据，否则插入数据
+     * @param {DbData} data - 更新或插入数据
+     * @param {Where} [condition] - 更新条件，不为空或data包含主键则更新数据，否则插入数据
      * @returns {Promise<OkPacket>}
      */
     async save(data, condition = {}) {
-        if(data[this.pk] || Object.keys(condition).length) {
+        if(data[this.pk] || (condition && Object.keys(condition).length)) {
             if(data[this.pk]) {
                 condition[this.pk] = data[this.pk];
                 delete data[this.pk];
@@ -58,17 +67,20 @@ class Model extends Context
     /**
      * 删除数据
      * @public
-     * @param {object} condition - 删除条件
+     * @param {Where} condition - 删除条件
      * @returns {Promise<OkPacket>}
      */
     async del(condition) {
+        if(!condition || Object.keys(condition).length === 0) {
+            throw new Error('condition is empty');
+        }
         return await this.db.delete(condition);
     }
 
     /**
      * 查询一条数据
      * @public
-     * @param {object} condition - 查询条件
+     * @param {Where} [condition] - 查询条件
      * @returns {Promise<(RowData|null)>}
      */
     async get(condition) {
@@ -78,7 +90,7 @@ class Model extends Context
     /**
      * 查询多条数据
      * @public
-     * @param {object} condition - 查询条件
+     * @param {Where} [condition] - 查询条件
      * @returns {Promise<(ListData)>}
      */
     async all(condition) {
@@ -87,7 +99,9 @@ class Model extends Context
 
     /**
      * 数据库实例
-     * @type {import('../types').DbInstance}
+     * @type {DbInstance}
+     * @public
+     * @returns {DbInstance}
      */
     get db() {
         if(!this._db){