Switched out nodemon to watch and run test. Implemented parents from …

…issue #1

package.json

@@ -16,20 +16,13 @@
     "after-effects": "^0.3.2",
     "babel-cli": "^6.6.5",
     "babel-preset-es2015": "^6.6.0",
-    "npm-watch": "^0.1.1",
+    "nodemon": "^1.9.1",
     "opn-cli": "^3.1.0",
     "tape": "^4.5.1"
   },
-  "watch": {
-    "test-build-run": {
-      "patterns": ["src", "test"],
-      "extensions": "js",
-      "ignore": "test/aeToJSON.js"
-    }
-  },
   "scripts": {
     "start": "npm run watch",
-    "watch": "npm run open-ae; npm-watch",
+    "watch": "npm run open-ae; nodemon -w src/ -w test/ -i test/aeToJSON.js -x npm -- run test-build-run",
     "test": "npm run open-ae; npm run test-build-run;",
     "test-build-run": "npm run build-test; babel-node test/",
     "open-ae": "opn test/ae/testProject.aepx",

src/getComposition.js

@@ -12,11 +12,11 @@ module.exports = function getComposition(comp) {
   var layers = collectionToArray(comp.layers);
 
   // now loop through all layers to get keyframes
-  layers.forEach(function(layer, layers) {
+  layers.forEach(function(layer) {
 
     // save out the layer
     outLayers.push(
-      getLayer(layer)
+      getLayer(layer, layers)
     );
   });
 

src/getLayer.js

@@ -4,11 +4,9 @@ module.exports = function getLayer(layer, parentLayers) {
 
   var parent = layer.parent;
 
-  // if(parent) {
-  //   parent = parentLayers.indexOf(parent);
-  // }
-
-  // console.log('parent', parent);
+  if(parent) {
+    parent = parentLayers.indexOf(parent);
+  }
 
   return {
     name: layer.name,

test/layers.js

@@ -1,9 +1,20 @@
 var EXPECTED_NAMES = {
-  "Test-Comp-Static": [ 'jam3Logo.png', 'iAmANull' ],
+  "Test-Comp-Static": [ 'static-logo', 'iAmANull' ],
   "Test-Comp-Blank": [],
   "Test-Comp-Animated": [ 'animatedLogo 2', 'animatedLogo', 'animatedLogoBezier', 'staticLogo' ]
 };
 
+var TESTS_FOR_LAYER = {
+  "iAmANull": function(t, comp, layer) {
+    // check if null layer is true
+    t.equal(layer.isNullLayer, true, 'isNullLayer' + comp.name + ' layer ' + layer.name);
+  },
+
+  "static-logo": function(t, comp, layer) {
+    t.equal(layer.parent, 1, 'static-logo\'s parent is set correctly');
+  }
+};
+
 module.exports = function(t) {
   var json = global.jsonFromAE;
   var compositions = json.compositions;
@@ -28,11 +39,15 @@ module.exports = function(t) {
       t.ok(layer.properties, 'composition ' + comp.name + ' layer ' + layer.name + ' has properties');
       t.ok(layer.isNullLayer !== undefined, 'composition ' + comp.name + ' layer ' + layer.name + ' has isNullLayer');
 
-      // want to check that isNullLayer is being exported properly
-      if(layer.name === 'iAmANull') {
-        t.ok(layer.isNullLayer === true, 'isNullLayer' + comp.name + ' layer ' + layer.name);        
+      // run tests for specific layers
+      if(TESTS_FOR_LAYER[ layer.name ]) {
+        TESTS_FOR_LAYER[ layer.name ](t, comp, layer);
+
+      // run test for every other layer
       } else {
-        t.ok(layer.isNullLayer === false, 'isNullLayer value was correct for ' + comp.name + ' layer ' + layer.name);        
+
+        t.equal(layer.isNullLayer, false, 'isNullLayer value was correct for ' + comp.name + ' layer ' + layer.name);
+        t.equal(layer.parent, null, 'parent was set to null for ' + comp.name + ' layer ' + layer.name);
       }
 
       names.push(layer.name);