typescript 5.0.0-dev.20230109 → 5.0.0-dev.20230110

package/lib/typescript.js

@@ -42,7 +42,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20230109`;
+      version = `${versionMajorMinor}.0-dev.20230110`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8394,6 +8394,9 @@ ${lanes.join("\n")}
         Found_1_error_in_1: diag(6259, 3 /* Message */, "Found_1_error_in_1_6259", "Found 1 error in {1}"),
         Found_0_errors_in_the_same_file_starting_at_Colon_1: diag(6260, 3 /* Message */, "Found_0_errors_in_the_same_file_starting_at_Colon_1_6260", "Found {0} errors in the same file, starting at: {1}"),
         Found_0_errors_in_1_files: diag(6261, 3 /* Message */, "Found_0_errors_in_1_files_6261", "Found {0} errors in {1} files."),
+        File_name_0_has_a_1_extension_looking_up_2_instead: diag(6262, 3 /* Message */, "File_name_0_has_a_1_extension_looking_up_2_instead_6262", "File name '{0}' has a '{1}' extension - looking up '{2}' instead."),
+        Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set: diag(6263, 1 /* Error */, "Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set_6263", "Module '{0}' was resolved to '{1}', but '--allowArbitraryExtensions' is not set."),
+        Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present: diag(6264, 3 /* Message */, "Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present_6264", "Enable importing files with any extension, provided a declaration file is present."),
         Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve: diag(6270, 3 /* Message */, "Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve_6270", "Directory '{0}' has no containing package.json scope. Imports will not resolve."),
         Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1: diag(6271, 3 /* Message */, "Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1_6271", "Import specifier '{0}' does not exist in package.json scope at path '{1}'."),
         Invalid_import_specifier_0_has_no_possible_resolutions: diag(6272, 3 /* Message */, "Invalid_import_specifier_0_has_no_possible_resolutions_6272", "Invalid import specifier '{0}' has no possible resolutions."),
@@ -15859,13 +15862,13 @@ ${lanes.join("\n")}
     return removeFileExtension(path) + declarationExtension;
   }
   function getDeclarationEmitExtensionForPath(path) {
-    return fileExtensionIsOneOf(path, [".mjs" /* Mjs */, ".mts" /* Mts */]) ? ".d.mts" /* Dmts */ : fileExtensionIsOneOf(path, [".cjs" /* Cjs */, ".cts" /* Cts */]) ? ".d.cts" /* Dcts */ : fileExtensionIsOneOf(path, [".json" /* Json */]) ? `.json.d.ts` : (
+    return fileExtensionIsOneOf(path, [".mjs" /* Mjs */, ".mts" /* Mts */]) ? ".d.mts" /* Dmts */ : fileExtensionIsOneOf(path, [".cjs" /* Cjs */, ".cts" /* Cts */]) ? ".d.cts" /* Dcts */ : fileExtensionIsOneOf(path, [".json" /* Json */]) ? `.d.json.ts` : (
       // Drive-by redefinition of json declaration file output name so if it's ever enabled, it behaves well
       ".d.ts" /* Dts */
     );
   }
   function getPossibleOriginalInputExtensionForExtension(path) {
-    return fileExtensionIsOneOf(path, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path, [`.json.d.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
+    return fileExtensionIsOneOf(path, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path, [`.d.json.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
   }
   function outFile(options) {
     return options.outFile || options.out;
@@ -17872,7 +17875,7 @@ ${lanes.join("\n")}
     return !(pos >= 0);
   }
   function extensionIsTS(ext) {
-    return ext === ".ts" /* Ts */ || ext === ".tsx" /* Tsx */ || ext === ".d.ts" /* Dts */ || ext === ".cts" /* Cts */ || ext === ".mts" /* Mts */ || ext === ".d.mts" /* Dmts */ || ext === ".d.cts" /* Dcts */;
+    return ext === ".ts" /* Ts */ || ext === ".tsx" /* Tsx */ || ext === ".d.ts" /* Dts */ || ext === ".cts" /* Cts */ || ext === ".mts" /* Mts */ || ext === ".d.mts" /* Dmts */ || ext === ".d.cts" /* Dcts */ || startsWith(ext, ".d.") && endsWith(ext, ".ts");
   }
   function resolutionExtensionIsTSOrJson(ext) {
     return extensionIsTS(ext) || ext === ".json" /* Json */;
@@ -26928,7 +26931,7 @@ ${lanes.join("\n")}
     return Parser.JSDocParser.parseJSDocTypeExpressionForTests(content, start, length2);
   }
   function isDeclarationFileName(fileName) {
-    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions);
+    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && stringContains(getBaseFileName(fileName), ".d.");
   }
   function parseResolutionMode(mode, pos, end, reportDiagnostic) {
     if (!mode) {
@@ -37298,6 +37301,14 @@ ${lanes.join("\n")}
           description: Diagnostics.Enable_importing_json_files,
           defaultValueDescription: false
         },
+        {
+          name: "allowArbitraryExtensions",
+          type: "boolean",
+          affectsModuleResolution: true,
+          category: Diagnostics.Modules,
+          description: Diagnostics.Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present,
+          defaultValueDescription: false
+        },
         {
           name: "out",
           type: "string",
@@ -39045,14 +39056,19 @@ ${lanes.join("\n")}
     }
   }
   function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
-    if (hasJSFileExtension(candidate) || extensions & 8 /* Json */ && fileExtensionIs(candidate, ".json" /* Json */) || extensions & (1 /* TypeScript */ | 4 /* Declaration */) && moduleResolutionSupportsResolvingTsExtensions(state.compilerOptions) && fileExtensionIsOneOf(candidate, supportedTSExtensionsFlat)) {
-      const extensionless = removeFileExtension(candidate);
-      const extension = candidate.substring(extensionless.length);
-      if (state.traceEnabled) {
-        trace(state.host, Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
-      }
-      return tryAddingExtensions(extensionless, extensions, extension, onlyRecordFailures, state);
+    const filename = getBaseFileName(candidate);
+    if (filename.indexOf(".") === -1) {
+      return void 0;
     }
+    let extensionless = removeFileExtension(candidate);
+    if (extensionless === candidate) {
+      extensionless = candidate.substring(0, candidate.lastIndexOf("."));
+    }
+    const extension = candidate.substring(extensionless.length);
+    if (state.traceEnabled) {
+      trace(state.host, Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
+    }
+    return tryAddingExtensions(extensionless, extensions, extension, onlyRecordFailures, state);
   }
   function loadFileNameFromPackageJsonField(extensions, candidate, onlyRecordFailures, state) {
     if (extensions & 1 /* TypeScript */ && fileExtensionIsOneOf(candidate, supportedTSImplementationExtensions) || extensions & 4 /* Declaration */ && fileExtensionIsOneOf(candidate, supportedDeclarationExtensions)) {
@@ -39076,38 +39092,23 @@ ${lanes.join("\n")}
       case ".mjs" /* Mjs */:
       case ".mts" /* Mts */:
       case ".d.mts" /* Dmts */:
-        return extensions & 1 /* TypeScript */ && tryExtension(".mts" /* Mts */) || extensions & 4 /* Declaration */ && tryExtension(".d.mts" /* Dmts */) || extensions & 2 /* JavaScript */ && tryExtension(".mjs" /* Mjs */) || void 0;
+        return extensions & 1 /* TypeScript */ && tryExtension(".mts" /* Mts */, originalExtension === ".mts" /* Mts */ || originalExtension === ".d.mts" /* Dmts */) || extensions & 4 /* Declaration */ && tryExtension(".d.mts" /* Dmts */, originalExtension === ".mts" /* Mts */ || originalExtension === ".d.mts" /* Dmts */) || extensions & 2 /* JavaScript */ && tryExtension(".mjs" /* Mjs */) || void 0;
       case ".cjs" /* Cjs */:
       case ".cts" /* Cts */:
       case ".d.cts" /* Dcts */:
-        return extensions & 1 /* TypeScript */ && tryExtension(".cts" /* Cts */) || extensions & 4 /* Declaration */ && tryExtension(".d.cts" /* Dcts */) || extensions & 2 /* JavaScript */ && tryExtension(".cjs" /* Cjs */) || void 0;
+        return extensions & 1 /* TypeScript */ && tryExtension(".cts" /* Cts */, originalExtension === ".cts" /* Cts */ || originalExtension === ".d.cts" /* Dcts */) || extensions & 4 /* Declaration */ && tryExtension(".d.cts" /* Dcts */, originalExtension === ".cts" /* Cts */ || originalExtension === ".d.cts" /* Dcts */) || extensions & 2 /* JavaScript */ && tryExtension(".cjs" /* Cjs */) || void 0;
       case ".json" /* Json */:
-        const originalCandidate = candidate;
-        if (extensions & 4 /* Declaration */) {
-          candidate += ".json" /* Json */;
-          const result = tryExtension(".d.ts" /* Dts */);
-          if (result)
-            return result;
-        }
-        if (extensions & 8 /* Json */) {
-          candidate = originalCandidate;
-          const result = tryExtension(".json" /* Json */);
-          if (result)
-            return result;
-        }
-        return void 0;
-      case ".ts" /* Ts */:
+        return extensions & 4 /* Declaration */ && tryExtension(".d.json.ts") || extensions & 8 /* Json */ && tryExtension(".json" /* Json */) || void 0;
       case ".tsx" /* Tsx */:
+      case ".jsx" /* Jsx */:
+        return extensions & 1 /* TypeScript */ && (tryExtension(".tsx" /* Tsx */, originalExtension === ".tsx" /* Tsx */) || tryExtension(".ts" /* Ts */, originalExtension === ".tsx" /* Tsx */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */, originalExtension === ".tsx" /* Tsx */) || extensions & 2 /* JavaScript */ && (tryExtension(".jsx" /* Jsx */) || tryExtension(".js" /* Js */)) || void 0;
+      case ".ts" /* Ts */:
       case ".d.ts" /* Dts */:
-        if (moduleResolutionSupportsResolvingTsExtensions(state.compilerOptions) && extensionIsOk(extensions, originalExtension)) {
-          return tryExtension(
-            originalExtension,
-            /*resolvedUsingTsExtension*/
-            true
-          );
-        }
+      case ".js" /* Js */:
+      case "":
+        return extensions & 1 /* TypeScript */ && (tryExtension(".ts" /* Ts */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */) || tryExtension(".tsx" /* Tsx */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */) || extensions & 2 /* JavaScript */ && (tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */)) || state.isConfigLookup && tryExtension(".json" /* Json */) || void 0;
       default:
-        return extensions & 1 /* TypeScript */ && (tryExtension(".ts" /* Ts */) || tryExtension(".tsx" /* Tsx */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */) || extensions & 2 /* JavaScript */ && (tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */)) || state.isConfigLookup && tryExtension(".json" /* Json */) || void 0;
+        return extensions & 4 /* Declaration */ && !isDeclarationFileName(candidate + originalExtension) && tryExtension(`.d${originalExtension}.ts`) || void 0;
     }
     function tryExtension(ext, resolvedUsingTsExtension) {
       const path = tryFile(candidate + ext, onlyRecordFailures, state);
@@ -40146,11 +40147,8 @@ ${lanes.join("\n")}
       }
     }
   }
-  function moduleResolutionSupportsResolvingTsExtensions(compilerOptions) {
-    return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */;
-  }
   function shouldAllowImportingTsExtension(compilerOptions, fromFileName) {
-    return moduleResolutionSupportsResolvingTsExtensions(compilerOptions) && (!!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName));
+    return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */ && (!!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName));
   }
   function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache, packageJsonInfoCache) {
     const traceEnabled = isTraceEnabled(compilerOptions, host);
@@ -43916,6 +43914,8 @@ ${lanes.join("\n")}
     }
     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.")) {
+      return tryGetRealFileNameForNonJsDeclarationFileName(fileName);
     }
     switch (allowedEndings[0]) {
       case 0 /* Minimal */:
@@ -43939,6 +43939,14 @@ ${lanes.join("\n")}
         return Debug.assertNever(allowedEndings[0]);
     }
   }
+  function tryGetRealFileNameForNonJsDeclarationFileName(fileName) {
+    const baseName = getBaseFileName(fileName);
+    if (!endsWith(fileName, ".ts" /* Ts */) || !stringContains(baseName, ".d.") || fileExtensionIsOneOf(baseName, [".d.ts" /* Dts */]))
+      return void 0;
+    const noExtension = removeExtension(fileName, ".ts" /* Ts */);
+    const ext = noExtension.substring(noExtension.lastIndexOf("."));
+    return noExtension.substring(0, noExtension.indexOf(".d.")) + ext;
+  }
   function getJSExtensionForFile(fileName, options) {
     var _a2;
     return (_a2 = tryGetJSExtensionForFile(fileName, options)) != null ? _a2 : Debug.fail(`Extension ${extensionFromPath(fileName)} is unsupported:: FileName:: ${fileName}`);
@@ -43999,6 +44007,7 @@ ${lanes.join("\n")}
     getNodeModulesPackageName: () => getNodeModulesPackageName,
     tryGetJSExtensionForFile: () => tryGetJSExtensionForFile,
     tryGetModuleSpecifiersFromCache: () => tryGetModuleSpecifiersFromCache,
+    tryGetRealFileNameForNonJsDeclarationFileName: () => tryGetRealFileNameForNonJsDeclarationFileName,
     updateModuleSpecifier: () => updateModuleSpecifier
   });
   var init_ts_moduleSpecifiers = __esm({
@@ -46266,7 +46275,7 @@ ${lanes.join("\n")}
       const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
       const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
       if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-        if (hasExportAssignmentSymbol(moduleSymbol)) {
+        if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
           const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
           const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
           const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -47061,7 +47070,7 @@ ${lanes.join("\n")}
       const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
       const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
       const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode);
-      const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule);
+      const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
       const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
       if (sourceFile) {
         if (resolutionDiagnostic) {
@@ -51015,7 +51024,9 @@ ${lanes.join("\n")}
             case 267 /* NamespaceExportDeclaration */:
               addResult(factory.createNamespaceExportDeclaration(idText(node.name)), 0 /* None */);
               break;
-            case 270 /* ImportClause */:
+            case 270 /* ImportClause */: {
+              const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
+              const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.moduleSpecifier;
               addResult(factory.createImportDeclaration(
                 /*modifiers*/
                 void 0,
@@ -51026,15 +51037,14 @@ ${lanes.join("\n")}
                   /*namedBindings*/
                   void 0
                 ),
-                // We use `target.parent || target` below as `target.parent` is unset when the target is a module which has been export assigned
-                // And then made into a default by the `esModuleInterop` or `allowSyntheticDefaultImports` flag
-                // In such cases, the `target` refers to the module itself already
-                factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context)),
-                /*assertClause*/
-                void 0
+                specifier2,
+                node.parent.assertClause
               ), 0 /* None */);
               break;
-            case 271 /* NamespaceImport */:
+            }
+            case 271 /* NamespaceImport */: {
+              const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
+              const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.parent.moduleSpecifier;
               addResult(factory.createImportDeclaration(
                 /*modifiers*/
                 void 0,
@@ -51045,11 +51055,11 @@ ${lanes.join("\n")}
                   void 0,
                   factory.createNamespaceImport(factory.createIdentifier(localName))
                 ),
-                factory.createStringLiteral(getSpecifierForModuleSymbol(target, context)),
-                /*assertClause*/
-                void 0
+                specifier2,
+                node.parent.parent.assertClause
               ), 0 /* None */);
               break;
+            }
             case 277 /* NamespaceExport */:
               addResult(factory.createExportDeclaration(
                 /*modifiers*/
@@ -51060,7 +51070,9 @@ ${lanes.join("\n")}
                 factory.createStringLiteral(getSpecifierForModuleSymbol(target, context))
               ), 0 /* None */);
               break;
-            case 273 /* ImportSpecifier */:
+            case 273 /* ImportSpecifier */: {
+              const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
+              const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.parent.parent.moduleSpecifier;
               addResult(factory.createImportDeclaration(
                 /*modifiers*/
                 void 0,
@@ -51078,11 +51090,11 @@ ${lanes.join("\n")}
                     )
                   ])
                 ),
-                factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context)),
-                /*assertClause*/
-                void 0
+                specifier2,
+                node.parent.parent.parent.assertClause
               ), 0 /* None */);
               break;
+            }
             case 278 /* ExportSpecifier */:
               const specifier = node.parent.parent.moduleSpecifier;
               serializeExportSpecifier(
@@ -73736,7 +73748,7 @@ ${lanes.join("\n")}
             return getRegularTypeOfObjectLiteral(rightType);
           }
         case 27 /* CommaToken */:
-          if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isEvalNode(right)) {
+          if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isIndirectCall(left.parent)) {
             const sf = getSourceFileOfNode(left);
             const sourceText = sf.text;
             const start = skipTrivia(sourceText, left.pos);
@@ -73778,8 +73790,8 @@ ${lanes.join("\n")}
           }
         }
       }
-      function isEvalNode(node) {
-        return node.kind === 79 /* Identifier */ && node.escapedText === "eval";
+      function isIndirectCall(node) {
+        return node.parent.kind === 214 /* ParenthesizedExpression */ && isNumericLiteral(node.left) && node.left.text === "0" && (isCallExpression(node.parent.parent) && node.parent.parent.expression === node.parent || node.parent.parent.kind === 212 /* TaggedTemplateExpression */) && (isAccessExpression(node.right) || isIdentifier(node.right) && node.right.escapedText === "eval");
       }
       function checkForDisallowedESSymbolOperand(operator2) {
         const offendingSymbolOperand = maybeTypeOfKindConsideringBaseConstraint(leftType, 12288 /* ESSymbolLike */) ? left : maybeTypeOfKindConsideringBaseConstraint(rightType, 12288 /* ESSymbolLike */) ? right : void 0;
@@ -74343,15 +74355,16 @@ ${lanes.join("\n")}
         }
       }
       expr = skipParentheses(node);
+      if (isAwaitExpression(expr)) {
+        const type = getQuickTypeOfExpression(expr.expression);
+        return type ? getAwaitedType(type) : void 0;
+      }
       if (isCallExpression(expr) && expr.expression.kind !== 106 /* SuperKeyword */ && !isRequireCall(
         expr,
         /*checkArgumentIsStringLiteralLike*/
         true
       ) && !isSymbolOrSymbolForCall(expr)) {
-        const type = isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
-        if (type) {
-          return type;
-        }
+        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
       } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
         return getTypeFromTypeNode(expr.type);
       } else if (node.kind === 8 /* NumericLiteral */ || node.kind === 10 /* StringLiteral */ || node.kind === 110 /* TrueKeyword */ || node.kind === 95 /* FalseKeyword */) {
@@ -79518,12 +79531,12 @@ ${lanes.join("\n")}
       if (node.flags & 16777216 /* Ambient */ && !isEntityNameExpression(node.expression)) {
         grammarErrorOnNode(node.expression, Diagnostics.The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context);
       }
-      if (node.isExportEquals && !(node.flags & 16777216 /* Ambient */)) {
-        if (moduleKind >= 5 /* ES2015 */ && getSourceFileOfNode(node).impliedNodeFormat !== 1 /* CommonJS */) {
+      if (node.isExportEquals) {
+        if (moduleKind >= 5 /* ES2015 */ && (node.flags & 16777216 /* Ambient */ && getSourceFileOfNode(node).impliedNodeFormat === 99 /* ESNext */ || !(node.flags & 16777216 /* Ambient */) && getSourceFileOfNode(node).impliedNodeFormat !== 1 /* CommonJS */)) {
           grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_export_default_or_another_module_format_instead);
-        } else if (moduleKind === 4 /* System */) {
+        } else if (moduleKind === 4 /* System */ && !(node.flags & 16777216 /* Ambient */)) {
           grammarErrorOnNode(node, Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
-        } else if (getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */) {
+        } else if (getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */ && !(node.flags & 16777216 /* Ambient */)) {
           grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_moduleResolution_is_set_to_bundler_Consider_using_export_default_or_another_module_format_instead);
         }
       }
@@ -113486,7 +113499,7 @@ ${lanes.join("\n")}
             currentNodeModulesDepth++;
           }
           const elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
-          const shouldAddFile = resolvedFileName && !getResolutionDiagnostic(optionsForFile, resolution) && !optionsForFile.noResolve && index < file.imports.length && !elideImport && !(isJsFile && !getAllowJSCompilerOption(optionsForFile)) && (isInJSFile(file.imports[index]) || !(file.imports[index].flags & 8388608 /* JSDoc */));
+          const shouldAddFile = resolvedFileName && !getResolutionDiagnostic(optionsForFile, resolution, file) && !optionsForFile.noResolve && index < file.imports.length && !elideImport && !(isJsFile && !getAllowJSCompilerOption(optionsForFile)) && (isInJSFile(file.imports[index]) || !(file.imports[index].flags & 8388608 /* JSDoc */));
           if (elideImport) {
             modulesWithElidedImports.set(file.path, true);
           } else if (shouldAddFile) {
@@ -113829,7 +113842,7 @@ ${lanes.join("\n")}
       if (options.preserveValueImports && getEmitModuleKind(options) < 5 /* ES2015 */) {
         createOptionValueDiagnostic("importsNotUsedAsValues", Diagnostics.Option_preserveValueImports_can_only_be_used_when_module_is_set_to_es2015_or_later);
       }
-      if (options.allowImportingTsExtensions && !(moduleResolutionSupportsResolvingTsExtensions(options) && (options.noEmit || options.emitDeclarationOnly))) {
+      if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly)) {
         createOptionValueDiagnostic("allowImportingTsExtensions", Diagnostics.Option_allowImportingTsExtensions_can_only_be_used_when_moduleResolution_is_set_to_bundler_and_either_noEmit_or_emitDeclarationOnly_is_set);
       }
       const moduleResolution = getEmitModuleResolutionKind(options);
@@ -114480,19 +114493,27 @@ ${lanes.join("\n")}
     const passedInRef = ref ? ref : hostOrRef;
     return resolveConfigFileProjectName(passedInRef.path);
   }
-  function getResolutionDiagnostic(options, { extension }) {
+  function getResolutionDiagnostic(options, { extension }, { isDeclarationFile }) {
     switch (extension) {
       case ".ts" /* Ts */:
       case ".d.ts" /* Dts */:
+      case ".mts" /* Mts */:
+      case ".d.mts" /* Dmts */:
+      case ".cts" /* Cts */:
+      case ".d.cts" /* Dcts */:
         return void 0;
       case ".tsx" /* Tsx */:
         return needJsx();
       case ".jsx" /* Jsx */:
         return needJsx() || needAllowJs();
       case ".js" /* Js */:
+      case ".mjs" /* Mjs */:
+      case ".cjs" /* Cjs */:
         return needAllowJs();
       case ".json" /* Json */:
         return needResolveJsonModule();
+      default:
+        return needAllowArbitraryExtensions();
     }
     function needJsx() {
       return options.jsx ? void 0 : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
@@ -114503,6 +114524,9 @@ ${lanes.join("\n")}
     function needResolveJsonModule() {
       return getResolveJsonModule(options) ? void 0 : Diagnostics.Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used;
     }
+    function needAllowArbitraryExtensions() {
+      return isDeclarationFile || options.allowArbitraryExtensions ? void 0 : Diagnostics.Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set;
+    }
   }
   function getModuleNames({ imports, moduleAugmentations }) {
     const res = imports.map((i) => i);
@@ -144542,7 +144566,7 @@ ${lanes.join("\n")}
             break;
           case 291 /* JsxExpression */:
           case 290 /* JsxSpreadAttribute */:
-            if (previousToken.kind === 19 /* CloseBraceToken */ && currentToken.kind === 31 /* GreaterThanToken */) {
+            if (previousToken.kind === 19 /* CloseBraceToken */ || (previousToken.kind === 79 /* Identifier */ || previousToken.parent.kind === 288 /* JsxAttribute */)) {
               isJsxIdentifierExpected = true;
             }
             break;
@@ -146688,6 +146712,10 @@ ${lanes.join("\n")}
     return result;
   }
   function getFilenameWithExtensionOption(name, compilerOptions, extensionOptions) {
+    const nonJsResult = ts_moduleSpecifiers_exports.tryGetRealFileNameForNonJsDeclarationFileName(name);
+    if (nonJsResult) {
+      return { name: nonJsResult, extension: tryGetExtensionFromPath2(nonJsResult) };
+    }
     if (extensionOptions.referenceKind === 0 /* Filename */) {
       return { name, extension: tryGetExtensionFromPath2(name) };
     }
@@ -147633,7 +147661,7 @@ ${lanes.join("\n")}
     if (symbol.declarations) {
       for (const declaration of symbol.declarations) {
         if (isExportSpecifier(declaration) && !declaration.propertyName && !declaration.parent.parent.moduleSpecifier) {
-          return checker.getExportSpecifierLocalTargetSymbol(declaration);
+          return checker.getExportSpecifierLocalTargetSymbol(declaration) || symbol;
         } else if (isPropertyAccessExpression(declaration) && isModuleExportsAccessExpression(declaration.expression) && !isPrivateIdentifier(declaration.name)) {
           return checker.getSymbolAtLocation(declaration);
         } else if (isShorthandPropertyAssignment(declaration) && isBinaryExpression(declaration.parent.parent) && getAssignmentDeclarationKind(declaration.parent.parent) === 2 /* ModuleExports */) {
@@ -165998,7 +166026,6 @@ ${options.prefix}` : "\n" : options.prefix
     moduleResolutionNameAndModeGetter: () => moduleResolutionNameAndModeGetter,
     moduleResolutionOptionDeclarations: () => moduleResolutionOptionDeclarations,
     moduleResolutionSupportsPackageJsonExportsAndImports: () => moduleResolutionSupportsPackageJsonExportsAndImports,
-    moduleResolutionSupportsResolvingTsExtensions: () => moduleResolutionSupportsResolvingTsExtensions,
     moduleResolutionUsesNodeModules: () => moduleResolutionUsesNodeModules,
     moduleSpecifiers: () => ts_moduleSpecifiers_exports,
     moveEmitHelpers: () => moveEmitHelpers,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230109`;
+var version = `${versionMajorMinor}.0-dev.20230110`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6578,6 +6578,9 @@ var Diagnostics = {
   Found_1_error_in_1: diag(6259, 3 /* Message */, "Found_1_error_in_1_6259", "Found 1 error in {1}"),
   Found_0_errors_in_the_same_file_starting_at_Colon_1: diag(6260, 3 /* Message */, "Found_0_errors_in_the_same_file_starting_at_Colon_1_6260", "Found {0} errors in the same file, starting at: {1}"),
   Found_0_errors_in_1_files: diag(6261, 3 /* Message */, "Found_0_errors_in_1_files_6261", "Found {0} errors in {1} files."),
+  File_name_0_has_a_1_extension_looking_up_2_instead: diag(6262, 3 /* Message */, "File_name_0_has_a_1_extension_looking_up_2_instead_6262", "File name '{0}' has a '{1}' extension - looking up '{2}' instead."),
+  Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set: diag(6263, 1 /* Error */, "Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set_6263", "Module '{0}' was resolved to '{1}', but '--allowArbitraryExtensions' is not set."),
+  Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present: diag(6264, 3 /* Message */, "Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present_6264", "Enable importing files with any extension, provided a declaration file is present."),
   Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve: diag(6270, 3 /* Message */, "Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve_6270", "Directory '{0}' has no containing package.json scope. Imports will not resolve."),
   Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1: diag(6271, 3 /* Message */, "Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1_6271", "Import specifier '{0}' does not exist in package.json scope at path '{1}'."),
   Invalid_import_specifier_0_has_no_possible_resolutions: diag(6272, 3 /* Message */, "Invalid_import_specifier_0_has_no_possible_resolutions_6272", "Invalid import specifier '{0}' has no possible resolutions."),
@@ -11421,7 +11424,7 @@ function hostGetCanonicalFileName(host) {
   return createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
 }
 function getPossibleOriginalInputExtensionForExtension(path2) {
-  return fileExtensionIsOneOf(path2, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path2, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path2, [`.json.d.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
+  return fileExtensionIsOneOf(path2, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path2, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path2, [`.d.json.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
 }
 function outFile(options) {
   return options.outFile || options.out;
@@ -22097,7 +22100,7 @@ var Parser;
     const pos = getNodePos();
     return finishNode(factory2.createVoidExpression(nextTokenAnd(parseSimpleUnaryExpression)), pos);
   }
-  function isAwaitExpression() {
+  function isAwaitExpression2() {
     if (token() === 133 /* AwaitKeyword */) {
       if (inAwaitContext()) {
         return true;
@@ -22145,7 +22148,7 @@ var Parser;
       case 29 /* LessThanToken */:
         return parseTypeAssertion();
       case 133 /* AwaitKeyword */:
-        if (isAwaitExpression()) {
+        if (isAwaitExpression2()) {
           return parseAwaitExpression();
         }
       default:
@@ -25808,7 +25811,7 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 function isDeclarationFileName(fileName) {
-  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions);
+  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && stringContains(getBaseFileName(fileName), ".d.");
 }
 function parseResolutionMode(mode, pos, end, reportDiagnostic) {
   if (!mode) {
@@ -27066,6 +27069,14 @@ var commandOptionsWithoutBuild = [
     description: Diagnostics.Enable_importing_json_files,
     defaultValueDescription: false
   },
+  {
+    name: "allowArbitraryExtensions",
+    type: "boolean",
+    affectsModuleResolution: true,
+    category: Diagnostics.Modules,
+    description: Diagnostics.Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present,
+    defaultValueDescription: false
+  },
   {
     name: "out",
     type: "string",
@@ -28641,14 +28652,19 @@ function loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) {
   }
 }
 function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
-  if (hasJSFileExtension(candidate) || extensions & 8 /* Json */ && fileExtensionIs(candidate, ".json" /* Json */) || extensions & (1 /* TypeScript */ | 4 /* Declaration */) && moduleResolutionSupportsResolvingTsExtensions(state.compilerOptions) && fileExtensionIsOneOf(candidate, supportedTSExtensionsFlat)) {
-    const extensionless = removeFileExtension(candidate);
-    const extension = candidate.substring(extensionless.length);
-    if (state.traceEnabled) {
-      trace(state.host, Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
-    }
-    return tryAddingExtensions(extensionless, extensions, extension, onlyRecordFailures, state);
+  const filename = getBaseFileName(candidate);
+  if (filename.indexOf(".") === -1) {
+    return void 0;
+  }
+  let extensionless = removeFileExtension(candidate);
+  if (extensionless === candidate) {
+    extensionless = candidate.substring(0, candidate.lastIndexOf("."));
+  }
+  const extension = candidate.substring(extensionless.length);
+  if (state.traceEnabled) {
+    trace(state.host, Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
   }
+  return tryAddingExtensions(extensionless, extensions, extension, onlyRecordFailures, state);
 }
 function loadFileNameFromPackageJsonField(extensions, candidate, onlyRecordFailures, state) {
   if (extensions & 1 /* TypeScript */ && fileExtensionIsOneOf(candidate, supportedTSImplementationExtensions) || extensions & 4 /* Declaration */ && fileExtensionIsOneOf(candidate, supportedDeclarationExtensions)) {
@@ -28672,38 +28688,23 @@ function tryAddingExtensions(candidate, extensions, originalExtension, onlyRecor
     case ".mjs" /* Mjs */:
     case ".mts" /* Mts */:
     case ".d.mts" /* Dmts */:
-      return extensions & 1 /* TypeScript */ && tryExtension(".mts" /* Mts */) || extensions & 4 /* Declaration */ && tryExtension(".d.mts" /* Dmts */) || extensions & 2 /* JavaScript */ && tryExtension(".mjs" /* Mjs */) || void 0;
+      return extensions & 1 /* TypeScript */ && tryExtension(".mts" /* Mts */, originalExtension === ".mts" /* Mts */ || originalExtension === ".d.mts" /* Dmts */) || extensions & 4 /* Declaration */ && tryExtension(".d.mts" /* Dmts */, originalExtension === ".mts" /* Mts */ || originalExtension === ".d.mts" /* Dmts */) || extensions & 2 /* JavaScript */ && tryExtension(".mjs" /* Mjs */) || void 0;
     case ".cjs" /* Cjs */:
     case ".cts" /* Cts */:
     case ".d.cts" /* Dcts */:
-      return extensions & 1 /* TypeScript */ && tryExtension(".cts" /* Cts */) || extensions & 4 /* Declaration */ && tryExtension(".d.cts" /* Dcts */) || extensions & 2 /* JavaScript */ && tryExtension(".cjs" /* Cjs */) || void 0;
+      return extensions & 1 /* TypeScript */ && tryExtension(".cts" /* Cts */, originalExtension === ".cts" /* Cts */ || originalExtension === ".d.cts" /* Dcts */) || extensions & 4 /* Declaration */ && tryExtension(".d.cts" /* Dcts */, originalExtension === ".cts" /* Cts */ || originalExtension === ".d.cts" /* Dcts */) || extensions & 2 /* JavaScript */ && tryExtension(".cjs" /* Cjs */) || void 0;
     case ".json" /* Json */:
-      const originalCandidate = candidate;
-      if (extensions & 4 /* Declaration */) {
-        candidate += ".json" /* Json */;
-        const result = tryExtension(".d.ts" /* Dts */);
-        if (result)
-          return result;
-      }
-      if (extensions & 8 /* Json */) {
-        candidate = originalCandidate;
-        const result = tryExtension(".json" /* Json */);
-        if (result)
-          return result;
-      }
-      return void 0;
-    case ".ts" /* Ts */:
+      return extensions & 4 /* Declaration */ && tryExtension(".d.json.ts") || extensions & 8 /* Json */ && tryExtension(".json" /* Json */) || void 0;
     case ".tsx" /* Tsx */:
+    case ".jsx" /* Jsx */:
+      return extensions & 1 /* TypeScript */ && (tryExtension(".tsx" /* Tsx */, originalExtension === ".tsx" /* Tsx */) || tryExtension(".ts" /* Ts */, originalExtension === ".tsx" /* Tsx */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */, originalExtension === ".tsx" /* Tsx */) || extensions & 2 /* JavaScript */ && (tryExtension(".jsx" /* Jsx */) || tryExtension(".js" /* Js */)) || void 0;
+    case ".ts" /* Ts */:
     case ".d.ts" /* Dts */:
-      if (moduleResolutionSupportsResolvingTsExtensions(state.compilerOptions) && extensionIsOk(extensions, originalExtension)) {
-        return tryExtension(
-          originalExtension,
-          /*resolvedUsingTsExtension*/
-          true
-        );
-      }
+    case ".js" /* Js */:
+    case "":
+      return extensions & 1 /* TypeScript */ && (tryExtension(".ts" /* Ts */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */) || tryExtension(".tsx" /* Tsx */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */) || extensions & 2 /* JavaScript */ && (tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */)) || state.isConfigLookup && tryExtension(".json" /* Json */) || void 0;
     default:
-      return extensions & 1 /* TypeScript */ && (tryExtension(".ts" /* Ts */) || tryExtension(".tsx" /* Tsx */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */) || extensions & 2 /* JavaScript */ && (tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */)) || state.isConfigLookup && tryExtension(".json" /* Json */) || void 0;
+      return extensions & 4 /* Declaration */ && !isDeclarationFileName(candidate + originalExtension) && tryExtension(`.d${originalExtension}.ts`) || void 0;
   }
   function tryExtension(ext, resolvedUsingTsExtension) {
     const path2 = tryFile(candidate + ext, onlyRecordFailures, state);
@@ -29614,9 +29615,6 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     }
   }
 }
-function moduleResolutionSupportsResolvingTsExtensions(compilerOptions) {
-  return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */;
-}
 function toSearchResult(value) {
   return value !== void 0 ? { value } : void 0;
 }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.0.0-dev.20230109",
+    "version": "5.0.0-dev.20230110",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [