2b3aee9..master · compaREST

.github/actions/common_setup/action.yaml+27−9

since splitsnapshots

unifiedsplit

@@ -1,15 +1,34 @@

1name: "Common setup"

2description: "Common setup steps"

3inputs:

4− key:

4+ authToken:

5− description: "Caching key"

5+ description: "Cachix auth token"

6 required: true

7− restore-keys:

8− description: "Restore keys"

9− required: false

10runs:

7runs:

11 using: "composite"

8 using: "composite"

12 steps:

9 steps:

10+ - name: Increase swap if linux

11+ shell: bash

12+ run: |

13+ if [ "$RUNNER_OS" == "Linux" ]; then

14+

15+ echo "Is Linux"

16+

17+ free -h

18+

19+ sudo swapoff /mnt/swapfile

20+ sudo fallocate -l 12G /mnt/swapfile

21+ sudo mkswap /mnt/swapfile

22+ sudo swapon /mnt/swapfile

23+

24+ free -h

25+

26+ else

27+

28+ echo "Not Linux"

29+

30+ fi

31+

13 - name: Install Nix

32 - name: Install Nix

14 uses: cachix/install-nix-action@v16

33 uses: cachix/install-nix-action@v16

15 with:

34 with:

@@ -17,8 +36,7 @@ runs:

17 system-features = kvm

36 system-features = kvm

18 trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=

37 trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=

19 substituters = https://hydra.iohk.io https://cache.nixos.org/

38 substituters = https://hydra.iohk.io https://cache.nixos.org/

20− - name: Cache Nix

39+ - uses: cachix/cachix-action@v10

21− uses: ./.github/actions/nix_cache

22 with:

40 with:

23− key: ${{ inputs.key }}

41+ name: typeable

24− restore-keys: ${{ inputs.restore-keys }}

42+ authToken: "${{ inputs.authToken }}"

.github/actions/nix_cache/action.yamldeleted−54

@@ -1,54 +0,0 @@

1−name: "Nix cache"

2−description: "Cache nix build"

3−inputs:

4− key:

5− description: "Caching key"

6− required: true

7− restore-keys:

8− description: "Restore keys"

9− required: false

10− default: ""

11−runs:

12− using: "composite"

13− steps:

14− # - name: Install Nix

15− # uses: cachix/install-nix-action@v16

16− # with:

17− # extra_nix_config: |

18− # system-features = kvm

19− # trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=

20− # substituters = https://hydra.iohk.io https://cache.nixos.org/

21− - name: make nix store writable

22− shell: bash

23− run: |

24− sudo mkdir /nix

25− sudo chown -R $USER /nix

26− # sudo rm -rf /nix/*

27− - name: Cache Nix

28− id: cache-nix

29− uses: actions/cache@v2.1.7

30− with:

31− path: |

32− /nix

33− key: ${{ inputs.key }}

34− restore-keys: ${{ inputs.restore-keys }}

35− - name: Install Nix

36− uses: cachix/install-nix-action@v16

37− with:

38− extra_nix_config: |

39− system-features = kvm

40− trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=

41− substituters = https://hydra.iohk.io https://cache.nixos.org/

42− # - name: Move nix store

43− # shell: bash

44− # run: |

45− # echo

46− # ls /nix/store

47− # if [[ -d "~/nix/store/" ]]; then

48− # echo

49− # ls ~/nix/store

50− # sudo mkdir -p /nix/store

51− # sudo mv -f ~/nix/store/* /nix/store/

52− # fi

53− # echo

54− # ls /nix/store

.github/actions/nix_cache_post/action.yamldeleted−10

@@ -1,10 +0,0 @@

1−name: "Nix cache post"

2−description: "Cache nix build post"

3−runs:

4− using: "composite"

5− steps:

6− - name: Move nix store

7− shell: bash

8− run: |

9− mkdir -p ~/nix/store

10− sudo mv -f /nix/store/* ~/nix/store/

.github/workflows/github-actions-image.yaml+173−58

@@ -9,21 +9,81 @@ on:

9 types: [prereleased]

10

11jobs:

12− Linux:

12+ check-formatting:

13+ name: Check Haskell formatting

13 runs-on: ubuntu-latest

14 runs-on: ubuntu-latest

14 steps:

15 steps:

15− - name: Increase swap

16+ - uses: actions/checkout@v2

16− shell: bash

17+

18+ - name: Common setup

19+ uses: ./.github/actions/common_setup

20+ with:

21+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

22+

23+ - name: Run fourmolu

24+ run: |

25+ nix-shell nix/ci.nix -j auto --run "git ls-files '*.hs' | xargs fourmolu -m inplace -o -XRecursiveDo -o -XTypeApplications -o -XPatternSynonyms -o -XBangPatterns"

26+ git diff --exit-code

27+

28+ policeman:

29+ runs-on: ubuntu-latest

30+ steps:

31+ - uses: actions/checkout@v2

32+ with:

33+ submodules: recursive

34+

35+ - name: Common setup

36+ uses: ./.github/actions/common_setup

37+ with:

38+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

39+

40+ - name: Run policeman

41+ run: |

42+ jq --argjson msg "$( $(nix-build ci/policeman.nix)/bin/policeman | grep -v "⚙" | jq -aRs . )" ".[0].message = \$msg" <policeman.json >message.json

43+ cat message.json

44+

45+ - name: Post notice

46+ uses: yuzutech/annotations-action@v0.4.0

47+ with:

48+ title: 👮 Policeman

49+ repo-token: "${{ secrets.GITHUB_TOKEN }}"

50+ input: "./message.json"

51+

52+ check_versions:

53+ runs-on: ubuntu-latest

54+ steps:

55+ - uses: actions/checkout@v2

56+ with:

57+ submodules: recursive

58+

59+ - name: Check library version

60+ if: github.event_name == 'release'

17 run: |

61 run: |

18− free -h

62+ if [ "$(awk -F ':' '/^version/ {gsub(/ /, "", $2); print $2}' compaREST.cabal)" != "${{ github.event.release.tag_name }}" ]; then

63+ echo "::error file=compaREST.cabal::Library version does not match release version."

64+ exit 1

65+ fi

19

66

20− sudo swapoff /mnt/swapfile

67+ - name: Check docker tag

21− sudo fallocate -l 12G /mnt/swapfile

68+ if: github.event_name == 'release'

22− sudo mkswap /mnt/swapfile

69+ run: |

23− sudo swapon /mnt/swapfile

70+ if [ "$(yq eval '.runs.image' action.yaml | awk -F ':' '{print $NF}')" != "${{ github.event.release.tag_name }}" ]; then

71+ echo "::error file=action.yaml::Action docker tag does not match release tag."

72+ exit 1

73+ fi

24

74

25− free -h

75+ - name: Check changelog

76+ if: github.event_name == 'release'

77+ run: |

78+ if ! grep '^## ${{ github.event.release.tag_name }}$' CHANGELOG.md; then

79+ echo "::error file=CHANGELOG.md::CHANGELOG.md does not contain an entry for this release."

80+ exit 1

81+ fi

26

82

83+ Linux:

84+ needs: check_versions

85+ runs-on: ubuntu-latest

86+ steps:

27 - uses: actions/checkout@v2

87 - uses: actions/checkout@v2

28 with:

88 with:

29 submodules: recursive

89 submodules: recursive

@@ -31,15 +91,17 @@ jobs:

31 - name: Common setup

91 - name: Common setup

32 uses: ./.github/actions/common_setup

92 uses: ./.github/actions/common_setup

33 with:

93 with:

34− key: Linux-${{ hashFiles('**.nix') }}-${{ hashFiles('stack.yaml') }}-${{ hashFiles('**.cabal') }}

94+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

35− restore-keys: |

95+

36− Linux-${{ hashFiles('**.nix') }}-${{ hashFiles('stack.yaml') }}

96+ - name: Test

37− Linux-${{ hashFiles('**.nix') }}

97+ shell: bash

38− Linux

98+ run: |

99+ $(nix-build -A test -j auto --no-out-link)/bin/compaREST-tests

100+

39 - name: Build Linux static binary

101 - name: Build Linux static binary

40 shell: bash

102 shell: bash

41 run: |

103 run: |

42− cp $(nix-build -A compaRESTStaticBin -j auto)/bin/compaREST compaREST

104+ cp $(nix-build -A compaRESTStaticBin -j auto --no-out-link)/bin/compaREST compaREST

43

105

44 - name: Upload compaREST Linux Binary

106 - name: Upload compaREST Linux Binary

45 uses: actions/upload-artifact@v2

107 uses: actions/upload-artifact@v2

@@ -47,19 +109,19 @@ jobs:

47 name: compaREST-Linux

109 name: compaREST-Linux

48 path: compaREST

110 path: compaREST

49

111

50− - name: Build Github Action Docker Image

112+ - name: Build Docker Images

51 shell: bash

113 shell: bash

52 run: |

114 run: |

53− cp $(nix-build -A compaRESTGithubAction -j auto) compaREST-Github-Action-image.tar.gz

115+ cp $(nix-build -A compaRESTGithubAction -j auto --no-out-link) compaREST-Github-Action-image.tar.gz

54− cp $(nix-build -A compaRESTImage -j auto) compaREST-image.tar.gz

116+ cp $(nix-build -A compaRESTImage -j auto --no-out-link) compaREST-image.tar.gz

55

117

56− - name: Upload compaREST Github Action Image

118+ - name: Upload compaREST Docker Github Action Image

57 uses: actions/upload-artifact@v2

119 uses: actions/upload-artifact@v2

58 with:

120 with:

59 name: compaREST Github Action Docker Image

121 name: compaREST Github Action Docker Image

60 path: compaREST-Github-Action-image.tar.gz

122 path: compaREST-Github-Action-image.tar.gz

61

123

62− - name: Upload compaREST Image

124+ - name: Upload compaREST Docker Image

63 uses: actions/upload-artifact@v2

125 uses: actions/upload-artifact@v2

64 with:

126 with:

65 name: compaREST Docker Image

127 name: compaREST Docker Image

@@ -73,18 +135,30 @@ jobs:

73 sudo apt-get -y install skopeo

135 sudo apt-get -y install skopeo

74

136

75 - name: Login to DockerHub

137 - name: Login to DockerHub

76− if: github.event_name == 'release'

77 uses: docker/login-action@v1.10.0

138 uses: docker/login-action@v1.10.0

78 with:

139 with:

79− username: ${{ secrets.DOCKERHUB_USERNAME }}

140+ username: ${{ secrets.DOCKER_HUB_USERNAME }}

80− password: ${{ secrets.DOCKERHUB_TOKEN }}

141+ password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

142+

143+ - name: Push Nightly Docker Images to DockerHub

144+ if: github.ref == 'refs/heads/master' && github.event_name == 'push'

145+ shell: bash

146+ run: |

147+ skopeo copy docker-archive:$(nix-build -A compaRESTGithubAction -j auto --no-out-link) docker://ilyakooo0/comparest-github-action:nightly

148+ skopeo copy docker-archive:$(nix-build -A compaRESTImage -j auto --no-out-link) docker://ilyakooo0/comparest:nightly

149+

150+ - name: Push Release Docker Images to DockerHub

151+ if: github.event_name == 'release'

152+ shell: bash

153+ run: |

154+ skopeo copy docker-archive:$(nix-build -A compaRESTGithubAction -j auto --no-out-link) docker://ilyakooo0/comparest-github-action:${{ github.event.release.tag_name }}

155+ skopeo copy docker-archive:$(nix-build -A compaRESTImage -j auto --no-out-link) docker://ilyakooo0/comparest:${{ github.event.release.tag_name }}

81

156

82− - name: Push Docker Images to DockerHub

157+ - name: Zip Release Assets

83 if: github.event_name == 'release'

158 if: github.event_name == 'release'

84 shell: bash

159 shell: bash

85 run: |

160 run: |

86− skopeo copy docker-archive:$(nix-build -A compaRESTGithubAction -j auto) docker://typeable/comparest-github-action:${{ github.event.release.tag_name }}

161+ zip compaREST-Linux-x86.zip compaREST

87− skopeo copy docker-archive:$(nix-build -A compaRESTImage -j auto) docker://typeable/comparest:${{ github.event.release.tag_name }}

88

162

89 - name: Upload compaREST Github Action Docker Image to release

163 - name: Upload compaREST Github Action Docker Image to release

90 if: github.event_name == 'release'

164 if: github.event_name == 'release'

@@ -92,7 +166,6 @@ jobs:

92 with:

166 with:

93 repo_token: ${{ secrets.GITHUB_TOKEN }}

167 repo_token: ${{ secrets.GITHUB_TOKEN }}

94 file: compaREST-Github-Action-image.tar.gz

168 file: compaREST-Github-Action-image.tar.gz

95− asset_name: compaREST Github Action Docker Image

96 tag: ${{ github.ref }}

169 tag: ${{ github.ref }}

97

170

98 - name: Upload compaREST Docker Image to release

171 - name: Upload compaREST Docker Image to release

@@ -101,7 +174,6 @@ jobs:

101 with:

174 with:

102 repo_token: ${{ secrets.GITHUB_TOKEN }}

175 repo_token: ${{ secrets.GITHUB_TOKEN }}

103 file: compaREST-image.tar.gz

176 file: compaREST-image.tar.gz

104− asset_name: compaREST Docker Image

105 tag: ${{ github.ref }}

177 tag: ${{ github.ref }}

106

178

107 - name: Upload compaREST binary – Linux – x86 to release

179 - name: Upload compaREST binary – Linux – x86 to release

@@ -109,11 +181,63 @@ jobs:

109 uses: svenstaro/upload-release-action@2.2.1

181 uses: svenstaro/upload-release-action@2.2.1

110 with:

182 with:

111 repo_token: ${{ secrets.GITHUB_TOKEN }}

183 repo_token: ${{ secrets.GITHUB_TOKEN }}

112− file: compaREST

184+ file: compaREST-Linux-x86.zip

113− asset_name: compaREST binary – Linux – x86

185+ tag: ${{ github.ref }}

186+

187+ dist:

188+ needs: check_versions

189+ runs-on: ubuntu-latest

190+ steps:

191+ - uses: actions/checkout@v2

192+ with:

193+ submodules: recursive

194+

195+ - name: Cache

196+ uses: actions/cache@v1

197+ with:

198+ path: |

199+ ~/.stack

200+ .stack-work

201+ key: ${{ runner.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('**.cabal') }}

202+ restore-keys: |

203+ ${{ runner.os }}-stack-${{ hashFiles('stack.yaml') }}

204+ ${{ runner.os }}-stack

205+

206+ - name: Upgrade stack

207+ shell: bash

208+ # Needed for Hackage token authorization

209+ run: stack upgrade --git

210+

211+ - name: Build dist

212+ run: |

213+ stack sdist --pvp-bounds both --test-tarball

214+ echo "distPath=$(stack path | awk -F ": " '/dist-dir/ {print $2}')" >> $GITHUB_ENV

215+

216+ - name: Upload compaREST sources artifact

217+ uses: actions/upload-artifact@v2

218+ with:

219+ name: compaREST sources

220+ path: ${{ env.distPath }}/*.tar.gz

221+

222+ - name: Upload compaREST sources to release

223+ if: github.event_name == 'release'

224+ uses: svenstaro/upload-release-action@2.2.1

225+ with:

226+ repo_token: ${{ secrets.GITHUB_TOKEN }}

227+ file_glob: true

228+ file: ${{ env.distPath }}/*.tar.gz

114 tag: ${{ github.ref }}

229 tag: ${{ github.ref }}

115

230

231+ - name: Publish compaREST candidate to Hackage

232+ shell: bash

233+ if: github.event_name == 'release'

234+ env:

235+ HACKAGE_KEY: ${{ secrets.HACKAGE_KEY }}

236+ run: |

237+ stack upload --pvp-bounds both --test-tarball --candidate .

238+

116 macOS:

239 macOS:

240+ needs: check_versions

117 runs-on: macos-latest

241 runs-on: macos-latest

118 steps:

242 steps:

119 - uses: actions/checkout@v2

243 - uses: actions/checkout@v2

@@ -123,15 +247,11 @@ jobs:

123 - name: Common setup

247 - name: Common setup

124 uses: ./.github/actions/common_setup

248 uses: ./.github/actions/common_setup

125 with:

249 with:

126− key: macOS-${{ hashFiles('**.nix') }}-${{ hashFiles('stack.yaml') }}-${{ hashFiles('**.cabal') }}

250+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

127− restore-keys: |

128− macOS-${{ hashFiles('**.nix') }}-${{ hashFiles('stack.yaml') }}

129− macOS-${{ hashFiles('**.nix') }}

130− macOS

131

251

132 - name: Build macOS binary bundle

252 - name: Build macOS binary bundle

133 run: |

253 run: |

134− cp -LR $(nix-build -A macOSCompaRESTBundle -j auto) compaREST

254+ cp -LR $(nix-build -A macOSCompaRESTBundle -j auto --no-out-link) compaREST

135

255

136 - name: Upload macOS compaREST bundle

256 - name: Upload macOS compaREST bundle

137 uses: actions/upload-artifact@v2

257 uses: actions/upload-artifact@v2

@@ -139,30 +259,24 @@ jobs:

139 name: compaREST binary – macOS – x86

259 name: compaREST binary – macOS – x86

140 path: compaREST

260 path: compaREST

141

261

262+ - name: Zip Release Assets

263+ if: github.event_name == 'release'

264+ shell: bash

265+ run: |

266+ zip -r compaREST-macOS-x86.zip compaREST

267+

142 - name: Upload compaREST binary – macOS – x86 to release

268 - name: Upload compaREST binary – macOS – x86 to release

143 if: github.event_name == 'release'

269 if: github.event_name == 'release'

144 uses: svenstaro/upload-release-action@2.2.1

270 uses: svenstaro/upload-release-action@2.2.1

145 with:

271 with:

146 repo_token: ${{ secrets.GITHUB_TOKEN }}

272 repo_token: ${{ secrets.GITHUB_TOKEN }}

147− file: compaREST

273+ file: compaREST-macOS-x86.zip

148− asset_name: compaREST binary – macOS – x86

149 tag: ${{ github.ref }}

274 tag: ${{ github.ref }}

150

275

151 Linux-Windows:

276 Linux-Windows:

277+ needs: check_versions

152 runs-on: ubuntu-latest

278 runs-on: ubuntu-latest

153 steps:

279 steps:

154− - name: Increase swap

155− shell: bash

156− run: |

157− free -h

158−

159− sudo swapoff /mnt/swapfile

160− sudo fallocate -l 12G /mnt/swapfile

161− sudo mkswap /mnt/swapfile

162− sudo swapon /mnt/swapfile

163−

164− free -h

165−

166 - uses: actions/checkout@v2

280 - uses: actions/checkout@v2

167 with:

281 with:

168 submodules: recursive

282 submodules: recursive

@@ -170,15 +284,11 @@ jobs:

170 - name: Common setup

284 - name: Common setup

171 uses: ./.github/actions/common_setup

285 uses: ./.github/actions/common_setup

172 with:

286 with:

173− key: Linux-Windows-${{ hashFiles('**.nix') }}-${{ hashFiles('stack.yaml') }}-${{ hashFiles('**.cabal') }}

287+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

174− restore-keys: |

175− Linux-Windows-${{ hashFiles('**.nix') }}-${{ hashFiles('stack.yaml') }}

176− Linux-Windows-${{ hashFiles('**.nix') }}

177− Linux-Windows

178

288

179 - name: Build Windows binary

289 - name: Build Windows binary

180 run: |

290 run: |

181− cp -LR $(nix-build -A WindowsCompaRESTBin -j auto)/bin compaREST

291+ cp -LR $(nix-build -A WindowsCompaRESTBin -j auto --no-out-link)/bin compaREST

182

292

183 - name: Upload Windows compaREST bundle

293 - name: Upload Windows compaREST bundle

184 uses: actions/upload-artifact@v2

294 uses: actions/upload-artifact@v2

@@ -186,11 +296,16 @@ jobs:

186 name: compaREST binary – Windows

296 name: compaREST binary – Windows

187 path: compaREST

297 path: compaREST

188

298

299+ - name: Zip Release Assets

300+ if: github.event_name == 'release'

301+ shell: bash

302+ run: |

303+ zip -r compaREST-Windows.zip compaREST

304+

189 - name: Upload compaREST binary – Windows to release

305 - name: Upload compaREST binary – Windows to release

190 if: github.event_name == 'release'

306 if: github.event_name == 'release'

191 uses: svenstaro/upload-release-action@2.2.1

307 uses: svenstaro/upload-release-action@2.2.1

192 with:

308 with:

193 repo_token: ${{ secrets.GITHUB_TOKEN }}

309 repo_token: ${{ secrets.GITHUB_TOKEN }}

194− file: compaREST

310+ file: compaREST-Windows.zip

195− asset_name: compaREST binary – Windows

196 tag: ${{ github.ref }}

311 tag: ${{ github.ref }}

action.yaml+1−1

@@ -29,7 +29,7 @@ inputs:

29 default: "${{ github.event.pull_request.head.sha }}"

30runs:

31 using: "docker"

32− image: "typeable/comparest-github-action:latest"

32+ image: "docker://typeable/comparest-github-action:0.0.0.0"

33 env:

34 GITHUB_TOKEN: "${{ inputs.GITHUB_TOKEN }}"

35 REPO: "${{ inputs.repo }}"

app/Data/OpenApi/Compare/Options.hs+91−72

@@ -1,7 +1,7 @@

1module Data.OpenApi.Compare.Options

2− ( Options (..)

2+ ( Options (..),

3− , OutputMode (..)

3+ OutputMode (..),

4− , parseOptions

4+ parseOptions,

5 )

6where

7

@@ -30,86 +30,105 @@ optionsParserInfo :: ParserInfo Options

30optionsParserInfo =

31 info

32 (helper <*> optionsParser)

33− (fullDesc

33+ ( fullDesc

34− <> header "CompaREST"

34+ <> header "CompaREST"

35− <> progDescDoc

35+ <> progDescDoc

36− (Just $

36+ ( Just $

37− par "A tool to check compatibility between two OpenAPI specifications."

37+ par "A tool to check compatibility between two OpenAPI specifications."

38− <$$> hardline <> par "Usage examples" <> hardline

38+ <$$> hardline <> par "Usage examples" <> hardline

39− <$$> indent

39+ <$$> indent

40− 4

40+ 4

41− (par "Compare files old.yaml with new.yaml and output the resulting report to stdout:"

41+ ( par "Compare files old.yaml with new.yaml and output the resulting report to stdout:"

42− <$$> hardline <> indent 4 "comparest -c old.yaml -s new.yaml"

42+ <$$> hardline <> indent 4 "comparest -c old.yaml -s new.yaml"

43− <$$> hardline <> par "Only output breaking changes and write a styled HTML report to file report.html:"

43+ <$$> hardline <> par "Only output breaking changes and write a styled HTML report to file report.html:"

44− <$$> hardline <> indent 4 "comparest -c old.yaml -s new.yaml --only-breaking -o report"

44+ <$$> hardline <> indent 4 "comparest -c old.yaml -s new.yaml --only-breaking -o report"

45− <$$> hardline <> par "Don't output anything, only fail if there are breaking changes:"

45+ <$$> hardline <> par "Don't output anything, only fail if there are breaking changes:"

46− <$$> hardline <> indent 4 "comparest -c old.json -s new.json --silent"

46+ <$$> hardline <> indent 4 "comparest -c old.json -s new.json --silent"

47− <$$> hardline <> par "Write full report suitable for embedding into a GitHub comment to report.html:"

47+ <$$> hardline <> par "Write full report suitable for embedding into a GitHub comment to report.html:"

48− <$$> hardline <> indent 4 "comparest -c old.json -s new.json --folding-block-quotes-style -o report.html")))

48+ <$$> hardline <> indent 4 "comparest -c old.json -s new.json --folding-block-quotes-style -o report.html"

49+ )

50+ )

51+ )

49

52

50optionsParser :: Parser Options

53optionsParser :: Parser Options

51optionsParser =

54optionsParser =

52 Options

55 Options

53 <$> strOption

56 <$> strOption

54− (short 'c'

57+ ( short 'c'

55− <> long "client"

58+ <> long "client"

56− <> help

59+ <> help

57− "A path to the file containing the specification that will be \

60+ "A path to the file containing the specification that will be \

58− \used for the client of the API. Can be either a YAML or JSON file.")

61+ \used for the client of the API. Can be either a YAML or JSON file."

62+ )

59 <*> strOption

63 <*> strOption

60− (short 's'

64+ ( short 's'

61− <> long "server"

65+ <> long "server"

62− <> help

66+ <> help

63− "A path to the file containing the specification that will be \

67+ "A path to the file containing the specification that will be \

64− \used for the server of the API. Can be either a YAML or JSON file.")

68+ \used for the server of the API. Can be either a YAML or JSON file."

69+ )

65− <*> (flag'

70+ <*> ( flag'

66− Nothing

71+ Nothing

67− (long "silent"

72+ ( long "silent"

68− <> help "Silence all output. Only makes sense in combination with --signal-exit-code.")

73+ <> help "Silence all output. Only makes sense in combination with --signal-exit-code."

74+ )

69− <|> flag'

75+ <|> flag'

70− (Just OnlyErrors)

76+ (Just OnlyErrors)

71− (long "only-breaking"

77+ ( long "only-breaking"

72− <> help "Only report breaking changes in the output.")

78+ <> help "Only report breaking changes in the output."

79+ )

73− <|> flag'

80+ <|> flag'

74− (Just All)

81+ (Just All)

75− (long "all"

82+ ( long "all"

76− <> help

83+ <> help

77− "Report both incompatible and compatible changes. \

84+ "Report both incompatible and compatible changes. \

78− \Compatible changes will not trigger a failure exit code.")

85+ \Compatible changes will not trigger a failure exit code."

86+ )

79− <|> pure (Just All))

87+ <|> pure (Just All)

88+ )

80− <*> ((FileMode

89+ <*> ( ( FileMode

81− <$> strOption

90+ <$> strOption

82− (short 'o' <> long "output"

91+ ( short 'o' <> long "output"

83− <> helpDoc

92+ <> helpDoc

84− (Just $

93+ ( Just $

85− par "The file path where the output should be written. If the option is omitted the result will be written to stdout."

94+ par "The file path where the output should be written. If the option is omitted the result will be written to stdout."

86− <$$> hardline <> par "The file extension is used to determine the type of the output file."

95+ <$$> hardline <> par "The file extension is used to determine the type of the output file."

87− <$$> hardline <> par "Supports many formats such as markdown, html, rtf, doc, txt, rst, and many more."

96+ <$$> hardline <> par "Supports many formats such as markdown, html, rtf, doc, txt, rst, and many more."

88− <$$> hardline <> par "Leave out the extension to produce a self-contained HTML report with styling.")))

97+ <$$> hardline <> par "Leave out the extension to produce a self-contained HTML report with styling."

98+ )

99+ )

100+ )

89− <|> pure StdoutMode)

101+ <|> pure StdoutMode

102+ )

90− <*> (flag'

103+ <*> ( flag'

91− FoldingBlockquotesTreeStyle

104+ FoldingBlockquotesTreeStyle

92− (long "folding-block-quotes-style"

105+ ( long "folding-block-quotes-style"

93− <> help

94− "The report tree is structured using \

95− \summary/detail HTML elements and indented using \

96− \block quotes. This style renders well on GitHub.\

97− \Intended for HTML output format. Markdown has rendering \

98− \bugs on GitHub.")

99− <|> flag'

100− HeadersTreeStyle

101− (long "header-style"

102 <> help

106 <> help

103 "The report tree is structured using \

107 "The report tree is structured using \

108+ \summary/detail HTML elements and indented using \

109+ \block quotes. This style renders well on GitHub.\

110+ \Intended for HTML output format. Markdown has rendering \

111+ \bugs on GitHub."

112+ )

113+ <|> flag'

114+ HeadersTreeStyle

115+ ( long "header-style"

116+ <> help

117+ "The report tree is structured using \

104− \increasing levels of headers.")

118+ \increasing levels of headers."

119+ )

105− <|> pure HeadersTreeStyle)

120+ <|> pure HeadersTreeStyle

121+ )

106− <*> switch

122+ <*> switch

107− (long "signal-exit-code"

123+ ( long "signal-exit-code"

108− <> helpDoc (Just $

124+ <> helpDoc

125+ ( Just $

109 par "Signal API compatibility with the exit code."

126 par "Signal API compatibility with the exit code."

110 <$$> hardline <> par "Exit with 0 if there are no breaking changes."

127 <$$> hardline <> par "Exit with 0 if there are no breaking changes."

111 <$$> par "Exit with 1 if there are breaking changes."

128 <$$> par "Exit with 1 if there are breaking changes."

112− <$$> par "Exit with 2 if could not determine compatibility."))

129+ <$$> par "Exit with 2 if could not determine compatibility."

130+ )

131+ )

113

132

114par :: String -> Doc

133par :: String -> Doc

115par = foldr1 (</>) . fmap string . words

134par = foldr1 (</>) . fmap string . words

app/FormatHeuristic.hs+1−1

@@ -2,7 +2,7 @@

2-- Originally based on:

3-- https://github.com/jgm/pandoc/blob/master/src/Text/Pandoc/App/FormatHeuristics.hs

4module FormatHeuristic

5− ( formatFromFilePath

5+ ( formatFromFilePath,

6 )

7where

8

ci/policeman.nixnew file+4

@@ -0,0 +1,4 @@

1+{ sources ? import ../nix/sources.nix

2+, pkgs ? import sources.nixpkgs { }

3+}:

4+pkgs.haskellPackages.policeman

compaREST.cabal+6

@@ -14,6 +14,9 @@ extra-doc-files: README.md

14 CHANGELOG.md

15tested-with: GHC == 8.10.4

16extra-source-files: awsm-css/dist/awsm.min.css

17+data-files:

18+ test/golden/**/*.yaml

