fix(observable): change styles for linter

Igmat · Jun 9, 2019 · 49ce52f · 49ce52f
1 parent c2b5004
commit 49ce52f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/packages/observable/src/atoms.ts b/packages/observable/src/atoms.ts
@@ -29,11 +29,11 @@ export function getAtomCreator(obj: Function | object) {
         return existingAtom !== undefined
             ? existingAtom
             : objAtoms[p] = {
-                source: obj,
-                name: p,
                 dependencies: [],
                 dependents: [],
                 isDirty: true,
+                name: p,
+                source: obj,
                 value,
             };
     };

diff --git a/packages/observable/src/index.ts b/packages/observable/src/index.ts
@@ -2,4 +2,3 @@ export { autorun, IAutorunOptions } from './autorun';
 export { ITransaction } from './mutations';
 export { Observable } from './Observable';
 export { observe } from './observe';
-
diff --git a/packages/observable/src/observe.ts b/packages/observable/src/observe.ts
@@ -2,6 +2,7 @@ import { getAtomCreator } from './atoms';
 import { calculate, linkToCalculated, recalculate } from './calculations';
 import { ITransaction, mutate } from './mutations';
 import { Observable } from './Observable';
+// tslint:disable: no-unsafe-any
 
 export function observeFunction<T extends Function>(fn: T, onSet?: (tx: ITransaction) => void) {
     const createAtomIfNotExists = getAtomCreator(fn);
@@ -24,13 +25,6 @@ export function observeObj<T extends {}>(obj: T, onSet?: (tx: ITransaction) => v
     const createAtomIfNotExists = getAtomCreator(obj);
 
     return new Proxy(obj, {
-        // TODO: fix `symbol` type
-        defineProperty(target, p: string | number, attributes) {
-            const { value } = attributes;
-            createAtomIfNotExists(p, value);
-
-            return Reflect.defineProperty(target, p, attributes);
-        },
         // TODO: fix `symbol` type
         get(target, p: string | number, receiver) {
             const atom = createAtomIfNotExists(p);
@@ -43,6 +37,13 @@ export function observeObj<T extends {}>(obj: T, onSet?: (tx: ITransaction) => v
 
             return mutate(atom, () => Reflect.set(target, p, value, receiver), onSet);
         },
+        // TODO: fix `symbol` type
+        defineProperty(target, p: string | number, attributes) {
+            const { value } = attributes;
+            createAtomIfNotExists(p, value);
+
+            return Reflect.defineProperty(target, p, attributes);
+        },
     });
 }
 const arrayMethodKeys = Reflect.ownKeys(Array.prototype);
@@ -54,13 +55,6 @@ export function observeArray<T extends unknown[]>(arr: T, onSet?: (tx: ITransact
     const createAtomIfNotExists = getAtomCreator(arr);
 
     return new Proxy(arr, {
-        // TODO: fix `symbol` type
-        defineProperty(target, p: string | number, attributes) {
-            const { value } = attributes;
-            createAtomIfNotExists(p, value);
-
-            return Reflect.defineProperty(target, p, attributes);
-        },
         // TODO: fix `symbol` type
         get(target, p: string | number, receiver) {
             const atom = createAtomIfNotExists(p);
@@ -73,10 +67,17 @@ export function observeArray<T extends unknown[]>(arr: T, onSet?: (tx: ITransact
 
             return mutate(atom, () => Reflect.set(target, p, value, receiver), onSet);
         },
+        // TODO: fix `symbol` type
+        defineProperty(target, p: string | number, attributes) {
+            const { value } = attributes;
+            createAtomIfNotExists(p, value);
+
+            return Reflect.defineProperty(target, p, attributes);
+        },
     });
 }
 
-export function observe<T>(obj: T, onSet?: (tx: ITransaction) => void): any {
+export function observe<T>(obj: T, onSet?: (tx: ITransaction) => void): T {
     switch (typeof obj) {
         case 'object':
             if (obj === null) return obj;