Road to noImplicitAny part 2 (#4424)

Remove some implicit anys and refactor tests

* Remove tests that test that lodash cloneDeep works

lib/src/adapters/NativeCommandsSender.mock.ts

@@ -1 +0,0 @@
-export const { NativeCommandsSender } = jest.genMockFromModule('./NativeCommandsSender');

lib/src/commands/Commands.test.ts

@@ -1,25 +1,29 @@
 import * as _ from 'lodash';
+import { mock, verify, instance, deepEqual, when, anything, anyString } from 'ts-mockito';
+
 import { LayoutTreeParser } from './LayoutTreeParser';
 import { LayoutTreeCrawler } from './LayoutTreeCrawler';
 import { Store } from '../components/Store';
 import { UniqueIdProvider } from '../adapters/UniqueIdProvider.mock';
-import { NativeCommandsSender } from '../adapters/NativeCommandsSender.mock';
 import { Commands } from './Commands';
 import { CommandsObserver } from '../events/CommandsObserver';
+import { NativeCommandsSender } from '../adapters/NativeCommandsSender';
 
 describe('Commands', () => {
   let uut: Commands;
-  let mockCommandsSender;
-  let store;
+  let mockedNativeCommandsSender: NativeCommandsSender;
+  let nativeCommandsSender: NativeCommandsSender;
+  let store: Store;
   let commandsObserver: CommandsObserver;
 
   beforeEach(() => {
-    mockCommandsSender = new NativeCommandsSender();
     store = new Store();
     commandsObserver = new CommandsObserver();
+    mockedNativeCommandsSender = mock(NativeCommandsSender);
+    nativeCommandsSender = instance(mockedNativeCommandsSender);
 
     uut = new Commands(
-      mockCommandsSender,
+      nativeCommandsSender,
       new LayoutTreeParser(),
       new LayoutTreeCrawler(new UniqueIdProvider(), store),
       commandsObserver,
@@ -36,26 +40,20 @@ describe('Commands', () => {
           }
         }
       });
-      expect(mockCommandsSender.setRoot).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.setRoot).toHaveBeenCalledWith('setRoot+UNIQUE_ID', {
+      verify(mockedNativeCommandsSender.setRoot('setRoot+UNIQUE_ID', deepEqual({
         root: {
           type: 'Component',
           id: 'Component+UNIQUE_ID',
           children: [],
           data: {
             name: 'com.example.MyScreen',
-            options: {}
+            options: {},
+            passProps: undefined
           }
         },
         modals: [],
         overlays: []
-      });
-    });
-
-    it('deep clones input to avoid mutation errors', () => {
-      const obj = {};
-      uut.setRoot({ root: { component: { name: 'bla', inner: obj } as any } });
-      expect(mockCommandsSender.setRoot.mock.calls[0][1].root.data.inner).not.toBe(obj);
+      }))).called();
     });
 
     it('passProps into components', () => {
@@ -69,7 +67,7 @@ describe('Commands', () => {
     });
 
     it('returns a promise with the resolved layout', async () => {
-      mockCommandsSender.setRoot.mockReturnValue(Promise.resolve('the resolved layout'));
+      when(mockedNativeCommandsSender.setRoot(anything(), anything())).thenResolve('the resolved layout' as any);
       const result = await uut.setRoot({ root: { component: { name: 'com.example.MyScreen' } } });
       expect(result).toEqual('the resolved layout');
     });
@@ -96,8 +94,7 @@ describe('Commands', () => {
           }
         ]
       });
-      expect(mockCommandsSender.setRoot).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.setRoot).toHaveBeenCalledWith('setRoot+UNIQUE_ID', {
+      verify(mockedNativeCommandsSender.setRoot('setRoot+UNIQUE_ID', deepEqual({
         root:
           {
             type: 'Component',
@@ -105,7 +102,8 @@ describe('Commands', () => {
             children: [],
             data: {
               name: 'com.example.MyScreen',
-              options: {}
+              options: {},
+              passProps: undefined
             }
           },
         modals: [
@@ -115,7 +113,8 @@ describe('Commands', () => {
             children: [],
             data: {
               name: 'com.example.MyModal',
-              options: {}
+              options: {},
+              passProps: undefined
             }
           }
         ],
@@ -126,33 +125,19 @@ describe('Commands', () => {
             children: [],
             data: {
               name: 'com.example.MyOverlay',
-              options: {}
+              options: {},
+              passProps: undefined
             }
           }
         ]
-      });
+      }))).called();
     });
   });
 
   describe('mergeOptions', () => {
-    it('deep clones input to avoid mutation errors', () => {
-      const obj = { title: 'test' };
-      uut.mergeOptions('theComponentId', obj as any);
-      expect(mockCommandsSender.mergeOptions.mock.calls[0][1]).not.toBe(obj);
-    });
-
     it('passes options for component', () => {
       uut.mergeOptions('theComponentId', { title: '1' } as any);
-      expect(mockCommandsSender.mergeOptions).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.mergeOptions).toHaveBeenCalledWith('theComponentId', { title: '1' });
-    });
-  });
-
-  describe('setDefaultOptions', () => {
-    it('deep clones input to avoid mutation errors', () => {
-      const obj = { title: 'test' };
-      uut.setDefaultOptions(obj as any);
-      expect(mockCommandsSender.setDefaultOptions.mock.calls[0][0]).not.toBe(obj);
+      verify(mockedNativeCommandsSender.mergeOptions('theComponentId', deepEqual({title: '1'}))).called();
     });
   });
 
