rapydscript-ns 0.8.2 → 0.8.4

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

@@ -1,6 +1,5 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-# globals:regenerate
 from __python__ import hash_literals
 
 from ast import AST_ClassCall, AST_New, has_calls, AST_Dot, AST_SymbolRef, is_node_type
@@ -151,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
@@ -263,21 +271,10 @@ def function_definition(self, output, strip_first, as_expression):
     if self.is_generator:
         output.print('()'), output.space()
         output.with_block(def():
-            if output.options.js_version >= 6:
-                output.indent()
-                output.print('function* js_generator')
-                function_args(self.argnames, output, strip_first)
-                print_bracketed(self, output, True, function_preamble)
-            else:
-                temp = OutputStream({'beautify':True})
-                temp.print('function* js_generator')
-                function_args(self.argnames, temp, strip_first)
-                print_bracketed(self, temp, True, function_preamble)
-                transpiled = regenerate(temp.get(), output.options.beautify).replace(/regeneratorRuntime.(wrap|mark)/g, 'ρσ_regenerator.regeneratorRuntime.$1')
-                if output.options.beautify:
-                    ci = output.make_indent(0)
-                    transpiled = [ci + x for x in transpiled.split('\n')].join('\n')
-                output.print(transpiled)
+            output.indent()
+            output.print('function* js_generator')
+            function_args(self.argnames, output, strip_first)
+            print_bracketed(self, output, True, function_preamble)
             output.newline()
             output.indent()
             output.spaced('var', 'result', '=', 'js_generator.apply(this,', 'arguments)')

package/src/output/jsx.pyj

@@ -0,0 +1,164 @@
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
+
+from ast import AST_String, AST_JSXText, AST_JSXSpread, AST_JSXExprContainer, is_node_type
+
+def _is_component_tag(tag):
+    # Components start with uppercase or use dot notation (e.g. Router.Route)
+    first = tag[0]
+    return (first >= 'A' and first <= 'Z') or '.' in tag
+
+def _needs_quoting(name):
+    # Attribute names containing non-identifier chars (e.g. aria-label) need quoting
+    return not v'/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name)'
+
+def _decode_html_entities(text):
+    # Decode HTML entities in a single pass to avoid double-decoding (e.g. &amp;lt; -> &lt;)
+    return text.replace(/&(?:#x([0-9a-fA-F]+)|#(\d+)|([a-zA-Z]+));/g, def(match, hex, dec, name):
+        if hex:
+            return String.fromCharCode(parseInt(hex, 16))
+        if dec:
+            return String.fromCharCode(parseInt(dec, 10))
+        if name is 'amp':
+            return '&'
+        if name is 'lt':
+            return '<'
+        if name is 'gt':
+            return '>'
+        if name is 'quot':
+            return '"'
+        if name is 'apos':
+            return "'"
+        if name is 'nbsp':
+            return '\u00a0'
+        return match
+    )
+
+def _normalize_jsx_whitespace(text):
+    # Implements the Babel JSX whitespace algorithm:
+    # - Split by newlines; trim leading whitespace from all lines except the first,
+    #   trailing whitespace from all lines except the last.
+    # - Lines that are empty after trimming are dropped.
+    # - Remaining non-empty lines are joined; each line except the last non-empty
+    #   gets a trailing space to separate it from the next.
+    lines = text.split('\n')
+    last_non_empty = -1
+    for i in range(lines.length):
+        if /[^ \t]/.test(lines[i]):
+            last_non_empty = i
+    result = ''
+    for i in range(lines.length):
+        line = lines[i].replace(/\t/g, ' ')
+        is_first = (i is 0)
+        is_last = (i is lines.length - 1)
+        if not is_first:
+            line = line.replace(/^[ ]+/, '')
+        if not is_last:
+            line = line.replace(/[ ]+$/, '')
+        if line:
+            if i is not last_non_empty:
+                line += ' '
+            result += line
+    return result
+
+def _process_jsx_text(text):
+    text = _normalize_jsx_whitespace(text)
+    if text:
+        text = _decode_html_entities(text)
+    return text
+
+def _print_tag(tag, output):
+    if _is_component_tag(tag):
+        output.print(tag)
+    else:
+        output.print('"')
+        output.print(tag)
+        output.print('"')
+
+def _print_props(props, output):
+    if not props or not props.length:
+        output.print('null')
+        return
+    output.print('{')
+    first = True
+    for prop in props:
+        if not first:
+            output.print(', ')
+        first = False
+        if is_node_type(prop, AST_JSXSpread):
+            output.print('...')
+            prop.expression.print(output)
+        else:
+            if _needs_quoting(prop.name):
+                output.print('"')
+                output.print(prop.name)
+                output.print('"')
+            else:
+                output.print(prop.name)
+            output.print(': ')
+            if prop.value is None:
+                output.print('true')
+            elif is_node_type(prop.value, AST_String):
+                output.print_string(prop.value.value)
+            else:
+                prop.value.print(output)
+    output.print('}')
+
+def _print_children(children, output):
+    for child in children:
+        if is_node_type(child, AST_JSXText):
+            text = _process_jsx_text(child.value)
+            if text:
+                output.print(', ')
+                output.print_string(text)
+        elif is_node_type(child, AST_JSXExprContainer):
+            output.print(', ')
+            child.expression.print(output)
+        else:
+            output.print(', ')
+            child.print(output)
+
+def print_jsx_element(self, output):
+    output.print('React.createElement(')
+    _print_tag(self.tag, output)
+    output.print(', ')
+    _print_props(self.props, output)
+    if not self.self_closing:
+        _print_children(self.children, output)
+    output.print(')')
+
+def print_jsx_fragment(self, output):
+    output.print('React.createElement(React.Fragment, null')
+    _print_children(self.children, output)
+    output.print(')')
+
+def print_jsx_attribute(self, output):
+    # Handled directly by _print_props; kept for completeness
+    if _needs_quoting(self.name):
+        output.print('"')
+        output.print(self.name)
+        output.print('"')
+    else:
+        output.print(self.name)
+    if self.value is not None:
+        output.print(': ')
+        if is_node_type(self.value, AST_String):
+            output.print_string(self.value.value)
+        else:
+            self.value.print(output)
+
+def print_jsx_spread(self, output):
+    # Handled directly by _print_props; kept for completeness
+    output.print('...')
+    self.expression.print(output)
+
+def print_jsx_text(self, output):
+    # Handled directly by _print_children; kept for completeness
+    text = _process_jsx_text(self.value)
+    if text:
+        output.print_string(text)
+
+def print_jsx_expr_container(self, output):
+    # Handled directly by _print_children; kept for completeness
+    self.expression.print(output)

package/src/output/literals.pyj

@@ -2,7 +2,7 @@
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals
 
-from ast import AST_Binary, AST_ObjectSpread, is_node_type
+from ast import AST_Binary, AST_ObjectSpread, AST_Spread, AST_SetItem, is_node_type
 
 def print_array(self, output):
     output.print('ρσ_list_decorate')
@@ -15,7 +15,11 @@ def print_array(self, output):
             for i, exp in enumerate(a):
                 if i:
                     output.comma()
-                exp.print(output)
+                if is_node_type(exp, AST_Spread):
+                    output.print('...')
+                    exp.expression.print(output)
+                else:
+                    exp.print(output)
             if len_ > 0:
                 output.space()
         )
@@ -78,6 +82,28 @@ def print_object(self, output):
             output.print("Object.create(null)" if self.is_jshash else '{}')
 
 def print_set(self, output):
+    # Check for spread items: {*a, 1, 2, *b}
+    has_spread = False
+    for item in self.items:
+        if is_node_type(item, AST_Spread):
+            has_spread = True
+            break
+    if has_spread:
+        # Compile as ρσ_set([...a, 1, 2, ...b])
+        output.print('ρσ_set')
+        output.with_parens(def():
+            output.with_square(def():
+                for i, item in enumerate(self.items):
+                    if i:
+                        output.comma()
+                    if is_node_type(item, AST_Spread):
+                        output.print('...')
+                        item.expression.print(output)
+                    else:
+                        item.value.print(output)
+            )
+        )
+        return
     if self.items.length is 0:
         output.print('ρσ_set()')
         return

package/src/output/loops.pyj

@@ -1,6 +1,5 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-# globals: regenerate
 from __python__ import hash_literals
 
 from ast import AST_BaseCall, AST_SymbolRef, AST_Array, AST_Unary, AST_Number, has_calls, AST_Seq, AST_ListComprehension, AST_Starred, is_node_type
@@ -436,8 +435,6 @@ def print_list_comprehension(self, output):
         output.with_block(def():
             body_out = output
             if is_generator:
-                if es5:
-                    body_out = OutputStream({'beautify':True})
                 body_out.indent()
                 body_out.print('function* js_generator()'), body_out.space(), body_out.print('{')
                 body_out.newline()
@@ -485,12 +482,6 @@ def print_list_comprehension(self, output):
             if is_generator:
                 output.set_indentation(previous_indentation)
                 body_out.newline(), body_out.indent(), body_out.print('}')  # end js_generator
-                if es5:
-                    transpiled = regenerate(body_out.get(), output.options.beautify).replace(/regeneratorRuntime.(wrap|mark)/g, 'ρσ_regenerator.regeneratorRuntime.$1')
-                    if output.options.beautify:
-                        ci = output.make_indent(0)
-                        transpiled = [ci + x for x in transpiled.split('\n')].join('\n')
-                    output.print(transpiled)
                 output.newline(), output.indent()
                 output.spaced('var', 'result', '=', 'js_generator.call(this)')
                 output.end_statement()

package/src/output/modules.pyj

@@ -18,7 +18,7 @@ def write_imports(module, output):
     imports = []
     for import_id in Object.keys(module.imports):
         imports.push(module.imports[import_id])
-    imports.sort(def(a, b):
+    imports.jssort(def(a, b):
         a, b = a.import_order, b.import_order
         return -1 if a < b else (1 if a > b else 0)
     )
@@ -122,9 +122,6 @@ def prologue(module, output):
         output.indent(), output.spaced('if(', 'typeof', 'HTMLCollection', '!==', '"undefined"', '&&', 'typeof', 'Symbol', '===', '"function")',
             'NodeList.prototype[Symbol.iterator]', '=', 'HTMLCollection.prototype[Symbol.iterator]', '=', 'NamedNodeMap.prototype[Symbol.iterator]', '=', 'Array.prototype[Symbol.iterator]')
         output.end_statement()
-    needs_yield = output.options.js_version < 6 and module.baselib['yield']
-    if needs_yield:
-        output.dump_yield()
     # output the baselib
     if not output.options.baselib_plain:
         raise ValueError('The baselib is missing! Remember to set the baselib_plain field on the options for OutputStream')
@@ -186,7 +183,7 @@ def print_top_level(self, output):
             write_imports(self, output)
             write_main_name(output)
 
-        declare_vars(self.localvars, output)
+        declare_vars(self.localvars, output, "var" if output.options.repl_mode else "let")
         display_body(self.body, True, output)
         if self.comments_after and self.comments_after.length:
             output_comments(self.comments_after, output)