moved AMD module sorting to emitter, updated test case

v3nom · v3nom · commit 8492dfdffd89 · 2015-02-10T10:28:09.000+01:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -3902,11 +3902,25 @@ module ts {
                     }
                 });
             }
+            
+            function sortAMDModules(amdModules: {name: string; path: string}[]) {
+                // AMD modules with declared variable names goes first
+                return amdModules.sort((moduleA, moduleB) => {
+                    if (moduleA.name == moduleB.name) {
+                        return 0;
+                    } else if (moduleA.name == undefined) {
+                        return 1;
+                    } else {
+                        return -1;
+                    }
+                });
+            }
 
             function emitAMDModule(node: SourceFile, startIndex: number) {
                 var imports = getExternalImportDeclarations(node);
                 writeLine();
                 write("define(");
+                sortAMDModules(node.amdDependencies);
                 if (node.amdModuleName) {
                     write("\"" + node.amdModuleName + "\", ");
                 }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4719,12 +4719,7 @@ module ts {
                         var nameMatchResult = nameRegex.exec(comment);
                         if (pathMatchResult) {
                             var amdDependency = {path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
-                            // AMD dependencies with names have to go first in define header
-                            if (nameMatchResult) {
-                                amdDependencies.unshift(amdDependency);
-                            } else {
-                                amdDependencies.push(amdDependency);
-                            }
+                            amdDependencies.push(amdDependency);
                         }
                     }
                 }
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -10,6 +10,6 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 ///<amd-dependency path='foo'/>
 ///<amd-dependency path='goo' name='c'/>
-define(["require", "exports", "m2", "goo", "bar", "foo"], function (require, exports, m1, c, b) {
+define(["require", "exports", "m2", "bar", "goo", "foo"], function (require, exports, m1, b, c) {
     m1.f();
 });

Original file line number	Diff line number	Diff line change
`@@ -4719,12 +4719,7 @@ module ts {`
`4719`	`4719`	`var nameMatchResult = nameRegex.exec(comment);`
`4720`	`4720`	`if (pathMatchResult) {`
`4721`	`4721`	`var amdDependency = {path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };`
`4722`		`- // AMD dependencies with names have to go first in define header`
`4723`		`- if (nameMatchResult) {`
`4724`		`- amdDependencies.unshift(amdDependency);`
`4725`		`- } else {`
`4726`		`- amdDependencies.push(amdDependency);`
`4727`		`- }`
	`4722`	`+ amdDependencies.push(amdDependency);`
`4728`	`4723`	`}`
`4729`	`4724`	`}`
`4730`	`4725`	`}`