@typescript-deploys/pr-build 4.6.0-pr-47590-5 → 4.6.0-pr-45974-9

package/lib/tsc.js

@@ -4885,18 +4885,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    function normalizePathAndParts(path) {
-        path = normalizeSlashes(path);
-        var _a = reducePathComponents(getPathComponents(path)), root = _a[0], parts = _a.slice(1);
-        if (parts.length) {
-            var joinedParts = root + parts.join(ts.directorySeparator);
-            return { path: hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts: parts };
-        }
-        else {
-            return { path: root, parts: parts };
-        }
-    }
-    ts.normalizePathAndParts = normalizePathAndParts;
     function removeTrailingDirectorySeparator(path) {
         if (hasTrailingDirectorySeparator(path)) {
             return path.substr(0, path.length - 1);
@@ -8747,8 +8735,6 @@ var ts;
                 case 39:
                     tokenValue = scanString(true);
                     return token = 10;
-                case 96:
-                    return token = scanTemplateAndSetTokenValue(false);
                 default:
                     return scan();
             }
@@ -10398,10 +10384,6 @@ var ts;
             || kind === 287;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
-    function isStringLiteralOrTemplateExpressionOrJsxExpression(node) {
-        return node.kind === 222 || isStringLiteralOrJsxExpression(node);
-    }
-    ts.isStringLiteralOrTemplateExpressionOrJsxExpression = isStringLiteralOrTemplateExpressionOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
         return kind === 279
@@ -27636,26 +27618,15 @@ var ts;
             }
             return finishNode(factory.createJsxExpression(dotDotDotToken, expression), pos);
         }
-        function parseJsxAttributeValue() {
-            if (token() !== 63) {
-                return undefined;
-            }
-            var jsxAttributeValueToken = scanJsxAttributeValue();
-            if (jsxAttributeValueToken === 10 || jsxAttributeValueToken === 14) {
-                return parseLiteralNode();
-            }
-            if (jsxAttributeValueToken === 15) {
-                return parseTemplateExpression(false);
-            }
-            return parseJsxExpression(true);
-        }
         function parseJsxAttribute() {
             if (token() === 18) {
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
             var pos = getNodePos();
-            return finishNode(factory.createJsxAttribute(parseIdentifierName(), parseJsxAttributeValue()), pos);
+            return finishNode(factory.createJsxAttribute(parseIdentifierName(), token() !== 63 ? undefined :
+                scanJsxAttributeValue() === 10 ? parseLiteralNode() :
+                    parseJsxExpression(true)), pos);
         }
         function parseJsxSpreadAttribute() {
             var pos = getNodePos();
@@ -34051,7 +34022,7 @@ var ts;
                     result_4 = searchResult && searchResult.value;
                 }
                 else {
-                    var candidate = ts.normalizePathAndParts(ts.combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName)).path;
+                    var candidate = normalizePathForCJSResolution(initialLocationForSecondaryLookup, typeReferenceDirectiveName).path;
                     result_4 = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, false, moduleResolutionState, true);
                 }
                 return resolvedTypeScriptOnly(result_4);
@@ -34627,12 +34598,19 @@ var ts;
                 return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
             }
             else {
-                var _a = ts.normalizePathAndParts(ts.combinePaths(containingDirectory, moduleName)), candidate = _a.path, parts = _a.parts;
+                var _a = normalizePathForCJSResolution(containingDirectory, moduleName), candidate = _a.path, parts = _a.parts;
                 var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, false, state, true);
                 return resolved_2 && toSearchResult({ resolved: resolved_2, isExternalLibraryImport: ts.contains(parts, "node_modules") });
             }
         }
     }
