Merge branch 'v3nom-master'

mhegazy · mhegazy · commit d9058fbda029 · 2015-02-12T09:43:39.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ scripts/ior.js
 scripts/*.js.map
 coverage/
 internal/
+**/.DS_Store
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -4057,11 +4057,25 @@ module ts {
                     }
                 });
             }
+            
+            function sortAMDModules(amdModules: {name: string; path: string}[]) {
+                // AMD modules with declared variable names go first
+                return amdModules.sort((moduleA, moduleB) => {
+                    if (moduleA.name === moduleB.name) {
+                        return 0;
+                    } else if (!moduleA.name) {
+                        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 + "\", ");
                 }
@@ -4071,7 +4085,7 @@ module ts {
                     emitLiteral(<LiteralExpression>getExternalModuleImportDeclarationExpression(imp));
                 });
                 forEach(node.amdDependencies, amdDependency => {
-                    var text = "\"" + amdDependency + "\"";
+                    var text = "\"" + amdDependency.path + "\"";
                     write(", ");
                     write(text);
                 });
@@ -4080,6 +4094,12 @@ module ts {
                     write(", ");
                     emit(imp.name);
                 });
+                forEach(node.amdDependencies, amdDependency => {
+                    if (amdDependency.name) {
+                        write(", ");
+                        write(amdDependency.name);
+                    }
+                });
                 write(") {");
                 increaseIndent();
                 emitCaptureThisForNodeIfNecessary(node);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4749,7 +4749,7 @@ module ts {
         function processReferenceComments(sourceFile: SourceFile): void {
             var triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, sourceText);
             var referencedFiles: FileReference[] = [];
-            var amdDependencies: string[] = [];
+            var amdDependencies: {path: string; name: string}[] = [];
             var amdModuleName: string;
 
             // Keep scanning all the leading trivia in the file until we get to something that 
@@ -4789,10 +4789,17 @@ module ts {
                         amdModuleName = amdModuleNameMatchResult[2];
                     }
 
-                    var amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s+path\s*=\s*('|")(.+?)\1/gim;
+                    var amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
+                    var pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
+                    var nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
                     var amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
                     if (amdDependencyMatchResult) {
-                        amdDependencies.push(amdDependencyMatchResult[2]);
+                        var pathMatchResult = pathRegex.exec(comment);
+                        var nameMatchResult = nameRegex.exec(comment);
+                        if (pathMatchResult) {
+                            var amdDependency = {path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
+                            amdDependencies.push(amdDependency);
+                        }
                     }
                 }
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -887,7 +887,7 @@ module ts {
         fileName: string;
         text: string;
 
-        amdDependencies: string[];
+        amdDependencies: {path: string; name: string}[];
         amdModuleName: string;
         referencedFiles: FileReference[];
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -725,7 +725,7 @@ module ts {
         public statements: NodeArray<Statement>;
         public endOfFileToken: Node;
 
-        public amdDependencies: string[];
+        public amdDependencies: {name: string; path: string}[];
         public amdModuleName: string;
         public referencedFiles: FileReference[];
 
diff --git a/tests/baselines/reference/amdDependencyCommentName1.errors.txt b/tests/baselines/reference/amdDependencyCommentName1.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find external module 'm2'.
+
+
+==== tests/cases/compiler/amdDependencyCommentName1.ts (1 errors) ====
+    ///<amd-dependency path='bar' name='b'/>
+    
+    import m1 = require("m2")
+                        ~~~~
+!!! error TS2307: Cannot find external module 'm2'.
+    m1.f();
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
@@ -0,0 +1,10 @@
+//// [amdDependencyCommentName1.ts]
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
+
+//// [amdDependencyCommentName1.js]
+///<amd-dependency path='bar' name='b'/>
+var m1 = require("m2");
+m1.f();
diff --git a/tests/baselines/reference/amdDependencyCommentName2.errors.txt b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find external module 'm2'.
+
+
+==== tests/cases/compiler/amdDependencyCommentName2.ts (1 errors) ====
+    ///<amd-dependency path='bar' name='b'/>
+    
+    import m1 = require("m2")
+                        ~~~~
+!!! error TS2307: Cannot find external module 'm2'.
+    m1.f();
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -0,0 +1,11 @@
+//// [amdDependencyCommentName2.ts]
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
+
+//// [amdDependencyCommentName2.js]
+///<amd-dependency path='bar' name='b'/>
+define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) {
+    m1.f();
+});
diff --git a/tests/baselines/reference/amdDependencyCommentName3.errors.txt b/tests/baselines/reference/amdDependencyCommentName3.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find external module 'm2'.
+
+
+==== tests/cases/compiler/amdDependencyCommentName3.ts (1 errors) ====
+    ///<amd-dependency path='bar' name='b'/>
+    ///<amd-dependency path='foo'/>
+    ///<amd-dependency path='goo' name='c'/>
+    
+    import m1 = require("m2")
+                        ~~~~
+!!! error TS2307: Cannot find external module 'm2'.
+    m1.f();
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -0,0 +1,15 @@
+//// [amdDependencyCommentName3.ts]
+///<amd-dependency path='bar' name='b'/>
+///<amd-dependency path='foo'/>
+///<amd-dependency path='goo' name='c'/>
+
+import m1 = require("m2")
+m1.f();
+
+//// [amdDependencyCommentName3.js]
+///<amd-dependency path='bar' name='b'/>
+///<amd-dependency path='foo'/>
+///<amd-dependency path='goo' name='c'/>
+define(["require", "exports", "m2", "bar", "goo", "foo"], function (require, exports, m1, b, c) {
+    m1.f();
+});
diff --git a/tests/cases/compiler/amdDependencyCommentName1.ts b/tests/cases/compiler/amdDependencyCommentName1.ts
@@ -0,0 +1,5 @@
+//@module: commonjs
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
diff --git a/tests/cases/compiler/amdDependencyCommentName2.ts b/tests/cases/compiler/amdDependencyCommentName2.ts
@@ -0,0 +1,5 @@
+//@module: amd
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
diff --git a/tests/cases/compiler/amdDependencyCommentName3.ts b/tests/cases/compiler/amdDependencyCommentName3.ts
@@ -0,0 +1,7 @@
+//@module: amd
+///<amd-dependency path='bar' name='b'/>
+///<amd-dependency path='foo'/>
+///<amd-dependency path='goo' name='c'/>
+
+import m1 = require("m2")
+m1.f();
