Developer playground: genType support and sourcemap scaffolding

Author: fhammerschmidt

compiler/jsoo/dune

@@ -7,4 +7,4 @@
   (= %{profile} browser))
  (flags
   (:standard -w +a-4-9-40-42-44-45))
- (libraries core syntax ml js_of_ocaml))
+ (libraries core syntax ml gentype js_of_ocaml))

compiler/jsoo/jsoo_playground_main.ml

@@ -52,8 +52,9 @@
  * v5: Removed .ml support.
  * v6: Added `config.experimental_features` and `config.jsx_preserve_mode` to the BundleConfig.
  * v7: Added debug dump output APIs for developer playground tooling.
+ * v8: Added gentype debug output for developer playground tooling.
  * *)
-let api_version = "7"
+let api_version = "8"
 
 module Js = Js_of_ocaml.Js
 
@@ -78,6 +79,7 @@ module BundleConfig = struct
     mutable open_modules: string list;
     mutable experimental_features: string list;
     mutable jsx_preserve_mode: bool;
+    mutable gentype_enabled: bool;
   }
 
   let make () =
@@ -88,6 +90,7 @@ module BundleConfig = struct
       open_modules = [];
       experimental_features = [];
       jsx_preserve_mode = false;
+      gentype_enabled = false;
     }
 
   let default_filename (lang : Lang.t) = "playground." ^ Lang.to_string lang
@@ -475,6 +478,72 @@ module Compile = struct
     List.iter Iter.iter_structure_item structure.str_items;
     Js.array (!acc |> Array.of_list)
 
+  let gentype_output ~module_system ~modulename ~sourcefile structure env =
+    let cmt_annots = Cmt_format.Implementation structure in
+    let input_cmt =
+      {
+        Cmt_format.cmt_modname = modulename;
+        cmt_annots;
+        cmt_value_dependencies = [];
+        cmt_comments = [];
+        cmt_args = [||];
+        cmt_sourcefile = Some sourcefile;
+        cmt_builddir = Sys.getcwd ();
+        cmt_loadpath = !Config.load_path;
+        cmt_source_digest = None;
+        cmt_initial_env = env;
+        cmt_imports = [];
+        cmt_interface_digest = None;
+        cmt_use_summaries = false;
+        cmt_extra_info = {Cmt_utils.deprecated_used = []};
+      }
+    in
+    let has_gentype_annotations =
+      GenTypeMain.cmt_check_annotations input_cmt
+        ~check_annotation:(fun ~loc:_ attributes ->
+          attributes
+          |> Annotation.get_attribute_payload
+               Annotation.tag_is_one_of_the_gentype_annotations
+          <> None)
+    in
+    if has_gentype_annotations then
+      let module_ =
+        match module_system with
+        | Ext_module_system.Commonjs -> GenTypeConfig.CommonJS
+        | Esmodule -> ESModule
+      in
+      let project_root = Sys.getcwd () in
+      let config =
+        {
+          GenTypeConfig.default with
+          module_;
+          platform_lib = "rescript";
+          project_root;
+          bsb_project_root = project_root;
+        }
+      in
+      let source_file = sourcefile in
+      let output_file_relative =
+        source_file |> Paths.get_output_file_relative ~config
+      in
+      let file_name = modulename |> ModuleName.from_string_unsafe in
+      let resolver =
+        ModuleResolver.create_lazy_resolver ~config
+          ~extensions:[".res"; ".shim.ts"] ~exclude_file:(fun fname ->
+            fname = "React.res" || fname = "ReasonReact.res")
+      in
+      let code_text =
+        input_cmt
+        |> GenTypeMain.translate_c_m_t ~config ~output_file_relative ~resolver
+        |> EmitJs.emit_translation_as_string ~config ~file_name
+             ~output_file_relative ~resolver
+             ~input_cmt_translate_type_declarations:
+               GenTypeMain.input_cmt_translate_type_declarations
+      in
+      EmitType.file_header ~source_file:(Filename.basename source_file)
+      ^ "\n" ^ code_text ^ "\n"
+    else "No @gentype annotations found."
+
   let implementation ?(include_debug_outputs = false) ~(config : BundleConfig.t)
       ~lang str =
     let {
@@ -483,6 +552,7 @@ module Compile = struct
       open_modules;
       experimental_features;
       jsx_preserve_mode;
+      gentype_enabled;
     } =
       config
     in
