typescript 4.6.0-dev.20220202 → 4.6.0-dev.20220203

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220202";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220203";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -9583,11 +9583,17 @@ var ts;
     ts.getAllJSDocTagsOfKind = getAllJSDocTagsOfKind;
     function getTextOfJSDocComment(comment) {
         return typeof comment === "string" ? comment
-            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
-                return c.kind === 319 ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
-            }).join("");
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) { return c.kind === 319 ? c.text : formatJSDocLink(c); }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
+    function formatJSDocLink(link) {
+        var kind = link.kind === 322 ? "link"
+            : link.kind === 323 ? "linkcode"
+                : "linkplain";
+        var name = link.name ? ts.entityNameToString(link.name) : "";
+        var space = link.name && link.text.startsWith("://") ? "" : " ";
+        return "{@" + kind + " " + name + space + link.text + "}";
+    }
     function getEffectiveTypeParameterDeclarations(node) {
         if (ts.isJSDocSignature(node)) {
             return ts.emptyArray;

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220202";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220203";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -12809,12 +12809,17 @@ var ts;
     /** Gets the text of a jsdoc comment, flattening links to their text. */
     function getTextOfJSDocComment(comment) {
         return typeof comment === "string" ? comment
-            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
-                // TODO: Other kinds here
-                return c.kind === 319 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
-            }).join("");
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) { return c.kind === 319 /* JSDocText */ ? c.text : formatJSDocLink(c); }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
+    function formatJSDocLink(link) {
+        var kind = link.kind === 322 /* JSDocLink */ ? "link"
+            : link.kind === 323 /* JSDocLinkCode */ ? "linkcode"
+                : "linkplain";
+        var name = link.name ? ts.entityNameToString(link.name) : "";
+        var space = link.name && link.text.startsWith("://") ? "" : " ";
+        return "{@" + kind + " " + name + space + link.text + "}";
+    }
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
@@ -125863,7 +125868,7 @@ var ts;
                     parts.push(linkTextPart(text));
             }
             else {
-                parts.push(linkTextPart(name + (suffix ? "" : " ") + text));
+                parts.push(linkTextPart(name + (suffix || text.indexOf("://") === 0 ? "" : " ") + text));
             }
         }
         parts.push(linkPart("}"));
@@ -138487,7 +138492,7 @@ var ts;
                         newImportSpecifiers.push(ts.factory.createImportSpecifier(/*isTypeOnly*/ false, ts.factory.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217
                     }
                 }
-                newImportSpecifiers.push.apply(newImportSpecifiers, ts.flatMap(namedImports, function (i) { return i.importClause.namedBindings.elements; })); // TODO: GH#18217
+                newImportSpecifiers.push.apply(newImportSpecifiers, getNewImportSpecifiers(namedImports));
                 var sortedImportSpecifiers = sortSpecifiers(newImportSpecifiers);
                 var importDecl = defaultImports.length > 0
                     ? defaultImports[0]
@@ -138697,6 +138702,21 @@ var ts;
                     return 6;
             }
         }
+        function getNewImportSpecifiers(namedImports) {
+            return ts.flatMap(namedImports, function (namedImport) {
+                return ts.map(tryGetNamedBindingElements(namedImport), function (importSpecifier) {
+                    return importSpecifier.name && importSpecifier.propertyName && importSpecifier.name.escapedText === importSpecifier.propertyName.escapedText
+                        ? ts.factory.updateImportSpecifier(importSpecifier, importSpecifier.isTypeOnly, /*propertyName*/ undefined, importSpecifier.name)
+                        : importSpecifier;
+                });
+            });
+        }
+        function tryGetNamedBindingElements(namedImport) {
+            var _a;
+            return ((_a = namedImport.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings) && ts.isNamedImports(namedImport.importClause.namedBindings)
+                ? namedImport.importClause.namedBindings.elements
+                : undefined;
+        }
     })(OrganizeImports = ts.OrganizeImports || (ts.OrganizeImports = {}));
 })(ts || (ts = {}));
 /* @internal */

package/lib/tsserverlibrary.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220202";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220203";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13003,12 +13003,17 @@ var ts;
     /** Gets the text of a jsdoc comment, flattening links to their text. */
     function getTextOfJSDocComment(comment) {
         return typeof comment === "string" ? comment
-            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
-                // TODO: Other kinds here
-                return c.kind === 319 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
-            }).join("");
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) { return c.kind === 319 /* JSDocText */ ? c.text : formatJSDocLink(c); }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
+    function formatJSDocLink(link) {
+        var kind = link.kind === 322 /* JSDocLink */ ? "link"
+            : link.kind === 323 /* JSDocLinkCode */ ? "linkcode"
+                : "linkplain";
+        var name = link.name ? ts.entityNameToString(link.name) : "";
+        var space = link.name && link.text.startsWith("://") ? "" : " ";
+        return "{@" + kind + " " + name + space + link.text + "}";
+    }
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
@@ -126474,7 +126479,7 @@ var ts;
                     parts.push(linkTextPart(text));
             }
             else {
-                parts.push(linkTextPart(name + (suffix ? "" : " ") + text));
+                parts.push(linkTextPart(name + (suffix || text.indexOf("://") === 0 ? "" : " ") + text));
             }
         }
         parts.push(linkPart("}"));
