@abgov/nx-adsp 13.20.0 → 13.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "13.20.0",
+  "version": "13.20.1",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for ADSP apps.",
@@ -11,7 +11,6 @@
   },
   "peerDependencies": {
     "@abgov/nx-oc": "^13.0.0-0",
-    "@nx-dotnet/core": "^3.0.0",
     "@nx/angular": "^23.0.0",
     "@nx/devkit": "^23.0.0",
     "@nx/eslint": "^23.0.0",
@@ -22,9 +21,6 @@
     "tslib": "^2.0.0"
   },
   "peerDependenciesMeta": {
-    "@nx-dotnet/core": {
-      "optional": true
-    },
     "@nx/angular": {
       "optional": true
     },

package/src/generators/dotnet-service/dotnet-service.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const tslib_1 = require("tslib");
 const nx_oc_1 = require("@abgov/nx-oc");
-const generator_1 = require("@nx-dotnet/core/src/generators/app/generator");
-const generator_2 = require("@nx-dotnet/core/src/generators/nuget-reference/generator");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 function normalizeOptions(host, options) {
@@ -18,30 +16,48 @@ function normalizeOptions(host, options) {
     });
 }
 function addFiles(host, options) {
-    const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
+    const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign({}, options), options.adsp), (0, devkit_1.names)(options.projectName)), { tmpl: '' });
     (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
 }
