microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 03:23:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #8027 from Microsoft/transforms-skip-es6-imports-inside-namespace

Browse Source 
[Transforms] Do not emit ES6 import/export inside namespaces
This commit is contained in:
Nathan Shively-Sanders 2016-04-13 12:37:35 -07:00
commit 34ad57a972
7 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/transformers/ts.ts
View File

@ -157,7 +157,15 @@ namespace ts {
* @param node The node to visit.
*/
function namespaceElementVisitorWorker(node: Node): VisitResult<Node> {
if (node.transformFlags & TransformFlags.TypeScript || hasModifier(node, ModifierFlags.Export)) {
if (node.kind === SyntaxKind.ExportDeclaration ||
node.kind === SyntaxKind.ImportDeclaration ||
node.kind === SyntaxKind.ImportClause ||
(node.kind === SyntaxKind.ImportEqualsDeclaration &&
(<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference)) {
// do not emit ES6 imports and exports since they are illegal inside a namespace
return undefined;
}
else if (node.transformFlags & TransformFlags.TypeScript || hasModifier(node, ModifierFlags.Export)) {
// This node is explicitly marked as TypeScript, or is exported at the namespace
// level, so we should transform the node.
return visitTypeScript(node);
@ -2914,4 +2922,4 @@ namespace ts {
&& resolver.getNodeCheckFlags(currentSuperContainer) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding);
}
}
}
}

18
tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
View File

@ -6,9 +6,13 @@ tests/cases/compiler/es5ModuleInternalNamedImports.ts(27,5): error TS1194: Expor
tests/cases/compiler/es5ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in a namespace.
tests/cases/compiler/es5ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in a namespace.
tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Export declarations are not permitted in a namespace.
tests/cases/compiler/es5ModuleInternalNamedImports.ts(31,25): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/es5ModuleInternalNamedImports.ts(32,20): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/es5ModuleInternalNamedImports.ts(33,32): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/es5ModuleInternalNamedImports.ts(35,16): error TS2307: Cannot find module 'M3'.
==== tests/cases/compiler/es5ModuleInternalNamedImports.ts (8 errors) ====
==== tests/cases/compiler/es5ModuleInternalNamedImports.ts (12 errors) ====
export module M {
// variable
@ -55,5 +59,17 @@ tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Expor
export {M_A as a};
~~~~~~~~~~~~~~~~~~
!!! error TS1194: Export declarations are not permitted in a namespace.
import * as M2 from "M2";
~~~~
!!! error TS1147: Import declarations in a namespace cannot reference a module.
import M4 from "M4";
~~~~
!!! error TS1147: Import declarations in a namespace cannot reference a module.
export import M5 = require("M5");
~~~~
!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
import M3 from "M3";
~~~~
!!! error TS2307: Cannot find module 'M3'.

5
tests/baselines/reference/es5ModuleInternalNamedImports.js
View File

@ -29,7 +29,11 @@ export module M {
export {M_F as f};
export {M_E as e};
export {M_A as a};
import * as M2 from "M2";
import M4 from "M4";
export import M5 = require("M5");
}
import M3 from "M3";
//// [es5ModuleInternalNamedImports.js]
@ -60,6 +64,5 @@ define(["require", "exports"], function (require, exports) {
var M_E = M.M_E;
// alias
M.M_A = M_M;
// Reexports
})(M = exports.M || (exports.M = {}));
});

7
tests/baselines/reference/es6ModuleInternalNamedImports.js
View File

@ -55,11 +55,4 @@ export var M;
var M_E = M.M_E;
// alias
M.M_A = M_M;
// Reexports
export { M_V as v };
export { M_C as c };
export { M_M as m };
export { M_F as f };
export { M_E as e };
export { M_A as a };
})(M || (M = {}));

7
tests/baselines/reference/es6ModuleInternalNamedImports2.js
View File

@ -59,11 +59,4 @@ export var M;
M.M_A = M_M;
})(M || (M = {}));
(function (M) {
// Reexports
export { M_V as v };
export { M_C as c };
export { M_M as m };
export { M_F as f };
export { M_E as e };
export { M_A as a };
})(M || (M = {}));

1
tests/baselines/reference/exportDeclarationInInternalModule.js
View File

@ -53,7 +53,6 @@ var Bbb;
return SomeType;
}());
Bbb.SomeType = SomeType;
// this line causes the nullref
})(Bbb || (Bbb = {}));
var a;

4
tests/cases/compiler/es5ModuleInternalNamedImports.ts
View File

@ -30,4 +30,8 @@ export module M {
export {M_F as f};
export {M_E as e};
export {M_A as a};
import * as M2 from "M2";
import M4 from "M4";
export import M5 = require("M5");
}
import M3 from "M3";