refactor: get rid of weird setFunction, just use $set internally re: #1939

Author: vkarpov15

lib/document.js

@@ -435,8 +435,18 @@ function init(self, obj, doc, prefix) {
  */
 
 for (var k in hooks) {
-  if (k === 'pre' || k === 'post') {
+  if (k === 'post') {
     Document.prototype['$' + k] = Document['$' + k] = hooks[k];
+  } else if (k === 'pre') {
+    Document.prototype.$pre = Document.$pre = function mongoosePreWrapper() {
+      if (arguments[0] === 'set') {
+        // Make set hooks also work for `$set`
+        var $setArgs = Array.prototype.slice.call(arguments);
+        $setArgs[0] = '$set';
+        hooks.pre.apply(this, $setArgs);
+      }
+      return hooks.pre.apply(this, arguments);
+    };
   } else {
     Document.prototype[k] = Document[k] = hooks[k];
   }
@@ -468,29 +478,7 @@ Document.prototype.update = function update() {
 };
 
 /**
- * Sets the value of a path, or many paths.
- *
- * ####Example:
- *
- *     // path, value
- *     doc.set(path, value)
- *
- *     // object
- *     doc.set({
- *         path  : value
- *       , path2 : {
- *            path  : value
- *         }
- *     })
- *
- *     // on-the-fly cast to number
- *     doc.set(path, value, Number)
- *
- *     // on-the-fly cast to string
- *     doc.set(path, value, String)
- *
- *     // changing strict mode behavior
- *     doc.set(path, value, { strict: false });
+ * Alias for `set()`, used internally to avoid conflicts
  *
  * @param {String|Object} path path or object of key/vals to set
  * @param {Any} val the value to set
@@ -785,8 +773,36 @@ Document.prototype.$set = function(path, val, type, options) {
   return this;
 };
 
-/*!
- * ignore
+/**
+ * Sets the value of a path, or many paths.
+ *
+ * ####Example:
+ *
+ *     // path, value
+ *     doc.set(path, value)
+ *
+ *     // object
+ *     doc.set({
+ *         path  : value
+ *       , path2 : {
+ *            path  : value
+ *         }
+ *     })
+ *
+ *     // on-the-fly cast to number
+ *     doc.set(path, value, Number)
+ *
+ *     // on-the-fly cast to string
+ *     doc.set(path, value, String)
+ *
+ *     // changing strict mode behavior
+ *     doc.set(path, value, { strict: false });
+ *
+ * @param {String|Object} path path or object of key/vals to set
+ * @param {Any} val the value to set
+ * @param {Schema|String|Number|Buffer|*} [type] optionally specify a type for "on-the-fly" attributes
+ * @param {Object} [options] optionally specify options that modify the behavior of the set
+ * @api public
  */
 
 Document.prototype.set = Document.prototype.$set;

lib/schema.js

@@ -349,8 +349,7 @@ Schema.prototype.defaultOptions = function(options) {
     noVirtualId: false, // deprecated, use { id: false }
     id: true,
     typeKey: 'type',
-    retainKeyOrder: false,
-    setFunction: 'set'
+    retainKeyOrder: false
   }, options);
 
   if (options.read) {

lib/services/document/compile.js

@@ -127,7 +127,7 @@ function defineKey(prop, subprops, prototype, prefix, keys, options) {
           v = v.toObject({ transform: false });
         }
         var doc = this.$__.scope || this;
-        return doc[doc.schema.options.setFunction](path, v);
+        return doc.$set(path, v);
       }
     });
   } else {
@@ -138,7 +138,7 @@ function defineKey(prop, subprops, prototype, prefix, keys, options) {
         return this.get.call(this.$__.scope || this, path);
       },
       set: function(v) {
-        return this[this.schema.options.setFunction].call(this.$__.scope || this, path, v);
+        return this.$set.call(this.$__.scope || this, path, v);
       }
     });
   }