typescript 5.6.0-dev.20240701 → 5.6.0-dev.20240702

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240701`;
+var version = `${versionMajorMinor}.0-dev.20240702`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -59724,6 +59724,12 @@ function createTypeChecker(host) {
   function eachUnionContains(unionTypes2, type) {
     for (const u of unionTypes2) {
       if (!containsType(u.types, type)) {
+        if (type === missingType) {
+          return containsType(u.types, undefinedType);
+        }
+        if (type === undefinedType) {
+          return containsType(u.types, missingType);
+        }
         const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & (32 /* Enum */ | 256 /* NumberLiteral */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
         if (!primitive || !containsType(u.types, primitive)) {
           return false;
@@ -59780,6 +59786,13 @@ function createTypeChecker(host) {
       for (const t of u.types) {
         if (insertType(checked, t)) {
           if (eachUnionContains(unionTypes2, t)) {
+            if (t === undefinedType && result.length && result[0] === missingType) {
+              continue;
+            }
+            if (t === missingType && result.length && result[0] === undefinedType) {
+              result[0] = missingType;
+              continue;
+            }
             insertType(result, t);
           }
         }

package/lib/typescript.js

@@ -2250,7 +2250,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240701`;
+var version = `${versionMajorMinor}.0-dev.20240702`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -64312,6 +64312,12 @@ function createTypeChecker(host) {
   function eachUnionContains(unionTypes2, type) {
     for (const u of unionTypes2) {
       if (!containsType(u.types, type)) {
+        if (type === missingType) {
+          return containsType(u.types, undefinedType);
+        }
+        if (type === undefinedType) {
+          return containsType(u.types, missingType);
+        }
         const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & (32 /* Enum */ | 256 /* NumberLiteral */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
         if (!primitive || !containsType(u.types, primitive)) {
           return false;
@@ -64368,6 +64374,13 @@ function createTypeChecker(host) {
       for (const t of u.types) {
         if (insertType(checked, t)) {
           if (eachUnionContains(unionTypes2, t)) {
+            if (t === undefinedType && result.length && result[0] === missingType) {
+              continue;
+            }
+            if (t === missingType && result.length && result[0] === undefinedType) {
+              result[0] = missingType;
+              continue;
+            }
             insertType(result, t);
           }
         }
@@ -144056,7 +144069,7 @@ function isPureImport(node) {
       return false;
   }
 }
-function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PURE__ */ new Set()) {
+function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PURE__ */ new Set(), enclosingRange) {
   var _a;
   const movedSymbols = /* @__PURE__ */ new Set();
   const oldImportsNeededByTargetFile = /* @__PURE__ */ new Map();
@@ -144072,7 +144085,7 @@ function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PUR
   }
   const unusedImportsFromOldFile = /* @__PURE__ */ new Set();
   for (const statement of toMove) {
-    forEachReference(statement, checker, (symbol, isValidTypeOnlyUseSite) => {
+    forEachReference(statement, checker, enclosingRange, (symbol, isValidTypeOnlyUseSite) => {
       if (!symbol.declarations || isGlobalType(checker, symbol)) {
         return;
       }
@@ -144102,7 +144115,7 @@ function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PUR
     if (jsxNamespaceSymbol && !!(statement.transformFlags & 2 /* ContainsJsx */)) {
       unusedImportsFromOldFile.delete(jsxNamespaceSymbol);
     }
-    forEachReference(statement, checker, (symbol, isValidTypeOnlyUseSite) => {
+    forEachReference(statement, checker, enclosingRange, (symbol, isValidTypeOnlyUseSite) => {
       if (movedSymbols.has(symbol)) oldFileImportsFromTargetFile.set(symbol, isValidTypeOnlyUseSite);
       unusedImportsFromOldFile.delete(symbol);
     });
@@ -144144,9 +144157,12 @@ function makeUniqueFilename(proposedFilename, extension, inDirectory, host) {
 function inferNewFileName(importsFromNewFile, movedSymbols) {
   return forEachKey(importsFromNewFile, symbolNameNoDefault) || forEachKey(movedSymbols, symbolNameNoDefault) || "newFile";
 }
-function forEachReference(node, checker, onReference) {
+function forEachReference(node, checker, enclosingRange, onReference) {
   node.forEachChild(function cb(node2) {
     if (isIdentifier(node2) && !isDeclarationName(node2)) {
+      if (enclosingRange && !rangeContainsRange(enclosingRange, node2)) {
+        return;
+      }
       const sym = checker.getSymbolAtLocation(node2);
       if (sym) onReference(sym, isValidTypeOnlyAliasUseSite(node2));
     } else {
@@ -144309,12 +144325,18 @@ function getExistingLocals(sourceFile, statements, checker) {
     }
   }
   for (const statement of statements) {
-    forEachReference(statement, checker, (s) => {
-      const symbol = skipAlias(s, checker);
-      if (symbol.valueDeclaration && getSourceFileOfNode(symbol.valueDeclaration).path === sourceFile.path) {
-        existingLocals.add(symbol);
+    forEachReference(
+      statement,
+      checker,
+      /*enclosingRange*/
+      void 0,
+      (s) => {
+        const symbol = skipAlias(s, checker);
+        if (symbol.valueDeclaration && getSourceFileOfNode(symbol.valueDeclaration).path === sourceFile.path) {
+          existingLocals.add(symbol);
+        }
       }
-    });
+    );
   }
   return existingLocals;
 }
@@ -178388,7 +178410,7 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
         }
         statements.push(...statementsInSourceFile.slice(startNodeIndex, endNodeIndex === -1 ? statementsInSourceFile.length : endNodeIndex + 1));
       });
-      const usage = getUsageInfo(copiedFrom.file, statements, originalProgram.getTypeChecker(), getExistingLocals(updatedFile, statements, originalProgram.getTypeChecker()));
+      const usage = getUsageInfo(copiedFrom.file, statements, originalProgram.getTypeChecker(), getExistingLocals(updatedFile, statements, originalProgram.getTypeChecker()), { pos: copiedFrom.range[0].pos, end: copiedFrom.range[copiedFrom.range.length - 1].end });
       Debug.assertIsDefined(originalProgram);
       const useEsModuleSyntax = !fileShouldUseJavaScriptRequire(targetFile.fileName, originalProgram, host, !!copiedFrom.file.commonJsModuleIndicator);
       addExportsInOldFile(copiedFrom.file, usage.targetFileImportsFromOldFile, changes, useEsModuleSyntax);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240701",
+    "version": "5.6.0-dev.20240702",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -60,7 +60,7 @@
         "chokidar": "^3.6.0",
         "diff": "^5.2.0",
         "dprint": "^0.46.3",
-        "esbuild": "^0.21.5",
+        "esbuild": "^0.22.0",
         "eslint": "^8.57.0",
         "eslint-formatter-autolinkable-stylish": "^1.3.0",
         "fast-xml-parser": "^4.4.0",
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "cb98634f4915bbf7468d33a380a54a372fb94e26"
+    "gitHead": "7bd7dfc007999f6ed2ab0491821d9d136b6293d4"
 }