Merge branch 'release/0.7.0'

CMCRobotics · Oct 10, 2024 · be64bbb · be64bbb
2 parents 7fc411c + bec6ebd
commit be64bbb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cmcrobotics/homie-lit",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "description": "A TypeScript library integrating Homie devices with DOM element attributes for visualization",
   "repository": "github:cmcrobotics/homie-lit",
   "main": "dist/homie-lit.js",

diff --git a/src/HomieDevice.ts b/src/HomieDevice.ts
@@ -3,18 +3,18 @@ import { HomieNode } from './HomieNode';
 export class HomieDevice {
   private nodes: Map<string, HomieNode> = new Map();
 
-  constructor(public name: string) {}
+  constructor(public id: string, public name: string = id, public type: string = '') { }
 
   addNode(node: HomieNode) {
-    this.nodes.set(node.name, node);
+    this.nodes.set(node.id, node);
   }
 
   removeNode(node: HomieNode){
-    this.nodes.delete(node.name);
+    this.nodes.delete(node.id);
   }
 
-  getNode(name: string): HomieNode | undefined {
-    return this.nodes.get(name);
+  getNode(id: string): HomieNode | undefined {
+    return this.nodes.get(id);
   }
 
   getAllNodes(): HomieNode[] {

diff --git a/src/HomieNode.ts b/src/HomieNode.ts
@@ -3,14 +3,14 @@ import { HomieProperty } from './HomieProperty';
 export class HomieNode {
   private properties: Map<string, HomieProperty> = new Map();
 
-  constructor(public name: string) {}
+  constructor(public id: string, public name: string = id, public type: string = '') { }
 
   addProperty(property: HomieProperty) {
-    this.properties.set(property.name, property);
+    this.properties.set(property.id, property);
   }
 
-  getProperty(name: string): HomieProperty | undefined {
-    return this.properties.get(name);
+  getProperty(id: string): HomieProperty | undefined {
+    return this.properties.get(id);
   }
 
   getAllProperties(): HomieProperty[] {

diff --git a/src/HomieProperty.ts b/src/HomieProperty.ts
@@ -1,9 +1,8 @@
 export class HomieProperty {
-  constructor(public name: string, public value: any, public dataType: any) {}
+  constructor(public id: string, public name: string = id, public value: any, public dataType: any) {}
 
   setValue(newValue: any) {
     this.value = newValue;
-    // TODO: Implement update logic and event emission
   }
 
   getValue(): any {

diff --git a/test/src/CoralBranch.ts b/test/src/CoralBranch.ts
@@ -4,8 +4,8 @@ import { HomieProperty } from '../../src/HomieProperty';
 export class CoralBranch extends HomieNode {
   constructor(name: string) {
     super(name);
-    this.addProperty(new HomieProperty('color', 'pink', 'string'));
-    this.addProperty(new HomieProperty('length', 10, 'integer'));
+    this.addProperty(new HomieProperty('color', 'Color',  'pink', 'string'));
+    this.addProperty(new HomieProperty('length', 'Length', 10, 'integer'));
   }
 
   // Add coral branch specific methods here

diff --git a/test/src/PlayerAvatar.ts b/test/src/PlayerAvatar.ts
@@ -4,8 +4,8 @@ import { HomieProperty } from '../../src/HomieProperty';
 export class PlayerAvatar extends HomieNode {
   constructor(name: string) {
     super(name);
-    this.addProperty(new HomieProperty('position', { x: 0, y: 0, z: 0 }, 'json'));
-    this.addProperty(new HomieProperty('rotation', { x: 0, y: 0, z: 0 }, 'json'));
+    this.addProperty(new HomieProperty('position', "Position", { x: 0, y: 0, z: 0 }, 'json'));
+    this.addProperty(new HomieProperty('rotation', "Rotation", { x: 0, y: 0, z: 0 }, 'json'));
   }
 
   // Add player avatar specific methods here