typescript 5.4.0-dev.20231128 → 5.4.0-dev.20231129

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231128`;
+var version = `${versionMajorMinor}.0-dev.20231129`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -32696,18 +32696,7 @@ var Parser;
         }
         nextTokenJSDoc();
         skipWhitespace();
-        const p2 = getNodePos();
-        let name = tokenIsIdentifierOrKeyword(token()) ? parseEntityName(
-          /*allowReservedWords*/
-          true
-        ) : void 0;
-        if (name) {
-          while (token() === 81 /* PrivateIdentifier */) {
-            reScanHashToken();
-            nextTokenJSDoc();
-            name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), p2);
-          }
-        }
+        const name = parseJSDocLinkName();
         const text = [];
         while (token() !== 20 /* CloseBraceToken */ && token() !== 4 /* NewLineTrivia */ && token() !== 1 /* EndOfFileToken */) {
           text.push(scanner.getTokenText());
@@ -32716,6 +32705,26 @@ var Parser;
         const create = linkType === "link" ? factory2.createJSDocLink : linkType === "linkcode" ? factory2.createJSDocLinkCode : factory2.createJSDocLinkPlain;
         return finishNode(create(name, text.join("")), start2, scanner.getTokenEnd());
       }
+      function parseJSDocLinkName() {
+        if (tokenIsIdentifierOrKeyword(token())) {
+          const pos = getNodePos();
+          let name = parseIdentifierName();
+          while (parseOptional(25 /* DotToken */)) {
+            name = finishNode(factory2.createQualifiedName(name, token() === 81 /* PrivateIdentifier */ ? createMissingNode(
+              80 /* Identifier */,
+              /*reportAtCurrentPosition*/
+              false
+            ) : parseIdentifier()), pos);
+          }
+          while (token() === 81 /* PrivateIdentifier */) {
+            reScanHashToken();
+            nextTokenJSDoc();
+            name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), pos);
+          }
+          return name;
+        }
+        return void 0;
+      }
       function parseJSDocLinkPrefix() {
         skipWhitespaceOrAsterisk();
         if (token() === 19 /* OpenBraceToken */ && nextTokenJSDoc() === 60 /* AtToken */ && tokenIsIdentifierOrKeyword(nextTokenJSDoc())) {
@@ -66901,14 +66910,15 @@ function createTypeChecker(host) {
     if (declaration) {
       if (isBindingElement(declaration) && !declaration.initializer && !declaration.dotDotDotToken && declaration.parent.elements.length >= 2) {
         const parent = declaration.parent.parent;
-        if (parent.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(declaration) & 6 /* Constant */ || parent.kind === 169 /* Parameter */) {
+        const rootDeclaration = getRootDeclaration(parent);
+        if (rootDeclaration.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(rootDeclaration) & 6 /* Constant */ || rootDeclaration.kind === 169 /* Parameter */) {
           const links = getNodeLinks(parent);
           if (!(links.flags & 4194304 /* InCheckIdentifier */)) {
             links.flags |= 4194304 /* InCheckIdentifier */;
             const parentType = getTypeForBindingElementParent(parent, 0 /* Normal */);
             const parentTypeConstraint = parentType && mapType(parentType, getBaseConstraintOrType);
             links.flags &= ~4194304 /* InCheckIdentifier */;
-            if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(parent.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
+            if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(rootDeclaration.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
               const pattern = declaration.parent;
               const narrowedType = getFlowTypeOfReference(
                 pattern,

package/lib/tsserver.js

@@ -545,6 +545,7 @@ __export(server_exports, {
   escapeNonAsciiString: () => escapeNonAsciiString,
   escapeSnippetText: () => escapeSnippetText,
   escapeString: () => escapeString,
+  escapeTemplateSubstitution: () => escapeTemplateSubstitution,
   every: () => every,
   expandPreOrPostfixIncrementOrDecrementExpression: () => expandPreOrPostfixIncrementOrDecrementExpression,
   explainFiles: () => explainFiles,
@@ -2331,7 +2332,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231128`;
+var version = `${versionMajorMinor}.0-dev.20231129`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -37122,18 +37123,7 @@ var Parser;
         }
         nextTokenJSDoc();
         skipWhitespace();
