Skip to content

Commit 22a059d

Browse files
Add support for backwards-compat shims for cluster renames on Darwin. (#811)
1 parent 00b35d4 commit 22a059d

File tree

1 file changed

+25
-3
lines changed
  • src-electron/generator/matter/darwin/Framework/CHIP/templates

1 file changed

+25
-3
lines changed

src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,22 @@ function asObjectiveCNumberType(label, type, asLowerCased) {
130130
return templateUtil.templatePromise(this.global, promise);
131131
}
132132

133+
const compatClusterNameMap = {
134+
UnitTesting: 'TestCluster',
135+
};
136+
137+
function compatClusterNameRemapping(cluster) {
138+
cluster = appHelper.asUpperCamelCase(cluster, {
139+
hash: { preserveAcronyms: false },
140+
});
141+
142+
if (cluster in compatClusterNameMap) {
143+
cluster = compatClusterNameMap[cluster];
144+
}
145+
146+
return cluster;
147+
}
148+
133149
async function asObjectiveCClass(type, cluster, options) {
134150
let pkgIds = await templateUtil.ensureZclPackageIds(this);
135151
let isStruct = await zclHelper
@@ -152,9 +168,14 @@ async function asObjectiveCClass(type, cluster, options) {
152168
}
153169

154170
if (isStruct) {
155-
return `MTR${appHelper.asUpperCamelCase(cluster, {
156-
hash: { preserveAcronyms: false },
157-
})}Cluster${appHelper.asUpperCamelCase(type)}`;
171+
if (options.hash.compatRemapClusterName) {
172+
cluster = compatClusterNameRemapping.call(this, cluster);
173+
} else {
174+
cluster = appHelper.asUpperCamelCase(cluster, {
175+
hash: { preserveAcronyms: false },
176+
});
177+
}
178+
return `MTR${cluster}Cluster${appHelper.asUpperCamelCase(type)}`;
158179
}
159180

160181
return 'NSNumber';
@@ -262,6 +283,7 @@ exports.commandHasRequiredField = commandHasRequiredField;
262283
exports.objCEnumName = objCEnumName;
263284
exports.objCEnumItemLabel = objCEnumItemLabel;
264285
exports.hasArguments = hasArguments;
286+
exports.compatClusterNameRemapping = compatClusterNameRemapping;
265287

266288
exports.meta = {
267289
category: dbEnum.helperCategory.matter,

0 commit comments

Comments
 (0)