dodos - npm Package Compare versions

Comparing version 2.7.0 to 2.8.0

lib/dodo.js

@@ -13,2 +13,4 @@ 'use strict';
 
+exports.arrayToDodo = arrayToDodo;
+
 var _invariant = require('invariant');
@@ -46,16 +48,6 @@
 
-var action = Symbol('action');
-var currentIndex = Symbol('currentIndex');
-var names = Symbol('names');
-var meta = Symbol('meta');
-var dispatchReduce = Symbol('dispatchReduce');
 var noActions = [];
 
 var Arrays = new WeakMap();
-var Metadata = new WeakMap();
 
-var needSlowCase = function needSlowCase(a) {
-  return a.toString().includes('new Take') || a.toString().includes('new Drop');
-};
-
 var Dodo = function () {
@@ -70,11 +62,7 @@ function Dodo(array, index) {
     (0, _invariant2.default)(Array.isArray(array), 'new Dodo(arr, index) - arr is required');
-    (0, _invariant2.default)(index, 'new Dodo(arr, index) - index is missing');
-    (0, _invariant2.default)(Object.keys(index).length == array[0].length, 'new Dodo(arr, index) - index length (' + Object.keys(index).length + ') != array[0].length (' + array[0].length + ')');
+    (0, _invariant2.default)(index === false || actions !== noActions || Object.keys(index).length == array[0].length, 'new Dodo(arr, index) - index length (' + Object.keys(index).length + ') != array[0].length (' + array[0].length + ')');
 
+    this.index = index;
+    this.actions = actions;
     Arrays.set(this, array);
-    if (!Metadata.has(array)) Metadata.set(array, {
-      columns: new Set(Object.keys(index))
-    });
-    this.actions = actions;
-    this.index = index;
   }
@@ -90,3 +78,3 @@
     value: function toArray() {
-      if (this.actions.length) return (this.actions.some(needSlowCase) ? _transducers.transduce : _helpers.transduceNoBreak)(Arrays.get(this), (0, _helpers.compose)(this.actions), _helpers.arrayReducer, []);else return Arrays.get(this);
+      if (this.actions != noActions) return (this.actions.some(_helpers.needSlowCase) ? _transducers.transduce : _helpers.transduceNoBreak)(Arrays.get(this), (0, _helpers.compose)(this.actions), _helpers.arrayReducer, []);else return Arrays.get(this);
     }
@@ -99,9 +87,7 @@ }, {
   }, {
-    key: action,
-    value: function value(action) {
-      if (action) {
-        return new Dodo(Arrays.get(this), this.index, [].concat(_toConsumableArray(this.actions), [action]));
-      } else {
-        return new Dodo(Arrays.get(this), this.index, [].concat(_toConsumableArray(this.actions)));
-      }
+    key: 'transform',
+    value: function transform(transformer) {
+      var index = arguments.length <= 1 || arguments[1] === undefined ? this.index : arguments[1];
+
+      return new Dodo(Arrays.get(this), index, [].concat(_toConsumableArray(this.actions), [transformer]));
     }
@@ -114,9 +100,7 @@ }, {
       (0, _invariant2.default)((0, _helpers.isfunc)(fn), 'Dodo#filter(fn) — fn not a function');
-      if (this[names].length == 1) {
-        return this[action]((0, _transducers.filter)(fn));
-      } else {
+      if (this.index) {
         var _ret = function () {
-          var I = _this[currentIndex];
+          var I = _this.index;
           return {
-            v: _this[action]((0, _transducers.filter)(function (row) {
+            v: _this.transform((0, _transducers.filter)(function (row) {
               return fn(row, I);
@@ -128,2 +112,4 @@ }))
         if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+      } else {
+        return this.transform((0, _transducers.filter)(fn));
       }
@@ -134,6 +120,8 @@ }
     value: function filterBy(name, fn) {
-      (0, _invariant2.default)(name, 'Dodo#filterBy(name, fn) - col is required');
+      (0, _invariant2.default)(this.index, 'Dodo#filterBy(name, fn) — only available on indexed dodos');
+      (0, _invariant2.default)(name, 'Dodo#filterBy(name, fn) - name is required');
       (0, _invariant2.default)((0, _helpers.isfunc)(fn), 'Dodo#filterBy(name, fn) - fn not a function');
-      var col = this[currentIndex][name];
-      return this[action]((0, _transducers.filter)(function (row) {
+      var col = this.index[name];
+      (0, _invariant2.default)(col != null, 'Dodo#col(name) — name ' + name + ' not in index');
+      return this.transform((0, _transducers.filter)(function (row) {
         return fn(row[col]);
@@ -148,9 +136,7 @@ }));
       (0, _invariant2.default)((0, _helpers.isfunc)(fn), 'Dodo#map(fn) — fn not a function');
-      if (this[names].length == 1) {
-        return this[action]((0, _transducers.map)(fn));
-      } else {
+      if (this.index) {
         var _ret2 = function () {
-          var I = _this2[currentIndex];
+          var I = _this2.index;
           return {
-            v: _this2[action]((0, _transducers.map)(function (row) {
+            v: _this2.transform((0, _transducers.map)(function (row) {
               return fn(row, I);
@@ -162,2 +148,4 @@ }))
         if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
+      } else {
+        return this.transform((0, _transducers.map)(fn));
       }
@@ -168,11 +156,11 @@ }
     value: function col(name) {
-      (0, _invariant2.default)(name, 'Dodo#filterBy(name, fn) - col is required');
-      (0, _invariant2.default)(this[meta].columns.has(name), 'Dodo#col(name) — name ' + name + ' not in index');
-      var col = this[currentIndex][name];
-      var fn = (0, _transducers.map)(function (row) {
+      (0, _invariant2.default)(this.index, 'Dodo#col(name) — only available on indexed dodos');
+      (0, _invariant2.default)(name, 'Dodo#col(name) - name is required');
+
+      var col = this.index[name];
+      (0, _invariant2.default)(col != null, 'Dodo#col(name) — name ' + name + ' not in index');
+
+      return this.transform((0, _transducers.map)(function (row) {
         return row[col];
-      });
-      fn.I = (0, _helpers.arrayToIndex)([name]);
-      fn.singular = true;
-      return this[action](fn);
+      }), false);
     }
@@ -188,17 +176,17 @@ }, {
 
+      (0, _invariant2.default)(this.index, 'Dodo#cols(...names) — only available on indexed dodos');
       names = names.length ? (0, _flatten2.default)(names) : undefined;
-      (0, _invariant2.default)(names, 'Dodo#cols(names) - names is required');
-      names.forEach(function (n) {
-        return (0, _invariant2.default)(_this3[meta].columns.has(n), 'Dodo#cols(names) - name ' + n + ' not in index');
-      });
+      (0, _invariant2.default)(names, 'Dodo#cols(...names) - names is required');
 
       var indices = names.map(function (name) {
-        return _this3[currentIndex][name];
+        return _this3.index[name];
       });
-      var inner = new Function('row', '\n      return [' + indices.map(function (i) {
+      indices.forEach(function (i) {
+        return (0, _invariant2.default)(i != null, 'Dodo#cols(...names) - name ' + _this3.columns[i] + ' not in index');
+      });
+
+      var fn = (0, _transducers.map)(new Function('row', 'return [' + indices.map(function (i) {
         return 'row[' + i + ']';
-      }).join(',') + ']\n    ');
-      var fn = (0, _transducers.map)(inner);
-      fn.I = (0, _helpers.arrayToIndex)(names);
-      return this[action](fn);
+      }).join(',') + ']'));
+      return this.transform(fn, names);
     }
@@ -209,5 +197,5 @@ }, {
       (0, _invariant2.default)(Number.isFinite(amount), 'Dodo#skip(amount) - amount must be a number');
-      if (amount === 0) return this[action]();
-      (0, _invariant2.default)(amount > 0, 'Dodo#skip(amount) — amount smaller than 0');
-      return this[action]((0, _transducers.drop)(amount));
+      (0, _invariant2.default)(amount >= 0, 'Dodo#skip(amount) — amount smaller than 0');
+
+      if (amount === 0) return this;else return this.transform((0, _transducers.drop)(amount));
     }
@@ -219,12 +207,6 @@ }, {
       (0, _invariant2.default)(amount >= 0, 'Dodo#take(amount) — amount smaller than 0');
-      return this[action]((0, _transducers.take)(amount));
+
+      return this.transform((0, _transducers.take)(amount));
     }
   }, {
-    key: dispatchReduce,
-    value: function value(fn, initFactory, final) {
-      if (this.actions.find(function (a) {
-        return a.singular;
-      })) return this.reduce(fn, initFactory(), final);else return this.reduceEach(fn, initFactory, final);
-    }
-  }, {
     key: 'reduce',
@@ -239,3 +221,4 @@ value: function reduce(fn, init) {
       (0, _invariant2.default)((0, _helpers.isfunc)(final), 'Dodo#reduce(fn, init, final) — final not a function');
-      return (this.actions.some(needSlowCase) ? _transducers.transduce : _helpers.transduceNoBreak)(Arrays.get(this), (0, _helpers.compose)(this.actions), (_ref = {}, _defineProperty(_ref, '@@transducer/step', fn), _defineProperty(_ref, '@@transducer/result', final), _ref), init);
+
+      return (this.actions.some(_helpers.needSlowCase) ? _transducers.transduce : _helpers.transduceNoBreak)(Arrays.get(this), (0, _helpers.compose)(this.actions), (_ref = {}, _defineProperty(_ref, '@@transducer/step', fn), _defineProperty(_ref, '@@transducer/result', final), _ref), init);
     }
@@ -247,7 +230,8 @@ }, {
 
-      (0, _invariant2.default)((0, _helpers.isfunc)(initFactory), 'Dodo#reduceEach(fn, initFactory, final) - initFactory not a function');
-      (0, _invariant2.default)((0, _helpers.isfunc)(fn), 'Dodo#reduceEach(fn, init, final) — fn not a function');
-      (0, _invariant2.default)((0, _helpers.isfunc)(final), 'Dodo#reduceEach(fn, init, final) — final not a function');
+      (0, _invariant2.default)(this.index, 'Dodo#reduceEach(fn, initFactory, final?) - only available on indexed dodos');
+      (0, _invariant2.default)((0, _helpers.isfunc)(fn), 'Dodo#reduceEach(fn, initFactory, final?) — fn not a function');
+      (0, _invariant2.default)((0, _helpers.isfunc)(initFactory), 'Dodo#reduceEach(fn, initFactory, final?) - initFactory not a function');
+      (0, _invariant2.default)((0, _helpers.isfunc)(final), 'Dodo#reduceEach(fn, ininitFactory, final?) — final not a function');
 
-      var _unzip = (0, _unzip4.default)(this[names].map(function () {
+      var _unzip = (0, _unzip4.default)(this.columns.map(function () {
         return [fn, initFactory(), final];
@@ -262,3 +246,3 @@ }));
 
-      return (0, _zipObject2.default)(this[names], this.reduce((0, _helpers.combineReducers)(fns, true), inits, (0, _helpers.spread)(finals)));
+      return (0, _zipObject2.default)(this.columns, this.reduce((0, _helpers.combineReducers)(fns, true), inits, (0, _helpers.spread)(finals)));
     }
@@ -287,3 +271,3 @@ }, {
 
-      return this[dispatchReduce]((0, _helpers.combineReducers)(fns), function () {
+      return _helpers.dispatchReduce.call(this, (0, _helpers.combineReducers)(fns), function () {
         return inits.map(function (i) {
@@ -297,3 +281,3 @@ return i();
     value: function count() {
-      return this[dispatchReduce].apply(this, _toConsumableArray(_helpers.REDUCERS.count));
+      return _helpers.dispatchReduce.call.apply(_helpers.dispatchReduce, [this].concat(_toConsumableArray(_helpers.REDUCERS.count)));
     }
@@ -303,3 +287,3 @@ }, {
     value: function sum() {
-      return this[dispatchReduce].apply(this, _toConsumableArray(_helpers.REDUCERS.sum));
+      return _helpers.dispatchReduce.call.apply(_helpers.dispatchReduce, [this].concat(_toConsumableArray(_helpers.REDUCERS.sum)));
     }
@@ -309,3 +293,3 @@ }, {
     value: function min() {
-      return this[dispatchReduce].apply(this, _toConsumableArray(_helpers.REDUCERS.min));
+      return _helpers.dispatchReduce.call.apply(_helpers.dispatchReduce, [this].concat(_toConsumableArray(_helpers.REDUCERS.min)));
     }
@@ -315,3 +299,3 @@ }, {
     value: function max() {
-      return this[dispatchReduce].apply(this, _toConsumableArray(_helpers.REDUCERS.max));
+      return _helpers.dispatchReduce.call.apply(_helpers.dispatchReduce, [this].concat(_toConsumableArray(_helpers.REDUCERS.max)));
     }
@@ -321,3 +305,3 @@ }, {
     value: function countUniq() {
-      return this[dispatchReduce].apply(this, _toConsumableArray(_helpers.REDUCERS.countUniq));
+      return _helpers.dispatchReduce.call.apply(_helpers.dispatchReduce, [this].concat(_toConsumableArray(_helpers.REDUCERS.countUniq)));
     }
@@ -327,3 +311,3 @@ }, {
     value: function mean() {
-      return this[dispatchReduce].apply(this, _toConsumableArray(_helpers.REDUCERS.mean));
+      return _helpers.dispatchReduce.call.apply(_helpers.dispatchReduce, [this].concat(_toConsumableArray(_helpers.REDUCERS.mean)));
     }
@@ -333,15 +317,17 @@ }, {
     value: function groupBy(name, fn) {
-      (0, _invariant2.default)(name, 'Dodo#groupBy(name, fn) - name is required');
-      (0, _invariant2.default)(this[meta].columns.has(name), 'Dodo#group(name) — name ' + name + ' not in index');
+      var _this4 = this;
 
-      var map = new Map();
-      var grouper = (0, _helpers.createGrouper)(map, fn, this[currentIndex][name]);
-      var array = this.toArray();
-      var len = array.length;
-      var i = -1;
-      while (++i < len) {
-        grouper(array[i]);
+      if ((0, _helpers.isfunc)(name)) {
+        fn = name;
+        name = undefined;
       }
-      map.forEach(arrayToDodo(this[currentIndex]));
-      return Flock(map);
+      (0, _invariant2.default)(this.index ? name : !name, 'Dodo#groupBy(name, fn?) — name is required on indexed dodos');
+      (0, _invariant2.default)(!name || this.columns.includes(name), 'Dodo#groupBy(name?, fn?) — name ' + name + ' not in index');
+      (0, _invariant2.default)(!fn || (0, _helpers.isfunc)(fn), 'Dodo#groupBy(name?, fn?) — fn not a function');
+
+      var grouper = (0, _helpers.createGrouper)(fn, name ? this.index[name] : name);
+      var toDodos = function toDodos(map) {
+        return map.forEach(arrayToDodo(_this4.index)), map;
+      };
+      return Flock(this.reduce(grouper, new Map(), toDodos));
     }
@@ -352,24 +338,11 @@ }, {
       (0, _invariant2.default)((0, _helpers.isfunc)(fn), 'Dodo#flock(fn) — fn not a function');
-      return Flock(fn(this));
+      return Flock(fn.call(this, this));
     }
   }, {
-    key: meta,
+    key: 'columns',
     get: function get() {
-      return Metadata.get(Arrays.get(this));
-    }
-  }, {
-    key: currentIndex,
-    get: function get() {
-      var lastMapWithIndex = this.actions.filter(function (act) {
-        return !!act.I;
-      }).slice(-1);
+      var _this5 = this;
 
-      if (lastMapWithIndex.length) return lastMapWithIndex[0].I;else return this.index;
-    }
-  }, {
-    key: names,
-    get: function get() {
-      var I = this[currentIndex];
-      return Object.keys(I).sort(function (a, b) {
-        return I[a] - I[b];
+      return Object.keys(this.index).sort(function (a, b) {
+        return _this5.index[a] - _this5.index[b];
       });
@@ -388,7 +361,5 @@ }
 exports.default = Dodo;
-
-
-function arrayToDodo(Index) {
+function arrayToDodo(index) {
   return function (array, key, map) {
-    map.set(key, new Dodo(array, Index));
+    map.set(key, new Dodo(array, index));
   };
@@ -487,2 +458,3 @@ }
   return entries;
-}
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/dodo.js"],"names":[],"mappings":"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","file":"dodo.js","sourcesContent":["import invariant from 'invariant'\nimport zip from 'lodash/zip'\nimport zipObject from 'lodash/zipObject'\nimport unzip from 'lodash/unzip'\nimport flatten from 'lodash/flatten'\nimport {map, filter, drop, take, transduce} from 'transducers.js'\n\nimport {\n  identity, combineReducers, REDUCERS, spread, createGrouper, isfunc,\n  arrayToIndex, compose, transduceNoBreak, arrayReducer, needSlowCase,\n  dispatchReduce\n} from './helpers'\n\nconst noActions = []\n\nconst Arrays = new WeakMap()\n\nexport default class Dodo {\n  constructor(array, index, actions=noActions) {\n    if (Array.isArray(index))\n      index = arrayToIndex(index)\n\n    invariant(Array.isArray(array), `new Dodo(arr, index) - arr is required`)\n    invariant(index === false || actions !== noActions || Object.keys(index).length == array[0].length,\n      `new Dodo(arr, index) - index length (${Object.keys(index).length}) != array[0].length (${array[0].length})`)\n\n    this.index = index\n    this.actions = actions\n    Arrays.set(this, array)\n  }\n\n  get columns() {\n    return Object.keys(this.index).sort((a, b) => this.index[a] - this.index[b])\n  }\n\n  [Symbol.iterator]() { return this.toArray().values() }\n\n  toArray() {\n    if (this.actions != noActions)\n      return (this.actions.some(needSlowCase) ? transduce : transduceNoBreak)(\n        Arrays.get(this),\n        compose(this.actions),\n        arrayReducer,\n        []\n      )\n    else\n      return Arrays.get(this)\n  }\n\n  get length() { return this.toArray().length }\n\n  uniq() { return [...new Set(this)] }\n\n  transform(transformer, index=this.index) {\n    return new Dodo(Arrays.get(this), index, [...this.actions, transformer])\n  }\n\n  filter(fn) {\n    invariant(isfunc(fn), `Dodo#filter(fn) — fn not a function`)\n    if (this.index) {\n      const I = this.index\n      return this.transform(filter(row => fn(row, I)))\n    } else {\n      return this.transform(filter(fn))\n    }\n  }\n\n  filterBy(name, fn) {\n    invariant(this.index, `Dodo#filterBy(name, fn) — only available on indexed dodos`)\n    invariant(name, `Dodo#filterBy(name, fn) - name is required`)\n    invariant(isfunc(fn), `Dodo#filterBy(name, fn) - fn not a function`)\n    const col = this.index[name]\n    invariant(col != null, `Dodo#col(name) — name ${name} not in index`)\n    return this.transform( filter(row => fn(row[col])) )\n  }\n\n  map(fn) {\n    invariant(isfunc(fn), `Dodo#map(fn) — fn not a function`)\n    if (this.index) {\n      const I = this.index\n      return this.transform(map(row => fn(row, I)))\n    } else {\n      return this.transform(map(fn))\n    }\n  }\n\n  col(name) {\n    invariant(this.index, `Dodo#col(name) — only available on indexed dodos`)\n    invariant(name, `Dodo#col(name) - name is required`)\n\n    const col = this.index[name]\n    invariant(col != null, `Dodo#col(name) — name ${name} not in index`)\n\n    return this.transform(map(row => row[col]), false)\n  }\n\n  cols(...names) {\n    invariant(this.index, `Dodo#cols(...names) — only available on indexed dodos`)\n    names = names.length ? flatten(names) : undefined\n    invariant(names, `Dodo#cols(...names) - names is required`)\n\n    const indices = names.map(name => this.index[name])\n    indices.forEach(i => invariant(i != null, `Dodo#cols(...names) - name ${this.columns[i]} not in index`))\n\n    const fn = map(new Function('row',`return [${indices.map(i => `row[${i}]`).join(',')}]`))\n    return this.transform(fn, names)\n  }\n\n  skip(amount) {\n    invariant(Number.isFinite(amount), `Dodo#skip(amount) - amount must be a number`)\n    invariant(amount >= 0, `Dodo#skip(amount) — amount smaller than 0`)\n\n    if (amount === 0)\n      return this\n    else\n      return this.transform(drop(amount))\n  }\n\n  take(amount) {\n    invariant(Number.isFinite(amount), `Dodo#take(amount) - amount must be a number`)\n    invariant(amount >= 0, `Dodo#take(amount) — amount smaller than 0`)\n\n    return this.transform(take(amount))\n  }\n\n  reduce(fn, init, final=identity) {\n    invariant(init != null, `Dodo#reduce(fn, init, final) - init is required`)\n    invariant(isfunc(fn), `Dodo#reduce(fn, init, final) — fn not a function`)\n    invariant(isfunc(final), `Dodo#reduce(fn, init, final) — final not a function`)\n\n    return (this.actions.some(needSlowCase) ? transduce : transduceNoBreak)(\n      Arrays.get(this),\n      compose(this.actions),\n      {\n        ['@@transducer/step']: fn,\n        ['@@transducer/result']: final\n      },\n      init\n    )\n  }\n\n  reduceEach(fn, initFactory, final=identity) {\n    invariant(this.index, `Dodo#reduceEach(fn, initFactory, final?) - only available on indexed dodos`)\n    invariant(isfunc(fn), `Dodo#reduceEach(fn, initFactory, final?) — fn not a function`)\n    invariant(isfunc(initFactory), `Dodo#reduceEach(fn, initFactory, final?) - initFactory not a function`)\n    invariant(isfunc(final), `Dodo#reduceEach(fn, ininitFactory, final?) — final not a function`)\n\n    const [fns, inits, finals] = unzip(this.columns.map(() => [fn, initFactory(), final]))\n    return zipObject(\n      this.columns,\n      this.reduce(combineReducers(fns, true), inits, spread(finals))\n    )\n  }\n\n  stats(...methods) {\n    invariant(methods && methods.length, `Dodo#stats(...methods) - at least one method is required`)\n    methods.forEach(m => invariant(typeof m == 'string' && m in REDUCERS, `Dodo#stats(...methods) - method ${m} is not implemented`))\n\n    const [fns, inits, finals] = zip(...methods.map(m => REDUCERS[m]))\n    return dispatchReduce.call(this,\n      combineReducers(fns),\n      () => inits.map(i => i()),\n      spread(finals)\n    )\n  }\n\n  count() { return dispatchReduce.call(this, ...REDUCERS.count) }\n\n  sum() { return dispatchReduce.call(this, ...REDUCERS.sum) }\n\n  min() { return dispatchReduce.call(this, ...REDUCERS.min) }\n\n  max() { return dispatchReduce.call(this, ...REDUCERS.max) }\n\n  countUniq() { return dispatchReduce.call(this, ...REDUCERS.countUniq) }\n\n  mean() { return dispatchReduce.call(this, ...REDUCERS.mean) }\n\n  groupBy(name, fn) {\n    if (isfunc(name)) {\n      fn = name\n      name = undefined\n    }\n    invariant(this.index ? name : !name, `Dodo#groupBy(name, fn?) — name is required on indexed dodos` )\n    invariant(!name || this.columns.includes(name), `Dodo#groupBy(name?, fn?) — name ${name} not in index`)\n    invariant(!fn || isfunc(fn), `Dodo#groupBy(name?, fn?) — fn not a function`)\n\n    const grouper = createGrouper(fn, name ? this.index[name] : name)\n    const toDodos = map => (map.forEach(arrayToDodo(this.index)), map)\n    return Flock(this.reduce(grouper, new Map(), toDodos))\n  }\n\n  flock(fn) {\n    invariant(isfunc(fn), `Dodo#flock(fn) — fn not a function`)\n    return Flock(fn.call(this, this))\n  }\n}\n\nexport function arrayToDodo(index) {\n  return function(array, key, map) {\n    map.set(key, new Dodo(array, index))\n  }\n}\n\nDodo.prototype.drop = Dodo.prototype.skip\n\nconst dodoMethods = Object.getOwnPropertyNames(Dodo.prototype)\ndodoMethods.filter(method => method != 'constructor')\n\nfunction Flock(map, method, args) {\n  map = new Map(map)\n\n  // if called with method arg call that method on all Dodos\n  if (method)\n    for (const [key, dodo] of map.entries())\n      map.set(key, dodo[method](...args))\n\n  // if the values are Dodos add the Dodo methods to the returned Map\n  if (map.values().next().value instanceof Dodo)\n    for (const method of dodoMethods)\n      map[method] = (...args) => Flock(map, method, args)\n\n  // mapEntries method with same signature as native Map#forEach()\n  map.mapEntries = mapEntries\n\n  return map\n}\n\nfunction mapEntries(fn) {\n  const entries = [...this.entries()]\n  const len = this.size\n  let i = -1\n  while (++i < len) {\n    let entry = entries[i]\n    entries[i] = fn(entry[1], entry[0], this)\n  }\n  return entries\n}\n"]}

lib/helpers.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.arrayToIndex = exports.isfunc = exports.REDUCERS = exports.arrayReducer = exports.identity = undefined;
+exports.needSlowCase = exports.arrayToIndex = exports.isfunc = exports.REDUCERS = exports.arrayReducer = exports.identity = undefined;
 
@@ -18,2 +18,3 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 exports.createGrouper = createGrouper;
+exports.dispatchReduce = dispatchReduce;
 
@@ -137,13 +138,31 @@ var _zipObject = require('lodash/zipObject');
 
-function createGrouper(map, fn, col) {
+function createGrouper(fn, col) {
   if (fn) {
-    return function (row) {
-      var key = fn(row[col]);
-      map.has(key) ? map.get(key).push(row) : map.set(key, [row]);
-    };
+    if (col == undefined) {
+      return function (map, row) {
+        var key = fn(row);
+        map.has(key) ? map.get(key).push(row) : map.set(key, [row]);
+        return map;
+      };
+    } else {
+      return function (map, row) {
+        var key = fn(row[col]);
+        map.has(key) ? map.get(key).push(row) : map.set(key, [row]);
+        return map;
+      };
+    }
   } else {
-    return function (row) {
-      var key = row[col];
-      map.has(key) ? map.get(key).push(row) : map.set(key, [row]);
-    };
+    if (col == undefined) {
+      return function (map, row) {
+        var key = row;
+        map.has(key) ? map.get(key).push(row) : map.set(key, [row]);
+        return map;
+      };
+    } else {
+      return function (map, row) {
+        var key = row[col];
+        map.has(key) ? map.get(key).push(row) : map.set(key, [row]);
+        return map;
+      };
+    }
   }
@@ -155,4 +174,14 @@ }
 };
+
 var arrayToIndex = exports.arrayToIndex = function arrayToIndex(arr) {
   return (0, _zipObject2.default)(arr, [].concat(_toConsumableArray(arr.keys())));
-};
+};
+
+var needSlowCase = exports.needSlowCase = function needSlowCase(a) {
+  return a.toString().includes('new Take') || a.toString().includes('new Drop');
+};
+
+function dispatchReduce(fn, initFactory, final) {
+  if (this.index) return this.reduceEach(fn, initFactory, final);else return this.reduce(fn, initFactory(), final);
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/helpers.js"],"names":[],"mappings":"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","file":"helpers.js","sourcesContent":["import zipObject from 'lodash/zipObject'\n\nexport const identity = a => a\n\nexport function compose(funcs) {\n  var len = funcs.length\n  return function(r) {\n    var value = r\n    var i = len\n    while (i--) {\n      value = funcs[i](value)\n    }\n    return value\n  }\n}\n\nexport function spread(fns) {\n  const len = fns.length\n  return function(value) {\n    let i = -1\n    while (++i < len) {\n      value[i] = fns[i](value[i])\n    }\n    return value\n  }\n}\n\nexport const arrayReducer = {\n  ['@@transducer/result']: identity,\n\n  ['@@transducer/step'](arr, v) {\n    arr.push(v)\n    return arr\n  },\n}\n\nexport function transduceNoBreak(coll, xform, reducer, init) {\n  xform = xform(reducer)\n  var result = init;\n  var index = -1;\n  var len = coll.length;\n  while(++index < len) {\n    result = xform['@@transducer/step'](result, coll[index]);\n  }\n  return xform['@@transducer/result'](result);\n}\n\nexport function combineReducers(fns, spread) {\n  const len = fns.length\n  if (spread) {\n    return function(accs, row) {\n      let i = -1\n      while (++i < len) {\n        accs[i] = fns[i](accs[i], row[i])\n      }\n      return accs\n    }\n  } else {\n    return function(accs, row) {\n      let i = -1\n      while (++i < len) {\n        accs[i] = fns[i](accs[i], row)\n      }\n      return accs\n    }\n  }\n}\n\nexport const REDUCERS = {\n  max: [(max, el) => max > el ? max : el, () => -Infinity, identity],\n  min: [(min, el) => min < el ? min : el, () => Infinity, identity],\n  sum: [(sum, el) => sum + el, () => 0, identity],\n  mean: [\n    (stats, el) => {\n      ++stats[0]\n      stats[1] += el\n      return stats\n    },\n    () => [0, 0],\n    ([count, sum]) => sum / count\n  ],\n  count: [count => ++count, () => 0, identity],\n  countUniq: [(set, el) => set.add(el), () => new Set(), set => set.size],\n}\n\nexport function createGrouper(fn, col) {\n  if (fn) {\n    if (col == undefined) {\n      return function(map, row) {\n        const key = fn(row)\n        map.has(key)\n          ? map.get(key).push(row)\n          : map.set(key, [row])\n        return map\n      }\n    } else {\n      return function(map, row) {\n        const key = fn(row[col])\n        map.has(key)\n          ? map.get(key).push(row)\n          : map.set(key, [row])\n        return map\n      }\n    }\n  } else {\n    if (col == undefined) {\n      return function(map, row) {\n        const key = row\n        map.has(key)\n          ? map.get(key).push(row)\n          : map.set(key, [row])\n        return map\n      }\n    } else {\n      return function(map, row) {\n        const key = row[col]\n        map.has(key)\n          ? map.get(key).push(row)\n          : map.set(key, [row])\n        return map\n      }\n    }\n  }\n}\n\nexport const isfunc = fn => fn && typeof fn == 'function'\n\nexport const arrayToIndex = arr => zipObject(arr, [...arr.keys()])\n\nexport const needSlowCase = a =>\n  a.toString().includes('new Take') || a.toString().includes('new Drop')\n\nexport function dispatchReduce(fn, initFactory, final) {\n  if (this.index)\n    return this.reduceEach(fn, initFactory, final)\n  else\n    return this.reduce(fn, initFactory(), final)\n}\n"]}

package.json

 {
   "name": "dodos",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "Pandas-inspired iterator-based data wrangling library for js",
@@ -17,3 +17,3 @@ "main": "lib/dodo.js",
     "prepush": "npm test",
-    "prepublish": "npm test && npm run clean && npm run build",
+    "prepublish": "git pull origin master && npm test && npm run clean && npm run build",
     "postpublish": "git push origin master --no-verify"
@@ -38,3 +38,3 @@ },
     "ava": "~0.14.0",
-    "babel-cli": "~6.6.5",
+    "babel-cli": "~6.7.5",
     "babel-core": "~6.7.2",
@@ -48,13 +48,13 @@ "babel-eslint": "~6.0.0",
     "d3-dsv": "~0.3.1",
-    "eslint": "~2.7.0",
+    "eslint": "~2.8.0",
     "husky": "~0.11.4",
-    "npm-check": "~5.1.1",
-    "nyc": "~6.2.1",
+    "npm-check": "~5.2.1",
+    "nyc": "~6.4.0",
     "rimraf": "~2.5.2",
     "table": "~3.7.8",
-    "webpack": "~1.12.14"
+    "webpack": "~1.13.0"
   },
   "dependencies": {
     "invariant": "~2.2.1",
-    "lodash": "~4.8.2",
+    "lodash": "~4.11.0",
     "transducers.js": "~0.3.2"
@@ -61,0 +61,0 @@ },

src/dodo.js

@@ -10,18 +10,10 @@ import invariant from 'invariant'
   identity, combineReducers, REDUCERS, spread, createGrouper, isfunc,
-  arrayToIndex, compose, transduceNoBreak, arrayReducer
+  arrayToIndex, compose, transduceNoBreak, arrayReducer, needSlowCase,
+  dispatchReduce
 } from './helpers'
 
-const action = Symbol('action')
-const currentIndex = Symbol('currentIndex')
-const names = Symbol('names')
-const meta = Symbol('meta')
-const dispatchReduce = Symbol('dispatchReduce')
 const noActions = []
 
 const Arrays = new WeakMap()
-const Metadata = new WeakMap()
 
-const needSlowCase = a =>
-  a.toString().includes('new Take') || a.toString().includes('new Drop')
-
 export default class Dodo {
@@ -33,35 +25,18 @@ constructor(array, index, actions=noActions) {
     invariant(Array.isArray(array), `new Dodo(arr, index) - arr is required`)
-    invariant(index , `new Dodo(arr, index) - index is missing`)
-    invariant(Object.keys(index).length == array[0].length,
+    invariant(index === false || actions !== noActions || Object.keys(index).length == array[0].length,
       `new Dodo(arr, index) - index length (${Object.keys(index).length}) != array[0].length (${array[0].length})`)
 
+    this.index = index
+    this.actions = actions
     Arrays.set(this, array)
-    if (!Metadata.has(array))
-      Metadata.set(array, {
-        columns: new Set(Object.keys(index)),
-      })
-    this.actions = actions
-    this.index = index
   }
 
-  get [meta]() { return Metadata.get(Arrays.get(this)) }
-
-  get [currentIndex]() {
-    const lastMapWithIndex = this.actions.filter(act => !!act.I).slice(-1)
-
-    if (lastMapWithIndex.length)
-      return lastMapWithIndex[0].I
-    else
-      return this.index
+  get columns() {
+    return Object.keys(this.index).sort((a, b) => this.index[a] - this.index[b])
   }
 
-  get [names]() {
-    const I = this[currentIndex]
-    return Object.keys(I).sort((a, b) => I[a] - I[b])
-  }
-
   [Symbol.iterator]() { return this.toArray().values() }
 
   toArray() {
-    if (this.actions.length)
+    if (this.actions != noActions)
       return (this.actions.some(needSlowCase) ? transduce : transduceNoBreak)(
@@ -81,10 +56,4 @@ Arrays.get(this),
 
-  [action](action) {
-    if (action) {
-      return new Dodo(
-        Arrays.get(this), this.index, [...this.actions, action])
-    } else {
-      return new Dodo(
-        Arrays.get(this), this.index, [...this.actions])
-    }
+  transform(transformer, index=this.index) {
+    return new Dodo(Arrays.get(this), index, [...this.actions, transformer])
   }
@@ -94,7 +63,7 @@
     invariant(isfunc(fn), `Dodo#filter(fn) — fn not a function`)
-    if (this[names].length == 1) {
-      return this[action](filter(fn))
+    if (this.index) {
+      const I = this.index
+      return this.transform(filter(row => fn(row, I)))
     } else {
-      const I = this[currentIndex]
-      return this[action](filter(row => fn(row, I)))
+      return this.transform(filter(fn))
     }
@@ -104,6 +73,8 @@ }
   filterBy(name, fn) {
-    invariant(name, `Dodo#filterBy(name, fn) - col is required`)
+    invariant(this.index, `Dodo#filterBy(name, fn) — only available on indexed dodos`)
+    invariant(name, `Dodo#filterBy(name, fn) - name is required`)
     invariant(isfunc(fn), `Dodo#filterBy(name, fn) - fn not a function`)
-    const col = this[currentIndex][name]
-    return this[action]( filter(row => fn(row[col])) )
+    const col = this.index[name]
+    invariant(col != null, `Dodo#col(name) — name ${name} not in index`)
+    return this.transform( filter(row => fn(row[col])) )
   }
@@ -113,7 +84,7 @@
     invariant(isfunc(fn), `Dodo#map(fn) — fn not a function`)
-    if (this[names].length == 1) {
-      return this[action](map(fn))
+    if (this.index) {
+      const I = this.index
+      return this.transform(map(row => fn(row, I)))
     } else {
-      const I = this[currentIndex]
-      return this[action](map(row => fn(row, I)))
+      return this.transform(map(fn))
     }
@@ -123,25 +94,21 @@ }
   col(name) {
-    invariant(name, `Dodo#filterBy(name, fn) - col is required`)
-    invariant(this[meta].columns.has(name),
-      `Dodo#col(name) — name ${name} not in index`)
-    const col = this[currentIndex][name]
-    const fn = map(row => row[col])
-    fn.I = arrayToIndex([name])
-    fn.singular = true
-    return this[action](fn)
+    invariant(this.index, `Dodo#col(name) — only available on indexed dodos`)
+    invariant(name, `Dodo#col(name) - name is required`)
+
+    const col = this.index[name]
+    invariant(col != null, `Dodo#col(name) — name ${name} not in index`)
+
+    return this.transform(map(row => row[col]), false)
   }
 
   cols(...names) {
+    invariant(this.index, `Dodo#cols(...names) — only available on indexed dodos`)
     names = names.length ? flatten(names) : undefined
-    invariant(names, `Dodo#cols(names) - names is required`)
-    names.forEach(n => invariant(this[meta].columns.has(n),
-      `Dodo#cols(names) - name ${n} not in index`))
+    invariant(names, `Dodo#cols(...names) - names is required`)
 
-    const indices = names.map(name => this[currentIndex][name])
-    const inner = new Function('row', `
-      return [${indices.map(i => `row[${i}]`).join(',')}]
-    `)
-    const fn = map(inner)
-    fn.I = arrayToIndex(names)
-    return this[action](fn)
+    const indices = names.map(name => this.index[name])
+    indices.forEach(i => invariant(i != null, `Dodo#cols(...names) - name ${this.columns[i]} not in index`))
+
+    const fn = map(new Function('row',`return [${indices.map(i => `row[${i}]`).join(',')}]`))
+    return this.transform(fn, names)
   }
@@ -151,5 +118,8 @@
     invariant(Number.isFinite(amount), `Dodo#skip(amount) - amount must be a number`)
-    if (amount === 0) return this[action]()
-    invariant(amount > 0, `Dodo#skip(amount) — amount smaller than 0`)
-    return this[action](drop(amount))
+    invariant(amount >= 0, `Dodo#skip(amount) — amount smaller than 0`)
+
+    if (amount === 0)
+      return this
+    else
+      return this.transform(drop(amount))
   }
@@ -160,10 +130,4 @@
     invariant(amount >= 0, `Dodo#take(amount) — amount smaller than 0`)
-    return this[action](take(amount))
-  }
 
-  [dispatchReduce](fn, initFactory, final) {
-    if (this.actions.find(a => a.singular))
-      return this.reduce(fn, initFactory(), final)
-    else
-      return this.reduceEach(fn, initFactory, final)
+    return this.transform(take(amount))
   }
@@ -174,4 +138,4 @@
     invariant(isfunc(fn), `Dodo#reduce(fn, init, final) — fn not a function`)
-    invariant(isfunc(final),
-      `Dodo#reduce(fn, init, final) — final not a function`)
+    invariant(isfunc(final), `Dodo#reduce(fn, init, final) — final not a function`)
+
     return (this.actions.some(needSlowCase) ? transduce : transduceNoBreak)(
@@ -189,13 +153,10 @@ Arrays.get(this),
   reduceEach(fn, initFactory, final=identity) {
-    invariant(isfunc(initFactory),
-      `Dodo#reduceEach(fn, initFactory, final) - initFactory not a function`)
-    invariant(isfunc(fn),
-      `Dodo#reduceEach(fn, init, final) — fn not a function`)
-    invariant(isfunc(final),
-      `Dodo#reduceEach(fn, init, final) — final not a function`)
-    const [fns, inits, finals] = unzip(
-      this[names].map(() => [fn, initFactory(), final])
-    )
+    invariant(this.index, `Dodo#reduceEach(fn, initFactory, final?) - only available on indexed dodos`)
+    invariant(isfunc(fn), `Dodo#reduceEach(fn, initFactory, final?) — fn not a function`)
+    invariant(isfunc(initFactory), `Dodo#reduceEach(fn, initFactory, final?) - initFactory not a function`)
+    invariant(isfunc(final), `Dodo#reduceEach(fn, ininitFactory, final?) — final not a function`)
+
+    const [fns, inits, finals] = unzip(this.columns.map(() => [fn, initFactory(), final]))
     return zipObject(
-      this[names],
+      this.columns,
       this.reduce(combineReducers(fns, true), inits, spread(finals))
@@ -206,8 +167,7 @@ )
   stats(...methods) {
-    invariant(methods && methods.length,
-      `Dodo#stats(...methods) - at least one method is required`)
-    methods.forEach(m => invariant(typeof m == 'string' && m in REDUCERS,
-      `Dodo#stats(...methods) - method ${m} is not implemented`))
+    invariant(methods && methods.length, `Dodo#stats(...methods) - at least one method is required`)
+    methods.forEach(m => invariant(typeof m == 'string' && m in REDUCERS, `Dodo#stats(...methods) - method ${m} is not implemented`))
+
     const [fns, inits, finals] = zip(...methods.map(m => REDUCERS[m]))
-    return this[dispatchReduce](
+    return dispatchReduce.call(this,
       combineReducers(fns),
@@ -219,29 +179,26 @@ () => inits.map(i => i()),
 
-  count() { return this[dispatchReduce](...REDUCERS.count) }
+  count() { return dispatchReduce.call(this, ...REDUCERS.count) }
 
-  sum() { return this[dispatchReduce](...REDUCERS.sum) }
+  sum() { return dispatchReduce.call(this, ...REDUCERS.sum) }
 
-  min() { return this[dispatchReduce](...REDUCERS.min) }
+  min() { return dispatchReduce.call(this, ...REDUCERS.min) }
 
-  max() { return this[dispatchReduce](...REDUCERS.max) }
+  max() { return dispatchReduce.call(this, ...REDUCERS.max) }
 
-  countUniq() { return this[dispatchReduce](...REDUCERS.countUniq) }
+  countUniq() { return dispatchReduce.call(this, ...REDUCERS.countUniq) }
 
-  mean() { return this[dispatchReduce](...REDUCERS.mean) }
+  mean() { return dispatchReduce.call(this, ...REDUCERS.mean) }
 
   groupBy(name, fn) {
-    invariant(name, `Dodo#groupBy(name, fn) - name is required`)
-    invariant(this[meta].columns.has(name),
-      `Dodo#group(name) — name ${name} not in index`)
+    if (isfunc(name)) {
+      fn = name
+      name = undefined
+    }
+    invariant(this.index ? name : !name, `Dodo#groupBy(name, fn?) — name is required on indexed dodos` )
+    invariant(!name || this.columns.includes(name), `Dodo#groupBy(name?, fn?) — name ${name} not in index`)
+    invariant(!fn || isfunc(fn), `Dodo#groupBy(name?, fn?) — fn not a function`)
 
-    const map = new Map()
-    const grouper = createGrouper(map, fn, this[currentIndex][name])
-    const array = this.toArray()
-    const len = array.length
-    let i = -1
-    while (++i < len) {
-      grouper(array[i])
-    }
-    map.forEach(arrayToDodo(this[currentIndex]))
-    return Flock(map)
+    const grouper = createGrouper(fn, name ? this.index[name] : name)
+    const toDodos = map => (map.forEach(arrayToDodo(this.index)), map)
+    return Flock(this.reduce(grouper, new Map(), toDodos))
   }
@@ -251,9 +208,9 @@
     invariant(isfunc(fn), `Dodo#flock(fn) — fn not a function`)
-    return Flock(fn(this))
+    return Flock(fn.call(this, this))
   }
 }
 
-function arrayToDodo(Index) {
+export function arrayToDodo(index) {
   return function(array, key, map) {
-    map.set(key, new Dodo(array, Index))
+    map.set(key, new Dodo(array, index))
   }
@@ -260,0 +217,0 @@ }

src/helpers.js

@@ -86,16 +86,38 @@ import zipObject from 'lodash/zipObject'
 
-export function createGrouper(map, fn, col) {
+export function createGrouper(fn, col) {
   if (fn) {
-    return function(row) {
-      const key = fn(row[col])
-      map.has(key)
-        ? map.get(key).push(row)
-        : map.set(key, [row])
+    if (col == undefined) {
+      return function(map, row) {
+        const key = fn(row)
+        map.has(key)
+          ? map.get(key).push(row)
+          : map.set(key, [row])
+        return map
+      }
+    } else {
+      return function(map, row) {
+        const key = fn(row[col])
+        map.has(key)
+          ? map.get(key).push(row)
+          : map.set(key, [row])
+        return map
+      }
     }
   } else {
-    return function(row) {
-      const key = row[col]
-      map.has(key)
-        ? map.get(key).push(row)
-        : map.set(key, [row])
+    if (col == undefined) {
+      return function(map, row) {
+        const key = row
+        map.has(key)
+          ? map.get(key).push(row)
+          : map.set(key, [row])
+        return map
+      }
+    } else {
+      return function(map, row) {
+        const key = row[col]
+        map.has(key)
+          ? map.get(key).push(row)
+          : map.set(key, [row])
+        return map
+      }
     }
@@ -106,2 +128,13 @@ }
 export const isfunc = fn => fn && typeof fn == 'function'
+
 export const arrayToIndex = arr => zipObject(arr, [...arr.keys()])
+
+export const needSlowCase = a =>
+  a.toString().includes('new Take') || a.toString().includes('new Drop')
+
+export function dispatchReduce(fn, initFactory, final) {
+  if (this.index)
+    return this.reduceEach(fn, initFactory, final)
+  else
+    return this.reduce(fn, initFactory(), final)
+}

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

167967

increased by56.36%

Lines of code

3294

increased by3.07%

Dependency changes

• + Addedlodash@4.11.2(transitive)

• - Removedlodash@4.8.2(transitive)

• Updatedlodash@~4.11.0