Rename @ns.optional to @res.optional

Author: cristianoc

jscomp/main/builtin_cmi_datasets.ml

@@ -113,7 +113,7 @@ let constructor_descrs ty_path decl cstrs =
       if cd_args = Cstr_tuple [] then incr num_consts else incr num_nonconsts;
       if cd_res = None then incr num_normal)
     cstrs;
-  let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+  let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
   let rec describe_constructors idx_const idx_nonconst = function
       [] -> []
     | {cd_id; cd_args; cd_res; cd_loc; cd_attributes} :: rem ->

jscomp/ml/datarepr.ml

@@ -926,7 +926,7 @@ and tree_of_constructor cd =
       (name, args, Some ret)
 
 and tree_of_label l =
-  let opt = l.ld_attributes |> List.exists (fun ({txt}, _) -> txt = "ns.optional") in
+  let opt = l.ld_attributes |> List.exists (fun ({txt}, _) -> txt = "res.optional") in
   let typ = match l.ld_type.desc with
     | Tconstr (p, [t1], _) when opt && Path.same p Predef.path_option -> t1
     | _ -> l.ld_type in

jscomp/ml/printtyp.ml

@@ -322,7 +322,7 @@ let check_optional_attr env ld attrs loc =
       raise (Error (loc, env, Field_not_optional (ld.lbl_name, ld.lbl_res)));
     true in 
   Ext_list.exists attrs (fun ({txt}, _) ->
-    txt = "ns.optional" && check_redundant ())
+    txt = "res.optional" && check_redundant ())
 
 (* unification inside type_pat*)
 let unify_pat_types loc env ty ty' =

jscomp/ml/typecore.ml

@@ -358,7 +358,7 @@ let transl_declaration env sdecl id =
           | (_,_,loc)::_ ->
               Location.prerr_warning loc Warnings.Constraint_on_gadt
         end;
-        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
         let scstrs =
           Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
             match pcd_args with
@@ -409,7 +409,7 @@ let transl_declaration env sdecl id =
         let tcstrs, cstrs = List.split (List.map make_cstr scstrs) in
           Ttype_variant tcstrs, Type_variant cstrs
       | Ptype_record lbls ->
-          let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+          let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
           let optionalLabels =
               Ext_list.filter_map lbls
               (fun lbl -> if has_optional lbl.pld_attributes then Some lbl.pld_name.txt else None) in

jscomp/ml/typedecl.ml

@@ -43418,7 +43418,7 @@ let constructor_descrs ty_path decl cstrs =
       if cd_args = Cstr_tuple [] then incr num_consts else incr num_nonconsts;
       if cd_res = None then incr num_normal)
     cstrs;
-  let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+  let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
   let rec describe_constructors idx_const idx_nonconst = function
       [] -> []
     | {cd_id; cd_args; cd_res; cd_loc; cd_attributes} :: rem ->

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -27,7 +27,7 @@ let getLabel str =
   | Optional str | Labelled str -> str
   | Nolabel -> ""
 
-let optionalAttr = ({txt = "ns.optional"; loc = Location.none}, PStr [])
+let optionalAttr = ({txt = "res.optional"; loc = Location.none}, PStr [])
 let optionalAttrs = [optionalAttr]
 
 let constantString ~loc str =

lib/4.06.1/unstable/js_compiler.ml

@@ -926,7 +926,7 @@ and tree_of_constructor cd =
       (name, args, Some ret)
 
 and tree_of_label l =
-  let opt = l.ld_attributes |> List.exists (fun ({txt}, _) -> txt = "ns.optional") in
+  let opt = l.ld_attributes |> List.exists (fun ({txt}, _) -> txt = "res.optional") in
   let typ = match l.ld_type.desc with
     | Tconstr (p, [t1], _) when opt && Path.same p Predef.path_option -> t1
     | _ -> l.ld_type in

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -151,7 +151,7 @@ let jsxAttr = (Location.mknoloc "JSX", Parsetree.PStr [])
 let uncurriedAppAttr = (Location.mknoloc "res.uapp", Parsetree.PStr [])
 let ternaryAttr = (Location.mknoloc "ns.ternary", Parsetree.PStr [])
 let ifLetAttr = (Location.mknoloc "ns.iflet", Parsetree.PStr [])
-let optionalAttr = (Location.mknoloc "ns.optional", Parsetree.PStr [])
+let optionalAttr = (Location.mknoloc "res.optional", Parsetree.PStr [])
 let makeAwaitAttr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
 let makeAsyncAttr loc = (Location.mkloc "res.async" loc, Parsetree.PStr [])
 

