add in \ notin and within \ notwithin filter transforms; register filter with plotly

Author: timelyportfolio

lib/filter.js

@@ -0,0 +1,9 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+module.exports = require('../src/transforms/filter');

lib/index.js

@@ -29,4 +29,9 @@ Plotly.register([
     require('./scattermapbox')
 ]);
 
+// add transforms
+Plotly.register([
+    require('./filter')
+]);
+
 module.exports = Plotly;

src/transforms/filter.js

@@ -1,11 +1,10 @@
 'use strict';
 
 // var Lib = require('@src/lib');
-var Lib = require('../../../../src/lib');
+var Lib = require('../lib');
 
 /*eslint no-unused-vars: 0*/
 
-
 // so that Plotly.register knows what to do with it
 exports.moduleType = 'transform';
 
@@ -16,11 +15,11 @@ exports.name = 'filter';
 exports.attributes = {
     operation: {
         valType: 'enumerated',
-        values: ['=', '<', '>'],
+        values: ['=', '<', '>', 'within', 'notwithin', 'in', 'notin'],
         dflt: '='
     },
     value: {
-        valType: 'number',
+        valType: 'any',
         dflt: 0
     },
     filtersrc: {
@@ -121,6 +120,16 @@ function transformOne(trace, state) {
 
 function getFilterFunc(opts) {
     var value = opts.value;
+    // if value is not array then coerce to
+    //   an array of [value,value] so the
+    //   filter function will work
+    //   but perhaps should just error out
+    var value_arr = [];
+    if (!Array.isArray(value)) {
+        value_arr = [value, value];
+    } else {
+        value_arr = value;
+    }
 
     switch(opts.operation) {
         case '=':
@@ -129,6 +138,22 @@ function getFilterFunc(opts) {
             return function(v) { return v < value; };
         case '>':
             return function(v) { return v > value; };
+        case 'within':
+            return function(v) {
+                // keep the = ?
+                return v >= Math.min.apply( null, value ) &&
+                      v <= Math.max.apply( null, value );
+            };
+        case 'notwithin':
+            return function(v) {
+                // keep the = ?
+                return !(v >= Math.min.apply( null, value ) &&
+                      v <= Math.max.apply( null, value ));
+            };
+        case 'in':
+            return function(v) { return value.indexOf(v) >= 0 };
+        case 'notin':
+            return function(v) { return value.indexOf(v) === -1 };
     }
 }
 

src/transforms/groupby.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // var Lib = require('@src/lib');
-var Lib = require('../../../../src/lib');
+var Lib = require('../lib');
 
 /*eslint no-unused-vars: 0*/