move ppx tests to own folder, remove "none" as default arg value, cleanup

Author: jchavarri

Makefile

@@ -50,8 +50,6 @@ lib/rescript.exe: $(CLI_FILES)
 
 build-native: lib/refmt.exe lib/rescript.exe depend
 
-build-ppx: src/reactjs_jsx_ppx.cmx
-
 bootstrap: build-native
 	ocaml unix.cma ./scripts/bspack.ml -bs-main Res_cli -I src -o ./lib/rescript.ml
 	./lib/rescript.exe -parse ml -print ns ./lib/Rescript.ml > ./lib/Rescript2.ml
@@ -97,4 +95,4 @@ clean:
 	rm -rf lib/rescript.exe
 	rm -rf lib/test.exe
 	git clean -dfx src
-.PHONY: clean test roundtrip-test termination dce exception reanalyze bootstrap build-native build-ppx
+.PHONY: clean test roundtrip-test termination dce exception reanalyze bootstrap build-native

src/res_cli.ml

@@ -179,7 +179,7 @@ end = struct
   let origin = ref ""
   let interface = ref false
   let report = ref "pretty"
-  let ppx = ref "none"
+  let ppx = ref ""
 
   let usage = "Usage:\n  rescript <options> <file>\n\n" ^
   "Examples:\n" ^
@@ -230,11 +230,6 @@ 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;
@@ -252,8 +247,8 @@ module CliArgProcessor = struct
         end
         else
           let parsetree = match ppx with
-            | `Jsx -> Reactjs_jsx_ppx.rewrite_signature parseResult.parsetree
-            | `None -> parseResult.parsetree
+            | "jsx" -> Reactjs_jsx_ppx.rewrite_signature parseResult.parsetree
+            | _ -> parseResult.parsetree
           in
           printEngine.printInterface
             ~width ~filename ~comments:parseResult.comments parsetree
@@ -271,8 +266,8 @@ module CliArgProcessor = struct
         end
         else
           let parsetree = match ppx with
-            | `Jsx -> Reactjs_jsx_ppx.rewrite_implementation parseResult.parsetree
-            | `None -> parseResult.parsetree
+            | "jsx" -> Reactjs_jsx_ppx.rewrite_implementation parseResult.parsetree
+            | _ -> parseResult.parsetree
           in
           printEngine.printImplementation
             ~width ~filename ~comments:parseResult.comments parsetree

tests/printer/reactJsx/__snapshots__/render.spec.js.snap renamed to tests/ppx/react/__snapshots__/render.spec.js.snap

@@ -202,7 +202,7 @@ let makeReproducibleFilename = (txt) => {
   })
 };
 
-global.runPrinter = (dirname, ppx = "none") => {
+global.runPrinter = (dirname, ppx = "") => {
   fs.readdirSync(dirname).forEach((base) => {
     let filename = path.join(dirname, base);
 
@@ -225,7 +225,9 @@ Make sure the test input is syntactically valid.`;
         expect(result).toMatchSnapshot();
       }
 
-      if (process.env.ROUNDTRIP_TEST && ppx === "none") {
+      // Only run roundtrip tests in ppx-free tests.
+      // Ppxs are only applied in .res syntax, not .re, so resulting ASTs would not match
+      if (process.env.ROUNDTRIP_TEST && ppx === "") {
         let intf = isInterface(filename);
         let sexpAst = parseFileToSexp(filename);
         let result2 = parseNapkinStdinToNapkin(result, intf, 80);