From d16cbb165cfdf10232ee25935263b4e46f581cfa Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Mon, 14 Nov 2022 20:48:30 -0500
Subject: [PATCH] Add support for backwards-compat shims for cluster renames on
 Darwin.

---
 .../darwin/Framework/CHIP/templates/helper.js | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js b/src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js
index b32df7255c..ed6c657b62 100644
--- a/src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js
+++ b/src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js
@@ -130,6 +130,22 @@ function asObjectiveCNumberType(label, type, asLowerCased) {
   return templateUtil.templatePromise(this.global, promise);
 }
 
+const compatClusterNameMap = {
+  UnitTesting: 'TestCluster',
+};
+
+function compatClusterNameRemapping(cluster) {
+  cluster = appHelper.asUpperCamelCase(cluster, {
+    hash: { preserveAcronyms: false },
+  });
+
+  if (cluster in compatClusterNameMap) {
+    cluster = compatClusterNameMap[cluster];
+  }
+
+  return cluster;
+}
+
 async function asObjectiveCClass(type, cluster, options) {
   let pkgIds = await templateUtil.ensureZclPackageIds(this);
   let isStruct = await zclHelper
@@ -152,9 +168,14 @@ async function asObjectiveCClass(type, cluster, options) {
   }
 
   if (isStruct) {
-    return `MTR${appHelper.asUpperCamelCase(cluster, {
-      hash: { preserveAcronyms: false },
-    })}Cluster${appHelper.asUpperCamelCase(type)}`;
+    if (options.hash.compatRemapClusterName) {
+      cluster = compatClusterNameRemapping.call(this, cluster);
+    } else {
+      cluster = appHelper.asUpperCamelCase(cluster, {
+        hash: { preserveAcronyms: false },
+      });
+    }
+    return `MTR${cluster}Cluster${appHelper.asUpperCamelCase(type)}`;
   }
 
   return 'NSNumber';
@@ -262,6 +283,7 @@ exports.commandHasRequiredField = commandHasRequiredField;
 exports.objCEnumName = objCEnumName;
 exports.objCEnumItemLabel = objCEnumItemLabel;
 exports.hasArguments = hasArguments;
+exports.compatClusterNameRemapping = compatClusterNameRemapping;
 
 exports.meta = {
   category: dbEnum.helperCategory.matter,