lib/4.06.1/whole_compiler.ml

@@ -209,7 +209,7 @@ let filterParsingAttrs attrs =
       | ( {
             Location.txt =
               ( "bs" | "res.uapp" | "ns.braces" | "ns.iflet" | "ns.namedArgLoc"
-              | "ns.optional" | "ns.ternary" | "res.async" | "res.await"
+              | "res.optional" | "ns.ternary" | "res.async" | "res.await"
               | "res.template" );
           },
           _ ) ->
@@ -348,7 +348,7 @@ let isIfLetExpr expr =
 let rec hasOptionalAttribute attrs =
   match attrs with
   | [] -> false
-  | ({Location.txt = "ns.optional"}, _) :: _ -> true
+  | ({Location.txt = "res.optional"}, _) :: _ -> true
   | _ :: attrs -> hasOptionalAttribute attrs
 
 let hasAttributes attrs =

res_syntax/cli/reactjs_jsx_v4.ml

@@ -360,4 +360,4 @@ type call = CleanStart
 
 let f = (~a=1, ()) => 1
 
-type opt = {x:int, @ns.optional y: option<string>}
+type opt = {x:int, y?: option<string>}

res_syntax/compiler-libs-406/printtyp.ml

@@ -14,32 +14,32 @@ let r = { (make () : myRecord) with foo = bar }
 let r = { (make () : myRecord) with foo = bar }
 let r =
   {
-    x = ((None)[@ns.optional ]);
-    y = ((None)[@ns.optional ]);
-    z = (((None : tt))[@ns.optional ])
+    x = ((None)[@res.optional ]);
+    y = ((None)[@res.optional ]);
+    z = (((None : tt))[@res.optional ])
   }
-let z name = { name = ((name)[@ns.optional ]); x = 3 }
-let z name = { name = ((name)[@ns.optional ]); x = 3 }
-let z name = { name; x = ((x)[@ns.optional ]) }
-let zz name = { name; x = ((x)[@ns.optional ]) }
+let z name = { name = ((name)[@res.optional ]); x = 3 }
+let z name = { name = ((name)[@res.optional ]); x = 3 }
+let z name = { name; x = ((x)[@res.optional ]) }
+let zz name = { name; x = ((x)[@res.optional ]) }
 let _ =
   match z with
-  | { x = ((None)[@ns.optional ]); y = ((None)[@ns.optional ]);
-      z = (((None : tt))[@ns.optional ]) } -> 11
-  | { name = ((name)[@ns.optional ]); x = 3 } -> 42
-  | { name = ((name)[@ns.optional ]); x = 3 } -> 4242
-  | { x = ((None)[@ns.optional ]); y = ((None)[@ns.optional ]);
-      z = (((None : tt))[@ns.optional ]) } -> 11
-  | { name = ((name)[@ns.optional ]); x = 3 } -> 42
-  | { name = ((name)[@ns.optional ]); x = 3 } -> 4242
+  | { x = ((None)[@res.optional ]); y = ((None)[@res.optional ]);
+      z = (((None : tt))[@res.optional ]) } -> 11
+  | { name = ((name)[@res.optional ]); x = 3 } -> 42
+  | { name = ((name)[@res.optional ]); x = 3 } -> 4242
+  | { x = ((None)[@res.optional ]); y = ((None)[@res.optional ]);
+      z = (((None : tt))[@res.optional ]) } -> 11
+  | { name = ((name)[@res.optional ]); x = 3 } -> 42
+  | { name = ((name)[@res.optional ]); x = 3 } -> 4242
 type nonrec tt = {
   x: int ;
   y: string [@ns.opttinal ]}
 type nonrec ttt = {
   x: int ;
-  y: string [@ns.optional ]}
+  y: string [@res.optional ]}
 type nonrec multipleWithAttrs = {
   x: int ;
-  y: string [@ns.optional ][@attr ]}
+  y: string [@res.optional ][@attr ]}
 type nonrec singleWithAttrs = {
-  y: string [@ns.optional ][@attr ]}
+  y: string [@res.optional ][@attr ]}

res_syntax/src/res_core.ml

@@ -83,7 +83,7 @@ let _ = switch z {
   | {? name, x: 3} => 4242
 }
 
-type tt = {x:int, @ns.optional y: string}
+type tt = {x:int, @res.optional y: string}
 
 type ttt = {x:int, y?: string}