zigbee-herdsman 6.0.0 → 6.0.2

package/src/controller/tstype.ts

@@ -1,3 +1,16 @@
+import type {
+    TClusterAttributes,
+    TClusterCommandResponses,
+    TClusterCommands,
+    TClusterPayload,
+    TClusters,
+    TFoundation,
+    TFoundationGenericPayload,
+    TFoundationPayload,
+    TPartialClusterAttributes,
+} from "../zspec/zcl/definition/clusters-types";
+import type {DataType} from "../zspec/zcl/definition/enums";
+
 export interface KeyValue {
     // biome-ignore lint/suspicious/noExplicitAny: API
     [s: string]: any;
@@ -38,3 +51,224 @@ export interface GreenPowerDeviceJoinedPayload {
     networkAddress: number;
     securityKey?: Buffer;
 }
+
+export interface TCustomCluster {
+    attributes: Record<string, unknown> | never;
+    commands: Record<string, Record<string, unknown | never>> | never;
+    commandResponses: Record<string, Record<string, unknown | never>> | never;
+}
+
+export type RawClusterAttribute = {value: unknown; type: DataType};
+
+export type RawClusterAttributes = Record<number, RawClusterAttribute>;
+
+// below Cluster types follow roughly the same logic:
+//   - if cluster has attributes/commands/commandsResponse
+//     - if Custom is defined and has attributes/commands/commandsResponse, use Custom and/or raw
+//     - else use raw
+//   - else
+//     - if cluster is ZCL
+//       - if Custom is defined and has attributes/commands/commandsResponse, use Custom and/or ZCL and/or raw
+//       - else use ZCL and/or raw
+//     - else
+//       - if Custom is defined, use Custom and/or raw
+//       - else use raw
+//
+// where `raw` represents the type used for full manual input (usually using ID)
+
+export type ClusterOrRawAttributeKeys<
+    Cl extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = TClusterAttributes<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? number[]
+            : (keyof Custom["attributes"] | number)[]
+        : number[]
+    : Cl extends keyof TClusters
+      ? Custom extends TCustomCluster
+          ? Custom["attributes"] extends never
+              ? // don't use `TClusterAttributeKeys<Cl>` as that allows "symbol"
+                (keyof TClusters[Cl]["attributes"] | number)[]
+              : (keyof Custom["attributes"] | keyof TClusters[Cl]["attributes"] | number)[]
+          : (keyof TClusters[Cl]["attributes"] | number)[]
+      : Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? number[]
+            : (keyof Custom["attributes"] | number)[]
+        : number[];
+
+export type ClusterOrRawWriteAttributes<
+    Cl extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = TClusterAttributes<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? RawClusterAttributes
+            : Custom["attributes"] & RawClusterAttributes
+        : RawClusterAttributes
+    : Cl extends keyof TClusters
+      ? (Custom extends TCustomCluster
+            ? Custom["attributes"] extends never
+                ? TClusterAttributes<Cl>
+                : Custom["attributes"] & TClusterAttributes<Cl>
+            : TClusterAttributes<Cl>) &
+            RawClusterAttributes
+      : Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? RawClusterAttributes
+            : Custom["attributes"] & RawClusterAttributes
+        : RawClusterAttributes;
+
+export type PartialClusterOrRawWriteAttributes<
+    Cl extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = TClusterAttributes<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? RawClusterAttributes
+            : Partial<Custom["attributes"]> & RawClusterAttributes
+        : RawClusterAttributes
+    : Cl extends keyof TClusters
+      ? (Custom extends TCustomCluster
+            ? Custom["attributes"] extends never
+                ? TPartialClusterAttributes<Cl>
+                : Partial<Custom["attributes"]> & TPartialClusterAttributes<Cl>
+            : TPartialClusterAttributes<Cl>) &
+            RawClusterAttributes
+      : Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? RawClusterAttributes
+            : Partial<Custom["attributes"]> & RawClusterAttributes
+        : RawClusterAttributes;
+
+export type ClusterOrRawAttributes<
+    Cl extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = TClusterAttributes<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? Record<number, unknown>
+            : Custom["attributes"] & Record<number, unknown>
+        : Record<number, unknown>
+    : Cl extends keyof TClusters
+      ? (Custom extends TCustomCluster
+            ? Custom["attributes"] extends never
+                ? TClusterAttributes<Cl>
+                : Custom["attributes"] & TClusterAttributes<Cl>
+            : TClusterAttributes<Cl>) &
+            Record<number, unknown>
+      : Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? Record<number, unknown>
+            : Custom["attributes"] & Record<number, unknown>
+        : Record<number, unknown>;
+
+export type PartialClusterOrRawAttributes<
+    Cl extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = TClusterAttributes<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? Record<number, unknown>
+            : Partial<Custom["attributes"]> & Record<number, unknown>
+        : Record<number, unknown>
+    : Cl extends keyof TClusters
+      ? (Custom extends TCustomCluster
+            ? Custom["attributes"] extends never
+                ? TPartialClusterAttributes<Cl>
+                : Partial<Custom["attributes"]> & TPartialClusterAttributes<Cl>
+            : TPartialClusterAttributes<Cl>) &
+            Record<number, unknown>
+      : Custom extends TCustomCluster
+        ? Custom["attributes"] extends never
+            ? Record<number, unknown>
+            : Partial<Custom["attributes"]> & Record<number, unknown>
+        : Record<number, unknown>;
+
+export type ClusterCommandKeys<Cl extends string | number, Custom extends TCustomCluster | undefined = undefined> = TClusterCommands<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["commands"] extends never
+            ? number[]
+            : (keyof Custom["commands"] | number)[]
+        : number[]
+    : Cl extends keyof TClusters
+      ? Custom extends TCustomCluster
+          ? Custom["commands"] extends never
+              ? // don't use `TClusterCommandKeys<Cl>` as that allows "symbol"
+                (keyof TClusters[Cl]["commands"] | number)[]
+              : (keyof Custom["commands"] | keyof TClusters[Cl]["commands"] | number)[]
+          : (keyof TClusters[Cl]["commands"] | number)[]
+      : Custom extends TCustomCluster
+        ? Custom["commands"] extends never
+            ? number[]
+            : (keyof Custom["commands"] | number)[]
+        : number[];
+
+export type ClusterCommandResponseKeys<
+    Cl extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = TClusterCommandResponses<Cl> extends never
+    ? Custom extends TCustomCluster
+        ? Custom["commandResponses"] extends never
+            ? number[]
+            : (keyof Custom["commandResponses"] | number)[]
+        : number[]
+    : Cl extends keyof TClusters
+      ? Custom extends TCustomCluster
+          ? Custom["commandResponses"] extends never
+              ? // don't use `TClusterCommandResponseKeys<Cl>` as that allows "symbol"
+                (keyof TClusters[Cl]["commandResponses"] | number)[]
+              : (keyof Custom["commandResponses"] | keyof TClusters[Cl]["commandResponses"] | number)[]
+          : (keyof TClusters[Cl]["commandResponses"] | number)[]
+      : Custom extends TCustomCluster
+        ? Custom["commandResponses"] extends never
+            ? number[]
+            : (keyof Custom["commandResponses"] | number)[]
+        : number[];
+
+export type TCustomClusterPayload<Custom extends TCustomCluster, Co extends string | number> = Custom["commands"] extends never
+    ? Custom["commandResponses"] extends never
+        ? never
+        : Co extends keyof Custom["commandResponses"]
+          ? Custom["commandResponses"][Co]
+          : never
+    : Co extends keyof Custom["commands"]
+      ? Custom["commands"][Co]
+      : Co extends keyof Custom["commandResponses"]
+        ? Custom["commandResponses"][Co]
+        : never;
+
+export type ClusterOrRawPayload<
+    Cl extends string | number,
+    Co extends string | number,
+    Custom extends TCustomCluster | undefined = undefined,
+> = Cl extends number
+    ? Record<string, unknown>
+    : Co extends number
+      ? Record<string, unknown>
+      : TClusterPayload<Cl, Co> extends never
+        ? Custom extends TCustomCluster
+            ? TCustomClusterPayload<Custom, Co> extends never
+                ? never
+                : TCustomClusterPayload<Custom, Co>
+            : never
+        : Cl extends keyof TClusters
+          ? Custom extends TCustomCluster
+              ? TCustomClusterPayload<Custom, Co> extends never
+                  ? TClusterPayload<Cl, Co>
+                  : TCustomClusterPayload<Custom, Co> & TClusterPayload<Cl, Co>
+              : TClusterPayload<Cl, Co>
+          : Custom extends TCustomCluster
+            ? TCustomClusterPayload<Custom, Co> extends never
+                ? never
+                : TCustomClusterPayload<Custom, Co>
+            : never;
+
+export type FoundationOrRawPayload<Co extends string | number> = Co extends number
+    ? TFoundationGenericPayload
+    : TFoundationPayload<Co> extends never
+      ? never
+      : Co extends keyof TFoundation
+        ? TFoundationPayload<Co>
+        : never;

package/src/zspec/zcl/definition/cluster.ts

@@ -2167,6 +2167,7 @@ export const Clusters: Readonly<Record<ClusterName, Readonly<ClusterDefinition>>
             },
             getWeeklySchedule: {
                 ID: 2,
+                response: 0,
                 parameters: [
                     {name: "daystoreturn", type: DataType.UINT8},
                     {name: "modetoreturn", type: DataType.UINT8},
@@ -2178,6 +2179,7 @@ export const Clusters: Readonly<Record<ClusterName, Readonly<ClusterDefinition>>
             },
             getRelayStatusLog: {
                 ID: 4,
+                response: 1,
                 parameters: [],
             },
             danfossSetpointCommand: {
@@ -5438,15 +5440,6 @@ export const Clusters: Readonly<Record<ClusterName, Readonly<ClusterDefinition>>
         commands: {},
         commandsResponse: {},
     },
-    sprutDevice: {
-        ID: 26112,
-        manufacturerCode: 26214,
-        attributes: {
-            debug: {ID: 0, type: DataType.BOOLEAN},
-        },
-        commands: {},
-        commandsResponse: {},
-    },
     sprutVoc: {
         ID: 26113,
         manufacturerCode: 26214,

package/src/zspec/zcl/definition/clusters-typegen.ts

@@ -18,11 +18,11 @@ import {Clusters} from "./cluster";
 import {BuffaloZclDataType, DataType} from "./enums";
 import {Foundation, type FoundationCommandName, type FoundationDefinition} from "./foundation";
 import {ManufacturerCode} from "./manufacturerCode";
-import type {AttributeDefinition, ClusterName, CommandDefinition} from "./tstype";
+import type {AttributeDefinition, ClusterName, CommandDefinition, ParameterDefinition} from "./tstype";
 
 const FILENAME = "clusters-types.ts";
 
-const file = ts.createSourceFile(FILENAME, "", ts.ScriptTarget.ES2022, false, ts.ScriptKind.TS);
+const file = ts.createSourceFile(FILENAME, "", ts.ScriptTarget.ESNext, false, ts.ScriptKind.TS);
 const printer = ts.createPrinter({newLine: ts.NewLineKind.LineFeed});
 
 const emptyObject = ts.factory.createTypeReferenceNode("Record", [
@@ -40,12 +40,16 @@ const namedImports = ts.factory.createImportDeclaration(
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("ExtensionFieldSet")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("Gpd")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("GpdAttributeReport")),
+            ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("GpdChannelConfiguration")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("GpdChannelRequest")),
+            ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("GpdCommissioningReply")),
+            ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("GpdCustomReply")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("MiboxerZone")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("Struct")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("StructuredSelector")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("ThermoTransition")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("TuyaDataPointValue")),
+            ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("ZclArray")),
             // ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("ZclDate")), // XXX: currently unused
             // ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("ZclTimeOfDay")), // XXX: currently unused
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("ZoneInfo")),
@@ -61,6 +65,16 @@ const getTypeFromDataType = (dataType: DataType | BuffaloZclDataType): ts.TypeNo
         case DataType.UNKNOWN: {
             return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword);
         }
