Merge pull request #1179 from kzc/drop-unused-inner-functions-and-classes

drop unused function and class declarations within functions

src/ast/nodes/ClassDeclaration.js

@@ -42,4 +42,10 @@ export default class ClassDeclaration extends Node {
 			code.remove( this.leadingCommentStart || this.start, this.next || this.end );
 		}
 	}
+
+	run ( scope ) {
+		if ( this.parent.type === 'ExportDefaultDeclaration' ) {
+			super.run( scope );
+		}
+	}
 }

src/ast/nodes/FunctionDeclaration.js

@@ -50,4 +50,10 @@ export default class FunctionDeclaration extends Node {
 			code.remove( this.leadingCommentStart || this.start, this.next || this.end );
 		}
 	}
+
+	run ( scope ) {
+		if ( this.parent.type === 'ExportDefaultDeclaration' ) {
+			super.run( scope );
+		}
+	}
 }

test/form/unused-inner-functions-and-classes/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'does not include unused inner functions and classes'
+};

test/form/unused-inner-functions-and-classes/_expected/amd.js

@@ -0,0 +1,25 @@
+define(function () { 'use strict';
+
+    function bar () { console.log("outer bar"); }
+
+
+
+    function Baz() {
+        function bar () { console.log("inner bar"); }
+        function bog () { console.log("inner bog"); }
+        return bar(), bog;
+    }
+
+    bar();
+    var f = Baz();
+    f();
+
+    function getClass () {
+        class MyClass {}
+        return MyClass;
+        
+    }
+
+    console.log( getClass().name );
+
+});

test/form/unused-inner-functions-and-classes/_expected/cjs.js

@@ -0,0 +1,23 @@
+'use strict';
+
+function bar () { console.log("outer bar"); }
+
+
+
+function Baz() {
+    function bar () { console.log("inner bar"); }
+    function bog () { console.log("inner bog"); }
+    return bar(), bog;
+}
+
+bar();
+var f = Baz();
+f();
+
+function getClass () {
+    class MyClass {}
+    return MyClass;
+    
+}
+
+console.log( getClass().name );

test/form/unused-inner-functions-and-classes/_expected/es.js

@@ -0,0 +1,21 @@
+function bar () { console.log("outer bar"); }
+
+
+
+function Baz() {
+    function bar () { console.log("inner bar"); }
+    function bog () { console.log("inner bog"); }
+    return bar(), bog;
+}
+
+bar();
+var f = Baz();
+f();
+
+function getClass () {
+    class MyClass {}
+    return MyClass;
+    
+}
+
+console.log( getClass().name );

test/form/unused-inner-functions-and-classes/_expected/iife.js

@@ -0,0 +1,26 @@
+(function () {
+    'use strict';
+
+    function bar () { console.log("outer bar"); }
+
+
+
+    function Baz() {
+        function bar () { console.log("inner bar"); }
+        function bog () { console.log("inner bog"); }
+        return bar(), bog;
+    }
+
+    bar();
+    var f = Baz();
+    f();
+
+    function getClass () {
+        class MyClass {}
+        return MyClass;
+        
+    }
+
+    console.log( getClass().name );
+
+}());

test/form/unused-inner-functions-and-classes/_expected/umd.js

@@ -0,0 +1,29 @@
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (factory());
+}(this, (function () { 'use strict';
+
+    function bar () { console.log("outer bar"); }
+
+
+
+    function Baz() {
+        function bar () { console.log("inner bar"); }
+        function bog () { console.log("inner bog"); }
+        return bar(), bog;
+    }
+
+    bar();
+    var f = Baz();
+    f();
+
+    function getClass () {
+        class MyClass {}
+        return MyClass;
+        
+    }
+
+    console.log( getClass().name );
+
+})));

test/form/unused-inner-functions-and-classes/main.js

@@ -0,0 +1,17 @@
+import { foo, bar, bog, boo, baz } from './stuff';
+
+bar();
+var f = baz();
+f();
+
+function getClass () {
+    class MyClass {}
+    class UnusedInnerClass1 {}
+    return MyClass;
+    class UnusedInnerClass2 {}
+}
+
+class UnusedClass {}
+
+console.log( getClass().name );
+

test/form/unused-inner-functions-and-classes/stuff.js

@@ -0,0 +1,15 @@
+export function foo () { console.log("outer foo"); }
+export function bar () { console.log("outer bar"); }
+export function bog () { console.log("outer bog"); }
+export function boo () { console.log("outer boo"); }
+
+function Baz() {
+    function foo () { console.log("inner foo"); }
+    function bar () { console.log("inner bar"); }
+    function bog () { console.log("inner bog"); }
+    function boo () { console.log("inner boo"); }
+
+    return bar(), bog;
+}
+
+export { Baz as baz };