support inline records in external definitions

zth · zth · commit 7e75974e9aa0 · 2026-03-18T11:20:38.000+01:00
diff --git a/compiler/syntax/src/res_core.ml b/compiler/syntax/src/res_core.ml
diff --git a/compiler/syntax/src/res_printer.ml b/compiler/syntax/src/res_printer.ml
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/expected/externalInlineRecord.res.txt b/tests/syntax_tests/data/parsing/grammar/structure/expected/externalInlineRecord.res.txt
@@ -0,0 +1,11 @@
+type f1.a = {
+  x: int }[@@res.inlineRecordDefinition ]
+external f1 : a:f1.a -> unit (a:1) = "f1"
+type f2.return.type = {
+  id: string }[@@res.inlineRecordDefinition ]
+external f2 : int -> f2.return.type (a:1) = "f2"
+type f3.return.type = {
+  b: int }[@@res.inlineRecordDefinition ]
+and f3.returnType = {
+  a: int }[@@res.inlineRecordDefinition ]
+external f3 : returnType:f3.returnType -> f3.return.type (a:1) = "f3"
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/expected/externalInlineRecordAnonymous.res.txt b/tests/syntax_tests/data/parsing/grammar/structure/expected/externalInlineRecordAnonymous.res.txt
@@ -0,0 +1,18 @@
+type f1.arg0 = {
+  x: int }[@@res.inlineRecordDefinition ]
+external f1 : f1.arg0 -> unit (a:1) = "f1"
+type f2.arg0 = {
+  x: int }[@@res.inlineRecordDefinition ]
+external f2 : f2.arg0 -> string -> unit (a:2) = "f2"
+type f3.return.type = {
+  done: bool }[@@res.inlineRecordDefinition ]
+and f3.arg1 = {
+  y: string }[@@res.inlineRecordDefinition ]
+and f3.arg0 = {
+  x: int }[@@res.inlineRecordDefinition ]
+external f3 : f3.arg0 option -> f3.arg1 -> f3.return.type option (a:2) = "f3"
+type f4.arg1 = {
+  y: string }[@@res.inlineRecordDefinition ]
+and f4.named = {
+  x: int }[@@res.inlineRecordDefinition ]
+external f4 : named:f4.named -> f4.arg1 -> unit (a:2) = "f4"
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/expected/externalInlineRecordCollision.res.txt b/tests/syntax_tests/data/parsing/grammar/structure/expected/externalInlineRecordCollision.res.txt
@@ -0,0 +1,4 @@
+type nonrec f = string
+type f.arg0 = {
+  z: int }[@@res.inlineRecordDefinition ]
+external f : f.arg0 -> unit (a:1) = "f"
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/expected/inlineRecordCollision.res.txt b/tests/syntax_tests/data/parsing/grammar/structure/expected/inlineRecordCollision.res.txt
@@ -0,0 +1,5 @@
+type nonrec foo = string
+type t.foo = {
+  x: int }[@@res.inlineRecordDefinition ]
+and t = {
+  foo: t.foo }
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/externalInlineRecord.res b/tests/syntax_tests/data/parsing/grammar/structure/externalInlineRecord.res
@@ -0,0 +1,4 @@
+external f1: (~a: {x: int}) => unit = "f1"
+external f2: int => {id: string} = "f2"
+
+external f3: (~returnType: {a:int}) => {b:int} = "f3"
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/externalInlineRecordAnonymous.res b/tests/syntax_tests/data/parsing/grammar/structure/externalInlineRecordAnonymous.res
@@ -0,0 +1,4 @@
+external f1: {x: int} => unit = "f1"
+external f2: ({x: int}, string) => unit = "f2"
+external f3: (option<{x: int}>, {y: string}) => option<{done: bool}> = "f3"
+external f4: (~named: {x: int}, {y: string}) => unit = "f4"
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/externalInlineRecordCollision.res b/tests/syntax_tests/data/parsing/grammar/structure/externalInlineRecordCollision.res
@@ -0,0 +1,2 @@
+type f = string
+external f: {z: int} => unit = "f"
diff --git a/tests/syntax_tests/data/parsing/grammar/structure/inlineRecordCollision.res b/tests/syntax_tests/data/parsing/grammar/structure/inlineRecordCollision.res
@@ -0,0 +1,2 @@
+type foo = string
+type t = {foo: {x: int}}
diff --git a/tests/syntax_tests/data/printer/signature/expected/externalInlineRecord.resi.txt b/tests/syntax_tests/data/printer/signature/expected/externalInlineRecord.resi.txt
@@ -0,0 +1,11 @@
+@module("node:fs")
+external readFileSync: (
+  string,
+  ~options: {
+    encoding?: [#utf8 | #ascii | #base64],
+    flag?: string,
+    misc?: {
+      mode?: int,
+    },
+  },
+) => option<{filename: string, size: string}> = "fs.readFileSync"
diff --git a/tests/syntax_tests/data/printer/signature/expected/externalInlineRecordAnonymous.resi.txt b/tests/syntax_tests/data/printer/signature/expected/externalInlineRecordAnonymous.resi.txt
@@ -0,0 +1,4 @@
+external f1: {x: int} => unit = "f1"
+external f2: ({x: int}, string) => unit = "f2"
+external f3: (option<{x: int}>, {y: string}) => option<{done: bool}> = "f3"
+external f4: (~named: {x: int}, {y: string}) => unit = "f4"
diff --git a/tests/syntax_tests/data/printer/signature/expected/externalInlineRecordBareArrow.resi.txt b/tests/syntax_tests/data/printer/signature/expected/externalInlineRecordBareArrow.resi.txt
@@ -0,0 +1 @@
+external getMeta: int => {id: string} = "getMeta"
diff --git a/tests/syntax_tests/data/printer/signature/expected/externalObjectSpread.resi.txt b/tests/syntax_tests/data/printer/signature/expected/externalObjectSpread.resi.txt
@@ -0,0 +1,3 @@
+type user = {"name": string}
+@val
+external steve: {...user, "age": int} = "steve"
diff --git a/tests/syntax_tests/data/printer/signature/externalInlineRecord.resi b/tests/syntax_tests/data/printer/signature/externalInlineRecord.resi
@@ -0,0 +1,9 @@
+@module("node:fs")
+external readFileSync: (string, ~options: {
+    encoding?: [#utf8 | #ascii | #base64],
+    flag?: string,
+    misc?: {
+      mode?: int
+    }
+}) => option<{filename: string, size: string}> = "fs.readFileSync"
+
diff --git a/tests/syntax_tests/data/printer/signature/externalInlineRecordAnonymous.resi b/tests/syntax_tests/data/printer/signature/externalInlineRecordAnonymous.resi
@@ -0,0 +1,4 @@
+external f1: {x: int} => unit = "f1"
+external f2: ({x: int}, string) => unit = "f2"
+external f3: (option<{x: int}>, {y: string}) => option<{done: bool}> = "f3"
+external f4: (~named: {x: int}, {y: string}) => unit = "f4"
diff --git a/tests/syntax_tests/data/printer/signature/externalInlineRecordBareArrow.resi b/tests/syntax_tests/data/printer/signature/externalInlineRecordBareArrow.resi
@@ -0,0 +1,2 @@
+external getMeta: int => {id: string} = "getMeta"
+
diff --git a/tests/syntax_tests/data/printer/signature/externalObjectSpread.resi b/tests/syntax_tests/data/printer/signature/externalObjectSpread.resi
@@ -0,0 +1,4 @@
+type user = {"name": string}
+@val
+external steve: {...user, "age": int} = "steve"
+
diff --git a/tests/syntax_tests/data/printer/structure/expected/externalInlineRecord.res.txt b/tests/syntax_tests/data/printer/structure/expected/externalInlineRecord.res.txt
@@ -0,0 +1,11 @@
+@module("node:fs")
+external readFileSync: (
+  string,
+  ~options: {
+    encoding?: [#utf8 | #ascii | #base64],
+    flag?: string,
+    misc?: {
+      mode?: int,
+    },
+  },
+) => option<{filename: string, size: string}> = "fs.readFileSync"
diff --git a/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordAll.res.txt b/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordAll.res.txt
@@ -0,0 +1,23 @@
+@module("m1")
+external f1: (~a: {x: int}, ~b: {y: string}) => unit = "f1"
+
+@module("m2")
+external f2: (~opt: {z: int}=?) => unit = "f2"
+
+@module("m3")
+external f3: (
+  ~options: {
+    misc?: {
+      details: {
+        n: int,
+      },
+    },
+  },
+) => unit = "f3"
+
+@module("m4")
+external f4: int => {id2: string} = "f4"
+
+// Non-arrow external should not derive inline records
+@val
+external s1: {...user, "age": int} = "s1"
diff --git a/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordAnonymous.res.txt b/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordAnonymous.res.txt
@@ -0,0 +1,7 @@
+external f1: {x: int} => unit = "f1"
+external f2: ({x: int}, string) => unit = "f2"
+external f3: (option<{x: int}>, {y: string}) => option<{done: bool}> = "f3"
+external f4: (~named: {x: int}, {y: string}) => unit = "f4"
+
+type f = string
+external f: {z: int} => unit = "f"
diff --git a/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordBareArrow.res.txt b/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordBareArrow.res.txt
@@ -0,0 +1 @@
+external getMeta: int => {id: string} = "getMeta"
diff --git a/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordComments.res.txt b/tests/syntax_tests/data/printer/structure/expected/externalInlineRecordComments.res.txt
@@ -0,0 +1,3 @@
+// preserved
+@module("m")
+external read: (~options: {flag?: string}) => unit = "read"
diff --git a/tests/syntax_tests/data/printer/structure/expected/externalObjectSpread.res.txt b/tests/syntax_tests/data/printer/structure/expected/externalObjectSpread.res.txt
@@ -0,0 +1,3 @@
+type user = {"name": string}
+@val
+external steve: {...user, "age": int} = "steve"
diff --git a/tests/syntax_tests/data/printer/structure/externalInlineRecord.res b/tests/syntax_tests/data/printer/structure/externalInlineRecord.res
@@ -0,0 +1,9 @@
+@module("node:fs")
+external readFileSync: (string, ~options: {
+    encoding?: [#utf8 | #ascii | #base64],
+    flag?: string,
+    misc?: {
+      mode?: int
+    }
+}) => option<{filename: string, size: string}> = "fs.readFileSync"
+
diff --git a/tests/syntax_tests/data/printer/structure/externalInlineRecordAll.res b/tests/syntax_tests/data/printer/structure/externalInlineRecordAll.res
@@ -0,0 +1,21 @@
+@module("m1")
+external f1: (~a: {x: int}, ~b: {y: string}) => unit = "f1"
+
+@module("m2")
+external f2: (~opt: {z: int}=?) => unit = "f2"
+
+@module("m3")
+external f3: (~options: {
+  misc?: {
+    details: {
+      n: int
+    }
+  }
+}) => unit = "f3"
+
+@module("m4")
+external f4: int => {id2: string} = "f4"
+
+// Non-arrow external should not derive inline records
+@val
+external s1: {...user, "age": int} = "s1"
diff --git a/tests/syntax_tests/data/printer/structure/externalInlineRecordAnonymous.res b/tests/syntax_tests/data/printer/structure/externalInlineRecordAnonymous.res
@@ -0,0 +1,7 @@
+external f1: {x: int} => unit = "f1"
+external f2: ({x: int}, string) => unit = "f2"
+external f3: (option<{x: int}>, {y: string}) => option<{done: bool}> = "f3"
+external f4: (~named: {x: int}, {y: string}) => unit = "f4"
+
+type f = string
+external f: {z: int} => unit = "f"
diff --git a/tests/syntax_tests/data/printer/structure/externalInlineRecordBareArrow.res b/tests/syntax_tests/data/printer/structure/externalInlineRecordBareArrow.res
@@ -0,0 +1 @@
+external getMeta: int => {id: string} = "getMeta"
diff --git a/tests/syntax_tests/data/printer/structure/externalInlineRecordComments.res b/tests/syntax_tests/data/printer/structure/externalInlineRecordComments.res
@@ -0,0 +1,3 @@
+// preserved
+@module("m")
+external read: (~options: {flag?: string}) => unit = "read"
diff --git a/tests/syntax_tests/data/printer/structure/externalObjectSpread.res b/tests/syntax_tests/data/printer/structure/externalObjectSpread.res
@@ -0,0 +1,4 @@
+type user = {"name": string}
+@val
+external steve: {...user, "age": int} = "steve"
+
diff --git a/tests/syntax_tests/data/printer/typeDef/expected/inlineRecordCollision.res.txt b/tests/syntax_tests/data/printer/typeDef/expected/inlineRecordCollision.res.txt
@@ -0,0 +1,2 @@
+type foo = string
+type t = {foo: {x: int}}
diff --git a/tests/syntax_tests/data/printer/typeDef/inlineRecordCollision.res b/tests/syntax_tests/data/printer/typeDef/inlineRecordCollision.res
@@ -0,0 +1,2 @@
+type foo = string
+type t = {foo: {x: int}}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+type f = string`
	`2`	`+external f: {z: int} => unit = "f"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+type foo = string`
	`2`	`+type t = {foo: {x: int}}`