rapydscript-ns 0.8.3 → 0.8.4

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/modules.pyj

@@ -183,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)

package/src/output/operators.pyj

@@ -5,7 +5,7 @@ from ast import (
     AST_Array, AST_Assign, AST_BaseCall, AST_Binary, AST_Conditional,
     AST_ItemAccess, AST_NamedExpr, AST_Number, AST_Object, AST_Return, AST_Seq, AST_Set,
     AST_SimpleStatement, AST_Statement, AST_String, AST_Sub, AST_Symbol,
-    AST_SymbolRef, AST_Starred, AST_Unary, is_node_type
+    AST_SymbolRef, AST_Starred, AST_Unary, AST_AnnotatedAssign, is_node_type
 )
 from output.loops import unpack_tuple
 
@@ -13,6 +13,11 @@ from output.loops import unpack_tuple
 def print_getattr(self, output, skip_expression):  # AST_Dot
     if not skip_expression:
         expr = self.expression
+        # Redirect JSON.parse → ρσ_json_parse so RapydScript code gets dict-aware
+        # parsing without polluting the global JSON.parse for other JS on the page.
+        if is_node_type(expr, AST_SymbolRef) and expr.name == 'JSON' and self.property == 'parse':
+            output.print('ρσ_json_parse')
+            return
         expr.print(output)
     if is_node_type(expr, AST_Number) and expr.value >= 0:
         if not /[xa-f.]/i.test(output.last()):
@@ -482,7 +487,8 @@ def print_seq(output):
     or is_node_type(p, AST_Return)
     or is_node_type(p, AST_Array)
     or is_node_type(p, AST_BaseCall)
-    or is_node_type(p, AST_SimpleStatement):
+    or is_node_type(p, AST_SimpleStatement)
+    or is_node_type(p, AST_AnnotatedAssign):
         output.with_square(print_seq)
     else:
         print_seq()

package/src/output/statements.pyj

@@ -54,11 +54,11 @@ def first_in_statement(output):
             return False
 
 
-def declare_vars(vars, output):
+def declare_vars(vars, output, kind="var"):
     # declare all variables as local, unless explictly set otherwise
     if vars.length:
         output.indent()
-        output.print("var")
+        output.print(kind)
         output.space()
         for i, arg in enumerate(vars):
             if i:

package/src/output/stream.pyj

@@ -56,6 +56,7 @@ output_stream_defaults = {
     'write_name': True,
     'omit_function_metadata': False,
     'pythonize_strings': False,
+    'repl_mode': False,
 }
 
 class OutputStream:

package/src/output/treeshake.pyj