+        case DataType.DATA56:
+        case DataType.BITMAP56:
+        case DataType.UINT56:
+        case DataType.DATA64:
+        case DataType.BITMAP64:
+        case DataType.UINT64:
+        case DataType.INT56:
+        case DataType.INT64: {
+            return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BigIntKeyword);
+        }
         case DataType.OCTET_STR:
         case DataType.LONG_OCTET_STR:
         case DataType.SEC_KEY: {
@@ -74,7 +88,11 @@ const getTypeFromDataType = (dataType: DataType | BuffaloZclDataType): ts.TypeNo
         case DataType.ARRAY:
         case DataType.SET:
         case DataType.BAG: {
-            return ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword));
+            // mismatch on read vs write, have to union
+            return ts.factory.createUnionTypeNode([
+                ts.factory.createTypeReferenceNode("ZclArray"),
+                ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)),
+            ]);
         }
         case DataType.STRUCT: {
             return ts.factory.createTypeReferenceNode("Struct");
@@ -115,6 +133,9 @@ const getTypeFromDataType = (dataType: DataType | BuffaloZclDataType): ts.TypeNo
                     ts.factory.createPropertySignature(undefined, "raw", undefined, ts.factory.createTypeReferenceNode("Buffer")),
                 ]),
                 ts.factory.createTypeReferenceNode("Record<string, never>"),
