typescript 4.8.0-dev.20220617 → 4.8.0-dev.20220620

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220617";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220620";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -7103,6 +7103,9 @@ var ts;
         For_await_loops_cannot_be_used_inside_a_class_static_block: diag(18038, ts.DiagnosticCategory.Error, "For_await_loops_cannot_be_used_inside_a_class_static_block_18038", "'For await' loops cannot be used inside a class static block."),
         Invalid_use_of_0_It_cannot_be_used_inside_a_class_static_block: diag(18039, ts.DiagnosticCategory.Error, "Invalid_use_of_0_It_cannot_be_used_inside_a_class_static_block_18039", "Invalid use of '{0}'. It cannot be used inside a class static block."),
         A_return_statement_cannot_be_used_inside_a_class_static_block: diag(18041, ts.DiagnosticCategory.Error, "A_return_statement_cannot_be_used_inside_a_class_static_block_18041", "A 'return' statement cannot be used inside a class static block."),
+        _0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation: diag(18042, ts.DiagnosticCategory.Error, "_0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation_18042", "'{0}' is a type and cannot be imported in JavaScript files. Use '{1}' in a JSDoc type annotation."),
+        Types_cannot_appear_in_export_declarations_in_JavaScript_files: diag(18043, ts.DiagnosticCategory.Error, "Types_cannot_appear_in_export_declarations_in_JavaScript_files_18043", "Types cannot appear in export declarations in JavaScript files."),
+        _0_is_automatically_exported_here: diag(18044, ts.DiagnosticCategory.Message, "_0_is_automatically_exported_here_18044", "'{0}' is automatically exported here."),
     };
 })(ts || (ts = {}));
 var ts;
@@ -27908,10 +27911,10 @@ var ts;
                 setDecoratorContext(false);
             }
             var pos = getNodePos();
-            var expr = parseAssignmentExpressionOrHigher();
+            var expr = parseAssignmentExpressionOrHigher(true);
             var operatorToken;
             while ((operatorToken = parseOptionalToken(27))) {
-                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(), pos);
+                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(true), pos);
             }
             if (saveDecoratorContext) {
                 setDecoratorContext(true);
@@ -27919,25 +27922,25 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(63) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(63) ? parseAssignmentExpressionOrHigher(true) : undefined;
         }
-        function parseAssignmentExpressionOrHigher() {
+        function parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction) {
             if (isYieldExpression()) {
                 return parseYieldExpression();
             }
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) || tryParseAsyncSimpleArrowFunctionExpression(allowReturnTypeInArrowFunction);
             if (arrowExpression) {
                 return arrowExpression;
             }
             var pos = getNodePos();
             var expr = parseBinaryExpressionOrHigher(0);
             if (expr.kind === 79 && token() === 38) {
-                return parseSimpleArrowFunctionExpression(pos, expr, undefined);
+                return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, undefined);
             }
             if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
-                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(), pos);
+                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction), pos);
             }
-            return parseConditionalExpressionRest(expr, pos);
+            return parseConditionalExpressionRest(expr, pos, allowReturnTypeInArrowFunction);
         }
         function isYieldExpression() {
             if (token() === 125) {
@@ -27957,30 +27960,30 @@ var ts;
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 41 || isStartOfExpression())) {
-                return finishNode(factory.createYieldExpression(parseOptionalToken(41), parseAssignmentExpressionOrHigher()), pos);
+                return finishNode(factory.createYieldExpression(parseOptionalToken(41), parseAssignmentExpressionOrHigher(true)), pos);
             }
             else {
                 return finishNode(factory.createYieldExpression(undefined, undefined), pos);
             }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
             ts.Debug.assert(token() === 38, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var parameter = factory.createParameterDeclaration(undefined, undefined, identifier, undefined, undefined, undefined);
             finishNode(parameter, identifier.pos);
             var parameters = createNodeArray([parameter], parameter.pos, parameter.end);
             var equalsGreaterThanToken = parseExpectedToken(38);
-            var body = parseArrowFunctionExpressionBody(!!asyncModifier);
+            var body = parseArrowFunctionExpressionBody(!!asyncModifier, allowReturnTypeInArrowFunction);
             var node = factory.createArrowFunction(asyncModifier, undefined, parameters, undefined, equalsGreaterThanToken, body);
             return addJSDocComment(finishNode(node, pos));
         }
