rapydscript-ns 0.8.3 → 0.8.4

package/src/output/classes.pyj

@@ -82,19 +82,75 @@ def print_class(output):
         output.with_block(def():
             output.indent()
             cname = self.name.name
-            output.print('if (!(this instanceof ' + cname + ')) return new ' + cname + '(...arguments);')
-            output.newline()
+            if self.has_new:
+                # When __new__ is defined, call it to get the instance
+                output.print('if (!(this instanceof ' + cname + '))')
+                output.space()
+                output.with_block(def():
+                    output.indent()
+                    output.print('var ρσ_instance = ')
+                    self.name.print(output)
+                    output.print('.__new__(')
+                    self.name.print(output)
+                    output.print(', ...arguments)')
+                    output.end_statement()
+                    output.indent()
+                    output.print('if (ρσ_instance instanceof ')
+                    self.name.print(output)
+                    output.print(')')
+                    output.space()
+                    output.with_block(def():
+                        output.indent()
+                        output.spaced('if', '(ρσ_instance.ρσ_object_id', '===', 'undefined)', 'Object.defineProperty(ρσ_instance,', '"ρσ_object_id",', '{"value":++ρσ_object_counter})')
+                        output.end_statement()
+                        if self.bound.length:
+                            output.indent()
+                            self.name.print(output), output.print('.prototype.__bind_methods__ && ')
+                            self.name.print(output), output.print('.prototype.__bind_methods__.call(ρσ_instance)')
+                            output.end_statement()
+                        output.indent()
+                        self.name.print(output)
+                        output.print('.prototype.__init__.apply(ρσ_instance'), output.comma(), output.print('arguments)')
+                        output.end_statement()
+                    )
+                    output.newline()
+                    output.indent()
+                    output.print('return ρσ_instance')
+                    output.end_statement()
+                )
+                output.newline()
+            else:
+                output.print('if (!(this instanceof ' + cname + ')) return new ' + cname + '(...arguments);')
+                output.newline()
             output.indent()
             output.spaced('if', '(this.ρσ_object_id', '===', 'undefined)', 'Object.defineProperty(this,', '"ρσ_object_id",', '{"value":++ρσ_object_counter})')
             output.end_statement()
-            if self.bound.length:
+            if self.has_attr_dunders:
+                # Wrap in a Proxy so __getattr__/__setattr__/__delattr__/__getattribute__ are triggered.
                 output.indent()
-                self.name.print(output), output.print(".prototype.__bind_methods__.call(this)")
+                output.print('var ρσ_proxy = ρσ_JS_Proxy ? new ρσ_JS_Proxy(this, ρσ_attr_proxy_handler) : this')
+                output.end_statement()
+                if self.bound.length:
+                    output.indent()
+                    self.name.print(output), output.print(".prototype.__bind_methods__ && ")
+                    self.name.print(output), output.print(".prototype.__bind_methods__.call(ρσ_proxy)")
+                    output.end_statement()
+                output.indent()
+                self.name.print(output)
+                output.print(".prototype.__init__.apply(ρσ_proxy"), output.comma(), output.print('arguments)')
+                output.end_statement()
+                output.indent()
+                output.print('return ρσ_proxy')
+                output.end_statement()
+            else:
+                if self.bound.length:
+                    output.indent()
+                    self.name.print(output), output.print(".prototype.__bind_methods__.call(this)")
+                    output.end_statement()
+                output.indent()
+                self.name.print(output)
+                output.print(".prototype.__init__.apply(this"), output.comma(), output.print('arguments)')
                 output.end_statement()
-            output.indent()
-            self.name.print(output)
-            output.print(".prototype.__init__.apply(this"), output.comma(), output.print('arguments)')
-            output.end_statement()
         )
 
     decorators = self.decorators or v'[]'
@@ -235,6 +291,13 @@ def print_class(output):
             output.end_statement()
         )
 
