rapydscript-ns 0.8.4 → 0.9.1

package/src/output/classes.pyj

@@ -2,7 +2,7 @@
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals
 
-from ast import AST_Class, AST_Method, is_node_type
+from ast import AST_Class, AST_Method, AST_AnnotatedAssign, AST_SymbolRef, is_node_type
 from output.functions import decorate, function_definition, function_annotation
 from output.utils import create_doctring
 from utils import has_prop
@@ -291,6 +291,17 @@ def print_class(output):
             output.end_statement()
         )
 
+    if not defined_methods['__format__']:
+        define_default_method('__format__', def():
+            if self.parent:
+                output.print('if('), self.parent.print(output), output.spaced('.prototype.__format__)', 'return', self.parent)
+                output.print('.prototype.__format__.call(this, arguments[0])'), output.end_statement()
+            output.indent(), output.spaced('if', '(!arguments[0])', 'return', 'this.__str__()')
+            output.end_statement()
+            output.indent(), output.spaced('throw', 'new TypeError("unsupported format specification")')
+            output.end_statement()
+        )
+
     # Python semantics: defining __eq__ without __hash__ makes the class unhashable
     if defined_methods['__eq__'] and not defined_methods['__hash__']:
         output.indent()
@@ -319,7 +330,56 @@ def print_class(output):
     output.print('.prototype, "__class__", {get: function() { return this.constructor; }, configurable: true})')
     output.end_statement()
 
-    # __init_subclass__ hook: call after identity properties so cls.__name__ is correct
+    # Other statements in the class context (including nested class definitions).
+    # Emitted BEFORE __init_subclass__ so that the hook can see class variables.
+    # This matches Python's behaviour: the class body executes first, then the
+    # hook is called with the fully-populated class namespace.
+    for stmt in self.statements:
+        if is_node_type(stmt, AST_Class):
+            # Print the nested class in full, then attach it to the outer class.
+            # Two assignments mirror Python semantics:
+            #   Outer.Inner        — class-level access (Outer.Inner())
+            #   Outer.prototype.Inner — instance-level access (self.Inner() inside methods)
+            output.indent()
+            stmt.print(output)
+            output.newline()
+            nested_name = stmt.name.name
+            output.indent()
+            self.name.print(output)
+            output.print('.' + nested_name + ' = ' + nested_name)
+            output.end_statement()
+            output.indent()
+            self.name.print(output)
+            output.print('.prototype.' + nested_name + ' = ' + nested_name)
+            output.end_statement()
+        elif not is_node_type(stmt, AST_Method):
+            output.indent()
+            stmt.print(output)
+            output.newline()
+
+    # Emit __annotations__ for annotated class variables so that @dataclass and
+    # similar decorators can introspect field names and their declaration order.
+    # Only annotation-with-value statements (x: T = v) AND annotation-only
+    # statements (x: T) are collected; the value (if any) is already emitted
+    # above as a prototype assignment.  We store null as the type since type
+    # information is erased in the JS output.
+    annotated_field_names = []
+    for stmt in self.statements:
+        if is_node_type(stmt, AST_AnnotatedAssign) and is_node_type(stmt.target, AST_SymbolRef):
+            annotated_field_names.push(stmt.target.name)
+    if annotated_field_names.length:
+        output.indent()
+        self.name.print(output)
+        output.print('.__annotations__ = {')
+        for i in range(annotated_field_names.length):
+            if i > 0:
+                output.comma()
+            output.print(JSON.stringify(annotated_field_names[i]) + ': null')
+        output.print('}')
+        output.end_statement()
+
+    # __init_subclass__ hook: call after identity properties and class variables
+    # so cls.__name__ is correct and cls.prototype reflects the full class body.
     if self.parent:
         output.indent()
         output.print('if (typeof ')
@@ -371,30 +431,6 @@ def print_class(output):
             output.print(JSON.stringify(create_doctring(self.docstrings)))
         )
 
