Skip to content

Commit eff2f49

Browse files
Make compiler config camelCase
1 parent 140440b commit eff2f49

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

src/Playground.res

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ module Settings = {
874874
~config: Api.Config.t,
875875
~keyMapState: (CodeMirror.KeyMap.t, (CodeMirror.KeyMap.t => CodeMirror.KeyMap.t) => unit),
876876
) => {
877-
let {Api.Config.warn_flags: warn_flags} = config
877+
let {Api.Config.warnFlags: warnFlags} = config
878878
let (keyMap, setKeyMap) = keyMapState
879879

880880
let availableTargetLangs = Api.Version.availableLanguages(readyState.selected.apiVersion)
@@ -889,41 +889,41 @@ module Settings = {
889889
}
890890
let config = {
891891
...config,
892-
warn_flags: flags->normalizeEmptyFlags->WarningFlagDescription.Parser.tokensToString,
892+
warnFlags: flags->normalizeEmptyFlags->WarningFlagDescription.Parser.tokensToString,
893893
}
894894
setConfig(config)
895895
}
896896

897-
let onModuleSystemUpdate = module_system => {
898-
let config = {...config, module_system}
897+
let onModuleSystemUpdate = moduleSystem => {
898+
let config = {...config, moduleSystem}
899899
setConfig(config)
900900
}
901901

902902
let onJsxPreserveModeUpdate = compilation => {
903-
let jsx_preserve_mode = JsxCompilation.toBool(compilation)
904-
let config = {...config, jsx_preserve_mode}
903+
let jsxPreserveMode = JsxCompilation.toBool(compilation)
904+
let config = {...config, jsxPreserveMode}
905905
setConfig(config)
906906
}
907907

908908
let onExperimentalFeaturesUpdate = feature => {
909-
let features = config.experimental_features->Option.getOr([])
909+
let features = config.experimentalFeatures->Option.getOr([])
910910

911-
let experimental_features = if features->Array.includes(feature) {
911+
let experimentalFeatures = if features->Array.includes(feature) {
912912
features->Array.filter(x => x !== feature)
913913
} else {
914914
[...features, feature]
915915
}
916916

917-
let config = {...config, experimental_features}
917+
let config = {...config, experimentalFeatures}
918918
setConfig(config)
919919
}
920920

921-
let warnFlagTokens = WarningFlagDescription.Parser.parse(warn_flags)->Result.getOr([])
921+
let warnFlagTokens = WarningFlagDescription.Parser.parse(warnFlags)->Result.getOr([])
922922

923923
let onWarningFlagsResetClick = _evt => {
924924
setConfig({
925925
...config,
926-
warn_flags: "+a-4-9-20-40-41-42-50-61-102-109",
926+
warnFlags: "+a-4-9-20-40-41-42-50-61-102-109",
927927
})
928928
}
929929

src/bindings/RescriptCompilerApi.res

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -395,12 +395,12 @@ module ConversionResult = {
395395

396396
module Config = {
397397
type t = {
398-
module_system: string,
399-
warn_flags: string,
398+
@as("module_system") moduleSystem: string,
399+
@as("warn_flags") warnFlags: string,
400400
uncurried?: bool,
401-
open_modules?: array<string>,
402-
experimental_features?: array<string>,
403-
jsx_preserve_mode?: bool,
401+
@as("open_modules") openModules?: array<string>,
402+
@as("experimental_features") experimentalFeatures?: array<string>,
403+
@as("jsx_preserve_mode") jsxPreserveMode?: bool,
404404
}
405405
}
406406

@@ -486,13 +486,13 @@ module Compiler = {
486486
}
487487

488488
Option.forEach(moduleSystem, moduleSystem => t->setModuleSystem(moduleSystem)->ignore)
489-
Option.forEach(config.open_modules, modules => t->setOpenModules(modules)->ignore)
490-
Option.forEach(config.experimental_features, features =>
489+
Option.forEach(config.openModules, modules => t->setOpenModules(modules)->ignore)
490+
Option.forEach(config.experimentalFeatures, features =>
491491
t->setExperimentalFeatures(features)->ignore
492492
)
493-
Option.forEach(config.jsx_preserve_mode, toggle => t->setJsxPreserveMode(toggle)->ignore)
493+
Option.forEach(config.jsxPreserveMode, toggle => t->setJsxPreserveMode(toggle)->ignore)
494494

495-
t->setWarnFlags(config.warn_flags)->ignore
495+
t->setWarnFlags(config.warnFlags)->ignore
496496
}
497497

498498
@send

src/bindings/RescriptCompilerApi.resi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ module ConversionResult: {
159159

160160
module Config: {
161161
type t = {
162-
module_system: string,
163-
warn_flags: string,
162+
@as("module_system") moduleSystem: string,
163+
@as("warn_flags") warnFlags: string,
164164
/** Only available in apiVersion > 3 (= ReScript 11+) */
165165
uncurried?: bool,
166-
open_modules?: array<string>,
166+
@as("open_modules") openModules?: array<string>,
167167
/** Only available in apiVersion >= 6 (= ReScript 12+) */
168-
experimental_features?: array<string>,
169-
jsx_preserve_mode?: bool,
168+
@as("experimental_features") experimentalFeatures?: array<string>,
169+
@as("jsx_preserve_mode") jsxPreserveMode?: bool,
170170
}
171171
}
172172

src/common/CompilerManagerHook.res

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,13 @@ let createUrl = (pathName, ready) => {
207207
}
208208

209209
Array.push(params, (Version, "v" ++ ready.selected.compilerVersion))
210-
Array.push(params, (Module, ready.selected.config.module_system))
210+
Array.push(params, (Module, ready.selected.config.moduleSystem))
211211

212-
if ready.selected.config.jsx_preserve_mode->Option.getOr(false) {
212+
if ready.selected.config.jsxPreserveMode->Option.getOr(false) {
213213
Array.push(params, (JsxPreserve, "true"))
214214
}
215215

216-
switch ready.selected.config.experimental_features {
216+
switch ready.selected.config.experimentalFeatures {
217217
| Some([]) | None => ()
218218
| Some(features) => Array.push(params, (Experiments, features->Array.join(",")))
219219
}
@@ -436,7 +436,7 @@ let useCompilerManager = (
436436
| Ok() =>
437437
let instance = Compiler.make()
438438
let apiVersion = apiVersion->Version.fromString
439-
let open_modules = getOpenModules(~apiVersion, ~libraries)
439+
let openModules = getOpenModules(~apiVersion, ~libraries)
440440

441441
// Note: The compiler bundle currently defaults to
442442
// commonjs when initiating the compiler, but our playground
@@ -445,10 +445,10 @@ let useCompilerManager = (
445445
// internal compiler state with our playground state.
446446
let config = {
447447
...instance->Compiler.getConfig,
448-
module_system: initialModuleSystem,
449-
experimental_features: initialExperimentalFeatures,
450-
jsx_preserve_mode: initialJsxPreserveMode,
451-
?open_modules,
448+
moduleSystem: initialModuleSystem,
449+
experimentalFeatures: initialExperimentalFeatures,
450+
jsxPreserveMode: initialJsxPreserveMode,
451+
?openModules,
452452
}
453453
instance->Compiler.setConfig(config)
454454

@@ -503,12 +503,12 @@ let useCompilerManager = (
503503

504504
let instance = Compiler.make()
505505
let apiVersion = apiVersion->Version.fromString
506-
let open_modules = getOpenModules(~apiVersion, ~libraries)
506+
let openModules = getOpenModules(~apiVersion, ~libraries)
507507

508508
let config = {
509509
...instance->Compiler.getConfig,
510-
module_system: defaultModuleSystem,
511-
?open_modules,
510+
moduleSystem: defaultModuleSystem,
511+
?openModules,
512512
}
513513
instance->Compiler.setConfig(config)
514514

0 commit comments

Comments
 (0)