alchemymvc 1.2.0 → 1.2.3

package/lib/class/document.js

@@ -536,27 +536,24 @@ Document.setMethod(function remove(callback) {
 /**
  * Add associated data to this record
  *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    0.2.0
- * @version  1.1.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.3
+ * @version  1.2.3
  *
- * @param    {Criteria} criteria
- * @param    {Function} callback
+ * @param    {Criteria|String} criteria
  *
- * @return   {Pledge}
+ * @return   {Criteria}
  */
-Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria, callback) {
+Document.setMethod(function preparePopulationCriteria(criteria) {
 
-	var that  = this,
+	let type = typeof criteria,
 	    model = this.$model,
-	    type  = typeof criteria,
 	    selects;
 
 	if (type == 'string') {
 		selects = [criteria];
 		criteria = {};
 	} else if (type == 'function') {
-		callback = criteria;
 		criteria = {};
 	} else if (Array.isArray(criteria)) {
 		selects = criteria;
@@ -583,7 +580,31 @@ Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData
 		}
 	}
 
-	return model.addAssociatedDataToRecord(criteria, this.$record, callback);
+	return criteria;
+});
+
+/**
+ * Add associated data to this record
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.2.3
+ *
+ * @param    {Criteria} criteria
+ * @param    {Function} callback
+ *
+ * @return   {Pledge}
+ */
+Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria, callback) {
+
+	if (typeof criteria == 'function') {
+		callback = criteria;
+		criteria = null;
+	}
+
+	criteria = this.preparePopulationCriteria(criteria);
+
+	return this.$model.addAssociatedDataToRecord(criteria, this.$record, callback);
 });
 
 /**

package/lib/class/document_list.js

@@ -63,13 +63,23 @@ DocumentList.setMethod(function clone() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.3
  *
  * @param    {Criteria}   criteria
  *
  * @return   {Pledge}
  */
 DocumentList.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria) {
+
+	if (!this.records?.length) {
+		return;
+	}
+
+	let doc = this.records[0];
+
+	// Use the first doc to prepare the population criteria
+	criteria = doc.preparePopulationCriteria(criteria);
+
 	return Function.forEach.parallel(this.records, function eachDoc(doc, key, next) {
 		doc.populate(criteria).done(next);
 	});

package/lib/class/element.js

@@ -23,12 +23,17 @@ Function.getNamespace('Alchemy.Element').setStatic('default_element_prefix', 'al
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.1
  *
  * @return  {RURL}
  */
 Element.setMethod(function getCurrentUrl() {
 	if (Blast.isBrowser) {
+
+		if (hawkejs.scene.opening_url && hawkejs.scene.opening_url.url) {
+			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
+		}
+		
 		return Blast.Classes.RURL.parse(window.location);
 	} else if (this.hawkejs_renderer && this.hawkejs_renderer.variables && this.hawkejs_renderer.variables.__url) {
 		return this.hawkejs_renderer.variables.__url.clone();

package/lib/class/schema.js

@@ -287,7 +287,7 @@ Schema.setMethod(function getAssociationArguments(locality, alias, modelName, op
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.2
  *
  * @param    {String}   alias
  * @param    {String}   modelname
@@ -369,7 +369,14 @@ Schema.setMethod(function addAssociation(type, alias, modelName, options) {
 	if (locality == 'internal') {
 
 		if (!this.getField(options.localKey)) {
-			this.addField(options.localKey, type, args);
+			let field_options = Object.assign({}, args);
+
+			if (options && options.field_options) {
+				Object.assign(field_options, options.field_options);
+				field_options.field_options = undefined;
+			}
+
+			this.addField(options.localKey, type, field_options);
 
 			if (constructor) {
 				doc_class.setFieldGetter(options.localKey);

package/lib/core/base.js

@@ -416,19 +416,28 @@ Base.setMethod(function getClassPathAfter(after) {
 /**
  * Call a method if it exists or do the callback
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.0.0
+ * @version  1.2.2
  */
 Base.setMethod(function callOrNext(name, args, next) {
 
+	if (arguments.length == 2 && typeof args == 'function') {
+		next = args;
+		args = [];
+	}
+
 	if (typeof this[name] == 'function') {
 
 		if (next) {
 			args.push(next);
 		}
 
-		this[name].apply(this, args);
+		try {
+			this[name].apply(this, args);
+		} catch (err) {
+			next(err);
+		}
 	} else if (next) {
 		next();
 

package/lib/core/client_alchemy.js

@@ -24,6 +24,17 @@ var Alchemy = Function.inherits('Alchemy.Client.Base', function Alchemy() {
 	this.sent_subscriptions = [];
 });
 
+/**
+ * A reference to the main hawkejs instance
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.2.3
+ * @version   1.2.3
+ */
+Alchemy.setProperty(function hawkejs() {
+	return window.hawkejs;
+});
+
 /**
  * Called in the onScene static method of the Alchemy helper
  *
@@ -1066,4 +1077,18 @@ Alchemy.setMethod(function syncDataWithServer() {
 	});
 
 	return Function.parallel(tasks);
+});
+
+/**
+ * Create a new schema on the client
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {*}   parent
+ */
+Alchemy.setMethod(function createSchema(parent) {
+	let schema = new Classes.Alchemy.Client.Schema(parent);
+	return schema;
 });

package/lib/init/alchemy.js

@@ -751,7 +751,6 @@ Alchemy.setMethod(function use(module_name, register_as, options) {
 	return module;
 });
 
-
 /**
  * Look for a module by traversing the filesystem
  *
@@ -878,7 +877,7 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.2.2
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -949,20 +948,26 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 	// If the module_path was found, actually require the module
 	if (module_path) {
 
-		// Modules are required by default
-		if (options.require) {
-			module = require(module_path);
-		}
-
 		// Get the package.json file
 		if (~module_path.indexOf(libpath.sep)) {
 			internal = false;
 
+			let last_piece = moduleName.split(libpath.sep).last(),
+			    package_path;
+			
 			let module_dir = libpath.dirname(module_path);
 			result.module_dir = module_dir;
 
+			// If the path doesn't end with the module name, look for it
+			if (!module_path.endsWith(last_piece)) {
+				package_path = module_path.beforeLast(last_piece) + last_piece;
+				package_path = libpath.resolve(package_path, 'package.json');
+			} else {
+				package_path = libpath.resolve(module_dir, 'package.json');
+			}	
+
 			try {
-				package_json = require(libpath.resolve(module_dir, 'package.json'));
+				package_json = require(package_path);
 			} catch (err) {
 				package_json = false;
 			}
@@ -972,6 +977,15 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 				version: process.versions.node
 			};
 		}
+
+		// Modules are required by default
+		if (options.require) {
+			if (package_json && package_json.type == 'module' && !(package_json.main && package_json.module)) {
+				module = doImport(module_path)
+			} else {
+				module = require(module_path);
+			}
+		}
 	}
 
 	if (!options.require || module) {
@@ -1721,6 +1735,20 @@ Alchemy.setMethod(function importFromStream(input, options) {
 	return pledge;
 });
 
+/**
+ * Create a new schema
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {*}   parent
+ */
+Alchemy.setMethod(function createSchema(parent) {
+	let schema = new Classes.Alchemy.Schema(parent);
+	return schema;
+});
+
 /**
  * The alchemy global, where everything will be stored
  *

package/lib/init/functions.js

@@ -1082,7 +1082,7 @@ Alchemy.setMethod(function downloadFile(url, options, callback) {
 		file = fs.createWriteStream(filepath);
 
 		if (res.statusCode == 404) {
-			err = new Error('Path does not exist');
+			err = new Error('Path "' + url + '" does not exist');
 			err.number = 404;
 
 			return callback(err);
@@ -1325,7 +1325,7 @@ Alchemy.setMethod(function exposeStatic(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.1
  */
 Alchemy.setMethod(function exposeDefaultStaticVariables() {
 
@@ -1372,6 +1372,9 @@ Alchemy.setMethod(function exposeDefaultStaticVariables() {
 
 	hawkejs.exposeStatic('app_version', app_version);
 	hawkejs.app_version = app_version;
+
+	// Emit as a global event so plugins can also expose their data
+	this.emit('generate_static_variables', hawkejs);
 });
 
 /**

package/lib/init/load_functions.js

@@ -813,7 +813,7 @@ Alchemy.setMethod(function startPlugins(names) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.2.2
  *
  * @param    {String|Array}   names
  * @param    {Boolean}        attempt_require
@@ -844,8 +844,13 @@ Alchemy.setMethod(function requirePlugin(names, attempt_require) {
 				temp = alchemy.usePlugin(name);
 
 				if (temp) {
-					// Also start the plugin!
-					alchemy.startPlugins(name);
+					let plugin_stage = alchemy.sputnik.get('plugins');
+
+					if (!plugin_stage || plugin_stage.started) {
+						// If the plugin stage has already started,
+						// manually start this plugin now
+						alchemy.startPlugins(name);
+					}
 					continue;
 				}
 			}

package/lib/init/requirements.js

@@ -50,7 +50,7 @@ alchemy.use('less', 'less');
  * @link   https://npmjs.org/package/hawkejs
  */
 alchemy.use('hawkejs', 'hawkejs');
-alchemy.hawkejs = new Classes.Hawkejs.Hawkejs;
+alchemy.hawkejs = Classes.Hawkejs.Hawkejs.getInstance();
 
 /**
  * The function to detect when everything is too busy

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.2.0",
+	"version": "1.2.3",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~1.2.2",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.2.0",
+		"hawkejs"          : "~2.2.9",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.7.10",
+		"protoblast"       : "~0.7.20",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~2.4.0",
 		"@11ways/socket.io-stream" : "~0.9.2",