typescript 5.9.0-dev.20250623 → 5.9.0-dev.20250625

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-dev.20250623`;
+var version = `${versionMajorMinor}.0-dev.20250625`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -17198,8 +17198,14 @@ function base64encode(host, input) {
 function readJsonOrUndefined(path, hostOrText) {
   const jsonText = isString(hostOrText) ? hostOrText : hostOrText.readFile(path);
   if (!jsonText) return void 0;
-  const result = parseConfigFileTextToJson(path, jsonText);
-  return !result.error ? result.config : void 0;
+  let result = tryParseJson(jsonText);
+  if (result === void 0) {
+    const looseResult = parseConfigFileTextToJson(path, jsonText);
+    if (!looseResult.error) {
+      result = looseResult.config;
+    }
+  }
+  return result;
 }
 function readJson(path, host) {
   return readJsonOrUndefined(path, host) || {};
@@ -31211,6 +31217,7 @@ var Parser;
         /*skipKeyword*/
         true
       );
+      parseOptional(28 /* CommaToken */);
       if (!parseExpected(20 /* CloseBraceToken */)) {
         const lastError = lastOrUndefined(parseDiagnostics);
         if (lastError && lastError.code === Diagnostics._0_expected.code) {
@@ -67432,9 +67439,13 @@ function createTypeChecker(host) {
       return types[0];
     }
     const primaryTypes = strictNullChecks ? sameMap(types, (t) => filterType(t, (u) => !(u.flags & 98304 /* Nullable */))) : types;
-    const superTypeOrUnion = literalTypesWithSameBaseType(primaryTypes) ? getUnionType(primaryTypes) : reduceLeft(primaryTypes, (s, t) => isTypeSubtypeOf(s, t) ? t : s);
+    const superTypeOrUnion = literalTypesWithSameBaseType(primaryTypes) ? getUnionType(primaryTypes) : getSingleCommonSupertype(primaryTypes);
     return primaryTypes === types ? superTypeOrUnion : getNullableType(superTypeOrUnion, getCombinedTypeFlags(types) & 98304 /* Nullable */);
   }
+  function getSingleCommonSupertype(types) {
+    const candidate = reduceLeft(types, (s, t) => isTypeStrictSubtypeOf(s, t) ? t : s);
+    return every(types, (t) => t === candidate || isTypeStrictSubtypeOf(t, candidate)) ? candidate : reduceLeft(types, (s, t) => isTypeSubtypeOf(s, t) ? t : s);
+  }
   function getCommonSubtype(types) {
     return reduceLeft(types, (s, t) => isTypeSubtypeOf(t, s) ? t : s);
   }

package/lib/typescript.js

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-dev.20250623`;
+var version = `${versionMajorMinor}.0-dev.20250625`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -21084,8 +21084,14 @@ function base64decode(host, input) {
 function readJsonOrUndefined(path, hostOrText) {
   const jsonText = isString(hostOrText) ? hostOrText : hostOrText.readFile(path);
   if (!jsonText) return void 0;
-  const result = parseConfigFileTextToJson(path, jsonText);
-  return !result.error ? result.config : void 0;
+  let result = tryParseJson(jsonText);
+  if (result === void 0) {
+    const looseResult = parseConfigFileTextToJson(path, jsonText);
+    if (!looseResult.error) {
+      result = looseResult.config;
+    }
+  }
+  return result;
 }
 function readJson(path, host) {
   return readJsonOrUndefined(path, host) || {};
@@ -35472,6 +35478,7 @@ var Parser;
         /*skipKeyword*/
         true
       );
+      parseOptional(28 /* CommaToken */);
       if (!parseExpected(20 /* CloseBraceToken */)) {
         const lastError = lastOrUndefined(parseDiagnostics);
         if (lastError && lastError.code === Diagnostics._0_expected.code) {
@@ -72043,9 +72050,13 @@ function createTypeChecker(host) {
       return types[0];
     }
     const primaryTypes = strictNullChecks ? sameMap(types, (t) => filterType(t, (u) => !(u.flags & 98304 /* Nullable */))) : types;
-    const superTypeOrUnion = literalTypesWithSameBaseType(primaryTypes) ? getUnionType(primaryTypes) : reduceLeft(primaryTypes, (s, t) => isTypeSubtypeOf(s, t) ? t : s);
+    const superTypeOrUnion = literalTypesWithSameBaseType(primaryTypes) ? getUnionType(primaryTypes) : getSingleCommonSupertype(primaryTypes);
     return primaryTypes === types ? superTypeOrUnion : getNullableType(superTypeOrUnion, getCombinedTypeFlags(types) & 98304 /* Nullable */);
   }
+  function getSingleCommonSupertype(types) {
+    const candidate = reduceLeft(types, (s, t) => isTypeStrictSubtypeOf(s, t) ? t : s);
+    return every(types, (t) => t === candidate || isTypeStrictSubtypeOf(t, candidate)) ? candidate : reduceLeft(types, (s, t) => isTypeSubtypeOf(s, t) ? t : s);
+  }
   function getCommonSubtype(types) {
     return reduceLeft(types, (s, t) => isTypeSubtypeOf(t, s) ? t : s);
   }
@@ -139324,6 +139335,9 @@ function getMeaningFromRightHandSideOfImportEquals(node) {
   return name && name.parent.kind === 272 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
 }
 function isInRightSideOfInternalImportEqualsDeclaration(node) {
+  if (!node.parent) {
+    return false;
+  }
   while (node.parent.kind === 167 /* QualifiedName */) {
     node = node.parent;
   }
@@ -168297,48 +168311,46 @@ function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, con
   function shouldIncludeSymbol(symbol, symbolToSortTextMap2) {
     var _a;
     let allFlags = symbol.flags;
-    if (!isSourceFile(location)) {
-      if (isExportAssignment(location.parent)) {
-        return true;
+    if (location.parent && isExportAssignment(location.parent)) {
+      return true;
+    }
+    if (closestSymbolDeclaration && tryCast(closestSymbolDeclaration, isVariableDeclaration)) {
+      if (symbol.valueDeclaration === closestSymbolDeclaration) {
+        return false;
       }
-      if (closestSymbolDeclaration && tryCast(closestSymbolDeclaration, isVariableDeclaration)) {
-        if (symbol.valueDeclaration === closestSymbolDeclaration) {
+      if (isBindingPattern(closestSymbolDeclaration.name) && closestSymbolDeclaration.name.elements.some((e) => e === symbol.valueDeclaration)) {
+        return false;
+      }
+    }
+    const symbolDeclaration = symbol.valueDeclaration ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
+    if (closestSymbolDeclaration && symbolDeclaration) {
+      if (isParameter(closestSymbolDeclaration) && isParameter(symbolDeclaration)) {
+        const parameters = closestSymbolDeclaration.parent.parameters;
+        if (symbolDeclaration.pos >= closestSymbolDeclaration.pos && symbolDeclaration.pos < parameters.end) {
           return false;
         }
-        if (isBindingPattern(closestSymbolDeclaration.name) && closestSymbolDeclaration.name.elements.some((e) => e === symbol.valueDeclaration)) {
+      } else if (isTypeParameterDeclaration(closestSymbolDeclaration) && isTypeParameterDeclaration(symbolDeclaration)) {
+        if (closestSymbolDeclaration === symbolDeclaration && (contextToken == null ? void 0 : contextToken.kind) === 96 /* ExtendsKeyword */) {
           return false;
         }
-      }
-      const symbolDeclaration = symbol.valueDeclaration ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
-      if (closestSymbolDeclaration && symbolDeclaration) {
-        if (isParameter(closestSymbolDeclaration) && isParameter(symbolDeclaration)) {
-          const parameters = closestSymbolDeclaration.parent.parameters;
-          if (symbolDeclaration.pos >= closestSymbolDeclaration.pos && symbolDeclaration.pos < parameters.end) {
+        if (isInTypeParameterDefault(contextToken) && !isInferTypeNode(closestSymbolDeclaration.parent)) {
+          const typeParameters = closestSymbolDeclaration.parent.typeParameters;
+          if (typeParameters && symbolDeclaration.pos >= closestSymbolDeclaration.pos && symbolDeclaration.pos < typeParameters.end) {
             return false;
           }
-        } else if (isTypeParameterDeclaration(closestSymbolDeclaration) && isTypeParameterDeclaration(symbolDeclaration)) {
-          if (closestSymbolDeclaration === symbolDeclaration && (contextToken == null ? void 0 : contextToken.kind) === 96 /* ExtendsKeyword */) {
-            return false;
-          }
-          if (isInTypeParameterDefault(contextToken) && !isInferTypeNode(closestSymbolDeclaration.parent)) {
-            const typeParameters = closestSymbolDeclaration.parent.typeParameters;
-            if (typeParameters && symbolDeclaration.pos >= closestSymbolDeclaration.pos && symbolDeclaration.pos < typeParameters.end) {
-              return false;
-            }
-          }
         }
       }
-      const symbolOrigin = skipAlias(symbol, typeChecker);
-      if (!!sourceFile.externalModuleIndicator && !compilerOptions.allowUmdGlobalAccess && symbolToSortTextMap2[getSymbolId(symbol)] === SortText.GlobalsOrKeywords && (symbolToSortTextMap2[getSymbolId(symbolOrigin)] === SortText.AutoImportSuggestions || symbolToSortTextMap2[getSymbolId(symbolOrigin)] === SortText.LocationPriority)) {
-        return false;
-      }
-      allFlags |= getCombinedLocalAndExportSymbolFlags(symbolOrigin);
-      if (isInRightSideOfInternalImportEqualsDeclaration(location)) {
-        return !!(allFlags & 1920 /* Namespace */);
-      }
-      if (isTypeOnlyLocation) {
-        return symbolCanBeReferencedAtTypeLocation(symbol, typeChecker);
-      }
+    }
+    const symbolOrigin = skipAlias(symbol, typeChecker);
+    if (!!sourceFile.externalModuleIndicator && !compilerOptions.allowUmdGlobalAccess && symbolToSortTextMap2[getSymbolId(symbol)] === SortText.GlobalsOrKeywords && (symbolToSortTextMap2[getSymbolId(symbolOrigin)] === SortText.AutoImportSuggestions || symbolToSortTextMap2[getSymbolId(symbolOrigin)] === SortText.LocationPriority)) {
+      return false;
+    }
+    allFlags |= getCombinedLocalAndExportSymbolFlags(symbolOrigin);
+    if (isInRightSideOfInternalImportEqualsDeclaration(location)) {
+      return !!(allFlags & 1920 /* Namespace */);
+    }
+    if (isTypeOnlyLocation) {
+      return symbolCanBeReferencedAtTypeLocation(symbol, typeChecker);
     }
     return !!(allFlags & 111551 /* Value */);
   }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.9.0-dev.20250623",
+    "version": "5.9.0-dev.20250625",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -116,5 +116,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "479285d0ac293c35a926508d17f0bb5eca7e0303"
+    "gitHead": "e6a50a78619632bba7af4f23b2e7e4940b9cf788"
 }