trying to convert to a tree

ios/RNNControllerFactory.m

@@ -11,7 +11,14 @@
     NSString* containerName = layout[@"container"][@"name"];
     NSString* containerId = layout[@"container"][@"id"];
     
-    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNN.instance.bridge moduleName:containerName initialProperties:@{@"containerId": containerId}];
+    return [RNNControllerFactory create:containerName containerId:containerId];
+}
+
++(UIViewController*)create:(NSString*)containerName containerId:(NSString*)containerId
+{
+    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNN.instance.bridge
+                                                      moduleName:containerName
+                                               initialProperties:@{@"containerId": containerId}];
     
     UIViewController* controller = [UIViewController new];
     controller.view = reactView;

src/commands/Commands.test.js

@@ -4,7 +4,7 @@ describe('Commands', () => {
     startApp: jest.fn()
   };
   const mockIdProvider = {
-    generate: (prefix) => `${prefix}UNIQUE`
+    generate: (prefix) => `${prefix}UNIQUE_ID`
   };
 
   beforeEach(() => {
@@ -20,7 +20,12 @@ describe('Commands', () => {
         }
       });
       expect(mockCommandsSender.startApp).toHaveBeenCalledTimes(1);
-      //TODO
+      expect(mockCommandsSender.startApp).toHaveBeenCalledWith({
+        container: {
+          name: 'com.example.MyScreen',
+          id: 'containerUNIQUE_ID'
+        }
+      });
     });
   });
 });

src/commands/LayoutTreeParser.js