+    function normalizePathForCJSResolution(containingDirectory, moduleName) {
+        var combined = ts.combinePaths(containingDirectory, moduleName);
+        var parts = ts.getPathComponents(combined);
+        var lastPart = ts.lastOrUndefined(parts);
+        var path = lastPart === "." || lastPart === ".." ? ts.ensureTrailingDirectorySeparator(ts.normalizePath(combined)) : ts.normalizePath(combined);
+        return { path: path, parts: parts };
+    }
     function realPath(path, host, traceEnabled) {
         if (!host.realpath) {
             return path;
@@ -36135,7 +36113,7 @@ var ts;
             return ts.isDottedName(expr)
                 || (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression)
                 || ts.isBinaryExpression(expr) && expr.operatorToken.kind === 27 && isNarrowableReference(expr.right)
-                || ts.isElementAccessExpression(expr) && ts.isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression)
+                || ts.isElementAccessExpression(expr) && (ts.isStringOrNumericLiteralLike(expr.argumentExpression) || ts.isIdentifier(expr.argumentExpression)) && isNarrowableReference(expr.expression)
                 || ts.isAssignmentExpression(expr) && isNarrowableReference(expr.left);
         }
         function containsNarrowableReference(expr) {
@@ -56584,8 +56562,9 @@ var ts;
                     return isMatchingReference(source.expression, target);
                 case 205:
                 case 206:
-                    return ts.isAccessExpression(target) &&
-                        getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
+                    var sourcePropertyName = getAccessedPropertyName(source);
+                    var targetPropertyName = ts.isAccessExpression(target) ? getAccessedPropertyName(target) : undefined;
+                    return sourcePropertyName !== undefined && targetPropertyName !== undefined && targetPropertyName === sourcePropertyName &&
                         isMatchingReference(source.expression, target.expression);
                 case 160:
                     return ts.isAccessExpression(target) &&
@@ -56597,12 +56576,49 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            var propertyName;
-            return access.kind === 205 ? access.name.escapedText :
-                access.kind === 206 && ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
-                    access.kind === 202 && (propertyName = getDestructuringPropertyName(access)) ? ts.escapeLeadingUnderscores(propertyName) :
-                        access.kind === 163 ? ("" + access.parent.parameters.indexOf(access)) :
-                            undefined;
+            if (ts.isPropertyAccessExpression(access)) {
+                return access.name.escapedText;
+            }
+            if (ts.isElementAccessExpression(access)) {
+                return tryGetElementAccessExpressionName(access);
+            }
+            if (ts.isBindingElement(access)) {
+                var name = getDestructuringPropertyName(access);
+                return name ? ts.escapeLeadingUnderscores(name) : undefined;
+            }
+            if (ts.isParameter(access)) {
+                return ("" + access.parent.parameters.indexOf(access));
+            }
+            return undefined;
+        }
+        function tryGetNameFromType(type) {
+            return type.flags & 8192 ? type.escapedName :
+                type.flags & 384 ? ts.escapeLeadingUnderscores("" + type.value) : undefined;
+        }
+        function tryGetElementAccessExpressionName(node) {
+            if (ts.isStringOrNumericLiteralLike(node.argumentExpression)) {
+                return ts.escapeLeadingUnderscores(node.argumentExpression.text);
+            }
+            if (ts.isIdentifier(node.argumentExpression)) {
+                var symbol = getResolvedSymbol(node.argumentExpression);
+                if (!isConstVariable(symbol))
+                    return undefined;
+                var declaration = symbol.valueDeclaration;
+                if (declaration === undefined)
+                    return undefined;
+                var type = tryGetTypeFromEffectiveTypeNode(declaration);
+                if (type) {
+                    var name = tryGetNameFromType(type);
+                    if (name !== undefined) {
+                        return name;
+                    }
+                }
+                if (ts.hasOnlyExpressionInitializer(declaration)) {
+                    var initializer = ts.getEffectiveInitializer(declaration);
+                    return initializer && tryGetNameFromType(getTypeOfExpression(initializer));
+                }
+            }
+            return undefined;
         }
         function containsMatchingReference(source, target) {
             while (ts.isAccessExpression(source)) {
@@ -69292,7 +69308,7 @@ var ts;
                 }
                 if (!ts.isStatic(member) && isPropertyWithoutInitializer(member)) {
                     var propName = member.name;
-                    if (ts.isIdentifier(propName) || ts.isPrivateIdentifier(propName)) {
+                    if (ts.isIdentifier(propName) || ts.isPrivateIdentifier(propName) || ts.isComputedPropertyName(propName)) {
                         var type = getTypeOfSymbol(getSymbolOfNode(member));
                         if (!(type.flags & 3 || getFalsyFlags(type) & 32768)) {
                             if (!constructor || !isPropertyInitializedInConstructor(propName, type, constructor)) {
@@ -69326,7 +69342,9 @@ var ts;
             return false;
         }
         function isPropertyInitializedInConstructor(propName, propType, constructor) {
-            var reference = ts.factory.createPropertyAccessExpression(ts.factory.createThis(), propName);
+            var reference = ts.isComputedPropertyName(propName)
+                ? ts.factory.createElementAccessExpression(ts.factory.createThis(), propName.expression)
+                : ts.factory.createPropertyAccessExpression(ts.factory.createThis(), propName);
             ts.setParent(reference.expression, reference);
             ts.setParent(reference, constructor);
             reference.flowNode = constructor.returnFlowNode;
@@ -74091,7 +74109,7 @@ var ts;
                 return factory.updateJsxFragment(node, nodeVisitor(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingFragment, visitor, ts.isJsxClosingFragment));
             case 284:
                 ts.Debug.type(node);
-                return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrTemplateExpressionOrJsxExpression));
+                return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 285:
                 ts.Debug.type(node);
                 return factory.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
@@ -80263,9 +80281,6 @@ var ts;
                 var literal = factory.createStringLiteral(tryDecodeEntities(node.text) || node.text, singleQuote);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 14 || node.kind === 222) {
-                return node;
-            }
             else if (node.kind === 287) {
                 if (node.expression === undefined) {
                     return factory.createTrue();
@@ -80868,8 +80883,6 @@ var ts;
                     return visitReturnStatement(node);
                 case 216:
                     return visitVoidExpression(node);
-                case 284:
-                    return visitJsxAttribute(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
@@ -80899,12 +80912,6 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
-        function visitJsxAttribute(node) {
-            if (node.initializer && ts.isTemplateExpression(node.initializer)) {
-                return factory.createJsxAttribute(ts.visitNode(node.name, visitor, ts.isIdentifier), factory.createJsxExpression(undefined, ts.visitNode(node.initializer, visitor, ts.isExpression)));
-            }
-            return ts.visitEachChild(node, visitor, context);
-        }
         function visitCaseBlock(node) {
             var ancestorFacts = enterSubtree(7104, 0);
             var updated = ts.visitEachChild(node, visitor, context);

package/lib/tsserver.js

@@ -7636,18 +7636,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    function normalizePathAndParts(path) {
-        path = normalizeSlashes(path);
-        var _a = reducePathComponents(getPathComponents(path)), root = _a[0], parts = _a.slice(1);
-        if (parts.length) {
-            var joinedParts = root + parts.join(ts.directorySeparator);
-            return { path: hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts: parts };
-        }
-        else {
-            return { path: root, parts: parts };
-        }
-    }
-    ts.normalizePathAndParts = normalizePathAndParts;
     function removeTrailingDirectorySeparator(path) {
         if (hasTrailingDirectorySeparator(path)) {
             return path.substr(0, path.length - 1);
@@ -11751,8 +11739,6 @@ var ts;
                 case 39 /* singleQuote */:
                     tokenValue = scanString(/*jsxAttributeString*/ true);
                     return token = 10 /* StringLiteral */;
-                case 96 /* backtick */:
-                    return token = scanTemplateAndSetTokenValue(/*isTaggedTemplate*/ false);
                 default:
                     // If this scans anything other than `{`, it's a parse error.
                     return scan();
@@ -13760,11 +13746,6 @@ var ts;
             || kind === 287 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
-    /* @internal */
-    function isStringLiteralOrTemplateExpressionOrJsxExpression(node) {
-        return node.kind === 222 /* TemplateExpression */ || isStringLiteralOrJsxExpression(node);
-    }
-    ts.isStringLiteralOrTemplateExpressionOrJsxExpression = isStringLiteralOrTemplateExpressionOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
         return kind === 279 /* JsxOpeningElement */
@@ -34462,26 +34443,15 @@ var ts;
             }
             return finishNode(factory.createJsxExpression(dotDotDotToken, expression), pos);
         }
-        function parseJsxAttributeValue() {
-            if (token() !== 63 /* EqualsToken */) {
-                return undefined;
-            }
-            var jsxAttributeValueToken = scanJsxAttributeValue();
-            if (jsxAttributeValueToken === 10 /* StringLiteral */ || jsxAttributeValueToken === 14 /* NoSubstitutionTemplateLiteral */) {
-                return parseLiteralNode();
-            }
-            if (jsxAttributeValueToken === 15 /* TemplateHead */) {
-                return parseTemplateExpression(/*isTaggedTemplate*/ false);
-            }
-            return parseJsxExpression(/*inExpressionContext*/ true);
-        }
         function parseJsxAttribute() {
             if (token() === 18 /* OpenBraceToken */) {
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
             var pos = getNodePos();
-            return finishNode(factory.createJsxAttribute(parseIdentifierName(), parseJsxAttributeValue()), pos);
+            return finishNode(factory.createJsxAttribute(parseIdentifierName(), token() !== 63 /* EqualsToken */ ? undefined :
+                scanJsxAttributeValue() === 10 /* StringLiteral */ ? parseLiteralNode() :
+                    parseJsxExpression(/*inExpressionContext*/ true)), pos);
         }
         function parseJsxSpreadAttribute() {
             var pos = getNodePos();
@@ -41739,7 +41709,7 @@ var ts;
                     result_4 = searchResult && searchResult.value;
                 }
                 else {
-                    var candidate = ts.normalizePathAndParts(ts.combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName)).path;
+                    var candidate = normalizePathForCJSResolution(initialLocationForSecondaryLookup, typeReferenceDirectiveName).path;
                     result_4 = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
                 }
                 return resolvedTypeScriptOnly(result_4);
@@ -42442,13 +42412,25 @@ var ts;
                 return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
             }
             else {
-                var _a = ts.normalizePathAndParts(ts.combinePaths(containingDirectory, moduleName)), candidate = _a.path, parts = _a.parts;
+                var _a = normalizePathForCJSResolution(containingDirectory, moduleName), candidate = _a.path, parts = _a.parts;
                 var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/ true);
                 // Treat explicit "node_modules" import as an external library import.
                 return resolved_2 && toSearchResult({ resolved: resolved_2, isExternalLibraryImport: ts.contains(parts, "node_modules") });
             }
         }
     }
+    // If you import from "." inside a containing directory "/foo", the result of `normalizePath`
+    // would be "/foo", but this loses the information that `foo` is a directory and we intended
+    // to look inside of it. The Node CommonJS resolution algorithm doesn't call this out
+    // (https://nodejs.org/api/modules.html#all-together), but it seems that module paths ending
+    // in `.` are actually normalized to `./` before proceeding with the resolution algorithm.
+    function normalizePathForCJSResolution(containingDirectory, moduleName) {
+        var combined = ts.combinePaths(containingDirectory, moduleName);
+        var parts = ts.getPathComponents(combined);
+        var lastPart = ts.lastOrUndefined(parts);
+        var path = lastPart === "." || lastPart === ".." ? ts.ensureTrailingDirectorySeparator(ts.normalizePath(combined)) : ts.normalizePath(combined);
+        return { path: path, parts: parts };
+    }
     function realPath(path, host, traceEnabled) {
         if (!host.realpath) {
             return path;
@@ -44196,7 +44178,7 @@ var ts;
             return ts.isDottedName(expr)
                 || (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression)
                 || ts.isBinaryExpression(expr) && expr.operatorToken.kind === 27 /* CommaToken */ && isNarrowableReference(expr.right)
-                || ts.isElementAccessExpression(expr) && ts.isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression)
+                || ts.isElementAccessExpression(expr) && (ts.isStringOrNumericLiteralLike(expr.argumentExpression) || ts.isIdentifier(expr.argumentExpression)) && isNarrowableReference(expr.expression)
                 || ts.isAssignmentExpression(expr) && isNarrowableReference(expr.left);
         }
         function containsNarrowableReference(expr) {
@@ -67823,8 +67805,9 @@ var ts;
                     return isMatchingReference(source.expression, target);
                 case 205 /* PropertyAccessExpression */:
                 case 206 /* ElementAccessExpression */:
-                    return ts.isAccessExpression(target) &&
-                        getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
+                    var sourcePropertyName = getAccessedPropertyName(source);
+                    var targetPropertyName = ts.isAccessExpression(target) ? getAccessedPropertyName(target) : undefined;
+                    return sourcePropertyName !== undefined && targetPropertyName !== undefined && targetPropertyName === sourcePropertyName &&
                         isMatchingReference(source.expression, target.expression);
                 case 160 /* QualifiedName */:
                     return ts.isAccessExpression(target) &&
@@ -67836,12 +67819,49 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            var propertyName;
-            return access.kind === 205 /* PropertyAccessExpression */ ? access.name.escapedText :
-                access.kind === 206 /* ElementAccessExpression */ && ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
-                    access.kind === 202 /* BindingElement */ && (propertyName = getDestructuringPropertyName(access)) ? ts.escapeLeadingUnderscores(propertyName) :
-                        access.kind === 163 /* Parameter */ ? ("" + access.parent.parameters.indexOf(access)) :
-                            undefined;
+            if (ts.isPropertyAccessExpression(access)) {
+                return access.name.escapedText;
+            }
+            if (ts.isElementAccessExpression(access)) {
+                return tryGetElementAccessExpressionName(access);
+            }
+            if (ts.isBindingElement(access)) {
+                var name = getDestructuringPropertyName(access);
+                return name ? ts.escapeLeadingUnderscores(name) : undefined;
+            }
+            if (ts.isParameter(access)) {
+                return ("" + access.parent.parameters.indexOf(access));
+            }
+            return undefined;
+        }
+        function tryGetNameFromType(type) {
+            return type.flags & 8192 /* UniqueESSymbol */ ? type.escapedName :
+                type.flags & 384 /* StringOrNumberLiteral */ ? ts.escapeLeadingUnderscores("" + type.value) : undefined;
+        }
+        function tryGetElementAccessExpressionName(node) {
+            if (ts.isStringOrNumericLiteralLike(node.argumentExpression)) {
+                return ts.escapeLeadingUnderscores(node.argumentExpression.text);
+            }
+            if (ts.isIdentifier(node.argumentExpression)) {
+                var symbol = getResolvedSymbol(node.argumentExpression);
+                if (!isConstVariable(symbol))
+                    return undefined;
+                var declaration = symbol.valueDeclaration;
+                if (declaration === undefined)
+                    return undefined;
+                var type = tryGetTypeFromEffectiveTypeNode(declaration);
+                if (type) {
+                    var name = tryGetNameFromType(type);
+                    if (name !== undefined) {
+                        return name;
+                    }
+                }
+                if (ts.hasOnlyExpressionInitializer(declaration)) {
+                    var initializer = ts.getEffectiveInitializer(declaration);
+                    return initializer && tryGetNameFromType(getTypeOfExpression(initializer));
+                }
+            }
+            return undefined;
         }
         function containsMatchingReference(source, target) {
             while (ts.isAccessExpression(source)) {
@@ -82759,7 +82779,7 @@ var ts;
                 }
                 if (!ts.isStatic(member) && isPropertyWithoutInitializer(member)) {
                     var propName = member.name;
-                    if (ts.isIdentifier(propName) || ts.isPrivateIdentifier(propName)) {
+                    if (ts.isIdentifier(propName) || ts.isPrivateIdentifier(propName) || ts.isComputedPropertyName(propName)) {
                         var type = getTypeOfSymbol(getSymbolOfNode(member));
                         if (!(type.flags & 3 /* AnyOrUnknown */ || getFalsyFlags(type) & 32768 /* Undefined */)) {
                             if (!constructor || !isPropertyInitializedInConstructor(propName, type, constructor)) {
@@ -82794,7 +82814,9 @@ var ts;
             return false;
         }
         function isPropertyInitializedInConstructor(propName, propType, constructor) {
-            var reference = ts.factory.createPropertyAccessExpression(ts.factory.createThis(), propName);
+            var reference = ts.isComputedPropertyName(propName)
+                ? ts.factory.createElementAccessExpression(ts.factory.createThis(), propName.expression)
+                : ts.factory.createPropertyAccessExpression(ts.factory.createThis(), propName);
             ts.setParent(reference.expression, reference);
             ts.setParent(reference, constructor);
             reference.flowNode = constructor.returnFlowNode;
@@ -88021,7 +88043,7 @@ var ts;
                 return factory.updateJsxFragment(node, nodeVisitor(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingFragment, visitor, ts.isJsxClosingFragment));
             case 284 /* JsxAttribute */:
                 ts.Debug.type(node);
-                return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrTemplateExpressionOrJsxExpression));
+                return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 285 /* JsxAttributes */:
                 ts.Debug.type(node);
                 return factory.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
@@ -96083,9 +96105,6 @@ var ts;
                 var literal = factory.createStringLiteral(tryDecodeEntities(node.text) || node.text, singleQuote);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 14 /* NoSubstitutionTemplateLiteral */ || node.kind === 222 /* TemplateExpression */) {
-                return node;
-            }
             else if (node.kind === 287 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return factory.createTrue();
@@ -96860,8 +96879,6 @@ var ts;
                     return visitReturnStatement(node);
                 case 216 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 284 /* JsxAttribute */:
-                    return visitJsxAttribute(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
@@ -96892,13 +96909,6 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
-        function visitJsxAttribute(node) {
-            if (node.initializer && ts.isTemplateExpression(node.initializer)) {
-                return factory.createJsxAttribute(ts.visitNode(node.name, visitor, ts.isIdentifier), factory.createJsxExpression(
-                /* dotDotDotToken */ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression)));
-            }
-            return ts.visitEachChild(node, visitor, context);
-        }
         function visitCaseBlock(node) {
             var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
@@ -126964,6 +126974,10 @@ var ts;
         return __assign(__assign({}, options), { semicolons: shouldRemoveSemicolons ? ts.SemicolonPreference.Remove : ts.SemicolonPreference.Ignore });
     }
     ts.getFormatCodeSettingsForWriting = getFormatCodeSettingsForWriting;
+    function jsxModeNeedsExplicitImport(jsx) {
+        return jsx === 2 /* React */ || jsx === 3 /* ReactNative */;
+    }
+    ts.jsxModeNeedsExplicitImport = jsxModeNeedsExplicitImport;
     // #endregion
 })(ts || (ts = {}));
 /*@internal*/
@@ -128908,9 +128922,18 @@ var ts;
                     return getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath);
                 }
             }
+            function isEmitResolutionKindUsingNodeModules(compilerOptions) {
+                return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs ||
+                    ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.Node12 ||
+                    ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeNext;
+            }
+            function isEmitModuleResolutionRespectingExportMaps(compilerOptions) {
+                return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.Node12 ||
+                    ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeNext;
+            }
             function getSupportedExtensionsForModuleResolution(compilerOptions) {
                 var extensions = ts.getSupportedExtensions(compilerOptions);
-                return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs ?
+                return isEmitResolutionKindUsingNodeModules(compilerOptions) ?
                     ts.getSupportedExtensionsWithJsonIfResolveJsonModule(compilerOptions, extensions) :
                     extensions;
             }
@@ -129073,7 +129096,7 @@ var ts;
                     result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                 }
                 getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-                if (ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs) {
+                if (isEmitResolutionKindUsingNodeModules(compilerOptions)) {
                     // If looking for a global package name, don't just include everything in `node_modules` because that includes dependencies' own dependencies.
                     // (But do if we didn't find anything, e.g. 'package.json' missing.)
                     var foundGlobal = false;
@@ -129090,12 +129113,68 @@ var ts;
                         }
                     }
                     if (!foundGlobal) {
-                        ts.forEachAncestorDirectory(scriptPath, function (ancestor) {
+                        var ancestorLookup = function (ancestor) {
                             var nodeModules = ts.combinePaths(ancestor, "node_modules");
                             if (ts.tryDirectoryExists(host, nodeModules)) {
                                 getCompletionEntriesForDirectoryFragment(fragment, nodeModules, extensionOptions, host, /*exclude*/ undefined, result);
                             }
-                        });
+                        };
+                        if (fragmentDirectory && isEmitModuleResolutionRespectingExportMaps(compilerOptions)) {
+                            var nodeModulesDirectoryLookup_1 = ancestorLookup;
+                            ancestorLookup = function (ancestor) {
+                                var components = ts.getPathComponents(fragment);
+                                components.shift(); // shift off empty root
+                                var packagePath = components.shift();
+                                if (!packagePath) {
+                                    return nodeModulesDirectoryLookup_1(ancestor);
+                                }
+                                if (ts.startsWith(packagePath, "@")) {
+                                    var subName = components.shift();
+                                    if (!subName) {
+                                        return nodeModulesDirectoryLookup_1(ancestor);
+                                    }
+                                    packagePath = ts.combinePaths(packagePath, subName);
+                                }
+                                var packageFile = ts.combinePaths(ancestor, "node_modules", packagePath, "package.json");
+                                if (ts.tryFileExists(host, packageFile)) {
+                                    var packageJson = ts.readJson(packageFile, host);
+                                    var exports = packageJson.exports;
+                                    if (exports) {
+                                        if (typeof exports !== "object" || exports === null) { // eslint-disable-line no-null/no-null
+                                            return; // null exports or entrypoint only, no sub-modules available
+                                        }
+                                        var keys = ts.getOwnKeys(exports);
+                                        var fragmentSubpath_1 = components.join("/");
+                                        var processedKeys = ts.mapDefined(keys, function (k) {
+                                            if (k === ".")
+                                                return undefined;
+                                            if (!ts.startsWith(k, "./"))
+                                                return undefined;
+                                            var subpath = k.substring(2);
+                                            if (!ts.startsWith(subpath, fragmentSubpath_1))
+                                                return undefined;
+                                            // subpath is a valid export (barring conditions, which we don't currently check here)
+                                            if (!ts.stringContains(subpath, "*")) {
+                                                return subpath;
+                                            }
+                                            // pattern export - only return everything up to the `*`, so the user can autocomplete, then
+                                            // keep filling in the pattern (we could speculatively return a list of options by hitting disk,
+                                            // but conditions will make that somewhat awkward, as each condition may have a different set of possible
+                                            // options for the `*`.
+                                            return subpath.slice(0, subpath.indexOf("*"));
+                                        });
+                                        ts.forEach(processedKeys, function (k) {
+                                            if (k) {
+                                                result.push(nameAndKind(k, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                                            }
+                                        });
+                                        return;
+                                    }
+                                }
+                                return nodeModulesDirectoryLookup_1(ancestor);
+                            };
+                        }
+                        ts.forEachAncestorDirectory(scriptPath, ancestorLookup);
                     }
                 }
                 return result;
@@ -138588,6 +138667,7 @@ var ts;
                 return oldImports;
             }
             var typeChecker = program.getTypeChecker();
+            var compilerOptions = program.getCompilerOptions();
             var jsxNamespace = typeChecker.getJsxNamespace(sourceFile);
             var jsxFragmentFactory = typeChecker.getJsxFragmentFactory(sourceFile);
             var jsxElementsPresent = !!(sourceFile.transformFlags & 2 /* ContainsJsx */);
@@ -138644,7 +138724,7 @@ var ts;
             return usedImports;
             function isDeclarationUsed(identifier) {
                 // The JSX factory symbol is always used if JSX elements are present - even if they are not allowed.
-                return jsxElementsPresent && (identifier.text === jsxNamespace || jsxFragmentFactory && identifier.text === jsxFragmentFactory) ||
+                return jsxElementsPresent && (identifier.text === jsxNamespace || jsxFragmentFactory && identifier.text === jsxFragmentFactory) && ts.jsxModeNeedsExplicitImport(compilerOptions.jsx) ||
                     ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
             }
         }
