diff --git a/README.markdown b/README.markdown deleted file mode 100644 --- a/README.markdown +++ /dev/null @@ -1,74 +0,0 @@ -hjsmin -====== - -[![Build Status](https://secure.travis-ci.org/alanz/hjsmin.png?branch=master)](http://travis-ci.org/alanz/hjsmin) - -Haskell implementation of a javascript minifier - -It is intended to be used in conjunction with Hamlet, part of Yesod. - -As such, much of the structure of the package is shamelessly copied from Hamlet. - -See http://github.com/snoyberg/hamlet - - -How to build ------------- - -Library: - -cabal clean && cabal configure && cabal build - -Tests: - -cabal clean && cabal configure -fbuildtests && cabal build - -Running the tests - -./dist/build/runtests/runtests - -Changes -------- - -0.1.5.0 - fix tests to work with language-javascript >= 0.5.14 - -0.1.4.7 - remove upper bounds in cabal file - -0.1.4.6 - relax upper bound in optparse-applicative - -0.1.4.5 - relax upper bound in text to support 1.1 - - introduce CLI wrapper for minifying files from the - commandline, courtesy of @CodeBlock - -0.1.4.4 - relax upper bound in text to support 1.0 - -0.1.4.3 - make sure all missing cases are covered - -0.1.4.2 - minify octal literals too - -0.1.4.1 - Bump upper bound for containers to < 0.6 for the tests as well as the library - -0.1.4 - Include test assets in cabal to allow cabal test to pass. Courtesy of @snoyberg - -0.1.3 - Update version ranges for GHC 7.6.1, courtesy of @mietek - -0.1.2 - More general fix to the space after 'new' keyword, for issue #8 & #9 - -0.1.1 - Fixed problem with missing space after 'new' keyword, in issue #8. - -0.1.0 - Major update to work with language-javascript 0.5.1. All changes should be internal. - Update of build process to make use of Cabal testing support, and Travis CI. - -0.0.15 - Fix GHC 7.4.1 compile compatibility. Patch accepted from github.com/luite - -0.0.14 - Allow unicode characters in comments - -0.0.13 - Error in parsing numbers with zeros before decimal point - -0.0.12 - Worked in Michael Snoyman's fix for unicode output - -0.0.11 - Worked in language-javascript 0.4.*, with source locations in the AST - Worked in processing of property get/set in object literals -0.0.10 - Removed attoparsec dependency and historical Parse/Token - - diff --git a/Readme.md b/Readme.md new file mode 100644 --- /dev/null +++ b/Readme.md @@ -0,0 +1,76 @@ +hjsmin +====== + +[![Build Status](https://secure.travis-ci.org/erikd/hjsmin.png?branch=master)](http://travis-ci.org/erikd/hjsmin) + +Haskell implementation of a javascript minifier + +It is intended to be used in conjunction with Hamlet, part of Yesod. + +As such, much of the structure of the package is shamelessly copied from Hamlet. + +See http://github.com/snoyberg/hamlet + + +How to build +------------ + +Library: + +cabal clean && cabal configure && cabal build + +Tests: + + cabal clean && cabal configure --enable-tests && cabal build + +Running the tests + + dist/build/test-hjsmin/test-hjsmin + +Changes +------- + +0.1.5.1 - fix if/else/if minify issue + +0.1.5.0 - fix tests to work with language-javascript >= 0.5.14 + +0.1.4.7 - remove upper bounds in cabal file + +0.1.4.6 - relax upper bound in optparse-applicative + +0.1.4.5 - relax upper bound in text to support 1.1 + - introduce CLI wrapper for minifying files from the + commandline, courtesy of @CodeBlock + +0.1.4.4 - relax upper bound in text to support 1.0 + +0.1.4.3 - make sure all missing cases are covered + +0.1.4.2 - minify octal literals too + +0.1.4.1 - Bump upper bound for containers to < 0.6 for the tests as well as the library + +0.1.4 - Include test assets in cabal to allow cabal test to pass. Courtesy of @snoyberg + +0.1.3 - Update version ranges for GHC 7.6.1, courtesy of @mietek + +0.1.2 - More general fix to the space after 'new' keyword, for issue #8 & #9 + +0.1.1 - Fixed problem with missing space after 'new' keyword, in issue #8. + +0.1.0 - Major update to work with language-javascript 0.5.1. All changes should be internal. + Update of build process to make use of Cabal testing support, and Travis CI. + +0.0.15 - Fix GHC 7.4.1 compile compatibility. Patch accepted from github.com/luite + +0.0.14 - Allow unicode characters in comments + +0.0.13 - Error in parsing numbers with zeros before decimal point + +0.0.12 - Worked in Michael Snoyman's fix for unicode output + +0.0.11 - Worked in language-javascript 0.4.*, with source locations in the AST + Worked in processing of property get/set in object literals +0.0.10 - Removed attoparsec dependency and historical Parse/Token + + diff --git a/Text/Jasmine.hs b/Text/Jasmine.hs --- a/Text/Jasmine.hs +++ b/Text/Jasmine.hs @@ -1,54 +1,48 @@ module Text.Jasmine - ( - minify + ( minify , minifym , minifyBb , minifyFile ) where ---import Text.Jasmine.Parse +import Control.Applicative ((<$>)) +import Data.Text.Lazy (unpack) +import Data.Text.Lazy.Encoding (decodeUtf8With) +import Data.Text.Encoding.Error (lenientDecode) import Language.JavaScript.Parser (readJs, parse, JSNode(..)) -import Text.Jasmine.Pretty + import qualified Blaze.ByteString.Builder as BB import qualified Data.ByteString.Lazy as LB import qualified Data.ByteString.Lazy.Char8 as S8 -import Data.Text.Lazy (unpack) -import Data.Text.Lazy.Encoding (decodeUtf8With) -import Data.Text.Encoding.Error (lenientDecode) +import Text.Jasmine.Pretty + + minifym :: LB.ByteString -> Either String LB.ByteString -minifym s = case parse' s of - Left msg -> Left (show msg) - Right p -> Right $ BB.toLazyByteString $ renderJS p +minifym s = + case myParse s of + Left msg -> Left (show msg) + Right p -> Right $ BB.toLazyByteString $ renderJS p + minifyBb :: LB.ByteString -> Either String BB.Builder -minifyBb s = case parse' s of - Left msg -> Left (show msg) - Right p -> Right (renderJS p) +minifyBb s = + case myParse s of + Left msg -> Left (show msg) + Right p -> Right (renderJS p) + minify :: LB.ByteString -> LB.ByteString ---minify s = BB.toLazyByteString $ renderJS $ readJs s -minify s = BB.toLazyByteString $ renderJS $ readJs (lbToStr s) +minify s = BB.toLazyByteString . renderJS . readJs $ lbToStr s -_minify' :: LB.ByteString -> BB.Builder -_minify' s = renderJS $ readJs (lbToStr s) minifyFile :: FilePath -> IO LB.ByteString -minifyFile filename = - do - x <- LB.readFile (filename) - return $ minify x +minifyFile filename = minify <$> LB.readFile filename ---parse' :: S8.ByteString -> Either ParseError JSNode -parse' - :: S8.ByteString -> Either String JSNode -parse' input = parse (lbToStr input) "src" -lbToStr :: S8.ByteString -> [Char] -lbToStr = unpack . decodeUtf8With lenientDecode - -_strToLb :: String -> S8.ByteString -_strToLb str = S8.pack str +myParse :: S8.ByteString -> Either String JSNode +myParse input = parse (lbToStr input) "src" --- EOF +lbToStr :: S8.ByteString -> String +lbToStr = unpack . decodeUtf8With lenientDecode diff --git a/Text/Jasmine/Pretty.hs b/Text/Jasmine/Pretty.hs --- a/Text/Jasmine/Pretty.hs +++ b/Text/Jasmine/Pretty.hs @@ -94,6 +94,11 @@ rn (JSIf _i _lb c _rb t [_e,(NT (JSLiteral ";") _ _)]) = (text "if") <> (text "(") <> (renderJS c) <> (text ")") <> (rJS $ fixIfBlock t) <> (text "else") + +rn (JSIf _i _lb c _rb [NT (JSLiteral ";") _ _] [_e,e]) = (text "if") <> (text "(") <> (renderJS c) <> (text ")") + <> text ";" + <> (text "else") <> (spaceOrBlock $ fixBlock e) + rn (JSIf _i _lb c _rb t [_e,e]) = (text "if") <> (text "(") <> (renderJS c) <> (text ")") <> (rJS $ fixIfElse $ fixSourceElements t) <> (text "else") <> (spaceOrBlock $ fixBlock e) diff --git a/buildall.sh b/buildall.sh deleted file mode 100644 --- a/buildall.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# do a clean build of all, including the tests -#cabal clean && cabal configure -fbuildtests && cabal build && cabal haddock -cabal clean && cabal configure --enable-tests && cabal build && cabal test && cabal haddock diff --git a/hjsmin.cabal b/hjsmin.cabal --- a/hjsmin.cabal +++ b/hjsmin.cabal @@ -1,5 +1,5 @@ name: hjsmin -version: 0.1.5.0 +version: 0.1.5.1 license: BSD3 license-file: LICENSE author: Alan Zimmerman @@ -17,8 +17,7 @@ Extra-source-files: TODO.txt - , README.markdown - , buildall.sh + , Readme.md , test/pminified/*.js , test/parsingonly/*.js @@ -29,7 +28,7 @@ , blaze-builder >= 0.2 , text >= 0.8 , containers >= 0.2 - , language-javascript >= 0.5.14 + , language-javascript >= 0.5.14 && < 0.6 exposed-modules: Text.Jasmine other-modules: Text.Jasmine.Pretty ghc-options: -Wall diff --git a/hjsmin.hs b/hjsmin.hs --- a/hjsmin.hs +++ b/hjsmin.hs @@ -1,36 +1,41 @@ module Main where -import qualified Data.ByteString.Lazy as B -import qualified Data.ByteString.Lazy.Char8 as C8 import Options.Applicative import Text.Jasmine -data Options = Options { - inputFile :: String - , outputFile :: Maybe String - } +import qualified Data.ByteString.Lazy as B +import qualified Data.ByteString.Lazy.Char8 as C8 + +data Options = Options + { inputFile :: String + , outputFile :: Maybe String + } + +main :: IO () +main = + execParser opts >>= minify' + where + opts = info (helper <*> options) + ( fullDesc + <> progDesc "Minify JavaScript files." + <> header "hjsmin - a simple command-line interface to the 'hjsmin' library" + ) + options :: Parser Options -options = Options +options = Options <$> argument str (metavar "INPUT_FILE" <> help "The unminified, original JavaScript file") - <*> optional ( - strOption (long "output-file" + <*> optional + ( strOption (long "output-file" <> short 'o' <> metavar "OUTPUT_FILE" - <> help "The minified output file. Default: stdout")) - -main :: IO () -main = execParser opts >>= minify' - where - opts = info (helper <*> options) - ( fullDesc - <> progDesc "Minify JavaScript files." - <> header "hjsmin - a simple command-line interface to the 'hjsmin' library" ) + <> help "The minified output file. Default: stdout") + ) minify' :: Options -> IO () minify' o = do - minified <- minifyFile (inputFile o) - case outputFile o of - Nothing -> C8.putStrLn $ minified - Just f -> B.writeFile f minified + minified <- minifyFile (inputFile o) + case outputFile o of + Nothing -> C8.putStrLn minified + Just f -> B.writeFile f minified diff --git a/runtests.hs b/runtests.hs --- a/runtests.hs +++ b/runtests.hs @@ -1,24 +1,28 @@ -module Main where +import Data.Char +import Language.JavaScript.Parser import Test.Framework (defaultMain, testGroup, Test) import Test.Framework.Providers.HUnit import Test.HUnit hiding (Test) -import Data.Char -import Text.Jasmine -import Language.JavaScript.Parser -import Text.Jasmine.Pretty import qualified Data.ByteString.Lazy as LB import qualified Data.Text as T import qualified Data.Text.Encoding as E +import Text.Jasmine +import Text.Jasmine.Pretty + main :: IO () -main = defaultMain [testSuite,testSuiteMin,testSuiteFiles,testSuiteFilesUnminified] +main = defaultMain + [ testSuite + , testSuiteMin + , testSuiteFiles + , testSuiteFilesUnminified + ] testSuite :: Test testSuite = testGroup "Text.Jasmine.Parse" - [ - testCase "helloWorld" caseHelloWorld + [ testCase "helloWorld" caseHelloWorld , testCase "helloWorld2" caseHelloWorld2 , testCase "simpleAssignment" caseSimpleAssignment , testCase "emptyFor" caseEmptyFor @@ -52,6 +56,7 @@ , testCase "simpleAssignment" caseMinSimpleAssignment , testCase "ifelse1" caseMinIfElse1 , testCase "ifelse2" caseMinIfElse2 + , testCase "ifelse3" caseMinIfElse3 , testCase "0_f.js" caseMin0_f , testCase "01_semi1.js" caseMin01_semi1 , testCase "min_100_animals" caseMin_min_100_animals @@ -77,295 +82,292 @@ testSuiteFiles :: Test testSuiteFiles = testGroup "Text.Jasmine.Pretty files" - [ testCase "00_f.js" (testFile "./test/pminified/00_f.js") - , testCase "01_semi1.js" (testFile "./test/pminified/01_semi1.js") - , testCase "02_sm.js" (testFile "./test/pminified/02_sm.js") - , testCase "03_sm.js" (testFile "./test/pminified/03_sm.js") - , testCase "04_if.js" (testFile "./test/pminified/04_if.js") - , testCase "05_comments_simple.js" (testFile "./test/pminified/05_comments_simple.js") - , testCase "05_regex.js" (testFile "./test/pminified/05_regex.js") - , testCase "06_callexpr.js" (testFile "./test/pminified/06_callexpr.js") - , testCase "06_newexpr.js" (testFile "./test/pminified/06_newexpr.js") - , testCase "06_var.js" (testFile "./test/pminified/06_var.js") - , testCase "07_expr.js" (testFile "./test/pminified/07_expr.js") - , testCase "10_switch.js" (testFile "./test/pminified/10_switch.js") - , testCase "14_labelled_stmts.js" (testFile "./test/pminified/14_labelled_stmts.js") - , testCase "15_literals.js" (testFile "./test/pminified/15_literals.js") - , testCase "16_literals.js" (testFile "./test/pminified/16_literals.js") - , testCase "20_statements.js" (testFile "./test/pminified/20_statements.js") - , testCase "20_continue_loop.js" (testFile "./test/pminified/20_continue_loop.js") - , testCase "25_trycatch.js" (testFile "./test/pminified/25_trycatch.js") - , testCase "40_functions.js" (testFile "./test/pminified/40_functions.js") - , testCase "67_bob.js" (testFile "./test/pminified/67_bob.js") - , testCase "110_perfect.js" (testFile "./test/pminified/110_perfect.js") - , testCase "120_js.js" (testFile "./test/pminified/120_js.js") - , testCase "121_jsdefs.js" (testFile "./test/pminified/121_jsdefs.js") - , testCase "122_jsexec.js" (testFile "./test/pminified/122_jsexec.js") - , testCase "122_jsexec2.js" (testFile "./test/pminified/122_jsexec2.js") - , testCase "122_jsexec3.js" (testFile "./test/pminified/122_jsexec3.js") - -- , testCase "123_jsparse.js" (testFile "./test/pminified/123_jsparse.js") - -- TODO: something strange here, assigning code block to variable? - -- See http://msdn.microsoft.com/en-us/library/77kz8hy0.aspx, get/set keywords for object accessors + [ testCase "00_f.js" (testFile "./test/pminified/00_f.js") + , testCase "01_semi1.js" (testFile "./test/pminified/01_semi1.js") + , testCase "02_sm.js" (testFile "./test/pminified/02_sm.js") + , testCase "03_sm.js" (testFile "./test/pminified/03_sm.js") + , testCase "04_if.js" (testFile "./test/pminified/04_if.js") + , testCase "05_comments_simple.js" (testFile "./test/pminified/05_comments_simple.js") + , testCase "05_regex.js" (testFile "./test/pminified/05_regex.js") + , testCase "06_callexpr.js" (testFile "./test/pminified/06_callexpr.js") + , testCase "06_newexpr.js" (testFile "./test/pminified/06_newexpr.js") + , testCase "06_var.js" (testFile "./test/pminified/06_var.js") + , testCase "07_expr.js" (testFile "./test/pminified/07_expr.js") + , testCase "10_switch.js" (testFile "./test/pminified/10_switch.js") + , testCase "14_labelled_stmts.js" (testFile "./test/pminified/14_labelled_stmts.js") + , testCase "15_literals.js" (testFile "./test/pminified/15_literals.js") + , testCase "16_literals.js" (testFile "./test/pminified/16_literals.js") + , testCase "20_statements.js" (testFile "./test/pminified/20_statements.js") + , testCase "20_continue_loop.js" (testFile "./test/pminified/20_continue_loop.js") + , testCase "25_trycatch.js" (testFile "./test/pminified/25_trycatch.js") + , testCase "40_functions.js" (testFile "./test/pminified/40_functions.js") + , testCase "67_bob.js" (testFile "./test/pminified/67_bob.js") + , testCase "110_perfect.js" (testFile "./test/pminified/110_perfect.js") + , testCase "120_js.js" (testFile "./test/pminified/120_js.js") + , testCase "121_jsdefs.js" (testFile "./test/pminified/121_jsdefs.js") + , testCase "122_jsexec.js" (testFile "./test/pminified/122_jsexec.js") + , testCase "122_jsexec2.js" (testFile "./test/pminified/122_jsexec2.js") + , testCase "122_jsexec3.js" (testFile "./test/pminified/122_jsexec3.js") + -- , testCase "123_jsparse.js" (testFile "./test/pminified/123_jsparse.js") - --, testCase "130_htojs2.js" (testFile "./test/parsingonly/130_htojs2.js") - --, testCase "" (testFile "./test/pminified/") - ] + -- TODO: something strange here, assigning code block to variable? + -- See http://msdn.microsoft.com/en-us/library/77kz8hy0.aspx, get/set keywords for object accessors + --, testCase "130_htojs2.js" (testFile "./test/parsingonly/130_htojs2.js") + --, testCase "" (testFile "./test/pminified/") + ] + testSuiteFilesUnminified :: Test testSuiteFilesUnminified = testGroup "Text.Jasmine.Pretty filesUnminified" - [ testCase "00_f.js" (testFileUnminified "00_f.js") - , testCase "01_semi1.js" (testFileUnminified "01_semi1.js") - , testCase "02_sm.js" (testFileUnminified "02_sm.js") - , testCase "03_sm.js" (testFileUnminified "03_sm.js") - , testCase "04_if.js" (testFileUnminified "04_if.js") - , testCase "05_comments_simple.js" (testFileUnminified "05_comments_simple.js") - , testCase "05_regex.js" (testFileUnminified "05_regex.js") - , testCase "06_callexpr.js" (testFileUnminified "06_callexpr.js") - , testCase "06_newexpr.js" (testFileUnminified "06_newexpr.js") - , testCase "06_var.js" (testFileUnminified "06_var.js") - , testCase "07_expr.js" (testFileUnminified "07_expr.js") - , testCase "10_switch.js" (testFileUnminified "10_switch.js") - , testCase "14_labelled_stmts.js" (testFileUnminified "14_labelled_stmts.js") - , testCase "15_literals.js" (testFileUnminified "15_literals.js") - , testCase "16_literals.js" (testFileUnminified "16_literals.js") - , testCase "20_statements.js" (testFileUnminified "20_statements.js") - , testCase "25_trycatch.js" (testFileUnminified "25_trycatch.js") - , testCase "40_functions.js" (testFileUnminified "40_functions.js") - , testCase "67_bob.js" (testFileUnminified "67_bob.js") - , testCase "110_perfect.js" (testFileUnminified "110_perfect.js") - , testCase "120_js.js" (testFileUnminified "120_js.js") - , testCase "121_jsdefs.js" (testFileUnminified "121_jsdefs.js") - , testCase "122_jsexec.js" (testFileUnminified "122_jsexec.js") + [ testCase "00_f.js" (testFileUnminified "00_f.js") + , testCase "01_semi1.js" (testFileUnminified "01_semi1.js") + , testCase "02_sm.js" (testFileUnminified "02_sm.js") + , testCase "03_sm.js" (testFileUnminified "03_sm.js") + , testCase "04_if.js" (testFileUnminified "04_if.js") + , testCase "05_comments_simple.js" (testFileUnminified "05_comments_simple.js") + , testCase "05_regex.js" (testFileUnminified "05_regex.js") + , testCase "06_callexpr.js" (testFileUnminified "06_callexpr.js") + , testCase "06_newexpr.js" (testFileUnminified "06_newexpr.js") + , testCase "06_var.js" (testFileUnminified "06_var.js") + , testCase "07_expr.js" (testFileUnminified "07_expr.js") + , testCase "10_switch.js" (testFileUnminified "10_switch.js") + , testCase "14_labelled_stmts.js" (testFileUnminified "14_labelled_stmts.js") + , testCase "15_literals.js" (testFileUnminified "15_literals.js") + , testCase "16_literals.js" (testFileUnminified "16_literals.js") + , testCase "20_statements.js" (testFileUnminified "20_statements.js") + , testCase "25_trycatch.js" (testFileUnminified "25_trycatch.js") + , testCase "40_functions.js" (testFileUnminified "40_functions.js") + , testCase "67_bob.js" (testFileUnminified "67_bob.js") + , testCase "110_perfect.js" (testFileUnminified "110_perfect.js") + , testCase "120_js.js" (testFileUnminified "120_js.js") + , testCase "121_jsdefs.js" (testFileUnminified "121_jsdefs.js") + , testCase "122_jsexec.js" (testFileUnminified "122_jsexec.js") - --, testCase "122_jsexec2.js" (testFileUnminified "122_jsexec2.js") - ] + --, testCase "122_jsexec2.js" (testFileUnminified "122_jsexec2.js") + ] srcHelloWorld = "function Hello(a) {}" caseHelloWorld = - "Right (JSSourceElementsTop [JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSBlock ([])),JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcHelloWorld) + "Right (JSSourceElementsTop [JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSBlock ([])),JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcHelloWorld) caseMinHelloWorld = - -- "function Hello(a){}" @=? (minify (U.fromString srcHelloWorld)) - testMinify "function Hello(a){}" srcHelloWorld + -- "function Hello(a){}" @=? (minify (U.fromString srcHelloWorld)) + testMinify "function Hello(a){}" srcHelloWorld srcHelloWorld2 = "function Hello(a) {b=1}" caseHelloWorld2 = - "Right (JSSourceElementsTop [JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSBlock ([JSExpression [JSIdentifier \"b\",JSOperator JSLiteral \"=\",JSDecimal \"1\"]])),JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcHelloWorld2) + "Right (JSSourceElementsTop [JSFunction (JSIdentifier \"Hello\") [JSIdentifier \"a\"] (JSBlock ([JSExpression [JSIdentifier \"b\",JSOperator JSLiteral \"=\",JSDecimal \"1\"]])),JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcHelloWorld2) caseMinHelloWorld2 = - -- "function Hello(a){b=1}" @=? (minify (U.fromString srcHelloWorld2)) - testMinify "function Hello(a){b=1}" srcHelloWorld2 + -- "function Hello(a){b=1}" @=? (minify (U.fromString srcHelloWorld2)) + testMinify "function Hello(a){b=1}" srcHelloWorld2 srcSimpleAssignment = "a=1;" caseSimpleAssignment = - "Right (JSSourceElementsTop [JSExpression [JSIdentifier \"a\",JSOperator JSLiteral \"=\",JSDecimal \"1\"],JSLiteral \";\",JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcSimpleAssignment) + "Right (JSSourceElementsTop [JSExpression [JSIdentifier \"a\",JSOperator JSLiteral \"=\",JSDecimal \"1\"],JSLiteral \";\",JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcSimpleAssignment) caseMinSimpleAssignment = - testMinify "a=1" srcSimpleAssignment + testMinify "a=1" srcSimpleAssignment srcEmptyFor = "for (i = 0;;){}" caseEmptyFor = - "Right (JSSourceElementsTop [JSFor [JSExpression [JSIdentifier \"i\",JSOperator JSLiteral \"=\",JSDecimal \"0\"]] [] [] (JSBlock ([])),JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcEmptyFor) + "Right (JSSourceElementsTop [JSFor [JSExpression [JSIdentifier \"i\",JSOperator JSLiteral \"=\",JSDecimal \"0\"]] [] [] (JSBlock ([])),JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcEmptyFor) srcFullFor = "for (i = 0;i<10;i++){}" caseFullFor = - "Right (JSSourceElementsTop [JSFor [JSExpression [JSIdentifier \"i\",JSOperator JSLiteral \"=\",JSDecimal \"0\"]] [JSExpression [JSExpressionBinary \"<\" [JSIdentifier \"i\"] [JSDecimal \"10\"]]] [JSExpression [JSExpressionPostfix \"++\" [JSIdentifier \"i\"]]] (JSBlock ([])),JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcFullFor) + "Right (JSSourceElementsTop [JSFor [JSExpression [JSIdentifier \"i\",JSOperator JSLiteral \"=\",JSDecimal \"0\"]] [JSExpression [JSExpressionBinary \"<\" [JSIdentifier \"i\"] [JSDecimal \"10\"]]] [JSExpression [JSExpressionPostfix \"++\" [JSIdentifier \"i\"]]] (JSBlock ([])),JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcFullFor) srcForVarFull = "for(var i=0,j=tokens.length;i\" [JSIdentifier \"i\"] [JSDecimal \"0\"]]) ([JSExpression [JSIdentifier \"consts\",JSOperator JSLiteral \"+=\",JSStringLiteral '\"' \", \"],JSLiteral \";\"]) ([]),JSVariables JSLiteral \"var\" [JSVarDecl (JSIdentifier \"t\") [JSLiteral \"=\",JSMemberSquare [JSIdentifier \"tokens\"] (JSExpression [JSIdentifier \"i\"])]],JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcIf1) + "Right (JSSourceElementsTop [JSIf (JSExpression [JSExpressionBinary \">\" [JSIdentifier \"i\"] [JSDecimal \"0\"]]) ([JSExpression [JSIdentifier \"consts\",JSOperator JSLiteral \"+=\",JSStringLiteral '\"' \", \"],JSLiteral \";\"]) ([]),JSVariables JSLiteral \"var\" [JSVarDecl (JSIdentifier \"t\") [JSLiteral \"=\",JSMemberSquare [JSIdentifier \"tokens\"] (JSExpression [JSIdentifier \"i\"])]],JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcIf1) caseMinIf1 = - testMinify "if(i>0)consts+=\", \";var t=tokens[i]" srcIf1 + testMinify "if(i>0)consts+=\", \";var t=tokens[i]" srcIf1 srcIf2 = "if (getValue)\n execute;\nelse {\n execute;\n}" caseIf2 = - "Right (JSSourceElementsTop [JSIf (JSExpression [JSIdentifier \"getValue\"]) ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"]) ([JSLiteral \"else\",JSBlock ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"])]),JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcIf2) + "Right (JSSourceElementsTop [JSIf (JSExpression [JSIdentifier \"getValue\"]) ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"]) ([JSLiteral \"else\",JSBlock ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"])]),JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcIf2) caseMinIf2 = - testMinify "if(getValue){execute}else execute" srcIf2 + testMinify "if(getValue){execute}else execute" srcIf2 srcIf3 = "if(getValue){execute}else execute" caseIf3 = - "Right (JSSourceElementsTop [JSIf (JSExpression [JSIdentifier \"getValue\"]) ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"]) ([JSLiteral \"else\",JSBlock ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"])]),JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcIf2) + "Right (JSSourceElementsTop [JSIf (JSExpression [JSIdentifier \"getValue\"]) ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"]) ([JSLiteral \"else\",JSBlock ([JSExpression [JSIdentifier \"execute\"],JSLiteral \";\"])]),JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcIf2) caseMinIf3 = - testMinify "if(getValue){execute}else execute" srcIf3 + testMinify "if(getValue){execute}else execute" srcIf3 srcBootstrapDropdown = "clearMenus()\n!isActive && $parent.toggleClass('open')" caseBootstrapDropdown = - "Right (JSSourceElementsTop [JSExpression [JSIdentifier \"clearMenus\",JSArguments []],JSExpression [JSExpressionBinary \"&&\" [JSUnary \"!\",JSIdentifier \"isActive\"] [JSMemberDot [JSIdentifier \"$parent\"] (JSIdentifier \"toggleClass\"),JSArguments [JSStringLiteral '\\'' \"open\"]]],JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcBootstrapDropdown) + "Right (JSSourceElementsTop [JSExpression [JSIdentifier \"clearMenus\",JSArguments []],JSExpression [JSExpressionBinary \"&&\" [JSUnary \"!\",JSIdentifier \"isActive\"] [JSMemberDot [JSIdentifier \"$parent\"] (JSIdentifier \"toggleClass\"),JSArguments [JSStringLiteral '\\'' \"open\"]]],JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcBootstrapDropdown) caseMinBootstrapDropdown = - testMinify "clearMenus();!isActive&&$parent.toggleClass('open')" srcBootstrapDropdown + testMinify "clearMenus();!isActive&&$parent.toggleClass('open')" srcBootstrapDropdown srcIssue8 = "(function(){new nicEditor({fullPanel:true}).panelInstance('h4')})();" caseIssue8 = - "Right (JSSourceElementsTop [JSExpression [JSExpressionParen (JSExpression [JSFunctionExpression [] [] (JSBlock ([JSExpression [JSMemberDot [JSLiteral \"new\",JSIdentifier \"nicEditor\",JSArguments [JSObjectLiteral [JSPropertyNameandValue (JSIdentifier \"fullPanel\") [JSLiteral \"true\"]]]] (JSIdentifier \"panelInstance\"),JSArguments [JSStringLiteral '\\'' \"h4\"]]]))]),JSArguments []],JSLiteral \";\",JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcIssue8) + "Right (JSSourceElementsTop [JSExpression [JSExpressionParen (JSExpression [JSFunctionExpression [] [] (JSBlock ([JSExpression [JSMemberDot [JSLiteral \"new\",JSIdentifier \"nicEditor\",JSArguments [JSObjectLiteral [JSPropertyNameandValue (JSIdentifier \"fullPanel\") [JSLiteral \"true\"]]]] (JSIdentifier \"panelInstance\"),JSArguments [JSStringLiteral '\\'' \"h4\"]]]))]),JSArguments []],JSLiteral \";\",JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcIssue8) caseMinIssue8 = - testMinify "(function(){new nicEditor({fullPanel:true}).panelInstance('h4')})()" srcIssue8 + testMinify "(function(){new nicEditor({fullPanel:true}).panelInstance('h4')})()" srcIssue8 srcIssue9 = "var x = [new friend(5)];" + caseIssue9 = - "Right (JSSourceElementsTop [JSVariables JSLiteral \"var\" [JSVarDecl (JSIdentifier \"x\") [JSLiteral \"=\",JSArrayLiteral [JSLiteral \"new\",JSIdentifier \"friend\",JSArguments [JSDecimal \"5\"]]]],JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcIssue9) + "Right (JSSourceElementsTop [JSVariables JSLiteral \"var\" [JSVarDecl (JSIdentifier \"x\") [JSLiteral \"=\",JSArrayLiteral [JSLiteral \"new\",JSIdentifier \"friend\",JSArguments [JSDecimal \"5\"]]]],JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcIssue9) + caseMinIssue9 = - testMinify "var x=[new friend(5)]" srcIssue9 + testMinify "var x=[new friend(5)]" srcIssue9 srcIssue14 = "var settings = {start : new Date(2012, 01, 27)};" + caseIssue14 = - "Right (JSSourceElementsTop [JSVariables JSLiteral \"var\" [JSVarDecl (JSIdentifier \"settings\") [JSLiteral \"=\",JSObjectLiteral [JSPropertyNameandValue (JSIdentifier \"start\") [JSLiteral \"new\",JSIdentifier \"Date\",JSArguments [JSDecimal \"2012\",JSLiteral \",\",JSOctal \"01\",JSLiteral \",\",JSDecimal \"27\"]]]]],JSLiteral \"\"])" - @=? (showStrippedMaybe $ parseProgram srcIssue14) + "Right (JSSourceElementsTop [JSVariables JSLiteral \"var\" [JSVarDecl (JSIdentifier \"settings\") [JSLiteral \"=\",JSObjectLiteral [JSPropertyNameandValue (JSIdentifier \"start\") [JSLiteral \"new\",JSIdentifier \"Date\",JSArguments [JSDecimal \"2012\",JSLiteral \",\",JSOctal \"01\",JSLiteral \",\",JSDecimal \"27\"]]]]],JSLiteral \"\"])" + @=? showStrippedMaybe (parseProgram srcIssue14) + caseMinIssue14 = - testMinify "var settings={start:new Date(2012,01,27)}" srcIssue14 + testMinify "var settings={start:new Date(2012,01,27)}" srcIssue14 -- --------------------------------------------------------------------- -- utilities ---testMinify expected src = (LB.fromChunks [(U.fromString expected)]) @=? (minify (U.fromString src)) -testMinify expected src = (LB.fromChunks [(E.encodeUtf8 $ T.pack expected)]) @=? (minify $ LB.fromChunks [(E.encodeUtf8 $ T.pack src)]) +testMinify expected src = LB.fromChunks [E.encodeUtf8 (T.pack expected)] @=? minify (LB.fromChunks [E.encodeUtf8 (T.pack src)]) testFile :: FilePath -> IO () -testFile filename = - do - x <- readFile (filename) +testFile filename = do + x <- readFile filename let x' = trim x - -- x' @=? (minify (U.fromString x') ) testMinify x' x' testFileUnminified :: FilePath -> IO () -testFileUnminified filename = - do +testFileUnminified filename = do x <- readFile ("./test/pminified/" ++ filename) y <- readFile ("./test/parsingonly/" ++ filename) let x' = trim x - -- x' @=? (minify (U.fromString y)) testMinify x' y -trim :: String -> String -trim = f . f - where f = reverse . dropWhile isSpace +trim :: String -> String +trim = + let f = reverse . dropWhile isSpace + in f . f -- For language-javascript parseProgram src = parse src "src" - --- EOF