Back to decoding in coerce

Author: jonmmease

src/lib/array.js

@@ -41,7 +41,7 @@ exports.isArrayOrTypedArray = isArrayOrTypedArray;
  * not consistent we won't figure that out here.
  */
 function isArray1D(a) {
-    return !(isArrayOrTypedArray(a[0]) || (isTypedArraySpec(a) && a.ndims === 1));
+    return !isArrayOrTypedArray(a[0]);
 }
 exports.isArray1D = isArray1D;
 
@@ -83,6 +83,7 @@ exports.typedArrays = typedArrays;
 
 exports.decodeTypedArraySpec = function(v) {
     // Assume processed by coerceTypedArraySpec
+    v = coerceTypedArraySpec(v)
     var T = typedArrays[v.dtype];
     var buffer;
     if(v.bvals.constructor === ArrayBuffer) {
@@ -259,8 +260,6 @@ function _rowLength(z, fn, len0) {
         } else {
             return z.length;
         }
-    } else if(isTypedArraySpec(z)) {
-        return z.shape[z.shape.length - 1];
     }
     return 0;
 }

src/lib/coerce.js

@@ -20,7 +20,7 @@ var counterRegex = require('./regex').counter;
 var modHalf = require('./mod').modHalf;
 var isArrayOrTypedArray = require('./array').isArrayOrTypedArray;
 var isTypedArraySpec = require('./array').isTypedArraySpec;
-var coerceTypedArraySpec = require('./array').coerceTypedArraySpec;
+var decodeTypedArraySpec = require('./array').decodeTypedArraySpec;
 
 
 exports.valObjectMeta = {
@@ -42,7 +42,7 @@ exports.valObjectMeta = {
                 propOut.set(v);
                 wasSet = true;
             } else if(isTypedArraySpec(v)) {
-                propOut.set(coerceTypedArraySpec(v));
+                propOut.set(decodeTypedArraySpec(v));
                 wasSet = true;
             }
             if(!wasSet && dflt !== undefined) propOut.set(dflt);

src/plots/plots.js

@@ -11,8 +11,6 @@
 var d3 = require('d3');
 var timeFormatLocale = require('d3-time-format').timeFormatLocale;
 var isNumeric = require('fast-isnumeric');
-var decodeTypedArraySpec = require('../lib/array').decodeTypedArraySpec;
-var isTypedArraySpec = require('../lib/array').isTypedArraySpec;
 
 var Registry = require('../registry');
 var PlotSchema = require('../plot_api/plot_schema');
@@ -2850,36 +2848,7 @@ function _transition(gd, transitionOpts, opts) {
     return transitionStarting.then(function() { return gd; });
 }
 
-function _decode(cont) {
-    if(isTypedArraySpec(cont)) {
-        return decodeTypedArraySpec(cont);
-    }
-    for(var prop in cont) {
-        if(prop[0] !== '_' && cont.hasOwnProperty(prop)) {
-            var item = cont[prop];
-            if(Lib.isPlainObject(item)) {
-                var r = _decode(item);
-                if(r !== undefined) cont[prop] = r;
-            } else if(Array.isArray(cont) && cont.length > 0 && Lib.isPlainObject(cont[0])) {
-                for(var i = 0; i < cont.length; i++) {
-                    _decode(cont[i]);
-                }
-            }
-        }
-    }
-}
-
-function decodeTypedArrays(gd) {
-    for(var i = 0; i < gd._fullData.length; i++) {
-        _decode(gd._fullData[i]);
-    }
-
-    _decode(gd._fullLayout);
-}
-
 plots.doCalcdata = function(gd, traces) {
-    decodeTypedArrays(gd);
-
     var axList = axisIDs.list(gd);
     var fullData = gd._fullData;
     var fullLayout = gd._fullLayout;

src/traces/isosurface/defaults.js

@@ -38,8 +38,6 @@ function supplyIsoDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
     var z = coerce('z');
     var value = coerce('value');
 
-    console.log(["x", x]);
-
     if(
         !x || !x.length ||
         !y || !y.length ||