-    # Other statements in the class context (including nested class definitions)
-    for stmt in self.statements:
-        if is_node_type(stmt, AST_Class):
-            # Print the nested class in full, then attach it to the outer class.
-            # Two assignments mirror Python semantics:
-            #   Outer.Inner        — class-level access (Outer.Inner())
-            #   Outer.prototype.Inner — instance-level access (self.Inner() inside methods)
-            output.indent()
-            stmt.print(output)
-            output.newline()
-            nested_name = stmt.name.name
-            output.indent()
-            self.name.print(output)
-            output.print('.' + nested_name + ' = ' + nested_name)
-            output.end_statement()
-            output.indent()
-            self.name.print(output)
-            output.print('.prototype.' + nested_name + ' = ' + nested_name)
-            output.end_statement()
-        elif not is_node_type(stmt, AST_Method):
-            output.indent()
-            stmt.print(output)
-            output.newline()
-
     if decorators.length:
         output.indent()
         output.assign(self.name)

package/src/output/comments.pyj

@@ -1,45 +1,45 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
-from __python__ import hash_literals
-
-from ast import AST_Exit, is_node_type
-
-
-def output_comments(comments, output, nlb):
-    for comm in comments:
-        if comm.type is "comment1":
-            output.print("//" + comm.value + "\n")
-            output.indent()
-        elif comm.type is "comment2":
-            output.print("/*" + comm.value + "*/")
-            if nlb:
-                output.print("\n")
-                output.indent()
-            else:
-                output.space()
-
-
-def print_comments(self, output):
-    c = output.options.comments
-    if c:
-        start = self.start
-        if start and not start._comments_dumped:
-            start._comments_dumped = True
-            comments = start.comments_before
-            # XXX: ugly fix for https://github.com/mishoo/RapydScript2/issues/112
-            #      if this node is `return` or `throw`, we cannot allow comments before
-            #      the returned or thrown value.
-            if is_node_type(self, AST_Exit) and self.value and self.value.start.comments_before and self.value.start.comments_before.length > 0:
-                comments = (comments or v'[]').concat(self.value.start.comments_before)
-                self.value.start.comments_before = v'[]'
-
-            if c.test:
-                comments = comments.filter(def(comment):
-                    return c.test(comment.value)
-                )
-            elif jstype(c) is "function":
-                comments = comments.filter(def(comment):
-                    return c(self, comment)
-                )
-
-            output_comments(comments, output, start.nlb)
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
+
+from ast import AST_Exit, is_node_type
+
+
+def output_comments(comments, output, nlb):
+    for comm in comments:
+        if comm.type is "comment1":
+            output.print("//" + comm.value + "\n")
+            output.indent()
+        elif comm.type is "comment2":
+            output.print("/*" + comm.value + "*/")
+            if nlb:
+                output.print("\n")
+                output.indent()
+            else:
+                output.space()
+
+
+def print_comments(self, output):
+    c = output.options.comments
+    if c:
+        start = self.start
+        if start and not start._comments_dumped:
+            start._comments_dumped = True
+            comments = start.comments_before
+            # XXX: ugly fix for https://github.com/mishoo/RapydScript2/issues/112
+            #      if this node is `return` or `throw`, we cannot allow comments before
+            #      the returned or thrown value.
+            if is_node_type(self, AST_Exit) and self.value and self.value.start.comments_before and self.value.start.comments_before.length > 0:
+                comments = (comments or v'[]').concat(self.value.start.comments_before)
+                self.value.start.comments_before = v'[]'
+
+            if c.test:
+                comments = comments.filter(def(comment):
+                    return c.test(comment.value)
+                )
+            elif jstype(c) is "function":
+                comments = comments.filter(def(comment):
+                    return c(self, comment)
+                )
+
+            output_comments(comments, output, start.nlb)

package/src/output/exceptions.pyj

