typescript 5.2.0-dev.20230703 → 5.2.0-dev.20230705

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230703`;
+var version = `${versionMajorMinor}.0-dev.20230705`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -34107,6 +34107,7 @@ var commandOptionsWithoutBuild = [
   {
     name: "checkJs",
     type: "boolean",
+    affectsModuleResolution: true,
     showInSimplifiedHelpView: true,
     category: Diagnostics.JavaScript_Support,
     description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -38305,6 +38306,9 @@ function loadModuleFromSelfNameReference(extensions, moduleName, directory, stat
   }
   const trailingParts = parts.slice(nameParts.length);
   const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+  if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+    return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+  }
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
@@ -42531,7 +42535,9 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
         for (const { ending, value } of candidates) {
           if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
             const matchedStar = value.substring(prefix.length, value.length - suffix.length);
-            return pathIsRelative(matchedStar) ? void 0 : key.replace("*", matchedStar);
+            if (!pathIsRelative(matchedStar)) {
+              return key.replace("*", matchedStar);
+            }
           }
         }
       } else if (some(candidates, (c) => c.ending !== 0 /* Minimal */ && pattern === c.value) || some(candidates, (c) => c.ending === 0 /* Minimal */ && pattern === c.value && validateEnding(c))) {

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230703`;
+var version = `${versionMajorMinor}.0-dev.20230705`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -38505,6 +38505,7 @@ var commandOptionsWithoutBuild = [
   {
     name: "checkJs",
     type: "boolean",
+    affectsModuleResolution: true,
     showInSimplifiedHelpView: true,
     category: Diagnostics.JavaScript_Support,
     description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -42915,6 +42916,9 @@ function loadModuleFromSelfNameReference(extensions, moduleName, directory, stat
   }
   const trailingParts = parts.slice(nameParts.length);
   const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+  if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+    return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+  }
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
@@ -47207,7 +47211,9 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
         for (const { ending, value } of candidates) {
           if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
             const matchedStar = value.substring(prefix.length, value.length - suffix.length);
-            return pathIsRelative(matchedStar) ? void 0 : key.replace("*", matchedStar);
+            if (!pathIsRelative(matchedStar)) {
+              return key.replace("*", matchedStar);
+            }
           }
         }
       } else if (some(candidates, (c) => c.ending !== 0 /* Minimal */ && pattern === c.value) || some(candidates, (c) => c.ending === 0 /* Minimal */ && pattern === c.value && validateEnding(c))) {
@@ -161188,16 +161194,18 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   const fragmentDirectory = fragmentHasPath ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
   const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
   const normalizedSuffix = normalizePath(parsed.suffix);
+  const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" + normalizedSuffix);
+  const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix];
   const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
   const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
