Compare commits

..
42 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
ari 25770e1c1d v0.1.12 2022-05-18 23:09:19 -04:00
ari 029a2dac9f better formatting 2022-05-18 22:57:51 -04:00
ari 8732ab8dda not populating changelog 2022-05-18 22:42:56 -04:00
ari 42ab6e5913 improper save for conditions 2022-05-18 22:41:24 -04:00
ari c28796872f condition validation 2022-05-18 22:37:25 -04:00
ari 40690293a8 added initial pre-validation per node 2022-05-18 22:23:57 -04:00
ari 621f43e5c8 v0.1.10 2022-05-18 11:57:34 -04:00
ari f3496f9d32 fixed nodejs test 2022-05-18 11:04:15 -04:00
ari 409cf2b21a simpler names 2022-05-18 11:03:07 -04:00
ari ef92261666 reverting something stupid 2022-05-18 11:01:29 -04:00
ari 83edaf9bf8 tagged names 2022-05-18 11:00:41 -04:00
ari f8efd895a9 not building 2022-05-18 10:59:35 -04:00
ari da0d153b81 fixed up linting 2022-05-18 10:58:26 -04:00
ari bcd262dd46 - fixed up optional metadata + + desc
- using timestamp for default new ids
'
2022-05-18 10:54:53 -04:00
ari ea47b3e1eb fixed up automation time 2022-05-18 10:37:41 -04:00
ari 5192c09681 trying to provide test 2022-05-18 09:50:08 -04:00
ari d3adfaaacb making sure the version is required 2022-05-17 22:16:09 -04:00
ari c249a94b3d fixing up typo 2022-05-17 22:15:44 -04:00
ari dce028d0bc clean up 2022-05-17 22:15:18 -04:00
ari 7333f9e159 added manual build 2022-05-17 22:15:06 -04:00
ari 809095f8e0 added edge tag 2022-05-17 22:14:38 -04:00
ari 8942693a32 added a manual build 2022-05-17 22:13:57 -04:00
ari db49ed02ed updated tsc 2022-05-17 22:10:08 -04:00
ari cce2e03053 fixed up trigger issues 2022-05-17 22:03:22 -04:00
ari 4509a224a9 minor style patch 2022-05-17 21:51:20 -04:00
83 changed files with 1659 additions and 444 deletions

No files matched your search

+34
View File
@@ -0,0 +1,34 @@
name: "Manual Build"
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
required: true
jobs:
build:
runs-on: ubuntu-latest
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
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
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
+5 -34
View File
@@ -1,18 +1,17 @@
name: Deploy name: Deploy
env: env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs" MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branch: [main] branch: [main]
paths: paths:
- 'config.yaml' - "config.yaml"
jobs: jobs:
metadata: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Metadata name: Metadata
outputs: outputs:
version: ${{ steps.version.outputs.VERSION }} version: ${{ steps.version.outputs.VERSION }}
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }} changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps: steps:
@@ -29,42 +28,15 @@ 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:
- metadata - metadata
- build
name: Publish Github Release name: Publish Github Release
steps: steps:
- name: Publish Release ${{ needs.metadata.outputs.version }} - name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6 uses: actions/github-script@v6
env: env:
VERSION: ${{ needs.metadata.outputs.version }} VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }} CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with: with:
@@ -73,5 +45,4 @@ jobs:
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
tag_name: process.env.VERSION, tag_name: process.env.VERSION,
body: process.env.CHANGELOG, });
});
+55 -32
View File
@@ -1,47 +1,38 @@
name: Test name: Test
env: env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs" MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branch: [main] branch: [main]
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,26 +46,58 @@ 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: [test:ci, tsc:ci, build] action:
- "test:ci"
- "tsc:ci"
- "build"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- 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"
}
} }
+23 -1
View File
@@ -1,6 +1,28 @@
# Changelog # Changelog
## [0.1.7] - Support for Malformed Automations ## [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
- Added more node-based errors (this way it's easier to see where validations failed)
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists - API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations - Frontend has support for displaying bad automations
+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",
], ],
}, },
+1 -1
View File
@@ -1,4 +1,4 @@
from typing import Dict, List, Literal, Optional, Union from typing import Dict, List, Optional, Union
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
+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.7 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"
+2 -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",
@@ -81,4 +82,4 @@
"node_modules", "node_modules",
"src" "src"
] ]
} }
@@ -80,8 +80,8 @@ export const AutoInfoBox: FC<Props> = ({
return <div className={`automation-editor--info-box ${className}`}> return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner"> <div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} /> <InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} /> <InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} /> <InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
<InputList <InputList
label="Mode" label="Mode"
current={metadata.mode} current={metadata.mode}
@@ -9,6 +9,8 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 1em; padding: 1em;
overflow: scroll;
height: 100%;
} }
.automation-editor--flow-wrapper { .automation-editor--flow-wrapper {
@@ -2,7 +2,7 @@ import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index'; import { AutomationEditor } from './index';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants'; import * as dgconst from 'components/DAGFlow/constants';
export default { export default {
@@ -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>
} }
@@ -3,7 +3,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationList } from "."; import { AutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import * as dgconst from 'components/DAGSvgs/constants'; import * as dgconst from 'components/DAGFlow/constants';
export default { export default {
title: 'App/AutomationList', title: 'App/AutomationList',
@@ -62,6 +62,445 @@ FewAutos.args = {
createMockAuto({ "Room": "Office", "Type": "Lights" }), createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }), createMockAuto({ "Room": "Office" }),
createMockAuto(), createMockAuto(),
{
"metadata": {
"id": "1649947692702",
"alias": "Bed Remote",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "asdasdasdasdas",
"entity_id": "light.bulb_ari_lamp",
"domain": "light"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "turn_on"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 153,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "up_dbclk"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 500,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
}
],
"default": []
}
],
"tags": {
"Type": "Remote",
"Room": "Bedroom"
}
},
{
"metadata": {
"id": "1641617168123",
"alias": "Ensure On",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "device",
"type": "turned_off",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"platform": "device",
"type": "turned_off",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"condition": [],
"sequence": [
{
"type": "turn_on",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"type": "turn_on",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"tags": {}
},
{
"metadata": {
"id": "1649726828269",
"alias": "Climate Heat Mode Settings",
"description": "Ensures that the climate is always in sync with the house settings",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "state",
"entity_id": "climate.main_floor",
"id": "main"
},
{
"platform": "state",
"entity_id": "climate.second_floor",
"id": "second"
},
{
"platform": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"id": "setting"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "setting"
}
],
"sequence": [
{
"service": "climate.turn_off",
"data": {},
"target": {
"device_id": [
"d88dcfe82bc9a1c0f2b77b871848155e",
"ef2d47fdeef19f8984b85f92f2597f73"
]
}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"state": "on"
}
],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'heat' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "heat"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"default": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'cool' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "cool"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"tags": {}
},
{
"metadata": {
"id": "1628024070687",
"alias": "Baby Light Setting",
"description": "Configures max/min light settings for the baby ",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "time",
"at": "21:00:00",
"id": "night"
},
{
"platform": "time",
"at": "07:30:00",
"id": "day"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "night"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": "15"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "day"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": 100
}
}
]
}
],
"default": []
}
],
"tags": {}
},
{
"metadata": {
"id": "alarmanlage_an",
"alias": "alarmanlage_an (Uhrzeit)",
"mode": "single"
},
tags: {},
"trigger": [
{
"entity_id": "sensor.time",
"platform": "state",
"to": "23:30"
}
],
"condition": [
{
"condition": "or",
"conditions": [
{
"condition": "state",
"entity_id": "person.simon",
"state": "home"
},
{
"condition": "state",
"entity_id": "person.leni",
"state": "home"
}
]
}
],
"sequence": [
{
"service": "alarm_control_panel.alarm_arm_night",
"target": {
"entity_id": [
"alarm_control_panel.alarmo"
]
},
"data": {
"code": "xxx"
}
},
{
"service": "alarm_control_panel.alarm_arm_away",
"data": {},
"target": {
"entity_id": "alarm_control_panel.blink_home"
}
}
],
}
], ],
} }
@@ -71,6 +510,38 @@ export const BadAutmations = Template.bind({})
BadAutmations.args = { BadAutmations.args = {
...BadAutmations.args, ...BadAutmations.args,
automations: [ automations: [
{
"metadata": {
"alias": "Set Thermostat to 76 at 8am",
"description": "",
"mode": "single",
} as any,
"trigger": [
{
"at": "08:00:00",
"platform": "time"
}
],
"condition": [
{
"condition": "state",
"entity_id": "climate.thermostat",
"state": "cool"
}
],
"sequence": [
{
"data": {
"temperature": 76
},
"service": "climate.set_temperature",
"target": {
"entity_id": "climate.thermostat"
}
}
],
"tags": {},
},
{ {
condition: [], condition: [],
tags: {}, tags: {},
@@ -71,8 +71,8 @@ const filterAutomations = (autos: AutomationData[], searchText: string, selected
if (searchText.length > 0) { if (searchText.length > 0) {
if ( if (
!( !(
a.metadata.description.toLocaleLowerCase().includes(searchText) || (a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
a.metadata.alias.toLocaleLowerCase().includes(searchText) (a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
) )
) { ) {
return false return false
@@ -169,8 +169,8 @@ export const MetadataBox: FC<{
let title = <span>{"BadAuto<<Missing Metadata>>"}</span> let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) { if (auto.metadata) {
title = <> title = <>
<b>{String(auto.metadata.alias).slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b> <b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description).slice(0, 25)}</span> <span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</> </>
} }
return <div return <div
@@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from "."; import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants'; import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
export default { export default {
title: 'App/AutomationList/Connected', title: 'App/AutomationList/Connected',
@@ -40,7 +40,7 @@ export const AutomationList: FC<AutomationListParams> = ({
<AutomationListBox <AutomationListBox
automations={automations} automations={automations}
onAdd={() => { onAdd={() => {
onAdd(defaultAutomation(`shortu-${automations.length}`)); onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length) setCurrent(automations.length)
}} }}
onSelectAutomation={i => { onSelectAutomation={i => {
@@ -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}>
@@ -0,0 +1,53 @@
.dagnode-error {
display: flex;
flex-direction: column;
justify-content: flex-end;
font-size: 0.85em;
z-index: 0;
}
.dagnode-error.open .dagnode-error--inner {
align-items: flex-start;
padding-top: 1em;
}
.dagnode-error--inner {
position: relative;
flex: 1;
/* internal positioning */
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0.5em;
/* shape */
background-color: var(--error-dark);
border-radius: 1em;
height: 100%;
max-height: 100%;
max-width: 100%;
margin-top: 2.5px;
margin-bottom: 2.5px;
border-top-width: 1px;
border-top-style: solid;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-color: var(--error);
}
.dagnode-error--inner:hover {
background-color: var(--error-accent);
cursor: default;
}
.dagnode-error--inner--edit-icon:hover {
transform: rotate(180deg);
cursor: pointer;
background-color: var(--error);
padding: 0.5em;
border-radius: 10px;
height: 0.25em;
width: 0.25em;
}
@@ -0,0 +1,46 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGErrorNode } from "./DAGErrorNode";
import { convertToFlowNode } from "./helpers";
export default {
title: 'DAGAutomationFlow/Viewer/DAGErrorNode',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
"height": dgconst.NODE_HEIGHT,
"width": dgconst.NODE_WIDTH,
}
} as ComponentMeta<typeof DAGErrorNode>
export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
const nodes = ["1", "2", "3", "4"].map((id, i) => ({
"data": args,
"id": id,
"type": "mynode",
"position": {
"x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i,
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
}
}));
return <div className="page">
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
"mynode": convertToFlowNode(DAGErrorNode)
}}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
>
<Controls />
</ReactFlow>
</div>
}
@@ -0,0 +1,34 @@
import "./DAGErrorNode.css";
import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps {
height: number;
width: number;
hasInput?: boolean;
error?: any,
onEdit: () => void;
}
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit
}) => {
// render
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{
height,
width,
maxHeight: height,
maxWidth: width,
}}>
<div className={"dagnode-error--inner"} title={String(error)}>
<InfoIcon color="var(--error-light)" size={1.25} />
Invalid Node
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
</div>
</div>
</>
}
@@ -0,0 +1,47 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGNode } from "./DAGNode";
import { convertToFlowNode } from "./helpers";
export default {
title: 'DAGAutomationFlow/Viewer/DAGNode',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
"color": "lblue",
"height": dgconst.NODE_HEIGHT,
"width": dgconst.NODE_WIDTH,
"label": "test",
"hasInput": true,
}
} as ComponentMeta<typeof DAGNode>
export const Colors: ComponentStory<typeof DAGNode> = args => {
const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({
"data": { ...args, color },
"id": color,
"type": "mynode",
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
}));
return <div className="page">
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
"mynode": convertToFlowNode(DAGNode)
}}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
>
<Controls />
</ReactFlow>
</div>
}
+9 -11
View File
@@ -15,17 +15,15 @@ export interface DAGNodeProps {
hasInput?: boolean; hasInput?: boolean;
accentBackground?: boolean; accentBackground?: boolean;
} }
export const DAGNode: FC<{ data: DAGNodeProps }> = ({ export const DAGNode: FC<DAGNodeProps> = ({
data: { label,
label, height,
height, width,
width, onXClick,
onXClick, onEditClick = () => { },
onEditClick = () => { }, color,
color, hasInput = false,
hasInput = false, accentBackground = false,
accentBackground = false,
},
}) => { }) => {
const { classes, theme } = useNodeStyles({ const { classes, theme } = useNodeStyles({
color, color,
@@ -0,0 +1,9 @@
import { FC } from 'react';
export const convertToFlowNode = <D extends {}>(
Component: FC<D>
): FC<{ data: D }> =>
({ data }) => {
return <Component {...data} />
}
@@ -4,7 +4,7 @@ import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.'; import { DAGAutomationFlow } from '.';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from "components/DAGSvgs/constants"; import * as dgconst from "components/DAGFlow/constants";
export default { export default {
@@ -210,3 +210,24 @@ EmptyStart.args = {
trigger: [], trigger: [],
sequence: [] sequence: []
} }
export const Errors = Template.bind({})
Errors.args = {
...Errors.args,
condition: [
{
"condition": "numeric_state",
} as any
],
trigger: [
{
"platform": "event",
} as any
],
sequence: [
{
"choose": {}
} as any
]
}
+5 -2
View File
@@ -14,9 +14,12 @@ import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal"; import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods"; import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode";
const nodeTypes = { const nodeTypes = {
'dagnode': DAGNode, 'dagnode': convertToFlowNode(DAGNode),
'errornode': convertToFlowNode(DAGErrorNode),
'dagcircle': DAGCircle, 'dagcircle': DAGCircle,
} }
@@ -61,6 +64,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
if (modalState.single) { if (modalState.single) {
modalBody = <NodeEditor modalBody = <NodeEditor
node={modalState.node} node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)} onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }} onSave={n => { modalState.update(n as any); setModalState(null); }}
allowedTypes={modalState.allowedTypes} allowedTypes={modalState.allowedTypes}
@@ -123,7 +127,6 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
}, },
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
); );
// render // render
return <> return <>
<Modal open={!!modalState}> <Modal open={!!modalState}>
+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>
} }
@@ -38,7 +38,14 @@ export const sequenceToFlow = (
// draw node // draw node
if (getNodeType(node) === 'action') { if (getNodeType(node) === 'action') {
if ('choose' in node) { if ('choose' in node) {
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i) try {
const out = addChooseNode(node, position, nodeId, dims, updater, i);
position = out.lastPos
flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) {
console.error(err)
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
}
} else { } else {
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
@@ -56,6 +63,7 @@ export const sequenceToFlow = (
lastPointId = nodeId; lastPointId = nodeId;
lasPos = position; lasPos = position;
} }
// add button // add button
const addCircle = makeAddButton( const addCircle = makeAddButton(
`${prefix}-+`, `${prefix}-+`,
@@ -117,10 +125,33 @@ const addSingleNode = (
position, position,
}); });
const addErrorNode = (
flowData: FlowData,
nodeId: string,
position: XYPosition,
{
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
error: any,
onEdit: () => void,
hasInput: boolean = true,
) => flowData.nodes.push({
id: nodeId,
type: 'errornode',
position,
data: {
height: nodeHeight,
width: nodeWidth,
hasInput,
onEdit,
error,
}
})
const addChooseNode = ( const addChooseNode = (
flowData: FlowData,
node: ChooseAction, node: ChooseAction,
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
@@ -128,6 +159,10 @@ const addChooseNode = (
updater: SequenceUpdater, updater: SequenceUpdater,
i: number, i: number,
) => { ) => {
const flowData: FlowData = {
nodes: [],
edges: [],
};
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i), onXClick: () => updater.removeNode(i),
@@ -209,7 +244,7 @@ const addChooseNode = (
}, { size: dims.circleSize }) }, { size: dims.circleSize })
flowData.nodes.push(elseCircle) flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true) addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, { const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims, ...dims,
padding: { padding: {
x: position.x - dims.nodeWidth, x: position.x - dims.nodeWidth,
@@ -221,5 +256,11 @@ const addChooseNode = (
} else { } else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max) lastPos = xyApply(lastPos, elseCircle.position, Math.max)
} }
return lastPos return { lastPos, flowData }
}
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
fd1.edges = fd1.edges.concat(fd2.edges);
fd1.nodes = fd1.nodes.concat(fd2.nodes);
return fd1
} }
+1
View File
@@ -78,6 +78,7 @@ export const useNodeStyles = createAppUseStyles<{
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
overflow: "hidden", overflow: "hidden",
whiteSpace: "break-spaces", whiteSpace: "break-spaces",
lineBreak: "anywhere",
cursor: 'default', cursor: 'default',
}, },
buttonDelete: { buttonDelete: {
@@ -1,6 +1,7 @@
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types'; import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeAddButton } from './flowDataMods'; import { makeAddButton } from './flowDataMods';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
export const triggerToFlow = ( export const triggerToFlow = (
flowData: FlowData, flowData: FlowData,
@@ -23,7 +24,7 @@ export const triggerToFlow = (
id: flowId, id: flowId,
type: 'dagnode', type: 'dagnode',
data: { data: {
label: t.alias ?? t.platform, label: getDescriptionFromAutomationNode(t),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
color: 'red', color: 'red',
+3 -1
View File
@@ -4,6 +4,7 @@ import { DAGCircleProps } from './DAGCircle';
import { DAGNodeProps } from './DAGNode'; import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types'; import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode';
export type DAGAutomationFlowDims = { export type DAGAutomationFlowDims = {
@@ -16,7 +17,7 @@ export type DAGAutomationFlowDims = {
distanceFactor: number; distanceFactor: number;
} }
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>; export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
export type FlowData = { export type FlowData = {
nodes: DAGAutomationFlowNode[], nodes: DAGAutomationFlowNode[],
edges: Edge[], edges: Edge[],
@@ -34,6 +35,7 @@ export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigge
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = { export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
single: true, single: true,
isError?: boolean,
node: T node: T
update: (n: T) => void; update: (n: T) => void;
saveBtnCreateText?: boolean; saveBtnCreateText?: boolean;
+12 -1
View File
@@ -2,6 +2,7 @@ import { AutomationSequenceNode } from "types/automations";
import { ChooseAction } from "types/automations/actions"; import { ChooseAction } from "types/automations/actions";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { UpdateModalState } from "./types"; import { UpdateModalState } from "./types";
import { getNodeType } from '../../utils/automations';
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>; export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
@@ -68,7 +69,7 @@ export const makeSequenceUpdater = (
) )
} else { } else {
return makeSequenceUpdater( return makeSequenceUpdater(
node.default, node.default ?? [],
seq => this.updateNode(i, { seq => this.updateNode(i, {
...node, ...node,
default: seq default: seq
@@ -114,6 +115,16 @@ export const makeSequenceUpdater = (
}) })
} }
}, },
makeOnEditForBadNode(i: number) {
const node = sequence[i];
return () => openModal({
single: true,
isError: true,
node,
allowedTypes: [getNodeType(node)],
update: n => this.updateNode(i, n),
})
}
}); });
@@ -10,6 +10,10 @@
background-color: var(--secondary); background-color: var(--secondary);
} }
.input-boolean.disabled:hover, .input-boolean.disabled:hover * {
cursor: not-allowed;
}
.input-boolean:hover, .input-boolean:hover * { .input-boolean:hover, .input-boolean:hover * {
cursor: pointer; cursor: pointer;
background-color: var(--secondary-opaque); background-color: var(--secondary-opaque);
@@ -4,14 +4,16 @@ export interface Props {
label: string; label: string;
value: boolean; value: boolean;
onChange: (v: boolean) => void; onChange: (v: boolean) => void;
disabled?: boolean;
} }
export default function InputBoolean({ export default function InputBoolean({
label, label,
value = false, value = false,
onChange, onChange,
disabled = false,
}: Props) { }: Props) {
return <div className="input-boolean" onClick={() => onChange(!value)}> return <div className={["input-boolean", disabled ? 'disabled' : ''].join(' ')} onClick={() => onChange(!value)}>
<input type="checkbox" checked={value} onChange={() => { }} /> <input type="checkbox" checked={value} onChange={() => { }} disabled={disabled} />
<label>{label}</label> <label>{label}</label>
</div> </div>
} }
+10 -6
View File
@@ -1,14 +1,15 @@
import { PropsWithChildren, useState } from "react"; import { PropsWithChildren, useState } from "react";
import { AutomationTime } from "types/automations/common"; import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { milisecondsToObject } from "utils/time"; import { milisecondsToObject } from "utils/time";
import InputWrapper from "./InputWrapper"; import InputWrapper from "./InputWrapper";
import { useInputTimeStyles } from "./styles"; import { useInputTimeStyles } from "./styles";
import { convertStringToAutomationTimeObject } from 'utils/time';
export interface Props { export interface Props {
textBoxFor?: string; textBoxFor?: string;
label: string; label: string;
value?: AutomationTime; value?: AutomationTime;
onChange: (v?: AutomationTime) => void; onChange: (v?: AutomationTimeObject) => void;
onEnter?: () => void; onEnter?: () => void;
} }
export default function InputTime({ export default function InputTime({
@@ -21,11 +22,14 @@ export default function InputTime({
}: PropsWithChildren<Props>) { }: PropsWithChildren<Props>) {
let cleanValue = ''; let cleanValue = '';
if (value) { if (value) {
if (typeof value === 'string') {
value = convertStringToAutomationTimeObject(value);
}
const { const {
hours, hours = 0,
minutes, minutes = 0,
seconds, seconds = 0,
milliseconds, milliseconds = 0,
} = value; } = value;
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`; cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
} }
+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>
} }
+4 -1
View File
@@ -229,7 +229,10 @@ export const useInputTextAreaStyles = createAppUseStyles<{ resizable: boolean }>
return { return {
input: ({ resizable }) => ({ input: ({ resizable }) => ({
...styles.input, ...styles.input,
resize: resizable ? 'both' : 'none' resize: resizable ? 'both' : 'none',
minWidth: "calc(100% - 2em)",
maxWidth: "calc(100% - 2em)",
minHeight: "8em"
}) })
} }
}); });
@@ -130,12 +130,12 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
}) })
}, },
onClose() { onClose() {
if (!multiNode.isSaved) { if (!multiNode.isSaved && multiNode.isModified) {
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) { if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
return return
} }
props.onSave && props.onSave(slides)
} }
props.onSave && props.onSave(slides)
props.onClose && props.onClose() props.onClose && props.onClose()
} }
} }
@@ -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>
</> </>
} }
@@ -11,6 +11,7 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
"type": "", "type": "",
"subtype": "", "subtype": "",
"device_id": "", "device_id": "",
"entity_id": "",
}), }),
isReady: ({ alias }) => { isReady: ({ alias }) => {
return (alias !== '') return (alias !== '')
@@ -33,6 +34,10 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
...state, ...state,
device_id device_id
})} /> })} />
<InputText label="Entity" value={state.entity_id ?? ""} onChange={entity_id => setState({
...state,
entity_id
})} />
</> </>
} }
} }
@@ -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)}
@@ -1,13 +1,14 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers'; import { AutomationTriggerTime } from 'types/automations/triggers';
import InputTime from 'components/Inputs/InputTime'; import InputTime from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time';
export const TriggerTime: OptionManager<AutomationTriggerTime> = { export const TriggerTime: OptionManager<AutomationTriggerTime> = {
defaultState: () => ({ defaultState: () => ({
"alias": "", "alias": "",
"platform": 'time', "platform": 'time',
"at": {}, "at": "",
}), }),
isReady: ({ alias }) => { isReady: ({ alias }) => {
return (alias !== '') return (alias !== '')
@@ -19,7 +20,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
value={state.at} value={state.at}
onChange={_at => setState({ onChange={_at => setState({
...state, ...state,
at: _at ?? {}, at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
})} })}
/> />
</> </>
@@ -2,31 +2,38 @@ import { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations'; import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations'; import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager'; import { getOptionManager } from './getOptionManager';
import { getNodeType, getSubTypeList } from 'utils/automations'; import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations';
import { getNodeSubType } from '../constants';
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, 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,
invalidManualYaml: "", ...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
}, [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)
setAllState({ ...allState, node: yaml, invalidManualYaml: '' }) setAllState({
...allState,
...computeInvalidYaml(yaml)
})
} catch (err) { } catch (err) {
setAllState({ ...allState, invalidManualYaml: String(err) }) setAllState({ ...allState, invalidManualYaml: <>{String(err)}</>, isErrored: true, })
} }
} }
const { const {
@@ -41,26 +48,36 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
nodeType, nodeType,
subType, subType,
subTypes, subTypes,
yamlMode,
setYamlMode, setYamlMode,
invalidManualYaml, invalidManualYaml,
isModified, isModified,
isErrored: allState.isErrored,
get yamlMode() {
return allState.isErrored || yamlMode
},
get data() { get data() {
return currentNode return currentNode
}, },
renderOptionList() { renderOptionList() {
if (yamlMode) { const aliasEditor = <InputText label="Alias" value={getDescriptionFromAutomationNode(allState.node)} onChange={alias => setState({
...allState.node,
alias
})} />
if (yamlMode || allState.isErrored) {
return <> return <>
{aliasEditor}
<InputYaml <InputYaml
label='' label=''
value={currentNode} value={currentNode}
onChange={setStateForManualYaml} onChange={setStateForManualYaml}
resizable
/> />
<span className="node-editor--error">{invalidManualYaml}</span> <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);
@@ -99,4 +116,25 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) =
subTypes, subTypes,
optionManager, optionManager,
} }
}
const computeInvalidYaml = (node: AutomationNode) => {
const errors = validateNode(node);
if (errors) {
return {
node,
isErrored: true,
invalidManualYaml: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
}
} else {
return {
node,
isErrored: false,
invalidManualYaml: <></>
}
}
} }
@@ -1,76 +0,0 @@
import { AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { AutomationNode } from '../../types/automations/index';
const actionTypes = [
'choose',
'device',
'event',
'repeat',
'service',
'wait',
] as AutomationNodeSubtype<'action'>[];
const conditionTypes = [
'and',
'not',
'numeric_state',
'or',
'state',
'template',
'time',
'trigger',
'zone',
] as AutomationNodeSubtype<'condition'>[];
const triggerTypes = [
'device',
'event',
'homeassistant',
'mqtt',
'numeric_state',
'state',
'tag',
'template',
'time',
'time_pattern',
'webhook',
'zone',
] as AutomationNodeSubtype<'trigger'>[];
export const getSubTypeList = <T extends AutomationNodeTypes>(
nodeType: T
): Array<AutomationNodeSubtype<T> | 'condition'> => {
if (nodeType === 'action') {
return actionTypes as any;
} else if (nodeType === 'condition') {
return conditionTypes as any;
} else if (nodeType === 'trigger') {
return triggerTypes as any;
}
return [];
}
export const getNodeSubType = <T extends AutomationNodeTypes>(
node: AutomationNode<T>
): AutomationNodeSubtype<T> => {
if ('condition' in node) {
return node.condition as any;
} else if ('platform' in node) {
return node.platform as any;
} else if ('service' in node) {
return 'service' as any
} else if ('repeat' in node) {
return 'repeat' as any
} else if ('wait_template' in node) {
return 'wait' as any
} else if ('event' in node) {
return 'event' as any
} else if ('device_id' in node) {
return 'device' as any
} else if ('choose' in node) {
return 'choose' as any
} else {
throw new Error("Invalid node type!")
}
}
@@ -51,4 +51,10 @@
width: 100%; width: 100%;
min-height: 50px; min-height: 50px;
min-width: 25vw; min-width: 25vw;
}
.node-editor--error {
max-width: 30em;
overflow: auto;
max-height: 10em;
} }
+15 -5
View File
@@ -14,6 +14,7 @@ export interface NodeEditorProps {
onSave?: (n: AutomationNode) => void; onSave?: (n: AutomationNode) => void;
onFlags?: (isReady: boolean, isModified: boolean) => void; onFlags?: (isReady: boolean, isModified: boolean) => void;
saveBtnCreateText?: boolean; saveBtnCreateText?: boolean;
isErrored?: boolean;
} }
export const NodeEditor: FC<NodeEditorProps> = ({ export const NodeEditor: FC<NodeEditorProps> = ({
@@ -23,17 +24,20 @@ export const NodeEditor: FC<NodeEditorProps> = ({
onSave = () => { }, onSave = () => { },
onFlags = () => { }, onFlags = () => { },
saveBtnCreateText = false, saveBtnCreateText = false,
children children,
isErrored = false,
}) => { }) => {
// state // state
const state = useEditorNodeState(node); const state = useEditorNodeState(node, isErrored);
// alias // alias
const isModified = state.isModified; const isModified = state.isModified;
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);
@@ -53,7 +57,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
options={state.subTypes} options={state.subTypes}
onChange={state.setSubType} onChange={state.setSubType}
/> : <></>} /> : <></>}
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} /> <InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} disabled={state.isErrored} />
</div> </div>
{state.renderOptionList()} {state.renderOptionList()}
</div> </div>
@@ -62,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 -1
View File
@@ -1,6 +1,6 @@
import { ApiService } from 'apiService/core'; import { ApiService } from 'apiService/core';
import { ConnectedAutomationList } from "components/AutomationList"; import { ConnectedAutomationList } from "components/AutomationList";
import { DEFAULT_DIMS } from "components/DAGSvgs/constants"; import { DEFAULT_DIMS } from "components/DAGFlow/constants";
import { FC } from "react"; import { FC } from "react";
+1
View File
@@ -12,6 +12,7 @@
--green-light: #6f5; --green-light: #6f5;
--error: #c55; --error: #c55;
--error-light: #f77; --error-light: #f77;
--error-dark: #5c2323;
--error-opaque: #c555; --error-opaque: #c555;
--error-accent: #9f3a3a; --error-accent: #9f3a3a;
--change: #0f9; --change: #0f9;
+9 -25
View File
@@ -1,44 +1,28 @@
import { AutomationSequenceNode } from "."; import { AutomationSequenceNode } from ".";
import { AutomationTime } from "./common"; import { AutomationTime } from "./common";
import { AutomationCondition } from "./conditions"; import { AutomationCondition } from "./conditions";
import * as v from "types/validators/actions";
import * as st from 'superstruct';
type AutomationActionNodeBase<Data extends Object> = Data & { type AutomationActionNodeBase<Data extends Object> = Data &
alias?: string; st.Infer<typeof v.AutomationActionNodeBase>;
variables?: Record<string, any>;
}
export type ServiceAction = AutomationActionNodeBase<{ export type ServiceAction = st.Infer<typeof v.ServiceAction>;
service: string;
target: any;
data: any;
}>
export type RepeatAction = AutomationActionNodeBase<{ export type RepeatAction = AutomationActionNodeBase<{
repeat: { repeat: {
count: number; count: number;
sequence: AutomationAction[]; sequence: AutomationAction[];
} }
}> }>
export type WaitAction = AutomationActionNodeBase<{ export type WaitAction = st.Infer<typeof v.WaitAction>;
wait_template: string; export type FireEventAction = st.Infer<typeof v.FireEventAction>;
timeout?: AutomationTime; export type DeviceAction = st.Infer<typeof v.DeviceAction>;
continue_on_timeout?: boolean;
}>
export type FireEventAction = AutomationActionNodeBase<{
event: string;
event_data: any;
}>
export type DeviceAction = AutomationActionNodeBase<{
type: string;
device_id: string;
entity_id?: string;
domain: string;
}>
export type ChooseAction = AutomationActionNodeBase<{ export type ChooseAction = AutomationActionNodeBase<{
choose: Array<{ choose: Array<{
conditions: AutomationCondition[]; conditions: AutomationCondition[];
sequence: AutomationSequenceNode[]; sequence: AutomationSequenceNode[];
}>; }>;
default: AutomationSequenceNode[]; default?: AutomationSequenceNode[];
}> }>
export type AutomationAction = export type AutomationAction =
| ServiceAction | ServiceAction
+6 -6
View File
@@ -1,6 +1,6 @@
export interface AutomationTime { import * as st from 'superstruct'
hours?: number; import * as v from "types/validators/common";
minutes?: number;
seconds?: number; export type AutomationTime = st.Infer<typeof v.AutomationTime>
milliseconds?: number; export type AutomationTimeObject = st.Infer<typeof v.AutomationTimeObject>
} export type AutomationTimeString = st.Infer<typeof v.AutomationTimeString>
+8 -30
View File
@@ -1,5 +1,6 @@
import { AutomationTime } from "./common"; import { AutomationTime } from "./common";
import * as st from 'superstruct';
import * as v from "types/validators/conditions";
type AutomationConditionNodeBase<Name extends String, Data extends Object> = { type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
condition: Name; condition: Name;
alias?: string; alias?: string;
@@ -7,35 +8,12 @@ type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', { export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', {
conditions: AutomationCondition[]; conditions: AutomationCondition[];
}>; }>;
export type NumericCondition = AutomationConditionNodeBase<'numeric_state', { export type NumericCondition = st.Infer<typeof v.NumericCondition>;
entity_id: string | string[]; export type StateCondition = st.Infer<typeof v.StateCondition>;
above?: string; export type TemplateCondition = st.Infer<typeof v.TemplateCondition>;
below?: string; export type TimeCondition = st.Infer<typeof v.TimeCondition>;
attribute?: string; export type TriggerCondition = st.Infer<typeof v.TriggerCondition>;
value_template?: string; export type ZoneCondition = st.Infer<typeof v.ZoneCondition>;
}>;
export type StateCondition = AutomationConditionNodeBase<'state', {
entity_id: string | string[];
state: string | string[];
for?: AutomationTime;
attribute?: string;
}>;
export type TemplateCondition = AutomationConditionNodeBase<'template', {
value_template: string;
}>;
export type TimeCondition = AutomationConditionNodeBase<'time', {
after?: AutomationTime;
before?: AutomationTime;
weekday?: Array<'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun'>;
}>;
export type TriggerCondition = AutomationConditionNodeBase<'trigger', {
id: string;
}>;
export type ZoneCondition = AutomationConditionNodeBase<'zone', {
zone: string;
entity_id: string | string[];
state: string | string[];
}>;
export type AutomationCondition = export type AutomationCondition =
| LogicCondition | LogicCondition
| NumericCondition | NumericCondition
+1 -3
View File
@@ -19,15 +19,13 @@ export type AutomationNodeMapping = {
"action": AutomationAction; "action": AutomationAction;
"condition": AutomationCondition; "condition": AutomationCondition;
} }
export type AutomationNodeTypes = keyof AutomationNodeMapping | undefined; export type AutomationNodeTypes = keyof AutomationNodeMapping;
export type AutomationNode<N extends AutomationNodeTypes = any> = export type AutomationNode<N extends AutomationNodeTypes = any> =
N extends undefined ? AutomationTrigger :
N extends 'trigger' ? AutomationTrigger : N extends 'trigger' ? AutomationTrigger :
N extends 'action' ? AutomationAction : N extends 'action' ? AutomationAction :
N extends 'condition' ? AutomationCondition : N extends 'condition' ? AutomationCondition :
never; never;
export type AutomationNodeSubtype<T extends AutomationNodeTypes = any> = export type AutomationNodeSubtype<T extends AutomationNodeTypes = any> =
T extends undefined ? TriggerType :
T extends 'trigger' ? TriggerType : T extends 'trigger' ? TriggerType :
T extends 'action' ? ActionType : T extends 'action' ? ActionType :
T extends 'condition' ? ConditionType : T extends 'condition' ? ConditionType :
-1
View File
@@ -1,5 +1,4 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from "./common";
import * as v from "types/validators/triggers"; import * as v from "types/validators/triggers";
interface AutomationTriggerBase { interface AutomationTriggerBase {
+58 -14
View File
@@ -1,24 +1,68 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from './common';
const AutomationActionNodeBase = { export const AutomationActionNodeBase = st.type({
alias: st.optional(st.string()), alias: st.optional(st.string()),
variables: st.optional(st.record(st.string(), st.any())), variables: st.optional(st.record(st.string(), st.any())),
}
export const ServiceAction = st.object({
...AutomationActionNodeBase,
data: st.any(),
target: st.any(),
service: st.string(),
}) })
export const RepeatAction = st.object({ export const ServiceAction = st.intersection([
...AutomationActionNodeBase, AutomationActionNodeBase,
repeat: st.object({ st.type({
count: st.number(), data: st.any(),
sequence: st.array(), target: st.any(),
service: st.string(),
}) })
}) ]);
export const RepeatAction = st.intersection([
AutomationActionNodeBase,
st.type({
repeat: st.object({
count: st.number(),
sequence: st.array(st.object()),
})
})
]);
export const WaitAction = st.intersection([
AutomationActionNodeBase,
st.type({
wait_template: st.string(),
timeout: st.optional(AutomationTime),
continue_on_timeout: st.optional(st.boolean()),
})
]);
export const FireEventAction = st.intersection([
AutomationActionNodeBase,
st.type({
event: st.string(),
event_data: st.any(),
})
]);
export const DeviceAction = st.intersection([
AutomationActionNodeBase,
st.type({
type: st.string(),
device_id: st.string(),
entity_id: st.optional(st.string()),
domain: st.string(),
})
]);
export const ChooseAction = st.intersection([
AutomationActionNodeBase,
st.type({
choose: st.array(st.type({
conditions: st.array(st.object()),
sequence: st.array(st.object()),
})),
default: st.optional(st.array(st.object())),
})
]);
+1 -2
View File
@@ -1,11 +1,10 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationMetadata } from './metadata' import { AutomationMetadata } from './metadata'
import { AutomationTrigger } from './triggers';
export const AutomationData = st.object({ export const AutomationData = st.object({
metadata: AutomationMetadata, metadata: AutomationMetadata,
trigger: st.array(AutomationTrigger), trigger: st.array(st.object()),
condition: st.array(st.object()), condition: st.array(st.object()),
sequence: st.array(st.object()), sequence: st.array(st.object()),
tags: st.record(st.string(), st.string()), tags: st.record(st.string(), st.string()),
+32 -3
View File
@@ -1,9 +1,38 @@
import * as st from 'superstruct' import * as st from 'superstruct'
export const EntityId = st.union([
export const AutomationTime = st.object({ st.string(),
st.array(st.string()),
])
export const AutomationTimeString = st.refine(st.string(), 'TimeString', (v, c) => {
// https://www.home-assistant.io/docs/automation/trigger/#time-string
const bits: string[] = v.split(':')
if ((bits.length !== 2) && (bits.length !== 3)) {
return {
"branch": c.branch,
"message": "Time string should be either in the form 'HH:MM' or 'HH:MM:SS' as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string",
"path": c.path,
}
}
for (let i = 0; i < bits.length; i++) {
const b = bits[i];
const num = Number(b);
if (!Number.isInteger(num) || (num < 0) || (num > 23)) {
return {
"branch": c.branch,
"message": "Time string should contain only positive numbers between 0-23 as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string",
"path": c.path.concat(
bits.slice(0, i)
).concat([`<<${b}>>`])
}
}
}
return true
})
export const AutomationTimeObject = st.object({
hours: st.optional(st.number()), hours: st.optional(st.number()),
minutes: st.optional(st.number()), minutes: st.optional(st.number()),
seconds: st.optional(st.number()), seconds: st.optional(st.number()),
milliseconds: st.optional(st.number()), milliseconds: st.optional(st.number()),
}) });
export const AutomationTime = st.union([st.string(), AutomationTimeObject])
+71
View File
@@ -0,0 +1,71 @@
import * as st from 'superstruct'
import { AutomationTime, EntityId } from './common';
export const AutomationConditionNodeBase = st.type({
alias: st.optional(st.string()),
});
export const LogicCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.enums(['and', 'or', 'not']),
conditions: st.array(st.object())
})
])
export const NumericCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.literal('numeric_state'),
entity_id: EntityId,
above: st.optional(st.string()),
below: st.optional(st.string()),
attribute: st.optional(st.string()),
value_template: st.optional(st.string()),
})
]);
export const StateCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.literal('state'),
entity_id: EntityId,
state: st.union([st.array(st.string()), st.string()]),
for: st.optional(AutomationTime),
attribute: st.optional(st.string()),
})
]);
export const TemplateCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.literal('template'),
value_template: st.string(),
})
]);
export const TriggerCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.literal('trigger'),
id: st.string(),
})
]);
export const TimeCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.literal('time'),
after: st.optional(AutomationTime),
before: st.optional(AutomationTime),
weekday: st.optional(st.enums([
'mon', 'tue', 'wed',
'thu', 'fri', 'sat',
'sun',
]))
})
]);
export const ZoneCondition = st.intersection([
AutomationConditionNodeBase,
st.type({
condition: st.literal('zone'),
zone: st.string(),
entity_id: EntityId,
state: st.union([st.array(st.string()), st.string()]),
})
]);
+32 -1
View File
@@ -2,6 +2,7 @@ import * as st from "superstruct";
import { AutomationMetadata } from "./metadata"; import { AutomationMetadata } from "./metadata";
import { AutomationData } from './autmation'; import { AutomationData } from './autmation';
import { getFailures } from './helper'; import { getFailures } from './helper';
import { AutomationTimeString } from "./common";
test('superstructure is', () => { test('superstructure is', () => {
const badCheck = st.is({}, AutomationMetadata); const badCheck = st.is({}, AutomationMetadata);
@@ -10,7 +11,7 @@ test('superstructure is', () => {
test('getFailures returns failures', () => { test('getFailures returns failures', () => {
const failures = getFailures({ metadata: {} }, AutomationData); const failures = getFailures({ metadata: {} }, AutomationData);
expect(failures).toHaveLength(8) expect(failures).toHaveLength(6)
}) })
test('getFailures returns null', () => { test('getFailures returns null', () => {
@@ -21,4 +22,34 @@ test('getFailures returns null', () => {
mode: "single", mode: "single",
}, AutomationMetadata); }, AutomationMetadata);
expect(failures).toBeNull() expect(failures).toBeNull()
})
test('AutomationTimeString is valid', () => {
for (const c of [
'10:23',
'15:02',
'13:00:1',
'23:00:23'
]) {
const failures = getFailures(c, AutomationTimeString)
expect(failures).toBeNull()
}
})
test('AutomationTimeString is invalid', () => {
for (const c of [
'xx:23',
'1x:02',
'13:0a:1c',
'25:00:23',
'11'
]) {
const failures = getFailures({
"time": c
}, st.object({
time: AutomationTimeString,
}))
expect(failures).toHaveLength(1)
}
}) })
+3
View File
@@ -0,0 +1,3 @@
export * as actions from "./actions"
export * as triggers from "./triggers"
export * as conditions from "./conditions"
+2 -2
View File
@@ -3,8 +3,8 @@ import * as st from 'superstruct'
export const AutomationMetadata = st.object({ export const AutomationMetadata = st.object({
id: st.string(), id: st.string(),
alias: st.string(), alias: st.optional(st.string()),
description: st.string(), description: st.optional(st.string()),
trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))), trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))),
mode: st.enums(["single", "restart", "queued", "parallel"]), mode: st.enums(["single", "restart", "queued", "parallel"]),
}) })
+18 -16
View File
@@ -1,12 +1,13 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from './common' import { AutomationTimeString, AutomationTime } from './common'
const AutomationTriggerBase = { const AutomationTriggerBase = {
alias: st.optional(st.string()) alias: st.optional(st.string()),
id: st.optional(st.string()),
} }
export const AutomationTriggerEvent = st.object({ export const AutomationTriggerEvent = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('event'), platform: st.literal('event'),
event_type: st.union([st.string(), st.array(st.string())]), event_type: st.union([st.string(), st.array(st.string())]),
@@ -14,13 +15,13 @@ export const AutomationTriggerEvent = st.object({
context: st.any(), context: st.any(),
}) })
export const AutomationTriggerHA = st.object({ export const AutomationTriggerHA = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('homeassistant'), platform: st.literal('homeassistant'),
event: st.enums(['start', 'shutdown']), event: st.enums(['start', 'shutdown']),
}) })
export const AutomationTriggerMQTT = st.object({ export const AutomationTriggerMQTT = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('mqtt'), platform: st.literal('mqtt'),
topic: st.string(), topic: st.string(),
@@ -28,7 +29,7 @@ export const AutomationTriggerMQTT = st.object({
value_template: st.string(), value_template: st.string(),
}) })
export const AutomationTriggerNumericState = st.object({ export const AutomationTriggerNumericState = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('numeric_state'), platform: st.literal('numeric_state'),
entity_id: st.union([st.string(), st.array(st.string())]), entity_id: st.union([st.string(), st.array(st.string())]),
@@ -39,7 +40,7 @@ export const AutomationTriggerNumericState = st.object({
for: st.optional(AutomationTime), for: st.optional(AutomationTime),
}) })
export const AutomationTriggerState = st.object({ export const AutomationTriggerState = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('state'), platform: st.literal('state'),
entity_id: st.union([st.string(), st.array(st.string())]), entity_id: st.union([st.string(), st.array(st.string())]),
@@ -49,27 +50,27 @@ export const AutomationTriggerState = st.object({
for: st.optional(AutomationTime), for: st.optional(AutomationTime),
}) })
export const AutomationTriggerTag = st.object({ export const AutomationTriggerTag = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('tag'), platform: st.literal('tag'),
tag_id: st.string(), tag_id: st.string(),
device_id: st.union([st.string(), st.array(st.string())]), device_id: st.union([st.string(), st.array(st.string())]),
}) })
export const AutomationTriggerTemplate = st.object({ export const AutomationTriggerTemplate = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('template'), platform: st.literal('template'),
value_template: st.string(), value_template: st.string(),
for: st.optional(AutomationTime), for: st.optional(AutomationTime),
}) })
export const AutomationTriggerTime = st.object({ export const AutomationTriggerTime = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('time'), platform: st.literal('time'),
at: AutomationTime, at: AutomationTimeString,
}) })
export const AutomationTriggerTimePattern = st.object({ export const AutomationTriggerTimePattern = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('time_pattern'), platform: st.literal('time_pattern'),
hours: st.optional(st.string()), hours: st.optional(st.string()),
@@ -77,13 +78,13 @@ export const AutomationTriggerTimePattern = st.object({
seconds: st.optional(st.string()), seconds: st.optional(st.string()),
}) })
export const AutomationTriggerWebhook = st.object({ export const AutomationTriggerWebhook = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('webhook'), platform: st.literal('webhook'),
webhook_id: st.string(), webhook_id: st.string(),
}) })
export const AutomationTriggerZone = st.object({ export const AutomationTriggerZone = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('zone'), platform: st.literal('zone'),
entity_id: st.union([st.string(), st.array(st.string())]), entity_id: st.union([st.string(), st.array(st.string())]),
@@ -91,13 +92,14 @@ export const AutomationTriggerZone = st.object({
event: st.enums(['enter', 'leave']) event: st.enums(['enter', 'leave'])
}) })
export const AutomationTriggerDevice = st.object({ export const AutomationTriggerDevice = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('device'), platform: st.literal('device'),
entity_id: st.optional(st.string()),
device_id: st.string(), device_id: st.string(),
domain: st.string(), domain: st.string(),
type: st.string(), type: st.string(),
subtype: st.string(), subtype: st.optional(st.string()),
}) })
+98
View File
@@ -1,5 +1,8 @@
import * as v from "types/validators";
import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, AutomationNodeTypes } from "types/automations"; import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MiniFailure } from "types/validators/helper";
import { getFailures } from '../types/validators/helper';
export const getNodeType = (node: AutomationNode): AutomationNodeTypes => { export const getNodeType = (node: AutomationNode): AutomationNodeTypes => {
@@ -78,3 +81,98 @@ export const makeDefault = (nodeType: keyof AutomationNodeMapping): AutomationNo
} as AutomationTrigger } as AutomationTrigger
} }
} }
export const getNodeSubType = <T extends AutomationNodeTypes>(
node: AutomationNode<T>
): AutomationNodeSubtype<T> => {
if ('condition' in node) {
return node.condition as any;
} else if ('platform' in node) {
return node.platform as any;
} else if ('service' in node) {
return 'service' as any
} else if ('repeat' in node) {
return 'repeat' as any
} else if ('wait_template' in node) {
return 'wait' as any
} else if ('event' in node) {
return 'event' as any
} else if ('device_id' in node) {
return 'device' as any
} else if ('choose' in node) {
return 'choose' as any
} else {
throw new Error("Invalid node type!")
}
}
export const validateNode = (node: AutomationNode): MiniFailure[] | null => {
const nodeType = getNodeType(node);
try {
const nodeSubType = getNodeSubType(node);
if (nodeType === 'action') {
if (nodeSubType === 'service') {
return getFailures(node, v.actions.ServiceAction)
} else if (nodeSubType === 'repeat') {
return getFailures(node, v.actions.RepeatAction)
} else if (nodeSubType === 'wait') {
return getFailures(node, v.actions.WaitAction)
} else if (nodeSubType === 'event') {
return getFailures(node, v.actions.FireEventAction)
} else if (nodeSubType === 'device') {
return getFailures(node, v.actions.DeviceAction)
} else if (nodeSubType === 'choose') {
return getFailures(node, v.actions.ChooseAction)
}
} else if (nodeType === 'trigger') {
if (nodeSubType === 'event') {
return getFailures(node, v.triggers.AutomationTriggerEvent)
} else if (nodeSubType === 'homeassistant') {
return getFailures(node, v.triggers.AutomationTriggerHA)
} else if (nodeSubType === 'mqtt') {
return getFailures(node, v.triggers.AutomationTriggerMQTT)
} else if (nodeSubType === 'numeric_state') {
return getFailures(node, v.triggers.AutomationTriggerNumericState)
} else if (nodeSubType === 'state') {
return getFailures(node, v.triggers.AutomationTriggerState)
} else if (nodeSubType === 'tag') {
return getFailures(node, v.triggers.AutomationTriggerTag)
} else if (nodeSubType === 'template') {
return getFailures(node, v.triggers.AutomationTriggerTemplate)
} else if (nodeSubType === 'time') {
return getFailures(node, v.triggers.AutomationTriggerTime)
} else if (nodeSubType === 'time_pattern') {
return getFailures(node, v.triggers.AutomationTriggerTimePattern)
} else if (nodeSubType === 'webhook') {
return getFailures(node, v.triggers.AutomationTriggerWebhook)
} else if (nodeSubType === 'zone') {
return getFailures(node, v.triggers.AutomationTriggerZone)
} else if (nodeSubType === 'device') {
return getFailures(node, v.triggers.AutomationTriggerDevice)
}
} else if (nodeType === 'condition') {
if (['and', 'or', 'not'].includes(nodeSubType)) {
return getFailures(node, v.conditions.LogicCondition)
} else if (nodeSubType === 'numeric_state') {
return getFailures(node, v.conditions.NumericCondition)
} else if (nodeSubType === 'state') {
return getFailures(node, v.conditions.StateCondition)
} else if (nodeSubType === 'template') {
return getFailures(node, v.conditions.TemplateCondition)
} else if (nodeSubType === 'trigger') {
return getFailures(node, v.conditions.TriggerCondition)
} else if (nodeSubType === 'time') {
return getFailures(node, v.conditions.TimeCondition)
} else if (nodeSubType === 'zone') {
return getFailures(node, v.conditions.ZoneCondition)
}
}
} catch (err) {
console.warn(err)
}
return [
{ "message": ["Invalid or unknown " + nodeType], "path": "" },
]
}
+41 -7
View File
@@ -2,18 +2,52 @@ import { AutomationNode, AutomationNodeTypes } from "types/automations";
import { AutomationTime } from "types/automations/common"; import { AutomationTime } from "types/automations/common";
export const convertTimeToString = ({ export const convertTimeToString = (t: AutomationTime) => {
hours = 0, if (typeof t === 'string') {
minutes = 0, return t
seconds = 0, } else {
milliseconds = 0, const {
}: AutomationTime) => [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':') hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
} = t
return [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':')
}
}
export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => { export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => {
if (node.alias) { if (node.alias) {
return node.alias; return node.alias;
} }
if ('platform' in node) { if ('platform' in node) {
if (node.platform === 'time') {
return node.at
}
if (node.platform === 'homeassistant') {
if (node.event === 'start') {
return 'HA is starting'
} else {
return 'HA is shutting down'
}
}
if (node.platform === 'tag') {
return `Tag = ${node.tag_id}`
}
if (node.platform === 'state') {
let out = "";
if (typeof node.entity_id === 'string') {
out = node.entity_id
} else {
out = node.entity_id[0] + " and more"
}
if (node.from) {
out += ` from ${node.from}`
}
if (node.to) {
out += ` to ${node.to}`
}
return out
}
return node.platform return node.platform
} }
if ('condition' in node) { if ('condition' in node) {
+20 -2
View File
@@ -1,8 +1,8 @@
import { AutomationTime } from "types/automations/common"; import { AutomationTimeObject, AutomationTimeString } from "types/automations/common";
const cleanTime = (t: number) => Math.max(0, Math.floor(t)) const cleanTime = (t: number) => Math.max(0, Math.floor(t))
export const milisecondsToObject = (total_miliseconds: number): AutomationTime => { export const milisecondsToObject = (total_miliseconds: number): AutomationTimeObject => {
const hours = cleanTime(total_miliseconds / (60 * 60 * 1000)); const hours = cleanTime(total_miliseconds / (60 * 60 * 1000));
const minutes = cleanTime((total_miliseconds - hours * 60 * 60 * 1000) / (60 * 1000)); const minutes = cleanTime((total_miliseconds - hours * 60 * 60 * 1000) / (60 * 1000));
const seconds = cleanTime((total_miliseconds - hours * 60 * 60 * 1000 - minutes * 60 * 1000) / 1000); const seconds = cleanTime((total_miliseconds - hours * 60 * 60 * 1000 - minutes * 60 * 1000) / 1000);
@@ -10,4 +10,22 @@ export const milisecondsToObject = (total_miliseconds: number): AutomationTime =
return { return {
hours, minutes, seconds, milliseconds, hours, minutes, seconds, milliseconds,
} }
}
export const convertStringToAutomationTimeObject = (t: AutomationTimeString): AutomationTimeObject => {
const bits = t.split(':')
return {
hours: Number(bits[0]),
minutes: Number(bits[1]),
seconds: bits.length === 3 ? Number(bits[2]) : 0,
}
}
export const convertObjectToAutomationTimeString = (t: AutomationTimeObject): AutomationTimeString => {
const {
hours = 0,
minutes = 0,
seconds = 0
} = t
return [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':')
} }
+1
View File
@@ -5,6 +5,7 @@ export const useDelayEffect = (cb: () => void, deps: any[], timeout: number) =>
const fcn = useDelayedFunction(cb, timeout); const fcn = useDelayedFunction(cb, timeout);
useEffect(() => { useEffect(() => {
fcn() fcn()
// eslint-disable-next-line
}, deps) }, deps)
} }
+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"