alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/core/base.js

@@ -1,19 +1,18 @@
-'use strict';
 const CONDUIT = Symbol('conduit');
 
 /**
  * Alchemy's Base class
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
-var Base = Function.inherits('Informer', 'Alchemy', function Base() {});
+const Base = Function.inherits('Informer', 'Alchemy', function Base() {});
 
 /**
  * Add group support to Protoblast
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -33,7 +32,7 @@ __Protoblast.getGroup = function getGroup(name) {
 /**
  * Set basic behaviour
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.3.17
  */
@@ -204,11 +203,11 @@ Base.setStatic(function createClassTitle(suggested_root) {
 /**
  * Make this start a new group
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @param    {Boolean}   value
+ * @param    {boolean}   value
  */
 Base.setStatic(function startNewGroup(value) {
 
@@ -231,22 +230,20 @@ Base.setStatic(function startNewGroup(value) {
 /**
  * Get all the children of this class
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.0.0
+ * @version  1.4.0
  */
 Base.setStatic(function getAllChildren() {
 
-	var result = [],
-	    i;
+	let result = [];
 
 	if (!this.children) {
 		return result;
 	}
 
-	for (i = 0; i < this.children.length; i++) {
-		result.push(this.children[i]);
-		result.include(this.children[i].getAllChildren());
+	for (let child of this.children) {
+		result.push(child, ...child.getAllChildren());
 	}
 
 	return result;
@@ -255,7 +252,7 @@ Base.setStatic(function getAllChildren() {
 /**
  * Find a member of this group
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.3.0
  */
@@ -295,7 +292,7 @@ Base.setStatic(function getMember(name) {
 /**
  * Set a deprecated property
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  */
@@ -312,11 +309,11 @@ Base.setStatic(function setDeprecatedProperty(old_key, new_key) {
 /**
  * Get path to this class
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @return   {String}
+ * @return   {string}
  */
 Base.setStatic(function getClassPath() {
 
@@ -330,13 +327,13 @@ Base.setStatic(function getClassPath() {
 /**
  * Get path to this class, but after the given namespace piece
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @param    {String}   after   Only return the path after the given class
+ * @param    {string}   after   Only return the path after the given class
  *
- * @return   {String}
+ * @return   {string}
  */
 Base.setStatic(function getClassPathAfter(after) {
 
@@ -362,7 +359,7 @@ Base.setStatic(function getClassPathAfter(after) {
 /**
  * Set the 'shared group' prefix
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.0.0
  */
@@ -373,7 +370,7 @@ Base.setStatic('shared_group_prefix', '');
  * This property will not be inherited by children,
  * instead it'll always be set to false (unless overridden)
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.0.0
  */
@@ -383,7 +380,7 @@ Base.setStatic('is_abstract_class', true, false);
  * Does this class start a new group of children?
  * Like `is_abstract_class`, this does not get inherited.
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.0.0
  */
@@ -430,7 +427,7 @@ Base.setProperty(function conduit() {
 /**
  * Enable all inherited classes to get a class group
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -441,11 +438,11 @@ Base.setMethod(function getClassGroup(name) {
 /**
  * Get path to this class
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @return   {String}
+ * @return   {string}
  */
 Base.setMethod(function getClassPath() {
 	return this.constructor.getClassPath();
@@ -454,13 +451,13 @@ Base.setMethod(function getClassPath() {
 /**
  * Get path to this class
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @param    {String}   after   Only return the path after the given class
+ * @param    {string}   after   Only return the path after the given class
  *
- * @return   {String}
+ * @return   {string}
  */
 Base.setMethod(function getClassPathAfter(after) {
 	return this.constructor.getClassPathAfter(after);
@@ -473,7 +470,7 @@ Base.setMethod(function getClassPathAfter(after) {
  * @since    1.0.0
  * @version  1.3.20
  *
- * @param    {String}   name   The name of the method to call
+ * @param    {string}   name   The name of the method to call
  * @param    {Array}    args   The arguments to pass
  * @param    {Function} next   The callback to call afterwards
  */
@@ -552,7 +549,7 @@ Base.setStatic(function getClientClass() {
 /**
  * Attach a conduit to a certain instance
  * 
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
@@ -565,29 +562,35 @@ Base.setMethod(function attachConduit(conduit) {
 /**
  * Get a model, attach a conduit if possible
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.1.8
  *
- * @param   {String}   name      The name of the model to get
- * @param   {Boolean}  init      Initialize the class [true]
- * @param   {Object}   options
+ * @param    {string}   name      The name of the model to get
+ * @param    {boolean}  init      Initialize the class [true]
+ * @param    {Object}   options
  *
- * @return  {Model}
+ * @return   {Model}
  */
 Base.setMethod(function getModel(name, init, options) {
 
-	var instance;
-
 	if (typeof init != 'boolean') {
 		options = init;
 		init = true;
 	}
 
+	let constructor = Model.get(name, false);
+
+	if (!constructor) {
+		throw new Error('Model "' + name + '" could not be found');
+	}
+
 	if (!init) {
-		return Model.get(name, false);
+		return constructor;
 	}
 
+	let instance;
+
 	if (!options) {
 		options = {};
 	}
@@ -608,7 +611,7 @@ Base.setMethod(function getModel(name, init, options) {
 		return instance;
 	}
 
-	instance = Model.get(name, options);
+	instance = new constructor(options);
 
 	if (conduit) {
 		instance.attachConduit(conduit);
@@ -628,11 +631,11 @@ Base.setMethod(function getModel(name, init, options) {
 /**
  * Create a debug entry
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param   {Number}   verbosity
+ * @param    {number}   verbosity
  */
 Base.setMethod(function debug(verbosity) {
 
@@ -662,7 +665,7 @@ Base.setMethod(function debug(verbosity) {
 	}
 
 	// Do nothing if debugging is off and verbosity is too high
-	if (!alchemy.settings.debug && options.verbosity > log.ERROR) {
+	if (!alchemy.settings.debugging.debug && options.verbosity > log.ERROR) {
 		return;
 	}
 
@@ -719,7 +722,7 @@ Base.setMethod(function debug(verbosity) {
 		return item;
 	}
 
-	if (!duplicate && alchemy.settings.debug && options.data && options.data.args) {
+	if (!duplicate && alchemy.settings.debugging.debug && options.data && options.data.args) {
 		if (typeof options.level != 'number') {
 			options.level = 1;
 		}
@@ -733,11 +736,11 @@ Base.setMethod(function debug(verbosity) {
 /**
  * Create a debug mark
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param   {String}   message
+ * @param    {string}   message
  */
 Base.setMethod(function debugMark(message) {
 	if (this._debugObject) {
@@ -745,19 +748,4 @@ Base.setMethod(function debugMark(message) {
 	}
 });
 
-/**
- * Add the getClassGroup method to the alchemy object
- *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    0.3.0
- * @version  0.3.0
- */
-alchemy.getClassGroup = __Protoblast.getGroup;
-
 // PROTOBLAST END CUT
-
-// @TODO: put this somewhere else
-if (Blast.isBrowser) {
-	window.Types = Blast.Types;
-	window.Classes = Blast.Classes;
-}