@onetype/framework 2.0.49 → 2.0.52

package/addons/render/elements/front/items/self/form/field/field.css

@@ -13,7 +13,7 @@
 	display: flex;
 	align-items: flex-start;
 	gap: var(--ot-spacing-l);
-	padding: var(--ot-spacing-m);
+	padding: calc(var(--ot-spacing-m) * 1.3) var(--ot-spacing-m);
 	width: 100%;
 }
 
@@ -52,12 +52,26 @@
 	flex: 1;
 	min-width: 200px;
 	max-width: 420px;
+	display: flex;
+	justify-content: flex-end;
+	width: inherit;
 }
 
-/* Border variant */
 
-.e-2109a6b9 > .holder.border-bottom { border-bottom: 1px solid var(--ot-bg-2-border); }
-.e-2109a6b9:last-child > .holder.border-bottom { border-bottom: none; }
+/* Position bottom */
+
+.e-2109a6b9 > .holder.bottom
+{
+	flex-direction: column;
+	gap: var(--ot-spacing-m);
+}
+
+.e-2109a6b9 > .holder.bottom > .input
+{
+	min-width: 0;
+	max-width: none;
+	width: 100%;
+}
 
 /* Size variants */
 

package/addons/render/elements/front/items/self/form/field/field.js

@@ -16,6 +16,11 @@ onetype.AddonReady('elements', (elements) =>
 				type: 'string',
 				value: ''
 			},
+			position: {
+				type: 'string',
+				value: 'right',
+				options: ['right', 'bottom']
+			},
 			variant: {
 				type: 'array',
 				value: [],
@@ -25,7 +30,7 @@ onetype.AddonReady('elements', (elements) =>
 		render: function()
 		{
 			return `
-				<div :class="'holder ' + variant.join(' ')">
+				<div :class="'holder ' + position + ' ' + variant.join(' ')">
 					<div class="info">
 						<label ot-if="label" class="label">{{ label }}</label>
 						<p ot-if="description" class="description">{{ description }}</p>

package/addons/render/elements/front/items/self/form/section/section.js

@@ -24,9 +24,11 @@ onetype.AddonReady('elements', (elements) =>
 		},
 		render: function()
 		{
+			this.hasHeader = !!this.title || !!this.description;
+
 			return `
 				<div :class="'holder ' + variant.join(' ')">
-					<div class="header">
+					<div ot-if="hasHeader" class="header">
 						<h3 ot-if="title" class="title">{{ title }}</h3>
 						<p ot-if="description" class="description">{{ description }}</p>
 					</div>

package/addons/render/elements/front/items/self/navigation/tabs/tabs.css

@@ -61,6 +61,11 @@
 
 /* Size variants */
 
-.e-1a8b6ac1 > .holder.size-s > .tab { padding: var(--ot-spacing-x) var(--ot-spacing-s); font-size: var(--ot-size-s); }
-.e-1a8b6ac1 > .holder.size-m > .tab { padding: var(--ot-spacing-s) var(--ot-spacing-m); font-size: var(--ot-size-m); }
-.e-1a8b6ac1 > .holder.size-l > .tab { padding: var(--ot-spacing-m) var(--ot-spacing-l); font-size: var(--ot-size-m); }
+.e-1a8b6ac1 > .holder.size-s { height: var(--ot-height-s); }
+.e-1a8b6ac1 > .holder.size-s > .tab { height: 100%; padding: 0 var(--ot-spacing-s); font-size: var(--ot-size-s); }
+
+.e-1a8b6ac1 > .holder.size-m { height: var(--ot-height-m); }
+.e-1a8b6ac1 > .holder.size-m > .tab { height: 100%; padding: 0 var(--ot-spacing-m); font-size: var(--ot-size-m); }
+
+.e-1a8b6ac1 > .holder.size-l { height: var(--ot-height-l); }
+.e-1a8b6ac1 > .holder.size-l > .tab { height: 100%; padding: 0 var(--ot-spacing-l); font-size: var(--ot-size-m); }

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

@@ -2,7 +2,7 @@ import onetype from '#framework/load.js';
 
 const pages = onetype.Addon('pages', (addon) =>
 {
-	addon.Field('id', ['string']);
+	addon.Field('id', ['string|number']);
 	addon.Field('route', ['string|array'], null, (value) =>
 	{
 		const base = onetype.Base();

package/addons/render/pages/front/items/directives/change.js

@@ -8,7 +8,7 @@ onetype.AddonReady('directives', function(directives)
 		category: 'navigation',
 		trigger: 'node',
 		order: 666,
-		strict: false,
+		strict: true,
 		tag: 'ot-page',
 		attributes: {
 			'route': ['string', null, true],

package/addons/render/pages/front/styles/page.css

@@ -14,15 +14,8 @@
 {
 	position: relative;
 	overflow: auto;
-	scrollbar-width: thin;
-	scrollbar-color: var(--ot-bg-4) var(--ot-bg-1);
 }
 
-.ot-page-area::-webkit-scrollbar { width: 8px; height: 8px; }
-.ot-page-area::-webkit-scrollbar-track { background: var(--ot-bg-1); }
-.ot-page-area::-webkit-scrollbar-thumb { background: var(--ot-bg-4); border-radius: 4px; }
-.ot-page-area::-webkit-scrollbar-thumb:hover { background: var(--ot-bg-4-hover); }
-
 .ot-page-area > div
 {
 	height: 100%;

package/addons/render/transforms/js/functions/data.js

@@ -8,9 +8,28 @@ transforms.Fn('data', function(config, node)
 
         const attribute = 'ot-' + name;
         const raw = node.getAttribute(attribute);
-        const value = raw !== null ? onetype.Function(raw, {}, false) : undefined;
+        let value = raw;
 
-        data[name] = onetype.DataDefineOne(typeof value === 'undefined' ? raw : value, definition);
+        if(raw !== null)
+        {
+            const type = Array.isArray(definition) ? definition[0] : (definition && definition.type);
+
+            if(type !== 'string')
+            {
+                try
+                {
+                    const evaluated = onetype.Function(raw, {}, false);
+
+                    if(evaluated !== undefined)
+                    {
+                        value = evaluated;
+                    }
+                }
+                catch(e) {}
+            }
+        }
+
+        data[name] = onetype.DataDefineOne(value, definition);
 
         if(raw !== null)
         {

package/lib/src/classes/addon/class.js

@@ -4,8 +4,6 @@ import AddonFields from './mixins/fields.js';
 import AddonItems from './mixins/items.js';
 import AddonRemove from './mixins/remove.js';
 import AddonFunctions from './mixins/functions.js';
-import AddonTable from './mixins/table.js';
-import AddonFind from './mixins/find.js';
 import AddonRender from './mixins/render.js';
 
 class OneTypeAddon
@@ -17,18 +15,6 @@ class OneTypeAddon
 
         this.store = {};
 
-        this.table =
-        {
-            name: null,
-            callbacks:
-            {
-                get: [],
-                create: [],
-                update: [],
-                delete: []
-            }
-        };
-
         this.fields =
         {
             data: {},
@@ -76,8 +62,6 @@ Object.assign(OneTypeAddon.prototype, AddonFields);
 Object.assign(OneTypeAddon.prototype, AddonItems);
 Object.assign(OneTypeAddon.prototype, AddonRemove);
 Object.assign(OneTypeAddon.prototype, AddonFunctions);
-Object.assign(OneTypeAddon.prototype, AddonTable);
-Object.assign(OneTypeAddon.prototype, AddonFind);
 Object.assign(OneTypeAddon.prototype, AddonRender);
 
 export default OneTypeAddon;

package/lib/src/classes/addon/classes/item/class.js

@@ -2,7 +2,6 @@ import AddonItemGet from './mixins/get.js';
 import AddonItemSet from './mixins/set.js';
 import AddonItemRemove from './mixins/remove.js';
 import AddonItemFunctions from './mixins/functions.js';
-import AddonItemCrud from './mixins/crud.js';
 import AddonItemStore from './mixins/store.js';
 
 class OneTypeAddonItem
@@ -19,7 +18,6 @@ Object.assign(OneTypeAddonItem.prototype, AddonItemGet);
 Object.assign(OneTypeAddonItem.prototype, AddonItemSet);
 Object.assign(OneTypeAddonItem.prototype, AddonItemRemove);
 Object.assign(OneTypeAddonItem.prototype, AddonItemFunctions);
-Object.assign(OneTypeAddonItem.prototype, AddonItemCrud);
 Object.assign(OneTypeAddonItem.prototype, AddonItemStore);
 
 export default OneTypeAddonItem;

package/lib/src/classes/addon/classes/item/mixins/get.js

@@ -34,7 +34,6 @@ const AddonItemGet =
             value = callback(value, this);
         });
 
-
         try 
         {
             if(field?.define)

package/lib/src/classes/addon/classes/render/mixins/compile.js

@@ -2,7 +2,7 @@ import onetype from '#framework/load.js';
 
 const RenderCompile =
 {
-    Compile(html, data = null)
+    Compile(html, data = null, options = {})
     {
         const element = this.DOMCreateElement(html);
 
@@ -24,7 +24,8 @@ const RenderCompile =
             nodes: {},
             time: 0,
             walk: true,
-            children: true
+            children: true,
+            locale: options.locale !== undefined ? options.locale : true
         };
 
         if(data)

package/lib/src/classes/addon/mixins/items.js

@@ -62,6 +62,8 @@ const AddonItems =
 
         let item = new OneTypeAddonItem(this, {});
 
+        this.onetype.Emit('@addon.item.init', item);
+
         if(!('id' in object))
         {
             object.id = this.items.id++;

package/lib/src/mixins/addons.js

@@ -20,6 +20,8 @@ const OneTypeAddons =
 
         const addon = new OneTypeAddon(this, name);
 
+        this.Emit('@addon.init', addon);
+
         this.addons.data[name] = addon;
 
         then && then(addon);

package/lib/src/mixins/data.js

@@ -39,7 +39,8 @@ const OneTypeData =
             }
             catch (error)
             {
-                throw this.Error(400, 'Error in field :field:.', {field: key});
+                error.path = [key].concat(error.path || []);
+                throw error;
             }
         }
 
@@ -68,7 +69,11 @@ const OneTypeData =
                 {
                     if(parsed.required)
                     {
-                        throw this.Error(400, 'Expected :type:.', {type: parsed.type});
+                        throw this.Error(400, 'Expected :type:, got :got:.', {
+                            type: parsed.type,
+                            got: value === null ? 'null' : (value === undefined ? 'undefined' : (Array.isArray(value) ? 'array' : typeof value)),
+                            value: value
+                        });
                     }
 
                     value = value === null ? null : undefined;
@@ -100,7 +105,8 @@ const OneTypeData =
                         }
                         catch (error)
                         {
-                            throw this.Error(400, 'Error at array index :index:.', {index: i});
+                            error.path = ['[' + i + ']'].concat(error.path || []);
+                            throw error;
                         }
                     }
                 }
@@ -119,12 +125,7 @@ const OneTypeData =
         }
         catch (error)
         {
-            if (error.message.includes('Error at') || error.message.includes('Error in field'))
-            {
-                throw error;
-            }
-
-            throw this.Error(400, 'Data validation error.');
+            throw error;
         }
     },
 

package/lib/src/mixins/emitter.js

@@ -25,7 +25,11 @@ const OneTypeEmitter =
             }
             catch(error)
             {
-                this.Error(500, 'Error in emitter callback.', {name});
+                this.Error(500, 'Error in emitter callback :name: — :reason:', {
+                    name,
+                    reason: error.message,
+                    stack: error.stack
+                });
             }
         }
 

package/lib/src/mixins/form.js

@@ -50,14 +50,18 @@ const OneTypeForm =
                 if(input.type === 'checkbox')
                 {
                     input.checked = !!value;
+                    input.dispatchEvent(new Event('change', { bubbles: true }));
                 }
                 else if(input.type === 'radio')
                 {
                     input.checked = input.value === value;
+                    input.dispatchEvent(new Event('change', { bubbles: true }));
                 }
                 else
                 {
                     input.value = value;
+                    input.dispatchEvent(new Event('input', { bubbles: true }));
+                    input.dispatchEvent(new Event('change', { bubbles: true }));
                 }
             });
         });

package/lib/src/mixins/function.js

@@ -27,7 +27,12 @@ const OneTypeFunction =
         }
         catch (error)
         {
-            this.Error(500, 'Function error on :expression:.', {expression});
+            this.Error(500, 'Function error on :expression: — :reason:', {
+                expression,
+                reason: error.message,
+                data: Object.keys(data),
+                stack: error.stack
+            });
             return undefined;
         }
     },

