Merge branch 'main' into fix-bad-put-settings-example

Author: lcawl

compiler-rs/clients_schema_to_openapi/src/lib.rs

@@ -25,7 +25,7 @@ use indexmap::IndexMap;
 
 use clients_schema::{Availabilities, Availability, Flavor, IndexedModel, Stability, Visibility};
 use openapiv3::{Components, OpenAPI};
-use serde_json::Value;
+use serde_json::{Map,Value};
 use clients_schema::transform::ExpandConfig;
 use crate::components::TypesAndComponents;
 
@@ -190,9 +190,14 @@ pub fn product_meta_as_extensions(namespace: &str, product_meta: &IndexMap<Strin
     if let Some(meta) = product_meta.get(namespace) {
         additional_namespace = format!(", {meta}");
     }
-    
+
     let product_str = format!("elasticsearch{additional_namespace}");
-    result.insert("x-product-feature".to_string(), Value::String(product_str));
+    let mut product_feature_list: Vec<Value> = Vec::new();
+    let mut product_feature: Map<String, Value> = Map::new();
+    product_feature.insert("name".to_string(),Value::String("x-product-feature".to_string()));
+    product_feature.insert("content".to_string(),Value::String(product_str));
+    product_feature_list.push(Value::Object(product_feature));
+    result.insert("x-metaTags".to_string(), Value::Array(product_feature_list));
     result
 }
 

compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm

@@ -579,17 +579,10 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
 
     if (typeDef.variants?.kind === 'container') {
       const variants = typeDef.properties.filter(prop => !(prop.containerProperty ?? false))
-      if (variants.length === 1) {
-        // Single-variant containers must have a required property
-        if (!variants[0].required) {
-          modelError(`Property ${variants[0].name} is a single-variant and must be required`)
-        }
-      } else {
-        // Multiple variants must all be optional
-        for (const v of variants) {
-          if (v.required) {
-            modelError(`Variant ${variants[0].name} must be optional`)
-          }
+      // Variants must all be optional
+      for (const v of variants) {
+        if (v.required) {
+          modelError(`Variant ${variants[0].name} must be optional`)
         }
       }
     }