rapydscript-ng 0.7.18 → 0.7.22

package/release/signatures.json

@@ -1,30 +1,31 @@
 {
-    "ast": "1146ab4709bdfa631410b9ff162612d8e7a78551",
-    "baselib-builtins": "681435f650d8c3a7621703b54fcc038048b1f577",
-    "baselib-containers": "bf6799ed79ba4aacd8c59dac9275f060907dc325",
+    "ast": "7a1a1800d9ee7af7f7153eee38002e4e9dcfb71e",
+    "baselib-builtins": "50927b38fded9bd9dbe14c42a20dd8e930ac021f",
+    "baselib-containers": "f7ac21a4dfc6311693239ea1eb45e74fae45a3f5",
     "baselib-errors": "f2423e1e2489bdd7fb8c8725bb76436898c8008c",
-    "baselib-internal": "dab57c2bfc07bf761e46dc7469969668fefe7a7c",
+    "baselib-internal": "1b77d40970a8ef2d886132dc7c21c9510d2eb4cd",
     "baselib-itertools": "ab1f3257642c8d26fab1ff9d392814a459a60cdb",
-    "baselib-str": "532d9d31003b9e19b4505e062a40365d29e693fa",
+    "baselib-str": "8c396e4fae02ae34b6d3d805becf7bfdd36625ee",
     "compiler": "cfbfceb0439fed3302f78d80b303dca713b25e7b",
     "errors": "d1b33848d19b141e19cc079cf78421f29b6d2c05",
     "output/__init__": "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-    "output/classes": "dd1ac2387a01da170b0c984ba33b6994d702db80",
-    "output/codegen": "b8970a936267f1fcb00c821961237fc25cb9efe6",
+    "output/classes": "d05c1992cc91b337a4e4ff137b0aa3d626e6624b",
+    "output/codegen": "0519a88c2704fe60b98fe747ca39f6be43b9abf3",
+    "output/comments": "78ec38d8b34da96c078653e2d0d4049d7003906b",
     "output/exceptions": "c7d90155694c7108e94d0940a160ae83725421d7",
-    "output/functions": "9067d5c2b22277a65e9653d0f6ebdeb4dd2027f9",
+    "output/functions": "abaa81b171359eb77be6ea87cbdf9d7421d4622b",
     "output/literals": "fdbfb744fec8dfea1e1c62cb49767c60160fd402",
     "output/loops": "f59cc623320f57edb01953f7877d712758e9f825",
-    "output/modules": "e5d60443c0d84fa303b4ad68a4d051bf5c54e01c",
-    "output/operators": "c1b45fd5b97329f46d4437ee5e70d0ff601db82e",
-    "output/statements": "ea38bdd2ca8a5fe0ceaa2c88d4a7b058df02675e",
-    "output/stream": "66d54f69f4ed1bba506d243b39cc425fb82394c0",
+    "output/modules": "bd3e3f3f6794fb6e401867b4d011c4e3aab98893",
+    "output/operators": "f8142836a13b75680cb4874391db9e871fad0cad",
+    "output/statements": "7d8dfdc0b43e3e430be7ce3b23ffaf1b41408d8c",
+    "output/stream": "46375cb467477ac898546e818bfdfa5be738c352",
     "output/utils": "595968f96f6fdcc51eb41c34d64c92bb595e3cb1",
-    "parse": "469e4fbdf935b03939f5d45397759f8eec872f77",
-    "string_interpolation": "a1d336a7b11ac5760e004e79a82eb558be6f0368",
-    "tokenizer": "1a0f90773ee7050a1b3c8fee2c059f3c9d5b9f6b",
+    "parse": "d5c1a77662dfcff841dfcd368d5dbb129a592f5d",
+    "string_interpolation": "bff1cc76d772d24d35707f6c794f38734ca08376",
+    "tokenizer": "00fc24a41edac9f9b31735e6290348005a623cef",
     "unicode_aliases": "79ac6eaa5e6be44a5397d62c561f854a8fe7528e",
     "utils": "c1666db819aa7c8db38697e34e18362e3cb45869",
-    "#compiler#": "d4261f3ec5afc29831ed8295d61c84e4ce8418a6",
-    "#compiled_with#": "d4261f3ec5afc29831ed8295d61c84e4ce8418a6"
+    "#compiler#": "d98fcbb15d08dae74d9c7371ea28fea676642e67",
+    "#compiled_with#": "d98fcbb15d08dae74d9c7371ea28fea676642e67"
 }

