Merge pull request Sofie-Automation#1651 from evs-broadcast/contribute/objectWithOverrides-array-support

Fix objectWithOverrides to correctly handle arrays

Author: scriptorian

packages/corelib/src/settings/__tests__/objectWithOverrides.spec.ts

@@ -13,6 +13,12 @@ interface BasicType {
 		valC: number
 		valD?: string
 	}
+	valE?: [
+		{
+			valF: number
+			valG: string
+		},
+	]
 }
 
 describe('applyAndValidateOverrides', () => {
@@ -159,6 +165,7 @@ describe('applyAndValidateOverrides', () => {
 				valC: 5,
 				valD: 'xyz',
 			},
+			valE: [{ valF: 27, valG: 'hij' }],
 		}
 
 		const inputObjWithOverrides: ObjectWithOverrides<BasicType> = {
@@ -172,6 +179,7 @@ describe('applyAndValidateOverrides', () => {
 				valC: 6,
 				valD: 'uvw',
 			},
+			valE: [{ valF: 32, valG: 'klm' }],
 		}
 
 		const res = updateOverrides(inputObjWithOverrides, updateObj)
@@ -185,11 +193,13 @@ describe('applyAndValidateOverrides', () => {
 						valC: 5,
 						valD: 'xyz',
 					},
+					valE: [{ valF: 27, valG: 'hij' }],
 				},
 				overrides: [
 					{ op: 'set', path: 'valB.valD', value: 'uvw' },
 					{ op: 'set', path: 'valA', value: 'def' },
 					{ op: 'set', path: 'valB.valC', value: 6 },
+					{ op: 'set', path: 'valE', value: [{ valF: 32, valG: 'klm' }] },
 				],
 			})
 		)

packages/corelib/src/settings/objectWithOverrides.ts

@@ -150,23 +150,30 @@ function recursivelyGenerateOverrides<T extends object>(
 			})
 			continue
 		}
-		if (Array.isArray(rawValue) && !_.isEqual(curValue, rawValue)) {
-			outOverrides.push({
-				op: 'set',
-				path: fullKeyPathString,
-				value: rawValue,
-			})
-		}
-		if (typeof curValue === 'object' && curValue !== null && typeof rawValue === 'object' && rawValue !== null) {
-			recursivelyGenerateOverrides(curValue, rawValue, fullKeyPath, outOverrides)
-			continue
-		}
-		if (curValue !== rawValue) {
-			outOverrides.push({
-				op: 'set',
-				path: fullKeyPathString,
-				value: rawValue,
-			})
+		if (Array.isArray(rawValue)) {
+			if (!_.isEqual(curValue, rawValue))
+				outOverrides.push({
+					op: 'set',
+					path: fullKeyPathString,
+					value: rawValue,
+				})
+		} else {
+			if (
+				typeof curValue === 'object' &&
+				curValue !== null &&
+				typeof rawValue === 'object' &&
+				rawValue !== null
+			) {
+				recursivelyGenerateOverrides(curValue, rawValue, fullKeyPath, outOverrides)
+				continue
+			}
+			if (curValue !== rawValue) {
+				outOverrides.push({
+					op: 'set',
+					path: fullKeyPathString,
+					value: rawValue,
+				})
+			}
 		}
 	}
 	for (const [rawKey, rawValue] of Object.entries<any>(rawObj)) {