@@ -1,182 +1,182 @@
-# vim:fileencoding=utf-8
-# License: BSD
-from __python__ import hash_literals
-
-from ast import (
-    AST_Function, AST_Class, AST_SimpleStatement, AST_Assign,
-    AST_SymbolRef, AST_Dot, AST_Sub, AST_Imports, TreeWalker, is_node_type
-)
-from utils import has_prop
-
-
-def get_top_level_name(stmt):
-    if is_node_type(stmt, AST_Function) or is_node_type(stmt, AST_Class):
-        if stmt.name:
-            return stmt.name.name
-        return None
-    if is_node_type(stmt, AST_SimpleStatement):
-        body = stmt.body
-        if is_node_type(body, AST_Assign):
-            lhs = body.left
-            if is_node_type(lhs, AST_SymbolRef):
-                return lhs.name
-    return None
-
-
-def collect_refs_in_node(stmt, top_level_set, refs):
-    def visit_fn(node, descend):
-        if is_node_type(node, AST_SymbolRef):
-            if has_prop(top_level_set, node.name):
-                refs[node.name] = True
-    stmt.walk(TreeWalker(visit_fn))
-
-
-def compute_transitive_closure(body, direct_names, nonlocalvars):
-    nonlocal_set = {}
-    if nonlocalvars:
-        for nv in nonlocalvars:
-            nonlocal_set[nv] = True
-
-    name_map = {}
-    unnamed_stmts = []
-    for stmt in body:
-        name = get_top_level_name(stmt)
-        if name is not None:
-            name_map[name] = stmt
-        else:
-            unnamed_stmts.push(stmt)
-
-    top_level_set = {}
-    for name in Object.keys(name_map):
-        top_level_set[name] = True
-
-    needed = {}
-    queue = []
-
-    # Always include top-level assignments to nonlocal vars — they affect the
-    # global JavaScript scope and must never be filtered out.
-    for name in Object.keys(name_map):
-        if has_prop(nonlocal_set, name):
-            needed[name] = True
-            queue.push(name)
-
-    # Add directly imported names
-    for name in Object.keys(direct_names):
-        if not has_prop(needed, name):
-            needed[name] = True
-            queue.push(name)
-
-    # Unnamed statements (imports, if-blocks, bare expressions) are always
-    # included in output, so their references to named top-level items must
-    # also be included transitively.
-    always_refs = {}
-    for stmt in unnamed_stmts:
-        collect_refs_in_node(stmt, top_level_set, always_refs)
-    for ref_name in Object.keys(always_refs):
-        if not has_prop(needed, ref_name):
-            needed[ref_name] = True
-            queue.push(ref_name)
-
-    while queue.length > 0:
-        current = queue.shift()
-        if not has_prop(name_map, current):
-            continue
-        refs = {}
-        collect_refs_in_node(name_map[current], top_level_set, refs)
-        for ref_name in Object.keys(refs):
-            if not has_prop(needed, ref_name):
-                needed[ref_name] = True
-                queue.push(ref_name)
-
-    return needed
-
-
-def check_module_attr_access(main_body, info, alias_set):
-    def visit_fn(node, descend):
-        if is_node_type(node, AST_Dot):
-            expr = node.expression
-            if is_node_type(expr, AST_SymbolRef) and has_prop(alias_set, expr.name):
-                info.direct_names[node.property] = True
-                return True
-        if is_node_type(node, AST_Sub):
-            expr = node.expression
-            if is_node_type(expr, AST_SymbolRef) and has_prop(alias_set, expr.name):
-                info.can_tree_shake = False
-    for stmt in main_body:
-        stmt.walk(TreeWalker(visit_fn))
-
-
-def analyze_imports(main_body):
-    result = {}
-
-    # First pass: walk the entire AST recursively to collect all from-imports
-    # (including those nested inside functions or other scopes).
-    def visit_from_imports(node, descend):
-        if is_node_type(node, AST_Imports):
-            for imp in node.imports:
-                if imp.argnames:
-                    key = imp.key
-                    if not has_prop(result, key):
-                        result[key] = {'direct_names': {}, 'can_tree_shake': True}
-                    for argname in imp.argnames:
-                        result[key].direct_names[argname.name] = True
-    for stmt in main_body:
-        stmt.walk(TreeWalker(visit_from_imports))
-
-    # Second pass: handle top-level plain imports (import X as Y, import X).
-    # Attribute tracking via check_module_attr_access applies to main_body scope.
-    for stmt in main_body:
-        if not is_node_type(stmt, AST_Imports):
-            continue
-        for imp in stmt.imports:
-            if imp.argnames:
-                continue  # already handled in first pass
-            key = imp.key
-            if not has_prop(result, key):
-                result[key] = {'direct_names': {}, 'can_tree_shake': True}
-            info = result[key]
-            if imp.alias:
-                alias_set = {}
-                alias_set[imp.alias.name] = True
-                check_module_attr_access(main_body, info, alias_set)
-            else:
-                parts = key.split('.')
-                if parts.length > 1:
-                    # import X.Y with no alias: user accesses via X.Y.attr which
-                    # requires two-level dot traversal — disable tree-shaking safely
-                    info.can_tree_shake = False
-                else:
-                    alias_set = {}
-                    alias_set[parts[0]] = True
-                    check_module_attr_access(main_body, info, alias_set)
-
-    return result
-
-
-def tree_shake(ast, context):
-    import_infos = analyze_imports(ast.body)
-    for mod_key in Object.keys(import_infos):
-        info = import_infos[mod_key]
-        if not info.can_tree_shake:
-            continue
-        if not has_prop(ast.imports, mod_key):
-            continue
-        mod = ast.imports[mod_key]
-        # If body is missing (cached module), re-parse to get it
-        if not mod.body and mod.src_code:
-            parsed = context.parse(mod.src_code, {
-                'filename': mod.filename,
-                'module_id': mod_key,
-                'libdir': context.libdir,
-                'import_dirs': context.import_dirs or [],
-                'discard_asserts': context.discard_asserts,
-                'for_linting': True,
-            })
-            mod.body = parsed.body
-            mod.localvars = parsed.localvars
-            if not mod.nonlocalvars:
-                mod.nonlocalvars = parsed.nonlocalvars
-        if not mod.body:
-            continue
-        needed = compute_transitive_closure(mod.body, info.direct_names, mod.nonlocalvars)
-        mod.needed_names = needed
+# vim:fileencoding=utf-8
+# License: BSD
+from __python__ import hash_literals
+
+from ast import (
+    AST_Function, AST_Class, AST_SimpleStatement, AST_Assign,
+    AST_SymbolRef, AST_Dot, AST_Sub, AST_Imports, TreeWalker, is_node_type
+)
+from utils import has_prop
+
+
+def get_top_level_name(stmt):
+    if is_node_type(stmt, AST_Function) or is_node_type(stmt, AST_Class):
+        if stmt.name:
+            return stmt.name.name
+        return None
+    if is_node_type(stmt, AST_SimpleStatement):
+        body = stmt.body
+        if is_node_type(body, AST_Assign):
+            lhs = body.left
+            if is_node_type(lhs, AST_SymbolRef):
+                return lhs.name
+    return None
+
+
+def collect_refs_in_node(stmt, top_level_set, refs):
+    def visit_fn(node, descend):
+        if is_node_type(node, AST_SymbolRef):
+            if has_prop(top_level_set, node.name):
+                refs[node.name] = True
+    stmt.walk(TreeWalker(visit_fn))
+
+
+def compute_transitive_closure(body, direct_names, nonlocalvars):
+    nonlocal_set = {}
+    if nonlocalvars:
+        for nv in nonlocalvars:
+            nonlocal_set[nv] = True
+
+    name_map = {}
+    unnamed_stmts = []
+    for stmt in body:
+        name = get_top_level_name(stmt)
+        if name is not None:
+            name_map[name] = stmt
+        else:
+            unnamed_stmts.push(stmt)
+
+    top_level_set = {}
+    for name in Object.keys(name_map):
+        top_level_set[name] = True
+
+    needed = {}
+    queue = []
+
+    # Always include top-level assignments to nonlocal vars — they affect the
+    # global JavaScript scope and must never be filtered out.
+    for name in Object.keys(name_map):
+        if has_prop(nonlocal_set, name):
+            needed[name] = True
+            queue.push(name)
+
+    # Add directly imported names
+    for name in Object.keys(direct_names):
+        if not has_prop(needed, name):
+            needed[name] = True
+            queue.push(name)
+
+    # Unnamed statements (imports, if-blocks, bare expressions) are always
+    # included in output, so their references to named top-level items must
+    # also be included transitively.
+    always_refs = {}
+    for stmt in unnamed_stmts:
+        collect_refs_in_node(stmt, top_level_set, always_refs)
+    for ref_name in Object.keys(always_refs):
+        if not has_prop(needed, ref_name):
+            needed[ref_name] = True
+            queue.push(ref_name)
+
+    while queue.length > 0:
+        current = queue.shift()
+        if not has_prop(name_map, current):
+            continue
+        refs = {}
+        collect_refs_in_node(name_map[current], top_level_set, refs)
+        for ref_name in Object.keys(refs):
+            if not has_prop(needed, ref_name):
+                needed[ref_name] = True
+                queue.push(ref_name)
+
+    return needed
+
+
+def check_module_attr_access(main_body, info, alias_set):
+    def visit_fn(node, descend):
+        if is_node_type(node, AST_Dot):
+            expr = node.expression
+            if is_node_type(expr, AST_SymbolRef) and has_prop(alias_set, expr.name):
+                info.direct_names[node.property] = True
+                return True
+        if is_node_type(node, AST_Sub):
+            expr = node.expression
+            if is_node_type(expr, AST_SymbolRef) and has_prop(alias_set, expr.name):
+                info.can_tree_shake = False
+    for stmt in main_body:
+        stmt.walk(TreeWalker(visit_fn))
+
+
+def analyze_imports(main_body):
+    result = {}
+
+    # First pass: walk the entire AST recursively to collect all from-imports
+    # (including those nested inside functions or other scopes).
+    def visit_from_imports(node, descend):
+        if is_node_type(node, AST_Imports):
+            for imp in node.imports:
+                if imp.argnames:
+                    key = imp.key
+                    if not has_prop(result, key):
+                        result[key] = {'direct_names': {}, 'can_tree_shake': True}
+                    for argname in imp.argnames:
+                        result[key].direct_names[argname.name] = True
+    for stmt in main_body:
+        stmt.walk(TreeWalker(visit_from_imports))
+
+    # Second pass: handle top-level plain imports (import X as Y, import X).
+    # Attribute tracking via check_module_attr_access applies to main_body scope.
+    for stmt in main_body:
+        if not is_node_type(stmt, AST_Imports):
+            continue
+        for imp in stmt.imports:
+            if imp.argnames:
+                continue  # already handled in first pass
+            key = imp.key
+            if not has_prop(result, key):
+                result[key] = {'direct_names': {}, 'can_tree_shake': True}
+            info = result[key]
+            if imp.alias:
+                alias_set = {}
+                alias_set[imp.alias.name] = True
+                check_module_attr_access(main_body, info, alias_set)
+            else:
+                parts = key.split('.')
+                if parts.length > 1:
+                    # import X.Y with no alias: user accesses via X.Y.attr which
+                    # requires two-level dot traversal — disable tree-shaking safely
+                    info.can_tree_shake = False
+                else:
+                    alias_set = {}
+                    alias_set[parts[0]] = True
+                    check_module_attr_access(main_body, info, alias_set)
+
+    return result
+
+
+def tree_shake(ast, context):
+    import_infos = analyze_imports(ast.body)
+    for mod_key in Object.keys(import_infos):
+        info = import_infos[mod_key]
+        if not info.can_tree_shake:
+            continue
+        if not has_prop(ast.imports, mod_key):
+            continue
+        mod = ast.imports[mod_key]
+        # If body is missing (cached module), re-parse to get it
+        if not mod.body and mod.src_code:
+            parsed = context.parse(mod.src_code, {
+                'filename': mod.filename,
+                'module_id': mod_key,
+                'libdir': context.libdir,
+                'import_dirs': context.import_dirs or [],
+                'discard_asserts': context.discard_asserts,
+                'for_linting': True,
+            })
+            mod.body = parsed.body
+            mod.localvars = parsed.localvars
+            if not mod.nonlocalvars:
+                mod.nonlocalvars = parsed.nonlocalvars
+        if not mod.body:
+            continue
+        needed = compute_transitive_closure(mod.body, info.direct_names, mod.nonlocalvars)
+        mod.needed_names = needed