Fix custompage issue when there are two (#3389)

* Fix custompage issue when there are two * Update * update * Update * comment out shared source check until 3392 gets merged --------- Co-authored-by: m-nash <[email protected]>
Azure · May 12, 2023 · 8b06121 · 8b06121
1 parent 79a6291
commit 8b06121
Show file tree

Hide file tree

Showing 22 changed files with 1,692 additions and 540 deletions.
diff --git a/eng/SharedCodeCheck.ps1 b/eng/SharedCodeCheck.ps1
@@ -3,9 +3,10 @@
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 1
 
-Write-Host 'Downloading shared source files...'
-& (Join-Path $PSScriptRoot 'DownloadSharedSource.ps1')
-Write-Host 'Shared source files are downloaded'
+#uncomment when this is fixed https://github.com/Azure/autorest.csharp/pull/3392
+#Write-Host 'Downloading shared source files...'
+#& (Join-Path $PSScriptRoot 'DownloadSharedSource.ps1')
+#Write-Host 'Shared source files are downloaded'
 
 Write-Host 'Checking file difference...'
 git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code

diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/model.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/model.ts
@@ -66,7 +66,7 @@ import {
     getSdkSimpleType,
     isInternal
 } from "@azure-tools/typespec-client-generator-core";
-import { capitalize } from "./utils.js";
+import { capitalize, getNameForTemplate } from "./utils.js";
 /**
  * Map calType to csharp InputTypeKind
  */
@@ -380,7 +380,7 @@ export function getInputType(
 
     function getInputModelForModel(m: Model): InputModelType {
         m = getEffectiveSchemaType(context, m) as Model;
-        const name = getFriendlyName(program, m) ?? m.name;
+        const name = getFriendlyName(program, m) ?? getNameForTemplate(m);
         let model = models.get(name);
         if (!model) {
             const baseModel = getInputModelBaseType(m.baseModel);

diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/utils.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/utils.ts
@@ -1,3 +1,16 @@
+import { Model } from "@typespec/compiler";
+
 export function capitalize(str: string): string {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
+
+export function getNameForTemplate(model: Model): string {
+    if (model.templateMapper && model.templateMapper.args) {
+        return (
+            model.name +
+            model.templateMapper.args.map((it) => (it as Model).name).join("")
+        );
+    }
+
+    return model.name;
+}
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/Generated/cadl.json
@@ -8,11 +8,11 @@
  "Models": [
   {
    "$id": "2",
-   "Name": "CustomPage",
+   "Name": "CustomPageLedgerEntry",
    "Namespace": "Azure.Core.Foundations",
    "Description": "Paged collection of LedgerEntry items",
    "IsNullable": false,
-   "Usage": "Output",
+   "Usage": "None",
    "Properties": [
     {
      "$id": "3",

diff --git a/test/CadlRanchProjects/azure/core/basic/src/Generated/cadl.json b/test/CadlRanchProjects/azure/core/basic/src/Generated/cadl.json
@@ -136,11 +136,11 @@
   },
   {
    "$id": "18",
-   "Name": "CustomPage",
+   "Name": "CustomPageUser",
    "Namespace": "Azure.Core.Foundations",
    "Description": "Paged collection of User items",
    "IsNullable": false,
-   "Usage": "Output",
+   "Usage": "None",
    "Properties": [
     {
      "$id": "19",

diff --git a/test/TestProjects/Authoring-Typespec/src/Generated/Docs/AuthoringClient.xml b/test/TestProjects/Authoring-Typespec/src/Generated/Docs/AuthoringClient.xml
@@ -619,17 +619,7 @@ var client = new AuthoringClient(endpoint);
 await foreach (var item in client.GetDeploymentsAsync("<projectName>", new RequestContext()))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("projectKind").ToString());
-    Console.WriteLine(result.GetProperty("storageInputContainerName").ToString());
-    Console.WriteLine(result.GetProperty("settings").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("multilingual").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result.GetProperty("name").ToString());
 }
 ]]></code>
 </example>
@@ -644,17 +634,7 @@ var client = new AuthoringClient(endpoint);
 foreach (var item in client.GetDeployments("<projectName>", new RequestContext()))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("projectKind").ToString());
-    Console.WriteLine(result.GetProperty("storageInputContainerName").ToString());
-    Console.WriteLine(result.GetProperty("settings").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("multilingual").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result.GetProperty("name").ToString());
 }
 ]]></code>
 </example>