@onetype/framework 2.0.41 → 2.0.43

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/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;
         }