@angular/language-server 12.2.1 → 13.1.0

package/index.js

@@ -33,7 +33,9 @@ var require_cmdline_utils = __commonJS({
         logVerbosity: findArgument(argv, "--logVerbosity"),
         logToConsole: hasArgument(argv, "--logToConsole"),
         ngProbeLocations: parseStringArray(argv, "--ngProbeLocations"),
-        tsProbeLocations: parseStringArray(argv, "--tsProbeLocations")
+        tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
+        includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
+        includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -66,9 +68,37 @@ var require_cmdline_utils = __commonJS({
 var require_resolver = __commonJS({
   "dist/common/resolver.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Version = exports2.resolve = void 0;
-    var fs = require("fs");
+    var fs = __importStar(require("fs"));
     function resolve(packageName, location, rootPackage) {
       rootPackage = rootPackage || packageName;
       try {
@@ -135,13 +165,45 @@ var require_resolver = __commonJS({
 var require_version_provider = __commonJS({
   "dist/banner/version_provider.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.resolveNgcc = exports2.resolveNgLangSvc = exports2.resolveTsServer = void 0;
-    var fs = require("fs");
-    var path = require("path");
+    exports2.resolveNgcc = exports2.resolveNgLangSvc = exports2.loadEsmModule = exports2.resolveTsServer = void 0;
+    var fs = __importStar(require("fs"));
+    var path = __importStar(require("path"));
+    var url_1 = __importDefault(require("url"));
     var resolver_1 = require_resolver();
-    var MIN_TS_VERSION = "4.2";
-    var MIN_NG_VERSION = "12.0";
+    var MIN_TS_VERSION = "4.3";
+    var MIN_NG_VERSION = "13.0";
     var TSSERVERLIB = "typescript/lib/tsserverlibrary";
     function resolveWithMinVersion(packageName, minVersionStr, probeLocations, rootPackage) {
       if (!packageName.startsWith(rootPackage)) {
@@ -149,7 +211,7 @@ var require_version_provider = __commonJS({
       }
       const minVersion = new resolver_1.Version(minVersionStr);
       for (const location of probeLocations) {
-        const nodeModule = resolver_1.resolve(packageName, location, rootPackage);
+        const nodeModule = (0, resolver_1.resolve)(packageName, location, rootPackage);
         if (nodeModule && nodeModule.version.greaterThanOrEqual(minVersion)) {
           return nodeModule;
         }
@@ -189,13 +251,30 @@ var require_version_provider = __commonJS({
         return void 0;
       }
     }
+    function loadEsmModule(modulePath) {
+      return new Function("modulePath", `return import(modulePath);`)(modulePath);
+    }
+    exports2.loadEsmModule = loadEsmModule;
     function resolveNgLangSvc(probeLocations) {
       const ngls = "@angular/language-service";
       return resolveWithMinVersion(ngls, MIN_NG_VERSION, probeLocations, ngls);
     }
     exports2.resolveNgLangSvc = resolveNgLangSvc;
-    function resolveNgcc(directory) {
-      return resolver_1.resolve("@angular/compiler-cli/ngcc/main-ngcc.js", directory, "@angular/compiler-cli");
+    async function resolveNgcc(directory) {
+      try {
+        const ngcc = (0, resolver_1.resolve)("@angular/compiler-cli/ngcc", directory, "@angular/compiler-cli");
+        if (ngcc === void 0) {
+          throw new Error("Could not resolve ngcc");
+        }
+        const ngccModule = await loadEsmModule(url_1.default.pathToFileURL(ngcc.resolvedPath));
+        const resolvedPath = ngccModule.ngccMainFilePath;
+        if (resolvedPath === void 0) {
+          throw new Error("could not resolve ngcc path.");
+        }
+        return Object.assign(Object.assign({}, ngcc), { resolvedPath });
+      } catch (e) {
+        return (0, resolver_1.resolve)("@angular/compiler-cli/ngcc/main-ngcc.js", directory, "@angular/compiler-cli");
+      }
     }
     exports2.resolveNgcc = resolveNgcc;
   }
@@ -214,8 +293,8 @@ function requireOverride(moduleName) {
     throw new Error(`Import '${TSSERVER}' instead of 'typescript'`);
   }
   if (moduleName === TSSERVER) {
-    const { tsProbeLocations } = cmdline_utils_1.parseCommandLine(process.argv);
-    moduleName = version_provider_1.resolveTsServer(tsProbeLocations).resolvedPath;
+    const { tsProbeLocations } = (0, cmdline_utils_1.parseCommandLine)(process.argv);
+    moduleName = (0, version_provider_1.resolveTsServer)(tsProbeLocations).resolvedPath;
   }
   return originalRequire(moduleName);
 }
@@ -265,7 +344,9 @@ var require_cmdline_utils = __commonJS({
         logVerbosity: findArgument(argv, "--logVerbosity"),
         logToConsole: hasArgument(argv, "--logToConsole"),
         ngProbeLocations: parseStringArray(argv, "--ngProbeLocations"),
-        tsProbeLocations: parseStringArray(argv, "--tsProbeLocations")
+        tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
+        includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
+        includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -298,11 +379,39 @@ var require_cmdline_utils = __commonJS({
 var require_logger = __commonJS({
   "dist/server/logger.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createLogger = void 0;
-    var fs = require("fs");
-    var path = require("path");
-    var ts = require("typescript/lib/tsserverlibrary");
+    var fs = __importStar(require("fs"));
+    var path = __importStar(require("path"));
+    var ts = __importStar(require("typescript/lib/tsserverlibrary"));
     function createLogger(options) {
       let logLevel;
       switch (options.logVerbosity) {
@@ -398,9 +507,37 @@ var require_logger = __commonJS({
 var require_server_host = __commonJS({
   "dist/server/server_host.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ServerHost = void 0;
-    var ts = require("typescript/lib/tsserverlibrary");
+    var ts = __importStar(require("typescript/lib/tsserverlibrary"));
     var NOOP_WATCHER = {
       close() {
       }
@@ -2873,10 +3010,39 @@ var require_main2 = __commonJS({
 var require_requests = __commonJS({
   "dist/common/requests.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.IsInAngularProject = exports2.GetTcbRequest = exports2.GetComponentsWithTemplateFile = void 0;
-    var lsp = require_main2();
+    exports2.IsInAngularProject = exports2.GetTcbRequest = exports2.GetTemplateLocationForComponent = exports2.GetComponentsWithTemplateFile = void 0;
+    var lsp = __importStar(require_main2());
     exports2.GetComponentsWithTemplateFile = new lsp.RequestType("angular/getComponentsWithTemplateFile");
+    exports2.GetTemplateLocationForComponent = new lsp.RequestType("angular/getTemplateLocationForComponent");
     exports2.GetTcbRequest = new lsp.RequestType("angular/getTcb");
     exports2.IsInAngularProject = new lsp.RequestType("angular/isAngularCoreInOwningProject");
   }
@@ -2886,10 +3052,38 @@ var require_requests = __commonJS({
 var require_utils = __commonJS({
   "dist/server/utils.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.tsDisplayPartsToText = exports2.MruTracker = exports2.isConfiguredProject = exports2.lspRangeToTsPositions = exports2.lspPositionToTsPosition = exports2.tsTextSpanToLspRange = exports2.filePathToUri = exports2.uriToFilePath = exports2.isDebugMode = void 0;
-    var ts = require("typescript/lib/tsserverlibrary");
-    var lsp = require("vscode-languageserver");
+    exports2.tsDisplayPartsToText = exports2.MruTracker = exports2.isConfiguredProject = exports2.tsRelatedInformationToLspRelatedInformation = exports2.lspRangeToTsPositions = exports2.lspPositionToTsPosition = exports2.tsTextSpanToLspRange = exports2.filePathToUri = exports2.uriToFilePath = exports2.isDebugMode = void 0;
+    var ts = __importStar(require("typescript/lib/tsserverlibrary"));
+    var lsp = __importStar(require("vscode-languageserver"));
     var vscode_uri_1 = require("vscode-uri");
     exports2.isDebugMode = process.env["NG_DEBUG"] === "true";
     var Scheme;
@@ -2925,6 +3119,23 @@ var require_utils = __commonJS({
       return [start, end];
     }
     exports2.lspRangeToTsPositions = lspRangeToTsPositions;
+    function tsRelatedInformationToLspRelatedInformation(scriptInfo, relatedInfo) {
+      if (relatedInfo === void 0)
+        return;
+      const lspRelatedInfo = [];
+      for (const info of relatedInfo) {
+        if (info.file === void 0 || info.start === void 0 || info.length === void 0)
+          continue;
+        const textSpan = {
+          start: info.start,
+          length: info.length
+        };
+        const location = lsp.Location.create(filePathToUri(info.file.fileName), tsTextSpanToLspRange(scriptInfo, textSpan));
+        lspRelatedInfo.push(lsp.DiagnosticRelatedInformation.create(location, ts.flattenDiagnosticMessageText(info.messageText, "\n")));
+      }
+      return lspRelatedInfo;
+    }
+    exports2.tsRelatedInformationToLspRelatedInformation = tsRelatedInformationToLspRelatedInformation;
     function isConfiguredProject(project) {
       return project.projectKind === ts.server.ProjectKind.Configured;
     }
@@ -2958,9 +3169,37 @@ var require_utils = __commonJS({
 var require_completion = __commonJS({
   "dist/server/completion.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.tsCompletionEntryToLspCompletionItem = exports2.readNgCompletionData = void 0;
-    var lsp = require("vscode-languageserver");
+    var lsp = __importStar(require("vscode-languageserver"));
     var utils_1 = require_utils();
     var CompletionKind;
     (function(CompletionKind2) {
@@ -3016,7 +3255,7 @@ var require_completion = __commonJS({
           return lsp.CompletionItemKind.Text;
       }
     }
-    function tsCompletionEntryToLspCompletionItem(entry, position, scriptInfo, insertReplaceSupport) {
+    function tsCompletionEntryToLspCompletionItem(entry, position, scriptInfo, insertReplaceSupport, isIvy) {
       const item = lsp.CompletionItem.create(entry.name);
       const kind = entry.kind;
       item.kind = ngCompletionKindToLspCompletionItemKind(kind);
@@ -3024,6 +3263,12 @@ var require_completion = __commonJS({
       item.sortText = entry.sortText;
       const insertText = entry.insertText || entry.name;
       item.textEdit = createTextEdit(scriptInfo, entry, position, insertText, insertReplaceSupport);
+      if (isIvy) {
+        item.filterText = entry.insertText;
+        if (entry.isSnippet) {
+          item.insertTextFormat = lsp.InsertTextFormat.Snippet;
+        }
+      }
       item.data = {
         kind: "ngCompletionOriginData",
         filePath: scriptInfo.fileName,
@@ -3036,13 +3281,13 @@ var require_completion = __commonJS({
       if (entry.replacementSpan === void 0) {
         return lsp.TextEdit.insert(position, insertText);
       } else if (insertReplaceSupport) {
-        const replacementRange = utils_1.tsTextSpanToLspRange(scriptInfo, entry.replacementSpan);
-        const tsPosition = utils_1.lspPositionToTsPosition(scriptInfo, position);
+        const replacementRange = (0, utils_1.tsTextSpanToLspRange)(scriptInfo, entry.replacementSpan);
+        const tsPosition = (0, utils_1.lspPositionToTsPosition)(scriptInfo, position);
         const insertLength = tsPosition - entry.replacementSpan.start;
-        const insertionRange = utils_1.tsTextSpanToLspRange(scriptInfo, Object.assign(Object.assign({}, entry.replacementSpan), { length: insertLength }));
+        const insertionRange = (0, utils_1.tsTextSpanToLspRange)(scriptInfo, Object.assign(Object.assign({}, entry.replacementSpan), { length: insertLength }));
         return lsp.InsertReplaceEdit.create(insertText, insertionRange, replacementRange);
       } else {
-        return lsp.TextEdit.replace(utils_1.tsTextSpanToLspRange(scriptInfo, entry.replacementSpan), insertText);
+        return lsp.TextEdit.replace((0, utils_1.tsTextSpanToLspRange)(scriptInfo, entry.replacementSpan), insertText);
       }
     }
   }
@@ -3052,10 +3297,38 @@ var require_completion = __commonJS({
 var require_diagnostic = __commonJS({
   "dist/server/diagnostic.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.tsDiagnosticToLspDiagnostic = void 0;
-    var ts = require("typescript/lib/tsserverlibrary");
-    var lsp = require("vscode-languageserver");
+    var ts = __importStar(require("typescript/lib/tsserverlibrary"));
+    var lsp = __importStar(require("vscode-languageserver"));
     var utils_1 = require_utils();
     function tsDiagnosticCategoryToLspDiagnosticSeverity(category) {
       switch (category) {
@@ -3075,7 +3348,7 @@ var require_diagnostic = __commonJS({
         start: tsDiag.start || 0,
         length: tsDiag.length || 0
       };
-      return lsp.Diagnostic.create(utils_1.tsTextSpanToLspRange(scriptInfo, textSpan), ts.flattenDiagnosticMessageText(tsDiag.messageText, "\n"), tsDiagnosticCategoryToLspDiagnosticSeverity(tsDiag.category), tsDiag.code, tsDiag.source);
+      return lsp.Diagnostic.create((0, utils_1.tsTextSpanToLspRange)(scriptInfo, textSpan), ts.flattenDiagnosticMessageText(tsDiag.messageText, "\n"), tsDiagnosticCategoryToLspDiagnosticSeverity(tsDiag.category), tsDiag.code, tsDiag.source, (0, utils_1.tsRelatedInformationToLspRelatedInformation)(scriptInfo, tsDiag.relatedInformation));
     }
     exports2.tsDiagnosticToLspDiagnostic = tsDiagnosticToLspDiagnostic;
   }
@@ -3085,9 +3358,37 @@ var require_diagnostic = __commonJS({
 var require_resolver = __commonJS({
   "dist/common/resolver.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Version = exports2.resolve = void 0;
-    var fs = require("fs");
+    var fs = __importStar(require("fs"));
     function resolve(packageName, location, rootPackage) {
       rootPackage = rootPackage || packageName;
       try {
@@ -3154,13 +3455,45 @@ var require_resolver = __commonJS({
 var require_version_provider = __commonJS({
   "dist/server/version_provider.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.resolveNgcc = exports2.resolveNgLangSvc = exports2.resolveTsServer = void 0;
-    var fs = require("fs");
-    var path = require("path");
+    exports2.resolveNgcc = exports2.resolveNgLangSvc = exports2.loadEsmModule = exports2.resolveTsServer = void 0;
+    var fs = __importStar(require("fs"));
+    var path = __importStar(require("path"));
+    var url_1 = __importDefault(require("url"));
     var resolver_1 = require_resolver();
-    var MIN_TS_VERSION = "4.2";
-    var MIN_NG_VERSION = "12.0";
+    var MIN_TS_VERSION = "4.3";
+    var MIN_NG_VERSION = "13.0";
     var TSSERVERLIB = "typescript/lib/tsserverlibrary";
     function resolveWithMinVersion(packageName, minVersionStr, probeLocations, rootPackage) {
       if (!packageName.startsWith(rootPackage)) {
@@ -3168,7 +3501,7 @@ var require_version_provider = __commonJS({
       }
       const minVersion = new resolver_1.Version(minVersionStr);
       for (const location of probeLocations) {
-        const nodeModule = resolver_1.resolve(packageName, location, rootPackage);
+        const nodeModule = (0, resolver_1.resolve)(packageName, location, rootPackage);
         if (nodeModule && nodeModule.version.greaterThanOrEqual(minVersion)) {
           return nodeModule;
         }
@@ -3208,13 +3541,30 @@ var require_version_provider = __commonJS({
         return void 0;
       }
     }
+    function loadEsmModule(modulePath) {
+      return new Function("modulePath", `return import(modulePath);`)(modulePath);
+    }
+    exports2.loadEsmModule = loadEsmModule;
     function resolveNgLangSvc(probeLocations) {
       const ngls = "@angular/language-service";
       return resolveWithMinVersion(ngls, MIN_NG_VERSION, probeLocations, ngls);
     }
     exports2.resolveNgLangSvc = resolveNgLangSvc;
-    function resolveNgcc(directory) {
-      return resolver_1.resolve("@angular/compiler-cli/ngcc/main-ngcc.js", directory, "@angular/compiler-cli");
+    async function resolveNgcc(directory) {
+      try {
+        const ngcc = (0, resolver_1.resolve)("@angular/compiler-cli/ngcc", directory, "@angular/compiler-cli");
+        if (ngcc === void 0) {
+          throw new Error("Could not resolve ngcc");
+        }
+        const ngccModule = await loadEsmModule(url_1.default.pathToFileURL(ngcc.resolvedPath));
+        const resolvedPath = ngccModule.ngccMainFilePath;
+        if (resolvedPath === void 0) {
+          throw new Error("could not resolve ngcc path.");
+        }
+        return Object.assign(Object.assign({}, ngcc), { resolvedPath });
+      } catch (e) {
+        return (0, resolver_1.resolve)("@angular/compiler-cli/ngcc/main-ngcc.js", directory, "@angular/compiler-cli");
+      }
     }
     exports2.resolveNgcc = resolveNgcc;
   }
@@ -3232,8 +3582,8 @@ var require_ngcc = __commonJS({
     var version_provider_12 = require_version_provider();
     async function resolveAndRunNgcc(tsconfig, progress) {
       var _a, _b;
-      const directory = path_1.dirname(tsconfig);
-      const ngcc = version_provider_12.resolveNgcc(directory);
+      const directory = (0, path_1.dirname)(tsconfig);
+      const ngcc = await (0, version_provider_12.resolveNgcc)(directory);
       if (!ngcc) {
         throw new Error(`Failed to resolve ngcc from ${directory}`);
       }
@@ -3246,8 +3596,8 @@ var require_ngcc = __commonJS({
       if (ngcc.version.greaterThanOrEqual(new resolver_1.Version("11.2.4"))) {
         args.push("--typings-only");
       }
-      const childProcess = child_process_1.fork(ngcc.resolvedPath, args, {
-        cwd: path_1.resolve(cwd),
+      const childProcess = (0, child_process_1.fork)(ngcc.resolvedPath, args, {
+        cwd: (0, path_1.resolve)(cwd),
         silent: true,
         execArgv: []
       });
@@ -3284,13 +3634,40 @@ var require_ngcc = __commonJS({
 var require_session = __commonJS({
   "dist/server/session.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Session = void 0;
     var api_1 = require_api();
-    var assert = require("assert");
-    var ts = require("typescript/lib/tsserverlibrary");
+    var ts = __importStar(require("typescript/lib/tsserverlibrary"));
     var util_1 = require("util");
-    var lsp = require("vscode-languageserver/node");
+    var lsp = __importStar(require("vscode-languageserver/node"));
     var notifications_1 = require_notifications();
     var progress_1 = require_progress();
     var requests_1 = require_requests();
@@ -3304,7 +3681,7 @@ var require_session = __commonJS({
       LanguageId2["HTML"] = "html";
     })(LanguageId || (LanguageId = {}));
     var EMPTY_RANGE = lsp.Range.create(0, 0, 0, 0);
-    var setImmediateP = util_1.promisify(setImmediate);
+    var setImmediateP = (0, util_1.promisify)(setImmediate);
     var Session = class {
       constructor(options) {
         this.configuredProjToExternalProj = new Map();
@@ -3314,6 +3691,8 @@ var require_session = __commonJS({
         this.isProjectLoading = false;
         this.renameDisabledProjects = new WeakSet();
         this.clientCapabilities = {};
+        this.includeAutomaticOptionalChainCompletions = options.includeAutomaticOptionalChainCompletions;
+        this.includeCompletionsWithSnippetText = options.includeCompletionsWithSnippetText;
         this.logger = options.logger;
         this.ivy = options.ivy;
         this.logToConsole = options.logToConsole;
@@ -3341,7 +3720,8 @@ var require_session = __commonJS({
           eventHandler: (e) => this.handleProjectServiceEvent(e),
           globalPlugins: [options.ngPlugin],
           pluginProbeLocations: [options.resolvedNgLsPath],
-          allowLocalPluginLoads: false
+          allowLocalPluginLoads: false,
+          session: void 0
         });
         projSvc.setHostConfiguration({
           formatOptions: projSvc.getHostFormatCodeOptions(),
@@ -3362,11 +3742,10 @@ var require_session = __commonJS({
           }
         });
         const pluginConfig = {
-          angularOnly: true,
-          ivy: options.ivy
+          angularOnly: true
         };
         if (options.host.isG3) {
-          assert(options.ivy === true, "Ivy LS must be used in google3");
+          options.ivy = true;
           pluginConfig.forceStrictTemplates = true;
         }
         projSvc.configurePlugin({
@@ -3390,6 +3769,7 @@ var require_session = __commonJS({
         conn.onCompletion((p) => this.onCompletion(p));
         conn.onCompletionResolve((p) => this.onCompletionResolve(p));
         conn.onRequest(requests_1.GetComponentsWithTemplateFile, (p) => this.onGetComponentsWithTemplateFile(p));
+        conn.onRequest(requests_1.GetTemplateLocationForComponent, (p) => this.onGetTemplateLocationForComponent(p));
         conn.onRequest(requests_1.GetTcbRequest, (p) => this.onGetTcb(p));
         conn.onRequest(requests_1.IsInAngularProject, (p) => this.isInAngularProject(p));
         conn.onCodeLens((p) => this.onCodeLens(p));
@@ -3397,7 +3777,7 @@ var require_session = __commonJS({
         conn.onSignatureHelp((p) => this.onSignatureHelp(p));
       }
       isInAngularProject(params) {
-        const filePath = utils_1.uriToFilePath(params.textDocument.uri);
+        const filePath = (0, utils_1.uriToFilePath)(params.textDocument.uri);
         if (!filePath) {
           return false;
         }
@@ -3418,7 +3798,7 @@ var require_session = __commonJS({
           return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const response = languageService.getTcb(scriptInfo.fileName, offset);
         if (response === void 0) {
           return null;
@@ -3429,11 +3809,29 @@ var require_session = __commonJS({
           return null;
         }
         return {
-          uri: utils_1.filePathToUri(tcfName),
+          uri: (0, utils_1.filePathToUri)(tcfName),
           content: response.content,
-          selections: response.selections.map((span) => utils_1.tsTextSpanToLspRange(tcfScriptInfo, span))
+          selections: response.selections.map((span) => (0, utils_1.tsTextSpanToLspRange)(tcfScriptInfo, span))
         };
       }
+      onGetTemplateLocationForComponent(params) {
+        const lsInfo = this.getLSAndScriptInfo(params.textDocument);
+        if (lsInfo === null) {
+          return null;
+        }
+        const { languageService, scriptInfo } = lsInfo;
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
+        const documentSpan = languageService.getTemplateLocationForComponent(scriptInfo.fileName, offset);
+        if (documentSpan === void 0) {
+          return null;
+        }
+        const templateScriptInfo = this.projectService.getScriptInfo(documentSpan.fileName);
+        if (templateScriptInfo === void 0) {
+          return null;
+        }
+        const range = (0, utils_1.tsTextSpanToLspRange)(templateScriptInfo, documentSpan.textSpan);
+        return lsp.Location.create((0, utils_1.filePathToUri)(documentSpan.fileName), range);
+      }
       onGetComponentsWithTemplateFile(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
@@ -3447,8 +3845,8 @@ var require_session = __commonJS({
           if (scriptInfo2 === void 0) {
             continue;
           }
-          const range = utils_1.tsTextSpanToLspRange(scriptInfo2, documentSpan.textSpan);
-          results.push(lsp.Location.create(utils_1.filePathToUri(documentSpan.fileName), range));
+          const range = (0, utils_1.tsTextSpanToLspRange)(scriptInfo2, documentSpan.textSpan);
+          results.push(lsp.Location.create((0, utils_1.filePathToUri)(documentSpan.fileName), range));
         }
         return results;
       }
@@ -3458,7 +3856,7 @@ var require_session = __commonJS({
           return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const help = languageService.getSignatureHelpItems(scriptInfo.fileName, offset, void 0);
         if (help === void 0) {
           return null;
@@ -3467,26 +3865,26 @@ var require_session = __commonJS({
           activeParameter: help.argumentCount > 0 ? help.argumentIndex : null,
           activeSignature: help.selectedItemIndex,
           signatures: help.items.map((item) => {
-            let label = utils_1.tsDisplayPartsToText(item.prefixDisplayParts);
+            let label = (0, utils_1.tsDisplayPartsToText)(item.prefixDisplayParts);
             const parameters = [];
             let first = true;
             for (const param of item.parameters) {
               if (!first) {
-                label += utils_1.tsDisplayPartsToText(item.separatorDisplayParts);
+                label += (0, utils_1.tsDisplayPartsToText)(item.separatorDisplayParts);
               }
               first = false;
               const start = label.length;
-              label += utils_1.tsDisplayPartsToText(param.displayParts);
+              label += (0, utils_1.tsDisplayPartsToText)(param.displayParts);
               const end = label.length;
               parameters.push({
                 label: [start, end],
-                documentation: utils_1.tsDisplayPartsToText(param.documentation)
+                documentation: (0, utils_1.tsDisplayPartsToText)(param.documentation)
               });
             }
-            label += utils_1.tsDisplayPartsToText(item.suffixDisplayParts);
+            label += (0, utils_1.tsDisplayPartsToText)(item.suffixDisplayParts);
             return {
               label,
-              documentation: utils_1.tsDisplayPartsToText(item.documentation),
+              documentation: (0, utils_1.tsDisplayPartsToText)(item.documentation),
               parameters
             };
           })
@@ -3554,7 +3952,7 @@ var require_session = __commonJS({
         }
       }
       handleCompilerOptionsDiagnostics(project) {
-        if (!utils_1.isConfiguredProject(project)) {
+        if (!(0, utils_1.isConfiguredProject)(project)) {
           return;
         }
         const diags = project.getLanguageService().getCompilerOptionsDiagnostics();
@@ -3644,8 +4042,8 @@ var require_session = __commonJS({
             console.timeEnd(label);
           }
           this.connection.sendDiagnostics({
-            uri: utils_1.filePathToUri(fileName),
-            diagnostics: diagnostics.map((d) => diagnostic_1.tsDiagnosticToLspDiagnostic(d, result.scriptInfo))
+            uri: (0, utils_1.filePathToUri)(fileName),
+            diagnostics: diagnostics.map((d) => (0, diagnostic_1.tsDiagnosticToLspDiagnostic)(d, result.scriptInfo))
           });
           if (this.diagnosticsTimeout) {
             return;
@@ -3661,11 +4059,11 @@ var require_session = __commonJS({
           const { configFileName } = this.projectService.openClientFile(scriptInfo.fileName);
           if (!configFileName) {
             this.error(`No config file for ${scriptInfo.fileName}`);
-            return;
+            return null;
           }
           project = this.projectService.findProject(configFileName);
           if (!project) {
-            return;
+            return null;
           }
           scriptInfo.detachAllProjects();
           scriptInfo.attachToProject(project);
@@ -3674,6 +4072,8 @@ var require_session = __commonJS({
         return project;
       }
       onInitialize(params) {
+        var _a, _b, _c;
+        this.snippetSupport = (_c = (_b = (_a = params.capabilities.textDocument) === null || _a === void 0 ? void 0 : _a.completion) === null || _b === void 0 ? void 0 : _b.completionItem) === null || _c === void 0 ? void 0 : _c.snippetSupport;
         const serverOptions = {
           logFile: this.logger.getLogFileName()
         };
@@ -3707,7 +4107,7 @@ var require_session = __commonJS({
       onDidOpenTextDocument(params) {
         var _a;
         const { uri, languageId, text } = params.textDocument;
-        const filePath = utils_1.uriToFilePath(uri);
+        const filePath = (0, utils_1.uriToFilePath)(uri);
         if (!filePath) {
           return;
         }
@@ -3740,7 +4140,7 @@ var require_session = __commonJS({
         this.closeOrphanedExternalProjects();
       }
       createExternalProject(project) {
-        if (utils_1.isConfiguredProject(project) && !this.configuredProjToExternalProj.has(project.projectName)) {
+        if ((0, utils_1.isConfiguredProject)(project) && !this.configuredProjToExternalProj.has(project.projectName)) {
           const extProjectName = `${project.projectName}-external`;
           project.projectService.openExternalProject({
             projectFileName: extProjectName,
@@ -3752,7 +4152,7 @@ var require_session = __commonJS({
       }
       onDidCloseTextDocument(params) {
         const { textDocument } = params;
-        const filePath = utils_1.uriToFilePath(textDocument.uri);
+        const filePath = (0, utils_1.uriToFilePath)(textDocument.uri);
         if (!filePath) {
           return;
         }
@@ -3779,7 +4179,7 @@ var require_session = __commonJS({
       }
       onDidChangeTextDocument(params) {
         const { contentChanges, textDocument } = params;
-        const filePath = utils_1.uriToFilePath(textDocument.uri);
+        const filePath = (0, utils_1.uriToFilePath)(textDocument.uri);
         if (!filePath) {
           return;
         }
@@ -3791,7 +4191,7 @@ var require_session = __commonJS({
         }
         for (const change of contentChanges) {
           if ("range" in change) {
-            const [start, end] = utils_1.lspRangeToTsPositions(scriptInfo, change.range);
+            const [start, end] = (0, utils_1.lspRangeToTsPositions)(scriptInfo, change.range);
             scriptInfo.editContent(start, end, change.text);
           } else {
             scriptInfo.editContent(0, scriptInfo.getSnapshot().getLength(), change.text);
@@ -3805,7 +4205,7 @@ var require_session = __commonJS({
       }
       onDidSaveTextDocument(params) {
         const { text, textDocument } = params;
-        const filePath = utils_1.uriToFilePath(textDocument.uri);
+        const filePath = (0, utils_1.uriToFilePath)(textDocument.uri);
         if (!filePath) {
           return;
         }
@@ -3823,47 +4223,47 @@ var require_session = __commonJS({
       onDefinition(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
-          return;
+          return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const definition = languageService.getDefinitionAndBoundSpan(scriptInfo.fileName, offset);
         if (!definition || !definition.definitions) {
-          return;
+          return null;
         }
-        const originSelectionRange = utils_1.tsTextSpanToLspRange(scriptInfo, definition.textSpan);
+        const originSelectionRange = (0, utils_1.tsTextSpanToLspRange)(scriptInfo, definition.textSpan);
         return this.tsDefinitionsToLspLocationLinks(definition.definitions, originSelectionRange);
       }
       onTypeDefinition(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
-          return;
+          return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const definitions = languageService.getTypeDefinitionAtPosition(scriptInfo.fileName, offset);
         if (!definitions) {
-          return;
+          return null;
         }
         return this.tsDefinitionsToLspLocationLinks(definitions);
       }
       onRenameRequest(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
-          return;
+          return null;
         }
         const { languageService, scriptInfo } = lsInfo;
         const project = this.getDefaultProjectForScriptInfo(scriptInfo);
-        if (project === void 0 || this.renameDisabledProjects.has(project)) {
-          return;
+        if (project === null || this.renameDisabledProjects.has(project)) {
+          return null;
         }
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const renameLocations = languageService.findRenameLocations(scriptInfo.fileName, offset, false, false);
         if (renameLocations === void 0) {
-          return;
+          return null;
         }
         const changes = renameLocations.reduce((changes2, location) => {
-          let uri = utils_1.filePathToUri(location.fileName);
+          let uri = (0, utils_1.filePathToUri)(location.fileName);
           if (changes2[uri] === void 0) {
             changes2[uri] = [];
           }
@@ -3872,7 +4272,7 @@ var require_session = __commonJS({
           if (lsInfo2 === null) {
             return changes2;
           }
-          const range = utils_1.tsTextSpanToLspRange(lsInfo2.scriptInfo, location.textSpan);
+          const range = (0, utils_1.tsTextSpanToLspRange)(lsInfo2.scriptInfo, location.textSpan);
           fileEdits.push({ range, newText: params.newName });
           return changes2;
         }, {});
@@ -3885,15 +4285,15 @@ var require_session = __commonJS({
         }
         const { languageService, scriptInfo } = lsInfo;
         const project = this.getDefaultProjectForScriptInfo(scriptInfo);
-        if (project === void 0 || this.renameDisabledProjects.has(project)) {
+        if (project === null || this.renameDisabledProjects.has(project)) {
           return null;
         }
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const renameInfo = languageService.getRenameInfo(scriptInfo.fileName, offset);
         if (!renameInfo.canRename) {
           return null;
         }
-        const range = utils_1.tsTextSpanToLspRange(scriptInfo, renameInfo.triggerSpan);
+        const range = (0, utils_1.tsTextSpanToLspRange)(scriptInfo, renameInfo.triggerSpan);
         return {
           range,
           placeholder: renameInfo.displayName
@@ -3902,18 +4302,18 @@ var require_session = __commonJS({
       onReferences(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
-          return;
+          return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const references = languageService.getReferencesAtPosition(scriptInfo.fileName, offset);
         if (references === void 0) {
-          return;
+          return null;
         }
         return references.map((ref) => {
           const scriptInfo2 = this.projectService.getScriptInfo(ref.fileName);
-          const range = scriptInfo2 ? utils_1.tsTextSpanToLspRange(scriptInfo2, ref.textSpan) : EMPTY_RANGE;
-          const uri = utils_1.filePathToUri(ref.fileName);
+          const range = scriptInfo2 ? (0, utils_1.tsTextSpanToLspRange)(scriptInfo2, ref.textSpan) : EMPTY_RANGE;
+          const uri = (0, utils_1.filePathToUri)(ref.fileName);
           return { uri, range };
         });
       }
@@ -3924,8 +4324,8 @@ var require_session = __commonJS({
           if (!scriptInfo && d.textSpan.length > 0) {
             continue;
           }
-          const range = scriptInfo ? utils_1.tsTextSpanToLspRange(scriptInfo, d.textSpan) : EMPTY_RANGE;
-          const targetUri = utils_1.filePathToUri(d.fileName);
+          const range = scriptInfo ? (0, utils_1.tsTextSpanToLspRange)(scriptInfo, d.textSpan) : EMPTY_RANGE;
+          const targetUri = (0, utils_1.filePathToUri)(d.fileName);
           results.push({
             originSelectionRange,
             targetUri,
@@ -3936,7 +4336,7 @@ var require_session = __commonJS({
         return results;
       }
       getLSAndScriptInfo(textDocumentOrFileName) {
-        const filePath = lsp.TextDocumentIdentifier.is(textDocumentOrFileName) ? utils_1.uriToFilePath(textDocumentOrFileName.uri) : textDocumentOrFileName;
+        const filePath = lsp.TextDocumentIdentifier.is(textDocumentOrFileName) ? (0, utils_1.uriToFilePath)(textDocumentOrFileName.uri) : textDocumentOrFileName;
         const scriptInfo = this.projectService.getScriptInfo(filePath);
         if (!scriptInfo) {
           this.error(`Script info not found for ${filePath}`);
@@ -3952,7 +4352,7 @@ var require_session = __commonJS({
           return null;
         }
         const languageService = project.getLanguageService();
-        if (!api_1.isNgLanguageService(languageService)) {
+        if (!(0, api_1.isNgLanguageService)(languageService)) {
           return null;
         }
         return {
@@ -3963,13 +4363,13 @@ var require_session = __commonJS({
       onHover(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
-          return;
+          return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         const info = languageService.getQuickInfoAtPosition(scriptInfo.fileName, offset);
         if (!info) {
-          return;
+          return null;
         }
         const { kind, kindModifiers, textSpan, displayParts, documentation } = info;
         let desc = kindModifiers ? kindModifiers + " " : "";
@@ -3989,27 +4389,36 @@ var require_session = __commonJS({
         }
         return {
           contents,
-          range: utils_1.tsTextSpanToLspRange(scriptInfo, textSpan)
+          range: (0, utils_1.tsTextSpanToLspRange)(scriptInfo, textSpan)
         };
       }
       onCompletion(params) {
         var _a, _b, _c, _d;
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
-          return;
+          return null;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, params.position);
-        const completions = languageService.getCompletionsAtPosition(scriptInfo.fileName, offset, {});
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
+        let options = {};
+        const includeCompletionsWithSnippetText = this.includeCompletionsWithSnippetText && this.snippetSupport;
+        if (this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText) {
+          options = {
+            includeAutomaticOptionalChainCompletions: this.includeAutomaticOptionalChainCompletions,
+            includeCompletionsWithSnippetText,
+            includeCompletionsWithInsertText: this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText
+          };
+        }
+        const completions = languageService.getCompletionsAtPosition(scriptInfo.fileName, offset, options);
         if (!completions) {
-          return;
+          return null;
         }
         const clientSupportsInsertReplaceCompletion = (_d = (_c = (_b = (_a = this.clientCapabilities.textDocument) === null || _a === void 0 ? void 0 : _a.completion) === null || _b === void 0 ? void 0 : _b.completionItem) === null || _c === void 0 ? void 0 : _c.insertReplaceSupport) !== null && _d !== void 0 ? _d : false;
-        return completions.entries.map((e) => completion_1.tsCompletionEntryToLspCompletionItem(e, params.position, scriptInfo, clientSupportsInsertReplaceCompletion));
+        return completions.entries.map((e) => (0, completion_1.tsCompletionEntryToLspCompletionItem)(e, params.position, scriptInfo, clientSupportsInsertReplaceCompletion, this.ivy));
       }
       onCompletionResolve(item) {
         var _a;
-        const data = completion_1.readNgCompletionData(item);
+        const data = (0, completion_1.readNgCompletionData)(item);
         if (data === null) {
           return item;
         }
@@ -4019,7 +4428,7 @@ var require_session = __commonJS({
           return item;
         }
         const { languageService, scriptInfo } = lsInfo;
-        const offset = utils_1.lspPositionToTsPosition(scriptInfo, position);
+        const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, position);
         const details = languageService.getCompletionEntryDetails(filePath, offset, (_a = item.insertText) !== null && _a !== void 0 ? _a : item.label, void 0, void 0, void 0, void 0);
         if (details === void 0) {
           return item;
@@ -4072,7 +4481,7 @@ var require_session = __commonJS({
         return angularCore !== null && angularCore !== void 0 ? angularCore : null;
       }
       async runNgcc(project) {
-        if (!utils_1.isConfiguredProject(project)) {
+        if (!(0, utils_1.isConfiguredProject)(project)) {
           return;
         }
         this.disableLanguageServiceForProject(project, "ngcc is running");
@@ -4085,7 +4494,7 @@ var require_session = __commonJS({
         let success = false;
         try {
           this.projectNgccQueue.push({ project, done: false });
-          await ngcc_1.resolveAndRunNgcc(configFilePath, {
+          await (0, ngcc_1.resolveAndRunNgcc)(configFilePath, {
             report: (msg) => {
               this.connection.sendProgress(progress_1.NgccProgressType, progress_1.NgccProgressToken, {
                 done: false,
@@ -4150,17 +4559,17 @@ var server_host_1 = require_server_host();
 var session_1 = require_session();
 var version_provider_1 = require_version_provider();
 function main() {
-  const options = cmdline_utils_1.parseCommandLine(process.argv);
+  const options = (0, cmdline_utils_1.parseCommandLine)(process.argv);
   if (options.help) {
-    console.error(cmdline_utils_1.generateHelpMessage(process.argv));
+    console.error((0, cmdline_utils_1.generateHelpMessage)(process.argv));
     process.exit(0);
   }
-  const logger = logger_1.createLogger({
+  const logger = (0, logger_1.createLogger)({
     logFile: options.logFile,
     logVerbosity: options.logVerbosity
   });
-  const ts = version_provider_1.resolveTsServer(options.tsProbeLocations);
-  const ng = version_provider_1.resolveNgLangSvc(options.ngProbeLocations);
+  const ts = (0, version_provider_1.resolveTsServer)(options.tsProbeLocations);
+  const ng = (0, version_provider_1.resolveNgLangSvc)(options.ngProbeLocations);
   const isG3 = ts.resolvedPath.includes("/google3/");
   const host = new server_host_1.ServerHost(isG3);
   const session = new session_1.Session({
@@ -4169,7 +4578,9 @@ function main() {
     ngPlugin: "@angular/language-service",
     resolvedNgLsPath: ng.resolvedPath,
     ivy: isG3 ? true : options.ivy,
-    logToConsole: options.logToConsole
+    logToConsole: options.logToConsole,
+    includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
+    includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText
   });
   session.info(`Angular language server process ID: ${process.pid}`);
   session.info(`Using ${ts.name} v${ts.version} from ${ts.resolvedPath}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular/language-server",
   "description": "LSP server for Angular Language Service",
-  "version": "12.2.1",
+  "version": "13.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/vscode-ng-language-service.git"
@@ -15,7 +15,7 @@
     "ngserver": "./bin/ngserver"
   },
   "dependencies": {
-    "@angular/language-service": "12.2.9",
+    "@angular/language-service": "13.1.0",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.2"