Re: #7 - Better handling of extra require() parameters

Author: gfranko

src/amdclean.js

@@ -255,6 +255,7 @@
                 var callbackFuncParams = obj.callbackFuncParams,
                     callbackFunc = obj.callbackFunc,
                     dependencyNames = obj.dependencyNames;
+
                 return {
                     'type': 'ExpressionStatement',
                     'expression': {
@@ -486,10 +487,15 @@
                     if((publicAPI.commentLineNumbers[startLineNumber] || publicAPI.commentLineNumbers['' + (parseInt(startLineNumber, 10) - 1)])) {
                         return node;
                     }
-                    args = node.expression['arguments'];
+                    args = Array.prototype.slice.call(node.expression['arguments'], 0);
                     dependencies = (function() {
-                        var deps = _.isPlainObject(args[args.length - 2]) ? args[args.length - 2].elements : [],
+                        var deps = isRequire ? args[0] : args[args.length - 2],
                             depNames = [];
+                        if(_.isPlainObject(deps)) {
+                            deps = deps.elements || [];
+                        } else {
+                            deps = [];
+                        }
                         if(Array.isArray(deps) && deps.length) {
                             _.each(deps, function(currentDependency) {
                                 if(publicAPI.dependencyBlacklist[currentDependency.value]) {
@@ -501,7 +507,7 @@
                         }
                         return depNames;
                     }());
-                    moduleReturnValue = args[args.length - 1];
+                    moduleReturnValue = isRequire ? args[1] : args[args.length - 1];
                     moduleName = publicAPI.normalizeModuleName(node.expression['arguments'][0].value);
                     params = {
                             node: node,

test/specs/convert.js

@@ -181,6 +181,13 @@ describe('amdclean specs', function() {
 				expect(cleanedCode).toBe(standardJavaScript);
 			});
 
+			it('should not bomb on extra parameters being passed to the require() method', function() {
+				var AMDcode = "require(['blah'], function(blahParam) { var two = 1 + 1; }, undefined, true);",
+					cleanedCode = amdclean.clean({ code: AMDcode, escodegen: { format: { compact: true } } }),
+					standardJavaScript = "(function(blahParam){var two=1+1;}(blah));";
+				expect(cleanedCode).toBe(standardJavaScript);
+			});
+
 		});
 
 	});