Remove auto make observable

0x80 · Apr 30, 2022 · 163323c · 163323c
1 parent 3934dad
commit 163323c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/collection.ts b/src/collection.ts
@@ -1,5 +1,8 @@
 import {
-  makeAutoObservable,
+  action,
+  computed,
+  makeObservable,
+  observable,
   onBecomeObserved,
   onBecomeUnobserved,
   runInAction,
@@ -66,15 +69,13 @@ export class ObservableCollection<T> {
     queryCreatorFn?: QueryCreatorFn,
     options?: Options,
   ) {
-    // makeObservable(this, {
-    //   documents: observable,
-    //   isLoading: observable,
-    //   isEmpty: computed,
-    //   hasDocuments: computed,
-    //   attachTo: action,
-    // });
-
-    makeAutoObservable(this);
+    makeObservable(this, {
+      documents: observable,
+      isLoading: observable,
+      isEmpty: computed,
+      hasDocuments: computed,
+      attachTo: action,
+    });
 
     this.initializeReadyPromise();
     /**

diff --git a/src/document.ts b/src/document.ts
@@ -1,5 +1,9 @@
 import {
+  action,
+  computed,
   makeAutoObservable,
+  makeObservable,
+  observable,
   onBecomeObserved,
   onBecomeUnobserved,
   runInAction,
@@ -42,7 +46,7 @@ type SourceType<T> =
   | Document<T>;
 
 export class ObservableDocument<T> {
-  private _data: T | typeof NO_DATA = NO_DATA;
+  _data: T | typeof NO_DATA = NO_DATA;
   isLoading = false;
 
   private debugId = createUniqueId();
@@ -61,15 +65,14 @@ export class ObservableDocument<T> {
   onError?: (err: Error) => void;
 
   public constructor(source?: SourceType<T>, options?: Options) {
-    // makeObservable(this, {
-    //   _data: observable,
-    //   isLoading: observable,
-    //   data: computed,
-    //   document: computed,
-    //   attachTo: action,
-    //   hasData: computed,
-    // })
-    makeAutoObservable(this);
+    makeObservable(this, {
+      _data: observable,
+      isLoading: observable,
+      data: computed,
+      document: computed,
+      attachTo: action,
+      hasData: computed,
+    });
 
     if (options) {
       this.isDebugEnabled = options.debug || false;