Chore update lts

mulang.cabal

@@ -77,7 +77,7 @@ library
     language-javascript       ,
     language-python           ,
     aeson                     ,
-    inflections               <= 0.2.0.1,
+    inflections               ,
     parsec                    ,
     ParsecTools               ,
     split                     ,

spec/TokenizerSpec.hs

@@ -1,7 +1,7 @@
 module TokenizerSpec (spec) where
 
 import           Test.Hspec
-import           Text.Inflections.Tokenizer (snakeCase, camelCase, tokenize)
+import           Text.Inflections.Tokenizer (snakeCase, camelCase, tokenize, canTokenize)
 
 spec :: Spec
 spec = do
@@ -17,3 +17,9 @@ spec = do
 
     it "can tokenize snake_case words with numbers" $ do
       tokenize snakeCase "the_first_and_the_last_2" `shouldBe` ["the", "first", "and", "the", "last", "2"]
+
+    it "can tokenize snake_case words with numbers using a wrong case" $ do
+      tokenize camelCase "the_first_and_the_last_2" `shouldBe` []
+
+    it "can tokenize snake_case words with numbers using a wrong case" $ do
+      canTokenize camelCase "the_first_and_the_last_2" `shouldBe` False

src/Text/Inflections/Tokenizer.hs

@@ -8,20 +8,21 @@ module Text.Inflections.Tokenizer (
 
 import Data.Char (toLower, isDigit, isLower)
 import Data.Either (isRight)
+import Data.Bifunctor (first)
 
-import Text.Inflections
-import Text.Inflections.Parse.Types
-import Text.Parsec.Error (ParseError)
+import Text.Inflections (parseCamelCase, parseSnakeCase)
+import Text.Inflections (SomeWord, unSomeWord)
+import Data.Text (pack, unpack)
 
 import Control.Fallible
 
-type CaseStyle = String -> Either Text.Parsec.Error.ParseError [Text.Inflections.Parse.Types.Word]
+type CaseStyle = String -> Either String [SomeWord]
 
 camelCase      :: CaseStyle
-camelCase      = parseCamelCase [] . filter (not.isDigit)
+camelCase      = first show . parseCamelCase [] . pack . filter (not.isDigit)
 
 snakeCase      :: CaseStyle
-snakeCase      = parseSnakeCase []
+snakeCase      = first show . parseSnakeCase [] . pack
 
 rubyCase       :: CaseStyle
 rubyCase  word | (isLower.head) word = snakeCase baseWord
@@ -37,7 +38,5 @@ tokenize style s | Just words <- (wordsOrNothing . style) s = concatMap toToken
                  | otherwise = []
                   where toToken = return . map toLower
 
-
-wordsOrNothing = fmap (concatMap c) . orNothing
-                where c (Word w) = [w]
-                      c _        = []
+wordsOrNothing = fmap (map c) . orNothing
+                where c t        = unpack (unSomeWord id t)

stack.yaml

@@ -1,10 +1,9 @@
-resolver: lts-7.24
+resolver: lts-9.1
 packages:
 - '.'
 extra-deps:
 # Using newest aeson, with no contents in tagged
 # unions with nullary constructors
 - aeson-1.2.1.0
-- language-javascript-0.6.0.10
 flags: {}
 extra-package-dbs: []