Format & review fixes

Author: fhammerschmidt

compiler/core/js_source_map.ml

@@ -130,7 +130,7 @@ let make ~source_contents ~generated_file ~source_root ~sources_content =
 let load_content builder filename =
   match Hashtbl.find_opt builder.provided_source_contents filename with
   | Some content -> Some content
-  | None -> (try Some (Ext_io.load_file filename) with _ -> None)
+  | None -> ( try Some (Ext_io.load_file filename) with _ -> None)
 
 let add_source builder filename =
   let filename =

compiler/jsoo/jsoo_playground_main.ml

@@ -539,6 +539,7 @@ module Compile = struct
           platform_lib = "rescript";
           project_root;
           bsb_project_root = project_root;
+          suffix = Literals.suffix_js;
         }
       in
       let source_file = sourcefile in
@@ -557,7 +558,7 @@ module Compile = struct
         |> Emit_js.emit_translation_as_string ~config ~file_name
              ~output_file_relative ~resolver
              ~input_cmt_translate_type_declarations:
-                Gentype_main.input_cmt_translate_type_declarations
+               Gentype_main.input_cmt_translate_type_declarations
       in
       Emit_type.file_header ~source_file:(Filename.basename source_file)
       ^ "\n" ^ code_text ^ "\n"
@@ -576,13 +577,15 @@ module Compile = struct
       | Js_config.No_source_map -> None
       | Linked | Inline | Hidden ->
         Some
-          (Js_source_map.make ~source_contents:[(filename, source)] ~generated_file
-             ~source_root:source_map_root
+          (Js_source_map.make
+             ~source_contents:[(filename, source)]
+             ~generated_file ~source_root:source_map_root
              ~sources_content:source_map_sources_content)
     in
     let print_javascript () =
       Js_dump_program.pp_deps_program ~output_prefix:"" module_system
-        lambda_output (Ext_pp.from_buffer buffer)
+        lambda_output
+        (Ext_pp.from_buffer buffer)
     in
     (match source_map_builder with
     | None -> print_javascript ()
@@ -891,59 +894,56 @@ module Export = struct
           ( "setJsxPreserveMode",
             inject
             @@ Js.wrap_meth_callback (fun _ value ->
-                   Js.bool (set_jsx_preserve_mode (Js.to_bool value))) );
+                Js.bool (set_jsx_preserve_mode (Js.to_bool value))) );
           ( "setGentypeEnabled",
             inject
             @@ Js.wrap_meth_callback (fun _ value ->
-                   Js.bool (set_gentype_enabled (Js.to_bool value))) );
+                Js.bool (set_gentype_enabled (Js.to_bool value))) );
           ( "setSourceMapMode",
             inject
             @@ Js.wrap_meth_callback (fun _ value ->
-                   Js.bool (set_source_map_mode (Js.to_string value))) );
+                Js.bool (set_source_map_mode (Js.to_string value))) );
           ( "setSourceMapSourcesContent",
             inject
             @@ Js.wrap_meth_callback (fun _ value ->
-                   Js.bool
-                     (set_source_map_sources_content (Js.to_bool value))) );
+                Js.bool (set_source_map_sources_content (Js.to_bool value))) );
           ( "setSourceMapRoot",
             inject
             @@ Js.wrap_meth_callback (fun _ value ->
-                   Js.bool (set_source_map_root (Js.to_string value))) );
+                Js.bool (set_source_map_root (Js.to_string value))) );
           ( "getConfig",
             inject
             @@ Js.wrap_meth_callback (fun _ ->
-                   Js.Unsafe.(
-                     obj
-                       [|
-                         ( "module_system",
-                           inject
-                           @@ (config.module_system
-                             |> Bundle_config.string_of_module_system
-                             |> Js.string) );
-                         ("warn_flags", inject @@ Js.string config.warn_flags);
-                         ( "jsx_preserve_mode",
-                           inject @@ (config.jsx_preserve_mode |> Js.bool) );
-                         ( "gentype_enabled",
-                           inject @@ (config.gentype_enabled |> Js.bool) );
-                         ( "source_map_mode",
-                           inject
-                           @@ (config.source_map_mode
-                             |> Bundle_config.string_of_source_map |> Js.string)
-                         );
-                         ( "source_map_sources_content",
-                           inject
-                           @@ (config.source_map_sources_content |> Js.bool) );
-                         ( "source_map_root",
-                           inject @@ Js.string config.source_map_root );
-                         ( "experimental_features",
-                           inject
-                           @@ (config.experimental_features |> Array.of_list
-                             |> Js.array) );
-                         ( "open_modules",
-                           inject
-                           @@ (config.open_modules |> Array.of_list |> Js.array)
-                         );
-                       |])) );
+                Js.Unsafe.(
+                  obj
+                    [|
+                      ( "module_system",
+                        inject
+                        @@ (config.module_system
+                          |> Bundle_config.string_of_module_system |> Js.string
+                           ) );
+                      ("warn_flags", inject @@ Js.string config.warn_flags);
+                      ( "jsx_preserve_mode",
+                        inject @@ (config.jsx_preserve_mode |> Js.bool) );
+                      ( "gentype_enabled",
+                        inject @@ (config.gentype_enabled |> Js.bool) );
+                      ( "source_map_mode",
+                        inject
+                        @@ (config.source_map_mode
+                          |> Bundle_config.string_of_source_map |> Js.string) );
+                      ( "source_map_sources_content",
+                        inject @@ (config.source_map_sources_content |> Js.bool)
+                      );
+                      ( "source_map_root",
+                        inject @@ Js.string config.source_map_root );
+                      ( "experimental_features",
+                        inject
+                        @@ (config.experimental_features |> Array.of_list
+                          |> Js.array) );
+                      ( "open_modules",
+                        inject
+                        @@ (config.open_modules |> Array.of_list |> Js.array) );
+                    |])) );
         |])
 end
 

