Rename Aspire.Hosting.NodeJs to Aspire.Hosting.JavaScript (dotnet#12681)

* Rename Aspire.Hosting.NodeJs to Aspire.Hosting.JavaScript

This makes the library consistent to use language naming, and not a single technology. It allows for more JS features in the future that aren't tied to Node.js.

Since the library is being renamed, I also removed the Obsolete APIs since there is no reason to ship them in the new library.

Contributes to dotnet#12058

* Fix build

* Fix Helix tests

Author: eerhardt

Aspire.slnx

@@ -60,7 +60,7 @@
     <Project Path="src/Aspire.Hosting.MongoDB/Aspire.Hosting.MongoDB.csproj" />
     <Project Path="src/Aspire.Hosting.MySql/Aspire.Hosting.MySql.csproj" />
     <Project Path="src/Aspire.Hosting.Nats/Aspire.Hosting.Nats.csproj" />
-    <Project Path="src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj" />
+    <Project Path="src/Aspire.Hosting.JavaScript/Aspire.Hosting.JavaScript.csproj" />
     <Project Path="src/Aspire.Hosting.OpenAI/Aspire.Hosting.OpenAI.csproj" />
     <Project Path="src/Aspire.Hosting.Oracle/Aspire.Hosting.Oracle.csproj" />
     <Project Path="src/Aspire.Hosting.Orleans/Aspire.Hosting.Orleans.csproj" />
@@ -425,7 +425,7 @@
     <Project Path="tests/Aspire.Hosting.MongoDB.Tests/Aspire.Hosting.MongoDB.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.MySql.Tests/Aspire.Hosting.MySql.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.Nats.Tests/Aspire.Hosting.Nats.Tests.csproj" />
-    <Project Path="tests/Aspire.Hosting.NodeJs.Tests/Aspire.Hosting.NodeJs.Tests.csproj" />
+    <Project Path="tests/Aspire.Hosting.JavaScript.Tests/Aspire.Hosting.JavaScript.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.OpenAI.Tests/Aspire.Hosting.OpenAI.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.Oracle.Tests/Aspire.Hosting.Oracle.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.PostgreSQL.Tests/Aspire.Hosting.PostgreSQL.Tests.csproj" />

AspireWithMaui.slnx

@@ -60,7 +60,7 @@
     <Project Path="src/Aspire.Hosting.MongoDB/Aspire.Hosting.MongoDB.csproj" />
     <Project Path="src/Aspire.Hosting.MySql/Aspire.Hosting.MySql.csproj" />
     <Project Path="src/Aspire.Hosting.Nats/Aspire.Hosting.Nats.csproj" />
-    <Project Path="src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj" />
+    <Project Path="src/Aspire.Hosting.JavaScript/Aspire.Hosting.JavaScript.csproj" />
     <Project Path="src/Aspire.Hosting.OpenAI/Aspire.Hosting.OpenAI.csproj" />
     <Project Path="src/Aspire.Hosting.Oracle/Aspire.Hosting.Oracle.csproj" />
     <Project Path="src/Aspire.Hosting.Orleans/Aspire.Hosting.Orleans.csproj" />
@@ -432,7 +432,7 @@
     <Project Path="tests/Aspire.Hosting.MongoDB.Tests/Aspire.Hosting.MongoDB.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.MySql.Tests/Aspire.Hosting.MySql.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.Nats.Tests/Aspire.Hosting.Nats.Tests.csproj" />
-    <Project Path="tests/Aspire.Hosting.NodeJs.Tests/Aspire.Hosting.NodeJs.Tests.csproj" />
+    <Project Path="tests/Aspire.Hosting.JavaScript.Tests/Aspire.Hosting.JavaScript.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.OpenAI.Tests/Aspire.Hosting.OpenAI.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.Oracle.Tests/Aspire.Hosting.Oracle.Tests.csproj" />
     <Project Path="tests/Aspire.Hosting.PostgreSQL.Tests/Aspire.Hosting.PostgreSQL.Tests.csproj" />

playground/AspireWithJavaScript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
-    <AspireProjectOrPackageReference Include="Aspire.Hosting.NodeJs" />
+    <AspireProjectOrPackageReference Include="Aspire.Hosting.JavaScript" />
   </ItemGroup>
 
   <ItemGroup>

playground/AspireWithNode/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
-    <AspireProjectOrPackageReference Include="Aspire.Hosting.NodeJs" />
+    <AspireProjectOrPackageReference Include="Aspire.Hosting.JavaScript" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.Redis" />
   </ItemGroup>
 

playground/AspireWithNode/AspireWithNode.AppHost/NodeHostingExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Hosting;
+using Aspire.Hosting.JavaScript;
+using Microsoft.Extensions.Hosting;
 
 namespace Aspire.Hosting;
 
@@ -8,7 +9,7 @@ internal static class NodeHostingExtensions
     /// Injects the ASP.NET Core HTTPS developer certificate into the resource via the specified environment variables when
     /// <paramref name="builder"/>.<see cref="IResourceBuilder{T}.ApplicationBuilder">ApplicationBuilder</see>.<see cref="IDistributedApplicationBuilder.ExecutionContext">ExecutionContext</see>.<see cref="DistributedApplicationExecutionContext.IsRunMode">IsRunMode</see><c> == true</c>.<br/>
     /// </summary>
-    public static IResourceBuilder<NodeAppResource> RunWithHttpsDevCertificate(this IResourceBuilder<NodeAppResource> builder, string certFileEnv, string certKeyFileEnv)
+    public static IResourceBuilder<JavaScriptAppResource> RunWithHttpsDevCertificate(this IResourceBuilder<JavaScriptAppResource> builder, string certFileEnv, string certKeyFileEnv)
     {
         if (builder.ApplicationBuilder.ExecutionContext.IsRunMode && builder.ApplicationBuilder.Environment.IsDevelopment())
         {

src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj renamed to src/Aspire.Hosting.JavaScript/Aspire.Hosting.JavaScript.csproj

@@ -4,12 +4,13 @@
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
     <PackageTags>aspire integration hosting Node Nodejs javascript framework runtime</PackageTags>
-    <Description>Node.js support for Aspire.</Description>
+    <Description>JavaScript support for Aspire.</Description>
+    <!-- Disable package validation as this package hasn't shipped stable yet. -->
+    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="$(SharedDir)PathNormalizer.cs" Link="Utils\PathNormalizer.cs" />
-    <Compile Include="$(SharedDir)OverloadResolutionPriorityAttribute.cs" Link="Utils\OverloadResolutionPriorityAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.NodeJs/JavaScriptAppResource.cs renamed to src/Aspire.Hosting.JavaScript/JavaScriptAppResource.cs

@@ -3,7 +3,7 @@
 
 using Aspire.Hosting.ApplicationModel;
 
-namespace Aspire.Hosting;
+namespace Aspire.Hosting.JavaScript;
 
 /// <summary>
 /// A resource that represents a JavaScript application.

src/Aspire.Hosting.NodeJs/JavaScriptBuildScriptAnnotation.cs renamed to src/Aspire.Hosting.JavaScript/JavaScriptBuildScriptAnnotation.cs

@@ -3,7 +3,7 @@
 
 using Aspire.Hosting.ApplicationModel;
 
-namespace Aspire.Hosting.NodeJs;
+namespace Aspire.Hosting.JavaScript;
 
 /// <summary>
 /// Represents the annotation for the JavaScript package manager's build script.

src/Aspire.Hosting.NodeJs/NodeExtensions.cs renamed to src/Aspire.Hosting.JavaScript/JavaScriptHostingExtensions.cs

@@ -3,12 +3,10 @@
 
 #pragma warning disable ASPIREDOCKERFILEBUILDER001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 
-using System.ComponentModel;
 using System.Globalization;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Aspire.Hosting.ApplicationModel;
-using Aspire.Hosting.NodeJs;
+using Aspire.Hosting.JavaScript;
 using Aspire.Hosting.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -18,42 +16,12 @@
 namespace Aspire.Hosting;
 
 /// <summary>
-/// Provides extension methods for adding Node applications to an <see cref="IDistributedApplicationBuilder"/>.
+/// Provides extension methods for adding JavaScript applications to an <see cref="IDistributedApplicationBuilder"/>.
 /// </summary>
-public static class NodeAppHostingExtension
+public static class JavaScriptHostingExtensions
 {
     private const string DefaultNodeVersion = "22";
 
-    /// <summary>
-    /// Adds a node application to the application model. Node should be available on the PATH.
-    /// </summary>
-    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/> to add the resource to.</param>
-    /// <param name="name">The name of the resource.</param>
-    /// <param name="scriptPath">The path to the script that Node will execute.</param>
-    /// <param name="workingDirectory">The working directory to use for the command. If null, the directory of the <paramref name="scriptPath"/> is used.</param>
-    /// <param name="args">The arguments to pass to the command.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    [Obsolete("Use AddNodeApp that takes an appDirectory and relative scriptPath instead.")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static IResourceBuilder<NodeAppResource> AddNodeApp(this IDistributedApplicationBuilder builder, [ResourceName] string name, string scriptPath, string? workingDirectory = null, string[]? args = null)
-    {
-        ArgumentNullException.ThrowIfNull(builder);
-        ArgumentException.ThrowIfNullOrEmpty(name);
-        ArgumentException.ThrowIfNullOrEmpty(scriptPath);
-
-        args ??= [];
-        string[] effectiveArgs = [scriptPath, .. args];
-        workingDirectory ??= Path.GetDirectoryName(scriptPath)!;
-        workingDirectory = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.AppHostDirectory, workingDirectory));
-
-        var resource = new NodeAppResource(name, "node", workingDirectory);
-
-        return builder.AddResource(resource)
-                      .WithNodeDefaults()
-                      .WithArgs(effectiveArgs)
-                      .WithIconName("CodeJsRectangle");
-    }
-
     /// <summary>
     /// Adds a node application to the application model. Node should be available on the PATH.
     /// </summary>
@@ -80,7 +48,6 @@ public static IResourceBuilder<NodeAppResource> AddNodeApp(this IDistributedAppl
     /// builder.Build().Run();
     /// </code>
     /// </example>
-    [OverloadResolutionPriority(1)]
     public static IResourceBuilder<NodeAppResource> AddNodeApp(this IDistributedApplicationBuilder builder, [ResourceName] string name, string appDirectory, string scriptPath)
     {
         ArgumentNullException.ThrowIfNull(builder);
@@ -200,36 +167,6 @@ public static IResourceBuilder<NodeAppResource> AddNodeApp(this IDistributedAppl
         return resourceBuilder;
     }
 
-    /// <summary>
-    /// Adds a node application to the application model. Executes the npm command with the specified script name.
-    /// </summary>
-    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/> to add the resource to.</param>
-    /// <param name="name">The name of the resource.</param>
-    /// <param name="workingDirectory">The working directory to use for the command.</param>
-    /// <param name="scriptName">The npm script to execute. Defaults to "start".</param>
-    /// <param name="args">The arguments to pass to the command.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    [Obsolete("Use AddJavaScriptApp instead.")]
-    public static IResourceBuilder<NodeAppResource> AddNpmApp(this IDistributedApplicationBuilder builder, [ResourceName] string name, string workingDirectory, string scriptName = "start", string[]? args = null)
-    {
-        ArgumentNullException.ThrowIfNull(builder);
-        ArgumentException.ThrowIfNullOrEmpty(name);
-        ArgumentException.ThrowIfNullOrEmpty(workingDirectory);
-        ArgumentException.ThrowIfNullOrEmpty(scriptName);
-
-        string[] allArgs = args is { Length: > 0 }
-            ? ["run", scriptName, "--", .. args]
-            : ["run", scriptName];
-
-        workingDirectory = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.AppHostDirectory, workingDirectory));
-        var resource = new NodeAppResource(name, "npm", workingDirectory);
-
-        return builder.AddResource(resource)
-                      .WithNodeDefaults()
-                      .WithArgs(allArgs)
-                      .WithIconName("CodeJsRectangle");
-    }
-
     private static IResourceBuilder<TResource> WithNodeDefaults<TResource>(this IResourceBuilder<TResource> builder) where TResource : JavaScriptAppResource =>
         builder.WithOtlpExporter()
             .WithEnvironment("NODE_ENV", builder.ApplicationBuilder.Environment.IsDevelopment() ? "development" : "production")

src/Aspire.Hosting.NodeJs/JavaScriptInstallCommandAnnotation.cs renamed to src/Aspire.Hosting.JavaScript/JavaScriptInstallCommandAnnotation.cs

@@ -3,7 +3,7 @@
 
 using Aspire.Hosting.ApplicationModel;
 
-namespace Aspire.Hosting.NodeJs;
+namespace Aspire.Hosting.JavaScript;
 
 /// <summary>
 /// Represents the annotation for the JavaScript package manager's install command.