19+ test/golden/**/*.md

17

20

18common common-options

21common common-options

19 ghc-options:

22 ghc-options:

@@ -32,6 +35,7 @@ common common-options

32 build-depends: base >= 4.12.0.0 && < 4.16

35 build-depends: base >= 4.12.0.0 && < 4.16

33 , text

36 , text

34

37

38+

35 default-extensions: ApplicativeDo

39 default-extensions: ApplicativeDo

36 , BangPatterns

40 , BangPatterns

37 , ConstraintKinds

41 , ConstraintKinds

@@ -202,6 +206,8 @@ test-suite compaREST-tests

202 other-modules:

206 other-modules:

203 Spec.Golden.Extra

207 Spec.Golden.Extra

204 Spec.Golden.TraceTree

208 Spec.Golden.TraceTree

209+ Paths_compaREST

210+ autogen-modules: Paths_compaREST

205 build-depends:

211 build-depends:

206 , compaREST

212 , compaREST

207 , tasty-golden

213 , tasty-golden

default.nix+9−10

@@ -24,12 +24,11 @@ let

24 dontPatchELF = false;

25 enableDeadCodeElimination = true;

26 ghcOptions = [

27− # "-O2"

27+ "-O2"

28− # "-fexpose-all-unfoldings"

28+ "-fexpose-all-unfoldings"

29− # "-fspecialise-aggressively"

29+ "-fspecialise-aggressively"

30− "-O0"

31 ];

30 ];

32− # packages.pandoc.ghcOptions = [ "-O1" ];

31+ packages.pandoc.ghcOptions = [ "-O1" ];

