gina 0.1.1-alpha.170 → 0.1.1-alpha.172

package/framework/v0.1.1-alpha.172/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js

@@ -0,0 +1,5 @@
+window.originalContext=window.jQuery;window.ginaToolbar=null;
+window.onGinaLoaded=function(b){if(b){if(b.isFrameworkLoaded)return!0;var d=b.config={bundle:'{{ page.environment.bundle }}',env:'{{ page.environment.env }}',envIsDev:/^true$/.test('{{ page.environment.envIsDev }}')?!0:!1,hostname:'{{ page.environment.hostname }}',routing:JSON.parse(decodeURIComponent('{{ page.environment.routing }}')),reverseRouting:JSON.parse(decodeURIComponent('{{ page.environment.reverseRouting }}')),version:'{{ page.environment.version }}',webroot:'{{ page.environment.webroot }}',
+protocol:'{{ page.environment.protocol }}'};b.config.getRouting=function(c){if('undefined'==typeof c)return b.config.routing;var f={},h=b.config.routing;c=new RegExp('\\@'+c+String.fromCharCode(36));var e=null;for(e in h)c.test(e)&&(f[e]=h[e]);return 0<f.count()?f:null};window.GINA_ENV='{{ page.environment.env }}';window.GINA_ENV_IS_DEV=/^true$/i.test('{{ page.environment.envIsDev }}')?!0:!1;if('undefined'!=typeof location.search&&/debug=/i.test(location.search)||!location.search&&/\?/.test(location.href)){var a=
+(' '+location.search).slice(1);!a&&/\?/.test(location.href)&&(a=location.href.match(/\?.*/),Array.isArray(a)&&0<a.length&&(a=a[0]));(a=a.match(/debug=(true|false)/))&&(window.GINA_ENV_IS_DEV=b.config.envIsDev=/^true$/i.test(a[0].split(/=/)[1])?!0:!1)}b.isFrameworkLoaded=!0;b.setOptions(d);try{b.forms=JSON.parse(decodeURIComponent('{{ page.environment.forms }}'))}catch(c){throw c;}a=null;a=document.head.getElementsByTagName('link');for(var g=0,l=a.length,k=!1,m=RegExp('css/vendor/gina/gina.min.css');g<
+l;++g)if(m.test(a[g].href)){k=!0;break}k||(a=document.createElement('link'),a.href=d.webroot+'css/vendor/gina/gina.min.css',a.media='screen',a.rel='stylesheet',a.type='text/css',document.getElementsByTagName('head')[0].appendChild(a));/^true$/i.test(d.envIsDev)&&(d=window.require('gina/toolbar'),window.ginaToolbar=new d);return!0}return!1};

package/framework/v0.1.1-alpha.172/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.172/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"lineCount":5,
+"mappings":"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",
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.172/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","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","appendChild","Toolbar"]
+}

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/core/config.js

