FIX #75 populate-getter in property-list

pubkey · Mar 12, 2017 · 5dbe535 · 5dbe535
1 parent 5876e85
commit 5dbe535
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/RxDocument.js b/src/RxDocument.js
@@ -187,14 +187,21 @@ class RxDocument {
                     return this.get(util.trimDots(objPath + '.' + key));
                 });
                 // getter - observable$
-                valueObj.__defineGetter__(key + '$', () => {
-                    return this.get$(util.trimDots(objPath + '.' + key));
+                Object.defineProperty(valueObj, key + '$', {
+                    get: () => {
+                        return this.get$(util.trimDots(objPath + '.' + key));
+                    },
+                    enumerable: false,
+                    configurable: false
                 });
                 // getter - populate_
-                valueObj.__defineGetter__(key + '_', () => {
-                    return this.populate(util.trimDots(objPath + '.' + key));
+                Object.defineProperty(valueObj, key + '_', {
+                    get: () => {
+                        return this.populate(util.trimDots(objPath + '.' + key));
+                    },
+                    enumerable: false,
+                    configurable: false
                 });
-
                 // setter - value
                 valueObj.__defineSetter__(key, (val) => {
                     return this.set(util.trimDots(objPath + '.' + key), val);
@@ -293,11 +300,11 @@ class RxDocument {
         await this.collection.pouch.remove(this.getPrimary(), this._data._rev);
 
         this.$emit(RxChangeEvent.create(
-          'REMOVE',
-          this.collection.database,
-          this.collection,
-          this,
-          null
+            'REMOVE',
+            this.collection.database,
+            this.collection,
+            this,
+            null
         ));
 
         await this.collection._runHooks('post', 'remove', this);

diff --git a/test/unit/RxDocument.test.js b/test/unit/RxDocument.test.js
@@ -329,6 +329,11 @@ describe('RxDocument.test.js', () => {
                 const passportId = doc.get('passportId');
                 assert.equal(doc.passportId, passportId);
             });
+            it('hidden properties should not show up', async() => {
+                const c = await humansCollection.create(1);
+                const doc = await c.findOne().exec();
+                assert.ok(!Object.keys(doc).includes('lastName_'));
+            });
             it('nested-value', async() => {
                 const c = await humansCollection.createNested(1);
                 const doc = await c.findOne().exec();
@@ -436,12 +441,11 @@ describe('RxDocument.test.js', () => {
             const c = await humansCollection.createPrimary(0);
             const docData = schemaObjects.simpleHuman();
             const primary = docData.passportId;
-            console.dir(docData);
+
 
             // insert
             await c.insert(docData);
             const doc1 = await c.findOne(primary).exec();
-            console.dir(doc1);
             assert.equal(doc1.firstName, docData.firstName);
 
             // remove
@@ -459,12 +463,10 @@ describe('RxDocument.test.js', () => {
             const c = await humansCollection.createPrimary(0);
             const docData = schemaObjects.simpleHuman();
             const primary = docData.passportId;
-            console.dir(docData);
 
             // insert
             await c.upsert(docData);
             const doc1 = await c.findOne(primary).exec();
-            console.dir(doc1);
             assert.equal(doc1.firstName, docData.firstName);
 
             // remove