made requested changes

IslandRhythms · IslandRhythms · commit cd7db73705cf · 2021-11-23T16:57:46.000-05:00
diff --git a/lib/document.js b/lib/document.js
@@ -988,7 +988,7 @@ Document.prototype.$session = function $session(session) {
   this.$__.session = session;
 
 
-  if (!this.isSubDocument) {
+  if (!this.$__.isSubDocument) {
     const subdocs = this.$getAllSubdocs();
     for (const child of subdocs) {
       child.$session(session);
@@ -1458,9 +1458,9 @@ Document.prototype.$set = function $set(path, val, type, options) {
   }
 
   if (shouldSet) {
-    const doc = this.isSubDocument ? this.ownerDocument() : this;
+    const doc = this.$__.isSubDocument ? this.ownerDocument() : this;
     const savedState = doc.$__.savedState;
-    const savedStatePath = this.isSubDocument ? this.$__.fullPath + '.' + path : path;
+    const savedStatePath = this.$__.isSubDocument ? this.$__.fullPath + '.' + path : path;
     if (savedState != null) {
       const firstDot = savedStatePath.indexOf('.');
       const topLevelPath = firstDot === -1 ? savedStatePath : savedStatePath.slice(0, firstDot);
@@ -1834,7 +1834,7 @@ Document.prototype.$__path = function(path) {
 
 Document.prototype.markModified = function(path, scope) {
   this.$__.activePaths.modify(path);
-  if (scope != null && !this.isSubDocument) {
+  if (scope != null && !this.$__.isSubDocument) {
     this.$__.pathsToScopes = this.$__pathsToScopes || {};
     this.$__.pathsToScopes[path] = scope;
   }
@@ -2362,7 +2362,7 @@ Document.prototype.validate = function(pathsToValidate, options, callback) {
   let parallelValidate;
   this.$op = 'validate';
 
-  if (this.isSubDocument != null) {
+  if (this.$__.isSubDocument != null) {
     // Skip parallel validate check for subdocuments
   } else if (this.$__.validating) {
     parallelValidate = new ParallelValidateError(this, {
@@ -3941,7 +3941,9 @@ Document.prototype.toJSON = function(options) {
 };
 
 
-Document.prototype.ownerDocument = function() {};
+Document.prototype.ownerDocument = function() {
+  return this;
+};
 
 
 /**
diff --git a/lib/types/subdocument.js b/lib/types/subdocument.js
@@ -17,6 +17,7 @@ module.exports = Subdocument;
  */
 
 function Subdocument(value, fields, parent, skipId, options) {
+  this.$__.isSubDocument = true;
   if (parent != null) {
     // If setting a nested path, should copy isNew from parent re: gh-7048
     const parentOptions = { isNew: parent.isNew, defaults: 'defaults' in parent.$__ ? parent.$__.defaults : true };
@@ -229,7 +230,6 @@ Subdocument.prototype.$ignore = function(path) {
  */
 
 Subdocument.prototype.ownerDocument = function() {
-  this.isSubDocument = true;
   if (this.$__.ownerDocument) {
     return this.$__.ownerDocument;
   }
