Compare commits

...
17 Commits
Author SHA1 Message Date
ari eb363acf81 v0.1.13 2022-05-20 14:08:36 -04:00
ari 415acf06cc correct slash 2022-05-20 13:46:09 -04:00
ari 0325b8eec3 trying to get a valid version 2022-05-20 13:45:23 -04:00
ari d184871217 trying to get build test working 2022-05-20 13:40:02 -04:00
ari 0499feb61d added test badge; 2022-05-20 12:34:40 -04:00
ari 0030920558 fixed up typing 2022-05-20 12:33:25 -04:00
ari f62f139f55 fixed up tests 2022-05-20 12:32:36 -04:00
ari 2d80798ccb removed rumeal references 2022-05-20 12:29:24 -04:00
ari 3da5e1c88c fixed python issues 2022-05-20 11:05:15 -04:00
ari 7df34bdf7f build post test 2022-05-20 11:01:39 -04:00
ari 554528ace0 fixed yarn build 2022-05-20 10:56:06 -04:00
ari 298a233a5f changed yaml loaders 2022-05-20 10:53:53 -04:00
ari cbbc099384 no repeat alias editor 2022-05-20 10:05:27 -04:00
ari 48decb2e16 saving colors when not modified 2022-05-19 23:22:16 -04:00
ari 7afda7eb1c fixing up yaml modder 2022-05-19 23:18:16 -04:00
ari f6270c94f3 clean up 2022-05-19 22:57:58 -04:00
ari 952dcba3ac nicer yaml editor 2022-05-19 22:56:34 -04:00
33 changed files with 351 additions and 202 deletions

No files matched your search

-26
View File
@@ -28,32 +28,6 @@ jobs:
run: | run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md) echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
# build:
# runs-on: ubuntu-latest
# name: Build & Publish ${{ matrix.arch }}
# needs:
# - metadata
# strategy:
# matrix:
# arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
# steps:
# - name: Check out repository
# uses: actions/checkout@v3
# - name: Login to DockerHub
# uses: docker/login-action@v2.0.0
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
# - name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
# uses: home-assistant/builder@2022.03.1
# with:
# args: |
# --${{ matrix.arch }} \
# --target .
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
+48 -28
View File
@@ -8,40 +8,31 @@ on:
pull_request: pull_request:
branches: [main] branches: [main]
jobs: jobs:
build: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build Test for ${{ matrix.arch }} name: Metadata
strategy: outputs:
matrix: version: ${{ steps.version.outputs.VERSION }}
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps: steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository - name: Check out repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} fetch-depth: 0
password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
- name: ${{ matrix.arch }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--test \
--${{ matrix.arch }} \
--target .
python: python:
name: "Python Tests" name: "Python Tests"
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs:
- metadata
strategy: strategy:
matrix: matrix:
action: [lint, coverage, security-checks] action: [lint, coverage, security-checks]
@@ -55,12 +46,14 @@ jobs:
run: cd api && make setup run: cd api && make setup
- name: Echo dependencies - name: Echo dependencies
run: cd api && ./venv/bin/pip freeze run: cd api && ./venv/bin/pip freeze
- name: Running ${{ matrix.action }} - name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd api && make ${{ matrix.action }} run: cd api && make ${{ matrix.action }}
nodejs: nodejs:
name: "NodeJs Tests" name: "NodeJs Tests"
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs:
- metadata
strategy: strategy:
matrix: matrix:
action: action:
@@ -72,12 +65,39 @@ jobs:
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 16 node-version: 16
cache: 'yarn' cache: "yarn"
cache-dependency-path: webapp/yarn.lock cache-dependency-path: webapp/yarn.lock
- name: Install Dependencies - name: Install Dependencies
run: cd webapp && yarn install run: cd webapp && yarn install
- name: Run Tests - name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }} run: cd webapp && yarn ${{ matrix.action }}
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
- nodejs
- python
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--version ${{ needs.metadata.outputs.version }} \
--additional-tag edge \
--target .
+4 -1
View File
@@ -8,5 +8,8 @@
"*test_*.py" "*test_*.py"
], ],
"python.testing.pytestEnabled": false, "python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true "python.testing.unittestEnabled": true,
"yaml.schemas": {
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
}
} }
+6
View File
@@ -1,5 +1,11 @@
# Changelog # Changelog
## [0.1.13] - YAML
- Better YAML
- Rewrote yaml parser/loader to use pyyaml and safe mode
- Cleaned up description vs alias
## [0.1.12] - Less Intense Error Messages ## [0.1.12] - Less Intense Error Messages
- Added more node-based errors (this way it's easier to see where validations failed) - Added more node-based errors (this way it's easier to see where validations failed)
+2
View File
@@ -1,5 +1,7 @@
# Shortumation # Shortumation
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
A better way to write automations in home-assistant without having to install and run a seperate automation engine! A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png) ![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png)
+1
View File
@@ -43,4 +43,5 @@ clean:
run-local: run-local:
rm -f web rm -f web
ln -s ../webapp/build web ln -s ../webapp/build web
cd ../webapp && yarn build
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+2 -1
View File
@@ -4,7 +4,7 @@ import setuptools # type: ignore
setuptools.setup( setuptools.setup(
python_requires=">=3.9", python_requires=">=3.9",
install_requires=[ install_requires=[
"ruamel.yaml==0.17.17", "PyYAML==6.0",
"fastapi==0.70.0", "fastapi==0.70.0",
"pydantic==1.8.2", "pydantic==1.8.2",
"uvicorn[standard]==0.15.0", "uvicorn[standard]==0.15.0",
@@ -21,6 +21,7 @@ setuptools.setup(
"pre-commit==2.13.0", "pre-commit==2.13.0",
"vulture==2.3", "vulture==2.3",
"types-requests==2.25.6", "types-requests==2.25.6",
"types-PyYAML==6.0.7",
"requests==2.27.0", "requests==2.27.0",
], ],
}, },
+13 -3
View File
@@ -1,7 +1,10 @@
import io import io
from typing import Any, TextIO, Union from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml import yaml
from src.yaml_serializer.dumper import YamlSafeDumper
from src.yaml_serializer.loader import YamlSafeLoader
def dump_yaml(obj: Any) -> str: def dump_yaml(obj: Any) -> str:
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
str str
""" """
stream = io.StringIO() stream = io.StringIO()
yaml.dump(obj, stream) yaml.dump( # nosec
obj,
stream,
default_flow_style=False,
allow_unicode=True,
sort_keys=False,
Dumper=YamlSafeDumper,
)
stream.seek(0) stream.seek(0)
return stream.read() return stream.read()
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
Returns: Returns:
List[dict, list] List[dict, list]
""" """
return yaml.load(yaml_stream) return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
-19
View File
@@ -1,19 +0,0 @@
from ruamel.yaml import YAML
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
yaml = YAML()
yaml.register_class(IncludedYaml)
yaml.register_class(SecretValue)
yaml.register_class(IncludedYamlDir)
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
+16
View File
@@ -0,0 +1,16 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeDumper(yaml.SafeDumper):
pass
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
+26
View File
@@ -0,0 +1,26 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeLoader(yaml.SafeLoader):
pass
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
# """Annotate a node with the first line it was seen."""
# last_line: int = self.line
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
# return node
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
+2 -2
View File
@@ -1,7 +1,7 @@
from typing import NamedTuple from typing import NamedTuple
from ruamel.yaml.nodes import Node from yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter from yaml.representer import BaseRepresenter
class IncludedYaml(NamedTuple): class IncludedYaml(NamedTuple):
+3 -3
View File
@@ -1,7 +1,7 @@
from unittest import TestCase from unittest import TestCase
import yaml
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from ruamel.yaml import YAML
from src.api.app import make_app from src.api.app import make_app
from src.automations.types import ( from src.automations.types import (
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp: with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[15]) disk_data = dict(yaml.safe_load(fp)[15])
trigger = list(map(dict, disk_data.pop("trigger"))) trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition") condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action"))) action = list(map(dict, disk_data.pop("action")))
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp: with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[27]) disk_data = dict(yaml.safe_load(fp)[27])
trigger = list(map(dict, disk_data.pop("trigger"))) trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition") condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action"))) action = list(map(dict, disk_data.pop("action")))
@@ -1,11 +1,6 @@
import json import json
from unittest import TestCase from unittest import TestCase
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarstring import ScalarString
from src.json_serializer import json_dumps from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
@@ -34,25 +29,3 @@ class json_serializer_tests(TestCase):
}, },
), ),
) )
def test_convert_ruamel_types(self):
self.assertEqual(
json_dumps(
{
"int": ScalarInt(1),
"float": ScalarFloat(1.3),
"bool": ScalarBoolean(False),
"list": [1, ScalarString("w")],
"tup": (1, ScalarString("w")),
}
),
json.dumps(
{
"int": 1,
"float": 1.3,
"bool": 0,
"list": [1, "w"],
"tup": (1, "w"),
},
),
)
+28 -7
View File
@@ -19,21 +19,29 @@ class dumping_yamls_tests(TestCase):
) )
} }
) )
self.assertEqual(yaml, "automations: !include automations.yaml\n") self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
def test_dumping_secrets(self): def test_dumping_secrets(self):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")}) yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
self.assertEqual(yaml, "google_password: !secret gpass\n") self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
def test_dumping_stub(self): def test_dumping_stub(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")}) yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n") self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
def test_load_stub(self): def test_load_stub(self):
yaml_obj = load_yaml( yaml_obj = load_yaml(
io.StringIO( io.StringIO(
""" """
name: cool name: cool
date: "10:00"
bools:
- "yes"
- "no"
- true
- false
bobIsNull:
bobIsNull2: null
google_password: !secret gpass google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml automations: !include automations.yaml
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
dict(yaml_obj), dict(yaml_obj),
{ {
"name": "cool", "name": "cool",
"date": "10:00",
"bools": ["yes", "no", True, False],
"bobIsNull": None,
"bobIsNull2": None,
"google_password": SecretValue("gpass", "n/a"), "google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"), "sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"), "automations": IncludedYaml("automations.yaml"),
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
) )
self.assertEqual( self.assertEqual(
dump_yaml(yaml_obj), dump_yaml(yaml_obj),
"name: cool\n" """name: cool
"google_password: !secret gpass\n" date: '10:00'
"sensor: !include_dir_list sensors/*yaml\n" bools:
f"automations: !include automations.yaml\n", - 'yes'
- 'no'
- true
- false
bobIsNull: null
bobIsNull2: null
google_password: !secret 'gpass'
sensor: !include_dir_list 'sensors/*yaml'
automations: !include 'automations.yaml'
""",
) )
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: 0.1.12 version: 0.1.13
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
+1
View File
@@ -8,6 +8,7 @@
"@types/node": "^12.0.0", "@types/node": "^12.0.0",
"@types/react": "^17.0.0", "@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0", "@types/react-dom": "^17.0.0",
"@uiw/react-codemirror": "^4.7.0",
"jss": "^10.8.2", "jss": "^10.8.2",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
@@ -133,11 +133,11 @@ export const ValidationBox: FC<{
</>)} </>)}
</ul> </ul>
<span>Please correct the automation file manually and then continue!</span> <span>Please correct the automation file manually and then continue!</span>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable /> <InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} />
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable /> <InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} />
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable /> <InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} />
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable /> <InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} />
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable /> <InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} />
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button> <Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
</div> </div>
} }
@@ -116,7 +116,6 @@ export const ConditionNode: FC<{
label="" label=""
value={condition} value={condition}
onChange={update => onUpdate(update as any)} onChange={update => onUpdate(update as any)}
resizable
/>} />}
{!yamlMode && childrenConditions} {!yamlMode && childrenConditions}
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}> {!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
+3 -3
View File
@@ -70,11 +70,11 @@ export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, Sta
<span key={i}>{s}</span><br key={`br-${i}`} /> <span key={i}>{s}</span><br key={`br-${i}`} />
</>)} </>)}
<h2>Automation YAML</h2> <h2>Automation YAML</h2>
<InputYaml resizable label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} /> <InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
<Button onClick={makeSave('trigger')}>Save Triggers</Button> <Button onClick={makeSave('trigger')}>Save Triggers</Button>
<InputYaml resizable label="Condition" value={this.state.condition} onChange={makeSet('condition')} /> <InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
<Button onClick={makeSave('condition')}>Save Conditions</Button> <Button onClick={makeSave('condition')}>Save Conditions</Button>
<InputYaml resizable label="Action" value={this.state.sequence} onChange={makeSet('sequence')} /> <InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
<Button onClick={makeSave('sequence')}>Save Actions</Button> <Button onClick={makeSave('sequence')}>Save Actions</Button>
</div> </div>
} }
+13 -10
View File
@@ -1,19 +1,20 @@
import * as yaml from "js-yaml"; import * as yaml from "js-yaml";
import { useState } from "react"; import { useState } from "react";
import InputTextArea from "./InputTextArea";
import { useDelayEffect } from 'utils/useDelay'; import { useDelayEffect } from 'utils/useDelay';
import CodeMirror from '@uiw/react-codemirror';
import InputWrapper from "./InputWrapper";
export interface Props<T extends {}> { export interface Props<T extends {}> {
label: string; label: string;
value: T; value: T;
onChange: (v: T) => void; onChange: (v: T) => void;
resizable?: boolean;
} }
export default function InputYaml<T>({ export default function InputYaml<T>({
label, label,
value = {} as any, value = {} as any,
onChange, onChange,
resizable,
}: Props<T>) { }: Props<T>) {
const [{ text, error }, setState] = useState<{ const [{ text, error }, setState] = useState<{
text: string, text: string,
@@ -24,6 +25,7 @@ export default function InputYaml<T>({
}); });
const setText = (t: string) => { const setText = (t: string) => {
try { try {
yaml.load(t)
setState({ text: t, error: undefined }) setState({ text: t, error: undefined })
} catch (_) { } catch (_) {
setState({ text: t, error: "! Invalid Yaml !" }) setState({ text: t, error: "! Invalid Yaml !" })
@@ -40,11 +42,12 @@ export default function InputYaml<T>({
} }
} }
}, [text], 1000) }, [text], 1000)
return <InputTextArea return <InputWrapper label={label} error={error}>
error={error} <CodeMirror
label={label} theme={"dark"}
value={text} value={text}
onChange={setText} lang="yaml"
resizable={resizable} onChange={setText}
/> />
</InputWrapper>
} }
@@ -1,6 +1,5 @@
import InputText from "components/Inputs/InputText";
import { ChooseAction } from "types/automations/actions"; import { ChooseAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager'; import { OptionManager } from './OptionManager';
export const ActionChooseState: OptionManager<ChooseAction> = { export const ActionChooseState: OptionManager<ChooseAction> = {
@@ -12,14 +11,8 @@ export const ActionChooseState: OptionManager<ChooseAction> = {
isReady: ({ alias }) => { isReady: ({ alias }) => {
return alias !== '' return alias !== ''
}, },
renderOptionList: (state, setState) => { renderOptionList: () => {
const update = updateActionData(state, setState);
return <> return <>
<InputText
label="Description"
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
</> </>
} }
} }
@@ -27,11 +27,6 @@ export const ActionDeviceState: OptionManager<DeviceAction> = {
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> return <>
<InputText
label="Description"
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText <InputText
textBoxFor="device_id" textBoxFor="device_id"
label="Device" label="Device"
@@ -17,11 +17,6 @@ export const ActionEventState: OptionManager<FireEventAction> = {
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> return <>
<InputText
label="Description"
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText <InputText
textBoxFor="event" textBoxFor="event"
label="Event" label="Event"
@@ -1,5 +1,4 @@
import InputNumber from "components/Inputs/InputNumber"; import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/InputYaml";
import { RepeatAction } from "types/automations/actions"; import { RepeatAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager'; import { OptionManager, updateActionData } from './OptionManager';
@@ -23,11 +22,6 @@ export const ActionRepeatState: OptionManager<RepeatAction> = {
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> return <>
<InputText
label="Description"
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputNumber <InputNumber
label="How many times?" label="How many times?"
value={state.repeat.count} value={state.repeat.count}
@@ -18,14 +18,9 @@ export const ActionCallServiceState: OptionManager<ServiceAction> = {
target !== '' target !== ''
), ),
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
const { service, alias = "", target } = state; const { service, target } = state;
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> return <>
<InputText
label="Description"
value={alias}
onChange={alias => update({ alias })}
/>
<InputText <InputText
textBoxFor="service" textBoxFor="service"
label="Service" label="Service"
@@ -20,11 +20,6 @@ export const ActionWaitState: OptionManager<WaitAction> = {
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
const update = updateActionData(state, setState); const update = updateActionData(state, setState);
return <> return <>
<InputText
label="Description"
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText <InputText
textBoxFor="template" textBoxFor="template"
label="Template" label="Template"
@@ -6,5 +6,6 @@ export const Generic: OptionManager<any> = {
isReady: _ => true, isReady: _ => true,
renderOptionList: () => <> renderOptionList: () => <>
<b>THIS IS NOT SUPPORTED YET!</b> <b>THIS IS NOT SUPPORTED YET!</b>
<span>But feel free to modify the yaml!</span>
</> </>
} }
@@ -17,11 +17,6 @@ export const TriggerEventState: OptionManager<AutomationTriggerEvent> = {
}, },
renderOptionList: (state, setState) => { renderOptionList: (state, setState) => {
return <> return <>
<InputText
label="Description"
value={state.alias ?? ""}
onChange={alias => setState({ ...state, alias })}
/>
<InputText <InputText
label="Event Type" label="Event Type"
value={String(state.event_type)} value={String(state.event_type)}
@@ -4,40 +4,36 @@ import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager'; import { getOptionManager } from './getOptionManager';
import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations'; import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations';
import InputYaml from 'components/Inputs/InputYaml'; import InputYaml from 'components/Inputs/InputYaml';
import InputText from 'components/Inputs/InputText';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>] type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => { export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => {
const [allState, setAllState] = uState({ const [allState, setAllState] = uState({
node: originalNode,
yamlMode: false, yamlMode: false,
isModified: false, isModified: false,
...computeInvalidYaml(originalNode, isErrored) ...computeInvalidYaml(originalNode)
}); });
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState; const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
useEffect(() => { useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, }) setAllState({ ...allState, node: originalNode, isModified: false, })
// eslint-disable-next-line // eslint-disable-next-line
}, [originalNode]) }, [originalNode])
const setState = (node: AutomationNode) => setAllState(({ ...allState, node, isModified: true, })); const setState = (node: AutomationNode) => setAllState(({
...allState, node,
isModified: JSON.stringify(node) !== JSON.stringify(originalNode),
}));
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, }); const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
const setStateForManualYaml = (yaml: any) => { const setStateForManualYaml = (yaml: any) => {
try { try {
createData(yaml, yaml) createData(yaml, yaml)
const errors = validateNode(yaml); setAllState({
if (errors) { ...allState,
setAllState({ ...computeInvalidYaml(yaml)
...allState, invalidManualYaml: <ul key={'error'}> })
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
})
} else {
setAllState({ ...allState, node: yaml, invalidManualYaml: <></> })
}
} catch (err) { } catch (err) {
setAllState({ ...allState, invalidManualYaml: <>{String(err)}</> }) setAllState({ ...allState, invalidManualYaml: <>{String(err)}</>, isErrored: true, })
} }
} }
const { const {
@@ -63,19 +59,25 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
return currentNode return currentNode
}, },
renderOptionList() { renderOptionList() {
const aliasEditor = <InputText label="Alias" value={getDescriptionFromAutomationNode(allState.node)} onChange={alias => setState({
...allState.node,
alias
})} />
if (yamlMode || allState.isErrored) { if (yamlMode || allState.isErrored) {
return <> return <>
{aliasEditor}
<InputYaml <InputYaml
label='' label=''
value={currentNode} value={currentNode}
onChange={setStateForManualYaml} onChange={setStateForManualYaml}
resizable
/> />
<div className="node-editor--error">{invalidManualYaml}</div> <div className="node-editor--error">{invalidManualYaml}</div>
</> </>
} }
return optionManager.renderOptionList(currentNode, setState); return <>
{aliasEditor}
{optionManager.renderOptionList(currentNode, setState)}
</>;
}, },
isReady() { isReady() {
return optionManager.isReady(currentNode); return optionManager.isReady(currentNode);
@@ -116,10 +118,11 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) =
} }
} }
const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => { const computeInvalidYaml = (node: AutomationNode) => {
const errors = validateNode(node); const errors = validateNode(node);
if (errors) { if (errors) {
return { return {
node,
isErrored: true, isErrored: true,
invalidManualYaml: <ul key={'error'}> invalidManualYaml: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}> {errors.map(({ message, path }, i) => <li key={i}>
@@ -129,7 +132,8 @@ const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => {
} }
} else { } else {
return { return {
isErrored, node,
isErrored: false,
invalidManualYaml: <></> invalidManualYaml: <></>
} }
} }
+10 -2
View File
@@ -35,7 +35,9 @@ export const NodeEditor: FC<NodeEditorProps> = ({
const isReady = state.isReady(); const isReady = state.isReady();
const areYouSureNotReady = (what: string) => !isReady ? const areYouSureNotReady = (what: string) => !isReady ?
window.confirm(`This node is missing some values, are you sure you want to ${what}?`) : window.confirm(`This node is missing some values, are you sure you want to ${what}?`) :
true; state.isErrored ?
window.confirm(`This node contains errors, are you sure you want to ${what}?`) :
true;
// events // events
onFlags(isReady, isModified); onFlags(isReady, isModified);
@@ -64,7 +66,13 @@ export const NodeEditor: FC<NodeEditorProps> = ({
<Button <Button
className="node-editor--footer--save" className="node-editor--footer--save"
onClick={() => { onClick={() => {
areYouSureNotReady('save') && onSave(state.data) if (areYouSureNotReady('save')) {
if (JSON.stringify(state.data) !== JSON.stringify(node)) {
onSave(state.data)
} else {
onClose()
}
}
}} }}
title={ title={
!isReady ? "Some fields have not been properly filled up" : "" !isReady ? "Some fields have not been properly filled up" : ""
-1
View File
@@ -16,7 +16,6 @@ export const convertTimeToString = (t: AutomationTime) => {
} }
} }
export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => { export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => {
console.log(node)
if (node.alias) { if (node.alias) {
return node.alias; return node.alias;
} }
+138
View File
@@ -2661,6 +2661,13 @@
core-js-pure "^3.0.0" core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4" regenerator-runtime "^0.13.4"
"@babel/runtime@>=7.11.0":
version "7.18.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.0.tgz#6d77142a19cb6088f0af662af1ada37a604d34ae"
integrity sha512-YMQvx/6nKEaucl0MY56mwIG483xk8SDNdlUwb2Ts6FUpr7fm85DxEmsY18LXBNhcTz6tO6JwZV8w1W06v8UKeg==
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.9.2": "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.9.2":
version "7.16.3" version "7.16.3"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz"
@@ -2798,6 +2805,92 @@
exec-sh "^0.3.2" exec-sh "^0.3.2"
minimist "^1.2.0" minimist "^1.2.0"
"@codemirror/autocomplete@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.20.1.tgz#d9aa5cfc111469f9f014e80d239916bb0c21edf9"
integrity sha512-rWDAkE1Qn9O4LsV8tAm/KlzzqdQLaIxqDOLhVYja3rKQIWebD3dixIzg9BAKpjt+0dIaDwtIp3yinD9MefgbQQ==
dependencies:
"@codemirror/language" "^0.20.0"
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.0"
"@lezer/common" "^0.16.0"
"@codemirror/basic-setup@^0.20.0":
version "0.20.0"
resolved "https://registry.yarnpkg.com/@codemirror/basic-setup/-/basic-setup-0.20.0.tgz#ed331e0b2d29efc0a09317de9e10467b992b0c7b"
integrity sha512-W/ERKMLErWkrVLyP5I8Yh8PXl4r+WFNkdYVSzkXYPQv2RMPSkWpr2BgggiSJ8AHF/q3GuApncDD8I4BZz65fyg==
dependencies:
"@codemirror/autocomplete" "^0.20.0"
"@codemirror/commands" "^0.20.0"
"@codemirror/language" "^0.20.0"
"@codemirror/lint" "^0.20.0"
"@codemirror/search" "^0.20.0"
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.0"
"@codemirror/commands@^0.20.0":
version "0.20.0"
resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.20.0.tgz#51405d442e6b8687b63e8fa27effc28179917c88"
integrity sha512-v9L5NNVA+A9R6zaFvaTbxs30kc69F6BkOoiEbeFw4m4I0exmDEKBILN6mK+GksJtvTzGBxvhAPlVFTdQW8GB7Q==
dependencies:
"@codemirror/language" "^0.20.0"
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.0"
"@lezer/common" "^0.16.0"
"@codemirror/language@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.20.1.tgz#27b41f9a5234455af083cbc90db531ef296899e7"
integrity sha512-AqaFeI3hbsuxU0IpVrR8dhHkrEAAEuVcwEO66JwAbJaE7IPOov+Y38KWqcQNgE1/osQGKHx9Zag0hng9V6OLsw==
dependencies:
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.0"
"@lezer/common" "^0.16.0"
"@lezer/highlight" "^0.16.0"
"@lezer/lr" "^0.16.0"
"@codemirror/lint@^0.20.0":
version "0.20.2"
resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.20.2.tgz#e47307167ff7e5bb14b717f4084a386dd7f8954e"
integrity sha512-xEH3wlzoFLEhPEeMVRNoQIhoTCMEtXhVxemGh3FYjLfl/CL3B2Wz+CU7ooP5SKhN1le7JqUNSfiTArFP+IzFuw==
dependencies:
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.2"
crelt "^1.0.5"
"@codemirror/search@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.20.1.tgz#9eba0514218a673e29501a889a4fcb7da7ce24ad"
integrity sha512-ROe6gRboQU5E4z6GAkNa2kxhXqsGNbeLEisbvzbOeB7nuDYXUZ70vGIgmqPu0tB+1M3F9yWk6W8k2vrFpJaD4Q==
dependencies:
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.0"
crelt "^1.0.5"
"@codemirror/state@^0.20.0":
version "0.20.0"
resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.20.0.tgz#3343d209169813b0152b77361cd78bea01549a73"
integrity sha512-R3XrAWCS5Xm9lx+4pDET4EUPEg+8bDfAa5zoOFIhx+VChsfew9Vy33dAjCXS5ES4Q8UecW4WM4UudmUFpZ+86A==
"@codemirror/theme-one-dark@^0.20.0":
version "0.20.0"
resolved "https://registry.yarnpkg.com/@codemirror/theme-one-dark/-/theme-one-dark-0.20.0.tgz#112074e446d46931d1104405154ccbe8c8874009"
integrity sha512-iqTKaiOZddwlc2rYF+9D60Gfyz9EsSawVejSjyP2FCtOwZ1X0frG5/ByTKH5FBDD2+P7W8+h/OIG4r5dWq4bgA==
dependencies:
"@codemirror/language" "^0.20.0"
"@codemirror/state" "^0.20.0"
"@codemirror/view" "^0.20.0"
"@lezer/highlight" "^0.16.0"
"@codemirror/view@^0.20.0", "@codemirror/view@^0.20.2":
version "0.20.5"
resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.20.5.tgz#ba0b46c3f6c9a2282accb196cdd5fd9bb11f3470"
integrity sha512-oUKoSLIKo7ps3dRc2pE6U80TOOPPA/s+fWBxoiy6BL1lUXegmqnFp2iVKKSJGoI8k08BHwW5knEsN6ebuZjc9w==
dependencies:
"@codemirror/state" "^0.20.0"
style-mod "^4.0.0"
w3c-keyname "^2.2.4"
"@colors/colors@1.5.0": "@colors/colors@1.5.0":
version "1.5.0" version "1.5.0"
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -3254,6 +3347,25 @@
"@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/sourcemap-codec" "^1.4.10"
"@lezer/common@^0.16.0":
version "0.16.0"
resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.16.0.tgz#b6023a0a682b0b7676d0e7f0e0838f71bde39fcd"
integrity sha512-H6sPCku+asKWYaNjwfQ1Uvcay9UP1Pdzu4qpy8GtRZ0cKT2AAGnj9MQGiRtY18MDntvhYRJxNGv7FNWOSV/e8A==
"@lezer/highlight@^0.16.0":
version "0.16.0"
resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-0.16.0.tgz#95f7b7ee3c32c8a0f6ce499c085e8b1f927ffbdc"
integrity sha512-iE5f4flHlJ1g1clOStvXNLbORJoiW4Kytso6ubfYzHnaNo/eo5SKhxs4wv/rtvwZQeZrK3we8S9SyA7OGOoRKQ==
dependencies:
"@lezer/common" "^0.16.0"
"@lezer/lr@^0.16.0":
version "0.16.3"
resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-0.16.3.tgz#1e4cc581d2725c498e6a731fc83c379114ba3a70"
integrity sha512-pau7um4eAw94BEuuShUIeQDTf3k4Wt6oIUOYxMmkZgDHdqtIcxWND4LRxi8nI9KuT4I1bXQv67BCapkxt7Ywqw==
dependencies:
"@lezer/common" "^0.16.0"
"@mdx-js/loader@^1.6.22": "@mdx-js/loader@^1.6.22":
version "1.6.22" version "1.6.22"
resolved "https://registry.npmjs.org/@mdx-js/loader/-/loader-1.6.22.tgz" resolved "https://registry.npmjs.org/@mdx-js/loader/-/loader-1.6.22.tgz"
@@ -5115,6 +5227,17 @@
"@typescript-eslint/types" "4.33.0" "@typescript-eslint/types" "4.33.0"
eslint-visitor-keys "^2.0.0" eslint-visitor-keys "^2.0.0"
"@uiw/react-codemirror@^4.7.0":
version "4.7.0"
resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.7.0.tgz#cca6cb2e91f5c5c5e545b389cc55fb307087be75"
integrity sha512-gRBsIScecZzqj1/vqPZ6XxykccBkp+qv6wLFyTk2DxHzuPl4cDIQwqCBl81u80by5nCKambceRkTvpiQ6oJ2Ew==
dependencies:
"@babel/runtime" ">=7.11.0"
"@codemirror/basic-setup" "^0.20.0"
"@codemirror/state" "^0.20.0"
"@codemirror/theme-one-dark" "^0.20.0"
"@codemirror/view" "^0.20.0"
"@webassemblyjs/ast@1.9.0": "@webassemblyjs/ast@1.9.0":
version "1.9.0" version "1.9.0"
resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz" resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"
@@ -7242,6 +7365,11 @@ create-require@^1.1.0:
resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz" resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
crelt@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94"
integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==
cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2: cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
version "7.0.3" version "7.0.3"
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
@@ -15921,6 +16049,11 @@ style-loader@1.3.0, style-loader@^1.3.0:
loader-utils "^2.0.0" loader-utils "^2.0.0"
schema-utils "^2.7.0" schema-utils "^2.7.0"
style-mod@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz#97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01"
integrity sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==
style-to-object@0.3.0, style-to-object@^0.3.0: style-to-object@0.3.0, style-to-object@^0.3.0:
version "0.3.0" version "0.3.0"
resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz" resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz"
@@ -16878,6 +17011,11 @@ w3c-hr-time@^1.0.2:
dependencies: dependencies:
browser-process-hrtime "^1.0.0" browser-process-hrtime "^1.0.0"
w3c-keyname@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b"
integrity sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw==
w3c-xmlserializer@^2.0.0: w3c-xmlserializer@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz" resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"