@onetype/framework 2.0.43 → 2.0.44

package/addons/core/assets/back/items/html/css.js

@@ -10,7 +10,7 @@ onetype.AddonReady('html', (html) =>
         order: 90,
         attributes: {
             rel: 'stylesheet',
-            href: onetype.StateGet('base', '') + '/assets/build.css?v=18'
+            href: onetype.Base() + '/assets/build.css?v=18'
         }
     });
 });

package/addons/core/assets/back/items/html/js.js

@@ -9,7 +9,7 @@ onetype.AddonReady('html', (html) =>
         position: 'head',
         order: 90,
         attributes: {
-            src: onetype.StateGet('base', '') + '/assets/build.js?v=18',
+            src: onetype.Base() + '/assets/build.js?v=18',
             defer: null
         }
     });

package/addons/core/commands/core/addon.js

@@ -23,9 +23,7 @@ const commands = onetype.Addon('commands', (addon) =>
             return null;
         }
 
-        const base = onetype.StateGet('base', '');
-
-        return base + '/' + value.replace(/^\/+/, '').replace(/\/+/g, '/').toLowerCase();
+        return onetype.Base() + '/' + value.replace(/^\/+/, '').replace(/\/+/g, '/').toLowerCase();
     });
 });
 

package/addons/render/directives/front/functions/process/match.js

@@ -34,9 +34,14 @@ directives.Fn('process.match', function(d, node)
         }
     });
 
+    if(matches.total === 0 && d.trigger !== 'node')
+    {
+        return true;
+    }
+
     if(d.strict)
     {
-        return matches.count === matches.total && matches.total > 0;
+        return matches.count === matches.total;
     }
 
     return matches.count > 0;

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

@@ -0,0 +1,45 @@
+directives.ItemAdd({
+	id: 'ot-base',
+	trigger: 'after',
+	order: 2000,
+	code: function(data, item, compile, node)
+	{
+		const base = onetype.Base();
+
+		if(!base)
+		{
+			return;
+		}
+
+		const walk = (parent) =>
+		{
+			for(let i = 0; i < parent.childNodes.length; i++)
+			{
+				const child = parent.childNodes[i];
+
+				if(child.nodeType !== 1)
+				{
+					continue;
+				}
+
+				if(child.tagName === 'A')
+				{
+					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);
+				}
+			}
+		};
+
+		walk(node);
+	}
+});

package/addons/render/directives/front/items/self/{node.js → 750-node.js}

@@ -6,7 +6,7 @@ onetype.AddonReady('directives', function()
 		name: 'Node Mount',
 		description: 'Mount a DOM node into the element.',
 		trigger: 'node',
-		order: 50,
+		order: 750,
 		strict: false,
 		attributes: {
 			'ot-node': ['string', null, true]

package/addons/render/html/load.js

@@ -21,6 +21,5 @@ import '#html/items/fonts/outfit.js';
 
 /* Essential Items - SEO */
 import '#html/items/seo/robots.js';
-import '#html/items/seo/theme-color.js';
 
 export default html;

package/addons/render/pages/core/addon.js

@@ -3,7 +3,22 @@ import onetype from '#framework/load.js';
 const pages = onetype.Addon('pages', (addon) =>
 {
 	addon.Field('id', ['string']);
-	addon.Field('route', ['string|array']);
+	addon.Field('route', ['string|array'], null, (value) =>
+	{
+		const base = onetype.Base();
+
+		if(!base)
+		{
+			return value;
+		}
+
+		if(Array.isArray(value))
+		{
+			return value.map(route => base + route);
+		}
+
+		return base + value;
+	});
 	addon.Field('title', ['string|function']);
 	addon.Field('meta', ['object', {}]);
 	addon.Field('data', ['function']);

package/addons/render/pages/front/events/click.js

@@ -24,4 +24,4 @@ document.addEventListener('click', (e) =>
 	e.preventDefault();
 
 	pages.Fn('change', match.page.Get('id'), null, match.parameters, true, url.search);
-});
+});

package/lib/browser.js

@@ -1,2 +1,17 @@
 window.onetype = new OneType();
-window.$ot = onetype.$ot;
+window.$ot = onetype.$ot;
+
+if(onetype.Base())
+{
+    const original = window.fetch;
+
+    window.fetch = function(url, options)
+    {
+        if(typeof url === 'string' && url.startsWith('/'))
+        {
+            url = onetype.Base() + url;
+        }
+
+        return original.call(this, url, options);
+    };
+}

package/lib/src/mixins/base.js

@@ -0,0 +1,14 @@
+const OneTypeBase =
+{
+	Base(value)
+	{
+		if(typeof value === 'undefined')
+		{
+			return this.StateGet('base', '');
+		}
+
+		this.StateSet('base', value);
+	}
+};
+
+export default OneTypeBase;

package/lib/src/mixins/route.js

@@ -162,15 +162,7 @@ const OneTypeRoute =
             return '/';
         }
 
-        const base = this.StateGet('base', '');
-        let path = window.location.pathname;
-
-        if(base && path.startsWith(base))
-        {
-            path = path.slice(base.length) || '/';
-        }
-
-        return this.RouteNormalize(path);
+        return this.RouteNormalize(window.location.pathname);
     },
 
     RouteNavigate(pathname, state = {})
@@ -180,8 +172,7 @@ const OneTypeRoute =
             return;
         }
 
-        const base = this.StateGet('base', '');
-        const normalized = this.RouteNormalize(base + pathname);
+        const normalized = this.RouteNormalize(pathname);
 
         if (window.history && window.history.pushState)
         {

package/lib/src/onetype.js

@@ -21,6 +21,7 @@ import OneTypeState from './mixins/state.js';
 import OneTypeAssets from './mixins/assets.js';
 import OneTypeObserver from './mixins/observer.js';
 import OneTypeMarkdown from './mixins/markdown.js';
+import OneTypeBase from './mixins/base.js';
 
 class OneType
 {
@@ -57,7 +58,7 @@ class OneType
 
         this.$ot =
         {
-            get: (key) => this.StateGet(key),
+            get: (key, value = undefined) => this.StateGet(key, undefined),
             set: (key, value) => this.StateSet(key, value)
         };
 
@@ -88,5 +89,6 @@ Object.assign(OneType.prototype, OneTypeState);
 Object.assign(OneType.prototype, OneTypeAssets);
 Object.assign(OneType.prototype, OneTypeObserver);
 Object.assign(OneType.prototype, OneTypeMarkdown);
+Object.assign(OneType.prototype, OneTypeBase);
 
 export default OneType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@onetype/framework",
-    "version": "2.0.43",
+    "version": "2.0.44",
     "description": "OneType Framework — 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",

package/addons/render/html/items/seo/theme-color.js

@@ -1,12 +0,0 @@
-import html from '#html/addon.js';
-
-html.Item({
-    id: 'seo-theme-color',
-    tag: 'meta',
-    position: 'head',
-    priority: -20,
-    attributes: {
-        name: 'theme-color',
-        content: '#000000'
-    }
-});