@typescript-deploys/pr-build 5.4.0-pr-49218-45 → 5.4.0-pr-56243-5

package/lib/tsc.js

@@ -50244,7 +50244,7 @@ function createTypeChecker(host) {
       });
       let addingDeclare = !bundled;
       const exportEquals = symbolTable.get("export=" /* ExportEquals */);
-      if (exportEquals && symbolTable.size > 1 && exportEquals.flags & 2097152 /* Alias */) {
+      if (exportEquals && symbolTable.size > 1 && exportEquals.flags & (2097152 /* Alias */ | 1536 /* Module */)) {
         symbolTable = createSymbolTable();
         symbolTable.set("export=" /* ExportEquals */, exportEquals);
       }
@@ -50701,8 +50701,18 @@ function createTypeChecker(host) {
         );
       }
       function getNamespaceMembersForSerialization(symbol) {
-        const exports2 = getExportsOfSymbol(symbol);
-        return !exports2 ? [] : filter(arrayFrom(exports2.values()), (m) => isNamespaceMember(m) && isIdentifierText(m.escapedName, 99 /* ESNext */));
+        let exports2 = arrayFrom(getExportsOfSymbol(symbol).values());
+        const merged = getMergedSymbol(symbol);
+        if (merged !== symbol) {
+          const membersSet = new Set(exports2);
+          for (const exported of getExportsOfSymbol(merged).values()) {
+            if (!(getSymbolFlags(resolveSymbol(exported)) & 111551 /* Value */)) {
+              membersSet.add(exported);
+            }
+          }
+          exports2 = arrayFrom(membersSet);
+        }
+        return filter(exports2, (m) => isNamespaceMember(m) && isIdentifierText(m.escapedName, 99 /* ESNext */));
       }
       function isTypeOnlyNamespace(symbol) {
         return every(getNamespaceMembersForSerialization(symbol), (m) => !(getSymbolFlags(resolveSymbol(m)) & 111551 /* Value */));
@@ -60529,37 +60539,7 @@ function createTypeChecker(host) {
     const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
     for (let i = 0; i < paramCount; i++) {
       const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-      let targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
-      if (i === restIndex && targetType && sourceType && isTupleType(sourceType)) {
-        targetType = mapType(targetType, (t) => {
-          if (!isTupleType(t) || // When both sides are tuples of the same structure, we don't want to "propagate" types from elements of variable positions
-          // to the following positions as that would disallow signatures of the exact same structures when trailing fixed elements are involved:
-          //
-          // let fn: (...rest: [...string[], number]) => void = (...rest: [...string[], number]) => {}; // ok
-          //
-          // Since we want to allow contextual types to flow into paremeters, we don't need to differentiate between rest and variadic elements
-          // as that doesn't affect the contextual type of the parameter
-          isTupleTypeStructureMatching(sourceType, t, 2 /* MatchVariable */)) {
-            return t;
-          }
-          const elementTypes = [];
-          const elementFlags = [];
-          const sourceArity = getTypeReferenceArity(sourceType);
-          const targetArity = getTypeReferenceArity(t);
-          for (let i2 = 0; i2 < sourceArity; i2++) {
-            if (i2 >= targetArity) {
-              if (sourceType.target.elementFlags[i2] & 3 /* Fixed */) {
-                elementTypes.push(undefinedType);
-                elementFlags.push(sourceType.target.elementFlags[i2]);
-              }
-              continue;
-            }
-            elementTypes.push(getTupleElementType(t, i2));
-            elementFlags.push(sourceType.target.elementFlags[i2]);
-          }
-          return createTupleType(elementTypes, elementFlags);
-        });
-      }
+      const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
       if (sourceType && targetType) {
         const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
         const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -63816,11 +63796,8 @@ function createTypeChecker(host) {
     }
     return void 0;
   }
-  function isTupleTypeStructureMatching(t1, t2, tupleStructureComparisonKind) {
-    return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && every(t1.target.elementFlags, (f1, i) => {
-      const f2 = t2.target.elementFlags[i];
-      return f1 === f2 || !!(tupleStructureComparisonKind & 1 /* MatchFixed */ && f1 & 3 /* Fixed */ && f2 & 3 /* Fixed */) || !!(tupleStructureComparisonKind & 2 /* MatchVariable */ && f1 & 12 /* Variable */ && f2 & 12 /* Variable */);
-    });
+  function isTupleTypeStructureMatching(t1, t2) {
+    return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && every(t1.target.elementFlags, (f, i) => (f & 12 /* Variable */) === (t2.target.elementFlags[i] & 12 /* Variable */));
   }
   function isZeroBigInt({ value }) {
     return value.base10Value === "0";
@@ -65028,7 +65005,7 @@ function createTypeChecker(host) {
             const targetArity = getTypeReferenceArity(target);
             const elementTypes = getTypeArguments(target);
             const elementFlags = target.target.elementFlags;
-            if (isTupleType(source) && isTupleTypeStructureMatching(source, target, 1 /* MatchFixed */)) {
+            if (isTupleType(source) && isTupleTypeStructureMatching(source, target)) {
               for (let i = 0; i < targetArity; i++) {
                 inferFromTypes(getTypeArguments(source)[i], elementTypes[i]);
               }
@@ -119634,7 +119611,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         }
         const isFromNodeModulesSearch = resolution.isExternalLibraryImport;
         const isJsFile = !resolutionExtensionIsTSOrJson(resolution.extension);
-        const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile;
+        const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile && (!resolution.originalPath || pathContainsNodeModules(resolution.resolvedFileName));
         const resolvedFileName = resolution.resolvedFileName;
         if (isFromNodeModulesSearch) {
           currentNodeModulesDepth++;

package/lib/tsserver.js

@@ -54982,7 +54982,7 @@ function createTypeChecker(host) {
       });
       let addingDeclare = !bundled;
       const exportEquals = symbolTable.get("export=" /* ExportEquals */);
-      if (exportEquals && symbolTable.size > 1 && exportEquals.flags & 2097152 /* Alias */) {
+      if (exportEquals && symbolTable.size > 1 && exportEquals.flags & (2097152 /* Alias */ | 1536 /* Module */)) {
         symbolTable = createSymbolTable();
         symbolTable.set("export=" /* ExportEquals */, exportEquals);
       }
@@ -55439,8 +55439,18 @@ function createTypeChecker(host) {
         );
       }
       function getNamespaceMembersForSerialization(symbol) {
-        const exports2 = getExportsOfSymbol(symbol);
-        return !exports2 ? [] : filter(arrayFrom(exports2.values()), (m) => isNamespaceMember(m) && isIdentifierText(m.escapedName, 99 /* ESNext */));
+        let exports2 = arrayFrom(getExportsOfSymbol(symbol).values());
+        const merged = getMergedSymbol(symbol);
+        if (merged !== symbol) {
+          const membersSet = new Set(exports2);
+          for (const exported of getExportsOfSymbol(merged).values()) {
+            if (!(getSymbolFlags(resolveSymbol(exported)) & 111551 /* Value */)) {
+              membersSet.add(exported);
+            }
+          }
+          exports2 = arrayFrom(membersSet);
+        }
+        return filter(exports2, (m) => isNamespaceMember(m) && isIdentifierText(m.escapedName, 99 /* ESNext */));
       }
       function isTypeOnlyNamespace(symbol) {
         return every(getNamespaceMembersForSerialization(symbol), (m) => !(getSymbolFlags(resolveSymbol(m)) & 111551 /* Value */));
@@ -65267,37 +65277,7 @@ function createTypeChecker(host) {
     const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
     for (let i = 0; i < paramCount; i++) {
       const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-      let targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
-      if (i === restIndex && targetType && sourceType && isTupleType(sourceType)) {
-        targetType = mapType(targetType, (t) => {
-          if (!isTupleType(t) || // When both sides are tuples of the same structure, we don't want to "propagate" types from elements of variable positions
-          // to the following positions as that would disallow signatures of the exact same structures when trailing fixed elements are involved:
-          //
-          // let fn: (...rest: [...string[], number]) => void = (...rest: [...string[], number]) => {}; // ok
-          //
-          // Since we want to allow contextual types to flow into paremeters, we don't need to differentiate between rest and variadic elements
-          // as that doesn't affect the contextual type of the parameter
-          isTupleTypeStructureMatching(sourceType, t, 2 /* MatchVariable */)) {
-            return t;
-          }
-          const elementTypes = [];
-          const elementFlags = [];
-          const sourceArity = getTypeReferenceArity(sourceType);
-          const targetArity = getTypeReferenceArity(t);
-          for (let i2 = 0; i2 < sourceArity; i2++) {
-            if (i2 >= targetArity) {
-              if (sourceType.target.elementFlags[i2] & 3 /* Fixed */) {
-                elementTypes.push(undefinedType);
-                elementFlags.push(sourceType.target.elementFlags[i2]);
-              }
-              continue;
-            }
-            elementTypes.push(getTupleElementType(t, i2));
-            elementFlags.push(sourceType.target.elementFlags[i2]);
-          }
-          return createTupleType(elementTypes, elementFlags);
-        });
-      }
+      const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
       if (sourceType && targetType) {
         const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
         const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -68554,11 +68534,8 @@ function createTypeChecker(host) {
     }
     return void 0;
   }
-  function isTupleTypeStructureMatching(t1, t2, tupleStructureComparisonKind) {
-    return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && every(t1.target.elementFlags, (f1, i) => {
-      const f2 = t2.target.elementFlags[i];
-      return f1 === f2 || !!(tupleStructureComparisonKind & 1 /* MatchFixed */ && f1 & 3 /* Fixed */ && f2 & 3 /* Fixed */) || !!(tupleStructureComparisonKind & 2 /* MatchVariable */ && f1 & 12 /* Variable */ && f2 & 12 /* Variable */);
-    });
+  function isTupleTypeStructureMatching(t1, t2) {
+    return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && every(t1.target.elementFlags, (f, i) => (f & 12 /* Variable */) === (t2.target.elementFlags[i] & 12 /* Variable */));
   }
   function isZeroBigInt({ value }) {
     return value.base10Value === "0";
@@ -69766,7 +69743,7 @@ function createTypeChecker(host) {
             const targetArity = getTypeReferenceArity(target);
             const elementTypes = getTypeArguments(target);
             const elementFlags = target.target.elementFlags;
-            if (isTupleType(source) && isTupleTypeStructureMatching(source, target, 1 /* MatchFixed */)) {
+            if (isTupleType(source) && isTupleTypeStructureMatching(source, target)) {
               for (let i = 0; i < targetArity; i++) {
                 inferFromTypes(getTypeArguments(source)[i], elementTypes[i]);
               }
@@ -124597,7 +124574,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         }
         const isFromNodeModulesSearch = resolution.isExternalLibraryImport;
         const isJsFile = !resolutionExtensionIsTSOrJson(resolution.extension);
-        const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile;
+        const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile && (!resolution.originalPath || pathContainsNodeModules(resolution.resolvedFileName));
         const resolvedFileName = resolution.resolvedFileName;
         if (isFromNodeModulesSearch) {
           currentNodeModulesDepth++;

package/lib/typescript.js

@@ -52737,7 +52737,7 @@ ${lanes.join("\n")}
         });
         let addingDeclare = !bundled;
         const exportEquals = symbolTable.get("export=" /* ExportEquals */);
-        if (exportEquals && symbolTable.size > 1 && exportEquals.flags & 2097152 /* Alias */) {
+        if (exportEquals && symbolTable.size > 1 && exportEquals.flags & (2097152 /* Alias */ | 1536 /* Module */)) {
           symbolTable = createSymbolTable();
           symbolTable.set("export=" /* ExportEquals */, exportEquals);
         }
@@ -53194,8 +53194,18 @@ ${lanes.join("\n")}
           );
         }
         function getNamespaceMembersForSerialization(symbol) {
-          const exports = getExportsOfSymbol(symbol);
-          return !exports ? [] : filter(arrayFrom(exports.values()), (m) => isNamespaceMember(m) && isIdentifierText(m.escapedName, 99 /* ESNext */));
+          let exports = arrayFrom(getExportsOfSymbol(symbol).values());
+          const merged = getMergedSymbol(symbol);
+          if (merged !== symbol) {
+            const membersSet = new Set(exports);
+            for (const exported of getExportsOfSymbol(merged).values()) {
+              if (!(getSymbolFlags(resolveSymbol(exported)) & 111551 /* Value */)) {
+                membersSet.add(exported);
+              }
+            }
+            exports = arrayFrom(membersSet);
+          }
+          return filter(exports, (m) => isNamespaceMember(m) && isIdentifierText(m.escapedName, 99 /* ESNext */));
         }
         function isTypeOnlyNamespace(symbol) {
           return every(getNamespaceMembersForSerialization(symbol), (m) => !(getSymbolFlags(resolveSymbol(m)) & 111551 /* Value */));
@@ -63022,37 +63032,7 @@ ${lanes.join("\n")}
       const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
       for (let i = 0; i < paramCount; i++) {
         const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-        let targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
-        if (i === restIndex && targetType && sourceType && isTupleType(sourceType)) {
-          targetType = mapType(targetType, (t) => {
-            if (!isTupleType(t) || // When both sides are tuples of the same structure, we don't want to "propagate" types from elements of variable positions
-            // to the following positions as that would disallow signatures of the exact same structures when trailing fixed elements are involved:
-            //
-            // let fn: (...rest: [...string[], number]) => void = (...rest: [...string[], number]) => {}; // ok
-            //
-            // Since we want to allow contextual types to flow into paremeters, we don't need to differentiate between rest and variadic elements
-            // as that doesn't affect the contextual type of the parameter
-            isTupleTypeStructureMatching(sourceType, t, 2 /* MatchVariable */)) {
-              return t;
-            }
-            const elementTypes = [];
-            const elementFlags = [];
-            const sourceArity = getTypeReferenceArity(sourceType);
-            const targetArity = getTypeReferenceArity(t);
-            for (let i2 = 0; i2 < sourceArity; i2++) {
-              if (i2 >= targetArity) {
-                if (sourceType.target.elementFlags[i2] & 3 /* Fixed */) {
-                  elementTypes.push(undefinedType);
-                  elementFlags.push(sourceType.target.elementFlags[i2]);
-                }
-                continue;
-              }
-              elementTypes.push(getTupleElementType(t, i2));
-              elementFlags.push(sourceType.target.elementFlags[i2]);
-            }
-            return createTupleType(elementTypes, elementFlags);
-          });
-        }
+        const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
         if (sourceType && targetType) {
           const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
           const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -66309,11 +66289,8 @@ ${lanes.join("\n")}
       }
       return void 0;
     }
-    function isTupleTypeStructureMatching(t1, t2, tupleStructureComparisonKind) {
-      return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && every(t1.target.elementFlags, (f1, i) => {
-        const f2 = t2.target.elementFlags[i];
-        return f1 === f2 || !!(tupleStructureComparisonKind & 1 /* MatchFixed */ && f1 & 3 /* Fixed */ && f2 & 3 /* Fixed */) || !!(tupleStructureComparisonKind & 2 /* MatchVariable */ && f1 & 12 /* Variable */ && f2 & 12 /* Variable */);
-      });
+    function isTupleTypeStructureMatching(t1, t2) {
+      return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && every(t1.target.elementFlags, (f, i) => (f & 12 /* Variable */) === (t2.target.elementFlags[i] & 12 /* Variable */));
     }
     function isZeroBigInt({ value }) {
       return value.base10Value === "0";
@@ -67521,7 +67498,7 @@ ${lanes.join("\n")}
               const targetArity = getTypeReferenceArity(target);
               const elementTypes = getTypeArguments(target);
               const elementFlags = target.target.elementFlags;
-              if (isTupleType(source) && isTupleTypeStructureMatching(source, target, 1 /* MatchFixed */)) {
+              if (isTupleType(source) && isTupleTypeStructureMatching(source, target)) {
                 for (let i = 0; i < targetArity; i++) {
                   inferFromTypes(getTypeArguments(source)[i], elementTypes[i]);
                 }
@@ -122570,7 +122547,7 @@ ${lanes.join("\n")}
           }
           const isFromNodeModulesSearch = resolution.isExternalLibraryImport;
           const isJsFile = !resolutionExtensionIsTSOrJson(resolution.extension);
-          const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile;
+          const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile && (!resolution.originalPath || pathContainsNodeModules(resolution.resolvedFileName));
           const resolvedFileName = resolution.resolvedFileName;
           if (isFromNodeModulesSearch) {
             currentNodeModulesDepth++;

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-49218-45",
+  "version": "5.4.0-pr-56243-5",
   "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": "624e31924d903e31deffbf8358ff7d517e1a6ec3"
+  "gitHead": "fe865ed126747a43ecaedd50761ad4070902ac22"
 }