Bump version to 0.5

README.md

@@ -1 +1,21 @@
 # utoy
+
+## Building the executable
+
+```
+$ $(nix-build utoy.nix)/bin/utoy
+```
+
+## Building the Docker image
+
+```
+$ docker load < $(nix-build nix/docker-image.nix)
+```
+
+## Development Shell
+
+Includes Stack, `haskell-language-server`, `gen-hie` etc.
+
+```
+$ nix-shell
+```

app/Main.hs

@@ -61,17 +61,17 @@ app :: Application
 app = serve (Proxy :: Proxy API) server
 
 type API =
-  "bytes" :> Capture "bytes" Text :> Get '[PlainText, HTML] BytesModel
+  "utf8" :> Capture "bytes" Text :> Get '[PlainText, HTML] Utf8Model
-  :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText] CodepointsModel
+  :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText, HTML] CodepointsModel
-  :<|> "text" :> Capture "text" Text :> Get '[HTML] TextModel
+  :<|> "text" :> Capture "text" Text :> Get '[PlainText, HTML] TextModel
 
 server :: Server API
 server =
-  bytesR :<|> codepointsR :<|> textR
+  utf8R :<|> codepointsR :<|> textR
   where
-    bytesR bytesP = do
+    utf8R bytesP = do
       bytes <- Parsers.parseHexBytes bytesP `orThrow` const err400
-      pure $ BytesModel $ Decode.decodeUtf8 bytes
+      pure $ mkUtf8Model bytes
 
     codepointsR codepointsP = do
       codepoints' <- Parsers.parseCodepoints codepointsP `orThrow` const err400
@@ -82,11 +82,14 @@ server =
 
 -- /bytes/<bytes>
 
-newtype BytesModel = BytesModel
+newtype Utf8Model = Utf8Model
   { codepoints :: [([Word8], Either String Char)]
   }
 
-instance MimeRender PlainText BytesModel where
+mkUtf8Model :: [Word8] -> Utf8Model
+mkUtf8Model = Utf8Model . Decode.decodeUtf8
+
+instance MimeRender PlainText Utf8Model where
   mimeRender _ model = renderText $
     Table.render "  " $ concat
       [ [ [ Table.cl $ Text.pack $ unwords $ map showByteHex bytes
@@ -99,7 +102,7 @@ instance MimeRender PlainText BytesModel where
             Right c ->
               [ Text.pack [c]
               , Text.pack $ printf "U+%04X" c
-              , Text.pack $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+              , Text.pack $ intercalate ", " $ allNames c
               , Text.pack $ fromMaybe "" $ blockName c
               ]
           )
@@ -107,25 +110,19 @@ instance MimeRender PlainText BytesModel where
       | (bytes, eiC) <- model.codepoints
       ]
 
-instance MimeRender HTML BytesModel where
+instance MimeRender HTML Utf8Model where
-  mimeRender _ model = renderHtml $ H.docTypeHtml $ do
+  mimeRender _ model = renderHtml $ documentWithBody $ do
-    H.head $ do
+    H.table $ for_ model.codepoints $ \(bytes, eiC) -> do
-      H.meta ! A.charset "utf-8"
+      H.tr $ do
-      H.title "utoy"
+        H.td $ H.pre $ H.toHtml $ unlines $ map unwords [map showByteHex bytes, map showByteBin bytes]
-      H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
+        case eiC of
-    H.body $ do
+          Left err ->
-      H.table $ for_ model.codepoints $ \(bytes, eiC) -> do
+            H.td ! A.colspan "4" $ H.toHtml $ "Decoding error: " ++ err
-        H.tr $ do
+          Right c -> do
-          H.td $ H.pre $ H.toHtml $ unlines $ map unwords [map showByteHex bytes, map showByteBin bytes]
+            H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
-          case eiC of
+            H.td $ H.code $ printfHtml "U+%04X" c
-            Left err ->
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
-              H.td ! A.colspan "4" $ H.toHtml $ "Decoding error: " ++ err
+            H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
-            Right c -> do
-              H.td $ do
-                H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
-                H.td $ H.code $ printfHtml "U+%04X" c
-              H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
-              H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
 -- /codepoints/<codepoints>
 
@@ -134,7 +131,14 @@ newtype CodepointsModel = CodepointsModel
   }
 
 mkCodepointsModel :: [(Word, Word)] -> CodepointsModel
-mkCodepointsModel = CodepointsModel . map go . concatMap (uncurry enumFromTo)
+mkCodepointsModel =
+  CodepointsModel
+  -- Limit number of returned codepoints. Otherwise it's
+  -- too easy to provoke massive response bodies with requests like
+  -- /codepoints/0-99999999
+  . take 100000
+  . map go
+  . concatMap (uncurry enumFromTo)
   where
     go codepoint = (codepoint, toChar codepoint)
 
