2016-08-27 [ci skip] Version: 1.201608270006.1+e62f1181b6a94161f8bfa8…

…8a84c2cf4c0f66bc3a
TypeStrong · Aug 27, 2016 · 42ded84 · 42ded84
1 parent 9ec404d
commit 42ded84
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 15 deletions.
diff --git a/TypeScript b/TypeScript
diff --git a/bin/ntypescript.js b/bin/ntypescript.js
@@ -10251,6 +10251,7 @@ var ts;
                     token() === 25 /* LessThanToken */ ||
                     token() === 53 /* QuestionToken */ ||
                     token() === 54 /* ColonToken */ ||
+                    token() === 24 /* CommaToken */ ||
                     canParseSemicolon();
             }
             return false;
@@ -33492,7 +33493,13 @@ var ts;
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
                 if (file.symbol && file.symbol.globalExports) {
-                    mergeSymbolTable(globals, file.symbol.globalExports);
+                    // Merge in UMD exports with first-in-wins semantics (see #9771)
+                    var source = file.symbol.globalExports;
+                    for (var id in source) {
+                        if (!(id in globals)) {
+                            globals[id] = source[id];
+                        }
+                    }
                 }
             });
             if (augmentations) {
@@ -36799,8 +36806,10 @@ var ts;
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
                     writeTextOfNode(currentText, node.name);
-                    // If optional property emit ?
-                    if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */ || node.kind === 142 /* Parameter */) && ts.hasQuestionToken(node)) {
+                    // If optional property emit ? but in the case of parameterProperty declaration with "?" indicating optional parameter for the constructor
+                    // we don't want to emit property declaration with "?"
+                    if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */ ||
+                        (node.kind === 142 /* Parameter */ && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
                     if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */) && node.parent.kind === 159 /* TypeLiteral */) {
@@ -43495,7 +43504,7 @@ var ts;
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            var isNakedImport = 230 /* ImportDeclaration */ && !node.importClause;
+                            var isNakedImport = node.kind === 230 /* ImportDeclaration */ && !node.importClause;
                             if (!isNakedImport) {
                                 write(varOrConst);
                                 write(getGeneratedNameForNode(node));

diff --git a/bin/typescript.js b/bin/typescript.js
@@ -10251,6 +10251,7 @@ var ts;
                     token() === 25 /* LessThanToken */ ||
                     token() === 53 /* QuestionToken */ ||
                     token() === 54 /* ColonToken */ ||
+                    token() === 24 /* CommaToken */ ||
                     canParseSemicolon();
             }
             return false;
@@ -33492,7 +33493,13 @@ var ts;
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
                 if (file.symbol && file.symbol.globalExports) {
-                    mergeSymbolTable(globals, file.symbol.globalExports);
+                    // Merge in UMD exports with first-in-wins semantics (see #9771)
+                    var source = file.symbol.globalExports;
+                    for (var id in source) {
+                        if (!(id in globals)) {
+                            globals[id] = source[id];
+                        }
+                    }
                 }
             });
             if (augmentations) {
@@ -36799,8 +36806,10 @@ var ts;
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
                     writeTextOfNode(currentText, node.name);
-                    // If optional property emit ?
-                    if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */ || node.kind === 142 /* Parameter */) && ts.hasQuestionToken(node)) {
+                    // If optional property emit ? but in the case of parameterProperty declaration with "?" indicating optional parameter for the constructor
+                    // we don't want to emit property declaration with "?"
+                    if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */ ||
+                        (node.kind === 142 /* Parameter */ && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
                     if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */) && node.parent.kind === 159 /* TypeLiteral */) {
@@ -43495,7 +43504,7 @@ var ts;
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            var isNakedImport = 230 /* ImportDeclaration */ && !node.importClause;
+                            var isNakedImport = node.kind === 230 /* ImportDeclaration */ && !node.importClause;
                             if (!isNakedImport) {
                                 write(varOrConst);
                                 write(getGeneratedNameForNode(node));

diff --git a/kicktravis b/kicktravis
@@ -1 +1 @@
-2016-08-26 [ci skip] Version: 1.201608260007.1+0041d5ce7907f9ee974693ace54efd64afa1971a
+2016-08-27 [ci skip] Version: 1.201608270006.1+e62f1181b6a94161f8bfa88a84c2cf4c0f66bc3a
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ntypescript",
-  "version": "1.201608260007.1+0041d5ce7907f9ee974693ace54efd64afa1971a",
+  "version": "1.201608270006.1+e62f1181b6a94161f8bfa88a84c2cf4c0f66bc3a",
   "description": "A nicer version of microsoft/typescript packaged and released for API developers",
   "main": "./bin/ntypescript.js",
   "bin": {

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -18763,7 +18763,13 @@ namespace ts {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
                 if (file.symbol && file.symbol.globalExports) {
-                    mergeSymbolTable(globals, file.symbol.globalExports);
+                    // Merge in UMD exports with first-in-wins semantics (see #9771)
+                    const source = file.symbol.globalExports;
+                    for (const id in source) {
+                        if (!(id in globals)) {
+                            globals[id] = source[id];
+                        }
+                    }
                 }
             });
 

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -1132,8 +1132,10 @@ namespace ts {
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
                     writeTextOfNode(currentText, node.name);
-                    // If optional property emit ?
-                    if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature || node.kind === SyntaxKind.Parameter) && hasQuestionToken(node)) {
+                    // If optional property emit ? but in the case of parameterProperty declaration with "?" indicating optional parameter for the constructor
+                    // we don't want to emit property declaration with "?"
+                    if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature ||
+                        (node.kind === SyntaxKind.Parameter && !isParameterPropertyDeclaration(node))) && hasQuestionToken(node)) {
                         write("?");
                     }
                     if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && node.parent.kind === SyntaxKind.TypeLiteral) {

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -6587,7 +6587,7 @@ const _super = (function (geti, seti) {
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            const isNakedImport = SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
+                            const isNakedImport = node.kind === SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
                             if (!isNakedImport) {
                                 write(varOrConst);
                                 write(getGeneratedNameForNode(<ImportDeclaration>node));

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -2339,6 +2339,7 @@ namespace ts {
                     token() === SyntaxKind.LessThanToken ||
                     token() === SyntaxKind.QuestionToken ||
                     token() === SyntaxKind.ColonToken ||
+                    token() === SyntaxKind.CommaToken ||
                     canParseSemicolon();
             }
             return false;
+7 −1		src/compiler/checker.ts
+4 −2		src/compiler/declarationEmitter.ts
+1 −1		src/compiler/emitter.ts
+1 −0		src/compiler/parser.ts
+2 −2		tests/baselines/reference/declFileConstructors.js
+2 −11		tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.errors.txt
+2 −3		tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.js
+4 −12		tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.errors.txt
+4 −4		tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js
+1 −1		tests/baselines/reference/optionalMethods.js
+10 −0		tests/baselines/reference/parseObjectLiteralsWithoutTypes.js
+16 −0		tests/baselines/reference/parseObjectLiteralsWithoutTypes.symbols
+16 −0		tests/baselines/reference/parseObjectLiteralsWithoutTypes.types
+23 −0		tests/baselines/reference/umdGlobalConflict.js
+29 −0		tests/baselines/reference/umdGlobalConflict.symbols
+29 −0		tests/baselines/reference/umdGlobalConflict.types
+3 −0		tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts
+15 −0		tests/cases/compiler/umdGlobalConflict.ts
+1 −1		tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts
+2 −2		...nce/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2016-08-26 [ci skip] Version: 1.201608260007.1+0041d5ce7907f9ee974693ace54efd64afa1971a
		2016-08-27 [ci skip] Version: 1.201608270006.1+e62f1181b6a94161f8bfa88a84c2cf4c0f66bc3a