Skip to content

Commit 52a4b8e

Browse files
committed
fix(utils): Make object $key and $exists properties non-enumerable
1 parent 404aa3d commit 52a4b8e

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/database/firebase_object_factory.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ describe('FirebaseObjectFactory', () => {
8181

8282

8383
it('should emit unwrapped data by default', (done: any) => {
84-
ref.set({ data: 'bar' }, () => {
84+
const fixtureData = { data: 'bar' };
85+
ref.set(fixtureData, () => {
8586
subscription = observable.subscribe(unwrapped => {
8687
if (!unwrapped) return;
87-
const expectedObject = { $key: ref.key, data: 'bar' };
88-
expect(unwrapped.$key).toEqual(expectedObject.$key);
89-
expect(unwrapped.data).toEqual(expectedObject.data);
88+
expect(unwrapped.$key).toEqual(ref.key);
89+
expect(unwrapped).toEqual(fixtureData);
9090
expect(unwrapped.$exists()).toEqual(true);
9191
done();
9292
});

src/database/firebase_object_observable.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('FirebaseObjectObservable', () => {
3030
});
3131
inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
3232
app = firebaseApp;
33-
ref = firebase.database().ref()
33+
ref = firebase.database().ref();
3434
O = new FirebaseObjectObservable((observer:Observer<any>) => {
3535
}, ref);
3636
})();

src/utils.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ export function unwrapMapFn (snapshot:firebase.database.DataSnapshot): AFUnwrapp
5757
$value: unwrapped
5858
};
5959
}
60-
unwrapped.$key = snapshot.ref.key;
61-
unwrapped.$exists = () => {
62-
return snapshot.exists();
63-
};
60+
Object.defineProperty(unwrapped, '$key', {value: snapshot.ref.key, enumerable: false});
61+
Object.defineProperty(unwrapped, '$exists', {
62+
value: () => {
63+
return snapshot.exists();
64+
},
65+
enumerable: false
66+
});
6467
return unwrapped;
6568
}
6669

0 commit comments

Comments
 (0)