pyscript-programming-language 1.13.4__py3-none-any.whl → 1.15.0.dev1__py3-none-any.whl

pyscript/core/editor/__init__.py

@@ -1,15 +1,31 @@
 """
 All Editor Application Implementations for PyScript.
+
+Not all editors are loaded (lazy import).
 """
 
-from . import (
-    bases,
-    gui,
-    terminal
-)
-
-__all__ = (
-    'bases',
-    'gui',
-    'terminal'
-)
+from ..utils.path import normpath
+
+from importlib import import_module as _import
+from os.path import dirname
+from pkgutil import iter_modules
+
+__all__ = tuple(frozenset(
+    name for _, name, _ in
+    iter_modules((dirname(normpath(__file__)),))
+))
+
+def __getattr__(name: str):
+    g = globals()
+    if name in g:
+        return g[name]
+    elif name in __all__:
+        module = _import(f'{__name__}.{name}')
+        g[name] = module
+        return module
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+def __dir__() -> list[str]:
+    return sorted(tuple(globals().keys()) + __all__)
+
+del normpath, iter_modules, dirname

pyscript/core/editor/bases.py

@@ -3,24 +3,25 @@ from ..buffer import PysFileBuffer
 from ..cache import pys_sys
 from ..constants import CONFIGURATIONS_PATH
 from ..utils.decorators import typecheck, inheritable
-from ..utils.generic import setimuattr
+from ..utils.generic import delimuattr
 from ..utils.string import normstr
 
 from json import dump, load
+from os.path import basename
 from typing import Any
 
-import os
-
 class PysEditor(Pys):
 
     @typecheck
     def __init__(self, file: PysFileBuffer, colored: bool = True) -> None:
         self.file = file
+        self.basename = basename(self.file.name)
         self.colored = bool(colored)
-        self.basename = os.path.basename(self.file.name)
         self.used = False
         self.modified = False
 
+        self.load_configuration()
+
     def __init_subclass__(cls, **kwargs) -> None:
         super().__init_subclass__(**kwargs)
         inheritable(cls)
@@ -29,20 +30,17 @@ class PysEditor(Pys):
         try:
             with open(CONFIGURATIONS_PATH, 'r', encoding=pys_sys.encoding) as file:
                 result = load(file)
-                if not isinstance(result, dict):
+            if not isinstance(result, dict):
+                raise ValueError
+            for key in result:
+                if not isinstance(key, str):
                     raise ValueError
-                for key in result:
-                    if not isinstance(key, str):
-                        raise ValueError
-                self.configurations = result
+            self.configurations = result
         except:
             self.configurations = {}
 
     def get_configuration(self, configuration: str, default: Any) -> Any:
-        if configuration in self.configurations:
-            return self.configurations[configuration]
-        self.configurations[configuration] = default
-        return default
+        return self.configurations.setdefault(configuration, default)
 
     def set_configuration(self, configuration: str, value: Any) -> None:
         self.configurations[configuration] = value
@@ -55,11 +53,12 @@ class PysEditor(Pys):
             pass
 
     def save(self, text) -> None:
+        if not self.modified:
+            return
+
         try:
-            text = normstr(text)
             with open(self.file.name, 'w', encoding=pys_sys.encoding) as file:
-                file.write(text)
-                setimuattr(self.file, 'text', text)
+                file.write(normstr(text))
         except:
             pass
         else:
@@ -68,4 +67,5 @@ class PysEditor(Pys):
     def run(self) -> None:
         if self.used:
             raise RuntimeError("one application object can only be used once")
+        delimuattr(self.file, 'text')
         self.used = True

pyscript/core/editor/gui.py

@@ -1,13 +1,22 @@
 from .bases import PysEditor
 from ..buffer import PysFileBuffer
 from ..constants import ICON_PATH
-from ..highlight import PygmentsPyScriptStyle, PygmentsPyScriptLexer
+from ..highlight import PYGMENTS, PygmentsPyScriptStyle, PygmentsPyScriptLexer
 from ..utils.generic import boundary
 from ..version import __version__
 
 try:
-    from tkinter import Tk, Scrollbar, Text, messagebox
-    from tkinter.font import Font
+    from tkinter import Tk, Scrollbar, Text, Canvas, messagebox
+    from tkinter.font import families, Font
+
+    MONO_FALLBACKS = (
+        'Fira Code',
+        'Cascadia Code', 'SF Mono', 'Ubuntu Mono', 'Liberation Mono',
+        'Consolas', 'Menlo', 'DejaVu Sans Mono',
+        'Courier New', 'Lucida Console', 'Monaco', 'Andale Mono',
+        'Courier', 'Terminal',
+        'monospace'
+    )
 
     class PysGUIEditor(PysEditor, Tk):
 
