From 632eab43f2a4147bc4b533aebf288acb3abb2c90 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 1 Dec 2023 01:11:27 +0000 Subject: [PATCH 1/2] Merge 9a75d6da9cd99d628c80b09d854ad6e7cd1fea67 into 6edfef8c0d4535eb8fdb83405f57dabec9b8166f --- src/services/transpile.ts | 3 ++- tests/baselines/reference/api/typescript.d.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/transpile.ts b/src/services/transpile.ts index 9637387afa093..0b708e6282635 100644 --- a/src/services/transpile.ts +++ b/src/services/transpile.ts @@ -36,6 +36,7 @@ export interface TranspileOptions { moduleName?: string; renamedDependencies?: MapLike; transformers?: CustomTransformers; + jsDocParsingMode?: JSDocParsingMode; } export interface TranspileOutput { @@ -121,7 +122,7 @@ export function transpileModule(input: string, transpileOptions: TranspileOption languageVersion: getEmitScriptTarget(options), impliedNodeFormat: getImpliedNodeFormatForFile(toPath(inputFileName, "", compilerHost.getCanonicalFileName), /*packageJsonInfoCache*/ undefined, compilerHost, options), setExternalModuleIndicator: getSetExternalModuleIndicator(options), - jsDocParsingMode: JSDocParsingMode.ParseNone, + jsDocParsingMode: transpileOptions.jsDocParsingMode ?? JSDocParsingMode.ParseNone, }, ); if (transpileOptions.moduleName) { diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 986c17630bfe2..754fc50cdd483 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -11614,6 +11614,7 @@ declare namespace ts { moduleName?: string; renamedDependencies?: MapLike; transformers?: CustomTransformers; + jsDocParsingMode?: JSDocParsingMode; } interface TranspileOutput { outputText: string; From fde5b3e62fce2d61010c91157a2a5c5c55df25bd Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 1 Dec 2023 11:59:51 -0800 Subject: [PATCH 2/2] Apply suggestions from code review --- src/services/transpile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/transpile.ts b/src/services/transpile.ts index 0b708e6282635..a15b48d8d7436 100644 --- a/src/services/transpile.ts +++ b/src/services/transpile.ts @@ -122,7 +122,7 @@ export function transpileModule(input: string, transpileOptions: TranspileOption languageVersion: getEmitScriptTarget(options), impliedNodeFormat: getImpliedNodeFormatForFile(toPath(inputFileName, "", compilerHost.getCanonicalFileName), /*packageJsonInfoCache*/ undefined, compilerHost, options), setExternalModuleIndicator: getSetExternalModuleIndicator(options), - jsDocParsingMode: transpileOptions.jsDocParsingMode ?? JSDocParsingMode.ParseNone, + jsDocParsingMode: transpileOptions.jsDocParsingMode ?? JSDocParsingMode.ParseAll, }, ); if (transpileOptions.moduleName) {