+    # Python semantics: defining __eq__ without __hash__ makes the class unhashable
+    if defined_methods['__eq__'] and not defined_methods['__hash__']:
+        output.indent()
+        self.name.print(output)
+        output.print('.prototype.__hash__ = null')
+        output.end_statement()
+
     # Multiple inheritance
     add_hidden_property('__bases__', def():
         output.print('[')
@@ -256,6 +319,43 @@ 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
+    if self.parent:
+        output.indent()
+        output.print('if (typeof ')
+        self.parent.print(output)
+        output.print('.__init_subclass__ === "function")')
+        output.space()
+        kws = self.class_kwargs
+        if kws and kws.length:
+            output.with_block(def():
+                output.indent()
+                output.print('var ρσ_isc_kw = {')
+                for v'var ρσ_kwi = 0; ρσ_kwi < kws.length; ρσ_kwi++':
+                    if ρσ_kwi > 0:
+                        output.comma()
+                    output.print(kws[ρσ_kwi][0].name + ':')
+                    output.space()
+                    kws[ρσ_kwi][1].print(output)
+                output.print('}')
+                output.end_statement()
+                output.indent()
+                output.print('ρσ_isc_kw[ρσ_kwargs_symbol] = true')
+                output.end_statement()
+                output.indent()
+                self.parent.print(output)
+                output.print('.__init_subclass__.call(')
+                self.name.print(output)
+                output.print(', ρσ_isc_kw)')
+                output.end_statement()
+            )
+        else:
+            self.parent.print(output)
+            output.print('.__init_subclass__.call(')
+            self.name.print(output)
+            output.print(')')
+            output.end_statement()
+
     if self.bases.length > 1:
         output.indent()
         output.print("ρσ_mixin(")

package/src/output/codegen.pyj

@@ -13,13 +13,14 @@ from ast import (
     AST_EmptyStatement, AST_Exit, AST_ExpressiveObject, AST_ForIn,
     AST_ForJS, AST_Function, AST_Hole, AST_If, AST_Imports, AST_Infinity,
     AST_Lambda, AST_ListComprehension, AST_LoopControl, AST_NaN, AST_NamedExpr, AST_New, AST_Node,
-    AST_Number, AST_Object, AST_ObjectKeyVal, AST_ObjectProperty, AST_ObjectSpread, AST_PropAccess,
+    AST_Number, AST_Object, AST_ObjectKeyVal, AST_ObjectProperty, AST_ObjectSpread, AST_Spread, AST_PropAccess,
     AST_RegExp, AST_Return, AST_Set, AST_Seq, AST_SimpleStatement, AST_Splice,
     AST_Statement, AST_StatementWithBody, AST_String, AST_Sub, AST_ItemAccess,
     AST_Symbol, AST_This, AST_Throw, AST_Toplevel, AST_Try, AST_Unary,
     AST_UnaryPrefix, AST_Undefined, AST_Var, AST_VarDef, AST_Assert,
     AST_Verbatim, AST_While, AST_With, AST_Yield, AST_Await, TreeWalker, AST_Existential,
-    AST_Match, AST_AnnotatedAssign, AST_Super
+    AST_Match, AST_AnnotatedAssign, AST_Super,
+    AST_JSXElement, AST_JSXFragment, AST_JSXAttribute, AST_JSXSpread, AST_JSXText, AST_JSXExprContainer
 )
 from output.exceptions import print_try
 from output.classes import print_class
@@ -34,6 +35,7 @@ from output.operators import (
 )
 from output.functions import print_function, print_function_call
 from output.statements import print_bracketed, first_in_statement, force_statement, print_with, print_assert, print_match, print_annotated_assign
+from output.jsx import print_jsx_element, print_jsx_fragment, print_jsx_attribute, print_jsx_spread, print_jsx_text, print_jsx_expr_container
 from output.utils import make_block, make_num
 
 # -----[ code generators ]-----
@@ -486,6 +488,10 @@ def generate_code():
         output.print('**')
         self.value.print(output)
     )
+    DEFPRINT(AST_Spread, def(self, output):
+        output.print('...')
+        self.expression.print(output)
+    )
     DEFPRINT(AST_Set, print_set)
 
     AST_Symbol.prototype.definition = def():
@@ -525,3 +531,11 @@ def generate_code():
         output.print(make_num(self.value))
     )
     DEFPRINT(AST_RegExp, print_regexp)
+
+    # -----[ JSX ]-----
+    DEFPRINT(AST_JSXElement, print_jsx_element)
+    DEFPRINT(AST_JSXFragment, print_jsx_fragment)
+    DEFPRINT(AST_JSXAttribute, print_jsx_attribute)
+    DEFPRINT(AST_JSXSpread, print_jsx_spread)
+    DEFPRINT(AST_JSXText, print_jsx_text)
+    DEFPRINT(AST_JSXExprContainer, print_jsx_expr_container)

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,105 +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
-
-
-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):
-    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 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)

package/src/output/functions.pyj

@@ -150,6 +150,15 @@ def function_preamble(node, output, offset):
         output.print('.pop()')
         output.end_statement()
 
+    # Convert the plain JS kwargs object to a proper Python dict so that
+    # kw.items(), kw.keys(), etc. work in the function body.
+    # This must happen AFTER defaults/kwonly/starargs processing which rely on
+    # plain property access (kw.name) and ρσ_kwargs_symbol checks.
+    if a.kwargs:
+        output.indent()
+        output.spaced(kw, '=', 'ρσ_kwargs_to_dict(' + kw + ')')
+        output.end_statement()
+
 def has_annotations(self):
     if self.return_annotation:
         return True