Updates to utilize a callbackify wrapper to get around a node issue n…

…odejs/node#26890 .

src/Model.js

@@ -11,6 +11,7 @@ const {
 } = require("mongodb");
 
 const {
+	callbackify,
 	errors,
 	getMyHooks,
 	getMyFields,
@@ -676,7 +677,7 @@ async function aggregate(pipeline, options = {}) {
 	return args.docs;
 }
 
-Model.prototype.aggregate = util.callbackify(aggregate);
+Model.prototype.aggregate = callbackify(aggregate);
 
 async function findById(id, options = {}) {
 	var self = this;
@@ -685,7 +686,7 @@ async function findById(id, options = {}) {
 	return docs.length === 0 ? null : docs[0];
 }
 
-Model.prototype.findById = util.callbackify(findById);
+Model.prototype.findById = callbackify(findById);
 
 async function find(filter, options = {}) {
 	var self = this;
@@ -786,7 +787,7 @@ async function find(filter, options = {}) {
 	}
 }
 
-Model.prototype.find = util.callbackify(find);
+Model.prototype.find = callbackify(find);
 
 Model.prototype.count = function(filter, options, cb) {
 	var self = this;
@@ -1155,7 +1156,7 @@ async function _executeHooks(args) {
 
 Model.prototype._executeHooksP = _executeHooks;
 
-Model.prototype._executeHooks = util.callbackify(_executeHooks);
+Model.prototype._executeHooks = callbackify(_executeHooks);
 
 var _getMyFindFields_regex = /^(\w+?)\./;
 Model.prototype._getMyFindFields = function(fields) {

src/utils.js

@@ -2,6 +2,7 @@ const { ObjectID } = require("mongodb");
 const typecaster = require("typecaster");
 const extend = require("extend");
 const async = require("async");
+const util = require("util");
 
 const objectLib = require("./lib/objectLib.js");
 const arrayLib = require("./lib/arrayLib.js");
@@ -457,8 +458,16 @@ function _newErrorType(name) {
 	return CustomErrorType;
 }
 
+function callbackify(fn) {
+	const newFn = util.callbackify(fn);
+	return function(...args) {
+		return newFn.call(this, ...args);
+	}
+}
+
 module.exports = {
 	_newErrorType,
+	callbackify,
 	convertValue,
 	errors : {
 		ValidationError : _newErrorType("ValidationError")

testing/Model.test.js

@@ -675,6 +675,19 @@ describe(__filename, function() {
 		});
 	});
 
+	it("should have valid callbackified functions", function() {
+		var model = new mongolayer.Model({
+			collection : "foo"
+		});
+
+		var functions = ["find", "findById", "insert", "update", "save", "aggregate", "remove"];
+
+		functions.forEach(function(val, i) {
+			assert.strictEqual(model[val].constructor.name, "Function");
+			assert.notStrictEqual(model[val][Symbol.toStringTag], "AsyncFunction");
+		});
+	});
+
 	describe("conversion", function() {
 		var model;