-        const p2 = getNodePos();
-        let name = tokenIsIdentifierOrKeyword(token()) ? parseEntityName(
-          /*allowReservedWords*/
-          true
-        ) : void 0;
-        if (name) {
-          while (token() === 81 /* PrivateIdentifier */) {
-            reScanHashToken();
-            nextTokenJSDoc();
-            name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), p2);
-          }
-        }
+        const name = parseJSDocLinkName();
         const text = [];
         while (token() !== 20 /* CloseBraceToken */ && token() !== 4 /* NewLineTrivia */ && token() !== 1 /* EndOfFileToken */) {
           text.push(scanner2.getTokenText());
@@ -37142,6 +37132,26 @@ var Parser;
         const create = linkType === "link" ? factory2.createJSDocLink : linkType === "linkcode" ? factory2.createJSDocLinkCode : factory2.createJSDocLinkPlain;
         return finishNode(create(name, text.join("")), start3, scanner2.getTokenEnd());
       }
+      function parseJSDocLinkName() {
+        if (tokenIsIdentifierOrKeyword(token())) {
+          const pos = getNodePos();
+          let name = parseIdentifierName();
+          while (parseOptional(25 /* DotToken */)) {
+            name = finishNode(factory2.createQualifiedName(name, token() === 81 /* PrivateIdentifier */ ? createMissingNode(
+              80 /* Identifier */,
+              /*reportAtCurrentPosition*/
+              false
+            ) : parseIdentifier()), pos);
+          }
+          while (token() === 81 /* PrivateIdentifier */) {
+            reScanHashToken();
+            nextTokenJSDoc();
+            name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), pos);
+          }
+          return name;
+        }
+        return void 0;
+      }
       function parseJSDocLinkPrefix() {
         skipWhitespaceOrAsterisk();
         if (token() === 19 /* OpenBraceToken */ && nextTokenJSDoc() === 60 /* AtToken */ && tokenIsIdentifierOrKeyword(nextTokenJSDoc())) {
@@ -71627,14 +71637,15 @@ function createTypeChecker(host) {
     if (declaration) {
       if (isBindingElement(declaration) && !declaration.initializer && !declaration.dotDotDotToken && declaration.parent.elements.length >= 2) {
         const parent2 = declaration.parent.parent;
-        if (parent2.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(declaration) & 6 /* Constant */ || parent2.kind === 169 /* Parameter */) {
+        const rootDeclaration = getRootDeclaration(parent2);
+        if (rootDeclaration.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(rootDeclaration) & 6 /* Constant */ || rootDeclaration.kind === 169 /* Parameter */) {
           const links = getNodeLinks(parent2);
           if (!(links.flags & 4194304 /* InCheckIdentifier */)) {
             links.flags |= 4194304 /* InCheckIdentifier */;
             const parentType = getTypeForBindingElementParent(parent2, 0 /* Normal */);
             const parentTypeConstraint = parentType && mapType(parentType, getBaseConstraintOrType);
             links.flags &= ~4194304 /* InCheckIdentifier */;
-            if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(parent2.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
+            if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(rootDeclaration.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
               const pattern = declaration.parent;
               const narrowedType = getFlowTypeOfReference(
                 pattern,
@@ -165843,6 +165854,28 @@ function provideInlayHints(context) {
           parts.push({ text: tokenToString(node.operator) });
           visitForDisplayParts(node.operand);
           break;
+        case 203 /* TemplateLiteralType */:
+          Debug.assertNode(node, isTemplateLiteralTypeNode);
+          visitForDisplayParts(node.head);
+          node.templateSpans.forEach(visitForDisplayParts);
+          break;
+        case 16 /* TemplateHead */:
+          Debug.assertNode(node, isTemplateHead);
+          parts.push({ text: getLiteralText2(node) });
+          break;
+        case 204 /* TemplateLiteralTypeSpan */:
+          Debug.assertNode(node, isTemplateLiteralTypeSpan);
+          visitForDisplayParts(node.type);
+          visitForDisplayParts(node.literal);
+          break;
+        case 17 /* TemplateMiddle */:
+          Debug.assertNode(node, isTemplateMiddle);
+          parts.push({ text: getLiteralText2(node) });
+          break;
+        case 18 /* TemplateTail */:
+          Debug.assertNode(node, isTemplateTail);
+          parts.push({ text: getLiteralText2(node) });
+          break;
         case 197 /* ThisType */:
           Debug.assertNode(node, isThisTypeNode);
           parts.push({ text: "this" });
@@ -165870,8 +165903,22 @@ function provideInlayHints(context) {
       });
     }
     function getLiteralText2(node) {
-      if (isStringLiteral(node)) {
-        return quotePreference === 0 /* Single */ ? `'${escapeString(node.text, 39 /* singleQuote */)}'` : `"${escapeString(node.text, 34 /* doubleQuote */)}"`;
+      switch (node.kind) {
+        case 11 /* StringLiteral */:
+          return quotePreference === 0 /* Single */ ? `'${escapeString(node.text, 39 /* singleQuote */)}'` : `"${escapeString(node.text, 34 /* doubleQuote */)}"`;
+        case 16 /* TemplateHead */:
+        case 17 /* TemplateMiddle */:
+        case 18 /* TemplateTail */: {
+          const rawText = node.rawText ?? escapeTemplateSubstitution(escapeString(node.text, 96 /* backtick */));
+          switch (node.kind) {
+            case 16 /* TemplateHead */:
+              return "`" + rawText + "${";
+            case 17 /* TemplateMiddle */:
+              return "}" + rawText + "${";
+            case 18 /* TemplateTail */:
+              return "}" + rawText + "`";
+          }
+        }
       }
       return node.text;
     }
@@ -173436,6 +173483,7 @@ __export(ts_exports2, {
   escapeNonAsciiString: () => escapeNonAsciiString,
   escapeSnippetText: () => escapeSnippetText,
   escapeString: () => escapeString,
+  escapeTemplateSubstitution: () => escapeTemplateSubstitution,
   every: () => every,
   expandPreOrPostfixIncrementOrDecrementExpression: () => expandPreOrPostfixIncrementOrDecrementExpression,
   explainFiles: () => explainFiles,
@@ -188227,6 +188275,7 @@ start(initializeNodeSystem(), require("os").platform());
   escapeNonAsciiString,
   escapeSnippetText,
   escapeString,
+  escapeTemplateSubstitution,
   every,
   expandPreOrPostfixIncrementOrDecrementExpression,
   explainFiles,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231128`;
+      version = `${versionMajorMinor}.0-dev.20231129`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -35191,18 +35191,7 @@ ${lanes.join("\n")}
               }
               nextTokenJSDoc();
               skipWhitespace();
-              const p2 = getNodePos();
-              let name = tokenIsIdentifierOrKeyword(token()) ? parseEntityName(
-                /*allowReservedWords*/
-                true
-              ) : void 0;
-              if (name) {
-                while (token() === 81 /* PrivateIdentifier */) {
-                  reScanHashToken();
-                  nextTokenJSDoc();
-                  name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), p2);
-                }
-              }
+              const name = parseJSDocLinkName();
               const text = [];
               while (token() !== 20 /* CloseBraceToken */ && token() !== 4 /* NewLineTrivia */ && token() !== 1 /* EndOfFileToken */) {
                 text.push(scanner2.getTokenText());
@@ -35211,6 +35200,26 @@ ${lanes.join("\n")}
               const create = linkType === "link" ? factory2.createJSDocLink : linkType === "linkcode" ? factory2.createJSDocLinkCode : factory2.createJSDocLinkPlain;
               return finishNode(create(name, text.join("")), start2, scanner2.getTokenEnd());
             }
+            function parseJSDocLinkName() {
+              if (tokenIsIdentifierOrKeyword(token())) {
+                const pos = getNodePos();
+                let name = parseIdentifierName();
+                while (parseOptional(25 /* DotToken */)) {
+                  name = finishNode(factory2.createQualifiedName(name, token() === 81 /* PrivateIdentifier */ ? createMissingNode(
+                    80 /* Identifier */,
+                    /*reportAtCurrentPosition*/
+                    false
+                  ) : parseIdentifier()), pos);
+                }
+                while (token() === 81 /* PrivateIdentifier */) {
+                  reScanHashToken();
+                  nextTokenJSDoc();
+                  name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), pos);
+                }
+                return name;
+              }
+              return void 0;
+            }
             function parseJSDocLinkPrefix() {
               skipWhitespaceOrAsterisk();
               if (token() === 19 /* OpenBraceToken */ && nextTokenJSDoc() === 60 /* AtToken */ && tokenIsIdentifierOrKeyword(nextTokenJSDoc())) {
@@ -69391,14 +69400,15 @@ ${lanes.join("\n")}
       if (declaration) {
         if (isBindingElement(declaration) && !declaration.initializer && !declaration.dotDotDotToken && declaration.parent.elements.length >= 2) {
           const parent2 = declaration.parent.parent;
-          if (parent2.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(declaration) & 6 /* Constant */ || parent2.kind === 169 /* Parameter */) {
+          const rootDeclaration = getRootDeclaration(parent2);
+          if (rootDeclaration.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(rootDeclaration) & 6 /* Constant */ || rootDeclaration.kind === 169 /* Parameter */) {
             const links = getNodeLinks(parent2);
             if (!(links.flags & 4194304 /* InCheckIdentifier */)) {
               links.flags |= 4194304 /* InCheckIdentifier */;
               const parentType = getTypeForBindingElementParent(parent2, 0 /* Normal */);
               const parentTypeConstraint = parentType && mapType(parentType, getBaseConstraintOrType);
               links.flags &= ~4194304 /* InCheckIdentifier */;
-              if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(parent2.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
+              if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(rootDeclaration.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
                 const pattern = declaration.parent;
                 const narrowedType = getFlowTypeOfReference(
                   pattern,
@@ -165186,6 +165196,28 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             parts.push({ text: tokenToString(node.operator) });
             visitForDisplayParts(node.operand);
             break;
+          case 203 /* TemplateLiteralType */:
+            Debug.assertNode(node, isTemplateLiteralTypeNode);
+            visitForDisplayParts(node.head);
+            node.templateSpans.forEach(visitForDisplayParts);
+            break;
+          case 16 /* TemplateHead */:
+            Debug.assertNode(node, isTemplateHead);
+            parts.push({ text: getLiteralText2(node) });
+            break;
+          case 204 /* TemplateLiteralTypeSpan */:
+            Debug.assertNode(node, isTemplateLiteralTypeSpan);
+            visitForDisplayParts(node.type);
+            visitForDisplayParts(node.literal);
+            break;
+          case 17 /* TemplateMiddle */:
+            Debug.assertNode(node, isTemplateMiddle);
+            parts.push({ text: getLiteralText2(node) });
+            break;
+          case 18 /* TemplateTail */:
+            Debug.assertNode(node, isTemplateTail);
+            parts.push({ text: getLiteralText2(node) });
+            break;
           case 197 /* ThisType */:
             Debug.assertNode(node, isThisTypeNode);
             parts.push({ text: "this" });
@@ -165213,8 +165245,22 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         });
       }
       function getLiteralText2(node) {
-        if (isStringLiteral(node)) {
-          return quotePreference === 0 /* Single */ ? `'${escapeString(node.text, 39 /* singleQuote */)}'` : `"${escapeString(node.text, 34 /* doubleQuote */)}"`;
+        switch (node.kind) {
+          case 11 /* StringLiteral */:
+            return quotePreference === 0 /* Single */ ? `'${escapeString(node.text, 39 /* singleQuote */)}'` : `"${escapeString(node.text, 34 /* doubleQuote */)}"`;
+          case 16 /* TemplateHead */:
+          case 17 /* TemplateMiddle */:
+          case 18 /* TemplateTail */: {
+            const rawText = node.rawText ?? escapeTemplateSubstitution(escapeString(node.text, 96 /* backtick */));
+            switch (node.kind) {
+              case 16 /* TemplateHead */:
+                return "`" + rawText + "${";
+              case 17 /* TemplateMiddle */:
+                return "}" + rawText + "${";
+              case 18 /* TemplateTail */:
+                return "}" + rawText + "`";
+            }
+          }
         }
         return node.text;
       }
@@ -184995,6 +185041,7 @@ ${e.message}`;
     escapeNonAsciiString: () => escapeNonAsciiString,
     escapeSnippetText: () => escapeSnippetText,
     escapeString: () => escapeString,
+    escapeTemplateSubstitution: () => escapeTemplateSubstitution,
     every: () => every,
     expandPreOrPostfixIncrementOrDecrementExpression: () => expandPreOrPostfixIncrementOrDecrementExpression,
     explainFiles: () => explainFiles,
@@ -187407,6 +187454,7 @@ ${e.message}`;
     escapeNonAsciiString: () => escapeNonAsciiString,
     escapeSnippetText: () => escapeSnippetText,
     escapeString: () => escapeString,
+    escapeTemplateSubstitution: () => escapeTemplateSubstitution,
     every: () => every,
     expandPreOrPostfixIncrementOrDecrementExpression: () => expandPreOrPostfixIncrementOrDecrementExpression,
     explainFiles: () => explainFiles,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231128`;
+var version = `${versionMajorMinor}.0-dev.20231129`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -24510,18 +24510,7 @@ var Parser;
         }
         nextTokenJSDoc();
         skipWhitespace();
-        const p2 = getNodePos();
-        let name = tokenIsIdentifierOrKeyword(token()) ? parseEntityName(
-          /*allowReservedWords*/
-          true
-        ) : void 0;
-        if (name) {
-          while (token() === 81 /* PrivateIdentifier */) {
-            reScanHashToken();
-            nextTokenJSDoc();
-            name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), p2);
-          }
-        }
+        const name = parseJSDocLinkName();
         const text = [];
         while (token() !== 20 /* CloseBraceToken */ && token() !== 4 /* NewLineTrivia */ && token() !== 1 /* EndOfFileToken */) {
           text.push(scanner.getTokenText());
@@ -24530,6 +24519,26 @@ var Parser;
         const create = linkType === "link" ? factory2.createJSDocLink : linkType === "linkcode" ? factory2.createJSDocLinkCode : factory2.createJSDocLinkPlain;
         return finishNode(create(name, text.join("")), start2, scanner.getTokenEnd());
       }
+      function parseJSDocLinkName() {
+        if (tokenIsIdentifierOrKeyword(token())) {
+          const pos = getNodePos();
+          let name = parseIdentifierName();
+          while (parseOptional(25 /* DotToken */)) {
+            name = finishNode(factory2.createQualifiedName(name, token() === 81 /* PrivateIdentifier */ ? createMissingNode(
+              80 /* Identifier */,
+              /*reportAtCurrentPosition*/
+              false
+            ) : parseIdentifier()), pos);
+          }
+          while (token() === 81 /* PrivateIdentifier */) {
+            reScanHashToken();
+            nextTokenJSDoc();
+            name = finishNode(factory2.createJSDocMemberName(name, parseIdentifier()), pos);
+          }
+          return name;
+        }
+        return void 0;
+      }
       function parseJSDocLinkPrefix() {
         skipWhitespaceOrAsterisk();
         if (token() === 19 /* OpenBraceToken */ && nextTokenJSDoc() === 60 /* AtToken */ && tokenIsIdentifierOrKeyword(nextTokenJSDoc())) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20231128",
+    "version": "5.4.0-dev.20231129",
     "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": "b6121e400cf8636760aa8a7da6b7fac14e2e70c7"
+    "gitHead": "2869579b2cad770ae20617e4148741c2ce35ffdc"
 }