typescript 5.3.0-dev.20231019 → 5.3.0-dev.20231021

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231019`;
+var version = `${versionMajorMinor}.0-dev.20231021`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -23694,17 +23694,18 @@ var asyncGeneratorHelper = {
   scoped: false,
   dependencies: [awaitHelper],
   text: `
-            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-                if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-                var g = generator.apply(thisArg, _arguments || []), i, q = [];
-                return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-                function fulfill(value) { resume("next", value); }
-                function reject(value) { resume("throw", value); }
-                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-            };`
+        var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var g = generator.apply(thisArg, _arguments || []), i, q = [];
+            return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+            function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+            function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+            function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+            function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+            function fulfill(value) { resume("next", value); }
+            function reject(value) { resume("throw", value); }
+            function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+        };`
 };
 var asyncDelegator = {
   name: "typescript:asyncDelegator",
@@ -65935,13 +65936,15 @@ function createTypeChecker(host) {
       return void 0;
     }
     function getDiscriminantPropertyAccess(expr, computedType) {
-      const type = !(computedType.flags & 1048576 /* Union */) && declaredType.flags & 1048576 /* Union */ ? declaredType : computedType;
-      if (type.flags & 1048576 /* Union */) {
+      if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
         const access = getCandidateDiscriminantPropertyAccess(expr);
         if (access) {
           const name = getAccessedPropertyName(access);
-          if (name && isDiscriminantProperty(type, name)) {
-            return access;
+          if (name) {
+            const type = declaredType.flags & 1048576 /* Union */ && isTypeSubsetOf(computedType, declaredType) ? declaredType : computedType;
+            if (isDiscriminantProperty(type, name)) {
+              return access;
+            }
           }
         }
       }

package/lib/tsserver.js

@@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231019`;
+var version = `${versionMajorMinor}.0-dev.20231021`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -27958,17 +27958,18 @@ var asyncGeneratorHelper = {
   scoped: false,
   dependencies: [awaitHelper],
   text: `
-            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-                if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-                var g = generator.apply(thisArg, _arguments || []), i, q = [];
-                return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-                function fulfill(value) { resume("next", value); }
-                function reject(value) { resume("throw", value); }
-                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-            };`
+        var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var g = generator.apply(thisArg, _arguments || []), i, q = [];
+            return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+            function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+            function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+            function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+            function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+            function fulfill(value) { resume("next", value); }
+            function reject(value) { resume("throw", value); }
+            function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+        };`
 };
 var asyncDelegator = {
   name: "typescript:asyncDelegator",
@@ -70647,13 +70648,15 @@ function createTypeChecker(host) {
       return void 0;
     }
     function getDiscriminantPropertyAccess(expr, computedType) {
-      const type = !(computedType.flags & 1048576 /* Union */) && declaredType.flags & 1048576 /* Union */ ? declaredType : computedType;
-      if (type.flags & 1048576 /* Union */) {
+      if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
         const access = getCandidateDiscriminantPropertyAccess(expr);
         if (access) {
           const name = getAccessedPropertyName(access);
-          if (name && isDiscriminantProperty(type, name)) {
-            return access;
+          if (name) {
+            const type = declaredType.flags & 1048576 /* Union */ && isTypeSubsetOf(computedType, declaredType) ? declaredType : computedType;
+            if (isDiscriminantProperty(type, name)) {
+              return access;
+            }
           }
         }
       }
@@ -149958,7 +149961,8 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         defaultImport,
         namedImports && arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
         namespaceLikeImport,
-        compilerOptions
+        compilerOptions,
+        preferences
       );
       newDeclarations = combine(newDeclarations, declarations);
     });
@@ -150663,7 +150667,8 @@ function codeActionForFixWorker(changes, sourceFile, symbolName2, fix, includeSy
           defaultImport,
           namedImports,
           namespaceLikeImport,
-          program.getCompilerOptions()
+          program.getCompilerOptions(),
+          preferences
         ),
         /*blankLineBetween*/
         true,
@@ -150795,7 +150800,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
     const newSpecifiers = stableSort(
       namedImports.map(
         (namedImport) => factory.createImportSpecifier(
-          (!clause.isTypeOnly || promoteFromTypeOnly2) && needsTypeOnly(namedImport),
+          (!clause.isTypeOnly || promoteFromTypeOnly2) && shouldUseTypeOnly(namedImport, preferences),
           /*propertyName*/
           void 0,
           factory.createIdentifier(namedImport.name)
@@ -150859,21 +150864,24 @@ function getImportTypePrefix(moduleSpecifier, quotePreference) {
 function needsTypeOnly({ addAsTypeOnly }) {
   return addAsTypeOnly === 2 /* Required */;
 }
-function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions) {
+function shouldUseTypeOnly(info, preferences) {
+  return needsTypeOnly(info) || !!preferences.preferTypeOnlyAutoImports && info.addAsTypeOnly !== 4 /* NotAllowed */;
+}
+function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions, preferences) {
   const quotedModuleSpecifier = makeStringLiteral(moduleSpecifier, quotePreference);
   let statements;
   if (defaultImport !== void 0 || (namedImports == null ? void 0 : namedImports.length)) {
-    const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || compilerOptions.verbatimModuleSyntax && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
+    const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || (compilerOptions.verbatimModuleSyntax || preferences.preferTypeOnlyAutoImports) && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
     statements = combine(
       statements,
       makeImport(
         defaultImport && factory.createIdentifier(defaultImport.name),
         namedImports == null ? void 0 : namedImports.map(
-          ({ addAsTypeOnly, name }) => factory.createImportSpecifier(
-            !topLevelTypeOnly && addAsTypeOnly === 2 /* Required */,
+          (namedImport) => factory.createImportSpecifier(
+            !topLevelTypeOnly && shouldUseTypeOnly(namedImport, preferences),
             /*propertyName*/
             void 0,
-            factory.createIdentifier(name)
+            factory.createIdentifier(namedImport.name)
           )
         ),
         moduleSpecifier,
@@ -150886,14 +150894,14 @@ function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImp
     const declaration = namespaceLikeImport.importKind === 3 /* CommonJS */ ? factory.createImportEqualsDeclaration(
       /*modifiers*/
       void 0,
-      needsTypeOnly(namespaceLikeImport),
+      shouldUseTypeOnly(namespaceLikeImport, preferences),
       factory.createIdentifier(namespaceLikeImport.name),
       factory.createExternalModuleReference(quotedModuleSpecifier)
     ) : factory.createImportDeclaration(
       /*modifiers*/
       void 0,
       factory.createImportClause(
-        needsTypeOnly(namespaceLikeImport),
+        shouldUseTypeOnly(namespaceLikeImport, preferences),
         /*name*/
         void 0,
         factory.createNamespaceImport(factory.createIdentifier(namespaceLikeImport.name))

package/lib/typescript.d.ts

@@ -8742,6 +8742,7 @@ declare namespace ts {
         readonly interactiveInlayHints?: boolean;
         readonly allowRenameOfImportPath?: boolean;
         readonly autoImportFileExcludePatterns?: string[];
+        readonly preferTypeOnlyAutoImports?: boolean;
         readonly organizeImportsIgnoreCase?: "auto" | boolean;
         readonly organizeImportsCollation?: "ordinal" | "unicode";
         readonly organizeImportsLocale?: string;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20231019`;
+      version = `${versionMajorMinor}.0-dev.20231021`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -25835,17 +25835,18 @@ ${lanes.join("\n")}
         scoped: false,
         dependencies: [awaitHelper],
         text: `
-            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-                if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-                var g = generator.apply(thisArg, _arguments || []), i, q = [];
-                return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-                function fulfill(value) { resume("next", value); }
-                function reject(value) { resume("throw", value); }
-                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-            };`
+        var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var g = generator.apply(thisArg, _arguments || []), i, q = [];
+            return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+            function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+            function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+            function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+            function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+            function fulfill(value) { resume("next", value); }
+            function reject(value) { resume("throw", value); }
+            function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+        };`
       };
       asyncDelegator = {
         name: "typescript:asyncDelegator",
@@ -68414,13 +68415,15 @@ ${lanes.join("\n")}
         return void 0;
       }
       function getDiscriminantPropertyAccess(expr, computedType) {
-        const type = !(computedType.flags & 1048576 /* Union */) && declaredType.flags & 1048576 /* Union */ ? declaredType : computedType;
-        if (type.flags & 1048576 /* Union */) {
+        if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
           const access = getCandidateDiscriminantPropertyAccess(expr);
           if (access) {
             const name = getAccessedPropertyName(access);
-            if (name && isDiscriminantProperty(type, name)) {
-              return access;
+            if (name) {
+              const type = declaredType.flags & 1048576 /* Union */ && isTypeSubsetOf(computedType, declaredType) ? declaredType : computedType;
+              if (isDiscriminantProperty(type, name)) {
+                return access;
+              }
             }
           }
         }
@@ -148679,7 +148682,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           defaultImport,
           namedImports && arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
           namespaceLikeImport,
-          compilerOptions
+          compilerOptions,
+          preferences
         );
         newDeclarations = combine(newDeclarations, declarations);
       });
@@ -149384,7 +149388,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             defaultImport,
             namedImports,
             namespaceLikeImport,
-            program.getCompilerOptions()
+            program.getCompilerOptions(),
+            preferences
           ),
           /*blankLineBetween*/
           true,
@@ -149516,7 +149521,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const newSpecifiers = stableSort(
         namedImports.map(
           (namedImport) => factory.createImportSpecifier(
-            (!clause.isTypeOnly || promoteFromTypeOnly2) && needsTypeOnly(namedImport),
+            (!clause.isTypeOnly || promoteFromTypeOnly2) && shouldUseTypeOnly(namedImport, preferences),
             /*propertyName*/
             void 0,
             factory.createIdentifier(namedImport.name)
@@ -149580,21 +149585,24 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function needsTypeOnly({ addAsTypeOnly }) {
     return addAsTypeOnly === 2 /* Required */;
   }
-  function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions) {
+  function shouldUseTypeOnly(info, preferences) {
+    return needsTypeOnly(info) || !!preferences.preferTypeOnlyAutoImports && info.addAsTypeOnly !== 4 /* NotAllowed */;
+  }
+  function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport, compilerOptions, preferences) {
     const quotedModuleSpecifier = makeStringLiteral(moduleSpecifier, quotePreference);
     let statements;
     if (defaultImport !== void 0 || (namedImports == null ? void 0 : namedImports.length)) {
-      const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || compilerOptions.verbatimModuleSyntax && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
+      const topLevelTypeOnly = (!defaultImport || needsTypeOnly(defaultImport)) && every(namedImports, needsTypeOnly) || (compilerOptions.verbatimModuleSyntax || preferences.preferTypeOnlyAutoImports) && (defaultImport == null ? void 0 : defaultImport.addAsTypeOnly) !== 4 /* NotAllowed */ && !some(namedImports, (i) => i.addAsTypeOnly === 4 /* NotAllowed */);
       statements = combine(
         statements,
         makeImport(
           defaultImport && factory.createIdentifier(defaultImport.name),
           namedImports == null ? void 0 : namedImports.map(
-            ({ addAsTypeOnly, name }) => factory.createImportSpecifier(
-              !topLevelTypeOnly && addAsTypeOnly === 2 /* Required */,
+            (namedImport) => factory.createImportSpecifier(
+              !topLevelTypeOnly && shouldUseTypeOnly(namedImport, preferences),
               /*propertyName*/
               void 0,
-              factory.createIdentifier(name)
+              factory.createIdentifier(namedImport.name)
             )
           ),
           moduleSpecifier,
@@ -149607,14 +149615,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const declaration = namespaceLikeImport.importKind === 3 /* CommonJS */ ? factory.createImportEqualsDeclaration(
         /*modifiers*/
         void 0,
-        needsTypeOnly(namespaceLikeImport),
+        shouldUseTypeOnly(namespaceLikeImport, preferences),
         factory.createIdentifier(namespaceLikeImport.name),
         factory.createExternalModuleReference(quotedModuleSpecifier)
       ) : factory.createImportDeclaration(
         /*modifiers*/
         void 0,
         factory.createImportClause(
-          needsTypeOnly(namespaceLikeImport),
+          shouldUseTypeOnly(namespaceLikeImport, preferences),
           /*name*/
           void 0,
           factory.createNamespaceImport(factory.createIdentifier(namespaceLikeImport.name))

package/lib/typingsInstaller.js

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

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20231019",
+    "version": "5.3.0-dev.20231021",
     "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": "3c221fc086be52b19801f6e8d82596d04607ede6"
+    "gitHead": "8af8f3c4d1e5cc6654916de9f42e9ba370513157"
 }