[tcgc] no need to add access override along with usage override for o…

…rphan model (#1378) this should be a bug that missing in #925. since we changed access default to public, we no longer need to add access override along with usage override when we want to expose an orphan model
Azure · Aug 15, 2024 · b02eabc · b02eabc
1 parent 3fae01c
commit b02eabc
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 113 deletions.
diff --git a/.chronus/changes/fix_usage-2024-7-15-13-21-20.md b/.chronus/changes/fix_usage-2024-7-15-13-21-20.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+no need to add access override along with usage override for orphan model
diff --git a/packages/typespec-client-generator-core/src/types.ts b/packages/typespec-client-generator-core/src/types.ts
@@ -1709,10 +1709,8 @@ function handleServiceOrphanType(context: TCGCContext, type: Model | Enum | Unio
     const sdkType = diagnostics.pipe(getClientTypeWithDiagnostics(context, type));
     updateUsageOfModel(context, UsageFlags.Input | UsageFlags.Output, sdkType);
   }
-  if (getAccessOverride(context, type) !== undefined) {
-    const sdkType = diagnostics.pipe(getClientTypeWithDiagnostics(context, type));
-    updateUsageOfModel(context, UsageFlags.None, sdkType);
-  }
+  const sdkType = diagnostics.pipe(getClientTypeWithDiagnostics(context, type));
+  updateUsageOfModel(context, UsageFlags.None, sdkType);
 }
 
 function verifyNoConflictingMultipartModelUsage(

diff --git a/packages/typespec-client-generator-core/test/decorators.test.ts b/packages/typespec-client-generator-core/test/decorators.test.ts
@@ -2328,7 +2328,6 @@ describe("typespec-client-generator-core: decorators", () => {
         @test namespace MyService {
           @test
           @usage(Usage.input | Usage.output)
-          @access(Access.public)
           enum Enum1{
             one,
             two,
@@ -2344,7 +2343,6 @@ describe("typespec-client-generator-core: decorators", () => {
 
           @test
           @usage(Usage.input | Usage.output)
-          @access(Access.public)
           model Model1{ prop: string }
 
           @test

diff --git a/packages/typespec-client-generator-core/test/public-utils.test.ts b/packages/typespec-client-generator-core/test/public-utils.test.ts
@@ -1517,7 +1517,6 @@ describe("typespec-client-generator-core: public-utils", () => {
         await runner.compileWithBuiltInService(
           `
           @usage(Usage.input | Usage.output)
-          @access(Access.public)
           model A {
             pForA: {
               name: string;
@@ -1545,7 +1544,6 @@ describe("typespec-client-generator-core: public-utils", () => {
         await runner.compileWithBuiltInService(
           `
           @usage(Usage.input | Usage.output)
-          @access(Access.public)
           model A {
             status: "start" | "stop";
           }

diff --git a/packages/typespec-client-generator-core/test/types/body-model-property-types.test.ts b/packages/typespec-client-generator-core/test/types/body-model-property-types.test.ts
@@ -15,7 +15,6 @@ describe("typespec-client-generator-core: body model property types", () => {
   it("required", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           name: string | int32;
         }
@@ -27,7 +26,6 @@ describe("typespec-client-generator-core: body model property types", () => {
   it("optional", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           name?: string;
         }
@@ -39,7 +37,6 @@ describe("typespec-client-generator-core: body model property types", () => {
   it("readonly", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @visibility("read")
           name?: string;
@@ -52,7 +49,6 @@ describe("typespec-client-generator-core: body model property types", () => {
   it("not readonly", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @visibility("read", "create", "update")
           name?: string;
@@ -67,7 +63,6 @@ describe("typespec-client-generator-core: body model property types", () => {
         #suppress "deprecated" "for testing"
         @test
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         @projectedName("java", "JavaTest")
         model Test {
           @projectedName("java", "javaProjectedName")
@@ -125,7 +120,6 @@ describe("typespec-client-generator-core: body model property types", () => {
   it("union type", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           name: string | int32;
         }
@@ -159,7 +153,6 @@ describe("typespec-client-generator-core: body model property types", () => {
         }
 
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @added(Versions.v1)
           @removed(Versions.v2)

diff --git a/packages/typespec-client-generator-core/test/types/built-in-types.test.ts b/packages/typespec-client-generator-core/test/types/built-in-types.test.ts
@@ -19,7 +19,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: string;
       }
@@ -35,7 +34,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: boolean;
       }
@@ -63,7 +61,6 @@ describe("typespec-client-generator-core: built-in types", () => {
       await runner.compileWithBuiltInService(
         `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           prop: ${type};
         }
@@ -82,7 +79,6 @@ describe("typespec-client-generator-core: built-in types", () => {
       await runner.compileWithBuiltInService(
         `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           prop: ${type};
         }
@@ -99,7 +95,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: decimal;
       }
@@ -115,7 +110,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: decimal128;
       }
@@ -131,7 +125,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: unknown;
       }
@@ -145,7 +138,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: bytes;
       }
@@ -161,7 +153,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         @encode(BytesKnownEncoding.base64)
         prop: bytes;
@@ -178,7 +169,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         @encode(BytesKnownEncoding.base64url)
         prop: bytes;
@@ -198,7 +188,6 @@ describe("typespec-client-generator-core: built-in types", () => {
       scalar Base64UrlBytes extends bytes;
 
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         value: Base64UrlBytes[];
       }
@@ -224,7 +213,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runnerWithCore.compileWithBuiltInAzureCoreService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         id: Azure.Core.armResourceIdentifier<[
           {
@@ -251,7 +239,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runnerWithCore.compileWithBuiltInAzureCoreService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         urlScalar: url;
 
@@ -313,7 +300,6 @@ describe("typespec-client-generator-core: built-in types", () => {
       scalar Derived extends Base;
 
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: Derived;
       }
@@ -338,7 +324,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         @format("unknown")
         unknownProp: string;
@@ -402,7 +387,6 @@ describe("typespec-client-generator-core: built-in types", () => {
       scalar TestScalar extends string;
       
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: TestScalar;
       }
@@ -422,7 +406,6 @@ describe("typespec-client-generator-core: built-in types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         @encode(string)
         value: safeint;
@@ -442,7 +425,6 @@ describe("typespec-client-generator-core: built-in types", () => {
       scalar int32EncodedAsString extends int32;
 
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         value: int32EncodedAsString;
       }

diff --git a/packages/typespec-client-generator-core/test/types/constant-types.test.ts b/packages/typespec-client-generator-core/test/types/constant-types.test.ts
@@ -13,7 +13,6 @@ describe("typespec-client-generator-core: constant types", () => {
   it("string", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           prop: "json";
         }
@@ -29,7 +28,6 @@ describe("typespec-client-generator-core: constant types", () => {
   it("boolean", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @test prop: true;
         }
@@ -45,7 +43,6 @@ describe("typespec-client-generator-core: constant types", () => {
   it("number", async function () {
     await runner.compileWithBuiltInService(`
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @test prop: 4;
         }

diff --git a/packages/typespec-client-generator-core/test/types/date-time-types.test.ts b/packages/typespec-client-generator-core/test/types/date-time-types.test.ts
@@ -14,7 +14,6 @@ describe("typespec-client-generator-core: date-time types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           prop: utcDateTime;
         }
@@ -30,7 +29,6 @@ describe("typespec-client-generator-core: date-time types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DateTimeKnownEncoding.rfc3339)
           prop: utcDateTime;
@@ -47,7 +45,6 @@ describe("typespec-client-generator-core: date-time types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DateTimeKnownEncoding.rfc7231)
           prop: utcDateTime;
@@ -65,7 +62,6 @@ describe("typespec-client-generator-core: date-time types", () => {
     await runner.compileWithBuiltInService(
       `
       @usage(Usage.input | Usage.output)
-      @access(Access.public)
       model Test {
         prop: unixTimestamp32;
       }
@@ -83,7 +79,6 @@ describe("typespec-client-generator-core: date-time types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DateTimeKnownEncoding.unixTimestamp, int64)
           value: utcDateTime;
@@ -107,7 +102,6 @@ describe("typespec-client-generator-core: date-time types", () => {
         scalar extraLayerDateTime extends unixTimestampDatetime;
 
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           value: extraLayerDateTime;
         }
@@ -135,7 +129,6 @@ describe("typespec-client-generator-core: date-time types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DateTimeKnownEncoding.unixTimestamp, int64)
           value: utcDateTime | null;
@@ -160,7 +153,6 @@ describe("typespec-client-generator-core: date-time types", () => {
         scalar unixTimestampDateTime extends utcDateTime;
 
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           value: unixTimestampDateTime[];
         }

diff --git a/packages/typespec-client-generator-core/test/types/duration-type.test.ts b/packages/typespec-client-generator-core/test/types/duration-type.test.ts
@@ -14,7 +14,6 @@ describe("typespec-client-generator-core: duration types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           prop: duration;
         }
@@ -29,7 +28,6 @@ describe("typespec-client-generator-core: duration types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DurationKnownEncoding.ISO8601)
           prop: duration;
@@ -46,7 +44,6 @@ describe("typespec-client-generator-core: duration types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DurationKnownEncoding.seconds, int32)
           prop: duration;
@@ -63,7 +60,6 @@ describe("typespec-client-generator-core: duration types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DurationKnownEncoding.seconds, float)
           prop: duration;
@@ -80,7 +76,6 @@ describe("typespec-client-generator-core: duration types", () => {
     await runner.compileWithBuiltInService(
       `
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           @encode(DurationKnownEncoding.seconds, float)
           prop: duration | null;
@@ -105,7 +100,6 @@ describe("typespec-client-generator-core: duration types", () => {
         scalar Float32Duration extends duration;
         
         @usage(Usage.input | Usage.output)
-        @access(Access.public)
         model Test {
           value: Float32Duration[];
         }