@@ -155,13 +159,27 @@ instance MimeRender PlainText CodepointsModel where
         Right c ->
           [ Text.pack [c]
           , Text.pack $ printf "U+%04X" c
-          , Text.pack $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+          , Text.pack $ intercalate ", " $ allNames c
           , Text.pack $ fromMaybe "" $ blockName c
           ]
       )
     | (codepoint, eiC) <- model.codepoints
     ]
 
+instance MimeRender HTML CodepointsModel where
+  mimeRender _ model = renderHtml $ documentWithBody $ do
+    H.table $ for_ model.codepoints $ \(codepoint, eiC) ->
+      H.tr $ do
+        H.td $ H.code $ H.toHtml $ Text.pack $ printf "0x%X" codepoint
+        case eiC of
+          Left err -> do
+            H.td ! A.colspan "4" $ H.code $ H.toHtml $ "Decoding error: " <> Text.pack err
+          Right c -> do
+            H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
+            H.td $ H.code $ printfHtml "U+%04X" c
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
+            H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
+
 -- /text/<text>
 
 newtype TextModel = TextModel
@@ -169,18 +187,25 @@ newtype TextModel = TextModel
   }
 
 instance MimeRender HTML TextModel where
-  mimeRender _ model = renderHtml $ H.docTypeHtml $ do
+  mimeRender _ model = renderHtml $ documentWithBody $ do
-    H.head $ do
+    H.table $ for_ (Text.unpack model.text) $ \c -> do
-      H.meta ! A.charset "utf-8"
+      H.tr $ do
-      H.title "utoy"
+        H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
-      H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
+        H.td $ H.code $ printfHtml "U+%04X" c
-    H.body $ do
+        H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
-      H.table $ for_ (Text.unpack model.text) $ \c -> do
+        H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
-        H.tr $ do
+
-          H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
+instance MimeRender PlainText TextModel where
-          H.td $ H.code $ printfHtml "U+%04X" c
+  mimeRender _ model = renderText $ Table.render "  "
-          H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+    [ map (Table.cl)
-          H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
+      [ Text.pack [c]
+      , Text.pack $ printf "U+%04X" c
+      , Text.pack $ intercalate ", " $ allNames c
+      , Text.pack $ fromMaybe "" $ blockName c
+      ]
+    | c <- Text.unpack model.text
+    ]
+
 
 -- Utilities
 
@@ -193,6 +218,12 @@ showByteHex = printf "      %02X"
 showByteBin :: Word8 -> String
 showByteBin = printf "%08b"
 
+-- | Retrieve name and aliases (suffixed with @*@) of a 'Char'.
+allNames :: Char -> [String]
+allNames c =
+  maybeToList (UnicodeNames.name c)
+  ++ map (++ "*") (UnicodeNames.nameAliases c)
+
 blockName :: Char -> Maybe String
 blockName c = UnicodeBlocks.blockName . UnicodeBlocks.blockDefinition <$> UnicodeBlocks.block c
 
@@ -203,6 +234,15 @@ orThrow (Right val) _ = pure val
 printfHtml :: PrintfArg a => String -> a -> H.Html
 printfHtml fmt = (H.toHtml :: String -> H.Html) . printf fmt
 
+documentWithBody :: H.Html -> H.Html
+documentWithBody body =
+  H.docTypeHtml $ do
+    H.head $ do
+      H.meta ! A.charset "utf-8"
+      H.title "utoy"
+      H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
+    H.body body
+
 -- HTML routes
 
 data HTML

nix/docker-image.nix

@@ -4,6 +4,6 @@ let
 in
   pkgs.dockerTools.buildImage {
     name = "git.pbrinkmeier.de/paul/utoy";
-    tag = "0.2";
+    tag = utoy.version;
     config.Cmd = [ "${utoy}/bin/utoy" ];
   }

package.yaml

@@ -1,7 +1,7 @@
 # Adapted from new-template.hsfiles
 
 name:                utoy
-version:             0.2
+version:             0.5
 git:                 "https://git.pbrinkmeier.de/paul/utoy"
 license:             MIT
 author:              "Paul Brinkmeier"

src/UToy/Table.hs

@@ -17,7 +17,7 @@ cr :: Text -> Cell
 cr = C AlignRight
 
 render :: Text -> [[Cell]] -> Text
-render delim cells = Text.intercalate "\n" $ map showRow cells
+render delim cells = Text.unlines $ map showRow cells
   where
     showRow = Text.intercalate delim . map showCell . zipLongest columnWidths
 

utoy.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           utoy
-version:        0.2
+version:        0.5
 author:         Paul Brinkmeier
 maintainer:     hallo@pbrinkmeier.de
 copyright:      2023 Paul Brinkmeier

utoy.nix

@@ -8,7 +8,7 @@ let
   utoy =
     { mkDerivation }:
     mkDerivation {
-      version = "0.2";
+      version = "0.5";
       pname = "utoy";
       license = pkgs.lib.licenses.mit;
       src =