33 packages.compaREST.src = nix-filter {

32 packages.compaREST.src = nix-filter {

34 root = ./.;

33 root = ./.;

35 name = "compaREST-src";

34 name = "compaREST-src";

@@ -99,8 +98,6 @@ let

99

98

100 WindowsCompaRESTBin = hsPkgs.projectCross.mingwW64.hsPkgs.compaREST.components.exes.compaREST;

99 WindowsCompaRESTBin = hsPkgs.projectCross.mingwW64.hsPkgs.compaREST.components.exes.compaREST;

101in

100in

102−builtins.trace

103− hsPkgs.compaREST.components.exes

104{

101{

105 inherit

102 inherit

106 compaRESTImage

103 compaRESTImage

@@ -109,7 +106,9 @@ builtins.trace

109 compaRESTBin

106 compaRESTBin

110 hsPkgs

107 hsPkgs

111 macOSCompaRESTBundle

108 macOSCompaRESTBundle

112− WindowsCompaRESTBin

109+ WindowsCompaRESTBin;

113− ;

110+

111+ # We use the static version so that we don't have to rebuild everything on CI.

112+ # The only binaries build on CI are static.

114− test = hsPkgs.compaREST.components.tests.compaREST-tests;

113+ test = hsPkgs.projectCross.musl64.hsPkgs.compaREST.components.tests.compaREST-tests;

115}

114}

nix/ci.nixnew file+6

@@ -0,0 +1,6 @@

1+{ sources ? import ./sources.nix

2+, pkgs ? import sources.nixpkgs { }

3+}:

4+pkgs.mkShell {

5+ packages = [ pkgs.haskellPackages.fourmolu ];

6+}

policeman.jsonnew file+6

@@ -0,0 +1,6 @@

1+[{

2+ "file": "compaREST.cabal",

3+ "annotation_level": "notice",

4+ "end_line": 0,

5+ "start_line": 0

6+}]

src/Data/HList.hs+11−11

@@ -1,11 +1,11 @@

1module Data.HList

2− ( Has

2+ ( Has,

3− , HasAll

3+ HasAll,

4− , getH

4+ getH,

5− , HList (..)

5+ HList (..),

6− , singletonH

6+ singletonH,

7− , ReassembleHList

7+ ReassembleHList,

8− , reassemble

8+ reassemble,

9 )

10where

11

@@ -40,8 +40,8 @@ instance (Has' x xs t, HeadEq x (y : xs) ~ 'False) => Has' x (y ': xs) 'False wh

40 {-# INLINE getH #-}

41

42instance

43− TypeError ('ShowType x ':<>: 'Text " is not a part of the list.")

43+ TypeError ( 'ShowType x ':<>: 'Text " is not a part of the list.") =>

44− => Has' x '[] 'False

44+ Has' x '[] 'False

45 where

46 getH HNil = undefined

47 {-# INLINE getH #-}

@@ -74,8 +74,8 @@ instance ReassembleHList' (x ': xs) '[] 'False where

74 {-# INLINE reassemble #-}

75

76instance

77− (Has y xs, ReassembleHList' xs ys f, (xs == (y ': ys)) ~ 'False)

77+ (Has y xs, ReassembleHList' xs ys f, (xs == (y ': ys)) ~ 'False) =>

78− => ReassembleHList' xs (y ': ys) 'False

78+ ReassembleHList' xs (y ': ys) 'False

79 where

80 reassemble xs = getH @y xs `HCons` reassemble xs

81 {-# INLINE reassemble #-}

src/Data/OpenApi/Compare/Behavior.hs+11−11

@@ -1,15 +1,15 @@

1module Data.OpenApi.Compare.Behavior

2− ( BehaviorLevel (..)

2+ ( BehaviorLevel (..),

3− , Behavable (..)

3+ Behavable (..),

4− , IssueKind (..)

4+ IssueKind (..),

5− , Issuable (..)

5+ Issuable (..),

6− , Orientation (..)

6+ Orientation (..),

7− , toggleOrientation

7+ toggleOrientation,

8− , Behavior

8+ Behavior,

9− , AnIssue (..)

9+ AnIssue (..),

10− , withClass

10+ withClass,

11− , anIssueKind

11+ anIssueKind,

12− , relatedAnIssues

12+ relatedAnIssues,

13 )

14where

15

src/Data/OpenApi/Compare/Common.hs+1−1

@@ -1,5 +1,5 @@

1module Data.OpenApi.Compare.Common

2− ( zipAll

2+ ( zipAll,

3 )

4where

5

src/Data/OpenApi/Compare/Formula.hs+31−21

@@ -1,14 +1,15 @@

1module Data.OpenApi.Compare.Formula

2− ( FormulaF

2+ ( FormulaF,

3− , VarRef

3+ VarRef,

4− , variable

4+ variable,

5− , eitherOf

5+ eitherOf,

6− , anError

6+ anError,

7− , errors

7+ errors,

8− , calculate

8+ calculate,

9− , maxFixpoint

9+ maxFixpoint,

10− , mapErrors

10+ mapErrors,

11+ )

11− ) where

12+where

12

13

13import Data.Kind

14import Data.Kind

14import qualified Data.List.NonEmpty as NE

15import qualified Data.List.NonEmpty as NE

@@ -24,15 +25,24 @@ type VarRef = Int

24-- fixpoints always exist, i.e. that @x = f x@ has at least one solution.

25-- fixpoints always exist, i.e. that @x = f x@ has at least one solution.

25data FormulaF (q :: k -> k -> Type) (f :: k -> Type) (r :: k) (a :: Type) where

26data FormulaF (q :: k -> k -> Type) (f :: k -> Type) (r :: k) (a :: Type) where

26 Result :: a -> FormulaF q f r a

27 Result :: a -> FormulaF q f r a

28+ Errors ::

27− Errors :: !(P.PathsPrefixTree q f r) -> FormulaF q f r a

29+ !(P.PathsPrefixTree q f r) ->

28− -- ^ invariant: never empty

30+ -- | invariant: never empty

31+ FormulaF q f r a

32+ Apply ::

29− Apply :: FormulaF q f r (b -> c) -> FormulaF q f r b -> (c -> a) -> FormulaF q f r a

33+ FormulaF q f r (b -> c) ->

34+ FormulaF q f r b ->

35+ (c -> a) ->

30− -- ^ invariant: at least one of LHS and RHS is not 'Errors', and they are

36+ -- | invariant: at least one of LHS and RHS is not 'Errors', and they are

31 -- both not 'Result'

37 -- both not 'Result'

38+ FormulaF q f r a

39+ SelectFirst ::

32− SelectFirst :: NE.NonEmpty (SomeFormulaF b)

40+ NE.NonEmpty (SomeFormulaF b) ->

33− -> !(P.PathsPrefixTree q f r) -> (b -> a) -> FormulaF q f r a

41+ !(P.PathsPrefixTree q f r) ->

42+ (b -> a) ->

34− -- ^ invariant: the list doesn't contain any 'Result's, 'Errors' or

43+ -- | invariant: the list doesn't contain any 'Result's, 'Errors' or

35 -- 'SelectFirst'

44 -- 'SelectFirst'

45+ FormulaF q f r a

36 Variable :: !VarRef -> a -> FormulaF q f r a

46 Variable :: !VarRef -> a -> FormulaF q f r a

37

47

38mkApply :: FormulaF q f r (b -> c) -> FormulaF q f r b -> (c -> a) -> FormulaF q f r a

48mkApply :: FormulaF q f r (b -> c) -> FormulaF q f r b -> (c -> a) -> FormulaF q f r a

@@ -44,13 +54,13 @@ mkApply f x h = Apply f x h

44mkSelectFirst :: [SomeFormulaF b] -> P.PathsPrefixTree q f r -> (b -> a) -> FormulaF q f r a

54mkSelectFirst :: [SomeFormulaF b] -> P.PathsPrefixTree q f r -> (b -> a) -> FormulaF q f r a

45mkSelectFirst fs allE h = case foldMap check fs of

55mkSelectFirst fs allE h = case foldMap check fs of

46 (First (Just x), _) -> Result (h x)

56 (First (Just x), _) -> Result (h x)

47− (First Nothing, x:xs) -> SelectFirst (x NE.:| xs) allE h

57+ (First Nothing, x : xs) -> SelectFirst (x NE.:| xs) allE h

48 (First Nothing, []) -> Errors allE

58 (First Nothing, []) -> Errors allE

49 where

59 where

50 check (SomeFormulaF (Result x)) = (First (Just x), mempty)

60 check (SomeFormulaF (Result x)) = (First (Just x), mempty)

51 check (SomeFormulaF (Errors _)) = (mempty, mempty)

61 check (SomeFormulaF (Errors _)) = (mempty, mempty)

52− check (SomeFormulaF (SelectFirst xs _ h'))

62+ check (SomeFormulaF (SelectFirst xs _ h')) =

53− = (mempty, NE.toList (fmap (fmap h') xs))

63+ (mempty, NE.toList (fmap (fmap h') xs))

54 check x = (mempty, [x])

64 check x = (mempty, [x])

55

65

56data SomeFormulaF (a :: Type) where

66data SomeFormulaF (a :: Type) where

@@ -96,7 +106,7 @@ calculate (Apply f x h) = case calculate f of

96 Right x' -> Right (h (f' x'))

106 Right x' -> Right (h (f' x'))

97calculate (SelectFirst xs e h) = go (NE.toList xs)

107calculate (SelectFirst xs e h) = go (NE.toList xs)

98 where

108 where

99− go (SomeFormulaF r:rs) = case calculate r of

109+ go (SomeFormulaF r : rs) = case calculate r of

100 Left _ -> go rs

110 Left _ -> go rs

101 Right x -> Right (h x)

111 Right x -> Right (h x)

102 go [] = Left e

112 go [] = Left e

src/Data/OpenApi/Compare/Memo.hs+104−66

@@ -1,22 +1,24 @@

1{-# LANGUAGE AllowAmbiguousTypes #-}

2+

2-- | Utilities for effectfully memoizing other, more effectful functions.

3-- | Utilities for effectfully memoizing other, more effectful functions.

3module Data.OpenApi.Compare.Memo

4module Data.OpenApi.Compare.Memo

4− ( MonadMemo

5+ ( MonadMemo,

5− , MemoState

6+ MemoState,

6− , runMemo

7+ runMemo,

7− , modifyMemoNonce

8+ modifyMemoNonce,

8− , KnotTier(..)

9+ KnotTier (..),

9− , unknot

10+ unknot,

10− , memoWithKnot

11+ memoWithKnot,

11− , memoTaggedWithKnot

12+ memoTaggedWithKnot,

13+ )

12− ) where

14+where

13

15

14import Control.Monad.State

16import Control.Monad.State

15import Data.Dynamic

17import Data.Dynamic

16import qualified Data.Map as M

18import qualified Data.Map as M

17import Data.Tagged

19import Data.Tagged

18−import Data.Void

19import qualified Data.TypeRepMap as T

20import qualified Data.TypeRepMap as T

21+import Data.Void

20import Type.Reflection

22import Type.Reflection

21

23

22data Progress a = Finished a | Started | TyingKnot Dynamic

24data Progress a = Finished a | Started | TyingKnot Dynamic

@@ -29,16 +31,23 @@ data MemoState s = MemoState s (T.TypeRepMap MemoMap)

29-- | An effectful memoization monad.

31-- | An effectful memoization monad.

30type MonadMemo s m = MonadState (MemoState s) m

32type MonadMemo s m = MonadState (MemoState s) m

31

33

32−memoStateLookup

34+memoStateLookup ::

35+ forall k v s.

33− :: forall k v s. (Typeable k, Typeable v, Ord k)

36+ (Typeable k, Typeable v, Ord k) =>

37+ k ->

38+ MemoState s ->

34− => k -> MemoState s -> Maybe (Progress v)

39+ Maybe (Progress v)

35memoStateLookup k (MemoState _ t) = case T.lookup @(k, v) t of

40memoStateLookup k (MemoState _ t) = case T.lookup @(k, v) t of

36 Just (MemoMap m) -> M.lookup k m

41 Just (MemoMap m) -> M.lookup k m

37 Nothing -> Nothing

42 Nothing -> Nothing

38

43

39−memoStateInsert

44+memoStateInsert ::

45+ forall k v s.

40− :: forall k v s. (Typeable k, Typeable v, Ord k)

46+ (Typeable k, Typeable v, Ord k) =>

47+ k ->

48+ Progress v ->

41− => k -> Progress v -> MemoState s -> MemoState s

49+ MemoState s ->

50+ MemoState s

42memoStateInsert k x (MemoState s t) = MemoState s $ T.insert (MemoMap m'') t

51memoStateInsert k x (MemoState s t) = MemoState s $ T.insert (MemoMap m'') t

43 where

52 where

44 m'' = M.insert k x m'

53 m'' = M.insert k x m'

@@ -59,19 +68,23 @@ runMemo s = (`evalStateT` MemoState s T.empty)

59-- | A description of how to effectfully tie knots in type @v@, using the @m@

68-- | A description of how to effectfully tie knots in type @v@, using the @m@

60-- monad, and by sharing some @d@ data among the recursive instances.

69-- monad, and by sharing some @d@ data among the recursive instances.

61data KnotTier v d m = KnotTier

70data KnotTier v d m = KnotTier

62− { onKnotFound :: m d -- ^ Create some data that will be connected to this knot

71+ { -- | Create some data that will be connected to this knot

72+ onKnotFound :: m d

63− , onKnotUsed :: d -> m v -- ^ This is what the knot will look like as a value

73+ , -- | This is what the knot will look like as a value

64 -- to the inner computations

74 -- to the inner computations

75+ onKnotUsed :: d -> m v

65− , tieKnot :: d -> v -> m v -- ^ Once we're done and we're outside, tie the

76+ , -- | Once we're done and we're outside, tie the

66 -- knot using the datum

77 -- knot using the datum

78+ tieKnot :: d -> v -> m v

67 }

79 }

68

80

69unknot :: KnotTier v Void m

81unknot :: KnotTier v Void m

82+unknot =

70−unknot = KnotTier

83+ KnotTier

71− { onKnotFound = error "Recursion detected"

84+ { onKnotFound = error "Recursion detected"

72− , onKnotUsed = absurd

85+ , onKnotUsed = absurd

73− , tieKnot = absurd

86+ , tieKnot = absurd

74− }

87+ }

75

88

76-- | Run a potentially recursive computation. The provided key will be used to

89-- | Run a potentially recursive computation. The provided key will be used to

77-- refer to the result of this computation. If during the computation, another

90-- refer to the result of this computation. If during the computation, another

@@ -80,47 +93,72 @@ unknot = KnotTier

80--

93--

81-- If another attempt to run the computation with the same key is made

94-- If another attempt to run the computation with the same key is made

82-- *after we're done*, we will return the memoized value.

95-- *after we're done*, we will return the memoized value.

83−memoWithKnot

96+memoWithKnot ::

84− :: forall k v d m s.

97+ forall k v d m s.

85− (Typeable k, Typeable v, Typeable d, Ord k, MonadMemo s m)

98+ (Typeable k, Typeable v, Typeable d, Ord k, MonadMemo s m) =>

86− => KnotTier v d m

99+ KnotTier v d m ->

87− -> m v -- ^ the computation to memoize

100+ -- | the computation to memoize

101+ m v ->

88− -> k -- ^ key for memoization

102+ -- | key for memoization

103+ k ->

89− -> m v

104+ m v

105+memoWithKnot tier f k =

90−memoWithKnot tier f k = memoStateLookup @k @v k <$> get >>= \case

106+ memoStateLookup @k @v k <$> get >>= \case

91− Just (Finished v) -> pure v

107+ Just (Finished v) -> pure v

92− Just Started -> do

108+ Just Started -> do

93− d <- onKnotFound tier

109+ d <- onKnotFound tier

94− modify $ memoStateInsert @k @v k (TyingKnot $ toDyn d)

110+ modify $ memoStateInsert @k @v k (TyingKnot $ toDyn d)

95− onKnotUsed tier d

111+ onKnotUsed tier d

96− Just (TyingKnot dyn) -> case fromDynamic dyn of

112+ Just (TyingKnot dyn) -> case fromDynamic dyn of

97− Just d -> onKnotUsed tier d

113+ Just d -> onKnotUsed tier d

114+ Nothing ->

115+ error $

98− Nothing -> error $ "Type mismatch when examining the knot of "

116+ "Type mismatch when examining the knot of "

99− <> show (typeRep @(k -> v)) <> ": expected " <> show (typeRep @d)

117+ <> show (typeRep @(k -> v))

118+ <> ": expected "

119+ <> show (typeRep @d)

120+ <> ", got "

100− <> ", got " <> show (dynTypeRep dyn)

121+ <> show (dynTypeRep dyn)

101− Nothing -> do

122+ Nothing -> do

102− modify $ memoStateInsert @k @v k Started

123+ modify $ memoStateInsert @k @v k Started

103− v <- f

124+ v <- f

125+ v' <-

104− v' <- memoStateLookup @k @v k <$> get >>= \case

126+ memoStateLookup @k @v k <$> get >>= \case

105− Just Started -> pure v

127+ Just Started -> pure v

106− Just (TyingKnot dyn) -> case fromDynamic dyn of

128+ Just (TyingKnot dyn) -> case fromDynamic dyn of

107− Just d -> tieKnot tier d v

129+ Just d -> tieKnot tier d v

130+ Nothing ->

131+ error $

108− Nothing -> error $ "Type mismatch when tying the knot of "

132+ "Type mismatch when tying the knot of "

109− <> show (typeRep @(k -> v)) <> ": expected " <> show (typeRep @d)

133+ <> show (typeRep @(k -> v))

134+ <> ": expected "

135+ <> show (typeRep @d)

136+ <> ", got "

110− <> ", got " <> show (dynTypeRep dyn)

137+ <> show (dynTypeRep dyn)

138+ Just (Finished _) ->

139+ error $

111− Just (Finished _) -> error $ "Unexpected Finished when memoizing "

140+ "Unexpected Finished when memoizing "

112− <> show (typeRep @(k -> v))

141+ <> show (typeRep @(k -> v))

113− Nothing -> pure v

142+ Nothing -> pure v

114− -- Normally this would be an error, but the underlying monad can refuse

143+ -- Normally this would be an error, but the underlying monad can refuse

115− -- to remember memoization state

144+ -- to remember memoization state

116− modify $ memoStateInsert @k @v k (Finished v')

145+ modify $ memoStateInsert @k @v k (Finished v')

117− pure v'

146+ pure v'

118

147

119-- | Disambiguate memoized computations with an arbitrary tag.

148-- | Disambiguate memoized computations with an arbitrary tag.

120−memoTaggedWithKnot

149+memoTaggedWithKnot ::

121− :: forall t k v d m s.

150+ forall t k v d m s.

122− ( Typeable t, Typeable k, Typeable v, Typeable d

151+ ( Typeable t

152+ , Typeable k

153+ , Typeable v

154+ , Typeable d

155+ , Ord k

123− , Ord k, MonadMemo s m )

156+ , MonadMemo s m

157+ ) =>

124− => KnotTier v d m -> m v -> k -> m v

158+ KnotTier v d m ->

159+ m v ->

160+ k ->

161+ m v

162+memoTaggedWithKnot tier f k =

125−memoTaggedWithKnot tier f k = withTypeable (typeRepKind $ typeRep @t) $

163+ withTypeable (typeRepKind $ typeRep @t) $

126− memoWithKnot tier f (Tagged @t k)

164+ memoWithKnot tier f (Tagged @t k)

src/Data/OpenApi/Compare/Paths.hs+9−9

@@ -2,17 +2,17 @@

2-- collection of datatypes that "contain" eachother in some form of tree

3-- structure.

4module Data.OpenApi.Compare.Paths

5− ( NiceQuiver

5+ ( NiceQuiver,

6− , AdditionalQuiverConstraints

6+ AdditionalQuiverConstraints,

7− , Paths (..)

7+ Paths (..),

8− , DiffPaths (..)

8+ DiffPaths (..),

9− , catDiffPaths

9+ catDiffPaths,

10− , AnItem (..)

10+ AnItem (..),

11− , step

11+ step,

12

13 -- * Reexports

14− , (>>>)

14+ (>>>),

15− , (<<<)

15+ (<<<),

16 )

17where

18

src/Data/OpenApi/Compare/PathsPrefixTree.hs+37−37

@@ -1,22 +1,22 @@

1{-# LANGUAGE QuantifiedConstraints #-}

2

3module Data.OpenApi.Compare.PathsPrefixTree

4− ( PathsPrefixTree (PathsPrefixNode)

4+ ( PathsPrefixTree (PathsPrefixNode),

5− , AStep (..)

5+ AStep (..),

6− , empty

6+ empty,

7− , singleton

7+ singleton,

8− , fromList

8+ fromList,

9− , null

9+ null,

10− , foldWith

10+ foldWith,

11− , toList

11+ toList,

12− , filter

12+ filter,

13− , filterWithKey

13+ filterWithKey,

14− , takeSubtree

14+ takeSubtree,

15− , lookup

15+ lookup,

16− , embed

16+ embed,

17− , size

17+ size,

18− , partition

18+ partition,

19− , map

19+ map,

20 )

21where

22

@@ -35,7 +35,7 @@ import qualified Data.TypeRepMap as TRM

35import qualified Data.Vector as V

36import qualified GHC.Exts as Exts

37import Type.Reflection

38−import Prelude hiding (filter, map, null, lookup)

38+import Prelude hiding (filter, lookup, map, null)

39

40-- | A list of @AnItem r f@, but optimized into a prefix tree.

41data PathsPrefixTree (q :: k -> k -> Type) (f :: k -> Type) (r :: k) = PathsPrefixTree

@@ -102,11 +102,11 @@ deriving stock instance Eq (PathsPrefixTree q f a)

102

103-- Kind of orphan. Treat the map as an infinite tuple of @Maybe (f a)@'s, where

104-- the components are ordered by the @SomeTypeRep@ of the @a@.

105−compareTRM

105+compareTRM ::

106− :: (forall a. Typeable a => Ord (f a))

106+ (forall a. Typeable a => Ord (f a)) =>

107− => TRM.TypeRepMap f

107+ TRM.TypeRepMap f ->

108− -> TRM.TypeRepMap f

108+ TRM.TypeRepMap f ->

109− -> Ordering

109+ Ordering

110compareTRM s1 s2 =

111 foldMap (\k -> compareMaybe compareW (M.lookup k m1) (M.lookup k m2)) mKeys

112 where

@@ -116,11 +116,11 @@ compareTRM s1 s2 =

116 compareMaybe _ Nothing (Just _) = LT

117 compareMaybe _ (Just _) Nothing = GT

118 compareMaybe cmp (Just x) (Just y) = cmp x y

119− compareW

119+ compareW ::

120− :: (forall a. Typeable a => Ord (f a))

120+ (forall a. Typeable a => Ord (f a)) =>

121− => TRM.WrapTypeable f

121+ TRM.WrapTypeable f ->

122− -> TRM.WrapTypeable f

122+ TRM.WrapTypeable f ->

123− -> Ordering

123+ Ordering

124 compareW (TRM.WrapTypeable (x :: f a)) (TRM.WrapTypeable (y :: f b))

125 | Just Refl <- testEquality (typeRep @a) (typeRep @b) = compare x y

126 | otherwise = EQ -- unreachable

@@ -172,10 +172,10 @@ instance Monoid (ASet a) where

172 mempty = AnEmptySet

173

174data AStep (q :: k -> k -> Type) (f :: k -> Type) (r :: k) (a :: k) where

175− AStep

175+ AStep ::

176− :: NiceQuiver q r a =>

176+ NiceQuiver q r a =>

177− !(M.Map (q r a) (PathsPrefixTree q f a))

177+ !(M.Map (q r a) (PathsPrefixTree q f a)) ->

178− -> AStep q f r a

178+ AStep q f r a

179

180mapAStep :: (forall x. f x -> f x) -> AStep q f r a -> AStep q f r a

181mapAStep f (AStep m) = AStep $ M.map (map f) m

@@ -215,12 +215,12 @@ null :: PathsPrefixTree q f r -> Bool

215null (PathsPrefixTree AnEmptySet s) = all (\(TRM.WrapTypeable (AStep x)) -> all null x) (Exts.toList s)

216null _ = False

217

218−foldWith

218+foldWith ::

219− :: forall q f m r.

219+ forall q f m r.

220− Monoid m

220+ Monoid m =>

221− => (forall a. Ord (f a) => Paths q r a -> f a -> m)

221+ (forall a. Ord (f a) => Paths q r a -> f a -> m) ->

222− -> PathsPrefixTree q f r

222+ PathsPrefixTree q f r ->

223− -> m

223+ m

224foldWith k = goTPT Root

225 where

226 goTPT :: forall a. Paths q r a -> PathsPrefixTree q f a -> m

src/Data/OpenApi/Compare/References.hs+8−8

@@ -1,9 +1,9 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.References

4− ( Step (..)

4+ ( Step (..),

5− , dereference

5+ dereference,

6− , Typeable

6+ Typeable,

7 )

8where

9

@@ -18,11 +18,11 @@ instance Typeable a => Steppable (Referenced a) a where

18 data Step (Referenced a) a = InlineStep

19 deriving stock (Eq, Ord, Show)

20

21−dereference

21+dereference ::

22− :: Typeable a

22+ Typeable a =>

23− => Traced (Definitions a)

23+ Traced (Definitions a) ->

24− -> Traced (Referenced a)

24+ Traced (Referenced a) ->

25− -> Traced a

25+ Traced a

26dereference defs x = case extract x of

27 Inline a ->

28 traced (ask x >>> step InlineStep) a

src/Data/OpenApi/Compare/Report.hs+140−120

@@ -1,13 +1,13 @@

1module Data.OpenApi.Compare.Report

2− ( generateReport

2+ ( generateReport,

3− , CheckerOutput(..)

3+ CheckerOutput (..),

4− , ReportInput (..)

4+ ReportInput (..),

5− , segregateIssues

5+ segregateIssues,

6− , ReportStatus (..)

6+ ReportStatus (..),

7− , Pandoc

7+ Pandoc,

8− , ReportConfig (..)

8+ ReportConfig (..),

9− , ReportTreeStyle (..)

9+ ReportTreeStyle (..),

10− , ReportMode (..)

10+ ReportMode (..),

11 )

12where

13

@@ -30,8 +30,8 @@ import qualified Data.OpenApi.Compare.PathsPrefixTree as P hiding (empty)

30import Data.OpenApi.Compare.Report.Jet

31import Data.OpenApi.Compare.Subtree (invertIssueOrientationP)

32import Data.OpenApi.Compare.Validate.OpenApi

33−import Data.OpenApi.Compare.Validate.Schema.TypedJson

34import Data.OpenApi.Compare.Validate.Schema.Issues

33import Data.OpenApi.Compare.Validate.Schema.Issues

34+import Data.OpenApi.Compare.Validate.Schema.TypedJson

35import Data.OpenUnion

36import Data.OpenUnion.Extra

37import Data.Set

@@ -54,22 +54,27 @@ data CheckerOutput = CheckerOutput

54 deriving anyclass (ToJSON)

55

56data ReportInput = ReportInput

57+ { -- | forward 'CertainIssue', 'ProbablyIssue' and 'Comment'

57− { breakingChanges :: Changes -- ^ forward 'CertainIssue', 'ProbablyIssue' and 'Comment'

58+ breakingChanges :: Changes

58− , nonBreakingChanges :: Changes -- ^ backward 'CertainIssue', 'ProbablyIssue' and 'Comment', except those shadowed by 'relatedIssues'

59+ , -- | backward 'CertainIssue', 'ProbablyIssue' and 'Comment', except those shadowed by 'relatedIssues'

60+ nonBreakingChanges :: Changes

61+ , -- | forward and backward 'Unsupported' (assumed to be the same anyway)

59− , unsupportedChanges :: Changes -- ^ forward and backward 'Unsupported' (assumed to be the same anyway)

62+ unsupportedChanges :: Changes

60− , schemaIssues :: Changes -- ^ forward and backward 'SchemaInvalid' (assumed to be the same anyway)

63+ , -- | forward and backward 'SchemaInvalid' (assumed to be the same anyway)

64+ schemaIssues :: Changes

61 }

65 }

62 deriving stock (Generic)

66 deriving stock (Generic)

63 deriving (Semigroup, Monoid) via (Generically ReportInput)

67 deriving (Semigroup, Monoid) via (Generically ReportInput)

64 deriving anyclass (ToJSON)

68 deriving anyclass (ToJSON)

65

69

66segregateIssues :: CheckerOutput -> ReportInput

70segregateIssues :: CheckerOutput -> ReportInput

67−segregateIssues CheckerOutput {forwardChanges = fwd, backwardChanges = bck} = ReportInput

71+segregateIssues CheckerOutput {forwardChanges = fwd, backwardChanges = bck} =

72+ ReportInput

68− { breakingChanges = P.filter isBreaking fwd

73+ { breakingChanges = P.filter isBreaking fwd

69− , nonBreakingChanges = invertIssueOrientationP $ P.filterWithKey isNonBreaking bck

74+ , nonBreakingChanges = invertIssueOrientationP $ P.filterWithKey isNonBreaking bck

70− , unsupportedChanges = P.filter isUnsupported fwd <> P.filter isUnsupported bck

75+ , unsupportedChanges = P.filter isUnsupported fwd <> P.filter isUnsupported bck

71− , schemaIssues = P.filter isSchemaIssue fwd <> P.filter isSchemaIssue bck

76+ , schemaIssues = P.filter isSchemaIssue fwd <> P.filter isSchemaIssue bck

72− }

77+ }

73 where

78 where

74 isBreaking i = anIssueKind i `elem` [CertainIssue, ProbablyIssue, Comment]

79 isBreaking i = anIssueKind i `elem` [CertainIssue, ProbablyIssue, Comment]

75 isNonBreaking :: Paths Behave 'APILevel a -> AnIssue a -> Bool

80 isNonBreaking :: Paths Behave 'APILevel a -> AnIssue a -> Bool

@@ -106,8 +111,7 @@ twoRowTable x = simpleTable (para . fst <$> x) [para . snd <$> x]

106

111

107generateReport :: ReportConfig -> ReportInput -> (Blocks, ReportStatus)

112generateReport :: ReportConfig -> ReportInput -> (Blocks, ReportStatus)

108generateReport cfg inp =

113generateReport cfg inp =

109− let

110− schemaIssuesPresent = not $ P.null $ schemaIssues inp

114+ let schemaIssuesPresent = not $ P.null $ schemaIssues inp

111 breakingChangesPresent = not $ P.null $ breakingChanges inp

115 breakingChangesPresent = not $ P.null $ breakingChanges inp

112 nonBreakingChangesPresent = not $ P.null $ nonBreakingChanges inp

116 nonBreakingChangesPresent = not $ P.null $ nonBreakingChanges inp

113 unsupportedChangesPresent = not $ P.null $ unsupportedChanges inp

117 unsupportedChangesPresent = not $ P.null $ unsupportedChanges inp

@@ -116,47 +120,55 @@ generateReport cfg inp =

116 OnlyErrors -> False

120 OnlyErrors -> False

117 builder = buildReport cfg

121 builder = buildReport cfg

118 report =

122 report =

119− header 1 "Summary"

123+ header 1 "Summary"

120− <> twoRowTable

124+ <> twoRowTable

121− (when'

125+ ( when'

122− schemaIssuesPresent

126+ schemaIssuesPresent

127+ [

123− [ ( refOpt schemaIssuesPresent schemaIssuesId "‼️ Schema issues"

128+ ( refOpt schemaIssuesPresent schemaIssuesId "‼️ Schema issues"

124− , show' $ P.size $ schemaIssues inp

129+ , show' $ P.size $ schemaIssues inp

125− )

130+ )

126− ]

131+ ]

127− ++

132+ ++ [

128− [ ( refOpt breakingChangesPresent breakingChangesId "❌ Breaking changes"

133+ ( refOpt breakingChangesPresent breakingChangesId "❌ Breaking changes"

129 , show' $ P.size $ breakingChanges inp

134 , show' $ P.size $ breakingChanges inp

130 )

135 )

131 ]

136 ]

132− ++ when'

137+ ++ when'

133− nonBreakingChangesShown

138+ nonBreakingChangesShown

139+ [

134− [ ( refOpt nonBreakingChangesPresent nonBreakingChangesId "⚠️ Non-breaking changes"

140+ ( refOpt nonBreakingChangesPresent nonBreakingChangesId "⚠️ Non-breaking changes"

135− , show' $ P.size $ nonBreakingChanges inp

141+ , show' $ P.size $ nonBreakingChanges inp

136− )

142+ )

137− ]

143+ ]

138− ++ when'

144+ ++ when'

139− unsupportedChangesPresent

145+ unsupportedChangesPresent

146+ [

140− [ ( refOpt unsupportedChangesPresent unsupportedChangesId "❓ Unsupported feature changes"

147+ ( refOpt unsupportedChangesPresent unsupportedChangesId "❓ Unsupported feature changes"

141− , show' $ P.size $ unsupportedChanges inp

148+ , show' $ P.size $ unsupportedChanges inp

142− )

149+ )

143− ])

150+ ]

151+ )

144− <> when'

152+ <> when'

145− schemaIssuesPresent

153+ schemaIssuesPresent

146− (header 1 (anchor schemaIssuesId <> "‼️ Schema issues")

154+ ( header 1 (anchor schemaIssuesId <> "‼️ Schema issues")

147− <> builder (showErrs $ schemaIssues inp))

155+ <> builder (showErrs $ schemaIssues inp)

156+ )

148− <> when'

157+ <> when'

149− breakingChangesPresent

158+ breakingChangesPresent

150− (header 1 (anchor breakingChangesId <> "❌ Breaking changes")

159+ ( header 1 (anchor breakingChangesId <> "❌ Breaking changes")

151− <> builder (showErrs $ breakingChanges inp))

160+ <> builder (showErrs $ breakingChanges inp)

161+ )

152− <> when'

162+ <> when'

153− (nonBreakingChangesPresent && nonBreakingChangesShown)

163+ (nonBreakingChangesPresent && nonBreakingChangesShown)

154− (header 1 (anchor nonBreakingChangesId <> "⚠️ Non-breaking changes")

164+ ( header 1 (anchor nonBreakingChangesId <> "⚠️ Non-breaking changes")

155− <> builder (showErrs $ nonBreakingChanges inp))

165+ <> builder (showErrs $ nonBreakingChanges inp)

166+ )

156− <> when'

167+ <> when'

157− unsupportedChangesPresent

168+ unsupportedChangesPresent

158− (header 1 (anchor unsupportedChangesId <> "❓ Unsupported feature changes")

169+ ( header 1 (anchor unsupportedChangesId <> "❓ Unsupported feature changes")

159− <> builder (showErrs $ unsupportedChanges inp))

170+ <> builder (showErrs $ unsupportedChanges inp)

171+ )

160 status =

172 status =

161 if

173 if

162 | breakingChangesPresent -> BreakingChanges

174 | breakingChangesPresent -> BreakingChanges

@@ -186,13 +198,14 @@ showErrs x@(P.PathsPrefixNode currentIssues _) =

186 let -- Extract this pattern if more cases like this arise

198 let -- Extract this pattern if more cases like this arise

187 ( removedPaths :: Maybe (Orientation, [Issue 'APILevel])

199 ( removedPaths :: Maybe (Orientation, [Issue 'APILevel])

188 , otherIssues :: Set (AnIssue a)

200 , otherIssues :: Set (AnIssue a)

189− ) = case eqT @a @'APILevel of

201+ ) = case eqT @a @ 'APILevel of

190 Just Refl

202 Just Refl

191 | (S.toList -> p@((AnIssue ori _) : _), o) <-

203 | (S.toList -> p@((AnIssue ori _) : _), o) <-

192 S.partition

204 S.partition

193− (\((AnIssue _ u)) -> case u of

205+ ( \((AnIssue _ u)) -> case u of

194− NoPathsMatched {} -> True

206+ NoPathsMatched {} -> True

195− AllPathsFailed {} -> True)

207+ AllPathsFailed {} -> True

208+ )

196 currentIssues ->

209 currentIssues ->

197 let p' = p <&> (\(AnIssue _ i) -> i)

210 let p' = p <&> (\(AnIssue _ i) -> i)

198 in (Just (ori, p'), o)

211 in (Just (ori, p'), o)

@@ -203,9 +216,10 @@ showErrs x@(P.PathsPrefixNode currentIssues _) =

203 paths = case removedPaths of

216 paths = case removedPaths of

204 Just (ori, ps) -> do

217 Just (ori, ps) -> do

205 singletonHeader

218 singletonHeader

206− (case ori of

219+ ( case ori of

207− Forward -> "Removed paths"

220+ Forward -> "Removed paths"

208− Backward -> "Added paths")

221+ Backward -> "Added paths"

222+ )

209 $ singletonBody $

223 $ singletonBody $

210 bulletList $

224 bulletList $

211 ps <&> \case

225 ps <&> \case

@@ -249,52 +263,54 @@ jets =

249 unwrapReportJetResult (Pure _) = error "There really shouldn't be any results here."

263 unwrapReportJetResult (Pure _) = error "There really shouldn't be any results here."

250 unwrapReportJetResult (Free f) = f

264 unwrapReportJetResult (Free f) = f

251

265

252− jsonPathJet

266+ jsonPathJet ::

253− :: NonEmpty

267+ NonEmpty

254− ( Union

268+ ( Union

255− '[ Behave 'SchemaLevel 'TypedSchemaLevel

269+ '[ Behave 'SchemaLevel 'TypedSchemaLevel

256− , Behave 'TypedSchemaLevel 'SchemaLevel

270+ , Behave 'TypedSchemaLevel 'SchemaLevel

257− ]

271+ ]

258− )

272+ ) ->

259− -> Inlines

273+ Inlines

260 jsonPathJet x = code $ "$" <> showParts (NE.toList x)

274 jsonPathJet x = code $ "$" <> showParts (NE.toList x)

261 where

275 where

262− showParts

276+ showParts ::

263− :: [ Union

277+ [ Union

264− '[ Behave 'SchemaLevel 'TypedSchemaLevel

278+ '[ Behave 'SchemaLevel 'TypedSchemaLevel

265− , Behave 'TypedSchemaLevel 'SchemaLevel

279+ , Behave 'TypedSchemaLevel 'SchemaLevel

266− ]

267− ]

280+ ]

281+ ] ->

268− -> Text

282+ Text

269 showParts [] = mempty

283 showParts [] = mempty

270 showParts (SingletonUnion (OfType Object) : xs@((SingletonUnion (InProperty _)) : _)) = showParts xs

284 showParts (SingletonUnion (OfType Object) : xs@((SingletonUnion (InProperty _)) : _)) = showParts xs

271 showParts (SingletonUnion (OfType Object) : xs@((SingletonUnion InAdditionalProperty) : _)) = showParts xs

285 showParts (SingletonUnion (OfType Object) : xs@((SingletonUnion InAdditionalProperty) : _)) = showParts xs

272 showParts (SingletonUnion (OfType Array) : xs@(SingletonUnion InItems : _)) = showParts xs

286 showParts (SingletonUnion (OfType Array) : xs@(SingletonUnion InItems : _)) = showParts xs

273 showParts (SingletonUnion (OfType Array) : xs@(SingletonUnion (InItem _) : _)) = showParts xs

287 showParts (SingletonUnion (OfType Array) : xs@(SingletonUnion (InItem _) : _)) = showParts xs

274 showParts (y : ys) =

288 showParts (y : ys) =

275− ((\(OfType t) -> "(" <> describeJSONType t <> ")")

289+ ( (\(OfType t) -> "(" <> describeJSONType t <> ")")

276− @@> (\case

290+ @@> ( \case

277− InItems -> "[*]"

291+ InItems -> "[*]"

278− InItem i -> "[" <> T.pack (show i) <> "]"

292+ InItem i -> "[" <> T.pack (show i) <> "]"

279− InProperty p -> "." <> p

293+ InProperty p -> "." <> p

280− InAdditionalProperty -> ".*")

294+ InAdditionalProperty -> ".*"

295+ )

281− @@> typesExhausted)

296+ @@> typesExhausted

297+ )

282 y

298 y

283 <> showParts ys

299 <> showParts ys

284

300

285−observeJetShowErrs

301+observeJetShowErrs ::

286− :: ReportJet' Behave (Maybe Inlines)

302+ ReportJet' Behave (Maybe Inlines) ->

287− -> P.PathsPrefixTree Behave AnIssue a

303+ P.PathsPrefixTree Behave AnIssue a ->

288− -> (Report, P.PathsPrefixTree Behave AnIssue a)

304+ (Report, P.PathsPrefixTree Behave AnIssue a)

289observeJetShowErrs jet p = case observeJetShowErrs' jet p of

305observeJetShowErrs jet p = case observeJetShowErrs' jet p of

290 Just m -> m

306 Just m -> m

291 Nothing -> (mempty, p)

307 Nothing -> (mempty, p)

292

308

293−observeJetShowErrs'

309+observeJetShowErrs' ::

294− :: forall a.

310+ forall a.

295− ReportJet' Behave (Maybe Inlines)

311+ ReportJet' Behave (Maybe Inlines) ->

296− -> P.PathsPrefixTree Behave AnIssue a

312+ P.PathsPrefixTree Behave AnIssue a ->

297− -> Maybe (Report, P.PathsPrefixTree Behave AnIssue a)

313+ Maybe (Report, P.PathsPrefixTree Behave AnIssue a)

298observeJetShowErrs' (ReportJet jet) (P.PathsPrefixNode currentIssues subIssues) =

314observeJetShowErrs' (ReportJet jet) (P.PathsPrefixNode currentIssues subIssues) =

299 let results =

315 let results =

300 subIssues >>= \(WrapTypeable (AStep m)) ->

316 subIssues >>= \(WrapTypeable (AStep m)) ->

@@ -302,21 +318,23 @@ observeJetShowErrs' (ReportJet jet) (P.PathsPrefixNode currentIssues subIssues)

302 maybe (Left $ embed (step bhv) subErrs) Right . listToMaybe $

318 maybe (Left $ embed (step bhv) subErrs) Right . listToMaybe $

303 jet @_ @_ @[] bhv

319 jet @_ @_ @[] bhv

304 & mapMaybe

320 & mapMaybe

305− (\case

321+ ( \case

306− Free jet' -> fmap (embed $ step bhv) <$> observeJetShowErrs' jet' subErrs

322+ Free jet' -> fmap (embed $ step bhv) <$> observeJetShowErrs' jet' subErrs

307− Pure (Just h) ->

323+ Pure (Just h) ->

308− if P.null subErrs

324+ if P.null subErrs

309− then Just mempty

325+ then Just mempty

310− else Just (singletonHeader h (showErrs subErrs), mempty)

326+ else Just (singletonHeader h (showErrs subErrs), mempty)

311− Pure Nothing -> Nothing)

327+ Pure Nothing -> Nothing

328+ )

312 in (fmap . fmap) (PathsPrefixNode currentIssues mempty <>) $

329 in (fmap . fmap) (PathsPrefixNode currentIssues mempty <>) $

313 if any isRight results

330 if any isRight results

314 then

331 then

315 Just $

332 Just $

316 foldMap

333 foldMap

317− (\case

334+ ( \case

318− Left e -> (mempty, e)

335+ Left e -> (mempty, e)

319− Right m -> m)

336+ Right m -> m

337+ )

320 results

338 results

321 else Nothing

339 else Nothing

322

340

@@ -339,8 +357,9 @@ buildReport cfg = case treeStyle cfg of

339 body rprt

357 body rprt

340 <> foldOMapWithKey

358 <> foldOMapWithKey

341 (headers rprt)

359 (headers rprt)

342− (\k v ->

360+ ( \k v ->

343− header level k <> subBuilder v)

361+ header level k <> subBuilder v

362+ )

344 where

363 where

345 subBuilder = headerStyleBuilder (level + 1)

364 subBuilder = headerStyleBuilder (level + 1)

346

365

@@ -349,16 +368,17 @@ buildReport cfg = case treeStyle cfg of

349 body rprt

368 body rprt

350 <> foldOMapWithKey

369 <> foldOMapWithKey

351 (headers rprt)

370 (headers rprt)

352− (\k v ->

371+ ( \k v ->

353− if (OM.size . headers $ rprt) < 2

372+ if (OM.size . headers $ rprt) < 2

354− then para k <> blockQuote (subBuilder v)

373+ then para k <> blockQuote (subBuilder v)

355− else

374+ else

356− rawHtml "<details>"

375+ rawHtml "<details>"

357− <> rawHtml "<summary>"

376+ <> rawHtml "<summary>"

358− <> plain k

377+ <> plain k

359− <> rawHtml "</summary>"

378+ <> rawHtml "</summary>"

360− <> blockQuote (subBuilder v)

379+ <> blockQuote (subBuilder v)

361− <> rawHtml "</details>")

380+ <> rawHtml "</details>"

381+ )

362 where

382 where

363 subBuilder = foldingStyleBuilder

383 subBuilder = foldingStyleBuilder

364

384

src/Data/OpenApi/Compare/Report/Html/Template.hs+1−1

@@ -1,7 +1,7 @@

1{-# LANGUAGE TemplateHaskell #-}

2

3module Data.OpenApi.Compare.Report.Html.Template

4− ( template

4+ ( template,

5 )

6where

7

src/Data/OpenApi/Compare/Report/Jet.hs+4−4

@@ -1,8 +1,8 @@

1module Data.OpenApi.Compare.Report.Jet

2− ( ReportJet (..)

2+ ( ReportJet (..),

3− , ReportJet'

3+ ReportJet',

4− , ConstructReportJet (..)

4+ ConstructReportJet (..),

5− , ReportJetResult

5+ ReportJetResult,

6 )

7where

8

src/Data/OpenApi/Compare/Run.hs+4−4

@@ -1,17 +1,17 @@

1module Data.OpenApi.Compare.Run

2− ( runChecker

2+ ( runChecker,

3− , runReport

3+ runReport,

4− , module Data.OpenApi.Compare.Report

4+ module Data.OpenApi.Compare.Report,

5 )

6where

7

8import Data.HList

9import Data.OpenApi (OpenApi)

10−import Text.Pandoc.Builder

11import Data.OpenApi.Compare.Paths

10import Data.OpenApi.Compare.Paths

12import Data.OpenApi.Compare.Report

11import Data.OpenApi.Compare.Report

13import Data.OpenApi.Compare.Subtree

12import Data.OpenApi.Compare.Subtree

14import Data.OpenApi.Compare.Validate.OpenApi ()

13import Data.OpenApi.Compare.Validate.OpenApi ()

14+import Text.Pandoc.Builder

15

16runChecker :: (OpenApi, OpenApi) -> CheckerOutput

17runChecker (client, server) =

src/Data/OpenApi/Compare/Subtree.hs+122−120

@@ -1,52 +1,52 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Subtree

4− ( Steppable (..)

4+ ( Steppable (..),

5− , Step (..)

5+ Step (..),

6− , TraceRoot

6+ TraceRoot,

7− , Trace

7+ Trace,

8− , Traced

8+ Traced,

9− , Traced'

9+ Traced',

10− , pattern Traced

10+ pattern Traced,

11− , traced

11+ traced,

12− , retraced

12+ retraced,

13− , stepTraced

13+ stepTraced,

14− , Subtree (..)

14+ Subtree (..),

15− , checkCompatibility

15+ checkCompatibility,

16− , checkSubstructure

16+ checkSubstructure,

17− , CompatM (..)

17+ CompatM (..),

18− , CompatFormula'

18+ CompatFormula',

19− , SemanticCompatFormula

19+ SemanticCompatFormula,

20− , ProdCons (..)

20+ ProdCons (..),

21− , orientProdCons

21+ orientProdCons,

22− , swapProdCons

22+ swapProdCons,

23− , runCompatFormula

23+ runCompatFormula,

24− , issueAt

24+ issueAt,

25− , anItem

25+ anItem,

26− , anIssue

26+ anIssue,

27− , invertIssueOrientation

27+ invertIssueOrientation,

28− , invertIssueOrientationP

28+ invertIssueOrientationP,

29− , embedFormula

29+ embedFormula,

30− , anyOfAt

30+ anyOfAt,

31− , clarifyIssue

31+ clarifyIssue,

32− , structuralIssue

32+ structuralIssue,

33

34 -- * Structural helpers

35− , structuralMaybe

35+ structuralMaybe,

36− , structuralMaybeWith

36+ structuralMaybeWith,

37− , structuralEq

37+ structuralEq,

38− , iohmStructural

38+ iohmStructural,

39− , iohmStructuralWith

39+ iohmStructuralWith,

40− , structuralList

40+ structuralList,

41

42 -- * Reexports

43− , (>>>)

43+ (>>>),

44− , (<<<)

44+ (<<<),

45− , extract

45+ extract,

46− , ask

46+ ask,

47− , local

47+ local,

48− , step

48+ step,

49− , Typeable

49+ Typeable,

50 )

51where

52

@@ -115,10 +115,10 @@ orientProdCons :: Orientation -> ProdCons x -> ProdCons x

115orientProdCons Forward x = x

116orientProdCons Backward (ProdCons p c) = ProdCons c p

117

118−swapProdCons

118+swapProdCons ::

119− :: SwapEnvRoles xs

119+ SwapEnvRoles xs =>

120− => (HList xs -> ProdCons x -> CompatFormula' q AnIssue r a)

120+ (HList xs -> ProdCons x -> CompatFormula' q AnIssue r a) ->

121− -> (HList xs -> ProdCons x -> CompatFormula' q AnIssue r a)

121+ (HList xs -> ProdCons x -> CompatFormula' q AnIssue r a)

122swapProdCons f e (ProdCons p c) =

123 invertIssueOrientation $

124 f (swapEnvRoles e) (ProdCons c p)

@@ -153,8 +153,8 @@ instance Applicative ProdCons where

153 ProdCons fp fc <*> ProdCons xp xc = ProdCons (fp xp) (fc xc)

154

155newtype CompatM a = CompatM

156− { unCompatM

156+ { unCompatM ::

157− :: StateT (MemoState VarRef) Identity a

157+ StateT (MemoState VarRef) Identity a

158 }

159 deriving newtype

160 ( Functor

@@ -183,64 +183,64 @@ class (Typeable t, Issuable (SubtreeLevel t)) => Subtree (t :: Type) where

183 type CheckEnv t :: [Type]

184 type SubtreeLevel t :: BehaviorLevel

185

186− checkStructuralCompatibility

186+ checkStructuralCompatibility ::

187− :: HList (CheckEnv t)

187+ HList (CheckEnv t) ->

188− -> ProdCons (Traced t)

188+ ProdCons (Traced t) ->

189− -> StructuralCompatFormula ()

189+ StructuralCompatFormula ()

190

191− checkSemanticCompatibility

191+ checkSemanticCompatibility ::

192− :: HList (CheckEnv t)

192+ HList (CheckEnv t) ->

193− -> Behavior (SubtreeLevel t)

193+ Behavior (SubtreeLevel t) ->

194− -> ProdCons (Traced t)

194+ ProdCons (Traced t) ->

195− -> SemanticCompatFormula ()

195+ SemanticCompatFormula ()

196

197{-# WARNING checkStructuralCompatibility "You should not be calling this directly. Use 'checkSubstructure'" #-}

198

199{-# WARNING checkSemanticCompatibility "You should not be calling this directly. Use 'checkCompatibility'" #-}

200

201−checkCompatibility

201+checkCompatibility ::

202− :: forall t xs.

202+ forall t xs.

203− (ReassembleHList xs (CheckEnv t), Subtree t)

203+ (ReassembleHList xs (CheckEnv t), Subtree t) =>

204− => Behavior (SubtreeLevel t)

204+ Behavior (SubtreeLevel t) ->

205− -> HList xs

205+ HList xs ->

206− -> ProdCons (Traced t)

206+ ProdCons (Traced t) ->

207− -> SemanticCompatFormula ()

207+ SemanticCompatFormula ()

208checkCompatibility bhv e = memo bhv SemanticMemoKey $ \pc ->

209 case runCompatFormula $ checkSubstructure e pc of

210 Left _ -> checkSemanticCompatibility (reassemble e) bhv pc

211 Right () -> pure ()

212{-# INLINE checkCompatibility #-}

213

214−checkSubstructure

214+checkSubstructure ::

215− :: (ReassembleHList xs (CheckEnv t), Subtree t)

215+ (ReassembleHList xs (CheckEnv t), Subtree t) =>

216− => HList xs

216+ HList xs ->

217− -> ProdCons (Traced t)

217+ ProdCons (Traced t) ->

218− -> StructuralCompatFormula ()

218+ StructuralCompatFormula ()

219checkSubstructure e = memo Root StructuralMemoKey $ checkStructuralCompatibility (reassemble e)

220{-# INLINE checkSubstructure #-}

221

222−structuralMaybe

222+structuralMaybe ::

223− :: (Subtree a, ReassembleHList xs (CheckEnv a))

223+ (Subtree a, ReassembleHList xs (CheckEnv a)) =>

224− => HList xs

224+ HList xs ->

225− -> ProdCons (Maybe (Traced a))

225+ ProdCons (Maybe (Traced a)) ->

226− -> StructuralCompatFormula ()

226+ StructuralCompatFormula ()

227structuralMaybe e = structuralMaybeWith (checkSubstructure e)

228{-# INLINE structuralMaybe #-}

229

230−structuralMaybeWith

230+structuralMaybeWith ::

231− :: (ProdCons a -> StructuralCompatFormula ())

231+ (ProdCons a -> StructuralCompatFormula ()) ->

232− -> ProdCons (Maybe a)

232+ ProdCons (Maybe a) ->

233− -> StructuralCompatFormula ()

233+ StructuralCompatFormula ()

234structuralMaybeWith f (ProdCons (Just a) (Just b)) = f $ ProdCons a b

235structuralMaybeWith _ (ProdCons Nothing Nothing) = pure ()

236structuralMaybeWith _ _ = structuralIssue

237{-# INLINE structuralMaybeWith #-}

238

239−structuralList

239+structuralList ::

240− :: (Subtree a, ReassembleHList xs (CheckEnv a))

240+ (Subtree a, ReassembleHList xs (CheckEnv a)) =>

241− => HList xs

241+ HList xs ->

242− -> ProdCons [Traced a]

242+ ProdCons [Traced a] ->

243− -> StructuralCompatFormula ()

243+ StructuralCompatFormula ()

244structuralList _ (ProdCons [] []) = pure ()

245structuralList e (ProdCons (a : aa) (b : bb)) = do

246 checkSubstructure e $ ProdCons a b

@@ -253,11 +253,11 @@ structuralEq :: (Eq a, Comonad w) => ProdCons (w a) -> StructuralCompatFormula (

253structuralEq (ProdCons a b) = if extract a == extract b then pure () else structuralIssue

254{-# INLINE structuralEq #-}

255

256−iohmStructural

256+iohmStructural ::

257− :: (ReassembleHList (k ': xs) (CheckEnv v), Ord k, Subtree v, Hashable k, Typeable k, Show k)

257+ (ReassembleHList (k ': xs) (CheckEnv v), Ord k, Subtree v, Hashable k, Typeable k, Show k) =>

258− => HList xs

258+ HList xs ->

259− -> ProdCons (Traced (IOHM.InsOrdHashMap k v))

259+ ProdCons (Traced (IOHM.InsOrdHashMap k v)) ->

260− -> StructuralCompatFormula ()

260+ StructuralCompatFormula ()

261iohmStructural e =

262 iohmStructuralWith (\k -> checkSubstructure (k `HCons` e))

263{-# INLINE iohmStructural #-}

@@ -266,25 +266,26 @@ instance (Typeable k, Typeable v, Ord k, Show k) => Steppable (IOHM.InsOrdHashMa

266 data Step (IOHM.InsOrdHashMap k v) v = InsOrdHashMapKeyStep k

267 deriving stock (Eq, Ord, Show)

268

269−iohmStructuralWith

269+iohmStructuralWith ::

270− :: (Ord k, Hashable k, Typeable k, Typeable v, Show k)

270+ (Ord k, Hashable k, Typeable k, Typeable v, Show k) =>

271− => (k -> ProdCons (Traced v) -> StructuralCompatFormula ())

271+ (k -> ProdCons (Traced v) -> StructuralCompatFormula ()) ->

272− -> ProdCons (Traced (IOHM.InsOrdHashMap k v))

272+ ProdCons (Traced (IOHM.InsOrdHashMap k v)) ->

273− -> StructuralCompatFormula ()

273+ StructuralCompatFormula ()

274iohmStructuralWith f pc = do

275 let ProdCons pEKeys cEKeys = S.fromList . IOHM.keys . extract <$> pc

276 if pEKeys == cEKeys

277 then

278 for_

279 pEKeys

280− (\eKey ->

280+ ( \eKey ->

281− f eKey $ stepTraced (InsOrdHashMapKeyStep eKey) . fmap (IOHM.lookupDefault (error "impossible") eKey) <$> pc)

281+ f eKey $ stepTraced (InsOrdHashMapKeyStep eKey) . fmap (IOHM.lookupDefault (error "impossible") eKey) <$> pc

282+ )

282 else structuralIssue

283 else structuralIssue

283{-# INLINE iohmStructuralWith #-}

284{-# INLINE iohmStructuralWith #-}

284

285

285−runCompatFormula

286+runCompatFormula ::

286− :: CompatFormula' q f r a

287+ CompatFormula' q f r a ->

287− -> Either (P.PathsPrefixTree q f r) a

288+ Either (P.PathsPrefixTree q f r) a

288runCompatFormula (Compose f) =

289runCompatFormula (Compose f) =

289 calculate . runIdentity . runMemo 0 . unCompatM $ f

290 calculate . runIdentity . runMemo 0 . unCompatM $ f

290{-# INLINE runCompatFormula #-}

291{-# INLINE runCompatFormula #-}

@@ -314,27 +315,27 @@ invertIssueOrientationP = P.map (\(AnIssue ori i) -> AnIssue (toggleOrientation

314structuralIssue :: StructuralCompatFormula a

315structuralIssue :: StructuralCompatFormula a

315structuralIssue = Compose $ pure $ anError $ AnItem Root Proxy

316structuralIssue = Compose $ pure $ anError $ AnItem Root Proxy

316

317

317−anyOfAt

318+anyOfAt ::

318− :: Issuable l

319+ Issuable l =>

319− => Paths q r l

320+ Paths q r l ->

320− -> Issue l

321+ Issue l ->

321− -> [CompatFormula' q AnIssue r a]

322+ [CompatFormula' q AnIssue r a] ->

322− -> CompatFormula' q AnIssue r a

323+ CompatFormula' q AnIssue r a

323anyOfAt _ _ [x] = x

324anyOfAt _ _ [x] = x

324anyOfAt xs issue fs =

325anyOfAt xs issue fs =

325 Compose $ (`eitherOf` AnItem xs (anIssue issue)) <$> traverse getCompose fs

326 Compose $ (`eitherOf` AnItem xs (anIssue issue)) <$> traverse getCompose fs

326

327

327-- | If the given formula contains any issues, add another issue on top. Otherwise succeed.

328-- | If the given formula contains any issues, add another issue on top. Otherwise succeed.

328−clarifyIssue

329+clarifyIssue ::

329− :: AnItem q AnIssue r

330+ AnItem q AnIssue r ->

330− -> CompatFormula' q AnIssue r a

331+ CompatFormula' q AnIssue r a ->

331− -> CompatFormula' q AnIssue r a

332+ CompatFormula' q AnIssue r a

332clarifyIssue item f =

333clarifyIssue item f =

333 Compose ((`eitherOf` item) <$> pure <$> getCompose f) *> f

334 Compose ((`eitherOf` item) <$> pure <$> getCompose f) *> f

334

335

335−fixpointKnot

336+fixpointKnot ::

336− :: MonadState (MemoState VarRef) m

337+ MonadState (MemoState VarRef) m =>

337− => KnotTier (FormulaF q f r ()) VarRef m

338+ KnotTier (FormulaF q f r ()) VarRef m

338fixpointKnot =

339fixpointKnot =

339 KnotTier

340 KnotTier

340 { onKnotFound = modifyMemoNonce succ

341 { onKnotFound = modifyMemoNonce succ

@@ -342,19 +343,20 @@ fixpointKnot =

342 , tieKnot = \i x -> pure $ maxFixpoint i x

343 , tieKnot = \i x -> pure $ maxFixpoint i x

343 }

344 }

344

345

345−memo

346+memo ::

346− :: (Typeable (l :: k), Typeable q, Typeable f, Typeable k, Typeable a)

347+ (Typeable (l :: k), Typeable q, Typeable f, Typeable k, Typeable a) =>

347− => Paths q r l

348+ Paths q r l ->

348− -> MemoKey

349+ MemoKey ->

349− -> (ProdCons (Traced a) -> CompatFormula' q f r ())

350+ (ProdCons (Traced a) -> CompatFormula' q f r ()) ->

350− -> (ProdCons (Traced a) -> CompatFormula' q f r ())

351+ (ProdCons (Traced a) -> CompatFormula' q f r ())

351memo bhv k f pc = Compose $ do

352memo bhv k f pc = Compose $ do

352 formula' <-

353 formula' <-

353 memoWithKnot

354 memoWithKnot

354 fixpointKnot

355 fixpointKnot

355− (do

356+ ( do

356− formula <- getCompose $ f pc

357+ formula <- getCompose $ f pc

357− pure $ mapErrors (P.takeSubtree bhv) formula)

358+ pure $ mapErrors (P.takeSubtree bhv) formula

359+ )

358 (k, ask <$> pc)

360 (k, ask <$> pc)

359 pure $ mapErrors (P.embed bhv) formula'

361 pure $ mapErrors (P.embed bhv) formula'

360

362

src/Data/OpenApi/Compare/Validate/MediaTypeObject.hs+2−2

@@ -1,8 +1,8 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Validate.MediaTypeObject

4− ( Issue (..)

4+ ( Issue (..),

5− , Behave (..)

5+ Behave (..),

6 )

7where

8

src/Data/OpenApi/Compare/Validate/OAuth2Flows.hs+13−13

@@ -1,9 +1,9 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Validate.OAuth2Flows

4− ( Step (..)

4+ ( Step (..),

5− , Issue (..)

5+ Issue (..),

6− , Behave (..)

6+ Behave (..),

7 )

8where

9

@@ -26,11 +26,11 @@ instance Subtree OAuth2Flows where

26 type SubtreeLevel OAuth2Flows = 'SecuritySchemeLevel

27 checkStructuralCompatibility _ = structuralEq

28 checkSemanticCompatibility env bhv pc = do

29− let supportFlow

29+ let supportFlow ::

30− :: (Subtree t, SubtreeLevel t ~ SubtreeLevel OAuth2Flows, CheckEnv OAuth2Flows ~ CheckEnv t)

30+ (Subtree t, SubtreeLevel t ~ SubtreeLevel OAuth2Flows, CheckEnv OAuth2Flows ~ CheckEnv t) =>

31− => Issue 'SecuritySchemeLevel

31+ Issue 'SecuritySchemeLevel ->

32− -> ProdCons (Maybe (Traced t))

32+ ProdCons (Maybe (Traced t)) ->

33− -> SemanticCompatFormula ()

33+ SemanticCompatFormula ()

34 supportFlow i x = case x of

35 -- producer will not attempt this flow

36 (ProdCons Nothing _) -> pure ()

@@ -38,11 +38,11 @@ instance Subtree OAuth2Flows where

38 (ProdCons (Just _) Nothing) -> issueAt bhv i

39 (ProdCons (Just p) (Just c)) ->

40 checkCompatibility bhv env $ ProdCons p c

41− getFlow

41+ getFlow ::

42− :: Typeable x

42+ Typeable x =>

43− => (OAuth2Flows -> Maybe (OAuth2Flow x))

43+ (OAuth2Flows -> Maybe (OAuth2Flow x)) ->

44− -> Traced OAuth2Flows

44+ Traced OAuth2Flows ->

45− -> Maybe (Traced (OAuth2Flow x))

45+ Maybe (Traced (OAuth2Flow x))

46 getFlow f (Traced t a) = Traced (t >>> step (OAuth2FlowsFlow Proxy)) <$> f a

47 supportFlow ConsumerDoesNotSupportImplicitFlow $ getFlow _oAuth2FlowsImplicit <$> pc

48 supportFlow ConsumerDoesNotSupportPasswordFlow $ getFlow _oAuth2FlowsPassword <$> pc

src/Data/OpenApi/Compare/Validate/OpenApi.hs+13−12

@@ -3,8 +3,8 @@

3{-# OPTIONS_GHC -fconstraint-solver-iterations=0 #-}

4

5module Data.OpenApi.Compare.Validate.OpenApi

6− ( Behave (..)

6+ ( Behave (..),

7− , Issue (..)

7+ Issue (..),

8 )

9where

10

@@ -79,16 +79,17 @@ instance Subtree OpenApi where

79 checkSemanticCompatibility _ beh prodCons = do

80 checkCompatibility @ProcessedPathItems

81 beh

82− ((tracedRequestBodies <$> prodCons)

82+ ( (tracedRequestBodies <$> prodCons)

83− `HCons` (tracedParameters <$> prodCons)

83+ `HCons` (tracedParameters <$> prodCons)

84− `HCons` (tracedSecuritySchemes <$> prodCons)

84+ `HCons` (tracedSecuritySchemes <$> prodCons)

85− `HCons` (tracedResponses <$> prodCons)

85+ `HCons` (tracedResponses <$> prodCons)

86− `HCons` (tracedHeaders <$> prodCons)

86+ `HCons` (tracedHeaders <$> prodCons)

87− `HCons` (tracedSchemas <$> prodCons)

87+ `HCons` (tracedSchemas <$> prodCons)

88− `HCons` (_openApiServers . extract <$> prodCons)

88+ `HCons` (_openApiServers . extract <$> prodCons)

89− `HCons` (tracedLinks <$> prodCons)

89+ `HCons` (tracedLinks <$> prodCons)

90− `HCons` (tracedCallbacks <$> prodCons)

90+ `HCons` (tracedCallbacks <$> prodCons)

91− `HCons` HNil)

91+ `HCons` HNil

92+ )

92 (tracedPaths <$> prodCons)

93 (tracedPaths <$> prodCons)

93

94

94instance Steppable OpenApi ProcessedPathItems where

95instance Steppable OpenApi ProcessedPathItems where

src/Data/OpenApi/Compare/Validate/Operation.hs+26−24

@@ -4,17 +4,17 @@

4

5module Data.OpenApi.Compare.Validate.Operation

6 ( -- * Operation

7− MatchedOperation (..)

7+ MatchedOperation (..),

8− , OperationMethod (..)

8+ OperationMethod (..),

9− , pathItemMethod

9+ pathItemMethod,

10

11 -- * ProcessedPathItem

12− , ProcessedPathItem (..)

12+ ProcessedPathItem (..),

13− , ProcessedPathItems (..)

13+ ProcessedPathItems (..),

14− , processPathItems

14+ processPathItems,

15− , Step (..)

15+ Step (..),

16− , Behave (..)

16+ Behave (..),

17− , Issue (..)

17+ Issue (..),

18 )

19where

20

@@ -87,10 +87,11 @@ tracedCallbacks (Traced t oper) =

87 ]

88

89-- FIXME: #28

90−getServers

90+getServers ::

91− :: [Server] -- ^ Servers from env

91+ -- | Servers from env

92+ [Server] ->

92− -> MatchedOperation

93+ MatchedOperation ->

93− -> [Server]

94+ [Server]

94getServers env oper =

95getServers env oper =

95 case _operationServers . operation $ oper of

96 case _operationServers . operation $ oper of

96 [] -> env

97 [] -> env

@@ -337,9 +338,10 @@ instance Issuable 'APILevel where

337 deriving stock (Eq, Ord, Show)

338 deriving stock (Eq, Ord, Show)

338 issueKind = \case

339 issueKind = \case

339 _ -> CertainIssue

340 _ -> CertainIssue

340− relatedIssues = (==) `withClass` \case

341+ relatedIssues =

342+ (==) `withClass` \case

341− NoPathsMatched fp -> Just fp

343+ NoPathsMatched fp -> Just fp

342− AllPathsFailed fp -> Just fp

344+ AllPathsFailed fp -> Just fp

343 describeIssue Forward (NoPathsMatched p) = para $ "The path " <> (code . T.pack) p <> " has been removed."

345 describeIssue Forward (NoPathsMatched p) = para $ "The path " <> (code . T.pack) p <> " has been removed."

344 describeIssue Backward (NoPathsMatched p) = para $ "The path " <> (code . T.pack) p <> " has been added."

346 describeIssue Backward (NoPathsMatched p) = para $ "The path " <> (code . T.pack) p <> " has been added."

345 describeIssue Forward (AllPathsFailed p) = para $ "The path " <> (code . T.pack) p <> " has been removed."

347 describeIssue Forward (AllPathsFailed p) = para $ "The path " <> (code . T.pack) p <> " has been removed."

@@ -434,10 +436,10 @@ tracedFragments mpi =

434 | (i, x) <- L.zip [0 ..] $ pathFragments $ extract mpi

436 | (i, x) <- L.zip [0 ..] $ pathFragments $ extract mpi

435 ]

437 ]

436

438

437−tracedMethod

439+tracedMethod ::

438− :: OperationMethod

440+ OperationMethod ->

439− -> Traced MatchedPathItem

441+ Traced MatchedPathItem ->

440− -> Maybe (Traced' MatchedOperation Operation)

442+ Maybe (Traced' MatchedOperation Operation)

441tracedMethod s mpi = env (ask mpi >>> step (OperationMethodStep s)) <$> (pathItemMethod s . pathItem . extract $ mpi)

443tracedMethod s mpi = env (ask mpi >>> step (OperationMethodStep s)) <$> (pathItemMethod s . pathItem . extract $ mpi)

442

444

443instance Issuable 'PathLevel where

445instance Issuable 'PathLevel where

@@ -485,10 +487,10 @@ instance Subtree MatchedPathItem where

485 checkSemanticCompatibility env beh prodCons = do

487 checkSemanticCompatibility env beh prodCons = do

486 let paramDefs = getH @(ProdCons (Traced (Definitions Param))) env

488 let paramDefs = getH @(ProdCons (Traced (Definitions Param))) env

487 pathTracedParams = getPathParams <$> paramDefs <*> prodCons

489 pathTracedParams = getPathParams <$> paramDefs <*> prodCons

488− getPathParams

490+ getPathParams ::

489− :: Traced (Definitions Param)

491+ Traced (Definitions Param) ->

490− -> Traced MatchedPathItem

492+ Traced MatchedPathItem ->

491− -> [Traced Param]

493+ [Traced Param]

492 getPathParams defs mpi = do

494 getPathParams defs mpi = do

493 paramRef <- tracedMatchedPathItemParameters mpi

495 paramRef <- tracedMatchedPathItemParameters mpi

494 pure $ dereference defs paramRef

496 pure $ dereference defs paramRef

src/Data/OpenApi/Compare/Validate/Param.hs+9−7

@@ -2,8 +2,8 @@

2{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

3

4module Data.OpenApi.Compare.Validate.Param

5− ( Behave (..)

5+ ( Behave (..),

6− , Issue (..)

6+ Issue (..),

7 )

8where

9

@@ -79,7 +79,7 @@ instance Issuable 'PathFragmentLevel where

79 describeIssue _ ParamPlaceIncompatible = para "Parameters in incompatible locations."

80 describeIssue _ ParamStyleMismatch = para "Different parameter styles (encodings)."

81 describeIssue _ ParamSchemaMismatch = para "Expected a schema, but didn't find one."

82− describeIssue ori (PathFragmentsDontMatch (orientProdCons ori -> ProdCons e a)) =

82+ describeIssue ori (PathFragmentsDontMatch (orientProdCons ori -> ProdCons e a)) =

83 para $ "Parameter changed from " <> code e <> " to " <> code a <> "."

84

85instance Behavable 'PathFragmentLevel 'SchemaLevel where

@@ -106,15 +106,17 @@ instance Subtree Param where

106 when (_paramName (extract p) /= _paramName (extract c)) $

107 issueAt beh ParamNameMismatch

108 when

109− ((fromMaybe False . _paramRequired . extract $ c)

109+ ( (fromMaybe False . _paramRequired . extract $ c)

110− && not (fromMaybe False . _paramRequired . extract $ p))

110+ && not (fromMaybe False . _paramRequired . extract $ p)

111+ )

111 $ issueAt beh ParamRequired

112 $ issueAt beh ParamRequired

112 case (_paramIn . extract $ p, _paramIn . extract $ c) of

113 case (_paramIn . extract $ p, _paramIn . extract $ c) of

113 (ParamQuery, ParamQuery) -> do

114 (ParamQuery, ParamQuery) -> do

114 -- Emptiness is only for query params

115 -- Emptiness is only for query params

115 when

116 when

116− ((fromMaybe False . _paramAllowEmptyValue . extract $ p)

117+ ( (fromMaybe False . _paramAllowEmptyValue . extract $ p)

117− && not (fromMaybe False . _paramAllowEmptyValue . extract $ c))

118+ && not (fromMaybe False . _paramAllowEmptyValue . extract $ c)

119+ )

118 $ issueAt beh ParamEmptinessIncompatible

120 $ issueAt beh ParamEmptinessIncompatible

119 (a, b) | a == b -> pure ()

121 (a, b) | a == b -> pure ()

120 _ -> issueAt beh ParamPlaceIncompatible

122 _ -> issueAt beh ParamPlaceIncompatible

src/Data/OpenApi/Compare/Validate/PathFragment.hs+3−3

@@ -1,7 +1,7 @@

1module Data.OpenApi.Compare.Validate.PathFragment

2− ( parsePath

2+ ( parsePath,

3− , PathFragment (..)

3+ PathFragment (..),

4− , PathFragmentParam

4+ PathFragmentParam,

5 )

6where

7

src/Data/OpenApi/Compare/Validate/Products.hs+27−28

@@ -1,21 +1,21 @@

1−{- | Checks product-like entities. The key is some identificator for the product

1+-- | Checks product-like entities. The key is some identificator for the product

2−element. Each element may be required or optional.

2+--element. Each element may be required or optional.

3−

3+--

4−One example of product is request parameters. There are optional and required

4+--One example of product is request parameters. There are optional and required

5−parameters. The client and server have possibly different set of

5+--parameters. The client and server have possibly different set of

6−parameters. What we must check is if server requires some request parameter,

6+--parameters. What we must check is if server requires some request parameter,

7−then this parameter must be presented by client and their schemas must match.

7+--then this parameter must be presented by client and their schemas must match.

8−

8+--

9−So when we checking products we are checking from the server's (consumer)

9+--So when we checking products we are checking from the server's (consumer)

10−perspective, ensuring that all parameters are provided by the client (producer)

10+--perspective, ensuring that all parameters are provided by the client (producer)

11−and their schemas match.

11+--and their schemas match.

12−

12+--

13−This module abstracts this logic for arbitrary elements -}

13+--This module abstracts this logic for arbitrary elements

14−

15module Data.OpenApi.Compare.Validate.Products

14module Data.OpenApi.Compare.Validate.Products

16− ( checkProducts

15+ ( checkProducts,

17− , ProductLike(..)

16+ ProductLike (..),

17+ )

18− ) where

18+where

19

20import Data.Foldable

21import Data.Map.Strict (Map)

@@ -30,20 +30,19 @@ data ProductLike a = ProductLike

30 , required :: Bool

31 }

32

33−checkProducts

33+checkProducts ::

34− :: (Ord k, Issuable l)

34+ (Ord k, Issuable l) =>

35− => Paths q r l

35+ Paths q r l ->

36− -> (k -> Issue l)

37− -- ^ No required element found

36+ -- | No required element found

37+ (k -> Issue l) ->

38− -> (k -> ProdCons t -> CompatFormula' q AnIssue r ())

38+ (k -> ProdCons t -> CompatFormula' q AnIssue r ()) ->

39− -> ProdCons (Map k (ProductLike t))

39+ ProdCons (Map k (ProductLike t)) ->

40− -> CompatFormula' q AnIssue r ()

40+ CompatFormula' q AnIssue r ()

41checkProducts xs noElt check (ProdCons p c) = for_ (M.toList c) $ \(key, consElt) ->

42 case M.lookup key p of

43 Nothing -> case required consElt of

44− True -> issueAt xs $ noElt key

44+ True -> issueAt xs $ noElt key

45 False -> pure ()

46 Just prodElt -> do

47− let

48− elts = ProdCons prodElt consElt

47+ let elts = ProdCons prodElt consElt

49 check key (productValue <$> elts)

48 check key (productValue <$> elts)

src/Data/OpenApi/Compare/Validate/RequestBody.hs+2−2

@@ -1,8 +1,8 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Validate.RequestBody

4− ( Issue (..)

4+ ( Issue (..),

5− , Behave (..)

5+ Behave (..),

6 )

7where

8

src/Data/OpenApi/Compare/Validate/Responses.hs+1−1

@@ -2,7 +2,7 @@

2{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

3

4module Data.OpenApi.Compare.Validate.Responses

5− ( Behave (..)

5+ ( Behave (..),

6 )

7where

8

src/Data/OpenApi/Compare/Validate/Schema.hs+76−97

@@ -1,4 +1,5 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2+

2module Data.OpenApi.Compare.Validate.Schema

3module Data.OpenApi.Compare.Validate.Schema

3 (

4 (

4 )

5 )

@@ -10,9 +11,9 @@ import Data.Coerce

10import Data.Foldable (for_, toList)

11import Data.Foldable (for_, toList)

11import Data.Functor

12import Data.Functor

12import Data.HList

13import Data.HList

14+import Data.List (genericIndex, genericLength, group)

13import qualified Data.List.NonEmpty as NE

15import qualified Data.List.NonEmpty as NE

14import qualified Data.Map as M

16import qualified Data.Map as M

15−import Data.List (group, genericLength, genericIndex)

16import Data.Maybe

17import Data.Maybe

17import Data.OpenApi

18import Data.OpenApi

18import Data.OpenApi.Compare.Behavior

19import Data.OpenApi.Compare.Behavior

@@ -22,24 +23,24 @@ import Data.OpenApi.Compare.Subtree

22import Data.OpenApi.Compare.Validate.Schema.DNF

23import Data.OpenApi.Compare.Validate.Schema.DNF

23import Data.OpenApi.Compare.Validate.Schema.Issues

24import Data.OpenApi.Compare.Validate.Schema.Issues

24import Data.OpenApi.Compare.Validate.Schema.JsonFormula

25import Data.OpenApi.Compare.Validate.Schema.JsonFormula

25−import Data.OpenApi.Compare.Validate.Schema.Traced

26−import Data.OpenApi.Compare.Validate.Schema.TypedJson

27import Data.OpenApi.Compare.Validate.Schema.Partition

26import Data.OpenApi.Compare.Validate.Schema.Partition

28import Data.OpenApi.Compare.Validate.Schema.Process

27import Data.OpenApi.Compare.Validate.Schema.Process

28+import Data.OpenApi.Compare.Validate.Schema.Traced

29+import Data.OpenApi.Compare.Validate.Schema.TypedJson

29import Data.Ord

30import Data.Ord

30import Data.Ratio

31import Data.Ratio

31import Data.Semigroup

32import Data.Semigroup

32import qualified Data.Set as S

33import qualified Data.Set as S

33import Data.Text (Text)

34import Data.Text (Text)

34

35

35−checkFormulas

36+checkFormulas ::

36− :: (ReassembleHList xs (CheckEnv (Referenced Schema)))

37+ (ReassembleHList xs (CheckEnv (Referenced Schema))) =>

37− => HList xs

38+ HList xs ->

38− -> Behavior 'SchemaLevel

39+ Behavior 'SchemaLevel ->

39− -> ProdCons (Trace Schema)

40+ ProdCons (Trace Schema) ->

40− -> ProdCons (Traced (Definitions Schema))

41+ ProdCons (Traced (Definitions Schema)) ->

41− -> ProdCons (ForeachType JsonFormula, P.PathsPrefixTree Behave AnIssue 'SchemaLevel)

42+ ProdCons (ForeachType JsonFormula, P.PathsPrefixTree Behave AnIssue 'SchemaLevel) ->

42− -> SemanticCompatFormula ()

43+ SemanticCompatFormula ()

43checkFormulas env beh trs defs (ProdCons (fp, ep) (fc, ec)) =

44checkFormulas env beh trs defs (ProdCons (fp, ep) (fc, ec)) =

44 case P.toList ep ++ P.toList ec of

45 case P.toList ep ++ P.toList ec of

45 issues@(_ : _) -> for_ issues $ embedFormula beh . anItem

46 issues@(_ : _) -> for_ issues $ embedFormula beh . anItem

@@ -144,21 +145,21 @@ checkFormulas env beh trs defs (ProdCons (fp, ep) (fc, ec)) =

144 EnumDoesntSatisfy $ untypeValue e -- what does this look like when partitioned?

145 EnumDoesntSatisfy $ untypeValue e -- what does this look like when partitioned?

145 issueFromDisjunct mPart ps = NoMatchingCondition mPart $ SomeCondition <$> S.toList ps

146 issueFromDisjunct mPart ps = NoMatchingCondition mPart $ SomeCondition <$> S.toList ps

146

147

147−checkContradiction

148+checkContradiction ::

148− :: Behavior 'TypedSchemaLevel

149+ Behavior 'TypedSchemaLevel ->

149− -> Maybe Partition

150+ Maybe Partition ->

150− -> S.Set (Condition t)

151+ S.Set (Condition t) ->

151− -> SemanticCompatFormula ()

152+ SemanticCompatFormula ()

152checkContradiction beh mPart _ = issueAt beh $ maybe TypeBecomesEmpty PartitionBecomesEmpty mPart -- TODO #70

153checkContradiction beh mPart _ = issueAt beh $ maybe TypeBecomesEmpty PartitionBecomesEmpty mPart -- TODO #70

153

154

154−checkImplication

155+checkImplication ::

155− :: (ReassembleHList xs (CheckEnv (Referenced Schema)))

156+ (ReassembleHList xs (CheckEnv (Referenced Schema))) =>

156− => HList xs

157+ HList xs ->

157− -> Behavior 'TypedSchemaLevel

158+ Behavior 'TypedSchemaLevel ->

158− -> ProdCons (Trace Schema) -- the traces of the root schemas used in this comparison

159+ ProdCons (Trace Schema) -> -- the traces of the root schemas used in this comparison

159− -> S.Set (Condition t)

160+ S.Set (Condition t) ->

160− -> Condition t

161+ Condition t ->

161− -> SemanticCompatFormula ()

162+ SemanticCompatFormula ()

162checkImplication env beh trs prods cons = case findExactly prods of

163checkImplication env beh trs prods cons = case findExactly prods of

163 Just e

164 Just e

164 | all (satisfiesTyped e) prods ->

165 | all (satisfiesTyped e) prods ->

@@ -166,124 +167,104 @@ checkImplication env beh trs prods cons = case findExactly prods of

166 then pure ()

167 then pure ()

167 else issueAt beh (EnumDoesntSatisfy $ untypeValue e)

168 else issueAt beh (EnumDoesntSatisfy $ untypeValue e)

168 | otherwise -> pure () -- vacuously true

169 | otherwise -> pure () -- vacuously true

169−

170 Nothing -> case cons of

171 -- the above code didn't catch it, so there's no Exactly condition on the lhs

172 Exactly e -> issueAt beh (NoMatchingEnum $ untypeValue e)

173−

174 Maximum m -> foldCheck min m NoMatchingMaximum MatchingMaximumWeak $ \case

173 Maximum m -> foldCheck min m NoMatchingMaximum MatchingMaximumWeak $ \case

175 Maximum m' -> Just m'

174 Maximum m' -> Just m'

176 _ -> Nothing

175 _ -> Nothing

177−

178 Minimum m -> foldCheck max m (NoMatchingMinimum . coerce) (MatchingMinimumWeak . coerce) $ \case

176 Minimum m -> foldCheck max m (NoMatchingMinimum . coerce) (MatchingMinimumWeak . coerce) $ \case

179 Minimum m' -> Just m'

177 Minimum m' -> Just m'

180 _ -> Nothing

178 _ -> Nothing

181−

182 MultipleOf m -> foldCheck lcmScientific m NoMatchingMultipleOf MatchingMultipleOfWeak $ \case

179 MultipleOf m -> foldCheck lcmScientific m NoMatchingMultipleOf MatchingMultipleOfWeak $ \case

183 MultipleOf m' -> Just m'

180 MultipleOf m' -> Just m'

184 _ -> Nothing

181 _ -> Nothing

185−

186 NumberFormat f -> case flip any prods $ \case

182 NumberFormat f -> case flip any prods $ \case

187− NumberFormat f' -> f == f'

183+ NumberFormat f' -> f == f'

188− _ -> False

184+ _ -> False of

189− of

190 True -> pure ()

185 True -> pure ()

191 False -> issueAt beh (NoMatchingFormat f)

186 False -> issueAt beh (NoMatchingFormat f)

192−

193 MaxLength m -> foldCheck min m NoMatchingMaxLength MatchingMaxLengthWeak $ \case

187 MaxLength m -> foldCheck min m NoMatchingMaxLength MatchingMaxLengthWeak $ \case

194 MaxLength m' -> Just m'

188 MaxLength m' -> Just m'

195 _ -> Nothing

189 _ -> Nothing

196−

197 MinLength m -> foldCheck max m NoMatchingMinLength MatchingMinLengthWeak $ \case

190 MinLength m -> foldCheck max m NoMatchingMinLength MatchingMinLengthWeak $ \case

198 MinLength m' -> Just m'

191 MinLength m' -> Just m'

199 _ -> Nothing

192 _ -> Nothing

200−

201 Pattern p -> case flip any prods $ \case

193 Pattern p -> case flip any prods $ \case

202− Pattern p' -> p == p'

194+ Pattern p' -> p == p'

203− _ -> False

195+ _ -> False of

204− of

205 True -> pure ()

196 True -> pure ()

206 False -> issueAt beh (NoMatchingPattern p) -- TODO: regex comparison #32

197 False -> issueAt beh (NoMatchingPattern p) -- TODO: regex comparison #32

207−

208 StringFormat f -> case flip any prods $ \case

198 StringFormat f -> case flip any prods $ \case

209− StringFormat f' -> f == f'

199+ StringFormat f' -> f == f'

210− _ -> False

200+ _ -> False of

211− of

212 True -> pure ()

201 True -> pure ()

213 False -> issueAt beh (NoMatchingFormat f)

202 False -> issueAt beh (NoMatchingFormat f)

214−

215 Items _ cons' -> case foldSome (<>) prods $ \case

203 Items _ cons' -> case foldSome (<>) prods $ \case

216− Items _ rs -> Just (Just (rs NE.:| []), mempty)

204+ Items _ rs -> Just (Just (rs NE.:| []), mempty)

217− TupleItems (map snd -> fs) -> Just (mempty, Just (fs NE.:| []))

205+ TupleItems (map snd -> fs) -> Just (mempty, Just (fs NE.:| []))

218− _ -> Nothing

206+ _ -> Nothing of

219− of

220 Just (mItems, Just pfs)

207 Just (mItems, Just pfs)

221 | not $ allSame (length <$> pfs) -> pure () -- vacuously

208 | not $ allSame (length <$> pfs) -> pure () -- vacuously

222− | let plen = genericLength (NE.head pfs)

209+ | let plen = genericLength (NE.head pfs) ->

223− -> clarifyIssue (AnItem beh (anIssue TupleToArray)) $ for_ [0 .. plen - 1] $ \i -> do

210+ clarifyIssue (AnItem beh (anIssue TupleToArray)) $

211+ for_ [0 .. plen - 1] $ \i -> do

224− let prod' = tracedConjunct $ case mItems of

212+ let prod' = tracedConjunct $ case mItems of

225− Just prods' -> ((`genericIndex` i) <$> pfs) <> prods'

213+ Just prods' -> ((`genericIndex` i) <$> pfs) <> prods'

226− Nothing -> (`genericIndex` i) <$> pfs

214+ Nothing -> (`genericIndex` i) <$> pfs

227− checkCompatibility (beh >>> step (InItem i)) env $ ProdCons prod' cons'

215+ checkCompatibility (beh >>> step (InItem i)) env $ ProdCons prod' cons'

228 Just (Just prods', Nothing) -> do

216 Just (Just prods', Nothing) -> do

229 let prod' = tracedConjunct prods'

217 let prod' = tracedConjunct prods'

230 checkCompatibility (beh >>> step InItems) env $ ProdCons prod' cons'

218 checkCompatibility (beh >>> step InItems) env $ ProdCons prod' cons'

231 _ -> clarifyIssue (AnItem beh (anIssue NoMatchingItems)) $ do

219 _ -> clarifyIssue (AnItem beh (anIssue NoMatchingItems)) $ do

232 checkCompatibility (beh >>> step InItems) env $ ProdCons prodTopSchema cons'

220 checkCompatibility (beh >>> step InItems) env $ ProdCons prodTopSchema cons'

233−

234 TupleItems (map snd -> fs) -> case foldSome (<>) prods $ \case

221 TupleItems (map snd -> fs) -> case foldSome (<>) prods $ \case

235− TupleItems (map snd -> fs') -> Just (Just $ fs' NE.:| [], Just . Max $ genericLength fs', Just . Min $ genericLength fs', mempty)

222+ TupleItems (map snd -> fs') -> Just (Just $ fs' NE.:| [], Just . Max $ genericLength fs', Just . Min $ genericLength fs', mempty)

236− MinItems m' -> Just (mempty, Just . Max $ m', mempty, mempty)

223+ MinItems m' -> Just (mempty, Just . Max $ m', mempty, mempty)

237− MaxItems m' -> Just (mempty, mempty, Just . Min $ m', mempty)

224+ MaxItems m' -> Just (mempty, mempty, Just . Min $ m', mempty)

238− Items _ rs -> Just (mempty, mempty, mempty, Just (rs NE.:| []))

225+ Items _ rs -> Just (mempty, mempty, mempty, Just (rs NE.:| []))

239− _ -> Nothing

226+ _ -> Nothing of

240− of

241− -- if the length constraints in the producer are contradictory:

227+ -- if the length constraints in the producer are contradictory:

242− Just (_, Just (Max lowest), Just (Min highest), _) | lowest > highest -> pure ()

228+ Just (_, Just (Max lowest), Just (Min highest), _) | lowest > highest -> pure ()

243− -- We have an explicit tuple items clause...

229+ -- We have an explicit tuple items clause...

244− Just (Just pfs, Just (Max plen), _, _)

230+ Just (Just pfs, Just (Max plen), _, _)

245− | plen /= genericLength fs -- ...of wrong length

231+ | plen /= genericLength fs -> -- ...of wrong length

246− -> issueAt beh (TupleItemsLengthChanged ProdCons {producer = plen, consumer = genericLength fs})

232+ issueAt beh (TupleItemsLengthChanged ProdCons {producer = plen, consumer = genericLength fs})

247− | otherwise

233+ | otherwise ->

248− -> for_ [0 .. plen - 1] $ \i -> do

234+ for_ [0 .. plen - 1] $ \i -> do

249 checkCompatibility (beh >>> step (InItem i)) env $ ProdCons (tracedConjunct $ (`genericIndex` i) <$> pfs) (fs `genericIndex` i)

235 checkCompatibility (beh >>> step (InItem i)) env $ ProdCons (tracedConjunct $ (`genericIndex` i) <$> pfs) (fs `genericIndex` i)

250− -- We have a fixed length array in the producer...

236+ -- We have a fixed length array in the producer...

251− Just (Nothing, Just (Max plen), Just (Min plen'), mProd)

237+ Just (Nothing, Just (Max plen), Just (Min plen'), mProd)

252− | plen == plen'

238+ | plen == plen' ->

253− -> clarifyIssue (AnItem beh (anIssue ArrayToTuple)) $ case mProd of

239+ clarifyIssue (AnItem beh (anIssue ArrayToTuple)) $ case mProd of

240+ _

254− _ | plen /= genericLength fs -> -- ...of wrong length

241+ | plen /= genericLength fs -> -- ...of wrong length

255− issueAt beh (TupleItemsLengthChanged ProdCons {producer = plen, consumer = genericLength fs})

242+ issueAt beh (TupleItemsLengthChanged ProdCons {producer = plen, consumer = genericLength fs})

256 Just rs -> for_ [0 .. plen - 1] $ \i -> do

243 Just rs -> for_ [0 .. plen - 1] $ \i -> do

257 checkCompatibility (beh >>> step (InItem i)) env $ ProdCons (tracedConjunct rs) (fs `genericIndex` i)

244 checkCompatibility (beh >>> step (InItem i)) env $ ProdCons (tracedConjunct rs) (fs `genericIndex` i)

258 -- ...and no "items" schema

245 -- ...and no "items" schema

259 Nothing -> clarifyIssue (AnItem beh (anIssue NoMatchingTupleItems)) $ do

246 Nothing -> clarifyIssue (AnItem beh (anIssue NoMatchingTupleItems)) $ do

260 for_ [0 .. plen - 1] $ \i -> do

247 for_ [0 .. plen - 1] $ \i -> do

261 checkCompatibility (beh >>> step (InItem i)) env $ ProdCons prodTopSchema (fs `genericIndex` i)

248 checkCompatibility (beh >>> step (InItem i)) env $ ProdCons prodTopSchema (fs `genericIndex` i)

262− _ -> issueAt beh NoMatchingTupleItems

249+ _ -> issueAt beh NoMatchingTupleItems

263−

264 MaxItems m -> foldCheck min m NoMatchingMaxItems MatchingMaxItemsWeak $ \case

250 MaxItems m -> foldCheck min m NoMatchingMaxItems MatchingMaxItemsWeak $ \case

265 MaxItems m' -> Just m'

251 MaxItems m' -> Just m'

266 TupleItems fs -> Just $ toInteger $ length fs

252 TupleItems fs -> Just $ toInteger $ length fs

267 _ -> Nothing

253 _ -> Nothing

268−

269 MinItems m -> foldCheck max m NoMatchingMinItems MatchingMinItemsWeak $ \case

254 MinItems m -> foldCheck max m NoMatchingMinItems MatchingMinItemsWeak $ \case

270 MinItems m' -> Just m'

255 MinItems m' -> Just m'

271 TupleItems fs -> Just $ toInteger $ length fs

256 TupleItems fs -> Just $ toInteger $ length fs

272 _ -> Nothing

257 _ -> Nothing

273−

274 UniqueItems -> case flip any prods $ \case

258 UniqueItems -> case flip any prods $ \case

275− UniqueItems -> True

259+ UniqueItems -> True

276− MaxItems 1 -> True

260+ MaxItems 1 -> True

277− TupleItems fs | length fs == 1 -> True

261+ TupleItems fs | length fs == 1 -> True

278− _ -> False

262+ _ -> False of

279− of

280 True -> pure ()

263 True -> pure ()

281 False -> issueAt beh NoMatchingUniqueItems

264 False -> issueAt beh NoMatchingUniqueItems

282−

283 Properties props _ madd -> case foldSome (<>) prods $ \case

265 Properties props _ madd -> case foldSome (<>) prods $ \case

284− Properties props' _ madd' -> Just $ (props', madd') NE.:| []

266+ Properties props' _ madd' -> Just $ (props', madd') NE.:| []

285− _ -> Nothing

267+ _ -> Nothing of

286− of

287 Just pm ->

268 Just pm ->

288 anyOfAt beh NoMatchingProperties $ -- TODO: could first "concat" the lists

269 anyOfAt beh NoMatchingProperties $ -- TODO: could first "concat" the lists

289 NE.toList pm <&> \(props', madd') -> do

270 NE.toList pm <&> \(props', madd') -> do

@@ -314,11 +295,9 @@ checkImplication env beh trs prods cons = case findExactly prods of

314 (Just add', Just add) -> checkCompatibility (beh >>> step InAdditionalProperty) env (ProdCons add' add)

295 (Just add', Just add) -> checkCompatibility (beh >>> step InAdditionalProperty) env (ProdCons add' add)

315 pure ()

296 pure ()

316 Nothing -> issueAt beh NoMatchingProperties

297 Nothing -> issueAt beh NoMatchingProperties

317−

318 MaxProperties m -> foldCheck min m NoMatchingMaxProperties MatchingMaxPropertiesWeak $ \case

298 MaxProperties m -> foldCheck min m NoMatchingMaxProperties MatchingMaxPropertiesWeak $ \case

319 MaxProperties m' -> Just m'

299 MaxProperties m' -> Just m'

320 _ -> Nothing

300 _ -> Nothing

321−

322 MinProperties m -> foldCheck max m NoMatchingMinProperties MatchingMinPropertiesWeak $ \case

301 MinProperties m -> foldCheck max m NoMatchingMinProperties MatchingMinPropertiesWeak $ \case

323 MinProperties m' -> Just m'

302 MinProperties m' -> Just m'

324 _ -> Nothing

303 _ -> Nothing

@@ -326,14 +305,14 @@ checkImplication env beh trs prods cons = case findExactly prods of

326 lcmScientific (toRational -> a) (toRational -> b) =

305 lcmScientific (toRational -> a) (toRational -> b) =

327 fromRational $ lcm (numerator a) (numerator b) % gcd (denominator a) (denominator b)

306 fromRational $ lcm (numerator a) (numerator b) % gcd (denominator a) (denominator b)

328

307

329− foldCheck

308+ foldCheck ::

330− :: Eq a

309+ Eq a =>

331− => (a -> a -> a)

310+ (a -> a -> a) ->

332− -> a

311+ a ->

333− -> (a -> Issue 'TypedSchemaLevel)

312+ (a -> Issue 'TypedSchemaLevel) ->

334− -> (ProdCons a -> Issue 'TypedSchemaLevel)

313+ (ProdCons a -> Issue 'TypedSchemaLevel) ->

335− -> (forall t. Condition t -> Maybe a)

314+ (forall t. Condition t -> Maybe a) ->

336− -> SemanticCompatFormula ()

315+ SemanticCompatFormula ()

337 foldCheck f m missing weak extr = case foldSome f prods extr of

316 foldCheck f m missing weak extr = case foldSome f prods extr of

338 Just m'

317 Just m'

339 | f m' m == m' -> pure ()

318 | f m' m == m' -> pure ()

src/Data/OpenApi/Compare/Validate/Schema/DNF.hs+8−8

@@ -1,12 +1,12 @@

1module Data.OpenApi.Compare.Validate.Schema.DNF

2− ( DNF (..)

2+ ( DNF (..),

3− , Disjunct (..)

3+ Disjunct (..),

4− , pattern SingleDisjunct

4+ pattern SingleDisjunct,

5− , pattern TopDNF

5+ pattern TopDNF,

6− , pattern BottomDNF

6+ pattern BottomDNF,

7− , pattern LiteralDNF

7+ pattern LiteralDNF,

8− , foldDNF

8+ foldDNF,

9− , forDNF

9+ forDNF,

10 )

11where

12

src/Data/OpenApi/Compare/Validate/Schema/Issues.hs+53−51

@@ -1,8 +1,8 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Validate.Schema.Issues

4− ( Issue (..)

4+ ( Issue (..),

5− , Behave (..)

5+ Behave (..),

6 )

7where

8

@@ -100,53 +100,54 @@ instance Issuable 'TypedSchemaLevel where

100 TypeBecomesEmpty -> ProbablyIssue -- TODO: #70

101 PartitionBecomesEmpty _ -> ProbablyIssue -- ditto

102 _ -> CertainIssue

103− relatedIssues = (==) `withClass` \case

103+ relatedIssues =

104+ (==) `withClass` \case

104 EnumDoesntSatisfy v -> Just v

105 EnumDoesntSatisfy v -> Just v

105 NoMatchingEnum v -> Just v

106 NoMatchingEnum v -> Just v

106 _ -> Nothing

107 _ -> Nothing

107− `withClass` \case

108+ `withClass` \case

108− NoMatchingMaximum _ -> Just ()

109+ NoMatchingMaximum _ -> Just ()

109− MatchingMaximumWeak _ -> Just ()

110+ MatchingMaximumWeak _ -> Just ()

110− _ -> Nothing

111+ _ -> Nothing

111− `withClass` \case

112+ `withClass` \case

112− NoMatchingMinimum _ -> Just ()

113+ NoMatchingMinimum _ -> Just ()

113− MatchingMinimumWeak _ -> Just ()

114+ MatchingMinimumWeak _ -> Just ()

114− _ -> Nothing

115+ _ -> Nothing

115− `withClass` \case

116+ `withClass` \case

116− NoMatchingMultipleOf _ -> Just ()

117+ NoMatchingMultipleOf _ -> Just ()

117− MatchingMultipleOfWeak _ -> Just ()

118+ MatchingMultipleOfWeak _ -> Just ()

118− _ -> Nothing

119+ _ -> Nothing

119− `withClass` \case

120+ `withClass` \case

120− NoMatchingMaxLength _ -> Just ()

121+ NoMatchingMaxLength _ -> Just ()

121− MatchingMaxLengthWeak _ -> Just ()

122+ MatchingMaxLengthWeak _ -> Just ()

122− _ -> Nothing

123+ _ -> Nothing

123− `withClass` \case

124+ `withClass` \case

124− NoMatchingMinLength _ -> Just ()

125+ NoMatchingMinLength _ -> Just ()

125− MatchingMinLengthWeak _ -> Just ()

126+ MatchingMinLengthWeak _ -> Just ()

126− _ -> Nothing

127+ _ -> Nothing

127− `withClass` \case

128+ `withClass` \case

128− NoMatchingItems -> Just ()

129+ NoMatchingItems -> Just ()

129− ArrayToTuple -> Just ()

130+ ArrayToTuple -> Just ()

130− TupleToArray -> Just ()

131+ TupleToArray -> Just ()

131− NoMatchingTupleItems -> Just ()

132+ NoMatchingTupleItems -> Just ()

132− TupleItemsLengthChanged _ -> Just ()

133+ TupleItemsLengthChanged _ -> Just ()

133− _ -> Nothing

134+ _ -> Nothing

134− `withClass` \case

135+ `withClass` \case

135− NoMatchingMaxItems _ -> Just ()

136+ NoMatchingMaxItems _ -> Just ()

136− MatchingMaxItemsWeak _ -> Just ()

137+ MatchingMaxItemsWeak _ -> Just ()

137− _ -> Nothing

138+ _ -> Nothing

138− `withClass` \case

139+ `withClass` \case

139− NoMatchingMinItems _ -> Just ()

140+ NoMatchingMinItems _ -> Just ()

140− MatchingMinItemsWeak _ -> Just ()

141+ MatchingMinItemsWeak _ -> Just ()

141− _ -> Nothing

142+ _ -> Nothing

142− `withClass` \case

143+ `withClass` \case

143− NoMatchingMaxProperties _ -> Just ()

144+ NoMatchingMaxProperties _ -> Just ()

144− MatchingMaxPropertiesWeak _ -> Just ()

145+ MatchingMaxPropertiesWeak _ -> Just ()

145− _ -> Nothing

146+ _ -> Nothing

146− `withClass` \case

147+ `withClass` \case

147− NoMatchingMinProperties _ -> Just ()

148+ NoMatchingMinProperties _ -> Just ()

148− MatchingMinPropertiesWeak _ -> Just ()

149+ MatchingMinPropertiesWeak _ -> Just ()

149− _ -> Nothing

150+ _ -> Nothing

150 describeIssue Forward (EnumDoesntSatisfy v) = para "The following enum value was removed:" <> showJSONValue v

151 describeIssue Forward (EnumDoesntSatisfy v) = para "The following enum value was removed:" <> showJSONValue v

151 describeIssue Backward (EnumDoesntSatisfy v) = para "The following enum value was added:" <> showJSONValue v

152 describeIssue Backward (EnumDoesntSatisfy v) = para "The following enum value was added:" <> showJSONValue v

152 describeIssue Forward (NoMatchingEnum v) = para "The following enum value has been added:" <> showJSONValue v

153 describeIssue Forward (NoMatchingEnum v) = para "The following enum value has been added:" <> showJSONValue v

@@ -254,14 +255,15 @@ instance Issuable 'SchemaLevel where

254 PropertyToAdditional -> Comment

255 PropertyToAdditional -> Comment

255 TypesRestricted _ -> ProbablyIssue -- TODO: #70

256 TypesRestricted _ -> ProbablyIssue -- TODO: #70

256 _ -> CertainIssue

257 _ -> CertainIssue

257− relatedIssues = (==) `withClass` \case

258+ relatedIssues =

259+ (==) `withClass` \case

258 AdditionalToProperty -> Just ()

260 AdditionalToProperty -> Just ()

259 PropertyToAdditional -> Just ()

261 PropertyToAdditional -> Just ()

260 _ -> Nothing

262 _ -> Nothing

261− `withClass` \case

263+ `withClass` \case

262− PropertyNowRequired -> Just ()

264+ PropertyNowRequired -> Just ()

263− UnexpectedProperty -> Just ()

265+ UnexpectedProperty -> Just ()

264− _ -> Nothing

266+ _ -> Nothing

265 describeIssue _ (NotSupported i) =

267 describeIssue _ (NotSupported i) =

266 para (emph "Encountered a feature that CompaREST does not support: " <> text i <> ".")

268 para (emph "Encountered a feature that CompaREST does not support: " <> text i <> ".")

267 describeIssue _ OneOfNotDisjoint =

269 describeIssue _ OneOfNotDisjoint =

src/Data/OpenApi/Compare/Validate/Schema/JsonFormula.hs+50−43

@@ -1,18 +1,18 @@

1module Data.OpenApi.Compare.Validate.Schema.JsonFormula

2− ( Bound (..)

2+ ( Bound (..),

3− , showBound

3+ showBound,

4− , Property (..)

4+ Property (..),

5− , Condition (..)

5+ Condition (..),

6− , showCondition

6+ showCondition,

7− , satisfiesTyped

7+ satisfiesTyped,

8− , checkStringFormat

8+ checkStringFormat,

9− , checkNumberFormat

9+ checkNumberFormat,

10− , SomeCondition (..)

10+ SomeCondition (..),

11− , JsonFormula (..)

11+ JsonFormula (..),

12− , satisfiesFormula

12+ satisfiesFormula,

13− , satisfies

13+ satisfies,

14− , showJSONValue

14+ showJSONValue,

15− , showJSONValueInline

15+ showJSONValueInline,

16 )

17where

18

@@ -20,8 +20,8 @@ import Algebra.Lattice

20import qualified Data.Aeson as A

21import qualified Data.ByteString.Lazy as BSL

22import qualified Data.Foldable as F

23−import qualified Data.HashMap.Strict as HM

24import Data.Functor

23import Data.Functor

24+import qualified Data.HashMap.Strict as HM

25import Data.Int

26import Data.Kind

27import qualified Data.Map as M

@@ -67,30 +67,33 @@ data Property = Property

67data Condition :: JsonType -> Type where

68 Exactly :: TypedValue t -> Condition t

69 Maximum :: !(Bound Scientific) -> Condition 'Number

70− Minimum

70+ Minimum ::

71− :: !(Down (Bound (Down Scientific)))

71+ !(Down (Bound (Down Scientific))) ->

72− -> Condition 'Number -- ^ this has the right Ord

72+ -- | this has the right Ord

73+ Condition 'Number

73 MultipleOf :: !Scientific -> Condition 'Number

74 MultipleOf :: !Scientific -> Condition 'Number

74 NumberFormat :: !Format -> Condition 'Number

75 NumberFormat :: !Format -> Condition 'Number

75 MaxLength :: !Integer -> Condition 'String

76 MaxLength :: !Integer -> Condition 'String

76 MinLength :: !Integer -> Condition 'String

77 MinLength :: !Integer -> Condition 'String

77 Pattern :: !Pattern -> Condition 'String

78 Pattern :: !Pattern -> Condition 'String

78 StringFormat :: !Format -> Condition 'String

79 StringFormat :: !Format -> Condition 'String

79− Items

80+ Items ::

80− :: !(ForeachType JsonFormula)

81+ !(ForeachType JsonFormula) ->

81− -> !(Traced (Referenced Schema))

82+ !(Traced (Referenced Schema)) ->

82− -> Condition 'Array

83+ Condition 'Array

83− TupleItems

84+ TupleItems ::

84− :: ![(ForeachType JsonFormula, Traced (Referenced Schema))]

85+ ![(ForeachType JsonFormula, Traced (Referenced Schema))] ->

85− -> Condition 'Array

86+ Condition 'Array

86 MaxItems :: !Integer -> Condition 'Array

87 MaxItems :: !Integer -> Condition 'Array

87 MinItems :: !Integer -> Condition 'Array

88 MinItems :: !Integer -> Condition 'Array

88 UniqueItems :: Condition 'Array

89 UniqueItems :: Condition 'Array

89− Properties

90+ Properties ::

90− :: !(M.Map Text Property)

91+ !(M.Map Text Property) ->

92+ -- | formula for additional properties

91− -> !(ForeachType JsonFormula) -- ^ formula for additional properties

93+ !(ForeachType JsonFormula) ->

92− -> !(Maybe (Traced (Referenced Schema))) -- ^ schema for additional properties, Nothing means bottom

94+ -- | schema for additional properties, Nothing means bottom

95+ !(Maybe (Traced (Referenced Schema))) ->

93− -> Condition 'Object

96+ Condition 'Object

94 MaxProperties :: !Integer -> Condition 'Object

97 MaxProperties :: !Integer -> Condition 'Object

95 MinProperties :: !Integer -> Condition 'Object

98 MinProperties :: !Integer -> Condition 'Object

96

99

@@ -118,13 +121,15 @@ showCondition = \case

118 UniqueItems -> para "The elements in the array should be unique."

121 UniqueItems -> para "The elements in the array should be unique."

119 (Properties props additional _) ->

122 (Properties props additional _) ->

120 bulletList $

123 bulletList $

121− (M.toList props

124+ ( M.toList props

122− <&> (\(k, p) ->

125+ <&> ( \(k, p) ->

123− para (code k)

126+ para (code k)

124− <> para (strong $ if propRequired p then "Required" else "Optional")

127+ <> para (strong $ if propRequired p then "Required" else "Optional")

125− <> showForEachJsonFormula (propFormula p)))

128+ <> showForEachJsonFormula (propFormula p)

129+ )

130+ )

126 <> [ para (emph "Additional properties")

131 <> [ para (emph "Additional properties")

127− <> showForEachJsonFormula additional

132+ <> showForEachJsonFormula additional

128 ]

133 ]

129 (MaxProperties n) -> para $ "The maximum number of fields should be " <> show' n <> "."

134 (MaxProperties n) -> para $ "The maximum number of fields should be " <> show' n <> "."

130 (MinProperties n) -> para $ "The minimum number of fields should be " <> show' n <> "."

135 (MinProperties n) -> para $ "The minimum number of fields should be " <> show' n <> "."

@@ -133,15 +138,17 @@ showCondition = \case

133 showForEachJsonFormula i =

138 showForEachJsonFormula i =

134 bulletList $

139 bulletList $

135 foldType

140 foldType

136− (\t f -> case getJsonFormula $ f i of

141+ ( \t f -> case getJsonFormula $ f i of

137− BottomDNF -> mempty

142+ BottomDNF -> mempty

138− (DNF conds) ->

143+ (DNF conds) ->

139 [ para (describeJSONType t)

144 [ para (describeJSONType t)

140 <> bulletList

145 <> bulletList

141− (S.toList conds <&> \case

146+ ( S.toList conds <&> \case

142− Disjunct (S.toList -> []) -> para "Empty"

147+ Disjunct (S.toList -> []) -> para "Empty"

143− Disjunct (S.toList -> cond) -> bulletList (showCondition <$> cond))

148+ Disjunct (S.toList -> cond) -> bulletList (showCondition <$> cond)

149+ )

144− ])

150+ ]

151+ )

145

152

146showJSONValue :: A.Value -> Blocks

153showJSONValue :: A.Value -> Blocks

147showJSONValue v = codeBlockWith ("", ["json"], mempty) (T.decodeUtf8 . BSL.toStrict . A.encode $ v)

154showJSONValue v = codeBlockWith ("", ["json"], mempty) (T.decodeUtf8 . BSL.toStrict . A.encode $ v)

src/Data/OpenApi/Compare/Validate/Schema/Partition.hs+30−29

@@ -1,15 +1,15 @@

1module Data.OpenApi.Compare.Validate.Schema.Partition

2− ( partitionSchema

2+ ( partitionSchema,

3− , partitionRefSchema

3+ partitionRefSchema,

4− , selectPartition

4+ selectPartition,

5− , runPartitionM

5+ runPartitionM,

6− , tryPartition

6+ tryPartition,

7− , showPartition

7+ showPartition,

8− , intersectSchema

8+ intersectSchema,

9− , intersectRefSchema

9+ intersectRefSchema,

10− , IntersectionResult (..)

10+ IntersectionResult (..),

11− , runIntersectionM

11+ runIntersectionM,

12− , Partition

12+ Partition,

13 )

14where

15

@@ -143,10 +143,11 @@ partitionCondition = \case

143 Just _ -> top

144 Nothing ->

145 singletonPart $

146− DByProperties $ LiteralDNF

146+ DByProperties $

147+ LiteralDNF

147− ( M.keysSet $ M.filter (not . propRequired) props

148+ ( M.keysSet $ M.filter (not . propRequired) props

148− , M.keysSet $ M.filter propRequired props

149+ , M.keysSet $ M.filter propRequired props

149− )

150+ )

150 inProps <- forM (M.toList $ M.filter propRequired props) $ \(k, prop) -> do

151 inProps <- forM (M.toList $ M.filter propRequired props) $ \(k, prop) -> do

151 f <- partitionRefSchema $ propRefSchema prop

152 f <- partitionRefSchema $ propRefSchema prop

152 pure $ fmap (\(Partitions m) -> Partitions $ M.mapKeysMonotonic (PInProperty k) m) f

153 pure $ fmap (\(Partitions m) -> Partitions $ M.mapKeysMonotonic (PInProperty k) m) f

@@ -156,10 +157,10 @@ partitionCondition = \case

156runPartitionM :: Traced (Definitions Schema) -> PartitionM a -> a

157runPartitionM :: Traced (Definitions Schema) -> PartitionM a -> a

157runPartitionM defs = runIdentity . runMemo () . (`runReaderT` defs)

158runPartitionM defs = runIdentity . runMemo () . (`runReaderT` defs)

158

159

159−partitionJsonFormulas

160+partitionJsonFormulas ::

160− :: ProdCons (Traced (Definitions Schema))

161+ ProdCons (Traced (Definitions Schema)) ->

161− -> ProdCons (JsonFormula t)

162+ ProdCons (JsonFormula t) ->

162− -> Lifted Partitions

163+ Lifted Partitions

163partitionJsonFormulas defs pc = producer pcPart \/ consumer pcPart

164partitionJsonFormulas defs pc = producer pcPart \/ consumer pcPart

164 where

165 where

165 pcPart = partitionFormula <$> defs <*> pc

166 pcPart = partitionFormula <$> defs <*> pc

@@ -211,11 +212,11 @@ runIntersectionM defs act = case runWriterT $ runReaderT act defs of

211 Just (x, Any False) -> Same x

212 Just (x, Any False) -> Same x

212 Just (x, Any True) -> New x

213 Just (x, Any True) -> New x

213

214

214−intersectSchema

215+intersectSchema ::

215− :: PartitionLocation

216+ PartitionLocation ->

216− -> PartitionChoice

217+ PartitionChoice ->

217− -> Traced Schema

218+ Traced Schema ->

218− -> IntersectionM Schema

219+ IntersectionM Schema

219intersectSchema loc part sch = do

220intersectSchema loc part sch = do

220 allOf' <- forM (tracedAllOf sch) $ \rss ->

221 allOf' <- forM (tracedAllOf sch) $ \rss ->

221 -- Assuming i ranges over a nonempty set (checked in processSchema)

222 -- Assuming i ranges over a nonempty set (checked in processSchema)

@@ -258,11 +259,11 @@ intersectSchema loc part sch = do

258 pure $ sch' {_schemaEnum = Just enum'}

259 pure $ sch' {_schemaEnum = Just enum'}

259 CByProperties {} -> error "CByProperties not implemented"

260 CByProperties {} -> error "CByProperties not implemented"

260

261

261−intersectRefSchema

262+intersectRefSchema ::

262− :: PartitionLocation

263+ PartitionLocation ->

263− -> PartitionChoice

264+ PartitionChoice ->

264− -> Traced (Referenced Schema)

265+ Traced (Referenced Schema) ->

265− -> IntersectionM (Referenced Schema)

266+ IntersectionM (Referenced Schema)

266intersectRefSchema loc part rs = do

267intersectRefSchema loc part rs = do

267 defs <- R.ask

268 defs <- R.ask

268 Inline <$> intersectSchema loc part (dereference defs rs)

269 Inline <$> intersectSchema loc part (dereference defs rs)

src/Data/OpenApi/Compare/Validate/Schema/Process.hs+35−34

@@ -1,11 +1,11 @@

1module Data.OpenApi.Compare.Validate.Schema.Process

2− ( schemaToFormula

2+ ( schemaToFormula,

3 )

4where

5

6import Algebra.Lattice

7−import qualified Control.Monad.Reader as R

8import Control.Monad.Reader hiding (ask)

7import Control.Monad.Reader hiding (ask)

8+import qualified Control.Monad.Reader as R

9import Control.Monad.State

10import Control.Monad.Writer

11import qualified Data.Aeson as A

@@ -71,10 +71,10 @@ warnKnot =

71 , tieKnot = \_ -> pure

72 }

73

74−processRefSchema

74+processRefSchema ::

75− :: MonadProcess m

75+ MonadProcess m =>

76− => Traced (Referenced Schema)

76+ Traced (Referenced Schema) ->

77− -> m (ForeachType JsonFormula)

77+ m (ForeachType JsonFormula)

78processRefSchema x = do

79 defs <- R.ask

80 memoWithKnot warnKnot (processSchema $ dereference defs x) (ask x)

@@ -82,10 +82,10 @@ processRefSchema x = do

82-- | Turn a schema into a tuple of 'JsonFormula's that describes the condition

83-- for every possible type of a JSON value. The conditions are independent, and

84-- are thus checked independently.

85−processSchema

85+processSchema ::

86− :: MonadProcess m

86+ MonadProcess m =>

87− => Traced Schema

87+ Traced Schema ->

88− -> m (ForeachType JsonFormula)

88+ m (ForeachType JsonFormula)

89processSchema sch@(extract -> Schema {..}) = do

90 let singletonFormula :: Condition t -> JsonFormula t

91 singletonFormula = JsonFormula . LiteralDNF

@@ -331,26 +331,27 @@ processSchema sch@(extract -> Schema {..}) = do

331 pure $

332 nullableClause

333 \/ meets

334− (allClauses

334+ ( allClauses

335− <> [ anyClause

335+ <> [ anyClause

336− , oneClause

336+ , oneClause

337− , typeClause

337+ , typeClause

338− , enumClause

338+ , enumClause

339− , maximumClause

339+ , maximumClause

340− , minimumClause

340+ , minimumClause

341− , multipleOfClause

341+ , multipleOfClause

342− , formatClause

342+ , formatClause

343− , maxLengthClause

343+ , maxLengthClause

344− , minLengthClause

344+ , minLengthClause

345− , patternClause

345+ , patternClause

346− , itemsClause

346+ , itemsClause

347− , maxItemsClause

347+ , maxItemsClause

348− , minItemsClause

348+ , minItemsClause

349− , uniqueItemsClause

349+ , uniqueItemsClause

350− , propertiesClause

350+ , propertiesClause

351− , maxPropertiesClause

351+ , maxPropertiesClause

352− , minPropertiesClause

352+ , minPropertiesClause

353− ])

353+ ]

354+ )

354

355

355{- TODO: ReadOnly/WriteOnly #68 -}

356{- TODO: ReadOnly/WriteOnly #68 -}

356

357

@@ -369,8 +370,8 @@ checkOneOfDisjoint schs = do

369runProcessM :: Traced (Definitions Schema) -> ProcessM a -> (a, P.PathsPrefixTree Behave AnIssue 'SchemaLevel)

370runProcessM :: Traced (Definitions Schema) -> ProcessM a -> (a, P.PathsPrefixTree Behave AnIssue 'SchemaLevel)

370runProcessM defs = runWriter . (`runReaderT` defs) . runMemo ()

371runProcessM defs = runWriter . (`runReaderT` defs) . runMemo ()

371

372

372−schemaToFormula

373+schemaToFormula ::

373− :: Traced (Definitions Schema)

374+ Traced (Definitions Schema) ->

374− -> Traced Schema

375+ Traced Schema ->

375− -> (ForeachType JsonFormula, P.PathsPrefixTree Behave AnIssue 'SchemaLevel)

376+ (ForeachType JsonFormula, P.PathsPrefixTree Behave AnIssue 'SchemaLevel)

376schemaToFormula defs rs = runProcessM defs $ processSchema rs

377schemaToFormula defs rs = runProcessM defs $ processSchema rs

src/Data/OpenApi/Compare/Validate/Schema/Traced.hs+12−12

@@ -1,18 +1,18 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Validate.Schema.Traced

4− ( Step (..)

4+ ( Step (..),

5− , tracedAllOf

5+ tracedAllOf,

6− , tracedAnyOf

6+ tracedAnyOf,

7− , tracedOneOf

7+ tracedOneOf,

8− , tracedItems

8+ tracedItems,

9− , tracedAdditionalProperties

9+ tracedAdditionalProperties,

10− , tracedDiscriminator

10+ tracedDiscriminator,

11− , tracedProperties

11+ tracedProperties,

12− , tracedConjunct

12+ tracedConjunct,

13− , PartitionLocation (..)

13+ PartitionLocation (..),

14− , PartitionChoice (..)

14+ PartitionChoice (..),

15− , Partition

15+ Partition,

16 )

17where

18

src/Data/OpenApi/Compare/Validate/Schema/TypedJson.hs+25−23

@@ -1,11 +1,11 @@

1module Data.OpenApi.Compare.Validate.Schema.TypedJson

2− ( JsonType (..)

2+ ( JsonType (..),

3− , describeJSONType

3+ describeJSONType,

4− , TypedValue (..)

4+ TypedValue (..),

5− , untypeValue

5+ untypeValue,

6− , ForeachType (..)

6+ ForeachType (..),

7− , foldType

7+ foldType,

8− , forType_

8+ forType_,

9 )

10where

11

@@ -88,24 +88,26 @@ forType_ :: Applicative m => (forall x. Typeable x => JsonType -> (ForeachType f

88forType_ k = getAp $ foldType (\ty proj -> Ap $ k ty proj)

89

90broadcastType :: (forall x. Typeable x => f x) -> ForeachType f

91−broadcastType k = ForeachType

91+broadcastType k =

92+ ForeachType

92− { forNull = k

93+ { forNull = k

93− , forBoolean = k

94+ , forBoolean = k

94− , forNumber = k

95+ , forNumber = k

95− , forString = k

96+ , forString = k

96− , forArray = k

97+ , forArray = k

97− , forObject = k

98+ , forObject = k

98− }

99+ }

99

100

100zipType :: (forall x. Typeable x => f x -> g x -> h x) -> ForeachType f -> ForeachType g -> ForeachType h

101zipType :: (forall x. Typeable x => f x -> g x -> h x) -> ForeachType f -> ForeachType g -> ForeachType h

101−zipType k f1 f2 = ForeachType

102+zipType k f1 f2 =

103+ ForeachType

102− { forNull = k (forNull f1) (forNull f2)

104+ { forNull = k (forNull f1) (forNull f2)

103− , forBoolean = k (forBoolean f1) (forBoolean f2)

105+ , forBoolean = k (forBoolean f1) (forBoolean f2)

104− , forNumber = k (forNumber f1) (forNumber f2)

106+ , forNumber = k (forNumber f1) (forNumber f2)

105− , forString = k (forString f1) (forString f2)

107+ , forString = k (forString f1) (forString f2)

106− , forArray = k (forArray f1) (forArray f2)

108+ , forArray = k (forArray f1) (forArray f2)

107− , forObject = k (forObject f1) (forObject f2)

109+ , forObject = k (forObject f1) (forObject f2)

108− }

110+ }

109

111

110instance (forall x. Lattice (f x)) => Lattice (ForeachType f) where

112instance (forall x. Lattice (f x)) => Lattice (ForeachType f) where

111 (\/) = zipType (\/)

113 (\/) = zipType (\/)

src/Data/OpenApi/Compare/Validate/SecurityRequirement.hs+9−8

@@ -2,7 +2,7 @@

2{-# OPTIONS_GHC -Wno-orphans #-}

3

4module Data.OpenApi.Compare.Validate.SecurityRequirement

5− ( Issue (..)

5+ ( Issue (..),

6 )

7where

8

@@ -41,18 +41,19 @@ instance Subtree SecurityRequirement where

41 for (IOHM.toList $ getSecurityRequirement sec) $ \(key, scopes) ->

42 (,scopes) <$> lookupScheme key defs

43 structuralMaybeWith

44− (\pc' -> do

44+ ( \pc' -> do

45− let ProdCons pScopes cScopes = fmap snd <$> pc'

45+ let ProdCons pScopes cScopes = fmap snd <$> pc'

46− unless (pScopes == cScopes) structuralIssue

46+ unless (pScopes == cScopes) structuralIssue

47− structuralList env $ fmap fst <$> pc'

47+ structuralList env $ fmap fst <$> pc'

48− pure ())

48+ pure ()

49+ )

49 normalized

50 normalized

50 pure ()

51 pure ()

51 checkSemanticCompatibility env bhv' pc = do

52 checkSemanticCompatibility env bhv' pc = do

52 let schemes = getH @(ProdCons (Traced (Definitions SecurityScheme))) env

53 let schemes = getH @(ProdCons (Traced (Definitions SecurityScheme))) env

53 ( ProdCons pErrs cErrs

54 ( ProdCons pErrs cErrs

54− , (ProdCons pSchemes cSchemes)

55+ , (ProdCons pSchemes cSchemes) ::

55− :: ProdCons [(Behavior 'SecuritySchemeLevel, Traced SecurityScheme, [Text])]

56+ ProdCons [(Behavior 'SecuritySchemeLevel, Traced SecurityScheme, [Text])]

56 ) =

57 ) =

57 NE.unzip $

58 NE.unzip $

58 partitionEithers <$> do

59 partitionEithers <$> do

src/Data/OpenApi/Compare/Validate/Server.hs+10−9

@@ -1,7 +1,7 @@

1{-# OPTIONS_GHC -Wno-orphans #-}

2

3module Data.OpenApi.Compare.Validate.Server

4− ( Issue (..)

4+ ( Issue (..),

5 )

6where

7

@@ -31,9 +31,9 @@ import Data.Traversable

31import Text.Pandoc.Builder

32import Prelude as P

33

34−tracedParsedServerUrlParts

34+tracedParsedServerUrlParts ::

35− :: Server

35+ Server ->

36− -> Either (Issue 'ServerLevel) ProcessedServer

36+ Either (Issue 'ServerLevel) ProcessedServer

37tracedParsedServerUrlParts s =

38 let parsedUrl = parseServerUrl $ _serverUrl s

39 lookupVar var = case IOHM.lookup var (_serverVariables s) of

@@ -63,11 +63,12 @@ instance Subtree [Server] where

63 pcServer

64 <&> partitionEithers

65 . fmap

66− (\(Traced t s) ->

66+ ( \(Traced t s) ->

67− let bhv = beh >>> step (InServer $ _serverUrl s)

67+ let bhv = beh >>> step (InServer $ _serverUrl s)

68− in case tracedParsedServerUrlParts s of

68+ in case tracedParsedServerUrlParts s of

69− Left e -> Left $ issueAt bhv e

69+ Left e -> Left $ issueAt bhv e

70− Right u -> Right (bhv, Traced (t >>> step (ServerStep $ _serverUrl s)) u))

70+ Right u -> Right (bhv, Traced (t >>> step (ServerStep $ _serverUrl s)) u)

71+ )

71 . sequence

72 . sequence

72 sequenceA_ pErrs

73 sequenceA_ pErrs

73 sequenceA_ cErrs

74 sequenceA_ cErrs

src/Data/OpenApi/Compare/Validate/Sums.hs+12−11

@@ -1,24 +1,25 @@

1module Data.OpenApi.Compare.Validate.Sums

2− ( checkSums

2+ ( checkSums,

3+ )

3− ) where

4+where

4

5

5import Data.Foldable

6import Data.Foldable

6import Data.Map.Strict (Map)

7import Data.Map.Strict (Map)

7import qualified Data.Map.Strict as M

8import qualified Data.Map.Strict as M

8import Data.OpenApi.Compare.Behavior

9import Data.OpenApi.Compare.Behavior

9−import Data.OpenApi.Compare.Subtree

10import Data.OpenApi.Compare.Paths

11+import Data.OpenApi.Compare.Subtree

11

12

12−checkSums

13+checkSums ::

13− :: (Ord k, Issuable l)

14+ (Ord k, Issuable l) =>

14− => Paths q r l

15+ Paths q r l ->

15− -> (k -> Issue l)

16+ (k -> Issue l) ->

16− -> (k -> ProdCons t -> CompatFormula' q AnIssue r ())

17+ (k -> ProdCons t -> CompatFormula' q AnIssue r ()) ->

17− -> ProdCons (Map k t)

18+ ProdCons (Map k t) ->

18− -> CompatFormula' q AnIssue r ()

19+ CompatFormula' q AnIssue r ()

19checkSums xs noElt check (ProdCons p c) = for_ (M.toList p) $ \(key, prodElt) ->

20checkSums xs noElt check (ProdCons p c) = for_ (M.toList p) $ \(key, prodElt) ->

20 case M.lookup key c of

21 case M.lookup key c of

21 Nothing -> issueAt xs $ noElt key

22 Nothing -> issueAt xs $ noElt key

22 Just consElt ->

23 Just consElt ->

23 let sumElts = ProdCons prodElt consElt

24 let sumElts = ProdCons prodElt consElt

24− in check key sumElts

25+ in check key sumElts

src/Data/OpenUnion/Extra.hs+5−5

@@ -1,7 +1,7 @@

1module Data.OpenUnion.Extra

2− ( (@@>)

2+ ( (@@>),

3− , TryLiftUnion (..)

3+ TryLiftUnion (..),

4− , pattern SingletonUnion

4+ pattern SingletonUnion,

5 )

6where

7

@@ -18,8 +18,8 @@ instance TryLiftUnion '[] where

18 tryLiftUnion _ = empty

19

20instance

21− (Typeable y, SubList ys (y : ys), TryLiftUnion ys)

21+ (Typeable y, SubList ys (y : ys), TryLiftUnion ys) =>

22− => TryLiftUnion (y ': ys)

22+ TryLiftUnion (y ': ys)

23 where

24 tryLiftUnion (x :: x) = case eqT @x @y of

25 Nothing -> reUnion <$> tryLiftUnion @ys x

test/Spec/Golden/Extra.hs+46−42

@@ -1,8 +1,8 @@

1module Spec.Golden.Extra

2− ( getGoldenInputs

2+ ( getGoldenInputs,

3− , getGoldenInputsUniform

3+ getGoldenInputsUniform,

4− , goldenInputsTree

4+ goldenInputsTree,

5− , goldenInputsTreeUniform

5+ goldenInputsTreeUniform,

6 )

7where

8

@@ -19,12 +19,12 @@ data TestInput t

19 | TestInputLeaf TestName t FilePath

20 deriving stock (Functor)

21

22−getGoldenInputs

22+getGoldenInputs ::

23− :: (Each s t (FilePath, FilePath -> IO a) a)

23+ (Each s t (FilePath, FilePath -> IO a) a) =>

24− => TestName

24+ TestName ->

25− -> FilePath

25+ FilePath ->

26− -> s

26+ s ->

27− -> IO (TestInput t)

27+ IO (TestInput t)

28getGoldenInputs name filepath inp = do

29 dirs' <- listDirectory filepath >>= filterM (doesDirectoryExist . (filepath </>))

30 case dirs' of

@@ -39,32 +39,34 @@ getGoldenInputs name filepath inp = do

39 TestInputNode name

40 <$> forM dirs (\dir -> getGoldenInputs dir (filepath </> dir) inp)

41

42−getGoldenInputsUniform

42+getGoldenInputsUniform ::

43− :: (Each t h (FilePath, FilePath -> IO a) a)

43+ (Each t h (FilePath, FilePath -> IO a) a) =>

44− => (Each s t FilePath (FilePath, FilePath -> IO a))

44+ (Each s t FilePath (FilePath, FilePath -> IO a)) =>

45− => TestName

45+ TestName ->

46− -> (FilePath -> IO a)

46+ (FilePath -> IO a) ->

47− -> FilePath

47+ FilePath ->

48− -> s

48+ s ->

49− -> IO (TestInput h)

49+ IO (TestInput h)

50getGoldenInputsUniform name f filepath inp = getGoldenInputs name filepath $ inp & each %~ (,f)

51

52−goldenInputsTree

52+goldenInputsTree ::

53− :: (Each s t (FilePath, FilePath -> IO a) a)

53+ (Each s t (FilePath, FilePath -> IO a) a) =>

54− => TestName

54+ TestName ->

55− -> FilePath -- ^ Root path

55+ -- | Root path

56+ FilePath ->

56− -> FilePath -- ^ Name of golden file

57+ -- | Name of golden file

57− -> s

58+ FilePath ->

59+ s ->

58− -> (t -> IO BSL.ByteString)

60+ (t -> IO BSL.ByteString) ->

59− -> IO TestTree

61+ IO TestTree

60goldenInputsTree name filepath golden inp f = do

62goldenInputsTree name filepath golden inp f = do

61 runTestInputTree golden f <$> getGoldenInputs name filepath inp

63 runTestInputTree golden f <$> getGoldenInputs name filepath inp

62

64

63−runTestInputTree

65+runTestInputTree ::

64− :: FilePath

66+ FilePath ->

65− -> (t -> IO BSL.ByteString)

67+ (t -> IO BSL.ByteString) ->

66− -> TestInput t

68+ TestInput t ->

67− -> TestTree

69+ TestTree

68runTestInputTree golden f (TestInputNode name rest) =

70runTestInputTree golden f (TestInputNode name rest) =

69 testGroup name (runTestInputTree golden f <$> rest)

71 testGroup name (runTestInputTree golden f <$> rest)

70runTestInputTree golden f (TestInputLeaf name t path) =

72runTestInputTree golden f (TestInputLeaf name t path) =

@@ -74,16 +76,18 @@ runTestInputTree golden f (TestInputLeaf name t path) =

74 (path </> golden)

76 (path </> golden)

75 (f t)

77 (f t)

76

78

77−goldenInputsTreeUniform

79+goldenInputsTreeUniform ::

78− :: ( Each t h (FilePath, FilePath -> IO a) a

80+ ( Each t h (FilePath, FilePath -> IO a) a

79− , Each s t FilePath (FilePath, FilePath -> IO a)

81+ , Each s t FilePath (FilePath, FilePath -> IO a)

80− )

82+ ) =>

81− => String

83+ String ->

82− -> FilePath -- ^ Root path

84+ -- | Root path

85+ FilePath ->

83− -> FilePath -- ^ Name of golden file

86+ -- | Name of golden file

84− -> s

87+ FilePath ->

88+ s ->

85− -> (FilePath -> IO a)

89+ (FilePath -> IO a) ->

86− -> (h -> IO BSL.ByteString)

90+ (h -> IO BSL.ByteString) ->

87− -> IO TestTree

91+ IO TestTree

88goldenInputsTreeUniform name filepath golden inp h =

92goldenInputsTreeUniform name filepath golden inp h =

89 goldenInputsTree name filepath golden (inp & each %~ (,h))

93 goldenInputsTree name filepath golden (inp & each %~ (,h))

test/Spec/Golden/TraceTree.hs+4−2

@@ -12,6 +12,7 @@ import Data.OpenApi.Compare.Validate.OpenApi ()

12import Data.Text (Text)

13import qualified Data.Text.Encoding as T

14import qualified Data.Yaml as Yaml

15+import Paths_compaREST

15import Spec.Golden.Extra

16import Spec.Golden.Extra

16import Test.Tasty (TestTree, testGroup)

17import Test.Tasty (TestTree, testGroup)

17import Text.Pandoc.Builder

18import Text.Pandoc.Builder

@@ -22,10 +23,11 @@ import Prelude hiding (id, (.))

22

23

23tests :: IO TestTree

24tests :: IO TestTree

24tests = do

25tests = do

26+ dir <- getDataDir

25 traceTreeTests <-

27 traceTreeTests <-

26 goldenInputsTreeUniform

28 goldenInputsTreeUniform

27 "TraceTree"

29 "TraceTree"

28− "test/golden/common"

30+ dir

29 "trace-tree.yaml"

31 "trace-tree.yaml"

30 ("a.yaml", "b.yaml")

32 ("a.yaml", "b.yaml")

31 Yaml.decodeFileThrow

33 Yaml.decodeFileThrow

@@ -34,7 +36,7 @@ tests = do

34 reportTests <-

36 reportTests <-

35 goldenInputsTreeUniform

37 goldenInputsTreeUniform

36 "Report"

38 "Report"

37− "test/golden/common"

39+ dir

38 "report.md"

40 "report.md"

39 ("a.yaml", "b.yaml")

41 ("a.yaml", "b.yaml")

40 Yaml.decodeFileThrow

42 Yaml.decodeFileThrow