@@ -139098,7 +139103,7 @@ var ts;
                         newImportSpecifiers.push(ts.factory.createImportSpecifier(/*isTypeOnly*/ false, ts.factory.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217
                     }
                 }
-                newImportSpecifiers.push.apply(newImportSpecifiers, ts.flatMap(namedImports, function (i) { return i.importClause.namedBindings.elements; })); // TODO: GH#18217
+                newImportSpecifiers.push.apply(newImportSpecifiers, getNewImportSpecifiers(namedImports));
                 var sortedImportSpecifiers = sortSpecifiers(newImportSpecifiers);
                 var importDecl = defaultImports.length > 0
                     ? defaultImports[0]
@@ -139308,6 +139313,21 @@ var ts;
                     return 6;
             }
         }
+        function getNewImportSpecifiers(namedImports) {
+            return ts.flatMap(namedImports, function (namedImport) {
+                return ts.map(tryGetNamedBindingElements(namedImport), function (importSpecifier) {
+                    return importSpecifier.name && importSpecifier.propertyName && importSpecifier.name.escapedText === importSpecifier.propertyName.escapedText
+                        ? ts.factory.updateImportSpecifier(importSpecifier, importSpecifier.isTypeOnly, /*propertyName*/ undefined, importSpecifier.name)
+                        : importSpecifier;
+                });
+            });
+        }
+        function tryGetNamedBindingElements(namedImport) {
+            var _a;
+            return ((_a = namedImport.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings) && ts.isNamedImports(namedImport.importClause.namedBindings)
+                ? namedImport.importClause.namedBindings.elements
+                : undefined;
+        }
     })(OrganizeImports = ts.OrganizeImports || (ts.OrganizeImports = {}));
 })(ts || (ts = {}));
 /* @internal */

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220202";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220203";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13003,12 +13003,17 @@ var ts;
     /** Gets the text of a jsdoc comment, flattening links to their text. */
     function getTextOfJSDocComment(comment) {
         return typeof comment === "string" ? comment
-            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
-                // TODO: Other kinds here
-                return c.kind === 319 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
-            }).join("");
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) { return c.kind === 319 /* JSDocText */ ? c.text : formatJSDocLink(c); }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
+    function formatJSDocLink(link) {
+        var kind = link.kind === 322 /* JSDocLink */ ? "link"
+            : link.kind === 323 /* JSDocLinkCode */ ? "linkcode"
+                : "linkplain";
+        var name = link.name ? ts.entityNameToString(link.name) : "";
+        var space = link.name && link.text.startsWith("://") ? "" : " ";
+        return "{@" + kind + " " + name + space + link.text + "}";
+    }
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
@@ -126474,7 +126479,7 @@ var ts;
                     parts.push(linkTextPart(text));
             }
             else {
-                parts.push(linkTextPart(name + (suffix ? "" : " ") + text));
+                parts.push(linkTextPart(name + (suffix || text.indexOf("://") === 0 ? "" : " ") + text));
             }
         }
         parts.push(linkPart("}"));
@@ -139098,7 +139103,7 @@ var ts;
                         newImportSpecifiers.push(ts.factory.createImportSpecifier(/*isTypeOnly*/ false, ts.factory.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217
                     }
                 }
-                newImportSpecifiers.push.apply(newImportSpecifiers, ts.flatMap(namedImports, function (i) { return i.importClause.namedBindings.elements; })); // TODO: GH#18217
+                newImportSpecifiers.push.apply(newImportSpecifiers, getNewImportSpecifiers(namedImports));
                 var sortedImportSpecifiers = sortSpecifiers(newImportSpecifiers);
                 var importDecl = defaultImports.length > 0
                     ? defaultImports[0]
@@ -139308,6 +139313,21 @@ var ts;
                     return 6;
             }
         }
