...

vikasburman · May 11, 2019 · c238007 · c238007
1 parent 2ffc08d
commit c238007
Show file tree

Hide file tree

Showing 20 changed files with 98 additions and 96 deletions.
diff --git a/dist/flair.app.js b/dist/flair.app.js
diff --git a/dist/flair.app.min.js b/dist/flair.app.min.js
diff --git a/dist/flair.app.min.js.gz b/dist/flair.app.min.js.gz
diff --git a/dist/flair.js b/dist/flair.js
@@ -5,8 +5,8 @@
  * 
  * Assembly: flair
  *     File: ./flair.js
- *  Version: 0.6.6
- *  Sat, 11 May 2019 03:36:56 GMT
+ *  Version: 0.6.7
+ *  Sat, 11 May 2019 03:55:11 GMT
  * 
  * (c) 2017-2019 Vikas Burman
  * MIT
@@ -105,10 +105,10 @@
         name: 'flairjs',
         title: 'Flair.js',
         file: currentFile,
-        version: '0.6.6',
+        version: '0.6.7',
         copyright: '(c) 2017-2019 Vikas Burman',
         license: 'MIT',
-        lupdate: new Date('Sat, 11 May 2019 03:36:56 GMT')
+        lupdate: new Date('Sat, 11 May 2019 03:55:11 GMT')
     });  
 
     flair.members = [];

diff --git a/dist/flair.min.js b/dist/flair.min.js
diff --git a/dist/flair.min.js.gz b/dist/flair.min.js.gz
diff --git a/dist/preamble.js b/dist/preamble.js
diff --git a/docs/v1/examples/js/flair.js b/docs/v1/examples/js/flair.js
@@ -5,8 +5,8 @@
  * 
  * Assembly: flair
  *     File: ./flair.js
- *  Version: 0.6.6
- *  Sat, 11 May 2019 03:36:56 GMT
+ *  Version: 0.6.7
+ *  Sat, 11 May 2019 03:55:11 GMT
  * 
  * (c) 2017-2019 Vikas Burman
  * MIT
@@ -105,10 +105,10 @@
         name: 'flairjs',
         title: 'Flair.js',
         file: currentFile,
-        version: '0.6.6',
+        version: '0.6.7',
         copyright: '(c) 2017-2019 Vikas Burman',
         license: 'MIT',
-        lupdate: new Date('Sat, 11 May 2019 03:36:56 GMT')
+        lupdate: new Date('Sat, 11 May 2019 03:55:11 GMT')
     });  
 
     flair.members = [];

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "title": "Flair.js",
     "description": "True Object Oriented JavaScript",
     "copyright": "(c) 2017-2019 Vikas Burman",
