typescript 5.3.0-dev.20230824 → 5.3.0-dev.20230826

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230824`;
+var version = `${versionMajorMinor}.0-dev.20230826`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -693,9 +693,6 @@ function endsWith(str, suffix) {
   const expectedPos = str.length - suffix.length;
   return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
 }
-function stringContains(str, substring) {
-  return str.indexOf(substring) !== -1;
-}
 function removeMinAndVersionNumbers(fileName) {
   let end = fileName.length;
   for (let pos = end - 1; pos > 0; pos--) {
@@ -3927,11 +3924,11 @@ function createDirectoryWatcherSupportingRecursive({
     return some(ignoredPaths, (searchPath) => isInPath(path2, searchPath)) || isIgnoredByWatchOptions(path2, options, useCaseSensitiveFileNames2, getCurrentDirectory);
   }
   function isInPath(path2, searchPath) {
-    if (stringContains(path2, searchPath))
+    if (path2.includes(searchPath))
       return true;
     if (useCaseSensitiveFileNames2)
       return false;
-    return stringContains(toCanonicalFilePath(path2), searchPath);
+    return toCanonicalFilePath(path2).includes(searchPath);
   }
 }
 function createFileWatcherCallback(callback) {
@@ -4761,7 +4758,7 @@ function pathIsRelative(path2) {
   return /^\.\.?($|[\\/])/.test(path2);
 }
 function hasExtension(fileName) {
-  return stringContains(getBaseFileName(fileName), ".");
+  return getBaseFileName(fileName).includes(".");
 }
 function fileExtensionIs(path2, extension) {
   return path2.length > extension.length && endsWith(path2, extension);
@@ -4906,7 +4903,7 @@ function getPathFromPathComponents(pathComponents2, length2) {
   return root + pathComponents2.slice(1, length2).join(directorySeparator);
 }
 function normalizeSlashes(path2) {
-  return path2.indexOf("\\") !== -1 ? path2.replace(backslashRegExp, directorySeparator) : path2;
+  return path2.includes("\\") ? path2.replace(backslashRegExp, directorySeparator) : path2;
 }
 function reducePathComponents(components) {
   if (!some(components))
@@ -21824,7 +21821,9 @@ var Parser;
     let dotDotDotToken;
     let expression;
     if (token() !== 20 /* CloseBraceToken */) {
-      dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
+      if (!inExpressionContext) {
+        dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
+      }
       expression = parseExpression();
     }
     if (inExpressionContext) {
@@ -25338,7 +25337,7 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 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) {
@@ -27863,7 +27862,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
     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,
@@ -27907,7 +27906,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
         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));
           }
@@ -27997,7 +27996,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
 }
 var nodeModulesPathPart = "/node_modules/";
 function pathContainsNodeModules(path2) {
-  return stringContains(path2, nodeModulesPathPart);
+  return path2.includes(nodeModulesPathPart);
 }
 function parseNodeModuleFromPath(resolved, isFolder) {
   const path2 = normalizePath(resolved);
@@ -28033,7 +28032,7 @@ function loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) {
 }
 function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
   const filename = getBaseFileName(candidate);
-  if (filename.indexOf(".") === -1) {
+  if (!filename.includes(".")) {
     return void 0;
   }
   let extensionless = removeFileExtension(candidate);
@@ -28441,7 +28440,7 @@ function comparePatternKeys(a, b) {
 }
 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,
@@ -28452,7 +28451,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
       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];
@@ -28546,7 +28545,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
       }
       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);
         }
@@ -28557,7 +28556,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
       }
       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);
         }
@@ -28584,7 +28583,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
       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);
@@ -28645,7 +28644,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
     }
     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) {
@@ -28719,7 +28718,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
   }
 }
 function isApplicableVersionedTypesKey(conditions, key) {
-  if (conditions.indexOf("types") === -1)
+  if (!conditions.includes("types"))
     return false;
   if (!startsWith(key, "types@"))
     return false;
@@ -31667,7 +31666,7 @@ var Arguments;
   Arguments2.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
 })(Arguments || (Arguments = {}));
 function hasArgument(argumentName) {
-  return sys.args.indexOf(argumentName) >= 0;
+  return sys.args.includes(argumentName);
 }
 function findArgument(argumentName) {
   const index = sys.args.indexOf(argumentName);
@@ -32094,7 +32093,7 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       log2
     );
     this.npmPath = npmLocation2 !== void 0 ? npmLocation2 : getDefaultNPMLocation(process.argv[0], validateDefaultNpmLocation2, this.installTypingHost);
-    if (stringContains(this.npmPath, " ") && this.npmPath[0] !== `"`) {
+    if (this.npmPath.includes(" ") && this.npmPath[0] !== `"`) {
       this.npmPath = `"${this.npmPath}"`;
     }
     if (this.log.isEnabled()) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20230824",
+    "version": "5.3.0-dev.20230826",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "769f2daf712c2cf057259ac5321174702ba0d59e"
+    "gitHead": "51e7a34c2c1557259599d6039c3e20da05d23abe"
 }