Rename block-type label to type

Signed-off-by: Nathan Rebours <[email protected]>

Author: NathanReb

lib/label.ml

@@ -106,7 +106,7 @@ let pp ppf = function
       Fmt.pf ppf "version%a%a" Relation.pp op Ocaml_version.pp v
   | Set (v, x) -> Fmt.pf ppf "set-%s=%s" v x
   | Unset x -> Fmt.pf ppf "unset-%s" x
-  | Block_type bt -> Fmt.pf ppf "block-type=%a" pp_block_type bt
+  | Block_type bt -> Fmt.pf ppf "type=%a" pp_block_type bt
 
 let is_prefix ~prefix s =
   let len_prefix = String.length prefix in
@@ -193,9 +193,9 @@ let interpret label value =
   | "file" -> requires_eq_value ~label ~value (fun x -> Ok (File x))
   | "part" -> requires_eq_value ~label ~value (fun x -> Ok (Part x))
   | "env" -> requires_eq_value ~label ~value (fun x -> Ok (Env x))
-  | "block-type" ->
-      requires_eq_value ~label ~value (fun x ->
-          parse_block_type_value ~label x >>= fun bt -> Ok (Block_type bt))
+  | "type" ->
+      requires_eq_value ~label ~value
+        (fun x -> parse_block_type_value ~label x >>= fun bt -> Ok (Block_type bt))
   | l when is_prefix ~prefix:"set-" l ->
       requires_eq_value ~label ~value (fun x ->
           Ok (Set (split_prefix ~prefix:"set-" l, x)))

test/bin/mdx-test/expect/block-type/test-case.md

@@ -5,15 +5,18 @@ inference which can sometime lead to troublesome error messages.
 The following blocks use a volontarily misleading language header that would
 normally lead to errors if we let MDX infer the type of block based on them.
 
-```sh block-type=toplevel
+<!-- $MDX type=toplevel -->
+```sh
 # 1 + 1;;
 ```
 
-```sh block-type=ocaml
+<!-- $MDX type=ocaml -->
+```sh
 let x = 2
 ```
 
-```ocaml block-type=cram
+<!-- $MDX type=cram -->
+```ocaml
 $ echo "boom"
 ```
 

test/bin/mdx-test/expect/block-type/test-case.md.expected

@@ -5,16 +5,19 @@ inference which can sometime lead to troublesome error messages.
 The following blocks use a volontarily misleading language header that would
 normally lead to errors if we let MDX infer the type of block based on them.
 
-```ocaml block-type=toplevel
+<!-- $MDX type=toplevel -->
+```ocaml
 # 1 + 1;;
 - : int = 2
 ```
 
-```ocaml block-type=ocaml
+<!-- $MDX type=ocaml -->
+```ocaml
 let x = 2
 ```
 
-```sh block-type=cram
+<!-- $MDX type=cram -->
+```sh
 $ echo "boom"
 boom
 ```

test/bin/mdx-test/failure/block-type-value/test-case.md

@@ -3,10 +3,12 @@ is misused.
 
 It requires a value
 
-```ocaml block-type
+<!-- $MDX type -->
+```ocaml
 ```
 
 It only accept a fixed set of values
 
-```ocaml block-type=invalid
+<!-- $MDX type=invalid -->
+```ocaml
 ```

test/bin/mdx-test/failure/block-type-value/test-case.md.expected

@@ -1,2 +1,2 @@
-[mdx] Fatal error: File "test-case.md", lines 6-7: invalid code block: Label `block-type` requires a value.
-[mdx] Fatal error: File "test-case.md", lines 11-12: invalid code block: "invalid" is not a valid value for label `block-type`. Valid values are "ocaml", "cram", "toplevel" and "include".
+[mdx] Fatal error: File "test-case.md", lines 6-8: invalid code block: Label `type` requires a value.
+[mdx] Fatal error: File "test-case.md", lines 12-14: invalid code block: "invalid" is not a valid value for label `type`. Valid values are "ocaml", "cram", "toplevel" and "include".

test/bin/mdx-test/failure/include-without-file-label/test-case.md

@@ -1,5 +1,6 @@
 Explicitly setting the block-type to include has little benefits except
 for warning you that the `file=...` label is mandatory.
 
-```ocaml block-type=include
+<!-- $MDX type=include -->
+```ocaml
 ```

test/bin/mdx-test/failure/include-without-file-label/test-case.md.expected

@@ -1 +1 @@
-[mdx] Fatal error: File "test-case.md", lines 4-5: invalid code block: `file` label is required for include blocks.
+[mdx] Fatal error: File "test-case.md", lines 4-6: invalid code block: `file` label is required for include blocks.