alchemymvc 1.3.16 → 1.3.17

package/lib/core/base.js

@@ -35,7 +35,7 @@ __Protoblast.getGroup = function getGroup(name) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.3.0
- * @version  1.2.6
+ * @version  1.3.17
  */
 Base.constitute(function setBasicBehaviour() {
 
@@ -134,6 +134,28 @@ Base.constitute(function setBasicBehaviour() {
 		this.setStatic('title', this.createClassTitle(name), false);
 	}
 
+	// And also set the type path
+	if (!this.hasOwnProperty('type_path')) {
+		let namespace = this.namespace;
+		let parent_namespace = this.super?.namespace;
+		let type_path = this.type_name;
+		
+		// Add extra identifier info if this child comes from another namespace
+		if (namespace && namespace != parent_namespace) {
+			if (parent_namespace && namespace.startsWith(parent_namespace)) {
+				namespace = namespace.after(parent_namespace);
+
+				if (namespace[0] == '.') {
+					namespace = namespace.slice(1);
+				}
+			}
+
+			type_path = Blast.Bound.String.underscore(Blast.Bound.String.slug(namespace)) + '.' + type_path;
+		}
+
+		this.setStatic('type_path', type_path, false);
+	}
+
 	// Add this class to the shared group
 	shared_group[this.type_name] = this;
 });

package/lib/core/middleware.js

@@ -311,7 +311,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.4
+ * @version  1.3.17
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -418,7 +418,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 			}
 		}
 
-		if (should_minify) {
+		if (should_minify && typeof Terser?.minify == 'function') {
 
 			// Force Blast.isNode & Blast.isBrowser to be replaced later
 			data = data.replaceAll('Blast.isNode', '__BLAST_IS_NODE');

package/lib/init/alchemy.js

@@ -135,7 +135,11 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 			this.startJaneway();
 		}
 	} catch (err) {
-		log.warn('Failed to start Janeway:', err);
+		if (typeof log != 'undefined') {
+			log.warn('Failed to start Janeway:', err);
+		} else {
+			console.warn('Failed to start Janeway:', err);
+		}
 	}
 });
 
@@ -357,6 +361,61 @@ Alchemy.setMethod(function isTooBusyForAjax() {
 	return false;
 });
 
+/**
+ * Called after the server has started
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.17
+ * @version  1.3.17
+ */
+Alchemy.setMethod(function afterStart() {
+	this.startTaskService();
+});
+
+let task_service_has_started = false;
+
+/**
+ * Start the task service
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.17
+ * @version  1.3.17
+ */
+Alchemy.setMethod(function startTaskService() {
+
+	if (task_service_has_started) {
+		return;
+	}
+
+	task_service_has_started = true;
+
+	this.task_service = new Classes.Alchemy.Task.TaskService();
+});
+
+/**
+ * Is the given PID running?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.17
+ * @version  1.3.17
+ *
+ * @param    {Number}   pid
+ *
+ * @return   {Boolean}
+ */
+Alchemy.setMethod(function isProcessRunning(pid) {
+
+	if (!pid) {
+		return false;
+	}
+
+	try {
+		return process.kill(pid, 0);
+	} catch (e) {
+		return e.code === 'EPERM'
+	}
+});
+
 /**
  * Start janeway
  *
@@ -441,6 +500,13 @@ Alchemy.setMethod(function startJaneway(options) {
 			return session_menu.remove();
 		}
 
+		session_menu.addItem({
+			title  : 'Current active browser sessions:',
+			weight : Infinity,
+		}, () => {
+			console.log('All sessions:', alchemy.sessions);
+		});
+
 		this.Janeway.session_menu = session_menu;
 	}
 
@@ -1051,7 +1117,7 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.3.16
+ * @version  1.3.17
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -1183,10 +1249,22 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 			// Make sure this does not support CJS.
 			// Some packages have the `module` type, but do have CJS exports too
 			if (!supports_cjs) {
-				let exports = package_json.exports?.['.'];
 
-				if (exports?.require) {
+				if (package_json.module && package_json.main) {
 					supports_cjs = true;
+				} else {
+
+					let exports = package_json.exports?.['.'];
+
+					if (Array.isArray(exports)) {
+						for (let entry of exports) {
+							if (entry && typeof entry == 'object' && entry.require) {
+								supports_cjs = true;
+							}
+						}
+					} else if (exports?.require) {
+						supports_cjs = true;
+					}
 				}
 			}
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.16",
+	"version": "1.3.17",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -45,7 +45,7 @@
 		"index.js"
 	],
 	"optionalDependencies": {
-		"janeway"          : "~0.4.0",
+		"janeway"          : "~0.4.2",
 		"less"             : "~4.2.0",
 		"sass"             : "~1.68.0",
 		"sass-embedded"    : "~1.67.0",