Remove instances of @ns.optional from tests.

There's a dedicated syntax for that.
And, moving away from `ns.*` to a uniform `res.*`.

Author: cristianoc

jscomp/main/builtin_cmi_datasets.ml

@@ -66,7 +66,7 @@ o others/js_weakmap.cmi others/js_weakmap.cmj : cc others/js_weakmap.ml | others
 o others/js_weakset.cmi others/js_weakset.cmj : cc others/js_weakset.ml | others/belt_internals.cmi others/js.cmi $bsc
 o others/jsx.cmi others/jsx.cmj : cc others/jsx.res | others/belt_internals.cmi others/js.cmi $bsc
 o others/jsxDOM.cmi others/jsxDOM.cmj : cc others/jsxDOM.res | others/belt_internals.cmi others/js.cmi others/jsx.cmj others/jsxDOMStyle.cmj others/jsxEvent.cmj $bsc
-o others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj : cc others/jsxDOMStyle.ml | others/belt_internals.cmi others/js.cmi $bsc
+o others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj : cc others/jsxDOMStyle.res | others/belt_internals.cmi others/js.cmi $bsc
 o others/jsxEvent.cmi others/jsxEvent.cmj : cc others/jsxEvent.ml | others/belt_internals.cmi others/js.cmi $bsc
 o others/jsxPPXReactSupport.cmi others/jsxPPXReactSupport.cmj : cc others/jsxPPXReactSupport.res | others/belt_internals.cmi others/js.cmi others/jsx.cmj $bsc
 o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_promise2.cmi others/js_promise2.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsx.cmi others/jsx.cmj others/jsxDOM.cmi others/jsxDOM.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxEvent.cmi others/jsxEvent.cmj others/jsxPPXReactSupport.cmi others/jsxPPXReactSupport.cmj

jscomp/others/jsxDOMStyle.ml

@@ -1,6 +1,6 @@
 // @@config({flags: ["-bs-diagnose"] })
 
-type t0 = {x: int, @ns.optional y: int, @ns.optional yy: option<int>, z: int}
+type t0 = {x: int, y?: int, yy?: option<int>, z: int}
 
 let f1 = {x: 3, z: 2}
 
@@ -31,30 +31,30 @@ let v2: r = {x: 3, y: None, z: 2}
 
 type config = {
   x: int,
-  @ns.optional y0: int,
-  @ns.optional y1: int,
-  @ns.optional y2: int,
-  @ns.optional y3: int,
-  @ns.optional y4: int,
-  @ns.optional y5: int,
-  @ns.optional y6: int,
-  @ns.optional y7: int,
-  @ns.optional y8: int,
-  @ns.optional y9: int,
-  @ns.optional y10: int,
-  @ns.optional y11: int,
-  @ns.optional y12: int,
-  @ns.optional y13: int,
-  @ns.optional y14: int,
-  @ns.optional y15: int,
-  @ns.optional y16: int,
-  @ns.optional y17: int,
-  @ns.optional y18: int,
-  @ns.optional y19: int,
-  @ns.optional y20: int,
-  @ns.optional y21: int,
-  @ns.optional y22: int,
-  @ns.optional y23: int,
+  y0?: int,
+  y1?: int,
+  y2?: int,
+  y3?: int,
+  y4?: int,
+  y5?: int,
+  y6?: int,
+  y7?: int,
+  y8?: int,
+  y9?: int,
+  y10?: int,
+  y11?: int,
+  y12?: int,
+  y13?: int,
+  y14?: int,
+  y15?: int,
+  y16?: int,
+  y17?: int,
+  y18?: int,
+  y19?: int,
+  y20?: int,
+  y21?: int,
+  y22?: int,
+  y23?: int,
   z: int,
 }
 
@@ -64,8 +64,8 @@ let h: config = {...v, y1: 22}
 
 type small_config = {
   x: int,
-  @ns.optional y0: int,
-  @ns.optional y1: int,
+  y0?: int,
+  y1?: int,
   z: int,
 }
 
