[TCGC] Fix naming logic for anonymous model wrapped by HttpPart

.chronus/changes/allow-reserved-2024-8-11-16-40-29.md

@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+`x-ms-skip-url-encoding` should be replaced with `allowReserved`

.chronus/changes/fix-tcgc-multipart-model-name-2024-8-6-14-12-14.md

@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+Fix naming logic for anonymous model wrapped by `HttpPart`

packages/e2e-tests/cadl-ranch-specs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@azure-tools/typespec-e2e-cadl-ranch-specs",
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.37.1"
+    "@azure-tools/cadl-ranch-specs": "0.37.2"
   },
   "type": "module",
   "private": true

packages/typespec-azure-resource-manager/lib/common-types/types.tsp

@@ -537,10 +537,9 @@ model ManagementGroupNameParameter {
 @added(Versions.v4)
 model ScopeParameter {
   /** The scope at which the operation is performed. */
-  @path
+  @path(#{ allowReserved: true })
   @segment("scope")
   @minLength(1)
-  @extension("x-ms-skip-url-encoding", true)
   scope: string;
 }
 

packages/typespec-azure-resource-manager/lib/parameters.tsp

@@ -83,9 +83,8 @@ model ArmLocationResource<BaseType extends
  */
 @doc("The default resourceUri parameter type.")
 model ResourceUriParameter {
-  @path
+  @path(#{ allowReserved: true })
   @doc("The fully qualified Azure Resource manager identifier of the resource.")
-  @extension("x-ms-skip-url-encoding", true)
   @resourceParameterBaseFor([ResourceHome.Extension])
   resourceUri: string;
 }

packages/typespec-client-generator-core/src/public-utils.ts

@@ -18,7 +18,7 @@ import {
   listServices,
   resolveEncodedName,
 } from "@typespec/compiler";
-import { HttpOperation, getHttpOperation, isMetadata } from "@typespec/http";
+import { HttpOperation, getHttpOperation, getHttpPart, isMetadata } from "@typespec/http";
 import { Version, getVersions } from "@typespec/versioning";
 import { pascalCase } from "change-case";
 import pluralize from "pluralize";
@@ -470,17 +470,28 @@ function getContextPath(
     if (currentType === expectedType) {
       result.push({ name: displayName, type: currentType });
       return true;
-    } else if (
-      currentType.kind === "Model" &&
-      currentType.indexer &&
-      currentType.properties.size === 0 &&
-      ((currentType.indexer.key.name === "string" && currentType.name === "Record") ||
-        currentType.indexer.key.name === "integer")
-    ) {
-      // handle array or dict
-      const dictOrArrayItemType: Type = currentType.indexer.value;
-      return dfsModelProperties(expectedType, dictOrArrayItemType, pluralize.singular(displayName));
     } else if (currentType.kind === "Model") {
+      // Peel off HttpPart<MyRealType> to get "MyRealType"
+      const typeWrappedByHttpPart = getHttpPart(context.program, currentType);
+      if (typeWrappedByHttpPart) {
+        return dfsModelProperties(expectedType, typeWrappedByHttpPart.type, displayName);
+      }
+
+      if (
+        currentType.indexer &&
+        currentType.properties.size === 0 &&
+        ((currentType.indexer.key.name === "string" && currentType.name === "Record") ||
+          currentType.indexer.key.name === "integer")
+      ) {
+        // handle array or dict
+        const dictOrArrayItemType: Type = currentType.indexer.value;
+        return dfsModelProperties(
+          expectedType,
+          dictOrArrayItemType,
+          pluralize.singular(displayName)
+        );
+      }
+
       // handle model
       result.push({ name: displayName, type: currentType });
       for (const property of currentType.properties.values()) {

packages/typespec-client-generator-core/test/types/array-types.test.ts

@@ -1,6 +1,6 @@
 import { AzureCoreTestLibrary } from "@azure-tools/typespec-azure-core/testing";
 import { ok, strictEqual } from "assert";
-import { beforeEach, describe, it } from "vitest";
+import { afterEach, beforeEach, describe, it } from "vitest";
 import { SdkTestRunner, createSdkTestRunner } from "../test-host.js";
 
 describe("typespec-client-generator-core: array types", () => {
@@ -9,7 +9,16 @@ describe("typespec-client-generator-core: array types", () => {
   beforeEach(async () => {
     runner = await createSdkTestRunner({ emitterName: "@azure-tools/typespec-java" });
   });
-
+  afterEach(async () => {
+    for (const modelsOrEnums of [
+      runner.context.sdkPackage.models,
+      runner.context.sdkPackage.enums,
+    ]) {
+      for (const item of modelsOrEnums) {
+        ok(item.name !== "");
+      }
+    }
+  });
   it("use model is to represent array", async () => {
     await runner.compile(`
       @service({})
@@ -40,13 +49,13 @@ describe("typespec-client-generator-core: array types", () => {
   });
 
   it("EmbeddingVector from azure-core", async () => {
-    const runnerWithCore = await createSdkTestRunner({
+    runner = await createSdkTestRunner({
       librariesToAdd: [AzureCoreTestLibrary],
       autoUsings: ["Azure.Core"],
       "filter-out-core-models": false,
       emitterName: "@azure-tools/typespec-java",
     });
-    await runnerWithCore.compileWithBuiltInAzureCoreService(`
+    await runner.compileWithBuiltInAzureCoreService(`
       @service({})
       namespace TestClient {
         model ModelWithEmbeddingVector {
@@ -56,7 +65,7 @@ describe("typespec-client-generator-core: array types", () => {
         op get(): ModelWithEmbeddingVector;
       }
     `);
-    const models = runnerWithCore.context.sdkPackage.models;
+    const models = runner.context.sdkPackage.models;
     strictEqual(models.length, 1);
     const model = models[0];
     const property = model.properties[0];
@@ -67,13 +76,13 @@ describe("typespec-client-generator-core: array types", () => {
   });
 
   it("alias of EmbeddingVector", async () => {
-    const runnerWithCore = await createSdkTestRunner({
+    runner = await createSdkTestRunner({
       librariesToAdd: [AzureCoreTestLibrary],
       autoUsings: ["Azure.Core"],
       "filter-out-core-models": false,
       emitterName: "@azure-tools/typespec-java",
     });
-    await runnerWithCore.compileWithBuiltInAzureCoreService(`
+    await runner.compileWithBuiltInAzureCoreService(`
       @service({})
       namespace TestClient {
         alias MyEmbeddingVector = EmbeddingVector<int32>;
@@ -85,7 +94,7 @@ describe("typespec-client-generator-core: array types", () => {
         op get(): ModelWithEmbeddingVector;
       }
     `);
-    const models = runnerWithCore.context.sdkPackage.models;
+    const models = runner.context.sdkPackage.models;
     strictEqual(models.length, 1);
     const model = models[0];
     const property = model.properties[0];

packages/typespec-client-generator-core/test/types/body-model-property-types.test.ts

@@ -1,5 +1,5 @@
 import { deepStrictEqual, ok, strictEqual } from "assert";
-import { beforeEach, describe, it } from "vitest";
+import { afterEach, beforeEach, describe, it } from "vitest";
 import { isReadOnly } from "../../src/types.js";
 import { SdkTestRunner, createSdkTestRunner } from "../test-host.js";
 import { getSdkBodyModelPropertyTypeHelper } from "./utils.js";
@@ -10,7 +10,16 @@ describe("typespec-client-generator-core: body model property types", () => {
   beforeEach(async () => {
     runner = await createSdkTestRunner({ emitterName: "@azure-tools/typespec-java" });
   });
-
+  afterEach(async () => {
+    for (const modelsOrEnums of [
+      runner.context.sdkPackage.models,
+      runner.context.sdkPackage.enums,
+    ]) {
+      for (const item of modelsOrEnums) {
+        ok(item.name !== "");
+      }
+    }
+  });
   it("required", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
@@ -134,12 +143,12 @@ describe("typespec-client-generator-core: body model property types", () => {
     strictEqual(values[1].kind, "int32");
   });
   it("versioning", async function () {
-    const runnerWithVersion = await createSdkTestRunner({
+    runner = await createSdkTestRunner({
       "api-version": "all",
       emitterName: "@azure-tools/typespec-python",
     });
 
-    await runnerWithVersion.compile(`
+    await runner.compile(`
         @versioned(Versions)
         @service({title: "Widget Service"})
         namespace DemoService;
@@ -164,7 +173,7 @@ describe("typespec-client-generator-core: body model property types", () => {
           removedProp: string;
         }
       `);
-    const sdkModel = runnerWithVersion.context.sdkPackage.models.find((x) => x.kind === "model");
+    const sdkModel = runner.context.sdkPackage.models.find((x) => x.kind === "model");
     ok(sdkModel);
     strictEqual(sdkModel.kind, "model");
 

packages/typespec-client-generator-core/test/types/built-in-types.test.ts

@@ -1,7 +1,7 @@
 import { AzureCoreTestLibrary } from "@azure-tools/typespec-azure-core/testing";
 import { expectDiagnostics } from "@typespec/compiler/testing";
 import { ok, strictEqual } from "assert";
-import { beforeEach, describe, it } from "vitest";
+import { afterEach, beforeEach, describe, it } from "vitest";
 import { SdkBuiltInType } from "../../src/interfaces.js";
 import { getAllModels } from "../../src/types.js";
 import { SdkTestRunner, createSdkTestRunner } from "../test-host.js";
@@ -13,7 +13,16 @@ describe("typespec-client-generator-core: built-in types", () => {
   beforeEach(async () => {
     runner = await createSdkTestRunner({ emitterName: "@azure-tools/typespec-java" });
   });
-
+  afterEach(async () => {
+    for (const modelsOrEnums of [
+      runner.context.sdkPackage.models,
+      runner.context.sdkPackage.enums,
+    ]) {
+      for (const item of modelsOrEnums) {
+        ok(item.name !== "");
+      }
+    }
+  });
   it("string", async function () {
     await runner.compileWithBuiltInService(
       `
@@ -204,12 +213,12 @@ describe("typespec-client-generator-core: built-in types", () => {
   });
 
   it("armId from Core", async function () {
-    const runnerWithCore = await createSdkTestRunner({
+    runner = await createSdkTestRunner({
       librariesToAdd: [AzureCoreTestLibrary],
       autoUsings: ["Azure.Core"],
       emitterName: "@azure-tools/typespec-java",
     });
-    await runnerWithCore.compileWithBuiltInAzureCoreService(
+    await runner.compileWithBuiltInAzureCoreService(
       `
       @usage(Usage.input | Usage.output)
       model Test {
@@ -221,7 +230,7 @@ describe("typespec-client-generator-core: built-in types", () => {
       }
     `
     );
-    const models = runnerWithCore.context.sdkPackage.models;
+    const models = runner.context.sdkPackage.models;
     const type = models[0].properties[0].type;
     strictEqual(type.kind, "string");
     strictEqual(type.name, "armResourceIdentifier");
@@ -230,12 +239,12 @@ describe("typespec-client-generator-core: built-in types", () => {
   });
 
   it("format", async function () {
-    const runnerWithCore = await createSdkTestRunner({
+    runner = await createSdkTestRunner({
       librariesToAdd: [AzureCoreTestLibrary],
       autoUsings: ["Azure.Core"],
       emitterName: "@azure-tools/typespec-java",
     });
-    await runnerWithCore.compileWithBuiltInAzureCoreService(
+    await runner.compileWithBuiltInAzureCoreService(
       `
       @usage(Usage.input | Usage.output)
       model Test {
@@ -246,7 +255,7 @@ describe("typespec-client-generator-core: built-in types", () => {
       }
     `
     );
-    const models = runnerWithCore.context.sdkPackage.models;
+    const models = runner.context.sdkPackage.models;
     for (const property of models[0].properties) {
       strictEqual(property.kind, "property");
       strictEqual(
@@ -257,13 +266,13 @@ describe("typespec-client-generator-core: built-in types", () => {
   });
 
   it("etag from core", async () => {
-    const runnerWithCore = await createSdkTestRunner({
+    runner = await createSdkTestRunner({
       librariesToAdd: [AzureCoreTestLibrary],
       autoUsings: ["Azure.Core"],
       "filter-out-core-models": false,
       emitterName: "@azure-tools/typespec-java",
     });
-    await runnerWithCore.compileWithBuiltInAzureCoreService(`
+    await runner.compileWithBuiltInAzureCoreService(`
     @resource("users")
     @doc("Details about a user.")
     model User {
@@ -278,7 +287,7 @@ describe("typespec-client-generator-core: built-in types", () => {
     @doc("Gets status.")
     op getStatus is GetResourceOperationStatus<User>;
     `);
-    const userModel = runnerWithCore.context.sdkPackage.models.find(
+    const userModel = runner.context.sdkPackage.models.find(
       (x) => x.kind === "model" && x.name === "User"
     );
     ok(userModel);

packages/typespec-client-generator-core/test/types/bytes-types.test.ts

@@ -1,5 +1,5 @@
 import { ok, strictEqual } from "assert";
-import { beforeEach, describe, it } from "vitest";
+import { afterEach, beforeEach, describe, it } from "vitest";
 import { SdkBasicServiceMethod, SdkBuiltInType, SdkHttpOperation } from "../../src/interfaces.js";
 import { SdkTestRunner, createSdkTestRunner } from "../test-host.js";
 
@@ -9,7 +9,16 @@ describe("typespec-client-generator-core: bytes types", () => {
   beforeEach(async () => {
     runner = await createSdkTestRunner({ emitterName: "@azure-tools/typespec-java" });
   });
-
+  afterEach(async () => {
+    for (const modelsOrEnums of [
+      runner.context.sdkPackage.models,
+      runner.context.sdkPackage.enums,
+    ]) {
+      for (const item of modelsOrEnums) {
+        ok(item.name !== "");
+      }
+    }
+  });
   describe("bytes SdkMethodParameter", () => {
     it("should use service operation parameter encoding", async () => {
       await runner.compile(`

packages/typespec-client-generator-core/test/types/constant-types.test.ts

@@ -1,5 +1,5 @@
-import { strictEqual } from "assert";
-import { beforeEach, describe, it } from "vitest";
+import { ok, strictEqual } from "assert";
+import { afterEach, beforeEach, describe, it } from "vitest";
 import { SdkTestRunner, createSdkTestRunner } from "../test-host.js";
 import { getSdkTypeHelper } from "./utils.js";
 
@@ -9,7 +9,16 @@ describe("typespec-client-generator-core: constant types", () => {
   beforeEach(async () => {
     runner = await createSdkTestRunner({ emitterName: "@azure-tools/typespec-java" });
   });
-
+  afterEach(async () => {
+    for (const modelsOrEnums of [
+      runner.context.sdkPackage.models,
+      runner.context.sdkPackage.enums,
+    ]) {
+      for (const item of modelsOrEnums) {
+        ok(item.name !== "");
+      }
+    }
+  });
   it("string", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)