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

package/index.js

@@ -40,7 +40,8 @@ var require_cmdline_utils = __commonJS({
         tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
         includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
-        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates")
+        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates"),
+        untrustedWorkspace: hasArgument(argv, "--untrustedWorkspace")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -76,9 +77,13 @@ var require_resolver = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -173,9 +178,13 @@ var require_version_provider = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -353,7 +362,8 @@ var require_cmdline_utils = __commonJS({
         tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
         includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
-        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates")
+        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates"),
+        untrustedWorkspace: hasArgument(argv, "--untrustedWorkspace")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -389,9 +399,13 @@ var require_logger = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -517,9 +531,13 @@ var require_server_host = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3010,9 +3028,13 @@ var require_requests = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3053,9 +3075,13 @@ var require_utils = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3207,9 +3233,13 @@ var require_completion = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3335,9 +3365,13 @@ var require_diagnostic = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3396,9 +3430,13 @@ var require_resolver = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3493,9 +3531,13 @@ var require_version_provider = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3672,9 +3714,13 @@ var require_session = __commonJS({
     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];
-      } });
+      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);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3722,7 +3768,6 @@ var require_session = __commonJS({
     })(NgccErrorMessageAction || (NgccErrorMessageAction = {}));
     var Session = class {
       constructor(options) {
-        this.configuredProjToExternalProj = /* @__PURE__ */ new Map();
         this.openFiles = new utils_1.MruTracker();
         this.projectNgccQueue = [];
         this.diagnosticsTimeout = null;
@@ -3735,6 +3780,7 @@ var require_session = __commonJS({
         this.ivy = options.ivy;
         this.disableAutomaticNgcc = options.disableAutomaticNgcc;
         this.logToConsole = options.logToConsole;
+        this.untrustedWorkspace = options.untrustedWorkspace;
         this.connection = lsp.createConnection({
           cancelUndispatched(message) {
             return {
@@ -3983,6 +4029,7 @@ var require_session = __commonJS({
         this.info(`Enabling Ivy language service for ${projectName}.`);
         this.handleCompilerOptionsDiagnostics(project);
         this.runGlobalAnalysisForNewlyLoadedProject(project);
+        project.refreshDiagnostics();
       }
       disableLanguageServiceForProject(project, reason) {
         if (!project.languageServiceEnabled) {
@@ -4121,7 +4168,6 @@ var require_session = __commonJS({
           scriptInfo.detachAllProjects();
           scriptInfo.attachToProject(project);
         }
-        this.createExternalProject(project);
         return project;
       }
       onInitialize(params) {
@@ -4190,18 +4236,6 @@ var require_session = __commonJS({
           }
           throw error;
         }
-        this.closeOrphanedExternalProjects();
-      }
-      createExternalProject(project) {
-        if ((0, utils_1.isConfiguredProject)(project) && !this.configuredProjToExternalProj.has(project.projectName)) {
-          const extProjectName = `${project.projectName}-external`;
-          project.projectService.openExternalProject({
-            projectFileName: extProjectName,
-            rootFiles: [{ fileName: project.getConfigFilePath() }],
-            options: {}
-          });
-          this.configuredProjToExternalProj.set(project.projectName, extProjectName);
-        }
       }
       onDidCloseTextDocument(params) {
         const { textDocument } = params;
@@ -4212,24 +4246,6 @@ var require_session = __commonJS({
         this.openFiles.delete(filePath);
         this.projectService.closeClientFile(filePath);
       }
-      closeOrphanedExternalProjects() {
-        for (const [configuredProjName, externalProjName] of this.configuredProjToExternalProj) {
-          const configuredProj = this.projectService.findProject(configuredProjName);
-          if (!configuredProj || configuredProj.isClosed()) {
-            this.projectService.closeExternalProject(externalProjName);
-            this.configuredProjToExternalProj.delete(configuredProjName);
-            continue;
-          }
-          const openFiles = toArray(this.projectService.openFiles.keys());
-          if (!openFiles.some((file) => {
-            const scriptInfo = this.projectService.getScriptInfo(file);
-            return scriptInfo === null || scriptInfo === void 0 ? void 0 : scriptInfo.isAttached(configuredProj);
-          })) {
-            this.projectService.closeExternalProject(externalProjName);
-            this.configuredProjToExternalProj.delete(configuredProjName);
-          }
-        }
-      }
       onDidChangeTextDocument(params) {
         const { contentChanges, textDocument } = params;
         const filePath = (0, utils_1.uriToFilePath)(textDocument.uri);
@@ -4542,6 +4558,10 @@ var require_session = __commonJS({
         return angularCore !== null && angularCore !== void 0 ? angularCore : null;
       }
       async runNgcc(project) {
+        if (this.untrustedWorkspace) {
+          this.error("Cannot run ngcc in an untrusted workspace.");
+          return;
+        }
         if (!(0, utils_1.isConfiguredProject)(project) || this.projectNgccQueue.some((p) => p.project === project)) {
           return;
         }
@@ -4584,13 +4604,6 @@ var require_session = __commonJS({
       }
     };
     exports2.Session = Session;
-    function toArray(it) {
-      const results = [];
-      for (let itResult = it.next(); !itResult.done; itResult = it.next()) {
-        results.push(itResult.value);
-      }
-      return results;
-    }
     function isAngularCore(path) {
       return isExternalAngularCore(path) || isInternalAngularCore(path);
     }
@@ -4636,11 +4649,12 @@ function main() {
     ngPlugin: "@angular/language-service",
     resolvedNgLsPath: ng.resolvedPath,
     ivy: isG3 ? true : options.ivy,
-    disableAutomaticNgcc: options.disableAutomaticNgcc,
+    disableAutomaticNgcc: options.disableAutomaticNgcc || options.untrustedWorkspace,
     logToConsole: options.logToConsole,
     includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
     includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText,
-    forceStrictTemplates: isG3 || options.forceStrictTemplates
+    forceStrictTemplates: isG3 || options.forceStrictTemplates,
+    untrustedWorkspace: options.untrustedWorkspace
   });
   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": "14.0.0-rc.0",
+  "version": "14.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": "14.0.0-rc.1",
+    "@angular/language-service": "14.1.0",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.3"
@@ -23,4 +23,4 @@
   "publishConfig": {
     "registry": "https://wombat-dressing-room.appspot.com"
   }
-}
+}