typescript 5.3.0-dev.20230911 → 5.3.0-dev.20230913

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.20230911`;
+var version = `${versionMajorMinor}.0-dev.20230913`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3704,6 +3704,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ClassOrInterface"] = 3] = "ClassOrInterface";
   ObjectFlags3[ObjectFlags3["RequiresWidening"] = 196608] = "RequiresWidening";
   ObjectFlags3[ObjectFlags3["PropagatingFlags"] = 458752] = "PropagatingFlags";
+  ObjectFlags3[ObjectFlags3["InstantiatedMapped"] = 96] = "InstantiatedMapped";
   ObjectFlags3[ObjectFlags3["ObjectTypeKindMask"] = 1343] = "ObjectTypeKindMask";
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
@@ -36690,7 +36691,7 @@ function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, e
     return false;
   }
   for (const ext of extensionGroup) {
-    if (fileExtensionIs(file, ext)) {
+    if (fileExtensionIs(file, ext) && (ext !== ".ts" /* Ts */ || !fileExtensionIs(file, ".d.ts" /* Dts */))) {
       return false;
     }
     const higherPriorityPath = keyMapper(changeExtension(file, ext));
@@ -56265,8 +56266,7 @@ function createTypeChecker(host) {
     if (elementFlags.length === 1 && elementFlags[0] & 4 /* Rest */) {
       return readonly ? globalReadonlyArrayType : globalArrayType;
     }
-    const memberIds = mapDefined(namedMemberDeclarations, (node) => node ? getNodeId(node) : void 0);
-    const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (memberIds.length ? "," + memberIds.join(",") : "");
+    const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (some(namedMemberDeclarations, (node) => !!node) ? "," + map(namedMemberDeclarations, (node) => node ? getNodeId(node) : "_").join(",") : "");
     let type = tupleTypes.get(key);
     if (!type) {
       tupleTypes.set(key, type = createTupleTargetType(elementFlags, readonly, namedMemberDeclarations));
@@ -62406,8 +62406,13 @@ function createTypeChecker(host) {
       if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
-      if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
-        return type.symbol;
+      if (type.symbol) {
+        if (getObjectFlags(type) & 32 /* Mapped */) {
+          type = getMappedTargetWithSymbol(type);
+        }
+        if (!(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+          return type.symbol;
+        }
       }
       if (isTupleType(type)) {
         return type.target;
@@ -62427,6 +62432,13 @@ function createTypeChecker(host) {
     }
     return type;
   }
+  function getMappedTargetWithSymbol(type) {
+    let target = type;
+    while ((getObjectFlags(target) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && isMappedTypeWithKeyofConstraintDeclaration(target)) {
+      target = getModifiersTypeFromMappedType(target);
+    }
+    return target.symbol ? target : type;
+  }
   function isPropertyIdenticalTo(sourceProp, targetProp) {
     return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
   }
@@ -114456,7 +114468,8 @@ function isIgnoredFileFromWildCardWatching({
   currentDirectory,
   useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   writeLog,
-  toPath: toPath3
+  toPath: toPath3,
+  getScriptKind
 }) {
   const newPath = removeIgnoredPath(fileOrDirectoryPath);
   if (!newPath) {
@@ -114466,7 +114479,7 @@ function isIgnoredFileFromWildCardWatching({
   fileOrDirectoryPath = newPath;
   if (fileOrDirectoryPath === watchedDirPath)
     return false;
-  if (hasExtension(fileOrDirectoryPath) && !isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
+  if (hasExtension(fileOrDirectoryPath) && !(isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions) || isSupportedScriptKind())) {
     writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
     return true;
   }
@@ -114495,6 +114508,25 @@ function isIgnoredFileFromWildCardWatching({
   function hasSourceFile(file) {
     return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
   }
+  function isSupportedScriptKind() {
+    if (!getScriptKind)
+      return false;
+    const scriptKind = getScriptKind(fileOrDirectory);
+    switch (scriptKind) {
+      case 3 /* TS */:
+      case 4 /* TSX */:
+      case 7 /* Deferred */:
+      case 5 /* External */:
+        return true;
+      case 1 /* JS */:
+      case 2 /* JSX */:
+        return getAllowJSCompilerOption(options);
+      case 6 /* JSON */:
+        return getResolveJsonModule(options);
+      case 0 /* Unknown */:
+        return false;
+    }
+  }
 }
 function isBuilderProgram(program) {
   return !!program.getState;

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230911`;
+var version = `${versionMajorMinor}.0-dev.20230913`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6695,6 +6695,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ClassOrInterface"] = 3] = "ClassOrInterface";
   ObjectFlags3[ObjectFlags3["RequiresWidening"] = 196608] = "RequiresWidening";
   ObjectFlags3[ObjectFlags3["PropagatingFlags"] = 458752] = "PropagatingFlags";
