Support for circular dependencies via exports parameter in define added.

Author: matthiaspalmer

src/modules/clean.js

@@ -244,6 +244,8 @@ define([
     // Creates variable declarations for each AMD module/callback parameter that needs to be hoisted
     _.each(hoistedVariables, function(moduleValue, moduleName) {
       if (!_.contains(options.ignoreModules, moduleName)) {
+	  var _initValue = amdclean.exportsModules[moduleName] !== true ? null : { type: 'ObjectExpression', properties: [] };
+
         declarations.push({
           'type': 'VariableDeclarator',
           'id': {
@@ -252,7 +254,7 @@ define([
             'range': defaultRange,
             'loc': defaultLOC
           },
-          'init': null,
+          'init': _initValue,
           'range': defaultRange,
           'loc': defaultLOC
         });
@@ -342,4 +344,4 @@ define([
 
     return generatedCode;
   };
-});
+});

src/modules/convertDefinesAndRequires.js

@@ -41,6 +41,7 @@ define([
       dependencyBlacklist = defaultValues.dependencyBlacklist,
       shouldOptimize;
 
+
     startLineNumber = isDefine || isRequire ? node.expression.loc.start.line : node && node.loc && node.loc.start ? node.loc.start.line : null;
     shouldBeIgnored = (amdclean.matchingCommentLineNumbers[startLineNumber] || amdclean.matchingCommentLineNumbers[startLineNumber - 1]);
 
@@ -120,7 +121,10 @@ define([
             if (dependencyBlacklist[currentDependency.value] && !shouldOptimize) {
               depNames.push(currentDependency.value);
             } else if (dependencyBlacklist[currentDependency.value] !== 'remove') {
-              if (dependencyBlacklist[currentDependency.value]) {
+	      if (currentDependency.value === "exports") {
+                  depNames.push(moduleName);
+		  amdclean.exportsModules[moduleName] = true;
+              } else if (dependencyBlacklist[currentDependency.value]) {
                 depNames.push('{}');
               } else {
                 depNames.push(currentDependency.value);
@@ -294,4 +298,4 @@ define([
       return node;
     }
   };
-});
+});

src/modules/index.js

@@ -149,6 +149,11 @@ require([
         // All of the stored program comments
         this.comments = [];
 
+        // exportsModules
+        // --------
+        // An object that stores a map of all modules that makes use of the exports parameter in define. Useful when declaring variables and making sure circular dependencies work correctly.
+        this.exportsModules = {};
+
         // options
         // -------
         // Merged user options and default options
@@ -183,4 +188,4 @@ require([
 
     return publicAPI;
   }));
-});
+});