package/lib/src/mixins/language.js

@@ -0,0 +1,55 @@
+const OneTypeLanguage =
+{
+	Language(value)
+	{
+		if(typeof value === 'undefined')
+		{
+			return this.LanguageGet();
+		}
+
+		this.LanguageSet(value);
+	},
+
+	LanguageGet()
+	{
+		return this.StateGet('language', 'EN');
+	},
+
+	LanguageSet(value)
+	{
+		this.LanguageValidate(value);
+		this.StateSet('language', value);
+	},
+
+	Languages(value)
+	{
+		if(typeof value === 'undefined')
+		{
+			return this.LanguagesGet();
+		}
+
+		this.LanguagesSet(value);
+	},
+
+	LanguagesGet()
+	{
+		return this.StateGet('languages', []);
+	},
+
+	LanguagesSet(value)
+	{
+		this.StateSet('languages', value);
+	},
+
+	LanguageValidate(code)
+	{
+		if(typeof code !== 'string' || !/^[A-Z]{2}$/.test(code))
+		{
+			throw this.Error(400, 'Language must be a 2-letter uppercase code, received: :code:.', {code});
+		}
+
+		return code;
+	}
+};
+
+export default OneTypeLanguage;

package/lib/src/mixins/locale.js

@@ -0,0 +1,49 @@
+const OneTypeLocale =
+{
+	LocaleGet(text, key = null)
+	{
+		const language = this.Language();
+		const hash = this.GenerateHash(key ? key + ':' + text : text);
+		const locales = this.LocalesGet(language);
+
+		if(hash in locales)
+		{
+			return locales[hash];
+		}
+
+		this.LocaleSet(text, key);
+
+		return text;
+	},
+
+	LocaleSet(text, key = null)
+	{
+		const language = this.Language();
+		const hash = this.GenerateHash(key ? key + ':' + text : text);
+		const locales = this.LocalesGet(language);
+
+		locales[hash] = text;
+		this.LocalesSet(language, locales);
+	},
+
+	LocalesGet(language)
+	{
+		const locales = this.StateGet('locales', {});
+
+		if(language in locales)
+		{
+			return locales[language]
+		}
+
+		return {};
+	},
+
+	LocalesSet(language, values)
+	{
+		const locales = this.StateGet('locales', {});
+		locales[language] = values;
+		this.StateSet('locales', locales);
+	}
+};
+
+export default OneTypeLocale;

