Update json-schema-to-typescript and ajv. (#94)

Author: mrstegeman

package-lock.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/WebThingsIO/gateway-addon-node/issues"
   },
   "dependencies": {
-    "ajv": "^6.12.6",
+    "ajv": "^7.0.3",
     "sqlite3": "^4.2.0",
     "ws": "^7.4.2"
   },
@@ -33,7 +33,7 @@
     "@typescript-eslint/parser": "^4.14.1",
     "babel-eslint": "^10.1.0",
     "eslint": "^7.18.0",
-    "json-schema-to-typescript": "^9.1.1",
+    "json-schema-to-typescript": "^10.1.3",
     "typescript": "^4.1.3"
   },
   "files": [

package.json

@@ -7,7 +7,7 @@
  */
 
 import {Device} from './device';
-import {ActionDescription, Input} from './schema';
+import {ActionDescription, Any} from './schema';
 import {timestamp} from './utils';
 
 /**
@@ -26,7 +26,7 @@ export class Action {
 
   private name: string;
 
-  private input?: Input;
+  private input?: Any;
 
   /**
   * Initialize the object.
@@ -36,7 +36,7 @@ export class Action {
   * @param {String} name Name of the action
   * @param {unknown} input Any action inputs
   */
-  constructor(id: string, device: Device, name: string, input?: Input) {
+  constructor(id: string, device: Device, name: string, input?: Any) {
     this.id = id;
     this.device = device;
     this.name = name;
@@ -51,7 +51,7 @@ export class Action {
     return this.name;
   }
 
-  getInput(): Input | undefined {
+  getInput(): Any | undefined {
     return this.input;
   }
 

src/action.ts

@@ -20,9 +20,12 @@ import {PluginClient} from './plugin-client';
 import {Property} from './property';
 import {MessageType} from './message-type';
 import {EventEmitter} from 'events';
-import {AdapterPairingPromptNotificationMessageData, AdapterRemoveDeviceRequest,
+import {
+  AdapterPairingPromptNotificationMessageData,
+  AdapterRemoveDeviceRequest,
   AdapterStartPairingCommand,
   AdapterUnpairingPromptNotificationMessageData,
+  Any,
   APIHandlerAPIRequest,
   APIHandlerUnloadRequest,
   DeviceRemoveActionRequest,
@@ -39,8 +42,8 @@ import {AdapterPairingPromptNotificationMessageData, AdapterRemoveDeviceRequest,
   NotifierAddedNotification,
   OutletNotifyRequest,
   Preferences,
-  PropertyValue,
-  UserProfile} from './schema';
+  UserProfile,
+} from './schema';
 
 interface MockAdapter {
   clearState(): Promise<void>;
@@ -744,7 +747,7 @@ export class AddonManagerProxy extends EventEmitter {
    * @method sendPropertyChangedNotification
    * Sends a propertyChanged notification to the gateway.
    */
-  sendPropertyChangedNotification(property: Property<PropertyValue>): void {
+  sendPropertyChangedNotification(property: Property<Any>): void {
     this.pluginClient.sendNotification(
       MessageType.DEVICE_PROPERTY_CHANGED_NOTIFICATION,
       {

src/addon-manager-proxy.ts

@@ -15,12 +15,11 @@ import {Property} from './property';
 import {Event} from './event';
 import {
   Action as ActionSchema,
+  Any,
   Event as EventSchema,
   Device as DeviceSchema,
   Property as PropertySchema,
   Link,
-  Input,
-  PropertyValue,
 } from './schema';
 
 const ajv = new Ajv();
@@ -40,7 +39,7 @@ export class Device {
 
   private description = '';
 
-  private properties = new Map<string, Property<PropertyValue>>();
+  private properties = new Map<string, Property<Any>>();
 
   private actions = new Map<string, ActionSchema>();
 
@@ -218,19 +217,19 @@ export class Device {
     return propDescs;
   }
 
-  findProperty(propertyName: string): Property<PropertyValue> | undefined {
+  findProperty(propertyName: string): Property<Any> | undefined {
     return this.properties.get(propertyName);
   }
 
-  addProperty(property: Property<PropertyValue>): void {
+  addProperty(property: Property<Any>): void {
     this.properties.set(property.getName(), property);
   }
 
   /**
    * @method getProperty
    * @returns a promise which resolves to the retrieved value.
    */
-  getProperty(propertyName: string): Promise<PropertyValue> {
+  getProperty(propertyName: string): Promise<Any> {
     return new Promise((resolve, reject) => {
       const property = this.findProperty(propertyName);
       if (property) {
@@ -247,7 +246,7 @@ export class Device {
     return this.properties.has(propertyName);
   }
 
-  notifyPropertyChanged(property: Property<PropertyValue>): void {
+  notifyPropertyChanged(property: Property<Any>): void {
     this.adapter.getManager().sendPropertyChangedNotification(property);
   }
 
@@ -270,7 +269,7 @@ export class Device {
    * @note it is possible that the updated value doesn't match
    * the value passed in.
    */
-  setProperty(propertyName: string, value: PropertyValue): Promise<PropertyValue> {
+  setProperty(propertyName: string, value: Any): Promise<Any> {
     const property = this.findProperty(propertyName);
     if (property) {
       return property.setValue(value);
@@ -287,7 +286,7 @@ export class Device {
    * @method requestAction
    * @returns a promise which resolves when the action has been requested.
    */
-  requestAction(actionId: string, actionName: string, input: Input): Promise<void> {
+  requestAction(actionId: string, actionName: string, input: Any): Promise<void> {
     return new Promise((resolve, reject) => {
       if (!this.actions.has(actionName)) {
         reject(`Action "${actionName}" not found`);