jj.js 0.7.1 → 0.7.4

package/lib/controller.js

@@ -2,13 +2,6 @@ const Middleware = require('./middleware');
 
 class Controller extends Middleware
 {
-    constructor(...args) {
-        super(...args);
-        if(!this.$view.__node.isClass) {
-            this.$view = this.$.view;
-        }
-    }
-
     // 赋值模版数据
     $assign(name, value) {
         this.$view.assign(name, value);

package/lib/ctx.js

@@ -3,37 +3,43 @@ const loader = require('./loader');
 const Ctx = new Proxy(class {}, {
         construct() {
             return new Proxy({__proto__: arguments[2].prototype}, {
-                get: (target, prop) => {
+                get: (target, prop, receiver) => {
                     if(prop in target || typeof prop == 'symbol' || prop == 'inspect') {
-                        return target[prop];
+                        return Reflect.get(target, prop, receiver);
                     }
                     if(prop == '$' || prop == '_') {
                         return target.ctx && target.ctx[prop]
                             || prop == '$' && (target.$ || (target.$ = loader('../'))) && target.$
                             || undefined;
                     }
+                    if(prop.slice(0, 1) != '$') {
+                        return undefined;
+                    }
                     const pp = prop.slice(1);
-                    if(target.ctx && target.ctx._) {
-                        const _ = target.ctx._;
-                        const ctx_app = target.ctx.APP;
-                        const common_app = _.config.app.common_app;
-                        const $ = target.ctx.$;
-                        if(_[ctx_app][prop] === undefined) {
-                            if(_[ctx_app][pp] && _[common_app] && _[common_app][pp]) {
-                                _[ctx_app][prop] = new Proxy({}, {
+                    const ctx = target.ctx;
+                    if(ctx && ctx._) {
+                        const _ = ctx._;
+                        const APP = ctx.APP;
+                        const COMMON = _.config.app.common_app;
+                        if(_[APP][prop] === undefined) {
+                            if(_[APP][pp] && _[COMMON] && _[COMMON][pp]) {
+                                _[APP][prop] = new Proxy({}, {
                                     get: (...args) => {
-                                        return _[ctx_app][pp][args[1]] || _[common_app][pp][args[1]];
+                                        return _[APP][pp][args[1]] || _[COMMON][pp][args[1]];
                                     }
                                 });
-                            } else if(_[ctx_app][pp]) {
-                                _[ctx_app][prop] = _[ctx_app][pp];
-                            } else if(_[common_app] && _[common_app][pp]) {
-                                _[ctx_app][prop] = _[common_app][pp];
+                            } else if(_[APP][pp]) {
+                                _[APP][prop] = _[APP][pp];
+                            } else if(_[COMMON] && _[COMMON][pp]) {
+                                _[APP][prop] = _[COMMON][pp];
                             } else {
-                                _[ctx_app][prop] = null;
+                                _[APP][prop] = null;
+                            }
+                            if(~['view', 'response'].indexOf(pp) && _[APP][prop] && _[APP][prop].__node && !_[APP][prop].__node.isClass && ctx.$ && ctx.$[pp]) {
+                                _[APP][prop] = ctx.$[pp];
                             }
                         }
-                        return _[ctx_app][prop] || _[pp] || $[pp] || undefined;
+                        return _[APP][prop] || _[pp] || (ctx.$ && ctx.$[pp]) || undefined;
                     } else {
                         return (target.$ || (target.$ = loader('../'))) && target.$[pp];
                     }

package/lib/loader.js

@@ -17,9 +17,9 @@ function loader(dir='./', ...args) {
 
     function creatLoader(node) {
         return new Proxy(node, {
-            get: (node, prop) => {
+            get: (node, prop, receiver) => {
                 if(prop in node || typeof prop == 'symbol' || prop == 'inspect') {
-                    return node[prop];
+                    return Reflect.get(node, prop, receiver);
                 }
                 const nodeInfo = info.get(node);
                 if(nodeInfo.isClass) {

package/lib/upload.js

@@ -37,7 +37,7 @@ class Upload extends Context
 
         try {
             const filePath = pt.join(this.$config.app.base_dir, dir, savename);
-            await utils.fs.mkdirs(filePath);
+            await utils.fs.mkdirs(pt.dirname(filePath));
             const reader = fs.createReadStream(this._file.path);
             const writer = fs.createWriteStream(filePath);
             reader.pipe(writer);

package/lib/utils/fs.js

@@ -64,23 +64,13 @@ fsFun.isDirSync = (path) => {return fs.existsSync(path) && fs.statSync(path).isD
 });
 
 //(多级目录生成)
-fsFun.mkdirs = async function (path) {
-    const dir = pt.dirname(path);
-    if(!await fsFun.isDir(dir)) {
-        let pathtmp;
-        const dirnames = dir.split(/[/\\]/);
-        for(const dirname of dirnames) {
-            if(pathtmp) {
-                pathtmp = pt.join(pathtmp, dirname);
-            } else {
-                pathtmp = dirname;
-            }
-            if(!await fsFun.isDir(pathtmp)) {
-                const result = await fsFun.mkdir(pathtmp)
-                if (!result) {
-                    throw result;
-                }
-            }
+fsFun.mkdirs = async function (dirname) {
+    if(await fsFun.isDir(dirname)) {
+        return true;
+    } else {
+        if(await fsFun.mkdirs(pt.dirname(dirname))) {
+            await fsFun.mkdir(dirname);
+            return true;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj.js",
-  "version": "0.7.1",
+  "version": "0.7.4",
   "description": "A simple and lightweight MVC framework built on nodejs+koa2",
   "main": "jj.js",
   "scripts": {