hoffmation-base 3.2.1-alpha.0 → 3.2.1-alpha.10

package/lib/devices/velux/veluxShutter.d.ts

@@ -3,7 +3,6 @@ import { iShutter, iWindow } from '../../interfaces';
 import { ShutterSettings } from '../../settingsObjects';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ShutterSetLevelCommand } from '../../command';
-import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 export declare class VeluxShutter extends VeluxDevice implements iShutter {
     /** @inheritDoc */
     settings: ShutterSettings;
@@ -22,6 +21,5 @@ export declare class VeluxShutter extends VeluxDevice implements iShutter {
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     persist(): void;
     setLevel(command: ShutterSetLevelCommand): void;
-    toJSON(): Partial<IoBrokerBaseDevice>;
     private setCurrentLevel;
 }

package/lib/devices/velux/veluxShutter.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VeluxShutter = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const veluxDevice_1 = require("./veluxDevice");
 const settingsObjects_1 = require("../../settingsObjects");
 const enums_1 = require("../../enums");
@@ -21,6 +17,7 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;
+        this.jsonOmitKeys.push('_window');
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
         this._setLevelSwitchID = `${this.info.fullID}.targetPosition`;
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {
@@ -103,9 +100,6 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         // Level is inverted for Velux Adapter (100 = 0, 0 = 100, 25 = 75, etc.)
         this.setState(this._setLevelSwitchID, Math.abs(targetLevel - 100));
     }
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
-    }
     setCurrentLevel(value, initial = false) {
         let correctedValue = Math.abs(value - 100);
         if (correctedValue !== this._setLevel && utils_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {

package/lib/devices/victron/victron-device.js

@@ -135,7 +135,7 @@ class VictronDevice extends BaseDevice_1.BaseDevice {
                 injectingWattage: this.injectingWattage,
                 selfConsumingWattage: this.selfConsumingWattage,
             },
-            ...utils_1.Utils.jsonFilter(super.toJSON(), this.jsonOmitKeys),
+            ...super.toJSON(),
         };
     }
     /**

package/lib/interfaces/iJsonCustomPrepend.d.ts

@@ -0,0 +1,9 @@
+/**
+ * An object which defines certain keys to append to the JSON output
+ */
+export interface iJsonCustomPrepend {
+    /**
+     * List of keys to append
+     */
+    readonly customPrepend: () => Partial<unknown>;
+}

package/lib/interfaces/iJsonCustomPrepend.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/index.d.ts

@@ -16,6 +16,7 @@ export * from './iButtonCallback';
 export * from './iButtonCapabilities';
 export * from './iDeviceInfo';
 export * from './iIdHolder';
+export * from './iJsonCustomPrepend';
 export * from './iJsonOmitKeys';
 export * from './iLogSettings';
 export * from './iAsusConfig';

package/lib/interfaces/index.js

@@ -32,6 +32,7 @@ __exportStar(require("./iButtonCallback"), exports);
 __exportStar(require("./iButtonCapabilities"), exports);
 __exportStar(require("./iDeviceInfo"), exports);
 __exportStar(require("./iIdHolder"), exports);
+__exportStar(require("./iJsonCustomPrepend"), exports);
 __exportStar(require("./iJsonOmitKeys"), exports);
 __exportStar(require("./iLogSettings"), exports);
 __exportStar(require("./iAsusConfig"), exports);

package/lib/services/ac/ac-device.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const devices_1 = require("../../devices");
 const interfaces_1 = require("../../interfaces");
 const enums_1 = require("../../enums");
@@ -301,9 +297,9 @@ class AcDevice extends devices_1.RoomBaseDevice {
     /** @inheritDoc */
     toJSON() {
         // eslint-disable-next-line
-        const result = lodash_1.default.omit(super.toJSON(), ['room', '_room']);
+        const result = super.toJSON();
         result['on'] = this.on;
-        return utils_1.Utils.jsonFilter(result);
+        return result;
     }
 }
 exports.AcDevice = AcDevice;

package/lib/services/ac/own-daikin-device.d.ts

@@ -45,6 +45,4 @@ export declare class OwnDaikinDevice extends AcDevice {
      */
     private handleDeviceUnreach;
     private handleParamNg;
-    /** @inheritDoc */
-    toJSON(): Partial<OwnDaikinDevice>;
 }

package/lib/services/ac/own-daikin-device.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnDaikinDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const ac_device_1 = require("./ac-device");
 const daikin_controller_1 = require("daikin-controller");
 const enums_1 = require("../../enums");
@@ -35,6 +31,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         /** @inheritDoc */
         this.deviceType = enums_1.DeviceType.Daikin;
         this._on = false;
+        this.jsonOmitKeys.push('_device');
     }
     get device() {
         return this._device;
@@ -191,12 +188,5 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             }
         });
     }
-    /** @inheritDoc */
-    toJSON() {
-        // eslint-disable-next-line
-        const result = lodash_1.default.omit(super.toJSON(), ['device', '_device']);
-        result['on'] = this.on;
-        return utils_1.Utils.jsonFilter(result);
-    }
 }
 exports.OwnDaikinDevice = OwnDaikinDevice;