packages/dev-playground/src/Bindings.res

@@ -169,8 +169,7 @@ module Element = {
   @send external removeChild: (Dom.element, Dom.element) => unit = "removeChild"
   @send external focus: Dom.element => unit = "focus"
   @send
-  external scrollIntoView: (Dom.element, scrollIntoViewOptions) => unit =
-    "scrollIntoView"
+  external scrollIntoView: (Dom.element, scrollIntoViewOptions) => unit = "scrollIntoView"
   @get external style: Dom.element => CssStyle.t = "style"
   @get @return(nullable)
   external getScrollHandler: Dom.element => option<Dom.event => unit> =

packages/dev-playground/src/Main.res

@@ -192,9 +192,11 @@ let offsetForPosition = (source, position: SourceMapNavigation.position) => {
   let col = ref(0)
   let length = source->String.length
 
-  while index.contents < length &&
-    (line.contents < position.line ||
-    (line.contents === position.line && col.contents < position.col)) {
+  while (
+    index.contents < length &&
+      (line.contents < position.line ||
+        (line.contents === position.line && col.contents < position.col))
+  ) {
     if source->String.charAt(index.contents) === "\n" {
       line := line.contents + 1
       col := 0
@@ -320,9 +322,8 @@ let mappedJavaScriptNode = (
             let className = isSelected
               ? "source-map-mapped-segment source-map-mapped-segment-active"
               : "source-map-mapped-segment"
-            let title = `${original.source}:${original.position.line->Int.toString}:${(
-                original.position.col + 1
-              )->Int.toString} — click to reveal in source`
+            let title = `${original.source}:${original.position.line->Int.toString}:${(original.position.col + 1)
+                ->Int.toString} — click to reveal in source`
             nodes->Array.push(
               <span
                 id={isSelected ? "generated-map-selection" : ""}
@@ -726,8 +727,7 @@ module App = {
     let scrollToGeneratedMapping = () =>
       Window.requestAnimationFrame(() =>
         switch Document.current->Document.getElementById("generated-map-selection") {
-        | Some(element) =>
-          element->Element.scrollIntoView({block: "center", inline: "nearest"})
+        | Some(element) => element->Element.scrollIntoView({block: "center", inline: "nearest"})
         | None => ()
         }
       )
@@ -765,10 +765,13 @@ module App = {
       switch Signal.peek(compileResult) {
       | Some(Ok({sourceMap: Some(sourceMap)})) => {
           let mappings = SourceMapNavigation.decode(sourceMap)
-          switch SourceMapNavigation.generatedForOriginal(mappings, {
-            line: position.line,
-            col: position.col,
-          }) {
+          switch SourceMapNavigation.generatedForOriginal(
+            mappings,
+            {
+              line: position.line,
+              col: position.col,
+            },
+          ) {
           | Some(mapping) => {
               Signal.set(mappedSourcePosition, Some({line: position.line, col: position.col}))
               Signal.set(mappedGeneratedPosition, Some(mapping.generated))

packages/dev-playground/src/SourceMapNavigation.res

@@ -33,7 +33,9 @@ module RawMapping = {
 let decode = sourceMap => {
   let mappings: array<mapping> = []
   try {
-    sourceMap->makeTraceMap->eachMapping(rawMapping => {
+    sourceMap
+    ->makeTraceMap
+    ->eachMapping(rawMapping => {
       let original = switch (
         rawMapping->RawMapping.source,
         rawMapping->RawMapping.originalLine,

packages/playground/playground_test.cjs

@@ -78,11 +78,20 @@ if (result.js_code !== "") {
   console.log("-- Playground test complete --");
 }
 
+compiler.setFilename("Playground.res");
+assert.equal(compiler.setGentypeEnabled(true), true);
+const gentypeResult = compiler.rescript.compileWithDebug("@genType let answer = 42\n");
+assert.equal(gentypeResult.type, "success");
+assert.match(gentypeResult.gentype, /require\(['"]\.\/Playground\.js['"]\)/);
+assert.doesNotMatch(gentypeResult.gentype, /Playground\.bs\.js/);
+assert.equal(compiler.setGentypeEnabled(false), true);
+
+console.log("-- Playground gentype suffix test complete --");
+
 const sourceMapSource = `let double = value => value * 2
 let result = double(21)
 `;
 
-compiler.setFilename("Playground.res");
 assert.equal(compiler.setSourceMapMode("linked"), true);
 assert.equal(compiler.setSourceMapSourcesContent(true), true);
 assert.equal(compiler.setSourceMapRoot("rescript://playground/"), true);