refactor: use applyHooks for subdocs in node

Re: #2754
Automattic · Jan 2, 2017 · d7a2dc5 · d7a2dc5
1 parent b75c2c9
commit d7a2dc5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -37,7 +37,7 @@ var mpath = require('mpath');
  * @api private
  */
 
-function Document(obj, fields, skipId, skipHooks) {
+function Document(obj, fields, skipId) {
   this.$__ = new InternalCache;
   this.$__.emitter = new EventEmitter();
   this.isNew = true;

diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -33,6 +33,7 @@ function DocumentArray(key, schema, options) {
   EmbeddedDocument.prototype.$__setSchema(schema);
   EmbeddedDocument.schema = schema;
   EmbeddedDocument.prototype.constructor = EmbeddedDocument;
+  EmbeddedDocument.$isArraySubdocument = true;
 
   // apply methods
   for (var i in schema.methods) {

diff --git a/lib/services/model/applyHooks.js b/lib/services/model/applyHooks.js
@@ -1,6 +1,5 @@
 'use strict';
 
-var Embedded = require('../../types/embedded');
 var PromiseProvider = require('../../promise_provider');
 var VersionError = require('../../error').VersionError;
 
@@ -14,7 +13,6 @@ module.exports = applyHooks;
  */
 
 function applyHooks(model, schema) {
-  Embedded = Embedded || require('./types/embedded');
   var Promise = PromiseProvider.get();
 
   var q = schema && schema.callQueue;
@@ -59,6 +57,20 @@ function applyHooks(model, schema) {
   });
   delete toWrap.post;
 
+  // 'init' should be synchronous on subdocuments
+  if (toWrap.init && (model.$isSingleNested || model.$isArraySubdocument)) {
+    if (toWrap.init.pre) {
+      toWrap.init.pre.forEach(function(args) {
+        model.prototype.$pre.apply(model.prototype, args);
+      });
+    }
+    if (toWrap.init.post) {
+      toWrap.init.post.forEach(function(args) {
+        model.prototype.$post.apply(model.prototype, args);
+      });
+    }
+    delete toWrap.init;
+  }
   if (toWrap.set) {
     // Set hooks also need to be sync re: gh-3479
     newName = '$__original_set';

diff --git a/lib/types/embedded.js b/lib/types/embedded.js
@@ -104,9 +104,12 @@ EmbeddedDocument.prototype.populate = function() {
 
 EmbeddedDocument.prototype.save = function(fn) {
   var Promise = PromiseProvider.get();
+  var _this = this;
   return new Promise.ES6(function(resolve) {
     fn && fn();
     resolve();
+    _this.emit('save', _this);
+    _this.constructor.emit('save', _this);
   });
 };
 
@@ -122,7 +125,6 @@ function registerRemoveListener(sub) {
   var owner = sub.ownerDocument();
 
   function emitRemove() {
-    console.log('Emitting remove', sub, sub.constructor);
     owner.removeListener('save', emitRemove);
     owner.removeListener('remove', emitRemove);
     sub.emit('remove', sub);

diff --git a/test/document.hooks.test.js b/test/document.hooks.test.js
@@ -342,7 +342,6 @@ describe('document: hooks:', function() {
   });
 
   it('post remove hooks on subdocuments work', function(done) {
-    console.log('------------');
     var db = start();
     var sub = new Schema({_id: Number});
     var called = {pre: 0, post: 0};

diff --git a/test/model.test.js b/test/model.test.js
@@ -3851,27 +3851,18 @@ describe('Model', function() {
           title: String
         });
 
-        var ParentSchema = new Schema({
-          embeds: [EmbeddedSchema]
-        });
-
         EmbeddedSchema.post('save', function() {
           save = true;
         });
 
-        // Don't know how to test those on a embedded document.
-        // EmbeddedSchema.post('init', function () {
-        // init = true;
-        // });
-
-        // EmbeddedSchema.post('remove', function () {
-        // remove = true;
-        // });
+        var ParentSchema = new Schema({
+          embeds: [EmbeddedSchema]
+        });
 
         mongoose.model('Parent', ParentSchema);
 
-        var db = start(),
-            Parent = db.model('Parent');
+        var db = start();
+        var Parent = db.model('Parent');
 
         var parent = new Parent();