package/lib/src/onetype.js

@@ -6,7 +6,6 @@ import OneTypeBinaries from './mixins/binaries.js';
 import OneTypeString from './mixins/string.js';
 import OneTypeEmitter from './mixins/emitter.js';
 import OneTypeMiddleware from './mixins/middleware.js';
-import OneTypeDependencies from './mixins/dependencies.js';
 import OneTypeFunction from './mixins/function.js';
 import OneTypeOverrides from './mixins/overrides.js';
 import OneTypeDOM from './mixins/dom.js';
@@ -22,6 +21,8 @@ import OneTypeAssets from './mixins/assets.js';
 import OneTypeObserver from './mixins/observer.js';
 import OneTypeMarkdown from './mixins/markdown.js';
 import OneTypeBase from './mixins/base.js';
+import OneTypeLanguage from './mixins/language.js';
+import OneTypeLocale from './mixins/locale.js';
 
 class OneType
 {
@@ -41,14 +42,6 @@ class OneType
             }
         };
 
-        this.dependencies = {
-            items: {},
-            callbacks: {
-                add: [],
-                remove: []
-            }
-        };
-
         this.data =
         {
             schemas: {},
@@ -59,7 +52,8 @@ class OneType
         this.$ot =
         {
             get: (key, value = undefined) => this.StateGet(key, undefined),
-            set: (key, value) => this.StateSet(key, value)
+            set: (key, value) => this.StateSet(key, value),
+            t: (text, key) => this.LocaleGet(text, key)
         };
 
         this.ObserverStart();
@@ -74,7 +68,6 @@ Object.assign(OneType.prototype, OneTypeData);
 Object.assign(OneType.prototype, OneTypeBinaries);
 Object.assign(OneType.prototype, OneTypeString);
 Object.assign(OneType.prototype, OneTypeMiddleware);
-Object.assign(OneType.prototype, OneTypeDependencies);
 Object.assign(OneType.prototype, OneTypeFunction);
 Object.assign(OneType.prototype, OneTypeOverrides);
 Object.assign(OneType.prototype, OneTypeDOM);
@@ -90,5 +83,7 @@ Object.assign(OneType.prototype, OneTypeAssets);
 Object.assign(OneType.prototype, OneTypeObserver);
 Object.assign(OneType.prototype, OneTypeMarkdown);
 Object.assign(OneType.prototype, OneTypeBase);
+Object.assign(OneType.prototype, OneTypeLanguage);
+Object.assign(OneType.prototype, OneTypeLocale);
 
 export default OneType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@onetype/framework",
-    "version": "2.0.49",
+    "version": "2.0.52",
     "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/core/database/back/events/addon.add.js

@@ -1,18 +0,0 @@
-import onetype from '#framework/load.js';
-
-onetype.EmitOn('@addon.add', (addon) =>
-{
-    addon.expose = null;
-
-    addon.Expose = function(config)
-    {
-        config = onetype.DataDefine(config, {
-            filter: ['array', []],
-            sort: ['array', []],
-            select: ['array', []],
-            callback: ['function']
-        });
-
-        addon.expose = config;
-    };
-});

package/addons/core/database/back/events/middleware/addon.items.find.js

@@ -1,24 +0,0 @@
-import onetype from '#framework/load.js';
-import database from '#database/addon.js';
-
-onetype.MiddlewareIntercept('addon.items.find', (middleware) =>
-{
-    let { addon, table, connection } = middleware.value;
-
-    if(!table.name)
-    {
-        throw onetype.Error(400, 'Addon must have table name set.');
-    }
-
-    if(typeof connection === 'string')
-    {
-        connection = database.ItemGet(connection)?.Get('connection');
-    }
-
-    if(!connection)
-    {
-        throw onetype.Error(500, 'Database connection is not present.');
-    }
-
-    middleware.value.response = database.Fn('find', connection, table, addon);
-});

package/addons/core/database/back/events/middleware/item.crud.create.js

@@ -1,24 +0,0 @@
-import onetype from '#framework/load.js';
-import database from '#database/addon.js';
-
-onetype.MiddlewareIntercept('item.crud.create', async (middleware) =>
-{
-    let { item, table, connection } = middleware.value;
-
-    if(!table.name)
-    {
-        throw onetype.Error(400, 'Addon must have table name set.');
-    }
-
-    if(typeof connection === 'string')
-    {
-        connection = database.ItemGet(connection)?.Get('connection');
-    }
-
-    if(!connection)
-    {
-        throw onetype.Error(500, 'Database connection is not present.');
-    }
-
-    middleware.value.response = database.Fn('create', connection, table, item);
-});

package/addons/core/database/back/events/middleware/item.crud.delete.js

@@ -1,24 +0,0 @@
-import onetype from '#framework/load.js';
-import database from '#database/addon.js';
-
-onetype.MiddlewareIntercept('item.crud.delete', async (middleware) =>
-{
-    let { item, table, connection } = middleware.value;
-
-    if(!table.name)
-    {
-        throw onetype.Error(400, 'Addon must have table name set.');
-    }
-
-    if(typeof connection === 'string')
-    {
-        connection = database.ItemGet(connection)?.Get('connection');
-    }
-
-    if(!connection)
-    {
-        throw onetype.Error(500, 'Database connection is not present.');
-    }
-
-    middleware.value.response = database.Fn('delete', connection, table, item);
-});

package/addons/core/database/back/events/middleware/item.crud.update.js

@@ -1,24 +0,0 @@
-import onetype from '#framework/load.js';
-import database from '#database/addon.js';
-
-onetype.MiddlewareIntercept('item.crud.update', async (middleware) =>
-{
-    let { item, table, connection } = middleware.value;
-
-    if(!table.name)
-    {
-        throw onetype.Error(400, 'Addon must have table name set.');
-    }
-
-    if(typeof connection === 'string')
-    {
-        connection = database.ItemGet(connection)?.Get('connection');
-    }
-
-    if(!connection)
-    {
-        throw onetype.Error(500, 'Database connection is not present.');
-    }
-
-    middleware.value.response = database.Fn('update', connection, table, item);
-});

package/addons/core/database/back/functions/create.js

@@ -1,6 +0,0 @@
-import database from '#database/addon.js';
-
-database.Fn('create', async function(connection, table, item)
-{
-    return database.Fn('item.create', item, item.addon, connection);
-});

package/addons/core/database/back/functions/delete.js

@@ -1,6 +0,0 @@
-import database from '#database/addon.js';
-
-database.Fn('delete', async function(connection, table, item)
-{
-    return database.Fn('item.delete', item, connection);
-});