package/src/ast.pyj

@@ -326,6 +326,7 @@ class AST_Toplevel(AST_Scope):
         'classes': "[Object/S] a map of class names to AST_Class for classes defined in this module",
         'filename': "[string] The absolute path to the file from which this module was read",
         'srchash': "[string] SHA1 hash of source code, used for caching",
+        'comments_after': '[array] True iff there were comments before this token',
     }
 
 class AST_Import(AST_Statement):
@@ -411,7 +412,7 @@ class AST_Class(AST_Scope):
         'init': "[AST_Function] constructor for the class",
         'parent': "[AST_Symbol?] parent class this class inherits from",
         'bases': "[AST_Symbol*] list of base classes this class inherits from",
-        "static": "[string*] list of static methods",
+        "static": "[dict] A hash whose keys are names of static methods for this class",
         'external': "[boolean] true if class is declared elsewhere, but will be within current scope at runtime",
         'bound': "[string*] list of methods that need to be bound to self",
         'decorators': "[AST_Decorator*] function decorators, if any",
@@ -718,6 +719,7 @@ class AST_ItemAccess(AST_PropAccess):
     'Python index-style property access, i.e. `a.__getitem__("foo")`'
     properties = {
         'assignment': "[AST_Node or None] Not None if this is an assignment (a[x] = y) rather than a simple access",
+        'assign_operator': "[String] The operator for a assignment like += or empty string if plain assignment",
     }
 
     def _walk(self, visitor):

package/src/baselib-builtins.pyj

@@ -15,13 +15,19 @@ def ρσ_print():
         console.log(parts.join(' '))
 
 def ρσ_int(val, base):
-    ans = parseInt(val, base or 10)
+    if jstype(val) is "number":
+        ans = val | 0
+    else:
+        ans = parseInt(val, base or 10)
     if isNaN(ans):
         raise ValueError('Invalid literal for int with base ' + (base or 10) + ': ' + val)
     return ans
 
-def ρσ_float():
-    ans = parseFloat.apply(None, arguments)
+def ρσ_float(val):
+    if jstype(val) is "number":
+        ans = val
+    else:
+        ans = parseFloat(val)
     if isNaN(ans):
         raise ValueError('Could not convert string to float: ' + arguments[0])
     return ans
@@ -171,6 +177,11 @@ def ρσ_range(start, stop, step):
         if not this._cached:
             this._cached = list(this)
         return this._cached.index(val)
