rollback a bit

Author: millotp

clients/algoliasearch-client-javascript/yarn.lock

@@ -139,7 +139,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@algolia/composition@npm:0.0.1, @algolia/composition@workspace:packages/composition":
+"@algolia/composition@workspace:packages/composition":
   version: 0.0.0-use.local
   resolution: "@algolia/composition@workspace:packages/composition"
   dependencies:
@@ -148,8 +148,8 @@ __metadata:
     "@algolia/requester-fetch": "npm:5.19.0"
     "@algolia/requester-node-http": "npm:5.19.0"
     "@arethetypeswrong/cli": "npm:0.17.3"
-    "@types/node": "npm:22.10.5"
-    publint: "npm:0.3.1"
+    "@types/node": "npm:22.10.7"
+    publint: "npm:0.3.2"
     rollup: "npm:4.30.1"
     tsup: "npm:8.3.5"
     typescript: "npm:5.7.3"
@@ -2317,7 +2317,6 @@ __metadata:
     "@algolia/client-personalization": "npm:5.19.0"
     "@algolia/client-query-suggestions": "npm:5.19.0"
     "@algolia/client-search": "npm:5.19.0"
-    "@algolia/composition": "npm:0.0.1"
     "@algolia/ingestion": "npm:1.19.0"
     "@algolia/monitoring": "npm:1.19.0"
     "@algolia/recommend": "npm:5.19.0"

generators/src/main/java/com/algolia/codegen/utils/GenericPropagator.java

@@ -54,8 +54,7 @@ private static boolean hasGeneric(IJsonSchemaValidationProperties property) {
     }
     return (
       (boolean) vendorExtensions.getOrDefault("x-propagated-generic", false) ||
-      (boolean) vendorExtensions.getOrDefault("x-has-child-generic", false) ||
-      (boolean) vendorExtensions.getOrDefault("x-is-generic", false)
+      (boolean) vendorExtensions.getOrDefault("x-has-child-generic", false)
     );
   }
 
@@ -80,13 +79,16 @@ private static boolean markPropagatedGeneric(
     }
     // if items itself isn't generic, we recurse on its items and properties until we reach the
     // end or find a generic property
-    if (items != null && (hasGeneric(items) || markPropagatedGeneric(items, getVar, skipOneOf))) {
+    if (
+      items != null &&
+      ((boolean) items.vendorExtensions.getOrDefault("x-is-generic", false) || markPropagatedGeneric(items, getVar, skipOneOf))
+    ) {
       setPropagatedGeneric(model);
       return true;
     }
     for (CodegenProperty variable : getVar.apply(model)) {
       // same thing for the variable, if it's not a generic, we recurse on it until we find one
-      if (hasGeneric(items) || markPropagatedGeneric(variable, getVar, skipOneOf)) {
+      if ((boolean) variable.vendorExtensions.getOrDefault("x-is-generic", false) || markPropagatedGeneric(variable, getVar, skipOneOf)) {
         setPropagatedGeneric(model);
         return true;
       }
@@ -130,8 +132,7 @@ private static void setGenericToComposedSchema(
       return;
     }
     for (CodegenProperty prop : composedSchemas) {
-      if (hasGeneric(prop) || hasGeneric(propertyToModel(models, prop))) {
-        setHasChildGeneric(model);
+      if (hasGeneric(propertyToModel(models, prop))) {
         setHasChildGeneric(prop);
       }
     }
@@ -208,7 +209,7 @@ public static void propagateGenericsToModels(Map<String, ModelsMap> modelsMap) {
   }
 
   public static void propagateGenericsToModels(Map<String, ModelsMap> modelsMap, boolean skipOneOf) {
-    propagateGenericsToModels("dontcare", "dontcare", modelsMap, false);
+    propagateGenericsToModels("dontcare", "dontcare", modelsMap, skipOneOf);
   }
 
   public static void propagateGenericsToModels(String language, String client, Map<String, ModelsMap> modelsMap) {