@@ -15,7 +24,8 @@ try:
             PysEditor.__init__(self, file, colored)
             Tk.__init__(self)
 
-            self.load_configuration()
+            def update_tab_size():
+                self.text.configure(tabs=(self.font.measure('    '),))
 
             def on_save(event=None):
                 text = self.text.get('1.0', 'end')
@@ -26,46 +36,43 @@ try:
             def on_close():
                 if self.modified:
                     answer = messagebox.askyesnocancel('Unsaved changes', 'File has been modified. Save before exit?')
-                    if answer is True:
+                    if answer is None:
+                        return
+                    elif answer:
                         on_save()
-                        self.save_configuration()
-                        self.destroy()
-                    elif answer is False:
-                        self.save_configuration()
-                        self.destroy()
-                else:
-                    self.save_configuration()
-                    self.destroy()
+                self.save_configuration()
+                self.destroy()
 
             def on_configure(event):
                 if event.widget == self:
                     zoom = self.wm_state() == 'zoomed'
                     self.set_configuration('zoom', zoom)
                     if not zoom:
-                        self.set_configuration(
-                            'gui-geometry',
-                            f'{event.width}x{event.height}+{event.x}+{event.y}'
-                        )
+                        self.set_configuration('gui-geometry', f'{event.width}x{event.height}+{event.x}+{event.y}')
 
             def on_modified(event=None):
-                text = self.text
-                if text.edit_modified():
+                if self.text.edit_modified():
                     self.modified = True
                     update()
-                    text.edit_modified(False)
+                    refresh_line_numbers()
+                    self.text.edit_modified(False)
 
             def on_change_font(value):
                 def wrapper(event=None):
                     font = self.font
                     size = boundary(font.cget('size') + value, 1, 127)
                     font.config(size=size)
+                    update_tab_size()
+                    refresh_line_numbers()
                     self.set_configuration('gui-size-font', size)
                     return 'break'
                 return wrapper
 
             def on_toggle_wrap(event=None):
-                wrap = self.text.cget('wrap') != 'char'
-                self.text.configure(wrap='char' if wrap else 'none')
+                text = self.text
+                wrap = text.cget('wrap') != 'char'
+                text.configure(wrap='char' if wrap else 'none')
+                refresh_line_numbers()
                 self.set_configuration('wrap', wrap)
                 return 'break'
 
@@ -83,13 +90,72 @@ try:
 
             def on_enter(event=None):
                 text = self.text
+                if text.tag_ranges('sel'):
+                    text.delete('sel.first', 'sel.last')
+
                 line = text.get('insert linestart', 'insert lineend')
                 text.insert('insert', '\n' + line[:len(line) - len(line.lstrip())])
+                text.see('insert')
                 return 'break'
 
+            def draw_line_numbers():
+                self.line_job = None
+                text = self.text
+                canvas = self.line_numbers
+                font = self.font
+
+                bold = (font.cget('family'), font.cget('size'), 'bold')
+                digits = len(text.index('end-1c').split('.')[0])
+                padding = font.measure(' ')
+                width = font.measure('0' * digits) + padding * 2
+
+                canvas.delete('all')
+                canvas.configure(width=width, bg='#1f1f1f')
+
+                current = text.index('insert').split('.')[0]
+                index = text.index('@0,0')
+                previous = None
+
+                while True:
+                    info = text.dlineinfo(index)
+                    if info is None:
+                        break
+
+                    number = index.split('.')[0]
+                    if number == previous:
+                        break
+
+                    canvas.create_text(
+                        width - padding, info[1],
+                        anchor='ne',
+                        text=number,
+                        font=bold if number == current else font,
+                        fill='#ffffff'
+                    )
+
+                    previous = number
+                    index = text.index(f'{index} +1 lines')
+
+            def refresh_line_numbers(event=None):
+                if self.line_job is None:
+                    self.line_job = self.after_idle(draw_line_numbers)
+
+            def on_scroll(first, last):
+                self.scrollbar.set(first, last)
+                refresh_line_numbers()
+
+            installed = frozenset(families())
+            for font_name in MONO_FALLBACKS:
+                if font_name in installed:
+                    break
+            else:
+                font_name = 'monospace'
+
             self.lexer = PygmentsPyScriptLexer()
