Fix recursion tests

Author: sir4ur0n

bin/configs/ocaml-recursion-test.yaml

@@ -1,6 +1,6 @@
 generatorName: ocaml
 outputDir: samples/client/petstore/ocaml-recursion-test
-inputSpec: modules/openapi-generator/src/test/resources/3_0/recursion.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/ocaml/direct-recursion.yaml
 templateDir: modules/openapi-generator/src/main/resources/ocaml
 additionalProperties:
   packageName: recursion_test

modules/openapi-generator/src/test/resources/3_0/ocaml/direct-recursion.yaml

@@ -0,0 +1,71 @@
+openapi: 3.0.0
+info:
+  description: |
+    Test for direct recursive types in OCaml generator.
+
+    This spec only tests direct recursion (A -> A) and NOT mutual recursion (A -> B -> A).
+
+    The OCaml generator does not support mutual recursion because OCaml requires mutually
+    recursive types to be declared together in the same file using "type a = ... and b = ..."
+    syntax. The generator's architecture uses one model per file, making this infeasible.
+
+    Note: The generic test file modules/openapi-generator/src/test/resources/3_0/recursion.yaml
+    contains both Foo (direct recursion) and Bar/Baz (mutual recursion), which is why we
+    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'
+components:
+  schemas:
+    Tree:
+      type: object
+      description: A tree with optional children (direct self-reference)
+      properties:
+        value:
+          type: integer
+          format: int32
+        children:
+          type: array
+          items:
+            $ref: '#/components/schemas/Tree'
+      required:
+        - value
+
+    Node:
+      type: object
+      description: A node with an optional self-reference
+      properties:
+        id:
+          type: string
+        next:
+          $ref: '#/components/schemas/Node'
+      required:
+        - id

samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES

@@ -1,4 +1,5 @@
 .ocamlformat
+.openapi-generator-ignore
 README.md
 dune
 dune-project

samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator/FILES

@@ -1,4 +1,5 @@
 .ocamlformat
+.openapi-generator-ignore
 README.md
 dune
 dune-project

samples/client/petstore/ocaml-fake-petstore/.openapi-generator/FILES

@@ -1,4 +1,5 @@
 .ocamlformat
+.openapi-generator-ignore
 README.md
 dune
 dune-project

samples/client/petstore/ocaml-oneOf-primitive/.openapi-generator/FILES

@@ -1,4 +1,5 @@
 .ocamlformat
+.openapi-generator-ignore
 README.md
 dune
 dune-project

samples/client/petstore/ocaml-recursion-test/.openapi-generator/FILES

@@ -1,13 +1,13 @@
 .ocamlformat
+.openapi-generator-ignore
 README.md
 dune
 dune-project
 recursion_test.opam
 src/apis/default_api.ml
 src/apis/default_api.mli
-src/models/bar.ml
-src/models/baz.ml
-src/models/foo.ml
+src/models/node.ml
+src/models/tree.ml
 src/support/enums.ml
 src/support/jsonSupport.ml
 src/support/request.ml

samples/client/petstore/ocaml-recursion-test/README.md

@@ -1,5 +1,16 @@
 # 
-Test
+Test for direct recursive types in OCaml generator.
+
+This spec only tests direct recursion (A -> A) and NOT mutual recursion (A -> B -> A).
+
+The OCaml generator does not support mutual recursion because OCaml requires mutually
+recursive types to be declared together in the same file using \''type a = ... and b = ...\''
+syntax. The generator's architecture uses one model per file, making this infeasible.
+
+Note: The generic test file modules/openapi-generator/src/test/resources/3_0/recursion.yaml
+contains both Foo (direct recursion) and Bar/Baz (mutual recursion), which is why we
+cannot use it for OCaml testing.
+
 
 This OCaml package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 

samples/client/petstore/ocaml-recursion-test/src/apis/default_api.ml

@@ -5,10 +5,32 @@
  *
  *)
 
-let foo_post () =
+let create_node ~node_t =
     let open Lwt.Infix in
-    let uri = Request.build_uri "/foo" in
+    let uri = Request.build_uri "/node" in
     let headers = Request.default_headers in
-    Cohttp_lwt_unix.Client.call `POST uri ~headers >>= fun (resp, body) ->
-    Request.read_json_body_as (JsonSupport.unwrap Foo.of_yojson) resp body
+    let body = Request.
+        
+        write_as_json_body     
+    
+    
+    
+    
+    
+    
+                Node.to_yojson
+    
+    
+    
+ node_t
+    in
+    Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
+    Request.read_json_body_as (JsonSupport.unwrap Node.of_yojson) resp body
+
+let get_tree () =
+    let open Lwt.Infix in
+    let uri = Request.build_uri "/tree" in
+    let headers = Request.default_headers in
+    Cohttp_lwt_unix.Client.call `GET uri ~headers >>= fun (resp, body) ->
+    Request.read_json_body_as (JsonSupport.unwrap Tree.of_yojson) resp body
 

samples/client/petstore/ocaml-recursion-test/src/apis/default_api.mli

@@ -5,4 +5,5 @@
  *
  *)
 
-val foo_post : unit -> Foo.t Lwt.t
+val create_node : node_t:Node.t -> Node.t Lwt.t
+val get_tree : unit -> Tree.t Lwt.t