Add test showing the bug

sir4ur0n · sir4ur0n · commit 3b61324ba918 · 2026-02-18T11:40:47.000+01:00
diff --git a/bin/configs/ocaml-enum-in-composed-schema.yaml b/bin/configs/ocaml-enum-in-composed-schema.yaml
@@ -0,0 +1,6 @@
+generatorName: ocaml
+outputDir: samples/client/petstore/ocaml-enum-in-composed-schema
+inputSpec: modules/openapi-generator/src/test/resources/3_0/ocaml/enum-in-composed-schema.yaml
+templateDir: modules/openapi-generator/src/main/resources/ocaml
+additionalProperties:
+  packageName: petstore_client
diff --git a/modules/openapi-generator/src/test/resources/3_0/ocaml/enum-in-composed-schema.yaml b/modules/openapi-generator/src/test/resources/3_0/ocaml/enum-in-composed-schema.yaml
@@ -0,0 +1,49 @@
+openapi: 3.0.0
+info:
+  title: Test Enum in Composed Schema
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      operationId: getTest
+      responses:
+        '200':
+          description: Success
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestModel'
+components:
+  schemas:
+    TestModel:
+      type: object
+      properties:
+        name:
+          type: string
+        config:
+          anyOf:
+            - allOf:
+                - type: object
+                  properties:
+                    type:
+                      type: string
+                      enum:
+                        - type1
+                        - type2
+                        - type3
+                    options:
+                      type: object
+                      properties:
+                        value:
+                          type: string
+                          enum:
+                            - value1
+                            - value2
+                            - value3
+        optionalUrl:
+          anyOf:
+            - type: string
+              format: uri
+            - type: string
+              enum:
+                - ""
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/.ocamlformat b/samples/client/petstore/ocaml-enum-in-composed-schema/.ocamlformat
@@ -0,0 +1,2 @@
+version=0.27.0
+ocaml-version=4.14.0
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator-ignore b/samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
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
@@ -0,0 +1,14 @@
+.ocamlformat
+README.md
+dune
+dune-project
+petstore_client.opam
+src/apis/default_api.ml
+src/apis/default_api.mli
+src/models/test_model.ml
+src/models/test_model_config.ml
+src/models/test_model_config_all_of_options.ml
+src/models/test_model_optional_url.ml
+src/support/enums.ml
+src/support/jsonSupport.ml
+src/support/request.ml
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator/VERSION b/samples/client/petstore/ocaml-enum-in-composed-schema/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.21.0-SNAPSHOT
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/README.md b/samples/client/petstore/ocaml-enum-in-composed-schema/README.md
@@ -0,0 +1,33 @@
+# 
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+This OCaml package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Generator version: 7.21.0-SNAPSHOT
+- Build package: org.openapitools.codegen.languages.OCamlClientCodegen
+
+## Requirements.
+
+OCaml 5.x
+
+## Installation
+
+Please run the following commands to build the package `petstore_client`:
+
+```sh
+opam install . --deps-only --with-test
+eval $(opam env)
+dune build
+```
+
+## Getting Started
+
+The generated directory structure is:
+- `src/apis`: contains several modules, each with several functions. Each function is an API endpoint.
+- `src/models`: contains several modules. Each module contains:
+  - a type `t` representing an input and/or output schema of the OpenAPI spec
+  - a smart constructor `create` for this type
+- `src/support`: various modules used by the generated APIs and Models
+
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/dune b/samples/client/petstore/ocaml-enum-in-composed-schema/dune
@@ -0,0 +1,9 @@
+(include_subdirs unqualified)
+(library
+   (name petstore_client)
+   (public_name petstore_client)
+   (flags (:standard -w -27))
+   (libraries str cohttp-lwt-unix lwt yojson ppx_deriving_yojson.runtime)
+   (preprocess (pps ppx_deriving_yojson ppx_deriving.std))
+   (wrapped true)
+)
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/dune-project b/samples/client/petstore/ocaml-enum-in-composed-schema/dune-project
@@ -0,0 +1,2 @@
+(lang dune 2.0)
+(name petstore_client)
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/petstore_client.opam b/samples/client/petstore/ocaml-enum-in-composed-schema/petstore_client.opam
@@ -0,0 +1,25 @@
+opam-version: "2.0"
+name: "petstore_client"
+version: "1.0.0"
+synopsis: ""
+description: """
+Longer description
+"""
+maintainer: "Name <email>"
+authors: "Name <email>"
+license: ""
+homepage: ""
+bug-reports: ""
+dev-repo: ""
+depends: [
+  "ocaml"
+  "ocamlfind"
+  "ocamlformat" {= "0.27.0"}
+  "dune"
+  "ppx_deriving_yojson"
+  "conf-libev"
+  "lwt"
+  "cohttp-lwt-unix" {< "6.0.0"}
+  "cohttp-async" {< "6.0.0"}
+]
+build: ["dune" "build" "-p" name]
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/apis/default_api.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/apis/default_api.ml
@@ -0,0 +1,14 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+let get_test () =
+    let open Lwt.Infix in
+    let uri = Request.build_uri "/test" 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 Test_model.of_yojson) resp body
+
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/apis/default_api.mli b/samples/client/petstore/ocaml-enum-in-composed-schema/src/apis/default_api.mli
@@ -0,0 +1,8 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+val get_test : unit -> Test_model.t Lwt.t
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model.ml
@@ -0,0 +1,38 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+
+
+    
+        type t = {
+                              name: string
+                  
+                   option [@default None]
+                
+                
+                ; [@key "name"]
+                                              config: Test_model_config.t
+                  
+                   option [@default None]
+                
+                
+                ; [@key "config"]
+                                              optional_url: Test_model_optional_url.t
+                  
+                   option [@default None]
+                
+                
+                ; [@key "optionalUrl"]
+                        } [@@deriving yojson { strict = false }, show, eq ];;
+        
+        let create () : t = {
+            name = None;
+            config = None;
+            optional_url = None;
+        }
+    
+
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_config.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_config.ml
@@ -0,0 +1,31 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+
+
+    
+        type t = {
+                      _type: Enums.testmodel_config_type
+                           option [@default
+                    
+                    None
+                  ]
+                ; [@key "type"]
+                                                      options: Test_model_config_all_of_options.t
+                  
+                   option [@default None]
+                
+                
+                ; [@key "options"]
+                        } [@@deriving yojson { strict = false }, show, eq ];;
+        
+        let create () : t = {
+            _type = None;
+            options = None;
+        }
+    
+
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_config_all_of_options.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_config_all_of_options.ml
@@ -0,0 +1,24 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+
+
+    
+        type t = {
+                      value: Enums.value
+                           option [@default
+                    
+                    None
+                  ]
+                ; [@key "value"]
+                                } [@@deriving yojson { strict = false }, show, eq ];;
+        
+        let create () : t = {
+            value = None;
+        }
+    
+
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_optional_url.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_optional_url.ml
@@ -0,0 +1,35 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+
+        type t =
+            | AnyOf0 of string
+            | AnyOf1 of any_of_1
+        [@@deriving show, eq];;
+        
+        let to_yojson = function
+            | AnyOf0 v -> [%to_yojson: string] v
+            | AnyOf1 v -> [%to_yojson: any_of_1] v
+        
+        (* Manual implementations because the derived one encodes into a tuple list where the first element is the constructor name. *)
+        
+        let of_yojson json =
+          [
+            [%of_yojson: string] json
+              |> Stdlib.Result.to_option
+              |> Stdlib.Option.map (fun v -> AnyOf0 v);
+            [%of_yojson: any_of_1] json
+              |> Stdlib.Result.to_option
+              |> Stdlib.Option.map (fun v -> AnyOf1 v);
+                        ]
+          |> Stdlib.List.filter_map (Fun.id)
+          |> function
+             | t :: _ -> Ok t (* Return the first successful parsing. *)
+             | [] -> Error ("Failed to parse JSON " ^ Yojson.Safe.show json ^ " into a value of type Test_model_optional_url.t")
+
+    
+
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/support/enums.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/support/enums.ml
@@ -0,0 +1,40 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+type any_of_1 = [
+| `Empty [@printer fun fmt _ -> Format.pp_print_string fmt "empty"] [@name "empty"]
+] [@@deriving yojson, show { with_path = false }, eq];;
+
+let any_of_1_of_yojson json = any_of_1_of_yojson (`List [json])
+let any_of_1_to_yojson e =
+    match any_of_1_to_yojson e with
+    | `List [json] -> json
+    | json -> json
+
+type value = [
+| `Value1 [@printer fun fmt _ -> Format.pp_print_string fmt "value1"] [@name "value1"]
+| `Value2 [@printer fun fmt _ -> Format.pp_print_string fmt "value2"] [@name "value2"]
+| `Value3 [@printer fun fmt _ -> Format.pp_print_string fmt "value3"] [@name "value3"]
+] [@@deriving yojson, show { with_path = false }, eq];;
+
+let value_of_yojson json = value_of_yojson (`List [json])
+let value_to_yojson e =
+    match value_to_yojson e with
+    | `List [json] -> json
+    | json -> json
+
+type testmodel_config_type = [
+| `Type1 [@printer fun fmt _ -> Format.pp_print_string fmt "type1"] [@name "type1"]
+| `Type2 [@printer fun fmt _ -> Format.pp_print_string fmt "type2"] [@name "type2"]
+| `Type3 [@printer fun fmt _ -> Format.pp_print_string fmt "type3"] [@name "type3"]
+] [@@deriving yojson, show { with_path = false }, eq];;
+
+let testmodel_config_type_of_yojson json = testmodel_config_type_of_yojson (`List [json])
+let testmodel_config_type_to_yojson e =
+    match testmodel_config_type_to_yojson e with
+    | `List [json] -> json
+    | json -> json
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/support/jsonSupport.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/support/jsonSupport.ml
diff --git a/samples/client/petstore/ocaml-enum-in-composed-schema/src/support/request.ml b/samples/client/petstore/ocaml-enum-in-composed-schema/src/support/request.ml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+version=0.27.0`
	`2`	`+ocaml-version=4.14.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+(lang dune 2.0)`
	`2`	`+(name petstore_client)`