gina 0.1.2-alpha.5 → 0.1.3-alpha.1

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.2-alpha.5/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.3-alpha.1/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.2-alpha.5/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.3-alpha.1/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","__defineGetter__","_this","Date","parseInt","getTime","timeout","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","headEls","existingLinks","console","debug","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/core/config.js

@@ -50,7 +50,7 @@ function Config(opt, contextResetNeeded) {
         setContext('projectName', opt.projectName || getContext('projectName'));
         setContext('bundle', opt.startingApp);
         // reset context
-        resetContext()
+        resetContext();
     }
 
     // framework settings from homedir
@@ -81,15 +81,18 @@ function Config(opt, contextResetNeeded) {
             self.startingApp    = opt.startingApp;
             self.executionPath  = opt.executionPath; // project path
 
-            self.task = opt.task || 'run'; // to be aible to filter later on non run task
+            self.task = opt.task || 'run'; // to be aible to filter later on non run task
 
             self.userConf = false;
-            var path = _(self.executionPath + '/env.json');
+            var pathObj = new _(self.executionPath + '/env.json', true);
+            var path    = pathObj.toString();
 
-            if ( fs.existsSync(path) ) {
+            if ( pathObj.existsSync() ) {
                 self.userConf = requireJSON(path);
                 console.debug('Application config file loaded [' + path + ']');
             }
+            path    = null;
+            pathObj = null;
 
             self.Env.parent = self;
             if (env != 'undefined') self.Env.set(env);
@@ -410,10 +413,10 @@ function Config(opt, contextResetNeeded) {
         },
         getDefault : function() {
             return {
-                "env" : this.template.defEnv,
-                "scope" : this.template.defScope,
-                "ext" : this.template.defExt,
-                "registeredEnvs" : this.template.registeredEnvs
+                "env"               : this.template.defEnv,
+                "scope"             : this.template.defScope,
+                "ext"               : this.template.defExt,
+                "registeredEnvs"    : this.template.registeredEnvs
             }
         }
     }
@@ -544,7 +547,8 @@ function Config(opt, contextResetNeeded) {
 
         var content     = userConf,
             //if nothing to merge.
-            newContent = JSON.parse( JSON.stringify(content) );
+            newContent = JSON.parse( JSON.stringify(content) )
+        ;
 
         var isStandalone    = true,
             masterPort      = null,
@@ -563,10 +567,12 @@ function Config(opt, contextResetNeeded) {
             self.projectName = ctx.config.projectName
         }
 
-        //Pushing default app first.
+        // Pushing default app first.
         self.bundles.push(self.startingApp);//This is a JSON.push.
-        var root = new _(self.executionPath).toUnixStyle();
-        var manifest = null, pkg  = null;
+        var root        = new _(self.executionPath).toUnixStyle()
+            , manifest  = null
+            , pkg       = null
+        ;
         try {
             manifest = require(_(root + '/manifest.json', true));
             pkg = manifest.bundles;
@@ -575,11 +581,11 @@ function Config(opt, contextResetNeeded) {
         } catch (err) {
             console.error(err.stack);
 
-            callback(err);
-        } //bundlesPath will be default.
+            return callback(err);
+        }
 
 
-        //For each app.
+        // For each app.
         var cacheless           = self.isCacheless()
             , bundleSettings    = null
             , bundHasSettings   = true
@@ -589,8 +595,7 @@ function Config(opt, contextResetNeeded) {
             , p                 = null
         ;
 
-        // getting bundle config files
-
+        // Getting bundle config files
         var configFiles     = null
             , appPath       = null
             , jsonFile      = null
@@ -682,9 +687,10 @@ function Config(opt, contextResetNeeded) {
                     files[name] = ( typeof(files[name]) != 'undefined' ) ? files[name] : {};
                     let fileContent = files[name];
                     // let filename = _(appPath + '/config/' + tmp);
-                    let filename = _(appPath + '/config/' + main);
+                    let filenameObj = new _(appPath + '/config/' + main, true);
+                    let filename    = filenameObj.toString();
 
-                    exists = fs.existsSync(_(filename, true));
+                    exists = filenameObj.existsSync();
                     // loading env if exists
                     if ( self.isCacheless() ) {
                         if (exists) {
@@ -705,16 +711,17 @@ function Config(opt, contextResetNeeded) {
                         }
                     } catch (_err) {
                         if (exists) {
-                            callback(new Error('[ ' + filename + ' ] is malformed !!'))
-                        } else {
-                            fileContent = undefined
+                            return callback(new Error('[ ' + filename + ' ] is malformed !!'))
                         }
+                        fileContent = undefined;
                     }
                     // loading main
-                    filename = _(appPath + '/config/' + main);
+                    filenameObj = new _(appPath + '/config/' + main, true);
+                    filename    = filenameObj.toString();
+                    exists      = filenameObj.existsSync();
                     //Can't do anything without.
                     try {
-                        exists = fs.existsSync(_(filename, true));
+
                         if (cacheless && exists) {
                             delete require.cache[require.resolve(_(filename, true))];
                         }
@@ -732,13 +739,13 @@ function Config(opt, contextResetNeeded) {
                         }
                     } catch (_err) {
 
-                        if (fs.existsSync(filename)) {
+                        if ( exists ) {
                             let e = '[ ' + filename + ' ] is malformed !!\n\r' + (_err.stack || _err.message);
                             console.error(e);
-                            callback(new Error(e))
-                        } else {
-                            fileContent = undefined
+                            return callback(new Error(e))
                         }
+
+                        fileContent = undefined;
                     }
 
                     // tmp settings - because we need it now
@@ -842,12 +849,13 @@ function Config(opt, contextResetNeeded) {
                 }
                 //I had to for this one...
                 appsPath = appsPath.replace(/\{executionPath\}/g, root);
-
+                let appsPathObj = new _(appsPath, true);
                 //console.log("My env ", env, self.executionPath, JSON.stringify(template, null, '\t') );
                 //Existing app and port sharing => != isStandalone.
-                if ( !fs.existsSync(appsPath) ) {
-                    new _(appsPath).mkdirSync()
+                if ( !appsPathObj.existsSync() ) {
+                    appsPathObj.mkdirSync()
                 }
+                appsPathObj = null;
 
 
                 newContent[app][env].port[ newContent[app][env].server.protocol ][ newContent[app][env].server.scheme ] = appPort;
@@ -923,7 +931,8 @@ function Config(opt, contextResetNeeded) {
                 try {
                     newContent = whisper(reps, newContent);
                 } catch(contentErr) {
-                    console.emerg(contentErr.stack)
+                    console.emerg(contentErr.stack);
+                    return;
                 }
 
             }
@@ -1227,18 +1236,46 @@ function Config(opt, contextResetNeeded) {
 
         var fileContent         = null
             , allEnvs           = self.getAllEnvs()
-            , foundEnvVersion   = null
         ;
 
         // getting bundle config files
-        var configFiles = fs.readdirSync(_(appPath + '/config'))
-            , c         = 0
-            , cLen      = configFiles.length
-            , jsonFile  = null
-            , e         = null
+        var configFiles             = fs.readdirSync(_(appPath + '/config', true))
+            , e                     = null
+            , sharedConfigPathObj   = new _(conf[bundle][env].sharedPath + '/config', true)
+            , sharedconfigPath      = null
+            , sharedConfigFiles     = []
+        ;
+
+        if ( sharedConfigPathObj.existsSync() ) {
+            sharedconfigPath = sharedConfigPathObj.toString();
+            sharedConfigFiles = fs.readdirSync(sharedconfigPath);
+            for (let i=0, len = sharedConfigFiles.length; i<len; i++) {
+                let file = sharedConfigFiles[i];
+
+                if (
+                    /^\./.test(file)
+                    || /\s+copy$/i.test(file)
+                ) {
+                    sharedConfigFiles.splice(i,1);
+                    i --;
+                    len--;
+                    continue;
+                }
+                // sharedConfigFiles[i] = _(sharedconfigPath +'/'+ file, true);
+                // completing `configFiles` when file is listed in `sharedConfigFiles` but not in `configFiles`
+                if ( configFiles.indexOf(file) < 0 ) {
+                    configFiles.push(file);
+                }
+            }
+        }
+        sharedConfigPathObj = null;
+
+        var c       = 0
+            , cLen  = configFiles.length
         ;
         for (; c < cLen; ++c) {
-            foundEnvVersion = false;
+            let jsonFile = null;
+
             fName = configFiles[c];
             fNameWithNoExt  = fName.replace(/.json/, '');
 
@@ -1249,6 +1286,7 @@ function Config(opt, contextResetNeeded) {
 
             // e.g: if env == `dev` and we have app.prod.json, we should skip it
             let skipIt = false;
+            let foundEnvVersion = false;
             for (let e = 0, eLen = allEnvs.length; e < eLen; e++) {
                 // *.dev.json or *.global.json
                 let re = new RegExp('\.('+ allEnvs[e] +'|global)\.json$');
@@ -1269,7 +1307,7 @@ function Config(opt, contextResetNeeded) {
                 continue;
 
             // e.g: if env == `dev` and we have app.dev.json
-            if (new RegExp('\.'+ env +'\.json$').test(fName)  ) {
+            if ( new RegExp('\.'+ env +'\.json$').test(fName)  ) {
                 foundEnvVersion = true;
             }
             //name            = fName.replace(/\.json$/, '');
@@ -1288,13 +1326,26 @@ function Config(opt, contextResetNeeded) {
 
             filesList[name] = fName;
             // handle registered config files
+            // Loading dev version
             main = fName;
             tmp = fName.replace(/.json/, '.' + env + '.json'); // dev
 
             files[name] = ( typeof(files[name]) != 'undefined' ) ? files[name] : {};
             fileContent = files[name];
-            filename = _(appPath + '/config/' + tmp);
-            exists = fs.existsSync(_(filename, true));
+            let filenameObj = new _(appPath + '/config/' + tmp, true);
+            filename    = filenameObj.toString();
+            exists      = filenameObj.existsSync();
+
+            // In case the config is not found in the bundle, but exists in shared config
+            let sharedFilesIndex = sharedConfigFiles.indexOf(tmp);
+            if (!exists && sharedFilesIndex > -1) {
+                filenameObj = new _( sharedconfigPath +'/'+ tmp, true);
+                filename    = filenameObj.toString();
+                exists      = filenameObj.existsSync();
+                // remove entry from `sharedConfigFiles` list
+                sharedConfigFiles.splice(sharedFilesIndex,1);
+            }
+            filenameObj = null;
             // loading dev if exists
             if ( self.isCacheless() ) {
                 if (exists) {
@@ -1303,50 +1354,80 @@ function Config(opt, contextResetNeeded) {
             }
 
             try {
-                if (exists) {
+
+                if (!exists) {
+                    jsonFile = null;
+                } else {
                     jsonFile = requireJSON(_(filename, true));
+
                     if (Array.isArray(jsonFile) && !Array.isArray(fileContent) && !Object.keys(fileContent).length) {
                         fileContent = []
                     }
                     // Fixed priority to env version and/or extended.description if found
                     fileContent = merge(jsonFile, fileContent);
                 }
+
             } catch (_err) {
                 if (exists) {
-                    callback(new Error('[ ' + filename + ' ] is malformed !!'))
-                } else {
-                    fileContent = undefined
+                    return callback(new Error('[ ' + filename + ' ] is malformed !!'))
                 }
+                fileContent = undefined
             }
             // loading main
-            filename = _(appPath + '/config/' + main, true);
+            filenameObj = new _(appPath + '/config/' + main, true);
+            filename    = filenameObj.toString();
+            exists      = filenameObj.existsSync();
+
+            // In case the config is not found in the bundle, but exists in shared config
+            sharedFilesIndex = sharedConfigFiles.indexOf(main);
+            if (!exists && sharedFilesIndex > -1) {
+                filenameObj = new _( sharedconfigPath +'/'+ main, true);
+                filename    = filenameObj.toString();
+                exists      = filenameObj.existsSync();
+                // remove entry from `sharedConfigFiles` list
+                // sharedConfigFiles.splice(sharedFilesIndex,1);
+            }
+            filenameObj = null;
+
+
             //Can't do anything without.
             try {
-                exists = fs.existsSync(_(filename, true));
                 if (cacheless && exists) {
                     delete require.cache[require.resolve(_(filename, true))];
                 }
 
-                if (exists) {
-                    jsonFile = requireJSON(_(filename, true));
-                    if (Array.isArray(jsonFile) && !Array.isArray(fileContent) && !Object.keys(fileContent).length) {
-                        fileContent = []
-                    }
-                    //fileContent = merge(fileContent, jsonFile);
-                    // Fixed priority to env version and/or extended.description if found
-                    fileContent = merge(jsonFile, fileContent);
-                } else {
+                if (!exists) {
                     console.warn('[ ' + app + ' ] [ ' + env + ' ]' + new Error('[ ' + filename + ' ] not found'));
+                } else {
+                    jsonFile = requireJSON(_(filename, true));
+                }
+
+                // sharedFilesIndex = sharedConfigFiles.indexOf(main);
+                if ( sharedFilesIndex > -1) {
+                    let sharedMain = requireJSON(_( sharedconfigPath +'/'+ main, true));
+                    jsonFile = merge(jsonFile, sharedMain);
+                    sharedMain = null;
+                    sharedConfigFiles.splice(sharedFilesIndex, 1);
+                }
+                sharedFilesIndex = null;
+
+                if (Array.isArray(jsonFile) && !Array.isArray(fileContent) && !Object.keys(fileContent).length) {
+                    fileContent = []
                 }
+                //fileContent = merge(fileContent, jsonFile);
+                // Fixed priority to env version and/or extended.description if found
+                fileContent = merge(jsonFile, fileContent);
+
+
             } catch (_err) {
 
-                if (fs.existsSync(filename)) {
+                if (exists) {
                     e = '[ ' + filename + ' ] is malformed !!\n\r' + (_err.stack || _err.message);
                     console.error(e);
-                    callback(new Error(e))
-                } else {
-                    fileContent = undefined
+                    return callback(new Error(e))
                 }
+
+                fileContent = undefined
             }
 
             if (section != '' ) {
@@ -1375,19 +1456,41 @@ function Config(opt, contextResetNeeded) {
         }
 
         // routing.global.json
-        let globalMiddlewares = null;
+        let globalMiddlewares = [];
         let globalMiddlewaresPathObj = new _(appPath + '/config/routing.global.json', true);
         if ( globalMiddlewaresPathObj.existsSync() ) {
             globalMiddlewares = requireJSON(globalMiddlewaresPathObj.toUnixStyle()).middleware;
         }
-        globalMiddlewaresPathObj = null;
+        sharedFilesIndex = sharedConfigFiles.indexOf('routing.global.json');
+        if ( sharedFilesIndex > -1) {
+            let sharedGlobalMiddlewaresPathObj = new _(sharedconfigPath + '/routing.global.json', true);
+            let sharedGlobalMiddlewares = null;
+            try {
+                sharedGlobalMiddlewares = requireJSON(sharedGlobalMiddlewaresPathObj.toUnixStyle());
+                globalMiddlewares = merge(globalMiddlewares, sharedGlobalMiddlewares.middleware);
+                sharedConfigFiles.splice(sharedFilesIndex, 1);
+                sharedGlobalMiddlewaresPathObj = null;
+                sharedGlobalMiddlewares = null;
+            } catch (_err) {
+
+                if ( sharedGlobalMiddlewaresPathObj.existsSync() ) {
+                    e = '[ ' + sharedGlobalMiddlewaresPathObj.toUnixStyle() + ' ] is malformed !!\n\r' + (_err.stack || _err.message);
+                    console.error(e);
+                    return callback(new Error(e))
+                }
+            }
+        }
+        sharedFilesIndex = null;
 
 
         name = 'routing';
         routing = files[name];
-        var r = null, rLen = null;
-        //setting app param
-        var urls = null;
+        var r       = null
+            , rLen  = null
+            , urls  = null
+        ;
+
+        // Setting app param
         // bundle status
         routing['bundle-status'] = {
             url: '/_status',
@@ -1403,7 +1506,7 @@ function Config(opt, contextResetNeeded) {
             url: '/custom-error',
             method: 'GET',
             middleware: [],
-            middlewareIgnored: ['shared.middlewares.global.checkScope'],
+            middlewareIgnored: [],
             param: {
                 control: 'renderCustomError',
                 // default data : will be fed on error
@@ -1663,7 +1766,8 @@ function Config(opt, contextResetNeeded) {
 
         var corePath = getPath('gina').core;
         var settingsPath = _(corePath +'/template/conf/settings.json', true);
-        var staticsPath = _(corePath +'/template/conf/statics.json', true);
+        var staticsPathObj  = new _(corePath +'/template/conf/statics.json', true);
+        var staticsPath     = staticsPathObj.toString();
         var viewsPath = _(corePath +'/template/conf/templates.json', true);
 
         var defaultViews = requireJSON(viewsPath);
@@ -1678,10 +1782,13 @@ function Config(opt, contextResetNeeded) {
             reps[p+'Port'] = ports[p]
         }
 
-        var localEnv = conf[bundle][env].executionPath + '/env.local.json';
-        if ( self.isCacheless() && fs.existsSync(localEnv) ) {
-            conf[bundle][env] = merge(conf[bundle][env], requireJSON(localEnv), true);
+        var localEnvPathObj = new _(conf[bundle][env].executionPath + '/env.local.json', true);
+        var localEnvPath    = localEnvPathObj.toString();
+        if ( self.isCacheless() && localEnvPathObj.existsSync() ) {
+            conf[bundle][env] = merge(conf[bundle][env], requireJSON(localEnvPath), true);
         }
+        localEnvPath    = null;
+        localEnvPathObj = null;
         var envKeys = conf[bundle][env];
         for (let k in envKeys) {
             if ( typeof(envKeys[k]) != 'object' && typeof(envKeys[k]) != 'array' ) {
@@ -1704,8 +1811,9 @@ function Config(opt, contextResetNeeded) {
                 // files['settings'] = merge(files['settings'], defaultSettings)
             }
 
-            if (fs.existsSync(staticsPath))
+            if ( staticsPathObj.existsSync() ) {
                 delete require.cache[require.resolve(staticsPath)];
+            }
 
 
             if (hasViews && typeof(files['statics']) == 'undefined') {
@@ -1731,14 +1839,20 @@ function Config(opt, contextResetNeeded) {
                 , dirsOrFiles   = null
                 , pCount        = 0
                 , sCount        = 0
+                , publicPathObj = (conf[bundle][env].publicPath) ? new _(conf[bundle][env].publicPath, true) : null
+                , publicPath    = (publicPathObj) ? publicPathObj.toString() : null
             ;
-            if (conf[bundle][env].publicPath && fs.existsSync(conf[bundle][env].publicPath) ) {
+            if (
+                publicPath
+                && publicPathObj
+                && publicPathObj.existsSync()
+            ) {
                 var publicResources = []
-                    , lStat = null
+                    , lStat         = null
                 ;
 
                 d = 0;
-                dirsOrFiles = fs.readdirSync(conf[bundle][env].publicPath);
+                dirsOrFiles = fs.readdirSync(publicPath);
                 // ignoring html (template files) directory
                 //dirsOrFiles.splice(dirsOrFiles.indexOf(new _(reps.html, true).toArray().last()), 1);
 
@@ -1748,7 +1862,7 @@ function Config(opt, contextResetNeeded) {
                         ++d;
                         continue;
                     }
-                    lStat = fs.lstatSync(_(conf[bundle][env].publicPath +'/'+ dirsOrFiles[d], true));
+                    lStat = fs.lstatSync(_(publicPath +'/'+ dirsOrFiles[d], true));
                     if ( lStat.isDirectory() ) {
                         // regular path
                         publicResources[pCount] = '/'+ dirsOrFiles[d] +'/';
@@ -1791,10 +1905,12 @@ function Config(opt, contextResetNeeded) {
                     staticToPublicPath = null;
                 }
 
-                conf[bundle][env].publicResources = publicResources
+                conf[bundle][env].publicResources = publicResources;
             } else if (hasViews) {
                 console.warn('['+bundle+'] No public dir to scan...')
             }
+            publicPathObj   = null;
+            publicPath      = null;
 
 
             if (hasViews && typeof(files['templates']) == 'undefined') {
@@ -2083,7 +2199,7 @@ function Config(opt, contextResetNeeded) {
             pCount = conf[bundle][env].publicResources.length || 0;
             sCount = conf[bundle][env].staticResources.length || 0;
 
-            for (var i in files['statics']) {
+            for (let i in files['statics']) {
                 if (!/^\//.test(i) ) {
                     files['statics'][ '/'+ i ] = files['statics'][i];
                     delete files['statics'][i];
@@ -2114,24 +2230,13 @@ function Config(opt, contextResetNeeded) {
 
         files = whisper(reps, files);
 
-        // favicons rewrite - Not needed anymore
-        // var faviconsPath = files['statics'][  ( (_wroot) ? _wroot +'/' : '' ) + 'favicons'];
-        // if ( hasViews && typeof(files['statics']) != 'undefiened' && fs.existsSync( faviconsPath ) ) {
-        //     var favFiles = fs.readdirSync(faviconsPath);
-        //     for (var f = 0, fLen = favFiles.length; f < fLen; ++f) {
-        //         if ( !/^\./.test(favFiles[f]) )
-        //             files['statics'][ ( (_wroot) ? _wroot +'/' : '' ) + favFiles[f] ] = faviconsPath +'/'+ favFiles[f];
-        //     }
-        // }
-
-
         if (hasViews) {
             // loading forms rules
             if (typeof(files['templates']._common.forms) != 'undefined') {
                 try {
-                    files['forms'] = loadForms(files['templates']._common.forms)
+                    files['forms'] = loadForms(files['templates']._common.forms);
                 } catch (err) {
-                    callback(err)
+                    return callback(err);
                 }
             }
 
@@ -2168,7 +2273,6 @@ function Config(opt, contextResetNeeded) {
                 htmlErrorsFromPath(files['templates']._common.html+ '/errors');
                 // Then, look into shared without overriding existing
                 htmlErrorsFromPath(conf[bundle][env].sharedPath + '/errors');
-
             }
         }
 
@@ -2191,8 +2295,6 @@ function Config(opt, contextResetNeeded) {
 
                 files['templates']._common.ginaLoader = scriptTag;
 
-                // files['templates']._common.ginaLoader = whisper(reps, files['templates']._common.ginaLoader);
-
             } catch (err) {
                 callback(err)
             }
@@ -2246,41 +2348,23 @@ function Config(opt, contextResetNeeded) {
         }
     }
 
-    // Todo - browseDirectory -> returns a collection of files & folders paths, unless it is handled by http/2
-    // Will be useful to generate cache
-    // var browseDirectory = function(filename, list, i, len) {
-
-    //     var name = filename.substring(filename.lastIndexOf('/') +1)
-    //         , location = filename.replace( new RegExp(name+'$'))
-    //         , obj = {
-    //             name: name,
-    //             location: location,
-    //             isDir: fs.statSync(filename).isDirectory()
-    //         }
-    //         , list = (typeof(list) != 'undefined') ? list : []
-    //         , i = (typeof(i) != 'undefined') ? i : 0
-    //         , len = (typeof(len) != 'undefined') ? len : 0
-    //     ;
-
-    //     if (i == 0 && obj.isDir) { //root
-    //         var files = fs.readdirSync(filename);
-    //         len = files.length;
-    //     }
-
-    // }
 
     var loadForms = function(formsDir) {
-        var forms = { rules: {}}, cacheless = self.isCacheless(), root = '';
+        var forms       = { rules: {}}
+            , cacheless = self.isCacheless()
+            , root      = ''
+        ;
 
-        if ( fs.existsSync(formsDir) ) {
+        if ( new _(formsDir, true).existsSync() ) {
             root = ''+formsDir;
             // browsing dir
             var readDir = function (dir, forms, key, previousKey) {
                 var files       = fs.readdirSync(dir)
                     , filename  = ''
-                    , k         = null;
+                    , k         = null
+                ;
 
-                for (var i = 0, len = files.length; i < len; ++i) {
+                for (let i = 0, len = files.length; i < len; ++i) {
                     if ( !/^\./.test(files[i]) ) {
                         filename = _(dir + '/' + files[i], true);