@typescript-deploys/pr-build 5.2.0-pr-54316-2 → 5.2.0-pr-54377-7

package/lib/lib.es2017.d.ts

@@ -22,3 +22,4 @@ and limitations under the License.
 /// <reference lib="es2017.string" />
 /// <reference lib="es2017.intl" />
 /// <reference lib="es2017.typedarrays" />
+/// <reference lib="es2017.date" />

package/lib/lib.es2017.date.d.ts

@@ -0,0 +1,31 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+/// <reference no-default-lib="true"/>
+
+interface DateConstructor {
+    /**
+     * Returns the number of milliseconds between midnight, January 1, 1970 Universal Coordinated Time (UTC) (or GMT) and the specified date.
+     * @param year The full year designation is required for cross-century date accuracy. If year is between 0 and 99 is used, then year is assumed to be 1900 + year.
+     * @param monthIndex The month as a number between 0 and 11 (January to December).
+     * @param date The date as a number between 1 and 31.
+     * @param hours Must be supplied if minutes is supplied. A number from 0 to 23 (midnight to 11pm) that specifies the hour.
+     * @param minutes Must be supplied if seconds is supplied. A number from 0 to 59 that specifies the minutes.
+     * @param seconds Must be supplied if milliseconds is supplied. A number from 0 to 59 that specifies the seconds.
+     * @param ms A number from 0 to 999 that specifies the milliseconds.
+     */
+    UTC(year: number, monthIndex?: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number;
+}

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230518`;
+var version = `${versionMajorMinor}.0-insiders.20230524`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -33368,6 +33368,7 @@ var libEntries = [
   ["es2015.symbol", "lib.es2015.symbol.d.ts"],
   ["es2015.symbol.wellknown", "lib.es2015.symbol.wellknown.d.ts"],
   ["es2016.array.include", "lib.es2016.array.include.d.ts"],
+  ["es2017.date", "lib.es2017.date.d.ts"],
   ["es2017.object", "lib.es2017.object.d.ts"],
   ["es2017.sharedmemory", "lib.es2017.sharedmemory.d.ts"],
   ["es2017.string", "lib.es2017.string.d.ts"],
@@ -47901,32 +47902,34 @@ function createTypeChecker(host) {
           const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
           typeElements.push(preserveCommentsOn(methodDeclaration));
         }
+        if (signatures.length || !optionalToken) {
+          return;
+        }
+      }
+      let propertyTypeNode;
+      if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+        propertyTypeNode = createElidedInformationPlaceholder(context);
       } else {
-        let propertyTypeNode;
-        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-          propertyTypeNode = createElidedInformationPlaceholder(context);
-        } else {
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack || (context.reverseMappedStack = []);
-            context.reverseMappedStack.push(propertySymbol);
-          }
-          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack.pop();
-          }
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack || (context.reverseMappedStack = []);
+          context.reverseMappedStack.push(propertySymbol);
         }
-        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-        if (modifiers) {
-          context.approximateLength += 9;
+        propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack.pop();
         }
-        const propertySignature = factory.createPropertySignature(
-          modifiers,
-          propertyName,
-          optionalToken,
-          propertyTypeNode
-        );
-        typeElements.push(preserveCommentsOn(propertySignature));
       }
+      const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+      if (modifiers) {
+        context.approximateLength += 9;
+      }
+      const propertySignature = factory.createPropertySignature(
+        modifiers,
+        propertyName,
+        optionalToken,
+        propertyTypeNode
+      );
+      typeElements.push(preserveCommentsOn(propertySignature));
       function preserveCommentsOn(node) {
         var _a2;
         if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -53989,7 +53992,7 @@ function createTypeChecker(host) {
       } else if (type !== firstType) {
         checkFlags |= 64 /* HasNonUniformType */;
       }
-      if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+      if (isLiteralType(type) || isPatternLiteralType(type)) {
         checkFlags |= 128 /* HasLiteralType */;
       }
       if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -56216,31 +56219,28 @@ function createTypeChecker(host) {
     return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
   }
   function getUnionOrIntersectionTypePredicate(signatures, kind) {
-    let first2;
+    let last2;
     const types = [];
     for (const sig of signatures) {
       const pred = getTypePredicateOfSignature(sig);
-      if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-        if (kind !== 2097152 /* Intersection */) {
-          continue;
-        } else {
-          return;
-        }
-      }
-      if (first2) {
-        if (!typePredicateKindsMatch(first2, pred)) {
+      if (pred) {
+        if (pred.kind !== 0 /* This */ && pred.kind !== 1 /* Identifier */ || last2 && !typePredicateKindsMatch(last2, pred)) {
           return void 0;
         }
+        last2 = pred;
+        types.push(pred.type);
       } else {
-        first2 = pred;
+        const returnType = kind !== 2097152 /* Intersection */ ? getReturnTypeOfSignature(sig) : void 0;
+        if (returnType !== falseType && returnType !== regularFalseType) {
+          return void 0;
+        }
       }
-      types.push(pred.type);
     }
-    if (!first2) {
+    if (!last2) {
       return void 0;
     }
     const compositeType = getUnionOrIntersectionType(types, kind);
-    return createTypePredicate(first2.kind, first2.parameterName, first2.parameterIndex, compositeType);
+    return createTypePredicate(last2.kind, last2.parameterName, last2.parameterIndex, compositeType);
   }
   function typePredicateKindsMatch(a, b) {
     return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -57282,9 +57282,9 @@ function createTypeChecker(host) {
         );
         if (freshMapper) {
           const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (const p of freshParams) {
-            if (root.inferTypeParameters.indexOf(p) === -1) {
-              p.mapper = freshCombinedMapper;
+          for (let i = 0; i < freshParams.length; i++) {
+            if (freshParams[i] !== root.inferTypeParameters[i]) {
+              freshParams[i].mapper = freshCombinedMapper;
             }
           }
         }
@@ -58121,18 +58121,19 @@ function createTypeChecker(host) {
         case 185 /* TypeQuery */:
           const entityName = node2.exprName;
           const firstIdentifier = getFirstIdentifier(entityName);
-          const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
-          const tpDeclaration = tp.symbol.declarations[0];
-          let tpScope;
-          if (tpDeclaration.kind === 167 /* TypeParameter */) {
-            tpScope = tpDeclaration.parent;
-          } else if (tp.isThisType) {
-            tpScope = tpDeclaration;
-          } else {
-            return true;
-          }
-          if (firstIdentifierSymbol.declarations) {
-            return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+          if (!isThisIdentifier(firstIdentifier)) {
+            const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
+            const tpDeclaration = tp.symbol.declarations[0];
+            const tpScope = tpDeclaration.kind === 167 /* TypeParameter */ ? tpDeclaration.parent : (
+              // Type parameter is a regular type parameter, e.g. foo<T>
+              tp.isThisType ? tpDeclaration : (
+                // Type parameter is the this type, and its declaration is the class declaration.
+                void 0
+              )
+            );
+            if (firstIdentifierSymbol.declarations && tpScope) {
+              return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+            }
           }
           return true;
         case 173 /* MethodDeclaration */:
@@ -58186,6 +58187,9 @@ function createTypeChecker(host) {
     const elementFlags = tupleType.target.elementFlags;
     const elementTypes = map(getElementTypes(tupleType), (t, i) => {
       const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+      if (singleton === typeVariable) {
+        return mappedType;
+      }
       return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
     });
     const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -61974,7 +61978,7 @@ function createTypeChecker(host) {
   }
   function getRecursionIdentity(type) {
     if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
-      if (getObjectFlags(type) && 4 /* Reference */ && type.node) {
+      if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
       if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
@@ -62749,6 +62753,8 @@ function createTypeChecker(host) {
     return context && context.mapper;
   }
   function couldContainTypeVariables(type) {
+    if (type.flags & 67359327 /* Intrinsic */)
+      return false;
     const objectFlags = getObjectFlags(type);
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -74242,7 +74248,7 @@ function createTypeChecker(host) {
     if (getIsolatedModules(compilerOptions)) {
       Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
       const constEnumDeclaration = type.symbol.valueDeclaration;
-      if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+      if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
         error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
       }
     }
@@ -74671,6 +74677,9 @@ function createTypeChecker(host) {
           case "length":
           case "caller":
           case "arguments":
+            if (compilerOptions.useDefineForClassFields) {
+              break;
+            }
           case "prototype":
             const message = Diagnostics.Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1;
             const className = getNameOfSymbolAsWritten(getSymbolOfDeclaration(node));
@@ -81677,7 +81686,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = getSymbol(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */);
                 if (!symbol) {
                   error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                 } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -118755,7 +118764,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let filesWithChangedSetOfUnresolvedImports;
   let filesWithInvalidatedResolutions;
   let filesWithInvalidatedNonRelativeUnresolvedImports;
-  const nonRelativeExternalModuleResolutions = /* @__PURE__ */ new Set();
+  const nonRelativeExternalModuleResolutions = createMultiMap();
   const resolutionsWithFailedLookups = /* @__PURE__ */ new Set();
   const resolutionsWithOnlyAffectingLocations = /* @__PURE__ */ new Set();
   const resolvedFileToResolution = /* @__PURE__ */ new Map();
@@ -118889,7 +118898,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
     typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
     libraryResolutionCache.clearAllExceptPackageJsonInfoCache();
-    watchFailedLookupLocationOfNonRelativeModuleResolutions();
+    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
+    nonRelativeExternalModuleResolutions.clear();
   }
   function cleanupLibResolutionWatching(newProgram) {
     resolvedLibraries.forEach((resolution, libFileName) => {
@@ -118907,7 +118917,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
     filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
     allModuleAndTypeResolutionsAreInvalidated = false;
-    watchFailedLookupLocationOfNonRelativeModuleResolutions();
+    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
+    nonRelativeExternalModuleResolutions.clear();
     if (newProgram !== oldProgram) {
       cleanupLibResolutionWatching(newProgram);
       newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
@@ -119188,7 +119199,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
         watchFailedLookupLocationOfResolution(resolution);
       } else {
-        nonRelativeExternalModuleResolutions.add(resolution);
+        nonRelativeExternalModuleResolutions.add(name, resolution);
       }
       const resolved = getResolutionWithResolvedFileName(resolution);
       if (resolved && resolved.resolvedFileName) {
@@ -119318,9 +119329,17 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       paths.add(affectingLocation);
     }
   }
-  function watchFailedLookupLocationOfNonRelativeModuleResolutions() {
-    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfResolution);
-    nonRelativeExternalModuleResolutions.clear();
+  function watchFailedLookupLocationOfNonRelativeModuleResolutions(resolutions, name) {
+    const program = resolutionHost.getCurrentProgram();
+    if (!program || !program.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(name)) {
+      resolutions.forEach(watchFailedLookupLocationOfResolution);
+    } else {
+      resolutions.forEach((resolution) => watchAffectingLocationsOfResolution(
+        resolution,
+        /*addToResolutionsWithOnlyAffectingLocations*/
+        true
+      ));
+    }
   }
   function setDirectoryWatcher(dir, dirPath, nonRecursive) {
     const dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230518`;
+var version = `${versionMajorMinor}.0-insiders.20230524`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -37753,6 +37753,7 @@ var libEntries = [
   ["es2015.symbol", "lib.es2015.symbol.d.ts"],
   ["es2015.symbol.wellknown", "lib.es2015.symbol.wellknown.d.ts"],
   ["es2016.array.include", "lib.es2016.array.include.d.ts"],
+  ["es2017.date", "lib.es2017.date.d.ts"],
   ["es2017.object", "lib.es2017.object.d.ts"],
   ["es2017.sharedmemory", "lib.es2017.sharedmemory.d.ts"],
   ["es2017.string", "lib.es2017.string.d.ts"],
@@ -52552,32 +52553,34 @@ function createTypeChecker(host) {
           const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
           typeElements.push(preserveCommentsOn(methodDeclaration));
         }
+        if (signatures.length || !optionalToken) {
+          return;
+        }
+      }
+      let propertyTypeNode;
+      if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+        propertyTypeNode = createElidedInformationPlaceholder(context);
       } else {
-        let propertyTypeNode;
-        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-          propertyTypeNode = createElidedInformationPlaceholder(context);
-        } else {
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack || (context.reverseMappedStack = []);
-            context.reverseMappedStack.push(propertySymbol);
-          }
-          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack.pop();
-          }
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack || (context.reverseMappedStack = []);
+          context.reverseMappedStack.push(propertySymbol);
         }
-        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-        if (modifiers) {
-          context.approximateLength += 9;
+        propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack.pop();
         }
-        const propertySignature = factory.createPropertySignature(
-          modifiers,
-          propertyName,
-          optionalToken,
-          propertyTypeNode
-        );
-        typeElements.push(preserveCommentsOn(propertySignature));
       }
+      const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+      if (modifiers) {
+        context.approximateLength += 9;
+      }
+      const propertySignature = factory.createPropertySignature(
+        modifiers,
+        propertyName,
+        optionalToken,
+        propertyTypeNode
+      );
+      typeElements.push(preserveCommentsOn(propertySignature));
       function preserveCommentsOn(node) {
         var _a2;
         if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -58640,7 +58643,7 @@ function createTypeChecker(host) {
       } else if (type !== firstType) {
         checkFlags |= 64 /* HasNonUniformType */;
       }
-      if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+      if (isLiteralType(type) || isPatternLiteralType(type)) {
         checkFlags |= 128 /* HasLiteralType */;
       }
       if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -60867,31 +60870,28 @@ function createTypeChecker(host) {
     return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
   }
   function getUnionOrIntersectionTypePredicate(signatures, kind) {
-    let first2;
+    let last2;
     const types = [];
     for (const sig of signatures) {
       const pred = getTypePredicateOfSignature(sig);
-      if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-        if (kind !== 2097152 /* Intersection */) {
-          continue;
-        } else {
-          return;
-        }
-      }
-      if (first2) {
-        if (!typePredicateKindsMatch(first2, pred)) {
+      if (pred) {
+        if (pred.kind !== 0 /* This */ && pred.kind !== 1 /* Identifier */ || last2 && !typePredicateKindsMatch(last2, pred)) {
           return void 0;
         }
+        last2 = pred;
+        types.push(pred.type);
       } else {
-        first2 = pred;
+        const returnType = kind !== 2097152 /* Intersection */ ? getReturnTypeOfSignature(sig) : void 0;
+        if (returnType !== falseType && returnType !== regularFalseType) {
+          return void 0;
+        }
       }
-      types.push(pred.type);
     }
-    if (!first2) {
+    if (!last2) {
       return void 0;
     }
     const compositeType = getUnionOrIntersectionType(types, kind);
-    return createTypePredicate(first2.kind, first2.parameterName, first2.parameterIndex, compositeType);
+    return createTypePredicate(last2.kind, last2.parameterName, last2.parameterIndex, compositeType);
   }
   function typePredicateKindsMatch(a, b) {
     return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -61933,9 +61933,9 @@ function createTypeChecker(host) {
         );
         if (freshMapper) {
           const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (const p of freshParams) {
-            if (root.inferTypeParameters.indexOf(p) === -1) {
-              p.mapper = freshCombinedMapper;
+          for (let i = 0; i < freshParams.length; i++) {
+            if (freshParams[i] !== root.inferTypeParameters[i]) {
+              freshParams[i].mapper = freshCombinedMapper;
             }
           }
         }
@@ -62772,18 +62772,19 @@ function createTypeChecker(host) {
         case 185 /* TypeQuery */:
           const entityName = node2.exprName;
           const firstIdentifier = getFirstIdentifier(entityName);
-          const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
-          const tpDeclaration = tp.symbol.declarations[0];
-          let tpScope;
-          if (tpDeclaration.kind === 167 /* TypeParameter */) {
-            tpScope = tpDeclaration.parent;
-          } else if (tp.isThisType) {
-            tpScope = tpDeclaration;
-          } else {
-            return true;
-          }
-          if (firstIdentifierSymbol.declarations) {
-            return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+          if (!isThisIdentifier(firstIdentifier)) {
+            const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
+            const tpDeclaration = tp.symbol.declarations[0];
+            const tpScope = tpDeclaration.kind === 167 /* TypeParameter */ ? tpDeclaration.parent : (
+              // Type parameter is a regular type parameter, e.g. foo<T>
+              tp.isThisType ? tpDeclaration : (
+                // Type parameter is the this type, and its declaration is the class declaration.
+                void 0
+              )
+            );
+            if (firstIdentifierSymbol.declarations && tpScope) {
+              return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+            }
           }
           return true;
         case 173 /* MethodDeclaration */:
@@ -62837,6 +62838,9 @@ function createTypeChecker(host) {
     const elementFlags = tupleType.target.elementFlags;
     const elementTypes = map(getElementTypes(tupleType), (t, i) => {
       const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+      if (singleton === typeVariable) {
+        return mappedType;
+      }
       return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
     });
     const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -66625,7 +66629,7 @@ function createTypeChecker(host) {
   }
   function getRecursionIdentity(type) {
     if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
-      if (getObjectFlags(type) && 4 /* Reference */ && type.node) {
+      if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
       if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
@@ -67400,6 +67404,8 @@ function createTypeChecker(host) {
     return context && context.mapper;
   }
   function couldContainTypeVariables(type) {
+    if (type.flags & 67359327 /* Intrinsic */)
+      return false;
     const objectFlags = getObjectFlags(type);
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -78893,7 +78899,7 @@ function createTypeChecker(host) {
     if (getIsolatedModules(compilerOptions)) {
       Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
       const constEnumDeclaration = type.symbol.valueDeclaration;
-      if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+      if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
         error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
       }
     }
@@ -79322,6 +79328,9 @@ function createTypeChecker(host) {
           case "length":
           case "caller":
           case "arguments":
+            if (compilerOptions.useDefineForClassFields) {
+              break;
+            }
           case "prototype":
             const message = Diagnostics.Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1;
             const className = getNameOfSymbolAsWritten(getSymbolOfDeclaration(node));
@@ -86328,7 +86337,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol2(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */);
                 if (!symbol) {
                   error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                 } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -123677,7 +123686,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let filesWithChangedSetOfUnresolvedImports;
   let filesWithInvalidatedResolutions;
   let filesWithInvalidatedNonRelativeUnresolvedImports;
-  const nonRelativeExternalModuleResolutions = /* @__PURE__ */ new Set();
+  const nonRelativeExternalModuleResolutions = createMultiMap();
   const resolutionsWithFailedLookups = /* @__PURE__ */ new Set();
   const resolutionsWithOnlyAffectingLocations = /* @__PURE__ */ new Set();
   const resolvedFileToResolution = /* @__PURE__ */ new Map();
@@ -123811,7 +123820,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
     typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
     libraryResolutionCache.clearAllExceptPackageJsonInfoCache();
-    watchFailedLookupLocationOfNonRelativeModuleResolutions();
+    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
+    nonRelativeExternalModuleResolutions.clear();
   }
   function cleanupLibResolutionWatching(newProgram) {
     resolvedLibraries.forEach((resolution, libFileName) => {
@@ -123829,7 +123839,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
     filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
     allModuleAndTypeResolutionsAreInvalidated = false;
-    watchFailedLookupLocationOfNonRelativeModuleResolutions();
+    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
+    nonRelativeExternalModuleResolutions.clear();
     if (newProgram !== oldProgram) {
       cleanupLibResolutionWatching(newProgram);
       newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
@@ -124110,7 +124121,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
         watchFailedLookupLocationOfResolution(resolution);
       } else {
-        nonRelativeExternalModuleResolutions.add(resolution);
+        nonRelativeExternalModuleResolutions.add(name, resolution);
       }
       const resolved = getResolutionWithResolvedFileName(resolution);
       if (resolved && resolved.resolvedFileName) {
@@ -124240,9 +124251,17 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       paths.add(affectingLocation);
     }
   }
-  function watchFailedLookupLocationOfNonRelativeModuleResolutions() {
-    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfResolution);
-    nonRelativeExternalModuleResolutions.clear();
+  function watchFailedLookupLocationOfNonRelativeModuleResolutions(resolutions, name) {
+    const program = resolutionHost.getCurrentProgram();
+    if (!program || !program.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(name)) {
+      resolutions.forEach(watchFailedLookupLocationOfResolution);
+    } else {
+      resolutions.forEach((resolution) => watchAffectingLocationsOfResolution(
+        resolution,
+        /*addToResolutionsWithOnlyAffectingLocations*/
+        true
+      ));
+    }
   }
   function setDirectoryWatcher(dir, dirPath, nonRecursive) {
     const dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);
@@ -136494,10 +136513,9 @@ registerRefactor(refactorNameForMoveToFile, {
   }
 });
 function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-  var _a;
   const checker = program.getTypeChecker();
   const usage = getUsageInfo(oldFile, toMove.all, checker);
-  if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+  if (!host.fileExists(targetFile)) {
     changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
     addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
   } else {
@@ -136535,6 +136553,13 @@ function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, chang
   if (typeof targetFile !== "string") {
     if (targetFile.statements.length > 0) {
       changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+    } else {
+      changes.insertNodesAtEndOfFile(
+        targetFile,
+        body,
+        /*blankLineBetween*/
+        false
+      );
     }
     if (imports.length > 0) {
       insertImports(
@@ -165999,6 +166024,17 @@ var ChangeTracker = class {
       this.insertNodeAt(sourceFile, pos, insert, options);
     }
   }
+  insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+    this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+  }
+  insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+    const pos = sourceFile.end + 1;
+    const options = {
+      prefix: this.newLineCharacter,
+      suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+    };
+    this.insertNodesAt(sourceFile, pos, insert, options);
+  }
   insertStatementsInNewFile(fileName, statements, oldFile) {
     if (!this.newFileChanges) {
       this.newFileChanges = createMultiMap();

package/lib/tsserverlibrary.d.ts

@@ -10196,7 +10196,7 @@ declare namespace ts {
          * arguments for any interactive action before offering it.
          */
         getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
-        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, includeInteractiveActions?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
+        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, interactiveRefactorArguments?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
         getMoveToRefactoringFileSuggestions(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): {
             newFileName: string;
             files: string[];