@matter/types 0.17.2 → 0.17.3-alpha.0-20260617-ea3690abc

package/dist/esm/schema/PairingCodeSchema.d.ts

@@ -100,7 +100,34 @@ export declare const QrCodeTlvDataDefaultFields: {
      */
     commissioningTimeout: import("../tlv/TlvObject.js").OptionalFieldType<number>;
 };
+/**
+ * Inclusive lower bound of the valid passcode range `0x0000001..0x5F5E0FE`.
+ * See {@link MatterSpecification.v13.Core} § 5.1.1.6.
+ */
+export declare const PASSCODE_MIN = 1;
+/**
+ * Inclusive upper bound of the valid passcode range `0x0000001..0x5F5E0FE`.
+ * See {@link MatterSpecification.v13.Core} § 5.1.1.6.
+ */
+export declare const PASSCODE_MAX = 99999998;
+/**
+ * Trivial/insecure passcodes that SHALL NOT be used for PASE.
+ * See {@link MatterSpecification.v13.Core} § 5.1.7.1.
+ */
+export declare const INVALID_PASSCODES: readonly number[];
+/**
+ * Returns true when the passcode is a valid setup passcode: within the {@link PASSCODE_MIN}..{@link PASSCODE_MAX} range
+ * and not one of the {@link INVALID_PASSCODES}. Mirrors CHIP's `PayloadContents::IsValidSetupPIN`.
+ *
+ * The onboarding codecs round-trip arbitrary 27-bit passcodes; use this to validate a decoded payload at parse time
+ * rather than deferring to the PASE layer. See {@link MatterSpecification.v13.Core} § 5.1.1.6 / § 5.1.7.1.
+ */
+export declare function isValidPasscode(passcode: number): boolean;
+/** Throws {@link UnexpectedDataError} when {@link isValidPasscode} returns false. */
+export declare function assertValidPasscode(passcode: number): void;
 declare class QrPairingCodeSchema extends Schema<QrCodeData[], string> {
+    /** Rejects payloads carrying an invalid passcode per § 5.1.1.6 / § 5.1.7.1. */
+    validate(payloadData: QrCodeData[]): void;
     protected encodeInternal(payloadData: QrCodeData[]): string;
     protected decodeInternal(encoded: string): QrCodeData[];
     /**
@@ -130,6 +157,8 @@ export type ManualPairingData = {
 };
 /** See {@link MatterSpecification.v10.Core} § 5.1.4.1 Table 38/39/40 */
 declare class ManualPairingCodeSchema extends Schema<ManualPairingData, string> {
+    /** Rejects payloads carrying an invalid passcode per § 5.1.1.6 / § 5.1.7.1. */
+    validate({ passcode }: ManualPairingData): void;
     protected encodeInternal({ discriminator, passcode, vendorId, productId }: ManualPairingData): string;
     protected decodeInternal(encoded: string): ManualPairingData;
 }

package/dist/esm/schema/PairingCodeSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PairingCodeSchema.d.ts","sourceRoot":"","sources":["../../../src/schema/PairingCodeSchema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAgE,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,EACH,QAAQ,EACR,YAAY,EACZ,OAAO,EAGP,oBAAoB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,0DAA0D;AAC1D,eAAO,MAAM,wCAAwC,MAAM,CAAC;AAE5D,0DAA0D;AAC1D,eAAO,MAAM,qCAAqC,OAAO,CAAC;AAE1D,kEAAkE;AAClE,oBAAY,qBAAqB;IAC7B,wFAAwF;IACxF,QAAQ,IAAI;IAEZ,wDAAwD;IACxD,UAAU,IAAI;IAEd,gFAAgF;IAChF,MAAM,IAAI;CACb;AAED,kEAAkE;AAClE,eAAO,MAAM,2BAA2B;IACpC;;;;OAIG;IACH,GAAG;IAEH;;;OAGG;IACH,WAAW;IAEX;;;;;OAKG;IACH,qBAAqB;CACxB,CAAC;AACF,eAAO,MAAM,2BAA2B;IArBpC;;;;OAIG;;IAGH;;;OAGG;;IAGH;;;;;OAKG;;EAG6E,CAAC;AAErF,kEAAkE;AAClE,QAAA,MAAM,gBAAgB;;;;;;;;EAQpB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,gBAAgB,CAAC,GAAG;IACrE;;;;OAIG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,0BAA0B;IACnC,sBAAsB;IACtB,YAAY;IACZ,eAAe;IACf,SAAS;IAET;;;OAGG;IACH,eAAe;IAEf;;;OAGG;IACH,oBAAoB;CACvB,CAAC;AAIF,cAAM,mBAAoB,SAAQ,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC;IAC1D,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CA0B1D;IAED,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,CAYtD;IAED;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,GAAE,SAAS,CAAC,GAAG,CAAyC,OAqBxF;IAED;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAE,SAAS,CAAC,GAAG,CAAyC,2BAetG;CACJ;AAED,eAAO,MAAM,kBAAkB,qBAA4B,CAAC;AAE5D,MAAM,MAAM,iBAAiB,GAAG;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wEAAwE;AACxE,cAAM,uBAAwB,SAAQ,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnE,SAAS,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,MAAM,CAcpG;IAED,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAkB3D;CACJ;AAED,eAAO,MAAM,sBAAsB,yBAAgC,CAAC"}
+{"version":3,"file":"PairingCodeSchema.d.ts","sourceRoot":"","sources":["../../../src/schema/PairingCodeSchema.ts"],"names":[],"mappings":"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"}

package/dist/esm/schema/PairingCodeSchema.js

@@ -3,7 +3,15 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Bytes, deepCopy, ImplementationError, UnexpectedDataError, Verhoeff } from "@matter/general";
+import {
+  Bytes,
+  CRYPTO_PBKDF_ITERATIONS_MAX,
+  CRYPTO_PBKDF_ITERATIONS_MIN,
+  deepCopy,
+  ImplementationError,
+  UnexpectedDataError,
+  Verhoeff
+} from "@matter/general";
 import { VendorId } from "../datatype/VendorId.js";
 import { TlvAny } from "../tlv/TlvAny.js";
 import { TlvType } from "../tlv/TlvCodec.js";
