isy-nodejs 1.0.1-alpha.27 → 1.0.1-alpha.28

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.1-alpha.27",
+    "version": "1.0.1-alpha.28",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "6818f4140be310656690e21c6a451f42cae1ef8f"
+    "gitHead": "8db16499c0e5d154bfa3d13ccf0d31409abbb4ae"
 }

package/src/CodeGeneration/EnumFactory.ts

@@ -1,7 +1,7 @@
 import { factory } from "typescript";
 import { createWrappedNode, ts, type EnumDeclaration, EnumMember, Identifier } from 'ts-morph'
 import { UnitOfMeasure } from "../Definitions/Global/UOM.js";
-import { Family } from "../ISY.js";
+
 import type {
   NodeClassDefinition,
   DriverDefinition,
@@ -12,6 +12,7 @@ import { EnumDefinition, EnumDefinitionMap } from "../Model/EnumDefinition.js";
 import { isGeneratorFunction } from "util/types";
 import { Logger, loggers } from "winston";
 import { pascalCase } from 'moderndash';
+import { Family } from '../Definitions/index.js';
 
 
 const logger = loggers.get("EnumFactory");

package/src/CodeGeneration/NodeClassFactory.ts

@@ -2,9 +2,10 @@ import { createWrappedNode, IndentationText, Project, QuoteKind, SourceFile, ts,
 import { factory, Statement, type Declaration } from 'typescript';
 import type { Driver } from '../Definitions/Global/Drivers.js';
 import { UnitOfMeasure } from '../Definitions/Global/UOM.js';
-import { Family } from '../ISY.js';
+
 import { CommandDefinition, DataTypeDefinition, DriverDefinition, NodeClassDefinition, ParameterDefinition } from '../Model/ClassDefinition.js';
 import { EnumDefinitionMap } from '../Model/EnumDefinition.js';
+import  { Family } from '../Definitions/index.js';
 
 // #region Type aliases (1)
 

package/src/Definitions/Global/Events.ts

@@ -3,7 +3,7 @@ import type { AnyMxRecord } from 'dns';
 import EventEmitter, { on } from 'events';
 import type { EventType } from '../../Events/EventType.js';
 import { ISYEvent } from '../../Events/ISYEvent.js';
-import type { InsteonBaseDevice, ISY } from '../../ISY.js';
+import type { ISY } from '../../ISY.js';
 import type { ISYNode } from '../../ISYNode.js';
 import type { UnitOfMeasure } from './UOM.js';
 
@@ -63,7 +63,7 @@ export namespace Event {
 	): FunctionSigFor<E, NodeEventEmitter<N>> & Omit<NodeEventEmitter<N>, 'on'> {
 		var f = new NodeEventEmitter(node);
 		for (let evt in node.drivers) {
-			
+
 			//f[`on${ev.name}`] = f.on.bind(f, ev.name);
 		}
 

package/src/Devices/ISYDeviceNode.ts

@@ -1,6 +1,6 @@
 
 import type { Driver } from '../Definitions/Global/Drivers.js';
-import { type Family, type ISY, Controls } from '../ISY.js';
+import {type ISY } from '../ISY.js';
 import type { ISYDevice } from '../ISYDevice.js';
 import { ISYNode} from '../ISYNode.js';
 import type { ISYScene } from '../ISYScene.js';
@@ -10,6 +10,7 @@ import type { Category } from '../Definitions/Global/Categories.js';
 import type { Command } from '../Definitions/Global/Commands.js';
 import type { Event } from '../Definitions/Global/Events.js';
 import type { StringKeys } from '../Utils.js';
+import type { Family } from '../Definitions/index.js';
 
 
 export class ISYDeviceNode<

package/src/Devices/ISYMultiNodeDevice.ts

@@ -1,7 +1,7 @@
 //import type { UnionToIntersection } from '@project-chip/matter-node.js/util.js';
 import type { Driver } from '../Definitions/Global/Drivers.js';
 import type { UnitOfMeasure } from '../Definitions/Global/UOM.js';
-import type { Family } from '../ISY.js';
+
 import type { ISYDevice } from '../ISYDevice.js';
 import type { DriverMap, ISYNode, NodeList } from '../ISYNode.js';
 import type { ISYScene } from '../ISYScene.js';

package/src/Devices/Insteon/InsteonDevice.ts

@@ -1,4 +1,4 @@
-import { Family, InsteonBaseDevice, ISY, ISYDevice } from '../../ISY.js';
+import { ISY } from '../../ISY.js';
 
 import { Insteon } from '../../Definitions/Global/Families.js';
 import { Commands } from '../../ISYConstants.js'
@@ -6,6 +6,7 @@ import { Constructor } from '../Constructor.js';
 import { InsteonKeypadButtonDevice } from './InsteonKeypadDevice.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
 import 'winston';
+import type { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 export const InsteonLampDevice = <T extends Constructor<InsteonBaseDevice>>(IB: T) => (class extends IB {
 			declare isDimmable: boolean;
@@ -21,7 +22,7 @@ export const InsteonLampDevice = <T extends Constructor<InsteonBaseDevice>>(IB:
 
 export const KeypadDevice = <T extends Constructor<InsteonBaseDevice>>(IB: T) => (class extends IB {
 
-	
+
 });
 
 

package/src/Devices/Insteon/InsteonDeviceFactory.ts

@@ -1,5 +1,5 @@
 import { Category } from '../../Definitions/Global/Categories.js';
-import { Family, InsteonBaseDevice, InsteonLockDevice, InsteonSmokeSensorDevice, InsteonThermostatDevice } from '../../ISY.js';
+
 import { parseTypeCode } from '../../Utils.js';
 import { NodeInfo } from '../../Model/NodeInfo.js';
 import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
@@ -19,6 +19,11 @@ import { ISYNode } from '../../ISYNode.js';
 import { DeviceDef, type CategoryDef, type FamilyDef } from '../DeviceMap.js';
 import { writeFileSync } from 'fs';
 import type { Constructor } from '../Constructor.js';
+import { Family } from '../../Definitions/index.js';
+import { InsteonBaseDevice } from './InsteonBaseDevice.js';
+import { InsteonSmokeSensorDevice } from './InsteonSmokeSensorDevice.js';
+import { InsteonThermostatDevice } from './InsteonThermostatDevice.js';
+import { InsteonLockDevice } from './InsteonLockDevice.js';
 
 
 
@@ -327,7 +332,7 @@ export class InsteonDeviceFactory {
 				retVal = { name: 'Plugin Relay', modelNumber: '2633-522' };
 		}
 		if (subAddress != '1' && retVal.class === InsteonKeypadRelayDevice) {
-			retVal.class = InsteonKeypadButtonDevice;
+			retVal.class = InsteonKeypadButtonDevice as any;
 		}
 		if (retVal.class === undefined) { retVal.class = InsteonRelayDevice; }
 		return retVal;

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -1,5 +1,5 @@
 import { Family } from '../../Definitions/Global/Families.js';
-import { ISY, ISYNode } from '../../ISY.js';
+import { ISY } from '../../ISY.js';
 import { States } from '../../ISYConstants.js';
 
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';

package/src/Devices/Insteon/InsteonKeypadDevice.ts

@@ -1,11 +1,11 @@
-import type { NodeInfo } from '../../Model/NodeInfo.js';
+import 'winston';
 import { ISY } from '../../ISY.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
-import 'winston';
-
+import { KeypadButton } from './KeypadButton.js';
 
-export class InsteonKeypadButtonDevice extends InsteonRelayDevice {
-	constructor (isy: ISY, deviceNode: NodeInfo) {
+export class InsteonKeypadButtonDevice extends KeypadButton.Node {
+	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 	}
 }

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -1,4 +1,4 @@
-import { Family, ISY } from '../../ISY.js';
+import {  ISY } from '../../ISY.js';
 
 import { NodeInfo } from '../../Model/NodeInfo.js';
 import { EndpointFor } from '../EndpointFor.js';

package/src/Devices/Insteon/{Generated/KeypadButton.ts → KeypadButton.ts}

@@ -1,29 +1,29 @@
-/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
-
-import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
-import { Family } from "../../../Definitions/Global/Families.js";
-import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
-import type { ISYNode } from "../../../ISYNode.js";
-import { Base } from "../index.js";
-import { ISYDeviceNode } from "../../ISYDeviceNode.js";
-import { Driver } from "../../../Definitions/Global/Drivers.js";
-import { Insteon } from "../../../Definitions/index.js";
-import type { DriverState } from "../../../Model/DriverState.js";
-import { NodeFactory } from "../../NodeFactory.js";
-
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
+import { UnitOfMeasure } from "../../Definitions/Global/UOM.js";
+import { Family } from "../../Definitions/Global/Families.js";
+import type { NodeInfo } from "../../Model/NodeInfo.js";
+import type { ISY } from "../../ISY.js";
+import type { ISYNode } from "../../ISYNode.js";
+import { Base } from "./index.js";
+import { ISYDeviceNode } from "../ISYDeviceNode.js";
+import { Driver } from "../../Definitions/Global/Drivers.js";
+import { Insteon } from "../../Definitions/index.js";
+import type { DriverState } from "../../Model/DriverState.js";
+import { NodeFactory } from "../NodeFactory.js";
+
 export const nodeDefId = "KeypadButton";
-
+
 type Commands = KeypadButton.Commands;
 type Drivers = KeypadButton.Drivers;
-
+
 export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadButton.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		QUERY: this.query,
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "KeypadButton";
+	static override nodeDefId = "KeypadButton";
 	declare readonly nodeDefId: "KeypadButton";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -46,9 +46,9 @@ export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadB
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(KeypadButtonNode);
-
+
 export namespace KeypadButton {
 	export interface Interface extends Omit<InstanceType<typeof KeypadButtonNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "KeypadButton";

package/src/Devices/NodeFactory.ts

@@ -1,10 +1,11 @@
-import type { MaybePromise } from '@project-chip/matter.js/util';
-import { Family, ISY } from '../ISY.js';
+
+import { ISY } from '../ISY.js';
 import  { ISYNode } from '../ISYNode.js';
 import type { NodeDef } from '../Model/NodeDef.js';
 import { isDynamic, type NodeInfo } from '../Model/NodeInfo.js';
 import type { Constructor } from './Constructor.js';
 import type { IdentityOf } from '../Utils.js';
+import { Family } from '../Definitions/index.js';
 
 
 

package/src/Devices/ZWave/ZWaveDimmerSwitchDevice.ts

@@ -1,6 +1,6 @@
 
 
-import { Family } from '../../ISY.js';
+
 import { ZWaveBaseDevice } from './ZWaveBaseDevice.js';
 import 'winston';
 

package/src/Devices/index.ts

@@ -1,6 +1,6 @@
-import { Family } from "../ISY.js";
+
+import type { Family } from '../Definitions/index.js';
 import {Insteon} from "./Insteon/index.js";
-import { ISYDeviceNode } from './ISYDeviceNode.js';
 import { ZWaveBaseDevice } from "./ZWave/ZWaveBaseDevice.js";
 
 export const Devices = {