+                ts.factory.createTypeReferenceNode("GpdCommissioningReply"),
+                ts.factory.createTypeReferenceNode("GpdChannelConfiguration"),
+                ts.factory.createTypeReferenceNode("GpdCustomReply"),
             ]);
         }
         case BuffaloZclDataType.STRUCTURED_SELECTOR: {
@@ -132,6 +153,28 @@ const getTypeFromDataType = (dataType: DataType | BuffaloZclDataType): ts.TypeNo
     }
 };
 
+const getConditionStr = (conditions: ParameterDefinition["conditions"]): string | undefined => {
+    if (conditions) {
+        let str = ", Conditions: [";
+
+        for (const condition of conditions) {
+            str += `{${condition.type}`;
+
+            for (const key in condition) {
+                if (key === "type") {
+                    continue;
+                }
+
+                str += ` ${key}=${condition[key as keyof typeof condition]}`;
+            }
+
+            str += "}";
+        }
+
+        return `${str}]`;
+    }
+};
+
 const addAttributes = (attributes: Readonly<Record<string, Readonly<AttributeDefinition>>>): ts.TypeNode => {
     const elements: ts.PropertySignature[] = [];
 
@@ -157,7 +200,7 @@ const addAttributes = (attributes: Readonly<Record<string, Readonly<AttributeDef
         ts.addSyntheticLeadingComment(element, ts.SyntaxKind.MultiLineCommentTrivia, comment, true);
     }
 
-    return elements.length > 0 ? ts.factory.createTypeLiteralNode(elements) : emptyObject;
+    return elements.length > 0 ? ts.factory.createTypeLiteralNode(elements) : ts.factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword);
 };
 
 const addCommands = (commands: Readonly<Record<string, Readonly<CommandDefinition>>>): ts.TypeNode => {
@@ -179,12 +222,13 @@ const addCommands = (commands: Readonly<Record<string, Readonly<CommandDefinitio
                     parameter.conditions ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined,
                     paramType,
                 );
+                const conditionComment = getConditionStr(parameter.conditions);
 
                 cmdElements.push(cmdElement);
                 ts.addSyntheticLeadingComment(
                     cmdElement,
                     ts.SyntaxKind.MultiLineCommentTrivia,
-                    `* Type: ${DataType[parameter.type] ?? BuffaloZclDataType[parameter.type]} `,
+                    `* Type: ${DataType[parameter.type] ?? BuffaloZclDataType[parameter.type]}${conditionComment ?? ""} `,
                     true,
                 );
             } else if (
@@ -266,13 +310,14 @@ const addParameters = (foundation: Readonly<FoundationDefinition>): ts.TypeNode
             parameter.conditions ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined,
             getTypeFromDataType(parameter.type),
         );