+function ensureNuGetConfig(host) {
+    if (!host.exists('NuGet.Config')) {
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'nuget-files'), '.', { tmpl: '' });
+    }
+}
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!(0, nx_oc_1.hasDependency)(host, '@nx-dotnet/core')) {
-            throw new Error('nx-dotnet/core is required to generate dotnet service');
+        if (!(0, nx_oc_1.hasDependency)(host, '@nx/dotnet')) {
+            throw new Error('@nx/dotnet is required to generate dotnet service');
         }
         const normalizedOptions = yield normalizeOptions(host, options);
-        yield (0, generator_1.default)(host, {
-            name: normalizedOptions.projectName,
-            template: 'webapi',
-            language: 'C#',
-            testTemplate: 'none',
-            solutionFile: false,
-            skipSwaggerLib: true,
-            pathScheme: 'nx',
+        (0, devkit_1.addProjectConfiguration)(host, normalizedOptions.projectName, {
+            root: normalizedOptions.projectRoot,
+            projectType: 'application',
+            sourceRoot: normalizedOptions.projectRoot,
+            targets: {
+                serve: {
+                    executor: 'nx:run-commands',
+                    options: {
+                        command: 'dotnet run',
+                        cwd: normalizedOptions.projectRoot,
+                    },
+                    configurations: {
+                        production: {
+                            command: 'dotnet run --configuration Release',
+                        },
+                    },
+                },
+            },
+            tags: ['adsp:type:dotnet'],
         });
-        yield (0, generator_2.default)(host, {
-            allowVersionMismatch: false,
-            project: normalizedOptions.projectName,
-            packageName: 'Adsp.Sdk',
-            version: '2.*',
+        (0, devkit_1.updateJson)(host, 'nx.json', (json) => {
+            var _a, _b;
+            if (!((_a = json.plugins) === null || _a === void 0 ? void 0 : _a.includes('@nx/dotnet'))) {
+                json.plugins = [...((_b = json.plugins) !== null && _b !== void 0 ? _b : []), '@nx/dotnet'];
+            }
+            return json;
         });
+        ensureNuGetConfig(host);
         addFiles(host, normalizedOptions);
         yield (0, nx_oc_1.deploymentGenerator)(host, Object.assign(Object.assign({}, normalizedOptions), { appType: 'dotnet', project: normalizedOptions.projectName }));
         return () => tslib_1.__awaiter(this, void 0, void 0, function* () {

package/src/generators/dotnet-service/dotnet-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;AAgDA,4BAmCC;;AAnFD,wCAIsB;AACtB,4EAAuF;AACvF,wFAAmG;AACnG,uCAMoB;AACpB,6BAA6B;AAG7B,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAA,qBAAa,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,IAAA,mBAAY,EAAC,IAAI,EAAE;YACvB,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,EAAE;YACvB,oBAAoB,EAAE,KAAK;YAC3B,OAAO,EAAE,iBAAiB,CAAC,WAAW;YACtC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElC,MAAM,IAAA,2BAAmB,EAAC,IAAI,kCACzB,iBAAiB,KACpB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;QAEH,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA"}
+{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":"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"}

package/src/generators/dotnet-service/dotnet-service.spec.ts

@@ -1,52 +1,63 @@
-import { addDependenciesToPackageJson } from '@nx/devkit';
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import appGenerator from '@nx-dotnet/core/src/generators/app/generator';
-import refGenerator from '@nx-dotnet/core/src/generators/nuget-reference/generator';
+import { addDependenciesToPackageJson, readJson } from '@nx/devkit'
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'
 
-import * as utils from '@abgov/nx-oc';
-import { environments } from '@abgov/nx-oc';
-import { Schema } from './schema';
-import generator from './dotnet-service';
-
-jest.mock('@nx-dotnet/core/src/generators/app/generator');
-jest.mock('@nx-dotnet/core/src/generators/nuget-reference/generator');
-
-const appGeneratorMock = appGenerator as jest.Mocked<typeof appGenerator>;
-const refGeneratorMock = refGenerator as jest.Mocked<typeof refGenerator>;
+import * as utils from '@abgov/nx-oc'
+import { environments } from '@abgov/nx-oc'
+import { Schema } from './schema'
+import generator from './dotnet-service'
 
 jest.mock('@abgov/nx-oc', () => ({
   ...jest.requireActual('@abgov/nx-oc'),
   getAdspConfiguration: jest.fn(),
   deploymentGenerator: jest.fn(),
-}));
-const utilsMock = utils as jest.Mocked<typeof utils>;
+}))
+const utilsMock = utils as jest.Mocked<typeof utils>
 utilsMock.getAdspConfiguration.mockResolvedValue({
   tenant: 'test',
   tenantRealm: 'test',
   accessServiceUrl: environments.test.accessServiceUrl,
   directoryServiceUrl: environments.test.directoryServiceUrl,
-});
-utilsMock.deploymentGenerator.mockResolvedValue();
+})
+utilsMock.deploymentGenerator.mockResolvedValue()
 
 describe('Dotnet Service Generator', () => {
   const options: Schema = {
     name: 'test',
     env: 'dev',
-  };
+  }
 
   it('can run', async () => {
-    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' })
     addDependenciesToPackageJson(
       host,
       {},
       {
-        '@nx-dotnet/core': '^1.16.0',
+        '@nx/dotnet': '^23.0.0',
       },
-    );
-    await generator(host, options);
-    expect(appGeneratorMock).toHaveBeenCalled();
-    expect(refGeneratorMock).toHaveBeenCalled();
-    expect(utils.deploymentGenerator).toHaveBeenCalled();
-    host.exists('apps/test/Program.cs');
-  });
-});
+    )
+    await generator(host, options)
+    expect(utils.deploymentGenerator).toHaveBeenCalled()
+    expect(host.exists('apps/test/test.csproj')).toBeTruthy()
+    expect(host.exists('apps/test/Program.cs')).toBeTruthy()
+    expect(host.exists('NuGet.Config')).toBeTruthy()
+  })
+
+  it('adds @nx/dotnet to nx.json plugins', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' })
+    addDependenciesToPackageJson(
+      host,
+      {},
+      {
+        '@nx/dotnet': '^23.0.0',
+      },
+    )
+    await generator(host, options)
+    const nxJson = readJson(host, 'nx.json')
+    expect(nxJson.plugins).toContain('@nx/dotnet')
+  })
+
+  it('throws when @nx/dotnet is not installed', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' })
+    await expect(generator(host, options)).rejects.toThrow('@nx/dotnet')
+  })
+})

package/src/generators/dotnet-service/files/Examples/HelloWorldConfiguration.cs__tmpl__

@@ -4,6 +4,6 @@ namespace Adsp.Sdk.Examples;
 
 public class HelloWorldConfiguration
 {
-  [JsonPropertyName("responses")]
-  public Dictionary<string, string>? Responses { get; set; }
+    [JsonPropertyName("responses")]
+    public Dictionary<string, string>? Responses { get; set; }
 }

package/src/generators/dotnet-service/files/Examples/HelloWorldEvent.cs__tmpl__

@@ -4,17 +4,17 @@ namespace Adsp.Sdk.Examples;
 
 public class HelloWorldEvent
 {
-  public const string EventName = "hello-world-event";
+    public const string EventName = "hello-world-event";
 
-  [JsonPropertyName("fromUserId")]
-  public string? FromUserId { get; set; }
+    [JsonPropertyName("fromUserId")]
+    public string? FromUserId { get; set; }
 
-  [JsonPropertyName("fromUser")]
-  public string? FromUser { get; set; }
+    [JsonPropertyName("fromUser")]
+    public string? FromUser { get; set; }
 
-  [JsonPropertyName("message")]
-  public string? Message { get; set; }
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-  [JsonPropertyName("response")]
-  public string? Response { get; set; }
+    [JsonPropertyName("response")]
+    public string? Response { get; set; }
 }