@@ -6,7 +6,7 @@ export default class LayoutTreeParser {
   }
 
   parse(params) {
-    const layout = _.merge({}, params);
+    const layout = _.cloneDeep(params);
     if (layout.container) {
       layout.container.id = this.uniqueIdProvider.generate(`container`);
     }

src/commands/LayoutTreeParser.test.js

@@ -1,121 +1,28 @@
-xdescribe('LayoutTreeParser', () => {
-  let LayoutBuilder;
+import * as SimpleLayouts from './SimpleLayouts';
+
+describe('LayoutTreeParser', () => {
+  let uut;
 
   beforeEach(() => {
-    jest.mock('../adapters/UniqueIdProvider');
-    LayoutBuilder = require('./LayoutTreeParser');
+    const uniqueIdProvider = {generate: (p) => `${p}UNIQUE_ID`};
+    const LayoutTreeParser = require('./LayoutTreeParser').default;
+    uut = new LayoutTreeParser(uniqueIdProvider);
   });
 
-  describe('parse', () => {
-    it('deeply clones input params', () => {
-      const input = {inner: {value: 1}};
-      expect(LayoutBuilder.parse(input)).not.toBe(input);
-      expect(LayoutBuilder.parse(input).inner).not.toBe(input.inner);
-    });
-
-    it('adds uniqueId to passed container', () => {
-      expect(LayoutBuilder.parse({
-        container: {
-          name: 'com.example.MyScreen'
-        }
-      })).toEqual({
-        container: {
-          name: 'com.example.MyScreen',
-          id: 'containerUNIQUE'
-        }
-      });
-    });
+  it('returns a deep clone', () => {
+    const input = {inner: {foo: {bar: 1}}};
+    expect(uut.parse(input)).not.toBe(input);
+    expect(uut.parse(input).inner).not.toBe(input.inner);
+    expect(uut.parse(input).inner.foo).not.toBe(input.inner.foo);
+  });
 
-    it('adds uniqueId to passed sideMenu', () => {
-      expect(LayoutBuilder.parse({
-        container: {
-          name: 'com.example.MyScreen'
-        },
-        sideMenu: {
-          left: {
-            name: 'com.example.SideMenu1'
-          },
-          right: {
-            name: 'com.example.SideMenu2'
-          }
-        }
-      })).toEqual({
-        container: {
-          name: 'com.example.MyScreen',
-          id: 'containerUNIQUE'
-        },
-        sideMenu: {
-          left: {
-            name: 'com.example.SideMenu1',
-            id: 'containerUNIQUE'
-          },
-          right: {
-            name: 'com.example.SideMenu2',
-            id: 'containerUNIQUE'
-          }
-        }
-      });
-    });
+  it('adds uniqueId to containers', () => {
+    const input = {container: {}};
+    expect(uut.parse(input)).toEqual({container: {id: 'containerUNIQUE_ID'}});
+  });
 
-    it('adds uniqueId to passed tabs', () => {
-      expect(LayoutBuilder.parse({
-        tabs: [
-          {
-            container: {
-              name: 'com.example.FirstTab'
-            }
-          },
-          {
-            container: {
-              name: 'com.example.SecondTab'
-            }
-          },
-          {
-            container: {
-              name: 'com.example.FirstTab'
-            }
-          }
-        ],
-        sideMenu: {
-          left: {
-            name: 'com.example.Menu1'
-          },
-          right: {
-            name: 'com.example.Menu2'
-          }
-        }
-      })).toEqual({
-        tabs: [
-          {
-            container: {
-              name: 'com.example.FirstTab',
-              id: 'containerUNIQUE'
-            }
-          },
-          {
-            container: {
-              name: 'com.example.SecondTab',
-              id: 'containerUNIQUE'
-            }
-          },
-          {
-            container: {
-              name: 'com.example.FirstTab',
-              id: 'containerUNIQUE'
-            }
-          }
-        ],
-        sideMenu: {
-          left: {
-            name: 'com.example.Menu1',
-            id: 'containerUNIQUE'
-          },
-          right: {
-            name: 'com.example.Menu2',
-            id: 'containerUNIQUE'
-          }
-        }
-      });
-    });
+  it('parses simple structures', () => {
+    uut.parse(SimpleLayouts.singleScreenApp);
+    //TODO
   });
 });

src/commands/SimpleLayouts.js

@@ -0,0 +1,91 @@
+export const singleScreenApp = {
+  container: {
+    name: 'com.example.MyScreen'
+  }
+};
+
+export const tabBasedApp = {
+  tabs: [
+    {
+      container: {
+        name: 'com.example.FirstTab'
+      }
+    },
+    {
+      container: {
+        name: 'com.example.SecondTab'
+      }
+    },
+    {
+      container: {
+        name: 'com.example.FirstTab'
+      }
+    }
+  ]
+};
+
+export const singleWithSideMenu = {
+  container: {
+    name: 'com.example.MyScreen'
+  },
+  sideMenu: {
+    left: {
+      container: {
+        name: 'com.example.MyScreen'
+      }
+    }
+  }
+};
+
+export const singleWithRightSideMenu = {
+  container: {
+    name: 'com.example.MyScreen'
+  },
+  sideMenu: {
+    right: {
+      name: 'com.example.Menu'
+    }
+  }
+};
+
+export const singleWithBothMenus = {
+  container: {
+    name: 'com.example.MyScreen'
+  },
+  sideMenu: {
+    left: {
+      name: 'com.example.Menu1'
+    },
+    right: {
+      name: 'com.example.Menu2'
+    }
+  }
+};
+
+export const tabBasedWithSideMenu = {
+  tabs: [
+    {
+      container: {
+        name: 'com.example.FirstTab'
+      }
+    },
+    {
+      container: {
+        name: 'com.example.SecondTab'
+      }
+    },
+    {
+      container: {
+        name: 'com.example.FirstTab'
+      }
+    }
+  ],
+  sideMenu: {
+    left: {
+      name: 'com.example.Menu1'
+    },
+    right: {
+      name: 'com.example.Menu2'
+    }
+  }
+};

src/commands/ValidCommands.js

@@ -1,91 +0,0 @@
-//export const singleScreenApp = {
-//  container: {
-//    name: 'com.example.MyScreen'
-//  }
-//};
-//
-//export const tabBasedApp = {
-//  tabs: [
-//    {
-//      container: {
-//        name: 'com.example.FirstTab'
-//      }
-//    },
-//    {
-//      container: {
-//        name: 'com.example.SecondTab'
-//      }
-//    },
-//    {
-//      container: {
-//        name: 'com.example.FirstTab'
-//      }
-//    }
-//  ]
-//};
-//
-//export const singleWithSideMenu = {
-//  container: {
-//    name: 'com.example.MyScreen'
-//  },
-//  sideMenu: {
-//    left: {
-//      container: {
-//        name: 'com.example.MyScreen'
-//      }
-//    }
-//  }
-//};
-//
-//export const singleWithRightSideMenu = {
-//  container: {
-//    name: 'com.example.MyScreen'
-//  },
-//  sideMenu: {
-//    right: {
-//      name: 'com.example.Menu'
-//    }
-//  }
-//};
-//
-//export const singleWithBothMenus = {
-//  container: {
-//    name: 'com.example.MyScreen'
-//  },
-//  sideMenu: {
-//    left: {
-//      name: 'com.example.Menu1'
-//    },
-//    right: {
-//      name: 'com.example.Menu2'
-//    }
-//  }
-//};
-//
-//export const tabBasedWithSideMenu = {
-//  tabs: [
-//    {
-//      container: {
-//        name: 'com.example.FirstTab'
-//      }
-//    },
-//    {
-//      container: {
-//        name: 'com.example.SecondTab'
-//      }
-//    },
-//    {
-//      container: {
-//        name: 'com.example.FirstTab'
-//      }
-//    }
-//  ],
-//  sideMenu: {
-//    left: {
-//      name: 'com.example.Menu1'
-//    },
-//    right: {
-//      name: 'com.example.Menu2'
-//    }
-//  }
-//};