@@ -1,201 +1,201 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-from __python__ import hash_literals
-
-from output.statements import print_bracketed, display_body
-
-
-def print_try(self, output):
-    else_var_name = None
-    def update_output_var(output):
-        output.indent(), output.assign(else_var_name), output.print('true'), output.end_statement()
-    if self.belse:
-        else_var_name = output.new_try_else_counter()
-        output.assign('var ' + else_var_name), output.print('false'), output.end_statement(), output.indent()
-    output.print("try")
-    output.space()
-    print_bracketed(self, output, False, None, None, update_output_var if else_var_name else None)
-    if self.bcatch:
-        output.space()
-        print_catch(self.bcatch, output)
-
-    if self.bfinally:
-        output.space()
-        print_finally(self.bfinally, output, self.belse, else_var_name)
-    elif self.belse:
-        output.newline()
-        print_else(self.belse, else_var_name, output)
-
-
-def print_catch(self, output):
-    # Dispatch to except* handler when any clause is an exception group handler
-    if self.body.length and self.body[0].is_star:
-        print_catch_star(self, output)
-        return
-    output.print("catch")
-    output.space()
-    output.with_parens(def():
-        output.print("ρσ_Exception")
-    )
-    output.space()
-    output.with_block(def():
-        output.indent()
-        output.spaced('ρσ_last_exception', '=', 'ρσ_Exception'), output.end_statement()
-        output.indent()
-        no_default = True
-        for i, exception in enumerate(self.body):
-            if i:
-                output.print("else ")
-
-            if exception.errors.length:
-                output.print("if")
-                output.space()
-                output.with_parens(def():
-                    for i, err in enumerate(exception.errors):
-                        if i:
-                            output.newline()
-                            output.indent()
-                            output.print("||")
-                            output.space()
-
-                        output.print("ρσ_Exception")
-                        output.space()
-                        output.print("instanceof")
-                        output.space()
-                        if err.name is 'Exception':
-                            output.print('Error')
-                        else:
-                            err.print(output)
-                )
-                output.space()
-            else:
-                no_default = False
-            print_bracketed(exception, output, True)
-            output.space()
-        if no_default:
-            output.print("else")
-            output.space()
-            output.with_block(def():
-                output.indent()
-                output.print("throw")
-                output.space()
-                output.print("ρσ_Exception")
-                output.semicolon()
-                output.newline()
-            )
-        output.newline()
-    )
-
-
-def _eg_type_cond(errors, varname):
-    # Build a JS condition string testing varname against each error type
-    parts = []
-    for err in errors:
-        if err.name is 'Exception':
-            parts.push(varname + " instanceof Error")
-        else:
-            parts.push(varname + " instanceof " + err.name)
-    return parts.join(" || ")
-
-
-def print_catch_star(self, output):
-    output.print("catch")
-    output.space()
-    output.with_parens(def():
-        output.print("ρσ_Exception")
-    )
-    output.space()
-    output.with_block(def():
-        output.indent()
-        output.spaced('ρσ_last_exception', '=', 'ρσ_Exception'), output.end_statement()
-
-        # Normalise: wrap non-ExceptionGroup exception into a one-element array
-        output.indent()
-        output.print("var ρσ_eg_exceptions = (ρσ_Exception instanceof ExceptionGroup) ? ρσ_Exception.exceptions.slice() : [ρσ_Exception]")
-        output.semicolon(), output.newline()
-        output.indent()
-        output.print("var ρσ_eg_raised = []")
-        output.semicolon(), output.newline()
-
-        for ei, exception in enumerate(self.body):
-            idx = str(ei)
-            if exception.errors.length:
-                cond = _eg_type_cond(exception.errors, "ρσ_et")
-                output.indent()
-                output.print("var ρσ_eg_matched_" + idx + " = ρσ_eg_exceptions.filter(function(ρσ_et) { return " + cond + "; })")
-                output.semicolon(), output.newline()
-                output.indent()
-                output.print("ρσ_eg_exceptions = ρσ_eg_exceptions.filter(function(ρσ_et) { return !(" + cond + "); })")
-                output.semicolon(), output.newline()
-            else:
-                # Bare except*: take all remaining
-                output.indent()
-                output.print("var ρσ_eg_matched_" + idx + " = ρσ_eg_exceptions.slice()")
-                output.semicolon(), output.newline()
-                output.indent()
-                output.print("ρσ_eg_exceptions = []")
-                output.semicolon(), output.newline()
-
-            output.indent()
-            output.print("if (ρσ_eg_matched_" + idx + ".length > 0)")
-            output.space()
-            output.with_block(def():
-                if exception.argname:
-                    output.indent()
-                    output.print("var ")
-                    output.assign(exception.argname)
-                    output.print("(ρσ_Exception instanceof ExceptionGroup) ? new ExceptionGroup(ρσ_Exception.message, ρσ_eg_matched_" + idx + ") : ρσ_eg_matched_" + idx + "[0]")
-                    output.semicolon(), output.newline()
-                output.indent()
-                output.print("try")
-                output.space()
-                output.with_block(def():
-                    display_body(exception.body, False, output)
-                )
-                output.print(" catch (ρσ_eg_exc_" + idx + ")")
-                output.space()
-                output.with_block(def():
-                    output.indent()
-                    output.print("ρσ_eg_raised.push(ρσ_eg_exc_" + idx + ")")
-                    output.semicolon(), output.newline()
-                )
-                output.newline()
-            )
-            output.newline()
-
-        # Re-raise unmatched exceptions and any raised by handlers
-        output.indent()
-        output.print("var ρσ_eg_unhandled = ρσ_eg_exceptions.concat(ρσ_eg_raised)")
-        output.semicolon(), output.newline()
-        output.indent()
-        output.print("if (ρσ_eg_unhandled.length > 0)")
-        output.space()
-        output.with_block(def():
-            output.indent()
-            output.print("throw (ρσ_eg_unhandled.length === 1 && !(ρσ_Exception instanceof ExceptionGroup)) ? ρσ_eg_unhandled[0] : new ExceptionGroup((ρσ_Exception instanceof ExceptionGroup) ? ρσ_Exception.message : \"unhandled exceptions\", ρσ_eg_unhandled)")
-            output.semicolon(), output.newline()
-        )
-        output.newline()
-    )
-
-
-def print_finally(self, output, belse, else_var_name):
-    output.print("finally")
-    output.space()
-    if else_var_name:
-        output.with_block(def():
-            output.indent(), output.print("try")
-            output.space()
-            output.with_block(def():
-                print_else(belse, else_var_name, output)
-            )
-            print_finally(self, output)
-        )
-    else:
-        print_bracketed(self, output)
-
-
-def print_else(self, else_var_name, output):
-    output.indent(), output.spaced('if', '(' + else_var_name + ')')
-    output.space()
-    print_bracketed(self, output)
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
+
+from output.statements import print_bracketed, display_body
+
+
+def print_try(self, output):
+    else_var_name = None
+    def update_output_var(output):
+        output.indent(), output.assign(else_var_name), output.print('true'), output.end_statement()
+    if self.belse:
+        else_var_name = output.new_try_else_counter()
+        output.assign('var ' + else_var_name), output.print('false'), output.end_statement(), output.indent()
+    output.print("try")
+    output.space()
+    print_bracketed(self, output, False, None, None, update_output_var if else_var_name else None)
+    if self.bcatch:
+        output.space()
+        print_catch(self.bcatch, output)
+
+    if self.bfinally:
+        output.space()
+        print_finally(self.bfinally, output, self.belse, else_var_name)
+    elif self.belse:
+        output.newline()
+        print_else(self.belse, else_var_name, output)
+
+
+def print_catch(self, output):
+    # Dispatch to except* handler when any clause is an exception group handler
+    if self.body.length and self.body[0].is_star:
+        print_catch_star(self, output)
+        return
+    output.print("catch")
+    output.space()
+    output.with_parens(def():
+        output.print("ρσ_Exception")
+    )
+    output.space()
+    output.with_block(def():
+        output.indent()
+        output.spaced('ρσ_last_exception', '=', 'ρσ_Exception'), output.end_statement()
+        output.indent()
+        no_default = True
+        for i, exception in enumerate(self.body):
+            if i:
+                output.print("else ")
+
+            if exception.errors.length:
+                output.print("if")
+                output.space()
+                output.with_parens(def():
+                    for i, err in enumerate(exception.errors):
+                        if i:
+                            output.newline()
+                            output.indent()
+                            output.print("||")
+                            output.space()
+
+                        output.print("ρσ_Exception")
+                        output.space()
+                        output.print("instanceof")
+                        output.space()
+                        if err.name is 'Exception':
+                            output.print('Error')
+                        else:
+                            err.print(output)
+                )
+                output.space()
+            else:
+                no_default = False
+            print_bracketed(exception, output, True)
+            output.space()
+        if no_default:
+            output.print("else")
+            output.space()
+            output.with_block(def():
+                output.indent()
+                output.print("throw")
+                output.space()
+                output.print("ρσ_Exception")
+                output.semicolon()
+                output.newline()
+            )
+        output.newline()
+    )
+
+
+def _eg_type_cond(errors, varname):
+    # Build a JS condition string testing varname against each error type
+    parts = []
+    for err in errors:
+        if err.name is 'Exception':
+            parts.push(varname + " instanceof Error")
+        else:
+            parts.push(varname + " instanceof " + err.name)
+    return parts.join(" || ")
+
+
+def print_catch_star(self, output):
+    output.print("catch")
+    output.space()
+    output.with_parens(def():
+        output.print("ρσ_Exception")
+    )
+    output.space()
+    output.with_block(def():
+        output.indent()
+        output.spaced('ρσ_last_exception', '=', 'ρσ_Exception'), output.end_statement()
+
+        # Normalise: wrap non-ExceptionGroup exception into a one-element array
+        output.indent()
+        output.print("var ρσ_eg_exceptions = (ρσ_Exception instanceof ExceptionGroup) ? ρσ_Exception.exceptions.slice() : [ρσ_Exception]")
+        output.semicolon(), output.newline()
+        output.indent()
+        output.print("var ρσ_eg_raised = []")
+        output.semicolon(), output.newline()
+
+        for ei, exception in enumerate(self.body):
+            idx = str(ei)
+            if exception.errors.length:
+                cond = _eg_type_cond(exception.errors, "ρσ_et")
+                output.indent()
+                output.print("var ρσ_eg_matched_" + idx + " = ρσ_eg_exceptions.filter(function(ρσ_et) { return " + cond + "; })")
+                output.semicolon(), output.newline()
+                output.indent()
+                output.print("ρσ_eg_exceptions = ρσ_eg_exceptions.filter(function(ρσ_et) { return !(" + cond + "); })")
+                output.semicolon(), output.newline()
+            else:
+                # Bare except*: take all remaining
+                output.indent()
+                output.print("var ρσ_eg_matched_" + idx + " = ρσ_eg_exceptions.slice()")
+                output.semicolon(), output.newline()
+                output.indent()
+                output.print("ρσ_eg_exceptions = []")
+                output.semicolon(), output.newline()
+
+            output.indent()
+            output.print("if (ρσ_eg_matched_" + idx + ".length > 0)")
+            output.space()
+            output.with_block(def():
+                if exception.argname:
+                    output.indent()
+                    output.print("var ")
+                    output.assign(exception.argname)
+                    output.print("(ρσ_Exception instanceof ExceptionGroup) ? new ExceptionGroup(ρσ_Exception.message, ρσ_eg_matched_" + idx + ") : ρσ_eg_matched_" + idx + "[0]")
+                    output.semicolon(), output.newline()
+                output.indent()
+                output.print("try")
+                output.space()
+                output.with_block(def():
+                    display_body(exception.body, False, output)
+                )
+                output.print(" catch (ρσ_eg_exc_" + idx + ")")
+                output.space()
+                output.with_block(def():
+                    output.indent()
+                    output.print("ρσ_eg_raised.push(ρσ_eg_exc_" + idx + ")")
+                    output.semicolon(), output.newline()
+                )
+                output.newline()
+            )
+            output.newline()
+
+        # Re-raise unmatched exceptions and any raised by handlers
+        output.indent()
+        output.print("var ρσ_eg_unhandled = ρσ_eg_exceptions.concat(ρσ_eg_raised)")
+        output.semicolon(), output.newline()
+        output.indent()
+        output.print("if (ρσ_eg_unhandled.length > 0)")
+        output.space()
+        output.with_block(def():
+            output.indent()
+            output.print("throw (ρσ_eg_unhandled.length === 1 && !(ρσ_Exception instanceof ExceptionGroup)) ? ρσ_eg_unhandled[0] : new ExceptionGroup((ρσ_Exception instanceof ExceptionGroup) ? ρσ_Exception.message : \"unhandled exceptions\", ρσ_eg_unhandled)")
+            output.semicolon(), output.newline()
+        )
+        output.newline()
+    )
+
+
+def print_finally(self, output, belse, else_var_name):
+    output.print("finally")
+    output.space()
+    if else_var_name:
+        output.with_block(def():
+            output.indent(), output.print("try")
+            output.space()
+            output.with_block(def():
+                print_else(belse, else_var_name, output)
+            )
+            print_finally(self, output)
+        )
+    else:
+        print_bracketed(self, output)
+
+
+def print_else(self, else_var_name, output):
+    output.indent(), output.spaced('if', '(' + else_var_name + ')')
+    output.space()
+    print_bracketed(self, output)