-    "version": "0.6.6",
+    "version": "0.6.7",
     "author": "Vikas Burman <[email protected]>",
     "keywords": [
         "javascript",

diff --git a/src/flair.app/flair.app/ClientHost.js b/src/flair.app/flair.app/ClientHost.js
@@ -27,26 +27,26 @@ Class('(auto)', Host, function() {
     // localization support (start)
     $$('state');
     $$('private');
-    this.currentLocale = settings.i18n.locale;
+    this.currentLocale = settings.client.i18n.locale;
 
     this.defaultLocale = {
-        get: () => { return settings.i18n.locale; },
+        get: () => { return settings.client.i18n.locale; },
         set: noop
     };
     this.supportedLocales = {
-        get: () => { return settings.i18n.locales.slice(); },
+        get: () => { return settings.client.i18n.locales.slice(); },
         set: noop
     };
     this.locale = (newLocale, isSuppressRefresh) => {
-        if (!settings.i18n.enabled) { return ''; }
+        if (!settings.client.i18n.enabled) { return ''; }
 
         // update value and refresh for changes (if required)
         if (newLocale && this.currentLocale !== newLocale) { 
             this.currentLocale = newLocale;
 
             // change url and then redirect to new URL
             if (!isSuppressRefresh) {
-                if (settings.url.i18n) {
+                if (settings.client.url.i18n) {
                     // set new path with replaced locale
                     // this change will also go in history
                     window.location.hash = this.replaceLocale(window.location.hash);
@@ -76,7 +76,7 @@ Class('(auto)', Host, function() {
     };
     $$('private');
     this.extractLocale = (path) => {
-        if (!settings.url.i18n) { return ''; }
+        if (!settings.client.url.i18n) { return ''; }
 
         // pick first path element
         let idx = path.indexOf('/');
@@ -102,7 +102,7 @@ Class('(auto)', Host, function() {
     $$('private');
     this.replaceLocale = (path) => {
         // replace current locale with given locale
-        if (settings.url.i18n) { 
+        if (settings.client.url.i18n) { 
             // clean path first
             path = this.cleanPath(path);
 
@@ -128,14 +128,14 @@ Class('(auto)', Host, function() {
         path = this.cleanPath(path);
 
         // add hash
-        if (settings.url.hashbang) {
+        if (settings.client.url.hashbang) {
             path = '/#!/' + path;
         } else {
             path = '/#/' + path;
         }
 
         // add i18n
-        if (settings.i18n.enabled && settings.url.i18n) {
+        if (settings.client.i18n.enabled && settings.client.url.i18n) {
             path = (this.currentLocale || this.defaultLocale) + '/' + path;
         }
 
@@ -191,7 +191,7 @@ Class('(auto)', Host, function() {
             // each item is: { name: '', value:  }
             // name: as in above link (as-is)
             // value: as defined in above link
-            let pageOptions = settings[`${mountName}-options`];
+            let pageOptions = settings.client.routing[`${mountName}-options`];
             if (pageOptions && pageOptions.length > 0) {
                 for(let pageOption of pageOptions) {
                     appOptions[pageOption.name] = pageOption.value;
@@ -217,13 +217,13 @@ Class('(auto)', Host, function() {
         mainApp.base('/');
 
         // create one instance of page app for each mounted path
-        for(let mountName of Object.keys(settings.routing.mounts)) {
+        for(let mountName of Object.keys(settings.client.routing.mounts)) {
             if (mountName === 'main') {
                 mountPath = '/';
                 mount = mainApp;
             } else {
                 appOptions = getOptions(mountName);
-                mountPath = settings.routing.mounts[mountName];
+                mountPath = settings.client.routing.mounts[mountName];
                 mount = page.create(appOptions); // create a sub-app
                 mount.strict(appOptions.strict);
                 mount.base(mountPath);
@@ -250,8 +250,8 @@ Class('(auto)', Host, function() {
             let path = this.cleanPath(window.location.hash);
 
             // handle i18n specific routing
-            if (settings.i18n.enabled) {
-                if (settings.url.i18n) { // if i18n type urls are being used
+            if (settings.client.i18n.enabled) {
+                if (settings.client.url.i18n) { // if i18n type urls are being used
                     // extract locale from path
                     let extractedLocale = this.extractLocale(path);
 
@@ -310,7 +310,7 @@ Class('(auto)', Host, function() {
         window.addEventListener('hashchange', hashChangeHandler);
 
         // navigate to home
-        this.app.redirect(settings.url.home);
+        this.app.redirect(settings.client.url.home);
 
         // ready
         console.log(`${AppDomain.app().info.name}, v${AppDomain.app().info.version}`); // eslint-disable-line no-console

diff --git a/src/flair.app/flair.app/ServerHost.js b/src/flair.app/flair.app/ServerHost.js
@@ -10,8 +10,8 @@ Class('(auto)', Host, function() {
     let mountedApps = {},
         httpServer = null,
         httpsServer = null,
-        httpSettings = settings.express['server-http'],
-        httpsSettings = settings.express['server-https'];         
+        httpSettings = settings.server.express['server-http'],
+        httpsSettings = settings.server.express['server-https'];         
 
     $$('override');
     this.construct = (base) => {
@@ -38,7 +38,7 @@ Class('(auto)', Host, function() {
             // each item is: { name: '', value:  }
             // name: as in above link (as-is)
             // value: as defined in above link
-            let appSettings = settings[`${mountName}-appSettings`];
+            let appSettings = settings.server.routing[`${mountName}-appSettings`];
             if (appSettings && appSettings.length > 0) {
                 for(let appSetting of appSettings) {
                     mount.set(appSetting.name, appSetting.value);
@@ -53,12 +53,12 @@ Class('(auto)', Host, function() {
         // create one instance of express app for each mounted path
         let mountPath = '',
             mount = null;
-        for(let mountName of Object.keys(settings.routing.mounts)) {
+        for(let mountName of Object.keys(settings.server.routing.mounts)) {
             if (mountName === 'main') {
                 mountPath = '/';
                 mount = mainApp;
             } else {
-                mountPath = settings.routing.mounts[mountName];
+                mountPath = settings.server.routing.mounts[mountName];
                 mount = express(); // create a sub-app
             }
 

diff --git a/src/flair.app/flair.boot/ClientRouter.js b/src/flair.app/flair.boot/ClientRouter.js
@@ -108,7 +108,7 @@ Class('(auto)', Bootware, function () {
                     // each interceptor is derived from ViewInterceptor and
                     // run method of it takes ctx, can update it
                     // each item is: "InterceptorTypeQualifiedName"
-                    let mountInterceptors = settings[`${mount.name}-interceptors`] || [];
+                    let mountInterceptors = settings.client.routing[`${mount.name}-interceptors`] || [];
                     runInterceptors(mountInterceptors, ctx).then(() => {
                         if (!ctx.$stop) {
                             handleRoute();
@@ -135,7 +135,7 @@ Class('(auto)', Bootware, function () {
         // catch 404 for this mount and forward to error handler
         mount.app("*", (ctx) => { // mount.app = page object/func
             // redirect to 404 route, which has to be defined route
-            let url404 = settings.url['404'];
+            let url404 = settings.client.url['404'];
             if (url404) {
                 ctx.handled = true;
                 if (ctx.pathname !== url404) { 

diff --git a/src/flair.app/flair.boot/Middlewares.js b/src/flair.app/flair.boot/Middlewares.js
@@ -26,7 +26,7 @@ Class('(auto)', Bootware, function() {
         //       define it as: "return (res, path, stat) => { res.set('x-timestamp', Date.now()) }"
         //       this string will be passed to new Function(...) and returned values will be used as value of option
         //       all object type arguments will be scanned for string values that start with 'return ' and will be tried to convert into a function
-        let middlewares = settings[`${mount.name}-middlewares`];
+        let middlewares = settings.server.routing[`${mount.name}-middlewares`];
         if (middlewares && middlewares.length > 0) {
             let mod = null,
                 func = null;

diff --git a/src/flair.app/flair.boot/NodeEnv.js b/src/flair.app/flair.boot/NodeEnv.js
@@ -16,12 +16,12 @@ Class('(auto)', Bootware, function() {
     this.boot = async (base) => {
         base();
 
-        if (settings.envVars.vars.length > 0) {
+        if (settings.server.nsenvVars.vars.length > 0) {
             const nodeEnv = await include('node-env-file | x');
 
             if (nodeEnv) {
-                for(let envVar of settings.envVars.vars) {
-                    nodeEnv(AppDomain.resolvePath(envVar), settings.envVars.options);
+                for(let envVar of settings.server.envVars.vars) {
+                    nodeEnv(AppDomain.resolvePath(envVar), settings.server.envVars.options);
                 }
             }
         }

diff --git a/src/flair.app/flair.boot/ServerRouter.js b/src/flair.app/flair.boot/ServerRouter.js
@@ -112,7 +112,7 @@ Class('(auto)', Bootware, function () {
                         // each interceptor is derived from RestInterceptor and
                         // run method of it takes req, can update it, also takes res method and can generate response, in case request is being stopped
                         // each item is: "InterceptorTypeQualifiedName"
-                        let mountInterceptors = settings[`${mount.name}-interceptors`] || [];
+                        let mountInterceptors = settings.server.routing[`${mount.name}-interceptors`] || [];
                         runInterceptors(mountInterceptors, req, res).then(() => {
                             if (!req.$stop) {
                                 handleRoute();

diff --git a/src/flair.app/flair.ui.vue/@3-VueComponentMembers.js b/src/flair.app/flair.ui.vue/@3-VueComponentMembers.js
@@ -32,7 +32,7 @@ Mixin('(auto)', function() {
         // each i18n resource file is defined as:
         // "ns": "json-file-name"
         // when loaded, each ns will convert into JSON object from defined file
-        if(settings.i18n.enabled && this.i18n) {
+        if(settings.client.i18n.enabled && this.i18n) {
             let i18ResFile = '';
             for(let i18nNs in this.i18n) {
                 if (this.i18n.hasOwnProperty(i18nNs)) {
@@ -122,7 +122,7 @@ Mixin('(auto)', function() {
         component.methods['route'] = (routeName, placeholders) => { return _this.route(routeName, placeholders); };
 
         // i18n specific built-in methods
-        if (settings.i18n.enabled) {
+        if (settings.client.i18n.enabled) {
             // supporting built-in method: locale 
             // e.g., {{ locale() }} will give: 'en'
             component.methods['locale'] = (value) => { return _this.locale(value); };

diff --git a/src/flair.app/flair.ui.vue/VuePlugin.js b/src/flair.app/flair.ui.vue/VuePlugin.js
@@ -6,8 +6,8 @@ $$('ns', '(auto)');
 Class('(auto)', function() {
     this.construct = (name) => {
         // load options, if name and corresponding options are defined
-        if (settings.vue.pluginOptions[name]) {
-            this.options = Object.assign({}, settings.vue.pluginOptions[name]); // keep a copy
+        if (settings.client.vue.pluginOptions[name]) {
+            this.options = Object.assign({}, settings.client.vue.pluginOptions[name]); // keep a copy
         }
     };
 

diff --git a/src/flair.app/flair.ui.vue/VueSetup.js b/src/flair.app/flair.ui.vue/VueSetup.js
@@ -24,7 +24,7 @@ Class('(auto)', Bootware, function() {
         // load Vue global plugins
         // each plugin in array is defined as:
         // { "name": "name", "type": "ns.typeName" }
-        let plugins = settings.vue.plugins,
+        let plugins = settings.client.vue.plugins,
             PluginType = null,
             plugin = null;
         for(let item of plugins) {
@@ -47,7 +47,7 @@ Class('(auto)', Bootware, function() {
         // load Vue global mixins
         // each mixin in array is defined as:
         // { "name": "name", "type": "ns.typeName" }
-        let mixins = settings.vue.mixins,
+        let mixins = settings.client.vue.mixins,
             MixinType = null,
             mixin = null;
         for(let item of mixins) {
@@ -70,7 +70,7 @@ Class('(auto)', Bootware, function() {
         // load Vue global directives
         // each directive in array is defined as:
         // { "name": "name", "type": "ns.typeName" }
-        let directives = settings.vue.directives,
+        let directives = settings.client.vue.directives,
             DirectiveType = null,
             directive = null;
         for(let item of directives) {
@@ -93,7 +93,7 @@ Class('(auto)', Bootware, function() {
         // load Vue global filters 
         // each filter in array is defined as:
         // { "name": "name", "type": "ns.typeName" }
-        let filters = settings.vue.filters,
+        let filters = settings.client.vue.filters,
             FilterType = null,
             filter = null;
         for(let item of filters) {
@@ -116,7 +116,7 @@ Class('(auto)', Bootware, function() {
         // register global components
         // each component in array is defined as:
         // { "name": "name", "type": "ns.typeName" }
-        let components = settings.vue.components,
+        let components = settings.client.vue.components,
             ComponentType = null,
             component = null;
         for(let item of components) {

diff --git a/src/flair.app/flair.ui.vue/VueView.js b/src/flair.app/flair.ui.vue/VueView.js
@@ -11,7 +11,7 @@ Class('(auto)', ViewHandler, [VueComponentMembers], function() {
 
     $$('override');
     this.construct = (base) => {
-        base(settings.view.el, settings.view.title, settings.view.transition);
+        base(settings.client.view.el, settings.client.view.title, settings.client.view.transition);
     };
 
     $$('private');

diff --git a/src/flair.app/settings.json b/src/flair.app/settings.json
@@ -85,7 +85,9 @@
             "main-middlewares": [
             ],
             "main-interceptors": [
-            ]    
+            ],
+            "main-resHeaders": [
+            ]
         }
     }
 }