@typescript-deploys/pr-build 5.7.0-pr-59767-2 → 5.7.0-pr-59736-2

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-insiders.20240826`;
+var version = `${versionMajorMinor}.0-insiders.20240827`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7269,7 +7269,6 @@ var Diagnostics = {
   Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0: diag(6418, 3 /* Message */, "Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0_6418", "Searching all ancestor node_modules directories for fallback extensions: {0}."),
   Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_program_needs_to_report_errors: diag(6419, 3 /* Message */, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_program_needs_to_report_errors_6419", "Project '{0}' is out of date because buildinfo file '{1}' indicates that program needs to report errors."),
   Project_0_is_out_of_date_because_1: diag(6420, 3 /* Message */, "Project_0_is_out_of_date_because_1_6420", "Project '{0}' is out of date because {1}."),
-  Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_in_output_files: diag(6421, 3 /* Message */, "Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_i_6421", "Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files."),
   The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, 3 /* Message */, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
   The_expected_type_comes_from_this_index_signature: diag(6501, 3 /* Message */, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
   The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, 3 /* Message */, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -17646,12 +17645,6 @@ function createComputedCompilerOptions(options) {
   return options;
 }
 var computedOptions = createComputedCompilerOptions({
-  allowImportingTsExtensions: {
-    dependencies: ["rewriteRelativeImportExtensions"],
-    computeValue: (compilerOptions) => {
-      return !!(compilerOptions.allowImportingTsExtensions || compilerOptions.rewriteRelativeImportExtensions);
-    }
-  },
   target: {
     dependencies: ["module"],
     computeValue: (compilerOptions) => {
@@ -17865,7 +17858,6 @@ var computedOptions = createComputedCompilerOptions({
     }
   }
 });
-var getAllowImportingTsExtensions = computedOptions.allowImportingTsExtensions.computeValue;
 var getEmitScriptTarget = computedOptions.target.computeValue;
 var getEmitModuleKind = computedOptions.module.computeValue;
 var getEmitModuleResolutionKind = computedOptions.moduleResolution.computeValue;
@@ -36659,15 +36651,6 @@ var commandOptionsWithoutBuild = [
     defaultValueDescription: false,
     transpileOptionValue: void 0
   },
-  {
-    name: "rewriteRelativeImportExtensions",
-    type: "boolean",
-    affectsSemanticDiagnostics: true,
-    affectsBuildInfo: true,
-    category: Diagnostics.Modules,
-    description: Diagnostics.Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_in_output_files,
-    defaultValueDescription: false
-  },
   {
     name: "resolvePackageJsonExports",
     type: "boolean",
@@ -41301,7 +41284,7 @@ function resolveFromTypeRoot(moduleName, state) {
   }
 }
 function shouldAllowImportingTsExtension(compilerOptions, fromFileName) {
-  return getAllowImportingTsExtensions(compilerOptions) || fromFileName && isDeclarationFileName(fromFileName);
+  return !!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName);
 }
 function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache, packageJsonInfoCache) {
   const traceEnabled = isTraceEnabled(compilerOptions, host);
@@ -93041,17 +93024,10 @@ function transformTypeScript(context) {
       /*modifiers*/
       void 0,
       importClause,
-      rewriteModuleSpecifier(node.moduleSpecifier),
+      node.moduleSpecifier,
       node.attributes
     ) : void 0;
   }
-  function rewriteModuleSpecifier(node) {
-    if (!node || !compilerOptions.rewriteRelativeImportExtensions || !isStringLiteral(node) || !pathIsRelative(node.text) || isDeclarationFileName(node.text)) {
-      return node;
-    }
-    const updatedText = changeExtension(node.text, getOutputExtension(node.text, compilerOptions));
-    return updatedText !== node.text ? setOriginalNode(setTextRange(factory2.createStringLiteral(updatedText, node.singleQuote), node), node) : node;
-  }
   function visitImportClause(node) {
     Debug.assert(!node.isTypeOnly);
     const name = shouldEmitAliasDeclaration(node) ? node.name : void 0;
@@ -93084,14 +93060,7 @@ function transformTypeScript(context) {
       return void 0;
     }
     if (!node.exportClause || isNamespaceExport(node.exportClause)) {
-      return factory2.updateExportDeclaration(
-        node,
-        node.modifiers,
-        node.isTypeOnly,
-        node.exportClause,
-        rewriteModuleSpecifier(node.moduleSpecifier),
-        node.attributes
-      );
+      return node;
     }
     const allowEmpty = !!compilerOptions.verbatimModuleSyntax;
     const exportClause = visitNode(
@@ -93105,7 +93074,7 @@ function transformTypeScript(context) {
       void 0,
       node.isTypeOnly,
       exportClause,
-      rewriteModuleSpecifier(node.moduleSpecifier),
+      node.moduleSpecifier,
       node.attributes
     ) : void 0;
   }
@@ -93130,24 +93099,8 @@ function transformTypeScript(context) {
       return void 0;
     }
     if (isExternalModuleImportEqualsDeclaration(node)) {
-      if (!shouldEmitAliasDeclaration(node)) {
-        return void 0;
-      }
-      const updatedModuleSpecifier = rewriteModuleSpecifier(node.moduleReference.expression);
-      if (updatedModuleSpecifier !== node.moduleReference.expression) {
-        return visitEachChild(
-          factory2.updateImportEqualsDeclaration(
-            node,
-            node.modifiers,
-            node.isTypeOnly,
-            node.name,
-            factory2.updateExternalModuleReference(node.moduleReference, updatedModuleSpecifier)
-          ),
-          visitor,
-          context
-        );
-      }
-      return visitEachChild(node, visitor, context);
+      const isReferenced = shouldEmitAliasDeclaration(node);
+      return isReferenced ? visitEachChild(node, visitor, context) : void 0;
     }
     if (!shouldEmitImportEqualsDeclaration(node)) {
       return void 0;
@@ -122516,7 +122469,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
       }
     }
-    if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly || options.rewriteRelativeImportExtensions)) {
+    if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly)) {
       createOptionValueDiagnostic("allowImportingTsExtensions", Diagnostics.Option_allowImportingTsExtensions_can_only_be_used_when_either_noEmit_or_emitDeclarationOnly_is_set);
     }
     const moduleResolution = getEmitModuleResolutionKind(options);

package/lib/typescript.d.ts

@@ -7021,7 +7021,6 @@ declare namespace ts {
         removeComments?: boolean;
         resolvePackageJsonExports?: boolean;
         resolvePackageJsonImports?: boolean;
-        rewriteRelativeImportExtensions?: boolean;
         rootDir?: string;
         rootDirs?: string[];
         skipLibCheck?: boolean;

package/lib/typescript.js

@@ -633,7 +633,6 @@ __export(typescript_exports, {
   getAllKeys: () => getAllKeys,
   getAllProjectOutputs: () => getAllProjectOutputs,
   getAllSuperTypeNodes: () => getAllSuperTypeNodes,
-  getAllowImportingTsExtensions: () => getAllowImportingTsExtensions,
   getAllowJSCompilerOption: () => getAllowJSCompilerOption,
   getAllowSyntheticDefaultImports: () => getAllowSyntheticDefaultImports,
   getAncestor: () => getAncestor,
@@ -2266,7 +2265,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-insiders.20240826`;
+var version = `${versionMajorMinor}.0-insiders.20240827`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10670,7 +10669,6 @@ var Diagnostics = {
   Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0: diag(6418, 3 /* Message */, "Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0_6418", "Searching all ancestor node_modules directories for fallback extensions: {0}."),
   Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_program_needs_to_report_errors: diag(6419, 3 /* Message */, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_program_needs_to_report_errors_6419", "Project '{0}' is out of date because buildinfo file '{1}' indicates that program needs to report errors."),
   Project_0_is_out_of_date_because_1: diag(6420, 3 /* Message */, "Project_0_is_out_of_date_because_1_6420", "Project '{0}' is out of date because {1}."),
-  Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_in_output_files: diag(6421, 3 /* Message */, "Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_i_6421", "Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files."),
   The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, 3 /* Message */, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
   The_expected_type_comes_from_this_index_signature: diag(6501, 3 /* Message */, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
   The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, 3 /* Message */, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -21614,12 +21612,6 @@ function createComputedCompilerOptions(options) {
   return options;
 }
 var computedOptions = createComputedCompilerOptions({
-  allowImportingTsExtensions: {
-    dependencies: ["rewriteRelativeImportExtensions"],
-    computeValue: (compilerOptions) => {
-      return !!(compilerOptions.allowImportingTsExtensions || compilerOptions.rewriteRelativeImportExtensions);
-    }
-  },
   target: {
     dependencies: ["module"],
     computeValue: (compilerOptions) => {
@@ -21833,7 +21825,6 @@ var computedOptions = createComputedCompilerOptions({
     }
   }
 });
-var getAllowImportingTsExtensions = computedOptions.allowImportingTsExtensions.computeValue;
 var getEmitScriptTarget = computedOptions.target.computeValue;
 var getEmitModuleKind = computedOptions.module.computeValue;
 var getEmitModuleResolutionKind = computedOptions.moduleResolution.computeValue;
@@ -40933,15 +40924,6 @@ var commandOptionsWithoutBuild = [
     defaultValueDescription: false,
     transpileOptionValue: void 0
   },
-  {
-    name: "rewriteRelativeImportExtensions",
-    type: "boolean",
-    affectsSemanticDiagnostics: true,
-    affectsBuildInfo: true,
-    category: Diagnostics.Modules,
-    description: Diagnostics.Rewrite_ts_tsx_mts_and_cts_file_extensions_in_relative_import_paths_to_their_JavaScript_equivalent_in_output_files,
-    defaultValueDescription: false
-  },
   {
     name: "resolvePackageJsonExports",
     type: "boolean",
@@ -45806,7 +45788,7 @@ function resolveFromTypeRoot(moduleName, state) {
   }
 }
 function shouldAllowImportingTsExtension(compilerOptions, fromFileName) {
-  return getAllowImportingTsExtensions(compilerOptions) || fromFileName && isDeclarationFileName(fromFileName);
+  return !!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName);
 }
 function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache, packageJsonInfoCache) {
   const traceEnabled = isTraceEnabled(compilerOptions, host);
@@ -97846,17 +97828,10 @@ function transformTypeScript(context) {
       /*modifiers*/
       void 0,
       importClause,
-      rewriteModuleSpecifier(node.moduleSpecifier),
+      node.moduleSpecifier,
       node.attributes
     ) : void 0;
   }
-  function rewriteModuleSpecifier(node) {
-    if (!node || !compilerOptions.rewriteRelativeImportExtensions || !isStringLiteral(node) || !pathIsRelative(node.text) || isDeclarationFileName(node.text)) {
-      return node;
-    }
-    const updatedText = changeExtension(node.text, getOutputExtension(node.text, compilerOptions));
-    return updatedText !== node.text ? setOriginalNode(setTextRange(factory2.createStringLiteral(updatedText, node.singleQuote), node), node) : node;
-  }
   function visitImportClause(node) {
     Debug.assert(!node.isTypeOnly);
     const name = shouldEmitAliasDeclaration(node) ? node.name : void 0;
@@ -97889,14 +97864,7 @@ function transformTypeScript(context) {
       return void 0;
     }
     if (!node.exportClause || isNamespaceExport(node.exportClause)) {
-      return factory2.updateExportDeclaration(
-        node,
-        node.modifiers,
-        node.isTypeOnly,
-        node.exportClause,
-        rewriteModuleSpecifier(node.moduleSpecifier),
-        node.attributes
-      );
+      return node;
     }
     const allowEmpty = !!compilerOptions.verbatimModuleSyntax;
     const exportClause = visitNode(
@@ -97910,7 +97878,7 @@ function transformTypeScript(context) {
       void 0,
       node.isTypeOnly,
       exportClause,
-      rewriteModuleSpecifier(node.moduleSpecifier),
+      node.moduleSpecifier,
       node.attributes
     ) : void 0;
   }
@@ -97935,24 +97903,8 @@ function transformTypeScript(context) {
       return void 0;
     }
     if (isExternalModuleImportEqualsDeclaration(node)) {
-      if (!shouldEmitAliasDeclaration(node)) {
-        return void 0;
-      }
-      const updatedModuleSpecifier = rewriteModuleSpecifier(node.moduleReference.expression);
-      if (updatedModuleSpecifier !== node.moduleReference.expression) {
-        return visitEachChild(
-          factory2.updateImportEqualsDeclaration(
-            node,
-            node.modifiers,
-            node.isTypeOnly,
-            node.name,
-            factory2.updateExternalModuleReference(node.moduleReference, updatedModuleSpecifier)
-          ),
-          visitor,
-          context
-        );
-      }
-      return visitEachChild(node, visitor, context);
+      const isReferenced = shouldEmitAliasDeclaration(node);
+      return isReferenced ? visitEachChild(node, visitor, context) : void 0;
     }
     if (!shouldEmitImportEqualsDeclaration(node)) {
       return void 0;
@@ -127378,7 +127330,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
       }
     }
-    if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly || options.rewriteRelativeImportExtensions)) {
+    if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly)) {
       createOptionValueDiagnostic("allowImportingTsExtensions", Diagnostics.Option_allowImportingTsExtensions_can_only_be_used_when_either_noEmit_or_emitDeclarationOnly_is_set);
     }
     const moduleResolution = getEmitModuleResolutionKind(options);
