@typescript-deploys/pr-build 5.0.0-pr-52059-5 → 5.0.0-pr-52577-2

package/lib/tsserver.js

@@ -2378,7 +2378,7 @@ __export(ts_server_exports3, {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-insiders.20230201`;
+var version = `${versionMajorMinor}.0-insiders.20230202`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -40430,6 +40430,22 @@ function resolvedTypeScriptOnly(resolved) {
   Debug.assert(extensionIsTS(resolved.extension));
   return { fileName: resolved.path, packageId: resolved.packageId };
 }
+function createResolvedModuleWithFailedLookupLocationsHandlingSymlink(moduleName, resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state, legacyResult) {
+  if (!state.resultFromCache && !state.compilerOptions.preserveSymlinks && resolved && isExternalLibraryImport && !resolved.originalPath && !isExternalModuleNameRelative(moduleName)) {
+    const { resolvedFileName, originalPath } = getOriginalAndResolvedFileName(resolved.path, state.host, state.traceEnabled);
+    if (originalPath)
+      resolved = { ...resolved, path: resolvedFileName, originalPath };
+  }
+  return createResolvedModuleWithFailedLookupLocations(
+    resolved,
+    isExternalLibraryImport,
+    failedLookupLocations,
+    affectingLocations,
+    diagnostics,
+    state.resultFromCache,
+    legacyResult
+  );
+}
 function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache, legacyResult) {
   if (resultFromCache) {
     resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
@@ -40590,6 +40606,15 @@ function arePathsEqual(path1, path2, host) {
   const useCaseSensitiveFileNames = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
   return comparePaths(path1, path2, !useCaseSensitiveFileNames) === 0 /* EqualTo */;
 }
+function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
+  const resolvedFileName = realPath(fileName, host, traceEnabled);
+  const pathsAreEqual = arePathsEqual(fileName, resolvedFileName, host);
+  return {
+    // If the fileName and realpath are differing only in casing prefer fileName so that we can issue correct errors for casing under forceConsistentCasingInFileNames
+    resolvedFileName: pathsAreEqual ? fileName : resolvedFileName,
+    originalPath: pathsAreEqual ? void 0 : fileName
+  };
+}
 function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
   Debug.assert(typeof typeReferenceDirectiveName === "string", "Non-string value passed to `ts.resolveTypeReferenceDirective`, likely by a wrapping package working with an outdated `resolveTypeReferenceDirectives` signature. This is probably not a problem in TS itself.");
   const traceEnabled = isTraceEnabled(options, host);
@@ -40661,13 +40686,13 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
   let resolvedTypeReferenceDirective;
   if (resolved) {
     const { fileName, packageId } = resolved;
-    const resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
-    const pathsAreEqual = arePathsEqual(fileName, resolvedFileName, host);
+    let resolvedFileName = fileName, originalPath;
+    if (!options.preserveSymlinks)
+      ({ resolvedFileName, originalPath } = getOriginalAndResolvedFileName(fileName, host, traceEnabled));
     resolvedTypeReferenceDirective = {
       primary,
-      // If the fileName and realpath are differing only in casing prefer fileName so that we can issue correct errors for casing under forceConsistentCasingInFileNames
-      resolvedFileName: pathsAreEqual ? fileName : resolvedFileName,
-      originalPath: pathsAreEqual ? void 0 : fileName,
+      resolvedFileName,
+      originalPath,
       packageId,
       isExternalLibraryImport: pathContainsNodeModules(fileName)
     };
@@ -41550,13 +41575,14 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
       legacyResult = diagnosticResult.value.resolved.path;
     }
   }
-  return createResolvedModuleWithFailedLookupLocations(
+  return createResolvedModuleWithFailedLookupLocationsHandlingSymlink(
+    moduleName,
     (_c = result == null ? void 0 : result.value) == null ? void 0 : _c.resolved,
     (_d = result == null ? void 0 : result.value) == null ? void 0 : _d.isExternalLibraryImport,
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state.resultFromCache,
+    state,
     legacyResult
   );
   function tryResolve(extensions2, state2) {
@@ -41586,16 +41612,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
         }
         resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       }
-      if (!resolved2)
-        return void 0;
-      let resolvedValue = resolved2.value;
-      if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) {
-        const path = realPath(resolvedValue.path, host, traceEnabled);
-        const pathsAreEqual = arePathsEqual(path, resolvedValue.path, host);
-        const originalPath = pathsAreEqual ? void 0 : resolvedValue.path;
-        resolvedValue = { ...resolvedValue, path: pathsAreEqual ? resolvedValue.path : path, originalPath };
-      }
-      return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
+      return resolved2 && { value: resolved2.value && { resolved: resolved2.value, isExternalLibraryImport: true } };
     } else {
       const { path: candidate, parts } = normalizePathForCJSResolution(containingDirectory, moduleName);
       const resolved2 = nodeLoadModuleByRelativeName(
@@ -42751,13 +42768,14 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     candidateIsFromPackageJsonField: false
   };
   const resolved = tryResolve(1 /* TypeScript */ | 4 /* Declaration */) || tryResolve(2 /* JavaScript */ | (compilerOptions.resolveJsonModule ? 8 /* Json */ : 0));
-  return createResolvedModuleWithFailedLookupLocations(
+  return createResolvedModuleWithFailedLookupLocationsHandlingSymlink(
+    moduleName,
     resolved && resolved.value,
     (resolved == null ? void 0 : resolved.value) && pathContainsNodeModules(resolved.value.path),
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state.resultFromCache
+    state
   );
   function tryResolve(extensions) {
     const resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, state);
@@ -48959,7 +48977,12 @@ function createTypeChecker(host) {
   }
   function resolveExportByName(moduleSymbol, name, sourceNode, dontResolveAlias) {
     const exportValue = moduleSymbol.exports.get("export=" /* ExportEquals */);
-    const exportSymbol = exportValue ? getPropertyOfType(getTypeOfSymbol(exportValue), name) : moduleSymbol.exports.get(name);
+    const exportSymbol = exportValue ? getPropertyOfType(
+      getTypeOfSymbol(exportValue),
+      name,
+      /*skipObjectFunctionPropertyAugment*/
+      true
+    ) : moduleSymbol.exports.get(name);
     const resolved = resolveSymbol(exportSymbol, dontResolveAlias);
     markSymbolOfAliasDeclarationIfTypeOnly(
       sourceNode,
@@ -58374,7 +58397,7 @@ function createTypeChecker(host) {
             for (const tag of node.tags) {
               if (isJSDocOverloadTag(tag)) {
                 const jsDocSignature = tag.typeExpression;
-                if (jsDocSignature.type === void 0) {
+                if (jsDocSignature.type === void 0 && !isConstructorDeclaration(decl)) {
                   reportImplicitAny(jsDocSignature, anyType);
                 }
                 result.push(getSignatureFromDeclaration(jsDocSignature));
@@ -58486,6 +58509,12 @@ function createTypeChecker(host) {
     if (declaration.kind === 173 /* Constructor */) {
       return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
     }
+    if (isJSDocSignature(declaration)) {
+      const root = getJSDocRoot(declaration);
+      if (root && isConstructorDeclaration(root.parent)) {
+        return getDeclaredTypeOfClassOrInterface(getMergedSymbol(root.parent.parent.symbol));
+      }
+    }
     if (isJSDocConstructSignature(declaration)) {
       return getTypeFromTypeNode(declaration.parameters[0].type);
     }
@@ -60076,7 +60105,7 @@ function createTypeChecker(host) {
   function typePredicateKindsMatch(a, b) {
     return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
   }
-  function getUnionTypeFromSortedList(types, objectFlags, aliasSymbol, aliasTypeArguments, origin) {
+  function getUnionTypeFromSortedList(types, precomputedObjectFlags, aliasSymbol, aliasTypeArguments, origin) {
     if (types.length === 0) {
       return neverType;
     }
@@ -60088,7 +60117,7 @@ function createTypeChecker(host) {
     let type = unionTypes.get(id);
     if (!type) {
       type = createType(1048576 /* Union */);
-      type.objectFlags = objectFlags | getPropagatingFlagsOfTypes(
+      type.objectFlags = precomputedObjectFlags | getPropagatingFlagsOfTypes(
         types,
         /*excludeKinds*/
         98304 /* Nullable */
@@ -63206,7 +63235,6 @@ function createTypeChecker(host) {
     let overrideNextErrorInfo = 0;
     let lastSkippedInfo;
     let incompatibleStack;
-    let inPropertyCheck = false;
     Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
     const result = isRelatedTo(
       source,
@@ -64165,14 +64193,15 @@ function createTypeChecker(host) {
             );
           }
         }
-        if (result2 && !inPropertyCheck && (target2.flags & 2097152 /* Intersection */ && !isGenericObjectType(target2) && source2.flags & (524288 /* Object */ | 2097152 /* Intersection */) || isNonGenericObjectType(target2) && !isArrayOrTupleType(target2) && source2.flags & 2097152 /* Intersection */ && getApparentType(source2).flags & 3670016 /* StructuredType */ && !some(source2.types, (t) => !!(getObjectFlags(t) & 262144 /* NonInferrableType */)))) {
-          inPropertyCheck = true;
+        if (result2 && !(intersectionState & 2 /* Target */) && target2.flags & 2097152 /* Intersection */ && !isGenericObjectType(target2) && source2.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
           result2 &= propertiesRelatedTo(
             source2,
             target2,
             reportErrors2,
             /*excludedProperties*/
             void 0,
+            /*optionalsOnly*/
+            false,
             0 /* None */
           );
           if (result2 && isObjectLiteralType2(source2) && getObjectFlags(source2) & 8192 /* FreshLiteral */) {
@@ -64185,7 +64214,17 @@ function createTypeChecker(host) {
               0 /* None */
             );
           }
-          inPropertyCheck = false;
+        } else if (result2 && isNonGenericObjectType(target2) && !isArrayOrTupleType(target2) && source2.flags & 2097152 /* Intersection */ && getApparentType(source2).flags & 3670016 /* StructuredType */ && !some(source2.types, (t) => !!(getObjectFlags(t) & 262144 /* NonInferrableType */))) {
+          result2 &= propertiesRelatedTo(
+            source2,
+            target2,
+            reportErrors2,
+            /*excludedProperties*/
+            void 0,
+            /*optionalsOnly*/
+            true,
+            intersectionState
+          );
         }
       }
       if (result2) {
@@ -64675,12 +64714,14 @@ function createTypeChecker(host) {
             reportStructuralErrors,
             /*excludedProperties*/
             void 0,
+            /*optionalsOnly*/
+            false,
             intersectionState
           );
           if (result2) {
-            result2 &= signaturesRelatedTo(source2, target2, 0 /* Call */, reportStructuralErrors);
+            result2 &= signaturesRelatedTo(source2, target2, 0 /* Call */, reportStructuralErrors, intersectionState);
             if (result2) {
-              result2 &= signaturesRelatedTo(source2, target2, 1 /* Construct */, reportStructuralErrors);
+              result2 &= signaturesRelatedTo(source2, target2, 1 /* Construct */, reportStructuralErrors, intersectionState);
               if (result2) {
                 result2 &= indexSignaturesRelatedTo(source2, target2, sourceIsPrimitive, reportStructuralErrors, intersectionState);
               }
@@ -64809,6 +64850,8 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false,
           excludedProperties,
+          /*optionalsOnly*/
+          false,
           0 /* None */
         );
         if (result2) {
@@ -64817,7 +64860,8 @@ function createTypeChecker(host) {
             type,
             0 /* Call */,
             /*reportStructuralErrors*/
-            false
+            false,
+            0 /* None */
           );
           if (result2) {
             result2 &= signaturesRelatedTo(
@@ -64825,7 +64869,8 @@ function createTypeChecker(host) {
               type,
               1 /* Construct */,
               /*reportStructuralErrors*/
-              false
+              false,
+              0 /* None */
             );
             if (result2 && !(isTupleType(source2) && isTupleType(type))) {
               result2 &= indexSignaturesRelatedTo(
@@ -65003,7 +65048,7 @@ function createTypeChecker(host) {
         }
       }
     }
-    function propertiesRelatedTo(source2, target2, reportErrors2, excludedProperties, intersectionState) {
+    function propertiesRelatedTo(source2, target2, reportErrors2, excludedProperties, optionalsOnly, intersectionState) {
       if (relation === identityRelation) {
         return propertiesIdenticalTo(source2, target2, excludedProperties);
       }
@@ -65139,7 +65184,7 @@ function createTypeChecker(host) {
       const numericNamesOnly = isTupleType(source2) && isTupleType(target2);
       for (const targetProp of excludeProperties(properties, excludedProperties)) {
         const name = targetProp.escapedName;
-        if (!(targetProp.flags & 4194304 /* Prototype */) && (!numericNamesOnly || isNumericLiteralName(name) || name === "length")) {
+        if (!(targetProp.flags & 4194304 /* Prototype */) && (!numericNamesOnly || isNumericLiteralName(name) || name === "length") && (!optionalsOnly || targetProp.flags & 16777216 /* Optional */)) {
           const sourceProp = getPropertyOfType(source2, name);
           if (sourceProp && sourceProp !== targetProp) {
             const related = propertyRelatedTo(source2, target2, sourceProp, targetProp, getNonMissingTypeOfSymbol, reportErrors2, intersectionState, relation === comparableRelation);
@@ -65175,7 +65220,7 @@ function createTypeChecker(host) {
       }
       return result2;
     }
-    function signaturesRelatedTo(source2, target2, kind, reportErrors2) {
+    function signaturesRelatedTo(source2, target2, kind, reportErrors2, intersectionState) {
       var _a3, _b;
       if (relation === identityRelation) {
         return signaturesIdenticalTo(source2, target2, kind);
@@ -65212,6 +65257,7 @@ function createTypeChecker(host) {
             /*erase*/
             true,
             reportErrors2,
+            intersectionState,
             incompatibleReporter(sourceSignatures[i], targetSignatures[i])
           );
           if (!related) {
@@ -65223,7 +65269,7 @@ function createTypeChecker(host) {
         const eraseGenerics = relation === comparableRelation || !!compilerOptions.noStrictGenericChecks;
         const sourceSignature = first(sourceSignatures);
         const targetSignature = first(targetSignatures);
-        result2 = signatureRelatedTo(sourceSignature, targetSignature, eraseGenerics, reportErrors2, incompatibleReporter(sourceSignature, targetSignature));
+        result2 = signatureRelatedTo(sourceSignature, targetSignature, eraseGenerics, reportErrors2, intersectionState, incompatibleReporter(sourceSignature, targetSignature));
         if (!result2 && reportErrors2 && kind === 1 /* Construct */ && sourceObjectFlags & targetObjectFlags && (((_a3 = targetSignature.declaration) == null ? void 0 : _a3.kind) === 173 /* Constructor */ || ((_b = sourceSignature.declaration) == null ? void 0 : _b.kind) === 173 /* Constructor */)) {
           const constructSignatureToString = (signature) => signatureToString(
             signature,
@@ -65248,6 +65294,7 @@ function createTypeChecker(host) {
                 /*erase*/
                 true,
                 shouldElaborateErrors,
+                intersectionState,
                 incompatibleReporter(s, t)
               );
               if (related) {
@@ -65300,7 +65347,7 @@ function createTypeChecker(host) {
       }
       return (source2, target2) => reportIncompatibleError(Diagnostics.Construct_signature_return_types_0_and_1_are_incompatible, typeToString(source2), typeToString(target2));
     }
-    function signatureRelatedTo(source2, target2, erase, reportErrors2, incompatibleReporter) {
+    function signatureRelatedTo(source2, target2, erase, reportErrors2, intersectionState, incompatibleReporter) {
       return compareSignaturesRelated(
         erase ? getErasedSignature(source2) : source2,
         erase ? getErasedSignature(target2) : target2,
@@ -65308,9 +65355,20 @@ function createTypeChecker(host) {
         reportErrors2,
         reportError,
         incompatibleReporter,
-        isRelatedToWorker,
+        isRelatedToWorker2,
         reportUnreliableMapper
       );
+      function isRelatedToWorker2(source3, target3, reportErrors3) {
+        return isRelatedTo(
+          source3,
+          target3,
+          3 /* Both */,
+          reportErrors3,
+          /*headMessage*/
+          void 0,
+          intersectionState
+        );
+      }
     }
     function signaturesIdenticalTo(source2, target2, kind) {
       const sourceSignatures = getSignaturesOfType(source2, kind);
@@ -65369,7 +65427,7 @@ function createTypeChecker(host) {
       }
       for (const info of getIndexInfosOfType(source2)) {
         if (isApplicableIndexType(info.keyType, keyType)) {
-          const related = indexInfoRelatedTo(info, targetInfo, reportErrors2);
+          const related = indexInfoRelatedTo(info, targetInfo, reportErrors2, intersectionState);
           if (!related) {
             return 0 /* False */;
           }
@@ -65378,8 +65436,16 @@ function createTypeChecker(host) {
       }
       return result2;
     }
-    function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2) {
-      const related = isRelatedTo(sourceInfo.type, targetInfo.type, 3 /* Both */, reportErrors2);
+    function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2, intersectionState) {
+      const related = isRelatedTo(
+        sourceInfo.type,
+        targetInfo.type,
+        3 /* Both */,
+        reportErrors2,
+        /*headMessage*/
+        void 0,
+        intersectionState
+      );
       if (!related && reportErrors2) {
         if (sourceInfo.keyType === targetInfo.keyType) {
           reportError(Diagnostics._0_index_signatures_are_incompatible, typeToString(sourceInfo.keyType));
@@ -65408,7 +65474,7 @@ function createTypeChecker(host) {
     function typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState) {
       const sourceInfo = getApplicableIndexInfo(source2, targetInfo.keyType);
       if (sourceInfo) {
-        return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2);
+        return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2, intersectionState);
       }
       if (!(intersectionState & 1 /* Source */) && isObjectTypeWithInferableIndex(source2)) {
         return membersRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
@@ -65699,12 +65765,15 @@ function createTypeChecker(host) {
   }
   function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
     if (depth >= maxDepth) {
+      if (type.flags & 2097152 /* Intersection */) {
+        return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
+      }
       const identity2 = getRecursionIdentity(type);
       let count = 0;
       let lastTypeId = 0;
       for (let i = 0; i < depth; i++) {
         const t = stack[i];
-        if (getRecursionIdentity(t) === identity2) {
+        if (t.flags & 2097152 /* Intersection */ ? some(t.types, (u) => getRecursionIdentity(u) === identity2) : getRecursionIdentity(t) === identity2) {
           if (t.id >= lastTypeId) {
             count++;
             if (count >= maxDepth) {
@@ -68072,7 +68141,7 @@ function createTypeChecker(host) {
       }
       return getUnionTypeFromSortedList(
         filtered,
-        type.objectFlags,
+        type.objectFlags & (32768 /* PrimitiveUnion */ | 16777216 /* ContainsIntersections */),
         /*aliasSymbol*/
         void 0,
         /*aliasTypeArguments*/
@@ -68579,7 +68648,7 @@ function createTypeChecker(host) {
         }
         return declaredType;
       }
-      if (isVariableDeclaration(node) && node.parent.parent.kind === 246 /* ForInStatement */ && (isMatchingReference(reference, node.parent.parent.expression) || optionalChainContainsReference(node.parent.parent.expression, reference))) {
+      if (isVariableDeclaration(node) && node.parent.parent.kind === 246 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
         return getNonNullableTypeIfNeeded(finalizeEvolvingArrayType(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent))));
       }
       return void 0;
@@ -74723,7 +74792,7 @@ function createTypeChecker(host) {
     }
   }
   function checkCallExpression(node, checkMode) {
-    var _a2;
+    var _a2, _b, _c;
     checkGrammarTypeArguments(node, node.typeArguments);
     const signature = getResolvedSignature(
       node,
@@ -74740,7 +74809,7 @@ function createTypeChecker(host) {
     }
     if (node.kind === 211 /* NewExpression */) {
       const declaration = signature.declaration;
-      if (declaration && declaration.kind !== 173 /* Constructor */ && declaration.kind !== 177 /* ConstructSignature */ && declaration.kind !== 182 /* ConstructorType */ && !isJSDocConstructSignature(declaration) && !isJSConstructor(declaration)) {
+      if (declaration && declaration.kind !== 173 /* Constructor */ && declaration.kind !== 177 /* ConstructSignature */ && declaration.kind !== 182 /* ConstructorType */ && !(isJSDocSignature(declaration) && ((_b = (_a2 = getJSDocRoot(declaration)) == null ? void 0 : _a2.parent) == null ? void 0 : _b.kind) === 173 /* Constructor */) && !isJSDocConstructSignature(declaration) && !isJSConstructor(declaration)) {
         if (noImplicitAny) {
           error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
         }
@@ -74768,7 +74837,7 @@ function createTypeChecker(host) {
         /*allowDeclaration*/
         false
       );
-      if ((_a2 = jsSymbol == null ? void 0 : jsSymbol.exports) == null ? void 0 : _a2.size) {
+      if ((_c = jsSymbol == null ? void 0 : jsSymbol.exports) == null ? void 0 : _c.size) {
         const jsAssignmentType = createAnonymousType(jsSymbol, jsSymbol.exports, emptyArray, emptyArray, emptyArray);
         jsAssignmentType.objectFlags |= 4096 /* JSLiteral */;
         return getIntersectionType([returnType, jsAssignmentType]);
@@ -77695,7 +77764,7 @@ function createTypeChecker(host) {
       return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
     } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
       return getTypeFromTypeNode(expr.type);
-    } else if (node.kind === 8 /* NumericLiteral */ || node.kind === 10 /* StringLiteral */ || node.kind === 110 /* TrueKeyword */ || node.kind === 95 /* FalseKeyword */) {
+    } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {
       return checkExpression(node);
     }
     return void 0;
@@ -108720,7 +108789,7 @@ function transformDeclarations(context) {
       if (elem.kind === 229 /* OmittedExpression */) {
         return elem;
       }
-      if (elem.propertyName && isIdentifier(elem.propertyName) && isIdentifier(elem.name) && !elem.symbol.isReferenced) {
+      if (elem.propertyName && isIdentifier(elem.propertyName) && isIdentifier(elem.name) && !elem.symbol.isReferenced && !isIdentifierANonContextualKeyword(elem.propertyName)) {
         return factory2.updateBindingElement(
           elem,
           elem.dotDotDotToken,
@@ -151081,7 +151150,7 @@ function completionEntryDataToSymbolOriginInfo(data, completionName, moduleSymbo
 }
 function getInsertTextAndReplacementSpanForImportCompletion(name, importStatementCompletion, origin, useSemicolons, sourceFile, options, preferences) {
   const replacementSpan = importStatementCompletion.replacementSpan;
-  const quotedModuleSpecifier = quote(sourceFile, preferences, origin.moduleSpecifier);
+  const quotedModuleSpecifier = quote(sourceFile, preferences, escapeSnippetText(origin.moduleSpecifier));
   const exportKind = origin.isDefaultExport ? 1 /* Default */ : origin.exportName === "export=" /* ExportEquals */ ? 2 /* ExportEquals */ : 0 /* Named */;
   const tabStop = preferences.includeCompletionsWithSnippetText ? "$1" : "";
   const importKind = ts_codefix_exports.getImportKind(
@@ -153651,12 +153720,12 @@ function getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, comp
   const mode = isStringLiteralLike(node) ? getModeForUsageLocation(sourceFile, node) : void 0;
   const scriptPath = sourceFile.path;
   const scriptDirectory = getDirectoryPath(scriptPath);
-  const extensionOptions = getExtensionOptions(compilerOptions, ReferenceKind.ModuleSpecifier, sourceFile, preferences, mode);
+  const extensionOptions = getExtensionOptions(compilerOptions, ReferenceKind.ModuleSpecifier, sourceFile, typeChecker, preferences, mode);
   return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && (isRootedDiskPath(literalValue) || isUrl(literalValue)) ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath, extensionOptions) : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, mode, compilerOptions, host, extensionOptions, typeChecker);
 }
-function getExtensionOptions(compilerOptions, referenceKind, importingSourceFile, preferences, resolutionMode) {
+function getExtensionOptions(compilerOptions, referenceKind, importingSourceFile, typeChecker, preferences, resolutionMode) {
   return {
-    extensionsToSearch: flatten(getSupportedExtensionsForModuleResolution(compilerOptions)),
+    extensionsToSearch: flatten(getSupportedExtensionsForModuleResolution(compilerOptions, typeChecker)),
     referenceKind,
     importingSourceFile,
     endingPreference: preferences == null ? void 0 : preferences.importModuleSpecifierEnding,
@@ -153686,8 +153755,17 @@ function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, c
     ).values());
   }
 }
-function getSupportedExtensionsForModuleResolution(compilerOptions) {
-  const extensions = getSupportedExtensions(compilerOptions);
+function getSupportedExtensionsForModuleResolution(compilerOptions, typeChecker) {
+  const ambientModulesExtensions = !typeChecker ? [] : mapDefined(
+    typeChecker.getAmbientModules(),
+    (module2) => {
+      const name = module2.name.slice(1, -1);
+      if (!name.startsWith("*.") || name.includes("/"))
+        return;
+      return name.slice(1);
+    }
+  );
+  const extensions = [...getSupportedExtensions(compilerOptions), ambientModulesExtensions];
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   return moduleResolutionUsesNodeModules(moduleResolution) ? getSupportedExtensionsWithJsonIfResolveJsonModule(compilerOptions, extensions) : extensions;
 }
@@ -160874,6 +160952,7 @@ function convertToBlock(body) {
   if (isExpression(body)) {
     const returnStatement = factory.createReturnStatement(body);
     const file = body.getSourceFile();
+    setTextRange(returnStatement, body);
     suppressLeadingAndTrailingTrivia(returnStatement);
     copyTrailingAsLeadingComments(
       body,

package/lib/tsserverlibrary.d.ts

@@ -6310,6 +6310,7 @@ declare namespace ts {
     }
     interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
+        getTypeOfSymbol(symbol: Symbol): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
         getPropertyOfType(type: Type, propertyName: string): Symbol | undefined;
@@ -6400,6 +6401,21 @@ declare namespace ts {
         getApparentType(type: Type): Type;
         getBaseConstraintOfType(type: Type): Type | undefined;
         getDefaultFromTypeParameter(type: Type): Type | undefined;
+        /**
+         * True if this type is the `Array` or `ReadonlyArray` type from lib.d.ts.
+         * This function will _not_ return true if passed a type which
+         * extends `Array` (for example, the TypeScript AST's `NodeArray` type).
+         */
+        isArrayType(type: Type): boolean;
+        /**
+         * True if this type is a tuple type. This function will _not_ return true if
+         * passed a type which extends from a tuple.
+         */
+        isTupleType(type: Type): boolean;
+        /**
+         * True if this type is assignable to `ReadonlyArray<any>`.
+         */
+        isArrayLikeType(type: Type): boolean;
         getTypePredicateOfSignature(signature: Signature): TypePredicate | undefined;
         /**
          * Depending on the operation performed, it may be appropriate to throw away the checker