-  const includeGlob = normalizedSuffix ? "**/*" + normalizedSuffix : "./*";
+  const includeGlobs = normalizedSuffix ? matchingSuffixes.map((suffix) => "**/*" + suffix) : ["./*"];
   const matches = mapDefined(tryReadDirectory(
     host,
     baseDirectory,
     extensionOptions.extensionsToSearch,
     /*exclude*/
     void 0,
-    [includeGlob]
+    includeGlobs
   ), (match) => {
     const trimmedWithPattern = trimPrefixAndSuffix(match);
     if (trimmedWithPattern) {
@@ -161211,8 +161219,10 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   const directories = normalizedSuffix ? emptyArray : mapDefined(tryGetDirectories(host, baseDirectory), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
   return [...matches, ...directories];
   function trimPrefixAndSuffix(path) {
-    const inner = withoutStartAndEnd(normalizePath(path), completePrefix, normalizedSuffix);
-    return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+    return firstDefined(matchingSuffixes, (suffix) => {
+      const inner = withoutStartAndEnd(normalizePath(path), completePrefix, suffix);
+      return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+    });
   }
 }
 function withoutStartAndEnd(s, start2, end) {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230703`;
+      version = `${versionMajorMinor}.0-dev.20230705`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -37987,6 +37987,7 @@ ${lanes.join("\n")}
         {
           name: "checkJs",
           type: "boolean",
+          affectsModuleResolution: true,
           showInSimplifiedHelpView: true,
           category: Diagnostics.JavaScript_Support,
           description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -40760,6 +40761,9 @@ ${lanes.join("\n")}
     }
     const trailingParts = parts.slice(nameParts.length);
     const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+    if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+      return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+    }
     const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
     const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
     return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
@@ -45073,7 +45077,9 @@ ${lanes.join("\n")}
           for (const { ending, value } of candidates) {
             if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
               const matchedStar = value.substring(prefix.length, value.length - suffix.length);
-              return pathIsRelative(matchedStar) ? void 0 : key.replace("*", matchedStar);
+              if (!pathIsRelative(matchedStar)) {
+                return key.replace("*", matchedStar);
+              }
             }
           }
         } else if (some(candidates, (c) => c.ending !== 0 /* Minimal */ && pattern === c.value) || some(candidates, (c) => c.ending === 0 /* Minimal */ && pattern === c.value && validateEnding(c))) {
@@ -160464,16 +160470,18 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const fragmentDirectory = fragmentHasPath ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
     const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
     const normalizedSuffix = normalizePath(parsed.suffix);
+    const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" + normalizedSuffix);
+    const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix];
     const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
     const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
-    const includeGlob = normalizedSuffix ? "**/*" + normalizedSuffix : "./*";
+    const includeGlobs = normalizedSuffix ? matchingSuffixes.map((suffix) => "**/*" + suffix) : ["./*"];
     const matches = mapDefined(tryReadDirectory(
       host,
       baseDirectory,
       extensionOptions.extensionsToSearch,
       /*exclude*/
       void 0,
-      [includeGlob]
+      includeGlobs
     ), (match) => {
       const trimmedWithPattern = trimPrefixAndSuffix(match);
       if (trimmedWithPattern) {
@@ -160487,8 +160495,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const directories = normalizedSuffix ? emptyArray : mapDefined(tryGetDirectories(host, baseDirectory), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
     return [...matches, ...directories];
     function trimPrefixAndSuffix(path) {
-      const inner = withoutStartAndEnd(normalizePath(path), completePrefix, normalizedSuffix);
-      return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+      return firstDefined(matchingSuffixes, (suffix) => {
+        const inner = withoutStartAndEnd(normalizePath(path), completePrefix, suffix);
+        return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+      });
     }
   }
   function withoutStartAndEnd(s, start, end) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230703`;
+      version = `${versionMajorMinor}.0-dev.20230705`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -37987,6 +37987,7 @@ ${lanes.join("\n")}
         {
           name: "checkJs",
           type: "boolean",
+          affectsModuleResolution: true,
           showInSimplifiedHelpView: true,
           category: Diagnostics.JavaScript_Support,
           description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -40760,6 +40761,9 @@ ${lanes.join("\n")}
     }
     const trailingParts = parts.slice(nameParts.length);
     const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+    if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+      return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+    }
     const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
     const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
     return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
@@ -45073,7 +45077,9 @@ ${lanes.join("\n")}
           for (const { ending, value } of candidates) {
             if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
               const matchedStar = value.substring(prefix.length, value.length - suffix.length);
-              return pathIsRelative(matchedStar) ? void 0 : key.replace("*", matchedStar);
+              if (!pathIsRelative(matchedStar)) {
+                return key.replace("*", matchedStar);
+              }
             }
           }
         } else if (some(candidates, (c) => c.ending !== 0 /* Minimal */ && pattern === c.value) || some(candidates, (c) => c.ending === 0 /* Minimal */ && pattern === c.value && validateEnding(c))) {
@@ -160479,16 +160485,18 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const fragmentDirectory = fragmentHasPath ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
     const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
     const normalizedSuffix = normalizePath(parsed.suffix);
+    const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" + normalizedSuffix);
+    const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix];
     const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
     const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
-    const includeGlob = normalizedSuffix ? "**/*" + normalizedSuffix : "./*";
+    const includeGlobs = normalizedSuffix ? matchingSuffixes.map((suffix) => "**/*" + suffix) : ["./*"];
     const matches = mapDefined(tryReadDirectory(
       host,
       baseDirectory,
       extensionOptions.extensionsToSearch,
       /*exclude*/
       void 0,
-      [includeGlob]
+      includeGlobs
     ), (match) => {
       const trimmedWithPattern = trimPrefixAndSuffix(match);
       if (trimmedWithPattern) {
@@ -160502,8 +160510,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const directories = normalizedSuffix ? emptyArray : mapDefined(tryGetDirectories(host, baseDirectory), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
     return [...matches, ...directories];
     function trimPrefixAndSuffix(path) {
-      const inner = withoutStartAndEnd(normalizePath(path), completePrefix, normalizedSuffix);
-      return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+      return firstDefined(matchingSuffixes, (suffix) => {
+        const inner = withoutStartAndEnd(normalizePath(path), completePrefix, suffix);
+        return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+      });
     }
   }
   function withoutStartAndEnd(s, start, end) {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230703`;
+var version = `${versionMajorMinor}.0-dev.20230705`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -11303,6 +11303,9 @@ function getResolveJsonModule(compilerOptions) {
   }
   return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */;
 }
+function getAllowJSCompilerOption(compilerOptions) {
+  return compilerOptions.allowJs === void 0 ? !!compilerOptions.checkJs : compilerOptions.allowJs;
+}
 var reservedCharacterPattern = /[^\w\s\/]/g;
 var wildcardCharCodes = [42 /* asterisk */, 63 /* question */];
 var commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
@@ -26006,6 +26009,7 @@ var commandOptionsWithoutBuild = [
   {
     name: "checkJs",
     type: "boolean",
+    affectsModuleResolution: true,
     showInSimplifiedHelpView: true,
     category: Diagnostics.JavaScript_Support,
     description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -28251,6 +28255,9 @@ function loadModuleFromSelfNameReference(extensions, moduleName, directory, stat
   }
   const trailingParts = parts.slice(nameParts.length);
   const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+  if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+    return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+  }
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230703",
+    "version": "5.2.0-dev.20230705",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "88cb76d314a93937ce8d9543114ccbad993be6d1"
+    "gitHead": "e89d42d373a570f12510429e13ec45a9eccd9ed0"
 }