validate: don't mix up info array and array containers

etpinard · etpinard · commit cfb39867da7e · 2016-08-03T19:04:47.000-04:00
diff --git a/src/plot_api/validate.js b/src/plot_api/validate.js
@@ -163,15 +163,16 @@ function crawl(objIn, objOut, schema, list, base, path) {
         var valIn = objIn[k],
             valOut = objOut[k];
 
-        var nestedSchema = getNestedSchema(schema, k);
+        var nestedSchema = getNestedSchema(schema, k),
+            isInfoArray = (nestedSchema || {}).valType === 'info_array';
 
         if(!isInSchema(schema, k)) {
             list.push(format('schema', base, p));
         }
         else if(isPlainObject(valIn) && isPlainObject(valOut)) {
             crawl(valIn, valOut, nestedSchema, list, base, p);
         }
-        else if(nestedSchema.items && isArray(valIn)) {
+        else if(nestedSchema.items && !isInfoArray && isArray(valIn)) {
             var itemName = k.substr(0, k.length - 1);
 
             for(var j = 0; j < valIn.length; j++) {
@@ -186,7 +187,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) && nestedSchema.valType !== 'info_array') {
+        else if(!isArray(valIn) && isArray(valOut) && !isInfoArray) {
             list.push(format('array', base, p, valIn));
         }
         else if(!(k in objOut)) {
diff --git a/test/jasmine/tests/validate_test.js b/test/jasmine/tests/validate_test.js
@@ -138,6 +138,21 @@ describe('Plotly.validate', function() {
         );
     });
 
+    it('should work with info arrays', function() {
+        var out = Plotly.validate([{
+            y: [1, 2, 2]
+        }], {
+            xaxis: { range: [0, 10] },
+            yaxis: { range: 'not-gonna-work' },
+        });
+
+        expect(out.length).toEqual(1);
+        assertErrorContent(
+            out[0], 'value', 'layout', null, ['yaxis', 'range'], 'yaxis.range',
+            'In layout, key yaxis.range is set to an invalid value (not-gonna-work)'
+        );
+    });
+
     it('should work with isLinkedToArray attributes', function() {
         var out = Plotly.validate([], {
             annotations: [{

Original file line number	Diff line number	Diff line change
`@@ -163,15 +163,16 @@ function crawl(objIn, objOut, schema, list, base, path) {`
`163`	`163`	`var valIn = objIn[k],`
`164`	`164`	`valOut = objOut[k];`
`165`	`165`
`166`		`- var nestedSchema = getNestedSchema(schema, k);`
	`166`	`+ var nestedSchema = getNestedSchema(schema, k),`
	`167`	`+ isInfoArray = (nestedSchema \|\| {}).valType === 'info_array';`
`167`	`168`
`168`	`169`	`if(!isInSchema(schema, k)) {`
`169`	`170`	`list.push(format('schema', base, p));`
`170`	`171`	`}`
`171`	`172`	`else if(isPlainObject(valIn) && isPlainObject(valOut)) {`
`172`	`173`	`crawl(valIn, valOut, nestedSchema, list, base, p);`
`173`	`174`	`}`
`174`		`- else if(nestedSchema.items && isArray(valIn)) {`
	`175`	`+ else if(nestedSchema.items && !isInfoArray && isArray(valIn)) {`
`175`	`176`	`var itemName = k.substr(0, k.length - 1);`
`176`	`177`
`177`	`178`	`for(var j = 0; j < valIn.length; j++) {`
`@@ -186,7 +187,7 @@ function crawl(objIn, objOut, schema, list, base, path) {`
`186`	`187`	`else if(!isPlainObject(valIn) && isPlainObject(valOut)) {`
`187`	`188`	`list.push(format('object', base, p, valIn));`
`188`	`189`	`}`
`189`		`- else if(!isArray(valIn) && isArray(valOut) && nestedSchema.valType !== 'info_array') {`
	`190`	`+ else if(!isArray(valIn) && isArray(valOut) && !isInfoArray) {`
`190`	`191`	`list.push(format('array', base, p, valIn));`
`191`	`192`	`}`
`192`	`193`	`else if(!(k in objOut)) {`