From 7cdd2d0192a5ae618fb36d9940258939b8a54b95 Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Fri, 24 Nov 2023 21:29:00 +0100 Subject: [PATCH 1/9] Rework device matching, Members in customData, Add AC Unit & Fan Signed-off-by: Michael Krug --- docs/USAGE.md | 89 +- functions/apihandler.js | 2 +- functions/commands/appselect.js | 6 +- functions/commands/armdisarm.js | 10 +- functions/commands/brightnessabsolute.js | 13 +- functions/commands/charge.js | 10 +- functions/commands/colorabsolute.js | 13 +- .../commands/colorabsolutetemperature.js | 20 +- functions/commands/default.js | 16 +- functions/commands/medianext.js | 11 +- functions/commands/mediapause.js | 11 +- functions/commands/mediaprevious.js | 11 +- functions/commands/mediaresume.js | 11 +- functions/commands/mute.js | 19 +- functions/commands/onoff.js | 28 +- functions/commands/selectchannel.js | 6 +- functions/commands/setfanspeed.js | 27 +- functions/commands/setfanspeedpercent.js | 23 - functions/commands/setinput.js | 11 +- functions/commands/setmodes.js | 45 + functions/commands/setvolume.js | 13 +- functions/commands/thermostatsetmode.js | 6 +- .../commands/thermostattemperaturesetpoint.js | 6 +- .../thermostattemperaturesetpointhigh.js | 6 +- .../thermostattemperaturesetpointlow.js | 7 +- functions/commands/volumerelative.js | 8 +- functions/devices/acunit.js | 41 + functions/devices/charger.js | 32 +- functions/devices/default.js | 36 +- functions/devices/dynamicmodesdevice.js | 79 + functions/devices/dynamicmodeslight.js | 9 + functions/devices/fan.js | 206 +- functions/devices/index.js | 2 +- functions/devices/modesdevice.js | 70 + functions/devices/modeslight.js | 9 + functions/devices/securitysystem.js | 29 +- functions/devices/sensor.js | 10 +- functions/devices/specialcolorlight.js | 49 +- functions/devices/temperaturesensor.js | 2 +- functions/devices/thermostat.js | 44 +- functions/devices/tv.js | 32 +- functions/openhab.js | 2 +- functions/package-lock.json | 430 +- package-lock.json | 5838 ++--------------- tests/apihandler.test.js | 2 +- tests/commands/appselect.test.js | 19 +- tests/commands/armdisarm.test.js | 82 +- tests/commands/brightnessabsolute.test.js | 30 +- tests/commands/charge.test.js | 25 +- tests/commands/colorabsolute.test.js | 34 +- .../commands/colorabsolutetemperature.test.js | 101 +- tests/commands/default.test.js | 52 +- tests/commands/medianext.test.js | 41 +- tests/commands/mediapause.test.js | 41 +- tests/commands/mediaprevious.test.js | 41 +- tests/commands/mediaresume.test.js | 41 +- tests/commands/mute.test.js | 84 +- tests/commands/onoff.test.js | 112 +- tests/commands/selectchannel.test.js | 19 +- tests/commands/setfanspeed.test.js | 56 +- tests/commands/setfanspeedpercent.test.js | 18 - tests/commands/setinput.test.js | 23 +- tests/commands/setmodes.test.js | 59 + tests/commands/setvolume.test.js | 28 +- tests/commands/thermostatsetmode.test.js | 21 +- .../thermostattemperaturesetpoint.test.js | 19 +- .../thermostattemperaturesetpointhigh.test.js | 19 +- .../thermostattemperaturesetpointlow.test.js | 19 +- tests/commands/volumerelative.test.js | 24 +- tests/devices/acunit.test.js | 251 + tests/devices/camera.test.js | 4 +- tests/devices/charger.test.js | 54 +- tests/devices/colorlight.test.js | 4 +- tests/devices/dimmablelight.test.js | 4 +- tests/devices/dynamicmodesdevice.test.js | 101 + tests/devices/dynamicmodeslight.test.js | 44 + tests/devices/fan.test.js | 420 +- tests/devices/lock.test.js | 4 +- tests/devices/modesdevice.test.js | 91 + tests/devices/modeslight.test.js | 32 + tests/devices/scene.test.js | 4 +- tests/devices/securitysystem.test.js | 43 +- tests/devices/sensor.test.js | 37 +- tests/devices/simplelight.test.js | 4 +- tests/devices/simplesecuritysystem.test.js | 4 +- tests/devices/speaker.test.js | 4 +- tests/devices/specialcolorlight.test.js | 146 +- tests/devices/switch.test.js | 4 +- tests/devices/temperaturesensor.test.js | 4 +- tests/devices/thermostat.test.js | 63 +- tests/devices/tv.test.js | 76 +- tests/devices/valve.test.js | 4 +- tests/openhab.test.js | 41 +- 93 files changed, 3149 insertions(+), 6652 deletions(-) delete mode 100644 functions/commands/setfanspeedpercent.js create mode 100644 functions/commands/setmodes.js create mode 100644 functions/devices/acunit.js create mode 100644 functions/devices/dynamicmodesdevice.js create mode 100644 functions/devices/dynamicmodeslight.js create mode 100644 functions/devices/modesdevice.js create mode 100644 functions/devices/modeslight.js delete mode 100644 tests/commands/setfanspeedpercent.test.js create mode 100644 tests/commands/setmodes.test.js create mode 100644 tests/devices/acunit.test.js create mode 100644 tests/devices/dynamicmodesdevice.test.js create mode 100644 tests/devices/dynamicmodeslight.test.js create mode 100644 tests/devices/modesdevice.test.js create mode 100644 tests/devices/modeslight.test.js diff --git a/docs/USAGE.md b/docs/USAGE.md index 0921e5b1..e1ceda2a 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -33,7 +33,7 @@ This documentation refers to release [v3.8.0](https://github.com/openhab/openhab ### v3.7.0 -- Adjusted [`Fan`](#fan-hood-airpurifier) to use `supportsFanSpeedPercent` option +- Adjusted [`Fan`](#fan-hood-airpurifier-only-onoff-or-fan-speed-control) to use `supportsFanSpeedPercent` option - Inverted `lightColorTemperature` percentage range when using `colorUnit="percent"` with [`SpecialColorLight`](#light-as-group-with-separate-controls) ### v3.6.0 @@ -308,7 +308,7 @@ Dimmer { ga="Speaker" [ volumeDefaultPercentage="50", levelStepSize="10", volume |---|---| | **Device Type** | [TV](https://developers.home.google.com/cloud-to-cloud/guides/tv) | | **Supported Traits** | [OnOff](https://developers.home.google.com/cloud-to-cloud/traits/onoff), [Volume](https://developers.home.google.com/cloud-to-cloud/traits/volume), [TransportControl](https://developers.home.google.com/cloud-to-cloud/traits/transportcontrol), [InputSelector](https://developers.home.google.com/cloud-to-cloud/traits/inputselector), [AppSelector](https://developers.home.google.com/cloud-to-cloud/traits/appselector), [Channel](https://developers.home.google.com/cloud-to-cloud/traits/channel) (depending on used members) | -| **Supported Items** | Group as `TV` with the following members:
(optional) Switch as `tvPower`
(optional) Switch as `tvMute`
(optional) Dimmer as `tvVolume`
(optional) String as `tvChannel`
(optional) String as `tvInput`
(optional) String as `tvApplication`
(optional) Player as `tvTransport` | +| **Supported Items** | Group as `TV` with the following members:
(optional) Switch as `tvPower`
(optional) Switch as `tvMute`
(optional) Dimmer or Number as `tvVolume`
(optional) String or Number as `tvChannel`
(optional) String or Number as `tvInput`
(optional) String or Number as `tvApplication`
(optional) Player as `tvTransport` | | **Configuration** | (optional) `checkState=true/false`
(optional) `volumeDefaultPercentage="20"`
(optional) `levelStepSize="5"`
(optional) `volumeMaxLevel="100"`
(optional) `transportControlSupportedCommands="NEXT,PREVIOUS,PAUSE,RESUME"`
(optional) `availableChannels="channelNumber=channelId=channelName:channelSynonym:...,..."`
(optional) `availableInputs="inputKey=inputName:inputSynonym:...,..."`
(optional) `availableApplications="applicationKey=applicationName:applicationSynonym:...,..."`
(optional) `lang="en"` | ```shell @@ -322,33 +322,86 @@ String applicationItem (tvGroup) { ga="tvApplication" } Player transportItem (tvGroup) { ga="tvTransport" } ``` -### Fan, Hood, AirPurifier +### Fan, Hood, AirPurifier (only on/off or fan speed control) | | | |---|---| | **Device Type** | [Fan](https://developers.home.google.com/cloud-to-cloud/guides/fan), [Hood](https://developers.home.google.com/cloud-to-cloud/guides/hood), [AirPurifier](https://developers.home.google.com/cloud-to-cloud/guides/airpurifier) | | **Supported Traits** | [OnOff](https://developers.home.google.com/cloud-to-cloud/traits/OnOff), [FanSpeed](https://developers.home.google.com/cloud-to-cloud/traits/fanspeed) (depending on used item type) | -| **Supported Items** | Switch (no speed control), Dimmer | -| **Configuration** | (optional) `checkState=true/false`
(optional) `speeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `lang="en"`
(optional) `ordered=true/false` | +| **Supported Items** | Switch (no speed control), Dimmer, Number | +| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `lang="en"`
(optional) `ordered=true/false` | Fans (and similar device types, like AirPurifier or Hood) support the `FanSpeed` trait. -If you do not specify the `speeds` option, Google will use and expect percentage values for the fan speed. +If you do not specify the `fanSpeeds` option, Google will use and expect percentage values for the fan speed. Otherwise, you will be able to set up and use human speakable modes, e.g. "fast" for 100% or "slow" for 25%. -`speeds` will be a comma-separated list of modes, where the mode value corresponds to the speed value to be passed to the device. The mode or value is followed by an equal sign to list different aliases separated by a colon sign. +`fanSpeeds` will be a comma-separated list of modes, where the mode value corresponds to the speed value to be passed to the device. The mode or value is followed by an equal sign to list different aliases separated by a colon sign. So in the example stated below both "high" and "two" would set the speed to 100%. -Some devices may expect a specific value instead of a percentage, like "1" or "2" as speed values. In this case, you can adjust the configuration and replace the percentage values with the values that the device expects. (e.g.: `speeds="0=away:zero,1=default:standard:one,2=high:two"`). +Some devices may expect a specific value instead of a percentage, like "1" or "2" as speed values. In this case, you can adjust the configuration and replace the percentage values with the values that the device expects. (e.g.: `fanSpeeds="0=away:zero,1=default:standard:one,2=high:two"`). You are also able to define the language of those aliases. The option `ordered` will tell the system that your list is ordered and you will then be able to also say "faster" or "slower" and Google will use the next or previous speed. ```shell -Dimmer { ga="Fan" [ speeds="0=away:zero,50=default:standard:one,100=high:two", lang="en", ordered=true ] } # Using specific percentage values for the speed +Dimmer { ga="Fan" [ fanSpeeds="0=away:zero,50=default:standard:one,100=high:two", lang="en", ordered=true ] } # Using specific percentage values for the speed Switch { ga="Hood" } # No speed control - only on/off Dimmer { ga="AirPurifier" } # Using percentage values for the speed -Dimmer { ga="AirPurifier" [ speeds="0=away:zero,1=low:one,2=medium:two,3=high:three,4=turbo:four", lang="en", ordered=true ] } # Using specific speed modes/values, which differ from percentage +Dimmer { ga="AirPurifier" [ fanSpeeds="0=away:zero,1=low:one,2=medium:two,3=high:three,4=turbo:four", lang="en", ordered=true ] } # Using specific speed modes/values, which differ from percentage Switch { ga="AirPurifier" } # No speed control - only on/off ``` +### Fan, Hood, AirPurifier (extended control options) + +| | | +|---|---| +| **Device Type** | [Fan](https://developers.google.com/assistant/smarthome/guides/fan), [Hood](https://developers.google.com/assistant/smarthome/guides/hood), [AirPurifier](https://developers.google.com/assistant/smarthome/guides/airpurifier) | +| **Supported Traits** | [OnOff](https://developers.google.com/assistant/smarthome/traits/OnOff), [FanSpeed](https://developers.google.com/assistant/smarthome/traits/fanspeed), [Modes](https://developers.google.com/assistant/smarthome/traits/modes), [SensorState](https://developers.google.com/assistant/smarthome/traits/sensorstate) | +| **Supported Items** | Group as `Fan`, `Hood` or `AirPurifier` with the following members:
(optional) Switch as `fanPower`
(optional) Dimmer or Number as `fanSpeed`
(optional) Number or String as `fanMode`
(optional) Number as `fanFilterLifeTime`
(optional) Number as `fanPM25` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `lang="en"`
(optional) `ordered=true/false` | + +When configuring a Fan (or similar device) as a group with the above listed members, you will gain more options to control the device. +In addition to control power and speeds, you will also be able to set modes and query sensor information (if supported by Google). + +For more information on the `fanSpeeds` configuration option, please have a look at the simple `Fan` device type. + +With the `fanModeName` and `fanModeSettings` you can control specific modes. Currently, one mode type per device is supported that you can configure with a name and a list of settings. The first entry in the names field is used internally while any other following separated by comma will be a synonym to be used in commands. The settings list is a comma-separated list of `value=name` pairs. The name can also contain synonyms separated by a colon. In the listed example you could then say "Set OperationMode to Normal". + +_Hint:_ At the moment, sensor values will only be queriable by voice and will not show up anywhere in the Google Home app. + +```shell +Group fanGroup { ga="Fan" [ fanSpeeds="0=away:zero,50=default:standard:one,100=high:two", fanModeName="OperationMode,Modus", fanModeSettings="1=Silent,2=Normal,3=Night", lang="en", ordered=true ] } +Switch powerItem (fanGroup) { ga="fanPower" } +Dimmer speedItem (fanGroup) { ga="fanSpeed" } +String modeItem (fanGroup) { ga="fanMode" } +Number lifetimeItem (fanGroup) { ga="fanFilterLifeTime" } +Number pm25Item (fanGroup) { ga="fanPM25" } +``` + +### AC_Unit + +| | | +|---|---| +| **Device Type** | [AC_Unit](https://developers.google.com/assistant/smarthome/guides/acunit) | +| **Supported Traits** | [OnOff](https://developers.google.com/assistant/smarthome/traits/OnOff), [FanSpeed](https://developers.google.com/assistant/smarthome/traits/fanspeed), [TemperatureSetting](https://developers.google.com/assistant/smarthome/traits/temperaturesetting), [Modes](https://developers.google.com/assistant/smarthome/traits/modes), [SensorState](https://developers.google.com/assistant/smarthome/traits/sensorstate) | +| **Supported Items** | Group as `AC_Unit` with the following members:
(optional) Switch as `fanPower`
(optional) Dimmer or Number as `fanSpeed`
(optional) Number or String as `fanMode`
(optional) Number as `fanFilterLifeTime`
(optional) Number as `fanPM25`
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `useFahrenheit=true/false`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"`
(optional) `lang="en"`
(optional) `ordered=true/false` | + +The AC_Unit device is basically the combination of the Fan and the Thermostat device. For explanation on configuration options please have a look at both of them. + +```shell +Group acunitGroup { ga="AC_Unit" [ fanSpeeds="0=null:off,50=slow,100=full:fast", fanModeName="OperationMode,Modus", fanModeSettings="1=Silent,2=Normal,3=Night", thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto", thermostatTemperatureRange="10,30", useFahrenheit=false, lang="en", ordered=true ] } +Switch powerItem (acunitGroup) { ga="fanPower" } +Dimmer speedItem (acunitGroup) { ga="fanSpeed" } +String modeItem (acunitGroup) { ga="fanMode" } +Number lifetimeItem (acunitGroup) { ga="fanFilterLifeTime" } +Number pm25Item (acunitGroup) { ga="fanPM25" } +Number ambientItem (acunitGroup) { ga="thermostatTemperatureAmbient" } +Number humidityItem (acunitGroup) { ga="thermostatHumidityAmbient" } +Number setpointItem (acunitGroup) { ga="thermostatTemperatureSetpoint" } +Number setpointItemLow (acunitGroup) { ga="thermostatTemperatureSetpointLow" } +Number setpointItemHigh (acunitGroup) { ga="thermostatTemperatureSetpointHigh" } +String modeItem (acunitGroup) { ga="thermostatMode" } +``` + ### Awning, Blinds, Curtain, Door, Garage, Gate, Pergola, Shutter, Window | | | @@ -409,6 +462,8 @@ Number capacityFullItem (chargerGroup) { ga="chargerCapacityUntilFull" } | **Supported Items** | Number | | **Configuration** | (optional) `useFahrenheit=true/false` | +_Hint:_ At the moment, sensor values will only be queriable by voice and will not show up anywhere in the Google Home app. + ```shell Number { ga="TemperatureSensor" [ useFahrenheit=true ] } ``` @@ -446,8 +501,8 @@ Number humidityItem (sensorGroup) { ga="humidityAmbient" } |---|---| | **Device Type** | [Thermostat](https://developers.home.google.com/cloud-to-cloud/guides/thermostat) | | **Supported Traits** | [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | -| **Supported Items** | Group as `Thermostat` with the following members:
String or Number as `thermostatMode`
(optional) Number as `thermostatHumidityAmbient`
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh` | -| **Configuration** | (optional) `checkState=true/false`
(optional) `useFahrenheit=true/false`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `modes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"` | +| **Supported Items** | Group as `Thermostat` with the following members
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `useFahrenheit=true/false`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"` | Thermostat requires a group of items to be properly configured to be used with Google Assistant. The default temperature unit is Celsius. To change the temperature unit to Fahrenheit, add the config option `useFahrenheit=true` to the thermostat group. @@ -456,16 +511,16 @@ If your thermostat supports a range for the setpoint you can use both `thermosta If your thermostat does not have a mode, you should create one and manually assign a value (e.g. heat, cool, on, etc.) to have proper functionality. -To map the [default thermostat modes of Google](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting.html) (on, off, heat, cool, etc.) to custom ones for your specific setup, you can use the `modes` config option on the thermostat group. -E.g. `[ modes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto" ]` will enable the following five modes in Google Home `"off, heat, eco, on, auto"` that will be translated to `"OFF, COMFORT, ECO, ON, auto"`. You can specify alternative conversions using the colon sign, so that in the former example "BOOST" in openHAB would also be translated to "heat" in Google. For the translation of Google modes to openHAB always the first option after the equal sign is used. -By default the integration will provide `"off,heat,cool,on,heatcool,auto,eco"`. +To map the [default thermostat modes of Google](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting.html) (on, off, heat, cool, etc.) to custom ones for your specific setup, you can use the `thermostatModes` config option on the thermostat group. +E.g. `[ thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto" ]` will enable the following five modes in Google Home `"off, heat, eco, on, auto"` that will be translated to `"OFF, COMFORT, ECO, ON, auto"`. You can specify alternative conversions using the colon sign, so that in the former example "BOOST" in openHAB would also be translated to "heat" in Google. For the translation of Google modes to openHAB always the first option after the equal sign is used. +By default, the integration will provide `"off,heat,cool,on,heatcool,auto,eco"`. You can also set up a Thermostat for using it as a temperature sensor. To do so, create a Thermostat group and only add one item member as "thermostatTemperatureAmbient". However, it is recommended to prefer the `TemperatureSensor` type for simple temperature reports (but currently there is no UI support in Google Home). ```shell -Group thermostatGroup { ga="Thermostat" [ modes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto", thermostatTemperatureRange="10,30", useFahrenheit=false ] } -Number temperatureItem (thermostatGroup) { ga="thermostatTemperatureAmbient" } +Group thermostatGroup { ga="Thermostat" [ thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto", thermostatTemperatureRange="10,30", useFahrenheit=false ] } +Number ambientItem (thermostatGroup) { ga="thermostatTemperatureAmbient" } Number humidityItem (thermostatGroup) { ga="thermostatHumidityAmbient" } Number setpointItem (thermostatGroup) { ga="thermostatTemperatureSetpoint" } Number setpointItemLow (thermostatGroup) { ga="thermostatTemperatureSetpointLow" } diff --git a/functions/apihandler.js b/functions/apihandler.js index 79393421..1d784ec1 100644 --- a/functions/apihandler.js +++ b/functions/apihandler.js @@ -133,7 +133,7 @@ class ApiHandler { reject({ statusCode: response.statusCode, message: 'sendCommand - failed for path: ' + options.path }); return; } - resolve(null); + resolve(true); }); req.on('error', (error) => { console.error(`openhabGoogleAssistant - sendCommand: ERROR ${JSON.stringify(error)}`); diff --git a/functions/commands/appselect.js b/functions/commands/appselect.js index 19b97029..e0e6efdc 100644 --- a/functions/commands/appselect.js +++ b/functions/commands/appselect.js @@ -17,10 +17,10 @@ class AppSelect extends DefaultCommand { return true; } - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvApplication' in members) { - return members.tvApplication.name; + return members.tvApplication; } throw { statusCode: 400 }; } diff --git a/functions/commands/armdisarm.js b/functions/commands/armdisarm.js index 5bcae2c4..dd132c6d 100644 --- a/functions/commands/armdisarm.js +++ b/functions/commands/armdisarm.js @@ -21,21 +21,21 @@ class ArmDisarm extends DefaultCommand { return arm ? 'ON' : 'OFF'; } - static getItemName(item, device, params) { + static getItemName(device, params) { if (this.getDeviceType(device) === 'SecuritySystem') { - const members = SecuritySystem.getMembers(item); + const members = this.getMembers(device); if (params.armLevel) { if (SecuritySystem.armLevelMemberName in members) { - return members[SecuritySystem.armLevelMemberName].name; + return members[SecuritySystem.armLevelMemberName]; } throw { statusCode: 400 }; } if (SecuritySystem.armedMemberName in members) { - return members[SecuritySystem.armedMemberName].name; + return members[SecuritySystem.armedMemberName]; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static requiresItem() { diff --git a/functions/commands/brightnessabsolute.js b/functions/commands/brightnessabsolute.js index fa0da7d4..0c558310 100644 --- a/functions/commands/brightnessabsolute.js +++ b/functions/commands/brightnessabsolute.js @@ -1,5 +1,4 @@ const DefaultCommand = require('./default.js'); -const SpecialColorLight = require('../devices/specialcolorlight.js'); class BrightnessAbsolute extends DefaultCommand { static get type() { @@ -10,19 +9,15 @@ class BrightnessAbsolute extends DefaultCommand { return 'brightness' in params && typeof params.brightness === 'number'; } - static requiresItem(device) { - return this.getDeviceType(device) === 'SpecialColorLight'; - } - - static getItemName(item, device) { + static getItemName(device) { if (this.getDeviceType(device) === 'SpecialColorLight') { - const members = SpecialColorLight.getMembers(item); + const members = this.getMembers(device); if ('lightBrightness' in members) { - return members.lightBrightness.name; + return members.lightBrightness; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params) { diff --git a/functions/commands/charge.js b/functions/commands/charge.js index 12477009..231b9330 100644 --- a/functions/commands/charge.js +++ b/functions/commands/charge.js @@ -10,14 +10,10 @@ class Charge extends DefaultCommand { return 'charge' in params && typeof params.charge === 'boolean'; } - static requiresItem() { - return true; - } - - static getItemName(item) { - const members = Charger.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('chargerCharging' in members) { - return members.chargerCharging.name; + return members.chargerCharging; } throw { statusCode: 400 }; } diff --git a/functions/commands/colorabsolute.js b/functions/commands/colorabsolute.js index a07c79bd..79987774 100644 --- a/functions/commands/colorabsolute.js +++ b/functions/commands/colorabsolute.js @@ -1,5 +1,4 @@ const DefaultCommand = require('./default.js'); -const SpecialColorLight = require('../devices/specialcolorlight.js'); class ColorAbsolute extends DefaultCommand { static get type() { @@ -15,19 +14,15 @@ class ColorAbsolute extends DefaultCommand { ); } - static requiresItem(device) { - return this.getDeviceType(device) === 'SpecialColorLight'; - } - - static getItemName(item, device) { + static getItemName(device) { if (this.getDeviceType(device) === 'SpecialColorLight') { - const members = SpecialColorLight.getMembers(item); + const members = this.getMembers(device); if ('lightColor' in members) { - return members.lightColor.name; + return members.lightColor; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params, _, device) { diff --git a/functions/commands/colorabsolutetemperature.js b/functions/commands/colorabsolutetemperature.js index db63e6ef..0063dfc0 100644 --- a/functions/commands/colorabsolutetemperature.js +++ b/functions/commands/colorabsolutetemperature.js @@ -1,5 +1,4 @@ const DefaultCommand = require('./default.js'); -const SpecialColorLight = require('../devices/specialcolorlight.js'); const { convertMired, convertRgbToHsv, convertKelvinToRgb } = require('../utilities.js'); class ColorAbsoluteTemperature extends DefaultCommand { @@ -16,34 +15,35 @@ class ColorAbsoluteTemperature extends DefaultCommand { ); } - static requiresItem() { - return true; + static requiresItem(device) { + return this.getDeviceType(device) !== 'SpecialColorLight'; } - static getItemName(item, device) { + static getItemName(device) { if (this.getDeviceType(device) === 'SpecialColorLight') { - const members = SpecialColorLight.getMembers(item); + const members = this.getMembers(device); if ('lightColorTemperature' in members) { - return members.lightColorTemperature.name; + return members.lightColorTemperature; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params, item, device) { if (this.getDeviceType(device) === 'SpecialColorLight') { try { - const colorUnit = SpecialColorLight.getColorUnit(item); + const customData = device.customData || {}; + const colorUnit = customData.colorUnit; if (colorUnit === 'kelvin') { return params.color.temperature.toString(); } if (colorUnit === 'mired') { return convertMired(params.color.temperature).toString(); } - const { temperatureMinK, temperatureMaxK } = SpecialColorLight.getAttributes(item).colorTemperatureRange; + const { temperatureMinK, temperatureMaxK } = customData.colorTemperatureRange; let percent = ((params.color.temperature - temperatureMinK) / (temperatureMaxK - temperatureMinK)) * 100; - if (SpecialColorLight.getColorTemperatureInverted(item)) { + if (customData.colorTemperatureInverted) { percent = 100 - percent; } return percent.toString(); diff --git a/functions/commands/default.js b/functions/commands/default.js index 9344e821..6726b64a 100644 --- a/functions/commands/default.js +++ b/functions/commands/default.js @@ -79,12 +79,11 @@ class DefaultCommand { } /** - * @param {object} item * @param {object} device * @param {object} params */ - static getItemName(item, device, params) { - return item.name; + static getItemName(device, params) { + return device.id; } /** @@ -101,6 +100,13 @@ class DefaultCommand { return (device.customData && device.customData.itemType) || ''; } + /** + * @param {object} device + */ + static getMembers(device) { + return (device.customData && device.customData.members) || {}; + } + /** * @param {object} device */ @@ -179,7 +185,7 @@ class DefaultCommand { console.log(`openhabGoogleAssistant - ${this.type}: Waiting ${secondsToWait} second(s) for state to update`); setTimeout(() => { console.log(`openhabGoogleAssistant - ${this.type}: Finished Waiting`); - resolve(null); + resolve(true); }, secondsToWait * 1000); }); } @@ -236,7 +242,7 @@ class DefaultCommand { return getItemPromise .then((item) => { - const targetItem = this.getItemName(item, device, params); + const targetItem = this.getItemName(device, params); const targetValue = this.convertParamsToValue(params, item, device); if (shouldCheckState) { let currentState = this.getNormalizedState(item); diff --git a/functions/commands/medianext.js b/functions/commands/medianext.js index 8d66943b..0abe75c0 100644 --- a/functions/commands/medianext.js +++ b/functions/commands/medianext.js @@ -1,19 +1,14 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class MediaNext extends DefaultCommand { static get type() { return 'action.devices.commands.mediaNext'; } - static requiresItem() { - return true; - } - - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvTransport' in members) { - return members.tvTransport.name; + return members.tvTransport; } throw { statusCode: 400 }; } diff --git a/functions/commands/mediapause.js b/functions/commands/mediapause.js index b97b5dce..2c91e9fb 100644 --- a/functions/commands/mediapause.js +++ b/functions/commands/mediapause.js @@ -1,19 +1,14 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class MediaPause extends DefaultCommand { static get type() { return 'action.devices.commands.mediaPause'; } - static requiresItem() { - return true; - } - - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvTransport' in members) { - return members.tvTransport.name; + return members.tvTransport; } throw { statusCode: 400 }; } diff --git a/functions/commands/mediaprevious.js b/functions/commands/mediaprevious.js index edf54cbd..295648f2 100644 --- a/functions/commands/mediaprevious.js +++ b/functions/commands/mediaprevious.js @@ -1,19 +1,14 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class MediaPrevious extends DefaultCommand { static get type() { return 'action.devices.commands.mediaPrevious'; } - static requiresItem() { - return true; - } - - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvTransport' in members) { - return members.tvTransport.name; + return members.tvTransport; } throw { statusCode: 400 }; } diff --git a/functions/commands/mediaresume.js b/functions/commands/mediaresume.js index 74ad0a6b..fc490aee 100644 --- a/functions/commands/mediaresume.js +++ b/functions/commands/mediaresume.js @@ -1,19 +1,14 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class MediaResume extends DefaultCommand { static get type() { return 'action.devices.commands.mediaResume'; } - static requiresItem() { - return true; - } - - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvTransport' in members) { - return members.tvTransport.name; + return members.tvTransport; } throw { statusCode: 400 }; } diff --git a/functions/commands/mute.js b/functions/commands/mute.js index 7f1ea0f1..077f6191 100644 --- a/functions/commands/mute.js +++ b/functions/commands/mute.js @@ -1,5 +1,4 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class Mute extends DefaultCommand { static get type() { @@ -10,32 +9,26 @@ class Mute extends DefaultCommand { return 'mute' in params && typeof params.mute === 'boolean'; } - static requiresItem(device) { - return this.getDeviceType(device) === 'TV'; - } - - static getItemName(item, device) { + static getItemName(device) { if (this.getDeviceType(device) === 'TV') { - const members = TV.getMembers(item); + const members = this.getMembers(device); if ('tvMute' in members) { - return members.tvMute.name; + return members.tvMute; } if ('tvVolume' in members) { - return members.tvVolume.name; + return members.tvVolume; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params, item, device) { let itemType = this.getItemType(device); if (this.getDeviceType(device) === 'TV') { - const members = TV.getMembers(item); + const members = this.getMembers(device); if ('tvMute' in members) { itemType = 'Switch'; - } else if ('tvVolume' in members) { - itemType = 'Dimmer'; } } let mute = params.mute; diff --git a/functions/commands/onoff.js b/functions/commands/onoff.js index 135b6aba..0cb54e8e 100644 --- a/functions/commands/onoff.js +++ b/functions/commands/onoff.js @@ -1,6 +1,4 @@ const DefaultCommand = require('./default.js'); -const SpecialColorLight = require('../devices/specialcolorlight.js'); -const TV = require('../devices/tv.js'); class OnOff extends DefaultCommand { static get type() { @@ -11,30 +9,34 @@ class OnOff extends DefaultCommand { return 'on' in params && typeof params.on === 'boolean'; } - static requiresItem(device) { - return ['SpecialColorLight', 'TV'].includes(this.getDeviceType(device)); - } - - static getItemName(item, device) { + static getItemName(device) { const deviceType = this.getDeviceType(device); + if (deviceType.startsWith('DynamicModes')) { + throw { statusCode: 400 }; + } + const members = this.getMembers(device); if (deviceType === 'SpecialColorLight') { - const members = SpecialColorLight.getMembers(item); if ('lightPower' in members) { - return members.lightPower.name; + return members.lightPower; } if ('lightBrightness' in members) { - return members.lightBrightness.name; + return members.lightBrightness; } throw { statusCode: 400 }; } if (deviceType === 'TV') { - const members = TV.getMembers(item); if ('tvPower' in members) { - return members.tvPower.name; + return members.tvPower; + } + throw { statusCode: 400 }; + } + if (['AirPurifier', 'Fan', 'Hood', 'ACUnit'].includes(deviceType) && this.getItemType(device) === 'Group') { + if ('fanPower' in members) { + return members.fanPower; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params, _, device) { diff --git a/functions/commands/selectchannel.js b/functions/commands/selectchannel.js index ae1bf0df..5e7f307d 100644 --- a/functions/commands/selectchannel.js +++ b/functions/commands/selectchannel.js @@ -18,10 +18,10 @@ class SelectChannel extends DefaultCommand { return true; } - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvChannel' in members) { - return members.tvChannel.name; + return members.tvChannel; } throw { statusCode: 400 }; } diff --git a/functions/commands/setfanspeed.js b/functions/commands/setfanspeed.js index b45df871..5f1dfc50 100644 --- a/functions/commands/setfanspeed.js +++ b/functions/commands/setfanspeed.js @@ -6,17 +6,36 @@ class SetFanSpeed extends DefaultCommand { } static validateParams(params) { - return 'fanSpeed' in params && typeof params.fanSpeed === 'string'; + return ( + ('fanSpeed' in params && typeof params.fanSpeed === 'string') || + ('fanSpeedPercent' in params && typeof params.fanSpeedPercent === 'number') + ); + } + + static getItemName(device) { + const deviceType = this.getDeviceType(device); + if (['AirPurifier', 'Fan', 'Hood', 'ACUnit'].includes(deviceType) && this.getItemType(device) === 'Group') { + const members = this.getMembers(device); + if ('fanSpeed' in members) { + return members.fanSpeed; + } + throw { statusCode: 400 }; + } + return device.id; } static convertParamsToValue(params) { - return params.fanSpeed.toString(); + return (params.fanSpeed || params.fanSpeedPercent).toString(); } static getResponseStates(params) { - return { - currentFanSpeedSetting: params.fanSpeed + const states = { + currentFanSpeedPercent: params.fanSpeedPercent || Number(params.fanSpeed) }; + if ('fanSpeed' in params) { + states.currentFanSpeedSetting = params.fanSpeed; + } + return states; } } diff --git a/functions/commands/setfanspeedpercent.js b/functions/commands/setfanspeedpercent.js deleted file mode 100644 index f100ed7e..00000000 --- a/functions/commands/setfanspeedpercent.js +++ /dev/null @@ -1,23 +0,0 @@ -const DefaultCommand = require('./default.js'); - -class SetFanSpeedPercent extends DefaultCommand { - static get type() { - return 'action.devices.commands.SetFanSpeed'; - } - - static validateParams(params) { - return 'fanSpeedPercent' in params && typeof params.fanSpeedPercent === 'number'; - } - - static convertParamsToValue(params) { - return params.fanSpeedPercent.toString(); - } - - static getResponseStates(params) { - return { - currentFanSpeedPercent: params.fanSpeedPercent - }; - } -} - -module.exports = SetFanSpeedPercent; diff --git a/functions/commands/setinput.js b/functions/commands/setinput.js index 7459dd3f..db9f2a62 100644 --- a/functions/commands/setinput.js +++ b/functions/commands/setinput.js @@ -1,5 +1,4 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class SetInput extends DefaultCommand { static get type() { @@ -10,14 +9,10 @@ class SetInput extends DefaultCommand { return 'newInput' in params && typeof params.newInput === 'string'; } - static requiresItem() { - return true; - } - - static getItemName(item) { - const members = TV.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('tvInput' in members) { - return members.tvInput.name; + return members.tvInput; } throw { statusCode: 400 }; } diff --git a/functions/commands/setmodes.js b/functions/commands/setmodes.js new file mode 100644 index 00000000..79a57932 --- /dev/null +++ b/functions/commands/setmodes.js @@ -0,0 +1,45 @@ +const DefaultCommand = require('./default.js'); + +class SetModes extends DefaultCommand { + static get type() { + return 'action.devices.commands.SetModes'; + } + + static validateParams(params) { + return 'updateModeSettings' in params && typeof params.updateModeSettings === 'object'; + } + + static getItemName(device) { + const deviceType = this.getDeviceType(device); + const members = this.getMembers(device); + if (deviceType.startsWith('DynamicModes')) { + if ('modesCurrentMode' in members) { + return members.modesCurrentMode; + } + throw { statusCode: 400 }; + } + if (['AirPurifier', 'Fan', 'Hood', 'ACUnit'].includes(deviceType)) { + if ('fanMode' in members) { + return members.fanMode; + } + throw { statusCode: 400 }; + } + return device.id; + } + + static convertParamsToValue(params) { + const mode = Object.keys(params.updateModeSettings)[0]; + return params.updateModeSettings[mode].toString(); + } + + static getResponseStates(params) { + const mode = Object.keys(params.updateModeSettings)[0]; + return { + currentModeSettings: { + [mode]: params.updateModeSettings[mode] + } + }; + } +} + +module.exports = SetModes; diff --git a/functions/commands/setvolume.js b/functions/commands/setvolume.js index bc95ce29..a01daf95 100644 --- a/functions/commands/setvolume.js +++ b/functions/commands/setvolume.js @@ -1,5 +1,4 @@ const DefaultCommand = require('./default.js'); -const TV = require('../devices/tv.js'); class SetVolume extends DefaultCommand { static get type() { @@ -10,19 +9,15 @@ class SetVolume extends DefaultCommand { return 'volumeLevel' in params && typeof params.volumeLevel === 'number'; } - static requiresItem(device) { - return this.getDeviceType(device) === 'TV'; - } - - static getItemName(item, device) { + static getItemName(device) { if (this.getDeviceType(device) === 'TV') { - const members = TV.getMembers(item); + const members = this.getMembers(device); if ('tvVolume' in members) { - return members.tvVolume.name; + return members.tvVolume; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params) { diff --git a/functions/commands/thermostatsetmode.js b/functions/commands/thermostatsetmode.js index 13675617..6f429973 100644 --- a/functions/commands/thermostatsetmode.js +++ b/functions/commands/thermostatsetmode.js @@ -14,10 +14,10 @@ class ThermostatSetMode extends DefaultCommand { return true; } - static getItemName(item) { - const members = Thermostat.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('thermostatMode' in members) { - return members.thermostatMode.name; + return members.thermostatMode; } throw { statusCode: 400 }; } diff --git a/functions/commands/thermostattemperaturesetpoint.js b/functions/commands/thermostattemperaturesetpoint.js index ffff3131..22ea70d0 100644 --- a/functions/commands/thermostattemperaturesetpoint.js +++ b/functions/commands/thermostattemperaturesetpoint.js @@ -15,10 +15,10 @@ class ThermostatTemperatureSetpoint extends DefaultCommand { return true; } - static getItemName(item) { - const members = Thermostat.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('thermostatTemperatureSetpoint' in members) { - return members.thermostatTemperatureSetpoint.name; + return members.thermostatTemperatureSetpoint; } throw { statusCode: 400 }; } diff --git a/functions/commands/thermostattemperaturesetpointhigh.js b/functions/commands/thermostattemperaturesetpointhigh.js index 610563e8..4f35769d 100644 --- a/functions/commands/thermostattemperaturesetpointhigh.js +++ b/functions/commands/thermostattemperaturesetpointhigh.js @@ -17,10 +17,10 @@ class ThermostatTemperatureSetpointHigh extends DefaultCommand { return true; } - static getItemName(item) { - const members = Thermostat.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('thermostatTemperatureSetpointHigh' in members) { - return members.thermostatTemperatureSetpointHigh.name; + return members.thermostatTemperatureSetpointHigh; } throw { statusCode: 400 }; } diff --git a/functions/commands/thermostattemperaturesetpointlow.js b/functions/commands/thermostattemperaturesetpointlow.js index cb36a7a7..7779c6ac 100644 --- a/functions/commands/thermostattemperaturesetpointlow.js +++ b/functions/commands/thermostattemperaturesetpointlow.js @@ -14,11 +14,10 @@ class ThermostatTemperatureSetpointLow extends DefaultCommand { static requiresItem() { return true; } - - static getItemName(item) { - const members = Thermostat.getMembers(item); + static getItemName(device) { + const members = this.getMembers(device); if ('thermostatTemperatureSetpointLow' in members) { - return members.thermostatTemperatureSetpointLow.name; + return members.thermostatTemperatureSetpointLow; } throw { statusCode: 400 }; } diff --git a/functions/commands/volumerelative.js b/functions/commands/volumerelative.js index 57a61b9c..62ed97f4 100644 --- a/functions/commands/volumerelative.js +++ b/functions/commands/volumerelative.js @@ -14,15 +14,15 @@ class VolumeRelative extends DefaultCommand { return true; } - static getItemName(item, device) { + static getItemName(device) { if (this.getDeviceType(device) === 'TV') { - const members = TV.getMembers(item); + const members = this.getMembers(device); if ('tvVolume' in members) { - return members.tvVolume.name; + return members.tvVolume; } throw { statusCode: 400 }; } - return item.name; + return device.id; } static convertParamsToValue(params, item, device) { diff --git a/functions/devices/acunit.js b/functions/devices/acunit.js new file mode 100644 index 00000000..8fb1b572 --- /dev/null +++ b/functions/devices/acunit.js @@ -0,0 +1,41 @@ +const DefaultDevice = require('./default.js'); +const Fan = require('./fan'); +const Thermostat = require('./thermostat'); + +class ACUnit extends DefaultDevice { + static get type() { + return 'action.devices.types.AC_UNIT'; + } + + static getTraits(item) { + return [...Fan.getTraits(item), ...Thermostat.getTraits()]; + } + + static get requiredItemTypes() { + return ['Group']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && Object.keys(this.getMembers(item)).length > 0; + } + + static getAttributes(item) { + return { + ...Fan.getAttributes(item), + ...Thermostat.getAttributes(item) + }; + } + + static getState(item) { + return { + ...Fan.getState(item), + ...Thermostat.getState(item) + }; + } + + static get supportedMembers() { + return [...Fan.supportedMembers, ...Thermostat.supportedMembers]; + } +} + +module.exports = ACUnit; diff --git a/functions/devices/charger.js b/functions/devices/charger.js index dd60a751..95c481d4 100644 --- a/functions/devices/charger.js +++ b/functions/devices/charger.js @@ -9,8 +9,12 @@ class Charger extends DefaultDevice { return ['action.devices.traits.EnergyStorage']; } - static matchesItemType(item) { - return item.type === 'Group' && Object.keys(this.getMembers(item)).length > 0; + static get requiredItemTypes() { + return ['Group']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && Object.keys(this.getMembers(item)).length > 0; } static getAttributes(item) { @@ -74,25 +78,13 @@ class Charger extends DefaultDevice { return state; } - static getMembers(item) { - const supportedMembers = [ - 'chargerCharging', - 'chargerPluggedIn', - 'chargerCapacityRemaining', - 'chargerCapacityUntilFull' + static get supportedMembers() { + return [ + { name: 'chargerCharging', types: ['Switch'] }, + { name: 'chargerPluggedIn', types: ['Switch'] }, + { name: 'chargerCapacityRemaining', types: ['Number', 'Dimmer'] }, + { name: 'chargerCapacityUntilFull', types: ['Number', 'Dimmer'] } ]; - const members = {}; - if (item.members && item.members.length) { - item.members.forEach((member) => { - if (member.metadata && member.metadata.ga) { - const memberType = supportedMembers.find((m) => member.metadata.ga.value.toLowerCase() === m.toLowerCase()); - if (memberType) { - members[memberType] = { name: member.name, state: member.state }; - } - } - }); - } - return members; } } diff --git a/functions/devices/default.js b/functions/devices/default.js index 96de4001..082b0242 100644 --- a/functions/devices/default.js +++ b/functions/devices/default.js @@ -25,8 +25,8 @@ class DefaultDevice { * @param {object} item * @returns {boolean} */ - static isCompatible(item) { - return ( + static matchesDeviceType(item) { + return !!( item.metadata && item.metadata.ga && this.type.toLowerCase() === `action.devices.types.${item.metadata.ga.value}`.toLowerCase() @@ -37,7 +37,7 @@ class DefaultDevice { * @param {object} item */ static matchesItemType(item) { - return ( + return !!( !this.requiredItemTypes.length || this.requiredItemTypes.includes((item.groupType || item.type || '').split(':')[0]) ); @@ -111,6 +111,13 @@ class DefaultDevice { if (config.waitForStateChange) { metadata.customData.waitForStateChange = parseInt(config.waitForStateChange); } + if (this.supportedMembers.length) { + const members = this.getMembers(item); + metadata.customData.members = {}; + for (const member in members) { + metadata.customData.members[member] = members[member].name; + } + } return metadata; } @@ -120,6 +127,29 @@ class DefaultDevice { static getState(item) { return {}; } + + static get supportedMembers() { + return []; + } + + static getMembers(item) { + const supportedMembers = this.supportedMembers; + const members = {}; + if (item.members && item.members.length) { + item.members.forEach((member) => { + if (member.metadata && member.metadata.ga) { + const memberType = supportedMembers.find((m) => { + const memberType = (member.groupType || member.type || '').split(':')[0]; + return m.types.includes(memberType) && member.metadata.ga.value.toLowerCase() === m.name.toLowerCase(); + }); + if (memberType) { + members[memberType.name] = { name: member.name, state: member.state }; + } + } + }); + } + return members; + } } module.exports = DefaultDevice; diff --git a/functions/devices/dynamicmodesdevice.js b/functions/devices/dynamicmodesdevice.js new file mode 100644 index 00000000..4fbaf46c --- /dev/null +++ b/functions/devices/dynamicmodesdevice.js @@ -0,0 +1,79 @@ +const DefaultDevice = require('./default.js'); + +class DynamicModesDevice extends DefaultDevice { + static getTraits() { + return ['action.devices.traits.Modes']; + } + + static get requiredItemTypes() { + return ['Group']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && !!this.getAttributes(item).availableModes; + } + + static getAttributes(item) { + const config = this.getConfig(item); + const members = this.getMembers(item); + if (!config.mode || !('modesSettings' in members) || !members.modesSettings.state.includes('=')) { + return {}; + } + const modeNames = config.mode.split(',').map((s) => s.trim()); + const attributes = { + availableModes: [ + { + name: modeNames[0], + name_values: [ + { + name_synonym: modeNames, + lang: config.lang || 'en' + } + ], + settings: [], + ordered: config.ordered === true + } + ] + }; + members.modesSettings.state.split(',').forEach((setting) => { + try { + const [settingName, settingSynonyms] = setting + .trim() + .split('=') + .map((s) => s.trim()); + attributes.availableModes[0].settings.push({ + setting_name: settingName, + setting_values: [ + { + setting_synonym: [settingName].concat(settingSynonyms.split(':').map((s) => s.trim())), + lang: config.lang || 'en' + } + ] + }); + } catch {} + }); + return attributes; + } + + static getState(item) { + const config = this.getConfig(item); + const members = this.getMembers(item); + const state = {}; + if (config.mode && 'modesCurrentMode' in members) { + const modeNames = config.mode.split(',').map((s) => s.trim()); + state.currentModeSettings = { + [modeNames[0]]: members.modesCurrentMode.state + }; + } + return state; + } + + static get supportedMembers() { + return [ + { name: 'modesCurrentMode', types: ['String', 'Number'] }, + { name: 'modesSettings', types: ['String'] } + ]; + } +} + +module.exports = DynamicModesDevice; diff --git a/functions/devices/dynamicmodeslight.js b/functions/devices/dynamicmodeslight.js new file mode 100644 index 00000000..a185f0bf --- /dev/null +++ b/functions/devices/dynamicmodeslight.js @@ -0,0 +1,9 @@ +const DynamicModesDevice = require('./dynamicmodesdevice.js'); + +class DynamicModesLight extends DynamicModesDevice { + static get type() { + return 'action.devices.types.LIGHT'; + } +} + +module.exports = DynamicModesLight; diff --git a/functions/devices/fan.js b/functions/devices/fan.js index 9afbf5d8..f7da1385 100644 --- a/functions/devices/fan.js +++ b/functions/devices/fan.js @@ -5,62 +5,192 @@ class Fan extends DefaultDevice { return 'action.devices.types.FAN'; } - static getTraits() { - return ['action.devices.traits.OnOff', 'action.devices.traits.FanSpeed']; + static getTraits(item) { + const traits = []; + const members = this.getMembers(item); + const itemType = item.groupType || item.type; + if (itemType !== 'Group' || 'fanPower' in members) traits.push('action.devices.traits.OnOff'); + if (itemType !== 'Group' || 'fanSpeed' in members) traits.push('action.devices.traits.FanSpeed'); + if ('fanMode' in members) traits.push('action.devices.traits.Modes'); + if ('fanFilterLifeTime' in members || 'fanPM25' in members) traits.push('action.devices.traits.SensorState'); + return traits; + } + + static get requiredItemTypes() { + return ['Group', 'Dimmer', 'Number']; + } + + static matchesDeviceType(item) { + const itemType = item.groupType || item.type; + return super.matchesDeviceType(item) && (itemType !== 'Group' || Object.keys(this.getMembers(item)).length > 0); } static getAttributes(item) { const config = this.getConfig(item); - if (!config || !config.speeds) { - return { - supportsFanSpeedPercent: true - }; - } - const attributes = { - availableFanSpeeds: { + const members = this.getMembers(item); + const attributes = { supportsFanSpeedPercent: true }; + if (config.fanSpeeds) { + attributes.availableFanSpeeds = { speeds: [], ordered: config.ordered === true - }, - reversible: false - }; - config.speeds.split(',').forEach((speedEntry) => { - try { - const [speedName, speedSynonyms] = speedEntry - .trim() - .split('=') - .map((s) => s.trim()); - // @ts-ignore - attributes.availableFanSpeeds.speeds.push({ - speed_name: speedName, - speed_values: [ + }; + config.fanSpeeds.split(',').forEach((speedEntry) => { + try { + const [speedName, speedSynonyms] = speedEntry + .trim() + .split('=') + .map((s) => s.trim()); + attributes.availableFanSpeeds.speeds.push({ + speed_name: speedName, + speed_values: [ + { + speed_synonym: speedSynonyms.split(':').map((s) => s.trim()), + lang: config.lang || 'en' + } + ] + }); + } catch (error) { + // + } + }); + } + if ('fanMode' in members && config.fanModeName && config.fanModeSettings) { + const modeNames = config.fanModeName.split(',').map((s) => s.trim()); + attributes.availableModes = [ + { + name: modeNames[0], + name_values: [ { - speed_synonym: speedSynonyms.split(':').map((s) => s.trim()), + name_synonym: modeNames, lang: config.lang || 'en' } - ] + ], + settings: [], + ordered: config.ordered === true + } + ]; + config.fanModeSettings.split(',').forEach((setting) => { + try { + const [settingName, settingSynonyms] = setting + .trim() + .split('=') + .map((s) => s.trim()); + attributes.availableModes[0].settings.push({ + setting_name: settingName, + setting_values: [ + { + setting_synonym: [settingName].concat(settingSynonyms.split(':').map((s) => s.trim())), + lang: config.lang || 'en' + } + ] + }); + } catch (error) { + // + } + }); + } + // Sensors + if ('fanFilterLifeTime' in members || 'fanPM25' in members) { + attributes.sensorStatesSupported = []; + if ('fanFilterLifeTime' in members) { + attributes.sensorStatesSupported.push({ + name: 'FilterLifeTime', + descriptiveCapabilities: { + availableStates: ['new', 'good', 'replace soon', 'replace now'] + }, + numericCapabilities: { + rawValueUnit: 'PERCENTAGE' + } }); - } catch (error) { - // } - }); + if ('fanPM25' in members) { + attributes.sensorStatesSupported.push({ + name: 'PM2.5', + numericCapabilities: { + rawValueUnit: 'MICROGRAMS_PER_CUBIC_METER' + } + }); + } + } return attributes; } - static get requiredItemTypes() { - return ['Dimmer']; - } - static getState(item) { - const state = { - on: Number(item.state) > 0 - }; const config = this.getConfig(item); - if (config && config.speeds) { - state.currentFanSpeedSetting = item.state.toString(); + const itemType = item.groupType || item.type; + if (itemType !== 'Group') { + const state = { + currentFanSpeedPercent: Math.round(Number(item.state)), + on: Number(item.state) > 0 + }; + if (config.fanSpeeds) { + state.currentFanSpeedSetting = item.state.toString(); + } + return state; } else { - state.currentFanSpeedPercent = Math.round(Number(item.state)); + const state = {}; + const config = this.getConfig(item); + const members = this.getMembers(item); + if ('fanPower' in members) { + state.on = members.fanPower.state === 'ON'; + } else if ('fanSpeed' in members) { + state.on = Number(members.fanSpeed.state) > 0; + } + if ('fanSpeed' in members) { + state.currentFanSpeedPercent = Number(members.fanSpeed.state); + if (config.fanSpeeds) { + state.currentFanSpeedSetting = members.fanSpeed.state.toString(); + } + } + if ('fanMode' in members && config.fanModeName && config.fanModeSettings) { + const modeNames = config.fanModeName.split(',').map((s) => s.trim()); + state.currentModeSettings = { + [modeNames[0]]: members.fanMode.state + }; + } + // Sensors + if ('fanFilterLifeTime' in members || 'fanPM25' in members) { + state.currentSensorStateData = []; + if ('fanFilterLifeTime' in members) { + const itemState = Number(members.fanFilterLifeTime.state); + state.currentSensorStateData.push({ + name: 'FilterLifeTime', + currentSensorState: this.translateFilterLifeTime(itemState), + rawValue: itemState + }); + } + if ('fanPM25' in members) { + state.currentSensorStateData.push({ + name: 'PM2.5', + rawValue: Number(members.fanPM25.state) + }); + } + } + return state; + } + } + + static get supportedMembers() { + return [ + { name: 'fanPower', types: ['Switch'] }, + { name: 'fanSpeed', types: ['Dimmer', 'Number'] }, + { name: 'fanMode', types: ['Number', 'String'] }, + { name: 'fanFilterLifeTime', types: ['Number'] }, + { name: 'fanPM25', types: ['Number'] } + ]; + } + + static translateFilterLifeTime(state) { + const map = [ + { value: 'new', threshold: 90 }, + { value: 'good', threshold: 20 }, + { value: 'replace soon', threshold: 10 }, + { value: 'replace now', threshold: 0 } + ]; + for (const entry of map) { + if (state >= entry.threshold) return entry.value; } - return state; + return 'unknown'; } } diff --git a/functions/devices/index.js b/functions/devices/index.js index 073d6608..4bc92541 100644 --- a/functions/devices/index.js +++ b/functions/devices/index.js @@ -18,7 +18,7 @@ module.exports = { return ( item.metadata && item.metadata.ga && - Devices.find((device) => device.matchesItemType(item) && device.isCompatible(item)) + Devices.find((device) => device.matchesItemType(item) && device.matchesDeviceType(item)) ); } }; diff --git a/functions/devices/modesdevice.js b/functions/devices/modesdevice.js new file mode 100644 index 00000000..ba41dc1f --- /dev/null +++ b/functions/devices/modesdevice.js @@ -0,0 +1,70 @@ +const DefaultDevice = require('./default.js'); + +class ModesDevice extends DefaultDevice { + static getTraits() { + return ['action.devices.traits.Modes']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && !!this.getAttributes(item).availableModes; + } + + static getAttributes(item) { + const config = this.getConfig(item); + if (!config.mode || !config.settings) { + return {}; + } + const modeNames = config.mode.split(',').map((s) => s.trim()); + const attributes = { + availableModes: [ + { + name: modeNames[0], + name_values: [ + { + name_synonym: modeNames, + lang: config.lang || 'en' + } + ], + settings: [], + ordered: config.ordered === true + } + ] + }; + config.settings.split(',').forEach((setting) => { + try { + const [settingName, settingSynonyms] = setting + .trim() + .split('=') + .map((s) => s.trim()); + attributes.availableModes[0].settings.push({ + setting_name: settingName, + setting_values: [ + { + setting_synonym: [settingName].concat(settingSynonyms.split(':').map((s) => s.trim())), + lang: config.lang || 'en' + } + ] + }); + } catch {} + }); + return attributes; + } + + static get requiredItemTypes() { + return ['Color', 'Dimmer', 'Number', 'Player', 'Rollershutter', 'String', 'Switch']; + } + + static getState(item) { + const config = this.getConfig(item); + const state = {}; + if (config.mode && config.settings) { + const modeNames = config.mode.split(',').map((s) => s.trim()); + state.currentModeSettings = { + [modeNames[0]]: item.state + }; + } + return state; + } +} + +module.exports = ModesDevice; diff --git a/functions/devices/modeslight.js b/functions/devices/modeslight.js new file mode 100644 index 00000000..a2d125d4 --- /dev/null +++ b/functions/devices/modeslight.js @@ -0,0 +1,9 @@ +const ModesDevice = require('./modesdevice.js'); + +class ModesLight extends ModesDevice { + static get type() { + return 'action.devices.types.LIGHT'; + } +} + +module.exports = ModesLight; diff --git a/functions/devices/securitysystem.js b/functions/devices/securitysystem.js index f7d90f86..5b5bb0a6 100644 --- a/functions/devices/securitysystem.js +++ b/functions/devices/securitysystem.js @@ -24,8 +24,12 @@ class SecuritySystem extends DefaultDevice { return memberArmLevel; } - static matchesItemType(item) { - return item.type === 'Group' && Object.keys(this.getMembers(item)).length > 0; + static get requiredItemTypes() { + return ['Group']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && Object.keys(this.getMembers(item)).length > 0; } static getAttributes(item) { @@ -56,20 +60,33 @@ class SecuritySystem extends DefaultDevice { return {}; } + static get supportedMembers() { + return [ + { name: memberArmed, types: ['Switch'] }, + { name: memberArmLevel, types: ['String'] }, + { name: memberZone, types: ['Contact'] }, + { name: memberTrouble, types: ['Switch'] }, + { name: memberErrorCode, types: ['String'] } + ]; + } + static getMembers(item) { - const supportedMembers = [memberArmed, memberArmLevel, memberZone, memberTrouble, memberErrorCode]; + const supportedMembers = this.supportedMembers; const members = {}; if (item.members && item.members.length) { item.members.forEach((member) => { if (member.metadata && member.metadata.ga) { - const memberType = supportedMembers.find((m) => member.metadata.ga.value.toLowerCase() === m.toLowerCase()); + const memberType = supportedMembers.find((m) => { + const memberType = (member.groupType || member.type || '').split(':')[0]; + return m.types.includes(memberType) && member.metadata.ga.value.toLowerCase() === m.name.toLowerCase(); + }); if (memberType) { const memberDetails = { name: member.name, state: member.state, config: this.getConfig(member) }; - if (memberType === memberZone) { + if (memberType.name === memberZone) { members.zones = members.zones || []; members.zones.push(memberDetails); } else { - members[memberType] = memberDetails; + members[memberType.name] = memberDetails; } } } diff --git a/functions/devices/sensor.js b/functions/devices/sensor.js index 79f52363..a8367194 100644 --- a/functions/devices/sensor.js +++ b/functions/devices/sensor.js @@ -8,9 +8,13 @@ class Sensor extends DefaultDevice { static getTraits() { return ['action.devices.traits.SensorState']; } - static matchesItemType(item) { - const config = this.getConfig(item); - return 'sensorName' in config && ('valueUnit' in config || 'states' in config); + + static get requiredItemTypes() { + return ['Number', 'String', 'Dimmer', 'Switch', 'Rollershutter', 'Contact']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && !!this.getAttributes(item).sensorStatesSupported; } static getAttributes(item) { diff --git a/functions/devices/specialcolorlight.js b/functions/devices/specialcolorlight.js index a46348ee..b77997ca 100644 --- a/functions/devices/specialcolorlight.js +++ b/functions/devices/specialcolorlight.js @@ -10,14 +10,16 @@ class SpecialColorLight extends DefaultDevice { return ['action.devices.traits.OnOff', 'action.devices.traits.Brightness', 'action.devices.traits.ColorSetting']; } - static isCompatible(item = {}) { - return item.metadata && item.metadata.ga && item.metadata.ga.value.toLowerCase() == 'specialcolorlight'; + static get requiredItemTypes() { + return ['Group']; } - static matchesItemType(item) { + static matchesDeviceType(item) { const members = this.getMembers(item); - return ( - item.type === 'Group' && + return !!( + item.metadata && + item.metadata.ga && + item.metadata.ga.value.toLowerCase() == 'specialcolorlight' && Object.keys(members).length > 1 && (!('lightColorTemperature' in members) || this.getColorUnit(item) !== 'percent' || @@ -45,6 +47,22 @@ class SpecialColorLight extends DefaultDevice { return attributes; } + static getMetadata(item) { + const metadata = super.getMetadata(item); + const colorTemperatureRange = this.getAttributes(item).colorTemperatureRange; + if (colorTemperatureRange) { + metadata.customData.colorTemperatureRange = colorTemperatureRange; + } + const colorUnit = this.getColorUnit(item); + if (colorUnit !== 'percent') { + metadata.customData.colorUnit = colorUnit; + } + if (this.getColorTemperatureInverted(item)) { + metadata.customData.colorTemperatureInverted = true; + } + return metadata; + } + static getState(item) { const state = {}; const members = this.getMembers(item); @@ -108,20 +126,13 @@ class SpecialColorLight extends DefaultDevice { return state; } - static getMembers(item) { - const supportedMembers = ['lightBrightness', 'lightColor', 'lightColorTemperature', 'lightPower']; - const members = {}; - if (item.members && item.members.length) { - item.members.forEach((member) => { - if (member.metadata && member.metadata.ga) { - const memberType = supportedMembers.find((m) => member.metadata.ga.value.toLowerCase() === m.toLowerCase()); - if (memberType) { - members[memberType] = { name: member.name, state: member.state }; - } - } - }); - } - return members; + static get supportedMembers() { + return [ + { name: 'lightPower', types: ['Switch'] }, + { name: 'lightColor', types: ['Color'] }, + { name: 'lightBrightness', types: ['Dimmer', 'Number'] }, + { name: 'lightColorTemperature', types: ['Dimmer', 'Number'] } + ]; } static getColorUnit(item) { diff --git a/functions/devices/temperaturesensor.js b/functions/devices/temperaturesensor.js index 0eb3db86..66e697a5 100644 --- a/functions/devices/temperaturesensor.js +++ b/functions/devices/temperaturesensor.js @@ -23,7 +23,7 @@ class TemperatureSensor extends DefaultDevice { return ['Number']; } - static isCompatible(item = {}) { + static matchesDeviceType(item) { return item.metadata && item.metadata.ga && item.metadata.ga.value.toLowerCase() == 'temperaturesensor'; } diff --git a/functions/devices/thermostat.js b/functions/devices/thermostat.js index a9aba5df..ff44fb67 100644 --- a/functions/devices/thermostat.js +++ b/functions/devices/thermostat.js @@ -10,8 +10,12 @@ class Thermostat extends DefaultDevice { return ['action.devices.traits.TemperatureSetting']; } - static matchesItemType(item) { - return item.type === 'Group' && Object.keys(this.getMembers(item)).length > 0; + static get requiredItemTypes() { + return ['Group']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && Object.keys(this.getMembers(item)).length > 0; } static getAttributes(item) { @@ -57,27 +61,15 @@ class Thermostat extends DefaultDevice { return state; } - static getMembers(item) { - const supportedMembers = [ - 'thermostatMode', - 'thermostatTemperatureSetpoint', - 'thermostatTemperatureSetpointHigh', - 'thermostatTemperatureSetpointLow', - 'thermostatTemperatureAmbient', - 'thermostatHumidityAmbient' + static get supportedMembers() { + return [ + { name: 'thermostatMode', types: ['Number', 'String', 'Switch'] }, + { name: 'thermostatTemperatureSetpoint', types: ['Number'] }, + { name: 'thermostatTemperatureSetpointHigh', types: ['Number'] }, + { name: 'thermostatTemperatureSetpointLow', types: ['Number'] }, + { name: 'thermostatTemperatureAmbient', types: ['Number'] }, + { name: 'thermostatHumidityAmbient', types: ['Number'] } ]; - const members = {}; - if (item.members && item.members.length) { - item.members.forEach((member) => { - if (member.metadata && member.metadata.ga) { - const memberType = supportedMembers.find((m) => member.metadata.ga.value.toLowerCase() === m.toLowerCase()); - if (memberType) { - members[memberType] = { name: member.name, state: member.state }; - } - } - }); - } - return members; } static useFahrenheit(item) { @@ -87,12 +79,12 @@ class Thermostat extends DefaultDevice { static getModeMap(item) { const config = this.getConfig(item); - let modes = ['off', 'heat', 'cool', 'on', 'heatcool', 'auto', 'eco']; - if ('modes' in config) { - modes = config.modes.split(',').map((s) => s.trim()); + let thermostatModes = ['off', 'heat', 'cool', 'on', 'heatcool', 'auto', 'eco']; + if ('thermostatModes' in config) { + thermostatModes = config.thermostatModes.split(',').map((s) => s.trim()); } const modeMap = {}; - modes.forEach((pair) => { + thermostatModes.forEach((pair) => { const [key, value] = pair.split('=').map((s) => s.trim()); modeMap[key] = value ? value.split(':').map((s) => s.trim()) : [key]; }); diff --git a/functions/devices/tv.js b/functions/devices/tv.js index 185164a3..88e5cb36 100644 --- a/functions/devices/tv.js +++ b/functions/devices/tv.js @@ -18,8 +18,12 @@ class TV extends DefaultDevice { return traits; } - static matchesItemType(item) { - return item.type === 'Group' && Object.keys(this.getMembers(item)).length > 0; + static get requiredItemTypes() { + return ['Group']; + } + + static matchesDeviceType(item) { + return super.matchesDeviceType(item) && Object.keys(this.getMembers(item)).length > 0; } static getAttributes(item) { @@ -129,20 +133,16 @@ class TV extends DefaultDevice { return state; } - static getMembers(item) { - const supportedMembers = ['tvApplication', 'tvChannel', 'tvVolume', 'tvInput', 'tvTransport', 'tvPower', 'tvMute']; - const members = {}; - if (item.members && item.members.length) { - item.members.forEach((member) => { - if (member.metadata && member.metadata.ga) { - const memberType = supportedMembers.find((m) => member.metadata.ga.value.toLowerCase() === m.toLowerCase()); - if (memberType) { - members[memberType] = { name: member.name, state: member.state }; - } - } - }); - } - return members; + static get supportedMembers() { + return [ + { name: 'tvApplication', types: ['Number', 'String'] }, + { name: 'tvChannel', types: ['Number', 'String'] }, + { name: 'tvVolume', types: ['Number', 'Dimmer'] }, + { name: 'tvInput', types: ['Number', 'String'] }, + { name: 'tvTransport', types: ['Player'] }, + { name: 'tvPower', types: ['Switch'] }, + { name: 'tvMute', types: ['Switch'] } + ]; } static getChannelMap(item) { diff --git a/functions/openhab.js b/functions/openhab.js index 52e7fe98..41b8cba0 100644 --- a/functions/openhab.js +++ b/functions/openhab.js @@ -141,7 +141,7 @@ class OpenHAB { if (!DeviceType) { throw { statusCode: 404, message: `Device type not found for item: ${item.type} ${item.name}` }; } - if (item.state === 'NULL' && !('getMembers' in DeviceType)) { + if (item.state === 'NULL' && !DeviceType.supportedMembers.length) { throw { statusCode: 406, message: `Item state is NULL: ${item.type} ${item.name}` }; } payload.devices[device.id] = Object.assign({ status: 'SUCCESS', online: true }, DeviceType.getState(item)); diff --git a/functions/package-lock.json b/functions/package-lock.json index abf909d1..2442de3c 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -1,7 +1,7 @@ { "name": "openhab.google-assistant-smarthome.cloud-function", "version": "3.8.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -296,11 +296,11 @@ } }, "node_modules/google-p12-pem": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz", - "integrity": "sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz", + "integrity": "sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A==", "dependencies": { - "node-forge": "^1.3.1" + "node-forge": "^0.10.0" }, "bin": { "gp12-pem": "build/src/bin/gp12-pem.js" @@ -458,11 +458,11 @@ } }, "node_modules/node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "engines": { - "node": ">= 6.13.0" + "node": ">= 6.0.0" } }, "node_modules/object-inspect": { @@ -556,417 +556,5 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } - }, - "dependencies": { - "@types/aws-lambda": { - "version": "8.10.83", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.83.tgz", - "integrity": "sha512-7YsLv/B8rF7K7jYAGmYBxLq3QU+hQV7qNJBMcSCmJCTcXuzoTKGBX8d4v9CsVs0SOKBSAErXG7rtk8jVxiP30g==" - }, - "@types/body-parser": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz", - "integrity": "sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==", - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", - "requires": { - "@types/node": "*" - } - }, - "@types/debug": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz", - "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==", - "requires": { - "@types/ms": "*" - } - }, - "@types/express": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", - "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.18", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz", - "integrity": "sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==", - "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" - } - }, - "@types/mime": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", - "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" - }, - "@types/ms": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz", - "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==" - }, - "@types/node": { - "version": "16.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz", - "integrity": "sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==" - }, - "@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==" - }, - "@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" - }, - "@types/serve-static": { - "version": "1.13.9", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz", - "integrity": "sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==", - "requires": { - "@types/mime": "^1", - "@types/node": "*" - } - }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, - "actions-on-google": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/actions-on-google/-/actions-on-google-3.0.0.tgz", - "integrity": "sha512-aEXCAyulR0gWYOknMAJ+WFCdNyw3L8klXowPd9G1CTzzoxgktI2px5bHapPlrKzaCWkqopHpQ7ujUlBSwKdV9Q==", - "requires": { - "@types/aws-lambda": "^8.10.0", - "@types/debug": "^4.1.6", - "@types/express": "~4.17.9", - "@types/express-serve-static-core": "4.17.19", - "@types/serve-static": "1.13.9", - "debug": "^4.3.0", - "google-auth-library": "^7.2.0", - "googleapis": "^80.0.0" - } - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "requires": { - "debug": "4" - } - }, - "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==" - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - }, - "bignumber.js": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", - "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==" - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "requires": { - "ms": "2.1.2" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "fast-text-encoding": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", - "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==" - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "gaxios": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.0.tgz", - "integrity": "sha512-pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg==", - "requires": { - "abort-controller": "^3.0.0", - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.3.0" - } - }, - "gcp-metadata": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.0.tgz", - "integrity": "sha512-L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA==", - "requires": { - "gaxios": "^4.0.0", - "json-bigint": "^1.0.0" - } - }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } - }, - "google-auth-library": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.6.2.tgz", - "integrity": "sha512-yvEnwVsvgH8RXTtpf6e84e7dqIdUEKJhmQvTJwzYP+RDdHjLrDp9sk2u2ZNDJPLKZ7DJicx/+AStcQspJiq+Qw==", - "requires": { - "arrify": "^2.0.0", - "base64-js": "^1.3.0", - "ecdsa-sig-formatter": "^1.0.11", - "fast-text-encoding": "^1.0.0", - "gaxios": "^4.0.0", - "gcp-metadata": "^4.2.0", - "gtoken": "^5.0.4", - "jws": "^4.0.0", - "lru-cache": "^6.0.0" - } - }, - "google-p12-pem": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz", - "integrity": "sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==", - "requires": { - "node-forge": "^1.3.1" - } - }, - "googleapis": { - "version": "80.2.0", - "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-80.2.0.tgz", - "integrity": "sha512-lpl+ieuD5YErItTbex/zdtRTndNTZUmbo0eInBtiIe428FSFdjFVZ7+RUdLdiOtMQSxdD1vHe24SXjL3E5U2Nw==", - "requires": { - "google-auth-library": "^7.0.2", - "googleapis-common": "^5.0.2" - } - }, - "googleapis-common": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.0.4.tgz", - "integrity": "sha512-clr6NSAoIeTrQ/ESl/OmH4uuvPUq4XgiyPAnTIrItOWyM/YKYsXgzpPNkmP6D6LNd/UoTnymcyLNuMPh0ibzXg==", - "requires": { - "extend": "^3.0.2", - "gaxios": "^4.0.0", - "google-auth-library": "^7.0.2", - "qs": "^6.7.0", - "url-template": "^2.0.8", - "uuid": "^8.0.0" - } - }, - "gtoken": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz", - "integrity": "sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ==", - "requires": { - "gaxios": "^4.0.0", - "google-p12-pem": "^3.0.3", - "jws": "^4.0.0" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" - }, - "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" - }, - "json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", - "requires": { - "bignumber.js": "^9.0.0" - } - }, - "jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "requires": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==" - }, - "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "requires": { - "side-channel": "^1.0.4" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" - }, - "url-template": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz", - "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE=" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } } } diff --git a/package-lock.json b/package-lock.json index c60349ac..2081d88e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "openhab.google-assistant-smarthome", "version": "3.8.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -23,18 +23,16 @@ }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -45,9 +43,8 @@ }, "node_modules/@babel/code-frame": { "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/highlight": "^7.22.13", "chalk": "^2.4.2" @@ -58,9 +55,8 @@ }, "node_modules/@babel/code-frame/node_modules/ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -70,9 +66,8 @@ }, "node_modules/@babel/code-frame/node_modules/chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -84,42 +79,37 @@ }, "node_modules/@babel/code-frame/node_modules/color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "node_modules/@babel/code-frame/node_modules/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/@babel/code-frame/node_modules/has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/code-frame/node_modules/supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -128,29 +118,27 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", - "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", + "version": "7.23.2", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz", - "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==", + "version": "7.23.2", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.23.0", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-module-transforms": "^7.23.0", - "@babel/helpers": "^7.23.0", + "@babel/helpers": "^7.23.2", "@babel/parser": "^7.23.0", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", + "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -168,9 +156,8 @@ }, "node_modules/@babel/core/node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -185,15 +172,13 @@ }, "node_modules/@babel/core/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/generator": { "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", @@ -206,9 +191,8 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", - "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.9", "@babel/helper-validator-option": "^7.22.15", @@ -222,18 +206,16 @@ }, "node_modules/@babel/helper-environment-visitor": { "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", "@babel/types": "^7.23.0" @@ -244,9 +226,8 @@ }, "node_modules/@babel/helper-hoist-variables": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -256,9 +237,8 @@ }, "node_modules/@babel/helper-module-imports": { "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", - "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.15" }, @@ -268,9 +248,8 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", - "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -287,18 +266,16 @@ }, "node_modules/@babel/helper-plugin-utils": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -308,9 +285,8 @@ }, "node_modules/@babel/helper-split-export-declaration": { "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -320,39 +296,35 @@ }, "node_modules/@babel/helper-string-parser": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", - "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.23.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz", - "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==", + "version": "7.23.2", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", + "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0" }, "engines": { @@ -361,9 +333,8 @@ }, "node_modules/@babel/highlight": { "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -375,9 +346,8 @@ }, "node_modules/@babel/highlight/node_modules/ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -387,9 +357,8 @@ }, "node_modules/@babel/highlight/node_modules/chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -401,42 +370,37 @@ }, "node_modules/@babel/highlight/node_modules/color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "node_modules/@babel/highlight/node_modules/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/@babel/highlight/node_modules/has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/highlight/node_modules/supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -446,9 +410,8 @@ }, "node_modules/@babel/parser": { "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, + "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -458,9 +421,8 @@ }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -470,9 +432,8 @@ }, "node_modules/@babel/plugin-syntax-bigint": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -482,9 +443,8 @@ }, "node_modules/@babel/plugin-syntax-class-properties": { "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -494,9 +454,8 @@ }, "node_modules/@babel/plugin-syntax-import-meta": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -506,9 +465,8 @@ }, "node_modules/@babel/plugin-syntax-json-strings": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -518,9 +476,8 @@ }, "node_modules/@babel/plugin-syntax-jsx": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -533,9 +490,8 @@ }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -545,9 +501,8 @@ }, "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -557,9 +512,8 @@ }, "node_modules/@babel/plugin-syntax-numeric-separator": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -569,9 +523,8 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -581,9 +534,8 @@ }, "node_modules/@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -593,9 +545,8 @@ }, "node_modules/@babel/plugin-syntax-optional-chaining": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -605,9 +556,8 @@ }, "node_modules/@babel/plugin-syntax-top-level-await": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -620,9 +570,8 @@ }, "node_modules/@babel/plugin-syntax-typescript": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", - "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -635,9 +584,8 @@ }, "node_modules/@babel/template": { "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.22.13", "@babel/parser": "^7.22.15", @@ -649,9 +597,8 @@ }, "node_modules/@babel/traverse": { "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", - "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.23.0", @@ -670,9 +617,8 @@ }, "node_modules/@babel/traverse/node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -685,17 +631,23 @@ } } }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/traverse/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/types": { "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.20", @@ -707,15 +659,13 @@ }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz", - "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -728,18 +678,16 @@ }, "node_modules/@eslint-community/regexpp": { "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", - "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -758,17 +706,10 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, "node_modules/@eslint/eslintrc/node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -781,53 +722,23 @@ } } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/@eslint/eslintrc/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@eslint/js": { "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -839,9 +750,8 @@ }, "node_modules/@humanwhocodes/config-array/node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -856,15 +766,13 @@ }, "node_modules/@humanwhocodes/config-array/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -875,15 +783,13 @@ }, "node_modules/@humanwhocodes/object-schema": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, + "license": "ISC", "dependencies": { "camelcase": "^5.3.1", "find-up": "^4.1.0", @@ -895,20 +801,46 @@ "node": ">=8" } }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@jest/console": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -923,9 +855,8 @@ }, "node_modules/@jest/core": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/reporters": "^29.7.0", @@ -970,9 +901,8 @@ }, "node_modules/@jest/environment": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/fake-timers": "^29.7.0", "@jest/types": "^29.6.3", @@ -985,9 +915,8 @@ }, "node_modules/@jest/expect": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, + "license": "MIT", "dependencies": { "expect": "^29.7.0", "jest-snapshot": "^29.7.0" @@ -998,9 +927,8 @@ }, "node_modules/@jest/expect-utils": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, + "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3" }, @@ -1010,9 +938,8 @@ }, "node_modules/@jest/fake-timers": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@sinonjs/fake-timers": "^10.0.2", @@ -1027,9 +954,8 @@ }, "node_modules/@jest/globals": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/expect": "^29.7.0", @@ -1042,9 +968,8 @@ }, "node_modules/@jest/reporters": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, + "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^29.7.0", @@ -1085,9 +1010,8 @@ }, "node_modules/@jest/schemas": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, + "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -1097,9 +1021,8 @@ }, "node_modules/@jest/source-map": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", @@ -1111,9 +1034,8 @@ }, "node_modules/@jest/test-result": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/types": "^29.6.3", @@ -1126,9 +1048,8 @@ }, "node_modules/@jest/test-sequencer": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", @@ -1141,9 +1062,8 @@ }, "node_modules/@jest/transform": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@jest/types": "^29.6.3", @@ -1167,9 +1087,8 @@ }, "node_modules/@jest/types": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", @@ -1184,9 +1103,8 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -1198,33 +1116,29 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.20", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -1232,9 +1146,8 @@ }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -1245,18 +1158,16 @@ }, "node_modules/@nodelib/fs.stat": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/@nodelib/fs.walk": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -1267,9 +1178,8 @@ }, "node_modules/@pkgr/utils": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", - "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "fast-glob": "^3.3.0", @@ -1287,33 +1197,29 @@ }, "node_modules/@sinclair/typebox": { "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@sinonjs/commons": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } }, "node_modules/@sinonjs/fake-timers": { "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.0" } }, "node_modules/@types/babel__core": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", - "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==", + "version": "7.20.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -1323,77 +1229,68 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.5.tgz", - "integrity": "sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==", + "version": "7.6.6", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.2.tgz", - "integrity": "sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==", + "version": "7.4.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__traverse": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.2.tgz", - "integrity": "sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==", + "version": "7.20.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/color-name": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/graceful-fs": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.7.tgz", - "integrity": "sha512-MhzcwU8aUygZroVwL2jeYk6JisJrPl/oov/gsgGCue9mkgl9wjGbzReYQClxiUgFDnib9FuHqTndccKeZKxTRw==", + "version": "4.1.8", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "node_modules/@types/istanbul-reports": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } }, "node_modules/@types/jest": { "version": "29.5.10", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.10.tgz", - "integrity": "sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==", "dev": true, + "license": "MIT", "dependencies": { "expect": "^29.0.0", "pretty-format": "^29.0.0" @@ -1401,41 +1298,35 @@ }, "node_modules/@types/node": { "version": "18.7.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.16.tgz", - "integrity": "sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/stack-utils": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/yargs": { "version": "17.0.12", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.12.tgz", - "integrity": "sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@types/yargs-parser": { "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@ungap/structured-clone": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/accepts": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -1446,9 +1337,8 @@ }, "node_modules/acorn": { "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -1458,18 +1348,16 @@ }, "node_modules/acorn-jsx": { "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1483,9 +1371,8 @@ }, "node_modules/ansi-escapes": { "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -1498,9 +1385,8 @@ }, "node_modules/ansi-escapes/node_modules/type-fest": { "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -1510,31 +1396,31 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/ansi-styles": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, + "license": "MIT", "dependencies": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/anymatch": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -1544,24 +1430,18 @@ } }, "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "version": "2.0.1", "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } + "license": "Python-2.0" }, "node_modules/array-flatten": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + "license": "MIT" }, "node_modules/babel-jest": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", @@ -1580,9 +1460,8 @@ }, "node_modules/babel-plugin-istanbul": { "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@istanbuljs/load-nyc-config": "^1.0.0", @@ -1596,9 +1475,8 @@ }, "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", @@ -1612,9 +1490,8 @@ }, "node_modules/babel-plugin-jest-hoist": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", @@ -1627,9 +1504,8 @@ }, "node_modules/babel-preset-current-node-syntax": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", @@ -1650,9 +1526,8 @@ }, "node_modules/babel-preset-jest": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, + "license": "MIT", "dependencies": { "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" @@ -1666,23 +1541,20 @@ }, "node_modules/balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/big-integer": { "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", "dev": true, + "license": "Unlicense", "engines": { "node": ">=0.6" } }, "node_modules/body-parser": { "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.4", @@ -1704,9 +1576,8 @@ }, "node_modules/bplist-parser": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", "dev": true, + "license": "MIT", "dependencies": { "big-integer": "^1.6.44" }, @@ -1716,9 +1587,8 @@ }, "node_modules/brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1726,9 +1596,8 @@ }, "node_modules/braces": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -1737,9 +1606,7 @@ } }, "node_modules/browserslist": { - "version": "4.21.11", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", - "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", + "version": "4.22.1", "dev": true, "funding": [ { @@ -1755,9 +1622,10 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001538", - "electron-to-chromium": "^1.4.526", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", "update-browserslist-db": "^1.0.13" }, @@ -1770,24 +1638,21 @@ }, "node_modules/bser": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" } }, "node_modules/buffer-from": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bundle-name": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", - "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", "dev": true, + "license": "MIT", "dependencies": { "run-applescript": "^5.0.0" }, @@ -1800,16 +1665,14 @@ }, "node_modules/bytes": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/call-bind": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -1820,26 +1683,22 @@ }, "node_modules/callsites": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/camelcase": { "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001539", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz", - "integrity": "sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==", + "version": "1.0.30001554", "dev": true, "funding": [ { @@ -1854,47 +1713,46 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/char-regex": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/ci-info": { "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz", - "integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cjs-module-lexer": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", - "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cliui": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -1906,9 +1764,8 @@ }, "node_modules/co": { "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, + "license": "MIT", "engines": { "iojs": ">= 1.0.0", "node": ">= 0.12.0" @@ -1916,15 +1773,13 @@ }, "node_modules/collect-v8-coverage": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -1934,20 +1789,17 @@ }, "node_modules/color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/content-disposition": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -1957,8 +1809,6 @@ }, "node_modules/content-disposition/node_modules/safe-buffer": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "funding": [ { "type": "github", @@ -1972,40 +1822,36 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/content-type": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/convert-source-map": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cookie": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie-signature": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "license": "MIT" }, "node_modules/create-jest": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "chalk": "^4.0.0", @@ -2024,9 +1870,8 @@ }, "node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -2038,17 +1883,15 @@ }, "node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/dedent": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", - "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", "dev": true, + "license": "MIT", "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, @@ -2060,24 +1903,21 @@ }, "node_modules/deep-is": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/deepmerge": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/default-browser": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", - "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", "dev": true, + "license": "MIT", "dependencies": { "bundle-name": "^3.0.0", "default-browser-id": "^3.0.0", @@ -2093,9 +1933,8 @@ }, "node_modules/default-browser-id": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", - "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", "dev": true, + "license": "MIT", "dependencies": { "bplist-parser": "^0.2.0", "untildify": "^4.0.0" @@ -2108,10 +1947,9 @@ } }, "node_modules/default-browser/node_modules/execa": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.1.1.tgz", - "integrity": "sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==", + "version": "7.2.0", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", @@ -2132,18 +1970,16 @@ }, "node_modules/default-browser/node_modules/human-signals": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=14.18.0" } }, "node_modules/default-browser/node_modules/is-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -2153,9 +1989,8 @@ }, "node_modules/default-browser/node_modules/mimic-fn": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -2165,9 +2000,8 @@ }, "node_modules/default-browser/node_modules/npm-run-path": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", - "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^4.0.0" }, @@ -2180,9 +2014,8 @@ }, "node_modules/default-browser/node_modules/onetime": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, + "license": "MIT", "dependencies": { "mimic-fn": "^4.0.0" }, @@ -2195,9 +2028,8 @@ }, "node_modules/default-browser/node_modules/path-key": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -2207,9 +2039,8 @@ }, "node_modules/default-browser/node_modules/strip-final-newline": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -2219,9 +2050,8 @@ }, "node_modules/define-lazy-prop": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -2231,16 +2061,14 @@ }, "node_modules/depd": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/destroy": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -2248,38 +2076,33 @@ }, "node_modules/detect-newline": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/diff-sequences": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/ee-first": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.529", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.529.tgz", - "integrity": "sha512-6uyPyXTo8lkv8SWAmjKFbG42U073TXlzD4R8rW3EzuznhFS2olCIAfjjQtV2dV2ar/vRF55KUd3zQYnCB0dd3A==", - "dev": true + "version": "1.4.566", + "dev": true, + "license": "ISC" }, "node_modules/emittery": { "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -2289,55 +2112,48 @@ }, "node_modules/emoji-regex": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/encodeurl": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/error-ex": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/escalade": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/escape-html": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "license": "MIT" }, "node_modules/escape-string-regexp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/eslint": { "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -2390,9 +2206,8 @@ }, "node_modules/eslint-config-prettier": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", "dev": true, + "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -2402,9 +2217,8 @@ }, "node_modules/eslint-plugin-prettier": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", - "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", "dev": true, + "license": "MIT", "dependencies": { "prettier-linter-helpers": "^1.0.0", "synckit": "^0.8.5" @@ -2431,9 +2245,8 @@ }, "node_modules/eslint-scope": { "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -2447,9 +2260,8 @@ }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -2457,17 +2269,10 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, "node_modules/eslint/node_modules/debug": { "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -2482,9 +2287,8 @@ }, "node_modules/eslint/node_modules/doctrine": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -2494,9 +2298,8 @@ }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -2506,9 +2309,8 @@ }, "node_modules/eslint/node_modules/find-up": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -2520,38 +2322,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/eslint/node_modules/locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -2564,15 +2338,13 @@ }, "node_modules/eslint/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/eslint/node_modules/p-locate": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -2585,9 +2357,8 @@ }, "node_modules/espree": { "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -2602,9 +2373,8 @@ }, "node_modules/esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -2615,9 +2385,8 @@ }, "node_modules/esquery": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -2627,9 +2396,8 @@ }, "node_modules/esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -2639,35 +2407,31 @@ }, "node_modules/estraverse": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/etag": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/execa": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -2688,8 +2452,6 @@ }, "node_modules/exit": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", "dev": true, "engines": { "node": ">= 0.8.0" @@ -2697,9 +2459,8 @@ }, "node_modules/expect": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", @@ -2713,8 +2474,7 @@ }, "node_modules/express": { "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -2754,8 +2514,6 @@ }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "funding": [ { "type": "github", @@ -2769,25 +2527,23 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-diff": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/fast-glob": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", - "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", + "version": "3.3.1", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -2801,9 +2557,8 @@ }, "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2813,39 +2568,34 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fastq": { "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "node_modules/fb-watchman": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" } }, "node_modules/file-entry-cache": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, + "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -2855,9 +2605,8 @@ }, "node_modules/fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2867,8 +2616,7 @@ }, "node_modules/finalhandler": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -2884,9 +2632,8 @@ }, "node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -2897,9 +2644,8 @@ }, "node_modules/flat-cache": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", "dev": true, + "license": "MIT", "dependencies": { "flatted": "^3.1.0", "rimraf": "^3.0.2" @@ -2910,38 +2656,32 @@ }, "node_modules/flatted": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/forwarded": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/fresh": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2951,32 +2691,31 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/gensync": { "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/get-caller-file": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, "node_modules/get-intrinsic": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -2988,18 +2727,16 @@ }, "node_modules/get-package-type": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.0.0" } }, "node_modules/get-stream": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3009,9 +2746,8 @@ }, "node_modules/glob": { "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3022,13 +2758,15 @@ }, "engines": { "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/glob-parent": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -3037,30 +2775,32 @@ } }, "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "version": "13.23.0", "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/graceful-fs": { "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/graphemer": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/has": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1" }, @@ -3070,17 +2810,15 @@ }, "node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/has-symbols": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3088,16 +2826,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hasown": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/html-escaper": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/http-errors": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -3111,17 +2858,15 @@ }, "node_modules/human-signals": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=10.17.0" } }, "node_modules/iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -3130,19 +2875,17 @@ } }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/import-fresh": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -3154,20 +2897,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/import-local": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, + "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" @@ -3184,18 +2917,16 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.19" } }, "node_modules/inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3203,30 +2934,26 @@ }, "node_modules/inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "license": "ISC" }, "node_modules/ipaddr.js": { "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", "engines": { "node": ">= 0.10" } }, "node_modules/is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "version": "2.13.1", "dev": true, + "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3234,9 +2961,8 @@ }, "node_modules/is-docker": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", "dev": true, + "license": "MIT", "bin": { "is-docker": "cli.js" }, @@ -3249,36 +2975,32 @@ }, "node_modules/is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-generator-fn": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/is-glob": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -3288,9 +3010,8 @@ }, "node_modules/is-inside-container": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", "dev": true, + "license": "MIT", "dependencies": { "is-docker": "^3.0.0" }, @@ -3306,27 +3027,24 @@ }, "node_modules/is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-path-inside": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-stream": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -3336,9 +3054,8 @@ }, "node_modules/is-wsl": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, + "license": "MIT", "dependencies": { "is-docker": "^2.0.0" }, @@ -3348,9 +3065,8 @@ }, "node_modules/is-wsl/node_modules/is-docker": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, + "license": "MIT", "bin": { "is-docker": "cli.js" }, @@ -3363,24 +3079,21 @@ }, "node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/istanbul-lib-coverage": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=8" } }, "node_modules/istanbul-lib-instrument": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz", - "integrity": "sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==", + "version": "6.0.1", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", @@ -3394,9 +3107,8 @@ }, "node_modules/istanbul-lib-instrument/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -3406,9 +3118,8 @@ }, "node_modules/istanbul-lib-instrument/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3421,15 +3132,13 @@ }, "node_modules/istanbul-lib-instrument/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/istanbul-lib-report": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -3441,9 +3150,8 @@ }, "node_modules/istanbul-lib-source-maps": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", @@ -3455,9 +3163,8 @@ }, "node_modules/istanbul-lib-source-maps/node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -3472,15 +3179,13 @@ }, "node_modules/istanbul-lib-source-maps/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/istanbul-reports": { "version": "3.1.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", - "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -3491,9 +3196,8 @@ }, "node_modules/jest": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -3517,9 +3221,8 @@ }, "node_modules/jest-changed-files": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, + "license": "MIT", "dependencies": { "execa": "^5.0.0", "jest-util": "^29.7.0", @@ -3531,9 +3234,8 @@ }, "node_modules/jest-circus": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/expect": "^29.7.0", @@ -3562,9 +3264,8 @@ }, "node_modules/jest-cli": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/core": "^29.7.0", "@jest/test-result": "^29.7.0", @@ -3595,9 +3296,8 @@ }, "node_modules/jest-config": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@jest/test-sequencer": "^29.7.0", @@ -3640,9 +3340,8 @@ }, "node_modules/jest-diff": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", @@ -3655,9 +3354,8 @@ }, "node_modules/jest-docblock": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, + "license": "MIT", "dependencies": { "detect-newline": "^3.0.0" }, @@ -3667,9 +3365,8 @@ }, "node_modules/jest-each": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "chalk": "^4.0.0", @@ -3683,9 +3380,8 @@ }, "node_modules/jest-environment-node": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", @@ -3700,18 +3396,16 @@ }, "node_modules/jest-get-type": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", @@ -3734,9 +3428,8 @@ }, "node_modules/jest-leak-detector": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, + "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3", "pretty-format": "^29.7.0" @@ -3747,9 +3440,8 @@ }, "node_modules/jest-matcher-utils": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "jest-diff": "^29.7.0", @@ -3762,9 +3454,8 @@ }, "node_modules/jest-message-util": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", @@ -3782,9 +3473,8 @@ }, "node_modules/jest-mock": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -3796,9 +3486,8 @@ }, "node_modules/jest-pnp-resolver": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" }, @@ -3813,18 +3502,16 @@ }, "node_modules/jest-regex-util": { "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", @@ -3842,9 +3529,8 @@ }, "node_modules/jest-resolve-dependencies": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, + "license": "MIT", "dependencies": { "jest-regex-util": "^29.6.3", "jest-snapshot": "^29.7.0" @@ -3855,9 +3541,8 @@ }, "node_modules/jest-runner": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/environment": "^29.7.0", @@ -3887,9 +3572,8 @@ }, "node_modules/jest-runtime": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", @@ -3920,9 +3604,8 @@ }, "node_modules/jest-snapshot": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", @@ -3951,9 +3634,8 @@ }, "node_modules/jest-snapshot/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -3963,9 +3645,8 @@ }, "node_modules/jest-snapshot/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3978,15 +3659,13 @@ }, "node_modules/jest-snapshot/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/jest-util": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -4001,9 +3680,8 @@ }, "node_modules/jest-validate": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "camelcase": "^6.2.0", @@ -4018,9 +3696,8 @@ }, "node_modules/jest-validate/node_modules/camelcase": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -4030,9 +3707,8 @@ }, "node_modules/jest-watcher": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, + "license": "MIT", "dependencies": { "@jest/test-result": "^29.7.0", "@jest/types": "^29.6.3", @@ -4049,9 +3725,8 @@ }, "node_modules/jest-worker": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "jest-util": "^29.7.0", @@ -4064,9 +3739,8 @@ }, "node_modules/jest-worker/node_modules/supports-color": { "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -4079,18 +3753,15 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", "dev": true, + "license": "MIT", "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" @@ -4098,9 +3769,8 @@ }, "node_modules/jsesc": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -4110,33 +3780,28 @@ }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stringify-safe": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/json5": { "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -4146,27 +3811,24 @@ }, "node_modules/kleur": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/leven": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/levn": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -4177,15 +3839,13 @@ }, "node_modules/lines-and-columns": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -4195,24 +3855,21 @@ }, "node_modules/lodash.merge": { "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lru-cache": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^3.0.2" } }, "node_modules/make-dir": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -4225,9 +3882,8 @@ }, "node_modules/make-dir/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -4237,9 +3893,8 @@ }, "node_modules/make-dir/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -4252,60 +3907,52 @@ }, "node_modules/make-dir/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/makeerror": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "tmpl": "1.0.5" } }, "node_modules/media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/merge-descriptors": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "license": "MIT" }, "node_modules/merge-stream": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/merge2": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/methods": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/micromatch": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -4316,8 +3963,7 @@ }, "node_modules/mime": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -4327,16 +3973,14 @@ }, "node_modules/mime-db": { "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", + "license": "MIT", "dependencies": { "mime-db": "1.51.0" }, @@ -4346,18 +3990,16 @@ }, "node_modules/mimic-fn": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4367,28 +4009,24 @@ }, "node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "license": "MIT" }, "node_modules/natural-compare": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/nock": { "version": "13.3.8", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.8.tgz", - "integrity": "sha512-96yVFal0c/W1lG7mmfRe7eO+hovrhJYd2obzzOZ90f6fjpeU/XNvd9cYHZKZAQJumDfhXgoTpkpJ9pvMj+hqHw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", @@ -4400,48 +4038,47 @@ }, "node_modules/nock/node_modules/debug": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, "engines": { "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/nock/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-int64": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-releases": { "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/npm-run-path": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -4451,16 +4088,14 @@ }, "node_modules/object-inspect": { "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/on-finished": { "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -4470,18 +4105,16 @@ }, "node_modules/once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/onetime": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -4494,9 +4127,8 @@ }, "node_modules/open": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", "dev": true, + "license": "MIT", "dependencies": { "default-browser": "^4.0.0", "define-lazy-prop": "^3.0.0", @@ -4512,9 +4144,8 @@ }, "node_modules/optionator": { "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, + "license": "MIT", "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -4529,9 +4160,8 @@ }, "node_modules/p-limit": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -4544,9 +4174,8 @@ }, "node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -4556,9 +4185,8 @@ }, "node_modules/p-locate/node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -4571,18 +4199,16 @@ }, "node_modules/p-try": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -4592,9 +4218,8 @@ }, "node_modules/parse-json": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -4610,61 +4235,53 @@ }, "node_modules/parseurl": { "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-to-regexp": { "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "license": "MIT" }, "node_modules/picocolors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -4674,18 +4291,16 @@ }, "node_modules/pirates": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/pkg-dir": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.0.0" }, @@ -4695,18 +4310,16 @@ }, "node_modules/prelude-ls": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/prettier": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -4719,9 +4332,8 @@ }, "node_modules/prettier-linter-helpers": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", "dev": true, + "license": "MIT", "dependencies": { "fast-diff": "^1.1.2" }, @@ -4731,9 +4343,8 @@ }, "node_modules/pretty-format": { "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -4745,9 +4356,8 @@ }, "node_modules/pretty-format/node_modules/ansi-styles": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -4757,9 +4367,8 @@ }, "node_modules/prompts": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", "dev": true, + "license": "MIT", "dependencies": { "kleur": "^3.0.3", "sisteransi": "^1.0.5" @@ -4770,17 +4379,15 @@ }, "node_modules/propagate": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/proxy-addr": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -4791,17 +4398,14 @@ }, "node_modules/punycode": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/pure-rand": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz", - "integrity": "sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w==", + "version": "6.0.4", "dev": true, "funding": [ { @@ -4812,12 +4416,12 @@ "type": "opencollective", "url": "https://opencollective.com/fast-check" } - ] + ], + "license": "MIT" }, "node_modules/qs": { "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.4" }, @@ -4830,8 +4434,6 @@ }, "node_modules/queue-microtask": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ { @@ -4846,20 +4448,19 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/range-parser": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/raw-body": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -4872,24 +4473,21 @@ }, "node_modules/react-is": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/resolve": { - "version": "1.22.6", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", - "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==", + "version": "1.22.8", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -4904,9 +4502,8 @@ }, "node_modules/resolve-cwd": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, + "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" }, @@ -4914,29 +4511,34 @@ "node": ">=8" } }, - "node_modules/resolve-from": { + "node_modules/resolve-cwd/node_modules/resolve-from": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, + "node_modules/resolve-from": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/resolve.exports": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", - "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/reusify": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -4944,21 +4546,22 @@ }, "node_modules/rimraf": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/run-applescript": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", - "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", "dev": true, + "license": "MIT", "dependencies": { "execa": "^5.0.0" }, @@ -4971,8 +4574,6 @@ }, "node_modules/run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ { @@ -4988,28 +4589,26 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "license": "MIT" }, "node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/send": { "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -5031,13 +4630,11 @@ }, "node_modules/send/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "license": "MIT" }, "node_modules/serve-static": { "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "license": "MIT", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -5050,14 +4647,12 @@ }, "node_modules/setprototypeof": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "license": "ISC" }, "node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -5067,17 +4662,15 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/side-channel": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -5089,39 +4682,34 @@ }, "node_modules/signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/sisteransi": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-support": { "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -5129,15 +4717,13 @@ }, "node_modules/sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/stack-utils": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", - "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "^2.0.0" }, @@ -5147,17 +4733,15 @@ }, "node_modules/statuses": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/string-length": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", "dev": true, + "license": "MIT", "dependencies": { "char-regex": "^1.0.2", "strip-ansi": "^6.0.0" @@ -5168,9 +4752,8 @@ }, "node_modules/string-width": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5182,9 +4765,8 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5194,27 +4776,24 @@ }, "node_modules/strip-bom": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/strip-final-newline": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -5224,9 +4803,8 @@ }, "node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -5236,9 +4814,8 @@ }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5248,9 +4825,8 @@ }, "node_modules/synckit": { "version": "0.8.5", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", - "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", "dev": true, + "license": "MIT", "dependencies": { "@pkgr/utils": "^2.3.1", "tslib": "^2.5.0" @@ -5264,9 +4840,8 @@ }, "node_modules/test-exclude": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, + "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -5278,15 +4853,13 @@ }, "node_modules/text-table": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/titleize": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", - "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -5296,24 +4869,21 @@ }, "node_modules/tmpl": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/to-fast-properties": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -5323,23 +4893,20 @@ }, "node_modules/toidentifier": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", "engines": { "node": ">=0.6" } }, "node_modules/tslib": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", - "dev": true + "version": "2.6.1", + "dev": true, + "license": "0BSD" }, "node_modules/type-check": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -5349,18 +4916,16 @@ }, "node_modules/type-detect": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/type-fest": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -5370,8 +4935,7 @@ }, "node_modules/type-is": { "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -5382,25 +4946,21 @@ }, "node_modules/unpipe": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/untildify": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/update-browserslist-db": { "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -5416,6 +4976,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -5429,63 +4990,51 @@ }, "node_modules/uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, "node_modules/utils-merge": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "license": "MIT", "engines": { "node": ">= 0.4.0" } }, "node_modules/v8-to-istanbul": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", - "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "version": "9.1.3", "dev": true, + "license": "ISC", "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" }, "engines": { "node": ">=10.12.0" } }, - "node_modules/v8-to-istanbul/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, "node_modules/vary": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/walker": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "makeerror": "1.0.12" } }, "node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -5498,9 +5047,8 @@ }, "node_modules/wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5515,15 +5063,13 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/write-file-atomic": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" @@ -5534,24 +5080,21 @@ }, "node_modules/y18n": { "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/yallist": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yargs": { "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -5567,18 +5110,16 @@ }, "node_modules/yargs-parser": { "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/yocto-queue": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -5586,4104 +5127,5 @@ "url": "https://github.com/sponsors/sindresorhus" } } - }, - "dependencies": { - "@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true - }, - "@ampproject/remapping": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", - "dev": true, - "requires": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/compat-data": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", - "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", - "dev": true - }, - "@babel/core": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz", - "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-module-transforms": "^7.23.0", - "@babel/helpers": "^7.23.0", - "@babel/parser": "^7.23.0", - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", - "@babel/types": "^7.23.0", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", - "dev": true, - "requires": { - "@babel/types": "^7.23.0", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", - "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.15", - "browserslist": "^4.21.9", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - } - }, - "@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", - "dev": true - }, - "@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", - "dev": true, - "requires": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-module-imports": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", - "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", - "dev": true, - "requires": { - "@babel/types": "^7.22.15" - } - }, - "@babel/helper-module-transforms": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", - "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.20" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", - "dev": true - }, - "@babel/helper-simple-access": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", - "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", - "dev": true - }, - "@babel/helpers": { - "version": "7.23.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz", - "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==", - "dev": true, - "requires": { - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", - "@babel/types": "^7.23.0" - } - }, - "@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.22.20", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", - "dev": true - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.22.5" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", - "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.22.5" - } - }, - "@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" - } - }, - "@babel/traverse": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", - "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", - "to-fast-properties": "^2.0.0" - } - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@eslint-community/eslint-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz", - "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^3.3.0" - } - }, - "@eslint-community/regexpp": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", - "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", - "dev": true - }, - "@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", - "dev": true - }, - "@humanwhocodes/config-array": { - "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^2.0.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/object-schema": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest/console": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0" - } - }, - "@jest/core": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/reporters": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.7.0", - "jest-config": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-resolve-dependencies": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "@jest/environment": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", - "dev": true, - "requires": { - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0" - } - }, - "@jest/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", - "dev": true, - "requires": { - "expect": "^29.7.0", - "jest-snapshot": "^29.7.0" - } - }, - "@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, - "requires": { - "jest-get-type": "^29.6.3" - } - }, - "@jest/fake-timers": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@sinonjs/fake-timers": "^10.0.2", - "@types/node": "*", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "@jest/globals": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/types": "^29.6.3", - "jest-mock": "^29.7.0" - } - }, - "@jest/reporters": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^6.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "v8-to-istanbul": "^9.0.1" - } - }, - "@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.27.8" - } - }, - "@jest/source-map": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.18", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", - "dev": true, - "requires": { - "@jest/test-result": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "slash": "^3.0.0" - } - }, - "@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - } - }, - "@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "requires": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - } - }, - "@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@pkgr/utils": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", - "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "fast-glob": "^3.3.0", - "is-glob": "^4.0.3", - "open": "^9.1.0", - "picocolors": "^1.0.0", - "tslib": "^2.6.0" - } - }, - "@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.0" - } - }, - "@types/babel__core": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", - "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==", - "dev": true, - "requires": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.5.tgz", - "integrity": "sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.2.tgz", - "integrity": "sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.2.tgz", - "integrity": "sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7" - } - }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, - "@types/graceful-fs": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.7.tgz", - "integrity": "sha512-MhzcwU8aUygZroVwL2jeYk6JisJrPl/oov/gsgGCue9mkgl9wjGbzReYQClxiUgFDnib9FuHqTndccKeZKxTRw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jest": { - "version": "29.5.10", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.10.tgz", - "integrity": "sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==", - "dev": true, - "requires": { - "expect": "^29.0.0", - "pretty-format": "^29.0.0" - } - }, - "@types/node": { - "version": "18.7.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.16.tgz", - "integrity": "sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==", - "dev": true - }, - "@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "@types/yargs": { - "version": "17.0.12", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.12.tgz", - "integrity": "sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - }, - "dependencies": { - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - } - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "requires": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "dependencies": { - "istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - } - } - } - }, - "babel-plugin-jest-hoist": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - } - }, - "babel-preset-jest": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true - }, - "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - } - }, - "bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "dev": true, - "requires": { - "big-integer": "^1.6.44" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browserslist": { - "version": "4.21.11", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", - "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001538", - "electron-to-chromium": "^1.4.526", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "bundle-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", - "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", - "dev": true, - "requires": { - "run-applescript": "^5.0.0" - } - }, - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001539", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz", - "integrity": "sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==", - "dev": true - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "ci-info": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz", - "integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", - "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", - "dev": true - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "requires": { - "safe-buffer": "5.2.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - } - } - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" - }, - "convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - }, - "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" - }, - "create-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "prompts": "^2.0.1" - } - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "dedent": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", - "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", - "dev": true, - "requires": {} - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true - }, - "default-browser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", - "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", - "dev": true, - "requires": { - "bundle-name": "^3.0.0", - "default-browser-id": "^3.0.0", - "execa": "^7.1.1", - "titleize": "^3.0.0" - }, - "dependencies": { - "execa": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.1.1.tgz", - "integrity": "sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - } - }, - "human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", - "dev": true - }, - "is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true - }, - "mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true - }, - "npm-run-path": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", - "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", - "dev": true, - "requires": { - "path-key": "^4.0.0" - } - }, - "onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "requires": { - "mimic-fn": "^4.0.0" - } - }, - "path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true - }, - "strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true - } - } - }, - "default-browser-id": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", - "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", - "dev": true, - "requires": { - "bplist-parser": "^0.2.0", - "untildify": "^4.0.0" - } - }, - "define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "dev": true - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "electron-to-chromium": { - "version": "1.4.529", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.529.tgz", - "integrity": "sha512-6uyPyXTo8lkv8SWAmjKFbG42U073TXlzD4R8rW3EzuznhFS2olCIAfjjQtV2dV2ar/vRF55KUd3zQYnCB0dd3A==", - "dev": true - }, - "emittery": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - }, - "eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", - "@humanwhocodes/config-array": "^0.11.13", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "dependencies": { - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - } - } - }, - "eslint-config-prettier": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", - "dev": true, - "requires": {} - }, - "eslint-plugin-prettier": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", - "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0", - "synckit": "^0.8.5" - } - }, - "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true - }, - "espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "requires": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, - "requires": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - } - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, - "fast-glob": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", - "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "dependencies": { - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - } - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", - "dev": true - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } - } - }, - "import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-inside-container": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", - "dev": true, - "requires": { - "is-docker": "^3.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "requires": { - "is-docker": "^2.0.0" - }, - "dependencies": { - "is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true - } - } - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz", - "integrity": "sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "istanbul-reports": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", - "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", - "dev": true, - "requires": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" - } - }, - "jest-changed-files": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0" - } - }, - "jest-circus": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^1.0.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^29.7.0", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0", - "pretty-format": "^29.7.0", - "pure-rand": "^6.0.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - } - }, - "jest-cli": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", - "dev": true, - "requires": { - "@jest/core": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "create-jest": "^29.7.0", - "exit": "^0.1.2", - "import-local": "^3.0.2", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "yargs": "^17.3.1" - } - }, - "jest-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-jest": "^29.7.0", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - } - }, - "jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-docblock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "jest-util": "^29.7.0", - "pretty-format": "^29.7.0" - } - }, - "jest-environment-node": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true - }, - "jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - } - }, - "jest-leak-detector": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", - "dev": true, - "requires": { - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - } - }, - "jest-mock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-util": "^29.7.0" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} - }, - "jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true - }, - "jest-resolve": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "resolve": "^1.20.0", - "resolve.exports": "^2.0.0", - "slash": "^3.0.0" - } - }, - "jest-resolve-dependencies": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", - "dev": true, - "requires": { - "jest-regex-util": "^29.6.3", - "jest-snapshot": "^29.7.0" - } - }, - "jest-runner": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/environment": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "graceful-fs": "^4.2.9", - "jest-docblock": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-leak-detector": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-resolve": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-util": "^29.7.0", - "jest-watcher": "^29.7.0", - "jest-worker": "^29.7.0", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - } - }, - "jest-runtime": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/globals": "^29.7.0", - "@jest/source-map": "^29.6.3", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - } - }, - "jest-snapshot": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-jsx": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "natural-compare": "^1.4.0", - "pretty-format": "^29.7.0", - "semver": "^7.5.3" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - } - }, - "jest-validate": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "leven": "^3.1.0", - "pretty-format": "^29.7.0" - }, - "dependencies": { - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - } - } - }, - "jest-watcher": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", - "dev": true, - "requires": { - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "jest-util": "^29.7.0", - "string-length": "^4.0.1" - } - }, - "jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "requires": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "requires": { - "semver": "^7.5.3" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "mime-db": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" - }, - "mime-types": { - "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", - "requires": { - "mime-db": "1.51.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" - }, - "nock": { - "version": "13.3.8", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.8.tgz", - "integrity": "sha512-96yVFal0c/W1lG7mmfRe7eO+hovrhJYd2obzzOZ90f6fjpeU/XNvd9cYHZKZAQJumDfhXgoTpkpJ9pvMj+hqHw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "json-stringify-safe": "^5.0.1", - "propagate": "^2.0.0" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==" - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "requires": { - "ee-first": "1.1.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "open": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", - "dev": true, - "requires": { - "default-browser": "^4.0.0", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^2.2.0" - } - }, - "optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, - "requires": { - "@aashutoshrathi/word-wrap": "^1.2.3", - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - }, - "dependencies": { - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - } - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", - "dev": true - }, - "prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "requires": { - "fast-diff": "^1.1.2" - } - }, - "pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "requires": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "propagate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", - "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", - "dev": true - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true - }, - "pure-rand": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz", - "integrity": "sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w==", - "dev": true - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "requires": { - "side-channel": "^1.0.4" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" - }, - "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "resolve": { - "version": "1.22.6", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", - "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==", - "dev": true, - "requires": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "resolve.exports": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", - "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", - "dev": true - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "run-applescript": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", - "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", - "dev": true, - "requires": { - "execa": "^5.0.0" - } - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - }, - "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - } - } - }, - "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - } - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "stack-utils": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", - "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "synckit": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", - "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", - "dev": true, - "requires": { - "@pkgr/utils": "^2.3.1", - "tslib": "^2.5.0" - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "titleize": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", - "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", - "dev": true - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" - }, - "tslib": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", - "dev": true - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" - }, - "untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true - }, - "update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" - }, - "v8-to-istanbul": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", - "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" - }, - "dependencies": { - "convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - } - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" - }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - } - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - }, - "yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - } } } diff --git a/tests/apihandler.test.js b/tests/apihandler.test.js index 0430239e..0192a47e 100644 --- a/tests/apihandler.test.js +++ b/tests/apihandler.test.js @@ -160,7 +160,7 @@ describe('ApiHandler', () => { .post('/items/TestItem') .reply(200, [{ name: 'TestItem' }]); const result = await apiHandler.sendCommand('TestItem', 'OFF'); - expect(result).toBeNull(); + expect(result).toBe(true); expect(scope.isDone()).toBe(true); }); diff --git a/tests/commands/appselect.test.js b/tests/commands/appselect.test.js index 9b91666e..3e122e1c 100644 --- a/tests/commands/appselect.test.js +++ b/tests/commands/appselect.test.js @@ -16,21 +16,16 @@ describe('appSelect Command', () => { test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'ApplicationItem', - metadata: { - ga: { - value: 'tvApplication' - } - } + const device = { + customData: { + members: { + tvApplication: 'ApplicationItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('ApplicationItem'); + expect(Command.getItemName(device)).toBe('ApplicationItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/armdisarm.test.js b/tests/commands/armdisarm.test.js index a3b60170..0d23dd93 100644 --- a/tests/commands/armdisarm.test.js +++ b/tests/commands/armdisarm.test.js @@ -37,9 +37,10 @@ describe('ArmDisarm Command', () => { describe('getItemName', () => { test('getItemName SimpleSecuritySystem', () => { - expect( - Command.getItemName({ name: 'SwitchItem' }, { customData: { deviceType: 'SimpleSecuritySystem' } }) - ).toStrictEqual('SwitchItem'); + const device = { + id: 'SwitchItem' + }; + expect(Command.getItemName(device)).toStrictEqual('SwitchItem'); }); describe('getItemName SecuritySystem', () => { @@ -47,51 +48,41 @@ describe('ArmDisarm Command', () => { const itemNameArmLevel = 'itemNameArmLevel'; test('getItemName SecuritySystem normal', () => { - const item = { - members: [ - { - name: itemNameArmed, - metadata: { ga: { value: SecuritySystem.armedMemberName } } - }, - { - name: itemNameArmLevel, - metadata: { ga: { value: SecuritySystem.armLevelMemberName } } - } - ] + const device = { + customData: { + deviceType: 'SecuritySystem', + members: {} + } }; - expect( - Command.getItemName(item, { customData: { deviceType: 'SecuritySystem' } }, { arm: true }) - ).toStrictEqual(itemNameArmed); - expect( - Command.getItemName(item, { customData: { deviceType: 'SecuritySystem' } }, { arm: true, armLevel: 'L1' }) - ).toStrictEqual(itemNameArmLevel); + device.customData.members[SecuritySystem.armedMemberName] = itemNameArmed; + device.customData.members[SecuritySystem.armLevelMemberName] = itemNameArmLevel; + expect(Command.getItemName(device, { arm: true })).toStrictEqual(itemNameArmed); + expect(Command.getItemName(device, { arm: true, armLevel: 'L1' })).toStrictEqual(itemNameArmLevel); }); test('getItemName SecuritySystem missing armed member', () => { - const item = { - members: [ - { - name: itemNameArmLevel, - metadata: { ga: { value: SecuritySystem.armLevelMemberName } } - } - ] + const device = { + customData: { + deviceType: 'SecuritySystem', + members: {} + } }; + device.customData.members[SecuritySystem.armLevelMemberName] = itemNameArmLevel; expect(() => { - Command.getItemName(item, { customData: { deviceType: 'SecuritySystem' } }, { arm: true }); + Command.getItemName(device, { arm: true }); }).toThrow(); }); test('getItemName SecuritySystem missing armLevel member', () => { - const item = { - members: [ - { - name: itemNameArmed, - metadata: { ga: { value: SecuritySystem.armedMemberName } } - } - ] + const device = { + customData: { + deviceType: 'SecuritySystem', + members: {} + } }; + device.customData.members[SecuritySystem.armedMemberName] = itemNameArmed; expect(() => { - Command.getItemName(item, { customData: { deviceType: 'SecuritySystem' } }, { arm: true, armLevel: 'L1' }); + Command.getItemName(device, { arm: true, armLevel: 'L1' }); }).toThrow(); }); }); @@ -173,9 +164,11 @@ describe('ArmDisarm Command', () => { name: 'itemName', members: [ { + type: 'Switch', metadata: { ga: { value: SecuritySystem.armedMemberName } } }, { + type: 'String', metadata: { ga: { value: SecuritySystem.armLevelMemberName } } } ] @@ -206,9 +199,7 @@ describe('ArmDisarm Command', () => { item.members[0].state = 'ON'; expect( - Command.validateUpdate({ arm: false }, item, { - customData: { deviceType: 'SecuritySystem', inverted: true } - }) + Command.validateUpdate({ arm: false }, item, { customData: { deviceType: 'SecuritySystem', inverted: true } }) ).toBeUndefined(); try { Command.validateUpdate({ arm: true }, item, { @@ -221,10 +212,15 @@ describe('ArmDisarm Command', () => { const item2 = { name: 'itemName', members: [ - { metadata: { ga: { value: SecuritySystem.armedMemberName } } }, - { metadata: { ga: { value: SecuritySystem.armLevelMemberName } } }, - { name: 'trouble', metadata: { ga: { value: 'securitySystemTrouble' } }, state: 'ON' }, - { name: 'errorCode', metadata: { ga: { value: 'securitySystemTroubleCode' } }, state: 'ErrorCode123' } + { type: 'Switch', metadata: { ga: { value: SecuritySystem.armedMemberName } } }, + { type: 'String', metadata: { ga: { value: SecuritySystem.armLevelMemberName } } }, + { type: 'Switch', name: 'trouble', metadata: { ga: { value: 'securitySystemTrouble' } }, state: 'ON' }, + { + type: 'String', + name: 'errorCode', + metadata: { ga: { value: 'securitySystemTroubleCode' } }, + state: 'ErrorCode123' + } ] }; expect( diff --git a/tests/commands/brightnessabsolute.test.js b/tests/commands/brightnessabsolute.test.js index f35e1607..4f713c33 100644 --- a/tests/commands/brightnessabsolute.test.js +++ b/tests/commands/brightnessabsolute.test.js @@ -7,30 +7,22 @@ describe('BrightnessAbsolute Command', () => { expect(Command.validateParams({ brightness: '100' })).toBe(false); }); - test('requiresItem', () => { - expect(Command.requiresItem({})).toBe(false); - expect(Command.requiresItem({ customData: { deviceType: 'SpecialColorLight' } })).toBe(true); - }); - test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'SpecialColorLight' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'SpecialColorLight' } }); }).toThrow(); - const item = { - name: 'Item', - members: [ - { - name: 'BrightnessItem', - metadata: { - ga: { - value: 'lightBrightness' - } - } + const device = { + id: 'Item', + customData: { + deviceType: 'SpecialColorLight', + members: { + lightBrightness: 'BrightnessItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'SpecialColorLight' } })).toBe('BrightnessItem'); + expect(Command.getItemName(device)).toBe('BrightnessItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/charge.test.js b/tests/commands/charge.test.js index b84ef2af..20e24ba6 100644 --- a/tests/commands/charge.test.js +++ b/tests/commands/charge.test.js @@ -6,28 +6,19 @@ describe('Charge Command', () => { expect(Command.validateParams({ charge: true })).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); - }); - test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'ChargingItem', - metadata: { - ga: { - value: 'chargerCharging' - } - } + const device = { + customData: { + members: { + chargerCharging: 'ChargingItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('ChargingItem'); + expect(Command.getItemName(device)).toBe('ChargingItem'); }); describe('convertParamsToValue', () => { @@ -44,6 +35,7 @@ describe('Charge Command', () => { const item = { members: [ { + type: 'Switch', metadata: { ga: { value: 'chargerCharging' @@ -52,6 +44,7 @@ describe('Charge Command', () => { state: 'OFF' }, { + type: 'Number', metadata: { ga: { value: 'chargerCapacityRemaining' diff --git a/tests/commands/colorabsolute.test.js b/tests/commands/colorabsolute.test.js index 38da4444..461b8cd0 100644 --- a/tests/commands/colorabsolute.test.js +++ b/tests/commands/colorabsolute.test.js @@ -13,31 +13,25 @@ describe('ColorAbsolute Command', () => { expect(Command.validateParams(params)).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem({})).toBe(false); - expect(Command.requiresItem({ customData: { deviceType: 'SpecialColorLight' } })).toBe(true); - }); - test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); - expect(Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'ColorLight' } })).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' }, { customData: {} })).toBe('Item'); + expect(Command.getItemName({ id: 'Item' }, { customData: { deviceType: 'ColorLight' } })).toBe('Item'); expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'SpecialColorLight' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'SpecialColorLight' } }); }).toThrow(); - const item = { - name: 'Item', - members: [ - { - name: 'ColorItem', - metadata: { - ga: { - value: 'lightColor' - } + expect( + Command.getItemName({ + id: 'Item', + customData: { + deviceType: 'SpecialColorLight', + members: { + lightColor: 'ColorItem' } } - ] - }; - expect(Command.getItemName(item, { customData: { deviceType: 'SpecialColorLight' } })).toBe('ColorItem'); + }) + ).toBe('ColorItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/colorabsolutetemperature.test.js b/tests/commands/colorabsolutetemperature.test.js index 62669e76..a4e76639 100644 --- a/tests/commands/colorabsolutetemperature.test.js +++ b/tests/commands/colorabsolutetemperature.test.js @@ -14,28 +14,27 @@ describe('ColorAbsoluteTemperature Command', () => { }); test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); + expect(Command.requiresItem({})).toBe(true); + expect(Command.requiresItem({ customData: { deviceType: 'SpecialColorLight' } })).toBe(false); }); test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'SpecialColorLight' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'SpecialColorLight' } }); }).toThrow(); - const item = { - name: 'Item', - members: [ - { - name: 'ColorTemperatureItem', - metadata: { - ga: { - value: 'lightColorTemperature' - } + expect( + Command.getItemName({ + id: 'Item', + customData: { + deviceType: 'SpecialColorLight', + members: { + lightColorTemperature: 'ColorItem' } } - ] - }; - expect(Command.getItemName(item, { customData: { deviceType: 'SpecialColorLight' } })).toBe('ColorTemperatureItem'); + }) + ).toBe('ColorItem'); }); describe('convertParamsToValue', () => { @@ -43,62 +42,46 @@ describe('ColorAbsoluteTemperature Command', () => { expect(Command.convertParamsToValue(params, { state: '100,100,50' }, {})).toBe('30.62,95,50'); }); - test('convertParamsToValue SpecialColorLight', () => { - const item = { - metadata: { - ga: { - config: { - colorTemperatureRange: '1000,5000' - } - } + test('convertParamsToValue SpecialColorLight Percent', () => { + const device = { + customData: { + deviceType: 'SpecialColorLight', + colorUnit: 'percent', + colorTemperatureRange: { temperatureMinK: 1000, temperatureMaxK: 5000 } } }; - const device = { customData: { deviceType: 'SpecialColorLight' } }; - expect(Command.convertParamsToValue(params, item, device)).toBe('25'); - expect(Command.convertParamsToValue(params, { state: '100,100,50' }, device)).toBe('0'); + expect(Command.convertParamsToValue(params, {}, device)).toBe('25'); }); - test('convertParamsToValue SpecialColorLight Kelvin', () => { - const item = { - metadata: { - ga: { - config: { - colorUnit: 'kelvin' - } - } + test('convertParamsToValue SpecialColorLight Percent Inverted', () => { + const device = { + customData: { + deviceType: 'SpecialColorLight', + colorUnit: 'percent', + colorTemperatureRange: { temperatureMinK: 1000, temperatureMaxK: 5000 }, + colorTemperatureInverted: true } }; - const device = { customData: { deviceType: 'SpecialColorLight' } }; - expect(Command.convertParamsToValue(params, item, device)).toBe('2000'); + expect(Command.convertParamsToValue(params, {}, device)).toBe('75'); }); - test('convertParamsToValue SpecialColorLight Mired', () => { - const item = { - metadata: { - ga: { - config: { - colorUnit: 'mired' - } - } + test('convertParamsToValue SpecialColorLight Invalid', () => { + const device = { + customData: { + deviceType: 'SpecialColorLight' } }; - const device = { customData: { deviceType: 'SpecialColorLight' } }; - expect(Command.convertParamsToValue(params, item, device)).toBe('500'); + expect(Command.convertParamsToValue(params, { state: '100,100,50' }, device)).toBe('0'); }); - test('convertParamsToValue SpecialColorLight Percent Inverted', () => { - const item = { - metadata: { - ga: { - config: { - colorTemperatureRange: '1000,5000', - colorTemperatureInverted: true - } - } - } - }; - const device = { customData: { deviceType: 'SpecialColorLight' } }; - expect(Command.convertParamsToValue(params, item, device)).toBe('75'); + test('convertParamsToValue SpecialColorLight Kelvin', () => { + const device = { customData: { deviceType: 'SpecialColorLight', colorUnit: 'kelvin' } }; + expect(Command.convertParamsToValue(params, {}, device)).toBe('2000'); + }); + + test('convertParamsToValue SpecialColorLight Mired', () => { + const device = { customData: { deviceType: 'SpecialColorLight', colorUnit: 'mired' } }; + expect(Command.convertParamsToValue(params, {}, device)).toBe('500'); }); }); diff --git a/tests/commands/default.test.js b/tests/commands/default.test.js index 18cc3ca3..a11122ef 100644 --- a/tests/commands/default.test.js +++ b/tests/commands/default.test.js @@ -25,7 +25,7 @@ class TestCommand2 extends TestCommand1 { // @ts-ignore class TestCommand3 extends TestCommand1 { static convertParamsToValue() { - return; + return null; } } @@ -68,7 +68,14 @@ describe('Default Command', () => { }); test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {}, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' }, {})).toBe('Item'); + }); + + test('getMembers', () => { + expect(Command.getMembers({})).toStrictEqual({}); + expect(Command.getMembers({ customData: { members: { testMember: 'testItem' } } })).toStrictEqual({ + testMember: 'testItem' + }); }); test('isInverted', () => { @@ -82,6 +89,14 @@ describe('Default Command', () => { expect(Command.requiresItem({})).toBe(false); }); + test('getNormalizedState', () => { + expect(Command.getNormalizedState({ type: 'Switch', state: 'ON' })).toBe('ON'); + expect(Command.getNormalizedState({ type: 'Number', state: '1' })).toBe('1'); + expect(Command.getNormalizedState({ type: 'Number:Temperature', state: '10 °C' })).toBe('10'); + expect(Command.getNormalizedState({ type: 'Number:DataAmount', state: '3.9375 GB' })).toBe('3.9375'); + expect(Command.getNormalizedState({ type: 'Number:Energy', state: 'NULL' })).toBe('NULL'); + }); + test('checkCurrentState', () => { expect.assertions(2); @@ -93,14 +108,6 @@ describe('Default Command', () => { } }); - test('getNormalizedState', () => { - expect(Command.getNormalizedState({ type: 'Switch', state: 'ON' })).toBe('ON'); - expect(Command.getNormalizedState({ type: 'Number', state: '1' })).toBe('1'); - expect(Command.getNormalizedState({ type: 'Number:Temperature', state: '10 °C' })).toBe('10'); - expect(Command.getNormalizedState({ type: 'Number:DataAmount', state: '3.9375 GB' })).toBe('3.9375'); - expect(Command.getNormalizedState({ type: 'Number:Energy', state: 'NULL' })).toBe('NULL'); - }); - test('handleAuthPin', () => { expect(Command.handleAuthPin({ id: 'Item', customData: {} }, undefined, {})).toBeUndefined(); expect( @@ -335,7 +342,7 @@ describe('Default Command', () => { }); test('execute with device not found', async () => { - getItemMock.mockReturnValue(Promise.reject({ statusCode: '404' })); + getItemMock.mockRejectedValue({ statusCode: '404' }); const devices = [{ id: 'Item1' }]; const result = await TestCommand2.execute(apiHandler, devices, { on: true }, {}); expect(getItemMock).toHaveBeenCalledTimes(1); @@ -364,7 +371,7 @@ describe('Default Command', () => { }); test('execute with device offline', async () => { - sendCommandMock.mockReturnValue(Promise.reject({ statusCode: 500 })); + sendCommandMock.mockRejectedValue({ statusCode: 500 }); const devices = [{ id: 'Item1' }]; const result = await TestCommand1.execute(apiHandler, devices, { on: true }, {}); expect(getItemMock).toHaveBeenCalledTimes(0); @@ -379,7 +386,7 @@ describe('Default Command', () => { }); test('execute with errorCode', async () => { - sendCommandMock.mockReturnValue(Promise.reject({ errorCode: 'noAvailableChannel' })); + sendCommandMock.mockRejectedValue({ errorCode: 'noAvailableChannel' }); const devices = [{ id: 'Item1' }]; const result = await TestCommand1.execute(apiHandler, devices, { on: true }, {}); expect(getItemMock).toHaveBeenCalledTimes(0); @@ -450,15 +457,16 @@ describe('Default Command', () => { }); test('execute with failing checkCurrentState with members', async () => { - getItemMock.mockReturnValue( - Promise.resolve({ - name: 'Item1', - type: 'Group', - state: 'NULL', - metadata: { ga: { value: 'TV' } }, - members: [{ name: 'PowerItem', type: 'Switch', state: 'ON', metadata: { ga: { value: 'tvPower' } } }] - }) - ); + const groupItem = { + name: 'Item1', + type: 'Group', + state: 'NULL', + metadata: { + ga: { value: 'TV' } + }, + members: [{ name: 'PowerItem', type: 'Switch', state: 'ON', metadata: { ga: { value: 'tvPower' } } }] + }; + getItemMock.mockReturnValue(Promise.resolve(groupItem)); const devices = [{ id: 'Item1', customData: { checkState: true } }]; const result = await TestCommand2.execute(apiHandler, devices, { on: true }, {}); expect(checkCurrentStateSpy).toHaveBeenCalledTimes(1); diff --git a/tests/commands/medianext.test.js b/tests/commands/medianext.test.js index 9e35479c..5ade4f88 100644 --- a/tests/commands/medianext.test.js +++ b/tests/commands/medianext.test.js @@ -5,35 +5,18 @@ describe('mediaNext Command', () => { expect(Command.validateParams({})).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); - }); - - describe('getItemName', () => { - test('getItemName', () => { - const item = { - members: [ - { - name: 'TransportItem', - metadata: { - ga: { - value: 'tvTransport' - } - } - } - ] - }; - expect(Command.getItemName(item)).toBe('TransportItem'); - }); - - test('getItemName no transport', () => { - const item = { - members: [] - }; - expect(() => { - Command.getItemName(item); - }).toThrow(); - }); + test('getItemName', () => { + const device = { + customData: { + members: { + tvTransport: 'TransportItem' + } + } + }; + expect(Command.getItemName(device)).toBe('TransportItem'); + expect(() => { + Command.getItemName({ customData: { members: {} } }); + }).toThrow(); }); test('convertParamsToValue', () => { diff --git a/tests/commands/mediapause.test.js b/tests/commands/mediapause.test.js index 45e063d9..b781458b 100644 --- a/tests/commands/mediapause.test.js +++ b/tests/commands/mediapause.test.js @@ -5,35 +5,18 @@ describe('mediaPause Command', () => { expect(Command.validateParams({})).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); - }); - - describe('getItemName', () => { - test('getItemName', () => { - const item = { - members: [ - { - name: 'TransportItem', - metadata: { - ga: { - value: 'tvTransport' - } - } - } - ] - }; - expect(Command.getItemName(item)).toBe('TransportItem'); - }); - - test('getItemName no transport', () => { - const item = { - members: [] - }; - expect(() => { - Command.getItemName(item); - }).toThrow(); - }); + test('getItemName', () => { + const device = { + customData: { + members: { + tvTransport: 'TransportItem' + } + } + }; + expect(Command.getItemName(device)).toBe('TransportItem'); + expect(() => { + Command.getItemName({ customData: { members: {} } }); + }).toThrow(); }); test('convertParamsToValue', () => { diff --git a/tests/commands/mediaprevious.test.js b/tests/commands/mediaprevious.test.js index 71c1c86d..127297cb 100644 --- a/tests/commands/mediaprevious.test.js +++ b/tests/commands/mediaprevious.test.js @@ -5,35 +5,18 @@ describe('mediaPrevious Command', () => { expect(Command.validateParams({})).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); - }); - - describe('getItemName', () => { - test('getItemName', () => { - const item = { - members: [ - { - name: 'TransportItem', - metadata: { - ga: { - value: 'tvTransport' - } - } - } - ] - }; - expect(Command.getItemName(item)).toBe('TransportItem'); - }); - - test('getItemName no transport', () => { - const item = { - members: [] - }; - expect(() => { - Command.getItemName(item); - }).toThrow(); - }); + test('getItemName', () => { + const device = { + customData: { + members: { + tvTransport: 'TransportItem' + } + } + }; + expect(Command.getItemName(device)).toBe('TransportItem'); + expect(() => { + Command.getItemName({ customData: { members: {} } }); + }).toThrow(); }); test('convertParamsToValue', () => { diff --git a/tests/commands/mediaresume.test.js b/tests/commands/mediaresume.test.js index 1a689a9e..4fbc1a80 100644 --- a/tests/commands/mediaresume.test.js +++ b/tests/commands/mediaresume.test.js @@ -5,35 +5,18 @@ describe('mediaResume Command', () => { expect(Command.validateParams({})).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); - }); - - describe('getItemName', () => { - test('getItemName', () => { - const item = { - members: [ - { - name: 'TransportItem', - metadata: { - ga: { - value: 'tvTransport' - } - } - } - ] - }; - expect(Command.getItemName(item)).toBe('TransportItem'); - }); - - test('getItemName no transport', () => { - const item = { - members: [] - }; - expect(() => { - Command.getItemName(item); - }).toThrow(); - }); + test('getItemName', () => { + const device = { + customData: { + members: { + tvTransport: 'TransportItem' + } + } + }; + expect(Command.getItemName(device)).toBe('TransportItem'); + expect(() => { + Command.getItemName({ customData: { members: {} } }); + }).toThrow(); }); test('convertParamsToValue', () => { diff --git a/tests/commands/mute.test.js b/tests/commands/mute.test.js index 07991c62..fe49b2fe 100644 --- a/tests/commands/mute.test.js +++ b/tests/commands/mute.test.js @@ -6,54 +6,42 @@ describe('Mute Command', () => { expect(Command.validateParams({ mute: true })).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem({})).toBe(false); - expect(Command.requiresItem({ customData: { deviceType: 'TV' } })).toBe(true); - }); - describe('getItemName', () => { test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); }); test('getItemName TV no members', () => { expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'TV' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'TV' } }); }).toThrow(); }); test('getItemName TV mute', () => { - const item = { - name: 'Item', - members: [ - { - name: 'MuteItem', - metadata: { - ga: { - value: 'tvMute' - } - } + const device = { + id: 'Item', + customData: { + deviceType: 'TV', + members: { + tvMute: 'MuteItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'TV' } })).toBe('MuteItem'); + expect(Command.getItemName(device)).toBe('MuteItem'); }); test('getItemName TV volume', () => { - const item = { - name: 'Item', - members: [ - { - name: 'VolumeItem', - metadata: { - ga: { - value: 'tvVolume' - } - } + const device = { + id: 'Item', + customData: { + deviceType: 'TV', + members: { + tvVolume: 'VolumeItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'TV' } })).toBe('VolumeItem'); + expect(Command.getItemName(device)).toBe('VolumeItem'); }); }); @@ -78,33 +66,19 @@ describe('Mute Command', () => { }); test('convertParamsToValue TV mute', () => { - const item = { - members: [ - { - metadata: { - ga: { - value: 'tvMute' - } - } - } - ] - }; - expect(Command.convertParamsToValue({ mute: true }, item, { customData: { deviceType: 'TV' } })).toBe('ON'); + expect( + Command.convertParamsToValue({ mute: true }, undefined, { + customData: { deviceType: 'TV', members: { tvMute: 'MuteItem' } } + }) + ).toBe('ON'); }); test('convertParamsToValue TV volume', () => { - const item = { - members: [ - { - metadata: { - ga: { - value: 'tvVolume' - } - } - } - ] - }; - expect(Command.convertParamsToValue({ mute: true }, item, { customData: { deviceType: 'TV' } })).toBe('0'); + expect( + Command.convertParamsToValue({ mute: true }, undefined, { + customData: { deviceType: 'TV', members: { tvVolume: 'VolumeItem' } } + }) + ).toBe('0'); }); }); diff --git a/tests/commands/onoff.test.js b/tests/commands/onoff.test.js index 60d273e1..2ac93e6d 100644 --- a/tests/commands/onoff.test.js +++ b/tests/commands/onoff.test.js @@ -6,69 +6,93 @@ describe('OnOff Command', () => { expect(Command.validateParams({ on: true })).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem({})).toBe(false); - expect(Command.requiresItem({ customData: { deviceType: 'SpecialColorLight' } })).toBe(true); - expect(Command.requiresItem({ customData: { deviceType: 'TV' } })).toBe(true); - }); - describe('getItemName', () => { test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); }); - test('getItemName SpecialColorLight', () => { + test('getItemName DynamicModesLight', () => { expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'SpecialColorLight' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'DynamicModesLight' } }); }).toThrow(); + }); - const item = { - members: [ - { - name: 'BrightnessItem', - metadata: { - ga: { - value: 'lightBrightness' - } - } + test('getItemName SpecialColorLight', () => { + expect(() => { + Command.getItemName({ id: 'Item', customData: { deviceType: 'SpecialColorLight' } }); + }).toThrow(); + const device = { + id: 'Item', + customData: { + deviceType: 'SpecialColorLight', + members: { + lightBrightness: 'BrightnessItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'SpecialColorLight' } })).toBe('BrightnessItem'); - - const item_power = { - members: [ - { - name: 'PowerItem', - metadata: { - ga: { - value: 'lightPower' - } - } + expect(Command.getItemName(device)).toBe('BrightnessItem'); + const device_power = { + id: 'Item', + customData: { + deviceType: 'SpecialColorLight', + members: { + lightPower: 'PowerItem' } - ] + } }; - expect(Command.getItemName(item_power, { customData: { deviceType: 'SpecialColorLight' } })).toBe('PowerItem'); + expect(Command.getItemName(device_power)).toBe('PowerItem'); }); test('getItemName TV', () => { expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'TV' } }); + Command.getItemName({ name: 'Item', customData: { deviceType: 'TV' } }); }).toThrow(); + const device = { + id: 'Item', + customData: { + deviceType: 'TV', + members: { + tvPower: 'PowerItem' + } + } + }; + expect(Command.getItemName(device)).toBe('PowerItem'); + }); - const item = { - members: [ - { - name: 'PowerItem', - metadata: { - ga: { - value: 'tvPower' - } - } + test('getItemName Fan', () => { + expect(() => { + Command.getItemName({ name: 'Item', customData: { deviceType: 'Fan', itemType: 'Group' } }); + }).toThrow(); + const device = { + id: 'Item', + customData: { + deviceType: 'Fan', + itemType: 'Group', + members: { + fanPower: 'PowerItem' + } + } + }; + expect(Command.getItemName(device)).toBe('PowerItem'); + expect(Command.getItemName({ id: 'Item', customData: { deviceType: 'Fan', itemType: 'Dimmer' } })).toBe('Item'); + }); + + test('getItemName ACUnit', () => { + expect(() => { + Command.getItemName({ name: 'Item', customData: { deviceType: 'ACUnit', itemType: 'Group' } }); + }).toThrow(); + const device = { + id: 'Item', + customData: { + deviceType: 'ACUnit', + itemType: 'Group', + members: { + fanPower: 'PowerItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'TV' } })).toBe('PowerItem'); + expect(Command.getItemName(device)).toBe('PowerItem'); }); }); diff --git a/tests/commands/selectchannel.test.js b/tests/commands/selectchannel.test.js index 35f30b13..931eb0e5 100644 --- a/tests/commands/selectchannel.test.js +++ b/tests/commands/selectchannel.test.js @@ -14,21 +14,16 @@ describe('selectChannel Command', () => { test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'ChannelItem', - metadata: { - ga: { - value: 'tvChannel' - } - } + const device = { + customData: { + members: { + tvChannel: 'ChannelItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('ChannelItem'); + expect(Command.getItemName(device)).toBe('ChannelItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/setfanspeed.test.js b/tests/commands/setfanspeed.test.js index adc7a105..66d5a86b 100644 --- a/tests/commands/setfanspeed.test.js +++ b/tests/commands/setfanspeed.test.js @@ -1,18 +1,64 @@ const Command = require('../../functions/commands/setfanspeed.js'); describe('SetFanSpeed Command', () => { - const params = { fanSpeed: '50' }; - test('validateParams', () => { expect(Command.validateParams({})).toBe(false); - expect(Command.validateParams(params)).toBe(true); + expect(Command.validateParams({ fanSpeed: '50' })).toBe(true); + expect(Command.validateParams({ fanSpeedPercent: 50 })).toBe(true); + }); + + describe('getItemName', () => { + test('getItemName', () => { + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); + }); + + test('getItemName Fan', () => { + expect(() => { + Command.getItemName({ id: 'Item', customData: { deviceType: 'Fan', itemType: 'Group' } }); + }).toThrow(); + const device = { + customData: { + deviceType: 'Fan', + itemType: 'Group', + members: { + fanSpeed: 'SpeedItem' + } + } + }; + expect(Command.getItemName(device)).toBe('SpeedItem'); + expect(Command.getItemName({ id: 'Item', customData: { deviceType: 'Fan', itemType: 'Dimmer' } })).toBe('Item'); + }); + + test('getItemName ACUnit', () => { + expect(() => { + Command.getItemName({ id: 'Item', customData: { deviceType: 'ACUnit', itemType: 'Group' } }); + }).toThrow(); + const device = { + customData: { + deviceType: 'ACUnit', + itemType: 'Group', + members: { + fanSpeed: 'SpeedItem' + } + } + }; + expect(Command.getItemName(device)).toBe('SpeedItem'); + }); }); test('convertParamsToValue', () => { - expect(Command.convertParamsToValue(params)).toBe('50'); + expect(Command.convertParamsToValue({ fanSpeed: '50' })).toStrictEqual('50'); + expect(Command.convertParamsToValue({ fanSpeedPercent: 50 })).toStrictEqual('50'); }); test('getResponseStates', () => { - expect(Command.getResponseStates(params)).toStrictEqual({ currentFanSpeedSetting: '50' }); + expect(Command.getResponseStates({ fanSpeed: '50' })).toStrictEqual({ + currentFanSpeedPercent: 50, + currentFanSpeedSetting: '50' + }); + expect(Command.getResponseStates({ fanSpeedPercent: 50 })).toStrictEqual({ + currentFanSpeedPercent: 50 + }); }); }); diff --git a/tests/commands/setfanspeedpercent.test.js b/tests/commands/setfanspeedpercent.test.js deleted file mode 100644 index 3b7db5df..00000000 --- a/tests/commands/setfanspeedpercent.test.js +++ /dev/null @@ -1,18 +0,0 @@ -const Command = require('../../functions/commands/setfanspeedpercent.js'); - -describe('SetFanSpeed Command', () => { - const params = { fanSpeedPercent: 50 }; - - test('validateParams', () => { - expect(Command.validateParams({})).toBe(false); - expect(Command.validateParams(params)).toBe(true); - }); - - test('convertParamsToValue', () => { - expect(Command.convertParamsToValue(params)).toBe('50'); - }); - - test('getResponseStates', () => { - expect(Command.getResponseStates(params)).toStrictEqual({ currentFanSpeedPercent: 50 }); - }); -}); diff --git a/tests/commands/setinput.test.js b/tests/commands/setinput.test.js index 507a7cc0..f8b386b4 100644 --- a/tests/commands/setinput.test.js +++ b/tests/commands/setinput.test.js @@ -8,27 +8,18 @@ describe('SetInput Command', () => { expect(Command.validateParams(params)).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem()).toBe(true); - }); - test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'InputItem', - metadata: { - ga: { - value: 'tvInput' - } - } + const device = { + customData: { + members: { + tvInput: 'InputItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('InputItem'); + expect(Command.getItemName(device)).toBe('InputItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/setmodes.test.js b/tests/commands/setmodes.test.js new file mode 100644 index 00000000..d085f05a --- /dev/null +++ b/tests/commands/setmodes.test.js @@ -0,0 +1,59 @@ +const Command = require('../../functions/commands/setmodes.js'); + +describe('SetModes Command', () => { + const params = { updateModeSettings: { mode: 'value' } }; + + test('validateParams', () => { + expect(Command.validateParams({})).toBe(false); + expect(Command.validateParams(params)).toBe(true); + }); + + describe('getItemName', () => { + test('getItemName', () => { + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); + }); + + test('getItemName DynamicModesLight', () => { + expect(() => { + Command.getItemName({ id: 'Item', customData: { deviceType: 'DynamicModesLight' } }); + }).toThrow(); + const device = { + id: 'Item', + customData: { + deviceType: 'DynamicModesLight', + members: { + modesCurrentMode: 'CurrentMode' + } + } + }; + expect(Command.getItemName(device)).toBe('CurrentMode'); + }); + + test('getItemName Fan', () => { + expect(() => { + Command.getItemName({ name: 'Item', customData: { deviceType: 'Fan' } }); + }).toThrow(); + const device = { + id: 'Item', + customData: { + deviceType: 'Fan', + members: { + fanMode: 'ModeItem' + } + } + }; + expect(Command.getItemName(device)).toBe('ModeItem'); + }); + }); + + test('convertParamsToValue', () => { + expect(Command.convertParamsToValue(params)).toBe('value'); + }); + + test('getResponseStates', () => { + expect(Command.getResponseStates(params)).toStrictEqual({ + currentModeSettings: { mode: 'value' } + }); + }); +}); diff --git a/tests/commands/setvolume.test.js b/tests/commands/setvolume.test.js index 94a29b6a..0c207e41 100644 --- a/tests/commands/setvolume.test.js +++ b/tests/commands/setvolume.test.js @@ -8,33 +8,25 @@ describe('setVolume Command', () => { expect(Command.validateParams(params)).toBe(true); }); - test('requiresItem', () => { - expect(Command.requiresItem({})).toBe(false); - expect(Command.requiresItem({ customData: { deviceType: 'TV' } })).toBe(true); - }); - describe('getItemName', () => { test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); }); test('getItemName TV', () => { expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'TV' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'TV' } }); }).toThrow(); - const item = { - members: [ - { - name: 'VolumeItem', - metadata: { - ga: { - value: 'tvVolume' - } - } + const device = { + customData: { + deviceType: 'TV', + members: { + tvVolume: 'VolumeItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'TV' } })).toBe('VolumeItem'); + expect(Command.getItemName(device)).toBe('VolumeItem'); }); }); diff --git a/tests/commands/thermostatsetmode.test.js b/tests/commands/thermostatsetmode.test.js index 66db2b63..330c6e85 100644 --- a/tests/commands/thermostatsetmode.test.js +++ b/tests/commands/thermostatsetmode.test.js @@ -14,21 +14,16 @@ describe('ThermostatSetMode Command', () => { test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'ModeItem', - metadata: { - ga: { - value: 'thermostatMode' - } - } + const device = { + customData: { + members: { + thermostatMode: 'ModeItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('ModeItem'); + expect(Command.getItemName(device)).toBe('ModeItem'); }); test('convertParamsToValue', () => { @@ -36,7 +31,7 @@ describe('ThermostatSetMode Command', () => { metadata: { ga: { config: { - modes: 'eco=ECO' + thermostatModes: 'eco=ECO' } } } diff --git a/tests/commands/thermostattemperaturesetpoint.test.js b/tests/commands/thermostattemperaturesetpoint.test.js index 095d4e22..5308bc39 100644 --- a/tests/commands/thermostattemperaturesetpoint.test.js +++ b/tests/commands/thermostattemperaturesetpoint.test.js @@ -14,21 +14,16 @@ describe('ThermostatTemperatureSetpoint Command', () => { test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'SetpointItem', - metadata: { - ga: { - value: 'thermostatTemperatureSetpoint' - } - } + const device = { + customData: { + members: { + thermostatTemperatureSetpoint: 'SetpointItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('SetpointItem'); + expect(Command.getItemName(device)).toBe('SetpointItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/thermostattemperaturesetpointhigh.test.js b/tests/commands/thermostattemperaturesetpointhigh.test.js index b499765c..c1c73651 100644 --- a/tests/commands/thermostattemperaturesetpointhigh.test.js +++ b/tests/commands/thermostattemperaturesetpointhigh.test.js @@ -14,21 +14,16 @@ describe('ThermostatTemperatureSetpointHigh Command', () => { test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'SetpointItem', - metadata: { - ga: { - value: 'thermostatTemperatureSetpointHigh' - } - } + const device = { + customData: { + members: { + thermostatTemperatureSetpointHigh: 'SetpointItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('SetpointItem'); + expect(Command.getItemName(device)).toBe('SetpointItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/thermostattemperaturesetpointlow.test.js b/tests/commands/thermostattemperaturesetpointlow.test.js index 71b1c599..0322cb09 100644 --- a/tests/commands/thermostattemperaturesetpointlow.test.js +++ b/tests/commands/thermostattemperaturesetpointlow.test.js @@ -14,21 +14,16 @@ describe('ThermostatTemperatureSetpointLow Command', () => { test('getItemName', () => { expect(() => { - Command.getItemName({ name: 'Item' }); + Command.getItemName({ id: 'Item' }); }).toThrow(); - const item = { - members: [ - { - name: 'SetpointItem', - metadata: { - ga: { - value: 'thermostatTemperatureSetpointLow' - } - } + const device = { + customData: { + members: { + thermostatTemperatureSetpointLow: 'SetpointItem' } - ] + } }; - expect(Command.getItemName(item)).toBe('SetpointItem'); + expect(Command.getItemName(device)).toBe('SetpointItem'); }); test('convertParamsToValue', () => { diff --git a/tests/commands/volumerelative.test.js b/tests/commands/volumerelative.test.js index da4b8c9d..9556839d 100644 --- a/tests/commands/volumerelative.test.js +++ b/tests/commands/volumerelative.test.js @@ -14,26 +14,23 @@ describe('volumeRelative Command', () => { describe('getItemName', () => { test('getItemName', () => { - expect(Command.getItemName({ name: 'Item' }, {})).toBe('Item'); + expect(Command.getItemName({ id: 'Item' })).toBe('Item'); + expect(Command.getItemName({ id: 'Item', customData: {} })).toBe('Item'); }); test('getItemName TV', () => { expect(() => { - Command.getItemName({ name: 'Item' }, { customData: { deviceType: 'TV' } }); + Command.getItemName({ id: 'Item', customData: { deviceType: 'TV' } }); }).toThrow(); - const item = { - members: [ - { - name: 'VolumeItem', - metadata: { - ga: { - value: 'tvVolume' - } - } + const device = { + customData: { + deviceType: 'TV', + members: { + tvVolume: 'VolumeItem' } - ] + } }; - expect(Command.getItemName(item, { customData: { deviceType: 'TV' } })).toBe('VolumeItem'); + expect(Command.getItemName(device)).toBe('VolumeItem'); }); }); @@ -49,6 +46,7 @@ describe('volumeRelative Command', () => { members: [ { state: '20', + type: 'Number', metadata: { ga: { value: 'tvVolume' diff --git a/tests/devices/acunit.test.js b/tests/devices/acunit.test.js new file mode 100644 index 00000000..23765c56 --- /dev/null +++ b/tests/devices/acunit.test.js @@ -0,0 +1,251 @@ +const Device = require('../../functions/devices/acunit.js'); + +describe('ACUnit Device', () => { + test('matchesDeviceType', () => { + expect( + Device.matchesDeviceType({ + type: 'Group', + metadata: { + ga: { + value: 'AC_Unit' + } + } + }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + type: 'Group', + metadata: { + ga: { + value: 'AC_Unit' + } + }, + members: [ + { + type: 'Number', + state: '10', + metadata: { + ga: { + value: 'fanSpeed' + } + } + } + ] + }) + ).toBe(true); + }); + + test('matchesItemType', () => { + expect(Device.matchesItemType({ type: 'Dimmer' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group' })).toBe(true); + }); + + describe('getTraits', () => { + const item = { + members: [ + { + type: 'Switch', + state: 'ON', + metadata: { + ga: { + value: 'fanPower' + } + } + }, + { + type: 'Dimmer', + state: '50', + metadata: { + ga: { + value: 'fanSpeed' + } + } + }, + { + type: 'String', + state: 'Mode1', + metadata: { + ga: { + value: 'fanMode' + } + } + }, + { + type: 'Number', + state: '10', + metadata: { + ga: { + value: 'fanFilterLifeTime' + } + } + } + ] + }; + expect(Device.getTraits(item)).toStrictEqual([ + 'action.devices.traits.OnOff', + 'action.devices.traits.FanSpeed', + 'action.devices.traits.Modes', + 'action.devices.traits.SensorState', + 'action.devices.traits.TemperatureSetting' + ]); + }); + + describe('getAttributes', () => { + test('getAttributes no config', () => { + const item = { + metadata: { + ga: { + config: {} + } + } + }; + expect(Device.getAttributes(item)).toStrictEqual({ + availableThermostatModes: ['off', 'heat', 'cool', 'on', 'heatcool', 'auto', 'eco'], + thermostatTemperatureUnit: 'C', + supportsFanSpeedPercent: true + }); + }); + }); + + describe('getState', () => { + test('getState', () => { + const item = { + type: 'Group', + members: [ + { + name: 'Mode', + type: 'String', + state: 'on', + metadata: { + ga: { + value: 'thermostatMode' + } + } + }, + { + name: 'Setpoint', + type: 'Number', + state: '20', + metadata: { + ga: { + value: 'thermostatTemperatureSetpoint' + } + } + }, + { + name: 'High', + type: 'Number', + state: '25', + metadata: { + ga: { + value: 'thermostatTemperatureSetpointHigh' + } + } + }, + { + name: 'Low', + type: 'Number', + state: '5', + metadata: { + ga: { + value: 'thermostatTemperatureSetpointLow' + } + } + }, + { + name: 'Temperature', + type: 'Number', + state: '20', + metadata: { + ga: { + value: 'thermostatTemperatureAmbient' + } + } + }, + { + name: 'Humidity', + type: 'Number', + state: '50', + metadata: { + ga: { + value: 'thermostatHumidityAmbient' + } + } + }, + { + name: 'FanSpeed', + type: 'Number', + state: '20', + metadata: { + ga: { + value: 'fanSpeed' + } + } + }, + { + name: 'FanPower', + type: 'Switch', + state: 'ON', + metadata: { + ga: { + value: 'fanPower' + } + } + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + currentFanSpeedPercent: 20, + on: true, + thermostatHumidityAmbient: 50, + thermostatMode: 'on', + thermostatTemperatureAmbient: 20, + thermostatTemperatureSetpoint: 20, + thermostatTemperatureSetpointHigh: 25, + thermostatTemperatureSetpointLow: 5 + }); + }); + + test('getState speeds', () => { + const item = { + type: 'Group', + metadata: { + ga: { + config: { + ordered: true, + fanSpeeds: '0=null:off,50=slow,100=full:fast', + lang: 'en' + } + } + }, + members: [ + { + name: 'FanSpeed', + state: '50', + type: 'Number', + metadata: { + ga: { + value: 'fanSpeed' + } + } + }, + { + name: 'FanPower', + state: 'ON', + type: 'Switch', + metadata: { + ga: { + value: 'fanPower' + } + } + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + currentFanSpeedPercent: 50, + currentFanSpeedSetting: '50', + on: true + }); + }); + }); +}); diff --git a/tests/devices/camera.test.js b/tests/devices/camera.test.js index 78f397c5..af2628ab 100644 --- a/tests/devices/camera.test.js +++ b/tests/devices/camera.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/camera.js'); describe('Camera Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'CAMERA' diff --git a/tests/devices/charger.test.js b/tests/devices/charger.test.js index 838441e3..08dd14da 100644 --- a/tests/devices/charger.test.js +++ b/tests/devices/charger.test.js @@ -1,33 +1,42 @@ const Device = require('../../functions/devices/charger.js'); describe('Charger Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ + type: 'Group', metadata: { ga: { value: 'Charger' } } }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + type: 'Group', + metadata: { + ga: { + value: 'Charger' + } + }, + members: [ + { + type: 'Switch', + metadata: { + ga: { + value: 'chargerCharging' + } + } + } + ] + }) ).toBe(true); }); test('matchesItemType', () => { - const item = { - type: 'Group', - members: [ - { - metadata: { - ga: { - value: 'chargerCharging' - } - } - } - ] - }; - expect(Device.matchesItemType(item)).toBe(true); - expect(Device.matchesItemType({ type: 'Group' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group' })).toBe(true); + expect(Device.matchesItemType({ type: 'Switch' })).toBe(false); }); describe('getAttributes', () => { @@ -40,6 +49,7 @@ describe('Charger Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'chargerCapacityRemaining' @@ -63,6 +73,7 @@ describe('Charger Device', () => { }, members: [ { + type: 'Switch', metadata: { ga: { value: 'chargerCharging' @@ -88,6 +99,7 @@ describe('Charger Device', () => { }, members: [ { + type: 'Switch', metadata: { ga: { value: 'chargerCharging' @@ -111,6 +123,7 @@ describe('Charger Device', () => { { name: 'Charging', state: 'ON', + type: 'Switch', metadata: { ga: { value: 'chargerCharging' @@ -120,6 +133,7 @@ describe('Charger Device', () => { { name: 'CapacityRemaining', state: '40', + type: 'Number', metadata: { ga: { value: 'chargerCapacityRemaining' @@ -129,6 +143,7 @@ describe('Charger Device', () => { { name: 'CapacityUntilFull', state: '60', + type: 'Number', metadata: { ga: { value: 'chargerCapacityUntilFull' @@ -167,6 +182,7 @@ describe('Charger Device', () => { { name: 'Charging', state: 'ON', + type: 'Switch', metadata: { ga: { value: 'chargerCharging' @@ -176,6 +192,7 @@ describe('Charger Device', () => { { name: 'CapacityRemaining', state: '60', + type: 'Number', metadata: { ga: { value: 'chargerCapacityRemaining' @@ -185,6 +202,7 @@ describe('Charger Device', () => { { name: 'CapacityUntilFull', state: '40', + type: 'Number', metadata: { ga: { value: 'chargerCapacityUntilFull' @@ -298,6 +316,7 @@ describe('Charger Device', () => { { name: 'Charging', state: 'OFF', + type: 'Switch', metadata: { ga: { value: 'chargerCharging' @@ -307,6 +326,7 @@ describe('Charger Device', () => { { name: 'PluggedIn', state: 'ON', + type: 'Switch', metadata: { ga: { value: 'chargerPluggedIn' @@ -316,6 +336,7 @@ describe('Charger Device', () => { { name: 'CapacityRemaining', state: '4000.123', + type: 'Number', metadata: { ga: { value: 'chargerCapacityRemaining' @@ -324,6 +345,7 @@ describe('Charger Device', () => { }, { name: 'CapacityUntilFull', + type: 'Number', state: '6000.123', metadata: { ga: { diff --git a/tests/devices/colorlight.test.js b/tests/devices/colorlight.test.js index a92714c9..8d74f8f2 100644 --- a/tests/devices/colorlight.test.js +++ b/tests/devices/colorlight.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/colorlight.js'); describe('ColorLight Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'LIGHT' diff --git a/tests/devices/dimmablelight.test.js b/tests/devices/dimmablelight.test.js index bbcf2a7f..2bd34477 100644 --- a/tests/devices/dimmablelight.test.js +++ b/tests/devices/dimmablelight.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/dimmablelight.js'); describe('DimmableLight Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'LIGHT' diff --git a/tests/devices/dynamicmodesdevice.test.js b/tests/devices/dynamicmodesdevice.test.js new file mode 100644 index 00000000..27b34a5a --- /dev/null +++ b/tests/devices/dynamicmodesdevice.test.js @@ -0,0 +1,101 @@ +const Device = require('../../functions/devices/dynamicmodesdevice.js'); + +describe('DynamicModesDevice Device', () => { + const item = { + type: 'Group', + metadata: { + ga: { + config: { + mode: 'mode_name,alternate_mode_name', + ordered: true + } + } + }, + members: [ + { + name: 'CurrentMode', + state: 'mode_value', + type: 'String', + metadata: { + ga: { + value: 'modesCurrentMode' + } + } + }, + { + name: 'Settings', + state: 'setting1=mode_value:alternate_mode_value,setting2=mode_value2', + type: 'String', + metadata: { + ga: { + value: 'modesSettings' + } + } + } + ] + }; + + test('matchesItemType', () => { + expect(Device.matchesItemType({ type: 'Color' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group', groupType: 'Color' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group', groupType: 'Dimmer' })).toBe(false); + }); + + describe('getAttributes', () => { + test('getAttributes no config', () => { + const invalid_item = { + metadata: { + ga: { + config: {} + } + } + }; + expect(Device.getAttributes(invalid_item)).toStrictEqual({}); + }); + + test('getAttributes mode', () => { + expect(Device.getAttributes(item)).toStrictEqual({ + availableModes: [ + { + name: 'mode_name', + name_values: [ + { + lang: 'en', + name_synonym: ['mode_name', 'alternate_mode_name'] + } + ], + ordered: true, + settings: [ + { + setting_name: 'setting1', + setting_values: [ + { + lang: 'en', + setting_synonym: ['setting1', 'mode_value', 'alternate_mode_value'] + } + ] + }, + { + setting_name: 'setting2', + setting_values: [ + { + lang: 'en', + setting_synonym: ['setting2', 'mode_value2'] + } + ] + } + ] + } + ] + }); + }); + }); + + test('getState', () => { + expect(Device.getState(item)).toStrictEqual({ + currentModeSettings: { + mode_name: 'mode_value' + } + }); + }); +}); diff --git a/tests/devices/dynamicmodeslight.test.js b/tests/devices/dynamicmodeslight.test.js new file mode 100644 index 00000000..dc743d31 --- /dev/null +++ b/tests/devices/dynamicmodeslight.test.js @@ -0,0 +1,44 @@ +const Device = require('../../functions/devices/dynamicmodeslight.js'); + +describe('DynamicModesLight Device', () => { + const item = { + type: 'Group', + metadata: { + ga: { + value: 'light', + config: { + mode: 'mode_name,alternate_mode_name', + ordered: true + } + } + }, + members: [ + { + name: 'CurrentMode', + state: 'mode_value', + type: 'String', + metadata: { + ga: { + value: 'modesCurrentMode' + } + } + }, + { + name: 'Settings', + state: 'setting1=mode_value:alternate_mode_value,setting2=mode_value2', + type: 'String', + metadata: { + ga: { + value: 'modesSettings' + } + } + } + ] + }; + + test('matchesDeviceType', () => { + expect(Device.matchesDeviceType(item)).toBe(true); + expect(Device.matchesDeviceType({ metadata: { ga: { value: 'test' } } })).toBe(false); + expect(Device.matchesDeviceType({ metadata: { ga: { value: 'light' } } })).toBe(false); + }); +}); diff --git a/tests/devices/fan.test.js b/tests/devices/fan.test.js index a6048f18..2e556394 100644 --- a/tests/devices/fan.test.js +++ b/tests/devices/fan.test.js @@ -1,9 +1,10 @@ const Device = require('../../functions/devices/fan.js'); describe('Fan Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ + type: 'Dimmer', metadata: { ga: { value: 'FAN' @@ -11,6 +12,37 @@ describe('Fan Device', () => { } }) ).toBe(true); + expect( + Device.matchesDeviceType({ + type: 'Group', + metadata: { + ga: { + value: 'FAN' + } + } + }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + type: 'Group', + metadata: { + ga: { + value: 'FAN' + } + }, + members: [ + { + type: 'Number', + state: '10', + metadata: { + ga: { + value: 'fanSpeed' + } + } + } + ] + }) + ).toBe(true); }); test('matchesItemType', () => { @@ -20,6 +52,90 @@ describe('Fan Device', () => { expect(Device.matchesItemType({ type: 'Group', groupType: 'String' })).toBe(false); }); + describe('getTraits', () => { + test('getTraits Dimmer', () => { + const item = { + type: 'Dimmer' + }; + expect(Device.getTraits(item)).toStrictEqual(['action.devices.traits.OnOff', 'action.devices.traits.FanSpeed']); + }); + + test('getTraits Group Dimmer', () => { + const item = { + type: 'Group', + groupType: 'Dimmer' + }; + expect(Device.getTraits(item)).toStrictEqual(['action.devices.traits.OnOff', 'action.devices.traits.FanSpeed']); + }); + + test('getTraits only fanPower', () => { + const item = { + type: 'Group', + members: [ + { + type: 'Switch', + state: 'ON', + metadata: { + ga: { + value: 'fanPower' + } + } + } + ] + }; + expect(Device.getTraits(item)).toStrictEqual(['action.devices.traits.OnOff']); + }); + + test('getTraits all members', () => { + const item = { + members: [ + { + type: 'Switch', + state: 'ON', + metadata: { + ga: { + value: 'fanPower' + } + } + }, + { + type: 'Dimmer', + state: '50', + metadata: { + ga: { + value: 'fanSpeed' + } + } + }, + { + type: 'String', + state: 'Mode1', + metadata: { + ga: { + value: 'fanMode' + } + } + }, + { + type: 'Number', + state: '10', + metadata: { + ga: { + value: 'fanFilterLifeTime' + } + } + } + ] + }; + expect(Device.getTraits(item)).toStrictEqual([ + 'action.devices.traits.OnOff', + 'action.devices.traits.FanSpeed', + 'action.devices.traits.Modes', + 'action.devices.traits.SensorState' + ]); + }); + }); + describe('getAttributes', () => { test('getAttributes no config', () => { const item = { @@ -29,18 +145,16 @@ describe('Fan Device', () => { } } }; - expect(Device.getAttributes(item)).toStrictEqual({ - supportsFanSpeedPercent: true - }); + expect(Device.getAttributes(item)).toStrictEqual({ supportsFanSpeedPercent: true }); }); - test('getAttributes speeds', () => { + test('getAttributes fanSpeeds', () => { const item = { metadata: { ga: { config: { ordered: true, - speeds: '0=null:off,50=slow,100=full:fast', + fanSpeeds: '0=null:off,50=slow,100=full:fast', lang: 'en' } } @@ -79,32 +193,294 @@ describe('Fan Device', () => { ], ordered: true }, - reversible: false + supportsFanSpeedPercent: true + }); + }); + + test('getAttributes fanMode', () => { + const item = { + metadata: { + ga: { + config: { + fanModeName: 'OperationMode,Modus', + fanModeSettings: '1=Silent,2=Normal,3=Night' + } + } + }, + members: [ + { + name: 'FanMode', + type: 'String', + metadata: { + ga: { + value: 'fanMode' + } + } + } + ] + }; + expect(Device.getAttributes(item)).toStrictEqual({ + supportsFanSpeedPercent: true, + availableModes: [ + { + name: 'OperationMode', + name_values: [ + { + lang: 'en', + name_synonym: ['OperationMode', 'Modus'] + } + ], + ordered: false, + settings: [ + { + setting_name: '1', + setting_values: [ + { + lang: 'en', + setting_synonym: ['1', 'Silent'] + } + ] + }, + { + setting_name: '2', + setting_values: [ + { + lang: 'en', + setting_synonym: ['2', 'Normal'] + } + ] + }, + { + setting_name: '3', + setting_values: [ + { + lang: 'en', + setting_synonym: ['3', 'Night'] + } + ] + } + ] + } + ] + }); + }); + + test('getAttributes fanFilterLifeTime', () => { + const item = { + members: [ + { + name: 'FanFilterLifeTime', + type: 'Number', + metadata: { + ga: { + value: 'fanFilterLifeTime' + } + } + } + ] + }; + expect(Device.getAttributes(item)).toStrictEqual({ + supportsFanSpeedPercent: true, + sensorStatesSupported: [ + { + descriptiveCapabilities: { + availableStates: ['new', 'good', 'replace soon', 'replace now'] + }, + numericCapabilities: { + rawValueUnit: 'PERCENTAGE' + }, + name: 'FilterLifeTime' + } + ] + }); + }); + + test('getAttributes fanPM25', () => { + const item = { + members: [ + { + name: 'FanPM25', + type: 'Number', + metadata: { + ga: { + value: 'fanPM25' + } + } + } + ] + }; + expect(Device.getAttributes(item)).toStrictEqual({ + supportsFanSpeedPercent: true, + sensorStatesSupported: [ + { + numericCapabilities: { + rawValueUnit: 'MICROGRAMS_PER_CUBIC_METER' + }, + name: 'PM2.5' + } + ] }); }); }); - test('getState', () => { - expect(Device.getState({ state: '50' })).toStrictEqual({ - currentFanSpeedPercent: 50, - on: true + describe('getState', () => { + test('getState Dimmer', () => { + expect(Device.getState({ type: 'Dimmer', state: '50' })).toStrictEqual({ + currentFanSpeedPercent: 50, + on: true + }); }); - expect( - Device.getState({ - state: '50', + + test('getState Group fanPower', () => { + const item = { + type: 'Group', + metadata: { + ga: { + value: 'FAN' + } + }, + members: [ + { + name: 'FanPower', + type: 'Switch', + metadata: { + ga: { + value: 'fanPower' + } + }, + state: 'ON' + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + on: true + }); + }); + + test('getState Group fanSpeed', () => { + const item = { + type: 'Group', metadata: { ga: { + value: 'FAN', config: { - ordered: true, - speeds: '0=null:off,50=slow,100=full:fast', - lang: 'en' + fanSpeeds: '0=null:off,50=slow,100=full:fast' + } + } + }, + members: [ + { + name: 'FanSpeed', + type: 'Dimmer', + metadata: { + ga: { + value: 'fanSpeed' + } + }, + state: '50' + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + currentFanSpeedPercent: 50, + currentFanSpeedSetting: '50', + on: true + }); + }); + + test('getState Group fanMode', () => { + const item = { + type: 'Group', + metadata: { + ga: { + value: 'FAN', + config: { + fanModeName: 'OperationMode,Modus', + fanModeSettings: '1=Silent,2=Normal,3=Night' } } + }, + members: [ + { + name: 'FanMode', + type: 'Number', + metadata: { + ga: { + value: 'fanMode' + } + }, + state: '2' + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + currentModeSettings: { + OperationMode: '2' } - }) - ).toStrictEqual({ - currentFanSpeedSetting: '50', - on: true + }); + }); + + test('getState Group fanFilterLifeTime', () => { + const item = { + type: 'Group', + metadata: { + ga: { + value: 'FAN' + } + }, + members: [ + { + name: 'FanFilterLifeTime', + type: 'Number', + metadata: { + ga: { + value: 'fanFilterLifeTime' + } + }, + state: '70' + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + currentSensorStateData: [ + { + name: 'FilterLifeTime', + currentSensorState: 'good', + rawValue: 70 + } + ] + }); + }); + + test('getState Group fanPM25', () => { + const item = { + type: 'Group', + metadata: { + ga: { + value: 'FAN' + } + }, + members: [ + { + name: 'FanPM25', + type: 'Number', + metadata: { + ga: { + value: 'fanPM25' + } + }, + state: '20' + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + currentSensorStateData: [ + { + name: 'PM2.5', + rawValue: 20 + } + ] + }); }); }); }); diff --git a/tests/devices/lock.test.js b/tests/devices/lock.test.js index d4395417..fe29bd9d 100644 --- a/tests/devices/lock.test.js +++ b/tests/devices/lock.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/lock.js'); describe('Lock Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'LOCK' diff --git a/tests/devices/modesdevice.test.js b/tests/devices/modesdevice.test.js new file mode 100644 index 00000000..c61b27bf --- /dev/null +++ b/tests/devices/modesdevice.test.js @@ -0,0 +1,91 @@ +const Device = require('../../functions/devices/modesdevice.js'); + +describe('ModesDevice Device', () => { + test('matchesItemType', () => { + expect(Device.matchesItemType({ type: 'Group' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group', groupType: 'Number' })).toBe(true); + expect(Device.matchesItemType({ type: 'String' })).toBe(true); + }); + + describe('getAttributes', () => { + test('getAttributes no config', () => { + const item = { + metadata: { + ga: { + config: {} + } + } + }; + expect(Device.getAttributes(item)).toStrictEqual({}); + }); + + test('getAttributes mode', () => { + const item = { + metadata: { + ga: { + config: { + mode: 'mode_name,alternate_mode_name', + settings: 'setting1=mode_value:alternate_mode_value,setting2=mode_value2', + ordered: true + } + } + } + }; + expect(Device.getAttributes(item)).toStrictEqual({ + availableModes: [ + { + name: 'mode_name', + name_values: [ + { + lang: 'en', + name_synonym: ['mode_name', 'alternate_mode_name'] + } + ], + ordered: true, + settings: [ + { + setting_name: 'setting1', + setting_values: [ + { + lang: 'en', + setting_synonym: ['setting1', 'mode_value', 'alternate_mode_value'] + } + ] + }, + { + setting_name: 'setting2', + setting_values: [ + { + lang: 'en', + setting_synonym: ['setting2', 'mode_value2'] + } + ] + } + ] + } + ] + }); + }); + }); + + test('getState', () => { + expect(Device.getState({ state: 'mode_value' })).toStrictEqual({}); + expect( + Device.getState({ + state: 'mode_value', + metadata: { + ga: { + config: { + mode: 'mode_name,alternate_mode_name', + settings: 'setting1=mode_value:alternate_mode_value,setting2=mode_value2' + } + } + } + }) + ).toStrictEqual({ + currentModeSettings: { + mode_name: 'mode_value' + } + }); + }); +}); diff --git a/tests/devices/modeslight.test.js b/tests/devices/modeslight.test.js new file mode 100644 index 00000000..0f9de27d --- /dev/null +++ b/tests/devices/modeslight.test.js @@ -0,0 +1,32 @@ +const Device = require('../../functions/devices/modeslight.js'); + +describe('ModesLight Device', () => { + test('matchesDeviceType', () => { + expect(Device.matchesDeviceType({ type: 'Group' })).toBe(false); + expect( + Device.matchesDeviceType({ + type: 'Switch', + metadata: { + ga: { + value: 'light', + config: {} + } + } + }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + type: 'Switch', + metadata: { + ga: { + value: 'light', + config: { + mode: 'testMode', + settings: '1=test' + } + } + } + }) + ).toBe(true); + }); +}); diff --git a/tests/devices/scene.test.js b/tests/devices/scene.test.js index d5dfc7a4..0e50773e 100644 --- a/tests/devices/scene.test.js +++ b/tests/devices/scene.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/scene.js'); describe('Scene Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'SCENE' diff --git a/tests/devices/securitysystem.test.js b/tests/devices/securitysystem.test.js index a797190e..8171db92 100644 --- a/tests/devices/securitysystem.test.js +++ b/tests/devices/securitysystem.test.js @@ -2,9 +2,29 @@ const SecuritySystem = require('../../functions/devices/securitysystem.js'); const Device = require('../../functions/devices/securitysystem.js'); describe('SecuritySystem Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ + metadata: { + ga: { + value: 'SECURITYSYSTEM' + } + } + }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + type: 'Group', + members: [ + { + type: 'Switch', + metadata: { + ga: { + value: SecuritySystem.armedMemberName + } + } + } + ], metadata: { ga: { value: 'SECURITYSYSTEM' @@ -19,6 +39,7 @@ describe('SecuritySystem Device', () => { type: 'Group', members: [ { + type: 'Switch', metadata: { ga: { value: SecuritySystem.armedMemberName @@ -44,6 +65,7 @@ describe('SecuritySystem Device', () => { type: 'Group', members: [ { + type: 'Switch', metadata: { ga: { value: Device.armedMemberName @@ -69,6 +91,7 @@ describe('SecuritySystem Device', () => { let device = { members: [ { + type: 'String', metadata: { ga: { value: Device.armLevelMemberName @@ -92,6 +115,7 @@ describe('SecuritySystem Device', () => { let device = { members: [ { + type: 'Switch', metadata: { ga: { value: Device.armedMemberName @@ -100,6 +124,7 @@ describe('SecuritySystem Device', () => { state: 'ON' }, { + type: 'String', metadata: { ga: { value: Device.armLevelMemberName @@ -126,6 +151,7 @@ describe('SecuritySystem Device', () => { const item = { members: [ { + type: 'Switch', metadata: { ga: { value: Device.armedMemberName @@ -317,6 +343,7 @@ describe('SecuritySystem Device', () => { members: [ { name: 'armed', + type: 'Switch', metadata: { ga: { value: memberArmed @@ -361,6 +388,7 @@ describe('SecuritySystem Device', () => { members: [ { name: 'armed', + type: 'Switch', metadata: { ga: { value: memberArmed @@ -370,6 +398,7 @@ describe('SecuritySystem Device', () => { }, { name: 'armLevel', + type: 'String', metadata: { ga: { value: memberArmLevel @@ -379,6 +408,7 @@ describe('SecuritySystem Device', () => { }, { name: 'trouble', + type: 'Switch', metadata: { ga: { value: memberTrouble @@ -388,6 +418,7 @@ describe('SecuritySystem Device', () => { }, { name: 'errorCode', + type: 'String', metadata: { ga: { value: memberErrorCode @@ -397,6 +428,7 @@ describe('SecuritySystem Device', () => { }, { name: 'zone1', + type: 'Contact', metadata: { ga: { value: memberZone @@ -421,6 +453,7 @@ describe('SecuritySystem Device', () => { members: [ { name: 'armed', + type: 'Switch', metadata: { ga: { value: memberArmed @@ -441,6 +474,7 @@ describe('SecuritySystem Device', () => { members: [ { name: 'zone1', + type: 'Contact', metadata: { ga: { value: memberZone, @@ -469,6 +503,7 @@ describe('SecuritySystem Device', () => { members: [ { name: 'trouble', + type: 'Switch', metadata: { ga: { value: memberTrouble @@ -478,6 +513,7 @@ describe('SecuritySystem Device', () => { }, { name: 'errorCode', + type: 'String', metadata: { ga: { value: memberErrorCode @@ -503,6 +539,7 @@ describe('SecuritySystem Device', () => { members: [ { name: 'zone1', + type: 'Contact', metadata: { ga: { value: memberZone, @@ -516,6 +553,7 @@ describe('SecuritySystem Device', () => { }, { name: 'zone2', + type: 'Contact', metadata: { ga: { value: memberZone, @@ -529,6 +567,7 @@ describe('SecuritySystem Device', () => { }, { name: 'zone3', + type: 'Contact', metadata: { ga: { value: memberZone, diff --git a/tests/devices/sensor.test.js b/tests/devices/sensor.test.js index a978e567..68b8f633 100644 --- a/tests/devices/sensor.test.js +++ b/tests/devices/sensor.test.js @@ -1,47 +1,48 @@ const Device = require('../../functions/devices/sensor.js'); describe('Sensor Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'SENSOR' } } }) - ).toBe(true); - }); - - describe('matchesItemType', () => { - describe('matchesItemType numeric', () => { - const item = { + ).toBe(false); + expect( + Device.matchesDeviceType({ metadata: { ga: { + value: 'SENSOR', config: { sensorName: 'Sensor', valueUnit: 'PERCENT' } } } - }; - expect(Device.matchesItemType(item)).toBe(true); - expect(Device.matchesItemType({ type: 'Number' })).toBe(false); - }); - - describe('matchesItemType descriptive', () => { - const item = { + }) + ).toBe(true); + expect( + Device.matchesDeviceType({ metadata: { ga: { + value: 'SENSOR', config: { sensorName: 'Sensor', states: '50=good,100=bad' } } } - }; - expect(Device.matchesItemType(item)).toBe(true); - }); + }) + ).toBe(true); + }); + + test('matchesItemType', () => { + expect(Device.matchesItemType({ type: 'Group' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group', groupType: 'String' })).toBe(true); + expect(Device.matchesItemType({ type: 'Number' })).toBe(true); }); describe('getAttributes', () => { diff --git a/tests/devices/simplelight.test.js b/tests/devices/simplelight.test.js index 6e627aac..f0dde916 100644 --- a/tests/devices/simplelight.test.js +++ b/tests/devices/simplelight.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/simplelight.js'); describe('SimpleLight Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'LIGHT' diff --git a/tests/devices/simplesecuritysystem.test.js b/tests/devices/simplesecuritysystem.test.js index 3d4a94e0..2d1045be 100644 --- a/tests/devices/simplesecuritysystem.test.js +++ b/tests/devices/simplesecuritysystem.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/simplesecuritysystem.js'); describe('SimpleSecuritySystem Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'SECURITYSYSTEM' diff --git a/tests/devices/speaker.test.js b/tests/devices/speaker.test.js index 3d285205..639e0649 100644 --- a/tests/devices/speaker.test.js +++ b/tests/devices/speaker.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/speaker.js'); describe('Speaker Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'SPEAKER' diff --git a/tests/devices/specialcolorlight.test.js b/tests/devices/specialcolorlight.test.js index 2f167d81..c47f9cf7 100644 --- a/tests/devices/specialcolorlight.test.js +++ b/tests/devices/specialcolorlight.test.js @@ -1,24 +1,11 @@ const Device = require('../../functions/devices/specialcolorlight.js'); describe('SpecialColorLight Device', () => { - test('isCompatible', () => { - expect( - Device.isCompatible({ - metadata: { - ga: { - value: 'SpecialColorLight' - } - } - }) - ).toBe(true); - }); - - test('matchesItemType', () => { + test('matchesDeviceType', () => { const item1 = { - type: 'Group', metadata: { ga: { - value: 'LIGHT', + value: 'SpecialColorLight', config: { colorTemperatureRange: '1000,4000' } @@ -26,6 +13,7 @@ describe('SpecialColorLight Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -33,6 +21,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -42,14 +31,14 @@ describe('SpecialColorLight Device', () => { ] }; const item2 = { - type: 'Group', metadata: { ga: { - value: 'LIGHT' + value: 'SpecialColorLight' } }, members: [ { + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -57,6 +46,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -66,10 +56,9 @@ describe('SpecialColorLight Device', () => { ] }; const item3 = { - type: 'Group', metadata: { ga: { - value: 'LIGHT', + value: 'SpecialColorLight', config: { colorUnit: 'kelvin' } @@ -77,6 +66,7 @@ describe('SpecialColorLight Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -84,6 +74,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -93,14 +84,14 @@ describe('SpecialColorLight Device', () => { ] }; const item4 = { - type: 'Group', metadata: { ga: { - value: 'LIGHT' + value: 'SpecialColorLight' } }, members: [ { + type: 'Dimmer', metadata: { ga: { value: 'lightBrightness' @@ -108,6 +99,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Color', metadata: { ga: { value: 'lightColor' @@ -117,14 +109,14 @@ describe('SpecialColorLight Device', () => { ] }; const item5 = { - type: 'Group', metadata: { ga: { - value: 'LIGHT' + value: 'SpecialColorLight' } }, members: [ { + type: 'Dimmer', metadata: { ga: { value: 'lightBrightness' @@ -132,6 +124,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Switch', metadata: { ga: { value: 'lightPower' @@ -141,14 +134,14 @@ describe('SpecialColorLight Device', () => { ] }; const item6 = { - type: 'Group', metadata: { ga: { - value: 'LIGHT' + value: 'SpecialColorLight' } }, members: [ { + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -156,6 +149,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -168,7 +162,7 @@ describe('SpecialColorLight Device', () => { type: 'Group', metadata: { ga: { - value: 'LIGHT', + value: 'SpecialColorLight', config: { colorUnit: 'mired' } @@ -176,6 +170,7 @@ describe('SpecialColorLight Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -183,6 +178,7 @@ describe('SpecialColorLight Device', () => { } }, { + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -191,13 +187,17 @@ describe('SpecialColorLight Device', () => { } ] }; - expect(Device.matchesItemType(item1)).toBe(true); - expect(Device.matchesItemType(item2)).toBe(false); - expect(Device.matchesItemType(item3)).toBe(true); - expect(Device.matchesItemType(item4)).toBe(true); - expect(Device.matchesItemType(item5)).toBe(true); - expect(Device.matchesItemType(item6)).toBe(false); - expect(Device.matchesItemType(item7)).toBe(true); + expect(Device.matchesDeviceType(item1)).toBe(true); + expect(Device.matchesDeviceType(item2)).toBe(false); + expect(Device.matchesDeviceType(item3)).toBe(true); + expect(Device.matchesDeviceType(item4)).toBe(true); + expect(Device.matchesDeviceType(item5)).toBe(true); + expect(Device.matchesDeviceType(item6)).toBe(false); + expect(Device.matchesDeviceType(item7)).toBe(true); + }); + + test('matchesItemType', () => { + expect(Device.matchesItemType({ type: 'Group' })).toBe(true); expect(Device.matchesItemType({ type: 'Color' })).toBe(false); expect(Device.matchesItemType({ type: 'Group', groupType: 'Color' })).toBe(false); expect(Device.matchesItemType({ type: 'Group', groupType: 'Dimmer' })).toBe(false); @@ -265,6 +265,7 @@ describe('SpecialColorLight Device', () => { }, members: [ { + type: 'Color', metadata: { ga: { value: 'lightColor' @@ -283,6 +284,58 @@ describe('SpecialColorLight Device', () => { }); }); + describe('getMetadata', () => { + test('getMetadata kelvin', () => { + const item = { + name: 'LightItem', + type: 'Group', + metadata: { + ga: { + config: { + colorTemperatureRange: '1000,2000', + colorUnit: 'kelvin' + } + } + } + }; + expect(Device.getMetadata(item).customData).toStrictEqual({ + colorTemperatureRange: { + temperatureMaxK: 2000, + temperatureMinK: 1000 + }, + deviceType: 'SpecialColorLight', + itemType: 'Group', + members: {}, + colorUnit: 'kelvin' + }); + }); + + test('getMetadata percent inverted', () => { + const item = { + name: 'LightItem', + type: 'Group', + metadata: { + ga: { + config: { + colorTemperatureRange: '1000,2000', + colorTemperatureInverted: true + } + } + } + }; + expect(Device.getMetadata(item).customData).toStrictEqual({ + colorTemperatureInverted: true, + colorTemperatureRange: { + temperatureMaxK: 2000, + temperatureMinK: 1000 + }, + deviceType: 'SpecialColorLight', + itemType: 'Group', + members: {} + }); + }); + }); + describe('getState', () => { test('getState', () => { const item = { @@ -298,6 +351,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: '50.421', + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -306,6 +360,7 @@ describe('SpecialColorLight Device', () => { }, { state: '77', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -337,6 +392,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: '2000.345', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -397,6 +453,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: '200', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -426,6 +483,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: '0', + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -433,7 +491,8 @@ describe('SpecialColorLight Device', () => { } }, { - state: '80', + state: '20', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -446,7 +505,7 @@ describe('SpecialColorLight Device', () => { on: false, brightness: 0, color: { - temperatureK: 3400 + temperatureK: 1600 } }); }); @@ -465,6 +524,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: 'OFF', + type: 'Switch', metadata: { ga: { value: 'lightPower' @@ -473,6 +533,7 @@ describe('SpecialColorLight Device', () => { }, { state: '50', + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -480,7 +541,8 @@ describe('SpecialColorLight Device', () => { } }, { - state: '80', + state: '20', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -493,7 +555,7 @@ describe('SpecialColorLight Device', () => { on: false, brightness: 50, color: { - temperatureK: 3400 + temperatureK: 1600 } }); }); @@ -512,6 +574,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: '50', + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -520,6 +583,7 @@ describe('SpecialColorLight Device', () => { }, { state: '100,50,10', + type: 'Color', metadata: { ga: { value: 'lightColor' @@ -528,6 +592,7 @@ describe('SpecialColorLight Device', () => { }, { state: '20', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -563,6 +628,7 @@ describe('SpecialColorLight Device', () => { members: [ { state: '50', + type: 'Number', metadata: { ga: { value: 'lightBrightness' @@ -571,6 +637,7 @@ describe('SpecialColorLight Device', () => { }, { state: '100,50,0', + type: 'Color', metadata: { ga: { value: 'lightColor' @@ -578,7 +645,8 @@ describe('SpecialColorLight Device', () => { } }, { - state: '80', + state: '20', + type: 'Number', metadata: { ga: { value: 'lightColorTemperature' @@ -591,7 +659,7 @@ describe('SpecialColorLight Device', () => { on: true, brightness: 50, color: { - temperatureK: 3400 + temperatureK: 1600 } }); }); diff --git a/tests/devices/switch.test.js b/tests/devices/switch.test.js index 4ab982d2..8c19f646 100644 --- a/tests/devices/switch.test.js +++ b/tests/devices/switch.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/switch.js'); describe('Switch Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'SWITCH' diff --git a/tests/devices/temperaturesensor.test.js b/tests/devices/temperaturesensor.test.js index cd5d09db..1a56f02f 100644 --- a/tests/devices/temperaturesensor.test.js +++ b/tests/devices/temperaturesensor.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/temperaturesensor.js'); describe('TemperatureSensor Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'temperaturesensor' diff --git a/tests/devices/thermostat.test.js b/tests/devices/thermostat.test.js index 7fc4a52e..da1ec8a8 100644 --- a/tests/devices/thermostat.test.js +++ b/tests/devices/thermostat.test.js @@ -1,33 +1,40 @@ const Device = require('../../functions/devices/thermostat.js'); describe('Thermostat Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'THERMOSTAT' } } }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + metadata: { + ga: { + value: 'THERMOSTAT' + } + }, + members: [ + { + type: 'Number', + metadata: { + ga: { + value: 'thermostatTemperatureAmbient' + } + } + } + ] + }) ).toBe(true); }); test('matchesItemType', () => { - const item = { - type: 'Group', - members: [ - { - metadata: { - ga: { - value: 'thermostatTemperatureAmbient' - } - } - } - ] - }; - expect(Device.matchesItemType(item)).toBe(true); - expect(Device.matchesItemType({ type: 'Group' })).toBe(false); + expect(Device.matchesItemType({ type: 'Number' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group' })).toBe(true); }); describe('useFahrenheit', () => { @@ -72,12 +79,12 @@ describe('Thermostat Device', () => { }); }); - test('getAttributes modes, fahrenheit', () => { + test('getAttributes thermostatModes, fahrenheit', () => { const item = { metadata: { ga: { config: { - modes: 'on=1,off=2', + thermostatModes: 'on=1,off=2', useFahrenheit: true } } @@ -134,6 +141,7 @@ describe('Thermostat Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureAmbient' @@ -158,6 +166,7 @@ describe('Thermostat Device', () => { { name: 'Mode', state: 'on', + type: 'String', metadata: { ga: { value: 'thermostatMode' @@ -167,6 +176,7 @@ describe('Thermostat Device', () => { { name: 'Setpoint', state: '20', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpoint' @@ -176,6 +186,7 @@ describe('Thermostat Device', () => { { name: 'High', state: '25', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpointHigh' @@ -185,6 +196,7 @@ describe('Thermostat Device', () => { { name: 'Low', state: '5', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpointLow' @@ -194,6 +206,7 @@ describe('Thermostat Device', () => { { name: 'Temperature', state: '20', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureAmbient' @@ -203,6 +216,7 @@ describe('Thermostat Device', () => { { name: 'Humidity', state: '50', + type: 'Number', metadata: { ga: { value: 'thermostatHumidityAmbient' @@ -245,7 +259,7 @@ describe('Thermostat Device', () => { metadata: { ga: { config: { - modes: 'on=ON:1,off=OFF:2,auto=3' + thermostatModes: 'on=ON:1,off=OFF:2,auto=3' } } } @@ -271,7 +285,7 @@ describe('Thermostat Device', () => { metadata: { ga: { config: { - modes: 'on=ON:1,off=OFF:2,auto=3' + thermostatModes: 'on=ON:1,off=OFF:2,auto=3' } } } @@ -288,7 +302,7 @@ describe('Thermostat Device', () => { metadata: { ga: { config: { - modes: 'on=ON:1,off=OFF:2,auto=3' + thermostatModes: 'on=ON:1,off=OFF:2,auto=3' } } } @@ -305,6 +319,7 @@ describe('Thermostat Device', () => { { name: 'Mode', state: 'on', + type: 'String', metadata: { ga: { value: 'thermostatMode' @@ -314,6 +329,7 @@ describe('Thermostat Device', () => { { name: 'Setpoint', state: '20', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpoint' @@ -323,6 +339,7 @@ describe('Thermostat Device', () => { { name: 'High', state: '25', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpointHigh' @@ -332,6 +349,7 @@ describe('Thermostat Device', () => { { name: 'Low', state: '5', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpointLow' @@ -341,6 +359,7 @@ describe('Thermostat Device', () => { { name: 'Temperature', state: '20', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureAmbient' @@ -350,6 +369,7 @@ describe('Thermostat Device', () => { { name: 'Humidity', state: '50', + type: 'Number', metadata: { ga: { value: 'thermostatHumidityAmbient' @@ -381,6 +401,7 @@ describe('Thermostat Device', () => { { name: 'Temperature', state: '20', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureAmbient' diff --git a/tests/devices/tv.test.js b/tests/devices/tv.test.js index d10ec901..ff549d9c 100644 --- a/tests/devices/tv.test.js +++ b/tests/devices/tv.test.js @@ -1,33 +1,40 @@ const Device = require('../../functions/devices/tv.js'); describe('TV Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'TV' } } }) + ).toBe(false); + expect( + Device.matchesDeviceType({ + metadata: { + ga: { + value: 'TV' + } + }, + members: [ + { + type: 'Switch', + metadata: { + ga: { + value: 'tvPower' + } + } + } + ] + }) ).toBe(true); }); test('matchesItemType', () => { - const item = { - type: 'Group', - members: [ - { - metadata: { - ga: { - value: 'tvPower' - } - } - } - ] - }; - expect(Device.matchesItemType(item)).toBe(true); - expect(Device.matchesItemType({ type: 'Group' })).toBe(false); + expect(Device.matchesItemType({ type: 'Switch' })).toBe(false); + expect(Device.matchesItemType({ type: 'Group' })).toBe(true); }); describe('getTraits', () => { @@ -36,6 +43,7 @@ describe('TV Device', () => { members: [ { state: 'ON', + type: 'Switch', metadata: { ga: { value: 'tvPower' @@ -52,6 +60,7 @@ describe('TV Device', () => { members: [ { state: '1', + type: 'Number', metadata: { ga: { value: 'tvChannel' @@ -60,6 +69,7 @@ describe('TV Device', () => { }, { state: '50', + type: 'Dimmer', metadata: { ga: { value: 'tvVolume' @@ -68,6 +78,7 @@ describe('TV Device', () => { }, { state: 'input1', + type: 'String', metadata: { ga: { value: 'tvInput' @@ -75,7 +86,8 @@ describe('TV Device', () => { } }, { - state: 'PLAYING', + state: 'PLAY', + type: 'Player', metadata: { ga: { value: 'tvTransport' @@ -84,6 +96,7 @@ describe('TV Device', () => { }, { state: 'ON', + type: 'Switch', metadata: { ga: { value: 'tvPower' @@ -92,6 +105,7 @@ describe('TV Device', () => { }, { state: 'OFF', + type: 'Switch', metadata: { ga: { value: 'tvMute' @@ -100,6 +114,7 @@ describe('TV Device', () => { }, { state: 'youtube', + type: 'String', metadata: { ga: { value: 'tvApplication' @@ -130,6 +145,7 @@ describe('TV Device', () => { }, members: [ { + type: 'Dimmer', metadata: { ga: { value: 'tvVolume' @@ -137,6 +153,7 @@ describe('TV Device', () => { } }, { + type: 'Player', metadata: { ga: { value: 'tvTransport' @@ -166,6 +183,7 @@ describe('TV Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'tvVolume' @@ -193,6 +211,7 @@ describe('TV Device', () => { }, members: [ { + type: 'Player', metadata: { ga: { value: 'tvTransport' @@ -200,6 +219,7 @@ describe('TV Device', () => { } }, { + type: 'Switch', metadata: { ga: { value: 'tvMute' @@ -226,6 +246,7 @@ describe('TV Device', () => { }, members: [ { + type: 'String', metadata: { ga: { value: 'tvInput' @@ -271,6 +292,7 @@ describe('TV Device', () => { }, members: [ { + type: 'Number', metadata: { ga: { value: 'tvChannel' @@ -308,6 +330,7 @@ describe('TV Device', () => { }, members: [ { + type: 'String', metadata: { ga: { value: 'tvApplication' @@ -349,6 +372,7 @@ describe('TV Device', () => { { name: 'Channel', state: '1', + type: 'Number', metadata: { ga: { value: 'tvChannel' @@ -358,6 +382,7 @@ describe('TV Device', () => { { name: 'Volume', state: '50', + type: 'Dimmer', metadata: { ga: { value: 'tvVolume' @@ -367,6 +392,7 @@ describe('TV Device', () => { { name: 'Input', state: 'input1', + type: 'String', metadata: { ga: { value: 'tvInput' @@ -376,6 +402,7 @@ describe('TV Device', () => { { name: 'Transport', state: 'PLAY', + type: 'Player', metadata: { ga: { value: 'tvTransport' @@ -385,6 +412,7 @@ describe('TV Device', () => { { name: 'Power', state: 'ON', + type: 'Switch', metadata: { ga: { value: 'tvPower' @@ -394,6 +422,7 @@ describe('TV Device', () => { { name: 'Mute', state: 'OFF', + type: 'Switch', metadata: { ga: { value: 'tvMute' @@ -403,6 +432,7 @@ describe('TV Device', () => { { name: 'Application', state: 'youtube', + type: 'String', metadata: { ga: { value: 'tvApplication' @@ -493,6 +523,7 @@ describe('TV Device', () => { members: [ { state: '1', + type: 'Number', metadata: { ga: { value: 'tvChannel' @@ -501,6 +532,7 @@ describe('TV Device', () => { }, { state: '50', + type: 'Dimmer', metadata: { ga: { value: 'tvVolume' @@ -509,6 +541,7 @@ describe('TV Device', () => { }, { state: 'input1', + type: 'String', metadata: { ga: { value: 'tvInput' @@ -517,6 +550,7 @@ describe('TV Device', () => { }, { state: 'PLAYING', + type: 'Player', metadata: { ga: { value: 'tvTransport' @@ -525,6 +559,7 @@ describe('TV Device', () => { }, { state: 'ON', + type: 'Switch', metadata: { ga: { value: 'tvPower' @@ -533,6 +568,7 @@ describe('TV Device', () => { }, { state: 'OFF', + type: 'Switch', metadata: { ga: { value: 'tvMute' @@ -541,6 +577,7 @@ describe('TV Device', () => { }, { state: 'youtube', + type: 'String', metadata: { ga: { value: 'tvApplication' @@ -567,6 +604,7 @@ describe('TV Device', () => { members: [ { state: '1', + type: 'Number', metadata: { ga: { value: 'tvChannel' @@ -590,7 +628,8 @@ describe('TV Device', () => { }, members: [ { - state: '50.43', + state: '50', + type: 'Number', metadata: { ga: { value: 'tvVolume' @@ -599,6 +638,7 @@ describe('TV Device', () => { }, { state: 'ON', + type: 'Switch', metadata: { ga: { value: 'tvPower' diff --git a/tests/devices/valve.test.js b/tests/devices/valve.test.js index 27c18648..29d1ea2f 100644 --- a/tests/devices/valve.test.js +++ b/tests/devices/valve.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/valve.js'); describe('Valve Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'VALVE' diff --git a/tests/openhab.test.js b/tests/openhab.test.js index 9d60c087..437180a2 100644 --- a/tests/openhab.test.js +++ b/tests/openhab.test.js @@ -24,7 +24,7 @@ describe('OpenHAB', () => { test('onSync failure', async () => { const handleSyncMock = jest.spyOn(openHAB, 'handleSync'); - handleSyncMock.mockReturnValue(Promise.reject()); + handleSyncMock.mockRejectedValue(); const result = await openHAB.onSync({ requestId: '1234' }, {}); expect(handleSyncMock).toBeCalledTimes(1); expect(result).toStrictEqual({ @@ -40,7 +40,7 @@ describe('OpenHAB', () => { test('onSync empty', async () => { const handleSyncMock = jest.spyOn(openHAB, 'handleSync'); const payload = { devices: [] }; - handleSyncMock.mockReturnValue(Promise.resolve(payload)); + handleSyncMock.mockResolvedValue(payload); const result = await openHAB.onSync({ requestId: '1234' }, {}); expect(handleSyncMock).toBeCalledTimes(1); expect(result).toStrictEqual({ @@ -64,7 +64,7 @@ describe('OpenHAB', () => { }); test('handleSync no matching items', async () => { - getItemsMock.mockReturnValue(Promise.resolve([{ name: 'TestItem' }])); + getItemsMock.mockResolvedValue([{ name: 'TestItem' }]); const result = await openHAB.handleSync(); expect(getItemsMock).toHaveBeenCalledTimes(1); expect(result).toStrictEqual({ devices: [] }); @@ -178,7 +178,11 @@ describe('OpenHAB', () => { }, customData: { deviceType: 'TV', - itemType: 'Group' + itemType: 'Group', + members: { + tvMute: 'TVMute', + tvPower: 'TVPower' + } }, deviceInfo: { manufacturer: 'openHAB', @@ -212,7 +216,7 @@ describe('OpenHAB', () => { test('onQuery failure', async () => { const handleQueryMock = jest.spyOn(openHAB, 'handleQuery'); - handleQueryMock.mockReturnValue(Promise.reject()); + handleQueryMock.mockRejectedValue(); const result = await openHAB.onQuery({ requestId: '1234' }, {}); expect(handleQueryMock).toBeCalledTimes(1); expect(handleQueryMock).toBeCalledWith([]); @@ -229,7 +233,7 @@ describe('OpenHAB', () => { test('onQuery empty', async () => { const handleQueryMock = jest.spyOn(openHAB, 'handleQuery'); const payload = { devices: {} }; - handleQueryMock.mockReturnValue(Promise.resolve(payload)); + handleQueryMock.mockResolvedValue(payload); const result = await openHAB.onQuery({ requestId: '1234' }, {}); expect(handleQueryMock).toBeCalledTimes(1); expect(handleQueryMock).toBeCalledWith([]); @@ -242,7 +246,7 @@ describe('OpenHAB', () => { test('onQuery', async () => { const handleQueryMock = jest.spyOn(openHAB, 'handleQuery'); const payload = { devices: {} }; - handleQueryMock.mockReturnValue(Promise.resolve(payload)); + handleQueryMock.mockResolvedValue(payload); const devices = [{ id: 'TestItem1' }, { id: 'TestItem2' }]; const body = { requestId: '1234', @@ -279,7 +283,7 @@ describe('OpenHAB', () => { }); test('handleQuery device offline', async () => { - getItemMock.mockReturnValue(Promise.reject({ statusCode: 500 })); + getItemMock.mockRejectedValue({ statusCode: 500 }); const result = await openHAB.handleQuery([{ id: 'TestItem' }]); expect(getItemMock).toHaveBeenCalledTimes(1); expect(result).toStrictEqual({ @@ -293,7 +297,7 @@ describe('OpenHAB', () => { }); test('handleQuery device not found', async () => { - getItemMock.mockReturnValue(Promise.resolve({ name: 'TestItem' })); + getItemMock.mockResolvedValue({ name: 'TestItem' }); const result = await openHAB.handleQuery([{ id: 'TestItem' }]); expect(getItemMock).toHaveBeenCalledTimes(1); expect(result).toStrictEqual({ @@ -396,7 +400,7 @@ describe('OpenHAB', () => { test('onExecute failure', async () => { const handleExecuteMock = jest.spyOn(openHAB, 'handleExecute'); - handleExecuteMock.mockReturnValue(Promise.reject()); + handleExecuteMock.mockRejectedValue({}); const result = await openHAB.onExecute({ requestId: '1234' }, {}); expect(handleExecuteMock).toBeCalledTimes(1); expect(handleExecuteMock).toBeCalledWith([]); @@ -413,7 +417,7 @@ describe('OpenHAB', () => { test('onExecute empty', async () => { const handleExecuteMock = jest.spyOn(openHAB, 'handleExecute'); const payload = { commands: [] }; - handleExecuteMock.mockReturnValue(Promise.resolve(payload)); + handleExecuteMock.mockResolvedValue(payload); const result = await openHAB.onExecute({ requestId: '1234' }, {}); expect(handleExecuteMock).toBeCalledTimes(1); expect(handleExecuteMock).toBeCalledWith([]); @@ -426,7 +430,7 @@ describe('OpenHAB', () => { test('onExecute', async () => { const handleExecuteMock = jest.spyOn(openHAB, 'handleExecute'); const payload = { commands: [] }; - handleExecuteMock.mockReturnValue(Promise.resolve(payload)); + handleExecuteMock.mockResolvedValue(payload); const commands = [ { devices: [{ id: '123' }, { id: '456' }], @@ -476,7 +480,7 @@ describe('OpenHAB', () => { }); test('handleExecute OnOff', async () => { - sendCommandMock.mockReturnValue(Promise.resolve()); + sendCommandMock.mockResolvedValue(null); const commands = [ { devices: [ @@ -587,6 +591,7 @@ describe('OpenHAB', () => { { name: 'High', state: '25', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpointHigh' @@ -596,6 +601,7 @@ describe('OpenHAB', () => { { name: 'Low', state: '5', + type: 'Number', metadata: { ga: { value: 'thermostatTemperatureSetpointLow' @@ -605,13 +611,18 @@ describe('OpenHAB', () => { ] }) ); - sendCommandMock.mockReturnValue(Promise.resolve()); + sendCommandMock.mockResolvedValue(null); const commands = [ { devices: [ { id: 'TestItem', - customData: {} + customData: { + members: { + thermostatTemperatureSetpointHigh: 'Test1', + thermostatTemperatureSetpointLow: 'Test2' + } + } } ], execution: [ From d52ded0b37b5b3f9e6ecbb919f827d41d5e4b79f Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Sat, 25 Nov 2023 00:18:18 +0100 Subject: [PATCH 2/9] Fix sensors, Add temperatureRange Signed-off-by: Michael Krug --- docs/USAGE.md | 16 +++++-- functions/devices/climatesensor.js | 45 ++++++++++--------- functions/devices/humiditysensor.js | 4 +- functions/devices/temperaturesensor.js | 21 +++++++-- tests/devices/climatesensor.test.js | 60 ++++++++++++++++++------- tests/devices/humiditysensor.test.js | 4 +- tests/devices/temperaturesensor.test.js | 34 +++++++++++++- 7 files changed, 133 insertions(+), 51 deletions(-) diff --git a/docs/USAGE.md b/docs/USAGE.md index e1ceda2a..345e53e0 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -460,12 +460,16 @@ Number capacityFullItem (chargerGroup) { ga="chargerCapacityUntilFull" } | **Device Type** | [Sensor](https://developers.home.google.com/cloud-to-cloud/guides/sensor) | | **Supported Traits** | [TemperatureControl](https://developers.home.google.com/cloud-to-cloud/traits/temperaturecontrol), [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | | **Supported Items** | Number | -| **Configuration** | (optional) `useFahrenheit=true/false` | +| **Configuration** | (optional) `useFahrenheit=true/false`
(optional) `temperatureRange="-10,50"` | + +By default, the temperature range of a temperature sensor is set to -100 °C to 100 °C. +The reported state values have to fall into that range! +If you need to adjust the range, please add the config option `temperatureRange="-20,40"` to the item. Keep in mind that those values always have to be provided in Celsius! _Hint:_ At the moment, sensor values will only be queriable by voice and will not show up anywhere in the Google Home app. ```shell -Number { ga="TemperatureSensor" [ useFahrenheit=true ] } +Number { ga="TemperatureSensor" [ useFahrenheit=true, temperatureRange="-20,40" ] } ``` ### HumiditySensor @@ -487,10 +491,14 @@ Number { ga="HumiditySensor" } | **Device Type** | [Sensor](https://developers.home.google.com/cloud-to-cloud/guides/sensor) | | **Supported Traits** | [HumiditySetting](https://developers.home.google.com/cloud-to-cloud/traits/humiditysetting), [TemperatureControl](https://developers.home.google.com/cloud-to-cloud/traits/temperaturecontrol), [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | | **Supported Items** | Group as `ClimateSensor` with the following members:
(optional) Number as `humidityAmbient`
(optional) Number as `temperatureAmbient` | -| **Configuration** | (optional) `useFahrenheit=true/false` | +| **Configuration** | (optional) `useFahrenheit=true/false`
(optional) `temperatureRange="-10,50"` | + +By default, the temperature range of a climate sensor is set to -100 °C to 100 °C. +The reported state values have to fall into that range! +If you need to adjust the range, please add the config option `temperatureRange="-20,40"` to the item. Keep in mind that those values always have to be provided in Celsius! ```shell -Group sensorGroup { ga="ClimateSensor" [ useFahrenheit=true ] } +Group sensorGroup { ga="ClimateSensor" [ useFahrenheit=true, temperatureRange="0,40" ] } Number temperatureItem (sensorGroup) { ga="temperatureAmbient" } Number humidityItem (sensorGroup) { ga="humidityAmbient" } ``` diff --git a/functions/devices/climatesensor.js b/functions/devices/climatesensor.js index 29aa0aed..314c7d82 100644 --- a/functions/devices/climatesensor.js +++ b/functions/devices/climatesensor.js @@ -23,6 +23,21 @@ class ClimateSensor extends DefaultDevice { attributes.temperatureUnitForUX = this.useFahrenheit(item) ? 'F' : 'C'; attributes.queryOnlyTemperatureSetting = true; attributes.thermostatTemperatureUnit = this.useFahrenheit(item) === true ? 'F' : 'C'; + attributes.temperatureRange = { + minThresholdCelsius: -100, + maxThresholdCelsius: 100 + }; + + const config = this.getConfig(item); + if ('temperatureRange' in config) { + const [min, max] = config.temperatureRange.split(',').map((s) => parseFloat(s.trim())); + if (!isNaN(min) && !isNaN(max)) { + attributes.temperatureRange = { + minThresholdCelsius: min, + maxThresholdCelsius: max + }; + } + } } if ('humidityAmbient' in members) { attributes.queryOnlyHumiditySetting = true; @@ -30,15 +45,15 @@ class ClimateSensor extends DefaultDevice { return attributes; } - static matchesItemType(item) { - return item.type === 'Group' && Object.keys(this.getMembers(item)).length > 0; + static get requiredItemTypes() { + return ['Group']; } - static isCompatible(item = {}) { + static matchesDeviceType(item) { return ( item.metadata && item.metadata.ga && - item.metadata.ga.value.toLowerCase() == 'climatesensor' && + item.metadata.ga.value.toLowerCase() === 'climatesensor' && Object.keys(this.getMembers(item)).length > 0 ); } @@ -63,23 +78,11 @@ class ClimateSensor extends DefaultDevice { return state; } - /** - * @returns {object} - */ - static getMembers(item) { - const supportedMembers = ['temperatureAmbient', 'humidityAmbient']; - const members = {}; - if (item.members && item.members.length) { - item.members.forEach((member) => { - if (member.metadata && member.metadata.ga) { - const memberType = supportedMembers.find((m) => member.metadata.ga.value.toLowerCase() === m.toLowerCase()); - if (memberType) { - members[memberType] = { name: member.name, state: member.state }; - } - } - }); - } - return members; + static get supportedMembers() { + return [ + { name: 'temperatureAmbient', types: ['Number'] }, + { name: 'humidityAmbient', types: ['Number'] } + ]; } static useFahrenheit(item) { diff --git a/functions/devices/humiditysensor.js b/functions/devices/humiditysensor.js index 70ffe318..399e0035 100644 --- a/functions/devices/humiditysensor.js +++ b/functions/devices/humiditysensor.js @@ -19,8 +19,8 @@ class HumiditySensor extends DefaultDevice { return ['Number']; } - static isCompatible(item = {}) { - return item.metadata && item.metadata.ga && item.metadata.ga.value.toLowerCase() == 'humiditysensor'; + static matchesDeviceType(item) { + return item.metadata && item.metadata.ga && item.metadata.ga.value.toLowerCase() === 'humiditysensor'; } static getState(item) { diff --git a/functions/devices/temperaturesensor.js b/functions/devices/temperaturesensor.js index 66e697a5..7e075ea6 100644 --- a/functions/devices/temperaturesensor.js +++ b/functions/devices/temperaturesensor.js @@ -11,12 +11,27 @@ class TemperatureSensor extends DefaultDevice { } static getAttributes(item) { - return { + const attributes = { queryOnlyTemperatureSetting: true, thermostatTemperatureUnit: this.useFahrenheit(item) ? 'F' : 'C', queryOnlyTemperatureControl: true, - temperatureUnitForUX: this.useFahrenheit(item) ? 'F' : 'C' + temperatureUnitForUX: this.useFahrenheit(item) ? 'F' : 'C', + temperatureRange: { + minThresholdCelsius: -100, + maxThresholdCelsius: 100 + } }; + const config = this.getConfig(item); + if ('temperatureRange' in config) { + const [min, max] = config.temperatureRange.split(',').map((s) => parseFloat(s.trim())); + if (!isNaN(min) && !isNaN(max)) { + attributes.temperatureRange = { + minThresholdCelsius: min, + maxThresholdCelsius: max + }; + } + } + return attributes; } static get requiredItemTypes() { @@ -24,7 +39,7 @@ class TemperatureSensor extends DefaultDevice { } static matchesDeviceType(item) { - return item.metadata && item.metadata.ga && item.metadata.ga.value.toLowerCase() == 'temperaturesensor'; + return item.metadata && item.metadata.ga && item.metadata.ga.value.toLowerCase() === 'temperaturesensor'; } static getState(item) { diff --git a/tests/devices/climatesensor.test.js b/tests/devices/climatesensor.test.js index f740bd2b..f4243642 100644 --- a/tests/devices/climatesensor.test.js +++ b/tests/devices/climatesensor.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/climatesensor.js'); describe('ClimateSensor Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'climatesensor' @@ -12,7 +12,7 @@ describe('ClimateSensor Device', () => { }) ).toBe(false); expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'climatesensor' @@ -33,23 +33,11 @@ describe('ClimateSensor Device', () => { }); test('matchesItemType', () => { - const item = { - type: 'Group', - members: [ - { - metadata: { - ga: { - value: 'temperatureAmbient' - } - } - } - ] - }; expect(Device.matchesItemType({ type: 'Number' })).toBe(false); expect(Device.matchesItemType({ type: 'Number:Temperature' })).toBe(false); expect(Device.matchesItemType({ type: 'Dimmer' })).toBe(false); expect(Device.matchesItemType({ type: 'Group', groupType: 'Number' })).toBe(false); - expect(Device.matchesItemType(item)).toBe(true); + expect(Device.matchesItemType({ type: 'Group' })).toBe(true); }); describe('getAttributes', () => { @@ -115,7 +103,45 @@ describe('ClimateSensor Device', () => { queryOnlyTemperatureControl: true, queryOnlyTemperatureSetting: true, temperatureUnitForUX: 'F', - thermostatTemperatureUnit: 'F' + thermostatTemperatureUnit: 'F', + temperatureRange: { + maxThresholdCelsius: 100, + minThresholdCelsius: -100 + } + }); + }); + + test('getAttributes temperatureRange', () => { + const item = { + metadata: { + ga: { + config: { + temperatureRange: '0,30' + } + } + }, + members: [ + { + name: 'Temperature', + state: '20', + type: 'Number', + metadata: { + ga: { + value: 'temperatureAmbient' + } + } + } + ] + }; + expect(Device.getAttributes(item)).toStrictEqual({ + queryOnlyTemperatureControl: true, + queryOnlyTemperatureSetting: true, + temperatureUnitForUX: 'C', + thermostatTemperatureUnit: 'C', + temperatureRange: { + maxThresholdCelsius: 30, + minThresholdCelsius: 0 + } }); }); }); diff --git a/tests/devices/humiditysensor.test.js b/tests/devices/humiditysensor.test.js index a1c53388..8684faac 100644 --- a/tests/devices/humiditysensor.test.js +++ b/tests/devices/humiditysensor.test.js @@ -1,9 +1,9 @@ const Device = require('../../functions/devices/humiditysensor.js'); describe('HumiditySensor Device', () => { - test('isCompatible', () => { + test('matchesDeviceType', () => { expect( - Device.isCompatible({ + Device.matchesDeviceType({ metadata: { ga: { value: 'humiditysensor' diff --git a/tests/devices/temperaturesensor.test.js b/tests/devices/temperaturesensor.test.js index 1a56f02f..e64a6e46 100644 --- a/tests/devices/temperaturesensor.test.js +++ b/tests/devices/temperaturesensor.test.js @@ -34,7 +34,11 @@ describe('TemperatureSensor Device', () => { queryOnlyTemperatureControl: true, queryOnlyTemperatureSetting: true, temperatureUnitForUX: 'C', - thermostatTemperatureUnit: 'C' + thermostatTemperatureUnit: 'C', + temperatureRange: { + maxThresholdCelsius: 100, + minThresholdCelsius: -100 + } }); }); @@ -52,7 +56,33 @@ describe('TemperatureSensor Device', () => { queryOnlyTemperatureControl: true, queryOnlyTemperatureSetting: true, temperatureUnitForUX: 'F', - thermostatTemperatureUnit: 'F' + thermostatTemperatureUnit: 'F', + temperatureRange: { + maxThresholdCelsius: 100, + minThresholdCelsius: -100 + } + }); + }); + + test('getAttributes temperatureRange', () => { + const item1 = { + metadata: { + ga: { + config: { + temperatureRange: '-20,40' + } + } + } + }; + expect(Device.getAttributes(item1)).toStrictEqual({ + queryOnlyTemperatureControl: true, + queryOnlyTemperatureSetting: true, + temperatureUnitForUX: 'C', + thermostatTemperatureUnit: 'C', + temperatureRange: { + maxThresholdCelsius: 40, + minThresholdCelsius: -20 + } }); }); }); From 8d38f54f71faa61af49d0bea5e308183b34a29ad Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Sat, 25 Nov 2023 00:21:42 +0100 Subject: [PATCH 3/9] Apply various code fixes by eslint Signed-off-by: Michael Krug --- functions/apihandler.js | 16 +++--- functions/commands/armdisarm.js | 2 +- functions/commands/default.js | 1 - functions/commands/selectchannel.js | 2 +- .../thermostattemperaturesetpointlow.js | 1 + functions/commands/volumerelative.js | 2 +- functions/config.js | 4 +- functions/devices/camera.js | 2 +- functions/devices/default.js | 6 ++ functions/devices/sensor.js | 2 +- functions/devices/specialcolorlight.js | 2 +- functions/devices/thermostat.js | 2 +- functions/index.js | 2 +- functions/openhab.js | 16 ++++-- functions/utilities.js | 30 ++++------ testServer.js | 1 + tests/apihandler.test.js | 12 ++-- tests/commands/default.test.js | 13 +++-- tests/commands/selectchannel.test.js | 5 +- tests/devices/charger.test.js | 2 +- tests/devices/securitysystem.test.js | 42 +++++++------- tests/devices/specialcolorlight.test.js | 23 ++++++++ tests/openhab.test.js | 56 ++++++++++--------- 23 files changed, 139 insertions(+), 105 deletions(-) diff --git a/functions/apihandler.js b/functions/apihandler.js index 1d784ec1..c36a9e3f 100644 --- a/functions/apihandler.js +++ b/functions/apihandler.js @@ -27,7 +27,7 @@ class ApiHandler { */ constructor(config = { host: '', path: '/rest/items/', port: 80 }) { if (!config.path.startsWith('/')) { - config.path = '/' + config.path; + config.path = `/${config.path}`; } if (!config.path.endsWith('/')) { config.path += '/'; @@ -51,13 +51,13 @@ class ApiHandler { getOptions(method = 'GET', itemName = '', length = 0) { const queryString = method === 'GET' - ? '?metadata=ga,synonyms' + (itemName ? '' : '&fields=groupNames,groupType,name,label,metadata,type') + ? `?metadata=ga,synonyms${itemName ? '' : '&fields=groupNames,groupType,name,label,metadata,type,state'}` : ''; const options = { hostname: this._config.host, port: this._config.port, - path: this._config.path + (itemName ? itemName : '') + queryString, method: method, + path: this._config.path + (itemName || '') + queryString, headers: { Accept: 'application/json' } @@ -66,7 +66,7 @@ class ApiHandler { if (this._config.userpass) { options.auth = this._config.userpass; } else if (this._authToken) { - options.headers['Authorization'] = 'Bearer ' + this._authToken; + options.headers.Authorization = `Bearer ${this._authToken}`; } if (method === 'POST') { @@ -85,8 +85,8 @@ class ApiHandler { return new Promise((resolve, reject) => { const protocol = options.port === 443 ? https : http; const req = protocol.request(options, (response) => { - if (200 !== response.statusCode) { - reject({ statusCode: response.statusCode, message: 'getItem - failed for path: ' + options.path }); + if (response.statusCode !== 200) { + reject({ statusCode: response.statusCode, message: `getItem - failed for path: ${options.path}` }); return; } @@ -103,7 +103,7 @@ class ApiHandler { } catch (e) { reject({ statusCode: 415, - message: 'getItem - JSON parse failed for path: ' + options.path + ' - ' + e.toString() + message: `getItem - JSON parse failed for path: ${options.path} - ${e.toString()}` }); } }); @@ -130,7 +130,7 @@ class ApiHandler { const protocol = options.port === 443 ? https : http; const req = protocol.request(options, (response) => { if (!response.statusCode || ![200, 201].includes(response.statusCode)) { - reject({ statusCode: response.statusCode, message: 'sendCommand - failed for path: ' + options.path }); + reject({ statusCode: response.statusCode, message: `sendCommand - failed for path: ${options.path}` }); return; } resolve(true); diff --git a/functions/commands/armdisarm.js b/functions/commands/armdisarm.js index dd132c6d..649a2421 100644 --- a/functions/commands/armdisarm.js +++ b/functions/commands/armdisarm.js @@ -84,7 +84,7 @@ class ArmDisarm extends DefaultCommand { return { ids: [device.id], status: 'EXCEPTIONS', - states: Object.assign({ online: true, currentStatusReport: report }, SecuritySystem.getState(item)) + states: { online: true, currentStatusReport: report, ...SecuritySystem.getState(item) } }; } throw { errorCode: 'armFailure' }; diff --git a/functions/commands/default.js b/functions/commands/default.js index 6726b64a..847935ed 100644 --- a/functions/commands/default.js +++ b/functions/commands/default.js @@ -247,7 +247,6 @@ class DefaultCommand { if (shouldCheckState) { let currentState = this.getNormalizedState(item); if (targetItem !== device.id && item.members && item.members.length) { - // @ts-ignore const member = item.members.find((m) => m.name === targetItem); currentState = member ? this.getNormalizedState(member) : currentState; } diff --git a/functions/commands/selectchannel.js b/functions/commands/selectchannel.js index 5e7f307d..363b2144 100644 --- a/functions/commands/selectchannel.js +++ b/functions/commands/selectchannel.js @@ -33,7 +33,7 @@ class SelectChannel extends DefaultCommand { } const search = params.channelName || params.channelCode; for (const number in channelMap) { - if (channelMap[number].includes(search)) { + if (channelMap[number].some((name) => name.toLowerCase() === search.toLowerCase())) { return number; } } diff --git a/functions/commands/thermostattemperaturesetpointlow.js b/functions/commands/thermostattemperaturesetpointlow.js index 7779c6ac..86ee08f6 100644 --- a/functions/commands/thermostattemperaturesetpointlow.js +++ b/functions/commands/thermostattemperaturesetpointlow.js @@ -14,6 +14,7 @@ class ThermostatTemperatureSetpointLow extends DefaultCommand { static requiresItem() { return true; } + static getItemName(device) { const members = this.getMembers(device); if ('thermostatTemperatureSetpointLow' in members) { diff --git a/functions/commands/volumerelative.js b/functions/commands/volumerelative.js index 62ed97f4..f3cb2b72 100644 --- a/functions/commands/volumerelative.js +++ b/functions/commands/volumerelative.js @@ -35,7 +35,7 @@ class VolumeRelative extends DefaultCommand { throw { statusCode: 400 }; } } - let level = parseInt(state) + params.relativeSteps; + const level = parseInt(state) + params.relativeSteps; return (level < 0 ? 0 : level > 100 ? 100 : level).toString(); } diff --git a/functions/config.js b/functions/config.js index 580cb983..57d5f2db 100644 --- a/functions/config.js +++ b/functions/config.js @@ -31,9 +31,9 @@ * path * Base URL path for openHAB items * - **/ + * */ module.exports = { - //userpass: process.env.OH_USERPASS || 'user@foo.com:Password1', + // userpass: process.env.OH_USERPASS || 'user@foo.com:Password1', host: process.env.OH_HOST || '', port: parseInt(process.env.OH_PORT) || 443, path: process.env.OH_PATH || '/YOUR/REST/ENDPOINT' diff --git a/functions/devices/camera.js b/functions/devices/camera.js index 7932384b..2f6429e5 100644 --- a/functions/devices/camera.js +++ b/functions/devices/camera.js @@ -15,7 +15,7 @@ class Camera extends DefaultDevice { cameraStreamSupportedProtocols: (config.protocols || 'hls,dash,smooth_stream,progressive_mp4') .split(',') .map((s) => s.trim()), - cameraStreamNeedAuthToken: config.token ? true : false, + cameraStreamNeedAuthToken: !!config.token, cameraStreamNeedDrmEncryption: false }; } diff --git a/functions/devices/default.js b/functions/devices/default.js index 082b0242..f0ac0b35 100644 --- a/functions/devices/default.js +++ b/functions/devices/default.js @@ -128,10 +128,16 @@ class DefaultDevice { return {}; } + /** + * @returns {Array} + */ static get supportedMembers() { return []; } + /** + * @returns {object} + */ static getMembers(item) { const supportedMembers = this.supportedMembers; const members = {}; diff --git a/functions/devices/sensor.js b/functions/devices/sensor.js index a8367194..77435f5d 100644 --- a/functions/devices/sensor.js +++ b/functions/devices/sensor.js @@ -53,7 +53,7 @@ class Sensor extends DefaultDevice { const states = config.states.split(',').map((s) => s.trim()); for (const state of states) { const [key, value] = state.split('=').map((s) => s.trim()); - if (value == item.state) { + if (value === item.state) { return key; } } diff --git a/functions/devices/specialcolorlight.js b/functions/devices/specialcolorlight.js index b77997ca..c8f5c6cf 100644 --- a/functions/devices/specialcolorlight.js +++ b/functions/devices/specialcolorlight.js @@ -19,7 +19,7 @@ class SpecialColorLight extends DefaultDevice { return !!( item.metadata && item.metadata.ga && - item.metadata.ga.value.toLowerCase() == 'specialcolorlight' && + item.metadata.ga.value.toLowerCase() === 'specialcolorlight' && Object.keys(members).length > 1 && (!('lightColorTemperature' in members) || this.getColorUnit(item) !== 'percent' || diff --git a/functions/devices/thermostat.js b/functions/devices/thermostat.js index ff44fb67..1e0ba816 100644 --- a/functions/devices/thermostat.js +++ b/functions/devices/thermostat.js @@ -49,7 +49,7 @@ class Thermostat extends DefaultDevice { const state = {}; const members = this.getMembers(item); for (const member in members) { - if (member == 'thermostatMode') { + if (member === 'thermostatMode') { state[member] = this.translateModeToGoogle(item, members[member].state); } else { state[member] = Number(parseFloat(members[member].state).toFixed(1)); diff --git a/functions/index.js b/functions/index.js index e50faacf..1d38ef3e 100644 --- a/functions/index.js +++ b/functions/index.js @@ -18,10 +18,10 @@ * @author Michael Krug - Rework * */ +const app = require('actions-on-google').smarthome(); const OpenHAB = require('./openhab.js'); const ApiHandler = require('./apihandler.js'); const config = require('./config.js'); -const app = require('actions-on-google').smarthome(); const apiHandler = new ApiHandler(config); const openHAB = new OpenHAB(apiHandler); diff --git a/functions/openhab.js b/functions/openhab.js index 41b8cba0..c2557d1d 100644 --- a/functions/openhab.js +++ b/functions/openhab.js @@ -111,7 +111,7 @@ class OpenHAB { handleSync() { return this._apiHandler.getItems().then((items) => { - let discoveredDevicesList = []; + const discoveredDevicesList = []; items = items.filter((item) => item.metadata && item.metadata.ga); items.forEach((item) => { item.members = items.filter((member) => member.groupNames && member.groupNames.includes(item.name)); @@ -144,14 +144,18 @@ class OpenHAB { if (item.state === 'NULL' && !DeviceType.supportedMembers.length) { throw { statusCode: 406, message: `Item state is NULL: ${item.type} ${item.name}` }; } - payload.devices[device.id] = Object.assign({ status: 'SUCCESS', online: true }, DeviceType.getState(item)); + payload.devices[device.id] = { status: 'SUCCESS', online: true, ...DeviceType.getState(item) }; }) .catch((error) => { console.error(`openhabGoogleAssistant - handleQuery - getItem: ERROR ${JSON.stringify(error)}`); payload.devices[device.id] = { status: 'ERROR', errorCode: - error.statusCode == 404 ? 'deviceNotFound' : error.statusCode == 406 ? 'deviceNotReady' : 'deviceOffline' + error.statusCode === 404 + ? 'deviceNotFound' + : error.statusCode === 406 + ? 'deviceNotReady' + : 'deviceOffline' }; }) ); @@ -172,9 +176,9 @@ class OpenHAB { const SetLow = getCommandType('action.devices.commands.ThermostatTemperatureSetpointLow', execution.params); if (SetHigh && SetLow) { promises.push( - SetHigh.execute(this._apiHandler, command.devices, execution.params, execution.challenge).then(() => { - return SetLow.execute(this._apiHandler, command.devices, execution.params, execution.challenge); - }) + SetHigh.execute(this._apiHandler, command.devices, execution.params, execution.challenge).then(() => + SetLow.execute(this._apiHandler, command.devices, execution.params, execution.challenge) + ) ); return; } diff --git a/functions/utilities.js b/functions/utilities.js index 2f439ccb..a1cef6a9 100644 --- a/functions/utilities.js +++ b/functions/utilities.js @@ -23,27 +23,21 @@ module.exports = { * @param {number} value temperature in Fahrenheit * @returns {number} temperature value converted to Celsius */ - convertFahrenheitToCelsius: (value) => { - return Number((((value - 32) * 5) / 9).toFixed(1)); - }, + convertFahrenheitToCelsius: (value) => Number((((value - 32) * 5) / 9).toFixed(1)), /** * @param {number} value temperature in Celsius * @returns {number} temperature value converted to Fahrenheit */ - convertCelsiusToFahrenheit: (value) => { - return Math.round((value * 9) / 5 + 32); - }, + convertCelsiusToFahrenheit: (value) => Math.round((value * 9) / 5 + 32), /** * @param {number} value color temperature as Kelvin * @returns {object} color temperature value converted to RGB */ convertKelvinToRgb: (value) => { const temp = value / 100; - const r = temp <= 66 ? 255 : 329.698727446 * Math.pow(temp - 60, -0.1332047592); + const r = temp <= 66 ? 255 : 329.698727446 * (temp - 60) ** -0.1332047592; const g = - temp <= 66 - ? 99.4708025861 * Math.log(temp) - 161.1195681661 - : 288.1221695283 * Math.pow(temp - 60, -0.0755148492); + temp <= 66 ? 99.4708025861 * Math.log(temp) - 161.1195681661 : 288.1221695283 * (temp - 60) ** -0.0755148492; const b = temp <= 66 ? (temp <= 19 ? 0 : 138.5177312231 * Math.log(temp - 10) - 305.0447927307) : 255; return { r: r < 0 ? 0 : r > 255 ? 255 : Math.round(r), @@ -55,20 +49,18 @@ module.exports = { * @param {number} value color temperature as Kelvin or Mired * @returns {number} color temperature value converted to Mired or Kelvin */ - convertMired: (value) => { - return Math.round(Math.pow(10, 6) / value); - }, + convertMired: (value) => Math.round(10 ** 6 / value), /** * @param {object} rgb color as RGB * @returns {object} color value converted to HSV */ convertRgbToHsv: ({ r, g, b }) => { - r = r / 255; - g = g / 255; - b = b / 255; - let v = Math.max(r, g, b), - n = v - Math.min(r, g, b); - let h = n && (v == r ? (g - b) / n : v == g ? 2 + (b - r) / n : 4 + (r - g) / n); + r /= 255; + g /= 255; + b /= 255; + const v = Math.max(r, g, b); + const n = v - Math.min(r, g, b); + const h = n && (v === r ? (g - b) / n : v === g ? 2 + (b - r) / n : 4 + (r - g) / n); return { hue: Math.round(60 * (h < 0 ? h + 6 : h) * 100) / 100, saturation: Math.round(v && (n / v) * 100) / 100, diff --git a/testServer.js b/testServer.js index 357c5b2d..870de934 100644 --- a/testServer.js +++ b/testServer.js @@ -1,4 +1,5 @@ const express = require('express'); + const app = express(); const openhabGA = require('./functions/index.js'); diff --git a/tests/apihandler.test.js b/tests/apihandler.test.js index 0192a47e..fdabd3ba 100644 --- a/tests/apihandler.test.js +++ b/tests/apihandler.test.js @@ -1,5 +1,5 @@ -const ApiHandler = require('../functions/apihandler.js'); const nock = require('nock'); +const ApiHandler = require('../functions/apihandler.js'); describe('ApiHandler', () => { const config = { @@ -40,7 +40,7 @@ describe('ApiHandler', () => { }, hostname: 'example.org', method: 'GET', - path: '/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type', + path: '/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type,state', port: 443 }); }); @@ -121,7 +121,7 @@ describe('ApiHandler', () => { test('getItems', async () => { const scope = nock('https://example.org') - .get('/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type') + .get('/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type,state') .reply(200, [{ name: 'TestItem' }]); const result = await apiHandler.getItems(); expect(result).toStrictEqual([{ name: 'TestItem' }]); @@ -130,12 +130,12 @@ describe('ApiHandler', () => { test('getItems failed', async () => { const scope = nock('https://example.org') - .get('/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type') + .get('/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type,state') .reply(400, {}); await expect(apiHandler.getItems()).rejects.toStrictEqual({ message: // eslint-disable-next-line max-len - 'getItem - failed for path: /items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type', + 'getItem - failed for path: /items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type,state', statusCode: 400 }); expect(scope.isDone()).toBe(true); @@ -143,7 +143,7 @@ describe('ApiHandler', () => { test('getItems error', async () => { const scope = nock('https://example.org') - .get('/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type') + .get('/items/?metadata=ga,synonyms&fields=groupNames,groupType,name,label,metadata,type,state') .replyWithError('could not reach server'); await expect(apiHandler.getItems()).rejects.toThrowError('could not reach server'); expect(scope.isDone()).toBe(true); diff --git a/tests/commands/default.test.js b/tests/commands/default.test.js index a11122ef..36f404d9 100644 --- a/tests/commands/default.test.js +++ b/tests/commands/default.test.js @@ -4,11 +4,13 @@ class TestCommand1 extends Command { static get type() { return 'action.devices.commands.OnOff'; } + static convertParamsToValue(params) { return params.on ? 'ON' : 'OFF'; } + static getResponseStates(params) { - return Object.assign({}, params); + return { ...params }; } } @@ -22,14 +24,12 @@ class TestCommand2 extends TestCommand1 { } } -// @ts-ignore class TestCommand3 extends TestCommand1 { static convertParamsToValue() { return null; } } -// @ts-ignore class TestCommand4 extends TestCommand1 { static convertParamsToValue() { throw { statusCode: 400 }; @@ -40,6 +40,7 @@ class TestCommand5 extends TestCommand1 { static get requiresUpdateValidation() { return true; } + static bypassPin() { return true; } @@ -49,6 +50,7 @@ class TestCommand6 extends TestCommand1 { static get requiresUpdateValidation() { return true; } + static validateUpdate() { return { someError: true }; } @@ -240,7 +242,7 @@ describe('Default Command', () => { }); test('execute with multiple getItem', async () => { - const successResponse2 = Object.assign({}, successResponse); + const successResponse2 = { ...successResponse }; successResponse2.ids = ['Item2']; const devices = [{ id: 'Item1' }, { id: 'Item2' }]; const result = await TestCommand2.execute(apiHandler, devices, { on: true }, {}); @@ -342,7 +344,7 @@ describe('Default Command', () => { }); test('execute with device not found', async () => { - getItemMock.mockRejectedValue({ statusCode: '404' }); + getItemMock.mockRejectedValue({ statusCode: 404 }); const devices = [{ id: 'Item1' }]; const result = await TestCommand2.execute(apiHandler, devices, { on: true }, {}); expect(getItemMock).toHaveBeenCalledTimes(1); @@ -524,7 +526,6 @@ describe('Default Command', () => { test('execute with validateUpdate and wait time', async () => { const timeoutSpy = jest.spyOn(global, 'setTimeout'); - // @ts-ignore timeoutSpy.mockImplementation((fn) => fn()); const devices = [{ id: 'Item1', customData: { waitForStateChange: 5 } }]; const result = await TestCommand5.execute(apiHandler, devices, { on: true }, {}); diff --git a/tests/commands/selectchannel.test.js b/tests/commands/selectchannel.test.js index 931eb0e5..fd5922fd 100644 --- a/tests/commands/selectchannel.test.js +++ b/tests/commands/selectchannel.test.js @@ -31,13 +31,16 @@ describe('selectChannel Command', () => { metadata: { ga: { config: { - availableChannels: '1=channel1=ARD,2=channel2=ZDF' + availableChannels: '1=channel1=ARD,2=channel2=ZDF,3=channel3=Disney Channel' } } } }; expect(Command.convertParamsToValue({ channelCode: 'channel1' }, item)).toBe('1'); + expect(Command.convertParamsToValue({ channelCode: 'channel3' }, item)).toBe('3'); expect(Command.convertParamsToValue({ channelName: 'ARD' }, item)).toBe('1'); + expect(Command.convertParamsToValue({ channelName: 'Ard' }, item)).toBe('1'); + expect(Command.convertParamsToValue({ channelName: 'Disney Channel' }, item)).toBe('3'); expect(Command.convertParamsToValue({ channelNumber: '1' }, item)).toBe('1'); expect(() => { Command.convertParamsToValue({ channelNumber: '0' }, item); diff --git a/tests/devices/charger.test.js b/tests/devices/charger.test.js index 08dd14da..a9536b5b 100644 --- a/tests/devices/charger.test.js +++ b/tests/devices/charger.test.js @@ -345,8 +345,8 @@ describe('Charger Device', () => { }, { name: 'CapacityUntilFull', - type: 'Number', state: '6000.123', + type: 'Number', metadata: { ga: { value: 'chargerCapacityUntilFull' diff --git a/tests/devices/securitysystem.test.js b/tests/devices/securitysystem.test.js index 8171db92..98e27449 100644 --- a/tests/devices/securitysystem.test.js +++ b/tests/devices/securitysystem.test.js @@ -61,7 +61,7 @@ describe('SecuritySystem Device', () => { describe('getState', () => { test('getState without armLevel', () => { - let device = { + const device = { type: 'Group', members: [ { @@ -88,7 +88,7 @@ describe('SecuritySystem Device', () => { }); test('getState without armed', () => { - let device = { + const device = { members: [ { type: 'String', @@ -112,7 +112,7 @@ describe('SecuritySystem Device', () => { }); test('getState with armLevel', () => { - let device = { + const device = { members: [ { type: 'Switch', @@ -178,7 +178,7 @@ describe('SecuritySystem Device', () => { describe('getAttributes', () => { test('just a switch with no config', () => { - let device = { + const device = { metadata: { ga: { config: {} @@ -190,7 +190,7 @@ describe('SecuritySystem Device', () => { }); test('no arm levels defined', () => { - let device = { + const device = { metadata: { ga: { config: { @@ -205,7 +205,7 @@ describe('SecuritySystem Device', () => { }); test('armLevels, 1 level with lang and ordered set', () => { - let device = { + const device = { metadata: { ga: { config: { @@ -237,7 +237,7 @@ describe('SecuritySystem Device', () => { }); test('armLevels, 1 level with default ordered value', () => { - let device = { + const device = { metadata: { ga: { config: { @@ -253,7 +253,7 @@ describe('SecuritySystem Device', () => { }); test('armLevels, 1 level with default lang', () => { - let device = { + const device = { metadata: { ga: { config: { @@ -281,7 +281,7 @@ describe('SecuritySystem Device', () => { }); test('armLevels, multiple levels', () => { - let device = { + const device = { metadata: { ga: { config: { @@ -339,7 +339,7 @@ describe('SecuritySystem Device', () => { const memberErrorCode = 'securitySystemTroubleCode'; test('member without ga metadata', () => { - let device = { + const device = { members: [ { name: 'armed', @@ -358,14 +358,14 @@ describe('SecuritySystem Device', () => { ] }; const members = Device.getMembers(device); - let expectedMembers = {}; + const expectedMembers = {}; expectedMembers[memberArmed] = { name: 'armed', state: 'ON', config: {} }; expect(members).toStrictEqual(expectedMembers); }); test('member with ga metadata but not an alarm item', () => { - let device = { + const device = { members: [ { name: 'armed', @@ -379,12 +379,12 @@ describe('SecuritySystem Device', () => { ] }; const members = Device.getMembers(device); - let expectedMembers = {}; + const expectedMembers = {}; expect(members).toStrictEqual(expectedMembers); }); test('all possible members defined with no extra config', () => { - let device = { + const device = { members: [ { name: 'armed', @@ -439,7 +439,7 @@ describe('SecuritySystem Device', () => { ] }; const members = Device.getMembers(device); - let expectedMembers = {}; + const expectedMembers = {}; expectedMembers[memberArmed] = { name: 'armed', state: 'ON', config: {} }; expectedMembers[memberArmLevel] = { name: 'armLevel', state: 'L1', config: {} }; expectedMembers[memberTrouble] = { name: 'trouble', state: 'OFF', config: {} }; @@ -449,7 +449,7 @@ describe('SecuritySystem Device', () => { }); test('bare minimum members', () => { - let device = { + const device = { members: [ { name: 'armed', @@ -464,13 +464,13 @@ describe('SecuritySystem Device', () => { ] }; const members = Device.getMembers(device); - let expectedMembers = {}; + const expectedMembers = {}; expectedMembers[memberArmed] = { name: 'armed', state: 'ON', config: {} }; expect(members).toStrictEqual(expectedMembers); }); test('zones with extra config', () => { - let device = { + const device = { members: [ { name: 'zone1', @@ -486,7 +486,7 @@ describe('SecuritySystem Device', () => { ] }; const members = Device.getMembers(device); - let expectedMembers = {}; + const expectedMembers = {}; expectedMembers.zones = [{ name: 'zone1', state: 'OPEN', config: { zoneType: 'OpenClose' } }]; expect(members).toStrictEqual(expectedMembers); }); @@ -498,7 +498,7 @@ describe('SecuritySystem Device', () => { const memberErrorCode = 'securitySystemTroubleCode'; test('trouble', () => { - let device = { + const device = { name: 'alarm', members: [ { @@ -534,7 +534,7 @@ describe('SecuritySystem Device', () => { }); test('zones', () => { - let device = { + const device = { name: 'alarm', members: [ { diff --git a/tests/devices/specialcolorlight.test.js b/tests/devices/specialcolorlight.test.js index c47f9cf7..4afcb344 100644 --- a/tests/devices/specialcolorlight.test.js +++ b/tests/devices/specialcolorlight.test.js @@ -204,6 +204,29 @@ describe('SpecialColorLight Device', () => { }); describe('getAttributes', () => { + test('getAttributes no config', () => { + const item = { + metadata: { + ga: { + config: {} + } + }, + members: [ + { + type: 'Color', + metadata: { + ga: { + value: 'lightColor' + } + } + } + ] + }; + expect(Device.getAttributes(item)).toStrictEqual({ + colorModel: 'hsv' + }); + }); + test('getAttributes colorTemperatureRange', () => { const item = { metadata: { diff --git a/tests/openhab.test.js b/tests/openhab.test.js index 437180a2..c85e9624 100644 --- a/tests/openhab.test.js +++ b/tests/openhab.test.js @@ -24,7 +24,7 @@ describe('OpenHAB', () => { test('onSync failure', async () => { const handleSyncMock = jest.spyOn(openHAB, 'handleSync'); - handleSyncMock.mockRejectedValue(); + handleSyncMock.mockRejectedValue(null); const result = await openHAB.onSync({ requestId: '1234' }, {}); expect(handleSyncMock).toBeCalledTimes(1); expect(result).toStrictEqual({ @@ -124,23 +124,23 @@ describe('OpenHAB', () => { }, { type: 'Group', - name: 'TVItem', - label: 'TV Item', - metadata: { ga: { value: 'TV' } } + name: 'LightItem', + label: 'Light Item', + metadata: { ga: { value: 'SpecialColorLight' } } }, { - type: 'Switch', - name: 'TVMute', - label: 'TV Mute', - groupNames: ['TVItem'], - metadata: { ga: { value: 'tvMute' } } + type: 'Color', + name: 'LightColor', + label: 'Light Color', + groupNames: ['LightItem'], + metadata: { ga: { value: 'lightColor' } } }, { type: 'Switch', - name: 'TVPower', - label: 'TV Power', - groupNames: ['TVItem'], - metadata: { ga: { value: 'tvPower' } } + name: 'LightPower', + label: 'Light Power', + groupNames: ['LightItem'], + metadata: { ga: { value: 'lightPower' } } } ]) ); @@ -174,32 +174,36 @@ describe('OpenHAB', () => { }, { attributes: { - volumeCanMuteAndUnmute: true + colorModel: 'hsv' }, customData: { - deviceType: 'TV', + deviceType: 'SpecialColorLight', itemType: 'Group', members: { - tvMute: 'TVMute', - tvPower: 'TVPower' + lightColor: 'LightColor', + lightPower: 'LightPower' } }, deviceInfo: { manufacturer: 'openHAB', - model: 'Group:TVItem', + model: 'Group:LightItem', hwVersion: '3.0.0', swVersion: packageVersion }, - id: 'TVItem', + id: 'LightItem', name: { - defaultNames: ['TV Item'], - name: 'TV Item', - nicknames: ['TV Item'] + defaultNames: ['Light Item'], + name: 'Light Item', + nicknames: ['Light Item'] }, roomHint: undefined, structureHint: undefined, - traits: ['action.devices.traits.OnOff', 'action.devices.traits.Volume'], - type: 'action.devices.types.TV', + traits: [ + 'action.devices.traits.OnOff', + 'action.devices.traits.Brightness', + 'action.devices.traits.ColorSetting' + ], + type: 'action.devices.types.LIGHT', willReportState: false } ] @@ -216,7 +220,7 @@ describe('OpenHAB', () => { test('onQuery failure', async () => { const handleQueryMock = jest.spyOn(openHAB, 'handleQuery'); - handleQueryMock.mockRejectedValue(); + handleQueryMock.mockRejectedValue(null); const result = await openHAB.onQuery({ requestId: '1234' }, {}); expect(handleQueryMock).toBeCalledTimes(1); expect(handleQueryMock).toBeCalledWith([]); @@ -400,7 +404,7 @@ describe('OpenHAB', () => { test('onExecute failure', async () => { const handleExecuteMock = jest.spyOn(openHAB, 'handleExecute'); - handleExecuteMock.mockRejectedValue({}); + handleExecuteMock.mockRejectedValue(null); const result = await openHAB.onExecute({ requestId: '1234' }, {}); expect(handleExecuteMock).toBeCalledTimes(1); expect(handleExecuteMock).toBeCalledWith([]); From b11300ec07076b6fe6234f0f78c9f478c67d2875 Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Sat, 25 Nov 2023 00:22:49 +0100 Subject: [PATCH 4/9] Adjust TV to latest documentation Signed-off-by: Michael Krug --- functions/devices/tv.js | 22 ++++++++++-------- tests/devices/tv.test.js | 49 ++++++++++++++++++++++++++++++---------- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/functions/devices/tv.js b/functions/devices/tv.js index 88e5cb36..330921af 100644 --- a/functions/devices/tv.js +++ b/functions/devices/tv.js @@ -6,15 +6,16 @@ class TV extends DefaultDevice { } static getTraits(item) { - const traits = []; + const traits = [ + 'action.devices.traits.AppSelector', + 'action.devices.traits.InputSelector', + 'action.devices.traits.MediaState', + 'action.devices.traits.OnOff', + 'action.devices.traits.TransportControl', + 'action.devices.traits.Volume' + ]; const members = this.getMembers(item); - if ('tvPower' in members) traits.push('action.devices.traits.OnOff'); - if ('tvMute' in members || 'tvVolume' in members) traits.push('action.devices.traits.Volume'); if ('tvChannel' in members) traits.push('action.devices.traits.Channel'); - if ('tvInput' in members) traits.push('action.devices.traits.InputSelector'); - if ('tvTransport' in members) - traits.push('action.devices.traits.TransportControl', 'action.devices.traits.MediaState'); - if ('tvApplication' in members) traits.push('action.devices.traits.AppSelector'); return traits; } @@ -30,10 +31,13 @@ class TV extends DefaultDevice { const config = this.getConfig(item); const members = this.getMembers(item); const attributes = { + availableApplications: [], + availableInputs: [], + transportControlSupportedCommands: [], + volumeMaxLevel: 100, volumeCanMuteAndUnmute: 'tvMute' in members }; if ('tvVolume' in members) { - attributes.volumeMaxLevel = 100; if ('volumeMaxLevel' in config) { attributes.volumeMaxLevel = Number(config.volumeMaxLevel); } @@ -54,7 +58,6 @@ class TV extends DefaultDevice { } } if ('tvInput' in members && 'availableInputs' in config) { - attributes.availableInputs = []; config.availableInputs.split(',').forEach((input) => { const [key, synonyms] = input.split('='); attributes.availableInputs.push({ @@ -81,7 +84,6 @@ class TV extends DefaultDevice { }); } if ('tvApplication' in members && 'availableApplications' in config) { - attributes.availableApplications = []; config.availableApplications.split(',').forEach((application) => { const [key, synonyms] = application.split('='); attributes.availableApplications.push({ diff --git a/tests/devices/tv.test.js b/tests/devices/tv.test.js index ff549d9c..67c9318c 100644 --- a/tests/devices/tv.test.js +++ b/tests/devices/tv.test.js @@ -52,7 +52,14 @@ describe('TV Device', () => { } ] }; - expect(Device.getTraits(item)).toStrictEqual(['action.devices.traits.OnOff']); + expect(Device.getTraits(item)).toStrictEqual([ + 'action.devices.traits.AppSelector', + 'action.devices.traits.InputSelector', + 'action.devices.traits.MediaState', + 'action.devices.traits.OnOff', + 'action.devices.traits.TransportControl', + 'action.devices.traits.Volume' + ]); }); test('getTraits all members', () => { @@ -86,7 +93,7 @@ describe('TV Device', () => { } }, { - state: 'PLAY', + state: 'PLAYING', type: 'Player', metadata: { ga: { @@ -124,13 +131,13 @@ describe('TV Device', () => { ] }; expect(Device.getTraits(item)).toStrictEqual([ - 'action.devices.traits.OnOff', - 'action.devices.traits.Volume', - 'action.devices.traits.Channel', + 'action.devices.traits.AppSelector', 'action.devices.traits.InputSelector', - 'action.devices.traits.TransportControl', 'action.devices.traits.MediaState', - 'action.devices.traits.AppSelector' + 'action.devices.traits.OnOff', + 'action.devices.traits.TransportControl', + 'action.devices.traits.Volume', + 'action.devices.traits.Channel' ]); }); }); @@ -166,6 +173,8 @@ describe('TV Device', () => { supportPlaybackState: true, transportControlSupportedCommands: ['NEXT', 'PREVIOUS', 'PAUSE', 'RESUME'], volumeCanMuteAndUnmute: false, + availableApplications: [], + availableInputs: [], volumeMaxLevel: 100 }); }); @@ -196,7 +205,10 @@ describe('TV Device', () => { levelStepSize: 10, volumeCanMuteAndUnmute: false, volumeDefaultPercentage: 20, - volumeMaxLevel: 80 + volumeMaxLevel: 80, + availableApplications: [], + availableInputs: [], + transportControlSupportedCommands: [] }); }); @@ -231,7 +243,10 @@ describe('TV Device', () => { expect(Device.getAttributes(item)).toStrictEqual({ supportPlaybackState: true, transportControlSupportedCommands: ['PAUSE', 'RESUME'], - volumeCanMuteAndUnmute: true + volumeCanMuteAndUnmute: true, + availableApplications: [], + availableInputs: [], + volumeMaxLevel: 100 }); }); @@ -277,7 +292,10 @@ describe('TV Device', () => { } ], orderedInputs: false, - volumeCanMuteAndUnmute: false + volumeCanMuteAndUnmute: false, + availableApplications: [], + transportControlSupportedCommands: [], + volumeMaxLevel: 100 }); }); @@ -314,6 +332,10 @@ describe('TV Device', () => { number: '2' } ], + availableApplications: [], + availableInputs: [], + transportControlSupportedCommands: [], + volumeMaxLevel: 100, volumeCanMuteAndUnmute: false }); }); @@ -360,7 +382,10 @@ describe('TV Device', () => { ] } ], - volumeCanMuteAndUnmute: false + volumeCanMuteAndUnmute: false, + availableInputs: [], + transportControlSupportedCommands: [], + volumeMaxLevel: 100 }); }); @@ -628,7 +653,7 @@ describe('TV Device', () => { }, members: [ { - state: '50', + state: '50.43', type: 'Number', metadata: { ga: { From 15c1dc4bfa743adcaf9e2fa6b032e5ebbcdea9fc Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Thu, 11 Jan 2024 13:39:57 +0100 Subject: [PATCH 5/9] Fix markdown complain Signed-off-by: Michael Krug --- docs/USAGE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/USAGE.md b/docs/USAGE.md index 077fec6a..1825e992 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -361,7 +361,7 @@ Switch { ga="AirPurifier" } # No speed control - only on/off When configuring a Fan (or similar device) as a group with the above listed members, you will gain more options to control the device. In addition to control power and speeds, you will also be able to set modes and query sensor information (if supported by Google). -For more information on the `fanSpeeds` configuration option, please have a look at the simple `Fan` device type. +For more information on the `fanSpeeds` configuration option, please take a look at the simple `Fan` device type. With the `fanModeName` and `fanModeSettings` you can control specific modes. Currently, one mode type per device is supported that you can configure with a name and a list of settings. The first entry in the names field is used internally while any other following separated by comma will be a synonym to be used in commands. The settings list is a comma-separated list of `value=name` pairs. The name can also contain synonyms separated by a colon. In the listed example you could then say "Set OperationMode to Normal". @@ -385,7 +385,7 @@ Number pm25Item (fanGroup) { ga="fanPM25" } | **Supported Items** | Group as `AC_Unit` with the following members:
(optional) Switch as `fanPower`
(optional) Dimmer or Number as `fanSpeed`
(optional) Number or String as `fanMode`
(optional) Number as `fanFilterLifeTime`
(optional) Number as `fanPM25`
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | | **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `useFahrenheit=true/false`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"`
(optional) `lang="en"`
(optional) `ordered=true/false` | -The AC_Unit device is basically the combination of the Fan and the Thermostat device. For explanation on configuration options please have a look at both of them. +The AC_Unit device is basically the combination of the Fan and the Thermostat device. For explanation on configuration options please take a look at both of them. ```shell Group acunitGroup { ga="AC_Unit" [ fanSpeeds="0=null:off,50=slow,100=full:fast", fanModeName="OperationMode,Modus", fanModeSettings="1=Silent,2=Normal,3=Night", thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto", thermostatTemperatureRange="10,30", useFahrenheit=false, lang="en", ordered=true ] } From 5be133028e844f46c3dffc00fd9044c7164d4060 Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Tue, 30 Jan 2024 09:04:03 +0100 Subject: [PATCH 6/9] Fix markdown issue Signed-off-by: Michael Krug --- docs/USAGE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/USAGE.md b/docs/USAGE.md index c6701cce..9a7d735a 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -32,7 +32,7 @@ This documentation refers to release [v3.9.0](https://github.com/openhab/openhab - Prepared available configuration options for the upcoming rollout of v4 - Users can start adjusting their setup to use the new configuration options: - [`Thermostat`](#thermostat): `modes` has been renamed to `thermostatModes` - - [`Fan`](#fan-hood-airpurifier): `speeds` has been renamed to `fanSpeeds` + - [`Fan`](#fan-hood-airpurifier-only-onoff-or-fan-speed-control): `speeds` has been renamed to `fanSpeeds` ### v3.8.0 From d3031224dbc9df5281f1985679a16f8c65d3e5e4 Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Wed, 29 May 2024 00:12:52 +0200 Subject: [PATCH 7/9] Add humidityUnit configuration option Signed-off-by: Michael Krug --- docs/USAGE.md | 7 ++++--- functions/devices/climatesensor.js | 4 +++- functions/devices/humiditysensor.js | 4 +++- functions/devices/thermostat.js | 5 +++++ tests/devices/climatesensor.test.js | 25 +++++++++++++++++++++++++ tests/devices/humiditysensor.test.js | 19 +++++++++++++++---- tests/devices/thermostat.test.js | 27 +++++++++++++++++++++++++++ 7 files changed, 82 insertions(+), 9 deletions(-) diff --git a/docs/USAGE.md b/docs/USAGE.md index 9a7d735a..731159d9 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -390,7 +390,7 @@ Number pm25Item (fanGroup) { ga="fanPM25" } | **Device Type** | [AC_Unit](https://developers.google.com/assistant/smarthome/guides/acunit) | | **Supported Traits** | [OnOff](https://developers.google.com/assistant/smarthome/traits/OnOff), [FanSpeed](https://developers.google.com/assistant/smarthome/traits/fanspeed), [TemperatureSetting](https://developers.google.com/assistant/smarthome/traits/temperaturesetting), [Modes](https://developers.google.com/assistant/smarthome/traits/modes), [SensorState](https://developers.google.com/assistant/smarthome/traits/sensorstate) | | **Supported Items** | Group as `AC_Unit` with the following members:
(optional) Switch as `fanPower`
(optional) Dimmer or Number as `fanSpeed`
(optional) Number or String as `fanMode`
(optional) Number as `fanFilterLifeTime`
(optional) Number as `fanPM25`
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | -| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `useFahrenheit=true/false`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"`
(optional) `lang="en"`
(optional) `ordered=true/false` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `useFahrenheit=true/false`
(optional) `humidityUnit=percent/float`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"`
(optional) `lang="en"`
(optional) `ordered=true/false` | The AC_Unit device is basically the combination of the Fan and the Thermostat device. For explanation on configuration options please take a look at both of them. @@ -486,6 +486,7 @@ Number { ga="TemperatureSensor" [ useFahrenheit=true, temperatureRange="-20,40" | **Device Type** | [Sensor](https://developers.home.google.com/cloud-to-cloud/guides/sensor) | | **Supported Traits** | [HumiditySetting](https://developers.home.google.com/cloud-to-cloud/traits/humiditysetting) | | **Supported Items** | Number | +| **Configuration** | (optional) `humidityUnit=percent/float` | ```shell Number { ga="HumiditySensor" } @@ -498,7 +499,7 @@ Number { ga="HumiditySensor" } | **Device Type** | [Sensor](https://developers.home.google.com/cloud-to-cloud/guides/sensor) | | **Supported Traits** | [HumiditySetting](https://developers.home.google.com/cloud-to-cloud/traits/humiditysetting), [TemperatureControl](https://developers.home.google.com/cloud-to-cloud/traits/temperaturecontrol), [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | | **Supported Items** | Group as `ClimateSensor` with the following members:
(optional) Number as `humidityAmbient`
(optional) Number as `temperatureAmbient` | -| **Configuration** | (optional) `useFahrenheit=true/false`
(optional) `temperatureRange="-10,50"` | +| **Configuration** | (optional) `useFahrenheit=true/false`
(optional) `humidityUnit=percent/float`
(optional) `temperatureRange="-10,50"` | By default, the temperature range of a climate sensor is set to -100 °C to 100 °C. The reported state values have to fall into that range! @@ -517,7 +518,7 @@ Number humidityItem (sensorGroup) { ga="humidityAmbient" } | **Device Type** | [Thermostat](https://developers.home.google.com/cloud-to-cloud/guides/thermostat) | | **Supported Traits** | [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | | **Supported Items** | Group as `Thermostat` with the following members
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | -| **Configuration** | (optional) `checkState=true/false`
(optional) `useFahrenheit=true/false`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `useFahrenheit=true/false`
(optional) `humidityUnit=percent/float`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"` | Thermostat requires a group of items to be properly configured to be used with Google Assistant. The default temperature unit is Celsius. To change the temperature unit to Fahrenheit, add the config option `useFahrenheit=true` to the thermostat group. diff --git a/functions/devices/climatesensor.js b/functions/devices/climatesensor.js index 81f6acef..381a12ef 100644 --- a/functions/devices/climatesensor.js +++ b/functions/devices/climatesensor.js @@ -71,7 +71,9 @@ class ClimateSensor extends DefaultDevice { state.temperatureSetpointCelsius = temperature; } if ('humidityAmbient' in members) { - const humidity = Math.round(parseFloat(members.humidityAmbient.state)); + const config = this.getConfig(item); + const isPercent = !config.humidityUnit || config.humidityUnit.toLowerCase() === 'percent'; + const humidity = Math.round(parseFloat(members.humidityAmbient.state) * (isPercent ? 1 : 100)); state.humidityAmbientPercent = humidity; state.humiditySetpointPercent = humidity; } diff --git a/functions/devices/humiditysensor.js b/functions/devices/humiditysensor.js index b9df74b1..e007dd57 100644 --- a/functions/devices/humiditysensor.js +++ b/functions/devices/humiditysensor.js @@ -24,7 +24,9 @@ class HumiditySensor extends DefaultDevice { } static getState(item) { - const state = Math.round(parseFloat(item.state)); + const config = this.getConfig(item); + const isPercent = !config.humidityUnit || config.humidityUnit.toLowerCase() === 'percent'; + const state = Math.round(parseFloat(item.state) * (isPercent ? 1 : 100)); return { humidityAmbientPercent: state, humiditySetpointPercent: state diff --git a/functions/devices/thermostat.js b/functions/devices/thermostat.js index 1e0ba816..0666097a 100644 --- a/functions/devices/thermostat.js +++ b/functions/devices/thermostat.js @@ -56,6 +56,11 @@ class Thermostat extends DefaultDevice { if (member.indexOf('Temperature') > 0 && this.useFahrenheit(item)) { state[member] = convertFahrenheitToCelsius(state[member]); } + if (member.indexOf('Humidity') > 0) { + const config = this.getConfig(item); + const isPercent = !config.humidityUnit || config.humidityUnit.toLowerCase() === 'percent'; + state[member] = Math.round(parseFloat(members[member].state) * (isPercent ? 1 : 100)); + } } } return state; diff --git a/tests/devices/climatesensor.test.js b/tests/devices/climatesensor.test.js index 06d2e3b7..9e4ec232 100644 --- a/tests/devices/climatesensor.test.js +++ b/tests/devices/climatesensor.test.js @@ -222,5 +222,30 @@ describe('ClimateSensor Device', () => { humidityAmbientPercent: 30, humiditySetpointPercent: 30 }); + const item4 = { + metadata: { + ga: { + config: { + humidityUnit: 'float' + } + } + }, + members: [ + { + name: 'Humidity', + state: '0.45', + type: 'Number', + metadata: { + ga: { + value: 'humidityAmbient' + } + } + } + ] + }; + expect(Device.getState(item4)).toStrictEqual({ + humidityAmbientPercent: 45, + humiditySetpointPercent: 45 + }); }); }); diff --git a/tests/devices/humiditysensor.test.js b/tests/devices/humiditysensor.test.js index b6311f48..9e483b5b 100644 --- a/tests/devices/humiditysensor.test.js +++ b/tests/devices/humiditysensor.test.js @@ -29,10 +29,21 @@ describe('HumiditySensor Device', () => { }); }); - test('getState', () => { - expect(Device.getState({ state: '9.6 %' })).toStrictEqual({ - humidityAmbientPercent: 10, - humiditySetpointPercent: 10 + describe('getAttributes', () => { + test('getState no config', () => { + expect(Device.getState({ state: '9.6 %' })).toStrictEqual({ + humidityAmbientPercent: 10, + humiditySetpointPercent: 10 + }); + }); + + test('getState humidityUnit float', () => { + expect(Device.getState({ state: '0.34', metadata: { ga: { config: { humidityUnit: 'float' } } } })).toStrictEqual( + { + humidityAmbientPercent: 34, + humiditySetpointPercent: 34 + } + ); }); }); }); diff --git a/tests/devices/thermostat.test.js b/tests/devices/thermostat.test.js index da1ec8a8..dcd81b04 100644 --- a/tests/devices/thermostat.test.js +++ b/tests/devices/thermostat.test.js @@ -414,5 +414,32 @@ describe('Thermostat Device', () => { thermostatTemperatureAmbient: -6.7 }); }); + + test('getState only humdity with unit', () => { + const item = { + metadata: { + ga: { + config: { + humidityUnit: 'float' + } + } + }, + members: [ + { + name: 'Humidity', + state: '0.65', + type: 'Number', + metadata: { + ga: { + value: 'thermostatHumidityAmbient' + } + } + } + ] + }; + expect(Device.getState(item)).toStrictEqual({ + thermostatHumidityAmbient: 65 + }); + }); }); }); From 5e85c45246ff89903b34558a0272479f5240d010 Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Fri, 31 May 2024 20:17:51 +0200 Subject: [PATCH 8/9] Change humidityUnit to maxHumidity Signed-off-by: Michael Krug --- docs/USAGE.md | 8 ++++---- functions/devices/climatesensor.js | 4 ++-- functions/devices/humiditysensor.js | 4 ++-- functions/devices/thermostat.js | 4 ++-- tests/devices/climatesensor.test.js | 2 +- tests/devices/humiditysensor.test.js | 12 +++++------- tests/devices/thermostat.test.js | 4 ++-- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/docs/USAGE.md b/docs/USAGE.md index 731159d9..da79204d 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -390,7 +390,7 @@ Number pm25Item (fanGroup) { ga="fanPM25" } | **Device Type** | [AC_Unit](https://developers.google.com/assistant/smarthome/guides/acunit) | | **Supported Traits** | [OnOff](https://developers.google.com/assistant/smarthome/traits/OnOff), [FanSpeed](https://developers.google.com/assistant/smarthome/traits/fanspeed), [TemperatureSetting](https://developers.google.com/assistant/smarthome/traits/temperaturesetting), [Modes](https://developers.google.com/assistant/smarthome/traits/modes), [SensorState](https://developers.google.com/assistant/smarthome/traits/sensorstate) | | **Supported Items** | Group as `AC_Unit` with the following members:
(optional) Switch as `fanPower`
(optional) Dimmer or Number as `fanSpeed`
(optional) Number or String as `fanMode`
(optional) Number as `fanFilterLifeTime`
(optional) Number as `fanPM25`
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | -| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `useFahrenheit=true/false`
(optional) `humidityUnit=percent/float`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"`
(optional) `lang="en"`
(optional) `ordered=true/false` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `fanSpeeds="0=away:zero,50=default:standard:one,100=high:two"`
(optional) `fanModeName="OperationMode,Modus"`
(optional) `fanModeSettings="1=Low:Silent,2=Normal,3=High:Night"`
(optional) `useFahrenheit=true/false`
(optional) `maxHumidity=1-100`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"`
(optional) `lang="en"`
(optional) `ordered=true/false` | The AC_Unit device is basically the combination of the Fan and the Thermostat device. For explanation on configuration options please take a look at both of them. @@ -486,7 +486,7 @@ Number { ga="TemperatureSensor" [ useFahrenheit=true, temperatureRange="-20,40" | **Device Type** | [Sensor](https://developers.home.google.com/cloud-to-cloud/guides/sensor) | | **Supported Traits** | [HumiditySetting](https://developers.home.google.com/cloud-to-cloud/traits/humiditysetting) | | **Supported Items** | Number | -| **Configuration** | (optional) `humidityUnit=percent/float` | +| **Configuration** | (optional) `maxHumidity=1-100` | ```shell Number { ga="HumiditySensor" } @@ -499,7 +499,7 @@ Number { ga="HumiditySensor" } | **Device Type** | [Sensor](https://developers.home.google.com/cloud-to-cloud/guides/sensor) | | **Supported Traits** | [HumiditySetting](https://developers.home.google.com/cloud-to-cloud/traits/humiditysetting), [TemperatureControl](https://developers.home.google.com/cloud-to-cloud/traits/temperaturecontrol), [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | | **Supported Items** | Group as `ClimateSensor` with the following members:
(optional) Number as `humidityAmbient`
(optional) Number as `temperatureAmbient` | -| **Configuration** | (optional) `useFahrenheit=true/false`
(optional) `humidityUnit=percent/float`
(optional) `temperatureRange="-10,50"` | +| **Configuration** | (optional) `useFahrenheit=true/false`
(optional) `maxHumidity=1-100`
(optional) `temperatureRange="-10,50"` | By default, the temperature range of a climate sensor is set to -100 °C to 100 °C. The reported state values have to fall into that range! @@ -518,7 +518,7 @@ Number humidityItem (sensorGroup) { ga="humidityAmbient" } | **Device Type** | [Thermostat](https://developers.home.google.com/cloud-to-cloud/guides/thermostat) | | **Supported Traits** | [TemperatureSetting](https://developers.home.google.com/cloud-to-cloud/traits/temperaturesetting) | | **Supported Items** | Group as `Thermostat` with the following members
(optional) Number as `thermostatTemperatureAmbient`
(optional) Number as `thermostatTemperatureSetpoint`
(optional) Number as `thermostatTemperatureSetpointLow`
(optional) Number as `thermostatTemperatureSetpointHigh`
(optional) Number as `thermostatHumidityAmbient`
(optional) String or Number or Switch as `thermostatMode` | -| **Configuration** | (optional) `checkState=true/false`
(optional) `useFahrenheit=true/false`
(optional) `humidityUnit=percent/float`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"` | +| **Configuration** | (optional) `checkState=true/false`
(optional) `useFahrenheit=true/false`
(optional) `maxHumidity=1-100`
(optional) `thermostatTemperatureRange="10,30"`
(optional) `thermostatModes="off=OFF:WINDOW_OPEN,heat=COMFORT:BOOST,eco=ECO,on=ON,auto"` | Thermostat requires a group of items to be properly configured to be used with Google Assistant. The default temperature unit is Celsius. To change the temperature unit to Fahrenheit, add the config option `useFahrenheit=true` to the thermostat group. diff --git a/functions/devices/climatesensor.js b/functions/devices/climatesensor.js index 381a12ef..444954d6 100644 --- a/functions/devices/climatesensor.js +++ b/functions/devices/climatesensor.js @@ -72,8 +72,8 @@ class ClimateSensor extends DefaultDevice { } if ('humidityAmbient' in members) { const config = this.getConfig(item); - const isPercent = !config.humidityUnit || config.humidityUnit.toLowerCase() === 'percent'; - const humidity = Math.round(parseFloat(members.humidityAmbient.state) * (isPercent ? 1 : 100)); + const maxHumidity = (config.maxHumidity && parseInt(config.maxHumidity)) || 100; + const humidity = Math.round(parseFloat(members.humidityAmbient.state) * (100 / maxHumidity)); state.humidityAmbientPercent = humidity; state.humiditySetpointPercent = humidity; } diff --git a/functions/devices/humiditysensor.js b/functions/devices/humiditysensor.js index e007dd57..53efe9ce 100644 --- a/functions/devices/humiditysensor.js +++ b/functions/devices/humiditysensor.js @@ -25,8 +25,8 @@ class HumiditySensor extends DefaultDevice { static getState(item) { const config = this.getConfig(item); - const isPercent = !config.humidityUnit || config.humidityUnit.toLowerCase() === 'percent'; - const state = Math.round(parseFloat(item.state) * (isPercent ? 1 : 100)); + const maxHumidity = (config.maxHumidity && parseInt(config.maxHumidity)) || 100; + const state = Math.round(parseFloat(item.state) * (100 / maxHumidity)); return { humidityAmbientPercent: state, humiditySetpointPercent: state diff --git a/functions/devices/thermostat.js b/functions/devices/thermostat.js index 0666097a..32303639 100644 --- a/functions/devices/thermostat.js +++ b/functions/devices/thermostat.js @@ -58,8 +58,8 @@ class Thermostat extends DefaultDevice { } if (member.indexOf('Humidity') > 0) { const config = this.getConfig(item); - const isPercent = !config.humidityUnit || config.humidityUnit.toLowerCase() === 'percent'; - state[member] = Math.round(parseFloat(members[member].state) * (isPercent ? 1 : 100)); + const maxHumidity = (config.maxHumidity && parseInt(config.maxHumidity)) || 100; + state[member] = Math.round(parseFloat(members[member].state) * (100 / maxHumidity)); } } } diff --git a/tests/devices/climatesensor.test.js b/tests/devices/climatesensor.test.js index 9e4ec232..a9cc735a 100644 --- a/tests/devices/climatesensor.test.js +++ b/tests/devices/climatesensor.test.js @@ -226,7 +226,7 @@ describe('ClimateSensor Device', () => { metadata: { ga: { config: { - humidityUnit: 'float' + maxHumidity: 1 } } }, diff --git a/tests/devices/humiditysensor.test.js b/tests/devices/humiditysensor.test.js index 9e483b5b..eaee42dd 100644 --- a/tests/devices/humiditysensor.test.js +++ b/tests/devices/humiditysensor.test.js @@ -37,13 +37,11 @@ describe('HumiditySensor Device', () => { }); }); - test('getState humidityUnit float', () => { - expect(Device.getState({ state: '0.34', metadata: { ga: { config: { humidityUnit: 'float' } } } })).toStrictEqual( - { - humidityAmbientPercent: 34, - humiditySetpointPercent: 34 - } - ); + test('getState maxHumidity', () => { + expect(Device.getState({ state: '0.34', metadata: { ga: { config: { maxHumidity: 1 } } } })).toStrictEqual({ + humidityAmbientPercent: 34, + humiditySetpointPercent: 34 + }); }); }); }); diff --git a/tests/devices/thermostat.test.js b/tests/devices/thermostat.test.js index dcd81b04..79bb505f 100644 --- a/tests/devices/thermostat.test.js +++ b/tests/devices/thermostat.test.js @@ -415,12 +415,12 @@ describe('Thermostat Device', () => { }); }); - test('getState only humdity with unit', () => { + test('getState only humdity with maxHumidity', () => { const item = { metadata: { ga: { config: { - humidityUnit: 'float' + maxHumidity: 1 } } }, From 9fad2f97657e2fc5c56f154e57bec1c5d9fa8b0a Mon Sep 17 00:00:00 2001 From: Michael Krug Date: Fri, 31 May 2024 20:21:51 +0200 Subject: [PATCH 9/9] Add Washer and Dishwasher Signed-off-by: Michael Krug --- docs/USAGE.md | 4 +++- functions/devices/dishwasher.js | 9 +++++++++ functions/devices/startstopswitch.js | 3 +-- functions/devices/washer.js | 9 +++++++++ tests/devices/startstopswitch.test.js | 12 ++++-------- 5 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 functions/devices/dishwasher.js create mode 100644 functions/devices/washer.js diff --git a/docs/USAGE.md b/docs/USAGE.md index da79204d..82586e49 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -194,7 +194,7 @@ Switch { ga="Fireplace" } Switch { ga="Valve" [ inverted=true ] } ``` -### Sprinkler, Vacuum +### Sprinkler, Vacuum, Washer, Dishwasher | | | |---|---| @@ -206,6 +206,8 @@ Switch { ga="Valve" [ inverted=true ] } ```shell Switch { ga="Sprinkler" [ inverted=true ] } Switch { ga="Vacuum" [ inverted=false ] } +Switch { ga="Washer" [ inverted=false ] } +Switch { ga="Dishwasher" [ inverted=false ] } ``` ### Lock diff --git a/functions/devices/dishwasher.js b/functions/devices/dishwasher.js new file mode 100644 index 00000000..02d29192 --- /dev/null +++ b/functions/devices/dishwasher.js @@ -0,0 +1,9 @@ +const StartStopSwitch = require('./startstopswitch.js'); + +class Dishwasher extends StartStopSwitch { + static get type() { + return 'action.devices.types.DISHWASHER'; + } +} + +module.exports = Dishwasher; diff --git a/functions/devices/startstopswitch.js b/functions/devices/startstopswitch.js index 0274f7fe..7d8037a5 100644 --- a/functions/devices/startstopswitch.js +++ b/functions/devices/startstopswitch.js @@ -19,8 +19,7 @@ class StartStopSwitch extends DefaultDevice { state = !state; } return { - isRunning: state, - isPaused: !state + isRunning: state }; } } diff --git a/functions/devices/washer.js b/functions/devices/washer.js new file mode 100644 index 00000000..7830a2ec --- /dev/null +++ b/functions/devices/washer.js @@ -0,0 +1,9 @@ +const StartStopSwitch = require('./startstopswitch.js'); + +class Washer extends StartStopSwitch { + static get type() { + return 'action.devices.types.WASHER'; + } +} + +module.exports = Washer; diff --git a/tests/devices/startstopswitch.test.js b/tests/devices/startstopswitch.test.js index 2fcaa1d6..24d16479 100644 --- a/tests/devices/startstopswitch.test.js +++ b/tests/devices/startstopswitch.test.js @@ -15,12 +15,10 @@ describe('StartStopSwitch Device', () => { describe('getState', () => { test('getState', () => { expect(Device.getState({ state: 'ON' })).toStrictEqual({ - isRunning: true, - isPaused: false + isRunning: true }); expect(Device.getState({ state: 'OFF' })).toStrictEqual({ - isRunning: false, - isPaused: true + isRunning: false }); }); @@ -36,13 +34,11 @@ describe('StartStopSwitch Device', () => { } }; expect(Device.getState(item)).toStrictEqual({ - isRunning: false, - isPaused: true + isRunning: false }); item.state = 'OFF'; expect(Device.getState(item)).toStrictEqual({ - isRunning: true, - isPaused: false + isRunning: true }); }); });