replace Array.isArray -> Lib.isArrayOrTypedArray in various places

etpinard · etpinard · commit 2d81bdc8ccbf · 2018-02-20T16:15:46.000-05:00
... that should accept typed array (mostly arrayOk attribute,
    with marker.size and marker.color being to most likely
    candidates for typed array inputs).
diff --git a/src/lib/coerce.js b/src/lib/coerce.js
@@ -322,7 +322,7 @@ exports.coerce = function(containerIn, containerOut, attributes, attribute, dflt
      * individual form (eg. some array vals can be numbers, even if the
      * single values must be color strings)
      */
-    if(opts.arrayOk && Array.isArray(v)) {
+    if(opts.arrayOk && isArrayOrTypedArray(v)) {
         propOut.set(v);
         return v;
     }
@@ -419,7 +419,7 @@ exports.coerceSelectionMarkerOpacity = function(traceOut, coerce) {
     //
     // Only give [un]selected.marker.opacity a default value if you don't
     // set any other [un]selected attributes.
-    if(!Array.isArray(mo) && !traceOut.selected && !traceOut.unselected) {
+    if(!isArrayOrTypedArray(mo) && !traceOut.selected && !traceOut.unselected) {
         smoDflt = mo;
         usmoDflt = DESELECTDIM * mo;
     }
@@ -431,7 +431,7 @@ exports.coerceSelectionMarkerOpacity = function(traceOut, coerce) {
 exports.validate = function(value, opts) {
     var valObjectDef = exports.valObjectMeta[opts.valType];
 
-    if(opts.arrayOk && Array.isArray(value)) return true;
+    if(opts.arrayOk && isArrayOrTypedArray(value)) return true;
 
     if(valObjectDef.validateFunction) {
         return valObjectDef.validateFunction(value, opts);
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -392,7 +392,7 @@ lib.noneOrAll = function(containerIn, containerOut, attrList) {
  * @param {string} cdAttr : calcdata key
  */
 lib.mergeArray = function(traceAttr, cd, cdAttr) {
-    if(Array.isArray(traceAttr)) {
+    if(lib.isArrayOrTypedArray(traceAttr)) {
         var imax = Math.min(traceAttr.length, cd.length);
         for(var i = 0; i < imax; i++) cd[i][cdAttr] = traceAttr[i];
     }
@@ -411,7 +411,7 @@ lib.mergeArray = function(traceAttr, cd, cdAttr) {
 lib.fillArray = function(traceAttr, cd, cdAttr, fn) {
     fn = fn || lib.identity;
 
-    if(Array.isArray(traceAttr)) {
+    if(lib.isArrayOrTypedArray(traceAttr)) {
         for(var i = 0; i < cd.length; i++) {
             cd[i][cdAttr] = fn(traceAttr[i]);
         }
@@ -432,7 +432,8 @@ lib.castOption = function(trace, ptNumber, astr, fn) {
 
     var val = lib.nestedProperty(trace, astr).get();
 
-    if(Array.isArray(val)) {
+    if(lib.isArrayOrTypedArray(val)) {
+        // TODO what to do with 2d arrays?
         if(Array.isArray(ptNumber) && Array.isArray(val[ptNumber[0]])) {
             return fn(val[ptNumber[0]][ptNumber[1]]);
         } else {
diff --git a/src/plot_api/plot_schema.js b/src/plot_api/plot_schema.js
@@ -191,7 +191,7 @@ exports.findArrayAttributes = function(trace) {
 
         var astr = toAttrString(stack);
         var val = Lib.nestedProperty(trace, astr).get();
-        if(!Array.isArray(val)) return;
+        if(!Lib.isArrayOrTypedArray(val)) return;
 
         arrayAttributes.push(astr);
     }
diff --git a/src/plot_api/validate.js b/src/plot_api/validate.js
@@ -6,18 +6,16 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
-
 var Lib = require('../lib');
 var Plots = require('../plots/plots');
 var PlotSchema = require('./plot_schema');
 var dfltConfig = require('./plot_config');
 
 var isPlainObject = Lib.isPlainObject;
 var isArray = Array.isArray;
-
+var isArrayOrTypedArray = Lib.isArrayOrTypedArray;
 
 /**
  * Validate a data array and layout object.
@@ -211,7 +209,7 @@ function crawl(objIn, objOut, schema, list, base, path) {
         else if(!isPlainObject(valIn) && isPlainObject(valOut)) {
             list.push(format('object', base, p, valIn));
         }
-        else if(!isArray(valIn) && isArray(valOut) && !isInfoArray && !isColorscale) {
+        else if(!isArrayOrTypedArray(valIn) && isArrayOrTypedArray(valOut) && !isInfoArray && !isColorscale) {
             list.push(format('array', base, p, valIn));
         }
         else if(!(k in objOut)) {
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js
@@ -308,14 +308,14 @@ var axisProperties = [ 'xaxis', 'yaxis', 'zaxis' ];
 
 function coordinateBound(axis, coord, len, d, bounds, calendar) {
     var x;
-    if(!Array.isArray(coord)) {
+    if(!Lib.isArrayOrTypedArray(coord)) {
         bounds[0][d] = Math.min(bounds[0][d], 0);
         bounds[1][d] = Math.max(bounds[1][d], len - 1);
         return;
     }
 
     for(var i = 0; i < (len || coord.length); ++i) {
-        if(Array.isArray(coord[i])) {
+        if(Lib.isArrayOrTypedArray(coord[i])) {
             for(var j = 0; j < coord[i].length; ++j) {
                 x = axis.d2l(coord[i][j], 0, calendar);
                 if(!isNaN(x) && isFinite(x)) {
diff --git a/src/plots/mapbox/convert_text_opts.js b/src/plots/mapbox/convert_text_opts.js
@@ -11,7 +11,6 @@
 
 var Lib = require('../../lib');
 
-
 /**
  * Convert plotly.js 'textposition' to mapbox-gl 'anchor' and 'offset'
  * (with the help of the icon size).
@@ -29,7 +28,7 @@ module.exports = function convertTextOpts(textposition, iconSize) {
         hPos = parts[1];
 
     // ballpack values
-    var factor = Array.isArray(iconSize) ? Lib.mean(iconSize) : iconSize,
+    var factor = Lib.isArrayOrTypedArray(iconSize) ? Lib.mean(iconSize) : iconSize,
         xInc = 0.5 + (factor / 100),
         yInc = 1.5 + (factor / 100);
 
diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js
@@ -11,6 +11,7 @@
 
 var isNumeric = require('fast-isnumeric');
 
+var Lib = require('../../lib');
 var Axes = require('../../plots/cartesian/axes');
 var hasColorscale = require('../../components/colorscale/has_colorscale');
 var colorscaleCalc = require('../../components/colorscale/calc');
@@ -63,7 +64,7 @@ module.exports = function calc(gd, trace) {
     var base = trace.base,
         b;
 
-    if(Array.isArray(base)) {
+    if(Lib.isArrayOrTypedArray(base)) {
         for(i = 0; i < Math.min(base.length, cd.length); i++) {
             b = sa.d2c(base[i], 0, scalendar);
             if(isNumeric(b)) {
diff --git a/src/traces/bar/set_positions.js b/src/traces/bar/set_positions.js
@@ -12,6 +12,7 @@
 var isNumeric = require('fast-isnumeric');
 var BADNUM = require('../../constants/numerical').BADNUM;
 
+var Lib = require('../../lib');
 var Registry = require('../../registry');
 var Axes = require('../../plots/cartesian/axes');
 var Sieve = require('./sieve.js');
@@ -311,7 +312,7 @@ function applyAttributes(sieve) {
             initialPoffset = t.poffset,
             newPoffset;
 
-        if(Array.isArray(offset)) {
+        if(Lib.isArrayOrTypedArray(offset)) {
             // if offset is an array, then clone it into t.poffset.
             newPoffset = offset.slice(0, calcTrace.length);
 
@@ -337,7 +338,7 @@ function applyAttributes(sieve) {
         var width = fullTrace.width,
             initialBarwidth = t.barwidth;
 
-        if(Array.isArray(width)) {
+        if(Lib.isArrayOrTypedArray(width)) {
             // if width is an array, then clone it into t.barwidth.
             var newBarwidth = width.slice(0, calcTrace.length);
 
diff --git a/src/traces/box/calc.js b/src/traces/box/calc.js
@@ -220,7 +220,7 @@ function arraysToCalcdata(pt, trace, i) {
 }
 
 function calcSelection(cd, trace) {
-    if(Array.isArray(trace.selectedpoints)) {
+    if(Lib.isArrayOrTypedArray(trace.selectedpoints)) {
         for(var i = 0; i < cd.length; i++) {
             var pts = cd[i].pts || [];
             var ptNumber2cdIndex = {};
diff --git a/src/traces/carpet/array_minmax.js b/src/traces/carpet/array_minmax.js
@@ -8,6 +8,8 @@
 
 'use strict';
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
+
 module.exports = function(a) {
     return minMax(a, 0);
 };
@@ -16,7 +18,7 @@ function minMax(a, depth) {
     // Limit to ten dimensional datasets. This seems *exceedingly* unlikely to
     // ever cause problems or even be a concern. It's include strictly so that
     // circular arrays could never cause this to loop.
-    if(!Array.isArray(a) || depth >= 10) {
+    if(!isArrayOrTypedArray(a) || depth >= 10) {
         return null;
     }
 
@@ -26,7 +28,7 @@ function minMax(a, depth) {
     for(var i = 0; i < n; i++) {
         var datum = a[i];
 
-        if(Array.isArray(datum)) {
+        if(isArrayOrTypedArray(datum)) {
             var result = minMax(datum, depth + 1);
 
             if(result) {
diff --git a/src/traces/carpet/axis_aligned_line.js b/src/traces/carpet/axis_aligned_line.js
@@ -8,6 +8,8 @@
 
 'use strict';
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
+
 /* This function retrns a set of control points that define a curve aligned along
  * either the a or b axis. Exactly one of a or b must be an array defining the range
  * spanned.
@@ -19,7 +21,7 @@ module.exports = function(carpet, carpetcd, a, b) {
     var idx, tangent, tanIsoIdx, tanIsoPar, segment, refidx;
     var p0, p1, v0, v1, start, end, range;
 
-    var axis = Array.isArray(a) ? 'a' : 'b';
+    var axis = isArrayOrTypedArray(a) ? 'a' : 'b';
     var ax = axis === 'a' ? carpet.aaxis : carpet.baxis;
     var smoothing = ax.smoothing;
     var toIdx = axis === 'a' ? carpet.a2i : carpet.b2j;
diff --git a/src/traces/carpet/has_columns.js b/src/traces/carpet/has_columns.js
@@ -6,9 +6,10 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
+
 module.exports = function(data) {
-    return Array.isArray(data[0]);
+    return isArrayOrTypedArray(data[0]);
 };
diff --git a/src/traces/carpet/map_1d_array.js b/src/traces/carpet/map_1d_array.js
@@ -8,6 +8,8 @@
 
 'use strict';
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
+
 /*
  * Map an array of x or y coordinates (c) to screen-space pixel coordinates (p).
  * The output array is optional, but if provided, it will be reused without
@@ -16,7 +18,7 @@
 module.exports = function mapArray(out, data, func) {
     var i;
 
-    if(!Array.isArray(out)) {
+    if(!isArrayOrTypedArray(out)) {
         // If not an array, make it an array:
         out = [];
     } else if(out.length > data.length) {
diff --git a/src/traces/carpet/map_2d_array.js b/src/traces/carpet/map_2d_array.js
@@ -8,6 +8,8 @@
 
 'use strict';
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
+
 /*
  * Map an array of x or y coordinates (c) to screen-space pixel coordinates (p).
  * The output array is optional, but if provided, it will be reused without
@@ -16,7 +18,7 @@
 module.exports = function mapArray(out, data, func) {
     var i, j;
 
-    if(!Array.isArray(out)) {
+    if(!isArrayOrTypedArray(out)) {
         // If not an array, make it an array:
         out = [];
     } else if(out.length > data.length) {
@@ -26,7 +28,7 @@ module.exports = function mapArray(out, data, func) {
     }
 
     for(i = 0; i < data.length; i++) {
-        if(!Array.isArray(out[i])) {
+        if(!isArrayOrTypedArray(out[i])) {
             // If not an array, make it an array:
             out[i] = [];
         } else if(out[i].length > data.length) {
diff --git a/src/traces/choropleth/defaults.js b/src/traces/choropleth/defaults.js
@@ -29,7 +29,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     var z = coerce('z');
-    if(!Array.isArray(z)) {
+    if(!Lib.isArrayOrTypedArray(z)) {
         traceOut.visible = false;
         return;
     }
diff --git a/src/traces/histogram/calc.js b/src/traces/histogram/calc.js
@@ -72,7 +72,7 @@ module.exports = function calc(gd, trace) {
     var pr2c = function(v) { return pa.r2c(v, 0, calendar); };
     var rawCounterData;
 
-    if(Array.isArray(trace[counterData]) && func !== 'count') {
+    if(Lib.isArrayOrTypedArray(trace[counterData]) && func !== 'count') {
         rawCounterData = trace[counterData];
         isAvg = func === 'avg';
         binFunc = binFunctions[func];
@@ -199,7 +199,7 @@ module.exports = function calc(gd, trace) {
 
     arraysToCalcdata(cd, trace);
 
-    if(Array.isArray(trace.selectedpoints)) {
+    if(Lib.isArrayOrTypedArray(trace.selectedpoints)) {
         Lib.tagSelected(cd, trace, ptNumber2cdIndex);
     }
 
diff --git a/src/traces/mesh3d/defaults.js b/src/traces/mesh3d/defaults.js
@@ -24,7 +24,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         var ret = array.map(function(attr) {
             var result = coerce(attr);
 
-            if(result && Array.isArray(result)) return result;
+            if(result && Lib.isArrayOrTypedArray(result)) return result;
             return null;
         });
 
diff --git a/src/traces/pie/calc.js b/src/traces/pie/calc.js
@@ -11,12 +11,13 @@
 var isNumeric = require('fast-isnumeric');
 var tinycolor = require('tinycolor2');
 
+var Lib = require('../../lib');
 var Color = require('../../components/color');
 var helpers = require('./helpers');
 
 module.exports = function calc(gd, trace) {
     var vals = trace.values;
-    var hasVals = Array.isArray(vals) && vals.length;
+    var hasVals = Lib.isArrayOrTypedArray(vals) && vals.length;
     var labels = trace.labels;
     var colors = trace.marker.colors || [];
     var cd = [];
diff --git a/src/traces/pie/defaults.js b/src/traces/pie/defaults.js
@@ -21,7 +21,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var vals = coerce('values');
     var labels = coerce('labels');
     if(!Array.isArray(labels)) {
-        if(!Array.isArray(vals) || !vals.length) {
+        if(!Lib.isArrayOrTypedArray(vals) || !vals.length) {
             // must have at least one of vals or labels
             traceOut.visible = false;
             return;
diff --git a/src/traces/scatter/calc.js b/src/traces/scatter/calc.js
@@ -6,11 +6,11 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
 
+var Lib = require('../../lib');
 var Axes = require('../../plots/cartesian/axes');
 var BADNUM = require('../../constants/numerical').BADNUM;
 
@@ -111,7 +111,7 @@ function calcMarkerSize(trace, serieslen) {
         };
     }
 
-    if(Array.isArray(marker.size)) {
+    if(Lib.isArrayOrTypedArray(marker.size)) {
         // I tried auto-type but category and dates dont make much sense.
         var ax = {type: 'linear'};
         Axes.setConvert(ax);
diff --git a/src/traces/scatter/calc_selection.js b/src/traces/scatter/calc_selection.js
@@ -11,7 +11,7 @@
 var Lib = require('../../lib');
 
 module.exports = function calcSelection(cd, trace) {
-    if(Array.isArray(trace.selectedpoints)) {
+    if(Lib.isArrayOrTypedArray(trace.selectedpoints)) {
         Lib.tagSelected(cd, trace);
     }
 };
diff --git a/src/traces/scatter/fillcolor_defaults.js b/src/traces/scatter/fillcolor_defaults.js
@@ -10,7 +10,7 @@
 'use strict';
 
 var Color = require('../../components/color');
-
+var Lib = require('../../lib');
 
 module.exports = function fillColorDefaults(traceIn, traceOut, defaultColor, coerce) {
     var inheritColorFromMarker = false;
@@ -20,10 +20,10 @@ module.exports = function fillColorDefaults(traceIn, traceOut, defaultColor, coe
         var markerColor = traceOut.marker.color,
             markerLineColor = (traceOut.marker.line || {}).color;
 
-        if(markerColor && !Array.isArray(markerColor)) {
+        if(markerColor && !Lib.isArrayOrTypedArray(markerColor)) {
             inheritColorFromMarker = markerColor;
         }
-        else if(markerLineColor && !Array.isArray(markerLineColor)) {
+        else if(markerLineColor && !Lib.isArrayOrTypedArray(markerLineColor)) {
             inheritColorFromMarker = markerLineColor;
         }
     }
diff --git a/src/traces/scatter/line_defaults.js b/src/traces/scatter/line_defaults.js
diff --git a/src/traces/scatter/subtypes.js b/src/traces/scatter/subtypes.js
diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js
diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js
diff --git a/src/traces/scattermapbox/convert.js b/src/traces/scattermapbox/convert.js
diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ exports.findArrayAttributes = function(trace) {`
`191`	`191`
`192`	`192`	`var astr = toAttrString(stack);`
`193`	`193`	`var val = Lib.nestedProperty(trace, astr).get();`
`194`		`- if(!Array.isArray(val)) return;`
	`194`	`+ if(!Lib.isArrayOrTypedArray(val)) return;`
`195`	`195`
`196`	`196`	`arrayAttributes.push(astr);`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ function arraysToCalcdata(pt, trace, i) {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`function calcSelection(cd, trace) {`
`223`		`- if(Array.isArray(trace.selectedpoints)) {`
	`223`	`+ if(Lib.isArrayOrTypedArray(trace.selectedpoints)) {`
`224`	`224`	`for(var i = 0; i < cd.length; i++) {`
`225`	`225`	`var pts = cd[i].pts \|\| [];`
`226`	`226`	`var ptNumber2cdIndex = {};`