fix(generators): getObject has no generic type (#6026)

MarioAlexandruDan · claude · web-flow · commit 81b565c73053 · 2026-03-03T10:11:14.000+01:00
Co-authored-by: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/Snippet.java b/generators/src/main/java/com/algolia/codegen/cts/tests/Snippet.java
@@ -54,6 +54,7 @@ public void addMethodCall(Map<String, Object> context, ParametersWithDataType pa
 
     try {
       context.put("isGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-is-generic", false));
+      context.put("isReturnGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-return-is-generic", false));
       context.put("isCustomRequest", Helpers.CUSTOM_METHODS.contains(ope.operationIdOriginal));
       context.put("isAsyncMethod", (boolean) ope.vendorExtensions.getOrDefault("x-asynchronous-helper", true));
       context.put("hasParams", ope.getHasParams());
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/TestsClient.java b/generators/src/main/java/com/algolia/codegen/cts/tests/TestsClient.java
@@ -134,6 +134,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
               stepOut.put("isMethod", true); // TODO: remove once kotlin is converted
               stepOut.put("hasParams", ope.getHasParams());
               stepOut.put("isGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-is-generic", false));
+              stepOut.put("isReturnGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-return-is-generic", false));
               if (ope.returnType != null && ope.returnType.length() > 0) {
                 stepOut.put("returnType", Helpers.toPascalCase(ope.returnType));
                 stepOut.put("returnsBoolean", ope.returnType.equals("Boolean")); // ruby requires a ? for boolean functions.
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java b/generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java
@@ -140,6 +140,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
 
         try {
           test.put("isGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-is-generic", false));
+          test.put("isReturnGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-return-is-generic", false));
           test.put("isCustomRequest", Helpers.CUSTOM_METHODS.contains(ope.operationIdOriginal));
 
           if (req.request != null && !isHelper) {
diff --git a/generators/src/main/java/com/algolia/codegen/utils/GenericPropagator.java b/generators/src/main/java/com/algolia/codegen/utils/GenericPropagator.java
@@ -247,6 +247,22 @@ public static void propagateGenericsToOperations(String language, String client,
         if (!ope.optionalParams.isEmpty()) {
           ope.optionalParams.get(0).vendorExtensions.put("x-is-generic", true);
         }
+      } else if (
+        returnType == null &&
+        ope.returnProperty != null &&
+        (boolean) ope.returnProperty.vendorExtensions.getOrDefault("x-is-generic", false)
+      ) {
+        // The return type itself IS the generic T (inline schema with x-is-generic, no named
+        // model).
+        // We only set x-return-is-generic (not x-is-generic) so that only templates that
+        // explicitly handle x-return-is-generic (e.g. JavaScript) apply the generic behavior.
+        // Other language templates (Java, C#, Swift) remain unchanged, avoiding breaking changes.
+        ope.vendorExtensions.put("x-return-is-generic", true);
+        if (!ope.optionalParams.isEmpty()) {
+          // Mirror onto optionalParams[0] so that templates inside {{#optionalParams.0}} blocks
+          // can find it via Mustache scope resolution.
+          ope.optionalParams.get(0).vendorExtensions.put("x-return-is-generic", true);
+        }
       }
     }
   }
diff --git a/templates/javascript/clients/api-single.mustache b/templates/javascript/clients/api-single.mustache
@@ -103,7 +103,7 @@ export function create{{#lambda.titlecase}}{{clientName}}{{/lambda.titlecase}}({
     {{/isCompositionClient}}
     {{#operation}}
     {{> client/api/operation/jsdoc}}
-    {{nickname}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}{{#vendorExtensions.x-has-generic-parameter}}<T extends object>{{/vendorExtensions.x-has-generic-parameter}}( {{> client/api/operation/parameters}} ) : Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}> {
+    {{nickname}}{{#vendorExtensions.x-return-is-generic}}<T = Record<string, unknown>>{{/vendorExtensions.x-return-is-generic}}{{^vendorExtensions.x-return-is-generic}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}{{/vendorExtensions.x-return-is-generic}}{{#vendorExtensions.x-has-generic-parameter}}<T extends object>{{/vendorExtensions.x-has-generic-parameter}}( {{> client/api/operation/parameters}} ) : Promise<{{#vendorExtensions.x-return-is-generic}}T{{/vendorExtensions.x-return-is-generic}}{{^vendorExtensions.x-return-is-generic}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}{{#vendorExtensions.x-is-generic}}<T>{{/vendorExtensions.x-is-generic}}{{/vendorExtensions.x-return-is-generic}}> {
       {{#vendorExtensions.x-legacy-signature}}
         {{> client/api/operation/legacySearchCompatible/implementation}}
       {{/vendorExtensions.x-legacy-signature}}

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,22 @@ public static void propagateGenericsToOperations(String language, String client,`
`247`	`247`	`if (!ope.optionalParams.isEmpty()) {`
`248`	`248`	`ope.optionalParams.get(0).vendorExtensions.put("x-is-generic", true);`
`249`	`249`	`}`
	`250`	`+ } else if (`
	`251`	`+ returnType == null &&`
	`252`	`+ ope.returnProperty != null &&`
	`253`	`+ (boolean) ope.returnProperty.vendorExtensions.getOrDefault("x-is-generic", false)`
	`254`	`+ ) {`
	`255`	`+ // The return type itself IS the generic T (inline schema with x-is-generic, no named`
	`256`	`+ // model).`
	`257`	`+ // We only set x-return-is-generic (not x-is-generic) so that only templates that`
	`258`	`+ // explicitly handle x-return-is-generic (e.g. JavaScript) apply the generic behavior.`
	`259`	`+ // Other language templates (Java, C#, Swift) remain unchanged, avoiding breaking changes.`
	`260`	`+ ope.vendorExtensions.put("x-return-is-generic", true);`
	`261`	`+ if (!ope.optionalParams.isEmpty()) {`
	`262`	`+ // Mirror onto optionalParams[0] so that templates inside {{#optionalParams.0}} blocks`
	`263`	`+ // can find it via Mustache scope resolution.`
	`264`	`+ ope.optionalParams.get(0).vendorExtensions.put("x-return-is-generic", true);`
	`265`	`+ }`
`250`	`266`	`}`
`251`	`267`	`}`
`252`	`268`	`}`