@@ -178751,6 +178703,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
       Debug.assert(rangeContainsRange(parent2, currentTokenInfo.token));
       const lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine();
       let indentToken = false;
+      let isNewlineSemicolon = false;
       if (currentTokenInfo.leadingTrivia) {
         processTrivia(currentTokenInfo.leadingTrivia, parent2, childContextNode, dynamicIndentation);
       }
@@ -178765,6 +178718,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
           if (lineAction === 0 /* None */) {
             const prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
             indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
+            isNewlineSemicolon = currentTokenInfo.token.kind === 27 /* SemicolonToken */;
           } else {
             indentToken = lineAction === 1 /* LineAdded */;
           }
@@ -178775,7 +178729,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
         processTrivia(currentTokenInfo.trailingTrivia, parent2, childContextNode, dynamicIndentation);
       }
       if (indentToken) {
-        const tokenIndentation = isTokenInRange && !rangeContainsError(currentTokenInfo.token) ? dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container, !!isListEndToken) : -1 /* Unknown */;
+        const tokenIndentation = isTokenInRange && !rangeContainsError(currentTokenInfo.token) ? dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container, !!isListEndToken || isNewlineSemicolon) : -1 /* Unknown */;
         let indentNextTokenOrTrivia = true;
         if (currentTokenInfo.leadingTrivia) {
           const commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind, tokenIndentation, container);
@@ -180407,7 +180361,6 @@ __export(ts_exports2, {
   getAllKeys: () => getAllKeys,
   getAllProjectOutputs: () => getAllProjectOutputs,
   getAllSuperTypeNodes: () => getAllSuperTypeNodes,
-  getAllowImportingTsExtensions: () => getAllowImportingTsExtensions,
   getAllowJSCompilerOption: () => getAllowJSCompilerOption,
   getAllowSyntheticDefaultImports: () => getAllowSyntheticDefaultImports,
   getAncestor: () => getAncestor,
@@ -194766,7 +194719,6 @@ if (typeof console !== "undefined") {
   getAllKeys,
   getAllProjectOutputs,
   getAllSuperTypeNodes,
-  getAllowImportingTsExtensions,
   getAllowJSCompilerOption,
   getAllowSyntheticDefaultImports,
   getAncestor,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.7.0-pr-59767-2",
+  "version": "5.7.0-pr-59736-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [