isy-nodejs 1.0.9-alpha.1 → 1.3.24

package/src/Model/ClassDefinition.ts

@@ -1,20 +1,15 @@
-import { camelize, capitalize } from '@matter/general';
-import camelcase from 'camelcase';
-import { getRandomValues } from 'crypto';
+import { capitalize } from '@matter/general';
 //import { detailedDiff } from 'deep-object-diff';
-import { create } from 'domain';
 import * as fs from 'fs';
 import diff from 'microdiff';
 import { camelCase, merge, pascalCase } from 'moderndash';
-import { ThisTypeNode, type TryStatement } from 'ts-morph';
-import ts, { ClassElement, factory, SyntaxKind } from 'typescript';
 import {} from 'util';
 import type { Driver } from '../Definitions/Global/Drivers.js';
 import { Family } from '../Definitions/Global/Families.js';
 import { UnitOfMeasure } from '../Definitions/Global/UOM.js';
 import { toArray } from '../Utils.js';
-import { EditorDef, type EditorDefMap as EDM, type RangeDef } from './EditorDef.js';
-import { EnumDefinition, EnumDefinitionMap } from './EnumDefinition.js';
+import { EditorDef, type RangeDef } from './EditorDef.js';
+import { EnumDefinition } from './EnumDefinition.js';
 import {
 	IndexDef,
 	NLS,
@@ -22,15 +17,15 @@ import {
 	NLSCommandRecord,
 	NLSDriverRecord,
 	NLSGenericRecord,
-	NLSRecord,
 	NLSRecordType,
-	type NLSIndexMap as NLSI,
-	type NLSRecordMap as NLSM,
-	type NLSRecordTypeMap
+	type NLSRecordTypeMap,
 } from './NLS.js';
 import { DriverDef, NodeDef, SendCommandDef, type AcceptCommandDef, type ParamDef } from './NodeDef.js';
 
-function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family: T): { [x: string]: NodeClassDefinition<T> } {
+function buildNodeClassDefinitions<T extends Family>(
+	nodeDefs: NodeDef[],
+	family: T
+): { [x: string]: NodeClassDefinition<T> } {
 	const map: { [x: string]: NodeClassDefinition<T> } = {};
 	for (const nodeDef of nodeDefs) {
 		var f = new NodeClassDefinition(nodeDef, family);
@@ -41,12 +36,14 @@ function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family
 			for (const cmd of Object.values(f.commands)) {
 				if (cmd.initialValue == driver.id) {
 					driver.readonly = false;
+					driver.settable = true;
 					break;
 				}
 				if (cmd.parameters)
-					for (const cmdp of Object.values(cmd.parameters)) {
+					for (const cmdp of cmd.parameters) {
 						if (cmdp.initialValue === driver.id) {
 							driver.readonly = false;
+							driver.settable = true;
 							break;
 						}
 					}
@@ -56,7 +53,7 @@ function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family
 	}
 	for (const id in map) {
 		let node = map[id];
-		for (const id2 of Object.keys(map).filter((k) => id !== k)) {
+		for (const id2 of Object.keys(map).filter(k => id !== k)) {
 			if (map[id2].implements.includes(id) || node.implements.includes(id2) || node.equivalentTo.includes(id2)) {
 			} else {
 				const node2 = map[id2];
@@ -64,16 +61,15 @@ function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family
 				const d = diff(JSON.parse(JSON.stringify(node2)), JSON.parse(JSON.stringify(node)));
 				let ext = false;
 				let equiv = false;
-				if (d.filter((p) => p.type == 'REMOVE').length == 0) {
+				if (d.filter(p => p.type == 'REMOVE').length == 0) {
 					ext = true;
-					if (d.filter((p) => p.type == 'CREATE').length == 0) equiv = true;
+					if (d.filter(p => p.type == 'CREATE').length == 0) equiv = true;
 				}
 				if (ext && equiv) {
 					if (id.includes(id2)) {
 						node.implements.push(id2, ...node2.implements);
 						node.equivalentTo.push(id2);
 						node2.equivalents.push(id);
-
 					} else {
 						node2.implements.push(id, ...node.implements);
 						node2.equivalentTo.push(id);
@@ -81,8 +77,7 @@ function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family
 					}
 				} else if (ext) {
 					node.implements.push(id2, ...node2.implements);
-					if(id.includes(id2))
-					{
+					if (id.includes(id2)) {
 						node.extends.push(id2);
 					}
 				}
@@ -111,26 +106,22 @@ function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family
 	// }
 
 	//TODO: Make this recursive
-	for (const node of Object.values(map).filter((p) => p.equivalentTo.length == 0)) {
+	for (const node of Object.values(map).filter(p => p.equivalentTo.length == 0)) {
 		if (node.extends == undefined && node.implements.length > 0) {
 			let e: string = null;
-			for (const i of node.implements.filter((p) => map[p].equivalentTo.length == 0)) {
+			for (const i of node.implements.filter(p => map[p].equivalentTo.length == 0)) {
 				let superNode = map[i];
 				if (e == null || superNode.implements.includes(e)) {
 					e = i;
 				}
 			}
-
 		}
 		map[node.id] = node;
 	}
-	for (const node of Object.values(map).filter((p) => p.implements.length > 0))
-	{
-		for (const i of node.implements)
-		{
+	for (const node of Object.values(map).filter(p => p.implements.length > 0)) {
+		for (const i of node.implements) {
 			let superNode = map[i];
-			if(superNode)
-				superNode.implementedBy?.push(node.id);
+			if (superNode) superNode.implementedBy?.push(node.id);
 		}
 	}
 	return map;
@@ -148,7 +139,6 @@ export class NodeClassDefinition<T extends Family> {
 
 	public equivalents: string[] = [];
 
-
 	public events: { [x: string]: EventDefinition } = {};
 	public extends?: string[] = [];
 	public family: T;
@@ -218,10 +208,12 @@ export class NodeClassDefinition<T extends Family> {
 				let d = EditorDef.get(this.family, cmd.editorId);
 				if (d) cmd.applyEditorDef(d);
 			}
-			for (const p of Object.values(cmd.parameters ?? {})) {
-				if (p.editorId) {
-					let d = EditorDef.get(this.family, p.editorId);
-					if (d) p.applyEditorDef(d);
+			if (cmd.parameters) {
+				for (const p of cmd.parameters) {
+					if (p.editorId) {
+						let d = EditorDef.get(this.family, p.editorId);
+						if (d) p.applyEditorDef(d);
+					}
 				}
 			}
 		}
@@ -277,18 +269,18 @@ export class NodeClassDefinition<T extends Family> {
 			className: this.name ?? this.label,
 			id: this.id,
 			nlsId: this.nlsId,
+			name: this.name,
+			label: this.label ?? this.id,
 			drivers: this.drivers,
 			commands: this.commands,
 			events: this.events,
 			family: this.family,
-			label: this.label ?? this.id,
-			name: this.name,
-			dynamic: this.family in [Family.ZWave, Family.ZigBee],
+			dynamic: [Family.ZWave, Family.ZigBee, Family.ZMatter].includes(this.family),
 			implements: this.implements.length > 0 ? this.implements : undefined,
 			equivalentTo: this.equivalentTo.length > 0 ? this.equivalentTo : undefined,
 			extends: this.extends.length > 0 ? this.extends : undefined,
 			equivalents: this.equivalents.length > 0 ? this.equivalents : undefined,
-			implementedBy: this.implementedBy.length > 0 ? this.implementedBy : undefined
+			implementedBy: this.implementedBy.length > 0 ? this.implementedBy : undefined,
 		};
 	}
 
@@ -322,6 +314,9 @@ export class NodeClassDefinition<T extends Family> {
 			if (this.commands.hasOwnProperty(c.control)) {
 				this.commands[c.control].applyNLSRecord(c);
 			}
+			if (this.events.hasOwnProperty(c.control)) {
+				this.events[c.control].applyNLSRecord(c);
+			}
 		}
 		for (const entry of nls.CMDP ?? []) {
 			var cp = entry as NLSCommandParameterRecord;
@@ -372,7 +367,7 @@ export class NodeClassDefinition<T extends Family> {
 }
 
 export type DataTypeDefinition =
-	 {
+	| {
 			uom: UnitOfMeasure;
 			serverUom?: UnitOfMeasure;
 			enum: false;
@@ -382,7 +377,7 @@ export type DataTypeDefinition =
 			step?: number;
 			precision?: number;
 			returnType?: string;
-	 }
+	  }
 	| {
 			uom: UnitOfMeasure;
 			enum: true;
@@ -438,7 +433,7 @@ export abstract class NodeMemberDefinition<TId extends string> {
 			for (const rangeDef of toArray(e.range)) {
 				let dt = {} as DataTypeDefinition;
 				if ('subset' in rangeDef) {
-				 	dt = { uom: rangeDef.uom, indexId: rangeDef.nls, ...this.#parseSubset(e) };
+					dt = { uom: rangeDef.uom, indexId: rangeDef.nls, ...this.#parseSubset(e) };
 				} else {
 					dt = {
 						uom: rangeDef.uom,
@@ -448,18 +443,17 @@ export abstract class NodeMemberDefinition<TId extends string> {
 						step: rangeDef.step ?? undefined,
 						precision: rangeDef.prec ?? undefined,
 						indexId: rangeDef.nls ?? undefined,
-						returnType: rangeDef.nls ? EnumDefinition.get(this.classDef.family, rangeDef.nls, rangeDef.uom, this.classDef.id)?.name : undefined
+						returnType: rangeDef.nls
+							? EnumDefinition.get(this.classDef.family, rangeDef.nls, rangeDef.uom, this.classDef.id)?.name
+							: undefined,
 					};
 				}
-				if(rangeDef.uom === UnitOfMeasure.Index)
-				{
+				if (rangeDef.uom === UnitOfMeasure.Index) {
 					dt.enum = true;
 				}
 				d.push(dt);
-
 			}
 			this.dataType = d;
-
 		}
 	}
 
@@ -523,7 +517,9 @@ export abstract class NodeMemberDefinition<TId extends string> {
 		}
 	}
 
-	public primaryDataType(): { uom: number; enum: false; min: number; max: number; step?: number; precision?: number } | { uom: number; enum: true; indexId: string; values: { [x: number]: string } } {
+	public primaryDataType():
+		| { uom: number; enum: false; min: number; max: number; step?: number; precision?: number }
+		| { uom: number; enum: true; indexId: string; values: { [x: number]: string } } {
 		return Object.values(this.dataType)[0];
 	}
 
@@ -538,13 +534,13 @@ export abstract class NodeMemberDefinition<TId extends string> {
 
 	public toJSON() {
 		return {
+			id: this.id,
+			name: this.name,
 			label: this.label,
 			hidden: this.hidden,
 			optional: this.optional,
-			id: this.id,
 			editorId: this.editorId,
 			dataType: this.dataType,
-			name: this.name
 		};
 	}
 
@@ -552,7 +548,9 @@ export abstract class NodeMemberDefinition<TId extends string> {
 
 	// #region Private Methods (1)
 
-	#parseSubset(e: EditorDef): { enum: true; values: { [x: number]: string } } | { enum: false; min: number; max: number } {
+	#parseSubset(
+		e: EditorDef
+	): { enum: true; values: { [x: number]: string } } | { enum: false; min: number; max: number } {
 		if ('subset' in e.range) {
 			if (e.range.subset.includes(',')) {
 				var values = {};
@@ -583,6 +581,7 @@ export class DriverDefinition extends NodeMemberDefinition<Driver.Type> {
 	// #region Properties (1)
 
 	public readonly = true;
+	public settable = true;
 
 	// #endregion Properties (1)
 
@@ -594,6 +593,7 @@ export class DriverDefinition extends NodeMemberDefinition<Driver.Type> {
 		this.hidden = def.hide === 'T';
 		this.editorId = def.editor;
 		this.optional = false;
+		this.settable = false;
 	}
 
 	// #endregion Constructors (1)
@@ -618,14 +618,15 @@ export class DriverDefinition extends NodeMemberDefinition<Driver.Type> {
 
 	public override toJSON() {
 		return {
+			id: this.id,
+			name: this.name,
 			label: this.label,
 			hidden: this.hidden,
 			optional: this.optional,
 			readonly: this.readonly,
-			id: this.id,
 			editorId: this.editorId,
 			dataType: this.dataType,
-			name: this.name
+			settable: this.settable,
 		};
 	}
 
@@ -636,7 +637,7 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 	// #region Properties (2)
 
 	public initialValue?: Driver.Type;
-	public parameters?: { [x: string]: ParameterDefinition };
+	public parameters?: ParameterDefinition[];
 
 	// #endregion Properties (2)
 
@@ -646,7 +647,7 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 		super(classDef);
 		this.id = def.id;
 		if (def.p) {
-			this.parameters = {};
+			this.parameters = [];
 
 			for (const p of toArray(def.p)) {
 				if (p.id === '') {
@@ -656,7 +657,7 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 					this.optional = p.optional === 'T';
 					p.id = 'value';
 				}
-				this.parameters[p.id] = new ParameterDefinition(p, classDef);
+				this.parameters.push(new ParameterDefinition(p, classDef));
 			}
 		}
 	}
@@ -666,7 +667,7 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 	// #region Public Getters And Setters (1)
 
 	public override get name(): string {
-		if (Object.values(this.classDef.drivers).find((d) => d.name === super.name)) {
+		if (Object.values(this.classDef.drivers).find(d => d.name === super.name)) {
 			return 'update' + capitalize(super.name);
 		}
 		return super.name;
@@ -678,15 +679,17 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 
 	public override applyEditorDef(e: EditorDef): void {
 		super.applyEditorDef(e);
-		for (const p in this.parameters) {
-			this.parameters[p].applyEditorDef(e);
+
+		for (const p of this.parameters ?? []) {
+			p.applyEditorDef(e);
 		}
 	}
 
 	public override applyIndexDef(e: { [x: string]: { [y: number]: string } }): void {
 		super.applyIndexDef(e);
-		for (const p in this.parameters) {
-			this.parameters[p].applyIndexDef(e);
+
+		for (const p of this.parameters ?? []) {
+			p.applyIndexDef(e);
 		}
 	}
 
@@ -703,12 +706,14 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 					this.label = this.selectValue(this.label, nls.value, nls.nlsId);
 				}
 			}
-			if (this.parameters && this.parameters[nls.control]) {
-				this.parameters[nls.control].applyNLSRecord(nls);
+			if (this.parameters && this.parameters.find(p => p.id == nls.control)) {
+				let p = this.parameters.find(p => p.id == nls.control);
+				p.applyNLSRecord(nls);
 			}
 		} else if (nls.type === NLSRecordType.CommandParameter || nls.type === NLSRecordType.CommandParameterNLS) {
-			if (this.parameters && this.parameters[nls.control]) {
-				this.parameters[nls.control].applyNLSRecord(nls);
+			if (this.parameters && this.parameters.find(p => p.id == nls.control)) {
+				let p = this.parameters.find(p => p.id == nls.control);
+				p.applyNLSRecord(nls);
 			}
 		}
 	}
@@ -728,15 +733,15 @@ export class CommandDefinition extends NodeMemberDefinition<string> {
 	//
 	public override toJSON() {
 		return {
+			id: this.id,
+			name: this.name,
 			label: this.label,
 			hidden: this.hidden,
-			id: this.id,
 			editorId: this.editorId,
 			dataType: this.dataType,
-			name: this.name,
 			optional: this.optional,
 			parameters: this.parameters,
-			initialValue: this.initialValue
+			initialValue: this.initialValue,
 		};
 	}
 
@@ -773,14 +778,14 @@ export class ParameterDefinition extends NodeMemberDefinition<string> {
 
 	public override toJSON() {
 		return {
+			id: this.id,
+			name: this.name,
 			label: this.label,
 			hidden: this.hidden,
-			id: this.id,
 			editorId: this.editorId,
 			dataType: this.dataType,
-			name: this.name,
 			optional: this.optional,
-			initialValue: this.initialValue
+			initialValue: this.initialValue,
 		};
 	}
 
@@ -847,7 +852,7 @@ export namespace NodeClassDefinition {
 	export function load(path: string) {
 		for (const file of new Set(fs.readdirSync(path + '/generated').concat(fs.readdirSync(path + '/overrides')))) {
 			let fam = file.replace('.json', '');
-			const family = Family[fam];
+			let family = Family[fam as keyof typeof Family];
 			let nodeClassDefs: {
 				[x: string]: NodeClassDefinition<Family>;
 			} = {};
@@ -864,22 +869,26 @@ export namespace NodeClassDefinition {
 					}
 				);
 			}
+			delete nodeClassDefs['$schema'];
 			populateClassDefinitions(nodeClassDefs);
 			NodeClassMap.set(family, nodeClassDefs);
 		}
 		return NodeClassMap;
 
 		function populateClassDefinitions(nodeClassDefs: { [x: string]: NodeClassDefinition<Family> }) {
-			for (var entry of Object.values(nodeClassDefs)) {
-				for (var driver of Object.values(entry.drivers)) {
-					driver.classDef = entry;
-				}
-				for (var command of Object.values(entry.commands)) {
-					command.classDef = entry;
-					if (command.parameters)
-						for (var param of Object.values(command.parameters)) {
-							param.classDef = entry;
-						}
+			for (var id in nodeClassDefs) {
+				if (id != '$schema') {
+					let entry = nodeClassDefs[id];
+					for (var driver of Object.values(entry.drivers)) {
+						driver.classDef = entry;
+					}
+					for (var command of Object.values(entry.commands)) {
+						command.classDef = entry;
+						if (command.parameters)
+							for (var param of command.parameters) {
+								param.classDef = entry;
+							}
+					}
 				}
 			}
 		}

package/src/Model/CodeGeneration/EventDef.ts

@@ -1,36 +1,33 @@
-import type { Family, UnitOfMeasure } from '../../Definitions/Global/index.js'
-import { type EditorDef, EditorDefMap } from '../EditorDef.js';
+import type { Family, UnitOfMeasure } from '../../Definitions/Global/index.js';
 
 interface EventMaps {
-  '$comment': string;
-  eventMap: EventMap;
+	$comment: string;
+	eventMap: EventMap;
 }
 
 interface EventMap {
-  uomMap: UomMap;
-  id: string;
+	uomMap: UomMap;
+	id: string;
 }
 
 interface UomMap {
-    uom: {
-    from: UnitOfMeasure;
-    to: UnitOfMeasure;
-    prec?: number;
- }[]
-  '$comment': string[];
+	uom: {
+		from: UnitOfMeasure;
+		to: UnitOfMeasure;
+		prec?: number;
+	}[];
+	$comment: string[];
 }
 
-export const UOMMap : Map<Family, {[x in UnitOfMeasure]?: UnitOfMeasure} > = new Map();
+export const UOMMap: Map<Family, { [x in UnitOfMeasure]?: UnitOfMeasure }> = new Map();
 
 export function buildUOMMap<T extends Family>(eventMaps: UomMap, family: T) {
-    let map: {[x in UnitOfMeasure]?: UnitOfMeasure} = {};
+	let map: { [x in UnitOfMeasure]?: UnitOfMeasure } = {};
 
-    for (const uom of eventMaps.uom) {
-        map[uom.to] = uom.from as UnitOfMeasure;
-    }
+	for (const uom of eventMaps.uom) {
+		map[uom.to] = uom.from as UnitOfMeasure;
+	}
 
-
-    UOMMap.set(family, map);
-    return map;
+	UOMMap.set(family, map);
+	return map;
 }
-

package/src/Model/Config.ts

@@ -49,15 +49,15 @@ export interface Product {
 	desc: string;
 }
 
-export interface Feature {
+interface ISYFeature {
 	id: number;
 	desc: string;
 	isInstalled: boolean;
 	isAvailable: boolean;
 }
 
-export interface Feature {
-	feature: Feature[];
+interface ISYFeature {
+	feature: ISYFeature[];
 }
 
 export interface BaseDriver {
@@ -82,7 +82,7 @@ export interface Config {
 	build_timestamp: string;
 	root: Root;
 	product: Product;
-	features: Feature;
+	features: ISYFeature;
 	triggers: boolean;
 	maxTriggers: number;
 	variables: boolean;
@@ -91,4 +91,4 @@ export interface Config {
 	security: Security;
 	isDefaultCert: boolean;
 	maxSSLStrength: number;
-}
+}

package/src/Model/DriverState.ts

@@ -1,7 +1,5 @@
 import type { UnitOfMeasure } from '../Definitions/Global/UOM.js';
 
-
-
 export interface DriverState {
 	id: string | number;
 	value: any;

package/src/Model/EditorDef.ts

@@ -2,45 +2,45 @@ import { Family } from '../Definitions/Global/Families.js';
 import type { UnitOfMeasure } from '../Definitions/Global/UOM.js';
 import type { MaybeArray } from '../Utils.js';
 
-export type RangeDef = {
-	uom: UnitOfMeasure;
-	subset: string;
-	nls: string;
-	prec?: number;
-} | {
-  	nls?: string;
-	uom: UnitOfMeasure;
-	min: number;
-	max: number;
-	step: number;
-	prec: number;
-}
-
+export type RangeDef =
+	| {
+			uom: UnitOfMeasure;
+			subset: string;
+			nls: string;
+			prec?: number;
+	  }
+	| {
+			nls?: string;
+			uom: UnitOfMeasure;
+			min: number;
+			max: number;
+			step: number;
+			prec: number;
+	  };
 
 export interface EditorDef {
 	id: string;
-	range: MaybeArray<RangeDef>
+	range: MaybeArray<RangeDef>;
 }
 
-
-export const EditorDefMap : Map<Family, {[x: string]: EditorDef}> = new Map();
+export const EditorDefMap: Map<Family, { [x: string]: EditorDef }> = new Map();
 
 export function buildEditorDefMap<T extends Family>(editorDefs: EditorDef[], family: T) {
-    const map: {[x: string]: EditorDef} = {};
-    for(const editorDef of editorDefs) {
-        map[editorDef.id] = editorDef;
-    }
+	const map: { [x: string]: EditorDef } = {};
+	for (const editorDef of editorDefs) {
+		map[editorDef.id] = editorDef;
+	}
 
-    EditorDefMap.set(family, map);
-    return map;
+	EditorDefMap.set(family, map);
+	return map;
 }
 
 export namespace EditorDef {
 	export function get<T extends Family>(family: T, id: string): EditorDef | undefined {
-		if(EditorDefMap.has(family)) {
+		if (EditorDefMap.has(family)) {
 			return EditorDefMap.get(family)[id];
 		}
 	}
 
 	export const Map = EditorDefMap;
-}
+}

package/src/Model/EnumDefinition.ts

@@ -1,11 +1,10 @@
-import camelcase from 'camelcase';
+import { merge, pascalCase } from 'moderndash';
 import { Family } from '../Definitions/Global/Families.js';
 import { applyTranslations, NLSIndexMap } from './NLS.js';
-import { camelCase, merge, pascalCase } from 'moderndash';
 
-import { UnitOfMeasure } from '../Definitions/Global/UOM.js';
 import fs from 'fs';
 import { factory } from 'typescript';
+import { UnitOfMeasure } from '../Definitions/Global/UOM.js';
 
 export class EnumDefinition<T extends Family> {
 	public readonly family: T;
@@ -13,7 +12,10 @@ export class EnumDefinition<T extends Family> {
 	public name: string;
 	public values: { [y: string]: number } = {};
 	public usages = new Set<`${string}:${keyof typeof UnitOfMeasure}`>();
-	public repType : { type: 'enum' } | {type: 'boolean', trueValue: number, falseValue: number, nullValue?: boolean} | {type: 'const', value: 'number'|'bigint'};
+	public repType:
+		| { type: 'enum' }
+		| { type: 'boolean'; trueValue: number; falseValue: number; nullValue?: boolean }
+		| { type: 'const'; value: 'number' | 'bigint' };
 	constructor(family: T, indexDef: { id: string; values: { [y: number]: string } }) {
 		this.family = family;
 		this.id = indexDef.id;
@@ -123,5 +125,5 @@ function createMemberName(name: string, mapNullishTo: string = 'Unknown'): any {
 }
 
 function sanitize(value: string) {
-  return pascalCase(value).replace(/[^a-zA-Z0-9]/g, '');
-}
+	return pascalCase(value).replace(/[^a-zA-Z0-9]/g, '');
+}

package/src/Model/Message.ts

@@ -1,9 +1,11 @@
+import type { UnitOfMeasure } from '../ISY.js';
+
 export interface Message<TEventInfo> {
-    seqnum: number;
-    sid: string;
-    timestamp: string;
-    control: string;
-    action: string;
-    node: string;
-    eventInfo: TEventInfo;
+	seqnum: number;
+	sid: string;
+	timestamp: string;
+	control: string;
+	action: string | number | { _: string | number; uom: UnitOfMeasure; prec: number };
+	node: string;
+	eventInfo: TEventInfo;
 }