@onetype/framework 2.0.44 → 2.0.46

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

@@ -1,7 +1,7 @@
 import assets from '../addon.js';
 import onetype from '#framework/load.js';
 
-assets.Fn('import', function(modules)
+assets.Fn('import', function(modules, order = 10)
 {
     for (let i = 0; i < modules.length; i++)
     {
@@ -12,12 +12,12 @@ assets.Fn('import', function(modules)
         {
             if (registered.js)
             {
-                assets.Item({ type: 'js', order: i, path: registered.js.path, ignore: registered.js.exclude || [] });
+                assets.Item({ type: 'js', order: order + i, path: registered.js.path, ignore: registered.js.exclude || [] });
             }
 
             if (registered.css)
             {
-                assets.Item({ type: 'css', order: i, path: registered.css.path, ignore: registered.css.exclude || [] });
+                assets.Item({ type: 'css', order: order + i, path: registered.css.path, ignore: registered.css.exclude || [] });
             }
         }
     }

package/addons/core/commands/front/directives/run.js

@@ -1,4 +1,4 @@
-onetype.AddonReady('directives', function()
+onetype.AddonReady('directives', function(directives)
 {
 	directives.ItemAdd({
 		id: 'ot-command',

package/addons/core/commands/front/directives/submit.js

@@ -1,4 +1,4 @@
-onetype.AddonReady('directives', function()
+onetype.AddonReady('directives', function(directives)
 {
 	directives.ItemAdd({
 		id: 'ot-command-submit',

package/addons/render/directives/front/items/self/100-if.js

@@ -1,25 +1,28 @@
-directives.ItemAdd({
-    id: 'ot-if',
-    icon: 'rule',
-    name: 'If',
-    description: 'Conditionally render elements based on expressions. Removes elements from DOM when condition is false.',
-    category: 'control-flow',
-    trigger: 'node',
-    order: 100,
-    strict: false,
-    attributes: {
-        'ot-if': ['string']
-    },
-    code: function(data, item, compile, node, identifier)
-    {
-        const expression = data['ot-if'].value;
-        const result = onetype.Function(expression, compile.data, false);
-
-        if (!result)
+onetype.AddonReady('directives', function(directives)
+{
+    directives.ItemAdd({
+        id: 'ot-if',
+        icon: 'rule',
+        name: 'If',
+        description: 'Conditionally render elements based on expressions. Removes elements from DOM when condition is false.',
+        category: 'control-flow',
+        trigger: 'node',
+        order: 100,
+        strict: false,
+        attributes: {
+            'ot-if': ['string']
+        },
+        code: function(data, item, compile, node, identifier)
         {
-            const placeholder = document.createComment('ot-if:' + identifier);
-            node.replaceWith(placeholder);
-            return false;
+            const expression = data['ot-if'].value;
+            const result = onetype.Function(expression, compile.data, false);
+
+            if (!result)
+            {
+                const placeholder = document.createComment('ot-if:' + identifier);
+                node.replaceWith(placeholder);
+                return false;
+            }
         }
-    }
+    });
 });

package/addons/render/directives/front/items/self/1000-render.js

@@ -1,37 +1,40 @@
-directives.ItemAdd({
-	id: 'ot-render',
-	icon: 'code',
-	name: 'Render',
-	description: 'Render components or elements into the DOM. Use <render name="property"> to inject render instances from the parent context.',
-    category: 'content',
-	trigger: 'node',
-	order: 1000,
-	tag: 'render',
-	attributes: {
-		'name': ['string']
-	},
-	code: function(data, item, compile, node)
-	{
-		const name = data['name'].value;
-
-		if(!name)
+onetype.AddonReady('directives', function(directives)
+{
+	directives.ItemAdd({
+		id: 'ot-render',
+		icon: 'code',
+		name: 'Render',
+		description: 'Render components or elements into the DOM. Use <render name="property"> to inject render instances from the parent context.',
+		category: 'content',
+		trigger: 'node',
+		order: 1000,
+		tag: 'render',
+		attributes: {
+			'name': ['string']
+		},
+		code: function(data, item, compile, node)
 		{
-			console.error('Render directive requires a name attribute');
-			node.remove();
-			return false;
-		}
+			const name = data['name'].value;
 
-		if(item[name] && item[name].Element)
-		{
-			item[name].Element.__otExternal = { name: 'render', key: name };
-			node.replaceWith(item[name].Element);
-		}
-		else
-		{
-			console.warn(`Render property "${name}" not found or is not a render instance`);
-			node.remove();
-		}
+			if(!name)
+			{
+				console.error('Render directive requires a name attribute');
+				node.remove();
+				return false;
+			}
+
+			if(item[name] && item[name].Element)
+			{
+				item[name].Element.__otExternal = { name: 'render', key: name };
+				node.replaceWith(item[name].Element);
+			}
+			else
+			{
+				console.warn(`Render property "${name}" not found or is not a render instance`);
+				node.remove();
+			}
 
-		return false;
-	}
+			return false;
+		}
+	});
 });

package/addons/render/directives/front/items/self/110-show.js

@@ -1,23 +1,26 @@
-directives.ItemAdd({
-    id: 'ot-show',
-    icon: 'visibility',
-    name: 'Show',
-    description: 'Toggle element visibility with CSS display property. Hides elements when condition is false without removing from DOM.',
-    category: 'control-flow',
-    trigger: 'node',
-    order: 110,
-    attributes: {
-        'ot-show': ['string']
-    },
-    code: function(data, item, compile, node, identifier)
-    {
-        if(!onetype.Function(data['ot-show'].value, compile.data, false))
+onetype.AddonReady('directives', function(directives)
+{
+    directives.ItemAdd({
+        id: 'ot-show',
+        icon: 'visibility',
+        name: 'Show',
+        description: 'Toggle element visibility with CSS display property. Hides elements when condition is false without removing from DOM.',
+        category: 'control-flow',
+        trigger: 'node',
+        order: 110,
+        attributes: {
+            'ot-show': ['string']
+        },
+        code: function(data, item, compile, node, identifier)
         {
-            node.style.display = 'none';
+            if(!onetype.Function(data['ot-show'].value, compile.data, false))
+            {
+                node.style.display = 'none';
+            }
+            else if(node.style.display === 'none')
+            {
+                node.style.display = '';
+            }
         }
-        else if(node.style.display === 'none')
-        {
-            node.style.display = '';
-        }
-    }
+    });
 });

package/addons/render/directives/front/items/self/160-slot.js

@@ -1,33 +1,36 @@
-directives.ItemAdd({
-    id: 'ot-slot',
-    icon: 'input',
-    name: 'Slot',
-    description: 'Insert slot content. Supports DOM elements and render instances.',
-    category: 'content',
-    trigger: 'node',
-    order: 160,
-    tag: 'slot',
-    attributes: {
-        'name': ['string']
-    },
-    code: function(data, item, compile, node, id)
-    {
-        const name = data['name']?.value || 'default';
-        const slot = item.Slots[name];
-
-        if (slot && slot.Element)
-        {
-            slot.Element.__otExternal = { name: 'slot', key: name };
-            node.replaceWith(slot.Element);
-        }
-        else if (slot && slot.html && slot.data)
+onetype.AddonReady('directives', function(directives)
+{
+    directives.ItemAdd({
+        id: 'ot-slot',
+        icon: 'input',
+        name: 'Slot',
+        description: 'Insert slot content. Supports DOM elements and render instances.',
+        category: 'content',
+        trigger: 'node',
+        order: 160,
+        tag: 'slot',
+        attributes: {
+            'name': ['string']
+        },
+        code: function(data, item, compile, node, id)
         {
-            const compiled = item.Compile(slot.html, slot.data);
-            node.replaceWith(...compiled.element.childNodes);
-        }
-        else
-        {
-            node.remove();
+            const name = data['name']?.value || 'default';
+            const slot = item.Slots[name];
+
+            if (slot && slot.Element)
+            {
+                slot.Element.__otExternal = { name: 'slot', key: name };
+                node.replaceWith(slot.Element);
+            }
+            else if (slot && slot.html && slot.data)
+            {
+                const compiled = item.Compile(slot.html, slot.data);
+                node.replaceWith(...compiled.element.childNodes);
+            }
+            else
+            {
+                node.remove();
+            }
         }
-    }
+    });
 });

package/addons/render/directives/front/items/self/200-for.js

@@ -1,87 +1,90 @@
-directives.ItemAdd({
-    id: 'ot-for',
-    icon: 'repeat',
-    name: 'For',
-    description: 'Loop through arrays and objects to render multiple elements. Supports item and index variables for complex iterations.',
-    category: 'control-flow',
-    trigger: 'node',
-    order: 200,
-    attributes: {
-        'ot-for': ['string']
-    },
-    code: function(data, item, compile, node, identifier)
-    {
-        const expression = data['ot-for'].value;
-        const match = expression.match(/(\w+)(?:\s*,\s*(\w+))?\s+in\s+(.+)/);
-
-        if (!match)
+onetype.AddonReady('directives', function(directives)
+{
+    directives.ItemAdd({
+        id: 'ot-for',
+        icon: 'repeat',
+        name: 'For',
+        description: 'Loop through arrays and objects to render multiple elements. Supports item and index variables for complex iterations.',
+        category: 'control-flow',
+        trigger: 'node',
+        order: 200,
+        attributes: {
+            'ot-for': ['string']
+        },
+        code: function(data, item, compile, node, identifier)
         {
-            onetype.Error(400, 'Invalid ot-for syntax. Expected: "item in items".');
-            return;
-        }
+            const expression = data['ot-for'].value;
+            const match = expression.match(/(\w+)(?:\s*,\s*(\w+))?\s+in\s+(.+)/);
 
-        const originalChildren = compile.children;
-        compile.children = false;
+            if (!match)
+            {
+                onetype.Error(400, 'Invalid ot-for syntax. Expected: "item in items".');
+                return;
+            }
 
-        const forName = match[1];
-        const forIndex = match[2] || forName + '_index';
-        const forExpression = match[3];
+            const originalChildren = compile.children;
+            compile.children = false;
 
-        try
-        {
-            let items = onetype.Function(forExpression, compile.data, false);
+            const forName = match[1];
+            const forIndex = match[2] || forName + '_index';
+            const forExpression = match[3];
 
-            if (!Array.isArray(items) && items && typeof items === 'object')
+            try
             {
-                if (items[Symbol.iterator])
+                let items = onetype.Function(forExpression, compile.data, false);
+
+                if (!Array.isArray(items) && items && typeof items === 'object')
                 {
-                    items = Array.from(items);
+                    if (items[Symbol.iterator])
+                    {
+                        items = Array.from(items);
+                    }
+                    else
+                    {
+                        items = Object.entries(items);
+                    }
                 }
-                else
+                else if (!Array.isArray(items))
                 {
-                    items = Object.entries(items);
+                    throw onetype.Error(400, 'ot-for expects an array or iterable.');
                 }
-            }
-            else if (!Array.isArray(items))
-            {
-                throw onetype.Error(400, 'ot-for expects an array or iterable.');
-            }
-
-            const html = node.outerHTML;
-            const fragment = document.createDocumentFragment();
-
-            items.forEach((value, index) =>
-            {
-                const loopData = Object.assign({}, compile.data);
-                loopData[forName] = value;
-                loopData[forIndex] = index;
 
-                const compiled = item.Compile(html, loopData);
-                const key = onetype.GenerateHash(index + ':' + (typeof value === 'object' ? JSON.stringify(value) : String(value)));
+                const html = node.outerHTML;
+                const fragment = document.createDocumentFragment();
 
-                while(compiled.element.firstChild)
+                items.forEach((value, index) =>
                 {
-                    const child = compiled.element.firstChild;
+                    const loopData = Object.assign({}, compile.data);
+                    loopData[forName] = value;
+                    loopData[forIndex] = index;
+
+                    const compiled = item.Compile(html, loopData);
+                    const key = onetype.GenerateHash(index + ':' + (typeof value === 'object' ? JSON.stringify(value) : String(value)));
 
-                    if(child.nodeType === Node.ELEMENT_NODE)
+                    while(compiled.element.firstChild)
                     {
-                        child.setAttribute('ot-key', key);
-                    }
+                        const child = compiled.element.firstChild;
 
-                    fragment.appendChild(child);
-                }
-            });
+                        if(child.nodeType === Node.ELEMENT_NODE)
+                        {
+                            child.setAttribute('ot-key', key);
+                        }
 
-            node.before(fragment);
-            node.remove();
-        }
-        catch (error)
-        {
-            onetype.Error(500, 'Error in ot-for directive.');
-        }
-        finally
-        {
-            compile.children = originalChildren;
+                        fragment.appendChild(child);
+                    }
+                });
+
+                node.before(fragment);
+                node.remove();
+            }
+            catch (error)
+            {
+                onetype.Error(500, 'Error in ot-for directive.');
+            }
+            finally
+            {
+                compile.children = originalChildren;
+            }
         }
-    }
+    });
 });

package/addons/render/directives/front/items/self/2000-base.js

@@ -1,45 +1,48 @@
-directives.ItemAdd({
-	id: 'ot-base',
-	trigger: 'after',
-	order: 2000,
-	code: function(data, item, compile, node)
-	{
-		const base = onetype.Base();
-
-		if(!base)
+onetype.AddonReady('directives', function(directives)
+{
+	directives.ItemAdd({
+		id: 'ot-base',
+		trigger: 'after',
+		order: 2000,
+		code: function(data, item, compile, node)
 		{
-			return;
-		}
+			const base = onetype.Base();
 
-		const walk = (parent) =>
-		{
-			for(let i = 0; i < parent.childNodes.length; i++)
+			if(!base)
 			{
-				const child = parent.childNodes[i];
+				return;
+			}
 
-				if(child.nodeType !== 1)
+			const walk = (parent) =>
+			{
+				for(let i = 0; i < parent.childNodes.length; i++)
 				{
-					continue;
-				}
+					const child = parent.childNodes[i];
 
-				if(child.tagName === 'A')
-				{
-					const href = child.getAttribute('href');
+					if(child.nodeType !== 1)
+					{
+						continue;
+					}
 
-					if(href && href.startsWith('/') && !child.__base)
+					if(child.tagName === 'A')
 					{
-						child.setAttribute('href', base + href);
-						child.__base = base;
+						const href = child.getAttribute('href');
+
+						if(href && href.startsWith('/') && !child.__base)
+						{
+							child.setAttribute('href', base + href);
+							child.__base = base;
+						}
 					}
-				}
 
-				if(child.childNodes.length)
-				{
-					walk(child);
+					if(child.childNodes.length)
+					{
+						walk(child);
+					}
 				}
-			}
-		};
+			};
 
-		walk(node);
-	}
-});
+			walk(node);
+		}
+	});
+});

package/addons/render/directives/front/items/self/500-click-outside.js

@@ -1,45 +1,48 @@
-onetype.AddonReady('directives', function()
+onetype.AddonReady('directives', function(directives)
 {
-	const tracked = new Set();
-
-	document.addEventListener('click', function(event)
+	onetype.AddonReady('directives', function()
 	{
-		tracked.forEach((entry) =>
+		const tracked = new Set();
+
+		document.addEventListener('click', function(event)
 		{
-			if(!document.contains(entry.element))
+			tracked.forEach((entry) =>
 			{
-				tracked.delete(entry);
-				return;
-			}
+				if(!document.contains(entry.element))
+				{
+					tracked.delete(entry);
+					return;
+				}
 
-			if(!entry.element.contains(event.target) && entry.element !== event.target)
-			{
-				entry.handler(event);
-			}
+				if(!entry.element.contains(event.target) && entry.element !== event.target)
+				{
+					entry.handler(event);
+				}
+			});
 		});
-	});
-
-	directives.ItemAdd({
-		id: 'ot-click-outside',
-		trigger: 'node',
-		order: 500,
-		attributes: { 'ot-click-outside': ['string'] },
-		code: function(data, item, compile, node)
-		{
-			const attribute = data['ot-click-outside'].value;
 
-			tracked.add({
-				element: node,
-				handler: (event) =>
-				{
-					const result = onetype.Function(attribute, compile.data, false);
+		directives.ItemAdd({
+			id: 'ot-click-outside',
+			trigger: 'node',
+			order: 500,
+			attributes: { 'ot-click-outside': ['string'] },
+			code: function(data, item, compile, node)
+			{
+				const attribute = data['ot-click-outside'].value;
 
-					if(typeof result === 'function')
+				tracked.add({
+					element: node,
+					handler: (event) =>
 					{
-						result({ event });
+						const result = onetype.Function(attribute, compile.data, false);
+
+						if(typeof result === 'function')
+						{
+							result({ event });
+						}
 					}
-				}
-			});
-		}
+				});
+			}
+		});
 	});
-});
+});

package/addons/render/directives/front/items/self/500-events.js

@@ -1,4 +1,4 @@
-onetype.AddonReady('directives', function()
+onetype.AddonReady('directives', function(directives)
 {
 	const register = (config) =>
 	{

package/addons/render/directives/front/items/self/500-mouse-enter.js

@@ -1,4 +1,4 @@
-onetype.AddonReady('directives', function()
+onetype.AddonReady('directives', function(directives)
 {
 	directives.ItemAdd({
 		id: 'ot-mouse-enter',

package/addons/render/directives/front/items/self/500-mouse-leave.js

@@ -1,4 +1,4 @@
-onetype.AddonReady('directives', function()
+onetype.AddonReady('directives', function(directives)
 {
 	directives.ItemAdd({
 		id: 'ot-mouse-leave',