@typescript-deploys/pr-build 5.4.0-pr-56392-10 → 5.4.0-pr-56859-8

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240104`;
+var version = `${versionMajorMinor}.0-insiders.20240105`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -45010,11 +45010,7 @@ function createTypeChecker(host) {
         if (errorBindingElement) {
           return findAncestor(errorBindingElement, isBindingElement) !== findAncestor(declaration, isBindingElement) || declaration.pos < errorBindingElement.pos;
         }
-        const rootDeclaration = getRootDeclaration(declaration);
-        if (rootDeclaration.kind !== 260 /* VariableDeclaration */) {
-          return true;
-        }
-        return isBlockScopedNameDeclaredBeforeUse(rootDeclaration, usage);
+        return isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, 260 /* VariableDeclaration */), usage);
       } else if (declaration.kind === 260 /* VariableDeclaration */) {
         return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
       } else if (isClassLike(declaration)) {
@@ -65339,9 +65335,29 @@ function createTypeChecker(host) {
       /*ignoreErrors*/
       true
     );
-    if (!symbol || symbol.valueDeclaration && !isBlockScopedNameDeclaredBeforeUse(symbol.valueDeclaration, node))
+    if (!symbol || !(isConstantVariable(symbol) || symbol.flags & 8 /* EnumMember */))
+      return void 0;
+    const declaration = symbol.valueDeclaration;
+    if (declaration === void 0)
       return void 0;
-    return tryGetNameFromType(getTypeOfExpression(node));
+    const type = tryGetTypeFromEffectiveTypeNode(declaration);
+    if (type) {
+      const name = tryGetNameFromType(type);
+      if (name !== void 0) {
+        return name;
+      }
+    }
+    if (hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node)) {
+      const initializer = getEffectiveInitializer(declaration);
+      if (initializer) {
+        const initializerType = isBindingPattern(declaration.parent) ? getTypeForBindingElement(declaration) : getTypeOfExpression(initializer);
+        return initializerType && tryGetNameFromType(initializerType);
+      }
+      if (isEnumMember(declaration)) {
+        return getTextOfPropertyName(declaration.name);
+      }
+    }
+    return void 0;
   }
   function containsMatchingReference(source, target) {
     while (isAccessExpression(source)) {
@@ -73871,6 +73887,9 @@ function createTypeChecker(host) {
     let fallbackReturnType = voidType;
     if (func.body.kind !== 241 /* Block */) {
       returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+      if (isConstContext(func.body)) {
+        returnType = getRegularTypeOfLiteralType(returnType);
+      }
       if (isAsync) {
         returnType = unwrapAwaitedType(checkAwaitedType(
           returnType,
@@ -74003,7 +74022,10 @@ function createTypeChecker(host) {
     const nextTypes = [];
     const isAsync = (getFunctionFlags(func) & 2 /* Async */) !== 0;
     forEachYieldExpression(func.body, (yieldExpression) => {
-      const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+      let yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+      if (yieldExpression.expression && isConstContext(yieldExpression.expression)) {
+        yieldExpressionType = getRegularTypeOfLiteralType(yieldExpressionType);
+      }
       pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
       let nextType;
       if (yieldExpression.asteriskToken) {
@@ -74118,7 +74140,7 @@ function createTypeChecker(host) {
         if (type.flags & 131072 /* Never */) {
           hasReturnOfTypeNever = true;
         }
-        pushIfUnique(aggregatedTypes, type);
+        pushIfUnique(aggregatedTypes, isConstContext(expr) ? getRegularTypeOfLiteralType(type) : type);
       } else {
         hasReturnWithNoExpression = true;
       }

package/lib/tsserver.js

@@ -2341,7 +2341,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240104`;
+var version = `${versionMajorMinor}.0-insiders.20240105`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -49738,11 +49738,7 @@ function createTypeChecker(host) {
         if (errorBindingElement) {
           return findAncestor(errorBindingElement, isBindingElement) !== findAncestor(declaration, isBindingElement) || declaration.pos < errorBindingElement.pos;
         }
-        const rootDeclaration = getRootDeclaration(declaration);
-        if (rootDeclaration.kind !== 260 /* VariableDeclaration */) {
-          return true;
-        }
-        return isBlockScopedNameDeclaredBeforeUse(rootDeclaration, usage);
+        return isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, 260 /* VariableDeclaration */), usage);
       } else if (declaration.kind === 260 /* VariableDeclaration */) {
         return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
       } else if (isClassLike(declaration)) {
@@ -70067,9 +70063,29 @@ function createTypeChecker(host) {
       /*ignoreErrors*/
       true
     );
-    if (!symbol || symbol.valueDeclaration && !isBlockScopedNameDeclaredBeforeUse(symbol.valueDeclaration, node))
+    if (!symbol || !(isConstantVariable(symbol) || symbol.flags & 8 /* EnumMember */))
+      return void 0;
+    const declaration = symbol.valueDeclaration;
+    if (declaration === void 0)
       return void 0;
-    return tryGetNameFromType(getTypeOfExpression(node));
+    const type = tryGetTypeFromEffectiveTypeNode(declaration);
+    if (type) {
+      const name = tryGetNameFromType(type);
+      if (name !== void 0) {
+        return name;
+      }
+    }
+    if (hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node)) {
+      const initializer = getEffectiveInitializer(declaration);
+      if (initializer) {
+        const initializerType = isBindingPattern(declaration.parent) ? getTypeForBindingElement(declaration) : getTypeOfExpression(initializer);
+        return initializerType && tryGetNameFromType(initializerType);
+      }
+      if (isEnumMember(declaration)) {
+        return getTextOfPropertyName(declaration.name);
+      }
+    }
+    return void 0;
   }
   function containsMatchingReference(source, target) {
     while (isAccessExpression(source)) {
@@ -78599,6 +78615,9 @@ function createTypeChecker(host) {
     let fallbackReturnType = voidType;
     if (func.body.kind !== 241 /* Block */) {
       returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+      if (isConstContext(func.body)) {
+        returnType = getRegularTypeOfLiteralType(returnType);
+      }
       if (isAsync) {
         returnType = unwrapAwaitedType(checkAwaitedType(
           returnType,
@@ -78731,7 +78750,10 @@ function createTypeChecker(host) {
     const nextTypes = [];
     const isAsync = (getFunctionFlags(func) & 2 /* Async */) !== 0;
     forEachYieldExpression(func.body, (yieldExpression) => {
-      const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+      let yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+      if (yieldExpression.expression && isConstContext(yieldExpression.expression)) {
+        yieldExpressionType = getRegularTypeOfLiteralType(yieldExpressionType);
+      }
       pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
       let nextType;
       if (yieldExpression.asteriskToken) {
@@ -78846,7 +78868,7 @@ function createTypeChecker(host) {
         if (type.flags & 131072 /* Never */) {
           hasReturnOfTypeNever = true;
         }
-        pushIfUnique(aggregatedTypes, type);
+        pushIfUnique(aggregatedTypes, isConstContext(expr) ? getRegularTypeOfLiteralType(type) : type);
       } else {
         hasReturnWithNoExpression = true;
       }
@@ -139946,11 +139968,9 @@ registerRefactor(refactorName3, {
 function getRangeToExtract(context, considerEmptySpans = true) {
   const { file, startPosition } = context;
   const isJS = isSourceFileJS(file);
-  const current = getTokenAtPosition(file, startPosition);
   const range = createTextRangeFromSpan(getRefactorContextSpan(context));
-  const cursorRequest = range.pos === range.end && considerEmptySpans;
-  const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
-  const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || overlappingRange));
+  const isCursorRequest = range.pos === range.end && considerEmptySpans;
+  const firstType = getFirstTypeAt(file, startPosition, range, isCursorRequest);
   if (!firstType || !isTypeNode(firstType))
     return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
   const checker = context.program.getTypeChecker();
@@ -139976,6 +139996,21 @@ function getRangeToExtract(context, considerEmptySpans = true) {
   const typeElements = flattenTypeLiteralNodeReference(checker, selection);
   return { isJS, selection, enclosingNode, typeParameters, typeElements };
 }
+function getFirstTypeAt(file, startPosition, range, isCursorRequest) {
+  const currentNodes = [
+    () => getTokenAtPosition(file, startPosition),
+    () => getTouchingToken(file, startPosition, () => true)
+  ];
+  for (const f of currentNodes) {
+    const current = f();
+    const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
+    const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (isCursorRequest || overlappingRange));
+    if (firstType) {
+      return firstType;
+    }
+  }
+  return void 0;
+}
 function flattenTypeLiteralNodeReference(checker, selection) {
   if (!selection)
     return void 0;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-insiders.20240104`;
+      version = `${versionMajorMinor}.0-insiders.20240105`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -47492,11 +47492,7 @@ ${lanes.join("\n")}
           if (errorBindingElement) {
             return findAncestor(errorBindingElement, isBindingElement) !== findAncestor(declaration, isBindingElement) || declaration.pos < errorBindingElement.pos;
           }
-          const rootDeclaration = getRootDeclaration(declaration);
-          if (rootDeclaration.kind !== 260 /* VariableDeclaration */) {
-            return true;
-          }
-          return isBlockScopedNameDeclaredBeforeUse(rootDeclaration, usage);
+          return isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, 260 /* VariableDeclaration */), usage);
         } else if (declaration.kind === 260 /* VariableDeclaration */) {
           return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
         } else if (isClassLike(declaration)) {
@@ -67821,9 +67817,29 @@ ${lanes.join("\n")}
         /*ignoreErrors*/
         true
       );
-      if (!symbol || symbol.valueDeclaration && !isBlockScopedNameDeclaredBeforeUse(symbol.valueDeclaration, node))
+      if (!symbol || !(isConstantVariable(symbol) || symbol.flags & 8 /* EnumMember */))
+        return void 0;
+      const declaration = symbol.valueDeclaration;
+      if (declaration === void 0)
         return void 0;
-      return tryGetNameFromType(getTypeOfExpression(node));
+      const type = tryGetTypeFromEffectiveTypeNode(declaration);
+      if (type) {
+        const name = tryGetNameFromType(type);
+        if (name !== void 0) {
+          return name;
+        }
+      }
+      if (hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node)) {
+        const initializer = getEffectiveInitializer(declaration);
+        if (initializer) {
+          const initializerType = isBindingPattern(declaration.parent) ? getTypeForBindingElement(declaration) : getTypeOfExpression(initializer);
+          return initializerType && tryGetNameFromType(initializerType);
+        }
+        if (isEnumMember(declaration)) {
+          return getTextOfPropertyName(declaration.name);
+        }
+      }
+      return void 0;
     }
     function containsMatchingReference(source, target) {
       while (isAccessExpression(source)) {
@@ -76353,6 +76369,9 @@ ${lanes.join("\n")}
       let fallbackReturnType = voidType;
       if (func.body.kind !== 241 /* Block */) {
         returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+        if (isConstContext(func.body)) {
+          returnType = getRegularTypeOfLiteralType(returnType);
+        }
         if (isAsync) {
           returnType = unwrapAwaitedType(checkAwaitedType(
             returnType,
@@ -76485,7 +76504,10 @@ ${lanes.join("\n")}
       const nextTypes = [];
       const isAsync = (getFunctionFlags(func) & 2 /* Async */) !== 0;
       forEachYieldExpression(func.body, (yieldExpression) => {
-        const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+        let yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+        if (yieldExpression.expression && isConstContext(yieldExpression.expression)) {
+          yieldExpressionType = getRegularTypeOfLiteralType(yieldExpressionType);
+        }
         pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
         let nextType;
         if (yieldExpression.asteriskToken) {
@@ -76600,7 +76622,7 @@ ${lanes.join("\n")}
           if (type.flags & 131072 /* Never */) {
             hasReturnOfTypeNever = true;
           }
-          pushIfUnique(aggregatedTypes, type);
+          pushIfUnique(aggregatedTypes, isConstContext(expr) ? getRegularTypeOfLiteralType(type) : type);
         } else {
           hasReturnWithNoExpression = true;
         }
@@ -138244,11 +138266,9 @@ ${lanes.join("\n")}
   function getRangeToExtract(context, considerEmptySpans = true) {
     const { file, startPosition } = context;
     const isJS = isSourceFileJS(file);
-    const current = getTokenAtPosition(file, startPosition);
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
-    const cursorRequest = range.pos === range.end && considerEmptySpans;
-    const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
-    const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || overlappingRange));
+    const isCursorRequest = range.pos === range.end && considerEmptySpans;
+    const firstType = getFirstTypeAt(file, startPosition, range, isCursorRequest);
     if (!firstType || !isTypeNode(firstType))
       return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
     const checker = context.program.getTypeChecker();
@@ -138274,6 +138294,21 @@ ${lanes.join("\n")}
     const typeElements = flattenTypeLiteralNodeReference(checker, selection);
     return { isJS, selection, enclosingNode, typeParameters, typeElements };
   }
+  function getFirstTypeAt(file, startPosition, range, isCursorRequest) {
+    const currentNodes = [
+      () => getTokenAtPosition(file, startPosition),
+      () => getTouchingToken(file, startPosition, () => true)
+    ];
+    for (const f of currentNodes) {
+      const current = f();
+      const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
+      const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (isCursorRequest || overlappingRange));
+      if (firstType) {
+        return firstType;
+      }
+    }
+    return void 0;
+  }
   function flattenTypeLiteralNodeReference(checker, selection) {
     if (!selection)
       return void 0;

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240104`;
+var version = `${versionMajorMinor}.0-insiders.20240105`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.4.0-pr-56392-10",
+  "version": "5.4.0-pr-56859-8",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "61dc1bc3d564f6e826f3e71906739e211c36705b"
+  "gitHead": "8f655f85c9fd59b743309dc0ade1e183c9f8ffc2"
 }