microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-20 13:45:34 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Move amd-dependency erlier in the list

Browse Source
This commit is contained in:
Mohamed Hegazy
2015-04-16 17:32:40 -07:00
parent d25d55ecc1
commit a84e64698a
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/compiler/emitter.ts
View File

@@ -4652,6 +4652,18 @@ var __param = this.__param || function(index, decorator) { return function (targ
let aliasedModuleNames: string[] = [];
let unaliasedModuleNames: string[] = [];
let importAliasNames: string[] = [];
// Fill in amd-dependency tags
for (let amdDependency of node.amdDependencies) {
if (amdDependency.name) {
aliasedModuleNames.push("\"" + amdDependency.path + "\"");
importAliasNames.push(amdDependency.name);
}
else {
unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
}
}
for (let importNode of externalImports) {
// Find the name of the external module
let externalModuleName = "";
@@ -4678,17 +4690,6 @@ var __param = this.__param || function(index, decorator) { return function (targ
unaliasedModuleNames.push(externalModuleName);
}
}
// Fill in amd-dependency tags
for (let amdDependency of node.amdDependencies) {
if (amdDependency.name) {
aliasedModuleNames.push("\"" + amdDependency.path + "\"");
importAliasNames.push(amdDependency.name);
}
else {
unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
}
}
writeLine();
write("define(");

2
tests/baselines/reference/amdDependencyCommentName2.js
View File

@@ -6,6 +6,6 @@ m1.f();
//// [amdDependencyCommentName2.js]
///<amd-dependency path='bar' name='b'/>
define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) {
define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
m1.f();
});

2
tests/baselines/reference/amdDependencyCommentName3.js
View File

@@ -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", "bar", "goo", "foo"], function (require, exports, m1, b, c) {
define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
m1.f();
});

2
tests/baselines/reference/amdDependencyCommentName4.js
View File

@@ -25,7 +25,7 @@ import "unaliasedModule2";
///<amd-dependency path='unaliasedModule3'/>
///<amd-dependency path='aliasedModule6' name='n2'/>
///<amd-dependency path='unaliasedModule4'/>
define(["require", "exports", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "aliasedModule5", "aliasedModule6", "unaliasedModule1", "unaliasedModule2", "unaliasedModule3", "unaliasedModule4"], function (require, exports, r1, aliasedModule2_1, aliasedModule3_1, ns, n1, n2) {
define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
r1;
aliasedModule2_1.p1;
aliasedModule3_1.default;