Fixed "export default { ... }"

Fixed #889
beautifier · Aug 28, 2016 · 1f6943c · 1f6943c
1 parent cc7f8a7
commit 1f6943c
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 4 deletions.
diff --git a/js/lib/beautify.js b/js/lib/beautify.js
@@ -841,11 +841,11 @@ if (!Object.values) {
                     // arrow function: (param1, paramN) => { statements }
                     set_mode(MODE.BlockStatement);
                 } else if (in_array(last_type, ['TK_EQUALS', 'TK_START_EXPR', 'TK_COMMA', 'TK_OPERATOR']) ||
-                    (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['return', 'throw', 'import']))
+                    (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['return', 'throw', 'import', 'default']))
                 ) {
                     // Detecting shorthand function syntax is difficult by scanning forward,
                     //     so check the surrounding context.
-                    // If the block is being returned, imported, passed as arg,
+                    // If the block is being returned, imported, export default, passed as arg,
                     //     assigned with = or assigned in a nested object, treat as an ObjectLiteral.
                     set_mode(MODE.ObjectLiteral);
                 } else {

diff --git a/js/test/generated/beautify-javascript-tests.js b/js/test/generated/beautify-javascript-tests.js
@@ -1886,6 +1886,26 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '    export default function div(x, y) {}\n' +
             '}');
 
+        // Issue 889 - export default { ... }
+        bt(
+            'export default {\n' +
+            '    func1() {},\n' +
+            '    func2() {}\n' +
+            '    func3() {}\n' +
+            '}');
+        bt(
+            'export default {\n' +
+            '    a() {\n' +
+            '        return 1;\n' +
+            '    },\n' +
+            '    b() {\n' +
+            '        return 2;\n' +
+            '    },\n' +
+            '    c() {\n' +
+            '        return 3;\n' +
+            '    }\n' +
+            '}');
+
         // Issue 508
         bt('set["name"]');
         bt('get["name"]');

diff --git a/python/jsbeautifier/__init__.py b/python/jsbeautifier/__init__.py
@@ -820,10 +820,10 @@ def handle_start_block(self, current_token):
             # arrow function: (param1, paramN) => { statements }
             self.set_mode(MODE.BlockStatement)
         elif self.last_type in ['TK_EQUALS', 'TK_START_EXPR', 'TK_COMMA', 'TK_OPERATOR'] or \
-            (self.last_type == 'TK_RESERVED' and self.flags.last_text in ['return', 'throw', 'import']):
+            (self.last_type == 'TK_RESERVED' and self.flags.last_text in ['return', 'throw', 'import', 'default']):
             # Detecting shorthand function syntax is difficult by scanning forward,
             #     so check the surrounding context.
-            # If the block is being returned, imported, passed as arg,
+            # If the block is being returned, imported, export default, passed as arg,
             #     assigned with = or assigned in a nested object, treat as an ObjectLiteral.
             self.set_mode(MODE.ObjectLiteral)
         else:

diff --git a/python/jsbeautifier/tests/generated/tests.py b/python/jsbeautifier/tests/generated/tests.py
@@ -1721,6 +1721,26 @@ def unicode_char(value):
             '    export default function div(x, y) {}\n' +
             '}')
 
+        # Issue 889 - export default { ... }
+        bt(
+            'export default {\n' +
+            '    func1() {},\n' +
+            '    func2() {}\n' +
+            '    func3() {}\n' +
+            '}')
+        bt(
+            'export default {\n' +
+            '    a() {\n' +
+            '        return 1;\n' +
+            '    },\n' +
+            '    b() {\n' +
+            '        return 2;\n' +
+            '    },\n' +
+            '    c() {\n' +
+            '        return 3;\n' +
+            '    }\n' +
+            '}')
+
         # Issue 508
         bt('set["name"]')
         bt('get["name"]')

diff --git a/test/data/javascript/tests.js b/test/data/javascript/tests.js
@@ -1562,6 +1562,31 @@ exports.test_data = {
                     '}'
                 ]
             },
+            {
+                comment: 'Issue 889 - export default { ... }',
+                unchanged: [
+                    'export default {',
+                    '    func1() {},',
+                    '    func2() {}',
+                    '    func3() {}',
+                    '}'
+                ]
+            },
+            {
+                unchanged: [
+                    'export default {',
+                    '    a() {',
+                    '        return 1;',
+                    '    },',
+                    '    b() {',
+                    '        return 2;',
+                    '    },',
+                    '    c() {',
+                    '        return 3;',
+                    '    }',
+                    '}'
+                ]
+            },
             {
                 comment: "Issue 508",
                 unchanged: 'set["name"]'