[WIP] Transforms [rebase of timelyportfolio's work]

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

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

test/jasmine/assets/transforms/filter.js → src/transforms/filter.js

@@ -1,11 +1,20 @@
+/**
+* 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.
+*/
+
 'use strict';
 
+var isNumeric = require('fast-isnumeric');
+
 // 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 +25,11 @@ exports.name = 'filter';
 exports.attributes = {
     operation: {
         valType: 'enumerated',
-        values: ['=', '<', '>'],
+        values: ['=', '<', '>', 'within', 'notwithin', 'in', 'notin'],
         dflt: '='
     },
     value: {
-        valType: 'number',
+        valType: 'any',
         dflt: 0
     },
     filtersrc: {
@@ -54,6 +63,16 @@ exports.supplyDefaults = function(transformIn, fullData, layout) {
     coerce('value');
     coerce('filtersrc');
 
+    // numeric values as character should be converted to numeric
+    if(Array.isArray(transformOut.value)) {
+        transformOut.value = transformOut.value.map(function(v) {
+            if(isNumeric(v)) v = +v;
+            return v;
+        });
+    } else {
+        if(isNumeric(transformOut.value)) transformOut.value = +transformOut.value;
+    }
+
     // or some more complex logic using fullData and layout
 
     return transformOut;
@@ -121,6 +140,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 valueArr = [];
+    if(!Array.isArray(value)) {
+        valueArr = [value, value];
+    } else {
+        valueArr = value;
+    }
 
     switch(opts.operation) {
         case '=':
@@ -129,6 +158,30 @@ function getFilterFunc(opts) {
             return function(v) { return v < value; };
         case '>':
             return function(v) { return v > value; };
+        case 'within':
+            return function(v) {
+                // if character then ignore with no side effect
+                function notDateNumber(d) {
+                    return !(isNumeric(d) || Lib.isDateTime(d));
+                }
+                if(valueArr.some(notDateNumber)) {
+                    return true;
+                }
+
+                // keep the = ?
+                return v >= Math.min.apply(null, valueArr) &&
+                      v <= Math.max.apply(null, valueArr);
+            };
+        case 'notwithin':
+            return function(v) {
+                // keep the = ?
+                return !(v >= Math.min.apply(null, valueArr) &&
+                      v <= Math.max.apply(null, valueArr));
+            };
+        case 'in':
+            return function(v) { return valueArr.indexOf(v) >= 0; };
+        case 'notin':
+            return function(v) { return valueArr.indexOf(v) === -1; };
     }
 }
 

test/jasmine/assets/transforms/groupby.js → src/transforms/groupby.js

@@ -1,7 +1,15 @@
+/**
+* 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.
+*/
+
 'use strict';
 
 // var Lib = require('@src/lib');
-var Lib = require('../../../../src/lib');
+var Lib = require('../lib');
 
 /* eslint no-unused-vars: 0*/
 

test/jasmine/tests/plotschema_test.js

@@ -2,8 +2,8 @@ var Plotly = require('@lib/index');
 var Lib = require('@src/lib');
 
 Plotly.register([
-    // until they become official
-    require('../assets/transforms/filter')
+    require('@src/transforms/filter'),
+    require('@src/transforms/groupby')
 ]);
 
 describe('plot schema', function() {