@@ -1568,7 +1568,7 @@ function Config(opt, contextResetNeeded) {
             "sharedPath"        : conf[bundle][env].sharedPath,
             "logsPath"          : conf[bundle][env].logsPath,
             "tmpPath"           : conf[bundle][env].tmpPath,
-            "version"           : getContext('gina').version
+            "version"           : getContext('gina').version,
         };
 
         for (let _contant in process.gina) {
@@ -1639,10 +1639,10 @@ function Config(opt, contextResetNeeded) {
             }
 
             // templates root directories
-            var d           = 0
-                , dirs      = null
-                , pCount    = 0
-                , sCount    = 0
+            var d               = 0
+                , dirsOrFiles   = null
+                , pCount        = 0
+                , sCount        = 0
             ;
             if (conf[bundle][env].publicPath && fs.existsSync(conf[bundle][env].publicPath) ) {
                 var publicResources = []
@@ -1650,26 +1650,38 @@ function Config(opt, contextResetNeeded) {
                 ;
 
                 d = 0;
-                dirs = fs.readdirSync(conf[bundle][env].publicPath);
+                dirsOrFiles = fs.readdirSync(conf[bundle][env].publicPath);
                 // ignoring html (template files) directory
-                //dirs.splice(dirs.indexOf(new _(reps.html, true).toArray().last()), 1);
+                //dirsOrFiles.splice(dirsOrFiles.indexOf(new _(reps.html, true).toArray().last()), 1);
 
                 // making statics allowed directories
-                while ( d < dirs.length) {
-                    lStat = fs.lstatSync(_(conf[bundle][env].publicPath +'/'+ dirs[d], true));
-                    if ( !/^\./.test(dirs[d]) && lStat.isDirectory() ) {
+                while ( d < dirsOrFiles.length) {
+                    if ( /^\./.test(dirsOrFiles[d]) ) {
+                        ++d;
+                        continue;
+                    }
+                    lStat = fs.lstatSync(_(conf[bundle][env].publicPath +'/'+ dirsOrFiles[d], true));
+                    if ( lStat.isDirectory() ) {
                         // regular path
-                        publicResources[pCount] = '/'+ dirs[d] +'/';
+                        publicResources[pCount] = '/'+ dirsOrFiles[d] +'/';
                         ++pCount;
+                        if ( conf[bundle][env].server.webroot == "/" ) {
+                            ++d;
+                            continue;
+                        }
                         // handle resources from public with webroot in url
-                        publicResources[pCount] = conf[bundle][env].server.webroot + dirs[d] +'/';
+                        publicResources[pCount] = conf[bundle][env].server.webroot + dirsOrFiles[d] +'/';
                         ++pCount
-                    } else if ( !/^\./.test(dirs[d]) && lStat.isFile() ) {
+                    } else if ( lStat.isFile() ) {
                         // regular path
-                        publicResources[pCount] = '/'+ dirs[d];
+                        publicResources[pCount] = '/'+ dirsOrFiles[d];
                         ++pCount;
+                        if ( conf[bundle][env].server.webroot == "/" ) {
+                            ++d;
+                            continue;
+                        }
                         // handle resources from public with webroot in url
-                        publicResources[pCount] = conf[bundle][env].server.webroot + dirs[d];
+                        publicResources[pCount] = conf[bundle][env].server.webroot + dirsOrFiles[d];
                         ++pCount
                     }
                     ++d
@@ -2078,6 +2090,8 @@ function Config(opt, contextResetNeeded) {
 
                 files['templates']._common.ginaLoader = scriptTag;
 
+                // files['templates']._common.ginaLoader = whisper(reps, files['templates']._common.ginaLoader);
+
             } catch (err) {
                 callback(err)
             }

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/core/controller/controller.js

@@ -215,7 +215,7 @@ function SuperController(options) {
                 , rule              = local.options.rule
                 , ext               = 'html' // by default
                 , isWithoutLayout   = false // by default
-                , namespace         = local.options.namespace || '';
+                , namespace         = local.options.namespace || '';
 
 
             if ( typeof(local.options.template) != 'undefined' && local.options.template ) {
@@ -253,7 +253,7 @@ function SuperController(options) {
                 }
 
                 rule        = local.options.rule;
-                namespace   = local.options.namespace || 'default';
+                namespace   = local.options.namespace || 'default';
 
 
                 set('page.view.file', local.options.file);
@@ -284,13 +284,13 @@ function SuperController(options) {
 
 
             var routing = local.options.conf.routing = ctx.config.envConf.routing; // all routes
-            set('page.environment.routing', escape(JSON.stringify(routing))); // export for GFF
+            set('page.environment.routing', encodeRFC5987ValueChars(JSON.stringify(routing))); // export for GFF
             //reverseRouting
             var reverseRouting = local.options.conf.reverseRouting = ctx.config.envConf.reverseRouting; // all routes
-            set('page.environment.reverseRouting', escape(JSON.stringify(reverseRouting))); // export for GFF
+            set('page.environment.reverseRouting', encodeRFC5987ValueChars(JSON.stringify(reverseRouting))); // export for GFF
 
             var forms = local.options.conf.forms = options.conf.content.forms // all forms
-            set('page.environment.forms', escape(JSON.stringify(forms))); // export for GFF
+            set('page.environment.forms', encodeRFC5987ValueChars(JSON.stringify(forms))); // export for GFF
             set('page.forms', options.conf.content.forms);
 
             set('page.environment.hostname', ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].hostname);
@@ -389,8 +389,8 @@ function SuperController(options) {
             var swigOptions = {
                 autoescape  : ( typeof(local.options.autoescape) != 'undefined') ? local.options.autoescape : false,
                 // `memory` is no working yet ... advanced rendering setup required
-                cache       : (local.options.cacheless) ? false : 'memory'
-                // cache       : 'memory'
+                // cache       : (local.options.cacheless) ? false : 'memory'
+                cache       : false
             };
             if (dir) {
                 swigOptions.loader = swig.loaders.fs(dir);
@@ -567,7 +567,7 @@ function SuperController(options) {
                     file = ''+ file.replace(localOptions.namespace+'-', '');
 
                 // means that rule name === namespace -> pointing to root namespace dir
-                if (!file || file === localOptions.namespace) {
+                if (!file || file === localOptions.namespace) {
                     file = 'index'
                 }
                 path = (isRenderingCustomError) ? _(file) : _(localOptions.template.html +'/'+ localOptions.namespace + '/' + file)
@@ -676,10 +676,10 @@ function SuperController(options) {
                 , isUsingGinaLayout     = (!isWithoutLayout && typeof(localOptions.template.layout) != 'undefined' && fs.existsSync(local.options.template.layout)) ? true : false
             ;
 
-            if ( isWithoutLayout || isUsingGinaLayout ) {
+            if ( isWithoutLayout || isUsingGinaLayout ) {
                 layoutPath = (isWithoutLayout) ? localOptions.template.noLayout : localOptions.template.layout;
                 // user layout override
-                if ( isUsingGinaLayout && !isWithoutLayout ) {
+                if ( isUsingGinaLayout && !isWithoutLayout ) {
                     layoutPath = localOptions.template.layout;
                 }
                 if (isWithoutLayout) {
@@ -859,7 +859,9 @@ function SuperController(options) {
             ) {
 
                 layout = ''
+                    // + '{%- set ginaDataInspector                    = JSON.clone(page) -%}'
                     + '{%- set ginaDataInspector                    = JSON.clone(page) -%}'
+                    // + '{%- set ginaDataInspector                    = { view: {}, environment: { routing: {}}} -%}'
                     + '{%- set ginaDataInspector.view.assets        = {} -%}'
                     + '{%- set ginaDataInspector.view.scripts       = "ignored-by-toolbar" -%}'
                     + '{%- set ginaDataInspector.view.stylesheets   = "ignored-by-toolbar" -%}'
@@ -869,6 +871,7 @@ function SuperController(options) {
                 plugin = '\t'
                     + '{# Gina Toolbar #}'
                     + '{%- set userDataInspector                    = JSON.clone(page) -%}'
+                    // + '{%- set userDataInspector                    = { view: {}, environment: { routing: {}}} -%}'
                     + '{%- set userDataInspector.view.scripts       = "ignored-by-toolbar"  -%}'
                     + '{%- set userDataInspector.view.stylesheets   = "ignored-by-toolbar"  -%}'
                     + '{%- set userDataInspector.view.assets        = '+ JSON.stringify(assets) +' -%}'
@@ -879,16 +882,19 @@ function SuperController(options) {
 
                 if (isWithoutLayout && localOptions.debugMode || localOptions.debugMode ) {
 
-                    XHRData = '\t<input type="hidden" id="gina-without-layout-xhr-data" value="'+ encodeURIComponent(JSON.stringify(data.page.data)) +'">\n\r';
-                    XHRView = '\n<input type="hidden" id="gina-without-layout-xhr-view" value="'+ encodeURIComponent(JSON.stringify(viewInfos)) +'">';
-                    if ( /<\/body>/i.test(layout) ) {
-                        layout = layout.replace(/<\/body>/i, XHRData + XHRView + '\n\t</body>');
-                    } else {
-                        // Popin case
-                        // Fix added on 2023-01-25
-                        layout += XHRData + XHRView + '\n\t'
+                    if (self.isXMLRequest()) {
+                        XHRData = '\t<input type="hidden" id="gina-without-layout-xhr-data" value="'+ encodeRFC5987ValueChars(JSON.stringify(data.page.data)) +'">\n\r';
+                        XHRView = '\n<input type="hidden" id="gina-without-layout-xhr-view" value="'+ encodeRFC5987ValueChars(JSON.stringify(viewInfos)) +'">';
+                        if ( /<\/body>/i.test(layout) ) {
+                            layout = layout.replace(/<\/body>/i, XHRData + XHRView + '\n\t</body>');
+                        } else {
+                            // Popin case
+                            // Fix added on 2023-01-25
+                            layout += XHRData + XHRView + '\n\t'
+                        }
                     }
 
+
                 }
 
                 if (self.isCacheless() || localOptions.debugMode ) {
@@ -924,11 +930,18 @@ function SuperController(options) {
                 // if ( !isWithoutLayout )
                 //     viewInfos.assets = assets;
 
-                XHRData = '\n<input type="hidden" id="gina-without-layout-xhr-data" value="'+ encodeURIComponent(JSON.stringify(data.page.data)) +'">';
-                XHRView = '\n<input type="hidden" id="gina-without-layout-xhr-view" value="'+ encodeURIComponent(JSON.stringify(viewInfos)) +'">';
 
+                XHRData = '\n<input type="hidden" id="gina-without-layout-xhr-data" value="'+ encodeRFC5987ValueChars(JSON.stringify(data.page.data)) +'">';
+                XHRView = '\n<input type="hidden" id="gina-without-layout-xhr-view" value="'+ encodeRFC5987ValueChars(JSON.stringify(viewInfos)) +'">';
+                if ( /<\/body>/i.test(layout) ) {
+                    layout = layout.replace(/<\/body>/i, XHRData + XHRView + '\n\t</body>');
+                } else {
+                    // Popin case
+                    // Fix added on 2023-01-25
+                    layout += XHRData + XHRView + '\n\t'
+                }
 
-                layout += XHRData + XHRView;
+                // layout += XHRData + XHRView;
 
             } else { // other envs like prod ...
 
@@ -1228,7 +1241,7 @@ function SuperController(options) {
                         }
                     }
                     if ( next ) {
-                        next()
+                        return next()
                     }
 
                     return;
@@ -1329,7 +1342,7 @@ function SuperController(options) {
      * Get data
      *
      * @param {String} variable Data name to set
-     * @returns {Object | String} data Data object or String
+     * @returns {Object | String} data Data object or String
      * */
     var get = function(variable) {
         return local.userData[variable]
@@ -1476,7 +1489,7 @@ function SuperController(options) {
     }
 
     this.getRequestMethodParams = function() {
-        return (localRequestMethodParams) ? localRequestMethodParams : local.req[local.req.method.toLowerCase()]
+        return (localRequestMethodParams) ? localRequestMethodParams : local.req[local.req.method.toLowerCase()]
     }
 
     /**
@@ -1715,11 +1728,11 @@ function SuperController(options) {
             originalMethod = ( typeof(req.originalMethod) != 'undefined') ? req.originalMethod :  req.method;
         }
 
-        var path        = originalUrl || req.routing.param.path || '';
+        var path        = originalUrl || req.routing.param.path || '';
         var url         = req.routing.param.url;
-        var code        = req.routing.param.code || 301;
+        var code        = req.routing.param.code || 301;
 
-        var keepParams  = req.routing.param['keep-params'] || false;
+        var keepParams  = req.routing.param['keep-params'] || false;
 
         var condition   = true; //set by default for url @ path redirect
 
@@ -1769,7 +1782,7 @@ function SuperController(options) {
 
                 // backing up oldParams
                 var oldParams = local.req[originalMethod.toLowerCase()];
-                var requestParams = req[req.method.toLowerCase()] || {};
+                var requestParams = req[req.method.toLowerCase()] || {};
                 if ( typeof(requestParams) != 'undefined' && typeof(requestParams.error) != 'undefined' ) {
                     var redirectError = requestParams.error;
                     self.throwError(requestParams.error);
@@ -1800,9 +1813,9 @@ function SuperController(options) {
 
                     var inheritedData = null;
                     if ( /\?/.test(path) ) {
-                        inheritedData = '&inheritedData='+ encodeURIComponent(JSON.stringify(requestParams));
+                        inheritedData = '&inheritedData='+ encodeRFC5987ValueChars(JSON.stringify(requestParams));
                     } else {
-                        inheritedData = '?inheritedData='+ encodeURIComponent(JSON.stringify(requestParams));
+                        inheritedData = '?inheritedData='+ encodeRFC5987ValueChars(JSON.stringify(requestParams));
                     }
 
                     if ( inheritedData.length > 2000 ) {
@@ -2196,7 +2209,7 @@ function SuperController(options) {
                     var fileName = null;
                     for (var len = files.length; i < len; ++i ){
 
-                        fileName = files[i].filename || files[i].originalFilename
+                        fileName = files[i].filename || files[i].originalFilename
 
                         list[i] = {
                             source: files[i].path,
@@ -2373,7 +2386,7 @@ function SuperController(options) {
             // TODO - if 'application/json' && method == (put|post)
             if ( ['put', 'post'].indexOf(options.method.toLowerCase()) >-1 && /(text\/plain|application\/json|application\/x\-www\-form)/i.test(options.headers['content-type']) ) {
                 // replacing
-                queryData = encodeURIComponent(JSON.stringify(data))
+                queryData = encodeRFC5987ValueChars(JSON.stringify(data))
                 //queryData = JSON.stringify(data)
 
             } else {
@@ -2385,7 +2398,7 @@ function SuperController(options) {
                     if ( typeof(tmpData[d]) == 'object') {
                         tmpData[d] = JSON.stringify(tmpData[d]);
                     }
-                    queryData += d + '=' + encodeURIComponent(tmpData[d]) + '&';
+                    queryData += d + '=' + encodeRFC5987ValueChars(tmpData[d]) + '&';
                 }
 
                 queryData = queryData.substring(0, queryData.length-1);
@@ -2475,8 +2488,8 @@ function SuperController(options) {
             }
 
             // might be != from the bundle requesting
-            //options.protocol    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.protocol || ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
-            //options.scheme    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.scheme || ctx.gina.config.envConf[bundle][ctx.env].server.scheme;
+            //options.protocol    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.protocol || ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
+            //options.scheme    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.scheme || ctx.gina.config.envConf[bundle][ctx.env].server.scheme;
         }
 
         if ( typeof(options.protocol) == 'undefined' ) {
@@ -2644,7 +2657,7 @@ function SuperController(options) {
 
             if (
                 typeof(err.code) != 'undefined' && /ECONNREFUSED|ECONNRESET/.test(err.code)
-                || typeof(err.cause) != 'undefined' && typeof(err.cause.code) != 'undefined' &&  /ECONNREFUSED|ECONNRESET/.test(err.cause.code)
+                || typeof(err.cause) != 'undefined' && typeof(err.cause.code) != 'undefined' &&  /ECONNREFUSED|ECONNRESET/.test(err.cause.code)
             ) {
 
                 var port = getContext('gina').ports[options.protocol][options.scheme.replace(/\:/, '')][ options.port ];//err.port || err.cause.port
@@ -2666,7 +2679,7 @@ function SuperController(options) {
             } else {
                 var error = {
                     status    : 500,
-                    error     : err.stack || err.message
+                    error     : err.stack || err.message
                 };
 
                 self.emit('query#complete', error)
@@ -3209,7 +3222,7 @@ function SuperController(options) {
 
             // TODO - filter : redirect & location
 
-            // if ( self.isXMLRequest() || !hasViews() || !local.options.isUsingTemplate && !hasViews() || hasViews() && !local.options.isUsingTemplate ) {
+            // if ( self.isXMLRequest() || !hasViews() || !local.options.isUsingTemplate && !hasViews() || hasViews() && !local.options.isUsingTemplate ) {
                 self.renderJSON(result)
             // } else {
             //     self.render(result)
@@ -3681,7 +3694,7 @@ function SuperController(options) {
             || typeof(arguments[arguments.length-1]) == 'string' && !(arguments[0] instanceof Error)
         ) {
 
-            code    = ( res && typeof(res.status) != 'undefined' ) ?  res.status : 500;
+            code    = ( res && typeof(res.status) != 'undefined' ) ?  res.status : 500;
 
             if ( typeof(statusCodes[code]) != 'undefined' ) {
                 standardErrorMessage = statusCodes[code];
@@ -3732,7 +3745,7 @@ function SuperController(options) {
         if (!res.headersSent) {
             // DELETE request methods don't normaly use a view,
             // but if we are calling it from a view, we should render the error back to the view
-            if ( self.isXMLRequest() || !hasViews() && !/delete/i.test(req.method) || !local.options.isUsingTemplate && !hasViews() || hasViews() && !local.options.isUsingTemplate ) {
+            if ( self.isXMLRequest() || !hasViews() && !/delete/i.test(req.method) || !local.options.isUsingTemplate && !hasViews() || hasViews() && !local.options.isUsingTemplate ) {
                 // fallback interception
                 if ( fallback ) {
                     if ( typeof(fallback) == 'string' ){ // string url: user provided
@@ -3757,7 +3770,7 @@ function SuperController(options) {
                     console.warn('[ ApiValidator ] statusCode `'+ code +'` not matching any definition in `'+_( getPath('gina').core + '/status.codes')+'`\nPlease contact the Gina dev team to add one if required');
                 }
 
-                // if ( !local.res.getHeaders()['content-type'] /**!req.headers['content-type'] */  ) {
+                // if ( !local.res.getHeaders()['content-type'] /**!req.headers['content-type'] */  ) {
                 //     // Internet Explorer override
                 //     if ( typeof(req.headers['user-agent']) != 'undefined' && /msie/i.test(req.headers['user-agent']) ) {
                 //         res.writeHead(code, "content-type", "text/plain")
@@ -3817,7 +3830,7 @@ function SuperController(options) {
 
 
                  // intercept none HTML mime types
-                 var url                     = unescape(local.req.url) /// avoid %20
+                 var url                     = decodeURI(local.req.url) /// avoid %20
                     , ext                   = null
                     , isHtmlContent         = false
                     , hasCustomErrorFile    = false
@@ -3889,7 +3902,7 @@ function SuperController(options) {
                         var eRule = 'custom-error-page@'+ bundle;
                         var routeObj = bundleConf.content.routing[eRule];
                         routeObj.rule = eRule;
-                        //routeObj.url = unescape(local.req.url);/// avoid %20
+                        //routeObj.url = decodeURI(local.req.url);/// avoid %20
                         routeObj.param.title = ( typeof(eData.title) != 'undefined' ) ? eData.title : 'Error ' + eData.status;
                         routeObj.param.file = eFilename;
                         routeObj.param.error = eData;