+    ans.__len__ = def():
+        return length
+    ans.__repr__ = def():
+        return f'range({start}, {stop}, {step})'
+    ans.__str__ = ans.toString = ans.__repr__
     if jstype(Proxy) is 'function':
         ans = new Proxy(ans, {
             'get': def(obj, prop):

package/src/baselib-containers.pyj

@@ -81,6 +81,8 @@ def ρσ_list_index(val, start, stop):
 def ρσ_list_pop(index):
     if this.length is 0:
         raise IndexError('list is empty')
+    if index is undefined:
+        index = -1
     ans = this.splice(index, 1)
     if not ans.length:
         raise IndexError('pop index out of range')
@@ -464,7 +466,7 @@ Object.defineProperties(ρσ_set.prototype, {
             s.add(r.value)
             r = iterator.next()
 
-ρσ_set.prototype.toString = ρσ_set.prototype.inspect = def():
+ρσ_set.prototype.toString = ρσ_set.prototype.__repr__ = ρσ_set.prototype.__str__ = ρσ_set.prototype.inspect = def():
     return '{' + list(this).join(', ') + '}'
 
 ρσ_set.prototype.__eq__ = def(other):
@@ -630,11 +632,16 @@ Object.defineProperties(ρσ_dict.prototype, {
     return ans
 
 ρσ_dict.prototype.popitem = def ():
-    r = this.jsmap.entries().next()
-    if r.done:
-        raise KeyError('dict is empty')
-    this.jsmap.delete(r.value[0])
-    return r.value
+    last = None
+    e = this.jsmap.entries()
+    while True:
+        r = e.next()
+        if r.done:
+            if last is None:
+                raise KeyError('dict is empty')
+            this.jsmap.delete(last.value[0])
+            return last.value
+        last = r
 
 ρσ_dict.prototype.update = def ():
     if arguments.length is 0:

package/src/baselib-internal.pyj

@@ -1,7 +1,7 @@
 # vim:fileencoding=utf-8
 # License: BSD
 
-# globals: exports, console, ρσ_iterator_symbol, ρσ_kwargs_symbol, ρσ_arraylike, ρσ_list_contains, ρσ_list_constructor, ρσ_str
+# globals: exports, console, ρσ_iterator_symbol, ρσ_kwargs_symbol, ρσ_arraylike, ρσ_list_contains, ρσ_list_constructor, ρσ_str, ρσ_int, ρσ_float
 
 def ρσ_eslice(arr, step, start, end):
     if jstype(arr) is 'string' or v'arr instanceof String':
@@ -261,6 +261,10 @@ def ρσ_instanceof():
             return True
         if q is ρσ_str and (jstype(obj) is 'string' or v'obj instanceof String'):
             return True
+        if q is ρσ_int and (jstype(obj) is 'number' and Number.isInteger(obj)):
+            return True
+        if q is ρσ_float and (jstype(obj) is 'number' and not Number.isInteger(obj)):
+            return True
         if bases.length > 1:
             for v'var c = 1; c < bases.length; c++':
                 cls = bases[c]

package/src/baselib-str.pyj

@@ -4,6 +4,14 @@
 
 # globals: ρσ_kwargs_symbol, ρσ_list_decorate, ρσ_iterator_symbol, HTMLElement
 
+# Locale can’t be changed in-flight, so we just retrieve this once.
+# Sadly older node versions (< 8) don’t support formatToParts
+# decimal_sep = Intl.NumberFormat() \
+#     .formatToParts(1.1) \
+#     .find(def(part): return part.type == 'decimal';) \
+#     .value
+decimal_sep = (1.1).toLocaleString()[1]
+
 def ρσ_repr_js_builtin(x, as_array):
     ans = v'[]'
     b = '{}'
@@ -174,7 +182,7 @@ define_str_func('format', def ():
                 (\#)? # integer base specifier
                 (0)? # zero-padding
                 (\d+)? # width
-                ([,_])? # use a comma thousands-seperator
+                ([,_])? # use a grouping (thousands) seperator
                 (?:\.(\d+))? # precision
                 ([bcdeEfFgGnosxX%])? # type
             ///
@@ -253,7 +261,7 @@ define_str_func('format', def ():
                 else:
                     value = value.toExponential(prec - 1)
                 value = value.replace(/0+$/g, '')
-                if value[-1] is '.':
+                if value[-1] is decimal_sep:
                     value = value[:-1]
                 if ftype is 'G':
                     value = value.toUpperCase()
@@ -334,6 +342,9 @@ define_str_func('format', def ():
         key, transformer, format_spec = parse_markup(markup)
         if transformer and v"['a', 'r', 's']".indexOf(transformer) is -1:
             raise ValueError('Unknown conversion specifier: ' + transformer)
+        ends_with_equal = key.endsWith('=')
+        if ends_with_equal:
+            key = key[:-1]
         lkey = key.length and split(key, /[.\[]/, 1)[0]
         if lkey:
             explicit = True
@@ -359,6 +370,8 @@ define_str_func('format', def ():
         ans = '' + object
         if format_spec:
             ans = apply_formatting(ans, format_spec)
+        if ends_with_equal:
+            ans = f'{key}={ans}'
         return ans
 
 

package/src/lib/elementmaker.pyj

@@ -3,12 +3,12 @@
 
 html_elements = {
     'a', 'abbr', 'acronym', 'address', 'area',
-    'article', 'aside', 'audio', 'b', 'big', 'blockquote', 'br', 'button',
+    'article', 'aside', 'audio', 'b', 'base', 'big', 'body', 'blockquote', 'br', 'button',
     'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
     'command', 'datagrid', 'datalist', 'dd', 'del', 'details', 'dfn',
     'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'event-source', 'fieldset',
     'figcaption', 'figure', 'footer', 'font', 'form', 'header', 'h1',
-    'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'iframe', 'img', 'input', 'ins',
+    'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'head', 'i', 'iframe', 'img', 'input', 'ins',
     'keygen', 'kbd', 'label', 'legend', 'li', 'm', 'map', 'menu', 'meter',
     'multicol', 'nav', 'nextid', 'ol', 'output', 'optgroup', 'option',
     'p', 'pre', 'progress', 'q', 's', 'samp', 'script', 'section', 'select',

package/src/lib/gettext.pyj

@@ -531,29 +531,31 @@ def register_callback(func):
     register_callback.install_callbacks.push(func)
 register_callback.install_callbacks = v'[]'
 
+empty_translation_data = {'entries': {}}
+
 class Translations:
 
     def __init__(self, translation_data):
-        translation_data = translation_data or {}
-        func = _get_plural_forms_function(translation_data['plural_forms'])
+        translation_data = translation_data or empty_translation_data
+        func = _get_plural_forms_function(translation_data.plural_forms)
         self.translations = [[translation_data, func]]
         self.language = translation_data['language']
 
     def add_fallback(self, fallback):
-        fallback = fallback or {}
-        func = _get_plural_forms_function(fallback['plural_forms'])
+        fallback = fallback or empty_translation_data
+        func = _get_plural_forms_function(fallback.plural_forms)
         self.translations.push([fallback, func])
 
     def gettext(self, text):
         for t in self.translations:
-            m = t[0]['entries']
+            m = t[0].entries
             if has_prop(m, text):
                 return m[text][0]
         return text
 
     def ngettext(self, text, plural, n):
         for t in self.translations:
-            m = t[0]['entries']
+            m = t[0].entries
             if has_prop(m, text):
                 idx = t[1](n)
                 return m[text][idx] or (text if n is 1 else plural)
@@ -565,4 +567,3 @@ class Translations:
             return self.gettext.apply(self, arguments)
         _ngettext = def ():
             return self.ngettext.apply(self, arguments)
-

package/src/lib/random.pyj

@@ -30,6 +30,7 @@
             ρσ_seed_state.key[ρσ_seed_state.key_j]) % 256]
 
 def seed(x=Date().getTime()):
+    ρσ_seed_state.key_i = ρσ_seed_state.key_j = 0
     if jstype(x) is 'number':
         x = x.toString()
     elif jstype(x) is not 'string':

package/src/lib/re.pyj

@@ -125,9 +125,12 @@ def _expand(groups, repl, group_name_map):
         return '\\' + q
 
     ans = ch = ''
-    while (ch = next()):
+    while True:
+        ch = next()
         if ch is '\\':
             ans += read_escape_sequence()
+        elif not ch:
+            break
         else:
             ans += ch
     return ans
@@ -184,8 +187,6 @@ def transform_regex(source, flags):
                         flags |= flag_map[q]
                     pos = close + 1
                     continue
-                if extension is '<':
-                    raise SyntaxError('Look behind assertions are not supported in JavaScript')
                 if extension is '(':
                     raise SyntaxError('Group existence assertions are not supported in JavaScript')
                 if extension is 'P':

package/src/lib/traceback.pyj

@@ -2,18 +2,30 @@
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 # globals: ρσ_str, ρσ_last_exception
 
+
 def _get_internal_traceback(err):
     if isinstance(err, Exception) and err.stack:
         lines = ρσ_str.splitlines(err.stack)
+        final_lines = v'[]'
+        found_sentinel = False
         for i, line in enumerate(lines):
-            line = ρσ_str.strip(line)
+            sline = ρσ_str.strip(line)
+            if i is 0:
+                final_lines.push(line)
+                continue
+            if found_sentinel:
+                final_lines.push(line)
+                continue
             # These two conditions work on desktop Chrome and Firefox to identify the correct
             # line in the traceback.
-            if line.startsWith('at new ' + err.name) or line.startsWith(err.name + '@'):
-                return err.__repr__() + '\n' +  lines.slice(i+1).join('\n')
+            if sline.startsWith('at new ' + err.name) or sline.startsWith(err.name + '@'):
+                found_sentinel = True
+        return final_lines.join('\n')
     return err and err.stack
 
 def format_exception(exc, limit):
+    if jstype(exc) is 'undefined':
+        exc = ρσ_last_exception
     if not isinstance(exc, Error):
         if exc and exc.toString:
             return [exc.toString()]
@@ -22,7 +34,7 @@ def format_exception(exc, limit):
     if tb:
         lines = ρσ_str.splitlines(tb)
         e = lines[0]
-        lines = [l for l in lines[1:]]
+        lines = lines[1:]
         if limit:
             lines = lines[:limit+1] if limit > 0 else lines[limit:]
         lines.reverse()

package/src/output/classes.pyj

@@ -5,6 +5,7 @@ from __python__ import hash_literals
 from ast import AST_Class, AST_Method, is_node_type
 from output.functions import decorate, function_definition, function_annotation
 from output.utils import create_doctring
+from utils import has_prop
 
 def print_class(output):
     self = this
@@ -14,7 +15,7 @@ def print_class(output):
     def class_def(method, is_var):
         output.indent()
         self.name.print(output)
-        if not is_var and method and self.static.indexOf(method) is not -1:
+        if not is_var and method and has_prop(self.static, method):
             output.assign("." + method)
         else:
             if is_var:
@@ -27,7 +28,7 @@ def print_class(output):
         if not is_property:
             class_def(name)
         # only strip first argument if the method is static
-        is_static = self.static.indexOf(name) is not -1
+        is_static = has_prop(self.static, name)
         strip_first = not is_static
 
         # decorate the method
@@ -74,15 +75,25 @@ def print_class(output):
             output.end_statement()
         )
 
-    # decorate the class
-    if self.decorators and self.decorators.length:
+    decorators = self.decorators or v'[]'
+    if decorators.length:
         output.print('var ')
         output.assign(self.name)
-        decorate(self.decorators, output, write_constructor)
+        write_constructor()
         output.semicolon()
     else:
         write_constructor()
     output.newline()
+    if decorators.length:
+        output.indent()
+        self.name.print(output)
+        output.spaced('.ρσ_decorators', '=', '[')
+        num = decorators.length
+        for i in range(num):
+            decorators[i].expression.print(output)
+            output.spaced(',' if i < num - 1 else ']')
+        output.semicolon()
+        output.newline()
 
     # inheritance
     if self.parent:
@@ -233,3 +244,20 @@ def print_class(output):
             output.indent()
             stmt.print(output)
             output.newline()
+
+    if decorators.length:
+        output.indent()
+        output.assign(self.name)
+        for di in range(decorators.length):
+            self.name.print(output)
+            output.print(f'.ρσ_decorators[{di}](')
+        self.name.print(output)
+        output.print(')' * decorators.length)
+        output.semicolon()
+        output.newline()
+        output.indent()
+        output.spaced('delete ')
+        self.name.print(output)
+        output.print('.ρσ_decorators')
+        output.semicolon()
+        output.newline()

package/src/output/codegen.pyj

@@ -8,9 +8,9 @@ from utils import noop
 from parse import PRECEDENCE
 from ast import (
     AST_Array, AST_Assign, AST_BaseCall, AST_Binary, AST_BlockStatement, AST_Break,
-    AST_Catch, AST_Class, AST_Conditional, AST_Constant, AST_Continue,
+    AST_Class, AST_Conditional, AST_Constant, AST_Continue,
     AST_Debugger, AST_Definitions, AST_Directive, AST_Do, AST_Dot, is_node_type,
-    AST_EmptyStatement, AST_Exit, AST_ExpressiveObject, AST_Finally, AST_ForIn,
+    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_New, AST_Node,
     AST_Number, AST_Object, AST_ObjectKeyVal, AST_ObjectProperty, AST_PropAccess,
@@ -25,6 +25,7 @@ from output.classes import print_class
 from output.literals import print_array, print_obj_literal, print_object, print_set, print_regexp
 from output.loops import print_do_loop, print_while_loop, print_for_loop_body, print_for_in, print_list_comprehension
 from output.modules import print_top_level, print_imports
+from output.comments import print_comments
 from output.operators import (
     print_getattr, print_getitem, print_rich_getitem, print_splice_assignment,
     print_unary_prefix, print_binary_op, print_assign,
@@ -57,42 +58,8 @@ def generate_code():
 
     # -----[ comments ]-----
     AST_Node.prototype.add_comments = def(output):
-        c = output.options.comments
-        self = this
-        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 []).concat(self.value.start.comments_before)
-                    self.value.start.comments_before = []
-
-                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)
-                    )
-
-                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 start.nlb:
-                            output.print("\n")
-                            output.indent()
-                        else:
-                            output.space()
-
-
+        if not is_node_type(this, AST_Toplevel):
+            print_comments(this, output)
 
     # -----[ PARENTHESES ]-----
     def PARENS(nodetype, func):

package/src/output/comments.pyj

@@ -0,0 +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)

package/src/output/functions.pyj

@@ -10,6 +10,12 @@ from output.utils import create_doctring
 from output.operators import print_getattr
 
 anonfunc = 'ρσ_anonfunc'
+module_name = 'null'
+
+def set_module_name(x):
+    nonlocal module_name
+    module_name = '"' + x + '"' if x else 'null'
+
 
 # Function definition {{{
 
@@ -148,7 +154,7 @@ def function_annotation(self, output, strip_first, name):
             output.print('true')
 
     # Create __argnames__
-    if self.argnames.length:
+    if self.argnames.length > (1 if strip_first else 0):
         props.__argnames__ = def():
             output.print('[')
             for i, arg in enumerate(self.argnames):
@@ -164,29 +170,28 @@ def function_annotation(self, output, strip_first, name):
         props.__doc__ = def():
             output.print(JSON.stringify(create_doctring(self.docstrings)))
 
+    props.__module__ = def():
+        output.print(module_name)
+
     names = Object.keys(props)
-    if names.length:
-        output.indent()
-        # Only define the properties if they were not already defined, which
-        # can happen if the function definition is inside a loop, for example.
-        output.spaced('if', '(!' + fname + '.' + names[0] + ')', 'Object.defineProperties(' + fname)
-        output.comma()
-        output.with_block(def():
-            for v'var i = 0; i < names.length; i++':
-                name = names[i]
-                output.indent(), output.spaced(name, ':', '{value:', ''), props[name](), output.print('}')
-                if i < names.length - 1:
-                    output.print(',')
-                output.newline()
-        )
-        output.print(')'), output.end_statement()
+    output.indent()
+    # Only define the properties if they were not already defined, which
+    # can happen if the function definition is inside a loop, for example.
+    output.spaced('if', '(!' + fname + '.' + names[0] + ')', 'Object.defineProperties(' + fname)
+    output.comma()
+    output.with_block(def():
+        for v'var i = 0; i < names.length; i++':
+            name = names[i]
+            output.indent(), output.spaced(name, ':', '{value:', ''), props[name](), output.print('}')
+            if i < names.length - 1:
+                output.print(',')
+            output.newline()
+    )
+    output.print(')'), output.end_statement()
 
 
 def function_definition(self, output, strip_first, as_expression):
     as_expression = as_expression or self.is_expression or self.is_anonymous
-    if not self.argnames.length and not self.return_annotation and (not output.options.keep_docstrings or not self.docstrings or not self.docstrings.length):
-        # This function has no annotations so dont wrap it needlessly
-        as_expression = False
     if as_expression:
         orig_indent = output.indentation()
         output.set_indentation(output.next_indent())
@@ -268,8 +273,10 @@ def print_this(expression, output):
         output.print('this')
 
 def print_function_call(self, output):
+    is_prototype_call = False
 
     def print_function_name(no_call):
+        nonlocal is_prototype_call
         if is_node_type(self, AST_ClassCall):
             # class methods are called through the prototype unless static
             if self.static:
@@ -277,6 +284,7 @@ def print_function_call(self, output):
                 output.print(".")
                 output.print(self.method)
             else:
+                is_prototype_call = True
                 self.class.print(output)
                 output.print(".prototype.")
                 output.print(self.method)
@@ -396,6 +404,9 @@ def print_function_call(self, output):
             output.print('.apply(')
             do_print_this()
 
+    if is_prototype_call and self.args.length > 1:
+        self.args.shift()
+
     print_positional_args()
 
     if has_kwargs: