fix: encoding of array related transforms

samuelgozi · Apr 13, 2020 · 4022ef4 · 4022ef4
1 parent e41c5be
commit 4022ef4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 39 deletions.
diff --git a/src/Transform.js b/src/Transform.js
@@ -23,6 +23,7 @@ export default class Transform {
 				`The value for the transform "${name}" needs to be a${validator === isNumber ? ' number' : 'n array'}.`
 			);
 
-		this[transformName] = name === 'serverTimestamp' ? 'REQUEST_TIME' : encodeValue(value);
+		if (validator === Array.isArray) this[transformName] = encodeValue(value).arrayValue;
+		else this[transformName] = name === 'serverTimestamp' ? 'REQUEST_TIME' : encodeValue(value);
 	}
 }
diff --git a/test/Transform.test.js b/test/Transform.test.js
@@ -105,19 +105,17 @@ describe('Transform', () => {
 				const given = JSON.stringify(new Transform('appendToArray', [1, 2, 3]));
 				const expected = JSON.stringify({
 					appendMissingElements: {
-						arrayValue: {
-							values: [
-								{
-									integerValue: '1'
-								},
-								{
-									integerValue: '2'
-								},
-								{
-									integerValue: '3'
-								}
-							]
-						}
+						values: [
+							{
+								integerValue: '1'
+							},
+							{
+								integerValue: '2'
+							},
+							{
+								integerValue: '3'
+							}
+						]
 					}
 				});
 
@@ -128,9 +126,7 @@ describe('Transform', () => {
 				const given = JSON.stringify(new Transform('appendToArray', []));
 				const expected = JSON.stringify({
 					appendMissingElements: {
-						arrayValue: {
-							values: []
-						}
+						values: []
 					}
 				});
 
@@ -159,19 +155,17 @@ describe('Transform', () => {
 				const given = JSON.stringify(new Transform('removeFromArray', [1, 2, 3]));
 				const expected = JSON.stringify({
 					removeAllFromArray: {
-						arrayValue: {
-							values: [
-								{
-									integerValue: '1'
-								},
-								{
-									integerValue: '2'
-								},
-								{
-									integerValue: '3'
-								}
-							]
-						}
+						values: [
+							{
+								integerValue: '1'
+							},
+							{
+								integerValue: '2'
+							},
+							{
+								integerValue: '3'
+							}
+						]
 					}
 				});
 
@@ -182,9 +176,7 @@ describe('Transform', () => {
 				const given = JSON.stringify(new Transform('removeFromArray', []));
 				const expected = JSON.stringify({
 					removeAllFromArray: {
-						arrayValue: {
-							values: []
-						}
+						values: []
 					}
 				});
 

diff --git a/test/utils.test.js b/test/utils.test.js
@@ -371,17 +371,13 @@ describe('encode', () => {
 			{
 				fieldPath: 't5',
 				appendMissingElements: {
-					arrayValue: {
-						values: [{ stringValue: 'hello' }]
-					}
+					values: [{ stringValue: 'hello' }]
 				}
 			},
 			{
 				fieldPath: 't6',
 				removeAllFromArray: {
-					arrayValue: {
-						values: [{ stringValue: 'good bye' }]
-					}
+					values: [{ stringValue: 'good bye' }]
 				}
 			}
 		];