typescript 5.3.0-dev.20230825 → 5.3.0-dev.20230826

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20230825`;
+      version = `${versionMajorMinor}.0-dev.20230826`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1398,9 +1398,6 @@ var ts = (() => {
   function tryRemoveSuffix(str, suffix) {
     return endsWith(str, suffix) ? str.slice(0, str.length - suffix.length) : void 0;
   }
-  function stringContains(str, substring) {
-    return str.indexOf(substring) !== -1;
-  }
   function removeMinAndVersionNumbers(fileName) {
     let end = fileName.length;
     for (let pos = end - 1; pos > 0; pos--) {
@@ -5765,11 +5762,11 @@ ${lanes.join("\n")}
       return some(ignoredPaths, (searchPath) => isInPath(path, searchPath)) || isIgnoredByWatchOptions(path, options, useCaseSensitiveFileNames2, getCurrentDirectory);
     }
     function isInPath(path, searchPath) {
-      if (stringContains(path, searchPath))
+      if (path.includes(searchPath))
         return true;
       if (useCaseSensitiveFileNames2)
         return false;
-      return stringContains(toCanonicalFilePath(path), searchPath);
+      return toCanonicalFilePath(path).includes(searchPath);
     }
   }
   function createFileWatcherCallback(callback) {
@@ -6638,7 +6635,7 @@ ${lanes.join("\n")}
     return !pathIsAbsolute(path) && !pathIsRelative(path);
   }
   function hasExtension(fileName) {
-    return stringContains(getBaseFileName(fileName), ".");
+    return getBaseFileName(fileName).includes(".");
   }
   function fileExtensionIs(path, extension) {
     return path.length > extension.length && endsWith(path, extension);
@@ -6783,7 +6780,7 @@ ${lanes.join("\n")}
     return root + pathComponents2.slice(1, length2).join(directorySeparator);
   }
   function normalizeSlashes(path) {
-    return path.indexOf("\\") !== -1 ? path.replace(backslashRegExp, directorySeparator) : path;
+    return path.includes("\\") ? path.replace(backslashRegExp, directorySeparator) : path;
   }
   function reducePathComponents(components) {
     if (!some(components))
@@ -13032,7 +13029,7 @@ ${lanes.join("\n")}
       void 0,
       Diagnostics.There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings,
       node10Result,
-      node10Result.indexOf(nodeModulesPathPart + "@types/") > -1 ? `@types/${mangleScopedPackageName(packageName)}` : packageName
+      node10Result.includes(nodeModulesPathPart + "@types/") ? `@types/${mangleScopedPackageName(packageName)}` : packageName
     ) : host.typesPackageExists(packageName) ? chainDiagnosticMessages(
       /*details*/
       void 0,
@@ -16053,7 +16050,7 @@ ${lanes.join("\n")}
   }
   function isIntrinsicJsxName(name) {
     const ch = name.charCodeAt(0);
-    return ch >= 97 /* a */ && ch <= 122 /* z */ || stringContains(name, "-");
+    return ch >= 97 /* a */ && ch <= 122 /* z */ || name.includes("-");
   }
   function getIndentString(level) {
     const singleLevel = indentStrings[1];
@@ -16066,7 +16063,7 @@ ${lanes.join("\n")}
     return indentStrings[1].length;
   }
   function isNightly() {
-    return stringContains(version, "-dev") || stringContains(version, "-insiders");
+    return version.includes("-dev") || version.includes("-insiders");
   }
   function createTextWriter(newLine) {
     var output;
@@ -16256,7 +16253,7 @@ ${lanes.join("\n")}
       return void 0;
     }
     const specifier = getExternalModuleName(declaration);
-    if (specifier && isStringLiteralLike(specifier) && !pathIsRelative(specifier.text) && getCanonicalAbsolutePath(host, file.path).indexOf(getCanonicalAbsolutePath(host, ensureTrailingDirectorySeparator(host.getCommonSourceDirectory()))) === -1) {
+    if (specifier && isStringLiteralLike(specifier) && !pathIsRelative(specifier.text) && !getCanonicalAbsolutePath(host, file.path).includes(getCanonicalAbsolutePath(host, ensureTrailingDirectorySeparator(host.getCommonSourceDirectory())))) {
       return void 0;
     }
     return getResolvedExternalModuleName(host, file);
@@ -18196,7 +18193,7 @@ ${lanes.join("\n")}
     const flatBuiltins = flatten(builtins);
     const extensions = [
       ...builtins,
-      ...mapDefined(extraFileExtensions, (x) => x.scriptKind === 7 /* Deferred */ || needJsExtensions && isJSLike(x.scriptKind) && flatBuiltins.indexOf(x.extension) === -1 ? [x.extension] : void 0)
+      ...mapDefined(extraFileExtensions, (x) => x.scriptKind === 7 /* Deferred */ || needJsExtensions && isJSLike(x.scriptKind) && !flatBuiltins.includes(x.extension) ? [x.extension] : void 0)
     ];
     return extensions;
   }
@@ -18646,7 +18643,7 @@ ${lanes.join("\n")}
     }
   }
   function containsIgnoredPath(path) {
-    return some(ignoredPaths, (p) => stringContains(path, p));
+    return some(ignoredPaths, (p) => path.includes(p));
   }
   function getContainingNodeArray(node) {
     if (!node.parent)
@@ -28199,7 +28196,7 @@ ${lanes.join("\n")}
     return Parser.JSDocParser.parseJSDocTypeExpressionForTests(content, start, length2);
   }
   function isDeclarationFileName(fileName) {
-    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && stringContains(getBaseFileName(fileName), ".d.");
+    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && getBaseFileName(fileName).includes(".d.");
   }
   function parseResolutionMode(mode, pos, end, reportDiagnostic) {
     if (!mode) {
@@ -35987,7 +35984,7 @@ ${lanes.join("\n")}
     if (startsWith(value, "-")) {
       return void 0;
     }
-    if (opt.type === "listOrElement" && !stringContains(value, ",")) {
+    if (opt.type === "listOrElement" && !value.includes(",")) {
       return validateJsonOptionValue(opt, value, errors);
     }
     if (value === "") {
@@ -36966,7 +36963,7 @@ ${lanes.join("\n")}
     var _a;
     basePath = normalizeSlashes(basePath);
     const resolvedPath = getNormalizedAbsolutePath(configFileName || "", basePath);
-    if (resolutionStack.indexOf(resolvedPath) >= 0) {
+    if (resolutionStack.includes(resolvedPath)) {
       errors.push(createCompilerDiagnostic(Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, [...resolutionStack, resolvedPath].join(" -> ")));
       return { raw: json || convertToObject(sourceFile, errors) };
     }
@@ -40321,7 +40318,7 @@ ${lanes.join("\n")}
       result = tryResolve(extensions, state);
     }
     let legacyResult;
-    if (((_a = result == null ? void 0 : result.value) == null ? void 0 : _a.isExternalLibraryImport) && !isConfigLookup && extensions & (1 /* TypeScript */ | 4 /* Declaration */) && features & 8 /* Exports */ && !isExternalModuleNameRelative(moduleName) && !extensionIsOk(1 /* TypeScript */ | 4 /* Declaration */, result.value.resolved.extension) && conditions.indexOf("import") > -1) {
+    if (((_a = result == null ? void 0 : result.value) == null ? void 0 : _a.isExternalLibraryImport) && !isConfigLookup && extensions & (1 /* TypeScript */ | 4 /* Declaration */) && features & 8 /* Exports */ && !isExternalModuleNameRelative(moduleName) && !extensionIsOk(1 /* TypeScript */ | 4 /* Declaration */, result.value.resolved.extension) && conditions.includes("import")) {
       traceIfEnabled(state, Diagnostics.Resolution_of_non_relative_name_failed_trying_with_modern_Node_resolution_features_disabled_to_see_if_npm_library_needs_configuration_update);
       const diagnosticState = {
         ...state,
@@ -40365,7 +40362,7 @@ ${lanes.join("\n")}
           resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
         }
         if (!resolved2) {
-          if (moduleName.indexOf(":") > -1) {
+          if (moduleName.includes(":")) {
             if (traceEnabled) {
               trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
             }
@@ -40454,7 +40451,7 @@ ${lanes.join("\n")}
     return void 0;
   }
   function pathContainsNodeModules(path) {
-    return stringContains(path, nodeModulesPathPart);
+    return path.includes(nodeModulesPathPart);
   }
   function parseNodeModuleFromPath(resolved, isFolder) {
     const path = normalizePath(resolved);
@@ -40490,7 +40487,7 @@ ${lanes.join("\n")}
   }
   function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
     const filename = getBaseFileName(candidate);
-    if (filename.indexOf(".") === -1) {
+    if (!filename.includes(".")) {
       return void 0;
     }
     let extensionless = removeFileExtension(candidate);
@@ -40647,7 +40644,7 @@ ${lanes.join("\n")}
     function loadEntrypointsFromTargetExports(target) {
       var _a, _b;
       if (typeof target === "string" && startsWith(target, "./")) {
-        if (target.indexOf("*") >= 0 && state.host.readDirectory) {
+        if (target.includes("*") && state.host.readDirectory) {
           if (target.indexOf("*") !== target.lastIndexOf("*")) {
             return false;
           }
@@ -40666,7 +40663,7 @@ ${lanes.join("\n")}
           });
         } else {
           const partsAfterFirst = getPathComponents(target).slice(2);
-          if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
+          if (partsAfterFirst.includes("..") || partsAfterFirst.includes(".") || partsAfterFirst.includes("node_modules")) {
             return false;
           }
           const resolvedTarget = combinePaths(scope.packageDirectory, target);
@@ -41034,7 +41031,7 @@ ${lanes.join("\n")}
   }
   function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
     const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
-    if (!endsWith(moduleName, directorySeparator) && moduleName.indexOf("*") === -1 && hasProperty(lookupTable, moduleName)) {
+    if (!endsWith(moduleName, directorySeparator) && !moduleName.includes("*") && hasProperty(lookupTable, moduleName)) {
       const target = lookupTable[moduleName];
       return loadModuleFromTargetImportOrExport(
         target,
@@ -41045,7 +41042,7 @@ ${lanes.join("\n")}
         moduleName
       );
     }
-    const expandingKeys = sort(filter(getOwnKeys(lookupTable), (k) => k.indexOf("*") !== -1 || endsWith(k, "/")), comparePatternKeys);
+    const expandingKeys = sort(filter(getOwnKeys(lookupTable), (k) => k.includes("*") || endsWith(k, "/")), comparePatternKeys);
     for (const potentialTarget of expandingKeys) {
       if (state.features & 16 /* ExportsPatternTrailers */ && matchesPatternWithTrailer(potentialTarget, moduleName)) {
         const target = lookupTable[potentialTarget];
@@ -41139,7 +41136,7 @@ ${lanes.join("\n")}
         }
         const parts = pathIsRelative(target) ? getPathComponents(target).slice(1) : getPathComponents(target);
         const partsAfterFirst = parts.slice(1);
-        if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
+        if (partsAfterFirst.includes("..") || partsAfterFirst.includes(".") || partsAfterFirst.includes("node_modules")) {
           if (state.traceEnabled) {
             trace(state.host, Diagnostics.package_json_scope_0_has_invalid_type_for_target_of_specifier_1, scope.packageDirectory, moduleName);
           }
@@ -41150,7 +41147,7 @@ ${lanes.join("\n")}
         }
         const resolvedTarget = combinePaths(scope.packageDirectory, target);
         const subpathParts = getPathComponents(subpath);
-        if (subpathParts.indexOf("..") >= 0 || subpathParts.indexOf(".") >= 0 || subpathParts.indexOf("node_modules") >= 0) {
+        if (subpathParts.includes("..") || subpathParts.includes(".") || subpathParts.includes("node_modules")) {
           if (state.traceEnabled) {
             trace(state.host, Diagnostics.package_json_scope_0_has_invalid_type_for_target_of_specifier_1, scope.packageDirectory, moduleName);
           }
@@ -41177,7 +41174,7 @@ ${lanes.join("\n")}
         if (!Array.isArray(target)) {
           traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
           for (const condition of getOwnKeys(target)) {
-            if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
+            if (condition === "default" || state.conditions.includes(condition) || isApplicableVersionedTypesKey(state.conditions, condition)) {
               traceIfEnabled(state, Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
               const subTarget = target[condition];
               const result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
@@ -41238,7 +41235,7 @@ ${lanes.join("\n")}
       }
       function tryLoadInputFileForPath(finalPath, entry, packagePath, isImports2) {
         var _a, _b, _c, _d;
-        if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && finalPath.indexOf("/node_modules/") === -1 && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
+        if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && !finalPath.includes("/node_modules/") && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
           const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames: () => useCaseSensitiveFileNames(state) });
           const commonSourceDirGuesses = [];
           if (state.compilerOptions.rootDir || state.compilerOptions.composite && state.compilerOptions.configFilePath) {
@@ -41312,7 +41309,7 @@ ${lanes.join("\n")}
     }
   }
   function isApplicableVersionedTypesKey(conditions, key) {
-    if (conditions.indexOf("types") === -1)
+    if (!conditions.includes("types"))
       return false;
     if (!startsWith(key, "types@"))
       return false;
@@ -41516,7 +41513,7 @@ ${lanes.join("\n")}
     return mangledName;
   }
   function unmangleScopedPackageName(typesPackageName) {
-    return stringContains(typesPackageName, mangledScopedPackageSeparator) ? "@" + typesPackageName.replace(mangledScopedPackageSeparator, directorySeparator) : typesPackageName;
+    return typesPackageName.includes(mangledScopedPackageSeparator) ? "@" + typesPackageName.replace(mangledScopedPackageSeparator, directorySeparator) : typesPackageName;
   }
   function tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, containingDirectory, redirectedReference, state) {
     const result = cache && cache.getFromNonRelativeNameCache(moduleName, mode, containingDirectory, redirectedReference);
@@ -45231,12 +45228,12 @@ ${lanes.join("\n")}
             /*currentDirectory*/
             void 0
           );
-          const mode2 = endsWith(k, "/") ? 1 /* Directory */ : stringContains(k, "*") ? 2 /* Pattern */ : 0 /* Exact */;
+          const mode2 = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
           return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode2);
         });
       } else {
         for (const key of getOwnKeys(exports)) {
-          if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
+          if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
             const subTarget = exports[key];
             const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
             if (result) {
@@ -45402,7 +45399,7 @@ ${lanes.join("\n")}
       return fileName;
     } else if (fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".d.cts" /* Dcts */, ".cts" /* Cts */])) {
       return noExtension + getJSExtensionForFile(fileName, options);
-    } else if (!fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */]) && fileExtensionIsOneOf(fileName, [".ts" /* Ts */]) && stringContains(fileName, ".d.")) {
+    } else if (!fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */]) && fileExtensionIsOneOf(fileName, [".ts" /* Ts */]) && fileName.includes(".d.")) {
       return tryGetRealFileNameForNonJsDeclarationFileName(fileName);
     }
     switch (allowedEndings[0]) {
@@ -45428,7 +45425,7 @@ ${lanes.join("\n")}
   }
   function tryGetRealFileNameForNonJsDeclarationFileName(fileName) {
     const baseName = getBaseFileName(fileName);
-    if (!endsWith(fileName, ".ts" /* Ts */) || !stringContains(baseName, ".d.") || fileExtensionIsOneOf(baseName, [".d.ts" /* Dts */]))
+    if (!endsWith(fileName, ".ts" /* Ts */) || !baseName.includes(".d.") || fileExtensionIsOneOf(baseName, [".d.ts" /* Dts */]))
       return void 0;
     const noExtension = removeExtension(fileName, ".ts" /* Ts */);
     const ext = noExtension.substring(noExtension.lastIndexOf("."));
@@ -51390,12 +51387,12 @@ ${lanes.join("\n")}
           if (!specifier) {
             specifier = getSpecifierForModuleSymbol(chain[0], context);
           }
-          if (!(context.flags & 67108864 /* AllowNodeModulesRelativePaths */) && getEmitModuleResolutionKind(compilerOptions) !== 1 /* Classic */ && specifier.indexOf("/node_modules/") >= 0) {
+          if (!(context.flags & 67108864 /* AllowNodeModulesRelativePaths */) && getEmitModuleResolutionKind(compilerOptions) !== 1 /* Classic */ && specifier.includes("/node_modules/")) {
             const oldSpecifier = specifier;
             if (getEmitModuleResolutionKind(compilerOptions) === 3 /* Node16 */ || getEmitModuleResolutionKind(compilerOptions) === 99 /* NodeNext */) {
               const swappedMode = (contextFile == null ? void 0 : contextFile.impliedNodeFormat) === 99 /* ESNext */ ? 1 /* CommonJS */ : 99 /* ESNext */;
               specifier = getSpecifierForModuleSymbol(chain[0], context, swappedMode);
-              if (specifier.indexOf("/node_modules/") >= 0) {
+              if (specifier.includes("/node_modules/")) {
                 specifier = oldSpecifier;
               } else {
                 assertion = factory.createImportTypeAssertionContainer(factory.createAssertClause(factory.createNodeArray([
@@ -52101,7 +52098,7 @@ ${lanes.join("\n")}
               for (const group2 of groups) {
                 if (group2.length > 1) {
                   statements = [
-                    ...filter(statements, (s) => group2.indexOf(s) === -1),
+                    ...filter(statements, (s) => !group2.includes(s)),
                     factory.createExportDeclaration(
                       /*modifiers*/
                       void 0,
@@ -65478,7 +65475,7 @@ ${lanes.join("\n")}
           const param = declaration;
           if (isIdentifier(param.name)) {
             const originalKeywordKind = identifierToKeywordKind(param.name);
-            if ((isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) && param.parent.parameters.indexOf(param) > -1 && (resolveName(
+            if ((isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) && param.parent.parameters.includes(param) && (resolveName(
               param,
               param.name.escapedText,
               788968 /* Type */,
@@ -70866,7 +70863,7 @@ ${lanes.join("\n")}
       return getJsxElementTypeAt(node) || anyType;
     }
     function isHyphenatedJsxName(name) {
-      return stringContains(name, "-");
+      return name.includes("-");
     }
     function isJsxIntrinsicTagName(tagName) {
       return isIdentifier(tagName) && isIntrinsicJsxName(tagName.escapedText) || isJsxNamespacedName(tagName);
@@ -86029,7 +86026,7 @@ ${lanes.join("\n")}
       return false;
     }
     function checkGrammarNumericLiteral(node) {
-      const isFractional = getTextOfNode(node).indexOf(".") !== -1;
+      const isFractional = getTextOfNode(node).includes(".");
       const isScientific = node.numericLiteralFlags & 16 /* Scientific */;
       if (isFractional || isScientific) {
         return;
@@ -109486,7 +109483,7 @@ ${lanes.join("\n")}
   }
   function hasInternalAnnotation(range, currentSourceFile) {
     const comment = currentSourceFile.text.substring(range.pos, range.end);
-    return stringContains(comment, "@internal");
+    return comment.includes("@internal");
   }
   function isInternalDeclaration(node, currentSourceFile) {
     const parseTreeNode = getParseTreeNode(node);
@@ -113943,7 +113940,7 @@ ${lanes.join("\n")}
           /*jsxAttributeEscape*/
           false
         );
-        return !(expression.numericLiteralFlags & 448 /* WithSpecifier */) && !stringContains(text, tokenToString(25 /* DotToken */)) && !stringContains(text, String.fromCharCode(69 /* E */)) && !stringContains(text, String.fromCharCode(101 /* e */));
+        return !(expression.numericLiteralFlags & 448 /* WithSpecifier */) && !text.includes(tokenToString(25 /* DotToken */)) && !text.includes(String.fromCharCode(69 /* E */)) && !text.includes(String.fromCharCode(101 /* e */));
       } else if (isAccessExpression(expression)) {
         const constantValue = getConstantValue(expression);
         return typeof constantValue === "number" && isFinite(constantValue) && constantValue >= 0 && Math.floor(constantValue) === constantValue;
@@ -118771,7 +118768,7 @@ ${lanes.join("\n")}
       const resultFromDts = getRedirectReferenceForResolutionFromSourceOfProject(file.path);
       if (resultFromDts)
         return resultFromDts;
-      if (!host.realpath || !options.preserveSymlinks || !stringContains(file.originalFileName, nodeModulesPathPart))
+      if (!host.realpath || !options.preserveSymlinks || !file.originalFileName.includes(nodeModulesPathPart))
         return void 0;
       const realDeclarationPath = toPath3(host.realpath(file.originalFileName));
       return realDeclarationPath === file.path ? void 0 : getRedirectReferenceForResolutionFromSourceOfProject(realDeclarationPath);
@@ -120029,7 +120026,7 @@ ${lanes.join("\n")}
       const path = toPath3(fileName);
       if (useSourceOfProjectReferenceRedirect) {
         let source = getSourceOfProjectReferenceRedirect(path);
-        if (!source && host.realpath && options.preserveSymlinks && isDeclarationFileName(fileName) && stringContains(fileName, nodeModulesPathPart)) {
+        if (!source && host.realpath && options.preserveSymlinks && isDeclarationFileName(fileName) && fileName.includes(nodeModulesPathPart)) {
           const realPath2 = toPath3(host.realpath(fileName));
           if (realPath2 !== path)
             source = getSourceOfProjectReferenceRedirect(realPath2);
@@ -121389,7 +121386,7 @@ ${lanes.join("\n")}
       var _a;
       if (!host.getResolvedProjectReferences() || containsIgnoredPath(directory))
         return;
-      if (!originalRealpath || !stringContains(directory, nodeModulesPathPart))
+      if (!originalRealpath || !directory.includes(nodeModulesPathPart))
         return;
       const symlinkCache = host.getSymlinkCache();
       const directoryPath = ensureTrailingDirectorySeparator(host.toPath(directory));
@@ -121417,7 +121414,7 @@ ${lanes.join("\n")}
       if (!symlinkedDirectories)
         return false;
       const fileOrDirectoryPath = host.toPath(fileOrDirectory);
-      if (!stringContains(fileOrDirectoryPath, nodeModulesPathPart))
+      if (!fileOrDirectoryPath.includes(nodeModulesPathPart))
         return false;
       if (isFile && ((_a = symlinkCache.getSymlinkedFiles()) == null ? void 0 : _a.has(fileOrDirectoryPath)))
         return true;
@@ -123465,7 +123462,7 @@ ${lanes.join("\n")}
     if (endsWith(path, "/node_modules/.staging")) {
       return removeSuffix(path, "/.staging");
     }
-    return some(ignoredPaths, (searchPath) => stringContains(path, searchPath)) ? void 0 : path;
+    return some(ignoredPaths, (searchPath) => path.includes(searchPath)) ? void 0 : path;
   }
   function perceivedOsRootLengthForWatching(pathComponents2, length2) {
     if (length2 <= 1)
@@ -128314,7 +128311,7 @@ ${lanes.join("\n")}
 
   // src/jsTyping/shared.ts
   function hasArgument(argumentName) {
-    return sys.args.indexOf(argumentName) >= 0;
+    return sys.args.includes(argumentName);
   }
   function findArgument(argumentName) {
     const index = sys.args.indexOf(argumentName);
@@ -131142,7 +131139,7 @@ ${lanes.join("\n")}
       return false;
     }
     function getNodeModulesPackageNameFromFileName(importedFileName, moduleSpecifierResolutionHost) {
-      if (!stringContains(importedFileName, "node_modules")) {
+      if (!importedFileName.includes("node_modules")) {
         return void 0;
       }
       const specifier = ts_moduleSpecifiers_exports.getNodeModulesPackageName(
@@ -131759,7 +131756,7 @@ ${lanes.join("\n")}
     var _a;
     const isExcluded = excludePatterns && ((fileName) => excludePatterns.some((p) => p.test(fileName)));
     for (const ambient of checker.getAmbientModules()) {
-      if (!stringContains(ambient.name, "*") && !(excludePatterns && ((_a = ambient.declarations) == null ? void 0 : _a.every((d) => isExcluded(d.getSourceFile().fileName))))) {
+      if (!ambient.name.includes("*") && !(excludePatterns && ((_a = ambient.declarations) == null ? void 0 : _a.every((d) => isExcluded(d.getSourceFile().fileName))))) {
         cb(
           ambient,
           /*sourceFile*/
@@ -140793,7 +140790,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return symbolId;
     }
     function checkForUsedDeclarations(node) {
-      if (node === targetRange.range || isReadonlyArray(targetRange.range) && targetRange.range.indexOf(node) >= 0) {
+      if (node === targetRange.range || isReadonlyArray(targetRange.range) && targetRange.range.includes(node)) {
         return;
       }
       const sym = isIdentifier(node) ? getSymbolReferencedByIdentifier(node) : checker.getSymbolAtLocation(node);
@@ -142659,7 +142656,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         return char >= 97 /* a */ && char <= 122 /* z */ || char >= 65 /* A */ && char <= 90 /* Z */ || char >= 48 /* _0 */ && char <= 57 /* _9 */;
       }
       function isNodeModulesFile(path) {
-        return stringContains(path, "/node_modules/");
+        return path.includes("/node_modules/");
       }
     }
     function getRenameInfo2(fileName, position, preferences) {
@@ -152500,7 +152497,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isCallbackLike(checker, sourceFile, name) {
-    return !!ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(name, checker, sourceFile, (reference) => isIdentifier(reference) && isCallExpression(reference.parent) && reference.parent.arguments.indexOf(reference) >= 0);
+    return !!ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(name, checker, sourceFile, (reference) => isIdentifier(reference) && isCallExpression(reference.parent) && reference.parent.arguments.includes(reference));
   }
   function isLastParameter(func, parameter, isFixAll) {
     const parameters = func.parameters;
@@ -160352,7 +160349,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function addReplacementSpans(text, textStart, names) {
     const span = getDirectoryFragmentTextSpan(text, textStart);
     const wholeSpan = text.length === 0 ? void 0 : createTextSpan(textStart, text.length);
-    return names.map(({ name, kind, extension }) => Math.max(name.indexOf(directorySeparator), name.indexOf(altDirectorySeparator)) !== -1 ? { name, kind, extension, span: wholeSpan } : { name, kind, extension, span });
+    return names.map(({ name, kind, extension }) => name.includes(directorySeparator) || name.includes(altDirectorySeparator) ? { name, kind, extension, span: wholeSpan } : { name, kind, extension, span });
   }
   function getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) {
     return addReplacementSpans(node.text, node.getStart(sourceFile) + 1, getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker, preferences));
@@ -160678,7 +160675,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     if (target && typeof target === "object" && !isArray(target)) {
       for (const condition in target) {
-        if (condition === "default" || conditions.indexOf(condition) > -1 || isApplicableVersionedTypesKey(conditions, condition)) {
+        if (condition === "default" || conditions.includes(condition) || isApplicableVersionedTypesKey(conditions, condition)) {
           const pattern = target[condition];
           return getPatternFromFirstMatchingCondition(pattern, conditions);
         }
@@ -160690,7 +160687,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionsForPathMapping(path, patterns, fragment, packageDirectory, extensionOptions, host) {
     if (!endsWith(path, "*")) {
-      return !stringContains(path, "*") ? justPathMappingName(path, "script" /* scriptElement */) : emptyArray;
+      return !path.includes("*") ? justPathMappingName(path, "script" /* scriptElement */) : emptyArray;
     }
     const pathPrefix = path.slice(0, path.length - 1);
     const remainingFragment = tryRemovePrefix(fragment, pathPrefix);
@@ -160760,7 +160757,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getAmbientModuleCompletions(fragment, fragmentDirectory, checker) {
     const ambientModules = checker.getAmbientModules().map((sym) => stripQuotes(sym.name));
-    const nonRelativeModuleNames = ambientModules.filter((moduleName) => startsWith(moduleName, fragment) && moduleName.indexOf("*") < 0);
+    const nonRelativeModuleNames = ambientModules.filter((moduleName) => startsWith(moduleName, fragment) && !moduleName.includes("*"));
     if (fragmentDirectory !== void 0) {
       const moduleNameWithSeparator = ensureTrailingDirectorySeparator(fragmentDirectory);
       return nonRelativeModuleNames.map((nonRelativeModuleName) => removePrefix(nonRelativeModuleName, moduleNameWithSeparator));
@@ -160874,7 +160871,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     return false;
   }
   function containsSlash(fragment) {
-    return stringContains(fragment, directorySeparator);
+    return fragment.includes(directorySeparator);
   }
   function isRequireCallArgument(node) {
     return isCallExpression(node.parent) && firstOrUndefined(node.parent.arguments) === node && isIdentifier(node.parent.expression) && node.parent.expression.escapedText === "require";
@@ -169767,7 +169764,7 @@ ${options.prefix}` : "\n" : options.prefix
     return positionIsASICandidate(context.currentTokenSpan.end, context.currentTokenParent, context.sourceFile);
   }
   function isNotPropertyAccessOnIntegerLiteral(context) {
-    return !isPropertyAccessExpression(context.contextNode) || !isNumericLiteral(context.contextNode.expression) || context.contextNode.expression.getText().indexOf(".") !== -1;
+    return !isPropertyAccessExpression(context.contextNode) || !isNumericLiteral(context.contextNode.expression) || context.contextNode.expression.getText().includes(".");
   }
   var init_rules = __esm({
     "src/services/formatting/rules.ts"() {
@@ -170963,7 +170960,7 @@ ${options.prefix}` : "\n" : options.prefix
           }
           const containerList = getListByPosition(position, precedingToken.parent, sourceFile);
           if (containerList && !rangeContainsRange(containerList, precedingToken)) {
-            const useTheSameBaseIndentation = [218 /* FunctionExpression */, 219 /* ArrowFunction */].indexOf(currentToken.parent.kind) !== -1;
+            const useTheSameBaseIndentation = [218 /* FunctionExpression */, 219 /* ArrowFunction */].includes(currentToken.parent.kind);
             const indentSize = useTheSameBaseIndentation ? 0 : options.indentSize;
             return getActualIndentationForListStartLine(containerList, sourceFile, options) + indentSize;
           }
@@ -172554,7 +172551,7 @@ ${options.prefix}` : "\n" : options.prefix
 
   // src/server/scriptInfo.ts
   function isDynamicFileName(fileName) {
-    return fileName[0] === "^" || (stringContains(fileName, "walkThroughSnippet:/") || stringContains(fileName, "untitled:/")) && getBaseFileName(fileName)[0] === "^" || stringContains(fileName, ":^") && !stringContains(fileName, directorySeparator);
+    return fileName[0] === "^" || (fileName.includes("walkThroughSnippet:/") || fileName.includes("untitled:/")) && getBaseFileName(fileName)[0] === "^" || fileName.includes(":^") && !fileName.includes(directorySeparator);
   }
   function ensurePrimaryProjectKind(project) {
     if (!project || project.projectKind === 3 /* AutoImportProvider */ || project.projectKind === 4 /* Auxiliary */) {
@@ -174204,7 +174201,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         removeExistingTypings(include) {
           const existing = getAutomaticTypeDirectiveNames(this.getCompilerOptions(), this.directoryStructureHost);
-          return include.filter((i) => existing.indexOf(i) < 0);
+          return include.filter((i) => !existing.includes(i));
         }
         updateGraphWorker() {
           var _a, _b;
@@ -178401,7 +178398,7 @@ Dynamic files must always be opened with service's current directory or service
                 this.logger.info(`Excluding files based on rule ${name} matching file '${root}'`);
                 if (rule2.types) {
                   for (const type of rule2.types) {
-                    if (typeAcqInclude.indexOf(type) < 0) {
+                    if (!typeAcqInclude.includes(type)) {
                       typeAcqInclude.push(type);
                     }
                   }
@@ -178420,13 +178417,13 @@ Dynamic files must always be opened with service's current directory or service
                         return groupNumberOrString;
                       }).join("");
                     });
-                    if (excludeRules.indexOf(processedRule) === -1) {
+                    if (!excludeRules.includes(processedRule)) {
                       excludeRules.push(processedRule);
                     }
                   }
                 } else {
                   const escaped = _ProjectService.escapeFilenameForRegex(root);
-                  if (excludeRules.indexOf(escaped) < 0) {
+                  if (!excludeRules.includes(escaped)) {
                     excludeRules.push(escaped);
                   }
                 }
@@ -178450,7 +178447,7 @@ Dynamic files must always be opened with service's current directory or service
                     this.logger.info(`Excluded '${normalizedNames[i]}' because it matched ${cleanedTypingName} from the legacy safelist`);
                     excludedFiles.push(normalizedNames[i]);
                     exclude = true;
-                    if (typeAcqInclude.indexOf(typeName) < 0) {
+                    if (!typeAcqInclude.includes(typeName)) {
                       typeAcqInclude.push(typeName);
                     }
                   }
@@ -181990,7 +181987,7 @@ ${e.message}`;
           if (languageServiceDisabled) {
             return;
           }
-          const fileNamesInProject = fileNames.filter((value) => !stringContains(value, "lib.d.ts"));
+          const fileNamesInProject = fileNames.filter((value) => !value.includes("lib.d.ts"));
           if (fileNamesInProject.length === 0) {
             return;
           }
@@ -185252,7 +185249,6 @@ ${e.message}`;
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,
     startsWithUseStrict: () => startsWithUseStrict,
-    stringContains: () => stringContains,
     stringContainsAt: () => stringContainsAt,
     stringToToken: () => stringToToken,
     stripQuotes: () => stripQuotes,
@@ -187661,7 +187657,6 @@ ${e.message}`;
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,
     startsWithUseStrict: () => startsWithUseStrict,
-    stringContains: () => stringContains,
     stringContainsAt: () => stringContainsAt,
     stringToToken: () => stringToToken,
     stripQuotes: () => stripQuotes,