typescript 5.6.0-dev.20240703 → 5.6.0-dev.20240705

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240703`;
+var version = `${versionMajorMinor}.0-dev.20240705`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -114395,7 +114395,13 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     );
   }
   function emitLiteral(node, jsxAttributeEscape) {
-    const text = getLiteralTextOfNode(node, printerOptions.neverAsciiEscape, jsxAttributeEscape);
+    const text = getLiteralTextOfNode(
+      node,
+      /*sourceFile*/
+      void 0,
+      printerOptions.neverAsciiEscape,
+      jsxAttributeEscape
+    );
     if ((printerOptions.sourceMap || printerOptions.inlineSourceMap) && (node.kind === 11 /* StringLiteral */ || isTemplateLiteralKind(node.kind))) {
       writeLiteral(text);
     } else {
@@ -114876,6 +114882,8 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     if (isNumericLiteral(expression)) {
       const text = getLiteralTextOfNode(
         expression,
+        /*sourceFile*/
+        void 0,
         /*neverAsciiEscape*/
         true,
         /*jsxAttributeEscape*/
@@ -117017,18 +117025,18 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
     return getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia);
   }
-  function getLiteralTextOfNode(node, neverAsciiEscape, jsxAttributeEscape) {
+  function getLiteralTextOfNode(node, sourceFile = currentSourceFile, neverAsciiEscape, jsxAttributeEscape) {
     if (node.kind === 11 /* StringLiteral */ && node.textSourceNode) {
       const textSourceNode = node.textSourceNode;
       if (isIdentifier(textSourceNode) || isPrivateIdentifier(textSourceNode) || isNumericLiteral(textSourceNode) || isJsxNamespacedName(textSourceNode)) {
         const text = isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode2(textSourceNode);
         return jsxAttributeEscape ? `"${escapeJsxAttributeString(text)}"` : neverAsciiEscape || getEmitFlags(node) & 16777216 /* NoAsciiEscaping */ ? `"${escapeString(text)}"` : `"${escapeNonAsciiString(text)}"`;
       } else {
-        return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
+        return getLiteralTextOfNode(textSourceNode, getSourceFileOfNode(textSourceNode), neverAsciiEscape, jsxAttributeEscape);
       }
     }
     const flags = (neverAsciiEscape ? 1 /* NeverAsciiEscape */ : 0) | (jsxAttributeEscape ? 2 /* JsxAttributeEscape */ : 0) | (printerOptions.terminateUnterminatedLiterals ? 4 /* TerminateUnterminatedLiterals */ : 0) | (printerOptions.target && printerOptions.target >= 8 /* ES2021 */ ? 8 /* AllowNumericSeparator */ : 0);
-    return getLiteralText(node, currentSourceFile, flags);
+    return getLiteralText(node, sourceFile, flags);
   }
   function pushNameGenerationScope(node) {
     privateNameTempFlagsStack.push(privateNameTempFlags);

package/lib/typescript.d.ts

@@ -214,6 +214,22 @@ declare namespace ts {
                  * The time spent creating or updating the auto-import program, in milliseconds.
                  */
                 createAutoImportProviderProgramDurationMs?: number;
+                /**
+                 * The time spent computing diagnostics, in milliseconds.
+                 */
+                diagnosticsDuration?: FileDiagnosticPerformanceData[];
+            }
+            /**
+             * Time spent computing each kind of diagnostics, in milliseconds.
+             */
+            export type DiagnosticPerformanceData = {
+                [Kind in DiagnosticEventKind]?: number;
+            };
+            export interface FileDiagnosticPerformanceData extends DiagnosticPerformanceData {
+                /**
+                 * The file for which the performance data is reported.
+                 */
+                file: string;
             }
             /**
              * Arguments for FileRequest messages.
@@ -1979,10 +1995,6 @@ declare namespace ts {
                  * Spans where the region diagnostic was requested, if this is a region semantic diagnostic event.
                  */
                 spans?: TextSpan[];
-                /**
-                 * Time spent computing the diagnostics, in milliseconds.
-                 */
-                duration?: number;
             }
             export type DiagnosticEventKind = "semanticDiag" | "syntaxDiag" | "suggestionDiag" | "regionSemanticDiag";
             /**
@@ -3416,6 +3428,7 @@ declare namespace ts {
             constructor(opts: SessionOptions);
             private sendRequestCompletedEvent;
             private addPerformanceData;
+            private addDiagnosticsPerformanceData;
             private performanceEventHandler;
             private defaultEventHandler;
             private projectsUpdatedInBackgroundEvent;

package/lib/typescript.js

@@ -2250,7 +2250,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240703`;
+var version = `${versionMajorMinor}.0-dev.20240705`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -119176,7 +119176,13 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     );
   }
   function emitLiteral(node, jsxAttributeEscape) {
-    const text = getLiteralTextOfNode(node, printerOptions.neverAsciiEscape, jsxAttributeEscape);
+    const text = getLiteralTextOfNode(
+      node,
+      /*sourceFile*/
+      void 0,
+      printerOptions.neverAsciiEscape,
+      jsxAttributeEscape
+    );
     if ((printerOptions.sourceMap || printerOptions.inlineSourceMap) && (node.kind === 11 /* StringLiteral */ || isTemplateLiteralKind(node.kind))) {
       writeLiteral(text);
     } else {
@@ -119657,6 +119663,8 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     if (isNumericLiteral(expression)) {
       const text = getLiteralTextOfNode(
         expression,
+        /*sourceFile*/
+        void 0,
         /*neverAsciiEscape*/
         true,
         /*jsxAttributeEscape*/
@@ -121798,18 +121806,18 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
     return getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia);
   }
-  function getLiteralTextOfNode(node, neverAsciiEscape, jsxAttributeEscape) {
+  function getLiteralTextOfNode(node, sourceFile = currentSourceFile, neverAsciiEscape, jsxAttributeEscape) {
     if (node.kind === 11 /* StringLiteral */ && node.textSourceNode) {
       const textSourceNode = node.textSourceNode;
       if (isIdentifier(textSourceNode) || isPrivateIdentifier(textSourceNode) || isNumericLiteral(textSourceNode) || isJsxNamespacedName(textSourceNode)) {
         const text = isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode2(textSourceNode);
         return jsxAttributeEscape ? `"${escapeJsxAttributeString(text)}"` : neverAsciiEscape || getEmitFlags(node) & 16777216 /* NoAsciiEscaping */ ? `"${escapeString(text)}"` : `"${escapeNonAsciiString(text)}"`;
       } else {
-        return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
+        return getLiteralTextOfNode(textSourceNode, getSourceFileOfNode(textSourceNode), neverAsciiEscape, jsxAttributeEscape);
       }
     }
     const flags = (neverAsciiEscape ? 1 /* NeverAsciiEscape */ : 0) | (jsxAttributeEscape ? 2 /* JsxAttributeEscape */ : 0) | (printerOptions.terminateUnterminatedLiterals ? 4 /* TerminateUnterminatedLiterals */ : 0) | (printerOptions.target && printerOptions.target >= 8 /* ES2021 */ ? 8 /* AllowNumericSeparator */ : 0);
-    return getLiteralText(node, currentSourceFile, flags);
+    return getLiteralText(node, sourceFile, flags);
   }
   function pushNameGenerationScope(node) {
     privateNameTempFlagsStack.push(privateNameTempFlags);
@@ -189594,7 +189602,13 @@ var Session3 = class _Session {
     }
   }
   sendRequestCompletedEvent(requestId, performanceData) {
-    this.event({ request_seq: requestId, performanceData }, "requestCompleted");
+    this.event(
+      {
+        request_seq: requestId,
+        performanceData: performanceData && toProtocolPerformanceData(performanceData)
+      },
+      "requestCompleted"
+    );
   }
   addPerformanceData(key, value) {
     if (!this.performanceData) {
@@ -189602,6 +189616,15 @@ var Session3 = class _Session {
     }
     this.performanceData[key] = (this.performanceData[key] ?? 0) + value;
   }
+  addDiagnosticsPerformanceData(file, kind, duration) {
+    var _a, _b;
+    if (!this.performanceData) {
+      this.performanceData = {};
+    }
+    let fileDiagnosticDuration = (_a = this.performanceData.diagnosticsDuration) == null ? void 0 : _a.get(file);
+    if (!fileDiagnosticDuration) ((_b = this.performanceData).diagnosticsDuration ?? (_b.diagnosticsDuration = /* @__PURE__ */ new Map())).set(file, fileDiagnosticDuration = {});
+    fileDiagnosticDuration[kind] = duration;
+  }
   performanceEventHandler(event) {
     switch (event.kind) {
       case "UpdateGraph":
@@ -189758,7 +189781,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       command: cmdName,
       request_seq: reqSeq,
       success,
-      performanceData
+      performanceData: performanceData && toProtocolPerformanceData(performanceData)
     };
     if (success) {
       let metadata;
@@ -189836,13 +189859,13 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       const body = {
         file,
         diagnostics: diagnostics.map((diag2) => formatDiag(file, project, diag2)),
-        spans: spans == null ? void 0 : spans.map((span) => toProtocolTextSpan(span, scriptInfo)),
-        duration
+        spans: spans == null ? void 0 : spans.map((span) => toProtocolTextSpan(span, scriptInfo))
       };
       this.event(
         body,
         kind
       );
+      this.addDiagnosticsPerformanceData(file, kind, duration);
     } catch (err) {
       this.logError(err, kind);
     }
@@ -191749,6 +191772,10 @@ ${e.message}`;
     return this.projectService.getHostPreferences();
   }
 };
+function toProtocolPerformanceData(performanceData) {
+  const diagnosticsDuration = performanceData.diagnosticsDuration && arrayFrom(performanceData.diagnosticsDuration, ([file, data]) => ({ ...data, file }));
+  return { ...performanceData, diagnosticsDuration };
+}
 function toProtocolTextSpan(textSpan, scriptInfo) {
   return {
     start: scriptInfo.positionToLineOffset(textSpan.start),

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240703",
+    "version": "5.6.0-dev.20240705",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "7bd7dfc007999f6ed2ab0491821d9d136b6293d4"
+    "gitHead": "3163fe7e3898c1f48cd9bc097b96e3426cd2a453"
 }