@@ -551,6 +621,26 @@ module Compile = struct
         let lambda = Printer.to_string Printlambda.lambda lam in
         let lam, _ = Lam_convert.convert export_ident_sets lam in
         let lam = Lam_print.lambda_to_string lam in
+        let gentype_attrs =
+          if gentype_enabled then
+            let structure, _ = typed_tree in
+            Js.Unsafe.
+              [|
+                ( "gentype",
+                  inject
+                  @@ Js.string
+                       (gentype_output ~module_system ~modulename
+                          ~sourcefile:filename structure env) );
+              |]
+          else [||]
+        in
+        (* TODO(sourcemap PR): The developer playground already knows how to
+           show an optional "source_map" debug tab. Add optional instance
+           setters named "setSourceMapMode", "setSourceMapSourcesContent",
+           and "setSourceMapRoot", matching getConfig fields named
+           "source_map_mode", "source_map_sources_content", and
+           "source_map_root", plus a compileWithDebug output field named
+           "source_map". *)
         let debug_attrs =
           Js.Unsafe.
             [|
@@ -560,7 +650,7 @@ module Compile = struct
               ("lam", inject @@ Js.string lam);
             |]
         in
-        Js.Unsafe.obj (Array.append attrs debug_attrs)
+        Js.Unsafe.obj (Array.concat [attrs; debug_attrs; gentype_attrs])
       else Js.Unsafe.obj attrs
     with e -> (
       match e with
@@ -661,6 +751,10 @@ module Export = struct
       config.jsx_preserve_mode <- value;
       true
     in
+    let set_gentype_enabled value =
+      config.gentype_enabled <- value;
+      true
+    in
     let convert_syntax ~(from_lang : string) ~(to_lang : string) (src : string)
         =
       let open Lang in
@@ -719,6 +813,10 @@ module Export = struct
             inject
             @@ Js.wrap_meth_callback (fun _ 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))) );
           ( "getConfig",
             inject
             @@ Js.wrap_meth_callback (fun _ ->
@@ -733,6 +831,8 @@ module Export = struct
                          ("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) );
                          ( "experimental_features",
                            inject
                            @@ (config.experimental_features |> Array.of_list

packages/dev-playground/src/Bindings.res

@@ -30,6 +30,12 @@ module Instance = {
   @send external setWarnFlags: (compilerInstance, string) => unit = "setWarnFlags"
   @send external setFilename: (compilerInstance, string) => unit = "setFilename"
   @send external setJsxPreserveMode: (compilerInstance, bool) => unit = "setJsxPreserveMode"
+  @send external setGentypeEnabled: (compilerInstance, bool) => unit = "setGentypeEnabled"
+  @send external setSourceMapMode: (compilerInstance, string) => unit = "setSourceMapMode"
+  @send
+  external setSourceMapSourcesContent: (compilerInstance, bool) => unit =
+    "setSourceMapSourcesContent"
+  @send external setSourceMapRoot: (compilerInstance, string) => unit = "setSourceMapRoot"
   @send
   external setExperimentalFeatures: (compilerInstance, array<string>) => unit =
     "setExperimentalFeatures"
@@ -51,6 +57,11 @@ module Config = {
   @get external jsxPreserveMode: compilerConfig => option<bool> = "jsx_preserve_mode"
   @get
   external experimentalFeatures: compilerConfig => option<array<string>> = "experimental_features"
+  @get external gentypeEnabled: compilerConfig => option<bool> = "gentype_enabled"
+  @get external sourceMapMode: compilerConfig => option<string> = "source_map_mode"
+  @get
+  external sourceMapSourcesContent: compilerConfig => option<bool> = "source_map_sources_content"
+  @get external sourceMapRoot: compilerConfig => option<string> = "source_map_root"
 }
 
 module Diagnostic = {
@@ -70,6 +81,8 @@ module CompileResult = {
   @get external typedtree: compileResult => option<string> = "typedtree"
   @get external lambda: compileResult => option<string> = "lambda"
   @get external lam: compileResult => option<string> = "lam"
+  @get external gentype: compileResult => option<string> = "gentype"
+  @get external sourceMap: compileResult => option<string> = "source_map"
   @get external errors: compileResult => option<array<diagnostic>> = "errors"
   @get external warnings: compileResult => option<array<diagnostic>> = "warnings"
   @get external msg: compileResult => option<string> = "msg"

packages/dev-playground/src/CompilerApi.res

@@ -50,6 +50,10 @@ type info = {
   warnFlags: string,
   jsxPreserveMode: bool,
   experimentalFeatures: array<PlaygroundConfig.experimentalFeature>,
+  gentypeEnabled: bool,
+  sourceMapMode: PlaygroundConfig.sourceMapMode,
+  sourceMapSourcesContent: bool,
+  sourceMapRoot: string,
   libraries: array<string>,
 }
 
@@ -59,6 +63,8 @@ type success = {
   typedtree: string,
   lambda: string,
   lam: string,
+  gentype: option<string>,
+  sourceMap: option<string>,
   warnings: array<string>,
   time: float,
 }
@@ -78,6 +84,10 @@ type normalizedConfig = {
   warnFlags: string,
   jsxPreserveMode: bool,
   experimentalFeatures: array<PlaygroundConfig.experimentalFeature>,
+  gentypeEnabled: bool,
+  sourceMapMode: PlaygroundConfig.sourceMapMode,
+  sourceMapSourcesContent: bool,
+  sourceMapRoot: string,
 }
 
 let defaultWarnFlags = "+a-4-9-20-40-41-42-50-61-102-109"
@@ -90,6 +100,10 @@ let defaultConfig: PlaygroundConfig.t = {
   warnFlags: defaultWarnFlags,
   jsxPreserveMode: false,
   experimentalFeatures: [],
+  gentypeEnabled: false,
+  sourceMapMode: Disabled,
+  sourceMapSourcesContent: true,
+  sourceMapRoot: "",
 }
 
 let pathFromBase = relativePath => {
@@ -207,6 +221,10 @@ let applyConfig = (
   ~moduleSystem: PlaygroundConfig.moduleSystem,
   ~warnFlags,
   ~jsxPreserveMode,
+  ~gentypeEnabled,
+  ~sourceMapMode: PlaygroundConfig.sourceMapMode,
+  ~sourceMapSourcesContent,
+  ~sourceMapRoot,
   ~experimentalFeatures: array<PlaygroundConfig.experimentalFeature>,
 ) => {
   if hasFunction(instance, "setModuleSystem") {
@@ -221,6 +239,18 @@ let applyConfig = (
   if hasFunction(instance, "setJsxPreserveMode") {
     instance->Instance.setJsxPreserveMode(jsxPreserveMode)
   }
+  if hasFunction(instance, "setGentypeEnabled") {
+    instance->Instance.setGentypeEnabled(gentypeEnabled)
+  }
+  if hasFunction(instance, "setSourceMapMode") {
+    instance->Instance.setSourceMapMode(sourceMapMode->PlaygroundConfig.sourceMapModeCompilerValue)
+  }
+  if hasFunction(instance, "setSourceMapSourcesContent") {
+    instance->Instance.setSourceMapSourcesContent(sourceMapSourcesContent)
+  }
+  if hasFunction(instance, "setSourceMapRoot") {
+    instance->Instance.setSourceMapRoot(sourceMapRoot)
+  }
   if hasFunction(instance, "setExperimentalFeatures") {
     instance->Instance.setExperimentalFeatures(
       experimentalFeatures->Array.map(feature => (feature :> string)),
@@ -245,13 +275,27 @@ let experimentalFeaturesFromConfig = configValue =>
   | None => []
   }
 
+let sourceMapModeFromConfig = configValue =>
+  switch configValue->Config.sourceMapMode {
+  | Some(sourceMapMode) =>
+    switch sourceMapMode->PlaygroundConfig.parseSourceMapMode {
+    | Some(sourceMapMode) => sourceMapMode
+    | None => defaultConfig.sourceMapMode
+    }
+  | None => defaultConfig.sourceMapMode
+  }
+
 let normalizeConfig = (configValue: option<compilerConfig>): normalizedConfig =>
   switch configValue {
   | None => {
       moduleSystem: Esmodule,
       warnFlags: defaultConfig.warnFlags,
       jsxPreserveMode: false,
       experimentalFeatures: [],
+      gentypeEnabled: defaultConfig.gentypeEnabled,
+      sourceMapMode: defaultConfig.sourceMapMode,
+      sourceMapSourcesContent: defaultConfig.sourceMapSourcesContent,
+      sourceMapRoot: defaultConfig.sourceMapRoot,
     }
   | Some(configValue) => {
       moduleSystem: configValue->moduleSystemFromConfig,
@@ -264,6 +308,19 @@ let normalizeConfig = (configValue: option<compilerConfig>): normalizedConfig =>
       | None => false
       },
       experimentalFeatures: configValue->experimentalFeaturesFromConfig,
+      gentypeEnabled: switch configValue->Config.gentypeEnabled {
+      | Some(gentypeEnabled) => gentypeEnabled
+      | None => defaultConfig.gentypeEnabled
+      },
+      sourceMapMode: configValue->sourceMapModeFromConfig,
+      sourceMapSourcesContent: switch configValue->Config.sourceMapSourcesContent {
+      | Some(sourceMapSourcesContent) => sourceMapSourcesContent
+      | None => defaultConfig.sourceMapSourcesContent
+      },
+      sourceMapRoot: switch configValue->Config.sourceMapRoot {
+      | Some(sourceMapRoot) => sourceMapRoot
+      | None => defaultConfig.sourceMapRoot
+      },
     }
   }
 
@@ -351,7 +408,10 @@ let normalize = (compileOutput, elapsedMs): compileResult => {
     | None => ""
     }
 
-    Ok({jsCode, parsetree, typedtree, lambda, lam, warnings, time: elapsedMs})
+    let gentype = compileOutput->CompileResult.gentype
+    let sourceMap = compileOutput->CompileResult.sourceMap
+
+    Ok({jsCode, parsetree, typedtree, lambda, lam, gentype, sourceMap, warnings, time: elapsedMs})
 
   | _ => Error(failureFromCompileOutput(compileOutput, elapsedMs))
   }
@@ -418,6 +478,10 @@ let ensureCompiler = async version => {
       ~moduleSystem=Esmodule,
       ~warnFlags=defaultConfig.warnFlags,
       ~jsxPreserveMode=false,
+      ~gentypeEnabled=defaultConfig.gentypeEnabled,
+      ~sourceMapMode=defaultConfig.sourceMapMode,
+      ~sourceMapSourcesContent=defaultConfig.sourceMapSourcesContent,
+      ~sourceMapRoot=defaultConfig.sourceMapRoot,
       ~experimentalFeatures=[],
     )
 
@@ -470,6 +534,10 @@ let init = async version => {
     warnFlags: config.warnFlags,
     jsxPreserveMode: config.jsxPreserveMode,
     experimentalFeatures: config.experimentalFeatures,
+    gentypeEnabled: config.gentypeEnabled,
+    sourceMapMode: config.sourceMapMode,
+    sourceMapSourcesContent: config.sourceMapSourcesContent,
+    sourceMapRoot: config.sourceMapRoot,
     libraries,
   }
 }
@@ -483,6 +551,10 @@ let compile = async (source, config: PlaygroundConfig.t) => {
     ~moduleSystem=config.moduleSystem,
     ~warnFlags=config.warnFlags,
     ~jsxPreserveMode=config.jsxPreserveMode,
+    ~gentypeEnabled=config.gentypeEnabled,
+    ~sourceMapMode=config.sourceMapMode,
+    ~sourceMapSourcesContent=config.sourceMapSourcesContent,
+    ~sourceMapRoot=config.sourceMapRoot,
     ~experimentalFeatures=config.experimentalFeatures,
   )
 
@@ -507,6 +579,10 @@ let format = async (source, config: PlaygroundConfig.t) => {
     ~moduleSystem=config.moduleSystem,
     ~warnFlags=config.warnFlags,
     ~jsxPreserveMode=config.jsxPreserveMode,
+    ~gentypeEnabled=config.gentypeEnabled,
+    ~sourceMapMode=config.sourceMapMode,
+    ~sourceMapSourcesContent=config.sourceMapSourcesContent,
+    ~sourceMapRoot=config.sourceMapRoot,
     ~experimentalFeatures=config.experimentalFeatures,
   )