Fix recursive types, improve tests

sir4ur0n · sir4ur0n · commit f3e7e8df59c2 · 2026-02-18T15:57:30.000+01:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
@@ -267,18 +267,8 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                 for (List<CodegenProperty> propList : allPropertyLists) {
                     for (CodegenProperty prop : propList) {
                         if (selfRefPropNames.contains(prop.name)) {
-                            // Replace "ModelName.t" with just "t" in all relevant fields
-                            prop.dataType = "t";
-                            prop.datatypeWithEnum = "t";
-                            if (prop.baseType != null) {
-                                prop.baseType = "t";
-                            }
-                            if (prop.complexType != null) {
-                                prop.complexType = "t";
-                            }
-
-                            // If it's a container type (e.g., array), update items as well
                             if (prop.isContainer && prop.items != null) {
+                                // For containers, update items and reconstruct the container type
                                 prop.items.dataType = "t";
                                 prop.items.datatypeWithEnum = "t";
                                 if (prop.items.baseType != null) {
@@ -287,6 +277,27 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                                 if (prop.items.complexType != null) {
                                     prop.items.complexType = "t";
                                 }
+
+                                // Reconstruct the container type based on the updated items
+                                if (prop.isArray) {
+                                    prop.dataType = "t list";
+                                    prop.datatypeWithEnum = "t list";
+                                } else if (prop.isMap) {
+                                    prop.dataType = "(string * t) list";
+                                    prop.datatypeWithEnum = "(string * t) list";
+                                }
+                            } else {
+                                // For non-containers, just replace the type directly
+                                prop.dataType = "t";
+                                prop.datatypeWithEnum = "t";
+                            }
+
+                            // Update baseType and complexType for all cases
+                            if (prop.baseType != null) {
+                                prop.baseType = "t";
+                            }
+                            if (prop.complexType != null) {
+                                prop.complexType = "t";
                             }
                         }
                     }
diff --git a/modules/openapi-generator/src/test/resources/3_0/ocaml/direct-recursion.yaml b/modules/openapi-generator/src/test/resources/3_0/ocaml/direct-recursion.yaml
@@ -14,58 +14,86 @@ info:
     cannot use it for OCaml testing.
   version: 1.0.0
   title: OCaml Direct Recursion Test
-paths:
-  /tree:
-    get:
-      operationId: getTree
-      description: Get a tree structure
-      responses:
-        '200':
-          description: Success
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Tree'
-  /node:
-    post:
-      operationId: createNode
-      description: Create a node
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Node'
-      responses:
-        '201':
-          description: Created
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Node'
+paths: {}
 components:
   schemas:
-    Tree:
+    ArrayRecursion:
       type: object
-      description: A tree with optional children (direct self-reference)
+      description: Test recursive type within an array (optional)
       properties:
         value:
           type: integer
           format: int32
         children:
           type: array
           items:
-            $ref: '#/components/schemas/Tree'
+            $ref: '#/components/schemas/ArrayRecursion'
       required:
         - value
 
-    Node:
+    DirectRecursion:
       type: object
-      description: A node with an optional self-reference
+      description: Test direct self-reference (not in container, optional)
       properties:
         id:
           type: string
         next:
-          $ref: '#/components/schemas/Node'
+          $ref: '#/components/schemas/DirectRecursion'
       required:
         - id
+
+    MapRecursion:
+      type: object
+      description: Test recursive type within a map (optional)
+      properties:
+        name:
+          type: string
+        childMap:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/MapRecursion'
+      required:
+        - name
+
+    RequiredRecursion:
+      type: object
+      description: Test required self-reference field
+      properties:
+        value:
+          type: string
+        parent:
+          $ref: '#/components/schemas/RequiredRecursion'
+      required:
+        - value
+        - parent
+
+    RequiredArrayRecursion:
+      type: object
+      description: Test required array of self-references
+      properties:
+        id:
+          type: integer
+        siblings:
+          type: array
+          items:
+            $ref: '#/components/schemas/RequiredArrayRecursion'
+      required:
+        - id
+        - siblings
+
+    MultipleRecursiveFields:
+      type: object
+      description: Test multiple recursive fields in the same model
+      properties:
+        name:
+          type: string
+        left:
+          $ref: '#/components/schemas/MultipleRecursiveFields'
+        right:
+          $ref: '#/components/schemas/MultipleRecursiveFields'
+        children:
+          type: array
+          items:
+            $ref: '#/components/schemas/MultipleRecursiveFields'
+      required:
+        - name
diff --git a/samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES b/samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES
@@ -1,5 +1,4 @@
 .ocamlformat
-.openapi-generator-ignore
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator/FILES b/samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator/FILES
@@ -1,5 +1,4 @@
 .ocamlformat
-.openapi-generator-ignore
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml-fake-petstore/.openapi-generator/FILES b/samples/client/petstore/ocaml-fake-petstore/.openapi-generator/FILES
@@ -1,5 +1,4 @@
 .ocamlformat
-.openapi-generator-ignore
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml-oneOf-primitive/.openapi-generator/FILES b/samples/client/petstore/ocaml-oneOf-primitive/.openapi-generator/FILES
@@ -1,5 +1,4 @@
 .ocamlformat
-.openapi-generator-ignore
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml-recursion-test/.openapi-generator/FILES b/samples/client/petstore/ocaml-recursion-test/.openapi-generator/FILES
@@ -1,13 +1,14 @@
 .ocamlformat
-.openapi-generator-ignore
 README.md
 dune
 dune-project
 recursion_test.opam
-src/apis/default_api.ml
-src/apis/default_api.mli
-src/models/node.ml
-src/models/tree.ml
+src/models/array_recursion.ml
+src/models/direct_recursion.ml
+src/models/map_recursion.ml
+src/models/multiple_recursive_fields.ml
+src/models/required_array_recursion.ml
+src/models/required_recursion.ml
 src/support/enums.ml
 src/support/jsonSupport.ml
 src/support/request.ml
diff --git a/samples/client/petstore/ocaml-recursion-test/src/apis/default_api.ml b/samples/client/petstore/ocaml-recursion-test/src/apis/default_api.ml
diff --git a/samples/client/petstore/ocaml-recursion-test/src/apis/default_api.mli b/samples/client/petstore/ocaml-recursion-test/src/apis/default_api.mli
diff --git a/samples/client/petstore/ocaml-recursion-test/src/models/array_recursion.ml b/samples/client/petstore/ocaml-recursion-test/src/models/array_recursion.ml
@@ -3,7 +3,7 @@
  *
  * Generated by: https://openapi-generator.tech
  *
- * Schema Tree.t : A tree with optional children (direct self-reference)
+ * Schema Array_recursion.t : Test recursive type within an array (optional)
  *)
 
 
@@ -16,13 +16,13 @@
                 
                 
                 ; [@key "value"]
-                                              children: t
+                                              children: t list
                  [@default []]
                 
                 ; [@key "children"]
                         } [@@deriving yojson { strict = false }, show, eq ];;
         
