1 files changed, 13 insertions, 8 deletions
diff --git a/Biz/Namespace.hs b/Biz/Namespace.hs
index 48ae1e6..574a2fc 100644
--- a/Biz/Namespace.hs
+++ b/Biz/Namespace.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 
+-- : dep regex-applicative
 module Biz.Namespace
   ( Namespace (..),
     Ext (..),
@@ -14,26 +15,31 @@ where
 import Alpha
 import qualified Data.Char as Char
 import qualified Data.List as List
-import qualified Data.Text as Text
 import qualified Text.Regex.Applicative as Regex
 
-data Ext = Hs | Scm | Nix
-  deriving (Show)
+data Ext = Hs | Scm | Nix | Md | Css | Py | Sh | Key | Json | None
+  deriving (Eq, Show)
 
 data Namespace = Namespace [String] Ext
-  deriving (Show)
+  deriving (Eq, Show)
 
 match :: String -> Maybe Namespace
 match = Regex.match <| Namespace </ path <* Regex.sym '.' <*> ext
   where
     name =
       Regex.many (Regex.psym Char.isUpper)
-        <> Regex.many (Regex.psym Char.isLower)
+        <> Regex.many (Regex.psym Char.isAlphaNum)
     path = Regex.many (name <* Regex.string "/" <|> name)
     ext =
       Nix <$ Regex.string "nix"
         <|> Hs <$ Regex.string "hs"
         <|> Scm <$ Regex.string "scm"
+        <|> Md <$ Regex.string "md"
+        <|> Css <$ Regex.string "css"
+        <|> Py <$ Regex.string "py"
+        <|> Sh <$ Regex.string "sh"
+        <|> Key <$ Regex.string "key"
+        <|> Json <$ Regex.string "json"
 
 fromPath :: String -> String -> Maybe Namespace
 fromPath bizRoot absPath =
@@ -46,9 +52,8 @@ toHaskellModule (Namespace parts Hs) = joinWith "." parts
 toHaskellModule (Namespace _ ext) =
   panic <| "can't convert " <> show ext <> " to a Haskell module"
 
-toPath :: Namespace -> Text
+toPath :: Namespace -> FilePath
 toPath (Namespace parts ext) =
-  Text.pack
-    <| joinWith "/" parts
+  joinWith "/" parts
     <> "."
     <> lowercase (show ext)