@pyscript/core 0.3.2 → 0.3.4

package/src/config.js

@@ -89,7 +89,7 @@ for (const [TYPE] of TYPES) {
             } else if (toml || type === "toml") {
                 try {
                     const { parse } = await import(
-                        /* webpackIgnore: true */ "./toml.js"
+                        /* webpackIgnore: true */ "./3rd-party/toml.js"
                     );
                     parsed = parse(text);
                 } catch (e) {

package/src/plugins/py-terminal.js

@@ -1,47 +1,48 @@
 // PyScript py-terminal plugin
 import { TYPES, hooks } from "../core.js";
+import { notify } from "./error.js";
 
-const CDN = "https://cdn.jsdelivr.net/npm/xterm";
-const XTERM = "5.3.0";
-const XTERM_READLINE = "1.1.1";
 const SELECTOR = [...TYPES.keys()]
     .map((type) => `script[type="${type}"][terminal],${type}-script[terminal]`)
     .join(",");
 
+// show the error on main and
+// stops the module from keep executing
+const notifyAndThrow = (message) => {
+    notify(message);
+    throw new Error(message);
+};
+
 const pyTerminal = async () => {
     const terminals = document.querySelectorAll(SELECTOR);
 
     // no results will look further for runtime nodes
     if (!terminals.length) return;
 
-    // we currently support only one terminal as in "classic"
-    if (terminals.length > 1)
-        console.warn("Unable to satisfy multiple terminals");
-
     // if we arrived this far, let's drop the MutationObserver
+    // as we only support one terminal per page (right now).
     mo.disconnect();
 
+    // we currently support only one terminal as in "classic"
+    if (terminals.length > 1) notifyAndThrow("You can use at most 1 terminal.");
+
     const [element] = terminals;
     // hopefully to be removed in the near future!
     if (element.matches('script[type="mpy"],mpy-script'))
-        throw new Error("Unsupported terminal");
-
-    // import styles once and lazily (only on valid terminal)
-    if (!document.querySelector(`link[href^="${CDN}"]`)) {
-        document.head.append(
-            Object.assign(document.createElement("link"), {
-                rel: "stylesheet",
-                href: `${CDN}@${XTERM}/css/xterm.min.css`,
-            }),
-        );
-    }
+        notifyAndThrow("Unsupported terminal.");
+
+    // import styles lazily
+    document.head.append(
+        Object.assign(document.createElement("link"), {
+            rel: "stylesheet",
+            href: new URL("./xterm.css", import.meta.url),
+        }),
+    );
 
     // lazy load these only when a valid terminal is found
     const [{ Terminal }, { Readline }] = await Promise.all([
-        import(/* webpackIgnore: true */ `${CDN}@${XTERM}/+esm`),
-        import(
-            /* webpackIgnore: true */ `${CDN}-readline@${XTERM_READLINE}/+esm`
-        ),
+        import(/* webpackIgnore: true */ "../3rd-party/xterm.js"),
+        import(/* webpackIgnore: true */ "../3rd-party/xterm-readline.js"),
     ]);
 
     const readline = new Readline();
@@ -80,32 +81,23 @@ const pyTerminal = async () => {
         const workerReady = ({ interpreter }, { sync }) => {
             sync.pyterminal_drop_hooks();
             const decoder = new TextDecoder();
+            let data = "";
             const generic = {
                 isatty: true,
                 write(buffer) {
-                    sync.pyterminal_write(decoder.decode(buffer));
+                    data = decoder.decode(buffer);
+                    sync.pyterminal_write(data);
                     return buffer.length;
                 },
             };
             interpreter.setStdout(generic);
             interpreter.setStderr(generic);
+            interpreter.setStdin({
+                isatty: true,
+                stdin: () => sync.pyterminal_read(data),
+            });
         };
 
-        // run in python code able to replace builtins.input
-        // using the xworker.sync non blocking prompt
-        const codeBefore = `
-            import builtins
-            from pyscript import sync as _sync
-
-            builtins.input = lambda prompt: _sync.pyterminal_read(prompt)
-        `;
-
-        // at the end of the code, make the terminal interactive
-        const codeAfter = `
-            import code as _code
-            _code.interact()
-        `;
-
         // add a hook on the main thread to setup all sync helpers
         // also bootstrapping the XTerm target on main
         hooks.main.onWorker.add(function worker(_, xworker) {
@@ -120,16 +112,12 @@ const pyTerminal = async () => {
             // allow a worker to drop main thread hooks ASAP
             xworker.sync.pyterminal_drop_hooks = () => {
                 hooks.worker.onReady.delete(workerReady);
-                hooks.worker.codeBeforeRun.delete(codeBefore);
-                hooks.worker.codeAfterRun.delete(codeAfter);
             };
         });
 
         // setup remote thread JS/Python code for whenever the
         // worker is ready to become a terminal
         hooks.worker.onReady.add(workerReady);
-        hooks.worker.codeBeforeRun.add(codeBefore);
-        hooks.worker.codeAfterRun.add(codeAfter);
     } else {
         // in the main case, just bootstrap XTerm without
         // allowing any input as that's not possible / awkward

package/src/stdlib/pyscript.js

@@ -8,6 +8,6 @@ export default {
     "util.py": "class NotSupported:\n    \"\"\"\n    Small helper that raises exceptions if you try to get/set any attribute on\n    it.\n    \"\"\"\n\n    def __init__(self, name, error):\n        object.__setattr__(self, \"name\", name)\n        object.__setattr__(self, \"error\", error)\n\n    def __repr__(self):\n        return f\"<NotSupported {self.name} [{self.error}]>\"\n\n    def __getattr__(self, attr):\n        raise AttributeError(self.error)\n\n    def __setattr__(self, attr, value):\n        raise AttributeError(self.error)\n\n    def __call__(self, *args):\n        raise TypeError(self.error)\n"
   },
   "pyweb": {
-    "pydom.py": "import sys\nimport warnings\nfrom functools import cached_property\nfrom typing import Any\n\nfrom pyodide.ffi import JsProxy\nfrom pyscript import display, document, window\n\n# from pyscript import when as _when\n\nalert = window.alert\n\n\nclass BaseElement:\n    def __init__(self, js_element):\n        self._js = js_element\n        self._parent = None\n        self.style = StyleProxy(self)\n\n    def __eq__(self, obj):\n        \"\"\"Check if the element is the same as the other element by comparing\n        the underlying JS element\"\"\"\n        return isinstance(obj, BaseElement) and obj._js == self._js\n\n    @property\n    def parent(self):\n        if self._parent:\n            return self._parent\n\n        if self._js.parentElement:\n            self._parent = self.__class__(self._js.parentElement)\n\n        return self._parent\n\n    @property\n    def __class(self):\n        return self.__class__ if self.__class__ != PyDom else Element\n\n    def create(self, type_, is_child=True, classes=None, html=None, label=None):\n        js_el = document.createElement(type_)\n        element = self.__class(js_el)\n\n        if classes:\n            for class_ in classes:\n                element.add_class(class_)\n\n        if html is not None:\n            element.html = html\n\n        if label is not None:\n            element.label = label\n\n        if is_child:\n            self.append(element)\n\n        return element\n\n    def find(self, selector):\n        \"\"\"Return an ElementCollection representing all the child elements that\n        match the specified selector.\n\n        Args:\n            selector (str): A string containing a selector expression\n\n        Returns:\n            ElementCollection: A collection of elements matching the selector\n        \"\"\"\n        elements = self._js.querySelectorAll(selector)\n        if not elements:\n            return None\n        return ElementCollection([Element(el) for el in elements])\n\n\nclass Element(BaseElement):\n    @property\n    def children(self):\n        return [self.__class__(el) for el in self._js.children]\n\n    def append(self, child):\n        # TODO: this is Pyodide specific for now!!!!!!\n        # if we get passed a JSProxy Element directly we just map it to the\n        # higher level Python element\n        if isinstance(child, JsProxy):\n            return self.append(Element(child))\n\n        elif isinstance(child, Element):\n            self._js.appendChild(child._js)\n\n            return child\n\n        elif isinstance(child, ElementCollection):\n            for el in child:\n                self.append(el)\n\n    # -------- Pythonic Interface to Element -------- #\n    @property\n    def html(self):\n        return self._js.innerHTML\n\n    @html.setter\n    def html(self, value):\n        self._js.innerHTML = value\n\n    @property\n    def content(self):\n        # TODO: This breaks with with standard template elements. Define how to best\n        #       handle this specifica use case. Just not support for now?\n        if self._js.tagName == \"TEMPLATE\":\n            warnings.warn(\n                \"Content attribute not supported for template elements.\", stacklevel=2\n            )\n            return None\n        return self._js.innerHTML\n\n    @content.setter\n    def content(self, value):\n        # TODO: (same comment as above)\n        if self._js.tagName == \"TEMPLATE\":\n            warnings.warn(\n                \"Content attribute not supported for template elements.\", stacklevel=2\n            )\n            return\n\n        display(value, target=self.id)\n\n    @property\n    def id(self):\n        return self._js.id\n\n    @id.setter\n    def id(self, value):\n        self._js.id = value\n\n    def clone(self, new_id=None):\n        clone = Element(self._js.cloneNode(True))\n        clone.id = new_id\n\n        return clone\n\n    def remove_class(self, classname):\n        classList = self._js.classList\n        if isinstance(classname, list):\n            classList.remove(*classname)\n        else:\n            classList.remove(classname)\n        return self\n\n    def add_class(self, classname):\n        classList = self._js.classList\n        if isinstance(classname, list):\n            classList.add(*classname)\n        else:\n            self._js.classList.add(classname)\n        return self\n\n    @property\n    def classes(self):\n        classes = self._js.classList.values()\n        return [x for x in classes]\n\n    def show_me(self):\n        self._js.scrollIntoView()\n\n    def when(self, event, handler):\n        document.when(event, selector=self)(handler)\n\n\nclass StyleProxy(dict):\n    def __init__(self, element: Element) -> None:\n        self._element = element\n\n    @cached_property\n    def _style(self):\n        return self._element._js.style\n\n    def __getitem__(self, key):\n        return self._style.getPropertyValue(key)\n\n    def __setitem__(self, key, value):\n        self._style.setProperty(key, value)\n\n    def remove(self, key):\n        self._style.removeProperty(key)\n\n    def set(self, **kws):\n        for k, v in kws.items():\n            self._element._js.style.setProperty(k, v)\n\n    # CSS Properties\n    # Reference: https://github.com/microsoft/TypeScript/blob/main/src/lib/dom.generated.d.ts#L3799C1-L5005C2\n    # Following prperties automatically generated from the above reference using\n    # tools/codegen_css_proxy.py\n    @property\n    def visible(self):\n        return self._element._js.style.visibility\n\n    @visible.setter\n    def visible(self, value):\n        self._element._js.style.visibility = value\n\n\nclass StyleCollection:\n    def __init__(self, collection: \"ElementCollection\") -> None:\n        self._collection = collection\n\n    def __get__(self, obj, objtype=None):\n        return obj._get_attribute(\"style\")\n\n    def __getitem__(self, key):\n        return self._collection._get_attribute(\"style\")[key]\n\n    def __setitem__(self, key, value):\n        for element in self._collection._elements:\n            element.style[key] = value\n\n    def remove(self, key):\n        for element in self._collection._elements:\n            element.style.remove(key)\n\n\nclass ElementCollection:\n    def __init__(self, elements: [Element]) -> None:\n        self._elements = elements\n        self.style = StyleCollection(self)\n\n    def __getitem__(self, key):\n        # If it's an integer we use it to access the elements in the collection\n        if isinstance(key, int):\n            return self._elements[key]\n        # If it's a slice we use it to support slice operations over the elements\n        # in the collection\n        elif isinstance(key, slice):\n            return ElementCollection(self._elements[key])\n\n        # If it's anything else (basically a string) we use it as a selector\n        # TODO: Write tests!\n        elements = self._element.querySelectorAll(key)\n        return ElementCollection([Element(el) for el in elements])\n\n    def __len__(self):\n        return len(self._elements)\n\n    def __eq__(self, obj):\n        \"\"\"Check if the element is the same as the other element by comparing\n        the underlying JS element\"\"\"\n        return isinstance(obj, ElementCollection) and obj._elements == self._elements\n\n    def _get_attribute(self, attr, index=None):\n        if index is None:\n            return [getattr(el, attr) for el in self._elements]\n\n        # As JQuery, when getting an attr, only return it for the first element\n        return getattr(self._elements[index], attr)\n\n    def _set_attribute(self, attr, value):\n        for el in self._elements:\n            setattr(el, attr, value)\n\n    @property\n    def html(self):\n        return self._get_attribute(\"html\")\n\n    @html.setter\n    def html(self, value):\n        self._set_attribute(\"html\", value)\n\n    @property\n    def children(self):\n        return self._elements\n\n    def __iter__(self):\n        yield from self._elements\n\n    def __repr__(self):\n        return f\"{self.__class__.__name__} (length: {len(self._elements)}) {self._elements}\"\n\n\nclass DomScope:\n    def __getattr__(self, __name: str) -> Any:\n        element = document[f\"#{__name}\"]\n        if element:\n            return element[0]\n\n\nclass PyDom(BaseElement):\n    # Add objects we want to expose to the DOM namespace since this class instance is being\n    # remapped as \"the module\" itself\n    BaseElement = BaseElement\n    Element = Element\n    ElementCollection = ElementCollection\n\n    def __init__(self):\n        super().__init__(document)\n        self.ids = DomScope()\n        self.body = Element(document.body)\n        self.head = Element(document.head)\n\n    def create(self, type_, parent=None, classes=None, html=None):\n        return super().create(type_, is_child=False)\n\n    def __getitem__(self, key):\n        if isinstance(key, int):\n            indices = range(*key.indices(len(self.list)))\n            return [self.list[i] for i in indices]\n\n        elements = self._js.querySelectorAll(key)\n        if not elements:\n            return None\n        return ElementCollection([Element(el) for el in elements])\n\n\ndom = PyDom()\n\nsys.modules[__name__] = dom\n"
+    "pydom.py": "import sys\nimport warnings\nfrom functools import cached_property\nfrom typing import Any\n\nfrom pyodide.ffi import JsProxy\nfrom pyscript import display, document, window\n\n# from pyscript import when as _when\n\nalert = window.alert\n\n\nclass BaseElement:\n    def __init__(self, js_element):\n        self._js = js_element\n        self._parent = None\n        self.style = StyleProxy(self)\n\n    def __eq__(self, obj):\n        \"\"\"Check if the element is the same as the other element by comparing\n        the underlying JS element\"\"\"\n        return isinstance(obj, BaseElement) and obj._js == self._js\n\n    @property\n    def parent(self):\n        if self._parent:\n            return self._parent\n\n        if self._js.parentElement:\n            self._parent = self.__class__(self._js.parentElement)\n\n        return self._parent\n\n    @property\n    def __class(self):\n        return self.__class__ if self.__class__ != PyDom else Element\n\n    def create(self, type_, is_child=True, classes=None, html=None, label=None):\n        js_el = document.createElement(type_)\n        element = self.__class(js_el)\n\n        if classes:\n            for class_ in classes:\n                element.add_class(class_)\n\n        if html is not None:\n            element.html = html\n\n        if label is not None:\n            element.label = label\n\n        if is_child:\n            self.append(element)\n\n        return element\n\n    def find(self, selector):\n        \"\"\"Return an ElementCollection representing all the child elements that\n        match the specified selector.\n\n        Args:\n            selector (str): A string containing a selector expression\n\n        Returns:\n            ElementCollection: A collection of elements matching the selector\n        \"\"\"\n        elements = self._js.querySelectorAll(selector)\n        if not elements:\n            return None\n        return ElementCollection([Element(el) for el in elements])\n\n\nclass Element(BaseElement):\n    @property\n    def children(self):\n        return [self.__class__(el) for el in self._js.children]\n\n    def append(self, child):\n        # TODO: this is Pyodide specific for now!!!!!!\n        # if we get passed a JSProxy Element directly we just map it to the\n        # higher level Python element\n        if isinstance(child, JsProxy):\n            return self.append(Element(child))\n\n        elif isinstance(child, Element):\n            self._js.appendChild(child._js)\n\n            return child\n\n        elif isinstance(child, ElementCollection):\n            for el in child:\n                self.append(el)\n\n    # -------- Pythonic Interface to Element -------- #\n    @property\n    def html(self):\n        return self._js.innerHTML\n\n    @html.setter\n    def html(self, value):\n        self._js.innerHTML = value\n\n    @property\n    def content(self):\n        # TODO: This breaks with with standard template elements. Define how to best\n        #       handle this specifica use case. Just not support for now?\n        if self._js.tagName == \"TEMPLATE\":\n            warnings.warn(\n                \"Content attribute not supported for template elements.\", stacklevel=2\n            )\n            return None\n        return self._js.innerHTML\n\n    @content.setter\n    def content(self, value):\n        # TODO: (same comment as above)\n        if self._js.tagName == \"TEMPLATE\":\n            warnings.warn(\n                \"Content attribute not supported for template elements.\", stacklevel=2\n            )\n            return\n\n        display(value, target=self.id)\n\n    @property\n    def id(self):\n        return self._js.id\n\n    @id.setter\n    def id(self, value):\n        self._js.id = value\n\n    @property\n    def value(self):\n        return self._js.value\n\n    @value.setter\n    def value(self, value):\n        # in order to avoid confusion to the user, we don't allow setting the\n        # value of elements that don't have a value attribute\n        if not hasattr(self._js, \"value\"):\n            raise AttributeError(\n                f\"Element {self._js.tagName} has no value attribute. If you want to \"\n                \"force a value attribute, set it directly using the `_js.value = <value>` \"\n                \"javascript API attribute instead.\"\n            )\n        self._js.value = value\n\n    def clone(self, new_id=None):\n        clone = Element(self._js.cloneNode(True))\n        clone.id = new_id\n\n        return clone\n\n    def remove_class(self, classname):\n        classList = self._js.classList\n        if isinstance(classname, list):\n            classList.remove(*classname)\n        else:\n            classList.remove(classname)\n        return self\n\n    def add_class(self, classname):\n        classList = self._js.classList\n        if isinstance(classname, list):\n            classList.add(*classname)\n        else:\n            self._js.classList.add(classname)\n        return self\n\n    @property\n    def classes(self):\n        classes = self._js.classList.values()\n        return [x for x in classes]\n\n    def show_me(self):\n        self._js.scrollIntoView()\n\n    def when(self, event, handler):\n        document.when(event, selector=self)(handler)\n\n\nclass StyleProxy(dict):\n    def __init__(self, element: Element) -> None:\n        self._element = element\n\n    @cached_property\n    def _style(self):\n        return self._element._js.style\n\n    def __getitem__(self, key):\n        return self._style.getPropertyValue(key)\n\n    def __setitem__(self, key, value):\n        self._style.setProperty(key, value)\n\n    def remove(self, key):\n        self._style.removeProperty(key)\n\n    def set(self, **kws):\n        for k, v in kws.items():\n            self._element._js.style.setProperty(k, v)\n\n    # CSS Properties\n    # Reference: https://github.com/microsoft/TypeScript/blob/main/src/lib/dom.generated.d.ts#L3799C1-L5005C2\n    # Following prperties automatically generated from the above reference using\n    # tools/codegen_css_proxy.py\n    @property\n    def visible(self):\n        return self._element._js.style.visibility\n\n    @visible.setter\n    def visible(self, value):\n        self._element._js.style.visibility = value\n\n\nclass StyleCollection:\n    def __init__(self, collection: \"ElementCollection\") -> None:\n        self._collection = collection\n\n    def __get__(self, obj, objtype=None):\n        return obj._get_attribute(\"style\")\n\n    def __getitem__(self, key):\n        return self._collection._get_attribute(\"style\")[key]\n\n    def __setitem__(self, key, value):\n        for element in self._collection._elements:\n            element.style[key] = value\n\n    def remove(self, key):\n        for element in self._collection._elements:\n            element.style.remove(key)\n\n\nclass ElementCollection:\n    def __init__(self, elements: [Element]) -> None:\n        self._elements = elements\n        self.style = StyleCollection(self)\n\n    def __getitem__(self, key):\n        # If it's an integer we use it to access the elements in the collection\n        if isinstance(key, int):\n            return self._elements[key]\n        # If it's a slice we use it to support slice operations over the elements\n        # in the collection\n        elif isinstance(key, slice):\n            return ElementCollection(self._elements[key])\n\n        # If it's anything else (basically a string) we use it as a selector\n        # TODO: Write tests!\n        elements = self._element.querySelectorAll(key)\n        return ElementCollection([Element(el) for el in elements])\n\n    def __len__(self):\n        return len(self._elements)\n\n    def __eq__(self, obj):\n        \"\"\"Check if the element is the same as the other element by comparing\n        the underlying JS element\"\"\"\n        return isinstance(obj, ElementCollection) and obj._elements == self._elements\n\n    def _get_attribute(self, attr, index=None):\n        if index is None:\n            return [getattr(el, attr) for el in self._elements]\n\n        # As JQuery, when getting an attr, only return it for the first element\n        return getattr(self._elements[index], attr)\n\n    def _set_attribute(self, attr, value):\n        for el in self._elements:\n            setattr(el, attr, value)\n\n    @property\n    def html(self):\n        return self._get_attribute(\"html\")\n\n    @html.setter\n    def html(self, value):\n        self._set_attribute(\"html\", value)\n\n    @property\n    def value(self):\n        return self._get_attribute(\"value\")\n\n    @value.setter\n    def value(self, value):\n        self._set_attribute(\"value\", value)\n\n    @property\n    def children(self):\n        return self._elements\n\n    def __iter__(self):\n        yield from self._elements\n\n    def __repr__(self):\n        return f\"{self.__class__.__name__} (length: {len(self._elements)}) {self._elements}\"\n\n\nclass DomScope:\n    def __getattr__(self, __name: str) -> Any:\n        element = document[f\"#{__name}\"]\n        if element:\n            return element[0]\n\n\nclass PyDom(BaseElement):\n    # Add objects we want to expose to the DOM namespace since this class instance is being\n    # remapped as \"the module\" itself\n    BaseElement = BaseElement\n    Element = Element\n    ElementCollection = ElementCollection\n\n    def __init__(self):\n        super().__init__(document)\n        self.ids = DomScope()\n        self.body = Element(document.body)\n        self.head = Element(document.head)\n\n    def create(self, type_, parent=None, classes=None, html=None):\n        return super().create(type_, is_child=False)\n\n    def __getitem__(self, key):\n        if isinstance(key, int):\n            indices = range(*key.indices(len(self.list)))\n            return [self.list[i] for i in indices]\n\n        elements = self._js.querySelectorAll(key)\n        if not elements:\n            return None\n        return ElementCollection([Element(el) for el in elements])\n\n\ndom = PyDom()\n\nsys.modules[__name__] = dom\n"
   }
 };

package/src/stdlib/pyweb/pydom.py

@@ -131,6 +131,22 @@ class Element(BaseElement):
     def id(self, value):
         self._js.id = value
 
+    @property
+    def value(self):
+        return self._js.value
+
+    @value.setter
+    def value(self, value):
+        # in order to avoid confusion to the user, we don't allow setting the
+        # value of elements that don't have a value attribute
+        if not hasattr(self._js, "value"):
+            raise AttributeError(
+                f"Element {self._js.tagName} has no value attribute. If you want to "
+                "force a value attribute, set it directly using the `_js.value = <value>` "
+                "javascript API attribute instead."
+            )
+        self._js.value = value
+
     def clone(self, new_id=None):
         clone = Element(self._js.cloneNode(True))
         clone.id = new_id
@@ -264,6 +280,14 @@ class ElementCollection:
     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)
+
     @property
     def children(self):
         return self._elements

package/types/3rd-party/toml.d.ts

@@ -0,0 +1,12 @@
+/*! (c) Jak Wings - MIT */ declare class e extends SyntaxError {
+    constructor(r: any, { offset: t, line: e, column: n }: {
+        offset: any;
+        line: any;
+        column: any;
+    });
+    offset: any;
+    line: any;
+    column: any;
+}
+declare function n(n: any): any;
+export { e as SyntaxError, n as parse };

package/types/3rd-party/xterm-readline.d.ts

@@ -0,0 +1,138 @@
+declare var b: any;
+declare var I: boolean;
+declare namespace r {
+    export let __esModule: boolean;
+    export { Readline };
+}
+declare class Readline {
+    highlighter: {
+        highlight(t: any, e: any): any;
+        highlightPrompt(t: any): any;
+        highlightChar(t: any, e: any): boolean;
+    };
+    history: {
+        entries: any[];
+        cursor: number;
+        maxEntries: any;
+        saveToLocalStorage(): void;
+        restoreFromLocalStorage(): void;
+        append(t: any): void;
+        resetCursor(): void;
+        next(): any;
+        prev(): any;
+    };
+    disposables: any[];
+    watermark: number;
+    highWatermark: number;
+    lowWatermark: number;
+    highWater: boolean;
+    state: {
+        line: {
+            buf: string;
+            pos: number;
+            buffer(): string;
+            pos_buffer(): string;
+            length(): number;
+            char_length(): number;
+            update(t: any, e: any): void;
+            insert(t: any): boolean;
+            moveBack(t: any): boolean;
+            moveForward(t: any): boolean;
+            moveHome(): boolean;
+            moveEnd(): boolean;
+            startOfLine(): number;
+            endOfLine(): number;
+            moveLineUp(t: any): boolean;
+            moveLineDown(t: any): boolean;
+            set_pos(t: any): void;
+            prevPos(t: any): number;
+            nextPos(t: any): number;
+            backspace(t: any): boolean;
+            delete(t: any): boolean;
+            deleteEndOfLine(): boolean;
+        };
+        highlighting: boolean;
+        prompt: any;
+        tty: any;
+        highlighter: any;
+        history: any;
+        promptSize: any;
+        layout: p;
+        buffer(): string;
+        shouldHighlight(): boolean;
+        clearScreen(): void;
+        editInsert(t: any): void;
+        update(t: any): void;
+        editBackspace(t: any): void;
+        editDelete(t: any): void;
+        editDeleteEndOfLine(): void;
+        refresh(): void;
+        moveCursorBack(t: any): void;
+        moveCursorForward(t: any): void;
+        moveCursorUp(t: any): void;
+        moveCursorDown(t: any): void;
+        moveCursorHome(): void;
+        moveCursorEnd(): void;
+        moveCursorToEnd(): void;
+        previousHistory(): void;
+        nextHistory(): void;
+        moveCursor(): void;
+    };
+    checkHandler: () => boolean;
+    ctrlCHandler: () => void;
+    pauseHandler: (t: any) => void;
+    activate(t: any): void;
+    term: any;
+    dispose(): void;
+    appendHistory(t: any): void;
+    setHighlighter(t: any): void;
+    setCheckHandler(t: any): void;
+    setCtrlCHandler(t: any): void;
+    setPauseHandler(t: any): void;
+    writeReady(): boolean;
+    write(t: any): void;
+    print(t: any): void;
+    println(t: any): void;
+    output(): this;
+    tty(): {
+        tabWidth: any;
+        col: any;
+        row: any;
+        out: any;
+        write(t: any): any;
+        print(t: any): any;
+        println(t: any): any;
+        clearScreen(): void;
+        calculatePosition(t: any, e: any): any;
+        computeLayout(t: any, e: any): {
+            promptSize: any;
+            cursor: any;
+            end: any;
+        };
+        refreshLine(t: any, e: any, s: any, i: any, r: any): void;
+        clearOldRows(t: any): void;
+        moveCursor(t: any, e: any): void;
+    };
+    read(t: any): Promise<any>;
+    activeRead: {
+        prompt: any;
+        resolve: (value: any) => void;
+        reject: (reason?: any) => void;
+    };
+    handleKeyEvent(t: any): boolean;
+    readData(t: any): void;
+    readPaste(t: any): void;
+    readKey(t: any): void;
+}
+declare class p {
+    constructor(t: any);
+    promptSize: any;
+    cursor: c;
+    end: c;
+}
+declare class c {
+    constructor(t: any, e: any);
+    row: any;
+    col: any;
+}
+export { b as Readline, I as __esModule, r as default };

package/types/3rd-party/xterm.d.ts

@@ -0,0 +1,4 @@
+declare var i: any;
+declare var s: any;
+declare var t: {};
+export { i as Terminal, s as __esModule, t as default };

package/types/core.d.ts

@@ -1,6 +1,42 @@
 import TYPES from "./types.js";
-declare const exportedPyWorker: any;
-declare const exportedHooks: any;
-declare const exportedConfig: any;
-declare const exportedWhenDefined: any;
+/**
+ * A `Worker` facade able to bootstrap on the worker thread only a PyScript module.
+ * @param {string} file the python file to run ina worker.
+ * @param {{config?: string | object, async?: boolean}} [options] optional configuration for the worker.
+ * @returns {Worker & {sync: ProxyHandler<object>}}
+ */
+declare function exportedPyWorker(file: string, options?: {
+    config?: string | object;
+    async?: boolean;
+}): Worker & {
+    sync: ProxyHandler<object>;
+};
+declare const exportedHooks: {
+    main: {
+        onWorker: Set<Function>;
+        onReady: Set<Function>;
+        onBeforeRun: Set<Function>;
+        onBeforeRunAsync: Set<Function>;
+        onAfterRun: Set<Function>;
+        onAfterRunAsync: Set<Function>;
+        codeBeforeRun: Set<string>;
+        codeBeforeRunAsync: Set<string>;
+        codeAfterRun: Set<string>;
+        codeAfterRunAsync: Set<string>;
+    };
+    worker: {
+        onReady: Set<Function>;
+        onBeforeRun: Set<Function>;
+        onBeforeRunAsync: Set<Function>;
+        onAfterRun: Set<Function>;
+        onAfterRunAsync: Set<Function>;
+        codeBeforeRun: Set<string>;
+        codeBeforeRunAsync: Set<string>;
+        codeAfterRun: Set<string>;
+        codeAfterRunAsync: Set<string>;
+    };
+};
+declare const exportedConfig: {};
+declare const exportedWhenDefined: (type: string) => Promise<any>;
+import sync from "./sync.js";
 export { TYPES, exportedPyWorker as PyWorker, exportedHooks as hooks, exportedConfig as config, exportedWhenDefined as whenDefined };

package/types/fetch.d.ts

@@ -9,3 +9,4 @@
  */
 export function robustFetch(url: string, options?: Request): Promise<Response>;
 export { getText };
+import { getText } from "polyscript/exports";

package/dist/py-terminal-_uJ8pDjX.js

@@ -1,2 +0,0 @@
-import{TYPES as e,hooks as t}from"./core.js";const r="https://cdn.jsdelivr.net/npm/xterm",n="5.3.0",o=[...e.keys()].map((e=>`script[type="${e}"][terminal],${e}-script[terminal]`)).join(","),i=async()=>{const e=document.querySelectorAll(o);if(!e.length)return;e.length>1&&console.warn("Unable to satisfy multiple terminals"),s.disconnect();const[i]=e;if(i.matches('script[type="mpy"],mpy-script'))throw new Error("Unsupported terminal");document.querySelector(`link[href^="${r}"]`)||document.head.append(Object.assign(document.createElement("link"),{rel:"stylesheet",href:`${r}@${n}/css/xterm.min.css`}));const[{Terminal:d},{Readline:a}]=await Promise.all([import(`${r}@${n}/+esm`),import(`${r}-readline@1.1.1/+esm`)]),c=new a,l=e=>{let t=i;const r=i.getAttribute("target");if(r){if(t=document.getElementById(r)||document.querySelector(r),!t)throw new Error(`Unknown target ${r}`)}else t=document.createElement("py-terminal"),t.style.display="block",i.after(t);const n=new d({theme:{background:"#191A19",foreground:"#F5F2E7"},...e});n.loadAddon(c),n.open(t),n.focus()};if(i.hasAttribute("worker")){const e=({interpreter:e},{sync:t})=>{t.pyterminal_drop_hooks();const r=new TextDecoder,n={isatty:!0,write:e=>(t.pyterminal_write(r.decode(e)),e.length)};e.setStdout(n),e.setStderr(n)},r="\n            import builtins\n            from pyscript import sync as _sync\n\n            builtins.input = lambda prompt: _sync.pyterminal_read(prompt)\n        ",n="\n            import code as _code\n            _code.interact()\n        ";t.main.onWorker.add((function o(i,s){t.main.onWorker.delete(o),l({disableStdin:!1,cursorBlink:!0,cursorStyle:"block"}),s.sync.pyterminal_read=c.read.bind(c),s.sync.pyterminal_write=c.write.bind(c),s.sync.pyterminal_drop_hooks=()=>{t.worker.onReady.delete(e),t.worker.codeBeforeRun.delete(r),t.worker.codeAfterRun.delete(n)}})),t.worker.onReady.add(e),t.worker.codeBeforeRun.add(r),t.worker.codeAfterRun.add(n)}else t.main.onReady.add((function e({io:r}){console.warn("py-terminal is read only on main thread"),t.main.onReady.delete(e),l({disableStdin:!0,cursorBlink:!1,cursorStyle:"underline"}),r.stdout=e=>{c.write(`${e}\n`)},r.stderr=e=>{c.write(`${e.message||e}\n`)}}))},s=new MutationObserver(i);s.observe(document,{childList:!0,subtree:!0});var d=i();export{d as default};
-//# sourceMappingURL=py-terminal-_uJ8pDjX.js.map

package/dist/py-terminal-_uJ8pDjX.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"py-terminal-_uJ8pDjX.js","sources":["../src/plugins/py-terminal.js"],"sourcesContent":["// PyScript py-terminal plugin\nimport { TYPES, hooks } from \"../core.js\";\n\nconst CDN = \"https://cdn.jsdelivr.net/npm/xterm\";\nconst XTERM = \"5.3.0\";\nconst XTERM_READLINE = \"1.1.1\";\nconst SELECTOR = [...TYPES.keys()]\n    .map((type) => `script[type=\"${type}\"][terminal],${type}-script[terminal]`)\n    .join(\",\");\n\nconst pyTerminal = async () => {\n    const terminals = document.querySelectorAll(SELECTOR);\n\n    // no results will look further for runtime nodes\n    if (!terminals.length) return;\n\n    // we currently support only one terminal as in \"classic\"\n    if (terminals.length > 1)\n        console.warn(\"Unable to satisfy multiple terminals\");\n\n    // if we arrived this far, let's drop the MutationObserver\n    mo.disconnect();\n\n    const [element] = terminals;\n    // hopefully to be removed in the near future!\n    if (element.matches('script[type=\"mpy\"],mpy-script'))\n        throw new Error(\"Unsupported terminal\");\n\n    // import styles once and lazily (only on valid terminal)\n    if (!document.querySelector(`link[href^=\"${CDN}\"]`)) {\n        document.head.append(\n            Object.assign(document.createElement(\"link\"), {\n                rel: \"stylesheet\",\n                href: `${CDN}@${XTERM}/css/xterm.min.css`,\n            }),\n        );\n    }\n\n    // lazy load these only when a valid terminal is found\n    const [{ Terminal }, { Readline }] = await Promise.all([\n        import(/* webpackIgnore: true */ `${CDN}@${XTERM}/+esm`),\n        import(\n            /* webpackIgnore: true */ `${CDN}-readline@${XTERM_READLINE}/+esm`\n        ),\n    ]);\n\n    const readline = new Readline();\n\n    // common main thread initialization for both worker\n    // or main case, bootstrapping the terminal on its target\n    const init = (options) => {\n        let target = element;\n        const selector = element.getAttribute(\"target\");\n        if (selector) {\n            target =\n                document.getElementById(selector) ||\n                document.querySelector(selector);\n            if (!target) throw new Error(`Unknown target ${selector}`);\n        } else {\n            target = document.createElement(\"py-terminal\");\n            target.style.display = \"block\";\n            element.after(target);\n        }\n        const terminal = new Terminal({\n            theme: {\n                background: \"#191A19\",\n                foreground: \"#F5F2E7\",\n            },\n            ...options,\n        });\n        terminal.loadAddon(readline);\n        terminal.open(target);\n        terminal.focus();\n    };\n\n    // branch logic for the worker\n    if (element.hasAttribute(\"worker\")) {\n        // when the remote thread onReady triggers:\n        // setup the interpreter stdout and stderr\n        const workerReady = ({ interpreter }, { sync }) => {\n            sync.pyterminal_drop_hooks();\n            const decoder = new TextDecoder();\n            const generic = {\n                isatty: true,\n                write(buffer) {\n                    sync.pyterminal_write(decoder.decode(buffer));\n                    return buffer.length;\n                },\n            };\n            interpreter.setStdout(generic);\n            interpreter.setStderr(generic);\n        };\n\n        // run in python code able to replace builtins.input\n        // using the xworker.sync non blocking prompt\n        const codeBefore = `\n            import builtins\n            from pyscript import sync as _sync\n\n            builtins.input = lambda prompt: _sync.pyterminal_read(prompt)\n        `;\n\n        // at the end of the code, make the terminal interactive\n        const codeAfter = `\n            import code as _code\n            _code.interact()\n        `;\n\n        // add a hook on the main thread to setup all sync helpers\n        // also bootstrapping the XTerm target on main\n        hooks.main.onWorker.add(function worker(_, xworker) {\n            hooks.main.onWorker.delete(worker);\n            init({\n                disableStdin: false,\n                cursorBlink: true,\n                cursorStyle: \"block\",\n            });\n            xworker.sync.pyterminal_read = readline.read.bind(readline);\n            xworker.sync.pyterminal_write = readline.write.bind(readline);\n            // allow a worker to drop main thread hooks ASAP\n            xworker.sync.pyterminal_drop_hooks = () => {\n                hooks.worker.onReady.delete(workerReady);\n                hooks.worker.codeBeforeRun.delete(codeBefore);\n                hooks.worker.codeAfterRun.delete(codeAfter);\n            };\n        });\n\n        // setup remote thread JS/Python code for whenever the\n        // worker is ready to become a terminal\n        hooks.worker.onReady.add(workerReady);\n        hooks.worker.codeBeforeRun.add(codeBefore);\n        hooks.worker.codeAfterRun.add(codeAfter);\n    } else {\n        // in the main case, just bootstrap XTerm without\n        // allowing any input as that's not possible / awkward\n        hooks.main.onReady.add(function main({ io }) {\n            console.warn(\"py-terminal is read only on main thread\");\n            hooks.main.onReady.delete(main);\n            init({\n                disableStdin: true,\n                cursorBlink: false,\n                cursorStyle: \"underline\",\n            });\n            io.stdout = (value) => {\n                readline.write(`${value}\\n`);\n            };\n            io.stderr = (error) => {\n                readline.write(`${error.message || error}\\n`);\n            };\n        });\n    }\n};\n\nconst mo = new MutationObserver(pyTerminal);\nmo.observe(document, { childList: true, subtree: true });\n\n// try to check the current document ASAP\nexport default pyTerminal();\n"],"names":["CDN","XTERM","SELECTOR","TYPES","keys","map","type","join","pyTerminal","async","terminals","document","querySelectorAll","length","console","warn","mo","disconnect","element","matches","Error","querySelector","head","append","Object","assign","createElement","rel","href","Terminal","Readline","Promise","all","import","readline","init","options","target","selector","getAttribute","getElementById","style","display","after","terminal","theme","background","foreground","loadAddon","open","focus","hasAttribute","workerReady","interpreter","sync","pyterminal_drop_hooks","decoder","TextDecoder","generic","isatty","write","buffer","pyterminal_write","decode","setStdout","setStderr","codeBefore","codeAfter","hooks","main","onWorker","add","worker","_","xworker","delete","disableStdin","cursorBlink","cursorStyle","pyterminal_read","read","bind","onReady","codeBeforeRun","codeAfterRun","io","stdout","value","stderr","error","message","MutationObserver","observe","childList","subtree","pyTerminal$1"],"mappings":"6CAGA,MAAMA,EAAM,qCACNC,EAAQ,QAERC,EAAW,IAAIC,EAAMC,QACtBC,KAAKC,GAAS,gBAAgBA,iBAAoBA,uBAClDC,KAAK,KAEJC,EAAaC,UACf,MAAMC,EAAYC,SAASC,iBAAiBV,GAG5C,IAAKQ,EAAUG,OAAQ,OAGnBH,EAAUG,OAAS,GACnBC,QAAQC,KAAK,wCAGjBC,EAAGC,aAEH,MAAOC,GAAWR,EAElB,GAAIQ,EAAQC,QAAQ,iCAChB,MAAM,IAAIC,MAAM,wBAGfT,SAASU,cAAc,eAAerB,QACvCW,SAASW,KAAKC,OACVC,OAAOC,OAAOd,SAASe,cAAc,QAAS,CAC1CC,IAAK,aACLC,KAAM,GAAG5B,KAAOC,yBAM5B,OAAO4B,SAAEA,IAAYC,SAAEA,UAAoBC,QAAQC,IAAI,CACnDC,OAAiC,GAAGjC,KAAOC,UAC3CgC,OAC8B,GAAGjC,2BAI/BkC,EAAW,IAAIJ,EAIfK,EAAQC,IACV,IAAIC,EAASnB,EACb,MAAMoB,EAAWpB,EAAQqB,aAAa,UACtC,GAAID,GAIA,GAHAD,EACI1B,SAAS6B,eAAeF,IACxB3B,SAASU,cAAciB,IACtBD,EAAQ,MAAM,IAAIjB,MAAM,kBAAkBkB,UAE/CD,EAAS1B,SAASe,cAAc,eAChCW,EAAOI,MAAMC,QAAU,QACvBxB,EAAQyB,MAAMN,GAElB,MAAMO,EAAW,IAAIf,EAAS,CAC1BgB,MAAO,CACHC,WAAY,UACZC,WAAY,cAEbX,IAEPQ,EAASI,UAAUd,GACnBU,EAASK,KAAKZ,GACdO,EAASM,OAAO,EAIpB,GAAIhC,EAAQiC,aAAa,UAAW,CAGhC,MAAMC,EAAc,EAAGC,gBAAiBC,WACpCA,EAAKC,wBACL,MAAMC,EAAU,IAAIC,YACdC,EAAU,CACZC,QAAQ,EACRC,MAAMC,IACFP,EAAKQ,iBAAiBN,EAAQO,OAAOF,IAC9BA,EAAOhD,SAGtBwC,EAAYW,UAAUN,GACtBL,EAAYY,UAAUP,EAAQ,EAK5BQ,EAAa,uKAQbC,EAAY,6EAOlBC,EAAMC,KAAKC,SAASC,KAAI,SAASC,EAAOC,EAAGC,GACvCN,EAAMC,KAAKC,SAASK,OAAOH,GAC3BrC,EAAK,CACDyC,cAAc,EACdC,aAAa,EACbC,YAAa,UAEjBJ,EAAQpB,KAAKyB,gBAAkB7C,EAAS8C,KAAKC,KAAK/C,GAClDwC,EAAQpB,KAAKQ,iBAAmB5B,EAAS0B,MAAMqB,KAAK/C,GAEpDwC,EAAQpB,KAAKC,sBAAwB,KACjCa,EAAMI,OAAOU,QAAQP,OAAOvB,GAC5BgB,EAAMI,OAAOW,cAAcR,OAAOT,GAClCE,EAAMI,OAAOY,aAAaT,OAAOR,EAAU,CAE3D,IAIQC,EAAMI,OAAOU,QAAQX,IAAInB,GACzBgB,EAAMI,OAAOW,cAAcZ,IAAIL,GAC/BE,EAAMI,OAAOY,aAAab,IAAIJ,EACtC,MAGQC,EAAMC,KAAKa,QAAQX,KAAI,SAASF,GAAKgB,GAAEA,IACnCvE,QAAQC,KAAK,2CACbqD,EAAMC,KAAKa,QAAQP,OAAON,GAC1BlC,EAAK,CACDyC,cAAc,EACdC,aAAa,EACbC,YAAa,cAEjBO,EAAGC,OAAUC,IACTrD,EAAS0B,MAAM,GAAG2B,MAAU,EAEhCF,EAAGG,OAAUC,IACTvD,EAAS0B,MAAM,GAAG6B,EAAMC,SAAWD,MAAU,CAE7D,GACK,EAGCzE,EAAK,IAAI2E,iBAAiBnF,GAChCQ,EAAG4E,QAAQjF,SAAU,CAAEkF,WAAW,EAAMC,SAAS,IAGjD,IAAAC,EAAevF"}