package/src/generators/dotnet-service/files/Examples/ServiceRoles.cs__tmpl__

@@ -2,5 +2,5 @@ namespace Adsp.Sdk.Examples;
 
 public static class ServiceRoles
 {
-  public const string HelloWorlder = "hello-worlder";
+    public const string HelloWorlder = "hello-worlder";
 }

package/src/generators/dotnet-service/files/Program.cs__tmpl__

@@ -20,31 +20,31 @@ builder.Services.Configure<AdspOptions>(adspConfiguration);
 // 2. Add ADSP components to the service collection.
 builder.Services.AddAdspForService(options =>
 {
-  // 3. Provide configuration of the service.
-  // 3a. Configure basic service information.
-  var serviceId = AdspId.Parse(adspConfiguration.GetValue<string>("ClientId"));
-  options.ServiceId = serviceId;
-  options.DisplayName = "<%= projectName %>";
+    // 3. Provide configuration of the service.
+    // 3a. Configure basic service information.
+    var serviceId = AdspId.Parse(adspConfiguration.GetValue<string>("ClientId"));
+    options.ServiceId = serviceId;
+    options.DisplayName = "<%= projectName %>";
 
-  // 3b. Register configuration definition.
-  options.Configuration = new ConfigurationDefinition<HelloWorldConfiguration>(
-    "Configuration of the hello world sample service.",
-    (tenant, core) => tenant
-  );
-  // Enable / disable socket.io based configuration invalidation.
-  // Include `urn:ads:platform:push-service` audience in access token; e.g use an audience mapper on the associated client.
-  options.EnableConfigurationInvalidation = false;
+    // 3b. Register configuration definition.
+    options.Configuration = new ConfigurationDefinition<HelloWorldConfiguration>(
+      "Configuration of the hello world sample service.",
+      (tenant, core) => tenant
+    );
+    // Enable / disable socket.io based configuration invalidation.
+    // Include `urn:ads:platform:push-service` audience in access token; e.g use an audience mapper on the associated client.
+    options.EnableConfigurationInvalidation = false;
 
-  // 3c. Register service roles.
-  options.Roles = new[] {
+    // 3c. Register service roles.
+    options.Roles = new[] {
     new ServiceRole {
       Role = ServiceRoles.HelloWorlder,
       Description = "Hello worlder role that allows user to post a message to the API."
     }
   };
 
-  // 3d. Register domain events.
-  options.Events = new[] {
+    // 3d. Register domain events.
+    options.Events = new[] {
     new DomainEventDefinition<HelloWorldEvent>(
       HelloWorldEvent.EventName,
       "Signalled when a hello world message is posted to the API."
@@ -62,7 +62,7 @@ app.UseAdsp();
 app.UseAuthorization();
 app.UseAdspMetadata(new AdspMetadataOptions
 {
-  ApiPath = "WeatherForecast"
+    ApiPath = "WeatherForecast"
 });
 
 app.MapControllers();

package/src/generators/dotnet-service/files/__projectName__.csproj__tmpl__

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <RootNamespace><%- className %></RootNamespace>
+    <AssemblyName><%- className %></AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Adsp.Sdk" Version="2.*" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+  </ItemGroup>
+
+</Project>

package/src/generators/dotnet-service/nuget-files/NuGet.Config__tmpl__

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="github" value="https://nuget.pkg.github.com/GovAlta/index.json" />
+  </packageSources>
+  <packageSourceCredentials>
+    <github>
+      <add key="Username" value="%GITHUB_USER%" />
+      <add key="ClearTextPassword" value="%GITHUB_TOKEN%" />
+    </github>
+  </packageSourceCredentials>
+</configuration>

package/src/generators/dotnet-service/schema.d.ts

@@ -4,6 +4,7 @@ export interface Schema {
   name: string;
   env: EnvironmentName;
   accessToken?: string;
+  tenant?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/dotnet-service/schema.json

@@ -28,6 +28,11 @@
       "type": "string",
       "description": "Access token for retrieving configuration from ADSP APIs.",
       "alias": "at"
+    },
+    "tenant": {
+      "type": "string",
+      "description": "ADSP tenant name. When provided, the realm is looked up anonymously and a single browser login is used instead of the full interactive flow.",
+      "alias": "t"
     }
   },
   "required": ["name", "env"],