merge with master

vladima · vladima · commit b6b735c0f278 · 2015-08-17T14:38:24.000-07:00
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
@@ -1450,6 +1450,7 @@ declare namespace ts {
     function getTrailingCommentRanges(text: string, pos: number): CommentRange[];
     function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
     function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
+    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant: ts.LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
 }
 declare namespace ts {
     function getDefaultLibFileName(options: CompilerOptions): string;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13319,7 +13319,7 @@ namespace ts {
                     }
                 }
                 else {
-                    if (languageVersion >= ScriptTarget.ES6) {
+                    if (languageVersion >= ScriptTarget.ES6 && !isInAmbientContext(node)) {
                         // Import equals declaration is deprecated in es6 or above
                         grammarErrorOnNode(node, Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_or_import_d_from_mod_instead);
                     }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -5343,13 +5343,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     emitExportMemberAssignments(<Identifier>node.name);
                 }
             }
+            
+            /*
+             * Some bundlers (SystemJS builder) sometimes want to rename dependencies. 
+             * Here we check if alternative name was provided for a given moduleName and return it if possible. 
+             */
+            function tryRenameExternalModule(moduleName: LiteralExpression): string {
+                if (currentSourceFile.renamedDependencies && hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
+                    return `"${currentSourceFile.renamedDependencies[moduleName.text]}"`
+                }
+                return undefined;
+            }
 
             function emitRequire(moduleName: Expression) {
                 if (moduleName.kind === SyntaxKind.StringLiteral) {
                     write("require(");
-                    emitStart(moduleName);
-                    emitLiteral(<LiteralExpression>moduleName);
-                    emitEnd(moduleName);
+                    let text = tryRenameExternalModule(<LiteralExpression>moduleName);
+                    if (text) {
+                        write(text);
+                    }
+                    else {
+                        emitStart(moduleName);
+                        emitLiteral(<LiteralExpression>moduleName);
+                        emitEnd(moduleName);
+                    }
                     emitToken(SyntaxKind.CloseParenToken, moduleName.end);
                 }
                 else {
@@ -5752,7 +5769,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             function getExternalModuleNameText(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): string {
                 let moduleName = getExternalModuleName(importNode);
                 if (moduleName.kind === SyntaxKind.StringLiteral) {
-                    return getLiteralText(<LiteralExpression>moduleName);
+                    return tryRenameExternalModule(<LiteralExpression>moduleName) || getLiteralText(<LiteralExpression>moduleName); 
                 }
 
                 return undefined;
@@ -6317,10 +6334,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         groupIndices[text] = dependencyGroups.length;
                         dependencyGroups.push([externalImports[i]]);
                     }
-                    
+
                     if (i !== 0) {
                         write(", ");
                     }
+                    
                     write(text);
                 }
                 write(`], function(${exportFunctionForFile}) {`);
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -672,7 +672,6 @@ namespace ts {
             ch > CharacterCodes.maxAsciiCharacter && isUnicodeIdentifierPart(ch, languageVersion);
     }
 
-    /* @internal */
     // Creates a scanner over a (possibly unspecified) range of a piece of text.
     export function createScanner(languageVersion: ScriptTarget,
                                   skipTrivia: boolean,
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -334,7 +334,7 @@ namespace ts {
         if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
             return getWScriptSystem();
         }
-        else if (typeof process !== "undefined" && process.nextTick && !process.browser) {
+        else if (typeof process !== "undefined" && process.nextTick && !process.browser && typeof require !== "undefined") {
             // process and process.nextTick checks if current environment is node-like
             // process.browser check excludes webpack and browserify
             return getNodeSystem();
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1244,6 +1244,10 @@ namespace ts {
         moduleName: string;
         referencedFiles: FileReference[];
         languageVariant: LanguageVariant;
+        
+        // this map is used by transpiler to supply alternative names for dependencies (i.e. in case of bundling)
+        /* @internal */
+        renamedDependencies?: Map<string>;
 
         /**
          * lib.d.ts should have a reference comment like
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
@@ -428,6 +428,7 @@ namespace ts.formatting {
                 case SyntaxKind.ConditionalExpression:
                 case SyntaxKind.ArrayBindingPattern:
                 case SyntaxKind.ObjectBindingPattern:
+                case SyntaxKind.JsxElement:
                     return true;
             }
             return false;
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1776,6 +1776,7 @@ namespace ts {
         fileName?: string;
         reportDiagnostics?: boolean;
         moduleName?: string;
+        renamedDependencies?: Map<string>;
     }
 
     export interface TranspileOutput {
@@ -1792,8 +1793,8 @@ namespace ts {
      * - allowNonTsExtensions = true
      * - noLib = true
      * - noResolve = true
-     */
-    export function transpileModule(input: string, transpileOptions?: TranspileOptions): TranspileOutput {
+     */    
+    export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput {
         let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions();
 
         options.isolatedModules = true;
@@ -1816,6 +1817,8 @@ namespace ts {
             sourceFile.moduleName = transpileOptions.moduleName;
         }
 
+        sourceFile.renamedDependencies = transpileOptions.renamedDependencies;
+
         let newLine = getNewLineCharacter(options);
 
         // Output
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.js b/tests/baselines/reference/es6ImportEqualsDeclaration2.js
@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/es6ImportEqualsDeclaration2.ts] ////
+
+//// [server.d.ts]
+
+declare module "other" {
+    export class C { }
+}
+
+declare module "server" {
+    import events = require("other"); // Ambient declaration, no error expected.
+
+    module S {
+        export var a: number;
+    }
+
+    export = S; // Ambient declaration, no error expected.
+}
+
+//// [client.ts]
+import {a} from "server";
+
+
+//// [client.js]
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/server.d.ts ===
+
+declare module "other" {
+    export class C { }
+>C : Symbol(C, Decl(server.d.ts, 1, 24))
+}
+
+declare module "server" {
+    import events = require("other"); // Ambient declaration, no error expected.
+>events : Symbol(events, Decl(server.d.ts, 5, 25))
+
+    module S {
+>S : Symbol(S, Decl(server.d.ts, 6, 37))
+
+        export var a: number;
+>a : Symbol(a, Decl(server.d.ts, 9, 18))
+    }
+
+    export = S; // Ambient declaration, no error expected.
+>S : Symbol(S, Decl(server.d.ts, 6, 37))
+}
+
+=== tests/cases/compiler/client.ts ===
+import {a} from "server";
+>a : Symbol(a, Decl(client.ts, 0, 8))
+
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.types b/tests/baselines/reference/es6ImportEqualsDeclaration2.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/server.d.ts ===
+
+declare module "other" {
+    export class C { }
+>C : C
+}
+
+declare module "server" {
+    import events = require("other"); // Ambient declaration, no error expected.
+>events : typeof events
+
+    module S {
+>S : typeof S
+
+        export var a: number;
+>a : number
+    }
+
+    export = S; // Ambient declaration, no error expected.
+>S : typeof S
+}
+
+=== tests/cases/compiler/client.ts ===
+import {a} from "server";
+>a : number
+
diff --git a/tests/cases/compiler/es6ImportEqualsDeclaration2.ts b/tests/cases/compiler/es6ImportEqualsDeclaration2.ts
@@ -0,0 +1,19 @@
+// @target: es6
+
+// @filename: server.d.ts
+declare module "other" {
+    export class C { }
+}
+
+declare module "server" {
+    import events = require("other"); // Ambient declaration, no error expected.
+
+    module S {
+        export var a: number;
+    }
+
+    export = S; // Ambient declaration, no error expected.
+}
+
+// @filename: client.ts
+import {a} from "server";
diff --git a/tests/cases/fourslash/formattingJsxElements.ts b/tests/cases/fourslash/formattingJsxElements.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: file.tsx
+////function () {
+////    return (
+////        <div className="commentBox" >
+////Hello, World!/*autoformat*/
+/////*indent*/
+////        </div>
+////    )
+////}
+////
+
+
+format.document();
+goTo.marker("autoformat");
+verify.currentLineContentIs('            Hello, World!');
+goTo.marker("indent");
+verify.indentationIs(12);
diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts
@@ -21,22 +21,29 @@ module ts {
         }
         
         function test(input: string, testSettings: TranspileTestSettings): void {
-            let diagnostics: Diagnostic[] = [];
             
-            let transpileOptions: TranspileOptions = testSettings.options || {}; 
-            let transpileResult = transpile(input, transpileOptions.compilerOptions, transpileOptions.fileName, diagnostics, transpileOptions.moduleName);
+            let transpileOptions: TranspileOptions = testSettings.options || {};
+            
+            let canUseOldTranspile = !transpileOptions.renamedDependencies;  
             
             transpileOptions.reportDiagnostics = true;
             let transpileModuleResult = transpileModule(input, transpileOptions);
             
-            checkDiagnostics(diagnostics, testSettings.expectedDiagnosticCodes);
             checkDiagnostics(transpileModuleResult.diagnostics, testSettings.expectedDiagnosticCodes);
             
             if (testSettings.expectedOutput !== undefined) {
-                assert.equal(transpileResult, testSettings.expectedOutput);
                 assert.equal(transpileModuleResult.outputText, testSettings.expectedOutput);
             }
             
+            if (canUseOldTranspile) {
+                let diagnostics: Diagnostic[] = [];                
+                let transpileResult = transpile(input, transpileOptions.compilerOptions, transpileOptions.fileName, diagnostics, transpileOptions.moduleName);                
+                checkDiagnostics(diagnostics, testSettings.expectedDiagnosticCodes);
+                if (testSettings.expectedOutput) {
+                    assert.equal(transpileResult, testSettings.expectedOutput);
+                }
+            }
+            
             // check source maps
             if (!transpileOptions.compilerOptions) {
                 transpileOptions.compilerOptions = {};
@@ -138,5 +145,74 @@ var x = 0;`,
         it("No extra errors for file without extension", () => {
             test(`var x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS }, fileName: "file" } });
         });
+
+        it("Rename dependencies - System", () => {
+            let input = 
+                `import {foo} from "SomeName";\n` +
+                `declare function use(a: any);\n` +
+                `use(foo);`
+            let output =
+                `System.register(["SomeOtherName"], function(exports_1) {\n` +
+                `    var SomeName_1;\n` +
+                `    return {\n` +
+                `        setters:[\n` +
+                `            function (SomeName_1_1) {\n` +
+                `                SomeName_1 = SomeName_1_1;\n` +
+                `            }],\n` +
+                `        execute: function() {\n` +
+                `            use(SomeName_1.foo);\n` +
+                `        }\n` +
+                `    }\n` +
+                `});\n`
+
+            test(input, 
+                { 
+                    options: { compilerOptions: { module: ModuleKind.System, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } }, 
+                    expectedOutput: output
+                });
+        });
+
+        it("Rename dependencies - AMD", () => {
+            let input = 
+                `import {foo} from "SomeName";\n` +
+                `declare function use(a: any);\n` +
+                `use(foo);`
+            let output =
+                `define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {\n` +
+                `    use(SomeName_1.foo);\n` +
+                `});\n`;
+
+            test(input, 
+                { 
+                    options: { compilerOptions: { module: ModuleKind.AMD, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } }, 
+                    expectedOutput: output
+                });
+        });
+
+        it("Rename dependencies - UMD", () => {
+            let input = 
+                `import {foo} from "SomeName";\n` +
+                `declare function use(a: any);\n` +
+                `use(foo);`
+            let output =
+                `(function (deps, factory) {\n` +
+                `    if (typeof module === 'object' && typeof module.exports === 'object') {\n` +
+                `        var v = factory(require, exports); if (v !== undefined) module.exports = v;\n` +
+                `    }\n` +
+                `    else if (typeof define === 'function' && define.amd) {\n` +
+                `        define(deps, factory);\n` +
+                `    }\n` +
+                `})(["require", "exports", "SomeOtherName"], function (require, exports) {\n` +
+                `    var SomeName_1 = require("SomeOtherName");\n` +
+                `    use(SomeName_1.foo);\n` +
+                `});\n`;
+
+            test(input, 
+                { 
+                    options: { compilerOptions: { module: ModuleKind.UMD, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } }, 
+                    expectedOutput: output
+                });
+        });
+
     });
 }

