Fixed nrchkb complaining about validValues #52 (#416)

NRCHKB · Jul 10, 2021 · f2a5076 · f2a5076
1 parent bc4c865
commit f2a5076
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.6]
+
+### Fixed
+
+- nrchkb complaining about validValues #52
+
 ## [1.3.5]
 
 ### Fixed

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-homekit-bridged",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Node-RED nodes to simulate Apple HomeKit devices.",
   "main": "build/nodes/nrchkb.js",
   "scripts": {

diff --git a/src/lib/api.ts b/src/lib/api.ts
@@ -186,13 +186,27 @@ module.exports = function (RED: NodeAPI) {
                         return
                     }
 
+                    const validatedProps = props
+                    if (validatedProps.validValues?.length === 0) {
+                        validatedProps.validValues = undefined
+                    }
+                    if (
+                        !validatedProps.validValueRanges?.[0] ||
+                        !validatedProps.validValueRanges?.[1]
+                    ) {
+                        validatedProps.validValueRanges = undefined
+                    }
+                    if (validatedProps.adminOnlyAccess?.length === 0) {
+                        validatedProps.adminOnlyAccess = undefined
+                    }
+
                     class CustomCharacteristic extends Characteristic {
                         static readonly UUID: string = UUID!
 
                         constructor() {
                             super(name!, CustomCharacteristic.UUID, {
-                                ...props,
-                                perms: props.perms ?? [
+                                ...validatedProps,
+                                perms: validatedProps.perms ?? [
                                     Perms.PAIRED_READ,
                                     Perms.PAIRED_WRITE,
                                     Perms.NOTIFY,