Applied suggestions in the PR request.

Author: siamakp-elastic

compiler-rs/clients_schema/src/lib.rs

@@ -482,16 +482,14 @@ impl TypeDefinition {
     }
 }
 
-/**
- * The Example type is used for both requests and responses
- * This type definition is taken from the OpenAPI spec
- *     https://spec.openapis.org/oas/v3.1.0#example-object
- * With the exception of using String as the 'value' type.
- * This type matches the 'Example' type in metamodel.ts. The
- * data serialized by the Typescript code in schema.json, 
- * needs to be deserialized into this equivalent type.
- * The OpenAPI v3 spec also defines the 'Example' type, so
- * to distinguish them, this type is called SchemaExample.
+/// The Example type is used for both requests and responses.
+///
+/// This type definition is taken from the OpenAPI spec
+///     https://spec.openapis.org/oas/v3.1.0#example-object
+/// with the exception of using String as the 'value' type.
+///
+/// The OpenAPI v3 spec also defines the 'Example' type, so
+/// to distinguish them, this type is called SchemaExample.
  */
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SchemaExample {

compiler/src/model/metamodel.ts

@@ -301,7 +301,7 @@ export class Request extends BaseType {
   body: Body
   behaviors?: Behavior[]
   attachedBehaviors?: string[]
-  examples?: Map<string, Example>
+  examples?: Record<string, Example>
 }
 
 /**
@@ -314,7 +314,7 @@ export class Response extends BaseType {
   behaviors?: Behavior[]
   attachedBehaviors?: string[]
   exceptions?: ResponseException[]
-  examples?: Map<string, Example>
+  examples?: Record<string, Example>
 }
 
 export class ResponseException {

compiler/src/steps/add-examples.ts

@@ -146,7 +146,7 @@ class BaseExamplesProcessor {
         // Convert to prettified JSON string
         example.value = JSON.stringify(example.value, null, 2)
       }
-      examples[exampleName] = example
+      examples.set(exampleName, example)
     }
     return examples
   }
@@ -189,7 +189,10 @@ class RequestExamplesProcessor extends BaseExamplesProcessor {
     const examplesRequestSubfolder = this.getExamplesRequestSubfolder(examplesFolder)
     // If there is an examples/request folder, add the request examples to the model.
     if (examplesRequestSubfolder !== undefined) {
-      requestDefinition.examples = this.getExampleMap(examplesRequestSubfolder)
+      const examples = this.getExampleMap(examplesRequestSubfolder)
+      if (examples.size > 0) {
+        requestDefinition.examples = Object.fromEntries(examples)
+      }
     }
   }
 }
@@ -223,7 +226,7 @@ class ResponseExamplesProcessor extends BaseExamplesProcessor {
     const subfolders = this.getSubfolders(examplesSubfolder)
     // If we have a "response" subfolder, stop there and return.
     // We should not have a mix of response and {nnn}_response folders.
-    if ('response' in subfolders) {
+    if (subfolders.includes('response')) {
       const responseSubfolder = path.join(examplesSubfolder, 'response')
       return new Map([['200', responseSubfolder]])
     }
@@ -255,7 +258,10 @@ class ResponseExamplesProcessor extends BaseExamplesProcessor {
     // If there is an examples/response or examples/200_response folder,
     // add the response examples to the model.
     if (examples200ResponseSubfolder !== undefined) {
-      responseDefinition.examples = this.getExampleMap(examples200ResponseSubfolder)
+      const examples = this.getExampleMap(examples200ResponseSubfolder)
+      if (examples.size > 0) {
+        responseDefinition.examples = Object.fromEntries(examples)
+      }
     }
   }
 }