moved AMD module sorting to emitter, updated test case

2025-11-18 17:21:48 +00:00 · 2015-02-10 10:28:09 +01:00
parent a27a893eeb
commit 8492dfdffd
3 changed files with 16 additions and 7 deletions
@@ -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 + "\", ");
                }