-        function tryParseParenthesizedArrowFunctionExpression() {
+        function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
             var triState = isParenthesizedArrowFunctionExpression();
             if (triState === 0) {
                 return undefined;
             }
             return triState === 1 ?
-                parseParenthesizedArrowFunctionExpression(true) :
-                tryParse(parsePossibleParenthesizedArrowFunctionExpression);
+                parseParenthesizedArrowFunctionExpression(true, true) :
+                tryParse(function () { return parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction); });
         }
         function isParenthesizedArrowFunctionExpression() {
             if (token() === 20 || token() === 29 || token() === 131) {
@@ -28077,24 +28080,24 @@ var ts;
                 return 2;
             }
         }
-        function parsePossibleParenthesizedArrowFunctionExpression() {
+        function parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
             var tokenPos = scanner.getTokenPos();
             if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) {
                 return undefined;
             }
-            var result = parseParenthesizedArrowFunctionExpression(false);
+            var result = parseParenthesizedArrowFunctionExpression(false, allowReturnTypeInArrowFunction);
             if (!result) {
                 (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos);
             }
             return result;
         }
-        function tryParseAsyncSimpleArrowFunctionExpression() {
+        function tryParseAsyncSimpleArrowFunctionExpression(allowReturnTypeInArrowFunction) {
             if (token() === 131) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) {
                     var pos = getNodePos();
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0);
-                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier);
+                    return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
                 }
             }
             return undefined;
@@ -28112,7 +28115,7 @@ var ts;
             }
             return 0;
         }
-        function parseParenthesizedArrowFunctionExpression(allowAmbiguity) {
+        function parseParenthesizedArrowFunctionExpression(allowAmbiguity, allowReturnTypeInArrowFunction) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiersForArrowFunction();
@@ -28140,6 +28143,7 @@ var ts;
                     return undefined;
                 }
             }
+            var hasReturnColon = token() === 58;
             var type = parseReturnType(58, false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -28155,12 +28159,17 @@ var ts;
             var lastToken = token();
             var equalsGreaterThanToken = parseExpectedToken(38);
             var body = (lastToken === 38 || lastToken === 18)
-                ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier))
+                ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier), allowReturnTypeInArrowFunction)
                 : parseIdentifier();
+            if (!allowReturnTypeInArrowFunction && hasReturnColon) {
+                if (token() !== 58) {
+                    return undefined;
+                }
+            }
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function parseArrowFunctionExpressionBody(isAsync) {
+        function parseArrowFunctionExpressionBody(isAsync, allowReturnTypeInArrowFunction) {
             if (token() === 18) {
                 return parseFunctionBlock(isAsync ? 2 : 0);
             }
@@ -28174,19 +28183,19 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var node = isAsync
-                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
-                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
+                ? doInAwaitContext(function () { return parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction); })
+                : doOutsideOfAwaitContext(function () { return parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction); });
             topLevel = savedTopLevel;
             return node;
         }
-        function parseConditionalExpressionRest(leftOperand, pos) {
+        function parseConditionalExpressionRest(leftOperand, pos, allowReturnTypeInArrowFunction) {
             var questionToken = parseOptionalToken(57);
             if (!questionToken) {
                 return leftOperand;
             }
             var colonToken;
-            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58), ts.nodeIsPresent(colonToken)
-                ? parseAssignmentExpressionOrHigher()
+            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, function () { return parseAssignmentExpressionOrHigher(false); }), colonToken = parseExpectedToken(58), ts.nodeIsPresent(colonToken)
+                ? parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction)
                 : createMissingNode(79, false, ts.Diagnostics._0_expected, ts.tokenToString(58))), pos);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -28856,13 +28865,13 @@ var ts;
         function parseSpreadElement() {
             var pos = getNodePos();
             parseExpected(25);
-            var expression = parseAssignmentExpressionOrHigher();
+            var expression = parseAssignmentExpressionOrHigher(true);
             return finishNode(factory.createSpreadElement(expression), pos);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 ? parseSpreadElement() :
                 token() === 27 ? finishNode(factory.createOmittedExpression(), getNodePos()) :
-                    parseAssignmentExpressionOrHigher();
+                    parseAssignmentExpressionOrHigher(true);
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
@@ -28880,7 +28889,7 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             if (parseOptionalToken(25)) {
-                var expression = parseAssignmentExpressionOrHigher();
+                var expression = parseAssignmentExpressionOrHigher(true);
                 return withJSDoc(finishNode(factory.createSpreadAssignment(expression), pos), hasJSDoc);
             }
             var decorators = parseDecorators();
@@ -28903,13 +28912,13 @@ var ts;
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 58);
             if (isShorthandPropertyAssignment) {
                 var equalsToken = parseOptionalToken(63);
-                var objectAssignmentInitializer = equalsToken ? allowInAnd(parseAssignmentExpressionOrHigher) : undefined;
+                var objectAssignmentInitializer = equalsToken ? allowInAnd(function () { return parseAssignmentExpressionOrHigher(true); }) : undefined;
                 node = factory.createShorthandPropertyAssignment(name, objectAssignmentInitializer);
                 node.equalsToken = equalsToken;
             }
             else {
                 parseExpected(58);
-                var initializer = allowInAnd(parseAssignmentExpressionOrHigher);
+                var initializer = allowInAnd(function () { return parseAssignmentExpressionOrHigher(true); });
                 node = factory.createPropertyAssignment(name, initializer);
             }
             node.decorators = decorators;
