add -ppx cmd line arg

Author: jchavarri

src/res_cli.ml

@@ -165,6 +165,7 @@ module ResClflags: sig
   val files: string list ref
   val interface: bool ref
   val report: string ref
+  val ppx: string ref
 
   val parse: unit -> unit
 end = struct
@@ -178,6 +179,7 @@ end = struct
   let origin = ref ""
   let interface = ref false
   let report = ref "pretty"
+  let ppx = ref "none"
 
   let usage = "Usage:\n  rescript <options> <file>\n\n" ^
   "Examples:\n" ^
@@ -192,6 +194,7 @@ end = struct
     ("-print", Arg.String (fun txt -> print := txt), "Print either binary or ns. Default: ns");
     ("-width", Arg.Int (fun w -> width := w), "Specify the line length for the printer (formatter)");
     ("-interface", Arg.Unit (fun () -> interface := true), "Parse as interface");
+    ("-ppx", Arg.String (fun txt -> ppx := txt), "Apply a specific built-in ppx before parsing, none or jsx. Default: none");
     (* ("-report", Arg.String (fun txt -> report := txt), "Stylize errors and messages using color and context. Accepts `Pretty` and `Plain`. Default `Plain`") *)
   ]
 
@@ -201,18 +204,17 @@ end
 module CliArgProcessor = struct
   type backend = Parser: ('diagnostics) Res_driver.parsingEngine -> backend [@@unboxed]
 
-  let processFile ~isInterface ~width ~recover ~origin ~target ~report:_ filename =
+  let processFile ~isInterface ~width ~recover ~origin ~target ~report:_ ~ppx filename =
     try
       let len = String.length filename in
       let processInterface =
         isInterface || len > 0 && (String.get [@doesNotRaise]) filename (len - 1) = 'i'
       in
-      let parsingEngine, react =
+      let parsingEngine =
           match origin with
-          | "reasonBinary" -> Parser Res_driver_reason_binary.parsingEngine, false
-          | "ml" | "ocaml" -> Parser Res_driver_ml_parser.parsingEngine, false
-          | "reactJsx" -> Parser Res_driver.parsingEngine, true
-          | _ -> Parser Res_driver.parsingEngine, false
+          | "reasonBinary" -> Parser Res_driver_reason_binary.parsingEngine
+          | "ml" | "ocaml" -> Parser Res_driver_ml_parser.parsingEngine
+          | _ -> Parser Res_driver.parsingEngine
       in
       let printEngine =
         match target with
@@ -228,6 +230,11 @@ module CliArgProcessor = struct
       | _ -> false
       in
 
+      let ppx = match ppx with
+      | "jsx" -> `Jsx
+      | _ -> `None
+      in
+
       let Parser backend = parsingEngine in
       (* This is the whole purpose of the Color module above *)
       Color.setup None;
@@ -244,8 +251,9 @@ module CliArgProcessor = struct
           else exit 1
         end
         else
-          let parsetree =
-            if react then Reactjs_jsx_ppx.rewrite_signature parseResult.parsetree else parseResult.parsetree
+          let parsetree = match ppx with
+            | `Jsx -> Reactjs_jsx_ppx.rewrite_signature parseResult.parsetree
+            | `None -> parseResult.parsetree
           in
           printEngine.printInterface
             ~width ~filename ~comments:parseResult.comments parsetree
@@ -262,8 +270,9 @@ module CliArgProcessor = struct
           else exit 1
         end
         else
-          let parsetree =
-            if react then Reactjs_jsx_ppx.rewrite_implementation parseResult.parsetree else parseResult.parsetree
+          let parsetree = match ppx with
+            | `Jsx -> Reactjs_jsx_ppx.rewrite_implementation parseResult.parsetree
+            | `None -> parseResult.parsetree
           in
           printEngine.printImplementation
             ~width ~filename ~comments:parseResult.comments parsetree
@@ -289,6 +298,7 @@ let [@raises Invalid_argument, exit] () =
         ~target:!ResClflags.print
         ~origin:!ResClflags.origin
         ~report:!ResClflags.report
+        ~ppx:!ResClflags.ppx
         ""
     | files ->
       List.iter (fun filename ->
@@ -299,6 +309,7 @@ let [@raises Invalid_argument, exit] () =
           ~target:!ResClflags.print
           ~origin:!ResClflags.origin
           ~report:!ResClflags.report
+          ~ppx:!ResClflags.ppx
           filename
         ) files
 end

tests/printer/reactJsx/render.spec.js

@@ -1 +1 @@
-runPrinter(__dirname, false, false)
+runPrinter(__dirname, "jsx")

tests/runner.js

@@ -29,12 +29,6 @@ function classifyLang(filename) {
       return "ocaml";
     }
   }
-  if (filename.length > 10) {
-    let suffix = filename.substring(filename.length - 10);
-    if (suffix === ".react.res" || suffix === "react.resi") {
-      return "reactJsx";
-    }
-  }
   return "rescript";
 }
 
@@ -93,10 +87,10 @@ function parseReasonFileToSexp(filename) {
     .stdout.toString();
 }
 
-function parseNapkinFileToSexp(filename, reactJsx) {
+function parseNapkinFileToSexp(filename) {
   let { stdout } = cp.spawnSync(parser, [
     "-parse",
-    reactJsx ? "reactJsx" : "res",
+    "res",
     "-print",
     "sexp",
     filename,
@@ -114,11 +108,8 @@ function parseFileToSexp(filename) {
     case "ocaml":
       return parseOcamlFileToSexp(filename);
 
-    case "reactJsx":
-      return parseNapkinFileToSexp(filename, true);
-
     default:
-      return parseNapkinFileToSexp(filename, false);
+      return parseNapkinFileToSexp(filename);
   }
 }
 
@@ -160,7 +151,7 @@ function parseNapkinStdinToNapkin(src, isInterface, width = 100) {
     .stdout.toString("utf8");
 }
 
-function printFile(filename) {
+function printFile(filename, ppx) {
   let parserSrc;
   switch (classifyLang(filename)) {
     case "ocaml":
@@ -174,20 +165,15 @@ function printFile(filename) {
         status: 0,
         errorOutput: ""
       };
-      break;
-
-    case "reactJsx":
-      parserSrc = "reactJsx";
-      break;
-
+    
     case "rescript":
     default:
       parserSrc = "res";
       break;
   }
 
   let intf = isInterface(filename);
-  let args = ["-parse", parserSrc, "-print", "res", "-width", "80"];
+  let args = ["-parse", parserSrc, "-print", "res", "-width", "80", "-ppx", ppx];
 
   if (intf) {
     args.push("-interface");
@@ -216,7 +202,7 @@ let makeReproducibleFilename = (txt) => {
   })
 };
 
-global.runPrinter = (dirname) => {
+global.runPrinter = (dirname, ppx = "none") => {
   fs.readdirSync(dirname).forEach((base) => {
     let filename = path.join(dirname, base);
 
@@ -232,7 +218,7 @@ global.runPrinter = (dirname) => {
     }
 
     test(base, () => {
-      let {result, errorOutput, status} = printFile(filename);
+      let {result, errorOutput, status} = printFile(filename, ppx);
       if (status > 0) {
         let msg = `Test from file: ${filename} failed with error output: