All tests green.

pyscript · fpliger · Jul 3, 2024 · Jun 4, 2024 · Jun 4, 2024 · Jun 4, 2024
commit 8c0b73a4cf6fdc6317e186d9eceb655ed110a392
diff --git a/pyscript.core/src/stdlib/pyscript/web/elements.py b/pyscript.core/src/stdlib/pyscript/web/elements.py
@@ -19,7 +19,7 @@ def warn(*args, **kwargs):
             print("WARNING: ", *args, **kwargs)
 
 
-from pyscript import display, document
+from pyscript import document
 
 
 #: A flag to show if MicroPython is the current Python interpreter.
@@ -98,7 +98,7 @@ class Element:
     draggable = DOMProperty("draggable")
     enterkeyhint = DOMProperty("enterkeyhint")
     hidden = DOMProperty("hidden")
-    html = DOMProperty("innerHTML")
+    innerHTML = DOMProperty("innerHTML")
     id = DOMProperty("id")
     lang = DOMProperty("lang")
     nonce = DOMProperty("nonce")
@@ -192,28 +192,6 @@ def children(self):
     def classes(self):
         return self._classes
 
-    @property
-    def content(self):
-        # TODO: This breaks with with standard template elements. Define how to best
-        #       handle this specific use case. Just not support for now?
-        if self._dom_element.tagName == "TEMPLATE":
-            warnings.warn(
-                "Content attribute not supported for template elements.", stacklevel=2
-            )
-            return None
-        return self._dom_element.innerHTML
-
-    @content.setter
-    def content(self, value):
-        # TODO: (same comment as above)
-        if self._dom_element.tagName == "TEMPLATE":
-            warnings.warn(
-                "Content attribute not supported for template elements.", stacklevel=2
-            )
-            return
-
-        display(value, target=self.id)
-
     @property
     def parent(self):
         if self._parent:
@@ -489,7 +467,7 @@ def __init__(
                 self.append(child)
 
             else:
-                self.html += child
+                self.innerHTML += child
 
 
 # IMPORTANT: For all HTML components defined below, we are not mapping all possible
@@ -1579,8 +1557,36 @@ def remove(self, key):
 class ElementCollection:
     def __init__(self, elements: [Element]) -> None:
         self._elements = elements
-        self.classes = ClassesCollection(self)
-        self.style = StyleCollection(self)
+        self._classes = ClassesCollection(self)
+        self._style = StyleCollection(self)
+
+    @property
+    def children(self):
+        return self._elements
+
+    @property
+    def classes(self):
+        return self._classes
+
+    @property
+    def style(self):
+        return self._style
+
+    @property
+    def innerHTML(self):
+        return self._get_attribute("innerHTML")
+
+    @innerHTML.setter
+    def innerHTML(self, value):
+        self._set_attribute("innerHTML", value)
+
+    @property
+    def value(self):
+        return self._get_attribute("value")
+
+    @value.setter
+    def value(self, value):
+        self._set_attribute("value", value)
 
     def __eq__(self, obj):
         """Check if the element is the same as the other element by comparing
@@ -1621,26 +1627,6 @@ def _set_attribute(self, attr, value):
         for el in self._elements:
             setattr(el, attr, value)
 
-    @property
-    def children(self):
-        return self._elements
-
-    @property
-    def html(self):
-        return self._get_attribute("html")
-
-    @html.setter
-    def html(self, value):
-        self._set_attribute("html", value)
-
-    @property
-    def value(self):
-        return self._get_attribute("value")
-
-    @value.setter
-    def value(self, value):
-        self._set_attribute("value", value)
-
 
 # fmt: off
 ELEMENT_CLASSES = [

diff --git a/pyscript.core/test/pyscript_dom/tests/test_dom.py b/pyscript.core/test/pyscript_dom/tests/test_dom.py
@@ -20,7 +20,7 @@ def test_getitem_by_id():
     div = result[0]
     # EXPECT the element text value to match what we expect and what
     # the JS document.querySelector API would return
-    assert document.querySelector(selector).innerHTML == div.html == txt
+    assert document.querySelector(selector).innerHTML == div.innerHTML == txt
     # EXPECT the results to be of the right types
     assert isinstance(div, el.Element)
     assert isinstance(result, ElementCollection)
@@ -47,12 +47,12 @@ def test_read_n_write_collection_elements():
     elements = dom.find(".multi-elems")
 
     for element in elements:
-        assert element.html == f"Content {element.id.replace('#', '')}"
+        assert element.innerHTML == f"Content {element.id.replace('#', '')}"
 
     new_content = "New Content"
-    elements.html = new_content
+    elements.innerHTML = new_content
     for element in elements:
-        assert element.html == new_content
+        assert element.innerHTML == new_content
 
 
 class TestElement:
@@ -69,7 +69,7 @@ def test_query(self):
         # EXPECT the new element to be a el.Element
         assert isinstance(div, el.Element)
         # EXPECT the div attributes to be == to how they are configured in the page
-        assert div.html == "Child 1"
+        assert div.innerHTML == "Child 1"
         assert div.id == "test_selector_w_children_child_1"
 
     def test_equality(self):
@@ -85,10 +85,10 @@ def test_equality(self):
         assert div is not div2
 
         # EXPECT their value to always be equal
-        assert div.html == div2.html
-        div.html = "some value"
+        assert div.innerHTML == div2.innerHTML
+        div.innerHTML = "some value"
 
-        assert div.html == div2.html == "some value"
+        assert div.innerHTML == div2.innerHTML == "some value"
 
     def test_append_element(self):
         id_ = "element-append-tests"
@@ -158,11 +158,11 @@ def test_html_attribute(self):
         div = dom.find("#element_attribute_tests")[0]
 
         # WHEN we set the html attribute
-        div.html = "<b>New Content</b>"
+        div.innerHTML = "<b>New Content</b>"
 
         # EXPECT the element html and underlying JS Element innerHTML property
         # to match what we expect and what
-        assert div.html == div._dom_element.innerHTML == "<b>New Content</b>"
+        assert div.innerHTML == div._dom_element.innerHTML == "<b>New Content</b>"
         assert div.text == div._dom_element.textContent == "New Content"
 
     def test_text_attribute(self):
@@ -175,7 +175,7 @@ def test_text_attribute(self):
         # EXPECT the element html and underlying JS Element innerHTML property
         # to match what we expect and what
         assert (
-            div.html == div._dom_element.innerHTML == "&lt;b&gt;New Content&lt;/b&gt;"
+            div.innerHTML == div._dom_element.innerHTML == "&lt;b&gt;New Content&lt;/b&gt;"
         )
         assert div.text == div._dom_element.textContent == "<b>New Content</b>"
 
@@ -251,7 +251,7 @@ def test_create_element_child(self):
 
         # Creating an element from another element automatically creates that element
         # as a child of the original element
-        new_el = el.p("a div", classes=["code-description"], html="Ciao PyScripters!")
+        new_el = el.p("a div", classes=["
F438
;code-description"], innerHTML="Ciao PyScripters!")
         parent_div.append(new_el)
 
         assert isinstance(new_el, el.Element)
@@ -320,7 +320,7 @@ def test_select_options_iter(self):
 
         for i, option in enumerate(select.options, 1):
             assert option.value == f"{i}"
-            assert option.html == f"Option {i}"
+            assert option.innerHTML == f"Option {i}"
 
     def test_select_options_len(self):
         select = dom.find(f"#test_select_element_w_options")[0]
@@ -348,7 +348,7 @@ def test_select_element_add(self):
         # we passed in
         assert len(select.options) == 1
         assert select.options[0].value == "1"
-        assert select.options[0].html == "Option 1"
+        assert select.options[0].innerHTML == "Option 1"
 
         # WHEN we add another option (blank this time)
         select.options.add("")
@@ -358,7 +358,7 @@ def test_select_element_add(self):
 
         # EXPECT the last option to have an empty value and html
         assert select.options[1].value == ""
-        assert select.options[1].html == ""
+        assert select.options[1].innerHTML == ""
 
         # WHEN we add another option (this time adding it in between the other 2
         # options by using an integer index)
@@ -369,11 +369,11 @@ def test_select_element_add(self):
 
         # EXPECT the middle option to have the value and html we passed in
         assert select.options[0].value == "1"
-        assert select.options[0].html == "Option 1"
+        assert select.options[0].innerHTML == "Option 1"
         assert select.options[1].value == "2"
-        assert select.options[1].html == "Option 2"
+        assert select.options[1].innerHTML == "Option 2"
         assert select.options[2].value == ""
-        assert select.options[2].html == ""
+        assert select.options[2].innerHTML == ""
 
         # WHEN we add another option (this time adding it in between the other 2
         # options but using the option itself)
@@ -386,23 +386,23 @@ def test_select_element_add(self):
 
         # EXPECT the middle option to have the value and html we passed in
         assert select.options[0].value == "1"
-        assert select.options[0].html == "Option 1"
+        assert select.options[0].innerHTML == "Option 1"
         assert (
             select.options[0].selected
             == select.options[0]._dom_element.selected
             == False
         )
         assert select.options[1].value == "2"
-        assert select.options[1].html == "Option 2"
+        assert select.options[1].innerHTML == "Option 2"
         assert select.options[2].value == "3"
-        assert select.options[2].html == "Option 3"
+        assert select.options[2].innerHTML == "Option 3"
         assert (
             select.options[2].selected
             == select.options[2]._dom_element.selected
             == True
         )
         assert select.options[3].value == ""
-        assert select.options[3].html == ""
+        assert select.options[3].innerHTML == ""
 
         # WHEN we add another option (this time adding it in between the other 2
         # options but using the JS element of the option itself)
@@ -415,15 +415,15 @@ def test_select_element_add(self):
 
         # EXPECT the middle option to have the value and html we passed in
         assert select.options[0].value == "1"
-        assert select.options[0].html == "Option 1"
+        assert select.options[0].innerHTML == "Option 1"
         assert select.options[1].value == "2"
-        assert select.options[1].html == "Option 2"
+        assert select.options[1].innerHTML == "Option 2"
         assert select.options[2].value == "2a"
-        assert select.options[2].html == "Option 2a"
+        assert select.options[2].innerHTML == "Option 2a"
         assert select.options[3].value == "3"
-        assert select.options[3].html == "Option 3"
+        assert select.options[3].innerHTML == "Option 3"
         assert select.options[4].value == ""
-        assert select.options[4].html == ""
+        assert select.options[4].innerHTML == ""
 
     def test_select_options_remove(self):
         # GIVEN the existing select element with 3 options
@@ -456,5 +456,5 @@ def test_select_get_selected_option(self):
 
         # EXPECT the selected option to be correct
         assert selected_option.value == "2"
-        assert selected_option.html == "Option 2"
+        assert selected_option.innerHTML == "Option 2"
         assert selected_option.selected == selected_option._dom_element.selected == True
diff --git a/pyscript.core/types/exceptions.d.ts b/pyscript.core/types/exceptions.d.ts
@@ -53,19 +53,4 @@ export class InstallError extends UserError {
 /**
  * Keys of the ErrorCode object
  */
-export type ErrorCodes = keyof {
-    GENERIC: string;
-    CONFLICTING_CODE: string;
-    BAD_CONFIG: string;
-    MICROPIP_INSTALL_ERROR: string;
-    BAD_PLUGIN_FILE_EXTENSION: string;
-    NO_DEFAULT_EXPORT: string;
-    TOP_LEVEL_AWAIT: string;
-    FETCH_ERROR: string;
-    FETCH_NAME_ERROR: string;
-    FETCH_UNAUTHORIZED_ERROR: string;
-    FETCH_FORBIDDEN_ERROR: string;
-    FETCH_NOT_FOUND_ERROR: string;
-    FETCH_SERVER_ERROR: string;
-    FETCH_UNAVAILABLE_ERROR: string;
-};
+export type ErrorCodes = "GENERIC" | "CONFLICTING_CODE" | "BAD_CONFIG" | "MICROPIP_INSTALL_ERROR" | "BAD_PLUGIN_FILE_EXTENSION" | "NO_DEFAULT_EXPORT" | "TOP_LEVEL_AWAIT" | "FETCH_ERROR" | "FETCH_NAME_ERROR" | "FETCH_UNAUTHORIZED_ERROR" | "FETCH_FORBIDDEN_ERROR" | "FETCH_NOT_FOUND_ERROR" | "FETCH_SERVER_ERROR" | "FETCH_UNAVAILABLE_ERROR";