Expose some more information on MTRDevice/MTRCluster*.

src/darwin/Framework/CHIP/MTRCluster.h

@@ -39,6 +39,11 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MTRCluster : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
+
+/**
+ * The endpoint this cluster lives on.
+ */
+@property (nonatomic, readonly) NSNumber * endpointID NS_REFINED_FOR_SWIFT MTR_NEWLY_AVAILABLE;
 @end
 
 /**

src/darwin/Framework/CHIP/MTRDevice.h

@@ -77,6 +77,17 @@ typedef NS_ENUM(NSUInteger, MTRDeviceState) {
 @property (nonatomic, readonly, nullable)
     NSDate * estimatedStartTime MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
 
+/**
+ * The controller this device was created for.  May return nil if that
+ * controller has been shut down.
+ */
+@property (nonatomic, readonly, nullable) MTRDeviceController * deviceController MTR_NEWLY_AVAILABLE;
+
+/**
+ * The node ID of the node this device corresponds to.
+ */
+@property (nonatomic, readonly, copy) NSNumber * nodeID NS_REFINED_FOR_SWIFT MTR_NEWLY_AVAILABLE;
+
 /**
  * Set the delegate to receive asynchronous callbacks about the device.
  *

src/darwin/Framework/CHIP/MTRDevice_Internal.h

@@ -64,8 +64,6 @@ typedef void (^MTRDevicePerformAsyncBlock)(MTRBaseDevice * baseDevice);
                                     queue:(dispatch_queue_t)queue
                                completion:(void (^)(id _Nullable response, NSError * _Nullable error))completion;
 
-@property (nonatomic, readonly) MTRDeviceController * deviceController;
-@property (nonatomic, readonly, copy) NSNumber * nodeID;
 // Queue used for various internal bookkeeping work.
 @property (nonatomic) dispatch_queue_t queue;
 @property (nonatomic, readonly) MTRAsyncWorkQueue<MTRDevice *> * asyncWorkQueue;

src/darwin/Framework/CHIP/templates/MTRClusters.zapt

@@ -34,6 +34,11 @@ NS_ASSUME_NONNULL_BEGIN
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="Future"}};
+
 {{#zcl_commands}}
 {{#if (is_str_equal source 'client')}}
 {{! Takes two arguments: cluster name and command name, plus the ambient state where the command is "this" }}

src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt

@@ -6,12 +6,5 @@
 #import "MTRDevice.h"
 #import "MTRDevice_Internal.h"
 
-{{#zcl_clusters}}
-
-{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
-@interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} ()
-@property (nonatomic, readonly) MTRDevice *device;
-@end
-{{/if}}
-
-{{/zcl_clusters}}
+// Nothing here for now, but leaving this file in place in case we need to add
+// something.