tsp, propagate usage/access to children, only for discriminated model (…

…#2751)
Azure · May 11, 2024 · bcb3082 · bcb3082
1 parent 2371806
commit bcb3082
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.15.17 (2024-05-11)
+
+Compatible with compiler 0.56.
+
+- Behavior change on access/usage of non-polymorphic subclass.
+
 ## 0.15.16 (2024-05-08)
 
 Compatible with compiler 0.56.

diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json
diff --git a/typespec-extension/package.json b/typespec-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.15.16",
+  "version": "0.15.17",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"

diff --git a/typespec-extension/src/code-model-builder.ts b/typespec-extension/src/code-model-builder.ts
@@ -2874,20 +2874,17 @@ export class CodeModelBuilder {
             schema.parents?.all?.forEach((p) => innerApplySchemaUsage(p, schemaUsage));
             schema.parents?.immediate?.forEach((p) => innerApplySchemaUsage(p, schemaUsage));
 
-            schema.children?.all?.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
-            schema.children?.immediate?.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
+            if (schema.discriminator) {
+              // propagate access/usage to immediate children, if the schema is a discriminated model
+              // if the schema is not a discriminated model, its children likely not valid for the mode/API
+              // TODO: it does not handle the case that concrete model (kind: "type1") for the discriminated model have depth larger than 1 (e.g. kind: "type1" | "type2" in middle)
+              schema.children?.immediate?.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
+            }
 
             if (schema.discriminator?.property?.schema) {
               innerApplySchemaUsage(schema.discriminator?.property?.schema, schemaUsage);
             }
           }
-
-          // Object.values(schema.discriminator?.all ?? {}).forEach((d) => {
-          //   innerApplySchemaUsage(d, schemaUsage);
-          // });
-          // Object.values(schema.discriminator?.immediate ?? {}).forEach((d) => {
-          //   innerApplySchemaUsage(d, schemaUsage);
-          // });
         }
       } else if (schema instanceof DictionarySchema) {
         innerApplySchemaUsage(schema.elementType, schemaUsage);

diff --git a/typespec-tests/package.json b/typespec-tests/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.33.4",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.16.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.17.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "~0.56.0",

diff --git a/...java/com/cadl/union/models/SubResult.java → ...nion/implementation/models/SubResult.java b/...java/com/cadl/union/models/SubResult.java → ...nion/implementation/models/SubResult.java
@@ -2,14 +2,15 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.cadl.union.models;
+package com.cadl.union.implementation.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.annotation.Generated;
 import com.azure.core.util.BinaryData;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.cadl.union.models.Result;
 import java.io.IOException;
 
 /**

diff --git a/typespec-tests/src/test/java/com/cadl/union/UnionTests.java b/typespec-tests/src/test/java/com/cadl/union/UnionTests.java
@@ -5,7 +5,7 @@
 
 import com.azure.core.util.BinaryData;
 import com.cadl.union.models.Result;
-import com.cadl.union.models.SubResult;
+import com.cadl.union.implementation.models.SubResult;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Assertions;

diff --git a/typespec-tests/tsp/union.tsp b/typespec-tests/tsp/union.tsp
@@ -73,6 +73,7 @@ model Query {
   data?: url | bytes;
 }
 
+@access(Access.internal)
 @usage(Usage.input | Usage.output)
 model SubResult extends Result {
   text?: string;