Original file line number	Diff line number	Diff line change
`@@ -1450,6 +1450,7 @@ declare namespace ts {`
`1450`	`1450`	`function getTrailingCommentRanges(text: string, pos: number): CommentRange[];`
`1451`	`1451`	`function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;`
`1452`	`1452`	`function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;`
	`1453`	`+ function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant: ts.LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;`
`1453`	`1454`	`}`
`1454`	`1455`	`declare namespace ts {`
`1455`	`1456`	`function getDefaultLibFileName(options: CompilerOptions): string;`
Original file line number	Diff line number	Diff line change
`@@ -13319,7 +13319,7 @@ namespace ts {`
`13319`	`13319`	`}`
`13320`	`13320`	`}`
`13321`	`13321`	`else {`
`13322`		`- if (languageVersion >= ScriptTarget.ES6) {`
	`13322`	`+ if (languageVersion >= ScriptTarget.ES6 && !isInAmbientContext(node)) {`
`13323`	`13323`	`// Import equals declaration is deprecated in es6 or above`
`13324`	`13324`	`grammarErrorOnNode(node, Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_or_import_d_from_mod_instead);`
`13325`	`13325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,6 @@ namespace ts {`
`672`	`672`	`ch > CharacterCodes.maxAsciiCharacter && isUnicodeIdentifierPart(ch, languageVersion);`
`673`	`673`	`}`
`674`	`674`
`675`		`- /* @internal */`
`676`	`675`	`// Creates a scanner over a (possibly unspecified) range of a piece of text.`
`677`	`676`	`export function createScanner(languageVersion: ScriptTarget,`
`678`	`677`	`skipTrivia: boolean,`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ namespace ts {`
`334`	`334`	`if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {`
`335`	`335`	`return getWScriptSystem();`
`336`	`336`	`}`
`337`		`- else if (typeof process !== "undefined" && process.nextTick && !process.browser) {`
	`337`	`+ else if (typeof process !== "undefined" && process.nextTick && !process.browser && typeof require !== "undefined") {`
`338`	`338`	`// process and process.nextTick checks if current environment is node-like`
`339`	`339`	`// process.browser check excludes webpack and browserify`
`340`	`340`	`return getNodeSystem();`
Original file line number	Diff line number	Diff line change
`@@ -428,6 +428,7 @@ namespace ts.formatting {`
`428`	`428`	`case SyntaxKind.ConditionalExpression:`
`429`	`429`	`case SyntaxKind.ArrayBindingPattern:`
`430`	`430`	`case SyntaxKind.ObjectBindingPattern:`
	`431`	`+ case SyntaxKind.JsxElement:`
`431`	`432`	`return true;`
`432`	`433`	`}`
`433`	`434`	`return false;`