typescript 5.5.0-dev.20240416 → 5.5.0-dev.20240418

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240416`;
+var version = `${versionMajorMinor}.0-dev.20240418`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -9175,11 +9175,6 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       }
       const ch = codePointAt(text, pos);
       if (pos === 0) {
-        if (text.slice(0, 256).includes("\uFFFD")) {
-          error(Diagnostics.File_appears_to_be_binary);
-          pos = end;
-          return token = 8 /* NonTextFileMarkerTrivia */;
-        }
         if (ch === 35 /* hash */ && isShebangTrivia(text, pos)) {
           pos = scanShebangTrivia(text, pos);
           if (skipTrivia2) {
@@ -9603,6 +9598,10 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             error(Diagnostics.Invalid_character, pos++, charSize(ch));
           }
           return token = 81 /* PrivateIdentifier */;
+        case 65533 /* replacementCharacter */:
+          error(Diagnostics.File_appears_to_be_binary, 0, 0);
+          pos = end;
+          return token = 8 /* NonTextFileMarkerTrivia */;
         default:
           const identifierKind = scanIdentifier(ch, languageVersion);
           if (identifierKind) {
@@ -34483,6 +34482,7 @@ var optionsForWatch = [
       isFilePath: true,
       extraValidation: specToDiagnostic
     },
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Watch_and_Build_Modes,
     description: Diagnostics.Remove_a_list_of_directories_from_the_watch_process
   },
@@ -34495,6 +34495,7 @@ var optionsForWatch = [
       isFilePath: true,
       extraValidation: specToDiagnostic
     },
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Watch_and_Build_Modes,
     description: Diagnostics.Remove_a_list_of_files_from_the_watch_mode_s_processing
   }
@@ -35193,6 +35194,7 @@ var commandOptionsWithoutBuild = [
     name: "paths",
     type: "object",
     affectsModuleResolution: true,
+    allowConfigDirTemplateSubstitution: true,
     isTSConfigOnly: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Specify_a_set_of_entries_that_re_map_imports_to_additional_lookup_locations,
@@ -35210,6 +35212,7 @@ var commandOptionsWithoutBuild = [
       isFilePath: true
     },
     affectsModuleResolution: true,
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Allow_multiple_folders_to_be_treated_as_one_when_resolving_modules,
     transpileOptionValue: void 0,
@@ -35224,6 +35227,7 @@ var commandOptionsWithoutBuild = [
       isFilePath: true
     },
     affectsModuleResolution: true,
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Specify_multiple_folders_that_act_like_Slashnode_modules_Slash_types
   },
@@ -35738,6 +35742,12 @@ var moduleResolutionOptionDeclarations = optionDeclarations.filter((option) => !
 var sourceFileAffectingCompilerOptions = optionDeclarations.filter((option) => !!option.affectsSourceFile || !!option.affectsBindDiagnostics);
 var optionsAffectingProgramStructure = optionDeclarations.filter((option) => !!option.affectsProgramStructure);
 var transpileOptionValueCompilerOptions = optionDeclarations.filter((option) => hasProperty(option, "transpileOptionValue"));
+var configDirTemplateSubstitutionOptions = optionDeclarations.filter(
+  (option) => option.allowConfigDirTemplateSubstitution || !option.isCommandLineOnly && option.isFilePath
+);
+var configDirTemplateSubstitutionWatchOptions = optionsForWatch.filter(
+  (option) => option.allowConfigDirTemplateSubstitution || !option.isCommandLineOnly && option.isFilePath
+);
 var optionsForBuild = [
   {
     name: "verbose",
@@ -36521,6 +36531,8 @@ function serializeOptionBaseObject(options, { optionsNameMap }, pathOptions) {
         if (!customTypeMap) {
           if (pathOptions && optionDefinition.isFilePath) {
             result.set(name, getRelativePathFromFile(pathOptions.configFilePath, getNormalizedAbsolutePath(value, getDirectoryPath(pathOptions.configFilePath)), getCanonicalFileName));
+          } else if (pathOptions && optionDefinition.type === "list" && optionDefinition.element.isFilePath) {
+            result.set(name, value.map((v) => getRelativePathFromFile(pathOptions.configFilePath, getNormalizedAbsolutePath(v, getDirectoryPath(pathOptions.configFilePath)), getCanonicalFileName)));
           } else {
             result.set(name, value);
           }
@@ -36705,14 +36717,21 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
   const errors = [];
   const parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
   const { raw } = parsedConfig;
-  const options = extend(existingOptions, parsedConfig.options || {});
-  const watchOptions = existingWatchOptions && parsedConfig.watchOptions ? extend(existingWatchOptions, parsedConfig.watchOptions) : parsedConfig.watchOptions || existingWatchOptions;
+  const options = handleOptionConfigDirTemplateSubstitution(
+    extend(existingOptions, parsedConfig.options || {}),
+    configDirTemplateSubstitutionOptions,
+    basePath
+  );
+  const watchOptions = handleWatchOptionsConfigDirTemplateSubstitution(
+    existingWatchOptions && parsedConfig.watchOptions ? extend(existingWatchOptions, parsedConfig.watchOptions) : parsedConfig.watchOptions || existingWatchOptions,
+    basePath
+  );
   options.configFilePath = configFileName && normalizeSlashes(configFileName);
+  const basePathForFileNames = normalizePath(configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath);
   const configFileSpecs = getConfigFileSpecs();
   if (sourceFile)
     sourceFile.configFileSpecs = configFileSpecs;
   setConfigFileInOptions(options, sourceFile);
-  const basePathForFileNames = normalizePath(configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath);
   return {
     options,
     watchOptions,
@@ -36761,9 +36780,10 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
       includeSpecs = [defaultIncludeSpec];
       isDefaultIncludeSpec = true;
     }
+    let validatedIncludeSpecsBeforeSubstitution, validatedExcludeSpecsBeforeSubstitution;
     let validatedIncludeSpecs, validatedExcludeSpecs;
     if (includeSpecs) {
-      validatedIncludeSpecs = validateSpecs(
+      validatedIncludeSpecsBeforeSubstitution = validateSpecs(
         includeSpecs,
         errors,
         /*disallowTrailingRecursion*/
@@ -36771,9 +36791,13 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
         sourceFile,
         "include"
       );
+      validatedIncludeSpecs = getSubstitutedStringArrayWithConfigDirTemplate(
+        validatedIncludeSpecsBeforeSubstitution,
+        basePathForFileNames
+      ) || validatedIncludeSpecsBeforeSubstitution;
     }
     if (excludeSpecs) {
-      validatedExcludeSpecs = validateSpecs(
+      validatedExcludeSpecsBeforeSubstitution = validateSpecs(
         excludeSpecs,
         errors,
         /*disallowTrailingRecursion*/
@@ -36781,14 +36805,26 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
         sourceFile,
         "exclude"
       );
+      validatedExcludeSpecs = getSubstitutedStringArrayWithConfigDirTemplate(
+        validatedExcludeSpecsBeforeSubstitution,
+        basePathForFileNames
+      ) || validatedExcludeSpecsBeforeSubstitution;
     }
+    const validatedFilesSpecBeforeSubstitution = filter(filesSpecs, isString);
+    const validatedFilesSpec = getSubstitutedStringArrayWithConfigDirTemplate(
+      validatedFilesSpecBeforeSubstitution,
+      basePathForFileNames
+    ) || validatedFilesSpecBeforeSubstitution;
     return {
       filesSpecs,
       includeSpecs,
       excludeSpecs,
-      validatedFilesSpec: filter(filesSpecs, isString),
+      validatedFilesSpec,
       validatedIncludeSpecs,
       validatedExcludeSpecs,
+      validatedFilesSpecBeforeSubstitution,
+      validatedIncludeSpecsBeforeSubstitution,
+      validatedExcludeSpecsBeforeSubstitution,
       pathPatterns: void 0,
       // Initialized on first use
       isDefaultIncludeSpec
@@ -36847,6 +36883,81 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
     }
   }
 }
+function handleWatchOptionsConfigDirTemplateSubstitution(watchOptions, basePath) {
+  return handleOptionConfigDirTemplateSubstitution(watchOptions, configDirTemplateSubstitutionWatchOptions, basePath);
+}
+function handleOptionConfigDirTemplateSubstitution(options, optionDeclarations2, basePath) {
+  if (!options)
+    return options;
+  let result;
+  for (const option of optionDeclarations2) {
+    if (options[option.name] !== void 0) {
+      const value = options[option.name];
+      switch (option.type) {
+        case "string":
+          Debug.assert(option.isFilePath);
+          if (startsWithConfigDirTemplate(value)) {
+            setOptionValue(option, getSubstitutedPathWithConfigDirTemplate(value, basePath));
+          }
+          break;
+        case "list":
+          Debug.assert(option.element.isFilePath);
+          const listResult = getSubstitutedStringArrayWithConfigDirTemplate(value, basePath);
+          if (listResult)
+            setOptionValue(option, listResult);
+          break;
+        case "object":
+          Debug.assert(option.name === "paths");
+          const objectResult = getSubstitutedMapLikeOfStringArrayWithConfigDirTemplate(value, basePath);
+          if (objectResult)
+            setOptionValue(option, objectResult);
+          break;
+        default:
+          Debug.fail("option type not supported");
+      }
+    }
+  }
+  return result || options;
+  function setOptionValue(option, value) {
+    (result ?? (result = assign({}, options)))[option.name] = value;
+  }
+}
+var configDirTemplate = `\${configDir}`;
+function startsWithConfigDirTemplate(value) {
+  return isString(value) && startsWith(
+    value,
+    configDirTemplate,
+    /*ignoreCase*/
+    true
+  );
+}
+function getSubstitutedPathWithConfigDirTemplate(value, basePath) {
+  return getNormalizedAbsolutePath(value.replace(configDirTemplate, "./"), basePath);
+}
+function getSubstitutedStringArrayWithConfigDirTemplate(list, basePath) {
+  if (!list)
+    return list;
+  let result;
+  list.forEach((element, index) => {
+    if (!startsWithConfigDirTemplate(element))
+      return;
+    (result ?? (result = list.slice()))[index] = getSubstitutedPathWithConfigDirTemplate(element, basePath);
+  });
+  return result;
+}
+function getSubstitutedMapLikeOfStringArrayWithConfigDirTemplate(mapLike, basePath) {
+  let result;
+  const ownKeys = getOwnKeys(mapLike);
+  ownKeys.forEach((key) => {
+    if (!isArray(mapLike[key]))
+      return;
+    const subStitution = getSubstitutedStringArrayWithConfigDirTemplate(mapLike[key], basePath);
+    if (!subStitution)
+      return;
+    (result ?? (result = assign({}, mapLike)))[key] = subStitution;
+  });
+  return result;
+}
 function isErrorNoInputFiles(error) {
   return error.code === Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2.code;
 }
@@ -36896,11 +37007,11 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
     } else {
       ownConfig.extendedConfigPath.forEach((extendedConfigPath) => applyExtendedConfig(result, extendedConfigPath));
     }
-    if (!ownConfig.raw.include && result.include)
+    if (result.include)
       ownConfig.raw.include = result.include;
-    if (!ownConfig.raw.exclude && result.exclude)
+    if (result.exclude)
       ownConfig.raw.exclude = result.exclude;
-    if (!ownConfig.raw.files && result.files)
+    if (result.files)
       ownConfig.raw.files = result.files;
     if (ownConfig.raw.compileOnSave === void 0 && result.compileOnSave)
       ownConfig.raw.compileOnSave = result.compileOnSave;
@@ -36916,8 +37027,10 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
       const extendsRaw = extendedConfig.raw;
       let relativeDifference;
       const setPropertyInResultIfNotUndefined = (propertyName) => {
+        if (ownConfig.raw[propertyName])
+          return;
         if (extendsRaw[propertyName]) {
-          result[propertyName] = map(extendsRaw[propertyName], (path) => isRootedDiskPath(path) ? path : combinePaths(
+          result[propertyName] = map(extendsRaw[propertyName], (path) => startsWithConfigDirTemplate(path) || isRootedDiskPath(path) ? path : combinePaths(
             relativeDifference || (relativeDifference = convertToRelativePath(getDirectoryPath(extendedConfigPath), basePath, createGetCanonicalFileName(host.useCaseSensitiveFileNames))),
             path
           ));
@@ -37185,7 +37298,8 @@ function convertJsonOption(opt, value, basePath, errors, propertyAssignment, val
 }
 function normalizeNonListOptionValue(option, basePath, value) {
   if (option.isFilePath) {
-    value = getNormalizedAbsolutePath(value, basePath);
+    value = normalizeSlashes(value);
+    value = !startsWithConfigDirTemplate(value) ? getNormalizedAbsolutePath(value, basePath) : value;
     if (value === "") {
       value = ".";
     }
@@ -44909,7 +45023,6 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
-  var homomorphicMappedTypeInferenceStack = [];
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -45010,6 +45123,9 @@ function createTypeChecker(host) {
   var potentialReflectCollisions = [];
   var potentialUnusedRenamedBindingElementsInTypes = [];
   var awaitedTypeStack = [];
+  var reverseMappedSourceStack = [];
+  var reverseMappedTargetStack = [];
+  var reverseExpandingFlags = 0 /* None */;
   var diagnostics = createDiagnosticCollection();
   var suggestionDiagnostics = createDiagnosticCollection();
   var typeofType = createTypeofType();
@@ -53093,7 +53209,7 @@ function createTypeChecker(host) {
           result.aliasTypeArguments = length(args) ? args : void 0;
         }
       }
-      result.objectFlags |= getObjectFlags(type) & 4096 /* JSLiteral */;
+      result.objectFlags |= getPropagatingFlagsOfTypes([type]) | getObjectFlags(type) & (4096 /* JSLiteral */ | 16384 /* ArrayLiteral */ | 128 /* ObjectLiteral */);
       if (result.symbol && result.symbol.flags & 32 /* Class */ && type === getDeclaredTypeOfClassOrInterface(result.symbol)) {
         result.objectFlags |= 16777216 /* IsClassInstanceClone */;
       }
@@ -55039,7 +55155,7 @@ function createTypeChecker(host) {
     const modifiers = getMappedTypeModifiers(type.mappedType);
     const readonlyMask = modifiers & 1 /* IncludeReadonly */ ? false : true;
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
-    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
+    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType) || unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
     const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
@@ -64859,13 +64975,7 @@ function createTypeChecker(host) {
     if (reverseMappedCache.has(cacheKey)) {
       return reverseMappedCache.get(cacheKey);
     }
-    const recursionKey = source.id + "," + (target.target || target).id;
-    if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
-      return void 0;
-    }
-    homomorphicMappedTypeInferenceStack.push(recursionKey);
     const type = createReverseMappedType(source, target, constraint);
-    homomorphicMappedTypeInferenceStack.pop();
     reverseMappedCache.set(cacheKey, type);
     return type;
   }
@@ -64877,10 +64987,17 @@ function createTypeChecker(host) {
       return void 0;
     }
     if (isArrayType(source)) {
-      return createArrayType(inferReverseMappedType(getTypeArguments(source)[0], target, constraint), isReadonlyArrayType(source));
+      const elementType = inferReverseMappedType(getTypeArguments(source)[0], target, constraint);
+      if (!elementType) {
+        return void 0;
+      }
+      return createArrayType(elementType, isReadonlyArrayType(source));
     }
     if (isTupleType(source)) {
       const elementTypes = map(getElementTypes(source), (t) => inferReverseMappedType(t, target, constraint));
+      if (!every(elementTypes, (t) => !!t)) {
+        return void 0;
+      }
       const elementFlags = getMappedTypeModifiers(target) & 4 /* IncludeOptional */ ? sameMap(source.target.elementFlags, (f) => f & 2 /* Optional */ ? 1 /* Required */ : f) : source.target.elementFlags;
       return createTupleType(elementTypes, elementFlags, source.target.readonly, source.target.labeledElementDeclarations);
     }
@@ -64897,17 +65014,39 @@ function createTypeChecker(host) {
   function getTypeOfReverseMappedSymbol(symbol) {
     const links = getSymbolLinks(symbol);
     if (!links.type) {
-      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType);
+      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType) || unknownType;
     }
     return links.type;
   }
-  function inferReverseMappedType(sourceType, target, constraint) {
+  function inferReverseMappedTypeWorker(sourceType, target, constraint) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
     inferTypes([inference], sourceType, templateType);
     return getTypeFromInference(inference) || unknownType;
   }
+  function inferReverseMappedType(source, target, constraint) {
+    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+    if (reverseMappedCache.has(cacheKey)) {
+      return reverseMappedCache.get(cacheKey) || unknownType;
+    }
+    reverseMappedSourceStack.push(source);
+    reverseMappedTargetStack.push(target);
+    const saveExpandingFlags = reverseExpandingFlags;
+    if (isDeeplyNestedType(source, reverseMappedSourceStack, reverseMappedSourceStack.length, 2))
+      reverseExpandingFlags |= 1 /* Source */;
+    if (isDeeplyNestedType(target, reverseMappedTargetStack, reverseMappedTargetStack.length, 2))
+      reverseExpandingFlags |= 2 /* Target */;
+    let type;
+    if (reverseExpandingFlags !== 3 /* Both */) {
+      type = inferReverseMappedTypeWorker(source, target, constraint);
+    }
+    reverseMappedSourceStack.pop();
+    reverseMappedTargetStack.pop();
+    reverseExpandingFlags = saveExpandingFlags;
+    reverseMappedCache.set(cacheKey, type);
+    return type;
+  }
   function* getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
     const properties = getPropertiesOfType(target);
     for (const targetProp of properties) {
@@ -123525,7 +123664,8 @@ function getMatchedFileSpec(program, fileName) {
     return void 0;
   const filePath = program.getCanonicalFileName(fileName);
   const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-  return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+  const index = findIndex(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+  return index !== -1 ? configFile.configFileSpecs.validatedFilesSpecBeforeSubstitution[index] : void 0;
 }
 function getMatchedIncludeSpec(program, fileName) {
   var _a, _b;
@@ -123537,12 +123677,13 @@ function getMatchedIncludeSpec(program, fileName) {
   const isJsonFile = fileExtensionIs(fileName, ".json" /* Json */);
   const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
   const useCaseSensitiveFileNames2 = program.useCaseSensitiveFileNames();
-  return find((_b = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _b.validatedIncludeSpecs, (includeSpec) => {
+  const index = findIndex((_b = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _b.validatedIncludeSpecs, (includeSpec) => {
     if (isJsonFile && !endsWith(includeSpec, ".json" /* Json */))
       return false;
     const pattern = getPatternFromSpec(includeSpec, basePath, "files");
     return !!pattern && getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames2).test(fileName);
   });
+  return index !== -1 ? configFile.configFileSpecs.validatedIncludeSpecsBeforeSubstitution[index] : void 0;
 }
 function fileIncludeReasonToDiagnostics(program, reason, fileNameConvertor) {
   var _a, _b;

package/lib/typescript.d.ts

@@ -4378,12 +4378,6 @@ declare namespace ts {
     interface Identifier {
         readonly text: string;
     }
-    interface Identifier {
-        /** @deprecated Use `idKeyword(identifier)` instead. */
-        readonly originalKeywordKind?: SyntaxKind;
-        /** @deprecated Use `.parent` or the surrounding context to determine this instead. */
-        readonly isInJSDocNamespace?: boolean;
-    }
     interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
     }

package/lib/typescript.js

@@ -339,6 +339,8 @@ __export(typescript_exports, {
   computedOptions: () => computedOptions,
   concatenate: () => concatenate,
   concatenateDiagnosticMessageChains: () => concatenateDiagnosticMessageChains,
+  configDirTemplateSubstitutionOptions: () => configDirTemplateSubstitutionOptions,
+  configDirTemplateSubstitutionWatchOptions: () => configDirTemplateSubstitutionWatchOptions,
   consumesNodeCoreModules: () => consumesNodeCoreModules,
   contains: () => contains,
   containsIgnoredPath: () => containsIgnoredPath,
@@ -1109,6 +1111,7 @@ __export(typescript_exports, {
   groupBy: () => groupBy,
   guessIndentation: () => guessIndentation,
   handleNoEmitOptions: () => handleNoEmitOptions,
+  handleWatchOptionsConfigDirTemplateSubstitution: () => handleWatchOptionsConfigDirTemplateSubstitution,
   hasAbstractModifier: () => hasAbstractModifier,
   hasAccessorModifier: () => hasAccessorModifier,
   hasAmbientModifier: () => hasAmbientModifier,
@@ -2347,7 +2350,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240416`;
+var version = `${versionMajorMinor}.0-dev.20240418`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7009,6 +7012,7 @@ var CharacterCodes = /* @__PURE__ */ ((CharacterCodes2) => {
   CharacterCodes2[CharacterCodes2["ideographicSpace"] = 12288] = "ideographicSpace";
   CharacterCodes2[CharacterCodes2["mathematicalSpace"] = 8287] = "mathematicalSpace";
   CharacterCodes2[CharacterCodes2["ogham"] = 5760] = "ogham";
+  CharacterCodes2[CharacterCodes2["replacementCharacter"] = 65533] = "replacementCharacter";
   CharacterCodes2[CharacterCodes2["_"] = 95] = "_";
   CharacterCodes2[CharacterCodes2["$"] = 36] = "$";
   CharacterCodes2[CharacterCodes2["_0"] = 48] = "_0";
@@ -12773,11 +12777,6 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       }
       const ch = codePointAt(text, pos);
       if (pos === 0) {
-        if (text.slice(0, 256).includes("\uFFFD")) {
-          error2(Diagnostics.File_appears_to_be_binary);
-          pos = end;
-          return token = 8 /* NonTextFileMarkerTrivia */;
-        }
         if (ch === 35 /* hash */ && isShebangTrivia(text, pos)) {
           pos = scanShebangTrivia(text, pos);
           if (skipTrivia2) {
@@ -13201,6 +13200,10 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             error2(Diagnostics.Invalid_character, pos++, charSize(ch));
           }
           return token = 81 /* PrivateIdentifier */;
+        case 65533 /* replacementCharacter */:
+          error2(Diagnostics.File_appears_to_be_binary, 0, 0);
+          pos = end;
+          return token = 8 /* NonTextFileMarkerTrivia */;
         default:
           const identifierKind = scanIdentifier(ch, languageVersion);
           if (identifierKind) {
@@ -38925,6 +38928,7 @@ var optionsForWatch = [
       isFilePath: true,
       extraValidation: specToDiagnostic
     },
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Watch_and_Build_Modes,
     description: Diagnostics.Remove_a_list_of_directories_from_the_watch_process
   },
@@ -38937,6 +38941,7 @@ var optionsForWatch = [
       isFilePath: true,
       extraValidation: specToDiagnostic
     },
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Watch_and_Build_Modes,
     description: Diagnostics.Remove_a_list_of_files_from_the_watch_mode_s_processing
   }
@@ -39635,6 +39640,7 @@ var commandOptionsWithoutBuild = [
     name: "paths",
     type: "object",
     affectsModuleResolution: true,
+    allowConfigDirTemplateSubstitution: true,
     isTSConfigOnly: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Specify_a_set_of_entries_that_re_map_imports_to_additional_lookup_locations,
@@ -39652,6 +39658,7 @@ var commandOptionsWithoutBuild = [
       isFilePath: true
     },
     affectsModuleResolution: true,
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Allow_multiple_folders_to_be_treated_as_one_when_resolving_modules,
     transpileOptionValue: void 0,
@@ -39666,6 +39673,7 @@ var commandOptionsWithoutBuild = [
       isFilePath: true
     },
     affectsModuleResolution: true,
+    allowConfigDirTemplateSubstitution: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Specify_multiple_folders_that_act_like_Slashnode_modules_Slash_types
   },
@@ -40180,6 +40188,12 @@ var moduleResolutionOptionDeclarations = optionDeclarations.filter((option) => !
 var sourceFileAffectingCompilerOptions = optionDeclarations.filter((option) => !!option.affectsSourceFile || !!option.affectsBindDiagnostics);
 var optionsAffectingProgramStructure = optionDeclarations.filter((option) => !!option.affectsProgramStructure);
 var transpileOptionValueCompilerOptions = optionDeclarations.filter((option) => hasProperty(option, "transpileOptionValue"));
+var configDirTemplateSubstitutionOptions = optionDeclarations.filter(
+  (option) => option.allowConfigDirTemplateSubstitution || !option.isCommandLineOnly && option.isFilePath
+);
+var configDirTemplateSubstitutionWatchOptions = optionsForWatch.filter(
+  (option) => option.allowConfigDirTemplateSubstitution || !option.isCommandLineOnly && option.isFilePath
+);
 var optionsForBuild = [
   {
     name: "verbose",
@@ -40973,6 +40987,8 @@ function serializeOptionBaseObject(options, { optionsNameMap }, pathOptions) {
         if (!customTypeMap) {
           if (pathOptions && optionDefinition.isFilePath) {
             result.set(name, getRelativePathFromFile(pathOptions.configFilePath, getNormalizedAbsolutePath(value, getDirectoryPath(pathOptions.configFilePath)), getCanonicalFileName));
+          } else if (pathOptions && optionDefinition.type === "list" && optionDefinition.element.isFilePath) {
+            result.set(name, value.map((v) => getRelativePathFromFile(pathOptions.configFilePath, getNormalizedAbsolutePath(v, getDirectoryPath(pathOptions.configFilePath)), getCanonicalFileName)));
           } else {
             result.set(name, value);
           }
@@ -41172,14 +41188,21 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
   const errors = [];
   const parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
   const { raw } = parsedConfig;
-  const options = extend(existingOptions, parsedConfig.options || {});
-  const watchOptions = existingWatchOptions && parsedConfig.watchOptions ? extend(existingWatchOptions, parsedConfig.watchOptions) : parsedConfig.watchOptions || existingWatchOptions;
+  const options = handleOptionConfigDirTemplateSubstitution(
+    extend(existingOptions, parsedConfig.options || {}),
+    configDirTemplateSubstitutionOptions,
+    basePath
+  );
+  const watchOptions = handleWatchOptionsConfigDirTemplateSubstitution(
+    existingWatchOptions && parsedConfig.watchOptions ? extend(existingWatchOptions, parsedConfig.watchOptions) : parsedConfig.watchOptions || existingWatchOptions,
+    basePath
+  );
   options.configFilePath = configFileName && normalizeSlashes(configFileName);
+  const basePathForFileNames = normalizePath(configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath);
   const configFileSpecs = getConfigFileSpecs();
   if (sourceFile)
     sourceFile.configFileSpecs = configFileSpecs;
   setConfigFileInOptions(options, sourceFile);
-  const basePathForFileNames = normalizePath(configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath);
   return {
     options,
     watchOptions,
@@ -41228,9 +41251,10 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
       includeSpecs = [defaultIncludeSpec];
       isDefaultIncludeSpec = true;
     }
+    let validatedIncludeSpecsBeforeSubstitution, validatedExcludeSpecsBeforeSubstitution;
     let validatedIncludeSpecs, validatedExcludeSpecs;
     if (includeSpecs) {
-      validatedIncludeSpecs = validateSpecs(
+      validatedIncludeSpecsBeforeSubstitution = validateSpecs(
         includeSpecs,
         errors,
         /*disallowTrailingRecursion*/
@@ -41238,9 +41262,13 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
         sourceFile,
         "include"
       );
+      validatedIncludeSpecs = getSubstitutedStringArrayWithConfigDirTemplate(
+        validatedIncludeSpecsBeforeSubstitution,
+        basePathForFileNames
+      ) || validatedIncludeSpecsBeforeSubstitution;
     }
     if (excludeSpecs) {
-      validatedExcludeSpecs = validateSpecs(
+      validatedExcludeSpecsBeforeSubstitution = validateSpecs(
         excludeSpecs,
         errors,
         /*disallowTrailingRecursion*/
@@ -41248,14 +41276,26 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
         sourceFile,
         "exclude"
       );
+      validatedExcludeSpecs = getSubstitutedStringArrayWithConfigDirTemplate(
+        validatedExcludeSpecsBeforeSubstitution,
+        basePathForFileNames
+      ) || validatedExcludeSpecsBeforeSubstitution;
     }
+    const validatedFilesSpecBeforeSubstitution = filter(filesSpecs, isString);
+    const validatedFilesSpec = getSubstitutedStringArrayWithConfigDirTemplate(
+      validatedFilesSpecBeforeSubstitution,
+      basePathForFileNames
+    ) || validatedFilesSpecBeforeSubstitution;
     return {
       filesSpecs,
       includeSpecs,
       excludeSpecs,
-      validatedFilesSpec: filter(filesSpecs, isString),
+      validatedFilesSpec,
       validatedIncludeSpecs,
       validatedExcludeSpecs,
+      validatedFilesSpecBeforeSubstitution,
+      validatedIncludeSpecsBeforeSubstitution,
+      validatedExcludeSpecsBeforeSubstitution,
       pathPatterns: void 0,
       // Initialized on first use
       isDefaultIncludeSpec
@@ -41314,6 +41354,81 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
     }
   }
 }
+function handleWatchOptionsConfigDirTemplateSubstitution(watchOptions, basePath) {
+  return handleOptionConfigDirTemplateSubstitution(watchOptions, configDirTemplateSubstitutionWatchOptions, basePath);
+}
+function handleOptionConfigDirTemplateSubstitution(options, optionDeclarations2, basePath) {
+  if (!options)
+    return options;
+  let result;
+  for (const option of optionDeclarations2) {
+    if (options[option.name] !== void 0) {
+      const value = options[option.name];
+      switch (option.type) {
+        case "string":
+          Debug.assert(option.isFilePath);
+          if (startsWithConfigDirTemplate(value)) {
+            setOptionValue(option, getSubstitutedPathWithConfigDirTemplate(value, basePath));
+          }
+          break;
+        case "list":
+          Debug.assert(option.element.isFilePath);
+          const listResult = getSubstitutedStringArrayWithConfigDirTemplate(value, basePath);
+          if (listResult)
+            setOptionValue(option, listResult);
+          break;
+        case "object":
+          Debug.assert(option.name === "paths");
+          const objectResult = getSubstitutedMapLikeOfStringArrayWithConfigDirTemplate(value, basePath);
+          if (objectResult)
+            setOptionValue(option, objectResult);
+          break;
+        default:
+          Debug.fail("option type not supported");
+      }
+    }
+  }
+  return result || options;
+  function setOptionValue(option, value) {
+    (result ?? (result = assign({}, options)))[option.name] = value;
+  }
+}
+var configDirTemplate = `\${configDir}`;
+function startsWithConfigDirTemplate(value) {
+  return isString(value) && startsWith(
+    value,
+    configDirTemplate,
+    /*ignoreCase*/
+    true
+  );
+}
+function getSubstitutedPathWithConfigDirTemplate(value, basePath) {
+  return getNormalizedAbsolutePath(value.replace(configDirTemplate, "./"), basePath);
+}
+function getSubstitutedStringArrayWithConfigDirTemplate(list, basePath) {
+  if (!list)
+    return list;
+  let result;
+  list.forEach((element, index) => {
+    if (!startsWithConfigDirTemplate(element))
+      return;
+    (result ?? (result = list.slice()))[index] = getSubstitutedPathWithConfigDirTemplate(element, basePath);
+  });
+  return result;
+}
+function getSubstitutedMapLikeOfStringArrayWithConfigDirTemplate(mapLike, basePath) {
+  let result;
+  const ownKeys = getOwnKeys(mapLike);
+  ownKeys.forEach((key) => {
+    if (!isArray(mapLike[key]))
+      return;
+    const subStitution = getSubstitutedStringArrayWithConfigDirTemplate(mapLike[key], basePath);
+    if (!subStitution)
+      return;
+    (result ?? (result = assign({}, mapLike)))[key] = subStitution;
+  });
+  return result;
+}
 function isErrorNoInputFiles(error2) {
   return error2.code === Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2.code;
 }
@@ -41363,11 +41478,11 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
     } else {
       ownConfig.extendedConfigPath.forEach((extendedConfigPath) => applyExtendedConfig(result, extendedConfigPath));
     }
-    if (!ownConfig.raw.include && result.include)
+    if (result.include)
       ownConfig.raw.include = result.include;
-    if (!ownConfig.raw.exclude && result.exclude)
+    if (result.exclude)
       ownConfig.raw.exclude = result.exclude;
-    if (!ownConfig.raw.files && result.files)
+    if (result.files)
       ownConfig.raw.files = result.files;
     if (ownConfig.raw.compileOnSave === void 0 && result.compileOnSave)
       ownConfig.raw.compileOnSave = result.compileOnSave;
@@ -41383,8 +41498,10 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
       const extendsRaw = extendedConfig.raw;
       let relativeDifference;
       const setPropertyInResultIfNotUndefined = (propertyName) => {
+        if (ownConfig.raw[propertyName])
+          return;
         if (extendsRaw[propertyName]) {
-          result[propertyName] = map(extendsRaw[propertyName], (path) => isRootedDiskPath(path) ? path : combinePaths(
+          result[propertyName] = map(extendsRaw[propertyName], (path) => startsWithConfigDirTemplate(path) || isRootedDiskPath(path) ? path : combinePaths(
             relativeDifference || (relativeDifference = convertToRelativePath(getDirectoryPath(extendedConfigPath), basePath, createGetCanonicalFileName(host.useCaseSensitiveFileNames))),
             path
           ));
@@ -41662,7 +41779,8 @@ function convertJsonOption(opt, value, basePath, errors, propertyAssignment, val
 }
 function normalizeNonListOptionValue(option, basePath, value) {
   if (option.isFilePath) {
-    value = getNormalizedAbsolutePath(value, basePath);
+    value = normalizeSlashes(value);
+    value = !startsWithConfigDirTemplate(value) ? getNormalizedAbsolutePath(value, basePath) : value;
     if (value === "") {
       value = ".";
     }
@@ -49707,7 +49825,6 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
-  var homomorphicMappedTypeInferenceStack = [];
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -49808,6 +49925,9 @@ function createTypeChecker(host) {
   var potentialReflectCollisions = [];
   var potentialUnusedRenamedBindingElementsInTypes = [];
   var awaitedTypeStack = [];
+  var reverseMappedSourceStack = [];
+  var reverseMappedTargetStack = [];
+  var reverseExpandingFlags = 0 /* None */;
   var diagnostics = createDiagnosticCollection();
   var suggestionDiagnostics = createDiagnosticCollection();
   var typeofType = createTypeofType();
@@ -57891,7 +58011,7 @@ function createTypeChecker(host) {
           result.aliasTypeArguments = length(args) ? args : void 0;
         }
       }
-      result.objectFlags |= getObjectFlags(type) & 4096 /* JSLiteral */;
+      result.objectFlags |= getPropagatingFlagsOfTypes([type]) | getObjectFlags(type) & (4096 /* JSLiteral */ | 16384 /* ArrayLiteral */ | 128 /* ObjectLiteral */);
       if (result.symbol && result.symbol.flags & 32 /* Class */ && type === getDeclaredTypeOfClassOrInterface(result.symbol)) {
         result.objectFlags |= 16777216 /* IsClassInstanceClone */;
       }
@@ -59837,7 +59957,7 @@ function createTypeChecker(host) {
     const modifiers = getMappedTypeModifiers(type.mappedType);
     const readonlyMask = modifiers & 1 /* IncludeReadonly */ ? false : true;
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
-    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
+    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType) || unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
     const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
@@ -69657,13 +69777,7 @@ function createTypeChecker(host) {
     if (reverseMappedCache.has(cacheKey)) {
       return reverseMappedCache.get(cacheKey);
     }
-    const recursionKey = source.id + "," + (target.target || target).id;
-    if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
-      return void 0;
-    }
-    homomorphicMappedTypeInferenceStack.push(recursionKey);
     const type = createReverseMappedType(source, target, constraint);
-    homomorphicMappedTypeInferenceStack.pop();
     reverseMappedCache.set(cacheKey, type);
     return type;
   }
@@ -69675,10 +69789,17 @@ function createTypeChecker(host) {
       return void 0;
     }
     if (isArrayType(source)) {
-      return createArrayType(inferReverseMappedType(getTypeArguments(source)[0], target, constraint), isReadonlyArrayType(source));
+      const elementType = inferReverseMappedType(getTypeArguments(source)[0], target, constraint);
+      if (!elementType) {
+        return void 0;
+      }
+      return createArrayType(elementType, isReadonlyArrayType(source));
     }
     if (isTupleType(source)) {
       const elementTypes = map(getElementTypes(source), (t) => inferReverseMappedType(t, target, constraint));
+      if (!every(elementTypes, (t) => !!t)) {
+        return void 0;
+      }
       const elementFlags = getMappedTypeModifiers(target) & 4 /* IncludeOptional */ ? sameMap(source.target.elementFlags, (f) => f & 2 /* Optional */ ? 1 /* Required */ : f) : source.target.elementFlags;
       return createTupleType(elementTypes, elementFlags, source.target.readonly, source.target.labeledElementDeclarations);
     }
@@ -69695,17 +69816,39 @@ function createTypeChecker(host) {
   function getTypeOfReverseMappedSymbol(symbol) {
     const links = getSymbolLinks(symbol);
     if (!links.type) {
-      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType);
+      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType) || unknownType;
     }
     return links.type;
   }
-  function inferReverseMappedType(sourceType, target, constraint) {
+  function inferReverseMappedTypeWorker(sourceType, target, constraint) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
     inferTypes([inference], sourceType, templateType);
     return getTypeFromInference(inference) || unknownType;
   }
+  function inferReverseMappedType(source, target, constraint) {
+    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+    if (reverseMappedCache.has(cacheKey)) {
+      return reverseMappedCache.get(cacheKey) || unknownType;
+    }
+    reverseMappedSourceStack.push(source);
+    reverseMappedTargetStack.push(target);
+    const saveExpandingFlags = reverseExpandingFlags;
+    if (isDeeplyNestedType(source, reverseMappedSourceStack, reverseMappedSourceStack.length, 2))
+      reverseExpandingFlags |= 1 /* Source */;
+    if (isDeeplyNestedType(target, reverseMappedTargetStack, reverseMappedTargetStack.length, 2))
+      reverseExpandingFlags |= 2 /* Target */;
+    let type;
+    if (reverseExpandingFlags !== 3 /* Both */) {
+      type = inferReverseMappedTypeWorker(source, target, constraint);
+    }
+    reverseMappedSourceStack.pop();
+    reverseMappedTargetStack.pop();
+    reverseExpandingFlags = saveExpandingFlags;
+    reverseMappedCache.set(cacheKey, type);
+    return type;
+  }
   function* getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
     const properties = getPropertiesOfType(target);
     for (const targetProp of properties) {
@@ -128608,7 +128751,8 @@ function getMatchedFileSpec(program, fileName) {
     return void 0;
   const filePath = program.getCanonicalFileName(fileName);
   const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-  return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+  const index = findIndex(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+  return index !== -1 ? configFile.configFileSpecs.validatedFilesSpecBeforeSubstitution[index] : void 0;
 }
 function getMatchedIncludeSpec(program, fileName) {
   var _a, _b;
@@ -128620,12 +128764,13 @@ function getMatchedIncludeSpec(program, fileName) {
   const isJsonFile = fileExtensionIs(fileName, ".json" /* Json */);
   const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
   const useCaseSensitiveFileNames2 = program.useCaseSensitiveFileNames();
-  return find((_b = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _b.validatedIncludeSpecs, (includeSpec) => {
+  const index = findIndex((_b = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _b.validatedIncludeSpecs, (includeSpec) => {
     if (isJsonFile && !endsWith(includeSpec, ".json" /* Json */))
       return false;
     const pattern = getPatternFromSpec(includeSpec, basePath, "files");
     return !!pattern && getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames2).test(fileName);
   });
+  return index !== -1 ? configFile.configFileSpecs.validatedIncludeSpecsBeforeSubstitution[index] : void 0;
 }
 function fileIncludeReasonToDiagnostics(program, reason, fileNameConvertor) {
   var _a, _b;
@@ -176028,6 +176173,8 @@ __export(ts_exports2, {
   computedOptions: () => computedOptions,
   concatenate: () => concatenate,
   concatenateDiagnosticMessageChains: () => concatenateDiagnosticMessageChains,
+  configDirTemplateSubstitutionOptions: () => configDirTemplateSubstitutionOptions,
+  configDirTemplateSubstitutionWatchOptions: () => configDirTemplateSubstitutionWatchOptions,
   consumesNodeCoreModules: () => consumesNodeCoreModules,
   contains: () => contains,
   containsIgnoredPath: () => containsIgnoredPath,
@@ -176798,6 +176945,7 @@ __export(ts_exports2, {
   groupBy: () => groupBy,
   guessIndentation: () => guessIndentation,
   handleNoEmitOptions: () => handleNoEmitOptions,
+  handleWatchOptionsConfigDirTemplateSubstitution: () => handleWatchOptionsConfigDirTemplateSubstitution,
   hasAbstractModifier: () => hasAbstractModifier,
   hasAccessorModifier: () => hasAccessorModifier,
   hasAmbientModifier: () => hasAmbientModifier,
@@ -178141,37 +178289,6 @@ function buildOverload(name) {
   };
 }
 
-// src/deprecatedCompat/5.0/identifierProperties.ts
-addObjectAllocatorPatcher((objectAllocator2) => {
-  const Identifier78 = objectAllocator2.getIdentifierConstructor();
-  if (!hasProperty(Identifier78.prototype, "originalKeywordKind")) {
-    Object.defineProperty(Identifier78.prototype, "originalKeywordKind", {
-      get: deprecate(function() {
-        return identifierToKeywordKind(this);
-      }, {
-        name: "originalKeywordKind",
-        since: "5.0",
-        warnAfter: "5.1",
-        errorAfter: "5.2",
-        message: "Use 'identifierToKeywordKind(identifier)' instead."
-      })
-    });
-  }
-  if (!hasProperty(Identifier78.prototype, "isInJSDocNamespace")) {
-    Object.defineProperty(Identifier78.prototype, "isInJSDocNamespace", {
-      get: deprecate(function() {
-        return this.flags & 4096 /* IdentifierIsInJSDocNamespace */ ? true : void 0;
-      }, {
-        name: "isInJSDocNamespace",
-        since: "5.0",
-        warnAfter: "5.1",
-        errorAfter: "5.2",
-        message: "Use '.parent' or the surrounding context to determine this instead."
-      })
-    });
-  }
-});
-
 // src/server/_namespaces/ts.server.ts
 var ts_server_exports3 = {};
 __export(ts_server_exports3, {
@@ -183023,7 +183140,7 @@ var _ProjectService = class _ProjectService {
         });
       },
       flags,
-      this.getWatchOptionsFromProjectWatchOptions(config.parsedCommandLine.watchOptions),
+      this.getWatchOptionsFromProjectWatchOptions(config.parsedCommandLine.watchOptions, getDirectoryPath(configFileName)),
       WatchType.WildcardDirectory,
       configFileName
     );
@@ -183313,7 +183430,7 @@ var _ProjectService = class _ProjectService {
         configFileName,
         (_fileName, eventKind) => this.onConfigFileChanged(canonicalConfigFilePath, eventKind),
         2e3 /* High */,
-        this.getWatchOptionsFromProjectWatchOptions((_b = (_a = configFileExistenceInfo == null ? void 0 : configFileExistenceInfo.config) == null ? void 0 : _a.parsedCommandLine) == null ? void 0 : _b.watchOptions),
+        this.getWatchOptionsFromProjectWatchOptions((_b = (_a = configFileExistenceInfo == null ? void 0 : configFileExistenceInfo.config) == null ? void 0 : _a.parsedCommandLine) == null ? void 0 : _b.watchOptions, getDirectoryPath(configFileName)),
         WatchType.ConfigFile,
         forProject
       );
@@ -183742,15 +183859,16 @@ var _ProjectService = class _ProjectService {
     const configFileErrors = configFile.parseDiagnostics;
     if (!isString(configFileContent))
       configFileErrors.push(configFileContent);
+    const configDir = getDirectoryPath(configFilename);
     const parsedCommandLine = parseJsonSourceFileConfigFileContent(
       configFile,
       cachedDirectoryStructureHost,
-      getDirectoryPath(configFilename),
+      configDir,
       /*existingOptions*/
-      {},
+      void 0,
       configFilename,
       /*resolutionStack*/
-      [],
+      void 0,
       this.hostConfiguration.extraFileExtensions,
       this.extendedConfigCache
     );
@@ -183780,10 +183898,11 @@ var _ProjectService = class _ProjectService {
       // Old options
       this.getWatchOptionsFromProjectWatchOptions(
         /*projectOptions*/
-        void 0
+        void 0,
+        configDir
       ),
       // New options
-      this.getWatchOptionsFromProjectWatchOptions(parsedCommandLine.watchOptions)
+      this.getWatchOptionsFromProjectWatchOptions(parsedCommandLine.watchOptions, configDir)
     )) {
       (_c = configFileExistenceInfo.watcher) == null ? void 0 : _c.close();
       configFileExistenceInfo.watcher = void 0;
@@ -184551,18 +184670,25 @@ Dynamic files must always be opened with service's current directory or service
         this.logger.info("Host file extension mappings updated");
       }
       if (args.watchOptions) {
-        this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) == null ? void 0 : _a.watchOptions;
+        const watchOptions = (_a = convertWatchOptions(args.watchOptions)) == null ? void 0 : _a.watchOptions;
+        const substitution = handleWatchOptionsConfigDirTemplateSubstitution(watchOptions, this.currentDirectory);
+        this.hostConfiguration.watchOptions = substitution;
+        this.hostConfiguration.beforeSubstitution = substitution === watchOptions ? void 0 : watchOptions;
         this.logger.info(`Host watch options changed to ${JSON.stringify(this.hostConfiguration.watchOptions)}, it will be take effect for next watches.`);
       }
     }
   }
   /** @internal */
   getWatchOptions(project) {
-    return this.getWatchOptionsFromProjectWatchOptions(project.getWatchOptions());
+    return this.getWatchOptionsFromProjectWatchOptions(project.getWatchOptions(), project.getCurrentDirectory());
   }
   /** @internal */
-  getWatchOptionsFromProjectWatchOptions(projectOptions) {
-    return projectOptions && this.hostConfiguration.watchOptions ? { ...this.hostConfiguration.watchOptions, ...projectOptions } : projectOptions || this.hostConfiguration.watchOptions;
+  getWatchOptionsFromProjectWatchOptions(projectOptions, basePath) {
+    const hostWatchOptions = !this.hostConfiguration.beforeSubstitution ? this.hostConfiguration.watchOptions : handleWatchOptionsConfigDirTemplateSubstitution(
+      this.hostConfiguration.beforeSubstitution,
+      basePath
+    );
+    return projectOptions && hostWatchOptions ? { ...hostWatchOptions, ...projectOptions } : projectOptions || hostWatchOptions;
   }
   closeLog() {
     this.logger.close();
@@ -184943,7 +185069,12 @@ Dynamic files must always be opened with service's current directory or service
     return result;
   }
   removeOrphanConfiguredProjects(toRetainConfiguredProjects) {
-    const toRemoveConfiguredProjects = new Map(this.configuredProjects);
+    const orphanConfiguredProjects = this.getOrphanConfiguredProjects(toRetainConfiguredProjects);
+    orphanConfiguredProjects.forEach((project) => this.removeProject(project));
+  }
+  /** @internal */
+  getOrphanConfiguredProjects(toRetainConfiguredProjects) {
+    const toRemoveConfiguredProjects = new Set(this.configuredProjects.values());
     const markOriginalProjectsAsUsed = (project) => {
       if (project.originalConfiguredProjects && (isConfiguredProject(project) || !project.isOrphan())) {
         project.originalConfiguredProjects.forEach(
@@ -184964,7 +185095,7 @@ Dynamic files must always be opened with service's current directory or service
     this.inferredProjects.forEach(markOriginalProjectsAsUsed);
     this.externalProjects.forEach(markOriginalProjectsAsUsed);
     this.configuredProjects.forEach((project) => {
-      if (!toRemoveConfiguredProjects.has(project.canonicalConfigFilePath))
+      if (!toRemoveConfiguredProjects.has(project))
         return;
       if (project.hasOpenRef()) {
         retainConfiguredProject(project);
@@ -184972,12 +185103,12 @@ Dynamic files must always be opened with service's current directory or service
         retainConfiguredProject(project);
       }
     });
-    toRemoveConfiguredProjects.forEach((project) => this.removeProject(project));
+    return toRemoveConfiguredProjects;
     function isRetained(project) {
-      return !toRemoveConfiguredProjects.has(project.canonicalConfigFilePath) || project.hasOpenRef();
+      return !toRemoveConfiguredProjects.has(project) || project.hasOpenRef();
     }
     function retainConfiguredProject(project) {
-      if (toRemoveConfiguredProjects.delete(project.canonicalConfigFilePath)) {
+      if (toRemoveConfiguredProjects.delete(project)) {
         markOriginalProjectsAsUsed(project);
         forEachReferencedProject(project, retainConfiguredProject);
       }
@@ -190410,6 +190541,8 @@ if (typeof console !== "undefined") {
   computedOptions,
   concatenate,
   concatenateDiagnosticMessageChains,
+  configDirTemplateSubstitutionOptions,
+  configDirTemplateSubstitutionWatchOptions,
   consumesNodeCoreModules,
   contains,
   containsIgnoredPath,
@@ -191180,6 +191313,7 @@ if (typeof console !== "undefined") {
   groupBy,
   guessIndentation,
   handleNoEmitOptions,
+  handleWatchOptionsConfigDirTemplateSubstitution,
   hasAbstractModifier,
   hasAccessorModifier,
   hasAmbientModifier,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240416",
+    "version": "5.5.0-dev.20240418",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -111,5 +111,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "ce213148ec562296ac7da215ca179043632c119c"
+    "gitHead": "72f413cea0fa8b98948f9608bb7a113070c7733f"
 }