full coverage at last

lib/src/Navigation.js → lib/src/Navigation.ts

@@ -1,30 +1,32 @@
-const NativeCommandsSender = require('./adapters/NativeCommandsSender');
-const NativeEventsReceiver = require('./adapters/NativeEventsReceiver');
-const UniqueIdProvider = require('./adapters/UniqueIdProvider');
-const Store = require('./components/Store');
-const ComponentRegistry = require('./components/ComponentRegistry');
-const Commands = require('./commands/Commands');
-const LayoutTreeParser = require('./commands/LayoutTreeParser');
-const LayoutTreeCrawler = require('./commands/LayoutTreeCrawler');
-const PrivateEventsListener = require('./events/PrivateEventsListener');
-const PublicEventsRegistry = require('./events/PublicEventsRegistry');
-
+import { NativeCommandsSender } from './adapters/NativeCommandsSender';
+import { NativeEventsReceiver } from './adapters/NativeEventsReceiver';
+import { UniqueIdProvider } from './adapters/UniqueIdProvider';
+import { Store } from './components/Store';
+import { ComponentRegistry } from './components/ComponentRegistry';
+import { Commands } from './commands/Commands';
+import { LayoutTreeParser } from './commands/LayoutTreeParser';
+import { LayoutTreeCrawler } from './commands/LayoutTreeCrawler';
+import { PrivateEventsListener } from './events/PrivateEventsListener';
+import { PublicEventsRegistry } from './events/PublicEventsRegistry';
+import { ComponentProvider } from 'react-native';
 import { Element } from './adapters/Element';
 
 class Navigation {
+  public readonly Element = Element;
+
+  private readonly store = new Store();
+  private readonly nativeEventsReceiver = new NativeEventsReceiver();
+  private readonly uniqueIdProvider = new UniqueIdProvider();
+  private readonly componentRegistry = new ComponentRegistry(this.store);
+  private readonly layoutTreeParser = new LayoutTreeParser();
+  private readonly layoutTreeCrawler = new LayoutTreeCrawler(this.uniqueIdProvider, this.store);
+  private readonly nativeCommandsSender = new NativeCommandsSender();
+  private readonly commands = new Commands(this.nativeCommandsSender, this.layoutTreeParser, this.layoutTreeCrawler);
+  private readonly publicEventsRegistry = new PublicEventsRegistry(this.nativeEventsReceiver);
+  private readonly privateEventsListener = new PrivateEventsListener(this.nativeEventsReceiver, this.store);
+
   constructor() {
-    this.store = new Store();
-    this.nativeEventsReceiver = new NativeEventsReceiver();
-    this.uniqueIdProvider = new UniqueIdProvider();
-    this.componentRegistry = new ComponentRegistry(this.store);
-    this.layoutTreeParser = new LayoutTreeParser();
-    this.layoutTreeCrawler = new LayoutTreeCrawler(this.uniqueIdProvider, this.store);
-    this.nativeCommandsSender = new NativeCommandsSender();
-    this.commands = new Commands(this.nativeCommandsSender, this.layoutTreeParser, this.layoutTreeCrawler);
-    this.publicEventsRegistry = new PublicEventsRegistry(this.nativeEventsReceiver);
-    this.privateEventsListener = new PrivateEventsListener(this.nativeEventsReceiver, this.store);
     this.privateEventsListener.listenAndHandlePrivateEvents();
-    this.Element = Element;
   }
 
   /**
@@ -32,7 +34,7 @@ class Navigation {
    * @param {string} componentName Unique component name
    * @param {function} getComponentClassFunc generator function, typically `() => require('./myComponent')`
    */
-  registerComponent(componentName, getComponentClassFunc) {
+  registerComponent(componentName: string, getComponentClassFunc: ComponentProvider) {
     this.componentRegistry.registerComponent(componentName, getComponentClassFunc);
   }
 

lib/src/commands/LayoutTreeCrawler.test.ts

@@ -1,7 +1,6 @@
-import { LayoutType } from './values/LayoutType';
-import { LayoutTreeCrawler } from './LayoutTreeCrawler';
+import { LayoutType } from './LayoutType';
+import { LayoutTreeCrawler, LayoutNode } from './LayoutTreeCrawler';
 import { UniqueIdProvider } from '../adapters/UniqueIdProvider.mock';
-import { LayoutNode } from './values/LayoutNode';
 import { Store } from '../components/Store';
 
 describe('LayoutTreeCrawler', () => {
@@ -208,4 +207,23 @@ describe('LayoutTreeCrawler', () => {
       expect(node.data.options.innerObj.innerMostObj.anotherColor).toEqual(0xffffff00);
     });
   });
+
+  describe('LayoutNode', () => {
+    it('convertable from same data structure', () => {
+      const x = {
+        id: 'theId',
+        type: LayoutType.Component,
+        data: {},
+        children: []
+      };
+
+      let got;
+      function expectingLayoutNode(param: LayoutNode) {
+        got = param;
+      }
+      expectingLayoutNode(x);
+
+      expect(got).toBe(x);
+    });
+  });
 });

lib/src/commands/LayoutTreeCrawler.ts

@@ -1,7 +1,13 @@
 import * as _ from 'lodash';
 import { OptionsProcessor } from './OptionsProcessor';
-import { LayoutType, isLayoutType } from './values/LayoutType';
-import { LayoutNode } from './values/LayoutNode';
+import { LayoutType, isLayoutType } from './LayoutType';
+
+export interface LayoutNode {
+  id?: string;
+  type: LayoutType;
+  data: object;
+  children: Array<LayoutNode>;
+}
 
 interface IdProvider {
   generate: (str: string) => string;

lib/src/commands/LayoutTreeParser.test.ts

@@ -1,6 +1,6 @@
 import * as  _ from 'lodash';
 import { LayoutTreeParser } from './LayoutTreeParser';
-import { LayoutType } from './values/LayoutType';
+import { LayoutType } from './LayoutType';
 
 describe('LayoutTreeParser', () => {
   let uut;

lib/src/commands/LayoutTreeParser.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
-import { LayoutType } from './values/LayoutType';
-import { LayoutNode } from './values/LayoutNode';
+import { LayoutType } from './LayoutType';
+import { LayoutNode } from './LayoutTreeCrawler';
 
 export class LayoutTreeParser {
   constructor() {

lib/src/commands/values/LayoutNode.test.ts

@@ -1,21 +0,0 @@
-import { LayoutNode } from './LayoutNode';
-import { LayoutType } from './LayoutType';
-
-describe('LayoutNode', () => {
-  it('convertable from same data structure', () => {
-    const x = {
-      id: 'theId',
-      type: LayoutType.Component,
-      data: {},
-      children: []
-    };
-
-    let got;
-    function expectingLayoutNode(param: LayoutNode) {
-      got = param;
-    }
-    expectingLayoutNode(x);
-
-    expect(got).toBe(x);
-  });
-});

lib/src/commands/values/LayoutNode.ts

@@ -1,9 +0,0 @@
-import { LayoutType } from "./LayoutType";
-
-export interface LayoutNode {
-  id?: string;
-  type: LayoutType;
-  data: object;
-  children: Array<LayoutNode>;
-}
-

lib/src/commands/values/Options.test.ts

@@ -1,6 +0,0 @@
-import { Options } from "./Options";
-
-describe('Options', () => {
-  it('valueType', () => {
-  });
-});

lib/src/commands/values/Options.ts

@@ -1,3 +0,0 @@
-export interface Options {
-
-}