+        const conditionComment = getConditionStr(parameter.conditions);
 
         elements.push(element);
 
         ts.addSyntheticLeadingComment(
             element,
             ts.SyntaxKind.MultiLineCommentTrivia,
-            `* Type: ${DataType[parameter.type] ?? BuffaloZclDataType[parameter.type]} `,
+            `* Type: ${DataType[parameter.type] ?? BuffaloZclDataType[parameter.type]}${conditionComment ?? ""} `,
             true,
         );
     }
@@ -387,12 +432,6 @@ const coDecl = ts.factory.createTypeParameterDeclaration(
         ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
     ]),
 );
-const clusterGenericPayloadDecl = ts.factory.createTypeAliasDeclaration(
-    [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-    "TClusterGenericPayload",
-    undefined,
-    ts.factory.createTypeReferenceNode("Record<string, unknown>"),
-);
 const clusterAttributeKeysDecl = ts.factory.createTypeAliasDeclaration(
     [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
     "TClusterAttributeKeys",
@@ -406,7 +445,7 @@ const clusterAttributesDecl = ts.factory.createTypeAliasDeclaration(
     "TClusterAttributes",
     [clDecl],
     ts.factory.createTypeReferenceNode(
-        `Cl extends keyof ${clustersDecl.name.escapedText} ? ${clustersDecl.name.escapedText}[Cl]["attributes"] : ${clusterGenericPayloadDecl.name.escapedText}`,
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? ${clustersDecl.name.escapedText}[Cl]["attributes"] : never`,
     ),
 );
 const partialClusterAttributesDecl = ts.factory.createTypeAliasDeclaration(
@@ -414,7 +453,39 @@ const partialClusterAttributesDecl = ts.factory.createTypeAliasDeclaration(
     "TPartialClusterAttributes",
     [clDecl],
     ts.factory.createTypeReferenceNode(
-        `Cl extends keyof ${clustersDecl.name.escapedText} ? Partial<${clustersDecl.name.escapedText}[Cl]["attributes"]> : ${clusterGenericPayloadDecl.name.escapedText}`,
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? Partial<${clustersDecl.name.escapedText}[Cl]["attributes"]> : never`,
+    ),
+);
+const clusterCommandKeysDecl = ts.factory.createTypeAliasDeclaration(
+    [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    "TClusterCommandKeys",
+    [clDecl],
+    ts.factory.createTypeReferenceNode(
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? (keyof ${clustersDecl.name.escapedText}[Cl]["commands"])[] : (string | number)[];`,
+    ),
+);
+const clusterCommandResponseKeysDecl = ts.factory.createTypeAliasDeclaration(
+    [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    "TClusterCommandResponseKeys",
+    [clDecl],
+    ts.factory.createTypeReferenceNode(
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? (keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"])[] : (string | number)[];`,
+    ),
+);
+const clusterCommandsDecl = ts.factory.createTypeAliasDeclaration(
+    [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    "TClusterCommands",
+    [clDecl],
+    ts.factory.createTypeReferenceNode(
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? ${clustersDecl.name.escapedText}[Cl]["commands"] : never`,
+    ),
+);
+const clusterCommandResponsesDecl = ts.factory.createTypeAliasDeclaration(
+    [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    "TClusterCommandResponses",
+    [clDecl],
+    ts.factory.createTypeReferenceNode(
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"] : never`,
     ),
 );
 const clusterCommandPayloadDecl = ts.factory.createTypeAliasDeclaration(
@@ -422,7 +493,7 @@ const clusterCommandPayloadDecl = ts.factory.createTypeAliasDeclaration(
     "TClusterCommandPayload",
     [clDecl, coDecl],
     ts.factory.createTypeReferenceNode(
-        `Cl extends keyof ${clustersDecl.name.escapedText} ? Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commands"] ? ${clustersDecl.name.escapedText}[Cl]["commands"][Co] : ${clusterGenericPayloadDecl.name.escapedText} : ${clusterGenericPayloadDecl.name.escapedText};`,
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commands"] ? ${clustersDecl.name.escapedText}[Cl]["commands"][Co] : never : never;`,
     ),
 );
 const clusterCommandResponsePayloadDecl = ts.factory.createTypeAliasDeclaration(
@@ -430,7 +501,7 @@ const clusterCommandResponsePayloadDecl = ts.factory.createTypeAliasDeclaration(
     "TClusterCommandResponsePayload",
     [clDecl, coDecl],
     ts.factory.createTypeReferenceNode(
-        `Cl extends keyof ${clustersDecl.name.escapedText} ? Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"] ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"][Co] : ${clusterGenericPayloadDecl.name.escapedText} : ${clusterGenericPayloadDecl.name.escapedText};`,
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"] ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"][Co] : never : never;`,
     ),
 );
 const clusterPayloadDecl = ts.factory.createTypeAliasDeclaration(
@@ -438,7 +509,7 @@ const clusterPayloadDecl = ts.factory.createTypeAliasDeclaration(
     "TClusterPayload",
     [clDecl, coDecl],
     ts.factory.createTypeReferenceNode(
-        `Cl extends keyof ${clustersDecl.name.escapedText} ? ${clustersDecl.name.escapedText}[Cl]["commands"] extends never ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"] extends never ? never : Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"] ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"][Co] : ${clusterGenericPayloadDecl.name.escapedText} : Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commands"] ? ${clustersDecl.name.escapedText}[Cl]["commands"][Co] : Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"] ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"][Co] : ${clusterGenericPayloadDecl.name.escapedText} : ${clusterGenericPayloadDecl.name.escapedText};`,
+        `Cl extends keyof ${clustersDecl.name.escapedText} ? ${clustersDecl.name.escapedText}[Cl]["commands"] extends never ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"] extends never ? never : Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"] ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"][Co] : never : Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commands"] ? ${clustersDecl.name.escapedText}[Cl]["commands"][Co] : Co extends keyof ${clustersDecl.name.escapedText}[Cl]["commandResponses"] ? ${clustersDecl.name.escapedText}[Cl]["commandResponses"][Co] : never : never;`,
     ),
 );
 const foundationGenericPayloadDecl = ts.factory.createTypeAliasDeclaration(
@@ -485,14 +556,20 @@ ${printer.printNode(ts.EmitHint.Unspecified, foundationFlatDecl, file)}
 ${printer.printNode(ts.EmitHint.Unspecified, foundationOneOfDecl, file)}
 
 // Clusters
-${printer.printNode(ts.EmitHint.Unspecified, clusterGenericPayloadDecl, file)}
-
 ${printer.printNode(ts.EmitHint.Unspecified, clusterAttributeKeysDecl, file)}
 
 ${printer.printNode(ts.EmitHint.Unspecified, clusterAttributesDecl, file)}
 
 ${printer.printNode(ts.EmitHint.Unspecified, partialClusterAttributesDecl, file)}
 
+${printer.printNode(ts.EmitHint.Unspecified, clusterCommandKeysDecl, file)}
+
+${printer.printNode(ts.EmitHint.Unspecified, clusterCommandResponseKeysDecl, file)}
+
+${printer.printNode(ts.EmitHint.Unspecified, clusterCommandsDecl, file)}
+
+${printer.printNode(ts.EmitHint.Unspecified, clusterCommandResponsesDecl, file)}
+
 ${printer.printNode(ts.EmitHint.Unspecified, clusterCommandPayloadDecl, file)}
 
 ${printer.printNode(ts.EmitHint.Unspecified, clusterCommandResponsePayloadDecl, file)}