@typescript-deploys/pr-build 5.4.0-pr-56911-7 → 5.4.0-pr-56392-10

package/lib/tsc.js

@@ -44254,19 +44254,6 @@ function createTypeChecker(host) {
     emptyArray
   );
   var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
-  var keyofConstraintObjectType = createAnonymousType(
-    /*symbol*/
-    void 0,
-    emptySymbols,
-    emptyArray,
-    emptyArray,
-    [stringType, numberType, esSymbolType].map((t) => createIndexInfo(
-      t,
-      unknownType,
-      /*isReadonly*/
-      false
-    ))
-  );
   var emptyGenericType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -45023,7 +45010,11 @@ function createTypeChecker(host) {
         if (errorBindingElement) {
           return findAncestor(errorBindingElement, isBindingElement) !== findAncestor(declaration, isBindingElement) || declaration.pos < errorBindingElement.pos;
         }
-        return isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, 260 /* VariableDeclaration */), usage);
+        const rootDeclaration = getRootDeclaration(declaration);
+        if (rootDeclaration.kind !== 260 /* VariableDeclaration */) {
+          return true;
+        }
+        return isBlockScopedNameDeclaredBeforeUse(rootDeclaration, usage);
       } else if (declaration.kind === 260 /* VariableDeclaration */) {
         return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
       } else if (isClassLike(declaration)) {
@@ -54543,13 +54534,17 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
-  function getReverseMappedTypeMembersLimitingConstraint(type) {
+  function getLimitedConstraint(type) {
     const constraint = getConstraintTypeFromMappedType(type.mappedType);
-    if (constraint === type.constraintType) {
+    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
       return;
     }
-    const mapper = appendTypeMapping(type.mappedType.mapper, type.constraintType.type, keyofConstraintObjectType);
-    return getBaseConstraintOrType(instantiateType(constraint, mapper));
+    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+    return limitedConstraint !== neverType ? limitedConstraint : void 0;
   }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
@@ -54558,11 +54553,11 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
-    const membersLimitingConstraint = getReverseMappedTypeMembersLimitingConstraint(type);
+    const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
-      if (membersLimitingConstraint) {
+      if (limitedConstraint) {
         const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
-        if (!isTypeAssignableTo(propertyNameType, membersLimitingConstraint)) {
+        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
           continue;
         }
       }
@@ -64840,7 +64835,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
+      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -65344,29 +65339,9 @@ function createTypeChecker(host) {
       /*ignoreErrors*/
       true
     );
-    if (!symbol || !(isConstantVariable(symbol) || symbol.flags & 8 /* EnumMember */))
-      return void 0;
-    const declaration = symbol.valueDeclaration;
-    if (declaration === void 0)
+    if (!symbol || symbol.valueDeclaration && !isBlockScopedNameDeclaredBeforeUse(symbol.valueDeclaration, node))
       return void 0;
-    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;
+    return tryGetNameFromType(getTypeOfExpression(node));
   }
   function containsMatchingReference(source, target) {
     while (isAccessExpression(source)) {

package/lib/tsserver.js

@@ -48982,19 +48982,6 @@ function createTypeChecker(host) {
     emptyArray
   );
   var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
-  var keyofConstraintObjectType = createAnonymousType(
-    /*symbol*/
-    void 0,
-    emptySymbols,
-    emptyArray,
-    emptyArray,
-    [stringType, numberType, esSymbolType].map((t) => createIndexInfo(
-      t,
-      unknownType,
-      /*isReadonly*/
-      false
-    ))
-  );
   var emptyGenericType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -49751,7 +49738,11 @@ function createTypeChecker(host) {
         if (errorBindingElement) {
           return findAncestor(errorBindingElement, isBindingElement) !== findAncestor(declaration, isBindingElement) || declaration.pos < errorBindingElement.pos;
         }
-        return isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, 260 /* VariableDeclaration */), usage);
+        const rootDeclaration = getRootDeclaration(declaration);
+        if (rootDeclaration.kind !== 260 /* VariableDeclaration */) {
+          return true;
+        }
+        return isBlockScopedNameDeclaredBeforeUse(rootDeclaration, usage);
       } else if (declaration.kind === 260 /* VariableDeclaration */) {
         return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
       } else if (isClassLike(declaration)) {
@@ -59271,13 +59262,17 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
-  function getReverseMappedTypeMembersLimitingConstraint(type) {
+  function getLimitedConstraint(type) {
     const constraint = getConstraintTypeFromMappedType(type.mappedType);
-    if (constraint === type.constraintType) {
+    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
       return;
     }
-    const mapper = appendTypeMapping(type.mappedType.mapper, type.constraintType.type, keyofConstraintObjectType);
-    return getBaseConstraintOrType(instantiateType(constraint, mapper));
+    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+    return limitedConstraint !== neverType ? limitedConstraint : void 0;
   }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
@@ -59286,11 +59281,11 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
-    const membersLimitingConstraint = getReverseMappedTypeMembersLimitingConstraint(type);
+    const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
-      if (membersLimitingConstraint) {
+      if (limitedConstraint) {
         const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
-        if (!isTypeAssignableTo(propertyNameType, membersLimitingConstraint)) {
+        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
           continue;
         }
       }
@@ -69568,7 +69563,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
+      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -70072,29 +70067,9 @@ function createTypeChecker(host) {
       /*ignoreErrors*/
       true
     );
-    if (!symbol || !(isConstantVariable(symbol) || symbol.flags & 8 /* EnumMember */))
-      return void 0;
-    const declaration = symbol.valueDeclaration;
-    if (declaration === void 0)
+    if (!symbol || symbol.valueDeclaration && !isBlockScopedNameDeclaredBeforeUse(symbol.valueDeclaration, node))
       return void 0;
-    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;
+    return tryGetNameFromType(getTypeOfExpression(node));
   }
   function containsMatchingReference(source, target) {
     while (isAccessExpression(source)) {

package/lib/typescript.js

@@ -46736,19 +46736,6 @@ ${lanes.join("\n")}
       emptyArray
     );
     var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
-    var keyofConstraintObjectType = createAnonymousType(
-      /*symbol*/
-      void 0,
-      emptySymbols,
-      emptyArray,
-      emptyArray,
-      [stringType, numberType, esSymbolType].map((t) => createIndexInfo(
-        t,
-        unknownType,
-        /*isReadonly*/
-        false
-      ))
-    );
     var emptyGenericType = createAnonymousType(
       /*symbol*/
       void 0,
@@ -47505,7 +47492,11 @@ ${lanes.join("\n")}
           if (errorBindingElement) {
             return findAncestor(errorBindingElement, isBindingElement) !== findAncestor(declaration, isBindingElement) || declaration.pos < errorBindingElement.pos;
           }
-          return isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, 260 /* VariableDeclaration */), usage);
+          const rootDeclaration = getRootDeclaration(declaration);
+          if (rootDeclaration.kind !== 260 /* VariableDeclaration */) {
+            return true;
+          }
+          return isBlockScopedNameDeclaredBeforeUse(rootDeclaration, usage);
         } else if (declaration.kind === 260 /* VariableDeclaration */) {
           return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
         } else if (isClassLike(declaration)) {
@@ -57025,13 +57016,17 @@ ${lanes.join("\n")}
     function replaceIndexedAccess(instantiable, type, replacement) {
       return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
     }
-    function getReverseMappedTypeMembersLimitingConstraint(type) {
+    function getLimitedConstraint(type) {
       const constraint = getConstraintTypeFromMappedType(type.mappedType);
-      if (constraint === type.constraintType) {
+      if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+        return;
+      }
+      const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+      if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
         return;
       }
-      const mapper = appendTypeMapping(type.mappedType.mapper, type.constraintType.type, keyofConstraintObjectType);
-      return getBaseConstraintOrType(instantiateType(constraint, mapper));
+      const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+      return limitedConstraint !== neverType ? limitedConstraint : void 0;
     }
     function resolveReverseMappedTypeMembers(type) {
       const indexInfo = getIndexInfoOfType(type.source, stringType);
@@ -57040,11 +57035,11 @@ ${lanes.join("\n")}
       const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
       const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
       const members = createSymbolTable();
-      const membersLimitingConstraint = getReverseMappedTypeMembersLimitingConstraint(type);
+      const limitedConstraint = getLimitedConstraint(type);
       for (const prop of getPropertiesOfType(type.source)) {
-        if (membersLimitingConstraint) {
+        if (limitedConstraint) {
           const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
-          if (!isTypeAssignableTo(propertyNameType, membersLimitingConstraint)) {
+          if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
             continue;
           }
         }
@@ -67322,7 +67317,7 @@ ${lanes.join("\n")}
         }
       }
       function inferToMappedType(source, target, constraintType) {
-        if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
+        if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
           let result = false;
           for (const type of constraintType.types) {
             result = inferToMappedType(source, target, type) || result;
@@ -67826,29 +67821,9 @@ ${lanes.join("\n")}
         /*ignoreErrors*/
         true
       );
-      if (!symbol || !(isConstantVariable(symbol) || symbol.flags & 8 /* EnumMember */))
+      if (!symbol || symbol.valueDeclaration && !isBlockScopedNameDeclaredBeforeUse(symbol.valueDeclaration, node))
         return void 0;
-      const declaration = symbol.valueDeclaration;
-      if (declaration === void 0)
-        return void 0;
-      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;
+      return tryGetNameFromType(getTypeOfExpression(node));
     }
     function containsMatchingReference(source, target) {
       while (isAccessExpression(source)) {

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-56911-7",
+  "version": "5.4.0-pr-56392-10",
   "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": "3baf3b4e1804f2f32ace0d49b294bcf08f3ee314"
+  "gitHead": "61dc1bc3d564f6e826f3e71906739e211c36705b"
 }