-            self.font = Font(family='Consolas', size=boundary(self.get_configuration('gui-size-font', 10), 1, 127))
+            self.font = Font(family=font_name, size=boundary(self.get_configuration('gui-size-font', 10), 1, 127))
+            self.line_job = None
             self.scrollbar = Scrollbar(self)
+            self.line_numbers = Canvas(self, width=0, highlightthickness=0, bd=0)
             self.text = Text(
                 self,
                 undo=True,
@@ -99,12 +165,16 @@ try:
                 bg='#000000',
                 fg='#ffffff',
                 insertbackground='white',
-                yscrollcommand=self.scrollbar.set
+                yscrollcommand=on_scroll
             )
 
+            update_tab_size()
+
             self.scrollbar.pack_configure(side='right', fill='y')
             self.scrollbar.configure(command=self.text.yview)
 
+            self.line_numbers.pack_configure(side='left', fill='y')
+            self.text.pack_configure(side='left', expand=True, fill='both')
             self.text.pack_configure(side='left', expand=True, fill='both')
 
             self.text.insert('1.0', self.file.text)
@@ -114,6 +184,9 @@ try:
             self.text.bind('<Return>', on_enter)
             self.text.bind('<Prior>', on_page_up)
             self.text.bind('<Next>', on_page_down)
+            self.text.bind('<KeyRelease>', refresh_line_numbers)
+            self.text.bind('<ButtonRelease-1>', refresh_line_numbers)
+            self.text.bind('<Configure>', refresh_line_numbers)
 
             self.bind('<Configure>', on_configure)
             self.bind_all('<Control-S>', on_save)
@@ -140,18 +213,20 @@ try:
                 )
             )
 
-            self.wm_minsize(300, 250)
+            self.wm_minsize(250, 200)
             self.wm_protocol('WM_DELETE_WINDOW', on_close)
 
-            if colored:
+            if PYGMENTS and colored:
+                self.update_job = None
+
                 tag_configure = self.text.tag_configure
                 for token, style in PygmentsPyScriptStyle.list_styles():
                     color = style['color']
                     if color:
                         tag_configure(str(token), foreground=f'#{color}')
 
-                def update():
-                    self.title(f'PyScript {__version__} - {self.basename}{"*" if self.modified else ""}')
+                def refresh_highlight():
+                    self.update_job = None
 
                     index = '1.0'
 
@@ -171,11 +246,18 @@ try:
                         text_tag_add(to_string(type), index, end_index)
                         index = end_index
 
+                def update():
+                    self.title(f'PyScript {__version__} - {self.basename}{"*" if self.modified else ""}')
+                    if self.update_job is not None:
+                        self.after_cancel(self.update_job)
+                    self.update_job = self.after(500, refresh_highlight)
+
             else:
                 def update():
                     self.title(f'PyScript {__version__} - {self.basename}{"*" if self.modified else ""}')
 
             update()
+            refresh_line_numbers()
 
         def run(self) -> None:
             PysEditor.run(self)

pyscript/core/editor/terminal.py

@@ -22,8 +22,6 @@ try:
         def __init__(self, file: PysFileBuffer, colored: bool = True) -> None:
             PysEditor.__init__(self, file, colored)
 
-            self.load_configuration()
-
             self.show_exit_window = False
 
             on_edit = Condition(lambda: not self.show_exit_window)
@@ -47,6 +45,9 @@ try:
                         'style': style_from_pygments_cls(PygmentsPyScriptStyle)
                     })
 
