handle on/off in bools, and treat empty strings as None

CHANGELOG.md

@@ -1,5 +1,8 @@
 # master
 
+- Add `allowEmptyString` option to `FormDataHelpers.getString`, and make sure that empty strings are treated as `None` by default.
+- Handle `on` and `off` values for `FormDataHelpers.getBool`.
+
 # 0.1.1
 
 - Fix issue with Vite transform and CSS files with imports.

package.json

@@ -20,16 +20,16 @@
   "author": "Gabriel Nordeborn",
   "license": "MIT",
   "peerDependencies": {
-    "rescript": ">=11.1.0-rc.2",
+    "rescript": ">=11.1.0",
     "@rescript/core": ">=1.0.0",
     "vite": ">=4.4.11",
     "rescript-bun": ">=0.4.1"
   },
   "devDependencies": {
-    "@rescript/core": "1.0.0",
+    "@rescript/core": "1.6.0",
     "fast-glob": "^3.3.1",
-    "rescript": "11.1.0-rc.2",
-    "rescript-bun": "0.4.1"
+    "rescript": "11.1.4",
+    "rescript-bun": "0.5.0"
   },
   "dependencies": {
     "fast-glob": "^3.3.1"

src/BunUtils.res

@@ -56,7 +56,7 @@ let serveStaticFile = async request => {
   let pathname = url->URL.pathname
 
   let path = pathname->String.split("/")->Array.filter(p => p !== "")
-  let joined = path->Array.joinWith("/")
+  let joined = path->Array.join("/")
 
   switch staticFiles->Map.get(joined) {
   | None => None

src/FormDataHelpers.res

@@ -10,17 +10,22 @@ let getOrRaise = (opt, ~name, ~expectedType, ~message=?) =>
   | Some(v) => v
   }
 
-let getString = (t, name) =>
+let getString = (t, name, ~allowEmptyString=false) =>
   switch t->FormData.get(name) {
-  | String(s) => Some(s)
+  | String(s) =>
+    switch s {
+    | "" if allowEmptyString => Some("")
+    | _ => Some(s)
+    }
   | _ => None
   }
+
 let getInt = (t, name) => t->getString(name)->Option.flatMap(s => s->Int.fromString)
 let getFloat = (t, name) => t->getString(name)->Option.flatMap(s => s->Float.fromString)
 let getBool = (t, name) =>
   switch t->FormData.get(name) {
-  | String("true") => Some(true)
-  | String("false") => Some(false)
+  | String("true" | "on") => Some(true)
+  | String("false" | "off") => Some(false)
   | _ => None
   }
 

src/Handlers.res

@@ -61,7 +61,7 @@ let make = (~requestToContext, ~options=?) => {
 
 let useContext = t => t.asyncLocalStorage->AsyncHooks.AsyncLocalStorage.getStoreUnsafe
 
-let defaultRenderTitle = segments => segments->Array.joinWith(" | ")
+let defaultRenderTitle = segments => segments->Array.join(" | ")
 
 @module("./vendor/hyperons.js")
 external escapeString: string => string = "escapeString"

src/Htmx.res

@@ -37,7 +37,7 @@ module Swap = {
       ),
     ]
     ->Array.keepSome
-    ->Array.joinWith(" ")
+    ->Array.join(" ")
 }
 
 type hxTarget =
@@ -71,8 +71,8 @@ module Params = {
     switch p {
     | IncludeAll => "*"
     | IncludeNone => "none"
-    | Not(list) => `not ${list->Array.joinWith(",")}`
-    | Only(list) => list->Array.joinWith(",")
+    | Not(list) => `not ${list->Array.join(",")}`
+    | Only(list) => list->Array.join(",")
     }
   }
 }
@@ -192,7 +192,7 @@ module Disinherit = {
   let make = d =>
     switch d {
     | All => "*"
-    | Attributes(attrs) => attrs->Array.map(a => (a :> string))->Array.joinWith(" ")
+    | Attributes(attrs) => attrs->Array.map(a => (a :> string))->Array.join(" ")
     }
 }
 

src/StaticExporter.res

@@ -40,14 +40,14 @@ let run = async (server: Server.t, ~urls: array<string>) => {
 
         switch dirStructure {
         | [] => ()
-        | dirStructure => await Fs.mkdir(dirStructure->Array.joinWith("/"), {recursive: true})
+        | dirStructure => await Fs.mkdir(dirStructure->Array.join("/"), {recursive: true})
         }
 
         dirStructure->Array.push(fileName)
-        let filePath = dirStructure->Array.joinWith("/")
+        let filePath = dirStructure->Array.join("/")
 
         let _ = await Bun.Write.writeResponseToFile(
-          ~file=dirStructure->Array.joinWith("/")->Bun.file,
+          ~file=dirStructure->Array.join("/")->Bun.file,
           ~response=res,
         )
 

src/Utils.res

@@ -127,13 +127,13 @@ module CacheControl = {
       } else {
         None
       },
-      expiration->Option.map(e => e->Array.map(expirationToString)->Array.joinWith(", ")),
-      revalidation->Option.map(r => r->Array.map(revalidationToString)->Array.joinWith(", ")),
-      modifiers->Option.map(r => r->Array.map(modifiersToString)->Array.joinWith(", ")),
-      extensions->Option.map(r => r->Array.map(extensionsToString)->Array.joinWith(", ")),
+      expiration->Option.map(e => e->Array.map(expirationToString)->Array.join(", ")),
+      revalidation->Option.map(r => r->Array.map(revalidationToString)->Array.join(", ")),
+      modifiers->Option.map(r => r->Array.map(modifiersToString)->Array.join(", ")),
+      extensions->Option.map(r => r->Array.map(extensionsToString)->Array.join(", ")),
     ]
     ->Array.keepSome
-    ->Array.joinWith(", ")
+    ->Array.join(", ")
   }
 
   module Presets = {