_.values function for complex keys

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossfilter-universe",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "The fastest way to query and explore multivariate datasets",
   "main": "src/universe.js",
   "directories": {

src/column.js

@@ -89,7 +89,7 @@ module.exports = function(service) {
         // Complex column Keys
         if (_.isArray(column.key)) {
           column.complex = true
-          sample = _.map(_.pick(all[0], column.key))
+          sample = _.values(_.pick(all[0], column.key))
           if (sample.length !== column.key.length) {
             throw new Error('Column key does not exist in data!', column.key)
           }
@@ -130,7 +130,10 @@ module.exports = function(service) {
           return Promise.resolve(column.dimension.bottom(Infinity))
             .then(function(rows) {
               var accessor = dimension.makeAccessor(column.key)
-              if (column.type === 'array') {
+              if (column.type === 'complex') {
+                column.values = _.uniq(_.flatten(_.map(rows, accessor)))
+              }
+              else if (column.type === 'array') {
                 column.values = _.uniq(_.flatten(_.map(rows, accessor)))
               } else {
                 column.values = _.uniq(_.map(rows, accessor))

src/lodash.js

@@ -25,7 +25,7 @@ module.exports = {
   uniq: uniq,
   flatten: flatten,
   sort: sort,
-  keys: keys,
+  values: values,
 }
 
 
@@ -110,7 +110,7 @@ function map(a, b) {
     m = []
     for (key in a) {
       if (a.hasOwnProperty(key)) {
-        m.push(a[key][b])
+        m.push(a[key])
       }
     }
     return m
@@ -256,12 +256,12 @@ function sort(arr) {
   return arr;
 }
 
-function keys(aa) {
-  var keys = []
-  for (var key in aa) {
-    if (aa.hasOwnProperty(key)) {
-      keys.push(aa[key])
+function values(a) {
+  var values = []
+  for (var key in a) {
+    if (a.hasOwnProperty(key)) {
+      values.push(a[key])
     }
   }
-  return keys
+  return values
 }