@@ -150335,12 +150415,9 @@ var ts;
                 return undefined;
             return { kind: 4 /* PromoteTypeOnly */, typeOnlyAliasDeclaration: typeOnlyAliasDeclaration };
         }
-        function jsxModeNeedsExplicitImport(jsx) {
-            return jsx === 2 /* React */ || jsx === 3 /* ReactNative */;
-        }
         function getSymbolName(sourceFile, checker, symbolToken, compilerOptions) {
             var parent = symbolToken.parent;
-            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
+            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && ts.jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
                 var jsxNamespace = checker.getJsxNamespace(sourceFile);
                 if (needsJsxNamespaceFix(jsxNamespace, symbolToken, checker)) {
                     return jsxNamespace;

package/lib/tsserverlibrary.d.ts

@@ -1373,7 +1373,7 @@ declare namespace ts {
         readonly kind: SyntaxKind.JsxAttribute;
         readonly parent: JsxAttributes;
         readonly name: Identifier;
-        readonly initializer?: StringLiteral | TemplateLiteral | JsxExpression;
+        readonly initializer?: StringLiteral | JsxExpression;
     }
     export interface JsxSpreadAttribute extends ObjectLiteralElement {
         readonly kind: SyntaxKind.JsxSpreadAttribute;
@@ -3690,8 +3690,8 @@ declare namespace ts {
         createJsxOpeningFragment(): JsxOpeningFragment;
         createJsxJsxClosingFragment(): JsxClosingFragment;
         updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment): JsxFragment;
-        createJsxAttribute(name: Identifier, initializer: StringLiteral | TemplateLiteral | JsxExpression | undefined): JsxAttribute;
-        updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | TemplateLiteral | JsxExpression | undefined): JsxAttribute;
+        createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression | undefined): JsxAttribute;
+        updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression | undefined): JsxAttribute;
         createJsxAttributes(properties: readonly JsxAttributeLike[]): JsxAttributes;
         updateJsxAttributes(node: JsxAttributes, properties: readonly JsxAttributeLike[]): JsxAttributes;
         createJsxSpreadAttribute(expression: Expression): JsxSpreadAttribute;