+  ObjectFlags3[ObjectFlags3["InstantiatedMapped"] = 96] = "InstantiatedMapped";
   ObjectFlags3[ObjectFlags3["ObjectTypeKindMask"] = 1343] = "ObjectTypeKindMask";
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
@@ -41121,7 +41122,7 @@ function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, e
     return false;
   }
   for (const ext of extensionGroup) {
-    if (fileExtensionIs(file, ext)) {
+    if (fileExtensionIs(file, ext) && (ext !== ".ts" /* Ts */ || !fileExtensionIs(file, ".d.ts" /* Dts */))) {
       return false;
     }
     const higherPriorityPath = keyMapper(changeExtension(file, ext));
@@ -60967,8 +60968,7 @@ function createTypeChecker(host) {
     if (elementFlags.length === 1 && elementFlags[0] & 4 /* Rest */) {
       return readonly ? globalReadonlyArrayType : globalArrayType;
     }
-    const memberIds = mapDefined(namedMemberDeclarations, (node) => node ? getNodeId(node) : void 0);
-    const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (memberIds.length ? "," + memberIds.join(",") : "");
+    const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (some(namedMemberDeclarations, (node) => !!node) ? "," + map(namedMemberDeclarations, (node) => node ? getNodeId(node) : "_").join(",") : "");
     let type = tupleTypes.get(key);
     if (!type) {
       tupleTypes.set(key, type = createTupleTargetType(elementFlags, readonly, namedMemberDeclarations));
@@ -67108,8 +67108,13 @@ function createTypeChecker(host) {
       if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
-      if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
-        return type.symbol;
+      if (type.symbol) {
+        if (getObjectFlags(type) & 32 /* Mapped */) {
+          type = getMappedTargetWithSymbol(type);
+        }
+        if (!(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+          return type.symbol;
+        }
       }
       if (isTupleType(type)) {
         return type.target;
@@ -67129,6 +67134,13 @@ function createTypeChecker(host) {
     }
     return type;
   }
+  function getMappedTargetWithSymbol(type) {
+    let target = type;
+    while ((getObjectFlags(target) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && isMappedTypeWithKeyofConstraintDeclaration(target)) {
+      target = getModifiersTypeFromMappedType(target);
+    }
+    return target.symbol ? target : type;
+  }
   function isPropertyIdenticalTo(sourceProp, targetProp) {
     return compareProperties2(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
   }
@@ -119357,7 +119369,8 @@ function isIgnoredFileFromWildCardWatching({
   currentDirectory,
   useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   writeLog,
-  toPath: toPath3
+  toPath: toPath3,
+  getScriptKind: getScriptKind2
 }) {
   const newPath = removeIgnoredPath(fileOrDirectoryPath);
   if (!newPath) {
@@ -119367,7 +119380,7 @@ function isIgnoredFileFromWildCardWatching({
   fileOrDirectoryPath = newPath;
   if (fileOrDirectoryPath === watchedDirPath)
     return false;
-  if (hasExtension(fileOrDirectoryPath) && !isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
+  if (hasExtension(fileOrDirectoryPath) && !(isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions) || isSupportedScriptKind())) {
     writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
     return true;
   }
@@ -119396,6 +119409,25 @@ function isIgnoredFileFromWildCardWatching({
   function hasSourceFile(file) {
     return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
   }
+  function isSupportedScriptKind() {
+    if (!getScriptKind2)
+      return false;
+    const scriptKind = getScriptKind2(fileOrDirectory);
+    switch (scriptKind) {
+      case 3 /* TS */:
+      case 4 /* TSX */:
+      case 7 /* Deferred */:
+      case 5 /* External */:
+        return true;
+      case 1 /* JS */:
+      case 2 /* JSX */:
+        return getAllowJSCompilerOption(options);
+      case 6 /* JSON */:
+        return getResolveJsonModule(options);
+      case 0 /* Unknown */:
+        return false;
+    }
+  }
 }
 function isBuilderProgram(program) {
   return !!program.getState;
@@ -161154,10 +161186,10 @@ function getSupportedExtensionsForModuleResolution(compilerOptions, typeChecker)
   return moduleResolutionUsesNodeModules(moduleResolution) ? getSupportedExtensionsWithJsonIfResolveJsonModule(compilerOptions, extensions) : extensions;
 }
 function getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptDirectory, ignoreCase) {
-  rootDirs = rootDirs.map((rootDirectory) => normalizePath(isRootedDiskPath(rootDirectory) ? rootDirectory : combinePaths(basePath, rootDirectory)));
+  rootDirs = rootDirs.map((rootDirectory) => ensureTrailingDirectorySeparator(normalizePath(isRootedDiskPath(rootDirectory) ? rootDirectory : combinePaths(basePath, rootDirectory))));
   const relativeDirectory = firstDefined(rootDirs, (rootDirectory) => containsPath(rootDirectory, scriptDirectory, basePath, ignoreCase) ? scriptDirectory.substr(rootDirectory.length) : void 0);
   return deduplicate(
-    [...rootDirs.map((rootDirectory) => combinePaths(rootDirectory, relativeDirectory)), scriptDirectory],
+    [...rootDirs.map((rootDirectory) => combinePaths(rootDirectory, relativeDirectory)), scriptDirectory].map((baseDir) => removeTrailingDirectorySeparator(baseDir)),
     equateStringsCaseSensitive,
     compareStringsCaseSensitive
   );
@@ -169682,7 +169714,7 @@ function getAllRules() {
     // insert space after '?' only when it is used in conditional operator
     rule("SpaceAfterQuestionMarkInConditionalOperator", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isConditionalOperatorContext], 4 /* InsertSpace */),
     // in other cases there should be no space between '?' and next token
-    rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
+    rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isNonOptionalPropertyContext], 16 /* DeleteSpace */),
     rule("NoSpaceBeforeDot", anyToken, [25 /* DotToken */, 29 /* QuestionDotToken */], [isNonJsxSameLineTokenContext, isNotPropertyAccessOnIntegerLiteral], 16 /* DeleteSpace */),
     rule("NoSpaceAfterDot", [25 /* DotToken */, 29 /* QuestionDotToken */], anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
     rule("NoSpaceBetweenImportParenInImportType", 102 /* ImportKeyword */, 21 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 16 /* DeleteSpace */),
@@ -170027,6 +170059,12 @@ function isTypeAnnotationContext(context) {
   const contextKind = context.contextNode.kind;
   return contextKind === 172 /* PropertyDeclaration */ || contextKind === 171 /* PropertySignature */ || contextKind === 169 /* Parameter */ || contextKind === 260 /* VariableDeclaration */ || isFunctionLikeKind(contextKind);
 }
+function isOptionalPropertyContext(context) {
+  return isPropertyDeclaration(context.contextNode) && context.contextNode.questionToken;
+}
+function isNonOptionalPropertyContext(context) {
+  return !isOptionalPropertyContext(context);
+}
 function isConditionalOperatorContext(context) {
   return context.contextNode.kind === 227 /* ConditionalExpression */ || context.contextNode.kind === 194 /* ConditionalType */;
 }
@@ -176174,7 +176212,7 @@ var Project3 = class _Project {
     return scriptInfo;
   }
   getScriptKind(fileName) {
-    const info = this.getOrCreateScriptInfoAndAttachToProject(fileName);
+    const info = this.projectService.getScriptInfoForPath(this.toPath(fileName));
     return info && info.scriptKind;
   }
   getScriptVersion(filename) {
@@ -178991,7 +179029,8 @@ var _ProjectService = class _ProjectService {
           program: (configuredProjectForConfig == null ? void 0 : configuredProjectForConfig.getCurrentProgram()) || config.parsedCommandLine.fileNames,
           useCaseSensitiveFileNames: this.host.useCaseSensitiveFileNames,
           writeLog: (s) => this.logger.info(s),
-          toPath: (s) => this.toPath(s)
+          toPath: (s) => this.toPath(s),
+          getScriptKind: configuredProjectForConfig ? (fileName) => configuredProjectForConfig.getScriptKind(fileName) : void 0
         }))
           return;
         if (config.reloadLevel !== 2 /* Full */)

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20230911`;
+      version = `${versionMajorMinor}.0-dev.20230913`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4461,6 +4461,7 @@ ${lanes.join("\n")}
         ObjectFlags3[ObjectFlags3["ClassOrInterface"] = 3] = "ClassOrInterface";
         ObjectFlags3[ObjectFlags3["RequiresWidening"] = 196608] = "RequiresWidening";
         ObjectFlags3[ObjectFlags3["PropagatingFlags"] = 458752] = "PropagatingFlags";
+        ObjectFlags3[ObjectFlags3["InstantiatedMapped"] = 96] = "InstantiatedMapped";
         ObjectFlags3[ObjectFlags3["ObjectTypeKindMask"] = 1343] = "ObjectTypeKindMask";
         ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
         ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
@@ -37442,7 +37443,7 @@ ${lanes.join("\n")}
       return false;
     }
     for (const ext of extensionGroup) {
-      if (fileExtensionIs(file, ext)) {
+      if (fileExtensionIs(file, ext) && (ext !== ".ts" /* Ts */ || !fileExtensionIs(file, ".d.ts" /* Dts */))) {
         return false;
       }
       const higherPriorityPath = keyMapper(changeExtension(file, ext));
@@ -58734,8 +58735,7 @@ ${lanes.join("\n")}
       if (elementFlags.length === 1 && elementFlags[0] & 4 /* Rest */) {
         return readonly ? globalReadonlyArrayType : globalArrayType;
       }
-      const memberIds = mapDefined(namedMemberDeclarations, (node) => node ? getNodeId(node) : void 0);
-      const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (memberIds.length ? "," + memberIds.join(",") : "");
+      const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (some(namedMemberDeclarations, (node) => !!node) ? "," + map(namedMemberDeclarations, (node) => node ? getNodeId(node) : "_").join(",") : "");
       let type = tupleTypes.get(key);
       if (!type) {
         tupleTypes.set(key, type = createTupleTargetType(elementFlags, readonly, namedMemberDeclarations));
@@ -64875,8 +64875,13 @@ ${lanes.join("\n")}
         if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
           return type.node;
         }
-        if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
-          return type.symbol;
+        if (type.symbol) {
+          if (getObjectFlags(type) & 32 /* Mapped */) {
+            type = getMappedTargetWithSymbol(type);
+          }
+          if (!(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
+            return type.symbol;
+          }
         }
         if (isTupleType(type)) {
           return type.target;
@@ -64896,6 +64901,13 @@ ${lanes.join("\n")}
       }
       return type;
     }
+    function getMappedTargetWithSymbol(type) {
+      let target = type;
+      while ((getObjectFlags(target) & 96 /* InstantiatedMapped */) === 96 /* InstantiatedMapped */ && isMappedTypeWithKeyofConstraintDeclaration(target)) {
+        target = getModifiersTypeFromMappedType(target);
+      }
+      return target.symbol ? target : type;
+    }
     function isPropertyIdenticalTo(sourceProp, targetProp) {
       return compareProperties2(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
     }
@@ -117454,7 +117466,8 @@ ${lanes.join("\n")}
     currentDirectory,
     useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
     writeLog,
-    toPath: toPath3
+    toPath: toPath3,
+    getScriptKind: getScriptKind2
   }) {
     const newPath = removeIgnoredPath(fileOrDirectoryPath);
     if (!newPath) {
@@ -117464,7 +117477,7 @@ ${lanes.join("\n")}
     fileOrDirectoryPath = newPath;
     if (fileOrDirectoryPath === watchedDirPath)
       return false;
-    if (hasExtension(fileOrDirectoryPath) && !isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
+    if (hasExtension(fileOrDirectoryPath) && !(isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions) || isSupportedScriptKind())) {
       writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
       return true;
     }
@@ -117493,6 +117506,25 @@ ${lanes.join("\n")}
     function hasSourceFile(file) {
       return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
     }
+    function isSupportedScriptKind() {
+      if (!getScriptKind2)
+        return false;
+      const scriptKind = getScriptKind2(fileOrDirectory);
+      switch (scriptKind) {
+        case 3 /* TS */:
+        case 4 /* TSX */:
+        case 7 /* Deferred */:
+        case 5 /* External */:
+          return true;
+        case 1 /* JS */:
+        case 2 /* JSX */:
+          return getAllowJSCompilerOption(options);
+        case 6 /* JSON */:
+          return getResolveJsonModule(options);
+        case 0 /* Unknown */:
+          return false;
+      }
+    }
   }
   function isBuilderProgram(program) {
     return !!program.getState;
@@ -160430,10 +160462,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     return moduleResolutionUsesNodeModules(moduleResolution) ? getSupportedExtensionsWithJsonIfResolveJsonModule(compilerOptions, extensions) : extensions;
   }
   function getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptDirectory, ignoreCase) {
-    rootDirs = rootDirs.map((rootDirectory) => normalizePath(isRootedDiskPath(rootDirectory) ? rootDirectory : combinePaths(basePath, rootDirectory)));
+    rootDirs = rootDirs.map((rootDirectory) => ensureTrailingDirectorySeparator(normalizePath(isRootedDiskPath(rootDirectory) ? rootDirectory : combinePaths(basePath, rootDirectory))));
     const relativeDirectory = firstDefined(rootDirs, (rootDirectory) => containsPath(rootDirectory, scriptDirectory, basePath, ignoreCase) ? scriptDirectory.substr(rootDirectory.length) : void 0);
     return deduplicate(
-      [...rootDirs.map((rootDirectory) => combinePaths(rootDirectory, relativeDirectory)), scriptDirectory],
+      [...rootDirs.map((rootDirectory) => combinePaths(rootDirectory, relativeDirectory)), scriptDirectory].map((baseDir) => removeTrailingDirectorySeparator(baseDir)),
       equateStringsCaseSensitive,
       compareStringsCaseSensitive
     );
@@ -169154,7 +169186,7 @@ ${options.prefix}` : "\n" : options.prefix
       // insert space after '?' only when it is used in conditional operator
       rule("SpaceAfterQuestionMarkInConditionalOperator", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isConditionalOperatorContext], 4 /* InsertSpace */),
       // in other cases there should be no space between '?' and next token
-      rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
+      rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isNonOptionalPropertyContext], 16 /* DeleteSpace */),
       rule("NoSpaceBeforeDot", anyToken, [25 /* DotToken */, 29 /* QuestionDotToken */], [isNonJsxSameLineTokenContext, isNotPropertyAccessOnIntegerLiteral], 16 /* DeleteSpace */),
       rule("NoSpaceAfterDot", [25 /* DotToken */, 29 /* QuestionDotToken */], anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
       rule("NoSpaceBetweenImportParenInImportType", 102 /* ImportKeyword */, 21 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 16 /* DeleteSpace */),
@@ -169499,6 +169531,12 @@ ${options.prefix}` : "\n" : options.prefix
     const contextKind = context.contextNode.kind;
     return contextKind === 172 /* PropertyDeclaration */ || contextKind === 171 /* PropertySignature */ || contextKind === 169 /* Parameter */ || contextKind === 260 /* VariableDeclaration */ || isFunctionLikeKind(contextKind);
   }
+  function isOptionalPropertyContext(context) {
+    return isPropertyDeclaration(context.contextNode) && context.contextNode.questionToken;
+  }
+  function isNonOptionalPropertyContext(context) {
+    return !isOptionalPropertyContext(context);
+  }
   function isConditionalOperatorContext(context) {
     return context.contextNode.kind === 227 /* ConditionalExpression */ || context.contextNode.kind === 194 /* ConditionalType */;
   }
@@ -173516,7 +173554,7 @@ ${options.prefix}` : "\n" : options.prefix
           return scriptInfo;
         }
         getScriptKind(fileName) {
-          const info = this.getOrCreateScriptInfoAndAttachToProject(fileName);
+          const info = this.projectService.getScriptInfoForPath(this.toPath(fileName));
           return info && info.scriptKind;
         }
         getScriptVersion(filename) {
@@ -176337,7 +176375,8 @@ ${options.prefix}` : "\n" : options.prefix
                 program: (configuredProjectForConfig == null ? void 0 : configuredProjectForConfig.getCurrentProgram()) || config.parsedCommandLine.fileNames,
                 useCaseSensitiveFileNames: this.host.useCaseSensitiveFileNames,
                 writeLog: (s) => this.logger.info(s),
-                toPath: (s) => this.toPath(s)
+                toPath: (s) => this.toPath(s),
+                getScriptKind: configuredProjectForConfig ? (fileName) => configuredProjectForConfig.getScriptKind(fileName) : void 0
               }))
                 return;
               if (config.reloadLevel !== 2 /* Full */)

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.20230911`;
+var version = `${versionMajorMinor}.0-dev.20230913`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3138,6 +3138,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ClassOrInterface"] = 3] = "ClassOrInterface";
   ObjectFlags3[ObjectFlags3["RequiresWidening"] = 196608] = "RequiresWidening";
   ObjectFlags3[ObjectFlags3["PropagatingFlags"] = 458752] = "PropagatingFlags";
+  ObjectFlags3[ObjectFlags3["InstantiatedMapped"] = 96] = "InstantiatedMapped";
   ObjectFlags3[ObjectFlags3["ObjectTypeKindMask"] = 1343] = "ObjectTypeKindMask";
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20230911",
+    "version": "5.3.0-dev.20230913",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -59,7 +59,7 @@
         "chalk": "^4.1.2",
         "chokidar": "^3.5.3",
         "diff": "^5.1.0",
-        "dprint": "^0.40.2",
+        "dprint": "^0.41.0",
         "esbuild": "^0.19.0",
         "eslint": "^8.22.0",
         "eslint-formatter-autolinkable-stylish": "^1.2.0",
@@ -112,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "fdb2531c0b188937c057786c276f7b12e89ab48e"
+    "gitHead": "3ade5022d7f287fdaf61c9e6deed32a3ffb60bc4"
 }