-        (** A tree with optional children (direct self-reference) *)
+        (** Test recursive type within an array (optional) *)
         let create (value : int32) : t = {
             value = value;
             children = [];
diff --git a/samples/client/petstore/ocaml-recursion-test/src/models/direct_recursion.ml b/samples/client/petstore/ocaml-recursion-test/src/models/direct_recursion.ml
@@ -3,7 +3,7 @@
  *
  * Generated by: https://openapi-generator.tech
  *
- * Schema Node.t : A node with an optional self-reference
+ * Schema Direct_recursion.t : Test direct self-reference (not in container, optional)
  *)
 
 
@@ -24,7 +24,7 @@
                 ; [@key "next"]
                         } [@@deriving yojson { strict = false }, show, eq ];;
         
-        (** A node with an optional self-reference *)
+        (** Test direct self-reference (not in container, optional) *)
         let create (id : string) : t = {
             id = id;
             next = None;
diff --git a/samples/client/petstore/ocaml-recursion-test/src/models/map_recursion.ml b/samples/client/petstore/ocaml-recursion-test/src/models/map_recursion.ml
@@ -0,0 +1,31 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ * Schema Map_recursion.t : Test recursive type within a map (optional)
+ *)
+
+
+
+    
+        type t = {
+                              name: string
+                  
+                  
+                
+                
+                ; [@key "name"]
+                                              child_map: (string * t) list
+                
+                 [@default []] [@to_yojson JsonSupport.of_map_of [%to_yojson: t]] [@of_yojson JsonSupport.to_map_of [%of_yojson: t]]
+                ; [@key "childMap"]
+                        } [@@deriving yojson { strict = false }, show, eq ];;
+        
+        (** Test recursive type within a map (optional) *)
+        let create (name : string) : t = {
+            name = name;
+            child_map = [];
+        }
+    
+
diff --git a/samples/client/petstore/ocaml-recursion-test/src/models/multiple_recursive_fields.ml b/samples/client/petstore/ocaml-recursion-test/src/models/multiple_recursive_fields.ml
@@ -0,0 +1,45 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ * Schema Multiple_recursive_fields.t : Test multiple recursive fields in the same model
+ *)
+
+
+
+    
+        type t = {
+                              name: string
+                  
+                  
+                
+                
+                ; [@key "name"]
+                                              left: t
+                  
+                   option [@default None]
+                
+                
+                ; [@key "left"]
+                                              right: t
+                  
+                   option [@default None]
+                
+                
+                ; [@key "right"]
+                                              children: t list
+                 [@default []]
+                
+                ; [@key "children"]
+                        } [@@deriving yojson { strict = false }, show, eq ];;
+        
+        (** Test multiple recursive fields in the same model *)
+        let create (name : string) : t = {
+            name = name;
+            left = None;
+            right = None;
+            children = [];
+        }
+    
+
diff --git a/samples/client/petstore/ocaml-recursion-test/src/models/required_array_recursion.ml b/samples/client/petstore/ocaml-recursion-test/src/models/required_array_recursion.ml
diff --git a/samples/client/petstore/ocaml-recursion-test/src/models/required_recursion.ml b/samples/client/petstore/ocaml-recursion-test/src/models/required_recursion.ml
diff --git a/samples/client/petstore/ocaml/.openapi-generator/FILES b/samples/client/petstore/ocaml/.openapi-generator/FILES

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`.ocamlformat`
`2`		`-.openapi-generator-ignore`
`3`	`2`	`README.md`
`4`	`3`	`dune`
`5`	`4`	`dune-project`