Don't expose provisional EventList in Darwin APIs yet. (#25295)

Fixes a template bug where we were doing incorrect wasRemoved checks.
project-chip · Jul 29, 2023 · 5623281 · 5623281
1 parent fb7497c
commit 5623281
Show file tree

Hide file tree

Showing 12 changed files with 1,420 additions and 16,729 deletions.
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
@@ -131,8 +131,9 @@ MTR{{cluster}}Cluster{{command}}Params
 
 {{#chip_server_cluster_attributes}}
 {{! This is used as the implementation for both the new-name and old-name bits, so check for both here. }}
-{{#unless (and (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))
-               (wasRemoved (compatClusterNameRemapping parent.name) command=(compatCommandNameRemapping parent.name name)))}}
+{{#unless (and (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))
+               (or (wasRemoved (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name))
+                   (not wasIntroducedBeforeRelease "First major API revamp" (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name))))}}
 {{#*inline "attribute"}}Attribute{{asUpperCamelCase name preserveAcronyms=true}}{{/inline}}
 - (void)read{{>attribute}}With
 {{~#if_is_fabric_scoped_struct type~}}

diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
@@ -185,7 +185,8 @@ MTRCommandIDTypeCluster{{cluster}}Command{{command}}ID
 {{#chip_server_cluster_attributes}}
 {{! This is used as the implementation for both the new-name and old-name bits, so check for both here. }}
 {{#unless (and (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))
-               (wasRemoved (compatClusterNameRemapping parent.name) command=(compatAttributeNameRemapping parent.name name)))}}
+               (or (wasRemoved (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name))
+                   (not wasIntroducedBeforeRelease "First major API revamp" (compatClusterNameRemapping parent.name) attribute=(compatAttributeNameRemapping parent.name name))))}}
 {{#*inline "cluster"}}{{asUpperCamelCase parent.name preserveAcronyms=true}}{{/inline}}
 {{#*inline "attribute"}}Attribute{{asUpperCamelCase name preserveAcronyms=true}}{{/inline}}
 - (NSDictionary<NSString *, id> *)read{{>attribute}}WithParams:(MTRReadParams * _Nullable)params {

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -6535,152 +6535,9 @@
 - release: "First after major API revamp"
   versions: "future"
   introduced:
-      global attributes:
-          - EventList
       attributes:
-          Scenes:
-              - EventList
-          OnOff:
-              - EventList
-          OnOffSwitchConfiguration:
-              - EventList
-          LevelControl:
-              - EventList
-          BinaryInputBasic:
-              - EventList
-          PulseWidthModulation:
-              - EventList
-          Descriptor:
-              - EventList
-          Binding:
-              - EventList
-          Identify:
-              - EventList
-          AccessControl:
-              - EventList
-          Actions:
-              - EventList
-          BasicInformation:
-              - EventList
-          OTASoftwareUpdateProvider:
-              - EventList
-          OTASoftwareUpdateRequestor:
-              - EventList
-          LocalizationConfiguration:
-              - EventList
-          TimeFormatLocalization:
-              - EventList
-          UnitLocalization:
-              - EventList
-          PowerSourceConfiguration:
-              - EventList
-          PowerSource:
-              - EventList
-          GeneralCommissioning:
-              - EventList
-          NetworkCommissioning:
-              - EventList
-          DiagnosticLogs:
-              - EventList
-          GeneralDiagnostics:
-              - EventList
-          SoftwareDiagnostics:
-              - EventList
-          ThreadNetworkDiagnostics:
-              - EventList
-          WiFiNetworkDiagnostics:
-              - EventList
-          EthernetNetworkDiagnostics:
-              - EventList
           TimeSynchronization:
-              - EventList
               - DSTOffset
-          BridgedDeviceBasicInformation:
-              - EventList
-          Switch:
-              - EventList
-          AdministratorCommissioning:
-              - EventList
-          OperationalCredentials:
-              - EventList
-          GroupKeyManagement:
-              - EventList
-          FixedLabel:
-              - EventList
-          UserLabel:
-              - EventList
-          ProxyConfiguration:
-              - EventList
-          ProxyDiscovery:
-              - EventList
-          ProxyValid:
-              - EventList
-          BooleanState:
-              - EventList
-          ModeSelect:
-              - EventList
-          DoorLock:
-              - EventList
-          WindowCovering:
-              - EventList
-          BarrierControl:
-              - EventList
-          PumpConfigurationAndControl:
-              - EventList
-          FanControl:
-              - EventList
-          ThermostatUserInterfaceConfiguration:
-              - EventList
-          ColorControl:
-              - EventList
-          BallastConfiguration:
-              - EventList
-          IlluminanceMeasurement:
-              - EventList
-          TemperatureMeasurement:
-              - EventList
-          PressureMeasurement:
-              - EventList
-          Thermostat:
-              - EventList
-          FlowMeasurement:
-              - EventList
-          RelativeHumidityMeasurement:
-              - EventList
-          OccupancySensing:
-              - EventList
-          WakeOnLAN:
-              - EventList
-          Channel:
-              - EventList
-          Groups:
-              - EventList
-          TargetNavigator:
-              - EventList
-          MediaPlayback:
-              - EventList
-          MediaInput:
-              - EventList
-          LowPower:
-              - EventList
-          KeypadInput:
-              - EventList
-          ContentLauncher:
-              - EventList
-          AudioOutput:
-              - EventList
-          ApplicationLauncher:
-              - EventList
-          ApplicationBasic:
-              - EventList
-          AccountLogin:
-              - EventList
-          ElectricalMeasurement:
-              - EventList
-          UnitTesting:
-              - EventList
-          FaultInjection:
-              - EventList
       command fields:
           DiagnosticLogs:
               RetrieveLogsRequest:
@@ -6946,6 +6803,153 @@
               PumpFeature:
                   - Local
   removed:
+      global attributes:
+          # EventList is provisional for now.
+          - EventList
+      attributes:
+          # EventList is provisional for now.
+          Scenes:
+              - EventList
+          OnOff:
+              - EventList
+          OnOffSwitchConfiguration:
+              - EventList
+          LevelControl:
+              - EventList
+          BinaryInputBasic:
+              - EventList
+          PulseWidthModulation:
+              - EventList
+          Descriptor:
+              - EventList
+          Binding:
+              - EventList
+          Identify:
+              - EventList
+          AccessControl:
+              - EventList
+          Actions:
+              - EventList
+          BasicInformation:
+              - EventList
+          OTASoftwareUpdateProvider:
+              - EventList
+          OTASoftwareUpdateRequestor:
+              - EventList
+          LocalizationConfiguration:
+              - EventList
+          TimeFormatLocalization:
+              - EventList
+          UnitLocalization:
+              - EventList
+          PowerSourceConfiguration:
+              - EventList
+          PowerSource:
+              - EventList
+          GeneralCommissioning:
+              - EventList
+          NetworkCommissioning:
+              - EventList
+          DiagnosticLogs:
+              - EventList
+          GeneralDiagnostics:
+              - EventList
+          SoftwareDiagnostics:
+              - EventList
+          ThreadNetworkDiagnostics:
+              - EventList
+          WiFiNetworkDiagnostics:
+              - EventList
+          EthernetNetworkDiagnostics:
+              - EventList
+          TimeSynchronization:
+              - EventList
+          BridgedDeviceBasicInformation:
+              - EventList
+          Switch:
+              - EventList
+          AdministratorCommissioning:
+              - EventList
+          OperationalCredentials:
+              - EventList
+          GroupKeyManagement:
+              - EventList
+          FixedLabel:
+              - EventList
+          UserLabel:
+              - EventList
+          ProxyConfiguration:
+              - EventList
+          ProxyDiscovery:
+              - EventList
+          ProxyValid:
+              - EventList
+          BooleanState:
+              - EventList
+          ModeSelect:
+              - EventList
+          DoorLock:
+              - EventList
+          WindowCovering:
+              - EventList
+          BarrierControl:
+              - EventList
+          PumpConfigurationAndControl:
+              - EventList
+          FanControl:
+              - EventList
+          ThermostatUserInterfaceConfiguration:
+              - EventList
+          ColorControl:
+              - EventList
+          BallastConfiguration:
+              - EventList
+          IlluminanceMeasurement:
+              - EventList
+          TemperatureMeasurement:
+              - EventList
+          PressureMeasurement:
+              - EventList
+          Thermostat:
+              - EventList
+          FlowMeasurement:
+              - EventList
+          RelativeHumidityMeasurement:
+              - EventList
+          OccupancySensing:
+              - EventList
+          WakeOnLAN:
+              - EventList
+          Channel:
+              - EventList
+          Groups:
+              - EventList
+          TargetNavigator:
+              - EventList
+          MediaPlayback:
+              - EventList
+          MediaInput:
+              - EventList
+          LowPower:
+              - EventList
+          KeypadInput:
+              - EventList
+          ContentLauncher:
+              - EventList
+          AudioOutput:
+              - EventList
+          ApplicationLauncher:
+              - EventList
+          ApplicationBasic:
+              - EventList
+          AccountLogin:
+              - EventList
+          ElectricalMeasurement:
+              - EventList
+          UnitTesting:
+              - EventList
+          FaultInjection:
+              - EventList
       enum values:
           DoorLock:
               DlLockDataType: