gina 0.1.1-alpha.162 → 0.1.1-alpha.163

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.163}/core/config.js

@@ -8,12 +8,15 @@
  */
 //Imports.
 var fs              = require('fs');
+var os              = require('os');
 var dns             = require('dns');
 var util            = require('util');
 var Events          = require('events');
 var EventEmitter    = require('events').EventEmitter;
 var locales         = require('./locales');
 var lib             = require('./../lib');
+var Domain          = lib.Domain;
+var domainLib       = new Domain();
 var merge           = lib.merge;
 var inherits        = lib.inherits;
 var console         = lib.logger;
@@ -494,9 +497,10 @@ function Config(opt, contextResetNeeded) {
         //Pushing default app first.
         self.bundles.push(self.startingApp);//This is a JSON.push.
         var root = new _(self.executionPath).toUnixStyle();
-        var pkg  = null;
+        var manifest = null, pkg  = null;
         try {
-            pkg = require(_(root + '/manifest.json')).bundles;
+            manifest = require(_(root + '/manifest.json', true));
+            pkg = manifest.bundles;
             // by default but may be overriden
             masterPort = portsReverse[self.startingApp+'@'+self.projectName][env][projectConf.def_protocol][projectConf.def_scheme]
         } catch (err) {
@@ -814,8 +818,25 @@ function Config(opt, contextResetNeeded) {
                     newContent[app][env].executionPath = root
                 }
 
-                //Constants to be exposed in configuration files.
-                //Variables replace. Compare with gina/core/template/conf/env.json.
+                // Constants to be exposed in configuration files.
+                // Variables replace. Compare with gina/core/template/conf/env.json.
+                // Defining root domain (TLD or SLD)
+                // by default
+                var rootDomain = domainLib.getRootDomain(os.hostname());
+                // if overrided by the project `manifest.json`: meaning all bundles belong to the same TLD or SLD
+                if ( typeof(manifest.rootDomain) != 'undefined' ) {
+                    rootDomain = manifest.rootDomain;
+                }
+                // if overrided by the project/env/bundle `env.json` or `bundle/config/settings.server.json`: meaning the bundles belong to a specific TLD or SLD
+                if ( typeof(newContent[app][env].rootDomain) != 'undefined' && newContent[app][env].rootDomain != '' ) {
+                    rootDomain = newContent[app][env].rootDomain;
+                }
+                // custom override: user entry in the project/env/bundle `env.json` or `bundle/config/settings.server.json`
+                if (!/\{rootDomain\}/.test(newContent[app][env].host) ) {
+                    rootDomain = domainLib.getRootDomain(newContent[app][env].host);
+                }
+                newContent[app][env].rootDomain = rootDomain;
+
                 let reps = {
                     "frameworkDir"  : getEnvVar('GINA_FRAMEWORK_DIR'),
                     "executionPath" : root,
@@ -824,6 +845,9 @@ function Config(opt, contextResetNeeded) {
                     "modelsPath" : modelsPath,
                     "tmpPath" : newContent[app][env].tmpPath,
                     "scope"     : newContent[app][env].server.scope,
+                    "rootDomain"     : rootDomain,
+                    "projectVersion"   : manifest,
+                    "projectVersionMajor"   : manifest.version.split(/\./g)[0],
                     "host"     : newContent[app][env].host,
                     "env" : env,
                     "bundle" : app,

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.163}/core/controller/controller.js

@@ -292,6 +292,7 @@ function SuperController(options) {
             set('page.forms', options.conf.content.forms);
 
             set('page.environment.hostname', ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].hostname);
+            set('page.environment.rootDomain', ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].rootDomain);
             set('page.environment.webroot', options.conf.server.webroot);
             set('page.environment.bundle', options.conf.bundle);
             set('page.environment.project', options.conf.projectName);
@@ -835,7 +836,10 @@ function SuperController(options) {
             }
 
             // adding plugins
-
+            // means that we don't want GFF context or we already have it loaded
+            viewInfos = JSON.clone(data.page.view);
+            if ( !isWithoutLayout )
+                    viewInfos.assets = assets;
 
             if (
                 hasViews() && self.isCacheless() && !isWithoutLayout
@@ -869,8 +873,15 @@ 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'
+                    }
 
-                    layout = layout.replace(/<\/body>/i, XHRData + '\n\t</body>');
                 }
 
                 if (self.isCacheless() || localOptions.debugMode ) {
@@ -902,9 +913,9 @@ function SuperController(options) {
                     delete data.page.view.stylesheets;
                 }
                 // means that we don't want GFF context or we already have it loaded
-                viewInfos = JSON.clone(data.page.view);
-                if ( !isWithoutLayout )
-                    viewInfos.assets = assets;
+                // viewInfos = JSON.clone(data.page.view);
+                // 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)) +'">';
@@ -3217,6 +3228,7 @@ function SuperController(options) {
 
     /**
      * Get locales
+     * Will take only supported lang
      *
      * @param {string} [shortCountryCode] - e.g. EN
      *
@@ -3242,29 +3254,27 @@ function SuperController(options) {
         /**
          * Get countries list
          *
-         * @param {string} [code] - e.g.: short, long, fifa, m49
+         * @param {string} [code] - e.g.: officialStateName, isoShort, isoLong, continent, capital, currency.name
          *
          * @returns {object} countries - countries code & value list
          * */
         var getCountries = function (code) {
-            var list = {}, cde = 'short', name = null;
+            var list = [], cde = 'countryName';
 
             if ( typeof(code) != 'undefined' && typeof(userLocales[0][code]) == 'string' ) {
                 cde = code
-            } else if ( typeof(code) != 'undefined' ) (
+            } else if ( typeof(code) != 'undefined' ) {
                 console.warn('`'+ code +'` not supported : sticking with `short` code')
-            )
-
-
-            for ( var i = 0, len = userLocales.length; i< len; ++i ) {
-
-                if (userLocales[i][cde]) {
+            }
 
-                    name = userLocales[i].officialName.short || userLocales[i].full;
 
-                    if ( name )
-                        list[ userLocales[i][cde] ] = name;
-                }
+            for ( let i = 0, len = userLocales.length; i< len; ++i ) {
+                list[ i ] = {
+                    isoShort: userLocales[i].isoShort,
+                    isoLong: userLocales[i].isoLong,
+                    countryName: userLocales[i].countryName,
+                    officialStateName: userLocales[i].officialStateName
+                };
             }
 
             return list
@@ -3272,6 +3282,7 @@ function SuperController(options) {
 
         return {
             'getCountries': getCountries
+            // TODO - getCurrencies()
         }
     }
 

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.163}/core/gna.js

@@ -872,7 +872,12 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                                     setTimeout( async function onStarted() {
 
                                         if ( conf.server.scheme == 'https' && /true/i.test(process.env.NODE_SCOPE_IS_LOCAL) ) {
-                                            await server.verifyCertificate(conf.host, conf.server.port);
+                                            try {
+                                                await server.verifyCertificate(conf.host, conf.server.port);
+                                            } catch (err) {
+                                                // console.emerg(err.stack);
+                                                throw err;
+                                            }
                                         }
 
                                         console.info('is now online V(-.o)V',

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.163}/core/locales/README.md

@@ -48,6 +48,11 @@ https://github.com/stefangabos/world_countries/
 ``` tty
 node src/make --target=region --region=en
 ```
+or if you want to select multiple languages
+``` tty
+node src/make --target=region --region=en,fr
+```
+
 A `dist/region/en.json` file will be created.
 
 __NB.: To keep the file updated__