Merge branch 'main' into chore/renovateBaseBranch

Author: shortcuts

clients/algoliasearch-client-csharp/algoliasearch/Models/Search/SynonymType.cs

@@ -46,6 +46,24 @@ public enum SynonymType
   /// Enum Placeholder for value: placeholder
   /// </summary>
   [JsonPropertyName("placeholder")]
-  Placeholder = 5
+  Placeholder = 5,
+
+  /// <summary>
+  /// Enum OneWaySynonym for value: oneWaySynonym
+  /// </summary>
+  [JsonPropertyName("oneWaySynonym")]
+  OneWaySynonym = 6,
+
+  /// <summary>
+  /// Enum AltCorrection1 for value: altCorrection1
+  /// </summary>
+  [JsonPropertyName("altCorrection1")]
+  AltCorrection1 = 7,
+
+  /// <summary>
+  /// Enum AltCorrection2 for value: altCorrection2
+  /// </summary>
+  [JsonPropertyName("altCorrection2")]
+  AltCorrection2 = 8
 }
 

clients/algoliasearch-client-dart/packages/client_search/lib/src/model/search_synonyms_params.g.dart

@@ -9,7 +9,10 @@ enum SynonymType {
   onewaysynonym(r'onewaysynonym'),
   altcorrection1(r'altcorrection1'),
   altcorrection2(r'altcorrection2'),
-  placeholder(r'placeholder');
+  placeholder(r'placeholder'),
+  oneWaySynonym(r'oneWaySynonym'),
+  altCorrection1(r'altCorrection1'),
+  altCorrection2(r'altCorrection2');
 
   const SynonymType(this.raw);
   final dynamic raw;

clients/algoliasearch-client-dart/packages/client_search/lib/src/model/synonym_hit.g.dart

@@ -10,7 +10,7 @@
 public enum BigQueryDataType {
   GA_4("ga4"),
 
-  GA_36_0("ga360");
+  GA_360("ga360");
 
   private final String value;
 

clients/algoliasearch-client-dart/packages/client_search/lib/src/model/synonym_type.dart

@@ -16,7 +16,13 @@ public enum SynonymType {
 
   ALTCORRECTION_2("altcorrection2"),
 
-  PLACEHOLDER("placeholder");
+  PLACEHOLDER("placeholder"),
+
+  ONE_WAY_SYNONYM("oneWaySynonym"),
+
+  ALT_CORRECTION_1("altCorrection1"),
+
+  ALT_CORRECTION_2("altCorrection2");
 
   private final String value;
 

clients/algoliasearch-client-go/algolia/search/model_synonym_type.go

@@ -3,4 +3,12 @@
 /**
  * Synonym type.
  */
-export type SynonymType = 'synonym' | 'onewaysynonym' | 'altcorrection1' | 'altcorrection2' | 'placeholder';
+export type SynonymType =
+  | 'synonym'
+  | 'onewaysynonym'
+  | 'altcorrection1'
+  | 'altcorrection2'
+  | 'placeholder'
+  | 'oneWaySynonym'
+  | 'altCorrection1'
+  | 'altCorrection2';

clients/algoliasearch-client-java/algoliasearch/src/main/java/com/algolia/model/ingestion/BigQueryDataType.java

@@ -22,7 +22,16 @@ public enum class SynonymType(public val value: kotlin.String) {
   Altcorrection2("altcorrection2"),
 
   @SerialName(value = "placeholder")
-  Placeholder("placeholder");
+  Placeholder("placeholder"),
+
+  @SerialName(value = "oneWaySynonym")
+  OneWaySynonym("oneWaySynonym"),
+
+  @SerialName(value = "altCorrection1")
+  AltCorrection1("altCorrection1"),
+
+  @SerialName(value = "altCorrection2")
+  AltCorrection2("altCorrection2");
 
   override fun toString(): kotlin.String = value
 }

clients/algoliasearch-client-java/algoliasearch/src/main/java/com/algolia/model/search/SynonymType.java

@@ -26,6 +26,12 @@ class SynonymType
 
     public const PLACEHOLDER = 'placeholder';
 
+    public const ONE_WAY_SYNONYM = 'oneWaySynonym';
+
+    public const ALT_CORRECTION1 = 'altCorrection1';
+
+    public const ALT_CORRECTION2 = 'altCorrection2';
+
     /**
      * Gets allowable values of the enum.
      *
@@ -39,6 +45,9 @@ public static function getAllowableEnumValues()
             self::ALTCORRECTION1,
             self::ALTCORRECTION2,
             self::PLACEHOLDER,
+            self::ONE_WAY_SYNONYM,
+            self::ALT_CORRECTION1,
+            self::ALT_CORRECTION2,
         ];
     }
 }

clients/algoliasearch-client-javascript/packages/client-search/model/synonymType.ts

@@ -24,9 +24,9 @@ class BigQueryDataType(str, Enum):
     """
     allowed enum values
     """
-    GA4 = "ga4"
+    GA_4 = "ga4"
 
-    GA360 = "ga360"
+    GA_360 = "ga360"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-kotlin/client/src/commonMain/kotlin/com/algolia/client/model/search/SynonymType.kt

@@ -24,7 +24,7 @@ class MappingFormatSchema(str, Enum):
     """
     allowed enum values
     """
-    MAPPINGKIT_SLASH_V1 = "mappingkit/v1"
+    MAPPINGKIT_V_1 = "mappingkit/v1"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-php/lib/Model/Search/SynonymType.php

@@ -24,7 +24,7 @@ class FbtModel(str, Enum):
     """
     allowed enum values
     """
-    BOUGHT_MINUS_TOGETHER = "bought-together"
+    BOUGHT_TOGETHER = "bought-together"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/ingestion/models/big_query_data_type.py

@@ -24,7 +24,7 @@ class LookingSimilarModel(str, Enum):
     """
     allowed enum values
     """
-    LOOKING_MINUS_SIMILAR = "looking-similar"
+    LOOKING_SIMILAR = "looking-similar"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/ingestion/models/mapping_format_schema.py

@@ -24,13 +24,13 @@ class RecommendModels(str, Enum):
     """
     allowed enum values
     """
-    RELATED_MINUS_PRODUCTS = "related-products"
+    RELATED_PRODUCTS = "related-products"
 
-    BOUGHT_MINUS_TOGETHER = "bought-together"
+    BOUGHT_TOGETHER = "bought-together"
 
-    TRENDING_MINUS_FACETS = "trending-facets"
+    TRENDING_FACETS = "trending-facets"
 
-    TRENDING_MINUS_ITEMS = "trending-items"
+    TRENDING_ITEMS = "trending-items"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/recommend/models/fbt_model.py

@@ -24,7 +24,7 @@ class RecommendedForYouModel(str, Enum):
     """
     allowed enum values
     """
-    RECOMMENDED_MINUS_FOR_MINUS_YOU = "recommended-for-you"
+    RECOMMENDED_FOR_YOU = "recommended-for-you"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/recommend/models/looking_similar_model.py

@@ -24,7 +24,7 @@ class RelatedModel(str, Enum):
     """
     allowed enum values
     """
-    RELATED_MINUS_PRODUCTS = "related-products"
+    RELATED_PRODUCTS = "related-products"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/recommend/models/recommend_models.py

@@ -122,7 +122,7 @@ class SupportedLanguage(str, Enum):
 
     PT = "pt"
 
-    PT_MINUS_BR = "pt-br"
+    PT_BR = "pt-br"
 
     QU = "qu"
 

clients/algoliasearch-client-python/algoliasearch/recommend/models/recommended_for_you_model.py

@@ -24,7 +24,7 @@ class TrendingFacetsModel(str, Enum):
     """
     allowed enum values
     """
-    TRENDING_MINUS_FACETS = "trending-facets"
+    TRENDING_FACETS = "trending-facets"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/recommend/models/related_model.py

@@ -24,7 +24,7 @@ class TrendingItemsModel(str, Enum):
     """
     allowed enum values
     """
-    TRENDING_MINUS_ITEMS = "trending-items"
+    TRENDING_ITEMS = "trending-items"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

clients/algoliasearch-client-python/algoliasearch/recommend/models/supported_language.py

@@ -122,7 +122,7 @@ class SupportedLanguage(str, Enum):
 
     PT = "pt"
 
-    PT_MINUS_BR = "pt-br"
+    PT_BR = "pt-br"
 
     QU = "qu"
 

clients/algoliasearch-client-python/algoliasearch/recommend/models/trending_facets_model.py

@@ -28,12 +28,18 @@ class SynonymType(str, Enum):
 
     ONEWAYSYNONYM = "onewaysynonym"
 
-    ALTCORRECTION1 = "altcorrection1"
+    ALTCORRECTION_1 = "altcorrection1"
 
-    ALTCORRECTION2 = "altcorrection2"
+    ALTCORRECTION_2 = "altcorrection2"
 
     PLACEHOLDER = "placeholder"
 
+    ONE_WAY_SYNONYM = "oneWaySynonym"
+
+    ALTCORRECTION1 = "altCorrection1"
+
+    ALTCORRECTION2 = "altCorrection2"
+
     @classmethod
     def from_json(cls, json_str: str) -> Self:
         """Create an instance of SynonymType from a JSON string"""

clients/algoliasearch-client-python/algoliasearch/recommend/models/trending_items_model.py

@@ -11,9 +11,21 @@ class SynonymType
       ALTCORRECTION1 = "altcorrection1".freeze
       ALTCORRECTION2 = "altcorrection2".freeze
       PLACEHOLDER = "placeholder".freeze
+      ONE_WAY_SYNONYM = "oneWaySynonym".freeze
+      ALT_CORRECTION1 = "altCorrection1".freeze
+      ALT_CORRECTION2 = "altCorrection2".freeze
 
       def self.all_vars
-        @all_vars ||= [SYNONYM, ONEWAYSYNONYM, ALTCORRECTION1, ALTCORRECTION2, PLACEHOLDER].freeze
+        @all_vars ||= [
+          SYNONYM,
+          ONEWAYSYNONYM,
+          ALTCORRECTION1,
+          ALTCORRECTION2,
+          PLACEHOLDER,
+          ONE_WAY_SYNONYM,
+          ALT_CORRECTION1,
+          ALT_CORRECTION2
+        ].freeze
       end
 
       # Builds the enum from string

clients/algoliasearch-client-python/algoliasearch/search/models/supported_language.py

@@ -55,7 +55,25 @@ object SynonymType {
   case object Placeholder extends SynonymType {
     override def toString = "placeholder"
   }
-  val values: Seq[SynonymType] = Seq(Synonym, Onewaysynonym, Altcorrection1, Altcorrection2, Placeholder)
+  case object OneWaySynonym extends SynonymType {
+    override def toString = "oneWaySynonym"
+  }
+  case object AltCorrection1 extends SynonymType {
+    override def toString = "altCorrection1"
+  }
+  case object AltCorrection2 extends SynonymType {
+    override def toString = "altCorrection2"
+  }
+  val values: Seq[SynonymType] = Seq(
+    Synonym,
+    Onewaysynonym,
+    Altcorrection1,
+    Altcorrection2,
+    Placeholder,
+    OneWaySynonym,
+    AltCorrection1,
+    AltCorrection2
+  )
 
   def withName(name: String): SynonymType = SynonymType.values
     .find(_.toString == name)

clients/algoliasearch-client-python/algoliasearch/search/models/synonym_type.py

@@ -13,6 +13,9 @@ public enum SynonymType: String, Codable, CaseIterable {
     case altcorrection1
     case altcorrection2
     case placeholder
+    case oneWaySynonym
+    case altCorrection1
+    case altCorrection2
 }
 
 extension SynonymType: Hashable {}

clients/algoliasearch-client-ruby/lib/algolia/models/search/synonym_type.rb

@@ -131,8 +131,7 @@ public static String toEnum(String value) {
     }
 
     if (!value.matches("[A-Z0-9_]+")) {
-      // convert camelCase77String to CAMEL_CASE_77_STRING
-      return value.replaceAll("-", "_").replaceAll("(.+?)([A-Z]|[0-9])", "$1_$2").toUpperCase(Locale.ROOT);
+      return Helpers.toScreamingSnakeCase(value);
     }
 
     return value;

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/search/SynonymType.scala

@@ -161,4 +161,28 @@ public String toEnumDefaultValue(CodegenProperty property, String value) {
     // always default to None in the client, to let the server handle the default value.
     return "None";
   }
+
+  public static String toEnum(String value) {
+    // we only convert the full lowercase enums as they have a fallback to camelCase enums with the
+    // same name so no BC is introduced
+    if (!value.toLowerCase().equals(value)) {
+      // special edge case for onewaysynonym because there's no way to distinguish the two at the
+      // generation level
+      if (value.equals("'oneWaySynonym'")) {
+        return Helpers.toSnakeCase(value);
+      }
+      return value;
+    }
+    return Helpers.toScreamingSnakeCase(value);
+  }
+
+  @Override
+  public String toEnumVariableName(String value, String datatype) {
+    return super.toEnumVariableName(toEnum(value), datatype);
+  }
+
+  @Override
+  public String toEnumVarName(String value, String datatype) {
+    return super.toEnumVarName(toEnum(value), datatype);
+  }
 }