divhunt 2.0.14 → 2.0.16

package/addons/core/servers/back/http/item/functions/start.js

@@ -22,15 +22,16 @@ serversHTTP.Fn('item.start', function(item)
         return {
             id: divhunt.GenerateUID(),
             request,
+            response,
+            error: null,
+            streaming: false,
+            prevent: false,
             data: await serversHTTP.Fn('extract.data', request),
             url: new URL(request.url, `http://${request.headers.host}`),
             user: this.methods.user(request),
             time: performance.now(),
-            error: null,
-            response,
-            streaming: false,
             types: this.methods.types,
-            prevent: false,
+            context: {},
             respond: {
                 type: 'JSON',
                 data: null,
@@ -102,6 +103,9 @@ serversHTTP.Fn('item.start', function(item)
         {
             const http = await this.methods.createHttpObject(request, response);
 
+            await divhunt.Middleware('servers.http.request', http);
+            divhunt.Emit('servers.http.request', http);
+
             try
             {
                 if(item.Get('onRequest'))
@@ -109,6 +113,9 @@ serversHTTP.Fn('item.start', function(item)
                     await Promise.resolve(item.Get('onRequest')(http));
                 }
 
+                await divhunt.Middleware('servers.http.respond', http);
+                divhunt.Emit('servers.http.respond', http);
+
                 this.methods.respond(http, response);
             }
             catch(error)
@@ -119,10 +126,19 @@ serversHTTP.Fn('item.start', function(item)
                 http.errorCode = code;
                 http.errorContext = error.context || {};
 
+                await divhunt.Middleware('servers.http.error', http);
+                divhunt.Emit('servers.http.error', http);
+
                 item.Get('onError') && item.Get('onError')(http.error);
 
+                await divhunt.Middleware('servers.http.respond', http);
+                divhunt.Emit('servers.http.respond', http);
+
                 this.methods.respond(http, response);
             }
+
+            await divhunt.Middleware('servers.http.complete', http);
+            divhunt.Emit('servers.http.complete', http);
         });
         
         httpServer.on('error', (error) =>
@@ -133,6 +149,7 @@ serversHTTP.Fn('item.start', function(item)
         httpServer.listen(item.Get('port'), () =>
         {
             item.Set('instance', httpServer);
+            divhunt.Emit('servers.http.start', httpServer);
             item.Get('onStart') && item.Get('onStart')(httpServer);
         });
     };

package/addons/modules/variables/{addon.js → core/addon.js}

@@ -1,11 +1,10 @@
-import divhunt from '#divhunt';
+import divhunt from '#framework/load.js';
 
 const variables = divhunt.Addon('variables', (addon) =>
 {
     addon.Field('id', ['string']);
     addon.Field('value', ['any']);
     addon.Field('type', ['string']);
-    addon.Field('key', ['string', null]);
     addon.Field('group', ['string', null]);
 });
 

package/addons/modules/variables/core/functions/process.js

@@ -0,0 +1,46 @@
+import divhunt from '#framework/load.js';
+import variables from '#variables/core/addon.js';
+
+variables.Fn('process', function(string)
+{
+    if(typeof string !== 'string')
+    {
+        return string;
+    }
+
+    const safe = divhunt.environment === 'back';
+    const data = {};
+
+    for(const id in this.items.data)
+    {
+        data[id] = this.items.data[id].Get('value');
+    }
+
+    if(!string.includes('${'))
+    {
+        const result = divhunt.Function(string, data, safe);
+
+        return result !== undefined ? result : string;
+    }
+
+    const single = string.match(/^\$\{([^}]+)\}$/);
+
+    if(single)
+    {
+        const result = divhunt.Function(single[1], data, safe);
+
+        return result !== undefined ? result : string;
+    }
+
+    return string.replace(/\$\{([^}]+)\}/g, (match, expression) =>
+    {
+        const result = divhunt.Function(expression, data, safe);
+
+        if(result === undefined || (typeof result === 'object' && result !== null))
+        {
+            return match;
+        }
+
+        return result;
+    });
+});

package/addons/modules/variables/core/item/catch/add.js

@@ -0,0 +1,6 @@
+import variables from '#variables/core/addon.js';
+
+variables.ItemOn('add', function(item)
+{
+    item.Set('type', typeof item.Get('value'));
+});

package/addons/modules/variables/core/load.js

@@ -0,0 +1,13 @@
+import divhunt from '#framework/load.js';
+import variables from '#variables/core/addon.js';
+
+import '#variables/core/item/catch/add.js';
+
+import '#variables/core/functions/process.js';
+
+divhunt.$dh.var = function(string)
+{
+    return variables.Fn('process', string);
+};
+
+export default variables;

package/addons/modules/variables/front/events/compile.js

@@ -0,0 +1,12 @@
+divhunt.EmitOn('addon.render.compile.before', (item, compile) =>
+{
+    const global = {};
+    const items = variables.Items();
+
+    for(const id in items)
+    {
+        global[id] = items[id].Get('value');
+    }
+
+    compile.data.global = global;
+});

package/addons/render/assets/back/functions/import.js

@@ -8,9 +8,10 @@ const root = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..', '..',
 const map =
 {
     framework:  { js: 'lib', ignore: ['lib/load.js'] },
-    commands:   { js: 'addons/core/commands', css: 'addons/core/commands/front', ignore: ['addons/core/commands/back'] },
+    commands:   { js: 'addons/core/commands', ignore: ['addons/core/commands/back'] },
     database:   { js: 'addons/core/database/front' },
     actions:    { js: 'addons/modules/actions/front' },
+    variables:  { js: 'addons/modules/variables' },
     bugs:       { js: 'addons/modules/bugs/front' },
     events:     { js: 'addons/modules/events/front' },
     schedules:  { js: 'addons/modules/schedules/front' },

package/lib/browser.js

@@ -1,4 +1,5 @@
-window.divhunt = window.divhunt = new Divhunt();
+window.divhunt = new Divhunt();
+window.$dh = divhunt.$dh;
 
 if (document.readyState === 'loading')
 {

package/lib/load.js

@@ -1,6 +1,8 @@
 import Divhunt from './src/divhunt.js';
 
-const divhunt = new Divhunt()
+const divhunt = new Divhunt();
+
+global.$dh = divhunt.$dh;
 
 process.on('SIGINT', async () => 
 {

package/lib/src/divhunt.js

@@ -64,6 +64,8 @@ class Divhunt
         {
             schemas: {},
         };
+
+        this.$dh = {};
     }
 }
 

package/lib/src/mixins/data.js

@@ -119,6 +119,11 @@ const DivhuntData =
     {
         return type.split('|').map(t => t.trim().toLowerCase()).some(type =>
         {
+            if (type === 'any')
+            {
+                return true;
+            }
+
             if (type === 'array')
             {
                 return Array.isArray(value);
@@ -249,7 +254,7 @@ const DivhuntData =
 
         parsed.type.split('|').forEach((type) =>
         {
-            if(!['number', 'string', 'boolean', 'object', 'array', 'function', 'binary'].includes(type))
+            if(!['number', 'string', 'boolean', 'object', 'array', 'function', 'binary', 'any'].includes(type))
             {
                 throw new Error('Invalid config type. Expected number, string, boolean, object, array, function or binary.');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "divhunt",
-    "version": "2.0.14",
+    "version": "2.0.16",
     "description": "Full-stack isomorphic JavaScript framework built from scratch. One addon abstraction powers databases, servers, commands, pages, directives, queues, and more.",
     "type": "module",
     "main": "lib/load.js",
@@ -20,7 +20,7 @@
         "./html": "./addons/render/html/load.js",
         "./tags": "./addons/render/tags/load.js",
         "./sources": "./addons/modules/sources/back/load.js",
-        "./variables": "./addons/modules/variables/load.js"
+        "./variables": "./addons/modules/variables/core/load.js"
     },
     "imports": {
         "#framework/*": "./lib/*",

package/test/front/test.js

@@ -12,6 +12,8 @@ pages.Item({
         {
             return `
                 1
+                {{ global.user.name }}
+
                 <h1>dh-command test</h1>
                 <dh-command-submit command="test" :api="true" bind="test" :data='{"name": "dejan"}'>
                     <input name="name" placeholder="Name"/>

package/test.js

@@ -7,8 +7,9 @@ import assets from './addons/render/assets/back/load.js';
 import commands from './addons/core/commands/core/load.js';
 import pages from './addons/render/pages/core/load.js';
 import html from './addons/render/html/load.js';
+import variables from './addons/modules/variables/core/load.js';
 
-assets.Fn('import', ['framework', 'directives', 'commands', 'pages']);
+assets.Fn('import', ['framework', 'variables', 'directives', 'commands', 'pages']);
 assets.Item({ type: 'js', order: 10, path: resolve(root, 'test/front') });
 assets.Item({ type: 'css', order: 10, path: resolve(root, 'test/front') });
 
@@ -24,6 +25,8 @@ commands.Item({
     }
 });
 
+console.log($dh.var('test'));
+
 commands.Item({
     id: 'test',
     exposed: true,

package/addons/modules/variables/functions/filter.js

@@ -1,24 +0,0 @@
-import variables from '../addon.js';
-
-variables.Fn('filter', function(group = null)
-{
-    const result = [];
-
-    for(const id in this.items.data)
-    {
-        const item = this.items.data[id];
-
-        if(group === null || item.Get('group') === group)
-        {
-            result.push({
-                id: item.Get('id'),
-                value: item.Get('value'),
-                type: item.Get('type'),
-                key: item.Get('key'),
-                group: item.Get('group')
-            });
-        }
-    }
-
-    return result;
-});

package/addons/modules/variables/functions/process.js

@@ -1,52 +0,0 @@
-import divhunt from '#divhunt';
-import variables from '../addon.js';
-
-variables.Fn('process', function(string)
-{
-    if(typeof string !== 'string')
-    {
-        return string;
-    }
-
-    return string.replace(/\$\{([^}]+)\}/g, (match, expr) =>
-    {
-        const parts = expr.trim().split('.');
-        const id = parts[0];
-        const key = parts.slice(1).join('.');
-
-        const item = this.ItemGet(id);
-
-        if(!item)
-        {
-            try
-            {
-                return divhunt.Function(`return ${expr}`)();
-            }
-            catch
-            {
-                return match;
-            }
-        }
-
-        let value = item.Get('value');
-
-        if(key && typeof value === 'object' && value !== null)
-        {
-            const keys = key.split('.');
-
-            for(const k of keys)
-            {
-                if(value && typeof value === 'object' && k in value)
-                {
-                    value = value[k];
-                }
-                else
-                {
-                    return match;
-                }
-            }
-        }
-
-        return value;
-    });
-});

package/addons/modules/variables/item/catch/add.js

@@ -1,13 +0,0 @@
-import divhunt from '#divhunt';
-import variables from '../../addon.js';
-
-variables.ItemOn('add', function(item)
-{
-    const value = item.Get('value');
-    const type = typeof value;
-
-    if(!item.Get('type'))
-    {
-        item.Set('type', type);
-    }
-});

package/addons/modules/variables/load.js

@@ -1,8 +0,0 @@
-import variables from './addon.js';
-
-import './item/catch/add.js';
-
-import './functions/process.js';
-import './functions/filter.js';
-
-export default variables;