+                text_other_keyword.update({
+                    'scrollbar': True
+                })
                 close_window_keyword.update({
                     'content': FormattedTextControl(
                         " File has been modified. Save before exit? \n"
@@ -64,6 +65,13 @@ try:
                         title = file
                     return ANSI(f'\x1b[7m{title}{" " * max(0, columns - len(title))}\x1b[0m')
 
+                def create_line_prefix(line_number, wrap_count):
+                    width = len(str(self.text.document.line_count))
+                    number = str(line_number + 1) if wrap_count == 0 else ''
+                    is_current = line_number == self.text.document.cursor_position_row
+                    style = 'bg:#ffffff fg:#000000' + (' bold' if is_current else '')
+                    return [(style, f' {number:>{width}} '), ('', ' ')]
+
             else:
                 app_other_keyword.update({
                     'color_depth': ColorDepth.DEPTH_1_BIT
@@ -84,11 +92,16 @@ try:
                         title = file
                     return title + ' ' * max(0, columns - len(title))
 
+                def create_line_prefix(line_number, wrap_count):
+                    width = len(str(self.text.document.line_count))
+                    number = str(line_number + 1) if wrap_count == 0 else ''
+                    return f' {number:>{width}} | '
+
             self.text = TextArea(
                 multiline=True,
-                scrollbar=True,
                 wrap_lines=on_wrap,
                 input_processors=[TabsProcessor(tabstop=4)],
+                get_line_prefix=create_line_prefix,
                 **text_other_keyword
             )
 
@@ -188,7 +201,7 @@ try:
             )
 
             self.text.text = self.file.text
-            self.text.buffer.on_text_changed += on_change
+            self.text.buffer.on_text_changed.add_handler(on_change)
 
             Application.__init__(
                 self,

pyscript/core/exceptions.py

@@ -1,7 +1,5 @@
 from .bases import Pys
 from .constants import NO_COLOR
-from .utils.decorators import immutable
-from .utils.generic import setimuattr
 from .utils.string import indent
 
 from typing import TYPE_CHECKING, Optional
@@ -12,7 +10,6 @@ if TYPE_CHECKING:
     from .position import PysPosition
     from .results import PysRunTimeResult
 
-@immutable
 class PysTraceback(Pys):
 
     __slots__ = ('exception', 'context', 'position', 'primary', 'implicit')
@@ -26,25 +23,23 @@ class PysTraceback(Pys):
         implicit: bool = False
     ) -> None:
 
-        setimuattr(self, 'exception', exception)
-        setimuattr(self, 'context', context)
-        setimuattr(self, 'position', position)
-        setimuattr(self, 'primary', primary)
-        setimuattr(self, 'implicit', implicit)
+        self.exception = exception
+        self.context = context
+        self.position = position
+        self.primary = primary
+        self.implicit = implicit
 
     def __repr__(self) -> str:
         return f'<traceback of {self.exception!r}>'
 
     def string_traceback(self) -> str:
-        # circular import problem solved
-        from .mapping import GET_ACOLOR
-        from .position import format_error_arrow
-
         context = self.context
         position = self.position
         colored = not (context.flags & NO_COLOR)
 
         if colored:
+            # circular import problem solved
+            from .mapping import GET_ACOLOR
             reset = GET_ACOLOR('reset')
             magenta = GET_ACOLOR('magenta')
             bmagenta = GET_ACOLOR('bold-magenta')
@@ -63,7 +58,7 @@ class PysTraceback(Pys):
                 f'  File {magenta}"{position.file.name}"{reset}' +
                 ('' if is_positionless      else f', line {magenta}{position.start_line}{reset}') + 
                 ('' if context_name is None else f', in {magenta}{context_name}{reset}') +
-                ('' if is_positionless      else f'\n{indent(format_error_arrow(position, colored), 4)}')
+                ('' if is_positionless      else f'\n{indent(position.format_error_arrow(colored), 4)}')
             )
 
             position = context.parent_entry_position

pyscript/core/handlers.py

@@ -1,5 +1,5 @@
 from .cache import pys_sys
-from .constants import ENV_PYSCRIPT_NO_GIL
+from .constants import ENV_PYSCRIPT_WITH_GIL
 from .context import PysContext
 from .position import PysPosition
 from .pystypes import PysFunction
@@ -10,36 +10,17 @@ from typing import Any
 
 wrapper_function = (MethodType, classmethod, staticmethod)
 
-if is_environ(ENV_PYSCRIPT_NO_GIL):
-
-    def handle_call(object: Any, context: PysContext, position: PysPosition) -> None:
-        ins = isinstance
-
-        if ins(object, PysFunction):
-            code = object.__code__
-            code.context = context
-            code.position = position
-
-        elif ins(object, wrapper_function):
-            handle_call(object.__func__, context, position)
-
-        elif ins(object, type):
-            gt = getattr
-
-            method = gt(object, '__new__', None)
-            if method is not None:
-                handle_call(method, context, position)
-
-            method = gt(object, '__init__', None)
-            if method is not None:
-                handle_call(method, context, position)
-
-    GIL = pys_sys.gil = False
-
-else:
-    from threading import RLock
-    gil_lock = RLock()
-
+GIL = pys_sys.gil = False
+if is_environ(ENV_PYSCRIPT_WITH_GIL):
+    try:
+        from threading import RLock
+        gil_lock = RLock()
+    except:
+        pass
+    else:
+        GIL = pys_sys.gil = True
+
+if GIL:
     def handle_call(object: Any, context: PysContext, position: PysPosition) -> None:
         with gil_lock:
             ins = isinstance
@@ -63,4 +44,25 @@ else:
                 if method is not None:
                     handle_call(method, context, position)
 
-    GIL = pys_sys.gil = True
+else:
+    def handle_call(object: Any, context: PysContext, position: PysPosition) -> None:
+        ins = isinstance
+
+        if ins(object, PysFunction):
+            code = object.__code__
+            code.context = context
+            code.position = position
+
+        elif ins(object, wrapper_function):
+            handle_call(object.__func__, context, position)
+
+        elif ins(object, type):
+            gt = getattr
+
+            method = gt(object, '__new__', None)
+            if method is not None:
+                handle_call(method, context, position)
+
+            method = gt(object, '__init__', None)
+            if method is not None:
+                handle_call(method, context, position)

pyscript/core/highlight.py

@@ -9,10 +9,11 @@ from .pysbuiltins import pys_builtins
 from .token import TOKENS
 from .utils.ansi import acolor
 from .utils.decorators import typecheck
+from .utils.generic import dfrozen
 from .utils.string import normstr
 
 from html import escape as html_escape
-from typing import Callable, Optional
+from typing import Callable, Iterator, Optional
 
 BUILTIN_TYPES = frozenset(
     name
@@ -31,10 +32,11 @@ try:
     from pygments.lexer import RegexLexer, include, bygroups
     from pygments.style import Style
     from pygments.token import (
-        Comment, Error, Escape, Generic, Keyword, Name, Number, Operator, Punctuation, String, Whitespace
+        _TokenType, Comment, Error, Escape, Generic, Keyword, Name, Number, Operator, Punctuation, String, Whitespace
     )
     from pygments.unistring import xid_start, xid_continue
 
+    _brackets_tokens = dfrozen({index: getattr(Punctuation, f'Brackets{index}') for index in range(3)})
     _set_constant_keywords = frozenset(CONSTANT_KEYWORDS)
     _keywords = '|'.join(KEYWORDS)
     _unicode_name = f'[{xid_start}][{xid_continue}]*'
@@ -112,6 +114,10 @@ try:
             Comment.Single: HIGHLIGHT_MAP['comment'],
             Error: HIGHLIGHT_MAP['invalid'],
             Generic.Prompt: HIGHLIGHT_MAP['keyword-other'],
+
+            Punctuation.Brackets0: HIGHLIGHT_MAP['brackets-0'],
+            Punctuation.Brackets1: HIGHLIGHT_MAP['brackets-1'],
+            Punctuation.Brackets2: HIGHLIGHT_MAP['brackets-2']
         }
 
     class PygmentsPyScriptLexer(Pys, RegexLexer):
@@ -324,6 +330,20 @@ try:
 
         }
 
+        def get_tokens_unprocessed(self, *args, **kwargs) -> Iterator[tuple[int, _TokenType, str]]:
+            brackets_stack = []
+
+            for index, token, value in super().get_tokens_unprocessed(*args, **kwargs):
+                if token is Punctuation and len(value) == 1 and is_bracket(ttype := ord(value)):
+                    if is_left_bracket(ttype):
+                        token = _brackets_tokens[len(brackets_stack) % 3]
+                        brackets_stack.append(ttype)
+                    elif not (brackets_stack and BRACKETS_MAP[brackets_stack.pop()] == ttype):
+                        token = Error
+                    else:
+                        token = _brackets_tokens[len(brackets_stack) % 3]
+                yield index, token, value
+
     class PygmentsPyScriptShellLexer(PygmentsPyScriptLexer):
 
         """
@@ -521,8 +541,8 @@ def pys_highlight(
             type_format = 'comment'
 
         elif is_bracket(ttype):
-            type_format = f'brackets-{len(brackets_stack) % max_bracket_level}'
             if is_left_bracket(ttype):
+                type_format = f'brackets-{len(brackets_stack) % max_bracket_level}'
                 brackets_stack.append(ttype)
             elif not (brackets_stack and BRACKETS_MAP[brackets_stack.pop()] == ttype):
                 type_format = 'invalid'