@@ -61,8 +69,10 @@ const QrCodeTlvDataDefaultFields = {
   /** Device Serial # */
   serialNumber: TlvOptionalField(0, TlvAny),
   // can be TlvString with up to 32 bytes or Unsigned Int up to 8 bytes
-  pbkdfIterations: TlvOptionalField(1, TlvUInt32.bound({ min: 1e3, max: 1e5 })),
-  // Or could also be UInt 16?
+  pbkdfIterations: TlvOptionalField(
+    1,
+    TlvUInt32.bound({ min: CRYPTO_PBKDF_ITERATIONS_MIN, max: CRYPTO_PBKDF_ITERATIONS_MAX })
+  ),
   pbkdfSalt: TlvOptionalField(2, TlvByteString.bound({ minLength: 16, maxLength: 32 })),
   /**
    * Number of devices that are expected to be onboarded using this payload when using the Enhanced Commissioning
@@ -75,8 +85,38 @@ const QrCodeTlvDataDefaultFields = {
    */
   commissioningTimeout: TlvOptionalField(4, TlvUInt16)
 };
+const PASSCODE_MIN = 1;
+const PASSCODE_MAX = 99999998;
+const INVALID_PASSCODES = [
+  0,
+  11111111,
+  22222222,
+  33333333,
+  44444444,
+  55555555,
+  66666666,
+  77777777,
+  88888888,
+  99999999,
+  12345678,
+  87654321
+];
+function isValidPasscode(passcode) {
+  return Number.isInteger(passcode) && passcode >= PASSCODE_MIN && passcode <= PASSCODE_MAX && !INVALID_PASSCODES.includes(passcode);
+}
+function assertValidPasscode(passcode) {
+  if (!isValidPasscode(passcode)) {
+    throw new UnexpectedDataError(`Invalid passcode ${passcode}`);
+  }
+}
 const PREFIX = "MT:";
 class QrPairingCodeSchema extends Schema {
+  /** Rejects payloads carrying an invalid passcode per § 5.1.1.6 / § 5.1.7.1. */
+  validate(payloadData) {
+    for (const { passcode } of payloadData) {
+      assertValidPasscode(passcode);
+    }
+  }
   encodeInternal(payloadData) {
     if (payloadData.length === 0) throw new ImplementationError("Provided Payload data is empty");
     const result = PREFIX + payloadData.map((payloadData2) => {
@@ -158,6 +198,10 @@ class QrPairingCodeSchema extends Schema {
 }
 const QrPairingCodeCodec = new QrPairingCodeSchema();
 class ManualPairingCodeSchema extends Schema {
+  /** Rejects payloads carrying an invalid passcode per § 5.1.1.6 / § 5.1.7.1. */
+  validate({ passcode }) {
+    assertValidPasscode(passcode);
+  }
   encodeInternal({ discriminator, passcode, vendorId, productId }) {
     if (discriminator === void 0) throw new UnexpectedDataError("discriminator is required");
     if (discriminator > 4095) throw new UnexpectedDataError("discriminator value must be less than 4096");
@@ -198,10 +242,15 @@ export {
   CommissioningFlowType,
   DiscoveryCapabilitiesBitmap,
   DiscoveryCapabilitiesSchema,
+  INVALID_PASSCODES,
   MATTER_QR_CODE_ALL_PAYLOAD_MAX_LENGTH,
   MATTER_QR_CODE_SINGLE_PAYLOAD_MAX_LENGTH,
   ManualPairingCodeCodec,
+  PASSCODE_MAX,
+  PASSCODE_MIN,
   QrCodeTlvDataDefaultFields,
-  QrPairingCodeCodec
+  QrPairingCodeCodec,
+  assertValidPasscode,
+  isValidPasscode
 };
 //# sourceMappingURL=PairingCodeSchema.js.map

package/dist/esm/schema/PairingCodeSchema.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/schema/PairingCodeSchema.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["CommissioningFlowType", "payloadData", "result"]
 }

package/dist/esm/tlv/TlvNullable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TlvNullable.d.ts","sourceRoot":"","sources":["../../../src/tlv/TlvNullable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAW,aAAa,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGrF;;;;GAIG;AACH,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IAE9B,YAAY,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAwB/B;IAED,0DAA0D;IAC1D,IAAa,OAAO,IAAI,SAAS,CAAC,OAAO,GAAG,SAAS,CAgBpD;IAEQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAM/G;IAEQ,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,GAAG,CAAC,GAAG,IAAI,CAuBtF;IAEQ,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAEvC;IAEQ,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,GAAG,CAAC,CAK/G;IAEQ,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,GAAG,CAAC,CAK9F;CACJ;AAID,2BAA2B;AAC3B,eAAO,MAAM,WAAW,GAAI,CAAC,UAAU,SAAS,CAAC,CAAC,CAAC,KAAG,cAAc,CAAC,CAAC,CAOrE,CAAC"}
+{"version":3,"file":"TlvNullable.d.ts","sourceRoot":"","sources":["../../../src/tlv/TlvNullable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAW,aAAa,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGrF;;;;GAIG;AACH,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IAE9B,YAAY,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EA2B/B;IAED,0DAA0D;IAC1D,IAAa,OAAO,IAAI,SAAS,CAAC,OAAO,GAAG,SAAS,CAgBpD;IAEQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAM/G;IAEQ,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,GAAG,CAAC,GAAG,IAAI,CAuBtF;IAEQ,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAEvC;IAEQ,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,GAAG,CAAC,CAK/G;IAEQ,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,GAAG,CAAC,CAK9F;CACJ;AAID,2BAA2B;AAC3B,eAAO,MAAM,WAAW,GAAI,CAAC,UAAU,SAAS,CAAC,CAAC,CAAC,KAAG,cAAc,CAAC,CAAC,CAOrE,CAAC"}

package/dist/esm/tlv/TlvNullable.js

@@ -3,7 +3,7 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { TlvNumericSchema } from "#tlv/TlvNumber.js";
+import { BitmapWrapper, TlvNumericSchema } from "#tlv/TlvNumber.js";
 import { ArraySchema } from "./TlvArray.js";
 import { TlvType } from "./TlvCodec.js";
 import { TlvSchema } from "./TlvSchema.js";
@@ -26,6 +26,8 @@ class NullableSchema extends TlvSchema {
           schema = schema.bound({ min: schema.baseTypeMin + BigInt(1), max: schema.max });
         }
       }
+    } else if (schema instanceof BitmapWrapper) {
+      schema = schema.withReservedMsb();
     }
     this.schema = schema;
   }

package/dist/esm/tlv/TlvNullable.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/tlv/TlvNullable.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wBAAwB;AACjC,SAAS,mBAAmB;AAC5B,SAAiB,eAA8B;AAC/C,SAAwC,iBAA4B;AACpE,SAAS,oBAAoB;AAOtB,MAAM,uBAA0B,UAAoB;AAAA,EAC9C;AAAA,EAET,YAAY,QAAsB;AAC9B,UAAM;AAKN,QAAI,kBAAkB,oBAAoB,OAAO,SAAS,QAAQ,OAAO;AAErE,UAAI,OAAO,gBAAgB,KAAK,OAAO,QAAQ,OAAO,aAAa;AAC/D,YAAI,OAAO,OAAO,gBAAgB,UAAU;AACxC,mBAAS,OAAO,MAAM,EAAE,KAAK,OAAO,KAAK,KAAK,OAAO,cAAc,EAAE,CAAC;AAAA,QAC1E,OAAO;AACH,mBAAS,OAAO,MAAM,EAAE,KAAK,OAAO,KAAK,KAAK,OAAO,cAAc,OAAO,CAAC,EAAE,CAAC;AAAA,QAClF;AAAA,MACJ,WAAW,OAAO,cAAc,KAAK,OAAO,QAAQ,OAAO,aAAa;AAEpE,YAAI,OAAO,OAAO,gBAAgB,UAAU;AACxC,mBAAS,OAAO,MAAM,EAAE,KAAK,OAAO,cAAc,GAAG,KAAK,OAAO,IAAI,CAAC;AAAA,QAC1E,OAAO;AACH,mBAAS,OAAO,MAAM,EAAE,KAAK,OAAO,cAAc,OAAO,CAAC,GAAG,KAAK,OAAO,IAAI,CAAC;AAAA,QAClF;AAAA,MACJ;AAAA,IACJ;AACA,SAAK,SAAS;AAAA,EAClB;AAAA;AAAA,EAGA,IAAa,UAAyC;AAClD,UAAM,QAAQ,KAAK,OAAO;AAC1B,QAAI,UAAU,QAAW;AACrB,aAAO;AAAA,IACX;AAEA,UAAM,UACF,MAAM,YAAY,SACZ,MACA,OAAO,MAAM,YAAY,WACvB,MAAM,QAAQ,SAAS,GAAG,IACtB,MAAM,UACN,GAAG,MAAM,OAAO,OACpB,MAAM;AAElB,WAAO,EAAE,GAAG,OAAO,QAAQ;AAAA,EAC/B;AAAA,EAES,kBAAkB,QAAmB,OAAiB,KAAc,SAAoC;AAC7G,QAAI,UAAU,MAAM;AAChB,aAAO,SAAS,EAAE,MAAM,QAAQ,KAAK,GAAG,GAAG;AAAA,IAC/C,OAAO;AACH,WAAK,OAAO,kBAAkB,QAAQ,OAAO,KAAK,OAAO;AAAA,IAC7D;AAAA,EACJ;AAAA,EAES,uBAAuB,QAAmB,YAAqC;AACpF,QAAI,WAAW,SAAS,QAAQ,KAAM,QAAO;AAC7C,UAAM,QAAQ,KAAK,OAAO,uBAAuB,QAAQ,UAAU;AAInE,QACI,UAAU,SACT,KAAK,kBAAkB,eAAe,KAAK,kBAAkB,iBAC7D,MAAc,WAAW,GAC5B;AAKE,UACK,KAAK,kBAAkB,gBAAgB,KAAK,OAAO,SAAS,QAAQ,cACpE,KAAK,OAAO,cAAc,UAAa,KAAK,OAAO,YAAY,GAClE;AACE,eAAO;AAAA,MACX;AAAA,IACJ;AACA,WAAO;AAAA,EACX;AAAA,EAES,SAAS,OAAuB;AACrC,QAAI,UAAU,KAAM,MAAK,OAAO,SAAS,KAAK;AAAA,EAClD;AAAA,EAES,YAAY,OAAU,SAAiB,YAAiB,eAAgD;AAC7G,QAAI,UAAU,MAAM;AAChB,aAAO,KAAK,OAAO,YAAY,OAAO,SAAS,YAAY,aAAa;AAAA,IAC5E;AACA,WAAO;AAAA,EACX;AAAA,EAES,YAAY,OAAU,SAAiB,eAAgD;AAC5F,QAAI,UAAU,MAAM;AAChB,aAAO,KAAK,OAAO,YAAY,OAAO,SAAS,aAAa;AAAA,IAChE;AACA,WAAO;AAAA,EACX;AACJ;AAEA,MAAM,gBAAgB,oBAAI,QAA6C;AAGhE,MAAM,cAAc,CAAI,WAA4C;AACvE,MAAI,SAAS,cAAc,IAAI,MAAM;AACrC,MAAI,WAAW,QAAW;AACtB,aAAS,IAAI,eAAe,MAAM;AAClC,kBAAc,IAAI,QAAQ,MAAM;AAAA,EACpC;AACA,SAAO;AACX;",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/tlv/TlvNumber.d.ts

@@ -1,4 +1,5 @@
 import { BitSchema, TypeFromPartialBitSchema } from "../schema/BitmapSchema.js";
+import { Schema } from "../schema/Schema.js";
 import { TlvLength, TlvTag, TlvType, TlvTypeLength } from "./TlvCodec.js";
 import { TlvReader, TlvSchema, TlvWriter } from "./TlvSchema.js";
 import { TlvWrapper } from "./TlvWrapper.js";
@@ -51,7 +52,23 @@ export declare const TlvUInt24: TlvNumberSchema;
 export declare const TlvUInt32: TlvNumberSchema;
 export declare const TlvUInt64: TlvNumericSchema<number | bigint>;
 export declare const TlvEnum: <T>() => TlvSchema<T>;
-export declare const TlvBitmap: <T extends BitSchema>(underlyingSchema: TlvNumberSchema, bitSchema: T) => TlvWrapper<TypeFromPartialBitSchema<T>, number>;
+/**
+ * TLV wrapper for a bitmap. Tracks the underlying numeric schema and the bit schema so a nullable
+ * variant can reserve the most-significant bit per spec.
+ */
+export declare class BitmapWrapper<D> extends TlvWrapper<D, number> {
+    readonly numericSchema: TlvNumericSchema<number>;
+    private readonly bitmapSchema;
+    constructor(numericSchema: TlvNumericSchema<number>, bitmapSchema: Schema<D, number>);
+    /**
+     * Returns a variant that reserves the most-significant bit (it encodes NULL for nullable
+     * bitmaps, shrinking the usable range).
+     *
+     * @see {@link MatterSpecification.v16.Core} § 7.19.1.2
+     */
+    withReservedMsb(): BitmapWrapper<D>;
+}
+export declare const TlvBitmap: <T extends BitSchema>(underlyingSchema: TlvNumberSchema, bitSchema: T) => BitmapWrapper<TypeFromPartialBitSchema<T>>;
 export declare const TlvPercent: TlvNumericSchema<number>;
 export declare const TlvPercent100ths: TlvNumericSchema<number>;
 export declare const TlvPosixMs: TlvNumericSchema<number | bigint>;

package/dist/esm/tlv/TlvNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TlvNumber.d.ts","sourceRoot":"","sources":["../../../src/tlv/TlvNumber.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TlvNumber.d.ts","sourceRoot":"","sources":["../../../src/tlv/TlvNumber.ts"],"names":[],"mappings":"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"}

package/dist/esm/tlv/TlvNumber.js

@@ -226,13 +226,32 @@ const TlvUInt64 = new TlvLongNumberSchema(
   UINT64_MAX
 );
 const TlvEnum = () => TlvUInt32;
+class BitmapWrapper extends TlvWrapper {
+  constructor(numericSchema, bitmapSchema) {
+    super(
+      numericSchema,
+      (bitmapData) => bitmapSchema.encode(bitmapData),
+      (value) => bitmapSchema.decode(value)
+    );
+    this.numericSchema = numericSchema;
+    this.bitmapSchema = bitmapSchema;
+  }
+  numericSchema;
+  bitmapSchema;
+  /**
+   * Returns a variant that reserves the most-significant bit (it encodes NULL for nullable
+   * bitmaps, shrinking the usable range).
+   *
+   * @see {@link MatterSpecification.v16.Core} § 7.19.1.2
+   */
+  withReservedMsb() {
+    const { baseTypeMax } = this.numericSchema;
+    return new BitmapWrapper(this.numericSchema.bound({ max: Math.floor(baseTypeMax / 2) }), this.bitmapSchema);
+  }
+}
 const TlvBitmap = (underlyingSchema, bitSchema) => {
   const bitmapSchema = BitmapSchema(bitSchema);
-  return new TlvWrapper(
-    underlyingSchema,
-    (bitmapData) => bitmapSchema.encode(bitmapData),
-    (value) => bitmapSchema.decode(value)
-  );
+  return new BitmapWrapper(underlyingSchema, bitmapSchema);
 };
 const TlvPercent = TlvUInt8.bound({ max: 100 });
 const TlvPercent100ths = TlvUInt16.bound({ max: 1e4 });
@@ -281,6 +300,7 @@ const TlvEpochUs = new TlvWrapper(
   (epochUs) => BigInt(epochUs) + MATTER_EPOCH_OFFSET_US
 );
 export {
+  BitmapWrapper,
   MATTER_EPOCH_OFFSET,
   MATTER_EPOCH_OFFSET_S,
   MATTER_EPOCH_OFFSET_US,

package/dist/esm/tlv/TlvNumber.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/tlv/TlvNumber.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/types",
-    "version": "0.17.2",
+    "version": "0.17.3-alpha.0-20260617-ea3690abc",
     "description": "Definitions for Matter application",
     "keywords": [
         "iot",
@@ -32,11 +32,11 @@
         "coverage": "c8 matter-test esm"
     },
     "dependencies": {
-        "@matter/general": "0.17.2",
-        "@matter/model": "0.17.2"
+        "@matter/general": "0.17.3-alpha.0-20260617-ea3690abc",
+        "@matter/model": "0.17.3-alpha.0-20260617-ea3690abc"
     },
     "devDependencies": {
-        "@matter/testing": "0.17.2"
+        "@matter/testing": "0.17.3-alpha.0-20260617-ea3690abc"
     },
     "files": [
         "dist/**/*",

package/src/cluster/ClusterHelper.ts

@@ -8,8 +8,7 @@ import { AttributeModel, ClusterModel, CommandModel, EventModel, Matter } from "
 import { ClusterId } from "../datatype/ClusterId.js";
 import { EndpointNumber } from "../datatype/EndpointNumber.js";
 import { NodeId } from "../datatype/NodeId.js";
-import { TlvAttributePath, TlvCommandPath, TlvEventPath } from "../protocol/index.js";
-import { TypeFromSchema } from "../tlv/TlvSchema.js";
+import { AttributePath, CommandPath, EventPath } from "../protocol/index.js";
 
 function toHex(value: number | bigint | undefined) {
     return value === undefined ? "*" : `0x${value.toString(16)}`;
@@ -53,12 +52,7 @@ function resolveElementName(cluster: ClusterModel | undefined, tag: string, elem
     return undefined;
 }
 
-export function resolveAttributeName({
-    nodeId,
-    endpointId,
-    clusterId,
-    attributeId,
-}: TypeFromSchema<typeof TlvAttributePath>) {
+export function resolveAttributeName({ nodeId, endpointId, clusterId, attributeId }: AttributePath) {
     const endpointClusterName = resolveEndpointClusterName(nodeId, endpointId, clusterId);
     if (endpointId === undefined || clusterId === undefined || attributeId === undefined) {
         return `${endpointClusterName}/${toHex(attributeId)}`;
@@ -71,13 +65,7 @@ export function resolveAttributeName({
     return `${endpointClusterName}/${name}(${toHex(attributeId)})`;
 }
 
-export function resolveEventName({
-    nodeId,
-    endpointId,
-    clusterId,
-    eventId,
-    isUrgent,
-}: TypeFromSchema<typeof TlvEventPath>) {
+export function resolveEventName({ nodeId, endpointId, clusterId, eventId, isUrgent }: EventPath) {
     const isUrgentStr = isUrgent ? "!" : "";
     const endpointClusterName = resolveEndpointClusterName(nodeId, endpointId, clusterId);
     if (endpointId === undefined || clusterId === undefined || eventId === undefined) {
@@ -91,7 +79,7 @@ export function resolveEventName({
     return `${isUrgentStr}${endpointClusterName}/${name}(${toHex(eventId)})`;
 }
 
-export function resolveCommandName({ endpointId, clusterId, commandId }: TypeFromSchema<typeof TlvCommandPath>) {
+export function resolveCommandName({ endpointId, clusterId, commandId }: CommandPath) {
     const endpointClusterName = resolveEndpointClusterName(undefined, endpointId, clusterId);
     if (endpointId === undefined || clusterId === undefined || commandId === undefined) {
         return `${endpointClusterName}/${toHex(commandId)}`;

package/src/commissioning/CommissioningOptions.ts

@@ -6,7 +6,7 @@
 
 import { Bytes, Duration } from "@matter/general";
 import { ProductDescription } from "../common/ProductDescription.js";
-import { CommissioningFlowType } from "../schema/PairingCodeSchema.js";
+import { CommissioningFlowType, INVALID_PASSCODES } from "../schema/PairingCodeSchema.js";
 
 /**
  * Configuration for initial node commissioning.
@@ -14,9 +14,7 @@ import { CommissioningFlowType } from "../schema/PairingCodeSchema.js";
 export interface CommissioningOptions extends Partial<CommissioningOptions.Configuration> {}
 
 export namespace CommissioningOptions {
-    export const FORBIDDEN_PASSCODES = [
-        0, 11111111, 22222222, 33333333, 44444444, 55555555, 66666666, 77777777, 88888888, 99999999, 12345678, 87654321,
-    ];
+    export const FORBIDDEN_PASSCODES = INVALID_PASSCODES;
 
     export interface Configuration {
         /**

package/src/schema/PairingCodeSchema.ts

@@ -4,7 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Bytes, deepCopy, ImplementationError, UnexpectedDataError, Verhoeff } from "@matter/general";
+import {
+    Bytes,
+    CRYPTO_PBKDF_ITERATIONS_MAX,
+    CRYPTO_PBKDF_ITERATIONS_MIN,
+    deepCopy,
+    ImplementationError,
+    UnexpectedDataError,
+    Verhoeff,
+} from "@matter/general";
 import { VendorId } from "../datatype/VendorId.js";
 import { TlvAny } from "../tlv/TlvAny.js";
 import { TlvType } from "../tlv/TlvCodec.js";
@@ -93,7 +101,10 @@ export type QrCodeData = TypeFromBitmapSchema<typeof QrCodeDataSchema> & {
 export const QrCodeTlvDataDefaultFields = {
     /** Device Serial # */
     serialNumber: TlvOptionalField(0x00, TlvAny), // can be TlvString with up to 32 bytes or Unsigned Int up to 8 bytes
-    pbkdfIterations: TlvOptionalField(0x01, TlvUInt32.bound({ min: 1000, max: 100_000 })), // Or could also be UInt 16?
+    pbkdfIterations: TlvOptionalField(
+        0x01,
+        TlvUInt32.bound({ min: CRYPTO_PBKDF_ITERATIONS_MIN, max: CRYPTO_PBKDF_ITERATIONS_MAX }),
+    ),
     pbkdfSalt: TlvOptionalField(0x02, TlvByteString.bound({ minLength: 16, maxLength: 32 })),
 
     /**
@@ -109,9 +120,59 @@ export const QrCodeTlvDataDefaultFields = {
     commissioningTimeout: TlvOptionalField(0x04, TlvUInt16),
 };
 
+/**
+ * Inclusive lower bound of the valid passcode range `0x0000001..0x5F5E0FE`.
+ * See {@link MatterSpecification.v13.Core} § 5.1.1.6.
+ */
+export const PASSCODE_MIN = 0x0000001;
+
+/**
+ * Inclusive upper bound of the valid passcode range `0x0000001..0x5F5E0FE`.
+ * See {@link MatterSpecification.v13.Core} § 5.1.1.6.
+ */
+export const PASSCODE_MAX = 0x5f5e0fe;
+
+/**
+ * Trivial/insecure passcodes that SHALL NOT be used for PASE.
+ * See {@link MatterSpecification.v13.Core} § 5.1.7.1.
+ */
+export const INVALID_PASSCODES: readonly number[] = [
+    0, 11111111, 22222222, 33333333, 44444444, 55555555, 66666666, 77777777, 88888888, 99999999, 12345678, 87654321,
+];
+
+/**
+ * Returns true when the passcode is a valid setup passcode: within the {@link PASSCODE_MIN}..{@link PASSCODE_MAX} range
+ * and not one of the {@link INVALID_PASSCODES}. Mirrors CHIP's `PayloadContents::IsValidSetupPIN`.
+ *
+ * The onboarding codecs round-trip arbitrary 27-bit passcodes; use this to validate a decoded payload at parse time
+ * rather than deferring to the PASE layer. See {@link MatterSpecification.v13.Core} § 5.1.1.6 / § 5.1.7.1.
+ */
+export function isValidPasscode(passcode: number): boolean {
+    return (
+        Number.isInteger(passcode) &&
+        passcode >= PASSCODE_MIN &&
+        passcode <= PASSCODE_MAX &&
+        !INVALID_PASSCODES.includes(passcode)
+    );
+}
+
+/** Throws {@link UnexpectedDataError} when {@link isValidPasscode} returns false. */
+export function assertValidPasscode(passcode: number): void {
+    if (!isValidPasscode(passcode)) {
+        throw new UnexpectedDataError(`Invalid passcode ${passcode}`);
+    }
+}
+
 const PREFIX = "MT:";
 
 class QrPairingCodeSchema extends Schema<QrCodeData[], string> {
+    /** Rejects payloads carrying an invalid passcode per § 5.1.1.6 / § 5.1.7.1. */
+    override validate(payloadData: QrCodeData[]): void {
+        for (const { passcode } of payloadData) {
+            assertValidPasscode(passcode);
+        }
+    }
+
     protected encodeInternal(payloadData: QrCodeData[]): string {
         if (payloadData.length === 0) throw new ImplementationError("Provided Payload data is empty");
         const result =
@@ -221,6 +282,11 @@ export type ManualPairingData = {
 
 /** See {@link MatterSpecification.v10.Core} § 5.1.4.1 Table 38/39/40 */
 class ManualPairingCodeSchema extends Schema<ManualPairingData, string> {
+    /** Rejects payloads carrying an invalid passcode per § 5.1.1.6 / § 5.1.7.1. */
+    override validate({ passcode }: ManualPairingData): void {
+        assertValidPasscode(passcode);
+    }
+
     protected encodeInternal({ discriminator, passcode, vendorId, productId }: ManualPairingData): string {
         if (discriminator === undefined) throw new UnexpectedDataError("discriminator is required");
         if (discriminator > 4095) throw new UnexpectedDataError("discriminator value must be less than 4096");

package/src/tlv/TlvNullable.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { TlvNumericSchema } from "#tlv/TlvNumber.js";
+import { BitmapWrapper, TlvNumericSchema } from "#tlv/TlvNumber.js";
 import { ArraySchema } from "./TlvArray.js";
 import { TlvTag, TlvType, TlvTypeLength } from "./TlvCodec.js";
 import { TlvEncodingOptions, TlvReader, TlvSchema, TlvWriter } from "./TlvSchema.js";
@@ -40,6 +40,9 @@ export class NullableSchema<T> extends TlvSchema<T | null> {
                     schema = schema.bound({ min: schema.baseTypeMin + BigInt(1), max: schema.max });
                 }
             }
+        } else if (schema instanceof BitmapWrapper) {
+            // Nullable bitmaps reserve the most-significant bit to encode null.
+            schema = schema.withReservedMsb();
         }
         this.schema = schema;
     }

package/src/tlv/TlvNumber.ts

@@ -273,6 +273,34 @@ export const TlvUInt64 = new TlvLongNumberSchema(
 // We use internally 32bit here - in fact encoding is done by real value length anyway
 export const TlvEnum = <T>() => TlvUInt32 as TlvSchema<number> as TlvSchema<T>;
 
+/**
+ * TLV wrapper for a bitmap. Tracks the underlying numeric schema and the bit schema so a nullable
+ * variant can reserve the most-significant bit per spec.
+ */
+export class BitmapWrapper<D> extends TlvWrapper<D, number> {
+    constructor(
+        readonly numericSchema: TlvNumericSchema<number>,
+        private readonly bitmapSchema: Schema<D, number>,
+    ) {
+        super(
+            numericSchema,
+            bitmapData => bitmapSchema.encode(bitmapData),
+            value => bitmapSchema.decode(value),
+        );
+    }
+
+    /**
+     * Returns a variant that reserves the most-significant bit (it encodes NULL for nullable
+     * bitmaps, shrinking the usable range).
+     *
+     * @see {@link MatterSpecification.v16.Core} § 7.19.1.2
+     */
+    withReservedMsb(): BitmapWrapper<D> {
+        const { baseTypeMax } = this.numericSchema;
+        return new BitmapWrapper(this.numericSchema.bound({ max: Math.floor(baseTypeMax / 2) }), this.bitmapSchema);
+    }
+}
+
 export const TlvBitmap = <T extends BitSchema>(underlyingSchema: TlvNumberSchema, bitSchema: T) => {
     // BitmapSchema supports encoding partial bit schemas but specifies its
     // type as TypeFromBitSchema.  Changing to TypeFromPartialBitSchema there
@@ -284,11 +312,7 @@ export const TlvBitmap = <T extends BitSchema>(underlyingSchema: TlvNumberSchema
     // only used in places where we want to support partial bitmaps.
     const bitmapSchema = BitmapSchema(bitSchema) as Schema<TypeFromPartialBitSchema<T>, number>;
 
-    return new TlvWrapper(
-        underlyingSchema,
-        (bitmapData: TypeFromPartialBitSchema<T>) => bitmapSchema.encode(bitmapData),
-        value => bitmapSchema.decode(value),
-    );
+    return new BitmapWrapper(underlyingSchema, bitmapSchema);
 };
 
 // Relative Number types