alchemymvc 1.2.2 → 1.2.5

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
  *
@@ -175,6 +186,26 @@ Alchemy.setMethod(function __d(domain, key, parameters) {
 	return hawkejs.scene.generalView.__d(domain, key, parameters);
 });
 
+/**
+ * Set the permission checker
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.2.5
+ * @version   1.2.5
+ *
+ * @param     {Object}   instance
+ */
+Alchemy.setMethod(function setPermissionChecker(instance) {
+
+	if (instance) {
+		if (typeof instance.conduitHasPermission != 'function') {
+			throw new Error('Permission checker needs to have a `conduitHasPermisison` method');
+		}
+	}
+
+	this.permission_checker = instance;
+});
+
 /**
  * Cast to an object id
  *
@@ -458,7 +489,7 @@ Alchemy.setMethod(function linkup(type, data, cb) {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.3.0
- * @version   1.1.0
+ * @version   1.2.5
  *
  * @param     {Object}   variables
  * @param     {Object}   render_data
@@ -485,6 +516,13 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
 	// Get the newly set breadcrumb
 	page_breadcrumb = variables.__breadcrumb;
 
+	// Get all the language switcher anchors
+	elements = document.querySelectorAll('[data-alchemy-language-switch]');
+
+	for (i = 0; i < elements.length; i++) {
+		hawkejs.scene.general_renderer.helpers.Router.updateLanguageSwitcher(elements[i]);
+	}
+
 	// Get all the elements with a breadcrumb set
 	elements = document.querySelectorAll('[data-breadcrumb],[data-breadcrumbs]');
 
@@ -573,25 +611,30 @@ Alchemy.setMethod(function markLinks(variables, render_data) {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     1.0.0
- * @version   1.0.5
+ * @version   1.2.5
  */
 Alchemy.setMethod(function reloadStylesheets() {
 
-	var sheet,
-	    url,
-	    i;
-
-	for (i = 0; i < document.styleSheets.length; i++) {
-		sheet = document.styleSheets[i];
+	for (let i = 0; i < document.styleSheets.length; i++) {
+		let sheet = document.styleSheets[i];
 
 		if (!sheet.href) {
 			continue;
 		}
 
-		url = new RURL(sheet.href);
+		let url = new RURL(sheet.href);
 		url.param('last_reload', Date.now());
 
-		sheet.ownerNode.href = String(url);
+		//sheet.ownerNode.href = String(url);
+
+		let new_element = alchemy.hawkejs.createElement('link');
+		new_element.setAttribute('rel', 'stylesheet');
+		new_element.setAttribute('href', String(url));
+		document.head.append(new_element);
+
+		new_element.addEventListener('load', e => {
+			sheet.ownerNode.remove();
+		});
 	}
 });
 
@@ -600,22 +643,17 @@ Alchemy.setMethod(function reloadStylesheets() {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.4.1
- * @version   1.1.0
+ * @version   1.2.5
  */
 Alchemy.setMethod(function switchLanguage(prefix) {
 
-	var config,
-	    target,
-	    temp,
-	    url,
-	    key,
-	    e;
-
 	if (prefix) {
 		if (typeof prefix != 'string') {
+			let target,
+			    temp;
 
 			if (prefix instanceof Event) {
-				e = prefix;
+				let e = prefix;
 				target = e.srcElement || e.target;
 				e.preventDefault();
 			} else if (typeof prefix.getAttribute == 'function') {
@@ -634,35 +672,13 @@ Alchemy.setMethod(function switchLanguage(prefix) {
 		}
 	}
 
-	config = hawkejs.scene.helpers.Router.routeConfig(alchemy.current_route);
+	let url = hawkejs.scene.helpers.Router.translateCurrentRoute(prefix);
 
-	if (!alchemy.current_route || !config) {
+	if (!url) {
 		// Unknown current route, defaulting to /prefix
 		return doNavigate('/' + prefix);
 	}
 
-	// Get the url string
-	url = hawkejs.scene.helpers.Router.routeUrl(alchemy.current_route, alchemy.current_url_params, {locale: prefix});
-
-	// Turn it into a url object
-	url = RURL.parse(url);
-
-	if (url && url.pathname == '/') {
-		url.pathname = '/' + prefix + url.pathname;
-	}
-
-	// Add the get queries
-	if (alchemy.current_url && alchemy.current_url.search) {
-		for (key in alchemy.current_url.query) {
-
-			if (key == 'hajax' || key == 'h_diversion' || key == 'htop') {
-				continue;
-			}
-
-			url.addQuery(key, alchemy.current_url.query[key]);
-		}
-	}
-
 	url = String(url);
 
 	return doNavigate(url);
@@ -1080,4 +1096,20 @@ Alchemy.setMethod(function syncDataWithServer() {
 Alchemy.setMethod(function createSchema(parent) {
 	let schema = new Classes.Alchemy.Client.Schema(parent);
 	return schema;
+});
+
+/**
+ * Get a client-side model
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ *
+ * @param   {String}   name
+ * @param   {Object}   options
+ *
+ * @return  {Model}
+ */
+Alchemy.setMethod(function getClientModel(name, init, options) {
+	return Classes.Alchemy.Client.Base.prototype.getModel.call(this, name, init, options);
 });

package/lib/core/client_base.js

@@ -233,7 +233,7 @@ ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.8
+ * @version  1.2.4
  *
  * @param   {String}   name
  * @param   {Object}   options
@@ -255,9 +255,19 @@ ClientBase.setMethod(function getModel(name, init, options) {
 	}
 
 	if (Blast.isBrowser) {
-		constructor = Hawkejs.Model.getClass(name, false);
+
+		if (name == '') {
+			constructor = Hawkejs.Model;
+		} else {
+			constructor = Hawkejs.Model.getClass(name, false);
+		}
 	} else {
-		constructor = Blast.Classes.Hawkejs.Model.getClass(name);
+
+		if (name == '') {
+			constructor = Blast.Classes.Hawkejs.Model;
+		} else {
+			constructor = Blast.Classes.Hawkejs.Model.getClass(name);
+		}
 	}
 
 	if (!constructor) {

package/lib/core/middleware.js

@@ -15,6 +15,7 @@ var publicDirs = alchemy.shared('public.directories', new Deck()),
     libpath    = alchemy.use('path'),
     nodent_compiler,
     regenerator_runtime,
+	sass_functions,
     babel_polyfill,
     babel_preset,
     babel_async,
@@ -30,7 +31,61 @@ if (alchemy.settings.css_less !== false) {
 }
 
 if (alchemy.settings.css_sass) {
-	sass = alchemy.use('sass');
+
+	// Try to use the embedded DART sass
+	sass = alchemy.use('sass-embedded');
+
+	if (!sass) {
+		sass = alchemy.use('sass');
+	}
+
+	sass_functions = {
+		'alchemy_settings($name)': function(name) {
+
+			if (!(name instanceof sass.types.String)) {
+				return sass.types.Null.NULL;
+			}
+
+			name = name.getValue();
+
+			let value = Object.path(alchemy.settings, name);
+
+			if (value == null) {
+				value = Object.path(alchemy.plugins, name);
+			}
+
+			let type = typeof value,
+			    result;
+
+			switch (type) {
+				case 'string':
+					if (value) {
+						result = new sass.types.String(value);
+					} else {
+						result = sass.types.Null.NULL;
+					}
+					break;
+				
+				case 'number':
+					result = new sass.types.Number(value);
+					break;
+				
+				case 'boolean':
+					result = new sass.types.Boolean(value);
+					break;
+				
+				default:
+					if (value == null) {
+						result = sass.types.Null.NULL;
+					} else {
+						result = new sass.types.String(''+value);
+					}
+					break;
+			}
+
+			return result;
+		}
+	};
 }
 
 if (alchemy.settings.css_post !== false) {
@@ -945,7 +1000,7 @@ Alchemy.setMethod(function getCompiledLessPath(lessPath, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.5
  */
 Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 
@@ -969,12 +1024,22 @@ Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 			return writeToTemp(source);
 		}
 
-		sass.render({
-			data           : source,
+		const render_options = {
 			includePaths   : ['.'].concat(styleDirs.getSorted()).concat(libpath.dirname(sassPath)),
-			sourceMapEmbed : alchemy.settings.debug,
-			sourceMapRoot  : '/_sourcemaps/'
-		}, function gotCss(err, result) {
+			functions      : sass_functions,
+		};
+
+		if (alchemy.settings.debug) {
+			render_options.file = sassPath;
+			render_options.sourceMap      = 'out.css.map';
+			render_options.sourceMapContents = true;
+			render_options.sourceMapEmbed = true;
+			render_options.sourceMapRoot  = '/_sourcemaps/';
+		} else {
+			render_options.data = source;
+		}
+
+		sass.render(render_options, function gotCss(err, result) {
 
 			if (err) {
 				console.log(''+err, err);

package/lib/init/alchemy.js

@@ -1749,6 +1749,22 @@ Alchemy.setMethod(function createSchema(parent) {
 	return schema;
 });
 
+/**
+ * Get a client-side model
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.4
+ * @version  1.2.4
+ *
+ * @param   {String}   name
+ * @param   {Object}   options
+ *
+ * @return  {Model}
+ */
+Alchemy.setMethod(function getClientModel(name, init, options) {
+	return Classes.Alchemy.Client.Base.prototype.getModel.call(this, name, init, options);
+});
+
 /**
  * The alchemy global, where everything will be stored
  *

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.2",
+	"version": "1.2.5",
 	"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.8",
+		"hawkejs"          : "~2.2.10",
 		"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.16",
+		"protoblast"       : "~0.7.21",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~2.4.0",
 		"@11ways/socket.io-stream" : "~0.9.2",
@@ -47,7 +47,8 @@
 	"optionalDependencies": {
 		"janeway"          : "~0.3.5",
 		"less"             : "~4.1.1",
-		"sass"             : "~1.49.8",
+		"sass"             : "~1.53.0",
+		"sass-embedded"    : "~1.53.0",
 		"nodent-compiler"  : "~3.2.13",
 		"socket.io-client" : "~2.4.0"
 	},
@@ -69,6 +70,6 @@
 	"main": "lib/bootstrap.js",
 	"license": "MIT",
 	"engines": {
-		"node" : ">=10.21.0"
+		"node" : ">=14.0.0"
 	}
 }