@onetype/framework 2.0.42 → 2.0.44

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

@@ -1,3 +1,5 @@
+import onetype from '#framework/load.js';
+
 const RenderProcess =
 {
     Process()
@@ -19,6 +21,8 @@ const RenderProcess =
             this.EventEmit('compile', compiled, false);
 
             this.Element = compiled.element;
+            this.Element.__add = () => this.EventEmit('mount');
+            this.Element.__remove = () => this.Destroy();
             this.Nodes = compiled.nodes;
             this.Time = compiled.time;
 
@@ -68,7 +72,7 @@ const RenderProcess =
             {
                 if(typeof resolved !== 'string')
                 {
-                    throw new Error('Render function must return a string');
+                    throw onetype.Error(400, 'Render function must return a string.');
                 }
 
                 this.Html = resolved;
@@ -80,7 +84,7 @@ const RenderProcess =
 
         if(typeof html !== 'string')
         {
-            throw new Error('Render function must return a string');
+            throw onetype.Error(400, 'Render function must return a string.');
         }
 
         return html;
@@ -91,7 +95,7 @@ const RenderProcess =
         const html = `
             <div class="ot-render-error" style="padding: 20px; background: rgb(255 0 0 / 10%); border: 1px solid rgb(255 0 0 / 20%); border-radius: 4px; color: #FF0000; font-family: monospace;">
                 <strong>Render Error | Name: ${this.GetName()} | Addon: ${this.GetAddon().GetName()} </strong><br>
-                ${this.GetOneType().StringSanitize(message)}
+                ${onetype.StringSanitize(message)}
             </div>
         `;
         

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

@@ -1,8 +1,10 @@
+import onetype from '#framework/load.js';
+
 const RenderSet =
 {
     SetData(data)
     {
-        this.Data = Object.assign({ state: this.GetOneType().StateGet() }, data);
+        this.Data = Object.assign({ state: onetype.StateGet() }, data);
         return this;
     },
 

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

@@ -28,10 +28,8 @@ const AddonFields =
         {
             if(!(name in this.items.map))
             {
-                this.items.map = {};
+                this.items.map[name] = {};
             }
-
-            this.items.map[name] = {};
         }
 
         if(define !== null) { this.fields.data[name].define = define; }
@@ -41,7 +39,7 @@ const AddonFields =
         if(callback)
         {
             this.fields.callbacks.add.forEach(callback => callback.call(this, this.fields.data[name]));
-            this.onetype.Emit('addon.field.add', this, this.fields.data[name]);
+            this.onetype.Emit('@addon.field.add', this, this.fields.data[name]);
         }
 
         return this.fields.data[name];
@@ -62,7 +60,7 @@ const AddonFields =
         if(callback)
         {
             this.fields.callbacks.remove.forEach(callback => callback.call(this, this.fields.data[name]));
-            this.onetype.Emit('addon.field.remove', this, this.fields.data[name]);
+            this.onetype.Emit('@addon.field.remove', this, this.fields.data[name]);
         }
 
         delete this.fields.data[name];
@@ -72,7 +70,7 @@ const AddonFields =
     {
         if(!(type in this.fields.callbacks))
         {
-            this.LogWarn('Field catcher not found.', {name});
+            this.onetype.Error(400, 'Field catcher not found.', {name});
             return this;
         }
 

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

@@ -12,7 +12,7 @@ const AddonFunctions =
 
         if (typeof callback !== 'function')
         {
-            this.onetype.LogWarn('Function "' + name + '" callback is not a function.');
+            this.onetype.Error(400, 'Function :name: callback is not a function.', {name});
             return this;
         }
 
@@ -21,11 +21,11 @@ const AddonFunctions =
         try
         {
             this.functions.callbacks.add.forEach(callback => callback.call(this, this.functions.data[name]));
-            this.onetype.Emit('addon.function.add', name);
+            this.onetype.Emit('@addon.function.add', name);
         }
         catch(error)
         {
-            this.onetype.LogError('Error in function "' + name + '" callback add.', {}, error);
+            this.onetype.Error(500, 'Error in function :name: callback add.', {name});
         }
 
         return this;
@@ -45,7 +45,7 @@ const AddonFunctions =
 
         if (!fn)
         {
-            this.onetype.LogError('Function not found.', {name});
+            this.onetype.Error(404, 'Function not found.', {name});
             return null;
         }
 
@@ -57,11 +57,11 @@ const AddonFunctions =
         try
         {
             this.functions.callbacks.before.forEach(callback => callback.call(context, fn, ...data));
-            this.onetype.Emit('addon.function.before', this, fn, response, ...data);
+            this.onetype.Emit('@addon.function.before', this, fn, response, ...data);
         }
         catch(error)
         {
-            this.onetype.LogError('Error in function callback before.', {name}, error);
+            this.onetype.Error(500, 'Error in function callback before.', {name});
         }
        
         response = fn.callback.call(context, ...data);
@@ -69,11 +69,11 @@ const AddonFunctions =
         try
         {
             this.functions.callbacks.after.forEach(callback => callback.call(context, fn, response, ...data));
-            this.onetype.Emit('addon.function.after', context, fn, response, ...data);
+            this.onetype.Emit('@addon.function.after', context, fn, response, ...data);
         }
         catch(error)
         {
-            this.onetype.LogError('Error in function callback after.', {name}, error);
+            this.onetype.Error(500, 'Error in function callback after.', {name});
         }
 
         return response;
@@ -91,11 +91,11 @@ const AddonFunctions =
         try
         {
             this.functions.callbacks.remove.forEach(callback => callback.call(this, fn));
-            this.onetype.Emit('addon.function.remove', this, fn);
+            this.onetype.Emit('@addon.function.remove', this, fn);
         }
         catch(error)
         {
-            this.onetype.LogError('Error in function callback remove.', {name: fn.name}, error);
+            this.onetype.Error(500, 'Error in function callback remove.', {name: fn.name});
         }
 
         delete this.functions.data[fn.name];
@@ -107,7 +107,7 @@ const AddonFunctions =
     {
         if(!(type in this.functions.callbacks))
         {
-            return this.LogWarn('Item catcher not found.', {type});
+            return this.onetype.Error(400, 'Function catcher not found.', {type});
         }
 
         this.functions.callbacks[type].push(callback);

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

@@ -69,10 +69,18 @@ const AddonItems =
 
         item.SetData(object, false);
 
+        for(const [name, field] of Object.entries(this.fields.data))
+        {
+            if(field.map && this.items.map[name])
+            {
+                this.items.map[name][item.data[name]] = item.data.id;
+            }
+        }
+
         if(callback)
         {
-            this.items.callbacks.add.forEach(callback => callback.call(this, item));
-            this.onetype.Emit('addon.item.add', this, item);
+            this.items.callbacks.add.forEach(callback => callback(item));
+            this.onetype.Emit('@addon.item.add', item);
         }
 
         then && then(item);
@@ -84,8 +92,8 @@ const AddonItems =
 
         if(callback)
         {
-            this.items.callbacks.added.forEach(callback => callback.call(this, item));
-            this.onetype.Emit('addon.item.added', this, item);
+            this.items.callbacks.added.forEach(callback => callback(item));
+            this.onetype.Emit('@addon.item.added', item);
         }
 
         return item;
@@ -124,16 +132,16 @@ const AddonItems =
 
         if(callback)
         {
-            this.items.callbacks.remove.forEach(callback => callback.call(this, item));
-            this.onetype.Emit('addon.item.remove', this, item);
+            this.items.callbacks.remove.forEach(callback => callback(item));
+            this.onetype.Emit('@addon.item.remove', item);
         }
 
         delete this.items.data[id];
 
         if(callback)
         {
-            this.items.callbacks.removed.forEach(callback => callback.call(this, item));
-            this.onetype.Emit('addon.item.removed', this, item);
+            this.items.callbacks.removed.forEach(callback => callback(item));
+            this.onetype.Emit('@addon.item.removed', item);
         }
     },
 
@@ -157,7 +165,7 @@ const AddonItems =
     {
         if(!(type in this.items.callbacks))
         {
-            this.LogWarn('Item catcher not found for: ' + type + '.');
+            this.onetype.Error(400, 'Item catcher not found for :type:.', {type});
             return this;
         }
 

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

@@ -34,7 +34,7 @@ const AddonRender =
 
         if(!fn)
         {
-            throw new Error('Render ' + name +' doesn\'t exist.');
+            throw this.onetype.Error(404, 'Render :name: doesn\'t exist.', {name});
         }
 
         return fn.callback.call(this, data, attributes, slots, item);

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

@@ -27,7 +27,7 @@ const AddonTable =
     {
         if(type in this.table.callbacks)
         {
-            this.table.callbacks.on(type, callback);
+            this.table.callbacks[type].push(callback);
         }
     }
 };

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

@@ -8,6 +8,16 @@ class OneTypeErrorClass extends Error
         this.code = typeof code === 'number' ? code : 500;
         this.context = context && typeof context === 'object' ? context : {};
     }
+
+    toJSON()
+    {
+        return {
+            name: this.name,
+            code: this.code,
+            message: this.message,
+            context: this.context
+        };
+    }
 }
 
 export default OneTypeErrorClass;

package/lib/src/mixins/addons.js

@@ -29,11 +29,11 @@ const OneTypeAddons =
             try
             {
                 this.addons.callbacks.add.forEach(callback => callback(addon));
-                this.Emit('addon.add', addon);
+                this.Emit('@addon.add', addon);
             }
             catch(error)
             {
-                this.LogError('Error while performing addon add callback.', {addon: name}, error);
+                this.Error(500, 'Error while performing addon add callback.', {addon: name});
             }
         }
 
@@ -73,21 +73,21 @@ const OneTypeAddons =
             try
             {
                 this.addons.callbacks.remove.forEach(callback => callback(addon));
-                this.Emit('addon.remove', addon);
+                this.Emit('@addon.remove', addon);
             }
             catch(error)
             {
-                this.LogError('Error while performing addon remove callback.', {addon: name}, error);
+                this.Error(500, 'Error while performing addon remove callback.', {addon: name});
             }
         }
 
         addon.ItemsRemove(callback);