@@ -11183,9 +11183,9 @@ declare namespace ts {
     /** @deprecated Use `factory.updateJsxFragment` or the factory supplied by your transformation context instead. */
     const updateJsxFragment: (node: JsxFragment, openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment) => JsxFragment;
     /** @deprecated Use `factory.createJsxAttribute` or the factory supplied by your transformation context instead. */
-    const createJsxAttribute: (name: Identifier, initializer: StringLiteral | TemplateLiteral | JsxExpression | undefined) => JsxAttribute;
+    const createJsxAttribute: (name: Identifier, initializer: StringLiteral | JsxExpression | undefined) => JsxAttribute;
     /** @deprecated Use `factory.updateJsxAttribute` or the factory supplied by your transformation context instead. */
-    const updateJsxAttribute: (node: JsxAttribute, name: Identifier, initializer: StringLiteral | TemplateLiteral | JsxExpression | undefined) => JsxAttribute;
+    const updateJsxAttribute: (node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression | undefined) => JsxAttribute;
     /** @deprecated Use `factory.createJsxAttributes` or the factory supplied by your transformation context instead. */
     const createJsxAttributes: (properties: readonly JsxAttributeLike[]) => JsxAttributes;
     /** @deprecated Use `factory.updateJsxAttributes` or the factory supplied by your transformation context instead. */