isy-nodejs 1.0.2-alpha.4 → 1.0.3-alpha.0

package/package.json

@@ -2,7 +2,7 @@
     "name": "isy-nodejs",
     "description": "Node.js wrapper for ISY interface including websockets for change notifications. Fork of isy-js by Rod Toll. Designed to be used in a node.js application.",
     "license": "MIT",
-    "version": "1.0.2-alpha.4",
+    "version": "1.0.3-alpha.0",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -57,12 +57,14 @@
         "@matter/types": "^0.11.4",
         "@project-chip/matter-node.js": "^0.11.4",
         "@project-chip/matter.js": "^0.11.4",
+        "@types/ws": "^8.5.13",
         "axios": "^1.7.7",
         "fast-xml-parser": "^4.5.0",
         "faye-websocket": "^0.11.4",
         "mocha": "^10.8.2",
         "p-queue": "^8.0.1",
         "winston": "^3.17.0",
+        "ws": "^8.18.0",
         "xml2js": "^0.6.2"
     },
     "bugs": {
@@ -71,5 +73,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "21e7087d05090f242cbd715056d218bd71f0bba8"
+    "gitHead": "7bc1560e617cbcb61c29680bd33ea63e2660f472"
 }

package/src/CodeGeneration/{NodeFactory.ts → CodeFactory.ts}

@@ -1,4 +1,6 @@
+import { unique } from 'moderndash';
 import ts, { ModifierFlags, type ModifierSyntaxKind, type PunctuationSyntaxKind } from 'typescript';
+import { types } from 'util';
 
 type ParameterType<F> = F extends (arg0: infer P) => any ? P : never;
 
@@ -207,10 +209,17 @@ export class CodeFactory {
 				return a.typeName.text === b.typeName.text;
 			}
 		}
+		if(a.kind === ts.SyntaxKind.NumberKeyword || a.kind === ts.SyntaxKind.StringKeyword || a.kind === ts.SyntaxKind.BigIntKeyword)
+		{
+			return a.kind === b.kind;
+		}
 		return false;
 	}
 
 	createUnionTypeNode(...types: ts.TypeNode[]): ts.UnionTypeNode {
+		let t = unique(types, this.typesEqual);
+		/*try
+		{
 		let t = [types[0]];
 		for (let i = 1; i < types.length; i++) {
 			if (types[i].kind !== ts.SyntaxKind.NeverKeyword) {
@@ -219,7 +228,14 @@ export class CodeFactory {
 				} else if (!t.some((x) => this.typesEqual(x, types[i]))) t.push(types[i]);
 			}
 		}
-		return ts.factory.createUnionTypeNode(types);
+			return ts.factory.createUnionTypeNode(t);
+		}
+		catch(e)
+		{*/
+			//console.warn(e);
+			return ts.factory.createUnionTypeNode(t);
+		//}
+
 	}
 
 	createIntersectionTypeNode(types: ts.TypeNode[]): ts.IntersectionTypeNode {
@@ -311,7 +327,7 @@ export class CodeFactory {
 		if(typeof multiLine === 'boolean') {
 			return ts.factory.createBlock(statements, multiLine);
 		}
-		return ts.factory.createBlock([multiLine, ...statements]);
+		return ts.factory.createBlock([multiLine, ...statements],true);
 
 	}
 

package/src/CodeGeneration/EnumFactory.ts

@@ -1,5 +1,5 @@
 import { factory } from "typescript";
-import { createWrappedNode, ts, type EnumDeclaration, EnumMember, Identifier } from 'ts-morph'
+import { createWrappedNode, ts, type EnumDeclaration, EnumMember, Identifier} from 'ts-morph'
 import { UnitOfMeasure } from "../Definitions/Global/UOM.js";
 
 import type {
@@ -7,6 +7,7 @@ import type {
   DriverDefinition,
   ParameterDefinition,
   CommandDefinition,
+  DataTypeDefinition,
 } from "../Model/ClassDefinition.js";
 import { EnumDefinition, EnumDefinitionMap } from "../Model/EnumDefinition.js";
 import { isGeneratorFunction } from "util/types";
@@ -136,7 +137,7 @@ function createDriverInitializationStatement(def: DriverDefinition): ts.Statemen
                 factory.createIdentifier("uom"),
                 factory.createPropertyAccessExpression(
                   factory.createIdentifier("UnitOfMeasure"),
-                  factory.createIdentifier(UnitOfMeasure[Object.values(def.dataType)[0]?.uom] ?? "Unknown")
+                  factory.createIdentifier(UnitOfMeasure[def.dataType[0]?.uom] ?? "Unknown")
                 )
               ),
               factory.createPropertyAssignment(
@@ -153,7 +154,7 @@ function createDriverInitializationStatement(def: DriverDefinition): ts.Statemen
   );
 }
 
-function createDriverSignatureReturnType(def: DriverDefinition["dataType"]["AbsoluteHumidity"]): ts.TypeNode {
+function createDriverSignatureReturnType(def: DataTypeDefinition): ts.TypeNode {
   if (def.enum) {
     return factory.createUnionTypeNode(
       Object.keys(def.values).map((p) => factory.createLiteralTypeNode(factory.createNumericLiteral(p)))
@@ -161,7 +162,7 @@ function createDriverSignatureReturnType(def: DriverDefinition["dataType"]["Abso
   } else return factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
 }
 
-function createDriverPropertyReturnType(def: DriverDefinition["dataType"]["AbsoluteHumidity"]): ts.TypeNode {
+function createDriverPropertyReturnType(def: DataTypeDefinition): ts.TypeNode {
   if (def.enum) {
     {
       if (Object.keys(def.values).length == 2) {