gina 0.1.6-alpha.62 → 0.1.6-alpha.64

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/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.6-alpha.62/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.64/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":8,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.62/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.64/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","isProxyHost","__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.6-alpha.62 → v0.1.6-alpha.64}/core/config.js

@@ -2052,12 +2052,16 @@ function Config(opt, contextResetNeeded) {
                         type    : 'text/css',
                         url     : '',
                         isCommon : false,
+                        // when set to true, allows the framework to load it before gina.min.css
+                        isExternalPlugin : false
                     },
                     js      = {
                         name    : '',
                         type    : 'text/javascript',
                         url     : '',
-                        isCommon : false
+                        isCommon : false,
+                        // when set to true, allows the framework to load it before gina.min.js
+                        isExternalPlugin : false
                     }
                 ;
 
@@ -2070,10 +2074,11 @@ function Config(opt, contextResetNeeded) {
                     , noneDefaultCss    = null
                     , reWebroot         = new RegExp('^'+conf[bundle][env].server.webroot)
                 ;
-                var t       = null
-                    , tLen  = null
-                    , tTmp  = null
-                    , url   = null
+                var t           = null
+                    , tLen      = null
+                    , tTmp      = null
+                    , url       = null
+                    , route     = null
                 ;
 
                 // formating _common def for javascripts & stylesheets
@@ -2092,8 +2097,8 @@ function Config(opt, contextResetNeeded) {
                         tLen    = tTmp.length;
                         noneDefaultJs = [];
                         for (; t < tLen; ++t) {
-                            noneDefaultJs[t]        = JSON.clone(js);
-                            url                     = tTmp[t];
+                            noneDefaultJs[t]            = JSON.clone(js);
+                            url                         = tTmp[t];
                             if ( typeof(url) == 'string') {
                                 noneDefaultJs[t].url    = url;
                                 noneDefaultJs[t].name   = url.substring(url.lastIndexOf('/')+1, url.lastIndexOf('.')).replace(/\W+/g, '-');
@@ -2111,11 +2116,11 @@ function Config(opt, contextResetNeeded) {
                         noneDefaultCss = [];
                         for (; t < tLen; ++t) {
                             noneDefaultCss[t]           = JSON.clone(css);
+                            noneDefaultCss[t].route     = section +'@'+ bundle;
                             url                         = tTmp[t];
                             if ( typeof(url) == 'string') {
                                 noneDefaultCss[t].url       = url;
                                 noneDefaultCss[t].name      = url.substring(url.lastIndexOf('/')+1, url.lastIndexOf('.')).replace(/\W+/g, '-');
-                                noneDefaultCss[t].isCommon  = ( /^_common$/.test(section) ) ? true : false;
                             } else {
                                 noneDefaultCss[t] = merge(url, noneDefaultCss[t]);
                             }
@@ -2142,6 +2147,7 @@ function Config(opt, contextResetNeeded) {
                         for (; t < tLen; ++t) {
                             noneDefaultJs[t]        = JSON.clone(js);
                             url                     = tTmp[t];
+                            noneDefaultJs[t].route  = section +'@'+ bundle;
                             if ( typeof(url) == 'string') {
                                 noneDefaultJs[t].url    = url;
                                 noneDefaultJs[t].name   = url.substring(url.lastIndexOf('/')+1, url.lastIndexOf('.')).replace(/\W+/g, '-');
@@ -2160,6 +2166,7 @@ function Config(opt, contextResetNeeded) {
                         for (; t < tLen; ++t) {
                             noneDefaultCss[t]           = JSON.clone(css);
                             url                         = tTmp[t];
+                            noneDefaultCss[t].route     = section +'@'+ bundle;
                             let re = new RegExp('\{\s*(.*)\s*\}', 'g');
                             if ( typeof(url) == 'string') {
                                 noneDefaultCss[t].url       = url.replace(re, originHostReplacement);
@@ -2182,7 +2189,6 @@ function Config(opt, contextResetNeeded) {
 
 
 
-
                     if (!files['templates'][section].javascriptsExcluded) {
                         // merging with common javascript def
                         // noneDefaultJs = merge.setKeyComparison('url')(files['templates']._common.javascripts, noneDefaultJs, true);
@@ -2222,6 +2228,8 @@ function Config(opt, contextResetNeeded) {
 
                         noneDefaultJs[t].type  = ( typeof(noneDefaultJs[t].type) != 'undefined' ) ? noneDefaultJs[t].type : js.type;
                         noneDefaultJs[t].isCommon  = ( typeof(noneDefaultJs[t].isCommon) != 'undefined' ) ? noneDefaultJs[t].isCommon : ( ( /^_common$/.test(section) ) ? true : false );
+                        noneDefaultJs[t].route  = ( typeof(noneDefaultJs[t].route) != 'undefined' ) ? noneDefaultJs[t].route : null;
+
                     }
                     // force css rechecking on `name` & `url`
                     t = 0;
@@ -2238,6 +2246,7 @@ function Config(opt, contextResetNeeded) {
                         noneDefaultCss[t].rel       = ( typeof(noneDefaultCss[t].rel) != 'undefined' ) ? noneDefaultCss[t].rel : css.rel;
                         noneDefaultCss[t].type      = ( typeof(noneDefaultCss[t].type) != 'undefined' ) ? noneDefaultCss[t].type : css.type;
                         noneDefaultCss[t].isCommon  = ( typeof(noneDefaultCss[t].isCommon) != 'undefined' ) ? noneDefaultCss[t].isCommon : ( ( /^_common$/.test(section) ) ? true : false );
+                        noneDefaultCss[t].route     = ( typeof(noneDefaultCss[t].route) != 'undefined' ) ? noneDefaultCss[t].route : null;
                     }
 
 

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/core/controller/controller.js

@@ -1016,6 +1016,7 @@ function SuperController(options) {
                 , XHRData               = null
                 , XHRView               = null
                 , isDeferModeEnabled    = null
+                , hasExternalsPlugins    = null
                 , viewInfos             = null
                 , filename              = null
                 , isWithSwigLayout      = null
@@ -1156,6 +1157,7 @@ function SuperController(options) {
             // }
 
             isDeferModeEnabled = localOptions.template.javascriptsDeferEnabled || localOptions.conf.content.templates._common.javascriptsDeferEnabled || false;
+            hasExternalsPlugins = (localOptions.template.externalPlugins.length > 0) ? true : false;
 
             // iframe case - without HTML TAG
             if (!self.isXMLRequest() && !/\<html/.test(layout) ) {
@@ -1257,10 +1259,18 @@ function SuperController(options) {
                 if (isLoadingPartial) {
                     layout += '\t{{ page.view.scripts }}';
                 } else {
+                    // placed in the HEAD
                     if ( isDeferModeEnabled  ) {
                         layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
-                    } else { // placed in the BODY
+                    }
+                    // placed in the BODY
+                    else {
                         layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
+                        if (hasExternalsPlugins) {
+                            for (let i =0, len = localOptions.template.externalPlugins.length; i<len; i++) {
+                                layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.externalPlugins +'\n</head>');
+                            }
+                        }
                     }
                 }
 
@@ -1306,6 +1316,11 @@ function SuperController(options) {
                 //         layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
                 //     } else { // placed in the BODY
                 //         layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
+                //         if (hasExternalsPlugins) {
+                //             for (let i =0, len = localOptions.template.externalPlugins.length; i<len; i++) {
+                //                 layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.externalPlugins +'\n</head>');
+                //             }
+                //         }
                 //     }
                 // }
 
@@ -1322,11 +1337,18 @@ function SuperController(options) {
                         layout += '\t'+ localOptions.template.ginaLoader +'\n';
                     }
                 } else {
+                    // placed in the HEAD
                     if ( isDeferModeEnabled && /\<\/head\>/i.test(layout) ) { // placed in the HEAD
                         layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
-
-                    } else { // placed in the BODY
+                    }
+                    // placed in the BODY
+                    else {
                         layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
+                        if (hasExternalsPlugins) {
+                            for (let i =0, len = localOptions.template.externalPlugins.length; i<len; i++) {
+                                layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.externalPlugins +'\n</head>');
+                            }
+                        }
                     }
                     // ginaLoader cannot be deferred
                     if ( !localOptions.template.javascriptsExcluded || localOptions.template.javascriptsExcluded != '**' ) {
@@ -1767,11 +1789,19 @@ function SuperController(options) {
 
         //Get css
         if( viewConf.stylesheets ) {
-            cssStr  = getNodeRes('css', viewConf.stylesheets, useWebroot, reURL)
+            // cssStr  = getNodeRes('css', viewConf.stylesheets, useWebroot, reURL);
+            // Fixed on 2025-03-08: ordered by route, making sure that _common could all be loaded first
+            var cssColl = new Collection(viewConf.stylesheets).orderBy({route: 'asc'})
+            cssStr   = getNodeRes('css', cssColl, useWebroot, reURL);
+            cssColl = null;
         }
         //Get js
         if( viewConf.javascripts ) {
-            jsStr   = getNodeRes('js', viewConf.javascripts, useWebroot, reURL)
+            // jsStr   = getNodeRes('js', viewConf.javascripts, useWebroot, reURL);
+            // Fixed on 2025-03-08: ordered by route, making sure that _common could all be loaded first
+            var jsColl = new Collection(viewConf.javascripts).orderBy({route: 'asc'})
+            jsStr   = getNodeRes('js', jsColl, useWebroot, reURL);
+            jsColl = null;
         }
 
         set('page.view.stylesheets', cssStr);
@@ -1870,7 +1900,21 @@ function SuperController(options) {
                     if (!/\:\/\//.test(obj.url) ) {
                         obj.url = hostname + obj.url;
                     }
-                    str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>'
+
+
+                    if ( /\/jquery\.(.*)\.(min\.js|js)$/i.test(obj.url) ) {
+                        console.warn('jQuery Plugin found in templates.json !\nIf you want to load it before [gina.min.js], you should declare it at the top of your handler using requireJS or add property "isExternalPlugin: true" in your templates.json, under: '+ (obj.route || local.req.routing.rule) +' .');
+                    }
+                    // Allow jQuery & other external plugins to be loaded in the HEAD section before gina
+                    if (
+                        obj.isExternalPlugin
+                    ) {
+                        local.options.template.externalPlugins.splice(1, 0, '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>');
+                    }
+                    else {
+                        // normal case
+                        str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>';
+                    }
                 }
                 break;
         }

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/core/plugins/lib/validator/src/main.js

@@ -410,12 +410,12 @@
 
     var refreshWarning = function($el) {
         var formId = $el.form.getAttribute('id');
-        if ( /^true$/i.test(instance.$forms[formId].isValidating) ) {
-            return;
-        }
 
-        var $parent = $el.parentNode, isErrorMessageHidden = false;
-        var $children = $parent.getElementsByTagName('div');
+
+        var $parent                 = $el.parentNode
+            , isErrorMessageHidden  = false
+            ,  $children            = $parent.getElementsByTagName('div')
+        ;
 
         if ( /form\-item\-warning/.test($parent.className) ) {
             $parent.className = $parent.className.replace(/form\-item\-warning/, 'form-item-error');
@@ -425,6 +425,14 @@
             isErrorMessageHidden = true;
         }
 
+        // Fixed added on 2025-03-07
+        if (
+            /^true$/i.test(instance.$forms[formId].isValidating)
+            && !isErrorMessageHidden
+        ) {
+            return;
+        }
+
 
         for (var c = 0, cLen = $children.length; c<cLen; ++c) {
             if ( /form\-item\-error\-message/.test($children[c].className) ) {
@@ -487,8 +495,18 @@
                     }
                     errors = liveCheckErrors[formId];
                     // only if the form has not been sent yet
-                    if (!instance.$forms[formId].sent || instance.$forms[formId].isValidating) {
+                    if (
+                        !instance.$forms[formId].sent
+                        ||
+                        instance.$forms[formId].isValidating
+                    ) {
                         isWarning = true;
+                        // Fixed on 2025-03-07
+                        var lastFocused = instance.$forms[formId].lastFocused;
+                        // console.debug('lastFocused: ', lastFocused);
+                        if ( typeof(lastFocused[1]) != 'undefined' && lastFocused[1].name == fieldName) {
+                            isWarning = false;
+                        }
                     }
                 } else {
                     if ( typeof(liveCheckErrors[formId][fieldName]) != 'undefined') {
@@ -3239,7 +3257,7 @@
                         // other inputs & textareas
                         else if ( /^focusin\./i.test(event.type) ) {
                             if ( /\-error/.test($el.parentNode.className) ) {
-                                console.debug('#1 you just focusin ....'+$el.id, $el.value);
+                                console.debug('#1 you just focusin ....'+$el.id, $el.value, instance.$forms[ $el.form.getAttribute('id') ].isValidating);
                                 refreshWarning($el);
                             }
                         }
@@ -5193,6 +5211,9 @@
                     }
                     lastFocused = ( typeof(instance.$forms[formId].lastFocused[1]) != 'undefined' ) ? instance.$forms[formId].lastFocused[1].id : null;
 
+                    // cleanup
+                    instance.$forms[formId].lastFocused.splice(2);
+
                     // console.debug('lastFocused: ', lastFocused, ' VS current: ', $el.id);
 
                     triggerEvent(gina, $el, _evt, event.detail);
@@ -6241,7 +6262,8 @@
                                 if ( !/^form$/i.test($formOrElement.tagName) ) {
                                     $currentForm  = $formOrElement.form;
                                 }
-                                var formId = $currentForm.getAttribute('id');
+                                var formId      = $currentForm.getAttribute('id');
+                                var isFormValid = null;
 
                                 if (
                                     hasParsedAllRules
@@ -6256,7 +6278,8 @@
 
                                     cb._data = d['toData']();
                                     cb._errors = d['getErrors'](field);
-                                    console.debug('[A] query callback triggered ', cb._errors, '\nisValidating: ', instance.$forms[formId].isValidating);
+                                    isFormValid = ( cb._errors.count() > 0 ) ? false : true;
+                                    console.debug('[A] query callback triggered ', cb._errors, 'isFormValid: '+isFormValid, '\nisValidating: '+ instance.$forms[formId].isValidating);
                                     // update instance form errors
                                     if ( cb._errors /**&& cb._errors.count() > 0*/) {
                                         if ( typeof(instance.$forms[formId].errors) == 'undefined' ) {
@@ -6292,9 +6315,10 @@
                                     }
                                     // Fixed on 2025-03-06
                                     if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating) || d[field].target.value != '' ) {
-                                        if ( typeof($allFields[field]._cancelled) == 'undefined' ) {
+                                        console.debug('[A] Refreshing warning/error on field '+ field);
+                                        // if ( typeof($allFields[field]._cancelled) == 'undefined' ) {
                                             refreshWarning($allFields[field]);
-                                        }
+                                        // }
                                         handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
                                         updateSubmitTriggerState( $currentForm, isFormValid);
                                     }
@@ -6318,14 +6342,15 @@
                                 }
 
                                 // is this the last or the only field to be validated ?
-                                var needsGlobalReValidation = false, isFormValid = null;
+                                var needsGlobalReValidation = false;
                                 if ( listedFields.length == 1 || listedFields[listedFields.length-1] == field) {
                                     // trigger end of validation
                                     // console.debug(field +' is the last element to be validated for formId: '+ formId, cb._errors, instance.$forms[formId].errors);
                                     isFormValid = ( cb._errors.count() > 0 ) ? false : true;
                                     if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating)) {
-                                        //console.debug('should update error display now ', cb._errors);
+                                        console.debug('[1] Should update error display now ', cb._errors);
                                         instance.$forms[formId].errors = merge(cb._errors, instance.$forms[formId].errors);
+                                        console.debug('[2] Should update error display now ', instance.$forms[formId].errors);
                                         refreshWarning($allFields[field]);
                                         handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
                                         updateSubmitTriggerState( $currentForm, isFormValid);

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/core/router.js

@@ -458,6 +458,7 @@ function Router(env, scope) {
 
         if (routeHasViews) {
             options.template = (routeHasViews) ? conf.content.templates[templateName] || conf.content.templates._common : undefined;
+            options.template.externalPlugins = [];
         }
 
         // Options need to be protected by a clone to allow overrides

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/core/server.isaac.js

@@ -167,7 +167,10 @@ function ServerEngineClass(options) {
             // Proxy detection
             isProxyHost = getContext('isProxyHost');
             requestHost = request.headers.host || request.headers[':authority'];
-            if ( !/\:[0-9]+$/.test(requestHost) ) {
+            if (
+                !/\:[0-9]+$/.test(requestHost)
+                && !isProxyHost
+            ) {
                 // Enable proxied mode
                 process.gina.PROXY_HOSTNAME = process.gina.PROXY_SCHEME +'://'+ requestHost;
                 process.gina.PROXY_HOST     = requestHost;

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/core/template/conf/templates.json

@@ -21,7 +21,8 @@
         "rel"       : "stylesheet",
         "type"      : "text/css",
         "url"       : "/css/vendor/gina/gina.min.css",
-        "isCommon"  : true
+        "isCommon"  : true,
+        "isExternalPlugin" : false
       }
     ],
     "javascriptsDeferEnabled": true, // will place scripts in defer mode in the head by default. If false, will place in the footer
@@ -30,7 +31,8 @@
         "name"      : "gina",
         "type"      : "text/javascript",
         "url"       : "/js/vendor/gina/gina.min.js",
-        "isCommon"  : true
+        "isCommon"  : true,
+        "isExternalPlugin" : false
       }
     ]
   }

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/lib/cmd/bundle/start.js

@@ -323,7 +323,7 @@ function Start(opt, cmd) {
                         }
                     }
 
-                    terminal.debug('Spawning '+ opt.argv[0] +' [with args] '+ params);
+                    // terminal.debug('Spawning '+ opt.argv[0] +' [with args] '+ params);
                     var child = spawn(opt.argv[0], params,
                         {
                             // cwd: bundleDir,
@@ -411,6 +411,7 @@ function Start(opt, cmd) {
 
                         // Expecting 2 flags (checkCaseCount) to free the child stdout !!
                         // terminal.debug('BO case count '+ checkCaseCount);
+                        // terminal.log('[debug] ', data);
                         var _matched =  data.match(checkCaseRe);
                         if ( _matched ) {
                             // terminal.warn('case count: '+ checkCaseCount +'\nMatched: '+ _matched.length + '\n'+ checkCaseRe +'\n-> '+ data + '<-\n');

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/lib/cmd/framework/tail.js

@@ -2,6 +2,7 @@ var fs          = require('fs');
 var os          = require("os");
 var util        = require('util');
 var net         = require('net');
+var execSync    = require('child_process').execSync;
 
 var EventEmitter    = require('events').EventEmitter;
 var e               = new EventEmitter();
@@ -30,6 +31,8 @@ function Tail(opt, cmd) {
     var self        = {};
     var nIntervId   = null;
     var mqPortFile  = _(getTmpDir() +'/mq-listener-v'+ GINA_VERSION +'.port', true);
+    // To allow auto restart on: JavaScript heap out of memory
+    var cmdUsedToStart = null;
 
 
     var init = function(opt, cmd) {
@@ -194,12 +197,15 @@ function Tail(opt, cmd) {
                         // }
 
                         // only for debug
-                        // process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
+                        // process.stdout.write(  '[MQTail-debug] '+ pl.content +'\n' );
 
 
 
                         try {
+                            // Main output
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
+
+
                             if (
                                 /(exiting|Got exit code)(.*)(SIGKILL|SIGTERM|SIGINT|SIGABRT)/.test(pl.content)
                                 ||
@@ -236,13 +242,24 @@ function Tail(opt, cmd) {
                                     opt.argv.indexOf('--follow') > -1
                                     && ! /(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
                                 ) {
-                                    // only for debug
-                                    process.stdout.write('[MQTail]['+ bundle +'] bundle is going offline !\n' );
+
+                                    // process.stdout.write('[MQTail]['+ bundle +'] TMP: '+ getTmpDir());
+                                    // restart the bundle: looking into payloads[0].content
+                                    if (bundle && project) {
+                                        // ?? only for debug
+                                        cmdUsedToStart = getBundleStartingArgv(bundle, project);
+                                        if (cmdUsedToStart) {
+                                            process.stdout.write('[MQTail]['+ bundle +'@'+ project +'] restarting with argv: '+ cmdUsedToStart +'\n' );
+                                            execSync(cmdUsedToStart);
+                                        }
+                                        process.stdout.write('[MQTail]['+ bundle +'@'+ project +'] bundle is going offline !\n' );
+
+                                        cmdUsedToStart = null;
+                                        break; // stop displaying ..
+                                    }
+
                                     process.stdout.write('[MQTail] '+ JSON.stringify(payloads, null, 2) +'\n' );
-                                    // restart the bundle: look into payloads[0].content
-                                    // if (project && bundle) {
 
-                                    // }
                                 }
                             }
 

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/lib/collection/src/main.js

@@ -1210,6 +1210,13 @@ function Collection(content, options) {
 
 
                     if ( typeof(a) == 'string' && a != '' ||  typeof(b) == 'string' ) {
+                        // Fixed on 2025-03-08: allowed to compare with one of the fields being NULL or not defined
+                        if ( typeof(a) == 'undefined' || a == null) {
+                            a = ''; // cast to string
+                        }
+                        if ( typeof(b) == 'undefined' || b == null) {
+                            b = ''; // cast to string
+                        }
 
                         if ( typeof(a) == 'number' ) {
                             a = ''+a; // cast to string
@@ -1218,6 +1225,7 @@ function Collection(content, options) {
                             b = ''+b; // cast to string
                         }
 
+
                         return a.localeCompare(b, undefined, {sensitivity: 'case', caseFirst: 'upper'})
                     }
 

package/framework/v0.1.6-alpha.64/lib/domain/exemples/backend.js

@@ -0,0 +1,12 @@
+var myBundle        = require('gina');
+// gina lib samples
+var lib             = myBundle.lib;
+var Domain          = lib.Domain;
+
+var conf        = myBundle.getConfig();
+var isProxyHost = getContext('isProxyHost');
+var rootDomain = ( /^true$/i.test(isProxyHost) )
+    ? process.gina.PROXY_HOST || new Domain().getRootDomain(os.hostname()).value
+    : new Domain().getRootDomain(conf.host).value;
+
+// => mydomain.tld

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/lib/routing/src/main.js

@@ -1363,7 +1363,7 @@ function Routing() {
                     url == '#'
                     && /GET/i.test(method)
                     && isMethodProvidedByDefault
-                    || /^404\:/.test(url)
+                    || /^404\:/.test(url)
                 ) {
                     url = location.pathname;
                     urlHasChanged = true;

package/framework/{v0.1.6-alpha.62 → v0.1.6-alpha.64}/lib/swig-filters/src/main.js

@@ -287,7 +287,8 @@ function SwigFilters(conf) {
             url = url.toUrl();
 
         } catch (routingErr) {
-            url = '404:['+ ctx.req.method +']'+rule
+            url = '404:['+ ctx.req.method +']'+rule;
+            console.error('[swig-filter] Routing Exception on route "', rule, '"');
         }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.6-alpha.62",
+  "version": "0.1.6-alpha.64",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.6-alpha.62/core/gna",
+  "main": "./framework/v0.1.6-alpha.64/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/utils/helper.js

@@ -367,6 +367,30 @@ function MainHelper(opt) {
         return tmp()
     }
 
+    /**
+     * getBundleStartingArgv
+     * Will get the bundle starting ARGV to allow live restart
+     *
+     * @param {string} bundle
+     * @param {string} project
+     *
+     * @returns {string} argv
+     * */
+    getBundleStartingArgv = function(bundle, project) {
+        bundle = bundle.replace(/(`|\s+)/g, '');
+        project = project.replace(/(`|\s+)/g, '');
+        var filename = _(getTmpDir() +'/'+ bundle +'@'+ project +'.argv', true);
+
+        var content = null;
+        if ( fs.existsSync(filename) ) {
+            delete require.cache[require.resolve(filename)];
+            content = ''+fs.readFileSync(filename);
+            content = content.replace(/\,/g, ' ');
+        }
+        // console.debug("@filename: ", filename, content);
+        return content
+    }
+
     /**
      * isWritableSync
      * Only used for `getUserHome()`

package/framework/v0.1.6-alpha.62/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.62

package/framework/v0.1.6-alpha.62/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.62/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}