@angular/language-server 13.3.4 → 14.0.0-rc.0

package/index.js

@@ -32,13 +32,15 @@ var require_cmdline_utils = __commonJS({
       return {
         help: hasArgument(argv, "--help"),
         ivy: !hasArgument(argv, "--viewEngine"),
+        disableAutomaticNgcc: hasArgument(argv, "--disableAutomaticNgcc"),
         logFile: findArgument(argv, "--logFile"),
         logVerbosity: findArgument(argv, "--logVerbosity"),
         logToConsole: hasArgument(argv, "--logToConsole"),
         ngProbeLocations: parseStringArray(argv, "--ngProbeLocations"),
         tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
-        includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText")
+        includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
+        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -74,13 +76,9 @@ var require_resolver = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -175,13 +173,9 @@ var require_version_provider = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -351,13 +345,15 @@ var require_cmdline_utils = __commonJS({
       return {
         help: hasArgument(argv, "--help"),
         ivy: !hasArgument(argv, "--viewEngine"),
+        disableAutomaticNgcc: hasArgument(argv, "--disableAutomaticNgcc"),
         logFile: findArgument(argv, "--logFile"),
         logVerbosity: findArgument(argv, "--logVerbosity"),
         logToConsole: hasArgument(argv, "--logToConsole"),
         ngProbeLocations: parseStringArray(argv, "--ngProbeLocations"),
         tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
-        includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText")
+        includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
+        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -393,13 +389,9 @@ var require_logger = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -525,13 +517,9 @@ var require_server_host = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3022,13 +3010,9 @@ var require_requests = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3052,11 +3036,12 @@ var require_requests = __commonJS({
       return result;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.IsInAngularProject = exports2.GetTcbRequest = exports2.GetTemplateLocationForComponent = exports2.GetComponentsWithTemplateFile = void 0;
+    exports2.IsInAngularProject = exports2.RunNgccRequest = 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.RunNgccRequest = new lsp.RequestType("angular/runNgcc");
     exports2.IsInAngularProject = new lsp.RequestType("angular/isAngularCoreInOwningProject");
   }
 });
@@ -3068,13 +3053,9 @@ var require_utils = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3226,13 +3207,9 @@ var require_completion = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3358,13 +3335,9 @@ var require_diagnostic = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3423,13 +3396,9 @@ var require_resolver = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3524,13 +3493,9 @@ var require_version_provider = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3707,13 +3672,9 @@ var require_session = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
+      Object.defineProperty(o, k2, { enumerable: true, get: function() {
+        return m[k];
+      } });
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3772,6 +3733,7 @@ var require_session = __commonJS({
         this.includeCompletionsWithSnippetText = options.includeCompletionsWithSnippetText;
         this.logger = options.logger;
         this.ivy = options.ivy;
+        this.disableAutomaticNgcc = options.disableAutomaticNgcc;
         this.logToConsole = options.logToConsole;
         this.connection = lsp.createConnection({
           cancelUndispatched(message) {
@@ -3821,9 +3783,11 @@ var require_session = __commonJS({
         const pluginConfig = {
           angularOnly: true
         };
+        if (options.forceStrictTemplates) {
+          pluginConfig.forceStrictTemplates = true;
+        }
         if (options.host.isG3) {
           options.ivy = true;
-          pluginConfig.forceStrictTemplates = true;
         }
         projSvc.configurePlugin({
           pluginName: options.ngPlugin,
@@ -3848,6 +3812,7 @@ var require_session = __commonJS({
         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.RunNgccRequest, (p) => this.onRunNgcc(p));
         conn.onRequest(requests_1.IsInAngularProject, (p) => this.isInAngularProject(p));
         conn.onCodeLens((p) => this.onCodeLens(p));
         conn.onCodeLensResolve((p) => this.onCodeLensResolve(p));
@@ -3891,6 +3856,17 @@ var require_session = __commonJS({
           selections: response.selections.map((span) => (0, utils_1.tsTextSpanToLspRange)(tcfScriptInfo, span))
         };
       }
+      onRunNgcc(params) {
+        const lsInfo = this.getLSAndScriptInfo(params.textDocument);
+        if (lsInfo === null) {
+          return;
+        }
+        const project = this.getDefaultProjectForScriptInfo(lsInfo.scriptInfo);
+        if (!project) {
+          return;
+        }
+        this.runNgcc(project);
+      }
       onGetTemplateLocationForComponent(params) {
         const lsInfo = this.getLSAndScriptInfo(params.textDocument);
         if (lsInfo === null) {
@@ -4060,7 +4036,7 @@ var require_session = __commonJS({
             const { project } = event.data;
             const angularCore = this.findAngularCore(project);
             if (angularCore) {
-              if (this.ivy && isExternalAngularCore(angularCore)) {
+              if (this.ivy && isExternalAngularCore(angularCore) && !this.disableAutomaticNgcc) {
                 this.runNgcc(project);
               } else {
                 this.enableLanguageServiceForProject(project);
@@ -4566,7 +4542,7 @@ var require_session = __commonJS({
         return angularCore !== null && angularCore !== void 0 ? angularCore : null;
       }
       async runNgcc(project) {
-        if (!(0, utils_1.isConfiguredProject)(project)) {
+        if (!(0, utils_1.isConfiguredProject)(project) || this.projectNgccQueue.some((p) => p.project === project)) {
           return;
         }
         this.disableLanguageServiceForProject(project, "ngcc is running");
@@ -4660,9 +4636,11 @@ function main() {
     ngPlugin: "@angular/language-service",
     resolvedNgLsPath: ng.resolvedPath,
     ivy: isG3 ? true : options.ivy,
+    disableAutomaticNgcc: options.disableAutomaticNgcc,
     logToConsole: options.logToConsole,
     includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
-    includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText
+    includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText,
+    forceStrictTemplates: isG3 || options.forceStrictTemplates
   });
   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": "13.3.4",
+  "version": "14.0.0-rc.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/vscode-ng-language-service.git"
@@ -9,13 +9,13 @@
   "author": "Angular",
   "license": "MIT",
   "engines": {
-    "node": "^12.20.0 || ^14.15.0 || >=16.10.0"
+    "node": "^14.15.0 || >=16.10.0"
   },
   "bin": {
     "ngserver": "./bin/ngserver"
   },
   "dependencies": {
-    "@angular/language-service": "13.3.8",
+    "@angular/language-service": "14.0.0-rc.1",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.3"