+        function getNewImportSpecifiers(namedImports) {
+            return ts.flatMap(namedImports, function (namedImport) {
+                return ts.map(tryGetNamedBindingElements(namedImport), function (importSpecifier) {
+                    return importSpecifier.name && importSpecifier.propertyName && importSpecifier.name.escapedText === importSpecifier.propertyName.escapedText
+                        ? ts.factory.updateImportSpecifier(importSpecifier, importSpecifier.isTypeOnly, /*propertyName*/ undefined, importSpecifier.name)
+                        : importSpecifier;
+                });
+            });
+        }
+        function tryGetNamedBindingElements(namedImport) {
+            var _a;
+            return ((_a = namedImport.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings) && ts.isNamedImports(namedImport.importClause.namedBindings)
+                ? namedImport.importClause.namedBindings.elements
+                : undefined;
+        }
     })(OrganizeImports = ts.OrganizeImports || (ts.OrganizeImports = {}));
 })(ts || (ts = {}));
 /* @internal */

package/lib/typescriptServices.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220202";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220203";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13003,12 +13003,17 @@ var ts;
     /** Gets the text of a jsdoc comment, flattening links to their text. */
     function getTextOfJSDocComment(comment) {
         return typeof comment === "string" ? comment
-            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
-                // TODO: Other kinds here
-                return c.kind === 319 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
-            }).join("");
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) { return c.kind === 319 /* JSDocText */ ? c.text : formatJSDocLink(c); }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
+    function formatJSDocLink(link) {
+        var kind = link.kind === 322 /* JSDocLink */ ? "link"
+            : link.kind === 323 /* JSDocLinkCode */ ? "linkcode"
+                : "linkplain";
+        var name = link.name ? ts.entityNameToString(link.name) : "";
+        var space = link.name && link.text.startsWith("://") ? "" : " ";
+        return "{@" + kind + " " + name + space + link.text + "}";
+    }
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
@@ -126474,7 +126479,7 @@ var ts;
                     parts.push(linkTextPart(text));
             }
             else {
-                parts.push(linkTextPart(name + (suffix ? "" : " ") + text));
+                parts.push(linkTextPart(name + (suffix || text.indexOf("://") === 0 ? "" : " ") + text));
             }
         }
         parts.push(linkPart("}"));
@@ -139098,7 +139103,7 @@ var ts;
                         newImportSpecifiers.push(ts.factory.createImportSpecifier(/*isTypeOnly*/ false, ts.factory.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217
                     }
                 }
-                newImportSpecifiers.push.apply(newImportSpecifiers, ts.flatMap(namedImports, function (i) { return i.importClause.namedBindings.elements; })); // TODO: GH#18217
+                newImportSpecifiers.push.apply(newImportSpecifiers, getNewImportSpecifiers(namedImports));
                 var sortedImportSpecifiers = sortSpecifiers(newImportSpecifiers);
                 var importDecl = defaultImports.length > 0
                     ? defaultImports[0]
@@ -139308,6 +139313,21 @@ var ts;
                     return 6;
             }
         }
+        function getNewImportSpecifiers(namedImports) {
+            return ts.flatMap(namedImports, function (namedImport) {
+                return ts.map(tryGetNamedBindingElements(namedImport), function (importSpecifier) {
+                    return importSpecifier.name && importSpecifier.propertyName && importSpecifier.name.escapedText === importSpecifier.propertyName.escapedText
+                        ? ts.factory.updateImportSpecifier(importSpecifier, importSpecifier.isTypeOnly, /*propertyName*/ undefined, importSpecifier.name)
+                        : importSpecifier;
+                });
+            });
+        }
+        function tryGetNamedBindingElements(namedImport) {
+            var _a;
+            return ((_a = namedImport.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings) && ts.isNamedImports(namedImport.importClause.namedBindings)
+                ? namedImport.importClause.namedBindings.elements
+                : undefined;
+        }
     })(OrganizeImports = ts.OrganizeImports || (ts.OrganizeImports = {}));
 })(ts || (ts = {}));
 /* @internal */

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220202";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220203";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -12798,12 +12798,17 @@ var ts;
     /** Gets the text of a jsdoc comment, flattening links to their text. */
     function getTextOfJSDocComment(comment) {
         return typeof comment === "string" ? comment
-            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
-                // TODO: Other kinds here
-                return c.kind === 319 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
-            }).join("");
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) { return c.kind === 319 /* JSDocText */ ? c.text : formatJSDocLink(c); }).join("");
     }
     ts.getTextOfJSDocComment = getTextOfJSDocComment;
+    function formatJSDocLink(link) {
+        var kind = link.kind === 322 /* JSDocLink */ ? "link"
+            : link.kind === 323 /* JSDocLinkCode */ ? "linkcode"
+                : "linkplain";
+        var name = link.name ? ts.entityNameToString(link.name) : "";
+        var space = link.name && link.text.startsWith("://") ? "" : " ";
+        return "{@" + kind + " " + name + space + link.text + "}";
+    }
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.

package/package.json

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