Merge branch 'main' of https://github.com/acivitillo/idom into form_serialize

Author: Alessio Civitillo

.github/ISSUE_TEMPLATE/issue-form.yml

@@ -14,10 +14,3 @@ body:
     description: Describe what ought to be done, and why that will address the reasons for action mentioned above.
   validations:
     required: false
-- type: textarea
-  attributes:
-    label: Work Items
-    description: |
-      An itemized list or detailed description of the work to be done to based on the proposed actions above.
-  validations:
-    required: false

.pre-commit-config.yaml

@@ -3,10 +3,6 @@ repos:
     rev: 22.1.0
     hooks:
       - id: black
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.7.9
-    hooks:
-      - id: flake8
   - repo: https://github.com/pycqa/isort
     rev: 5.6.3
     hooks:

VERSION

@@ -1 +1 @@
-0.36.0
+0.36.3

docs/source/_custom_js/package-lock.json

@@ -7,6 +7,48 @@ team are working on, or have feedback on how issues should be prioritized, feel
 :discussion-type:`open up a discussion <question>`.
 
 
+0.36.3
+------
+
+Misc bug fixes along with a minor improvement that allows components to return ``None``
+to render nothing.
+
+**Closed Issues**
+
+- All child states wiped upon any child key change - :issue:`652`
+- Allow NoneType returns within components - :issue:`538`
+
+**Merged Pull Requests**
+
+- fix #652 - :pull:`672`
+- Fix 663 - :pull:`667`
+
+
+0.36.2
+------
+
+Hot fix for newly introduced ``DeprecatedOption``:
+
+- :commit:`c146dfb264cbc3d2256a62efdfe9ccf62c795b01`
+
+
+0.36.1
+------
+
+Includes bug fixes and renames the configuration option ``IDOM_WED_MODULES_DIR`` to
+``IDOM_WEB_MODULES_DIR`` with a corresponding deprecation warning.
+
+**Closed Issues**
+
+- Fix Key Error When Cleaning Up Event Handlers - :issue:`640`
+- Update Script Tag Behavior - :issue:`628`
+
+**Merged Pull Requests**
+
+- mark old state as None if unmounting - :pull:`641`
+- rename IDOM_WED_MODULES_DIR to IDOM_WEB_MODULES_DIR - :pull:`638`
+
+
 0.36.0
 ------
 

docs/source/developing-idom/changelog.rst

@@ -297,8 +297,7 @@ following commands using the ``<format>`` of your choosing (``rst``, ``md``, ``t
 
 .. code-block:: bash
 
-    nox -s latest_closed_issues -- <format>
-    nox -s latest_pull_requests -- <format>
+    nox -s changes_since_release -- <format>
 
 Once the version has been updated and the changelog entry completed, you should commit
 the changes.

docs/source/developing-idom/contributor-guide.rst

@@ -248,16 +248,7 @@ def test_docs(session: Session) -> None:
     )
     session.run("sphinx-build", "-b", "doctest", "docs/source", "docs/build")
     # ensure docker image build works too
-    # session.run(
-    #    "docker",
-    #    "build",
-    #    ".",
-    #    "--file",
-    #    "docs/Dockerfile",
-    #    "--tag",
-    #   "idom-docs:latest",
-    #    external=True,
-    # )
+    session.run("docker", "build", ".", "--file", "docs/Dockerfile", external=True)
 
 
 @do_first
@@ -359,17 +350,10 @@ def update_version(session: Session) -> None:
 
 
 @nox.session(reuse_venv=True)
-def latest_pull_requests(session: Session) -> None:
-    """A basic script for outputing changelog info"""
+def changes_since_release(session: Session) -> None:
+    """Output the latest changes since the last release"""
     session.install("requests", "python-dateutil")
-    session.run("python", "scripts/latest_pull_requests.py", *session.posargs)
-
-
-@nox.session(reuse_venv=True)
-def latest_closed_issues(session: Session) -> None:
-    """A basic script for outputing changelog info"""
-    session.install("requests", "python-dateutil")
-    session.run("python", "scripts/latest_closed_issues.py", *session.posargs)
+    session.run("python", "scripts/changes_since_release.py", *session.posargs)
 
 
 def install_requirements_file(session: Session, name: str) -> None:

noxfile.py

@@ -5,3 +5,5 @@ flake8-print
 flake8-tidy-imports
 isort >=5.7.0
 pep8-naming
+# pydocstyle
+git+https://github.com/PyCQA/pydocstyle.git@bd4993345a241bd0d5128f21de56394b1cde3714#egg=pydocstyle

requirements/check-style.txt

@@ -12,6 +12,7 @@ uvicorn[standard] >=0.13.4
 
 # extra=flask
 flask<2.0
+markupsafe<2.1
 flask-cors
 flask-sockets
 

requirements/pkg-extras.txt

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+import sys
+
+from common.github_utils import (
+    REPO_NAME,
+    date_range_query,
+    last_release_date,
+    search_idom_repo,
+)
+
+
+SECTION_FORMAT_TEMPLATES = {
+    "md": lambda title: f"# {title}",
+    "rst": lambda title: f"**{title}**\n",
+    "text": lambda title: f"{title}\n{'-' * len(title)}",
+}
+
+
+ISSUE_FORMAT_TEMPLATES = {
+    "md": lambda title, number, **_: f"- {title} - [#{number}](https://github.com/{REPO_NAME}/issues/{number})",
+    "rst": lambda title, number, **_: f"- {title} - :issue:`{number}`",
+    "text": lambda title, number, **_: f"- {title} - #{number}",
+}
+
+PULL_REQUEST_FORMAT_TEMPLATES = {
+    "md": lambda title, number, **_: f"- {title} - [#{number}](https://github.com/{REPO_NAME}/pull/{number})",
+    "rst": lambda title, number, **_: f"- {title} - :pull:`{number}`",
+    "text": lambda title, number, **_: f"- {title} - #{number}",
+}
+
+
+def show_issues(format: str):
+    print(SECTION_FORMAT_TEMPLATES[format]("Closed Issues"))
+    template = ISSUE_FORMAT_TEMPLATES[format]
+    query = f"type:issue closed:{date_range_query(last_release_date())}"
+    for issue in search_idom_repo(query):
+        print(template(**issue))
+
+
+def show_pull_requests(format: str = "text"):
+    print(SECTION_FORMAT_TEMPLATES[format]("Merged Pull Requests"))
+    template = PULL_REQUEST_FORMAT_TEMPLATES[format]
+    query = f"type:pr merged:{date_range_query(last_release_date())}"
+    for pull in search_idom_repo(query):
+        print(template(**pull))
+
+
+def main(format: str = "text"):
+    for func in [show_issues, show_pull_requests]:
+        func(format)
+        print()
+
+
+if __name__ == "__main__":
+    main(*sys.argv[1:])

scripts/changes_since_release.py

@@ -24,6 +24,7 @@ testpaths = tests
 xfail_strict = True
 markers =
     slow: marks tests as slow (deselect with '-m "not slow"')
+python_files = assert_*.py test_*.py
 
 [coverage:report]
 fail_under = 100
@@ -42,3 +43,9 @@ omit =
 all-files = true
 source-dir = docs/source
 build-dir = docs/build
+
+[pydocstyle]
+inherit = false
+match = .*\.py
+convention = google
+add_ignore = D100,D101,D102,D103,D104,D105,D107,D412,D415

scripts/latest_closed_issues.py

@@ -14,7 +14,7 @@
     "publish": "npm --workspaces publish",
     "test": "npm --workspaces test"
   },
-  "version": "0.36.0",
+  "version": "0.36.3",
   "workspaces": [
     "./packages/*"
   ]

scripts/latest_pull_requests.py

@@ -21,5 +21,5 @@
     "format": "prettier --write ./src",
     "test": "echo 'no tests'"
   },
-  "version": "0.36.0"
+  "version": "0.36.3"
 }

setup.cfg

@@ -31,5 +31,5 @@
     "test": "uvu tests"
   },
   "type": "module",
-  "version": "0.36.0"
+  "version": "0.36.3"
 }

src/client/package-lock.json

@@ -20,6 +20,10 @@ export function Layout({ saveUpdateHook, sendEvent, loadImportSource }) {
 
   React.useEffect(() => saveUpdateHook(patchModel), [patchModel]);
 
+  if (!Object.keys(model).length) {
+    return html`<${React.Fragment} />`;
+  }
+
   return html`
     <${LayoutContext.Provider} value=${{ sendEvent, loadImportSource }}>
       <${Element} model=${model} />
@@ -28,7 +32,7 @@ export function Layout({ saveUpdateHook, sendEvent, loadImportSource }) {
 }
 
 export function Element({ model }) {
-  if (!model.tagName) {
+  if (model.error !== undefined) {
     if (model.error) {
       return html`<pre>${model.error}</pre>`;
     } else {
@@ -45,11 +49,19 @@ export function Element({ model }) {
 
 function StandardElement({ model }) {
   const layoutContext = React.useContext(LayoutContext);
+
+  let type;
+  if (model.tagName == "") {
+    type = React.Fragment;
+  } else {
+    type = model.tagName;
+  }
+
   // Use createElement here to avoid warning about variable numbers of children not
   // having keys. Warning about this must now be the responsibility of the server
   // providing the models instead of the client rendering them.
   return React.createElement(
-    model.tagName,
+    type,
     createElementAttributes(model, layoutContext.sendEvent),
     ...createElementChildren(
       model,

src/client/package.json

@@ -21,7 +21,7 @@
 
 
 __author__ = "idom-team"
-__version__ = "0.36.0"  # DO NOT MODIFY
+__version__ = "0.36.3"  # DO NOT MODIFY
 
 __all__ = [
     "component",