@@ -29072,7 +29081,7 @@ var ts;
             }
             var node;
             if (awaitToken ? parseExpected(160) : parseOptional(160)) {
-                var expression = allowInAnd(parseAssignmentExpressionOrHigher);
+                var expression = allowInAnd(function () { return parseAssignmentExpressionOrHigher(true); });
                 parseExpected(21);
                 node = factory.createForOfStatement(awaitToken, initializer, expression, parseStatement());
             }
@@ -30130,7 +30139,7 @@ var ts;
             var pos = getNodePos();
             var name = ts.tokenIsIdentifierOrKeyword(token()) ? parseIdentifierName() : parseLiteralLikeNode(10);
             parseExpected(58);
-            var value = parseAssignmentExpressionOrHigher();
+            var value = parseAssignmentExpressionOrHigher(true);
             return finishNode(factory.createAssertEntry(name, value), pos);
         }
         function parseAssertClause(skipAssertKeyword) {
@@ -30326,7 +30335,7 @@ var ts;
             else {
                 parseExpected(88);
             }
-            var expression = parseAssignmentExpressionOrHigher();
+            var expression = parseAssignmentExpressionOrHigher(true);
             parseSemicolon();
             setAwaitContext(savedAwaitContext);
             var node = factory.createExportAssignment(modifiers, isExportEquals, expression);
@@ -71880,10 +71889,35 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
+            var _a, _b, _c, _d, _e;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
                 symbol = getMergedSymbol(symbol.exportSymbol || symbol);
+                if (ts.isInJSFile(node) && !(target.flags & 111551) && !ts.isTypeOnlyImportOrExportDeclaration(node)) {
+                    var errorNode = ts.isImportOrExportSpecifier(node) ? node.propertyName || node.name :
+                        ts.isNamedDeclaration(node) ? node.name :
+                            node;
+                    ts.Debug.assert(node.kind !== 274);
+                    if (node.kind === 275) {
+                        var diag = error(errorNode, ts.Diagnostics.Types_cannot_appear_in_export_declarations_in_JavaScript_files);
+                        var alreadyExportedSymbol = (_b = (_a = ts.getSourceFileOfNode(node).symbol) === null || _a === void 0 ? void 0 : _a.exports) === null || _b === void 0 ? void 0 : _b.get((node.propertyName || node.name).escapedText);
+                        if (alreadyExportedSymbol === target) {
+                            var exportingDeclaration = (_c = alreadyExportedSymbol.declarations) === null || _c === void 0 ? void 0 : _c.find(ts.isJSDocNode);
+                            if (exportingDeclaration) {
+                                ts.addRelatedInfo(diag, ts.createDiagnosticForNode(exportingDeclaration, ts.Diagnostics._0_is_automatically_exported_here, ts.unescapeLeadingUnderscores(alreadyExportedSymbol.escapedName)));
+                            }
+                        }
+                    }
+                    else {
+                        ts.Debug.assert(node.kind !== 254);
+                        var importDeclaration = ts.findAncestor(node, ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration));
+                        var moduleSpecifier = (_e = (importDeclaration && ((_d = ts.tryGetModuleSpecifierFromDeclaration(importDeclaration)) === null || _d === void 0 ? void 0 : _d.text))) !== null && _e !== void 0 ? _e : "...";
+                        var importedIdentifier = ts.unescapeLeadingUnderscores(ts.isIdentifier(errorNode) ? errorNode.escapedText : symbol.escapedName);
+                        error(errorNode, ts.Diagnostics._0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation, importedIdentifier, "import(\"" + moduleSpecifier + "\")." + importedIdentifier);
+                    }
+                    return;
+                }
                 var excludedMeanings = (symbol.flags & (111551 | 1048576) ? 111551 : 0) |
                     (symbol.flags & 788968 ? 788968 : 0) |
                     (symbol.flags & 1920 ? 1920 : 0);