alchemymvc 1.1.7 → 1.2.0

package/lib/init/devwatch.js

@@ -100,7 +100,7 @@ if (alchemy.settings.kill_on_file_change) {
 		}
 
 		// Skip some big module folders by default
-		if (path.endsWith('/less') || path.endsWith('/caniuse-lite') || path.endsWith('/bcrypt') || path.endsWith('/node-sass') || path.endsWith('/mmmagic') || path.endsWith('/node-gyp') || path.endsWith('/lodash')) {
+		if (path.endsWith('/less') || path.endsWith('/caniuse-lite') || path.endsWith('/bcrypt') || path.endsWith('/sass') || path.endsWith('/mmmagic') || path.endsWith('/node-gyp') || path.endsWith('/lodash')) {
 			seen_map.set(_path, true);
 			return true;
 		}

package/lib/init/functions.js

@@ -41,7 +41,7 @@ Informer.setMethod(function attachConduit(conduit) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.3.0
- * @version  1.1.0
+ * @version  1.1.8
  *
  * @param   {String}   name      The name of the model to get
  * @param   {Boolean}  init      Initialize the class [true]
@@ -50,61 +50,7 @@ Informer.setMethod(function attachConduit(conduit) {
  * @return  {Model}
  */
 Informer.setMethod(function getModel(name, init, options) {
-
-	var instance;
-
-	if (typeof init != 'boolean') {
-		options = init;
-		init = true;
-	}
-
-	if (!init) {
-		return Model.get(name, false);
-	}
-
-	if (!options) {
-		options = {};
-	}
-
-	let conduit = this.conduit;
-
-	if (!conduit) {
-		if (this.view && this.view.conduit) {
-			conduit = this.view.conduit;
-		} else if (this.view && this.view.root_renderer && this.view.root_renderer.conduit) {
-			conduit = this.view.root_renderer.conduit;
-		}
-	}
-
-	if (options.cache !== false) {
-		if (!this._modelInstances) {
-			this._modelInstances = {};
-		} else {
-			instance = this._modelInstances[name];
-		}
-
-		// If an instance already exists on this item,
-		// and it has the same conduit (or none), return that
-		if (instance && (instance.conduit == conduit)) {
-			return instance;
-		}
-	}
-
-	instance = Model.get(name, options);
-
-	if (conduit) {
-		instance.attachConduit(conduit);
-	}
-
-	if (this._debugObject) {
-		instance._debugObject = this._debugObject;
-	}
-
-	if (options.cache !== false) {
-		this._modelInstances[name] = instance;
-	}
-
-	return instance;
+	return Blast.Classes.Alchemy.Base.prototype.getModel.apply(this, arguments);
 });
 
 /**

package/lib/init/load_functions.js

@@ -166,7 +166,7 @@ Alchemy.setProperty('default_use_path_options', {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.0.3
+ * @version  1.2.0
  *
  * @param   {String}   dir_path
  * @param   {Object}   options
@@ -255,7 +255,8 @@ Alchemy.setMethod(function _usePath(dir_path, options) {
 				parent_path : dir_path,
 				name        : file_name,
 				path        : file_path,
-				stat        : file_stat
+				stat        : file_stat,
+				local_path  : file_path.slice(PATH_APP.length),
 			});
 
 			continue;
@@ -273,6 +274,11 @@ Alchemy.setMethod(function _usePath(dir_path, options) {
 	for (i = 0; i < directories.length; i++) {
 		entry = directories[i];
 
+		// Don't load migrations
+		if (entry.local_path == '/migrations') {
+			continue;
+		}
+
 		// Do not include subfolders of the "config" directory
 		// if it's a modular load
 		if (options.modularParent && /\/config$/.exec(entry.parent_path)) {

package/lib/init/requirements.js

@@ -1,97 +1,102 @@
-'use strict';
-
-/**
- * The basic http module, used to create the server.
- *
- * @link   http://nodejs.org/api/http.html
- */
-alchemy.use('http', 'http');
-
-/**
- * This module contains utilities for handling and transforming file paths.
- * Almost all these methods perform only string transformations.
- * The file system is not consulted to check whether paths are valid.
- *
- * @link   http://nodejs.org/api/path.html
- */
-alchemy.use('path', 'path');
-
-/**
- * File I/O is provided by simple wrappers around standard POSIX functions.
- *
- * @link   http://nodejs.org/api/fs.html
- */
-alchemy.use('graceful-fs', 'fs');
-
-/**
- * Usefull utilities.
- *
- * @link   http://nodejs.org/api/util.html
- */
-alchemy.use('util', 'util');
-
-/**
- * The native mongodb library
- *
- * @link   https://npmjs.org/package/mongodb
- */
-alchemy.use('mongodb', 'mongodb');
-
-/**
- * The LESS interpreter.
- *
- * @link   https://npmjs.org/package/less
- */
-alchemy.use('less', 'less');
-
-/**
- * Hawkejs view engine
- *
- * @link   https://npmjs.org/package/hawkejs
- */
-alchemy.use('hawkejs', 'hawkejs');
-alchemy.hawkejs = new Classes.Hawkejs.Hawkejs;
-
-/**
- * The function to detect when everything is too busy
- */
-alchemy.toobusy = alchemy.use('toobusy-js', 'toobusy');
-
-// If the config is a number, use that as the lag threshold
-if (typeof alchemy.settings.toobusy === 'number') {
-	alchemy.toobusy.maxLag(alchemy.settings.toobusy);
-}
-
-/**
- * Load Sputnik, the stage-based launcher
- */
-alchemy.sputnik = new (alchemy.use('sputnik', 'sputnik'))();
-
-/**
- * Real-time apps made cross-browser & easy with a WebSocket-like API.
- *
- * @link   https://npmjs.org/package/socket.io
- */
-alchemy.use('socket.io', 'io');
-
-/**
- * Recursively mkdir, like `mkdir -p`.
- * This is a requirement fetched from express
- *
- * @link   https://npmjs.org/package/mkdirp
- */
-alchemy.use('mkdirp', 'mkdirp');
-
-/**
- * Base useragent library
- *
- * @link   https://npmjs.org/package/useragent
- */
-alchemy.use('useragent');
-
-/**
- * Enable the `satisfies` method in the `useragent` library
- *
- * @link   https://www.npmjs.com/package/useragent#adding-more-features-to-the-useragent
- */
+'use strict';
+
+/**
+ * The basic http module, used to create the server.
+ *
+ * @link   http://nodejs.org/api/http.html
+ */
+alchemy.use('http', 'http');
+
+/**
+ * This module contains utilities for handling and transforming file paths.
+ * Almost all these methods perform only string transformations.
+ * The file system is not consulted to check whether paths are valid.
+ *
+ * @link   http://nodejs.org/api/path.html
+ */
+alchemy.use('path', 'path');
+
+/**
+ * File I/O is provided by simple wrappers around standard POSIX functions.
+ *
+ * @link   http://nodejs.org/api/fs.html
+ */
+alchemy.use('graceful-fs', 'fs');
+
+/**
+ * Usefull utilities.
+ *
+ * @link   http://nodejs.org/api/util.html
+ */
+alchemy.use('util', 'util');
+
+/**
+ * The native mongodb library
+ *
+ * @link   https://npmjs.org/package/mongodb
+ */
+alchemy.use('mongodb', 'mongodb');
+
+/**
+ * The LESS interpreter.
+ *
+ * @link   https://npmjs.org/package/less
+ */
+alchemy.use('less', 'less');
+
+/**
+ * Hawkejs view engine
+ *
+ * @link   https://npmjs.org/package/hawkejs
+ */
+alchemy.use('hawkejs', 'hawkejs');
+alchemy.hawkejs = new Classes.Hawkejs.Hawkejs;
+
+/**
+ * The function to detect when everything is too busy
+ */
+alchemy.toobusy = alchemy.use('toobusy-js', 'toobusy');
+
+// If the config is a number, use that as the lag threshold
+if (typeof alchemy.settings.toobusy === 'number') {
+	alchemy.toobusy.maxLag(alchemy.settings.toobusy);
+}
+
+/**
+ * Load Sputnik, the stage-based launcher
+ */
+alchemy.sputnik = new (alchemy.use('sputnik', 'sputnik'))();
+
+/**
+ * Real-time apps made cross-browser & easy with a WebSocket-like API.
+ *
+ * @link   https://npmjs.org/package/socket.io
+ */
+alchemy.use('socket.io', 'io');
+
+/**
+ * Allow streams over a socket.io connection
+ */
+alchemy.use('@11ways/socket.io-stream', 'socket.io-stream');
+
+/**
+ * Recursively mkdir, like `mkdir -p`.
+ * This is a requirement fetched from express
+ *
+ * @link   https://npmjs.org/package/mkdirp
+ */
+alchemy.use('mkdirp', 'mkdirp');
+
+/**
+ * Base useragent library
+ *
+ * @link   https://npmjs.org/package/useragent
+ */
+alchemy.use('useragent');
+
+/**
+ * Enable the `satisfies` method in the `useragent` library
+ *
+ * @link   https://www.npmjs.com/package/useragent#adding-more-features-to-the-useragent
+ */
 require('useragent/features');

package/lib/stages.js

@@ -225,6 +225,18 @@ alchemy.sputnik.add(function hawkejs_setup() {
 		}
 	});
 
+	// Serve the static file with exposed variables
+	Router.use('/hawkejs/static.js', function getHawkejs(req, res, next) {
+		alchemy.hawkejs.getStaticExposedPath((err, path) => {
+
+			if (err) {
+				return req.conduit.error(err);
+			}
+
+			req.conduit.serveFile(path);
+		});
+	});
+
 	// Serve multiple template files
 	Router.use('/hawkejs/templates', function onGetTemplates(req, res) {
 

package/package.json

@@ -1,76 +1,74 @@
-{
-	"name": "alchemymvc",
-	"description": "MVC framework for Node.js",
-	"version": "1.1.7",
-	"author": "Jelle De Loecker <jelle@elevenways.be>",
-	"keywords": [
-		"alchemy",
-		"alchemymvc",
-		"mvc"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/11ways/alchemy.git"
-	},
-	"dependencies": {
-		"ansi-256-colors"   : "~1.1.0",
-		"autoprefixer"      : "~10.2.5",
-		"bcrypt"            : "~5.0.1",
-		"body"              : "~5.1.0",
-		"body-parser"       : "~1.19.0",
-		"bson"              : "~4.3.0",
-		"chokidar"          : "~3.5.1",
-		"formidable"        : "~1.2.2",
-		"graceful-fs"       : "~4.2.6",
-		"hawkejs"           : "~2.1.4",
-		"jsondiffpatch"     : "~0.4.1",
-		"mime"              : "~2.5.2",
-		"minimist"          : "~1.2.5",
-		"mkdirp"            : "~1.0.4",
-		"mmmagic"           : "~0.5.3",
-		"mollusc"           : "~2.0.0",
-		"mongodb"           : "~3.6.6",
-		"ncp"               : "~2.0.0",
-		"postcss"           : "~8.2.13",
-		"protoblast"        : "~0.7.8",
-		"semver"            : "~7.3.5",
-		"socket.io"         : "~2.3.0",
-		"socket.io-stream"  : "~0.9.1",
-		"sputnik"           : "~0.1.0",
-		"temp"              : "~0.9.4",
-		"terser"            : "~5.7.0",
-		"toobusy-js"        : "~0.5.1",
-		"useragent"         : "~2.3.0"
-	},
-	"files": [
-		"lib/",
-		"index.js"
-	],
-	"optionalDependencies": {
-		"janeway"           : "~0.3.5",
-		"less"              : "~4.1.1",
-		"node-sass"         : "~5.0.0",
-		"nodent-compiler"   : "~3.2.13",
-		"socket.io-client"  : "~2.3.0"
-	},
-	"devDependencies": {
-		"codecov"                 : "~3.8.1",
-		"istanbul-lib-instrument" : "~4.0.3",
-		"nyc"                     : "^15.1.0",
-		"mocha"                   : "~8.3.2",
-		"mongo-unit"              : "~2.0.1",
-		"puppeteer"               : "~9.0.0",
-		"source-map"              : "~0.7.3"
-	},
-	"scripts": {
-		"test"            : "mocha --exit --reporter spec --bail --timeout 50000 --file test/00-init.js",
-		"appveyor"        : "mocha --exit --reporter spec --bail --timeout 20000 --file test/00-init.js",
-		"coverage"        : "nyc --reporter=text --reporter=lcov mocha --exit --timeout 200000 --bail --file test/00-init.js",
-		"report-coverage" : "nyc report --reporter=lcov && cat ./coverage/lcov.info | codecov"
-	},
-	"main": "lib/bootstrap.js",
-	"license": "MIT",
-	"engines": {
-		"node": ">=10.21.0"
-	}
-}
+{
+	"name": "alchemymvc",
+	"description": "MVC framework for Node.js",
+	"version": "1.2.0",
+	"author": "Jelle De Loecker <jelle@elevenways.be>",
+	"keywords": [
+		"alchemy",
+		"alchemymvc",
+		"mvc"
+	],
+	"repository": {
+		"type" : "git",
+		"url"  : "git://github.com/11ways/alchemy.git"
+	},
+	"dependencies": {
+		"ansi-256-colors"  : "~1.1.0",
+		"autoprefixer"     : "~10.4.2",
+		"bcrypt"           : "~5.0.1",
+		"body"             : "~5.1.0",
+		"body-parser"      : "~1.19.2",
+		"bson"             : "~4.6.1",
+		"chokidar"         : "~3.5.3",
+		"formidable"       : "~1.2.2",
+		"graceful-fs"      : "~4.2.9",
+		"hawkejs"          : "~2.2.0",
+		"jsondiffpatch"    : "~0.4.1",
+		"mime"             : "~3.0.0",
+		"minimist"         : "~1.2.5",
+		"mkdirp"           : "~1.0.4",
+		"mmmagic"          : "~0.5.3",
+		"mongodb"          : "~3.6.6",
+		"ncp"              : "~2.0.0",
+		"postcss"          : "~8.4.6",
+		"protoblast"       : "~0.7.10",
+		"semver"           : "~7.3.5",
+		"socket.io"        : "~2.4.0",
+		"@11ways/socket.io-stream" : "~0.9.2",
+		"sputnik"          : "~0.1.0",
+		"terser"           : "~5.10.0",
+		"toobusy-js"       : "~0.5.1",
+		"useragent"        : "~2.3.0"
+	},
+	"files": [
+		"lib/",
+		"index.js"
+	],
+	"optionalDependencies": {
+		"janeway"          : "~0.3.5",
+		"less"             : "~4.1.1",
+		"sass"             : "~1.49.8",
+		"nodent-compiler"  : "~3.2.13",
+		"socket.io-client" : "~2.4.0"
+	},
+	"devDependencies": {
+		"codecov"                 : "~3.8.1",
+		"istanbul-lib-instrument" : "~4.0.3",
+		"mocha"                   : "~8.3.2",
+		"mongo-unit"              : "~2.0.1",
+		"nyc"                     : "^15.1.0",
+		"puppeteer"               : "~9.0.0",
+		"source-map"              : "~0.7.3"
+	},
+	"scripts": {
+		"appveyor"        : "mocha --exit --reporter spec --bail --timeout 20000 --file test/00-init.js",
+		"coverage"        : "nyc --reporter=text --reporter=lcov mocha --exit --timeout 200000 --bail --file test/00-init.js",
+		"report-coverage" : "nyc report --reporter=lcov && cat ./coverage/lcov.info | codecov",
+		"test"            : "mocha --exit --reporter spec --bail --timeout 50000 --file test/00-init.js"
+	},
+	"main": "lib/bootstrap.js",
+	"license": "MIT",
+	"engines": {
+		"node" : ">=10.21.0"
+	}
+}