alchemymvc 1.3.15 → 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/client_alchemy.js

@@ -315,11 +315,11 @@ Alchemy.setMethod(function castObjectId(str) {
 /**
  * Is the given parameter an object id (string or instance)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.0.5
+ * @version  1.3.16
  *
- * @param    {String|ObjectID}   obj
+ * @param    {String|ObjectId}   obj
  *
  * @return   {Boolean}
  */
@@ -331,9 +331,13 @@ Alchemy.setMethod(function isObjectId(obj) {
 
 	let type = typeof obj;
 
-	if (obj && type === 'object' && obj.constructor && obj.constructor.name === 'ObjectID') {
+	if (type === 'string' && obj.isObjectId()) {
 		return true;
-	} else if (type === 'string' && obj.isObjectId()) {
+	}
+
+	let class_name = obj.constructor?.name;
+
+	if (class_name == 'ObjectID' || class_name == 'ObjectId') {
 		return true;
 	}
 

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.2.7
+ * @version  1.3.17
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -1177,7 +1243,32 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 
 		// Modules are required by default
 		if (options.require) {
-			if (package_json && package_json.type == 'module' && !(package_json.main && package_json.module)) {
+
+			let supports_cjs = package_json?.type != 'module';
+
+			// Make sure this does not support CJS.
+			// Some packages have the `module` type, but do have CJS exports too
+			if (!supports_cjs) {
+
+				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;
+					}
+				}
+			}
+
+			if (!supports_cjs) {
 				module = doImport(module_path)
 			} else {
 				module = require(module_path);
@@ -1248,22 +1339,28 @@ Alchemy.setMethod(function shared(name, type, value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.4.0
+ * @version  1.3.16
  *
- * @param    {String|ObjectID}   obj
+ * @param    {String|ObjectId}   obj
  *
- * @return   {ObjectID|undefined}
+ * @return   {ObjectId|undefined}
  */
 Alchemy.setMethod(function castObjectId(obj) {
 
-	var type = typeof obj;
+	let type = typeof obj;
 
-	if (obj && type === 'object' && obj.constructor && obj.constructor.name === 'ObjectID') {
-		return obj;
-	} else if (type === 'string' && obj.isObjectId()) {
+	if (type === 'string' && obj.isObjectId()) {
 		return alchemy.ObjectId(obj);
 	}
 
+	if (obj && type === 'object') {
+		let class_name = obj.constructor?.name;
+
+		if (class_name == 'ObjectID' || class_name == 'ObjectId') {
+			return obj;
+		}
+	}
+
 	return undefined;
 });
 
@@ -1595,6 +1692,12 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 				return callback(null);
 			}
 
+			// Since formidable v3, all the fields are now arrays.
+			// We already had a lot of logic to deal with this,
+			// so we just have to un-array everything
+			form_fields = undoFormidableArray(form_fields);
+			form_files = undoFormidableArray(form_files);
+
 			// Fix the field names
 			for (key in form_fields) {
 				Object.setFormPath(fields, key, form_fields[key]);
@@ -1679,6 +1782,42 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	});
 });
 
+/**
+ * Undo formidable's new array handling
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @param    {Object}
+ *
+ * @return   {Object}
+ */
+function undoFormidableArray(data) {
+
+	if (!data) {
+		return {};
+	}
+
+	let result = {},
+	    value,
+	    key;
+
+	for (key in data) {
+		value = data[key];
+
+		if (key.endsWith('[]')) {
+			key = key.slice(0, -2);
+		} else {
+			value = value[0];
+		}
+
+		result[key] = value;
+	}
+
+	return result;
+}
+
 /**
  * Export all data
  *

package/lib/init/functions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var mkdirp       = alchemy.use('mkdirp'),
+let mkdirp       = alchemy.use('mkdirp')?.mkdirp,
     ncp          = alchemy.use('ncp').ncp,
     fs           = alchemy.use('fs'),
     libpath      = alchemy.use('path'),
@@ -496,6 +496,7 @@ Alchemy.setMethod(function getShared(first, second) {
 
 /**
  * Make JSON-Dry handle ObjectIDs when drying
+ * (Old class name)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
@@ -507,16 +508,65 @@ JSON.registerDrier('ObjectID', function dryOI(holder, key, value) {
 
 /**
  * Correctly un-dry ObjectIDs
+ * (Old class name)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
  * @version  0.2.0
  */
 JSON.registerUndrier('ObjectID', function undryOI(holder, key, value) {
-	return mongo.ObjectID(value);
+	return alchemy.castObjectId(value);
 });
 
-alchemy.ObjectId = mongo.ObjectID;
+/**
+ * Make JSON-Dry handle ObjectIds when drying
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+JSON.registerDrier('ObjectId', function dryOI(holder, key, value) {
+	return ''+value;
+}, {add_path: false});
+
+/**
+ * Correctly un-dry ObjectIds
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+JSON.registerUndrier('ObjectId', function undryOI(holder, key, value) {
+	return alchemy.castObjectId(value);
+});
+
+/**
+ * Monkey-patch checksum support to the ObjectId class
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ */
+if (typeof mongo?.ObjectId == 'function') {
+	Function.setMethod(mongo.ObjectId, Blast.checksumSymbol, function checksum() {
+		return this.toString();
+	});
+}
+
+/**
+ * Create a new ObjectId
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @param    {*}   object_id
+ *
+ * @return   {ObjectId}
+ */
+Alchemy.setMethod(function ObjectId(object_id) {
+	return new mongo.ObjectId(object_id);
+});
 
 /**
  * Get mimetype info of a file

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.15",
+	"version": "1.3.17",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -14,29 +14,29 @@
 	},
 	"dependencies": {
 		"ansi-256-colors"  : "~1.1.0",
-		"autoprefixer"     : "~10.4.2",
-		"bcrypt"           : "~5.0.1",
+		"autoprefixer"     : "~10.4.16",
+		"bcrypt"           : "~5.1.1",
 		"body"             : "~5.1.0",
-		"body-parser"      : "~1.19.2",
-		"bson"             : "~4.6.1",
+		"body-parser"      : "~1.20.2",
+		"bson"             : "~6.1.0",
 		"chokidar"         : "~3.5.3",
-		"formidable"       : "~2.1.1",
-		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.3.9",
-		"jsondiffpatch"    : "~0.4.1",
+		"formidable"       : "~3.5.1",
+		"graceful-fs"      : "~4.2.11",
+		"hawkejs"          : "~2.3.13",
+		"jsondiffpatch"    : "~0.5.0",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
-		"mkdirp"           : "~1.0.4",
+		"mkdirp"           : "~3.0.1",
 		"mmmagic"          : "~0.5.3",
-		"mongodb"          : "~3.6.6",
+		"mongodb"          : "~6.1.0",
 		"ncp"              : "~2.0.0",
-		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.8.9",
-		"semver"           : "~7.3.5",
-		"socket.io"        : "~4.6.0",
+		"postcss"          : "~8.4.31",
+		"protoblast"       : "~0.8.12",
+		"semver"           : "~7.5.4",
+		"socket.io"        : "~4.7.2",
 		"@11ways/socket.io-stream" : "~0.9.2",
 		"sputnik"          : "~0.1.0",
-		"terser"           : "~5.18.1",
+		"terser"           : "~5.21.0",
 		"toobusy-js"       : "~0.5.1",
 		"useragent"        : "~2.3.0"
 	},
@@ -45,21 +45,21 @@
 		"index.js"
 	],
 	"optionalDependencies": {
-		"janeway"          : "~0.4.0",
-		"less"             : "~4.1.1",
-		"sass"             : "~1.53.0",
-		"sass-embedded"    : "~1.53.0",
+		"janeway"          : "~0.4.2",
+		"less"             : "~4.2.0",
+		"sass"             : "~1.68.0",
+		"sass-embedded"    : "~1.67.0",
 		"nodent-compiler"  : "~3.2.13",
-		"socket.io-client" : "~4.6.0",
+		"socket.io-client" : "~4.7.2",
 		"socket.io-msgpack-parser": "~3.0.2"
 	},
 	"devDependencies": {
 		"codecov"                 : "~3.8.1",
-		"istanbul-lib-instrument" : "~4.0.3",
+		"istanbul-lib-instrument" : "~6.0.1",
 		"mocha"                   : "~10.2.0",
-		"mongo-unit"              : "~3.2.0",
+		"mongo-unit"              : "~3.3.0",
 		"nyc"                     : "^15.1.0",
-		"puppeteer"               : "~19.0.0",
+		"puppeteer"               : "~21.3.6",
 		"source-map"              : "~0.7.3"
 	},
 	"scripts": {
@@ -71,6 +71,6 @@
 	"main": "lib/bootstrap.js",
 	"license": "MIT",
 	"engines": {
-		"node" : ">=14.0.0"
+		"node" : ">=16.20.1"
 	}
 }