@angular/language-server 17.0.0 → 17.0.2

package/index.js

@@ -28,6 +28,7 @@ var require_cmdline_utils = __commonJS({
       return argv.includes(argName);
     }
     function parseCommandLine(argv) {
+      var _a;
       return {
         help: hasArgument(argv, "--help"),
         logFile: findArgument(argv, "--logFile"),
@@ -35,9 +36,11 @@ var require_cmdline_utils = __commonJS({
         logToConsole: hasArgument(argv, "--logToConsole"),
         ngProbeLocations: parseStringArray(argv, "--ngProbeLocations"),
         tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
+        tsdk: (_a = findArgument(argv, "--tsdk")) !== null && _a !== void 0 ? _a : null,
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
         includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
-        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates")
+        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates"),
+        disableBlockSyntax: hasArgument(argv, "--disableBlockSyntax")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -235,9 +238,9 @@ var require_version_provider = __commonJS({
       }
       throw new Error(`Failed to resolve '${packageName}' with minimum version '${minVersion}' from ` + JSON.stringify(probeLocations, null, 2));
     }
-    function resolveTsServer(probeLocations) {
-      if (probeLocations.length > 0) {
-        const resolvedFromTsdk = resolveTsServerFromTsdk(probeLocations[0], probeLocations.slice(1));
+    function resolveTsServer(probeLocations, tsdk) {
+      if (tsdk !== null) {
+        const resolvedFromTsdk = resolveTsServerFromTsdk(tsdk, probeLocations);
         const minVersion = new resolver_1.Version(MIN_TS_VERSION);
         if (resolvedFromTsdk !== void 0) {
           if (resolvedFromTsdk.version.greaterThanOrEqual(minVersion)) {
@@ -302,8 +305,8 @@ function requireOverride(moduleName) {
     throw new Error(`Import '${TSSERVER}' instead of 'typescript'`);
   }
   if (moduleName === TSSERVER) {
-    const { tsProbeLocations } = (0, cmdline_utils_1.parseCommandLine)(process.argv);
-    moduleName = (0, version_provider_1.resolveTsServer)(tsProbeLocations).resolvedPath;
+    const { tsProbeLocations, tsdk } = (0, cmdline_utils_1.parseCommandLine)(process.argv);
+    moduleName = (0, version_provider_1.resolveTsServer)(tsProbeLocations, tsdk).resolvedPath;
   }
   return originalRequire(moduleName);
 }
@@ -400,6 +403,7 @@ var require_cmdline_utils = __commonJS({
       return argv.includes(argName);
     }
     function parseCommandLine(argv) {
+      var _a;
       return {
         help: hasArgument(argv, "--help"),
         logFile: findArgument(argv, "--logFile"),
@@ -407,9 +411,11 @@ var require_cmdline_utils = __commonJS({
         logToConsole: hasArgument(argv, "--logToConsole"),
         ngProbeLocations: parseStringArray(argv, "--ngProbeLocations"),
         tsProbeLocations: parseStringArray(argv, "--tsProbeLocations"),
+        tsdk: (_a = findArgument(argv, "--tsdk")) !== null && _a !== void 0 ? _a : null,
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
         includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
-        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates")
+        forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates"),
+        disableBlockSyntax: hasArgument(argv, "--disableBlockSyntax")
       };
     }
     exports2.parseCommandLine = parseCommandLine;
@@ -757,9 +763,9 @@ var require_server_host = __commonJS({
   }
 });
 
-// ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@17.0.0-rc.3/node_modules/@angular/language-service/api_bundle.js
+// ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@17.0.2/node_modules/@angular/language-service/api_bundle.js
 var require_api_bundle = __commonJS({
-  "../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@17.0.0-rc.3/node_modules/@angular/language-service/api_bundle.js"(exports2, module2) {
+  "../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@17.0.2/node_modules/@angular/language-service/api_bundle.js"(exports2, module2) {
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
@@ -191960,6 +191966,9 @@ var require_session = __commonJS({
         if (options2.forceStrictTemplates) {
           pluginConfig.forceStrictTemplates = true;
         }
+        if (options2.disableBlockSyntax) {
+          pluginConfig.enableBlockSyntax = false;
+        }
         projSvc.configurePlugin({
           pluginName: options2.ngPlugin,
           configuration: pluginConfig
@@ -192195,7 +192204,8 @@ var require_session = __commonJS({
         if (!project.languageServiceEnabled) {
           return;
         }
-        project.disableLanguageService(`Disabling language service for ${project.getProjectName()} because ${reason}.`);
+        this.info(`Disabling language service for ${project.getProjectName()} because ${reason}.`);
+        project.disableLanguageService();
       }
       /**
        * Invoke the compiler for the first time so that external templates get
@@ -192239,6 +192249,7 @@ var require_session = __commonJS({
        * @param event
        */
       handleProjectServiceEvent(event) {
+        var _a;
         switch (event.eventName) {
           case ts.server.ProjectLoadingStartEvent:
             this.isProjectLoading = true;
@@ -192254,6 +192265,8 @@ var require_session = __commonJS({
             const angularCore = this.findAngularCore(project);
             if (angularCore) {
               this.enableLanguageServiceForProject(project);
+            } else if ((_a = project.getProjectReferences()) === null || _a === void 0 ? void 0 : _a.length) {
+              this.info(`@angular/core could not be found for project ${project.getProjectName()} but it has references that might. The Angular language service will remain enabled for this project.`);
             } else {
               this.disableLanguageServiceForProject(project, `project is not an Angular project ('@angular/core' could not be found)`);
             }
@@ -193071,9 +193084,9 @@ var require_version_provider = __commonJS({
       }
       throw new Error(`Failed to resolve '${packageName}' with minimum version '${minVersion}' from ` + JSON.stringify(probeLocations, null, 2));
     }
-    function resolveTsServer(probeLocations) {
-      if (probeLocations.length > 0) {
-        const resolvedFromTsdk = resolveTsServerFromTsdk(probeLocations[0], probeLocations.slice(1));
+    function resolveTsServer(probeLocations, tsdk) {
+      if (tsdk !== null) {
+        const resolvedFromTsdk = resolveTsServerFromTsdk(tsdk, probeLocations);
         const minVersion = new resolver_1.Version(MIN_TS_VERSION);
         if (resolvedFromTsdk !== void 0) {
           if (resolvedFromTsdk.version.greaterThanOrEqual(minVersion)) {
@@ -193128,6 +193141,7 @@ var require_version_provider = __commonJS({
 
 // ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/server/src/server.js
 Object.defineProperty(exports, "__esModule", { value: true });
+var tsserverlibrary_1 = require("typescript/lib/tsserverlibrary");
 var cmdline_utils_1 = require_cmdline_utils();
 var options = (0, cmdline_utils_1.parseCommandLine)(process.argv);
 if (options.help) {
@@ -193143,7 +193157,7 @@ function main() {
     logFile: options.logFile,
     logVerbosity: options.logVerbosity
   });
-  const ts = (0, version_provider_1.resolveTsServer)(options.tsProbeLocations);
+  const ts = (0, version_provider_1.resolveTsServer)(options.tsProbeLocations, options.tsdk);
   const ng = (0, version_provider_1.resolveNgLangSvc)(options.ngProbeLocations);
   const isG3 = ts.resolvedPath.includes("/google3/");
   const host = new server_host_1.ServerHost(isG3);
@@ -193156,10 +193170,11 @@ function main() {
     logToConsole: options.logToConsole,
     includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
     includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText,
-    forceStrictTemplates: isG3 || options.forceStrictTemplates
+    forceStrictTemplates: isG3 || options.forceStrictTemplates,
+    disableBlockSyntax: options.disableBlockSyntax
   });
   session.info(`Angular language server process ID: ${process.pid}`);
-  session.info(`Using ${ts.name} v${ts.version} from ${ts.resolvedPath}`);
+  session.info(`Imported typescript/lib/tsserverlibrary is version ${tsserverlibrary_1.version}.`);
   session.info(`Using ${ng.name} v${ng.version} from ${ng.resolvedPath}`);
   if (logger.loggingEnabled()) {
     session.info(`Log file: ${logger.getLogFileName()}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular/language-server",
   "description": "LSP server for Angular Language Service",
-  "version": "17.0.0",
+  "version": "17.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/vscode-ng-language-service.git"
@@ -15,7 +15,7 @@
     "ngserver": "./bin/ngserver"
   },
   "dependencies": {
-    "@angular/language-service": "17.0.0-rc.3",
+    "@angular/language-service": "17.0.2",
     "vscode-html-languageservice": "^4.2.5",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",