-        delete this.addons.items[name];
+        delete this.addons.data[name];
     },
 
     AddonsRemove(callback = true)
     {
-        for(let name in this.addons.items)
+        for(let name in this.addons.data)
         {
             this.AddonRemove(name, callback);
         }
@@ -97,7 +97,7 @@ const OneTypeAddons =
     {
         if(!(name in this.addons.callbacks))
         {
-            return this.LogWarn('Addon catcher not found.', {addon: name});
+            return this.Error(400, 'Addon catcher not found.', {addon: name});
         }
 
         this.addons.callbacks[name].push(callback);
@@ -117,23 +117,10 @@ const OneTypeAddons =
             return setTimeout(() => callback(addon));
         }
 
-        // let loaded = false;
-
-        // const timeout = setTimeout(() =>
-        // {
-        //     if(!loaded)
-        //     {
-        //         this.LogWarn(`Addon "${name}" might not be loaded.`);
-        //     }
-        // }, 2000);
-
         this.AddonOn('add', (addon) =>
         {
             if(addon.GetName() === name)
             {
-                // loaded = true;
-                // clearTimeout(timeout);
-
                 if(instant)
                 {
                     return callback(addon);

package/lib/src/mixins/assets.js

@@ -35,7 +35,7 @@ const OneTypeAssets =
         {
             if (!(type in schema))
             {
-                throw new Error(`Assets type '${type}' is not supported. Expected: js, css.`);
+                throw this.Error(400, 'Assets type :type: is not supported. Expected: js, css.', {type});
             }
 
             const value = config[type];

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/data.js

@@ -4,7 +4,7 @@ const OneTypeData =
     {
         if(!object || typeof object !== 'object')
         {
-            throw new Error(name + ' must be a non-null object.');
+            throw this.Error(400, ':name: must be a non-null object.', {name});
         }
 
         return object;
@@ -14,7 +14,7 @@ const OneTypeData =
     {
         if(!string || typeof string !== 'string')
         {
-            throw new Error(name + ' must be a non-empty string.');
+            throw this.Error(400, ':name: must be a non-empty string.', {name});
         }
 
         return string;
@@ -24,7 +24,7 @@ const OneTypeData =
     {
         if (depth > 10)
         {
-            throw new Error('Maximum nesting depth of 10 exceeded in data definition.');
+            throw this.Error(400, 'Maximum nesting depth of 10 exceeded in data definition.');
         }
 
         this.DataValidateObject(data, 'Data');
@@ -39,7 +39,7 @@ const OneTypeData =
             }
             catch (error)
             {
-                throw new Error(`Error in field '${key}': ${error.message}`);
+                throw this.Error(400, 'Error in field :field:.', {field: key});
             }
         }
 
@@ -68,7 +68,7 @@ const OneTypeData =
                 {
                     if(parsed.required)
                     {
-                        throw new Error('Expected ' + parsed.type + '.');
+                        throw this.Error(400, 'Expected :type:.', {type: parsed.type});
                     }
 
                     value = value === null ? null : undefined;
@@ -83,7 +83,7 @@ const OneTypeData =
                 {
                     if(!parsed.options.includes(values[i]))
                     {
-                        throw new Error('Expected one of: ' + parsed.options.join(', ') + '.');
+                        throw this.Error(400, 'Expected one of :options:.', {options: parsed.options.join(', ')});
                     }
                 }
             }
@@ -100,7 +100,7 @@ const OneTypeData =
                         }
                         catch (error)
                         {
-                            throw new Error(`Error at array index ${i}: ${error.message}`);
+                            throw this.Error(400, 'Error at array index :index:.', {index: i});
                         }
                     }
                 }
@@ -124,7 +124,7 @@ const OneTypeData =
                 throw error;
             }
 
-            throw new Error(`Data validation error: ${error.message}`);
+            throw this.Error(400, 'Data validation error.');
         }
     },
 
@@ -196,7 +196,7 @@ const OneTypeData =
             }
             catch (error)
             {
-                throw new Error(`Error in field '${key}': ${error.message}`);
+                throw this.Error(400, 'Error in field :field:.', {field: key});
             }
         }
 
