make the tree API return an object instead of array - closes #24

gulpjs · Nov 17, 2015 · c1cda41 · c1cda41
1 parent 6a1948e
commit c1cda41
Show file tree

Hide file tree

Showing 7 changed files with 306 additions and 283 deletions.
diff --git a/lib/tree.js b/lib/tree.js
@@ -10,7 +10,7 @@ function tree(opts) {
   });
 
   var tasks = this._registry.tasks();
-  return _.map(tasks, function(task) {
+  var nodes = _.map(tasks, function(task) {
     var meta = metadata.get(task);
 
     if (opts.deep) {
@@ -19,6 +19,11 @@ function tree(opts) {
 
     return meta.tree.label;
   });
+
+  return {
+    label: 'Tasks',
+    nodes: nodes,
+  };
 }
 
 module.exports = tree;
diff --git a/test/fixtures/taskTree/aliasNested.js b/test/fixtures/taskTree/aliasNested.js
@@ -1,98 +1,101 @@
 'use strict';
 
-module.exports = [
-  {
-    label: 'noop',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn1',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn2',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn3',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'ser',
-    type: 'task',
-    nodes: [
-      {
-        label: '<series>',
-        type: 'function',
-        nodes: [
-          {
-            label: 'noop',
-            type: 'function',
-            nodes: []
-          },
-          {
-            label: '<anonymous>',
-            type: 'function',
-            nodes: []
-          },
-          {
-            label: 'fn1',
-            type: 'task',
-            nodes: []
-          },
-          {
-            label: 'fn2',
-            type: 'task',
-            nodes: []
-          },
-          {
-            label: 'fn3',
-            type: 'task',
-            nodes: []
-          }
-        ]
-      }
-    ]
-  },
-  {
-    label: 'par',
-    type: 'task',
-    nodes: [
-      {
-        label: '<parallel>',
-        type: 'function',
-        nodes: [
-          {
-            label: 'noop',
-            type: 'function',
-            nodes: []
-          },
-          {
-            label: '<anonymous>',
-            type: 'function',
-            nodes: []
-          },
-          {
-            label: 'fn1',
-            type: 'task',
-            nodes: []
-          },
-          {
-            label: 'fn2',
-            type: 'task',
-            nodes: []
-          },
-          {
-            label: 'fn3',
-            type: 'task',
-            nodes: []
-          }
-        ]
-      }
-    ]
-  }
-];
+module.exports = {
+  label: 'Tasks',
+  nodes: [
+    {
+      label: 'noop',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn1',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn2',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn3',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'ser',
+      type: 'task',
+      nodes: [
+        {
+          label: '<series>',
+          type: 'function',
+          nodes: [
+            {
+              label: 'noop',
+              type: 'function',
+              nodes: []
+            },
+            {
+              label: '<anonymous>',
+              type: 'function',
+              nodes: []
+            },
+            {
+              label: 'fn1',
+              type: 'task',
+              nodes: []
+            },
+            {
+              label: 'fn2',
+              type: 'task',
+              nodes: []
+            },
+            {
+              label: 'fn3',
+              type: 'task',
+              nodes: []
+            }
+          ]
+        }
+      ]
+    },
+    {
+      label: 'par',
+      type: 'task',
+      nodes: [
+        {
+          label: '<parallel>',
+          type: 'function',
+          nodes: [
+            {
+              label: 'noop',
+              type: 'function',
+              nodes: []
+            },
+            {
+              label: '<anonymous>',
+              type: 'function',
+              nodes: []
+            },
+            {
+              label: 'fn1',
+              type: 'task',
+              nodes: []
+            },
+            {
+              label: 'fn2',
+              type: 'task',
+              nodes: []
+            },
+            {
+              label: 'fn3',
+              type: 'task',
+              nodes: []
+            }
+          ]
+        }
+      ]
+    }
+  ],
+};
diff --git a/test/fixtures/taskTree/aliasSimple.js b/test/fixtures/taskTree/aliasSimple.js
@@ -1,29 +1,32 @@
 'use strict';
 
-module.exports = [
-  {
-    label: 'noop',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn1',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn2',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn3',
-    type: 'task',
-    nodes: []
-  },
-  {
-    label: 'fn4',
-    type: 'task',
-    nodes: []
-  }
-];
+module.exports = {
+  label: 'Tasks',
+  nodes: [
+    {
+      label: 'noop',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn1',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn2',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn3',
+      type: 'task',
+      nodes: []
+    },
+    {
+      label: 'fn4',
+      type: 'task',
+      nodes: []
+    }
+  ],
+};
diff --git a/test/fixtures/taskTree/doubleLevel.js b/test/fixtures/taskTree/doubleLevel.js
@@ -1,36 +1,39 @@
 'use strict';
 
-module.exports = [
-  {
-    label: 'fn1',
-    type: 'task',
-    nodes: [],
-  },
-  {
-    label: 'fn2',
-    type: 'task',
-    nodes: [],
-  },
-  {
-    label: 'fn3',
-    type: 'task',
-    nodes: [
-      {
-        label: '<series>',
-        type: 'function',
-        nodes: [
-          {
-            label: 'fn1',
-            type: 'task',
-            nodes: [],
-          },
-          {
-            label: 'fn2',
-            type: 'task',
-            nodes: [],
-          },
-        ],
-      },
-    ],
-  },
-];
+module.exports = {
+  label: 'Tasks',
+  nodes: [
+    {
+      label: 'fn1',
+      type: 'task',
+      nodes: [],
+    },
+    {
+      label: 'fn2',
+      type: 'task',
+      nodes: [],
+    },
+    {
+      label: 'fn3',
+      type: 'task',
+      nodes: [
+        {
+          label: '<series>',
+          type: 'function',
+          nodes: [
+            {
+              label: 'fn1',
+              type: 'task',
+              nodes: [],
+            },
+            {
+              label: 'fn2',
+              type: 'task',
+              nodes: [],
+            },
+          ],
+        },
+      ],
+    },
+  ],
+};
diff --git a/test/fixtures/taskTree/simple.js b/test/fixtures/taskTree/simple.js
@@ -1,13 +1,16 @@
 'use strict';
 
-module.exports = [
-  'test1',
-  'test2',
-  'test3',
-  'error',
-  'ser',
-  'par',
-  'serpar',
-  'serpar2',
-  '<display name>',
-];
+module.exports = {
+  label: 'Tasks',
+  nodes: [
+    'test1',
+    'test2',
+    'test3',
+    'error',
+    'ser',
+    'par',
+    'serpar',
+    'serpar2',
+    '<display name>',
+  ],
+};