git.iko.soy/typeable/http-api-data
on 3375ca6 help sign in
5 files changed+80−153
since splitsnapshots
unifiedsplit
.github/workflows/haskell-ci.yml+41−125 CHANGELOG.md−7 cabal.haskell-ci+1−1 http-api-data.cabal+28−17 src/Web/Internal/HttpApiData.hs+10−3
.github/workflows/haskell-ci.yml+41−125
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.15.20220609
11+# version: 0.11.20210101
1212#
13−# REGENDATA ("0.15.20220609",["github","cabal.project"])
13+# REGENDATA ("0.11.20210101",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -22,119 +22,60 @@ on:
2222 - master
2323jobs:
2424 linux:
25− name: Haskell-CI - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-20.04
27− timeout-minutes:
28− 60
25+ name: Haskell-CI Linux - GHC ${{ matrix.ghc }}
26+ runs-on: ubuntu-18.04
2927 container:
3028 image: buildpack-deps:bionic
3129 continue-on-error: ${{ matrix.allow-failure }}
3230 strategy:
3331 matrix:
3432 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
33+ - ghc: 8.10.3
4434 allow-failure: false
45− - compiler: ghc-9.0.2
46− compilerKind: ghc
47− compilerVersion: 9.0.2
48− setup-method: ghcup
35+ - ghc: 8.8.4
4936 allow-failure: false
50− - compiler: ghc-8.10.7
51− compilerKind: ghc
52− compilerVersion: 8.10.7
53− setup-method: ghcup
37+ - ghc: 8.6.5
5438 allow-failure: false
55− - compiler: ghc-8.8.4
56− compilerKind: ghc
57− compilerVersion: 8.8.4
58− setup-method: hvr-ppa
39+ - ghc: 8.4.4
5940 allow-failure: false
60− - compiler: ghc-8.6.5
61− compilerKind: ghc
62− compilerVersion: 8.6.5
63− setup-method: hvr-ppa
41+ - ghc: 8.2.2
6442 allow-failure: false
65− - compiler: ghc-8.4.4
66− compilerKind: ghc
67− compilerVersion: 8.4.4
68− setup-method: hvr-ppa
43+ - ghc: 8.0.2
6944 allow-failure: false
70− - compiler: ghc-8.2.2
71− compilerKind: ghc
72− compilerVersion: 8.2.2
73− setup-method: hvr-ppa
45+ - ghc: 7.10.3
7446 allow-failure: false
75− - compiler: ghc-8.0.2
76− compilerKind: ghc
77− compilerVersion: 8.0.2
78− setup-method: hvr-ppa
47+ - ghc: 7.8.4
7948 allow-failure: false
8049 fail-fast: false
8150 steps:
8251 - name: apt
8352 run: |
8453 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
54+ apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
55+ apt-add-repository -y 'ppa:hvr/ghc'
56+ apt-get update
57+ apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
10258 env:
103− HCKIND: ${{ matrix.compilerKind }}
104− HCNAME: ${{ matrix.compiler }}
105− HCVER: ${{ matrix.compilerVersion }}
59+ GHC_VERSION: ${{ matrix.ghc }}
10660 - name: Set PATH and environment variables
10761 run: |
10862 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−
63+ echo "LANG=C.UTF-8" >> $GITHUB_ENV
64+ echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
65+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
66+ HC=/opt/ghc/$GHC_VERSION/bin/ghc
67+ echo "HC=$HC" >> $GITHUB_ENV
68+ echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
69+ echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
70+ echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
12771 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"
72+ echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
73+ echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
74+ echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
75+ echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
76+ echo "GHCJSARITH=0" >> $GITHUB_ENV
13477 env:
135− HCKIND: ${{ matrix.compilerKind }}
136− HCNAME: ${{ matrix.compiler }}
137− HCVER: ${{ matrix.compilerVersion }}
78+ GHC_VERSION: ${{ matrix.ghc }}
13879 - name: env
13980 run: |
14081 env
@@ -157,22 +98,6 @@ jobs:
15798 repository hackage.haskell.org
15899 url: http://hackage.haskell.org/
159100 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
176101 cat $CABAL_CONFIG
177102 - name: versions
178103 run: |
@@ -185,7 +110,7 @@ jobs:
185110 - name: cache (tools)
186111 uses: actions/cache@v2
187112 with:
188− key: ${{ runner.os }}-${{ matrix.compiler }}-tools-445c2459
113+ key: ${{ runner.os }}-${{ matrix.ghc }}-tools-b869866c
189114 path: ~/.haskell-ci-tools
190115 - name: install cabal-plan
191116 run: |
@@ -198,20 +123,16 @@ jobs:
198123 cabal-plan --version
199124 - name: install doctest
200125 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
126+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi
127+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then doctest --version ; fi
203128 - name: checkout
204129 uses: actions/checkout@v2
205130 with:
206131 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
212132 - name: sdist
213133 run: |
214134 mkdir -p sdist
135+ cd source || false
215136 $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
216137 - name: unpack
217138 run: |
@@ -220,8 +141,7 @@ jobs:
220141 - name: generate cabal.project
221142 run: |
222143 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
144+ echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> $GITHUB_ENV
225145 touch cabal.project
226146 touch cabal.project.local
227147 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
@@ -229,9 +149,6 @@ jobs:
229149 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
230150 cat >> cabal.project <<EOF
231151 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
235152 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local
236153 cat cabal.project
237154 cat cabal.project.local
@@ -242,9 +159,9 @@ jobs:
242159 - name: cache
243160 uses: actions/cache@v2
244161 with:
245− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
162+ key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
246163 path: ~/.cabal/store
247− restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
164+ restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
248165 - name: install dependencies
249166 run: |
250167 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -261,15 +178,15 @@ jobs:
261178 - name: doctest
262179 run: |
263180 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
181+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi
182+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then doctest src/ ; fi
266183 - name: cabal check
267184 run: |
268185 cd ${PKGDIR_http_api_data} || false
269186 ${CABAL} -vnormal check
270187 - name: haddock
271188 run: |
272− $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
189+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
273190 - name: unconstrained build
274191 run: |
275192 rm -f cabal.project.local
@@ -279,5 +196,4 @@ jobs:
279196 rm -f cabal.project.local
280197 - name: constraint set text-show
281198 run: |
282− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' --dependencies-only -j2 all
283199 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all
CHANGELOG.md−7
@@ -1,10 +1,3 @@
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−
810.4.3
92-----
103
cabal.haskell-ci+1−1
@@ -1,5 +1,5 @@
11branches: master
2−doctest: <9
2+doctest: True
33doctest-filter-packages: base-compat
44
55constraint-set text-show
http-api-data.cabal+28−17
@@ -1,6 +1,6 @@
11cabal-version: >= 1.10
22name: http-api-data
3−version: 0.5
3+version: 0.4.3
44
55synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
66category: Web
@@ -24,15 +24,14 @@ extra-source-files:
2424 README.md
2525
2626tested-with:
27+ GHC==7.8.4,
28+ GHC==7.10.3,
2729 GHC==8.0.2,
2830 GHC==8.2.2,
2931 GHC==8.4.4,
3032 GHC==8.6.5,
3133 GHC==8.8.4,
32− GHC==8.10.7,
33− GHC==9.0.2,
34− GHC==9.2.3,
35− GHC==9.4.1
34+ GHC==8.10.3
3635
3736flag use-text-show
3837 description: Use text-show library for efficient ToHttpApiData implementations.
@@ -44,28 +43,40 @@ library
4443 include-dirs: include/
4544
4645 -- 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
46+ build-depends: base >= 4.7 && < 4.15
47+ , bytestring >= 0.10.4.0 && < 0.12
48+ , containers >= 0.5.5.1 && < 0.7
49+ , text >= 1.2.3.0 && < 1.3
50+ , transformers >= 0.3 && < 0.6
51+
52+ -- so Semigroup Builder exists
53+ if impl(ghc >= 8.0)
54+ build-depends: bytestring >= 0.10.8.1
5255
5356 -- other-dependencies
5457 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+ attoparsec >= 0.13.2.2 && < 0.14
59+ , attoparsec-iso8601 >= 1.0.2.0 && < 1.1
60+ , base-compat >= 0.10.5 && < 0.12
5861 , cookie >= 0.4.3 && < 0.5
59− , hashable >= 1.2.7.0 && < 1.5
62+ , hashable >= 1.2.7.0 && < 1.4
6063 , http-types >= 0.12.3 && < 0.13
6164 , tagged >= 0.8.5 && < 0.9
6265 , time-compat >= 1.9.5 && < 1.10
6366 , unordered-containers >= 0.2.10.0 && < 0.3
6467 , uuid-types >= 1.0.3 && < 1.1
6568
69+ if !impl(ghc >= 7.10)
70+ build-depends:
71+ nats >= 1.1.2 && < 1.2,
72+ void >= 0.7.3 && < 0.8
73+
74+ if !impl(ghc >= 8.0)
75+ build-depends: semigroups >= 0.18.5 && < 0.20
76+
6677 if flag(use-text-show)
6778 cpp-options: -DUSE_TEXT_SHOW
68− build-depends: text-show >= 3.8.2 && <3.10
79+ build-depends: text-show >= 3.8.2 && <3.9
6980
7081 exposed-modules:
7182 Web.HttpApiData
@@ -85,7 +96,7 @@ test-suite spec
8596 hs-source-dirs: test
8697 ghc-options: -Wall
8798 default-language: Haskell2010
88− build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.11
99+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.8
89100 -- inherited depndencies
90101 build-depends:
91102 base
@@ -102,7 +113,7 @@ test-suite spec
102113 build-depends: nats
103114
104115 build-depends: HUnit >= 1.6.0.0 && <1.7
105− , hspec >= 2.7.1 && <2.11
116+ , hspec >= 2.7.1 && <2.8
106117 , QuickCheck >= 2.13.1 && <2.15
107118 , quickcheck-instances >= 0.3.25.2 && <0.4
108119
src/Web/Internal/HttpApiData.hs+10−3
@@ -32,7 +32,6 @@ import Data.Data (Data)
3232import qualified Data.Fixed as F
3333import Data.Functor.Identity (Identity(Identity))
3434import Data.Int (Int16, Int32, Int64, Int8)
35−import Data.Kind (Type)
3635import qualified Data.Map as Map
3736import Data.Monoid (All (..), Any (..), Dual (..),
3837 First (..), Last (..),
@@ -72,6 +71,12 @@ import Text.Read (readMaybe)
7271import Web.Cookie (SetCookie, parseSetCookie,
7372 renderSetCookie)
7473
74+#if MIN_VERSION_base(4,9,0)
75+import Data.Kind (Type)
76+#else
77+#define Type *
78+#endif
79+
7580#if USE_TEXT_SHOW
7681import TextShow (TextShow, showt)
7782#endif
@@ -96,7 +101,7 @@ class ToHttpApiData a where
96101 -- The default definition uses 'H.encodePathSegmentsRelative',
97102 -- but this may be overriden with a more efficient version.
98103 toEncodedUrlPiece :: a -> BS.Builder
99− toEncodedUrlPiece = H.urlEncodeBuilder True . encodeUtf8 . toUrlPiece
104+ toEncodedUrlPiece = H.encodePathSegmentsRelative . (:[]) . toUrlPiece
100105
101106 -- | Convert to HTTP header value.
102107 toHeader :: a -> ByteString
@@ -514,7 +519,7 @@ instance ToHttpApiData DayOfWeek where
514519
515520 toEncodedUrlPiece = unsafeToEncodedUrlPiece
516521
517−-- |
522+-- |
518523-- >>> toUrlPiece Q4
519524-- "q4"
520525instance ToHttpApiData QuarterOfYear where
@@ -865,3 +870,5 @@ runAtto :: Atto.Parser a -> Text -> Either Text a
865870runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of
866871 Left err -> Left (T.pack err)
867872 Right x -> Right x
873+
874+