Check apiVersion to ensure only supported methods are called

Author: fhammerschmidt

src/Playground.res

@@ -1047,43 +1047,41 @@ module Settings = {
         <ToggleSelection
           values=["commonjs", "esmodule"]
           toLabel={value => value}
-          selected=config.module_system
+          selected=config.moduleSystem
           onChange=onModuleSystemUpdate
         />
       </div>
-      {switch readyState.selected.apiVersion {
-      | V1 | V2 | V3 | V4 | V5 | UnknownVersion(_) => React.null
-      | V6 =>
-        <>
-          <div className="mt-6">
-            <div className=titleClass> {React.string("JSX")} </div>
-            <ToggleSelection
-              values=[JsxCompilation.Plain, PreserveJsx]
-              toLabel=JsxCompilation.getLabel
-              selected={config.jsx_preserve_mode->Option.getOr(false)->JsxCompilation.fromBool}
-              onChange=onJsxPreserveModeUpdate
-            />
-          </div>
-          <div className="mt-6">
-            <div className=titleClass> {React.string("Experimental Features")} </div>
-            {ExperimentalFeatures.list
-            ->Array.map(feature => {
-              let key = (feature :> string)
-
-              <SelectionOption
-                key
-                disabled=false
-                label={feature->ExperimentalFeatures.getLabel}
-                isActive={config.experimental_features
-                ->Option.getOr([])
-                ->Array.includes(key)}
-                onClick={_evt => onExperimentalFeaturesUpdate(key)}
+      {readyState.selected.apiVersion->RescriptCompilerApi.Version.isMinimumVersion(V6)
+        ? <>
+            <div className="mt-6">
+              <div className=titleClass> {React.string("JSX")} </div>
+              <ToggleSelection
+                values=[JsxCompilation.Plain, PreserveJsx]
+                toLabel=JsxCompilation.getLabel
+                selected={config.jsxPreserveMode->Option.getOr(false)->JsxCompilation.fromBool}
+                onChange=onJsxPreserveModeUpdate
               />
-            })
-            ->React.array}
-          </div>
-        </>
-      }}
+            </div>
+            <div className="mt-6">
+              <div className=titleClass> {React.string("Experimental Features")} </div>
+              {ExperimentalFeatures.list
+              ->Array.map(feature => {
+                let key = (feature :> string)
+
+                <SelectionOption
+                  key
+                  disabled=false
+                  label={feature->ExperimentalFeatures.getLabel}
+                  isActive={config.experimentalFeatures
+                  ->Option.getOr([])
+                  ->Array.includes(key)}
+                  onClick={_evt => onExperimentalFeaturesUpdate(key)}
+                />
+              })
+              ->React.array}
+            </div>
+          </>
+        : React.null}
 
       <div className="mt-6">
         <div className=titleClass> {React.string("Loaded Libraries")} </div>

src/bindings/RescriptCompilerApi.res

@@ -28,13 +28,16 @@ module Lang = {
 }
 
 module Version = {
+  type numbered =
+    | @as(1) V1
+    | @as(2) V2
+    | @as(3) V3
+    | @as(4) V4
+    | @as(5) V5
+    | @as(6) V6
+
   type t =
-    | V1
-    | V2
-    | V3
-    | V4
-    | V5
-    | V6
+    | ...numbered
     | UnknownVersion(string)
 
   // Helps finding the right API version
@@ -81,6 +84,12 @@ module Version = {
     | V2 | V3 | V4 | V5 | V6 => [Lang.Res]
     | UnknownVersion(_) => [Res]
     }
+
+  let isMinimumVersion = (version: t, minimum: numbered) =>
+    switch version {
+    | ...numbered as version => version >= minimum
+    | UnknownVersion(_) => false
+    }
 }
 
 module LocMsg = {
@@ -478,19 +487,25 @@ module Compiler = {
 
   @send external setJsxPreserveMode: (t, bool) => bool = "setJsxPreserveMode"
 
-  let setConfig = (t: t, config: Config.t): unit => {
-    let moduleSystem = switch config.module_system {
+  let setConfig = (t: t, config: Config.t, version: Version.t): unit => {
+    let moduleSystem = switch config.moduleSystem {
     | "commonjs" => #nodejs->Some
     | "esmodule" => #es6->Some
     | _ => None
     }
 
     Option.forEach(moduleSystem, moduleSystem => t->setModuleSystem(moduleSystem)->ignore)
-    Option.forEach(config.openModules, modules => t->setOpenModules(modules)->ignore)
-    Option.forEach(config.experimentalFeatures, features =>
-      t->setExperimentalFeatures(features)->ignore
-    )
-    Option.forEach(config.jsxPreserveMode, toggle => t->setJsxPreserveMode(toggle)->ignore)
+
+    if version->Version.isMinimumVersion(V4) {
+      Option.forEach(config.openModules, modules => t->setOpenModules(modules)->ignore)
+    }
+
+    if version->Version.isMinimumVersion(V6) {
+      Option.forEach(config.experimentalFeatures, features =>
+        t->setExperimentalFeatures(features)->ignore
+      )
+      Option.forEach(config.jsxPreserveMode, toggle => t->setJsxPreserveMode(toggle)->ignore)
+    }
 
     t->setWarnFlags(config.warnFlags)->ignore
   }

src/bindings/RescriptCompilerApi.resi

@@ -19,13 +19,16 @@ module Lang: {
 }
 
 module Version: {
+  type numbered =
+    | @as(1) V1
+    | @as(2) V2
+    | @as(3) V3
+    | @as(4) V4
+    | @as(5) V5
+    | @as(6) V6
+
   type t =
-    | V1
-    | V2
-    | V3
-    | V4
-    | V5
-    | V6
+    | ...numbered
     | UnknownVersion(string)
 
   // Helps finding the right API version
@@ -36,6 +39,8 @@ module Version: {
   let defaultTargetLang: Lang.t
 
   let availableLanguages: t => array<Lang.t>
+
+  let isMinimumVersion: (t, numbered) => bool
 }
 
 module LocMsg: {
@@ -205,7 +210,7 @@ module Compiler: {
 
   let setWarnFlags: (t, string) => bool
   let setOpenModules: (t, array<string>) => bool
-  let setConfig: (t, Config.t) => unit
+  let setConfig: (t, Config.t, Version.t) => unit
 
   // General format function
   let convertSyntax: (~fromLang: Lang.t, ~toLang: Lang.t, ~code: string, t) => ConversionResult.t

src/common/CompilerManagerHook.res

@@ -269,7 +269,7 @@ let useCompilerManager = (
       | UpdateConfig(config) =>
         switch state {
         | Ready(ready) =>
-          ready.selected.instance->Compiler.setConfig(config)
+          ready.selected.instance->Compiler.setConfig(config, ready.selected.apiVersion)
           let selected = {...ready.selected, config}
           Compiling({state: {...ready, selected}, previousJsCode: None})
         | _ => state
@@ -450,7 +450,8 @@ let useCompilerManager = (
                 jsxPreserveMode: initialJsxPreserveMode,
                 ?openModules,
               }
-              instance->Compiler.setConfig(config)
+
+              instance->Compiler.setConfig(config, apiVersion)
 
               let selected = {
                 id: version,
@@ -510,7 +511,8 @@ let useCompilerManager = (
             moduleSystem: defaultModuleSystem,
             ?openModules,
           }
-          instance->Compiler.setConfig(config)
+
+          instance->Compiler.setConfig(config, apiVersion)
 
           let selected = {
             id: version,