Typed arrays support

src/components/colorscale/has_colorscale.js

@@ -6,24 +6,22 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
-
 var Lib = require('../../lib');
-
 var isValidScale = require('./is_valid_scale');
 
-
 module.exports = function hasColorscale(trace, containerStr) {
  var container = containerStr ?
  Lib.nestedProperty(trace, containerStr).get() || {} :
  trace,
  color = container.color,
  isArrayWithOneNumber = false;
 
- if(Array.isArray(color)) {
+ if(Lib.isTypedArray(color)) {
+ isArrayWithOneNumber = true;
+ } else if(Array.isArray(color)) {
  for(var i = 0; i < color.length; i++) {
  if(isNumeric(color[i])) {
  isArrayWithOneNumber = true;

src/components/drawing/index.js

@@ -316,10 +316,10 @@ function singlePointStyle(d, sel, trace, markerScale, lineScale, marker, markerL
 
  if('mlc' in d) lineColor = d.mlcc = lineScale(d.mlc);
  // weird case: array wasn't long enough to apply to every point
- else if(Array.isArray(markerLine.color)) lineColor = Color.defaultLine;
+ else if(Lib.isArrayOrTypedArray(markerLine.color)) lineColor = Color.defaultLine;
  else lineColor = markerLine.color;
 
- if(Array.isArray(marker.color)) {
+ if(Lib.isArrayOrTypedArray(marker.color)) {
  fillColor = Color.defaultLine;
  perPointGradient = true;
  }
@@ -542,7 +542,7 @@ drawing.tryColorscale = function(marker, prefix) {
  scl = cont.colorscale,
  colorArray = cont.color;
 
- if(scl && Array.isArray(colorArray)) {
+ if(scl && Lib.isArrayOrTypedArray(colorArray)) {
  return Colorscale.makeColorScaleFunc(
  Colorscale.extractScale(scl, cont.cmin, cont.cmax)
  );

src/lib/coerce.js

@@ -19,18 +19,21 @@ var nestedProperty = require('./nested_property');
 var counterRegex = require('./regex').counter;
 var DESELECTDIM = require('../constants/interactions').DESELECTDIM;
 var wrap180 = require('./angles').wrap180;
+var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
 
 exports.valObjectMeta = {
  data_array: {
  // You can use *dflt=[] to force said array to exist though.
  description: [
  'An {array} of data.',
- 'The value MUST be an {array}, or we ignore it.'
+ 'The value MUST be an {array}, or we ignore it.',
+ 'Note that typed arrays (e.g. Float32Array) are supported.'
  ].join(' '),
  requiredOpts: [],
  otherOpts: ['dflt'],
  coerceFunction: function(v, propOut, dflt) {
- if(Array.isArray(v)) propOut.set(v);
+ // TODO maybe `v: {type: 'float32', vals: [/* ... */]}` also
+ if(isArrayOrTypedArray(v)) propOut.set(v);
  else if(dflt !== undefined) propOut.set(dflt);
  }
  },
@@ -320,7 +323,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;
  }
@@ -417,7 +420,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;
  }
@@ -429,7 +432,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);

src/lib/extend.js

@@ -65,6 +65,8 @@ function _extend(inputs, isDeep, keepAllKeys, noArrayCopies) {
 
  var input, key, src, copy, copyIsArray, clone, allPrimitives;
 
+ // TODO does this do the right thing for typed arrays?
+
  if(length === 2 && isArray(target) && isArray(inputs[1]) && target.length === 0) {
 
  allPrimitives = primitivesLoopSplice(inputs[1], target);

src/lib/index.js

@@ -22,12 +22,15 @@ lib.nestedProperty = require('./nested_property');
 lib.keyedContainer = require('./keyed_container');
 lib.relativeAttr = require('./relative_attr');
 lib.isPlainObject = require('./is_plain_object');
-lib.isArray = require('./is_array');
 lib.mod = require('./mod');
 lib.toLogRange = require('./to_log_range');
 lib.relinkPrivateKeys = require('./relink_private');
 lib.ensureArray = require('./ensure_array');
 
+var isArrayModule = require('./is_array');
+lib.isTypedArray = isArrayModule.isTypedArray;
+lib.isArrayOrTypedArray = isArrayModule.isArrayOrTypedArray;
+
 var coerceModule = require('./coerce');
 lib.valObjectMeta = coerceModule.valObjectMeta;
 lib.coerce = coerceModule.coerce;
@@ -389,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];
  }
@@ -408,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]);
  }
@@ -429,8 +432,8 @@ lib.castOption = function(trace, ptNumber, astr, fn) {
 
  var val = lib.nestedProperty(trace, astr).get();
 
- if(Array.isArray(val)) {
- if(Array.isArray(ptNumber) && Array.isArray(val[ptNumber[0]])) {
+ if(lib.isArrayOrTypedArray(val)) {
+ if(Array.isArray(ptNumber) && lib.isArrayOrTypedArray(val[ptNumber[0]])) {
  return fn(val[ptNumber[0]][ptNumber[1]]);
  } else {
  return fn(val[ptNumber]);

src/lib/is_array.js

@@ -8,15 +8,13 @@
 
 'use strict';
 
-/**
- * Return true for arrays, whether they're untyped or not.
- */
-
 // IE9 fallback
 var ab = (typeof ArrayBuffer === 'undefined' || !ArrayBuffer.isView) ?
  {isView: function() { return false; }} :
  ArrayBuffer;
 
-module.exports = function isArray(a) {
+exports.isTypedArray = ab.isView;
+
+exports.isArrayOrTypedArray = function(a) {
  return Array.isArray(a) || ab.isView(a);
 };

src/lib/nested_property.js

@@ -10,7 +10,7 @@
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
-var isArray = require('./is_array');
+var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
 var isPlainObject = require('./is_plain_object');
 var containerArrayMatch = require('../plot_api/container_array_match');
 
@@ -96,7 +96,7 @@ function npGet(cont, parts) {
  }
  return allSame ? out[0] : out;
  }
- if(typeof curPart === 'number' && !isArray(curCont)) {
+ if(typeof curPart === 'number' && !isArrayOrTypedArray(curCont)) {
  return undefined;
  }
  curCont = curCont[curPart];
@@ -144,7 +144,7 @@ function isDeletable(val, propStr) {
  ) {
  return false;
  }
- if(!isArray(val)) return true;
+ if(!isArrayOrTypedArray(val)) return true;
 
  if(propStr.match(INFO_PATTERNS)) return true;
 
@@ -167,7 +167,7 @@ function npSet(cont, parts, propStr) {
  for(i = 0; i < parts.length - 1; i++) {
  curPart = parts[i];
 
- if(typeof curPart === 'number' && !isArray(curCont)) {
+ if(typeof curPart === 'number' && !isArrayOrTypedArray(curCont)) {
  throw 'array index but container is not an array';
  }
 
@@ -211,7 +211,7 @@ function joinPropStr(propStr, newPart) {
 
 // handle special -1 array index
 function setArrayAll(containerArray, innerParts, val, propStr) {
- var arrayVal = isArray(val),
+ var arrayVal = isArrayOrTypedArray(val),
  allSet = true,
  thisVal = val,
  thisPropStr = propStr.replace('-1', 0),
@@ -261,7 +261,7 @@ function pruneContainers(containerLevels) {
  propPart = containerLevels[i][1];
 
  remainingKeys = false;
- if(isArray(curCont)) {
+ if(isArrayOrTypedArray(curCont)) {
  for(j = curCont.length - 1; j >= 0; j--) {
  if(isDeletable(curCont[j], joinPropStr(propPart, j))) {
  if(remainingKeys) curCont[j] = undefined;
@@ -287,7 +287,7 @@ function pruneContainers(containerLevels) {
 function emptyObj(obj) {
  if(obj === undefined || obj === null) return true;
  if(typeof obj !== 'object') return false; // any plain value
- if(isArray(obj)) return !obj.length; // []
+ if(isArrayOrTypedArray(obj)) return !obj.length; // []
  return !Object.keys(obj).length; // {}
 }
 

src/lib/relink_private.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var isArray = require('./is_array');
+var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
 var isPlainObject = require('./is_plain_object');
 
 /**
@@ -35,7 +35,7 @@ module.exports = function relinkPrivateKeys(toContainer, fromContainer) {
 
  toContainer[k] = fromVal;
  }
- else if(isArray(fromVal) && isArray(toVal) && isPlainObject(fromVal[0])) {
+ else if(isArrayOrTypedArray(fromVal) && isArrayOrTypedArray(toVal) && isPlainObject(fromVal[0])) {
 
  // filter out data_array items that can contain user objects
  // most of the time the toVal === fromVal check will catch these early

src/lib/stats.js

@@ -10,7 +10,7 @@
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
-
+var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
 
 /**
  * aggNums() returns the result of an aggregate function applied to an array of
@@ -30,7 +30,7 @@ exports.aggNums = function(f, v, a, len) {
  b;
  if(!len) len = a.length;
  if(!isNumeric(v)) v = false;
- if(Array.isArray(a[0])) {
+ if(isArrayOrTypedArray(a[0])) {
  b = new Array(len);
  for(i = 0; i < len; i++) b[i] = exports.aggNums(f, v, a[i]);
  a = 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);
  }

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)) {

src/plots/array_container_defaults.js

@@ -10,7 +10,6 @@
 
 var Lib = require('../lib');
 
-
 /** Convenience wrapper for making array container logic DRY and consistent
  *
  * @param {object} parentObjIn
@@ -46,7 +45,7 @@ module.exports = function handleArrayContainerDefaults(parentObjIn, parentObjOut
 
  var previousContOut = parentObjOut[name];
 
- var contIn = Lib.isArray(parentObjIn[name]) ? parentObjIn[name] : [],
+ var contIn = Lib.isArrayOrTypedArray(parentObjIn[name]) ? parentObjIn[name] : [],
  contOut = parentObjOut[name] = [],
  i;
 
@@ -70,7 +69,7 @@ module.exports = function handleArrayContainerDefaults(parentObjIn, parentObjOut
 
  // in case this array gets its defaults rebuilt independent of the whole layout,
  // relink the private keys just for this array.
- if(Lib.isArray(previousContOut)) {
+ if(Lib.isArrayOrTypedArray(previousContOut)) {
  var len = Math.min(previousContOut.length, contOut.length);
  for(i = 0; i < len; i++) {
  Lib.relinkPrivateKeys(contOut[i], previousContOut[i]);

src/plots/cartesian/set_convert.js

@@ -405,25 +405,34 @@ module.exports = function setConvert(ax, fullLayout) {
  if(axLetter in trace) {
  arrayIn = trace[axLetter];
  len = trace._length || arrayIn.length;
- arrayOut = new Array(len);
 
+ if(Lib.isTypedArray(arrayIn)) {
+ if(len === arrayIn.length) {
+ return arrayIn;
+ } else if(arrayIn.subarray) {
+ return arrayIn.subarray(0, len);
+ }
+ }
+
+ arrayOut = new Array(len);
  for(i = 0; i < len; i++) {
  arrayOut[i] = ax.d2c(arrayIn[i], 0, cal);
  }
  }
  else {
- var v0 = ((axLetter + '0') in trace) ?
- ax.d2c(trace[axLetter + '0'], 0, cal) : 0,
- dv = (trace['d' + axLetter]) ?
- Number(trace['d' + axLetter]) : 1;
+ var v0 = ((axLetter + '0') in trace) ? ax.d2c(trace[axLetter + '0'], 0, cal) : 0;
+ var dv = (trace['d' + axLetter]) ? Number(trace['d' + axLetter]) : 1;
 
  // the opposing data, for size if we have x and dx etc
  arrayIn = trace[{x: 'y', y: 'x'}[axLetter]];
  len = trace._length || arrayIn.length;
  arrayOut = new Array(len);
 
- for(i = 0; i < len; i++) arrayOut[i] = v0 + i * dv;
+ for(i = 0; i < len; i++) {
+ arrayOut[i] = v0 + i * dv;
+ }
  }
+
  return arrayOut;
  };
 

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)) {