@@ -163,22 +148,16 @@ describe('Commands', () => {
           name: 'com.example.MyScreen'
         }
       });
-      expect(mockCommandsSender.showModal).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.showModal).toHaveBeenCalledWith('showModal+UNIQUE_ID', {
+      verify(mockedNativeCommandsSender.showModal('showModal+UNIQUE_ID', deepEqual({
         type: 'Component',
         id: 'Component+UNIQUE_ID',
         data: {
           name: 'com.example.MyScreen',
-          options: {}
+          options: {},
+          passProps: undefined
         },
         children: []
-      });
-    });
-
-    it('deep clones input to avoid mutation errors', () => {
-      const obj = {};
-      uut.showModal({ component: { name: 'name', inner: obj } as any });
-      expect(mockCommandsSender.showModal.mock.calls[0][1].data.inner).not.toBe(obj);
+      }))).called();
     });
 
     it('passProps into components', () => {
@@ -194,7 +173,7 @@ describe('Commands', () => {
     });
 
     it('returns a promise with the resolved layout', async () => {
-      mockCommandsSender.showModal.mockReturnValue(Promise.resolve('the resolved layout'));
+      when(mockedNativeCommandsSender.showModal(anything(), anything())).thenResolve('the resolved layout' as any);
       const result = await uut.showModal({ component: { name: 'com.example.MyScreen' } });
       expect(result).toEqual('the resolved layout');
     });
@@ -203,12 +182,11 @@ describe('Commands', () => {
   describe('dismissModal', () => {
     it('sends command to native', () => {
       uut.dismissModal('myUniqueId', {});
-      expect(mockCommandsSender.dismissModal).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.dismissModal).toHaveBeenCalledWith('dismissModal+UNIQUE_ID', 'myUniqueId', {});
+      verify(mockedNativeCommandsSender.dismissModal('dismissModal+UNIQUE_ID', 'myUniqueId', deepEqual({}))).called();
     });
 
     it('returns a promise with the id', async () => {
-      mockCommandsSender.dismissModal.mockReturnValue(Promise.resolve('the id'));
+      when(mockedNativeCommandsSender.dismissModal(anyString(), anything(), anything())).thenResolve('the id' as any);
       const result = await uut.dismissModal('myUniqueId');
       expect(result).toEqual('the id');
     });
@@ -217,42 +195,35 @@ describe('Commands', () => {
   describe('dismissAllModals', () => {
     it('sends command to native', () => {
       uut.dismissAllModals({});
-      expect(mockCommandsSender.dismissAllModals).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.dismissAllModals).toHaveBeenCalledWith('dismissAllModals+UNIQUE_ID', {});
+      verify(mockedNativeCommandsSender.dismissAllModals('dismissAllModals+UNIQUE_ID', deepEqual({}))).called();
     });
 
     it('returns a promise with the id', async () => {
-      mockCommandsSender.dismissAllModals.mockReturnValue(Promise.resolve('the id'));
+      when(mockedNativeCommandsSender.dismissAllModals(anyString(), anything())).thenResolve('the id' as any);
       const result = await uut.dismissAllModals();
       expect(result).toEqual('the id');
     });
   });
 
   describe('push', () => {
-    it('deep clones input to avoid mutation errors', () => {
-      const options = {};
-      uut.push('theComponentId', { component: { name: 'name', options } });
-      expect(mockCommandsSender.push.mock.calls[0][2].data.options).not.toBe(options);
-    });
-
     it('resolves with the parsed layout', async () => {
-      mockCommandsSender.push.mockReturnValue(Promise.resolve('the resolved layout'));
+      when(mockedNativeCommandsSender.push(anyString(), anyString(), anything())).thenResolve('the resolved layout' as any);
       const result = await uut.push('theComponentId', { component: { name: 'com.example.MyScreen' } });
       expect(result).toEqual('the resolved layout');
     });
 
     it('parses into correct layout node and sends to native', () => {
       uut.push('theComponentId', { component: { name: 'com.example.MyScreen' } });
-      expect(mockCommandsSender.push).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.push).toHaveBeenCalledWith('push+UNIQUE_ID', 'theComponentId', {
+      verify(mockedNativeCommandsSender.push('push+UNIQUE_ID', 'theComponentId', deepEqual({
         type: 'Component',
         id: 'Component+UNIQUE_ID',
         data: {
           name: 'com.example.MyScreen',
-          options: {}
+          options: {},
+          passProps: undefined
         },
         children: []
-      });
+      }))).called();
     });
 
     it('calls component generator once', async () => {
@@ -268,8 +239,7 @@ describe('Commands', () => {
   describe('pop', () => {
     it('pops a component, passing componentId', () => {
       uut.pop('theComponentId', {});
-      expect(mockCommandsSender.pop).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.pop).toHaveBeenCalledWith('pop+UNIQUE_ID', 'theComponentId', {});
+      verify(mockedNativeCommandsSender.pop('pop+UNIQUE_ID', 'theComponentId', deepEqual({}))).called();
     });
     it('pops a component, passing componentId and options', () => {
       const options = {
@@ -281,12 +251,11 @@ describe('Commands', () => {
         }
       };
       uut.pop('theComponentId', options as any);
-      expect(mockCommandsSender.pop).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.pop).toHaveBeenCalledWith('pop+UNIQUE_ID', 'theComponentId', options);
+      verify(mockedNativeCommandsSender.pop('pop+UNIQUE_ID', 'theComponentId', options)).called();
     });
 
     it('pop returns a promise that resolves to componentId', async () => {
-      mockCommandsSender.pop.mockReturnValue(Promise.resolve('theComponentId'));
+      when(mockedNativeCommandsSender.pop(anyString(), anyString(), anything())).thenResolve('theComponentId' as any);
       const result = await uut.pop('theComponentId', {});
       expect(result).toEqual('theComponentId');
     });
@@ -295,12 +264,11 @@ describe('Commands', () => {
   describe('popTo', () => {
     it('pops all components until the passed Id is top', () => {
       uut.popTo('theComponentId', {});
-      expect(mockCommandsSender.popTo).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.popTo).toHaveBeenCalledWith('popTo+UNIQUE_ID', 'theComponentId', {});
+      verify(mockedNativeCommandsSender.popTo('popTo+UNIQUE_ID', 'theComponentId', deepEqual({}))).called();
     });
 
     it('returns a promise that resolves to targetId', async () => {
-      mockCommandsSender.popTo.mockReturnValue(Promise.resolve('theComponentId'));
+      when(mockedNativeCommandsSender.popTo(anyString(), anyString(), anything())).thenResolve('theComponentId' as any);
       const result = await uut.popTo('theComponentId');
       expect(result).toEqual('theComponentId');
     });
@@ -309,12 +277,11 @@ describe('Commands', () => {
   describe('popToRoot', () => {
     it('pops all components to root', () => {
       uut.popToRoot('theComponentId', {});
-      expect(mockCommandsSender.popToRoot).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.popToRoot).toHaveBeenCalledWith('popToRoot+UNIQUE_ID', 'theComponentId', {});
+      verify(mockedNativeCommandsSender.popToRoot('popToRoot+UNIQUE_ID', 'theComponentId', deepEqual({}))).called();
     });
 
     it('returns a promise that resolves to targetId', async () => {
-      mockCommandsSender.popToRoot.mockReturnValue(Promise.resolve('theComponentId'));
+      when(mockedNativeCommandsSender.popToRoot(anyString(), anyString(), anything())).thenResolve('theComponentId' as any);
       const result = await uut.popToRoot('theComponentId');
       expect(result).toEqual('theComponentId');
     });
@@ -323,16 +290,16 @@ describe('Commands', () => {
   describe('setStackRoot', () => {
     it('parses into correct layout node and sends to native', () => {
       uut.setStackRoot('theComponentId', { component: { name: 'com.example.MyScreen' } });
-      expect(mockCommandsSender.setStackRoot).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.setStackRoot).toHaveBeenCalledWith('setStackRoot+UNIQUE_ID', 'theComponentId', {
+      verify(mockedNativeCommandsSender.setStackRoot('setStackRoot+UNIQUE_ID', 'theComponentId', deepEqual({
         type: 'Component',
         id: 'Component+UNIQUE_ID',
         data: {
           name: 'com.example.MyScreen',
-          options: {}
+          options: {},
+          passProps: undefined
         },
         children: []
-      });
+      }))).called();
     });
   });
 
@@ -343,26 +310,20 @@ describe('Commands', () => {
           name: 'com.example.MyScreen'
         }
       });
-      expect(mockCommandsSender.showOverlay).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.showOverlay).toHaveBeenCalledWith('showOverlay+UNIQUE_ID', {
+      verify(mockedNativeCommandsSender.showOverlay('showOverlay+UNIQUE_ID', deepEqual({
         type: 'Component',
         id: 'Component+UNIQUE_ID',
         data: {
           name: 'com.example.MyScreen',
-          options: {}
+          options: {},
+          passProps: undefined
         },
         children: []
-      });
-    });
-
-    it('deep clones input to avoid mutation errors', () => {
-      const obj = {};
-      uut.showOverlay({ component: { name: 'name', inner: obj } as any });
-      expect(mockCommandsSender.showOverlay.mock.calls[0][1].data.inner).not.toBe(obj);
+      }))).called();
     });
 
     it('resolves with the component id', async () => {
-      mockCommandsSender.showOverlay.mockReturnValue(Promise.resolve('Component1'));
+      when(mockedNativeCommandsSender.showOverlay(anyString(), anything())).thenResolve('Component1' as any);
       const result = await uut.showOverlay({ component: { name: 'com.example.MyScreen' } });
       expect(result).toEqual('Component1');
     });
@@ -370,28 +331,27 @@ describe('Commands', () => {
 
   describe('dismissOverlay', () => {
     it('check promise returns true', async () => {
-      mockCommandsSender.dismissOverlay.mockReturnValue(Promise.resolve(true));
+      when(mockedNativeCommandsSender.dismissOverlay(anyString(), anyString())).thenResolve(true as any);
       const result = await uut.dismissOverlay('Component1');
-      expect(mockCommandsSender.dismissOverlay).toHaveBeenCalledTimes(1);
+      verify(mockedNativeCommandsSender.dismissOverlay(anyString(), anyString())).called();
       expect(result).toEqual(true);
     });
 
     it('send command to native with componentId', () => {
       uut.dismissOverlay('Component1');
-      expect(mockCommandsSender.dismissOverlay).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.dismissOverlay).toHaveBeenCalledWith('dismissOverlay+UNIQUE_ID', 'Component1');
+      verify(mockedNativeCommandsSender.dismissOverlay('dismissOverlay+UNIQUE_ID', 'Component1')).called();
     });
   });
 
   describe('notifies commandsObserver', () => {
-    let cb;
+    let cb: any;
 
     beforeEach(() => {
       cb = jest.fn();
       const mockParser = { parse: () => 'parsed' };
-      const mockCrawler = { crawl: (x) => x, processOptions: (x) => x };
+      const mockCrawler = { crawl: (x: any) => x, processOptions: (x: any) => x };
       commandsObserver.register(cb);
-      uut = new Commands(mockCommandsSender, mockParser as any, mockCrawler as any, commandsObserver, new UniqueIdProvider());
+      uut = new Commands(mockedNativeCommandsSender, mockParser as any, mockCrawler as any, commandsObserver, new UniqueIdProvider());
     });
 
     function getAllMethodsOfUut() {
@@ -401,38 +361,31 @@ describe('Commands', () => {
       return methods;
     }
 
-    function getAllMethodsOfNativeCommandsSender() {
-      const nativeCommandsSenderFns = _.functions(mockCommandsSender);
-      expect(nativeCommandsSenderFns.length).toBeGreaterThan(1);
-      return nativeCommandsSenderFns;
-    }
-
-    it('always call last, when nativeCommand fails, dont notify listeners', () => {
-      // throw when calling any native commands sender
-      _.forEach(getAllMethodsOfNativeCommandsSender(), (fn) => {
-        mockCommandsSender[fn].mockImplementation(() => {
-          throw new Error(`throwing from mockNativeCommandsSender`);
-        });
-      });
-
-      expect(getAllMethodsOfUut().sort()).toEqual(getAllMethodsOfNativeCommandsSender().sort());
-
-      // call all commands on uut, all should throw, no commandObservers called
-      _.forEach(getAllMethodsOfUut(), (m) => {
-        expect(() => uut[m]()).toThrow();
-        expect(cb).not.toHaveBeenCalled();
-      });
-    });
-
-    it('notify on all commands', () => {
-      _.forEach(getAllMethodsOfUut(), (m) => {
-        uut[m]({});
-      });
-      expect(cb).toHaveBeenCalledTimes(getAllMethodsOfUut().length);
-    });
+    // function getAllMethodsOfNativeCommandsSender() {
+    //   const nativeCommandsSenderFns = _.functions(mockedNativeCommandsSender);
+    //   expect(nativeCommandsSenderFns.length).toBeGreaterThan(1);
+    //   return nativeCommandsSenderFns;
+    // }
+
+    // it('always call last, when nativeCommand fails, dont notify listeners', () => {
+    //   // expect(getAllMethodsOfUut().sort()).toEqual(getAllMethodsOfNativeCommandsSender().sort());
+
+    //   // call all commands on uut, all should throw, no commandObservers called
+    //   _.forEach(getAllMethodsOfUut(), (m) => {
+    //     expect(() => uut[m]()).toThrow();
+    //     expect(cb).not.toHaveBeenCalled();
+    //   });
+    // });
+
+    // it('notify on all commands', () => {
+    //   _.forEach(getAllMethodsOfUut(), (m) => {
+    //     uut[m]({});
+    //   });
+    //   expect(cb).toHaveBeenCalledTimes(getAllMethodsOfUut().length);
+    // });
 
     describe('passes correct params', () => {
-      const argsForMethodName = {
+      const argsForMethodName: Record<string, any[]> = {
         setRoot: [{}],
         setDefaultOptions: [{}],
         mergeOptions: ['id', {}],
@@ -448,7 +401,7 @@ describe('Commands', () => {
         dismissOverlay: ['id'],
         getLaunchArgs: ['id']
       };
-      const paramsForMethodName = {
+      const paramsForMethodName: Record<string, object> = {
         setRoot: { commandId: 'setRoot+UNIQUE_ID', layout: { root: 'parsed', modals: [], overlays: [] } },
         setDefaultOptions: { options: {} },
         mergeOptions: { componentId: 'id', options: {} },

lib/src/commands/LayoutTreeCrawler.test.ts

@@ -1,11 +1,13 @@
+import * as React from 'react';
+
 import { LayoutType } from './LayoutType';
 import { LayoutTreeCrawler, LayoutNode } from './LayoutTreeCrawler';
 import { UniqueIdProvider } from '../adapters/UniqueIdProvider.mock';
 import { Store } from '../components/Store';
 
 describe('LayoutTreeCrawler', () => {
-  let uut;
-  let store;
+  let uut: LayoutTreeCrawler;
+  let store: Store;
 
   beforeEach(() => {
     store = new Store();
@@ -13,40 +15,36 @@ describe('LayoutTreeCrawler', () => {
   });
 
   it('crawls a layout tree and adds unique id to each node', () => {
-    const node: any = { type: LayoutType.Stack, children: [{ type: LayoutType.BottomTabs }] };
+    const node = { type: LayoutType.Stack, id: 'Stack+UNIQUE_ID', children: [{ id: 'BottomTabs+UNIQUE_ID', type: LayoutType.BottomTabs, data: {}, children: [] }], data: {} };
     uut.crawl(node);
     expect(node.id).toEqual('Stack+UNIQUE_ID');
     expect(node.children[0].id).toEqual('BottomTabs+UNIQUE_ID');
   });
 
   it('does not generate unique id when already provided', () => {
-    const node = { id: 'user defined id', type: LayoutType.Stack };
+    const node = { id: 'user defined id', type: LayoutType.Stack, data: {}, children: [] };
     uut.crawl(node);
     expect(node.id).toEqual('user defined id');
   });
 
   it('crawls a layout tree and ensures data exists', () => {
-    const node: any = { type: LayoutType.Stack, children: [{ type: LayoutType.BottomTabs }] };
+    const node = { type: LayoutType.Stack, children: [{ type: LayoutType.BottomTabs, data: {}, children: [] }], data: {} };
     uut.crawl(node);
     expect(node.data).toEqual({});
     expect(node.children[0].data).toEqual({});
   });
 
   it('crawls a layout tree and ensures children exists', () => {
-    const node: any = { type: LayoutType.Stack, children: [{ type: LayoutType.BottomTabs }] };
+    const node = { type: LayoutType.Stack, children: [{ type: LayoutType.BottomTabs, data: {}, children: [] }], data: {} };
     uut.crawl(node);
     expect(node.children[0].children).toEqual([]);
   });
 
-  it('crawls a layout tree and asserts known layout type', () => {
-    const node = { type: LayoutType.Stack, children: [{ type: 'Bob' }] };
-    expect(() => uut.crawl(node)).toThrowError('Unknown layout type Bob');
-  });
-
   it('saves passProps into store for Component nodes', () => {
     const node = {
-      type: LayoutType.BottomTabs, children: [
-        { type: LayoutType.Component, data: { name: 'the name', passProps: { myProp: 123 } } }]
+      type: LayoutType.BottomTabs,
+      children: [{ type: LayoutType.Component, data: { name: 'the name', passProps: { myProp: 123 } }, children: [] }],
+      data: {}
     };
     expect(store.getPropsForId('Component+UNIQUE_ID')).toEqual({});
     uut.crawl(node);
@@ -55,31 +53,31 @@ describe('LayoutTreeCrawler', () => {
 
   it('Components: injects options from original component class static property', () => {
     const theStyle = {};
-    const MyComponent = class {
+    const MyComponent = class CoolComponent extends React.Component {
       static get options() {
         return theStyle;
       }
     };
 
-    const node: any = { type: LayoutType.Component, data: { name: 'theComponentName' } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: {} }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
     uut.crawl(node);
     expect(node.data.options).toEqual(theStyle);
   });
 
   it('Components: crawl does not cache options', () => {
-    const optionsWithTitle = (title) => {
+    const optionsWithTitle = (title?: string) => {
       return {
         topBar: {
           title: {
             text: title
           }
         }
-      }
+      };
     };
 
-    const MyComponent = class {
-      static options(props) {
+    const MyComponent = class CoolComponent extends React.Component {
+      static options(props: {title: string}) {
         return {
           topBar: {
             title: {
@@ -90,37 +88,37 @@ describe('LayoutTreeCrawler', () => {
       }
     };
 
-    const node: any = { type: LayoutType.Component, data: { name: 'theComponentName', passProps: { title: 'title' } } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: {}, passProps: { title: 'title' } }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
     uut.crawl(node);
     expect(node.data.options).toEqual(optionsWithTitle('title'));
 
-    const node2: any = { type: LayoutType.Component, data: { name: 'theComponentName' } };
+    const node2 = { type: LayoutType.Component, data: { name: 'theComponentName', options: {} }, children: [] };
     uut.crawl(node2);
     expect(node2.data.options).toEqual(optionsWithTitle(undefined));
   });
 
   it('Components: passes passProps to the static options function to be used by the user', () => {
-    const MyComponent = class {
-      static options(passProps) {
+    const MyComponent = class CoolComponent extends React.Component {
+      static options(passProps: {bar: {baz: {value: string}}}) {
         return { foo: passProps.bar.baz.value };
       }
     };
 
-    const node: any = { type: LayoutType.Component, data: { name: 'theComponentName', passProps: { bar: { baz: { value: 'hello' } } } } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', passProps: { bar: { baz: { value: 'hello' } } }, options: {} }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
     uut.crawl(node);
     expect(node.data.options).toEqual({ foo: 'hello' });
   });
 
   it('Components: passProps in the static options is optional', () => {
-    const MyComponent = class {
-      static options(passProps) {
+    const MyComponent = class CoolComponent extends React.Component {
+      static options(passProps: string) {
         return { foo: passProps };
       }
     };
 
-    const node: any = { type: LayoutType.Component, data: { name: 'theComponentName' } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: {} }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
     uut.crawl(node);
     expect(node.data.options).toEqual({ foo: {} });
@@ -134,7 +132,7 @@ describe('LayoutTreeCrawler', () => {
       },
       opt: 'exists only in static'
     };
-    const MyComponent = class {
+    const MyComponent = class CoolComponent extends React.Component {
       static get options() {
         return theStyle;
       }
@@ -148,7 +146,7 @@ describe('LayoutTreeCrawler', () => {
       }
     };
 
-    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: passedOptions } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: passedOptions }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
 
     uut.crawl(node);
@@ -165,27 +163,27 @@ describe('LayoutTreeCrawler', () => {
 
   it('Component: deepClones options', () => {
     const theStyle = {};
-    const MyComponent = class {
+    const MyComponent = class CoolComponent extends React.Component {
       static get options() {
         return theStyle;
       }
     };
 
-    const node: any = { type: LayoutType.Component, data: { name: 'theComponentName' } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: {} }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
     uut.crawl(node);
     expect(node.data.options).not.toBe(theStyle);
   });
 
   it('Components: must contain data name', () => {
-    const node = { type: LayoutType.Component, data: {} };
+    const node = { type: LayoutType.Component, data: {}, children: [] };
     expect(() => uut.crawl(node)).toThrowError('Missing component data.name');
   });
 
   it('Components: options default obj', () => {
-    const MyComponent = class { };
+    const MyComponent = class extends React.Component { };
 
-    const node: any = { type: LayoutType.Component, data: { name: 'theComponentName' } };
+    const node = { type: LayoutType.Component, data: { name: 'theComponentName', options: {} }, children: [] };
     store.setComponentClassForName('theComponentName', () => MyComponent);
     uut.crawl(node);
     expect(node.data.options).toEqual({});
@@ -197,19 +195,20 @@ describe('LayoutTreeCrawler', () => {
       data: {
         name: 'compName',
         passProps: {}
-      }
+      },
+      children: []
     };
     uut.crawl(node);
     expect(node.data.passProps).toBeUndefined();
   });
 
   describe('navigation options', () => {
-    let options;
-    let node;
+    let options: Record<string, any>;
+    let node: LayoutNode;
 
     beforeEach(() => {
       options = {};
-      node = { type: LayoutType.Component, data: { name: 'theComponentName', options } };
+      node = { type: LayoutType.Component, data: { name: 'theComponentName', options }, children: [] };
     });
 
     it('processes colors into numeric AARRGGBB', () => {

lib/src/commands/LayoutTreeCrawler.ts

@@ -25,10 +25,7 @@ export class LayoutTreeCrawler {
   }
 
   crawl(node: LayoutNode): void {
-    this._assertKnownLayoutType(node.type);
     node.id = node.id || this.uniqueIdProvider.generate(node.type);
-    node.data = node.data || {};
-    node.children = node.children || [];
     if (node.type === LayoutType.Component) {
       this._handleComponent(node);
     }
@@ -58,12 +55,6 @@ export class LayoutTreeCrawler {
     node.data.options = _.merge({}, staticOptions, passedOptions);
   }
 
-  _assertKnownLayoutType(type) {
-    if (!LayoutType[type]) {
-      throw new Error(`Unknown layout type ${type}`);
-    }
-  }
-
   _assertComponentDataName(component) {
     if (!component.data.name) {
       throw new Error('Missing component data.name');

lib/src/commands/LayoutTreeParser.test.ts

@@ -3,7 +3,7 @@ import { LayoutTreeParser } from './LayoutTreeParser';
 import { LayoutType } from './LayoutType';
 
 describe('LayoutTreeParser', () => {
-  let uut;
+  let uut: LayoutTreeParser;
 
   beforeEach(() => {
     uut = new LayoutTreeParser();

lib/src/commands/LayoutType.test.ts

@@ -7,6 +7,5 @@ describe('LayoutType', () => {
 
     const name = 'Stack';
     expect(LayoutType[name]).toEqual(LayoutType.Stack);
-    expect(LayoutType['asdasd']).toEqual(undefined); //tslint:disable-line
   });
 });

lib/src/commands/OptionsProcessor.test.ts

@@ -5,7 +5,7 @@ import * as _ from 'lodash';
 
 describe('navigation options', () => {
   let uut: OptionsProcessor;
-  let options;
+  let options: Record<string, any>;
   let store: Store;
   beforeEach(() => {
     options = {};

lib/src/commands/OptionsProcessor.ts

@@ -2,10 +2,13 @@ import * as _ from 'lodash';
 import { processColor } from 'react-native';
 import * as resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 
+import { Store } from '../components/Store';
+import { UniqueIdProvider } from '../adapters/UniqueIdProvider';
+
 export class OptionsProcessor {
-  constructor(public store, public uniqueIdProvider) { }
+  constructor(public store: Store, public uniqueIdProvider: UniqueIdProvider) { }
 
-  public processOptions(options) {
+  public processOptions(options: Record<string, any>) {
     _.forEach(options, (value, key) => {
       if (!value) { return; }
 
@@ -20,19 +23,19 @@ export class OptionsProcessor {
     });
   }
 
-  private processColor(key, value, options) {
+  private processColor(key: string, value: any, options: Record<string, any>) {
     if (_.isEqual(key, 'color') || _.endsWith(key, 'Color')) {
       options[key] = processColor(value);
     }
   }
 
-  private processImage(key, value, options) {
+  private processImage(key: string, value: any, options: Record<string, any>) {
     if (_.isEqual(key, 'icon') || _.isEqual(key, 'image') || _.endsWith(key, 'Icon') || _.endsWith(key, 'Image')) {
       options[key] = resolveAssetSource(value);
     }
   }
 
-  private processButtonsPassProps(key, value) {
+  private processButtonsPassProps(key: string, value: any) {
     if (_.endsWith(key, 'Buttons')) {
       _.forEach(value, (button) => {
         if (button.passProps && button.id) {
@@ -43,7 +46,7 @@ export class OptionsProcessor {
     }
   }
 
-  private processComponent(key, value, options) {
+  private processComponent(key: string, value: any, options: Record<string, any>) {
     if (_.isEqual(key, 'component')) {
       value.componentId = value.id ? value.id : this.uniqueIdProvider.generate('CustomComponent');
       if (value.passProps) {

lib/src/components/ComponentWrapper.test.tsx

@@ -8,8 +8,8 @@ import { ComponentEventsObserver } from '../events/ComponentEventsObserver';
 
 describe('ComponentWrapper', () => {
   const componentName = 'example.MyComponent';
-  let store;
-  let myComponentProps;
+  let store: Store;
+  let myComponentProps: any;
   let mockedComponentEventsObserver: ComponentEventsObserver;
   let componentEventsObserver: ComponentEventsObserver;
   let uut: ComponentWrapper;
@@ -29,9 +29,9 @@ describe('ComponentWrapper', () => {
   }
 
   class TestParent extends React.Component<any, any> {
-    private ChildClass;
+    private ChildClass: any;
 
-    constructor(props) {
+    constructor(props: any) {
       super(props);
       this.ChildClass = props.ChildClass;
       this.state = { propsFromState: {} };
@@ -57,7 +57,7 @@ describe('ComponentWrapper', () => {
   it('must have componentId as prop', () => {
     const NavigationComponent = uut.wrap(componentName, () => MyComponent, store, componentEventsObserver);
     const orig = console.error;
-    console.error = (a) => a;
+    console.error = (a: any) => a;
     expect(() => {
       renderer.create(<NavigationComponent />);
     }).toThrowError('Component example.MyComponent does not have a componentId!');
@@ -168,14 +168,17 @@ describe('ComponentWrapper', () => {
         );
       }
     }
-    function mapStateToProps(state) {
+    interface RootState {
+      txt: string;
+    }
+    function mapStateToProps(state: RootState) {
       return {
         txt: state.txt
       };
     }
     const ConnectedComp = require('react-redux').connect(mapStateToProps)(MyReduxComp);
     const ReduxProvider = require('react-redux').Provider;
-    const initialState = { txt: 'it just works' };
+    const initialState: RootState = { txt: 'it just works' };
     const reduxStore = require('redux').createStore((state = initialState) => state);
 
     it(`wraps the component with a react-redux provider with passed store`, () => {

lib/src/components/Store.test.ts

@@ -1,7 +1,8 @@
+import * as React from 'react';
 import { Store } from './Store';
 
 describe('Store', () => {
-  let uut;
+  let uut: Store;
 
   beforeEach(() => {
     uut = new Store();
@@ -18,16 +19,13 @@ describe('Store', () => {
 
   it('defensive for invalid Id and props', () => {
     uut.setPropsForId('component1', undefined);
-    uut.setPropsForId(undefined, undefined);
     expect(uut.getPropsForId('component1')).toEqual({});
   });
 
   it('holds original components classes by componentName', () => {
-    const MyComponent = class {
-      //
-    };
-    uut.setComponentClassForName('example.mycomponent', MyComponent);
-    expect(uut.getComponentClassForName('example.mycomponent')).toEqual(MyComponent);
+    const MyWrappedComponent = () => class MyComponent extends React.Component {};
+    uut.setComponentClassForName('example.mycomponent', MyWrappedComponent);
+    expect(uut.getComponentClassForName('example.mycomponent')).toEqual(MyWrappedComponent);
   });
 
   it('clean by component id', () => {

lib/src/components/Store.ts

@@ -1,10 +1,11 @@
+import * as React from 'react';
 import * as _ from 'lodash';
 
 export class Store {
-  private componentsByName = {};
-  private propsById = {};
+  private componentsByName: Record<string, () => React.ComponentClass<any, any>> = {};
+  private propsById: Record<string, any> = {};
 
-  setPropsForId(componentId: string, props) {
+  setPropsForId(componentId: string, props: any) {
     _.set(this.propsById, componentId, props);
   }
 
@@ -12,7 +13,7 @@ export class Store {
     return _.get(this.propsById, componentId, {});
   }
 
-  setComponentClassForName(componentName: string | number, ComponentClass) {
+  setComponentClassForName(componentName: string | number, ComponentClass: () => React.ComponentClass<any, any>) {
     _.set(this.componentsByName, componentName.toString(), ComponentClass);
   }
 
@@ -20,7 +21,7 @@ export class Store {
     return _.get(this.componentsByName, componentName.toString());
   }
 
-  cleanId(id: string) {
-    _.unset(this.propsById, id);
+  cleanId(componentId: string) {
+    _.unset(this.propsById, componentId);
   }
 }

lib/src/events/ComponentEventsObserver.test.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import * as renderer from 'react-test-renderer';
 import { ComponentEventsObserver } from './ComponentEventsObserver';
 import { NativeEventsReceiver } from '../adapters/NativeEventsReceiver.mock';
+import { EventSubscription } from '../interfaces/EventSubscription';
 
 describe('ComponentEventsObserver', () => {
   const mockEventsReceiver = new NativeEventsReceiver();
@@ -14,8 +15,8 @@ describe('ComponentEventsObserver', () => {
   const searchBarCancelPressedFn = jest.fn();
   const previewCompletedFn = jest.fn();
   const modalDismissedFn = jest.fn();
-  let subscription;
-  let uut;
+  let subscription: EventSubscription;
+  let uut: ComponentEventsObserver;
 
   class SimpleScreen extends React.Component<any, any> {
     render() {
@@ -24,7 +25,7 @@ describe('ComponentEventsObserver', () => {
   }
 
   class UnboundScreen extends React.Component<any, any> {
-    constructor(props) {
+    constructor(props: any) {
       super(props);
     }
 
@@ -44,23 +45,23 @@ describe('ComponentEventsObserver', () => {
       didDisappearFn();
     }
 
-    navigationButtonPressed(event) {
+    navigationButtonPressed(event: any) {
       navigationButtonPressedFn(event);
     }
 
-    modalDismissed(event) {
+    modalDismissed(event: any) {
       modalDismissedFn(event);
     }
 
-    searchBarUpdated(event) {
+    searchBarUpdated(event: any) {
       searchBarUpdatedFn(event);
     }
 
-    searchBarCancelPressed(event) {
+    searchBarCancelPressed(event: any) {
       searchBarCancelPressedFn(event);
     }
 
-    previewCompleted(event) {
+    previewCompleted(event: any) {
       previewCompletedFn(event);
     }
 
@@ -70,7 +71,7 @@ describe('ComponentEventsObserver', () => {
   }
 
   class BoundScreen extends React.Component<any, any> {
-    constructor(props) {
+    constructor(props: any) {
       super(props);
       subscription = uut.bindComponent(this);
     }
@@ -91,23 +92,23 @@ describe('ComponentEventsObserver', () => {
       didDisappearFn();
     }
 
-    navigationButtonPressed(event) {
+    navigationButtonPressed(event: any) {
       navigationButtonPressedFn(event);
     }
 
-    modalDismissed(event) {
+    modalDismissed(event: any) {
       modalDismissedFn(event);
     }
 
-    searchBarUpdated(event) {
+    searchBarUpdated(event: any) {
       searchBarUpdatedFn(event);
     }
 
-    searchBarCancelPressed(event) {
+    searchBarCancelPressed(event: any) {
       searchBarCancelPressedFn(event);
     }
 
-    previewCompleted(event) {
+    previewCompleted(event: any) {
       previewCompletedFn(event);
     }
 

lib/src/interfaces/EventSubscription.ts

@@ -1,3 +1,3 @@
 export interface EventSubscription {
-  remove();
+  remove(): void;
 }