jj.js 0.18.0 → 0.20.0

package/lib/upload.js

@@ -61,11 +61,11 @@ class Upload extends Context
     /**
      * 保存文件到目录
      * @public
-     * @param {string} [dir]
+     * @param {string} [dir] - 保存目录，默认为当前目录
      * @returns {Promise<(boolean|UploadData)>}
      */
-    async save(dir) {
-        if(!this.check()) {
+    async save(dir = './') {
+        if(!this.check() || !this._file) {
             return false;
         }
 
@@ -76,7 +76,7 @@ class Upload extends Context
             savename = utils.date.format('YYYY/mmdd/') + utils.md5(Date.now() + Math.random().toString(36).substr(2));
         }
         if(!pt.extname(savename)) {
-            savename += pt.extname(this._file.originalFilename);
+            savename += pt.extname(this._file.originalFilename || '');
         }
 
         try {
@@ -98,7 +98,7 @@ class Upload extends Context
                 extname: pt.extname(savename).slice(1),
                 savename,
                 filepath: filePath,
-                name: this._file.originalFilename,
+                name: this._file.originalFilename || '',
                 size: this._file.size,
                 mimetype: this._file.mimetype,
                 hash: this._file.hash
@@ -113,10 +113,10 @@ class Upload extends Context
      * 获取上传文件
      * @public
      * @param {string} [name] - 为空时，获取所有上传文件
-     * @returns {(File|File[]|Files)}
+     * @returns {(File|File[]|Files|undefined)}
      */
     getFile(name) {
-        return typeof name == 'string' ? this.ctx.request.files[name] : this.ctx.request.files;
+        return typeof name == 'string' ? this.ctx.request.files && this.ctx.request.files[name] : this.ctx.request.files;
     }
 
     /**
@@ -125,7 +125,7 @@ class Upload extends Context
      * @returns {string}
      */
     getError() {
-        return this._error;
+        return this._error || '';
     }
 
     /**
@@ -135,7 +135,7 @@ class Upload extends Context
      */
     check() {
         if(!this._file) {
-            this._error = '上传文件为找到！';
+            this._error = '上传文件未找到！';
             return false;
         }
         
@@ -167,14 +167,14 @@ class Upload extends Context
     /**
      * 检查上传文件后缀
      * @public
-     * @param {(string|array)} ext
+     * @param {(string|string[])} ext
      * @returns {boolean}
      */
     checkExt(ext) {
         if(typeof ext == 'string') {
             ext = ext.split(',');
         }
-        if(!~ext.indexOf(pt.extname(this._file.originalFilename).slice(1).toLowerCase())) {
+        if(!~ext.indexOf(pt.extname(this._file && this._file.originalFilename || '').slice(1).toLowerCase())) {
             return false;
         }
         return true;
@@ -183,14 +183,14 @@ class Upload extends Context
     /**
      * 检查上传文件mimetype
      * @public
-     * @param {(string|array)} type
+     * @param {(string|string[])} type
      * @returns {boolean}
      */
     checkType(type) {
         if(typeof type == 'string') {
             type = type.split(',');
         }
-        if(!~type.indexOf(this._file.mimetype.toLowerCase())) {
+        if(!~type.indexOf((this._file && this._file.mimetype || '').toLowerCase())) {
             return false;
         }
         return true;
@@ -202,8 +202,8 @@ class Upload extends Context
      * @returns {boolean}
      */
     checkImg() {
-        const fileExt = pt.extname(this._file.originalFilename).slice(1).toLowerCase();
-        const fileType = this._file.mimetype.toLowerCase().split('/');
+        const fileExt = pt.extname(this._file && this._file.originalFilename || '').slice(1).toLowerCase();
+        const fileType = (this._file && this._file.mimetype || '').toLowerCase().split('/');
         const exts = ['gif', 'png', 'jpeg', 'webp', 'ico', 'bmp', 'svg', 'jpg', 'tiff'];
         const mimes = ['gif', 'png', 'jpeg', 'webp', 'x-icon', 'bmp', 'svg+xml', 'tiff'];
         if(~exts.indexOf(fileExt) && (fileType[0] != 'image' || !~mimes.indexOf(fileType[1]))) {

package/lib/url.js

@@ -1,6 +1,13 @@
 const {app: cfg_app, routes: cfg_routes} = require('./config');
+/**
+ * @typedef {import('../types').RouteConfigItem} RouteConfigItem
+ * @type {Object.<string, RouteConfigItem>}
+ */
 const routes = (cfg_routes || []).reverse().reduce((routes, route) => {
-    if(route.name){
+    if(route.name) {
+        // @ts-ignore
+        if(routes[route.name]) throw new Error(`RouteError: 重复的路由名字：${route.name}`);
+        // @ts-ignore
         routes[route.name] = route;
     }
     return routes;
@@ -30,7 +37,7 @@ class Url extends Context
         if(typeof vars != 'object') {
             [vars, ext, domain] = [{}, vars, ext];
         }
-        if(ext === true || ext.slice(0, 4) == 'http') {
+        if(typeof ext == 'boolean' || ext.slice(0, 4) == 'http') {
             [ext, domain] = ['', ext];
         }
         if(domain === true) {
@@ -83,6 +90,7 @@ class Url extends Context
         url = routes[url].url;
 
         if(~url.indexOf(':')) {
+            // @ts-ignore
             url = url.replace(/\:([^/]+\(.*\)|[^/]+)/g, (match, key) => {
                 key = key.split(/[(.]/);
                 const k = key[0];

package/lib/utils/error.js

@@ -1,24 +1,28 @@
 const fs = require('./fs.js');
 
+/**
+ * @typedef {import('../../types').ExceptionData} ExceptionData
+ */
+
 /**
  * @function - 解析Error数据
  * @param {Error} err - 错误对象
- * @returns {object} - 解析后数据
+ * @returns {ExceptionData} - 解析后数据
  */
 function parseError(err) {
     let msg = err.message;
-    let stack = err.stack.replace(/(\r\n)/g, "\n").split("\n");
+    let stack = (err.stack || '').replace(/(\r\n)/g, "\n").split("\n");
 
     if(err.name == 'TemplateError') {
         msg = 'TemplateError: ' + stack.pop();
-        stack = [stack.shift().replace('TemplateError:', "at")];
+        stack = [(stack.shift() || '').replace('TemplateError:', "at")];
     } else {
         stack = stack.filter(text => {return /^    at /.test(text);});
     }
 
     const file_info = stack[0].split(' ').slice(-1)[0].replace(/(\()|(\))/g, '').split(':');
-    const column = parseInt(file_info.pop());
-    const row = parseInt(file_info.pop());
+    const column = parseInt(file_info.pop() || '0');
+    const row = parseInt(file_info.pop() || '0');
     const file_path = file_info.join(':');
     let begin = row - 10;
     let end = row + 10;

package/lib/utils/utils.js

@@ -7,9 +7,11 @@
 module.exports = new Proxy({}, {
     get: (target, prop) => {
         if(prop in target || typeof prop == 'symbol' || prop == 'inspect') {
+            // @ts-ignore
             return target[prop];
         }
         if(prop == 'type') {
+            // @ts-ignore
             return para => Object.prototype.toString.call(para).slice(8, -1);
         }
         return require('./' + prop);

package/lib/utils/validate.js

@@ -0,0 +1,13 @@
+/**
+ * Validate path name
+ * @param {string} name
+ * @returns {boolean}
+ */
+function validatePath(name) {
+    if (!/^[a-zA-Z0-9_]+$/.test(name)) {
+        return false;
+    }
+    return true;
+}
+
+module.exports = { validatePath };

package/lib/view.js

@@ -5,19 +5,36 @@ const {app: cfg_app, view: cfg_view} = require('./config');
 const {toLine} = require('./utils/str');
 const Context = require('./context');
 
+/**
+ * @typedef {import('../types').KoaCtx} KoaCtx
+ * @typedef {import('../types').ViewEngine} ViewEngine
+ * @typedef {import('../types').ViewFilter} ViewFilter
+ * @typedef {import('../types').UrlInstance} UrlInstance
+ */
+
 /**
  * @extends Context
  */
 class View extends Context
 {
+    /**
+     * @type {Object.<string, any>}
+     */
+    _data = {};
+
+    /**
+     * @type {ViewEngine}
+     */
+    // @ts-ignore
+    _engine = null;
+
     /**
      * Initialize a new `View`
      * @public
-     * @param {import('../types').KoaCtx} ctx
+     * @param {KoaCtx} ctx
      */
     constructor(ctx) {
         super(ctx);
-        this._data = {};
         this.setEngine(cfg_view.view_engine);
     }
     
@@ -61,7 +78,8 @@ class View extends Context
      * @returns {this}
      */
     assign(name, value) {
-        if(typeof name == 'string') {
+
+        if(typeof name == 'string') {console.log('assign', this, Object.keys(this));
             this._data[name] = value;
         } else {
             this._data = name;
@@ -88,11 +106,11 @@ class View extends Context
      * @param {string} [view_depr] - 模板文件分隔符
      * @returns {string}
      */
-    parsePath(template, view_folder, view_depr) {
+    parsePath(template = '', view_folder, view_depr) {
         template = template || this.ctx.ACTION
         !view_folder && (view_folder = cfg_view.view_folder);
         !view_depr && (view_depr = cfg_view.view_depr);
-        let view_file = template;
+        let view_file = template || '';
 
         if(view_file.indexOf('/') !== 0) {
             const temp = view_file.replace(/^\/|\/$/g, '').split('/').reverse().map(u => toLine(u));
@@ -110,7 +128,7 @@ class View extends Context
      * @param {string} [template] - 默认当前请求方法名，支持智能解析
      * @returns {string}
      */
-    parseTplName(template) {
+    parseTplName(template = '') {
         let file_name = this.parsePath(template, this._folder, this._depr);
         let is_file = isFileSync(file_name);
         if(!is_file && (this._folder || this._depr)) {
@@ -133,8 +151,9 @@ class View extends Context
     setEngine(engine) {
         this._engine = typeof engine == 'string' ? require(engine) : engine;
         this._engine.defaults.debug = cfg_app.app_debug;
+        // @ts-ignore
         this.setFilter('url', (...args) => {
-            return this.$url.build(...args);
+            return this._$url.build(...args);
         });
         this.setFilter(cfg_view.view_filter);
         return this;
@@ -143,7 +162,7 @@ class View extends Context
     /**
      * 设置模版函数
      * @public
-     * @param {(string|object)} fun_obj - 函数名字或者包含多个函数的对象
+     * @param {(string|ViewFilter)} fun_obj - 函数名字或者包含多个函数的对象
      * @param {*} [fun] - 函数
      * @returns {this}
      */
@@ -179,6 +198,33 @@ class View extends Context
         this._depr = view_depr;
         return this;
     }
+
+    /**
+     * @type {UrlInstance} Url实例
+     * @private
+     */
+    // @ts-ignore
+    __url = null;
+
+    /**
+     * @type {UrlInstance} Url实例
+     */
+    get _$url() {
+        if(this.__url === null) {
+            if(this.$url && this.$url.__ISCLASS__) {
+                this.__url = this.$url;
+            } else if(this.$ && this.$.url) {
+                this.__url = this.$.url;
+            } else {
+                this.__url = new (require('./url'))(this.ctx);
+            }
+        }
+        return this.__url;
+    }
+
+    set _$url(url) {
+        this.__url = url;
+    }
 }
 
 module.exports = View;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "jj.js",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "description": "A super simple lightweight NodeJS MVC framework（一个超级简单轻量的NodeJS MVC框架）",
   "main": "jj.js",
-  "scripts": {},
+  "scripts": {
+    "demo": "node ./tests/_demo/server.js",
+    "test": "node --test"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yafoo/jj.js.git"
@@ -27,10 +30,14 @@
     "koa": "^2.16.0",
     "koa-body": "^6.0.1",
     "koa-static": "^5.0.0",
+    "mongodb": "^6.0.0",
     "mysql": "^2.18.1",
-    "watch": "^1.0.2"
+    "sqlite3": "^5.1.7"
   },
   "engines": {
     "node": ">= 18"
+  },
+  "devDependencies": {
+    "supertest": "^7.2.2"
   }
 }