Stop depending on controller-clusters.zap state entirely, now that we…

… can.
project-chip · Apr 18, 2023 · a42ddde · a42ddde
1 parent 8671f57
commit a42ddde
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 45 deletions.
diff --git a/examples/darwin-framework-tool/templates/commands.zapt b/examples/darwin-framework-tool/templates/commands.zapt
@@ -17,7 +17,7 @@
 
 {{> clusters_header}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 {{> cluster_header}}
 
@@ -250,12 +250,12 @@ public:
 {{/if}}
 {{/zcl_attributes_server}}
 {{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 /*----------------------------------------------------------------------------*\
 | Register all Clusters commands                                               |
 \*----------------------------------------------------------------------------*/
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 void registerCluster{{asUpperCamelCase name}}(Commands & commands)
 {
@@ -307,7 +307,7 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands)
     commands.Register(clusterName, clusterCommands);
 }
 {{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 void registerClusterAny(Commands & commands)
 {
@@ -329,9 +329,9 @@ void registerClusterAny(Commands & commands)
 void registerClusters(Commands & commands)
 {
     registerClusterAny(commands);
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
     {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
     registerCluster{{asUpperCamelCase name}}(commands);
     {{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 }
diff --git a/src/darwin/Framework/CHIP/templates/MTRAttributeTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/MTRAttributeTLVValueDecoder-src.zapt
@@ -18,7 +18,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader &
 {
     switch (aPath.mClusterId)
     {
-    {{#all_user_clusters side='client'}}
+    {{#zcl_clusters}}
     {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
     case Clusters::{{asUpperCamelCase name}}::Id: {
         using namespace Clusters::{{asUpperCamelCase name}};
@@ -47,7 +47,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader &
         break;
     }
     {{/if}}
-    {{/all_user_clusters}}
+    {{/zcl_clusters}}
     default: {
       *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
       break;

diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
@@ -26,7 +26,7 @@ using chip::System::Clock::Timeout;
 using chip::System::Clock::Seconds16;
 
 // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects.
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 @implementation MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}}
 
@@ -349,6 +349,6 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio
 @end
 {{/if}}
 
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -7,7 +7,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 
 
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
@@ -72,9 +72,9 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio
 @end
 {{/if}}
 
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#unless (isStrEqual (asUpperCamelCase name preserveAcronyms=true) (compatClusterNameRemapping name))}}
 {{#if (isSupported (compatClusterNameRemapping name))}}
 {{availability (compatClusterNameRemapping name) deprecationMessage=(concat "Please use MTRBaseCluster" (asUpperCamelCase name preserveAcronyms=true))}}
@@ -83,7 +83,7 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio
 
 {{/if}}
 {{/unless}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 {{#zcl_clusters}}
 {{#zcl_enums}}
@@ -179,7 +179,7 @@ typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitm
 {{/zcl_bitmaps}}
 {{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#if (and (wasIntroducedBeforeRelease "First major API revamp" (compatClusterNameRemapping name))
            (isSupported (compatClusterNameRemapping name)))}}
 @interface MTRBaseCluster{{compatClusterNameRemapping name}} (Deprecated)
@@ -234,6 +234,6 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio
 @end
 
 {{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt
@@ -7,7 +7,7 @@
 
 #include <zap-generated/CHIPClusters.h>
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 @interface MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}} ()
@@ -16,4 +16,4 @@
 @end
 {{/if}}
 
-{{/all_user_clusters}}
+{{/zcl_clusters}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRCallbackBridge-src.zapt b/src/darwin/Framework/CHIP/templates/MTRCallbackBridge-src.zapt
@@ -37,7 +37,7 @@
 {{#>MTRCallbackBridge type="vendor_id"    isNullable=false ns="chip"}}VendorIdAttributeCallback{{/MTRCallbackBridge}}
 {{#>MTRCallbackBridge type="vendor_id"    isNullable=true  ns="chip"}}NullableVendorIdAttributeCallback{{/MTRCallbackBridge}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_attributes_server removeKeys='isOptional'}}
 {{#if (isSupported (asUpperCamelCase ../name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
 {{#if isArray}}
@@ -52,15 +52,15 @@
 {{/if}}
 {{/if}}
 {{/zcl_attributes_server}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_command_responses}}
 {{#if (isSupported (asUpperCamelCase ../name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
 {{#>MTRCallbackBridge partial-type="Command"                        }}{{asUpperCamelCase ../../name preserveAcronyms=true}}Cluster{{asUpperCamelCase ../name preserveAcronyms=true}}Callback{{/MTRCallbackBridge}}
 {{/if}}
 {{/zcl_command_responses}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 {{#zcl_clusters}}
 {{#zcl_enums}}

diff --git a/src/darwin/Framework/CHIP/templates/MTRCallbackBridge.zapt b/src/darwin/Framework/CHIP/templates/MTRCallbackBridge.zapt
@@ -14,13 +14,13 @@ typedef void (*DefaultSuccessCallbackType)(void *);
 typedef void (*VendorIdAttributeCallback)(void *, chip::VendorId);
 typedef void (*NullableVendorIdAttributeCallback)(void *, const chip::app::DataModel::Nullable<chip::VendorId> &);
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_command_responses}}
 {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
 typedef void (*{{asUpperCamelCase parent.name preserveAcronyms=true}}Cluster{{asUpperCamelCase name preserveAcronyms=true}}CallbackType)(void *, const chip::app::Clusters::{{asUpperCamelCase parent.name}}::Commands::{{asUpperCamelCase name}}::DecodableType &);
 {{/if}}
 {{/zcl_command_responses}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 {{#zcl_clusters}}
 {{#zcl_enums}}
@@ -31,7 +31,7 @@ typedef void (*Nullable{{asUpperCamelCase parent.name preserveAcronyms=true}}Clu
 {{/zcl_enums}}
 {{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_attributes_server removeKeys='isOptional'}}
 {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
 {{#if isArray}}
@@ -46,7 +46,7 @@ typedef void (*{{asUpperCamelCase parent.name preserveAcronyms=true}}{{asUpperCa
 {{/if}}
 {{/if}}
 {{/zcl_attributes_server}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 {{#>MTRCallbackBridge header="1" partial-type="Status"                         }}DefaultSuccessCallback{{/MTRCallbackBridge}}
 {{#>MTRCallbackBridge header="1" partial-type="CommandStatus"                  }}CommandSuccessCallback{{/MTRCallbackBridge}}
@@ -79,7 +79,7 @@ typedef void (*{{asUpperCamelCase parent.name preserveAcronyms=true}}{{asUpperCa
 {{#>MTRCallbackBridge header="1" type="vendor_id"    isNullable=false ns="chip"}}VendorIdAttributeCallback{{/MTRCallbackBridge}}
 {{#>MTRCallbackBridge header="1" type="vendor_id"    isNullable=true  ns="chip"}}NullableVendorIdAttributeCallback{{/MTRCallbackBridge}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_attributes_server removeKeys='isOptional'}}
 {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
 {{#if isArray}}
@@ -94,15 +94,15 @@ typedef void (*{{asUpperCamelCase parent.name preserveAcronyms=true}}{{asUpperCa
 {{/if}}
 {{/if}}
 {{/zcl_attributes_server}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_command_responses}}
 {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
 {{#>MTRCallbackBridge header="1" partial-type="Command"                        }}{{asUpperCamelCase ../../name preserveAcronyms=true}}Cluster{{asUpperCamelCase ../name preserveAcronyms=true}}Callback{{/MTRCallbackBridge}}
 {{/if}}
 {{/zcl_command_responses}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 {{#zcl_clusters}}
 {{#zcl_enums}}

diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
@@ -40,7 +40,7 @@ static void MTRClustersLogCompletion(NSString *logPrefix, id value, NSError *err
 }
 
 // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects.
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 @implementation MTRCluster{{asUpperCamelCase name preserveAcronyms=true}}
 
@@ -291,6 +291,6 @@ MTRCommandIDTypeCluster{{cluster}}Command{{command}}ID
 @end
 {{/if}}
 
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
@@ -8,7 +8,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 
 
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
@@ -59,9 +59,9 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 {{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#unless (isStrEqual (asUpperCamelCase name preserveAcronyms=true) (compatClusterNameRemapping name))}}
 {{#if (isSupported (compatClusterNameRemapping name))}}
 {{availability (compatClusterNameRemapping name) deprecationMessage=(concat "Please use MTRCluster" (asUpperCamelCase name preserveAcronyms=true))}}
@@ -70,9 +70,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 {{/if}}
 {{/unless}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#if (and (wasIntroducedBeforeRelease "First major API revamp" (compatClusterNameRemapping name))
            (isSupported (compatClusterNameRemapping name)))}}
 @interface MTRCluster{{compatClusterNameRemapping name}} (Deprecated)
@@ -113,6 +113,6 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 {{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt
@@ -8,7 +8,7 @@
 
 #include <zap-generated/CHIPClusters.h>
 
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 @interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} ()
@@ -17,4 +17,4 @@
 @end
 {{/if}}
 
-{{/all_user_clusters}}
+{{/zcl_clusters}}
diff --git a/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/MTREventTLVValueDecoder-src.zapt
@@ -21,7 +21,7 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead
 {
     switch (aPath.mClusterId)
     {
-    {{#all_user_clusters side='client'}}
+    {{#zcl_clusters}}
     {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
     case Clusters::{{asUpperCamelCase name}}::Id: {
         using namespace Clusters::{{asUpperCamelCase name}};
@@ -63,7 +63,7 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead
         break;
     }
     {{/if}}
-    {{/all_user_clusters}}
+    {{/zcl_clusters}}
     default: {
       *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB;
       break;

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -6566,9 +6566,10 @@
       watchos: "9.5"
       tvos: "16.5"
   introduced:
-      attributes:
-          TimeSynchronization:
-              - DSTOffset
+      ids:
+          attributes:
+              TimeSynchronization:
+                  - DSTOffset
       command fields:
           DiagnosticLogs:
               RetrieveLogsRequest: