Skip to content

[OCaml] Generate .ocamlformat file; format all generated OCaml files #21809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Aug 25, 2025
Merged

[OCaml] Generate .ocamlformat file; format all generated OCaml files #21809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20c86dc
[OCaml] Generate .ocamlformat file
sir4ur0n Aug 25, 2025
f0d82dc
[OCaml] Run `dune fmt` on all OCaml folders
sir4ur0n Aug 25, 2025
6c690c3
Don't format in Git
sir4ur0n Aug 25, 2025
e5a205a
Add myself for OCaml
sir4ur0n Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ If you want to join the committee, please kindly apply by sending an email to te
| Nim | |
| NodeJS/Javascript | @CodeNinjai (2017/07) @frol (2017/07) @cliffano (2017/07) |
| ObjC | |
| OCaml | @cgensoul (2019/08) |
| OCaml | @cgensoul (2019/08), @sir4ur0n (2025/08) |
| Perl | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06) |
| PHP | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), [@ybelenko](https://github.com/ybelenko) (2018/07), @renepardon (2018/12) |
| PowerShell | @wing328 (2020/05) |
Expand Down
1 change: 1 addition & 0 deletions ...penapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public OCamlClientCodegen() {
supportingFiles.add(new SupportingFile("dune.mustache", "", "dune"));
supportingFiles.add(new SupportingFile("dune-project.mustache", "", "dune-project"));
supportingFiles.add(new SupportingFile("readme.mustache", "", "README.md"));
supportingFiles.add(new SupportingFile("ocamlformat.mustache", "", ".ocamlformat"));

defaultIncludes = new HashSet<>(
Arrays.asList(
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/ocaml/dune-project.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(lang dune 1.10)
(name {{{packageName}}})
(lang dune 2.0)
(name {{{packageName}}})
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/ocaml/lib.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dev-repo: ""
depends: [
"ocaml"
"ocamlfind"
"ocamlformat" {= "0.27.0"}
"dune"
"ppx_deriving_yojson"
"conf-libev"
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/ocaml/ocamlformat.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version=0.27.0
ocaml-version=4.14.0
2 changes: 2 additions & 0 deletions samples/client/petstore/ocaml-fake-petstore/.ocamlformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version=0.27.0
ocaml-version=4.14.0
1 change: 1 addition & 0 deletions samples/client/petstore/ocaml-fake-petstore/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.ocamlformat
README.md
dune
dune-project
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/ocaml-fake-petstore/dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(lang dune 1.10)
(name petstore_client)
(lang dune 2.0)
(name petstore_client)
1 change: 1 addition & 0 deletions samples/client/petstore/ocaml-fake-petstore/petstore_client.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dev-repo: ""
depends: [
"ocaml"
"ocamlfind"
"ocamlformat" {= "0.27.0"}
"dune"
"ppx_deriving_yojson"
"conf-libev"
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/ocaml-oneOf/.ocamlformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version=0.27.0
ocaml-version=4.14.0
1 change: 1 addition & 0 deletions samples/client/petstore/ocaml-oneOf/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.ocamlformat
README.md
dune
dune-project
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/ocaml-oneOf/dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(lang dune 1.10)
(name petstore_client)
(lang dune 2.0)
(name petstore_client)
1 change: 1 addition & 0 deletions samples/client/petstore/ocaml-oneOf/petstore_client.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dev-repo: ""
depends: [
"ocaml"
"ocamlfind"
"ocamlformat" {= "0.27.0"}
"dune"
"ppx_deriving_yojson"
"conf-libev"
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/ocaml/.ocamlformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version=0.27.0
ocaml-version=4.14.0
1 change: 1 addition & 0 deletions samples/client/petstore/ocaml/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.ocamlformat
README.md
dune
dune-project
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/ocaml/dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(lang dune 1.10)
(name petstore_client)
(lang dune 2.0)
(name petstore_client)
1 change: 1 addition & 0 deletions samples/client/petstore/ocaml/petstore_client.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dev-repo: ""
depends: [
"ocaml"
"ocamlfind"
"ocamlformat" {= "0.27.0"}
"dune"
"ppx_deriving_yojson"
"conf-libev"
Expand Down
15 changes: 6 additions & 9 deletions samples/client/petstore/ocaml/src/models/inline_object.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@
*)

type t = {
(* Updated name of the pet *)
name: string option [@default None];
(* Updated status of the pet *)
status: string option [@default None];
} [@@deriving yojson { strict = false }, show ];;

let create () : t = {
name = None;
status = None;
(* Updated name of the pet *)
name : string option; [@default None]
(* Updated status of the pet *)
status : string option; [@default None]
}
[@@deriving yojson { strict = false }, show]

let create () : t = { name = None; status = None }
15 changes: 6 additions & 9 deletions samples/client/petstore/ocaml/src/models/inline_object_1.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@
*)

type t = {
(* Additional data to pass to server *)
additional_metadata: string option [@default None];
(* file to upload *)
file: string option [@default None];
} [@@deriving yojson { strict = false }, show ];;

let create () : t = {
additional_metadata = None;
file = None;
(* Additional data to pass to server *)
additional_metadata : string option; [@default None]
(* file to upload *)
file : string option; [@default None]
}
[@@deriving yojson { strict = false }, show]

let create () : t = { additional_metadata = None; file = None }
Loading