@@ -78,15 +78,15 @@ let h11 = (v1): small_config => {
 }
 
 type partiallyOptional = {
-  @ns.optional aa: int,
+  aa?: int,
   bb: option<int>,
 }
 
 let po = {aa: 3, bb: Some(4)}
 
-let _ = {...po, aa: @ns.optional None}
+let _ = {...po, aa: ?None}
 
-let setAA = (ao: option<int>) => {aa: @ns.optional ao, bb: None}
+let setAA = (ao: option<int>) => {aa: ?ao, bb: None}
 
 type inlinedOptional = V0({x0: string, x1?: string, x2?: int, x3: int}) | V1({y0: string, y1: int})
 
@@ -96,29 +96,30 @@ let ir2 = V0({x0: "v0", x1: "v1", x2: 2, x3: 3})
 let ir3 = V1({y0: "v0", y1: 1})
 
 let pm0 = switch ir0 {
-  | V0({x0, x3}) => (x0, x3)
-  | V1({y0, y1}) => (y0, y1)
+| V0({x0, x3}) => (x0, x3)
+| V1({y0, y1}) => (y0, y1)
 }
 let pm1 = switch ir1 {
-  | V0({x0, x1, x3}) => (x0, x1, x3)
-  | V0({x0, x1: ?None, x3}) => (x0, "n/a", x3)
-  | V1({y0, y1}) => (y0, "n/a", y1)
+| V0({x0, x1, x3}) => (x0, x1, x3)
+| V0({x0, x1: ?None, x3}) => (x0, "n/a", x3)
+| V1({y0, y1}) => (y0, "n/a", y1)
 }
 let pm2 = switch ir2 {
-  | V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
-  | V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
-  | V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
-  | V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
-  | V1({y0, y1}) => (y0, "n/a", 0, y1)
+| V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
+| V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
+| V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
+| V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
+| V1({y0, y1}) => (y0, "n/a", 0, y1)
 }
-let inlinedRecord = ir => switch ir {
+let inlinedRecord = ir =>
+  switch ir {
   | V0({x0, x1: ?Some("x1"), x2, x3}) => (x0, "x1", x2, x3)
   | V0({x0, x1: "xx1", x2, x3}) => (x0, "xx1", x2, x3)
   | V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
   | V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
   | V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
   | V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
   | V1({y0, y1}) => (y0, "n/a", 0, y1)
-}
+  }
 let pm3 = inlinedRecord(ir2)
 let pm4 = inlinedRecord(ir3)

jscomp/others/jsxDOMStyle.res

@@ -1,13 +1,11 @@
 @@config({
-  flags: [
-    /* "-w";
-     "@A" */
-    /* "-drawlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose"; */
-    // "-dparsetree",
-    /* "-dsource"; */
-  ],
+  flags: [/* "-w";
+   "@A" */
+  /* "-drawlambda"; */
+  /* "-dtypedtree"; */
+  /* "-bs-diagnose"; */
+  // "-dparsetree",
+  /* "-dsource"; */],
 })
 type t = {x: int, y: int}
 
@@ -23,31 +21,29 @@ let f = (window, a, b) => {
 // let h = () => {
 //   // external hi : int => int = "hi"
 //   let h = 3
-//   h 
+//   h
 
 // }
 
 type r = {
-    x: int,
-    @ns.optional y: int,
-    z : int 
+  x: int,
+  y?: int,
+  z: int,
 }
 
-let v0 = { x :  3 , z : 2 }
+let v0 = {x: 3, z: 2}
 
+let v2 = {...v0, x: 3}
 
-
-
-let v2 = { ... v0 , x : 3 }
-
-let v1 : r = { x : 3 
-  , z : 3
+let v1: r = {
+  x: 3,
+  z: 3,
 }
 
 let testMatch = v =>
   switch v {
   | {y} => y
-  | {y: @ns.optional None} => 42
+  | {y: ?None} => 42
   }
 
 let h = '😊'