@@ -240,7 +240,7 @@ const OneTypeData =
 
         if(typeof parsed.type !== 'string')
         {
-            throw new Error('Type property is missing in config object.');
+            throw this.Error(400, 'Type property is missing in config object.');
         }
 
         parsed.type = parsed.type.toLowerCase();
@@ -260,7 +260,7 @@ const OneTypeData =
                 }
                 catch (error)
                 {
-                    throw new Error(`Error in field '${configKey}': ${error.message}`);
+                    throw this.Error(400, 'Error in field :field:.', {field: configKey});
                 }
             }
         }
@@ -269,7 +269,7 @@ const OneTypeData =
         {
             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.');
+                throw this.Error(400, 'Invalid config type. Expected number, string, boolean, object, array, function or binary.');
             }
         })
 
@@ -290,7 +290,7 @@ const OneTypeData =
 
     DataSchema(name, config = null)
     {
-        this.DataValidateString(name, 'Schema ');
+        this.DataValidateString(name, 'Schema');
 
         const command = this.GenerateCommand(name);
 
@@ -301,7 +301,7 @@ const OneTypeData =
         {
             if(!(name in this.data.schemas))
             {
-                throw new Error('Schema ' + name + ' doesn\'t exist.');
+                throw this.Error(400, 'Schema :name: doesn\'t exist.', {name});
             }
 
             const schema = this.DataConfig(structuredClone(this.data.schemas[name]));

package/lib/src/mixins/dependencies.js

@@ -39,11 +39,11 @@ const OneTypeDependencies =
             try
             {
                 this.dependencies.callbacks.add.forEach(callback => callback(dependency));
-                this.Emit('dependency.add', dependency);
+                this.Emit('@dependency.add', dependency);
             }
             catch(error)
             {
-                this.LogError('Error while performing dependency add callback.', {name}, error);
+                this.Error(500, 'Error while performing dependency add callback.', {name});
             }
         }
 
@@ -70,11 +70,11 @@ const OneTypeDependencies =
             try
             {
                 this.dependencies.callbacks.remove.forEach(callback => callback(dependency));
-                this.Emit('dependency.remove', dependency);
+                this.Emit('@dependency.remove', dependency);
             }
             catch(error)
             {
-                this.LogError('Error while performing dependency remove callback.', {name}, error);
+                this.Error(500, 'Error while performing dependency remove callback.', {name});
             }
         }
 
@@ -86,7 +86,7 @@ const OneTypeDependencies =
     {
         if(!(type in this.dependencies.callbacks))
         {
-            this.LogWarn('Field catcher not found.', {type});
+            this.Error(400, 'Dependency catcher not found.', {type});
             return this;
         }