git.iko.soy/typeable/http-api-data
on master help sign in
20 files changed+1413−451
since splitsnapshots
unifiedsplit
.github/workflows/haskell-ci.yml+283 .gitignore+2 .travis.yml−35 CHANGELOG.md+136 Setup.hs+2 Setup.lhs−48 cabal.haskell-ci+6 cabal.project+2 http-api-data.cabal+65−34 include/overlapping-compat.h+8 src/Web/FormUrlEncoded.hs+20−3 src/Web/HttpApiData.hs+5−3 src/Web/Internal/FormUrlEncoded.hs+412−104 src/Web/Internal/HttpApiData.hs+395−98 stack-ghc-7.10.yaml−11 stack-ghc-7.8.yaml−23 stack.yaml+1−6 test/DocTest.hs−30 test/Web/Internal/HttpApiDataSpec.hs+74−18 test/Web/Internal/TestInstances.hs+2−38
.github/workflows/haskell-ci.ymlnew file+283
@@ -0,0 +1,283 @@
1+# This GitHub workflow config has been generated by a script via
2+#
3+# haskell-ci 'github' 'cabal.project'
4+#
5+# To regenerate the script (for example after adjusting tested-with) run
6+#
7+# haskell-ci regenerate
8+#
9+# For more information, see https://github.com/haskell-CI/haskell-ci
10+#
11+# version: 0.15.20220609
12+#
13+# REGENDATA ("0.15.20220609",["github","cabal.project"])
14+#
15+name: Haskell-CI
16+on:
17+ push:
18+ branches:
19+ - master
20+ pull_request:
21+ branches:
22+ - master
23+jobs:
24+ linux:
25+ name: Haskell-CI - Linux - ${{ matrix.compiler }}
26+ runs-on: ubuntu-20.04
27+ timeout-minutes:
28+ 60
29+ container:
30+ image: buildpack-deps:bionic
31+ continue-on-error: ${{ matrix.allow-failure }}
32+ strategy:
33+ matrix:
34+ include:
35+ - compiler: ghc-9.4.0.20220523
36+ compilerKind: ghc
37+ compilerVersion: 9.4.0.20220523
38+ setup-method: ghcup
39+ allow-failure: true
40+ - compiler: ghc-9.2.3
41+ compilerKind: ghc
42+ compilerVersion: 9.2.3
43+ setup-method: ghcup
44+ allow-failure: false
45+ - compiler: ghc-9.0.2
46+ compilerKind: ghc
47+ compilerVersion: 9.0.2
48+ setup-method: ghcup
49+ allow-failure: false
50+ - compiler: ghc-8.10.7
51+ compilerKind: ghc
52+ compilerVersion: 8.10.7
53+ setup-method: ghcup
54+ allow-failure: false
55+ - compiler: ghc-8.8.4
56+ compilerKind: ghc
57+ compilerVersion: 8.8.4
58+ setup-method: hvr-ppa
59+ allow-failure: false
60+ - compiler: ghc-8.6.5
61+ compilerKind: ghc
62+ compilerVersion: 8.6.5
63+ setup-method: hvr-ppa
64+ allow-failure: false
65+ - compiler: ghc-8.4.4
66+ compilerKind: ghc
67+ compilerVersion: 8.4.4
68+ setup-method: hvr-ppa
69+ allow-failure: false
70+ - compiler: ghc-8.2.2
71+ compilerKind: ghc
72+ compilerVersion: 8.2.2
73+ setup-method: hvr-ppa
74+ allow-failure: false
75+ - compiler: ghc-8.0.2
76+ compilerKind: ghc
77+ compilerVersion: 8.0.2
78+ setup-method: hvr-ppa
79+ allow-failure: false
80+ fail-fast: false
81+ steps:
82+ - name: apt
83+ run: |
84+ apt-get update
85+ apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
86+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
87+ mkdir -p "$HOME/.ghcup/bin"
88+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
89+ chmod a+x "$HOME/.ghcup/bin/ghcup"
90+ if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi
91+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
92+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
93+ else
94+ apt-add-repository -y 'ppa:hvr/ghc'
95+ apt-get update
96+ apt-get install -y "$HCNAME"
97+ mkdir -p "$HOME/.ghcup/bin"
98+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
99+ chmod a+x "$HOME/.ghcup/bin/ghcup"
100+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101+ fi
102+ env:
103+ HCKIND: ${{ matrix.compilerKind }}
104+ HCNAME: ${{ matrix.compiler }}
105+ HCVER: ${{ matrix.compilerVersion }}
106+ - name: Set PATH and environment variables
107+ run: |
108+ echo "$HOME/.cabal/bin" >> $GITHUB_PATH
109+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
110+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
111+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
112+ HCDIR=/opt/$HCKIND/$HCVER
113+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
114+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
115+ echo "HC=$HC" >> "$GITHUB_ENV"
116+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
117+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
118+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119+ else
120+ HC=$HCDIR/bin/$HCKIND
121+ echo "HC=$HC" >> "$GITHUB_ENV"
122+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
123+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
124+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
125+ fi
126+
127+ HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
128+ echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
129+ echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
130+ echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
131+ if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
132+ echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
133+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"
134+ env:
135+ HCKIND: ${{ matrix.compilerKind }}
136+ HCNAME: ${{ matrix.compiler }}
137+ HCVER: ${{ matrix.compilerVersion }}
138+ - name: env
139+ run: |
140+ env
141+ - name: write cabal config
142+ run: |
143+ mkdir -p $CABAL_DIR
144+ cat >> $CABAL_CONFIG <<EOF
145+ remote-build-reporting: anonymous
146+ write-ghc-environment-files: never
147+ remote-repo-cache: $CABAL_DIR/packages
148+ logs-dir: $CABAL_DIR/logs
149+ world-file: $CABAL_DIR/world
150+ extra-prog-path: $CABAL_DIR/bin
151+ symlink-bindir: $CABAL_DIR/bin
152+ installdir: $CABAL_DIR/bin
153+ build-summary: $CABAL_DIR/logs/build.log
154+ store-dir: $CABAL_DIR/store
155+ install-dirs user
156+ prefix: $CABAL_DIR
157+ repository hackage.haskell.org
158+ url: http://hackage.haskell.org/
159+ EOF
160+ if $HEADHACKAGE; then
161+ cat >> $CABAL_CONFIG <<EOF
162+ repository head.hackage.ghc.haskell.org
163+ url: https://ghc.gitlab.haskell.org/head.hackage/
164+ secure: True
165+ root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
166+ 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
167+ f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
168+ key-threshold: 3
169+ active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
170+ EOF
171+ fi
172+ cat >> $CABAL_CONFIG <<EOF
173+ program-default-options
174+ ghc-options: $GHCJOBS +RTS -M3G -RTS
175+ EOF
176+ cat $CABAL_CONFIG
177+ - name: versions
178+ run: |
179+ $HC --version || true
180+ $HC --print-project-git-commit-id || true
181+ $CABAL --version || true
182+ - name: update cabal index
183+ run: |
184+ $CABAL v2-update -v
185+ - name: cache (tools)
186+ uses: actions/cache@v2
187+ with:
188+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-445c2459
189+ path: ~/.haskell-ci-tools
190+ - name: install cabal-plan
191+ run: |
192+ mkdir -p $HOME/.cabal/bin
193+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
194+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
195+ xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
196+ rm -f cabal-plan.xz
197+ chmod a+x $HOME/.cabal/bin/cabal-plan
198+ cabal-plan --version
199+ - name: install doctest
200+ run: |
201+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
202+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
203+ - name: checkout
204+ uses: actions/checkout@v2
205+ with:
206+ path: source
207+ - name: initial cabal.project for sdist
208+ run: |
209+ touch cabal.project
210+ echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
211+ cat cabal.project
212+ - name: sdist
213+ run: |
214+ mkdir -p sdist
215+ $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
216+ - name: unpack
217+ run: |
218+ mkdir -p unpacked
219+ find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
220+ - name: generate cabal.project
221+ run: |
222+ PKGDIR_http_api_data="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"
223+ echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> "$GITHUB_ENV"
224+ rm -f cabal.project cabal.project.local
225+ touch cabal.project
226+ touch cabal.project.local
227+ echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
228+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package http-api-data" >> cabal.project ; fi
229+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
230+ cat >> cabal.project <<EOF
231+ EOF
232+ if $HEADHACKAGE; then
233+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
234+ fi
235+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local
236+ cat cabal.project
237+ cat cabal.project.local
238+ - name: dump install plan
239+ run: |
240+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
241+ cabal-plan
242+ - name: cache
243+ uses: actions/cache@v2
244+ with:
245+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
246+ path: ~/.cabal/store
247+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
248+ - name: install dependencies
249+ run: |
250+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
251+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
252+ - name: build w/o tests
253+ run: |
254+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
255+ - name: build
256+ run: |
257+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
258+ - name: tests
259+ run: |
260+ $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
261+ - name: doctest
262+ run: |
263+ perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat)-\d+(\.\d+)*/; }' .ghc.environment.*
264+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi
265+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src/ ; fi
266+ - name: cabal check
267+ run: |
268+ cd ${PKGDIR_http_api_data} || false
269+ ${CABAL} -vnormal check
270+ - name: haddock
271+ run: |
272+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
273+ - name: unconstrained build
274+ run: |
275+ rm -f cabal.project.local
276+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
277+ - name: prepare for constraint sets
278+ run: |
279+ rm -f cabal.project.local
280+ - name: constraint set text-show
281+ run: |
282+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' --dependencies-only -j2 all
283+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all
.gitignore+2
@@ -1,4 +1,6 @@
11/dist/
2+/dist-newstyle/
3+/.ghc.environment.*
24/.shelly/
35/tarballs/
46*.swp
.travis.ymldeleted−35
@@ -1,35 +0,0 @@
1−sudo: false
2−
3−addons:
4− apt:
5− sources:
6− - hvr-ghc
7− packages:
8− - happy-1.19.5
9− - libgmp-dev
10−
11−env:
12− - STACK_YAML=stack.yaml FLAGS="--flag http-api-data:use-text-show"
13− - STACK_YAML=stack-ghc-7.8.yaml FLAGS="--flag http-api-data:use-text-show"
14− - STACK_YAML=stack-ghc-7.10.yaml FLAGS="--flag http-api-data:use-text-show"
15− - STACK_YAML=stack.yaml FLAGS=
16− - STACK_YAML=stack-ghc-7.8.yaml FLAGS=
17− - STACK_YAML=stack-ghc-7.10.yaml FLAGS=
18−
19−before_install:
20− # Download and unpack the stack executable
21− - mkdir -p ~/.local/bin
22− - export PATH=$HOME/.local/bin:/opt/happy/1.19.5/bin:$PATH
23− - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
24− - export PATH=~/.local/bin:$PATH
25− - stack --version
26−
27−install:
28− - stack setup
29−
30−script:
31− - stack --no-terminal build --test $FLAGS
32−
33−cache:
34− directories:
35− - $HOME/.stack
CHANGELOG.md+136
@@ -1,3 +1,139 @@
1+0.5
2+---
3+
4+* Use `attoparsec-iso8601-1.1.0.0`.
5+ `Day` and `UTCTime` parsers require at least 4 digits now, which is a breaking change.
6+* Drop GHC-7.8 and GHC-7.10 support.
7+
8+0.4.3
9+-----
10+
11+* Add `Quarter`, `QuarterOfYear` and `Month` instances
12+* Support `bytestring-0.11`
13+
14+0.4.2
15+-----
16+
17+* Add instances for `Const` and `Identity`
18+
19+0.4.1.1
20+-------
21+
22+* Allow cookie <0.5
23+* Change to `build-type: Simple`
24+
25+0.4.1
26+-----
27+
28+* Use `time-compat` to provide instances for `DayOfWeek`.
29+
30+0.4
31+---
32+
33+* `NominalDiffTime` instances preserve precision (roundtrip)
34+* Add `Semigroup.Min`, `Max`, `First`, `Last` instances
35+* Add `Tagged b a` instances
36+
37+0.3.10
38+---
39+
40+* Fix 'SetCookie' instances
41+ (see [#86](https://github.com/fizruk/http-api-data/pull/86))
42+* Add support for `Fixed`
43+ (see [#78](https://github.com/fizruk/http-api-data/pull/87))
44+
45+0.3.9
46+---
47+
48+* GHC-8.6 support
49+* Remove dependency on `uri-bytestring` and use functions from `http-types` instead
50+ (see [#75](https://github.com/fizruk/http-api-data/pull/75))
51+* Add support for `SetCookie`
52+ (see [#74](https://github.com/fizruk/http-api-data/pull/74))
53+
54+0.3.8.1
55+---
56+
57+* GHC-8.4.1 support
58+
59+0.3.8
60+---
61+
62+* Minor changes:
63+ * Stable URL-encoding for `Form`s (see [#67](https://github.com/fizruk/http-api-data/pull/67)):
64+ * Introduce `urlEncodeParams` and `urlDecodeParams`;
65+ * Introduce `urlEncodeAsFormStable` and use stable encoding for doctests;
66+ * Add `toEntriesByKeyStable` and `toListStable`;
67+ * Add `Semigroup` instance for `Form` (see [#69](https://github.com/fizruk/http-api-data/pull/69));
68+ * Relax upper bound on Cabal (see [#73](https://github.com/fizruk/http-api-data/pull/73)).
69+
70+0.3.7.2
71+---
72+
73+* Allow http-types-0.12
74+* .cabal file adjustments
75+
76+0.3.7.1
77+---
78+
79+* GHC-8.2 support (see [#55](https://github.com/fizruk/http-api-data/pull/55)).
80+
81+0.3.7
82+---
83+
84+* Minor changes:
85+ * Use [`attoparsec-iso8601`](http://hackage.haskell.org/package/attoparsec-iso8601)
86+ for parsing of time types. Now the accepted formats are the same as by `aeson`,
87+ i.e. parsers are more lenient
88+ (see [#41](https://github.com/fizruk/http-api-data/pull/41));
89+ * Preserve fractions of a second in `ToHttpApiData` instances (see [#53](https://github.com/fizruk/http-api-data/pull/53));
90+ * Add `ToHttpApiData` and `FromHttpApiData` instances for `TimeOfDay` (see [#53](https://github.com/fizruk/http-api-data/pull/53)).
91+
92+0.3.6
93+---
94+
95+* Minor change:
96+ * Add `toEncodedUrlPiece` class method for URL-encoded path segments (see [#50](https://github.com/fizruk/http-api-data/pull/50)); use efficient encoding for types whose values don't need URL-encoding.
97+
98+0.3.5
99+---
100+
101+* Minor changes:
102+ * Add `LenientData` which always succeeds to parse (see [#45](https://github.com/fizruk/http-api-data/pull/45)).
103+
104+0.3.4
105+---
106+
107+* Minor changes:
108+ * Add support for GHC 8.2, drop support for GHC 7.6 (see [#44](https://github.com/fizruk/http-api-data/pull/44)).
109+
110+0.3.3
111+---
112+
113+* Minor changes:
114+ * Expose `Form` constructor from `Web.FromUrlEncoded` (see [#40](https://github.com/fizruk/http-api-data/pull/40));
115+ * Fix example in `FromForm` documentation (see [#39](https://github.com/fizruk/http-api-data/issues/39)).
116+
117+0.3.2
118+---
119+
120+* Minor change:
121+ * Export `Form` type from `Web.FormUrlEncoded` (see [#37](https://github.com/fizruk/http-api-data/pull/37)).
122+
123+0.3.1
124+---
125+
126+* Minor changes:
127+ * Add instances for `Data.UUID` (see [#34](https://github.com/fizruk/http-api-data/pull/34)).
128+
129+0.3
130+---
131+* Major changes:
132+ * Add `Web.FormUrlEncoded` to work with form data (see [#32](https://github.com/fizruk/http-api-data/pull/32)).
133+
134+* Minor changes:
135+ * Add instances for `Numeric.Natural` (see [`d944721`](https://github.com/fizruk/http-api-data/commit/d944721ac94929a7ed9e66f25e23221799c08d83)).
136+
11370.2.4
2138---
3139* Make `parseHeader` total (instead of throwing exceptions on invalid Unicode, see [#30](https://github.com/fizruk/http-api-data/pull/30)).
Setup.hsnew file+2
@@ -0,0 +1,2 @@
1+import Distribution.Simple
2+main = defaultMain
Setup.lhsdeleted−48
@@ -1,48 +0,0 @@
1−#!/usr/bin/runhaskell
2−\begin{code}
3−{-# OPTIONS_GHC -Wall #-}
4−module Main (main) where
5−
6−import Data.List ( nub )
7−import Data.Version ( showVersion )
8−import Distribution.Package ( PackageName(PackageName), PackageId, InstalledPackageId, packageVersion, packageName )
9−import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) )
10−import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
11−import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose )
12−import Distribution.Simple.BuildPaths ( autogenModulesDir )
13−import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag )
14−import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) )
15−import Distribution.Verbosity ( Verbosity )
16−import System.FilePath ( (</>) )
17−
18−main :: IO ()
19−main = defaultMainWithHooks simpleUserHooks
20− { buildHook = \pkg lbi hooks flags -> do
21− generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi
22− buildHook simpleUserHooks pkg lbi hooks flags
23− }
24−
25−generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
26−generateBuildModule verbosity pkg lbi = do
27− let dir = autogenModulesDir lbi
28− createDirectoryIfMissingVerbose verbosity True dir
29− withLibLBI pkg lbi $ \_ libcfg -> do
30− withTestLBI pkg lbi $ \suite suitecfg -> do
31− rewriteFile (dir </> "Build_" ++ testName suite ++ ".hs") $ unlines
32− [ "module Build_" ++ testName suite ++ " where"
33− , ""
34− , "autogen_dir :: String"
35− , "autogen_dir = " ++ show dir
36− , ""
37− , "deps :: [String]"
38− , "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg))
39− ]
40− where
41− formatdeps = map (formatone . snd)
42− formatone p = case packageName p of
43− PackageName n -> n ++ "-" ++ showVersion (packageVersion p)
44−
45−testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]
46−testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys
47−
48−\end{code}
cabal.haskell-cinew file+6
@@ -0,0 +1,6 @@
1+branches: master
2+doctest: <9
3+doctest-filter-packages: base-compat
4+
5+constraint-set text-show
6+ constraints: http-api-data +use-text-show
cabal.projectnew file+2
@@ -0,0 +1,2 @@
1+packages: .
2+tests: True
http-api-data.cabal+65−34
@@ -1,39 +1,72 @@
1+cabal-version: >= 1.10
12name: http-api-data
2−version: 0.2.4
3+version: 0.5
4+
5+synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
6+category: Web
7+description:
8+ This package defines typeclasses used for converting Haskell data types to and from HTTP API data.
9+ .
10+ Please see README.md
11+
312license: BSD3
413license-file: LICENSE
514author: Nickolay Kudasov <nickolay.kudasov@gmail.com>
615maintainer: Nickolay Kudasov <nickolay.kudasov@gmail.com>
7−synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
8−description: Please see README.md
916homepage: http://github.com/fizruk/http-api-data
10−category: Web
1117stability: unstable
12−cabal-version: >= 1.10
13−build-type: Custom
18+build-type: Simple
19+
1420extra-source-files:
21+ include/overlapping-compat.h
1522 test/*.hs
1623 CHANGELOG.md
1724 README.md
1825
26+tested-with:
27+ GHC==8.0.2,
28+ GHC==8.2.2,
29+ GHC==8.4.4,
30+ GHC==8.6.5,
31+ GHC==8.8.4,
32+ GHC==8.10.7,
33+ GHC==9.0.2,
34+ GHC==9.2.3,
35+ GHC==9.4.1
36+
1937flag use-text-show
2038 description: Use text-show library for efficient ToHttpApiData implementations.
2139 default: False
40+ manual: True
2241
2342library
2443 hs-source-dirs: src/
25− build-depends: base >= 4.6 && < 4.10
26− , bytestring
27− , containers
28− , hashable
29− , text >= 0.5
30− , time
31− , time-locale-compat >=0.1.1.0 && <0.2
32− , unordered-containers
33− , uri-bytestring
44+ include-dirs: include/
45+
46+ -- GHC bundled
47+ build-depends: base >= 4.9 && < 4.17
48+ , bytestring >= 0.10.8.1 && < 0.12
49+ , containers >= 0.5.7.1 && < 0.7
50+ , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1
51+ , transformers >= 0.5.2.0 && < 0.7
52+
53+ -- other-dependencies
54+ build-depends:
55+ attoparsec >= 0.13.2.2 && < 0.15
56+ , attoparsec-iso8601 >= 1.1.0.0 && < 1.2
57+ , base-compat >= 0.10.5 && < 0.13
58+ , cookie >= 0.4.3 && < 0.5
59+ , hashable >= 1.2.7.0 && < 1.5
60+ , http-types >= 0.12.3 && < 0.13
61+ , tagged >= 0.8.5 && < 0.9
62+ , time-compat >= 1.9.5 && < 1.10
63+ , unordered-containers >= 0.2.10.0 && < 0.3
64+ , uuid-types >= 1.0.3 && < 1.1
65+
3466 if flag(use-text-show)
3567 cpp-options: -DUSE_TEXT_SHOW
36− build-depends: text-show >= 2
68+ build-depends: text-show >= 3.8.2 && <3.10
69+
3770 exposed-modules:
3871 Web.HttpApiData
3972 Web.FormUrlEncoded
@@ -52,28 +85,26 @@ test-suite spec
5285 hs-source-dirs: test
5386 ghc-options: -Wall
5487 default-language: Haskell2010
55− build-depends: HUnit
56− , hspec >= 1.3
57− , base >= 4 && < 5
88+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.11
89+ -- inherited depndencies
90+ build-depends:
91+ base
92+ , base-compat
5893 , bytestring
59− , QuickCheck
60− , unordered-containers
94+ , cookie
6195 , http-api-data
6296 , text
63− , time
64− , bytestring
97+ , time-compat
98+ , unordered-containers
99+ , uuid-types
100+
101+ if !impl(ghc >= 7.10)
102+ build-depends: nats
65103
66−test-suite doctest
67− ghc-options: -Wall
68− build-depends:
69− base,
70− directory >= 1.0,
71− doctest >= 0.11 && <0.12,
72− filepath
73− default-language: Haskell2010
74− hs-source-dirs: test
75− main-is: DocTest.hs
76− type: exitcode-stdio-1.0
104+ build-depends: HUnit >= 1.6.0.0 && <1.7
105+ , hspec >= 2.7.1 && <2.11
106+ , QuickCheck >= 2.13.1 && <2.15
107+ , quickcheck-instances >= 0.3.25.2 && <0.4
77108
78109source-repository head
79110 type: git
include/overlapping-compat.hnew file+8
@@ -0,0 +1,8 @@
1+#if __GLASGOW_HASKELL__ >= 710
2+#define OVERLAPPABLE_ {-# OVERLAPPABLE #-}
3+#define OVERLAPPING_ {-# OVERLAPPING #-}
4+#else
5+{-# LANGUAGE OverlappingInstances #-}
6+#define OVERLAPPABLE_
7+#define OVERLAPPING_
8+#endif
src/Web/FormUrlEncoded.hs+20−3
@@ -9,26 +9,43 @@ module Web.FormUrlEncoded (
99 ToFormKey(..),
1010 FromFormKey(..),
1111
12+ -- * 'Form' type
13+ Form(..),
14+
1215 -- * Encoding and decoding @'Form'@s
1316 urlEncodeAsForm,
17+ urlEncodeAsFormStable,
1418 urlDecodeAsForm,
1519
1620 urlEncodeForm,
21+ urlEncodeFormStable,
1722 urlDecodeForm,
1823
1924 -- * 'Generic's
2025 genericToForm,
2126 genericFromForm,
2227
28+ -- ** Encoding options
29+ FormOptions(..),
30+ defaultFormOptions,
31+
2332 -- * Helpers
33+ toListStable,
2434 toEntriesByKey,
35+ toEntriesByKeyStable,
2536 fromEntriesByKey,
2637
27− lookupKey,
38+ lookupAll,
39+ lookupMaybe,
2840 lookupUnique,
29− parseUnique,
41+
3042 parseAll,
43+ parseMaybe,
44+ parseUnique,
45+
46+ urlEncodeParams,
47+ urlDecodeParams,
3148) where
3249
33−import Web.Internal.FormUrlEncoded
50+import Web.Internal.FormUrlEncoded
3451
src/Web/HttpApiData.hs+5−3
@@ -35,21 +35,23 @@ module Web.HttpApiData (
3535 parseBoundedEnumOfI,
3636 parseBoundedTextData,
3737
38+ -- * Lenient data
39+ LenientData (..),
40+
3841 -- * Other helpers
3942 showTextData,
4043 readTextData,
4144) where
4245
43−import Web.Internal.HttpApiData
46+import Web.Internal.HttpApiData
4447
4548-- $setup
4649--
4750-- >>> :set -XOverloadedStrings
4851-- >>> import Control.Applicative
49−-- >>> import Data.Time
52+-- >>> import Data.Time.Compat
5053-- >>> import Data.Int
5154-- >>> import Data.Text (Text)
52−-- >>> import Data.Time (Day)
5355-- >>> import Data.Version
5456
5557-- $examples
src/Web/Internal/FormUrlEncoded.hs+412−104
@@ -1,53 +1,67 @@
1+{-# LANGUAGE ConstraintKinds #-}
12{-# LANGUAGE CPP #-}
3+{-# LANGUAGE DataKinds #-}
24{-# LANGUAGE DefaultSignatures #-}
35{-# LANGUAGE DeriveGeneric #-}
46{-# LANGUAGE FlexibleContexts #-}
57{-# LANGUAGE FlexibleInstances #-}
68{-# LANGUAGE GeneralizedNewtypeDeriving #-}
79{-# LANGUAGE KindSignatures #-}
10+{-# LANGUAGE MultiParamTypeClasses #-}
811{-# LANGUAGE OverloadedStrings #-}
912{-# LANGUAGE PolyKinds #-}
1013{-# LANGUAGE ScopedTypeVariables #-}
1114{-# LANGUAGE TypeFamilies #-}
1215{-# LANGUAGE TypeOperators #-}
16+{-# LANGUAGE UndecidableInstances #-}
17+#include "overlapping-compat.h"
1318module Web.Internal.FormUrlEncoded where
1419
15−#if __GLASGOW_HASKELL__ < 710
16−import Control.Applicative
17−import Data.Traversable
18−#endif
20+import Prelude ()
21+import Prelude.Compat
1922
23+import Control.Applicative (Const(Const))
2024import Control.Arrow ((***))
2125import Control.Monad ((<=<))
22−import Data.ByteString.Builder (toLazyByteString, shortByteString)
26+import Data.ByteString.Builder (shortByteString, toLazyByteString)
2327import qualified Data.ByteString.Lazy as BSL
2428import qualified Data.ByteString.Lazy.Char8 as BSL8
29+import Data.Coerce (coerce)
2530import qualified Data.Foldable as F
31+import Data.Functor.Identity (Identity(Identity))
2632import Data.Hashable (Hashable)
2733import Data.HashMap.Strict (HashMap)
2834import qualified Data.HashMap.Strict as HashMap
29−import Data.Int
35+import Data.Int (Int16, Int32, Int64, Int8)
3036import Data.IntMap (IntMap)
3137import qualified Data.IntMap as IntMap
32−import Data.List (intersperse)
38+import Data.List (intersperse, sortBy)
3339import Data.Map (Map)
3440import qualified Data.Map as Map
35−import Data.Monoid
36−
41+import Data.Monoid (All (..), Any (..), Dual (..),
42+ Product (..), Sum (..))
43+import Data.Ord (comparing)
44+import Data.Proxy (Proxy (..))
45+import Data.Semigroup (Semigroup (..))
46+import qualified Data.Semigroup as Semi
47+import Data.Tagged (Tagged (..))
3748import Data.Text (Text)
3849import qualified Data.Text as Text
39−import qualified Data.Text.Lazy as Lazy
40−import Data.Text.Encoding as Text
50+import qualified Data.Text.Encoding as Text
4151import Data.Text.Encoding.Error (lenientDecode)
42−
43−import Data.Time
44−import Data.Word
45−
46−import GHC.Exts (IsList (..))
52+import qualified Data.Text.Lazy as Lazy
53+import Data.Time.Compat (Day, LocalTime, NominalDiffTime,
54+ UTCTime, ZonedTime)
55+import Data.Time.Calendar.Month.Compat (Month)
56+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..))
57+import Data.Void (Void)
58+import Data.Word (Word16, Word32, Word64, Word8)
59+import GHC.Exts (Constraint, IsList (..))
4760import GHC.Generics
48−import URI.ByteString (urlEncodeQuery, urlDecodeQuery)
49−
50−import Web.Internal.HttpApiData
61+import GHC.TypeLits
62+import Network.HTTP.Types.URI (urlDecode, urlEncodeBuilder)
63+import Numeric.Natural (Natural)
64+import Web.Internal.HttpApiData
5165
5266-- $setup
5367-- >>> :set -XDeriveGeneric
@@ -56,11 +70,20 @@ import Web.Internal.HttpApiData
5670-- >>> :set -XFlexibleContexts
5771-- >>> :set -XScopedTypeVariables
5872-- >>> :set -XTypeFamilies
59−-- >>> import Data.Either (isLeft)
60−-- >>> import Data.List (sort)
73+-- >>> import Data.Char (toLower)
74+--
6175-- >>> data Person = Person { name :: String, age :: Int } deriving (Show, Generic)
6276-- >>> instance ToForm Person
6377-- >>> instance FromForm Person
78+--
79+-- >>> data Post = Post { title :: String, subtitle :: Maybe String, comments :: [String]} deriving (Generic, Show)
80+-- >>> instance ToForm Post
81+-- >>> instance FromForm Post
82+--
83+-- >>> data Project = Project { projectName :: String, projectSize :: Int } deriving (Generic, Show)
84+-- >>> let myOptions = FormOptions { fieldLabelModifier = map toLower . drop (length ("project" :: String)) }
85+-- >>> instance ToForm Project where toForm = genericToForm myOptions
86+-- >>> instance FromForm Project where fromForm = genericFromForm myOptions
6487
6588-- | Typeclass for types that can be used as keys in a 'Form'-like container (like 'Map').
6689class ToFormKey k where
@@ -92,6 +115,9 @@ instance ToFormKey LocalTime where toFormKey = toQueryParam
92115instance ToFormKey ZonedTime where toFormKey = toQueryParam
93116instance ToFormKey UTCTime where toFormKey = toQueryParam
94117instance ToFormKey NominalDiffTime where toFormKey = toQueryParam
118+instance ToFormKey Quarter where toFormKey = toQueryParam
119+instance ToFormKey QuarterOfYear where toFormKey = toQueryParam
120+instance ToFormKey Month where toFormKey = toQueryParam
95121
96122instance ToFormKey String where toFormKey = toQueryParam
97123instance ToFormKey Text where toFormKey = toQueryParam
@@ -100,9 +126,26 @@ instance ToFormKey Lazy.Text where toFormKey = toQueryParam
100126instance ToFormKey All where toFormKey = toQueryParam
101127instance ToFormKey Any where toFormKey = toQueryParam
102128
103−instance ToFormKey a => ToFormKey (Dual a) where toFormKey = toFormKey . getDual
104−instance ToFormKey a => ToFormKey (Sum a) where toFormKey = toFormKey . getSum
105−instance ToFormKey a => ToFormKey (Product a) where toFormKey = toFormKey . getProduct
129+instance ToFormKey a => ToFormKey (Dual a) where toFormKey = coerce (toFormKey :: a -> Text)
130+instance ToFormKey a => ToFormKey (Sum a) where toFormKey = coerce (toFormKey :: a -> Text)
131+instance ToFormKey a => ToFormKey (Product a) where toFormKey = coerce (toFormKey :: a -> Text)
132+
133+instance ToFormKey a => ToFormKey (Semi.Min a) where toFormKey = coerce (toFormKey :: a -> Text)
134+instance ToFormKey a => ToFormKey (Semi.Max a) where toFormKey = coerce (toFormKey :: a -> Text)
135+instance ToFormKey a => ToFormKey (Semi.First a) where toFormKey = coerce (toFormKey :: a -> Text)
136+instance ToFormKey a => ToFormKey (Semi.Last a) where toFormKey = coerce (toFormKey :: a -> Text)
137+
138+instance ToFormKey a => ToFormKey (Tagged b a) where toFormKey = coerce (toFormKey :: a -> Text)
139+
140+-- | @since 0.4.2
141+instance ToFormKey a => ToFormKey (Identity a) where toFormKey = coerce (toFormKey :: a -> Text)
142+
143+-- | @since 0.4.2
144+instance ToFormKey a => ToFormKey (Const a b) where
145+ toFormKey = coerce (toFormKey :: a -> Text)
146+
147+instance ToFormKey Void where toFormKey = toQueryParam
148+instance ToFormKey Natural where toFormKey = toQueryParam
106149
107150-- | Typeclass for types that can be parsed from keys of a 'Form'. This is the reverse of 'ToFormKey'.
108151class FromFormKey k where
@@ -134,6 +177,9 @@ instance FromFormKey LocalTime where parseFormKey = parseQueryParam
134177instance FromFormKey ZonedTime where parseFormKey = parseQueryParam
135178instance FromFormKey UTCTime where parseFormKey = parseQueryParam
136179instance FromFormKey NominalDiffTime where parseFormKey = parseQueryParam
180+instance FromFormKey Quarter where parseFormKey = parseQueryParam
181+instance FromFormKey QuarterOfYear where parseFormKey = parseQueryParam
182+instance FromFormKey Month where parseFormKey = parseQueryParam
137183
138184instance FromFormKey String where parseFormKey = parseQueryParam
139185instance FromFormKey Text where parseFormKey = parseQueryParam
@@ -142,25 +188,48 @@ instance FromFormKey Lazy.Text where parseFormKey = parseQueryParam
142188instance FromFormKey All where parseFormKey = parseQueryParam
143189instance FromFormKey Any where parseFormKey = parseQueryParam
144190
145−instance FromFormKey a => FromFormKey (Dual a) where parseFormKey = fmap Dual . parseFormKey
146−instance FromFormKey a => FromFormKey (Sum a) where parseFormKey = fmap Sum . parseFormKey
147−instance FromFormKey a => FromFormKey (Product a) where parseFormKey = fmap Product . parseFormKey
191+instance FromFormKey a => FromFormKey (Dual a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
192+instance FromFormKey a => FromFormKey (Sum a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
193+instance FromFormKey a => FromFormKey (Product a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
194+
195+instance FromFormKey a => FromFormKey (Semi.Min a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
196+instance FromFormKey a => FromFormKey (Semi.Max a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
197+instance FromFormKey a => FromFormKey (Semi.First a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
198+instance FromFormKey a => FromFormKey (Semi.Last a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
199+
200+instance FromFormKey a => FromFormKey (Tagged b a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
201+
202+-- | @since 0.4.2
203+instance FromFormKey a => FromFormKey (Identity a) where parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
204+
205+-- | @since 0.4.2
206+instance FromFormKey a => FromFormKey (Const a b) where
207+ parseFormKey = coerce (parseFormKey :: Text -> Either Text a)
208+
209+instance FromFormKey Void where parseFormKey = parseQueryParam
210+instance FromFormKey Natural where parseFormKey = parseQueryParam
148211
149212-- | The contents of a form, not yet URL-encoded.
150213--
151214-- 'Form' can be URL-encoded with 'urlEncodeForm' and URL-decoded with 'urlDecodeForm'.
152215newtype Form = Form { unForm :: HashMap Text [Text] }
153− deriving (Eq, Read, Generic, Monoid)
216+ deriving (Eq, Read, Generic, Semigroup, Monoid)
154217
155218instance Show Form where
156219 showsPrec d form = showParen (d > 10) $
157− showString "fromList " . shows (toList form)
220+ showString "fromList " . shows (toListStable form)
158221
222+-- | _NOTE:_ 'toList' is unstable and may result in different key order (but not values).
223+-- For a stable conversion use 'toListStable'.
159224instance IsList Form where
160225 type Item Form = (Text, Text)
161226 fromList = Form . HashMap.fromListWith (flip (<>)) . fmap (\(k, v) -> (k, [v]))
162227 toList = concatMap (\(k, vs) -> map ((,) k) vs) . HashMap.toList . unForm
163228
229+-- | A stable version of 'toList'.
230+toListStable :: Form -> [(Text, Text)]
231+toListStable = sortOn fst . toList
232+
164233-- | Convert a value into 'Form'.
165234--
166235-- An example type and instance:
@@ -196,12 +265,12 @@ instance IsList Form where
196265-- instance 'ToForm' Person
197266-- @
198267--
199−-- The default implementation will use 'toQueryParam' for each field's value.
268+-- The default implementation of 'toForm' is 'genericToForm'.
200269class ToForm a where
201270 -- | Convert a value into 'Form'.
202271 toForm :: a -> Form
203− default toForm :: (Generic a, GToForm (Rep a)) => a -> Form
204− toForm = genericToForm
272+ default toForm :: (Generic a, GToForm a (Rep a)) => a -> Form
273+ toForm = genericToForm defaultFormOptions
205274
206275instance ToForm Form where toForm = id
207276
@@ -218,30 +287,100 @@ instance ToHttpApiData v => ToForm (IntMap [v]) where
218287 toForm = fromEntriesByKey . IntMap.toList
219288
220289-- | Convert a list of entries groupped by key into a 'Form'.
290+--
291+-- >>> fromEntriesByKey [("name",["Nick"]),("color",["red","blue"])]
292+-- fromList [("color","red"),("color","blue"),("name","Nick")]
221293fromEntriesByKey :: (ToFormKey k, ToHttpApiData v) => [(k, [v])] -> Form
222294fromEntriesByKey = Form . HashMap.fromListWith (<>) . map (toFormKey *** map toQueryParam)
223295
296+data Proxy3 a b c = Proxy3
297+
298+type family NotSupported (cls :: k1) (a :: k2) (reason :: Symbol) :: Constraint where
299+#if __GLASGOW_HASKELL__ < 800
300+ -- this is just a placeholder case for older GHCs to not freak out on an empty closed type family
301+ NotSupported cls a "this type family is actually empty" = ()
302+#else
303+ NotSupported cls a reason = TypeError
304+ ( 'Text "Cannot derive a Generic-based " ':<>: 'ShowType cls ':<>: 'Text " instance for " ':<>: 'ShowType a ':<>: 'Text "." ':$$:
305+ 'ShowType a ':<>: 'Text " " ':<>: 'Text reason ':<>: 'Text "," ':$$:
306+ 'Text "but Generic-based " ':<>: 'ShowType cls ':<>: 'Text " instances can be derived only for records" ':$$:
307+ 'Text "(i.e. product types with named fields)." )
308+#endif
309+
224310-- | A 'Generic'-based implementation of 'toForm'.
225311-- This is used as a default implementation in 'ToForm'.
226−genericToForm :: (Generic a, GToForm (Rep a)) => a -> Form
227−genericToForm = gToForm . from
312+--
313+-- Note that this only works for records (i.e. product data types with named fields):
314+--
315+-- @
316+-- data Person = Person
317+-- { name :: String
318+-- , age :: Int
319+-- } deriving ('Generic')
320+-- @
321+--
322+-- In this implementation each field's value gets encoded using `toQueryParam`.
323+-- Two field types are exceptions:
324+--
325+-- - for values of type @'Maybe' a@ an entry is added to the 'Form' only when it is @'Just' x@
326+-- and the encoded value is @'toQueryParam' x@; 'Nothing' values are omitted from the 'Form';
327+--
328+-- - for values of type @[a]@ (except @['Char']@) an entry is added for every item in the list;
329+-- if the list is empty no entries are added to the 'Form';
330+--
331+-- Here's an example:
332+--
333+-- @
334+-- data Post = Post
335+-- { title :: String
336+-- , subtitle :: Maybe String
337+-- , comments :: [String]
338+-- } deriving ('Generic', 'Show')
339+--
340+-- instance 'ToForm' Post
341+-- @
342+--
343+-- >>> urlEncodeAsFormStable Post { title = "Test", subtitle = Nothing, comments = ["Nice post!", "+1"] }
344+-- "comments=Nice%20post%21&comments=%2B1&title=Test"
345+genericToForm :: forall a. (Generic a, GToForm a (Rep a)) => FormOptions -> a -> Form
346+genericToForm opts = gToForm (Proxy :: Proxy a) opts . from
347+
348+class GToForm t (f :: * -> *) where
349+ gToForm :: Proxy t -> FormOptions -> f x -> Form
350+
351+instance (GToForm t f, GToForm t g) => GToForm t (f :*: g) where
352+ gToForm p opts (a :*: b) = gToForm p opts a <> gToForm p opts b
228353
229−class GToForm (f :: * -> *) where
230− gToForm :: f x -> Form
354+instance (GToForm t f) => GToForm t (M1 D x f) where
355+ gToForm p opts (M1 a) = gToForm p opts a
231356
232−instance (GToForm f, GToForm g) => GToForm (f :*: g) where
233− gToForm (a :*: b) = gToForm a <> gToForm b
357+instance (GToForm t f) => GToForm t (M1 C x f) where
358+ gToForm p opts (M1 a) = gToForm p opts a
234359
235−instance (GToForm f) => GToForm (M1 D x f) where
236− gToForm (M1 a) = gToForm a
360+instance OVERLAPPABLE_ (Selector s, ToHttpApiData c) => GToForm t (M1 S s (K1 i c)) where
361+ gToForm _ opts (M1 (K1 c)) = fromList [(key, toQueryParam c)]
362+ where
363+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
237364
238−instance (GToForm f) => GToForm (M1 C x f) where
239− gToForm (M1 a) = gToForm a
365+instance (Selector s, ToHttpApiData c) => GToForm t (M1 S s (K1 i (Maybe c))) where
366+ gToForm _ opts (M1 (K1 c)) =
367+ case c of
368+ Nothing -> mempty
369+ Just x -> fromList [(key, toQueryParam x)]
370+ where
371+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
240372
241−instance (Selector s, ToHttpApiData c) => GToForm (M1 S s (K1 i c)) where
242− gToForm (M1 (K1 c)) = fromList [(key, toQueryParam c)]
373+instance (Selector s, ToHttpApiData c) => GToForm t (M1 S s (K1 i [c])) where
374+ gToForm _ opts (M1 (K1 cs)) = fromList (map (\c -> (key, toQueryParam c)) cs)
243375 where
244− key = Text.pack $ selName (Proxy3 :: Proxy3 s g p)
376+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
377+
378+instance OVERLAPPING_ (Selector s) => GToForm t (M1 S s (K1 i String)) where
379+ gToForm _ opts (M1 (K1 c)) = fromList [(key, toQueryParam c)]
380+ where
381+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
382+
383+instance NotSupported ToForm t "is a sum type" => GToForm t (f :+: g) where gToForm = error "impossible"
245384
246385-- | Parse 'Form' into a value.
247386--
@@ -253,9 +392,9 @@ instance (Selector s, ToHttpApiData c) => GToForm (M1 S s (K1 i c)) where
253392-- , age :: Int }
254393--
255394-- instance 'FromForm' Person where
256−-- 'fromForm' (Form m) = Person
257−-- '<$>' 'parseUnique' "name" m
258−-- '<*>' 'parseUnique' "age" m
395+-- 'fromForm' f = Person
396+-- '<$>' 'parseUnique' "name" f
397+-- '<*>' 'parseUnique' "age" f
259398-- @
260399--
261400-- Instead of manually writing @'FromForm'@ instances you can
@@ -276,16 +415,17 @@ instance (Selector s, ToHttpApiData c) => GToForm (M1 S s (K1 i c)) where
276415-- instance 'FromForm' Person
277416-- @
278417--
279−-- The default implementation will use 'parseQueryParam' for each field's value.
418+-- The default implementation of 'fromForm' is 'genericFromForm'.
419+-- It only works for records and it will use 'parseQueryParam' for each field's value.
280420class FromForm a where
281421 -- | Parse 'Form' into a value.
282422 fromForm :: Form -> Either Text a
283− default fromForm :: (Generic a, GFromForm (Rep a))
284− => Form -> Either Text a
285− fromForm = genericFromForm
423+ default fromForm :: (Generic a, GFromForm a (Rep a)) => Form -> Either Text a
424+ fromForm = genericFromForm defaultFormOptions
286425
287426instance FromForm Form where fromForm = pure
288427
428+-- | _NOTE:_ this conversion is unstable and may result in different key order (but not values).
289429instance (FromFormKey k, FromHttpApiData v) => FromForm [(k, v)] where
290430 fromForm = fmap (concatMap (\(k, vs) -> map ((,) k) vs)) . toEntriesByKey
291431
@@ -299,69 +439,143 @@ instance FromHttpApiData v => FromForm (IntMap [v]) where
299439 fromForm = fmap (IntMap.fromListWith (<>)) . toEntriesByKey
300440
301441-- | Parse a 'Form' into a list of entries groupped by key.
442+--
443+-- _NOTE:_ this conversion is unstable and may result in different key order
444+-- (but not values). For a stable encoding see 'toEntriesByKeyStable'.
302445toEntriesByKey :: (FromFormKey k, FromHttpApiData v) => Form -> Either Text [(k, [v])]
303446toEntriesByKey = traverse parseGroup . HashMap.toList . unForm
304447 where
305448 parseGroup (k, vs) = (,) <$> parseFormKey k <*> traverse parseQueryParam vs
306449
450+-- | Parse a 'Form' into a list of entries groupped by key.
451+--
452+-- >>> toEntriesByKeyStable [("name", "Nick"), ("color", "red"), ("color", "white")] :: Either Text [(Text, [Text])]
453+-- Right [("color",["red","white"]),("name",["Nick"])]
454+--
455+-- For an unstable (but faster) conversion see 'toEntriesByKey'.
456+toEntriesByKeyStable :: (Ord k, FromFormKey k, FromHttpApiData v) => Form -> Either Text [(k, [v])]
457+toEntriesByKeyStable = fmap (sortOn fst) . toEntriesByKey
458+
307459-- | A 'Generic'-based implementation of 'fromForm'.
308460-- This is used as a default implementation in 'FromForm'.
309−genericFromForm :: (Generic a, GFromForm (Rep a))
310− => Form -> Either Text a
311−genericFromForm f = to <$> gFromForm f
461+--
462+-- Note that this only works for records (i.e. product data types with named fields):
463+--
464+-- @
465+-- data Person = Person
466+-- { name :: String
467+-- , age :: Int
468+-- } deriving ('Generic')
469+-- @
470+--
471+-- In this implementation each field's value gets decoded using `parseQueryParam`.
472+-- Two field types are exceptions:
473+--
474+-- - for values of type @'Maybe' a@ an entry is parsed if present in the 'Form'
475+-- and the is decoded with 'parseQueryParam'; if no entry is present result is 'Nothing';
476+--
477+-- - for values of type @[a]@ (except @['Char']@) all entries are parsed to produce a list of parsed values;
478+--
479+-- Here's an example:
480+--
481+-- @
482+-- data Post = Post
483+-- { title :: String
484+-- , subtitle :: Maybe String
485+-- , comments :: [String]
486+-- } deriving ('Generic', 'Show')
487+--
488+-- instance 'FromForm' Post
489+-- @
490+--
491+-- >>> urlDecodeAsForm "comments=Nice%20post%21&comments=%2B1&title=Test" :: Either Text Post
492+-- Right (Post {title = "Test", subtitle = Nothing, comments = ["Nice post!","+1"]})
493+genericFromForm :: forall a. (Generic a, GFromForm a (Rep a)) => FormOptions -> Form -> Either Text a
494+genericFromForm opts f = to <$> gFromForm (Proxy :: Proxy a) opts f
495+
496+class GFromForm t (f :: * -> *) where
497+ gFromForm :: Proxy t -> FormOptions -> Form -> Either Text (f x)
498+
499+instance (GFromForm t f, GFromForm t g) => GFromForm t (f :*: g) where
500+ gFromForm p opts f = (:*:) <$> gFromForm p opts f <*> gFromForm p opts f
312501
313−class GFromForm (f :: * -> *) where
314− gFromForm :: Form -> Either Text (f x)
502+instance GFromForm t f => GFromForm t (M1 D x f) where
503+ gFromForm p opts f = M1 <$> gFromForm p opts f
315504
316−instance (GFromForm f, GFromForm g) => GFromForm (f :*: g) where
317− gFromForm f = (:*:) <$> gFromForm f <*> gFromForm f
505+instance GFromForm t f => GFromForm t (M1 C x f) where
506+ gFromForm p opts f = M1 <$> gFromForm p opts f
507+
508+instance OVERLAPPABLE_ (Selector s, FromHttpApiData c) => GFromForm t (M1 S s (K1 i c)) where
509+ gFromForm _ opts form = M1 . K1 <$> parseUnique key form
510+ where
511+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
512+
513+instance (Selector s, FromHttpApiData c) => GFromForm t (M1 S s (K1 i (Maybe c))) where
514+ gFromForm _ opts form = M1 . K1 <$> parseMaybe key form
515+ where
516+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
517+
518+instance (Selector s, FromHttpApiData c) => GFromForm t (M1 S s (K1 i [c])) where
519+ gFromForm _ opts form = M1 . K1 <$> parseAll key form
520+ where
521+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
318522
319−instance (Selector s, FromHttpApiData f) => GFromForm (M1 S s (K1 i f)) where
320− gFromForm form = M1 . K1 <$> parseUnique key form
523+instance OVERLAPPING_ (Selector s) => GFromForm t (M1 S s (K1 i String)) where
524+ gFromForm _ opts form = M1 . K1 <$> parseUnique key form
321525 where
322− key = Text.pack $ selName (Proxy3 :: Proxy3 s g p)
526+ key = Text.pack $ fieldLabelModifier opts $ selName (Proxy3 :: Proxy3 s g p)
323527
324−instance (GFromForm f) => GFromForm (M1 D x f) where
325− gFromForm f = M1 <$> gFromForm f
528+instance NotSupported FromForm t "is a sum type" => GFromForm t (f :+: g) where gFromForm = error "impossible"
326529
327−instance (GFromForm f) => GFromForm (M1 C x f) where
328− gFromForm f = M1 <$> gFromForm f
530+-- | Encode a 'Form' to an @application/x-www-form-urlencoded@ 'BSL.ByteString'.
531+--
532+-- _NOTE:_ this encoding is unstable and may result in different key order
533+-- (but not values). For a stable encoding see 'urlEncodeFormStable'.
534+urlEncodeForm :: Form -> BSL.ByteString
535+urlEncodeForm = urlEncodeParams . toList
329536
330537-- | Encode a 'Form' to an @application/x-www-form-urlencoded@ 'BSL.ByteString'.
331538--
539+-- For an unstable (but faster) encoding see 'urlEncodeForm'.
540+--
332541-- Key-value pairs get encoded to @key=value@ and separated by @&@:
333542--
334−-- >>> urlEncodeForm [("name", "Julian"), ("lastname", "Arni")]
543+-- >>> urlEncodeFormStable [("name", "Julian"), ("lastname", "Arni")]
335544-- "lastname=Arni&name=Julian"
336545--
337546-- Keys with empty values get encoded to just @key@ (without the @=@ sign):
338547--
339−-- >>> urlEncodeForm [("is_test", "")]
548+-- >>> urlEncodeFormStable [("is_test", "")]
340549-- "is_test"
341550--
342551-- Empty keys are allowed too:
343552--
344−-- >>> urlEncodeForm [("", "foobar")]
553+-- >>> urlEncodeFormStable [("", "foobar")]
345554-- "=foobar"
346555--
347−-- However, if not key and value are empty, the key-value pair is ignored.
348−-- (This prevents @'urlDecodeForm' . 'urlEncodeForm'@ from being a true isomorphism).
556+-- However, if both key and value are empty, the key-value pair is ignored.
557+-- (This prevents @'urlDecodeForm' . 'urlEncodeFormStable'@ from being a true isomorphism).
349558--
350−-- >>> urlEncodeForm [("", "")]
559+-- >>> urlEncodeFormStable [("", "")]
351560-- ""
352561--
353562-- Everything is escaped with @'escapeURIString' 'isUnreserved'@:
354563--
355−-- >>> urlEncodeForm [("fullname", "Andres Löh")]
564+-- >>> urlEncodeFormStable [("fullname", "Andres Löh")]
356565-- "fullname=Andres%20L%C3%B6h"
357−urlEncodeForm :: Form -> BSL.ByteString
358−urlEncodeForm = toLazyByteString . mconcat . intersperse (shortByteString "&") . map encodePair . toList
566+urlEncodeFormStable :: Form -> BSL.ByteString
567+urlEncodeFormStable = urlEncodeParams . sortOn fst . toList
568+
569+-- | Encode a list of key-value pairs to an @application/x-www-form-urlencoded@ 'BSL.ByteString'.
570+--
571+-- See also 'urlEncodeFormStable'.
572+urlEncodeParams :: [(Text, Text)] -> BSL.ByteString
573+urlEncodeParams = toLazyByteString . mconcat . intersperse (shortByteString "&") . map encodePair
359574 where
360− escape = urlEncodeQuery . Text.encodeUtf8
575+ escape = urlEncodeBuilder True . Text.encodeUtf8
361576
362577 encodePair (k, "") = escape k
363− encodePair (k, v) = escape k <> shortByteString "=" <> escape v
364−
578+ encodePair (k, v) = escape k <> shortByteString "=" <> escape v
365579
366580-- | Decode an @application/x-www-form-urlencoded@ 'BSL.ByteString' to a 'Form'.
367581--
@@ -395,11 +609,17 @@ urlEncodeForm = toLazyByteString . mconcat . intersperse (shortByteString "&") .
395609-- >>> urlDecodeForm "this=has=too=many=equals"
396610-- Left "not a valid pair: this=has=too=many=equals"
397611urlDecodeForm :: BSL.ByteString -> Either Text Form
398−urlDecodeForm bs = toForm <$> traverse parsePair pairs
612+urlDecodeForm = fmap toForm . urlDecodeParams
613+
614+-- | Decode an @application/x-www-form-urlencoded@ 'BSL.ByteString' to a list of key-value pairs.
615+--
616+-- See also 'urlDecodeForm'.
617+urlDecodeParams :: BSL.ByteString -> Either Text [(Text, Text)]
618+urlDecodeParams bs = traverse parsePair pairs
399619 where
400620 pairs = map (BSL8.split '=') (BSL8.split '&' bs)
401621
402− unescape = Text.decodeUtf8With lenientDecode . urlDecodeQuery . BSL.toStrict
622+ unescape = Text.decodeUtf8With lenientDecode . urlDecode True . BSL.toStrict
403623
404624 parsePair p =
405625 case map unescape p of
@@ -407,7 +627,6 @@ urlDecodeForm bs = toForm <$> traverse parsePair pairs
407627 [k] -> return (k, "")
408628 xs -> Left $ "not a valid pair: " <> Text.intercalate "=" xs
409629
410−data Proxy3 a b c = Proxy3
411630
412631-- | This is a convenience function for decoding a
413632-- @application/x-www-form-urlencoded@ 'BSL.ByteString' directly to a datatype
@@ -426,21 +645,48 @@ urlDecodeAsForm = fromForm <=< urlDecodeForm
426645--
427646-- This is effectively @'urlEncodeForm' . 'toForm'@.
428647--
429−-- >>> urlEncodeAsForm Person {name = "Dennis", age = 22}
430−-- "age=22&name=Dennis"
648+-- _NOTE:_ this encoding is unstable and may result in different key order
649+-- (but not values). For a stable encoding see 'urlEncodeAsFormStable'.
431650urlEncodeAsForm :: ToForm a => a -> BSL.ByteString
432651urlEncodeAsForm = urlEncodeForm . toForm
433652
653+-- | This is a convenience function for encoding a datatype that has instance
654+-- of 'ToForm' directly to a @application/x-www-form-urlencoded@
655+-- 'BSL.ByteString'.
656+--
657+-- This is effectively @'urlEncodeFormStable' . 'toForm'@.
658+--
659+-- >>> urlEncodeAsFormStable Person {name = "Dennis", age = 22}
660+-- "age=22&name=Dennis"
661+urlEncodeAsFormStable :: ToForm a => a -> BSL.ByteString
662+urlEncodeAsFormStable = urlEncodeFormStable . toForm
663+
434664-- | Find all values corresponding to a given key in a 'Form'.
435665--
436−-- >>> lookupKey "name" []
666+-- >>> lookupAll "name" []
437667-- []
438−-- >>> lookupKey "name" [("name", "Oleg")]
668+-- >>> lookupAll "name" [("name", "Oleg")]
439669-- ["Oleg"]
440−-- >>> lookupKey "name" [("name", "Oleg"), ("name", "David")]
670+-- >>> lookupAll "name" [("name", "Oleg"), ("name", "David")]
441671-- ["Oleg","David"]
442−lookupKey :: Text -> Form -> [Text]
443−lookupKey key = F.concat . HashMap.lookup key . unForm
672+lookupAll :: Text -> Form -> [Text]
673+lookupAll key = F.concat . HashMap.lookup key . unForm
674+
675+-- | Lookup an optional value for a key.
676+-- Fail if there is more than one value.
677+--
678+-- >>> lookupMaybe "name" []
679+-- Right Nothing
680+-- >>> lookupMaybe "name" [("name", "Oleg")]
681+-- Right (Just "Oleg")
682+-- >>> lookupMaybe "name" [("name", "Oleg"), ("name", "David")]
683+-- Left "Duplicate key \"name\""
684+lookupMaybe :: Text -> Form -> Either Text (Maybe Text)
685+lookupMaybe key form =
686+ case lookupAll key form of
687+ [] -> pure Nothing
688+ [v] -> pure (Just v)
689+ _ -> Left $ "Duplicate key " <> Text.pack (show key)
444690
445691-- | Lookup a unique value for a key.
446692-- Fail if there is zero or more than one value.
@@ -452,13 +698,43 @@ lookupKey key = F.concat . HashMap.lookup key . unForm
452698-- >>> lookupUnique "name" [("name", "Oleg"), ("name", "David")]
453699-- Left "Duplicate key \"name\""
454700lookupUnique :: Text -> Form -> Either Text Text
455−lookupUnique key form =
456− case lookupKey key form of
457− [v] -> pure v
458− [] -> Left $ "Could not find key " <> Text.pack (show key)
459− _ -> Left $ "Duplicate key " <> Text.pack (show key)
701+lookupUnique key form = do
702+ mv <- lookupMaybe key form
703+ case mv of
704+ Just v -> pure v
705+ Nothing -> Left $ "Could not find key " <> Text.pack (show key)
706+
707+-- | Lookup all values for a given key in a 'Form' and parse them with 'parseQueryParams'.
708+--
709+-- >>> parseAll "age" [] :: Either Text [Word8]
710+-- Right []
711+-- >>> parseAll "age" [("age", "8"), ("age", "seven")] :: Either Text [Word8]
712+-- Left "could not parse: `seven' (input does not start with a digit)"
713+-- >>> parseAll "age" [("age", "8"), ("age", "777")] :: Either Text [Word8]
714+-- Left "out of bounds: `777' (should be between 0 and 255)"
715+-- >>> parseAll "age" [("age", "12"), ("age", "25")] :: Either Text [Word8]
716+-- Right [12,25]
717+parseAll :: FromHttpApiData v => Text -> Form -> Either Text [v]
718+parseAll key = parseQueryParams . lookupAll key
719+
720+-- | Lookup an optional value for a given key and parse it with 'parseQueryParam'.
721+-- Fail if there is more than one value for the key.
722+--
723+-- >>> parseMaybe "age" [] :: Either Text (Maybe Word8)
724+-- Right Nothing
725+-- >>> parseMaybe "age" [("age", "12"), ("age", "25")] :: Either Text (Maybe Word8)
726+-- Left "Duplicate key \"age\""
727+-- >>> parseMaybe "age" [("age", "seven")] :: Either Text (Maybe Word8)
728+-- Left "could not parse: `seven' (input does not start with a digit)"
729+-- >>> parseMaybe "age" [("age", "777")] :: Either Text (Maybe Word8)
730+-- Left "out of bounds: `777' (should be between 0 and 255)"
731+-- >>> parseMaybe "age" [("age", "7")] :: Either Text (Maybe Word8)
732+-- Right (Just 7)
733+parseMaybe :: FromHttpApiData v => Text -> Form -> Either Text (Maybe v)
734+parseMaybe key = parseQueryParams <=< lookupMaybe key
460735
461736-- | Lookup a unique value for a given key and parse it with 'parseQueryParam'.
737+-- Fail if there is zero or more than one value for the key.
462738--
463739-- >>> parseUnique "age" [] :: Either Text Word8
464740-- Left "Could not find key \"age\""
@@ -473,16 +749,48 @@ lookupUnique key form =
473749parseUnique :: FromHttpApiData v => Text -> Form -> Either Text v
474750parseUnique key form = lookupUnique key form >>= parseQueryParam
475751
476−-- | Lookup all values for a given key in a 'Form' and parse them with 'parseQueryParams'.
752+-- | 'Generic'-based deriving options for 'ToForm' and 'FromForm'.
477753--
478−-- >>> parseAll "age" [] :: Either Text [Word8]
479−-- Right []
480−-- >>> parseAll "age" [("age", "8"), ("age", "seven")] :: Either Text [Word8]
481−-- Left "could not parse: `seven' (input does not start with a digit)"
482−-- >>> parseAll "age" [("age", "8"), ("age", "777")] :: Either Text [Word8]
483−-- Left "out of bounds: `777' (should be between 0 and 255)"
484−-- >>> parseAll "age" [("age", "12"), ("age", "25")] :: Either Text [Word8]
485−-- Right [12,25]
486−parseAll :: FromHttpApiData v => Text -> Form -> Either Text [v]
487−parseAll key = parseQueryParams . lookupKey key
754+-- A common use case for non-default 'FormOptions'
755+-- is to strip a prefix off of field labels:
756+--
757+-- @
758+-- data Project = Project
759+-- { projectName :: String
760+-- , projectSize :: Int
761+-- } deriving ('Generic', 'Show')
762+--
763+-- myOptions :: 'FormOptions'
764+-- myOptions = 'FormOptions'
765+-- { 'fieldLabelModifier' = 'map' 'toLower' . 'drop' ('length' \"project\") }
766+--
767+-- instance 'ToForm' Project where
768+-- 'toForm' = 'genericToForm' myOptions
769+--
770+-- instance 'FromForm' Project where
771+-- 'fromForm' = 'genericFromForm' myOptions
772+-- @
773+--
774+-- >>> urlEncodeAsFormStable Project { projectName = "http-api-data", projectSize = 172 }
775+-- "name=http-api-data&size=172"
776+-- >>> urlDecodeAsForm "name=http-api-data&size=172" :: Either Text Project
777+-- Right (Project {projectName = "http-api-data", projectSize = 172})
778+data FormOptions = FormOptions
779+ { -- | Function applied to field labels. Handy for removing common record prefixes for example.
780+ fieldLabelModifier :: String -> String
781+ }
782+
783+-- | Default encoding 'FormOptions'.
784+--
785+-- @
786+-- 'FormOptions'
787+-- { 'fieldLabelModifier' = id
788+-- }
789+-- @
790+defaultFormOptions :: FormOptions
791+defaultFormOptions = FormOptions
792+ { fieldLabelModifier = id
793+ }
488794
795+sortOn :: Ord b => (a -> b) -> [a] -> [a]
796+sortOn f = sortBy (comparing f)
src/Web/Internal/HttpApiData.hs+395−98
@@ -1,52 +1,86 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DefaultSignatures #-}
3−{-# LANGUAGE FlexibleInstances #-}
4−{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE ScopedTypeVariables #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DefaultSignatures #-}
3+{-# LANGUAGE DeriveDataTypeable #-}
4+{-# LANGUAGE DeriveFoldable #-}
5+{-# LANGUAGE DeriveFunctor #-}
6+{-# LANGUAGE DeriveTraversable #-}
7+{-# LANGUAGE FlexibleInstances #-}
8+{-# LANGUAGE KindSignatures #-}
9+{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE PolyKinds #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
612{-# LANGUAGE TypeSynonymInstances #-}
713-- |
814-- Convert Haskell values to and from HTTP API data
915-- such as URL pieces, headers and query parameters.
1016module Web.Internal.HttpApiData where
1117
12−#if __GLASGOW_HASKELL__ < 710
13−import Control.Applicative
14−import Data.Traversable (Traversable(traverse))
15−#endif
16−import Control.Arrow ((&&&), left)
17−import Control.Monad ((<=<))
18−
19−import Data.Monoid
20−import Data.ByteString (ByteString)
21−import qualified Data.ByteString as BS
22−
23−import Data.Int
24−import Data.Word
25−
26−import Data.Text (Text)
27−import Data.Text.Encoding (encodeUtf8, decodeUtf8')
28−import Data.Text.Read (signed, decimal, rational, Reader)
29−import qualified Data.Text as T
30−import qualified Data.Text.Lazy as L
31−
32−import Data.Time.Locale.Compat
33−import Data.Time
34−import Data.Version
35−
36−#if MIN_VERSION_base(4,8,0)
37−import Data.Void
38−#endif
39−
40−import Text.Read (readMaybe)
41−import Text.ParserCombinators.ReadP (readP_to_S)
18+import Prelude ()
19+import Prelude.Compat
20+
21+import Control.Applicative (Const(Const))
22+import Control.Arrow (left, (&&&))
23+import Control.Monad ((<=<))
24+import qualified Data.Attoparsec.Text as Atto
25+import qualified Data.Attoparsec.Time as Atto
26+import Data.ByteString (ByteString)
27+import qualified Data.ByteString as BS
28+import qualified Data.ByteString.Builder as BS
29+import qualified Data.ByteString.Lazy as LBS
30+import Data.Coerce (coerce)
31+import Data.Data (Data)
32+import qualified Data.Fixed as F
33+import Data.Functor.Identity (Identity(Identity))
34+import Data.Int (Int16, Int32, Int64, Int8)
35+import Data.Kind (Type)
36+import qualified Data.Map as Map
37+import Data.Monoid (All (..), Any (..), Dual (..),
38+ First (..), Last (..),
39+ Product (..), Sum (..))
40+import Data.Semigroup (Semigroup (..))
41+import qualified Data.Semigroup as Semi
42+import Data.Tagged (Tagged (..))
43+import Data.Text (Text)
44+import qualified Data.Text as T
45+import Data.Text.Encoding (decodeUtf8', decodeUtf8With,
46+ encodeUtf8)
47+import Data.Text.Encoding.Error (lenientDecode)
48+import qualified Data.Text.Lazy as L
49+import Data.Text.Read (Reader, decimal, rational,
50+ signed)
51+import Data.Time.Compat (Day, FormatTime, LocalTime,
52+ NominalDiffTime, TimeOfDay,
53+ UTCTime, ZonedTime, formatTime,
54+ DayOfWeek (..),
55+ nominalDiffTimeToSeconds,
56+ secondsToNominalDiffTime)
57+import Data.Time.Format.Compat (defaultTimeLocale,
58+ iso8601DateFormat)
59+import Data.Time.Calendar.Month.Compat (Month)
60+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..),
61+ toYearQuarter)
62+import Data.Typeable (Typeable)
63+import qualified Data.UUID.Types as UUID
64+import Data.Version (Version, parseVersion,
65+ showVersion)
66+import Data.Void (Void, absurd)
67+import Data.Word (Word16, Word32, Word64, Word8)
68+import qualified Network.HTTP.Types as H
69+import Numeric.Natural (Natural)
70+import Text.ParserCombinators.ReadP (readP_to_S)
71+import Text.Read (readMaybe)
72+import Web.Cookie (SetCookie, parseSetCookie,
73+ renderSetCookie)
4274
4375#if USE_TEXT_SHOW
44−import TextShow (TextShow, showt)
76+import TextShow (TextShow, showt)
4577#endif
4678
4779-- $setup
4880-- >>> data BasicAuthToken = BasicAuthToken Text deriving (Show)
4981-- >>> instance FromHttpApiData BasicAuthToken where parseHeader h = BasicAuthToken <$> parseHeaderWithPrefix "Basic " h; parseQueryParam p = BasicAuthToken <$> parseQueryParam p
82+-- >>> import Data.Time.Compat
83+-- >>> import Data.Version
5084
5185-- | Convert value to HTTP API data.
5286--
@@ -58,6 +92,12 @@ class ToHttpApiData a where
5892 toUrlPiece :: a -> Text
5993 toUrlPiece = toQueryParam
6094
95+ -- | Convert to a URL path piece, making sure to encode any special chars.
96+ -- The default definition uses 'H.encodePathSegmentsRelative',
97+ -- but this may be overriden with a more efficient version.
98+ toEncodedUrlPiece :: a -> BS.Builder
99+ toEncodedUrlPiece = H.urlEncodeBuilder True . encodeUtf8 . toUrlPiece
100+
61101 -- | Convert to HTTP header value.
62102 toHeader :: a -> ByteString
63103 toHeader = encodeUtf8 . toUrlPiece
@@ -298,7 +338,7 @@ lookupBoundedEnumOf f = flip lookup (map (f &&& id) [minBound..maxBound])
298338-- >>> parseBoundedEnumOf toUrlPiece "true" :: Either Text Bool
299339-- Right True
300340--
301−-- For case sensitive parser see 'parseBoundedEnumOfI'.
341+-- For case insensitive parser see 'parseBoundedEnumOfI'.
302342parseBoundedEnumOf :: (Bounded a, Enum a) => (a -> Text) -> Text -> Either Text a
303343parseBoundedEnumOf = parseMaybeTextData . lookupBoundedEnumOf
304344
@@ -343,7 +383,7 @@ parseBoundedHeader bs = case lookupBoundedEnumOf toHeader bs of
343383-- Right 1991-06-02
344384--
345385-- This parser is case sensitive and will not match @'showTextData'@
346−-- in presense of letters:
386+-- in presence of letters:
347387--
348388-- >>> readTextData (showTextData True) :: Either Text Bool
349389-- Left "could not parse: `true'"
@@ -375,79 +415,193 @@ parseBounded reader input = do
375415 l = toInteger (minBound :: a)
376416 h = toInteger (maxBound :: a)
377417
418+-- | Convert to a URL-encoded path piece using 'toUrlPiece'.
419+-- /Note/: this function does not check if the result contains unescaped characters!
420+-- This function can be used to override 'toEncodedUrlPiece' as a more efficient implementation
421+-- when the resulting URL piece /never/ has to be escaped.
422+unsafeToEncodedUrlPiece :: ToHttpApiData a => a -> BS.Builder
423+unsafeToEncodedUrlPiece = BS.byteString . encodeUtf8 . toUrlPiece
424+
378425-- |
379426-- >>> toUrlPiece ()
380427-- "_"
381428instance ToHttpApiData () where
382429 toUrlPiece () = "_"
430+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
383431
384−instance ToHttpApiData Char where toUrlPiece = T.singleton
432+instance ToHttpApiData Char where
433+ toUrlPiece = T.singleton
385434
386435-- |
387436-- >>> toUrlPiece (Version [1, 2, 3] [])
388437-- "1.2.3"
389438instance ToHttpApiData Version where
390439 toUrlPiece = T.pack . showVersion
391−
392−#if MIN_VERSION_base(4,8,0)
393−instance ToHttpApiData Void where
394− toUrlPiece = absurd
395−#endif
396−
397−instance ToHttpApiData Bool where toUrlPiece = showTextData
398−instance ToHttpApiData Ordering where toUrlPiece = showTextData
399−
400−instance ToHttpApiData Double where toUrlPiece = showt
401−instance ToHttpApiData Float where toUrlPiece = showt
402−instance ToHttpApiData Int where toUrlPiece = showt
403−instance ToHttpApiData Int8 where toUrlPiece = showt
404−instance ToHttpApiData Int16 where toUrlPiece = showt
405−instance ToHttpApiData Int32 where toUrlPiece = showt
406−instance ToHttpApiData Int64 where toUrlPiece = showt
407−instance ToHttpApiData Integer where toUrlPiece = showt
408−instance ToHttpApiData Word where toUrlPiece = showt
409−instance ToHttpApiData Word8 where toUrlPiece = showt
410−instance ToHttpApiData Word16 where toUrlPiece = showt
411−instance ToHttpApiData Word32 where toUrlPiece = showt
412−instance ToHttpApiData Word64 where toUrlPiece = showt
440+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
441+
442+instance ToHttpApiData Void where toUrlPiece = absurd
443+instance ToHttpApiData Natural where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
444+
445+instance ToHttpApiData Bool where toUrlPiece = showTextData; toEncodedUrlPiece = unsafeToEncodedUrlPiece
446+instance ToHttpApiData Ordering where toUrlPiece = showTextData; toEncodedUrlPiece = unsafeToEncodedUrlPiece
447+
448+instance ToHttpApiData Double where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
449+instance ToHttpApiData Float where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
450+instance ToHttpApiData Int where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
451+instance ToHttpApiData Int8 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
452+instance ToHttpApiData Int16 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
453+instance ToHttpApiData Int32 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
454+instance ToHttpApiData Int64 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
455+instance ToHttpApiData Integer where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
456+instance ToHttpApiData Word where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
457+instance ToHttpApiData Word8 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
458+instance ToHttpApiData Word16 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
459+instance ToHttpApiData Word32 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
460+instance ToHttpApiData Word64 where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
461+
462+-- | Note: this instance is not polykinded
463+instance F.HasResolution a => ToHttpApiData (F.Fixed (a :: Type)) where toUrlPiece = showt; toEncodedUrlPiece = unsafeToEncodedUrlPiece
413464
414465-- |
415466-- >>> toUrlPiece (fromGregorian 2015 10 03)
416467-- "2015-10-03"
417−instance ToHttpApiData Day where toUrlPiece = T.pack . show
468+instance ToHttpApiData Day where
469+ toUrlPiece = T.pack . show
470+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
418471
419472timeToUrlPiece :: FormatTime t => String -> t -> Text
420473timeToUrlPiece fmt = T.pack . formatTime defaultTimeLocale (iso8601DateFormat (Just fmt))
421474
422475-- |
423−-- >>> toUrlPiece $ LocalTime (fromGregorian 2015 10 03) (TimeOfDay 14 55 01)
424−-- "2015-10-03T14:55:01"
425−instance ToHttpApiData LocalTime where toUrlPiece = timeToUrlPiece "%H:%M:%S"
476+-- >>> toUrlPiece $ TimeOfDay 14 55 23.1
477+-- "14:55:23.1"
478+instance ToHttpApiData TimeOfDay where
479+ toUrlPiece = T.pack . formatTime defaultTimeLocale "%H:%M:%S%Q"
480+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
426481
427482-- |
428−-- >>> toUrlPiece $ ZonedTime (LocalTime (fromGregorian 2015 10 03) (TimeOfDay 14 55 01)) utc
429−-- "2015-10-03T14:55:01+0000"
430−instance ToHttpApiData ZonedTime where toUrlPiece = timeToUrlPiece "%H:%M:%S%z"
483+-- >>> toUrlPiece $ LocalTime (fromGregorian 2015 10 03) (TimeOfDay 14 55 21.687)
484+-- "2015-10-03T14:55:21.687"
485+instance ToHttpApiData LocalTime where
486+ toUrlPiece = timeToUrlPiece "%H:%M:%S%Q"
487+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
488+
489+-- |
490+-- >>> toUrlPiece $ ZonedTime (LocalTime (fromGregorian 2015 10 03) (TimeOfDay 14 55 51.001)) utc
491+-- "2015-10-03T14:55:51.001+0000"
492+instance ToHttpApiData ZonedTime where
493+ toUrlPiece = timeToUrlPiece "%H:%M:%S%Q%z"
494+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
495+
496+-- |
497+-- >>> toUrlPiece $ UTCTime (fromGregorian 2015 10 03) 864.5
498+-- "2015-10-03T00:14:24.5Z"
499+instance ToHttpApiData UTCTime where
500+ toUrlPiece = timeToUrlPiece "%H:%M:%S%QZ"
501+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
502+
503+-- |
504+-- >>> toUrlPiece Monday
505+-- "monday"
506+instance ToHttpApiData DayOfWeek where
507+ toUrlPiece Monday = "monday"
508+ toUrlPiece Tuesday = "tuesday"
509+ toUrlPiece Wednesday = "wednesday"
510+ toUrlPiece Thursday = "thursday"
511+ toUrlPiece Friday = "friday"
512+ toUrlPiece Saturday = "saturday"
513+ toUrlPiece Sunday = "sunday"
514+
515+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
516+
517+-- |
518+-- >>> toUrlPiece Q4
519+-- "q4"
520+instance ToHttpApiData QuarterOfYear where
521+ toUrlPiece Q1 = "q1"
522+ toUrlPiece Q2 = "q2"
523+ toUrlPiece Q3 = "q3"
524+ toUrlPiece Q4 = "q4"
525+
526+-- |
527+-- >>> import Data.Time.Calendar.Quarter.Compat (Quarter (..))
528+-- >>> MkQuarter 8040
529+-- 2010-Q1
530+--
531+-- >>> toUrlPiece $ MkQuarter 8040
532+-- "2010-q1"
533+--
534+instance ToHttpApiData Quarter where
535+ toUrlPiece q = case toYearQuarter q of
536+ (y, qoy) -> T.pack (show y ++ "-" ++ f qoy)
537+ where
538+ f Q1 = "q1"
539+ f Q2 = "q2"
540+ f Q3 = "q3"
541+ f Q4 = "q4"
431542
432543-- |
433−-- >>> toUrlPiece $ UTCTime (fromGregorian 2015 10 03) 864
434−-- "2015-10-03T00:14:24Z"
435−instance ToHttpApiData UTCTime where toUrlPiece = timeToUrlPiece "%H:%M:%SZ"
544+-- >>> import Data.Time.Calendar.Month.Compat (Month (..))
545+-- >>> MkMonth 24482
546+-- 2040-03
547+--
548+-- >>> toUrlPiece $ MkMonth 24482
549+-- "2040-03"
550+--
551+instance ToHttpApiData Month where
552+ toUrlPiece = T.pack . formatTime defaultTimeLocale "%Y-%m"
436553
437−instance ToHttpApiData NominalDiffTime where toUrlPiece = toUrlPiece . (floor :: NominalDiffTime -> Integer)
554+instance ToHttpApiData NominalDiffTime where
555+ toUrlPiece = toUrlPiece . nominalDiffTimeToSeconds
556+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
438557
439558instance ToHttpApiData String where toUrlPiece = T.pack
440559instance ToHttpApiData Text where toUrlPiece = id
441560instance ToHttpApiData L.Text where toUrlPiece = L.toStrict
442561
443−instance ToHttpApiData All where toUrlPiece = toUrlPiece . getAll
444−instance ToHttpApiData Any where toUrlPiece = toUrlPiece . getAny
562+instance ToHttpApiData All where
563+ toUrlPiece = coerce (toUrlPiece :: Bool -> Text)
564+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: Bool -> BS.Builder)
565+
566+instance ToHttpApiData Any where
567+ toUrlPiece = coerce (toUrlPiece :: Bool -> Text)
568+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: Bool -> BS.Builder)
569+
570+instance ToHttpApiData a => ToHttpApiData (Dual a) where
571+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
572+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
573+
574+instance ToHttpApiData a => ToHttpApiData (Sum a) where
575+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
576+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
577+
578+instance ToHttpApiData a => ToHttpApiData (Product a) where
579+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
580+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
581+
582+instance ToHttpApiData a => ToHttpApiData (First a) where
583+ toUrlPiece = coerce (toUrlPiece :: Maybe a -> Text)
584+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: Maybe a -> BS.Builder)
445585
446−instance ToHttpApiData a => ToHttpApiData (Dual a) where toUrlPiece = toUrlPiece . getDual
447−instance ToHttpApiData a => ToHttpApiData (Sum a) where toUrlPiece = toUrlPiece . getSum
448−instance ToHttpApiData a => ToHttpApiData (Product a) where toUrlPiece = toUrlPiece . getProduct
449−instance ToHttpApiData a => ToHttpApiData (First a) where toUrlPiece = toUrlPiece . getFirst
450−instance ToHttpApiData a => ToHttpApiData (Last a) where toUrlPiece = toUrlPiece . getLast
586+instance ToHttpApiData a => ToHttpApiData (Last a) where
587+ toUrlPiece = coerce (toUrlPiece :: Maybe a -> Text)
588+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: Maybe a -> BS.Builder)
589+
590+instance ToHttpApiData a => ToHttpApiData (Semi.Min a) where
591+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
592+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
593+
594+instance ToHttpApiData a => ToHttpApiData (Semi.Max a) where
595+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
596+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
597+
598+instance ToHttpApiData a => ToHttpApiData (Semi.First a) where
599+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
600+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
601+
602+instance ToHttpApiData a => ToHttpApiData (Semi.Last a) where
603+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
604+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
451605
452606-- |
453607-- >>> toUrlPiece (Just "Hello")
@@ -465,6 +619,41 @@ instance (ToHttpApiData a, ToHttpApiData b) => ToHttpApiData (Either a b) where
465619 toUrlPiece (Left x) = "left " <> toUrlPiece x
466620 toUrlPiece (Right x) = "right " <> toUrlPiece x
467621
622+-- | /Note:/ this instance works correctly for alphanumeric name and value
623+--
624+-- >>> let Right c = parseUrlPiece "SESSID=r2t5uvjq435r4q7ib3vtdjq120" :: Either Text SetCookie
625+-- >>> toUrlPiece c
626+-- "SESSID=r2t5uvjq435r4q7ib3vtdjq120"
627+--
628+-- >>> toHeader c
629+-- "SESSID=r2t5uvjq435r4q7ib3vtdjq120"
630+--
631+instance ToHttpApiData SetCookie where
632+ toUrlPiece = decodeUtf8With lenientDecode . toHeader
633+ toHeader = LBS.toStrict . BS.toLazyByteString . renderSetCookie
634+ -- toEncodedUrlPiece = renderSetCookie -- doesn't do things.
635+
636+-- | Note: this instance is not polykinded
637+instance ToHttpApiData a => ToHttpApiData (Tagged (b :: Type) a) where
638+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
639+ toHeader = coerce (toHeader :: a -> ByteString)
640+ toQueryParam = coerce (toQueryParam :: a -> Text)
641+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
642+
643+-- | @since 0.4.2
644+instance ToHttpApiData a => ToHttpApiData (Const a b) where
645+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
646+ toHeader = coerce (toHeader :: a -> ByteString)
647+ toQueryParam = coerce (toQueryParam :: a -> Text)
648+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
649+
650+-- | @since 0.4.2
651+instance ToHttpApiData a => ToHttpApiData (Identity a) where
652+ toUrlPiece = coerce (toUrlPiece :: a -> Text)
653+ toHeader = coerce (toHeader :: a -> ByteString)
654+ toQueryParam = coerce (toQueryParam :: a -> Text)
655+ toEncodedUrlPiece = coerce (toEncodedUrlPiece :: a -> BS.Builder)
656+
468657-- |
469658-- >>> parseUrlPiece "_" :: Either Text ()
470659-- Right ()
@@ -476,7 +665,7 @@ instance FromHttpApiData Char where
476665 parseUrlPiece s =
477666 case T.uncons s of
478667 Just (c, s') | T.null s' -> pure c
479− _ -> defaultParseError s
668+ _ -> defaultParseError s
480669
481670-- |
482671-- >>> showVersion <$> parseUrlPiece "1.2.3"
@@ -487,11 +676,16 @@ instance FromHttpApiData Version where
487676 ((x, ""):_) -> pure x
488677 _ -> defaultParseError s
489678
490−#if MIN_VERSION_base(4,8,0)
491679-- | Parsing a @'Void'@ value is always an error, considering @'Void'@ as a data type with no constructors.
492680instance FromHttpApiData Void where
493681 parseUrlPiece _ = Left "Void cannot be parsed!"
494−#endif
682+
683+instance FromHttpApiData Natural where
684+ parseUrlPiece s = do
685+ n <- runReader (signed decimal) s
686+ if n < 0
687+ then Left ("underflow: " <> s <> " (should be a non-negative integer)")
688+ else Right (fromInteger n)
495689
496690instance FromHttpApiData Bool where parseUrlPiece = parseBoundedUrlPiece
497691instance FromHttpApiData Ordering where parseUrlPiece = parseBoundedUrlPiece
@@ -512,41 +706,89 @@ instance FromHttpApiData String where parseUrlPiece = Right . T.unpack
512706instance FromHttpApiData Text where parseUrlPiece = Right
513707instance FromHttpApiData L.Text where parseUrlPiece = Right . L.fromStrict
514708
709+-- | Note: this instance is not polykinded
710+instance F.HasResolution a => FromHttpApiData (F.Fixed (a :: Type)) where
711+ parseUrlPiece = runReader rational
712+
515713-- |
516714-- >>> toGregorian <$> parseUrlPiece "2016-12-01"
517715-- Right (2016,12,1)
518−instance FromHttpApiData Day where parseUrlPiece = readTextData
716+instance FromHttpApiData Day where parseUrlPiece = runAtto Atto.day
519717
520−timeParseUrlPiece :: ParseTime t => String -> Text -> Either Text t
521−timeParseUrlPiece fmt = parseMaybeTextData (timeParseUrlPieceMaybe . T.unpack)
522− where
523− timeParseUrlPieceMaybe = parseTime defaultTimeLocale (iso8601DateFormat (Just fmt))
718+-- |
719+-- >>> parseUrlPiece "14:55:01.333" :: Either Text TimeOfDay
720+-- Right 14:55:01.333
721+instance FromHttpApiData TimeOfDay where parseUrlPiece = runAtto Atto.timeOfDay
524722
525723-- |
526724-- >>> parseUrlPiece "2015-10-03T14:55:01" :: Either Text LocalTime
527725-- Right 2015-10-03 14:55:01
528−instance FromHttpApiData LocalTime where parseUrlPiece = timeParseUrlPiece "%H:%M:%S"
726+instance FromHttpApiData LocalTime where parseUrlPiece = runAtto Atto.localTime
529727
530728-- |
531729-- >>> parseUrlPiece "2015-10-03T14:55:01+0000" :: Either Text ZonedTime
532730-- Right 2015-10-03 14:55:01 +0000
533−instance FromHttpApiData ZonedTime where parseUrlPiece = timeParseUrlPiece "%H:%M:%S%z"
731+--
732+-- >>> parseQueryParam "2016-12-31T01:00:00Z" :: Either Text ZonedTime
733+-- Right 2016-12-31 01:00:00 +0000
734+instance FromHttpApiData ZonedTime where parseUrlPiece = runAtto Atto.zonedTime
534735
535736-- |
536737-- >>> parseUrlPiece "2015-10-03T00:14:24Z" :: Either Text UTCTime
537738-- Right 2015-10-03 00:14:24 UTC
538−instance FromHttpApiData UTCTime where parseUrlPiece = timeParseUrlPiece "%H:%M:%SZ"
739+instance FromHttpApiData UTCTime where parseUrlPiece = runAtto Atto.utcTime
539740
540−instance FromHttpApiData NominalDiffTime where parseUrlPiece = fmap fromInteger . parseUrlPiece
741+-- |
742+-- >>> parseUrlPiece "Monday" :: Either Text DayOfWeek
743+-- Right Monday
744+instance FromHttpApiData DayOfWeek where
745+ parseUrlPiece t = case Map.lookup (T.toLower t) m of
746+ Just dow -> Right dow
747+ Nothing -> Left $ "Incorrect DayOfWeek: " <> T.take 10 t
748+ where
749+ m :: Map.Map Text DayOfWeek
750+ m = Map.fromList [ (toUrlPiece dow, dow) | dow <- [Monday .. Sunday] ]
541751
542−instance FromHttpApiData All where parseUrlPiece = fmap All . parseUrlPiece
543−instance FromHttpApiData Any where parseUrlPiece = fmap Any . parseUrlPiece
544752
545−instance FromHttpApiData a => FromHttpApiData (Dual a) where parseUrlPiece = fmap Dual . parseUrlPiece
546−instance FromHttpApiData a => FromHttpApiData (Sum a) where parseUrlPiece = fmap Sum . parseUrlPiece
547−instance FromHttpApiData a => FromHttpApiData (Product a) where parseUrlPiece = fmap Product . parseUrlPiece
548−instance FromHttpApiData a => FromHttpApiData (First a) where parseUrlPiece = fmap First . parseUrlPiece
549−instance FromHttpApiData a => FromHttpApiData (Last a) where parseUrlPiece = fmap Last . parseUrlPiece
753+instance FromHttpApiData NominalDiffTime where parseUrlPiece = fmap secondsToNominalDiffTime . parseUrlPiece
754+
755+-- |
756+-- >>> parseUrlPiece "2021-01" :: Either Text Month
757+-- Right 2021-01
758+instance FromHttpApiData Month where parseUrlPiece = runAtto Atto.month
759+
760+-- |
761+-- >>> parseUrlPiece "2021-q1" :: Either Text Quarter
762+-- Right 2021-Q1
763+instance FromHttpApiData Quarter where parseUrlPiece = runAtto Atto.quarter
764+
765+-- |
766+-- >>> parseUrlPiece "q2" :: Either Text QuarterOfYear
767+-- Right Q2
768+--
769+-- >>> parseUrlPiece "Q3" :: Either Text QuarterOfYear
770+-- Right Q3
771+instance FromHttpApiData QuarterOfYear where
772+ parseUrlPiece t = case T.toLower t of
773+ "q1" -> return Q1
774+ "q2" -> return Q2
775+ "q3" -> return Q3
776+ "q4" -> return Q4
777+ _ -> Left "Invalid quarter of year"
778+
779+instance FromHttpApiData All where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)
780+instance FromHttpApiData Any where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)
781+
782+instance FromHttpApiData a => FromHttpApiData (Dual a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
783+instance FromHttpApiData a => FromHttpApiData (Sum a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
784+instance FromHttpApiData a => FromHttpApiData (Product a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
785+instance FromHttpApiData a => FromHttpApiData (First a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text (Maybe a))
786+instance FromHttpApiData a => FromHttpApiData (Last a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text (Maybe a))
787+
788+instance FromHttpApiData a => FromHttpApiData (Semi.Min a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
789+instance FromHttpApiData a => FromHttpApiData (Semi.Max a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
790+instance FromHttpApiData a => FromHttpApiData (Semi.First a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
791+instance FromHttpApiData a => FromHttpApiData (Semi.Last a) where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
550792
551793-- |
552794-- >>> parseUrlPiece "Just 123" :: Either Text (Maybe Int)
@@ -568,3 +810,58 @@ instance (FromHttpApiData a, FromHttpApiData b) => FromHttpApiData (Either a b)
568810 Left _ <!> y = y
569811 x <!> _ = x
570812
813+instance ToHttpApiData UUID.UUID where
814+ toUrlPiece = UUID.toText
815+ toHeader = UUID.toASCIIBytes
816+ toEncodedUrlPiece = unsafeToEncodedUrlPiece
817+
818+instance FromHttpApiData UUID.UUID where
819+ parseUrlPiece = maybe (Left "invalid UUID") Right . UUID.fromText
820+ parseHeader = maybe (Left "invalid UUID") Right . UUID.fromASCIIBytes
821+
822+
823+-- | Lenient parameters. 'FromHttpApiData' combinators always return `Right`.
824+--
825+-- @since 0.3.5
826+newtype LenientData a = LenientData { getLenientData :: Either Text a }
827+ deriving (Eq, Ord, Show, Read, Typeable, Data, Functor, Foldable, Traversable)
828+
829+instance FromHttpApiData a => FromHttpApiData (LenientData a) where
830+ parseUrlPiece = Right . LenientData . parseUrlPiece
831+ parseHeader = Right . LenientData . parseHeader
832+ parseQueryParam = Right . LenientData . parseQueryParam
833+
834+-- | /Note:/ this instance works correctly for alphanumeric name and value
835+--
836+-- >>> parseUrlPiece "SESSID=r2t5uvjq435r4q7ib3vtdjq120" :: Either Text SetCookie
837+-- Right (SetCookie {setCookieName = "SESSID", setCookieValue = "r2t5uvjq435r4q7ib3vtdjq120", setCookiePath = Nothing, setCookieExpires = Nothing, setCookieMaxAge = Nothing, setCookieDomain = Nothing, setCookieHttpOnly = False, setCookieSecure = False, setCookieSameSite = Nothing})
838+instance FromHttpApiData SetCookie where
839+ parseUrlPiece = parseHeader . encodeUtf8
840+ parseHeader = Right . parseSetCookie
841+
842+-- | Note: this instance is not polykinded
843+instance FromHttpApiData a => FromHttpApiData (Tagged (b :: Type) a) where
844+ parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
845+ parseHeader = coerce (parseHeader :: ByteString -> Either Text a)
846+ parseQueryParam = coerce (parseQueryParam :: Text -> Either Text a)
847+
848+-- | @since 0.4.2
849+instance FromHttpApiData a => FromHttpApiData (Const a b) where
850+ parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
851+ parseHeader = coerce (parseHeader :: ByteString -> Either Text a)
852+ parseQueryParam = coerce (parseQueryParam :: Text -> Either Text a)
853+
854+-- | @since 0.4.2
855+instance FromHttpApiData a => FromHttpApiData (Identity a) where
856+ parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text a)
857+ parseHeader = coerce (parseHeader :: ByteString -> Either Text a)
858+ parseQueryParam = coerce (parseQueryParam :: Text -> Either Text a)
859+
860+-------------------------------------------------------------------------------
861+-- Attoparsec helpers
862+-------------------------------------------------------------------------------
863+
864+runAtto :: Atto.Parser a -> Text -> Either Text a
865+runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of
866+ Left err -> Left (T.pack err)
867+ Right x -> Right x
stack-ghc-7.10.yamldeleted−11
@@ -1,11 +0,0 @@
1−resolver: lts-6.8
2−
3−packages:
4−- '.'
5−
6−flags:
7− http-api-data:
8− use-text-show: false
9−
10−extra-deps: []
11−extra-package-dbs: []
stack-ghc-7.8.yamldeleted−23
@@ -1,23 +0,0 @@
1−resolver: lts-2.22
2−
3−packages:
4−- '.'
5−
6−flags:
7− http-api-data:
8− use-text-show: false
9−
10−extra-deps:
11−- time-locale-compat-0.1.1.3
12−- uri-bytestring-0.2.2.0
13−# below are dependencies necessary for use-text-show=true
14−- text-show-2.1.2
15−- base-compat-0.9.1
16−- bifunctors-5.2
17−- semigroups-0.16.2.2
18−- th-lift-0.7.6
19−- transformers-compat-0.4.0.4
20−- base-orphans-0.5.4
21−- generic-deriving-1.9.0
22−- doctest-0.11.0
23−extra-package-dbs: []
stack.yaml+1−6
@@ -1,11 +1,6 @@
1−resolver: nightly-2016-07-19
2−
1+resolver: lts-12.10
32packages:
43- '.'
5−
64flags:
75 http-api-data:
86 use-text-show: false
9−
10−extra-deps: []
11−extra-package-dbs: []
test/DocTest.hsdeleted−30
@@ -1,30 +0,0 @@
1−module Main where
2−
3−import Build_doctest (autogen_dir, deps)
4−import Control.Applicative
5−import Control.Monad
6−import Data.List
7−import System.Directory
8−import System.FilePath
9−import Test.DocTest
10−
11−main :: IO ()
12−main = getSources >>= \sources -> doctest $
13− "-isrc"
14− : ("-i" ++ autogen_dir)
15− : "-optP-include"
16− : ("-optP" ++ autogen_dir ++ "/cabal_macros.h")
17− : "-hide-all-packages"
18− : map ("-package="++) deps ++ sources
19−
20−getSources :: IO [FilePath]
21−getSources = filter (isSuffixOf ".hs") <$> go "src"
22− where
23− go dir = do
24− (dirs, files) <- getFilesAndDirectories dir
25− (files ++) . concat <$> mapM go dirs
26−
27−getFilesAndDirectories :: FilePath -> IO ([FilePath], [FilePath])
28−getFilesAndDirectories dir = do
29− c <- map (dir </>) . filter (`notElem` ["..", "."]) <$> getDirectoryContents dir
30− (,) <$> filterM doesDirectoryExist c <*> filterM doesFileExist c
test/Web/Internal/HttpApiDataSpec.hs+74−18
@@ -1,29 +1,61 @@
1−{-# Language ScopedTypeVariables #-}
1+{-# LANGUAGE ScopedTypeVariables #-}
22module Web.Internal.HttpApiDataSpec (spec) where
33
4−import Data.Int
5−import Data.Word
6−import Data.Time
7−import qualified Data.Text as T
8−import qualified Data.Text.Lazy as L
9−import qualified Data.ByteString as BS
10−import Data.Version
114
12−import Data.Proxy
13−import Test.Hspec
14−import Test.Hspec.QuickCheck(prop)
15−import Test.QuickCheck
5+import Prelude ()
6+import Prelude.Compat
167
17−import Web.Internal.HttpApiData
8+import qualified Data.ByteString as BS
9+import Data.ByteString.Builder (toLazyByteString)
10+import Data.Char
11+import qualified Data.Fixed as F
12+import Data.Int
13+import qualified Data.Text as T
14+import qualified Data.Text.Encoding as TE
15+import qualified Data.Text.Lazy as L
16+import Data.Time.Compat
17+import Data.Time.Calendar.Month.Compat (Month)
18+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..))
19+import qualified Data.UUID.Types as UUID
20+import Data.Version
21+import Data.Word
22+import Web.Cookie (SetCookie, defaultSetCookie,
23+ setCookieName, setCookieValue)
1824
19−import Web.Internal.TestInstances
25+import Data.Proxy
2026
27+import Numeric.Natural
2128
22−(<=>) :: Eq a => (a -> b) -> (b -> Either T.Text a) -> a -> Bool
23−(f <=> g) x = g (f x) == Right x
29+import Test.Hspec
30+import Test.Hspec.QuickCheck (prop)
31+import Test.QuickCheck
2432
33+import Web.Internal.HttpApiData
34+
35+import Web.Internal.TestInstances
36+
37+(<=>) :: forall a b. (Show a, Show b, Eq a) => (a -> b) -> (b -> Either T.Text a) -> a -> Property
38+(f <=> g) x = counterexample
39+ (show lhs' ++ " : " ++ show lhs ++ " /= " ++ show rhs)
40+ (lhs == rhs)
41+ where
42+ lhs' = f x
43+ lhs = g lhs' :: Either T.Text a
44+ rhs = Right x :: Either T.Text a
45+
46+encodedUrlPieceProp :: ToHttpApiData a => a -> Property
47+encodedUrlPieceProp x = toLazyByteString (toEncodedUrlPiece (toUrlPiece x)) === toLazyByteString (toEncodedUrlPiece x)
48+
49+-- | Check 'ToHttpApiData' and 'FromHttpApiData' compatibility
2550checkUrlPiece :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Show a, Arbitrary a) => Proxy a -> String -> Spec
26−checkUrlPiece _ name = prop name (toUrlPiece <=> parseUrlPiece :: a -> Bool)
51+checkUrlPiece _ = checkUrlPiece' (arbitrary :: Gen a)
52+
53+checkUrlPiece' :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Show a) => Gen a -> String -> Spec
54+checkUrlPiece' gen name = describe name $ do
55+ prop "toUrlPiece <=> parseUrlPiece" $ forAll gen (toUrlPiece <=> parseUrlPiece :: a -> Property)
56+ prop "toQueryParam <=> parseQueryParam" $ forAll gen (toQueryParam <=> parseQueryParam :: a -> Property)
57+ prop "toHeader <=> parseHeader" $ forAll gen (toHeader <=> parseHeader :: a -> Property)
58+ prop "toEncodedUrlPiece encodes correctly" $ forAll gen encodedUrlPieceProp
2759
2860-- | Check case insensitivity for @parseUrlPiece@.
2961checkUrlPieceI :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Arbitrary a) => Proxy a -> String -> Spec
@@ -31,7 +63,7 @@ checkUrlPieceI _ = checkUrlPiece (Proxy :: Proxy (RandomCase a))
3163
3264spec :: Spec
3365spec = do
34− describe "toUrlPiece <=> parseUrlPiece" $ do
66+ describe "Instances" $ do
3567 checkUrlPiece (Proxy :: Proxy ()) "()"
3668 checkUrlPiece (Proxy :: Proxy Char) "Char"
3769 checkUrlPieceI (Proxy :: Proxy Bool) "Bool"
@@ -51,17 +83,35 @@ spec = do
5183 checkUrlPiece (Proxy :: Proxy T.Text) "Text.Strict"
5284 checkUrlPiece (Proxy :: Proxy L.Text) "Text.Lazy"
5385 checkUrlPiece (Proxy :: Proxy Day) "Day"
86+ checkUrlPiece (Proxy :: Proxy TimeOfDay) "TimeOfDay"
5487 checkUrlPiece (Proxy :: Proxy LocalTime) "LocalTime"
5588 checkUrlPiece (Proxy :: Proxy ZonedTime) "ZonedTime"
5689 checkUrlPiece (Proxy :: Proxy UTCTime) "UTCTime"
5790 checkUrlPiece (Proxy :: Proxy NominalDiffTime) "NominalDiffTime"
91+ checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"
92+ checkUrlPiece (Proxy :: Proxy Quarter) "Quarter"
93+ checkUrlPiece (Proxy :: Proxy QuarterOfYear) "QuarterOfYear"
94+ checkUrlPiece (Proxy :: Proxy Month) "Month"
95+ checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"
5896 checkUrlPiece (Proxy :: Proxy Version) "Version"
97+ checkUrlPiece (Proxy :: Proxy UUID.UUID) "UUID"
98+ checkUrlPiece' setCookieGen "Cookie"
99+
100+ checkUrlPiece (Proxy :: Proxy F.Uni) "Uni"
101+ checkUrlPiece (Proxy :: Proxy F.Deci) "Deci"
102+ checkUrlPiece (Proxy :: Proxy F.Centi) "Centi"
103+ checkUrlPiece (Proxy :: Proxy F.Milli) "Milli"
104+ checkUrlPiece (Proxy :: Proxy F.Micro) "Micro"
105+ checkUrlPiece (Proxy :: Proxy F.Nano) "Nano"
106+ checkUrlPiece (Proxy :: Proxy F.Pico) "Pico"
59107
60108 checkUrlPiece (Proxy :: Proxy (Maybe String)) "Maybe String"
61109 checkUrlPieceI (Proxy :: Proxy (Maybe Integer)) "Maybe Integer"
62110 checkUrlPiece (Proxy :: Proxy (Either Integer T.Text)) "Either Integer Text"
63111 checkUrlPieceI (Proxy :: Proxy (Either Version Day)) "Either Version Day"
64112
113+ checkUrlPiece (Proxy :: Proxy Natural) "Natural"
114+
65115 it "bad integers are rejected" $ do
66116 parseUrlPieceMaybe (T.pack "123hello") `shouldBe` (Nothing :: Maybe Int)
67117
@@ -71,3 +121,9 @@ spec = do
71121
72122 it "invalid utf8 is handled" $ do
73123 parseHeaderMaybe (BS.pack [128]) `shouldBe` (Nothing :: Maybe T.Text)
124+
125+setCookieGen :: Gen SetCookie
126+setCookieGen = do
127+ n <- TE.encodeUtf8 . T.pack . filter isAlphaNum <$> arbitrary
128+ v <- TE.encodeUtf8 . T.pack . filter isAlphaNum <$> arbitrary
129+ return $ defaultSetCookie { setCookieName = n, setCookieValue = v }
test/Web/Internal/TestInstances.hs+2−38
@@ -9,58 +9,22 @@ module Web.Internal.TestInstances
99 ) where
1010
1111import Control.Applicative
12−import qualified Data.ByteString.Lazy.Char8 as BSL
1312import Data.Char
1413import qualified Data.HashMap.Strict as HashMap
1514import qualified Data.Text as T
16−import qualified Data.Text.Lazy as L
17−import Data.Time
18−import Data.Version
15+import Data.Time.Compat
1916import GHC.Exts (fromList)
2017import GHC.Generics
2118
2219import Test.QuickCheck
20+import Test.QuickCheck.Instances ()
2321
2422import Web.Internal.FormUrlEncoded
2523import Web.Internal.HttpApiData
2624
27−instance Arbitrary T.Text where
28− arbitrary = T.pack <$> arbitrary
29−
30−instance Arbitrary L.Text where
31− arbitrary = L.pack <$> arbitrary
32−
33−instance Arbitrary BSL.ByteString where
34− arbitrary = BSL.pack <$> arbitrary
35−
36−instance Arbitrary Day where
37− arbitrary = liftA3 fromGregorian (fmap abs arbitrary) arbitrary arbitrary
38−
39−instance Arbitrary LocalTime where
40− arbitrary = LocalTime
41− <$> arbitrary
42− <*> liftA3 TimeOfDay (choose (0, 23)) (choose (0, 59)) (fromInteger <$> choose (0, 60))
43−
4425instance Eq ZonedTime where
4526 ZonedTime t (TimeZone x _ _) == ZonedTime t' (TimeZone y _ _) = t == t' && x == y
4627
47−instance Arbitrary ZonedTime where
48− arbitrary = ZonedTime
49− <$> arbitrary
50− <*> liftA3 TimeZone arbitrary arbitrary (vectorOf 3 (elements ['A'..'Z']))
51−
52−instance Arbitrary UTCTime where
53− arbitrary = UTCTime <$> arbitrary <*> fmap fromInteger (choose (0, 86400))
54−
55−instance Arbitrary NominalDiffTime where
56− arbitrary = fromInteger <$> arbitrary
57−
58−instance Arbitrary Version where
59− arbitrary = (version . map abs) <$> nonempty
60− where
61− version branch = Version branch []
62− nonempty = liftA2 (:) arbitrary arbitrary
63−
6428instance Arbitrary Form where
6529 arbitrary = fromList <$> arbitrary
6630