6094af1 · rowtype-yoga/purescript-yoga-fetch-om

git.iko.soy/rowtype-yoga/purescript-yoga-fetch-om

Harden client encoding and response handling

commit6094af1fd2912aa7433cce8be0917e19e47044a6 authorMark <mark.eibes@gmail.com> dateSat 5 Sep 2026, 21:18 (1 month ago) parent2264aeb

27 files changed+932−183

compare with main

unifiedsplit

.c8rc.jsonnew file+22

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

1+{

2+ "all": true,

3+ "include": [

4+ "output/Yoga.Fetch.Om*/index.js",

5+ "output/Yoga.Fetch.Om*/foreign.js"

6+ ],

7+ "exclude": [

8+ "output/Yoga.Fetch.Om.ExtractParams/index.js",

9+ "output/Yoga.Fetch.Om.SplitResponses/index.js"

10+ ],

11+ "reporter": [

12+ "text",

13+ "html",

14+ "lcov"

15+ ],

16+ "reports-dir": "coverage",

17+ "check-coverage": true,

18+ "statements": 95,

19+ "branches": 90,

20+ "functions": 85,

21+ "lines": 95

22+}

.github/workflows/ci.yml+6−2

@@ -12,6 +12,10 @@ jobs:

1212 steps:

1313 - uses: actions/checkout@v4

1414 - uses: rowtype-yoga/purescript-yoga-actions/.github/actions/setup@main

15− - run: spago build

16− - run: spago test

15+ - run: bun run coverage

16+ - uses: actions/upload-artifact@v4

17+ if: always()

18+ with:

19+ name: coverage

20+ path: coverage/

1721 - run: bun compile-fail-tests/run.js

.gitignore+2

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

11output/

22output-compile-fail/

3+coverage/

4+generated-docs/

35node_modules/

46.spago/

57.psc-ide-port

LICENSEnew file+21

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

1+The MIT License (MIT)

5+Permission is hereby granted, free of charge, to any person obtaining a copy

6+of this software and associated documentation files (the "Software"), to deal

7+in the Software without restriction, including without limitation the rights

8+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

9+copies of the Software, and to permit persons to whom the Software is

10+furnished to do so, subject to the following conditions:

11+

12+The above copyright notice and this permission notice shall be included in all

13+copies or substantial portions of the Software.

14+

15+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

16+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

17+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

18+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

19+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

20+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

21+SOFTWARE.

README.md+27−11

@@ -132,10 +132,10 @@ See the test files for complete, runnable examples with all imports:

132132

133133### ✅ Type-Safe Everything

134134

135−- **Path parameters**: `/users/:id` requires `{ id: Int }`

136−- **Query parameters**: Type-safe query strings with `?`

137−- **Request bodies**: Automatic JSON serialization

138−- **Response bodies**: Automatic JSON parsing

135+- **Path parameters**: `/users/:id` requires `{ id :: Int }`; names and values are percent-encoded

136+- **Query parameters**: Type-safe, percent-encoded query strings with explicit `Maybe` fields for optional values

137+- **Request bodies**: `JSON`, `PlainText`, and URL-encoded `FormData`

138+- **Response bodies**: Parsed JSON, `PlainText` as `String`, and `Streaming a` as `Strom {} () a`

139139- **Error handling**: Exhaustive pattern matching on variants

140140

141141### ✅ Single Source of Truth

@@ -155,12 +155,12 @@ Changes to routes automatically update both client and server!

155155### ✅ Automatic Derivation

156156

157157No manual client code:

158−- ✅ URL building with path parameter substitution

159−- ✅ Query string construction

160−- ✅ JSON request serialization

161−- ✅ JSON response parsing

158+- ✅ URL building with segment-safe path substitution

159+- ✅ Query construction that preserves existing queries and fragments

160+- ✅ JSON, plain-text, and URL-encoded request serialization

161+- ✅ JSON and plain-text response decoding

162+- ✅ Incremental UTF-8 and binary response streams

162163- ✅ Status code → variant mapping

163−- ✅ CORS and credentials handling

164164

165165### ✅ Integration with yoga-om

166166

@@ -180,8 +180,9 @@ The library uses PureScript's type system to:

180180

1811811. **Extract parameters** from route definitions at compile time

182182 - Path params: `"users" / "id" : Int` → `{ id :: Int }`

183− - Query params: `:? { limit :: Int }` → `{ limit :: Int }`

184− - Body params: `{ body :: JSON User }` → request body

183+ - Optional query params: `:? { limit :: Int }` → `{ limit :: Maybe Int }`

184+ - Required query params: `:? { limit :: Required Int }` → `{ limit :: Int }`

185+ - Body params: `{ body :: JSON User }` → `User`

185186

1861872. **Build URLs** automatically

187188 - Pattern: `/users/:id` + params: `{ id: 42 }` → `/users/42`

@@ -226,6 +227,21 @@ api = client @UserAPI "https://api.example.com"

226227- ✅ Variant response handling

227228- ✅ Om monad integration

228229

230+## Testing

231+

232+```sh

233+bun test

234+bun run test:compile-fail

235+bun run coverage

236+```

237+The suite combines example-based specifications with QuickCheck properties for

238+URL encoding, suffix preservation, repeated parameters, optional fields, and

239+query-separator invariants.

240+

241+The coverage command uses compiler source maps to report PureScript source

242+coverage, includes JavaScript FFI modules, enforces regression thresholds, and

243+writes HTML and LCOV reports to `coverage/`.

244+

229245## License

230246

231247MIT

bun.lock+98−15

@@ -15,6 +15,7 @@

1515 "@fastify/rate-limit": "^11.2.0",

1616 "@fastify/websocket": "^11.3.0",

1717 "argon2": "^0.45.1",

18+ "c8": "^12.0.0",

1819 "fastify": "^5.7.4",

1920 "jose": "^6.2.8",

2021 "jsdom": "^28.0.0",

@@ -33,6 +34,8 @@

3334

3435 "@asamuzakjp/nwsapi": ["@asamuzakjp/nwsapi@2.3.9", "", {}, "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q=="],

3536

37+ "@bcoe/v8-coverage": ["@bcoe/v8-coverage@1.0.2", "", {}, "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA=="],

38+

3639 "@csstools/color-helpers": ["@csstools/color-helpers@6.0.1", "", {}, "sha512-NmXRccUJMk2AWA5A7e5a//3bCIMyOu2hAtdRYrhPPHjDxINuCwX1w6rnIZ4xjLcp0ayv6h8Pc3X0eJUGiAAXHQ=="],

3740

3841 "@csstools/css-calc": ["@csstools/css-calc@3.0.0", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^4.0.0", "@csstools/css-tokenizer": "^4.0.0" } }, "sha512-q4d82GTl8BIlh/dTnVsWmxnbWJeb3kiU8eUH71UxlxnS+WIaALmtzTL8gR15PkYOexMQYVk0CO4qIG93C1IvPA=="],

@@ -131,8 +134,14 @@

131134

132135 "@isaacs/fs-minipass": ["@isaacs/fs-minipass@4.0.1", "", { "dependencies": { "minipass": "^7.0.4" } }, "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w=="],

133136

137+ "@istanbuljs/schema": ["@istanbuljs/schema@0.1.6", "", {}, "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw=="],

138+

139+ "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="],

140+

134141 "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="],

135142

143+ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],

144+

136145 "@lukeed/ms": ["@lukeed/ms@2.0.2", "", {}, "sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA=="],

137146

138147 "@nodelib/fs.scandir": ["@nodelib/fs.scandir@4.0.1", "", { "dependencies": { "@nodelib/fs.stat": "4.0.0", "run-parallel": "^1.2.0" } }, "sha512-vAkI715yhnmiPupY+dq+xenu5Tdf2TBQ66jLvBIcCddtz+5Q8LbMKaf9CIJJreez8fQ8fgaY+RaywQx8RJIWpw=="],

@@ -203,6 +212,8 @@

203212

204213 "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],

205214

215+ "@types/istanbul-lib-coverage": ["@types/istanbul-lib-coverage@2.0.6", "", {}, "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="],

216+

206217 "@vitest/expect": ["@vitest/expect@2.1.9", "", { "dependencies": { "@vitest/spy": "2.1.9", "@vitest/utils": "2.1.9", "chai": "^5.1.2", "tinyrainbow": "^1.2.0" } }, "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw=="],

207218

208219 "@vitest/mocker": ["@vitest/mocker@2.1.9", "", { "dependencies": { "@vitest/spy": "2.1.9", "estree-walker": "^3.0.3", "magic-string": "^0.30.12" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^5.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg=="],

@@ -231,7 +242,7 @@

231242

232243 "ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="],

233244

234− "ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],

245+ "ansi-regex": ["ansi-regex@6.3.0", "", {}, "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ=="],

235246

236247 "ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="],

237248

@@ -271,6 +282,8 @@

271282

272283 "byline": ["byline@5.0.0", "", {}, "sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q=="],

273284

285+ "c8": ["c8@12.0.0", "", { "dependencies": { "@bcoe/v8-coverage": "^1.0.1", "@istanbuljs/schema": "^0.1.3", "find-up": "^5.0.0", "foreground-child": "^3.1.1", "istanbul-lib-coverage": "^3.2.0", "istanbul-lib-report": "^3.0.1", "istanbul-reports": "^3.1.6", "test-exclude": "^8.0.0", "v8-to-istanbul": "^9.0.0", "yargs": "^18.0.0", "yargs-parser": "^21.1.1" }, "peerDependencies": { "monocart-coverage-reports": "^2" }, "optionalPeers": ["monocart-coverage-reports"], "bin": { "c8": "bin/c8.js" } }, "sha512-4zpJvrd1nKWutnnKC2pXkFmb6iM1l+ffN//o1CzlTNwW7GSOs9a1xrLqkC48nU8oEkjmPZLPiwMsIaOvoF4Pqg=="],

286+

274287 "cac": ["cac@6.7.14", "", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="],

275288

276289 "cacache": ["cacache@11.3.3", "", { "dependencies": { "bluebird": "^3.5.5", "chownr": "^1.1.1", "figgy-pudding": "^3.5.1", "glob": "^7.1.4", "graceful-fs": "^4.1.15", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", "rimraf": "^2.6.3", "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" } }, "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA=="],

@@ -287,6 +300,8 @@

287300

288301 "cli-cursor": ["cli-cursor@3.1.0", "", { "dependencies": { "restore-cursor": "^3.1.0" } }, "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="],

289302

303+ "cliui": ["cliui@9.0.1", "", { "dependencies": { "string-width": "^7.2.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" } }, "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w=="],

304+

290305 "color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="],

291306

292307 "color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="],

@@ -295,6 +310,8 @@

295310

296311 "concat-stream": ["concat-stream@1.6.2", "", { "dependencies": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^2.2.2", "typedarray": "^0.0.6" } }, "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="],

297312

313+ "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="],

314+

298315 "cookie": ["cookie@2.0.1", "", {}, "sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w=="],

299316

300317 "copy-concurrently": ["copy-concurrently@1.0.5", "", { "dependencies": { "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", "iferr": "^0.1.5", "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.0" } }, "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="],

@@ -331,7 +348,7 @@

331348

332349 "duplexify": ["duplexify@4.1.3", "", { "dependencies": { "end-of-stream": "^1.4.1", "inherits": "^2.0.3", "readable-stream": "^3.1.1", "stream-shift": "^1.0.2" } }, "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA=="],

333350

334− "emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

351+ "emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="],

335352

336353 "encoding": ["encoding@0.1.13", "", { "dependencies": { "iconv-lite": "^0.6.2" } }, "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="],

337354

@@ -347,6 +364,8 @@

347364

348365 "esbuild": ["esbuild@0.21.5", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.21.5", "@esbuild/android-arm": "0.21.5", "@esbuild/android-arm64": "0.21.5", "@esbuild/android-x64": "0.21.5", "@esbuild/darwin-arm64": "0.21.5", "@esbuild/darwin-x64": "0.21.5", "@esbuild/freebsd-arm64": "0.21.5", "@esbuild/freebsd-x64": "0.21.5", "@esbuild/linux-arm": "0.21.5", "@esbuild/linux-arm64": "0.21.5", "@esbuild/linux-ia32": "0.21.5", "@esbuild/linux-loong64": "0.21.5", "@esbuild/linux-mips64el": "0.21.5", "@esbuild/linux-ppc64": "0.21.5", "@esbuild/linux-riscv64": "0.21.5", "@esbuild/linux-s390x": "0.21.5", "@esbuild/linux-x64": "0.21.5", "@esbuild/netbsd-x64": "0.21.5", "@esbuild/openbsd-x64": "0.21.5", "@esbuild/sunos-x64": "0.21.5", "@esbuild/win32-arm64": "0.21.5", "@esbuild/win32-ia32": "0.21.5", "@esbuild/win32-x64": "0.21.5" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="],

349366

367+ "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],

368+

350369 "escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="],

351370

352371 "estree-walker": ["estree-walker@3.0.3", "", { "dependencies": { "@types/estree": "^1.0.0" } }, "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="],

@@ -379,6 +398,8 @@

379398

380399 "find-my-way": ["find-my-way@9.4.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-querystring": "^1.0.0", "safe-regex2": "^5.0.0" } }, "sha512-5Ye4vHsypZRYtS01ob/iwHzGRUDELlsoCftI/OZFhcLs1M0tkGPcXldE80TAZC5yYuJMBPJQQ43UHlqbJWiX2w=="],

381400

401+ "find-up": ["find-up@5.0.0", "", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="],

402+

382403 "flush-write-stream": ["flush-write-stream@1.1.1", "", { "dependencies": { "inherits": "^2.0.3", "readable-stream": "^2.3.6" } }, "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="],

383404

384405 "foreground-child": ["foreground-child@3.3.1", "", { "dependencies": { "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" } }, "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw=="],

@@ -397,18 +418,24 @@

397418

398419 "fuse.js": ["fuse.js@7.1.0", "", {}, "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ=="],

399420

421+ "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="],

422+

423+ "get-east-asian-width": ["get-east-asian-width@1.6.0", "", {}, "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA=="],

424+

400425 "get-stream": ["get-stream@5.2.0", "", { "dependencies": { "pump": "^3.0.0" } }, "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="],

401426

402427 "glob": ["glob@11.1.0", "", { "dependencies": { "foreground-child": "^3.3.1", "jackspeak": "^4.1.1", "minimatch": "^10.1.1", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw=="],

403428

404429 "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],

405430

406− "has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="],

431+ "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],

407432

408433 "helmet": ["helmet@8.3.0", "", {}, "sha512-Qgpiaws3Sm30Av8Eah6sjMCZZwjlBu+E68rhpCWBshY1lb09HtLwj5GviX0OyQIn+ulUS0iX0AxN5n3tLZzz1w=="],

409434

410435 "html-encoding-sniffer": ["html-encoding-sniffer@6.0.0", "", { "dependencies": { "@exodus/bytes": "^1.6.0" } }, "sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg=="],

411436

437+ "html-escaper": ["html-escaper@2.0.2", "", {}, "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="],

438+

412439 "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="],

413440

414441 "http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="],

@@ -457,6 +484,12 @@

457484

458485 "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],

459486

487+ "istanbul-lib-coverage": ["istanbul-lib-coverage@3.2.2", "", {}, "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="],

488+

489+ "istanbul-lib-report": ["istanbul-lib-report@3.0.1", "", { "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", "supports-color": "^7.1.0" } }, "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw=="],

490+

491+ "istanbul-reports": ["istanbul-reports@3.2.0", "", { "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" } }, "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA=="],

492+

460493 "jackspeak": ["jackspeak@4.2.3", "", { "dependencies": { "@isaacs/cliui": "^9.0.0" } }, "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg=="],

461494

462495 "jose": ["jose@6.2.8", "", {}, "sha512-Bsdjwm3Qsd/P0jR+BHDe3LytDfY7WBq2HmCCLIwuVRHMuEC9ae7/R474GIUdF1NgCyZjzVo/A9DOiOBtXq8ZoQ=="],

@@ -473,6 +506,8 @@

473506

474507 "linkify-it": ["linkify-it@5.0.0", "", { "dependencies": { "uc.micro": "^2.0.0" } }, "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ=="],

475508

509+ "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],

510+

476511 "log-symbols": ["log-symbols@3.0.0", "", { "dependencies": { "chalk": "^2.4.2" } }, "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="],

477512

478513 "log-update": ["log-update@4.0.0", "", { "dependencies": { "ansi-escapes": "^4.3.0", "cli-cursor": "^3.1.0", "slice-ansi": "^4.0.0", "wrap-ansi": "^6.2.0" } }, "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="],

@@ -483,6 +518,8 @@

483518

484519 "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],

485520

521+ "make-dir": ["make-dir@4.0.0", "", { "dependencies": { "semver": "^7.5.3" } }, "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw=="],

522+

486523 "make-fetch-happen": ["make-fetch-happen@10.2.1", "", { "dependencies": { "agentkeepalive": "^4.2.1", "cacache": "^16.1.0", "http-cache-semantics": "^4.1.0", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^7.7.1", "minipass": "^3.1.6", "minipass-collect": "^1.0.2", "minipass-fetch": "^2.0.3", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", "promise-retry": "^2.0.1", "socks-proxy-agent": "^7.0.0", "ssri": "^9.0.0" } }, "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="],

487524

488525 "markdown-it": ["markdown-it@14.1.0", "", { "dependencies": { "argparse": "^2.0.1", "entities": "^4.4.0", "linkify-it": "^5.0.0", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" }, "bin": { "markdown-it": "bin/markdown-it.mjs" } }, "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg=="],

@@ -545,6 +582,10 @@

545582

546583 "p-finally": ["p-finally@2.0.1", "", {}, "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="],

547584

585+ "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],

586+

587+ "p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],

588+

548589 "p-map": ["p-map@4.0.0", "", { "dependencies": { "aggregate-error": "^3.0.0" } }, "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="],

549590

550591 "package-json-from-dist": ["package-json-from-dist@1.0.1", "", {}, "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="],

@@ -553,6 +594,8 @@

553594

554595 "parse5": ["parse5@8.0.0", "", { "dependencies": { "entities": "^6.0.0" } }, "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA=="],

555596

597+ "path-exists": ["path-exists@4.0.0", "", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="],

598+

556599 "path-is-absolute": ["path-is-absolute@1.0.1", "", {}, "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="],

557600

558601 "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="],

@@ -649,7 +692,7 @@

649692

650693 "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="],

651694

652− "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],

695+ "signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],

653696

654697 "slice-ansi": ["slice-ansi@4.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", "is-fullwidth-code-point": "^3.0.0" } }, "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="],

655698

@@ -685,11 +728,11 @@

685728

686729 "stream-shift": ["stream-shift@1.0.3", "", {}, "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ=="],

687730

688− "string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

731+ "string-width": ["string-width@8.2.2", "", { "dependencies": { "get-east-asian-width": "^1.5.0", "strip-ansi": "^7.1.2" } }, "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg=="],

689732

690733 "string_decoder": ["string_decoder@1.3.0", "", { "dependencies": { "safe-buffer": "~5.2.0" } }, "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="],

691734

692− "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],

735+ "strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="],

693736

694737 "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="],

695738

@@ -699,6 +742,8 @@

699742

700743 "tar": ["tar@7.5.7", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ=="],

701744

745+ "test-exclude": ["test-exclude@8.0.0", "", { "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^13.0.6", "minimatch": "^10.2.2" } }, "sha512-ZOffsNrXYggvU1mDGHk54I96r26P8SyMjO5slMKSc7+IWmtB/MQKnEC2fP51imB3/pT6YK5cT5E8f+Dd9KdyOQ=="],

746+

702747 "thread-stream": ["thread-stream@4.0.0", "", { "dependencies": { "real-require": "^0.2.0" } }, "sha512-4iMVL6HAINXWf1ZKZjIPcz5wYaOdPhtO8ATvZ+Xqp3BTdaqtAwQkNmKORqcIo5YkQqGXq5cwfswDwMqqQNrpJA=="],

703748

704749 "through2": ["through2@2.0.5", "", { "dependencies": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" } }, "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="],

@@ -745,6 +790,8 @@

745790

746791 "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="],

747792

793+ "v8-to-istanbul": ["v8-to-istanbul@9.3.0", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", "convert-source-map": "^2.0.0" } }, "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA=="],

794+

748795 "vite": ["vite@5.4.21", "", { "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", "rollup": "^4.20.0" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" }, "optionalPeers": ["@types/node", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser"], "bin": { "vite": "bin/vite.js" } }, "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw=="],

749796

750797 "vite-node": ["vite-node@2.1.9", "", { "dependencies": { "cac": "^6.7.14", "debug": "^4.3.7", "es-module-lexer": "^1.5.4", "pathe": "^1.1.2", "vite": "^5.0.0" }, "bin": { "vite-node": "vite-node.mjs" } }, "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA=="],

@@ -763,7 +810,7 @@

763810

764811 "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="],

765812

766− "wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],

813+ "wrap-ansi": ["wrap-ansi@9.0.2", "", { "dependencies": { "ansi-styles": "^6.2.1", "string-width": "^7.0.0", "strip-ansi": "^7.1.0" } }, "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww=="],

767814

768815 "wrappy": ["wrappy@1.0.2", "", {}, "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="],

769816

@@ -779,12 +826,18 @@

779826

780827 "xtend": ["xtend@4.0.2", "", {}, "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="],

781828

782− "y18n": ["y18n@4.0.3", "", {}, "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="],

829+ "y18n": ["y18n@5.0.8", "", {}, "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="],

783830

784831 "yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="],

785832

786833 "yaml": ["yaml@2.8.2", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A=="],

787834

835+ "yargs": ["yargs@18.1.0", "", { "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "string-width": "^8.2.1", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" } }, "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg=="],

836+

837+ "yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],

838+

839+ "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],

840+

788841 "zen-observable": ["zen-observable@0.8.15", "", {}, "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="],

789842

790843 "@npmcli/move-file/mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="],

@@ -797,15 +850,19 @@

797850

798851 "cacache/lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="],

799852

853+ "cacache/y18n": ["y18n@4.0.3", "", {}, "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="],

854+

800855 "chalk/supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="],

801856

857+ "cliui/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],

858+

802859 "concat-stream/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],

803860

804861 "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],

805862

806− "flush-write-stream/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],

863+ "execa/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],

807864

808− "foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],

865+ "flush-write-stream/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],

809866

810867 "from2/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],

811868

@@ -813,10 +870,14 @@

813870

814871 "fs-write-stream-atomic/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],

815872

873+ "istanbul-lib-report/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],

874+

816875 "light-my-request/cookie": ["cookie@1.1.1", "", {}, "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ=="],

817876

818877 "light-my-request/process-warning": ["process-warning@4.0.1", "", {}, "sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q=="],

819878

879+ "log-update/wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],

880+

820881 "make-fetch-happen/cacache": ["cacache@16.1.3", "", { "dependencies": { "@npmcli/fs": "^2.1.0", "@npmcli/move-file": "^2.0.0", "chownr": "^2.0.0", "fs-minipass": "^2.1.0", "glob": "^8.0.1", "infer-owner": "^1.0.4", "lru-cache": "^7.7.1", "minipass": "^3.1.6", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "mkdirp": "^1.0.4", "p-map": "^4.0.0", "promise-inflight": "^1.0.1", "rimraf": "^3.0.2", "ssri": "^9.0.0", "tar": "^6.1.11", "unique-filename": "^2.0.0" } }, "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="],

821882

822883 "make-fetch-happen/http-proxy-agent": ["http-proxy-agent@5.0.0", "", { "dependencies": { "@tootallnate/once": "2", "agent-base": "6", "debug": "4" } }, "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="],

@@ -857,6 +918,8 @@

857918

858919 "purescript-installer/tar": ["tar@6.2.1", "", { "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" } }, "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="],

859920

921+ "restore-cursor/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],

922+

860923 "rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],

861924

862925 "slice-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],

@@ -865,9 +928,15 @@

865928

866929 "socks-proxy-agent/agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="],

867930

931+ "test-exclude/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="],

932+

868933 "through2/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],

869934

870− "wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],

935+ "wrap-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="],

936+

937+ "wrap-ansi/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],

938+

939+ "yargs/yargs-parser": ["yargs-parser@22.0.0", "", {}, "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw=="],

871940

872941 "@npmcli/move-file/rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],

873942

@@ -875,6 +944,8 @@

875944

876945 "cacache/lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],

877946

947+ "chalk/supports-color/has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="],

948+

878949 "concat-stream/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="],

879950

880951 "concat-stream/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],

@@ -893,6 +964,12 @@

893964

894965 "fs-write-stream-atomic/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],

895966

967+ "log-update/wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],

968+

969+ "log-update/wrap-ansi/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

970+

971+ "log-update/wrap-ansi/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],

972+

896973 "make-fetch-happen/cacache/chownr": ["chownr@2.0.0", "", {}, "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="],

897974

898975 "make-fetch-happen/cacache/glob": ["glob@8.1.0", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^5.0.1", "once": "^1.3.0" } }, "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="],

@@ -945,16 +1022,22 @@

9451022

9461023 "slice-ansi/ansi-styles/color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],

9471024

1025+ "test-exclude/glob/minipass": ["minipass@7.1.3", "", {}, "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="],

1026+

9481027 "through2/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="],

9491028

9501029 "through2/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],

9511030

952− "wrap-ansi/ansi-styles/color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],

953−

9541031 "@npmcli/move-file/rimraf/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],

9551032

9561033 "cacache/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],

9571034

1035+ "log-update/wrap-ansi/ansi-styles/color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],

1036+

1037+ "log-update/wrap-ansi/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

1038+

1039+ "log-update/wrap-ansi/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],

1040+

9581041 "make-fetch-happen/cacache/glob/minimatch": ["minimatch@5.1.6", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="],

9591042

9601043 "make-fetch-happen/cacache/rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],

@@ -981,12 +1064,12 @@

9811064

9821065 "slice-ansi/ansi-styles/color-convert/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],

9831066

984− "wrap-ansi/ansi-styles/color-convert/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],

985−

9861067 "@npmcli/move-file/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],

9871068

9881069 "cacache/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],

9891070

1071+ "log-update/wrap-ansi/ansi-styles/color-convert/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],

1072+

9901073 "make-fetch-happen/cacache/glob/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="],

9911074

9921075 "make-fetch-happen/cacache/rimraf/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],

package.json+3−1

@@ -6,8 +6,9 @@

66 "scripts": {

77 "build": "spago build",

88 "test": "spago test",

9+ "coverage": "spago build && c8 spago test",

910 "test:compile-fail": "bun compile-fail-tests/run.js",

10− "clean": "rm -rf output .spago",

11+ "clean": "rm -rf output .spago coverage",

1112 "watch": "spago build --watch",

1213 "repl": "spago repl",

1314 "docs": "spago docs",

@@ -33,6 +34,7 @@

3334 "@fastify/rate-limit": "^11.2.0",

3435 "@fastify/websocket": "^11.3.0",

3536 "argon2": "^0.45.1",

37+ "c8": "^12.0.0",

3638 "fastify": "^5.7.4",

3739 "jose": "^6.2.8",

3840 "jsdom": "^28.0.0",

spago.lock+83

@@ -44,6 +44,9 @@

4444 {

4545 "strings": ">=6.0.1 <7.0.0"

4646 },

47+ {

48+ "tailrec": ">=6.1.0 <7.0.0"

49+ },

4750 {

4851 "transformers": ">=6.1.0 <7.0.0"

4952 },

@@ -78,9 +81,22 @@

7881 {

7982 "console": ">=6.0.0 <7.0.0"

8083 },

84+ "enums",

85+ "foldable-traversable",

86+ "foreign",

87+ "foreign-object",

88+ "integers",

89+ "js-promise",

90+ {

91+ "js-uri": ">=3.1.0 <4.0.0"

92+ },

8193 {

8294 "justifill": ">=0.5.0 <0.6.0"

8395 },

96+ "partial",

97+ {

98+ "quickcheck": ">=8.0.1 <9.0.0"

99+ },

84100 {

85101 "refs": ">=6.0.0 <7.0.0"

86102 },

@@ -90,6 +106,10 @@

90106 {

91107 "spec-discovery": ">=8.0.0 <9.0.0"

92108 },

109+ {

110+ "spec-quickcheck": ">=5.0.2 <6.0.0"

111+ },

112+ "yoga-fastify",

93113 {

94114 "yoga-fastify-om": ">=0.4.7 <0.5.0"

95115 }

@@ -696,6 +716,20 @@

696716 "prelude"

697717 ]

698718 },

719+ "lcg": {

720+ "type": "registry",

721+ "version": "4.0.0",

722+ "integrity": "sha256-bUYyfXYmjTn7zSpj2hTiePywzsuD80fCjkonsrpdGOw=",

723+ "dependencies": [

724+ "effect",

725+ "integers",

726+ "maybe",

727+ "numbers",

728+ "partial",

729+ "prelude",

730+ "random"

731+ ]

732+ },

699733 "lists": {

700734 "type": "registry",

701735 "version": "7.0.0",

@@ -1075,6 +1109,39 @@

10751109 "tuples"

10761110 ]

10771111 },

1112+ "quickcheck": {

1113+ "type": "registry",

1114+ "version": "8.0.1",

1115+ "integrity": "sha256-SfW+maesCt0jnnFhfrgJZGPcWLj8oFcGbcDIVklmdzc=",

1116+ "dependencies": [

1117+ "arrays",

1118+ "console",

1119+ "control",

1120+ "effect",

1121+ "either",

1122+ "enums",

1123+ "exceptions",

1124+ "foldable-traversable",

1125+ "gen",

1126+ "identity",

1127+ "integers",

1128+ "lazy",

1129+ "lcg",

1130+ "lists",

1131+ "maybe",

1132+ "newtype",

1133+ "nonempty",

1134+ "numbers",

1135+ "partial",

1136+ "prelude",

1137+ "record",

1138+ "st",

1139+ "strings",

1140+ "tailrec",

1141+ "transformers",

1142+ "tuples"

1143+ ]

1144+ },

10781145 "random": {

10791146 "type": "registry",

10801147 "version": "6.0.0",

@@ -1225,6 +1292,22 @@

12251292 "tuples"

12261293 ]

12271294 },

1295+ "spec-quickcheck": {

1296+ "type": "registry",

1297+ "version": "5.0.2",

1298+ "integrity": "sha256-pmnLu9e9Yk+Yx4hi71XwbyuPS27ya4hjTOKk2KFK/Ns=",

1299+ "dependencies": [

1300+ "aff",

1301+ "arrays",

1302+ "effect",

1303+ "foldable-traversable",

1304+ "lists",

1305+ "maybe",

1306+ "prelude",

1307+ "quickcheck",

1308+ "tuples"

1309+ ]

1310+ },

12281311 "st": {

12291312 "type": "registry",

12301313 "version": "6.2.0",

spago.yaml+15−4

@@ -10,7 +10,6 @@ package:

1010 include:

1111 - LICENSE

1212 - README.md

13− - CHANGELOG.md

1413 exclude:

1514 - .github

1615 dependencies:

@@ -27,6 +26,7 @@ package:

2726 - prelude: ">=6.0.2 <7.0.0"

2827 - record: ">=4.0.0 <5.0.0"

2928 - strings: ">=6.0.1 <7.0.0"

29+ - tailrec: ">=6.1.0 <7.0.0"

3030 - transformers: ">=6.1.0 <7.0.0"

3131 - tuples: ">=7.0.0 <8.0.0"

3232 - typelevel-prelude: ">=7.0.0 <8.0.0"

@@ -39,9 +39,20 @@ package:

3939 test:

4040 main: Test.Main

4141 dependencies:

42+ - enums

43+ - foldable-traversable

44+ - foreign

45+ - foreign-object

46+ - integers

47+ - js-promise

48+ - partial

49+ - yoga-fastify

50+ - console: ">=6.0.0 <7.0.0"

51+ - js-uri: ">=3.1.0 <4.0.0"

52+ - justifill: ">=0.5.0 <0.6.0"

53+ - quickcheck: ">=8.0.1 <9.0.0"

54+ - refs: ">=6.0.0 <7.0.0"

4255 - spec: ">=8.0.0 <9.0.0"

4356 - spec-discovery: ">=8.0.0 <9.0.0"

44− - justifill: ">=0.5.0 <0.6.0"

45− - console: ">=6.0.0 <7.0.0"

57+ - spec-quickcheck: ">=5.0.2 <6.0.0"

4658 - yoga-fastify-om: ">=0.4.7 <0.5.0"

47− - refs: ">=6.0.0 <7.0.0"

src/Yoga/Fetch/Om.purs+3−7

@@ -21,7 +21,6 @@ module Yoga.Fetch.Om

2121 , toHeaders

2222 , module Yoga.HTTP.API.Route

2323 , module Yoga.HTTP.API.Path

24− , plainText

2524 , module Yoga.Fetch.Om.StreamDecode

2625 , module Yoga.Fetch.Om.Simple

2726 ) where

@@ -49,7 +48,7 @@ import Yoga.Fetch.Om.ParseResponse (class ParseResponse, parseResponse)

4948import Yoga.Fetch.Om.SplitResponses (class SplitResponses)

5049import Yoga.Fetch.Om.Variant (class VariantOrValue, variantOrValue)

5150import Yoga.HTTP.API.Path (Path, Root, Lit, Capture, PathCons, Param, QueryParams, Required, type (/), type (:), type (:?), class PathPattern)

52−import Yoga.HTTP.API.Route (Route(..), GET, POST, PUT, DELETE, PATCH, Response(..), JSON, FormData, PlainText, Streaming, NoBody, class HeaderValue, printHeader)

51+import Yoga.HTTP.API.Route (Route(..), GET, POST, PUT, DELETE, PATCH, QUERY, Response(..), JSON, FormData, PlainText, Streaming, NoBody, class HeaderValue, printHeader)

5352import Yoga.HTTP.API.Route.Handler (class SegmentPathParams, class SegmentQueryParams)

5453import Yoga.Om (Om, toOm)

5554

@@ -63,7 +62,6 @@ type ClientWithConfig ctx err providedHeaders providedQuery =

6362 , provide :: Om { | ctx } err (ClientInputs providedHeaders providedQuery)

6463 }

6564

66−

6765foreign import mergeRecords :: forall left right out. Record left -> Record right -> Record out

6866

6967-- | Extract row type from Record type

@@ -139,6 +137,7 @@ instance

139137 where

140138 pathParamsRec = unsafeCoerce pathQueryRec :: Record pathParams

141139 queryParamsRec = unsafeCoerce pathQueryRec :: Record queryParams

140+

142141 widenOm :: Om (Record ()) routeErrors ~> Om { | ctx } errRow

143142 widenOm = unsafeCoerce

144143

@@ -202,6 +201,7 @@ instance

202201 where

203202 widenExtra :: Om { | ctx } extraErr ~> Om { | ctx } errRow

204203 widenExtra = unsafeCoerce

204+

205205 widenRoute :: Om (Record ()) routeErrors ~> Om { | ctx } errRow

206206 widenRoute = unsafeCoerce

207207

@@ -239,10 +239,6 @@ clientWith

239239 -> Record clientsRow

240240clientWith config = deriveClientWithImpl @providedHeaders @providedQuery @ctx @extraErr config (Proxy :: _ { | routesRow })

241241

242−

243−plainText :: PlainText -> String

244−plainText = unsafeCoerce

245−

246242instance

247243 ( RowToList routesRow rl

248244 , DeriveClientRL ctx extraErr rl () clientsRow

src/Yoga/Fetch/Om/BuildUrl.js+86−2

@@ -1,3 +1,87 @@

1−export function encodeURIComponent_(s) {

2− return encodeURIComponent(s);

1+export function encodeURIComponent_(value) {

2+ try {

3+ return encodeURIComponent(value);

4+ } catch (error) {

5+ if (!(error instanceof URIError)) throw error;

6+ return encodeURIComponent(toWellFormed(value));

7+ }

8+}

10+function toWellFormed(value) {

11+ if (typeof value.toWellFormed === "function") return value.toWellFormed();

12+

13+ let result = "";

14+ let sliceStart = 0;

15+ for (let index = 0; index < value.length; index += 1) {

16+ const codeUnit = value.charCodeAt(index);

17+ const previous = index === 0 ? 0 : value.charCodeAt(index - 1);

18+ const next =

19+ index + 1 === value.length ? 0 : value.charCodeAt(index + 1);

20+ const loneHigh =

21+ codeUnit >= 0xd800 &&

22+ codeUnit <= 0xdbff &&

23+ (next < 0xdc00 || next > 0xdfff);

24+ const loneLow =

25+ codeUnit >= 0xdc00 &&

26+ codeUnit <= 0xdfff &&

27+ (previous < 0xd800 || previous > 0xdbff);

28+

29+ if (!loneHigh && !loneLow) continue;

30+ result += value.slice(sliceStart, index) + "\ufffd";

31+ sliceStart = index + 1;

32+ }

33+

34+ return sliceStart === 0 ? value : result + value.slice(sliceStart);

35+}

36+

37+function urlSuffixIndex(url) {

38+ const queryIndex = url.indexOf("?");

39+ const fragmentIndex = url.indexOf("#");

40+ return Math.min(

41+ queryIndex === -1 ? url.length : queryIndex,

42+ fragmentIndex === -1 ? url.length : fragmentIndex,

43+ );

44+}

45+

46+export function appendPath_(base) {

47+ return function (path) {

48+ const suffixIndex = urlSuffixIndex(base);

49+ const prefix = base.slice(0, suffixIndex).replace(/\/+$/, "");

50+ return prefix + path + base.slice(suffixIndex);

51+ };

52+}

53+

54+

55+export function substitutePathParam_(name) {

56+ const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");

57+ const segment = new RegExp(`(^|/):${escapedName}(?=/|[?#]|$)`, "g");

58+ return function (value) {

59+ const encodedValue = encodeURIComponent_(value);

60+ return function (url) {

61+ const suffixIndex = urlSuffixIndex(url);

62+ const path = url.slice(0, suffixIndex);

63+ return (

64+ path.replace(segment, (_, prefix) => prefix + encodedValue) +

65+ url.slice(suffixIndex)

66+ );

67+ };

68+ };

69+}

70+

71+export function appendQueryString_(url) {

72+ return function (queryString) {

73+ if (queryString === "") return url;

74+

75+ const fragmentIndex = url.indexOf("#");

76+ const beforeFragment =

77+ fragmentIndex === -1 ? url : url.slice(0, fragmentIndex);

78+ const fragment = fragmentIndex === -1 ? "" : url.slice(fragmentIndex);

79+ const separator = beforeFragment.includes("?")

80+ ? beforeFragment.endsWith("?") || beforeFragment.endsWith("&")

81+ ? ""

82+ : "&"

83+ : "?";

84+

85+ return beforeFragment + separator + queryString + fragment;

86+ };

387}

src/Yoga/Fetch/Om/BuildUrl.purs+10−11

@@ -19,7 +19,6 @@ import Prelude

1919

2020import Data.Array as Array

2121import Data.Maybe (Maybe(..))

22−import Data.String (Pattern(..), Replacement(..))

2322import Data.String as String

2423import Data.Symbol (class IsSymbol, reflectSymbol)

2524import Prim.Row as Row

@@ -31,6 +30,10 @@ import Yoga.HTTP.API.Path (class PathPattern, pathPattern)

3130import Yoga.Fetch.Om.ReadOptional (readOptional)

3231

3332foreign import encodeURIComponent_ :: String -> String

33+foreign import appendPath_ :: String -> String -> String

34+foreign import substitutePathParam_ :: String -> String -> String -> String

35+

36+foreign import appendQueryString_ :: String -> String -> String

3437

3538class BuildUrl :: forall k. k -> Row Type -> Row Type -> Constraint

3639class BuildUrl segments pathParams queryParams | segments -> pathParams queryParams where

@@ -47,10 +50,7 @@ instance

4750 pattern = pathPattern segmentsProxy

4851 withBase = case baseUrl of

4952 "" -> pattern

50− base -> dropTrailingSlash base <> pattern

51− dropTrailingSlash s = case String.stripSuffix (Pattern "/") s of

52− Just s' -> dropTrailingSlash s'

53− Nothing -> s

53+ base -> appendPath_ base pattern

5454 withPathParams = substitutePathParamsImpl (Proxy :: _ pathParams) pathParamsRec withBase

5555 withQueryParams = appendQueryParamsImpl (Proxy :: _ queryParams) queryParamsRec withPathParams

5656

@@ -85,8 +85,8 @@ instance

8585 substitutePathParamsRL _ rec url = substitutePathParamsRL (Proxy :: _ tail) rec replaced

8686 where

8787 value = Record.get (Proxy :: _ name) rec

88− pattern = Pattern (":" <> reflectSymbol (Proxy :: _ name))

89− replaced = String.replaceAll pattern (Replacement (serializeParam value)) url

88+ name = reflectSymbol (Proxy :: _ name)

89+ replaced = substitutePathParam_ name (serializeParam value) url

9090

9191class AppendQueryParams :: Row Type -> Constraint

9292class AppendQueryParams params where

@@ -100,12 +100,11 @@ instance

100100 , AppendQueryParamsRL rl params

101101 ) =>

102102 AppendQueryParams params where

103− appendQueryParamsImpl _ rec url = url <> queryString

103+ appendQueryParamsImpl _ rec url = case pairs of

104+ [] -> url

105+ _ -> appendQueryString_ url (String.joinWith "&" pairs)

104106 where

105107 pairs = appendQueryParamsRL (Proxy :: _ rl) rec []

106− queryString = case pairs of

107− [] -> ""

108− _ -> "?" <> String.joinWith "&" pairs

109108

110109class AppendQueryParamsRL :: RowList Type -> Row Type -> Constraint

111110class AppendQueryParamsRL rl r where

src/Yoga/Fetch/Om/MakeRequest.purs+6−13

@@ -2,8 +2,6 @@ module Yoga.Fetch.Om.MakeRequest

22 ( class MakeRequest

33 , httpMethod

44 , makeRequest

5− , class SerializeBody

6− , serializeBody

75 , class BodyEncoding

86 , encodingContentType

97 , encodeBody

@@ -32,8 +30,8 @@ import JS.Fetch.Integrity (Integrity(..))

3230import JS.Fetch.Duplex as Duplex

3331import JS.Fetch.Response (Response) as FetchResponse

3432import Promise.Aff as Promise

35−import Type.Proxy (Proxy(..))

36−import Yoga.HTTP.API.Route.Encoding (JSON, FormData, NoBody)

33+import Type.Proxy (Proxy)

34+import Yoga.HTTP.API.Route.Encoding (JSON, FormData, PlainText, NoBody)

3735import Yoga.HTTP.API.Route.Method as Method

3836import Yoga.JSON (class WriteForeign, writeJSON)

3937

@@ -96,15 +94,6 @@ makeRequest proxy url customHeaders bodyContentType maybeBody = do

9694 , cache: Cache.Default

9795 }

9896

99−class SerializeBody :: Type -> Constraint

100−class SerializeBody body where

101− serializeBody :: body -> Maybe String

102−

103−instance SerializeBody Unit where

104− serializeBody _ = Nothing

105−else instance WriteForeign body => SerializeBody body where

106− serializeBody b = Just (writeJSON b)

107−

10897class BodyEncoding :: Type -> Type -> Constraint

10998class BodyEncoding encoding body | encoding -> body where

11099 encodingContentType :: Proxy encoding -> String

@@ -114,6 +103,10 @@ instance WriteForeign ty => BodyEncoding (JSON ty) ty where

114103 encodingContentType _ = "application/json"

115104 encodeBody b = Just (writeJSON b)

116105

106+else instance BodyEncoding PlainText String where

107+ encodingContentType _ = "text/plain"

108+ encodeBody = Just

109+

117110else instance BodyEncoding (FormData ty) ty where

118111 encodingContentType _ = "application/x-www-form-urlencoded"

119112 encodeBody b = Just (toUrlEncoded b)

src/Yoga/Fetch/Om/ParseResponse.purs+2−36

@@ -29,7 +29,6 @@ import Promise.Aff as Promise

2929import Type.Proxy (Proxy(..))

3030import Unsafe.Coerce (unsafeCoerce)

3131import Yoga.Fetch.Om.StreamDecode (class StreamDecode, decodeStream)

32−import Yoga.HTTP.API.Route.Encoding (PlainText, Streaming)

3332import Yoga.HTTP.API.Route.StatusCode (class StatusCodeMap, statusCodeFor, StatusCode(..))

3433import Yoga.JSON (class ReadForeign, readJSON)

3534import Yoga.JSON.Error (withStringErrors)

@@ -72,31 +71,15 @@ instance ParseSuccessRL RL.Nil successRow where

7271 parseSuccessRL _ status _ =

7372 Aff.throwError (Exception.error ("Unexpected success status code: " <> show status))

7473

75−else instance

76− ( IsSymbol label

77− , StatusCodeMap label

78− , Row.Cons label PlainText tailRow successRow

79− , Row.Lacks label tailRow

80− , ParseSuccessRL tailRL successRow

81− ) =>

82− ParseSuccessRL (RL.Cons label PlainText tailRL) successRow where

83− parseSuccessRL _ actualStatus fetchResp = do

84− let StatusCode expected = statusCodeFor (Proxy :: _ label)

85− if actualStatus == expected then do

86− text <- liftEffect (Fetch.text fetchResp) >>= Promise.toAff

87− pure (Variant.inj (Proxy :: _ label) (unsafeCoerce text))

88− else

89− parseSuccessRL (Proxy :: _ tailRL) actualStatus fetchResp

90−

9174else instance

9275 ( IsSymbol label

9376 , StatusCodeMap label

9477 , StreamDecode a

95− , Row.Cons label (Streaming a) tailRow successRow

78+ , Row.Cons label (Strom streamContext streamError a) tailRow successRow

9679 , Row.Lacks label tailRow

9780 , ParseSuccessRL tailRL successRow

9881 ) =>

99− ParseSuccessRL (RL.Cons label (Streaming a) tailRL) successRow where

82+ ParseSuccessRL (RL.Cons label (Strom streamContext streamError a) tailRL) successRow where

10083 parseSuccessRL _ actualStatus fetchResp = do

10184 let StatusCode expected = statusCodeFor (Proxy :: _ label)

10285 if actualStatus == expected then do

@@ -106,7 +89,6 @@ else instance

10689 else

10790 parseSuccessRL (Proxy :: _ tailRL) actualStatus fetchResp

10891

109−

11092else instance

11193 ( IsSymbol label

11294 , StatusCodeMap label

@@ -153,22 +135,6 @@ instance ParseErrorRL RL.Nil errorRow where

153135 parseErrorRL _ _ status _ =

154136 throwError (Variant.inj (Proxy :: _ "exception") (Exception.error ("Unexpected error status code: " <> show status)))

155137

156−else instance

157− ( IsSymbol label

158− , StatusCodeMap label

159− , Row.Cons label PlainText tailRow errorRow

160− , Row.Lacks label tailRow

161− , Row.Cons label PlainText tailExc (Exception errorRow)

162− , ParseErrorRL tailRL errorRow

163− ) =>

164− ParseErrorRL (RL.Cons label PlainText tailRL) errorRow where

165− parseErrorRL _ errorProxy actualStatus text = do

166− let StatusCode expected = statusCodeFor (Proxy :: _ label)

167− if actualStatus == expected then

168− throwError (Variant.inj (Proxy :: _ label) (unsafeCoerce text))

169− else

170− parseErrorRL (Proxy :: _ tailRL) errorProxy actualStatus text

171−

172138else instance

173139 ( IsSymbol label

174140 , StatusCodeMap label

src/Yoga/Fetch/Om/ReadOptional.js+4−1

@@ -3,7 +3,10 @@ import * as Maybe from "../Data.Maybe/index.js";

33export function readOptionalImpl(key) {

44 return function (obj) {

55 const val = obj[key];

6− if (val === undefined) return Maybe.Nothing.value;

6+ if (val === undefined || val instanceof Maybe.Nothing) {

7+ return Maybe.Nothing.value;

8+ }

9+ if (val instanceof Maybe.Just) return val;

710 return Maybe.Just.create(val);

811 };

912}

src/Yoga/Fetch/Om/ReadOptional.purs+3−2

@@ -4,16 +4,17 @@ module Yoga.Fetch.Om.ReadOptional

44 , readPartialQuery

55 ) where

7−import Data.Maybe (Maybe(..))

7+import Data.Maybe (Maybe)

88import Data.Symbol (class IsSymbol, reflectSymbol)

99import Prim.Row as Row

10−import Prim.RowList (class RowToList, RowList)

10+import Prim.RowList (RowList)

1111import Prim.RowList as RL

1212import Record as Record

1313import Type.Proxy (Proxy(..))

1414

1515foreign import readOptionalImpl :: forall a r. String -> Record r -> Maybe a

1616

17+-- | Accept explicit `Maybe` fields as well as undefined-aware partial records.

1718readOptional :: forall @name ty r. IsSymbol name => Record r -> Maybe ty

1819readOptional rec = readOptionalImpl (reflectSymbol (Proxy :: _ name)) rec

1920

src/Yoga/Fetch/Om/Simple.purs+6−15

@@ -32,21 +32,14 @@ import JS.Fetch as Fetch

3232import JS.Fetch.Duplex as Duplex

3333import JS.Fetch.Headers (Headers)

3434import JS.Fetch.Headers as Headers

35−import JS.Fetch.Integrity (Integrity(..))

36−import JS.Fetch.Referrer as Referrer

37−import JS.Fetch.ReferrerPolicy as ReferrerPolicy

3835import JS.Fetch.Request as Request

3936import JS.Fetch.RequestBody as Body

40−import JS.Fetch.RequestCache as Cache

41−import JS.Fetch.RequestCredentials as Credentials

42−import JS.Fetch.RequestMode as Mode

4337import JS.Fetch.Response as Resp

4438import Promise.Aff as Promise

4539import Type.Row.Homogeneous (class Homogeneous)

46−-- PlainText removed, using local phantom type

4740import Yoga.JSON (class ReadForeign, class WriteForeign, readJSON, writeJSON)

4841import Yoga.JSON.Error (withStringErrors)

49−import Yoga.Om (class ToOm, Om, toOm, throw)

42+import Yoga.Om (Om, toOm, throw)

5043

5144type FetchError = { status :: Int, body :: String }

5245

@@ -56,9 +49,7 @@ class DecodeResponse :: forall k. k -> Type -> Constraint

5649class DecodeResponse a result | a -> result where

5750 decodeResponse :: String -> Either String result

5851

59−data PlainTextResponse

60−

61−instance DecodeResponse PlainTextResponse String where

52+instance DecodeResponse String String where

6253 decodeResponse = Right

6354

6455else instance ReadForeign a => DecodeResponse a a where

@@ -147,7 +138,7 @@ delete_

147138 => String

148139 -> Record headers

149140 -> Om ctx (fetchError :: FetchError | err) Unit

150−delete_ url headers = void $ simpleFetch @PlainTextResponse DELETE headers url Nothing

141+delete_ url headers = void $ simpleFetch @String DELETE headers url Nothing

151142

152143post

153144 :: forall @a result headers body ctx err

@@ -179,7 +170,7 @@ post_

179170 -> Record headers

180171 -> body

181172 -> Om ctx (fetchError :: FetchError | err) Unit

182−post_ url headers body = void $ simpleFetch @PlainTextResponse POST headers url (Just (writeJSON body))

173+post_ url headers body = void $ simpleFetch @String POST headers url (Just (writeJSON body))

183174

184175put

185176 :: forall @a result headers body ctx err

@@ -211,7 +202,7 @@ put_

211202 -> Record headers

212203 -> body

213204 -> Om ctx (fetchError :: FetchError | err) Unit

214−put_ url headers body = void $ simpleFetch @PlainTextResponse PUT headers url (Just (writeJSON body))

205+put_ url headers body = void $ simpleFetch @String PUT headers url (Just (writeJSON body))

215206

216207patch

217208 :: forall @a result headers body ctx err

@@ -243,4 +234,4 @@ patch_

243234 -> Record headers

244235 -> body

245236 -> Om ctx (fetchError :: FetchError | err) Unit

246−patch_ url headers body = void $ simpleFetch @PlainTextResponse PATCH headers url (Just (writeJSON body))

237+patch_ url headers body = void $ simpleFetch @String PATCH headers url (Just (writeJSON body))

src/Yoga/Fetch/Om/SplitResponses.purs+12−2

@@ -2,6 +2,7 @@ module Yoga.Fetch.Om.SplitResponses

22 ( class IsSuccessStatus

33 , class ExtractBodyRL

44 , class ExtractBody

5+ , class ClientResponseBody

56 , class SplitResponses

67 , class SplitResponsesRL

78 , class DispatchResponse

@@ -13,6 +14,8 @@ import Prim.RowList (RowList)

1314import Prim.RowList as RL

1415import Data.Unit (Unit)

1516import Yoga.HTTP.API.Route (Response)

17+import Yoga.HTTP.API.Route.Encoding (PlainText, Streaming)

18+import Yoga.Om.Strom (Strom)

1619

1720class IsSuccessStatus (label :: Symbol) (isSuccess :: Boolean) | label -> isSuccess

1821

@@ -37,13 +40,20 @@ instance ExtractBodyRL (RL.Cons "body" body tail) body

3740

3841else instance ExtractBodyRL tail body => ExtractBodyRL (RL.Cons label ty tail) body

3942

43+class ClientResponseBody (encoded :: Type) (decoded :: Type) | encoded -> decoded

44+

45+instance ClientResponseBody PlainText String

46+else instance ClientResponseBody (Streaming a) (Strom {} () a)

47+else instance ClientResponseBody body body

48+

4049class ExtractBody (responseType :: Type) (bodyType :: Type) | responseType -> bodyType

4150

42−instance ExtractBody (Response headers body) body

51+instance ClientResponseBody encoded body => ExtractBody (Response headers encoded) body

4352

4453else instance

4554 ( RL.RowToList row rl

46− , ExtractBodyRL rl body

55+ , ExtractBodyRL rl encoded

56+ , ClientResponseBody encoded body

4757 ) =>

4858 ExtractBody (Record row) body

4959

src/Yoga/Fetch/Om/StreamDecode.js+12−1

@@ -1 +1,12 @@

1−export const decodeUtf8 = (uint8array) => new TextDecoder().decode(uint8array);

1+export const newUtf8Decoder = () => new TextDecoder();

3+export const decodeUtf8Chunks = (decoder) => (chunks) => () => {

4+ const decoded = [];

5+ for (const bytes of chunks) {

6+ const text = decoder.decode(bytes, { stream: true });

7+ if (text !== "") decoded.push(text);

8+ }

9+ return decoded;

10+};

11+

12+export const flushUtf8Decoder = (decoder) => () => decoder.decode();

src/Yoga/Fetch/Om/StreamDecode.purs+43−2

@@ -4,7 +4,15 @@ module Yoga.Fetch.Om.StreamDecode

44 ) where

66import Prelude

8+import Control.Monad.Rec.Class (Step(..))

9+import Data.Array as Array

710import Data.ArrayBuffer.Types (Uint8Array)

11+import Data.Maybe (Maybe(..))

12+import Data.Tuple.Nested ((/\))

13+import Effect (Effect)

14+import Effect.Class (liftEffect)

15+import Yoga.Om (Om)

816import Yoga.Om.Strom (Strom)

917import Yoga.Om.Strom as Strom

1018

@@ -15,6 +23,39 @@ instance StreamDecode Uint8Array where

1523 decodeStream = identity

1624

1725else instance StreamDecode String where

18− decodeStream = Strom.mapStrom decodeUtf8

26+ decodeStream stream =

27+ Strom.fromOm (liftEffect newUtf8Decoder) >>= \decoder ->

28+ decodeUtf8Stream decoder stream

29+

30+data Utf8Decoder

31+

32+foreign import newUtf8Decoder :: Effect Utf8Decoder

33+

34+foreign import decodeUtf8Chunks :: Utf8Decoder -> Array Uint8Array -> Effect (Array String)

35+

36+foreign import flushUtf8Decoder :: Utf8Decoder -> Effect String

37+

38+decodeUtf8Stream :: Utf8Decoder -> Strom {} () Uint8Array -> Strom {} () String

39+decodeUtf8Stream decoder stream = Strom.mkStrom do

40+ step <- Strom.runStrom stream

41+ case step of

42+ Done maybeChunk -> do

43+ decoded <- decodeChunk decoder maybeChunk

44+ trailing <- liftEffect $ flushUtf8Decoder decoder

45+ let

46+ finalChunk =

47+ if trailing == "" then decoded

48+ else Array.snoc decoded trailing

49+ pure $ Done (nonEmpty finalChunk)

50+ Loop (maybeChunk /\ next) -> do

51+ decoded <- decodeChunk decoder maybeChunk

52+ pure $ Loop (nonEmpty decoded /\ decodeUtf8Stream decoder next)

53+

54+decodeChunk :: Utf8Decoder -> Maybe (Array Uint8Array) -> Om {} () (Array String)

55+decodeChunk _ Nothing = pure []

56+decodeChunk decoder (Just chunk) = liftEffect $ decodeUtf8Chunks decoder chunk

1957

20−foreign import decodeUtf8 :: Uint8Array -> String

58+nonEmpty :: forall a. Array a -> Maybe (Array a)

59+nonEmpty values

60+ | Array.null values = Nothing

61+ | otherwise = Just values

test/BuildUrl.Spec.purs+47−1

@@ -2,7 +2,7 @@ module BuildUrl.Spec where

33import Prelude

5−import Data.Maybe (Maybe)

5+import Data.Maybe (Maybe(..))

66import Test.Spec (Spec, describe, it)

77import Test.Spec.Assertions (shouldEqual)

88import Type.Proxy (Proxy(..))

@@ -34,6 +34,19 @@ spec = do

3434 { slug: "hello-world" }

3535 "/posts/:slug"

3636 result `shouldEqual` "/posts/hello-world"

37+ it "URL-encodes reserved characters in path params" do

38+ let

39+ result = substitutePathParams @(slug :: String)

40+ { slug: "a/b c?d#e" }

41+ "/users/:slug"

42+ result `shouldEqual` "/users/a%2Fb%20c%3Fd%23e"

43+

44+ it "distinguishes path param names with shared prefixes" do

45+ let

46+ result = substitutePathParams @(id :: Int, id2 :: Int)

47+ { id: 1, id2: 2 }

48+ "/pairs/:id/:id2"

49+ result `shouldEqual` "/pairs/1/2"

3750

3851 it "handles empty params" do

3952 let result = substitutePathParams @() {} "/users"

@@ -58,6 +71,14 @@ spec = do

5871 "/users"

5972 result `shouldEqual` "/users?limit=10"

6073

74+ it "serializes a present explicit Maybe query param" do

75+ let result = appendQueryParams @(id :: Maybe Int) { id: Just 42 } "/users"

76+ result `shouldEqual` "/users?id=42"

77+

78+ it "omits an explicit Nothing query param" do

79+ let result = appendQueryParams @(id :: Maybe Int) { id: Nothing } "/users"

80+ result `shouldEqual` "/users"

81+

6182 it "handles optional params - omitted via partial record" do

6283 let

6384 result = appendQueryParams @(limit :: Maybe Int)

@@ -79,6 +100,13 @@ spec = do

79100 it "URL-encodes special characters in values" do

80101 let result = appendQueryParams @(search :: String) { search: "hello world&more=yes" } "/users"

81102 result `shouldEqual` "/users?search=hello%20world%26more%3Dyes"

103+ it "appends query params to an existing query string" do

104+ let result = appendQueryParams @(search :: String) { search: "new value" } "/users?token=old"

105+ result `shouldEqual` "/users?token=old&search=new%20value"

106+

107+ it "inserts query params before a URL fragment" do

108+ let result = appendQueryParams @(search :: String) { search: "new value" } "/users#details"

109+ result `shouldEqual` "/users?search=new%20value#details"

82110

83111 it "repeats Array query params one pair per element" do

84112 let

@@ -119,3 +147,21 @@ spec = do

119147 {}

120148 { limit: 10, offset: 20 }

121149 result `shouldEqual` "https://api.example.com/users?limit=10&offset=20"

150+

151+ it "appends route paths before base URL query strings and fragments" do

152+ let

153+ result = buildUrl

154+ "https://api.example.com/base/?token=old#details"

155+ (Proxy :: _ (Path "users"))

156+ {}

157+ { search: "new value" }

158+ result `shouldEqual` "https://api.example.com/base/users?token=old&search=new%20value#details"

159+

160+ it "does not substitute path captures inside a base URL query string" do

161+ let

162+ result = buildUrl

163+ "https://api.example.com?redirect=/:id#details"

164+ (Proxy :: _ (Path ("users" / "id" : Int)))

165+ { id: 42 }

166+ {}

167+ result `shouldEqual` "https://api.example.com/users/42?redirect=/:id#details"

test/BuildUrlProperty.Spec.pursnew file+256

@@ -0,0 +1,256 @@

1+module BuildUrlProperty.Spec where

3+import Prelude

5+import Data.Array as Array

6+import Data.Array.NonEmpty as NEA

7+import Data.Enum (toEnum)

8+import Data.Foldable (all)

9+import Data.Maybe (Maybe(..), fromJust, isJust)

10+import Data.String as String

11+import Data.String.CodeUnits as CodeUnits

12+import Data.String.Gen (genAsciiString)

13+import Data.String.CodePoints (CodePoint, fromCodePointArray)

14+import Data.String.Pattern (Pattern(..))

15+import JSURI (decodeURIComponent)

16+import Test.QuickCheck ((<?>), (===))

17+import Test.QuickCheck.Arbitrary (arbitrary)

18+import Test.QuickCheck.Gen (Gen, arrayOf1, chooseInt)

19+import Test.Spec (Spec, describe, it)

20+import Test.Spec.Assertions (shouldEqual)

21+import Test.Spec.QuickCheck (quickCheck)

22+import Partial.Unsafe (unsafePartial)

23+import Unsafe.Coerce (unsafeCoerce)

24+import Yoga.Fetch.Om.BuildUrl (appendQueryParams, substitutePathParams)

25+

26+spec :: Spec Unit

27+spec = describe "URL properties" do

28+ it "never substitutes path captures in the query or fragment" $ quickCheck do

29+ value <- (genAsciiString :: Gen String)

30+ let

31+ suffix = "?next=/:slug#/:slug"

32+ result = substitutePathParams @(slug :: String)

33+ { slug: value }

34+ ("/items/:slug" <> suffix)

35+ property = case String.stripSuffix (Pattern suffix) result of

36+ Nothing -> false

37+ Just path -> not $ String.contains (Pattern ":slug") path

38+ pure $ property <?> "unexpected path substitution result: " <> show result

39+

40+ it "round-trips percent-encoded path and query values" $ quickCheck do

41+ value <- (genAsciiString :: Gen String)

42+ let

43+ pathResult = substitutePathParams @(value :: String)

44+ { value }

45+ "/items/:value"

46+ queryResult = appendQueryParams @(value :: String)

47+ { value }

48+ "/items"

49+ property = case

50+ String.stripPrefix (Pattern "/items/") pathResult,

51+ String.stripPrefix (Pattern "/items?value=") queryResult

52+ of

53+ Just encodedPath, Just encodedQuery ->

54+ decodeURIComponent encodedPath == Just value

55+ && decodeURIComponent encodedQuery == Just value

56+ _, _ -> false

57+ pure $ property <?> "failed to round-trip value " <> show value

58+

59+ it "preserves existing query values and fragments" $ quickCheck do

60+ existing <- (genAsciiString :: Gen String)

61+ added <- (genAsciiString :: Gen String)

62+ let

63+ base = appendQueryParams @(token :: String)

64+ { token: existing }

65+ "/items#details"

66+ result = appendQueryParams @(search :: String)

67+ { search: added }

68+ base

69+ property = do

70+ withoutFragment <- String.stripSuffix (Pattern "#details") result

71+ query <- String.stripPrefix (Pattern "/items?token=") withoutFragment

72+ case String.split (Pattern "&search=") query of

73+ [ encodedExisting, encodedAdded ] ->

74+ pure

75+ $ decodeURIComponent encodedExisting == Just existing

76+ && decodeURIComponent encodedAdded == Just added

77+ _ -> Nothing

78+ pure

79+ $ (property == Just true)

80+ <?> "query or fragment changed unexpectedly: " <> show result

81+

82+ it "preserves repeated query parameter order and multiplicity" $ quickCheck do

83+ values <- arbitrary

84+ let

85+ result = appendQueryParams @(tag :: Array Int) { tag: values } "/items"

86+ expected = case values of

87+ [] -> "/items"

88+ _ -> "/items?" <> String.joinWith "&" (map (\value -> "tag=" <> show value) values)

89+ pure $ result === expected

90+

91+ it "normalizes absent, Nothing, and Just optional fields" $ quickCheck do

92+ missing <- arbitrary

93+ value <- arbitrary

94+ let

95+ params :: Record (id :: Maybe Int)

96+ params = if missing then unsafeCoerce {} else { id: value }

97+ result = appendQueryParams @(id :: Maybe Int) params "/items"

98+ expected = case missing, value of

99+ true, _ -> "/items"

100+ false, Nothing -> "/items"

101+ false, Just id -> "/items?id=" <> show id

102+ pure $ result === expected

103+

104+ it "never introduces malformed query separators" $ quickCheck do

105+ value <- arbitrary

106+ let

107+ bases =

108+ [ "/items"

109+ , "/items?existing=1"

110+ , "/items?"

111+ , "/items?existing=1&"

112+ , "/items#details"

113+ , "/items?existing=1#details"

114+ , "/items?#details"

115+ , "/items?existing=1&#details"

116+ ]

117+ results = map (appendQueryParams @(id :: Int) { id: value }) bases

118+ pure

119+ $ all isWellFormed results

120+ <?> "malformed URL generated from " <> show results

121+

122+ it "preserves repeated existing query keys" $ quickCheck do

123+ first <- (arbitrary :: Gen Int)

124+ second <- (arbitrary :: Gen Int)

125+ page <- (arbitrary :: Gen Int)

126+ let

127+ base = "/items?id=" <> show first <> "&id=" <> show second <> "#details"

128+ result = appendQueryParams @(page :: Int) { page } base

129+ expected =

130+ "/items?id=" <> show first <> "&id=" <> show second

131+ <> "&page="

132+ <> show page

133+ <> "#details"

134+ pure $ result === expected

135+

136+ it "appends duplicate query values without coalescing existing ones" $ quickCheck do

137+ first <- (arbitrary :: Gen Int)

138+ second <- (arbitrary :: Gen Int)

139+ added <- (arbitrary :: Gen (Array Int))

140+ let

141+ base = "/items?id=" <> show first <> "&id=" <> show second

142+ result = appendQueryParams @(id :: Array Int) { id: added } base

143+ expected = case added of

144+ [] -> base

145+ _ -> base <> "&" <> String.joinWith "&" (map (\value -> "id=" <> show value) added)

146+ pure $ result === expected

147+

148+ it "ignores query-looking text inside fragments" $ quickCheck do

149+ value <- (arbitrary :: Gen Int)

150+ let

151+ rendered = show (value :: Int)

152+ cases =

153+ [ { base: "/items#section?fake=1", expected: "/items?id=" <> rendered <> "#section?fake=1" }

154+ , { base: "/items?real=1#section?fake=1", expected: "/items?real=1&id=" <> rendered <> "#section?fake=1" }

155+ , { base: "/items#?fake=1&other=2", expected: "/items?id=" <> rendered <> "#?fake=1&other=2" }

156+ , { base: "/items#first#second?fake=1", expected: "/items?id=" <> rendered <> "#first#second?fake=1" }

157+ ]

158+ property = all

159+ (\entry -> appendQueryParams @(id :: Int) { id: value } entry.base == entry.expected)

160+ cases

161+ pure $ property <?> "fragment handling failed for id " <> rendered

162+

163+ it "encodes every query delimiter inside values" $ quickCheck do

164+ prefix <- (genAsciiString :: Gen String)

165+ suffix <- (genAsciiString :: Gen String)

166+ let

167+ value = prefix <> "?#&=%+ /" <> suffix

168+ result = appendQueryParams @(value :: String) { value } "/items"

169+ property = case String.stripPrefix (Pattern "/items?value=") result of

170+ Nothing -> false

171+ Just encoded ->

172+ decodeURIComponent encoded == Just value

173+ && all

174+ (\delimiter -> not $ String.contains (Pattern delimiter) encoded)

175+ [ "?", "#", "&", "=", "+", "/" ]

176+ && String.contains (Pattern "%25") encoded

177+ pure $ property <?> "delimiter encoding failed: " <> show result

178+

179+ it "substitutes repeated captures without matching overlapping names" $ quickCheck do

180+ id <- (arbitrary :: Gen Int)

181+ id2 <- (arbitrary :: Gen Int)

182+ let

183+ result = substitutePathParams @(id :: Int, id2 :: Int)

184+ { id, id2 }

185+ "/:id/:id/:id2/:id20?next=/:id#/:id2"

186+ expected =

187+ "/" <> show id <> "/" <> show id <> "/" <> show id2

188+ <> "/:id20?next=/:id#/:id2"

189+ pure $ result === expected

190+

191+ it "normalizes lone UTF-16 surrogates before percent-encoding" do

192+ let

193+ value = codeUnit 0xD800 <> "x" <> codeUnit 0xDFFF

194+ result = appendQueryParams @(value :: String) { value } "/items"

195+ result `shouldEqual` "/items?value=%EF%BF%BDx%EF%BF%BD"

196+

197+ it "percent-encodes arbitrary UTF-16 strings without throwing" $ quickCheck do

198+ value <- (arbitrary :: Gen String)

199+ let

200+ pathResult = substitutePathParams @(value :: String) { value } "/items/:value"

201+ queryResult = appendQueryParams @(value :: String) { value } "/items"

202+ property =

203+ isJust (String.stripPrefix (Pattern "/items/") pathResult)

204+ && isJust (String.stripPrefix (Pattern "/items?value=") queryResult)

205+ pure $ property <?> "encoding failed for UTF-16 input " <> show value

206+

207+ it "round-trips valid non-ASCII scalar values" $ quickCheck do

208+ value <- unicodeScalarString

209+ let

210+ pathResult = substitutePathParams @(value :: String) { value } "/items/:value"

211+ queryResult = appendQueryParams @(value :: String) { value } "/items"

212+ property = case

213+ String.stripPrefix (Pattern "/items/") pathResult,

214+ String.stripPrefix (Pattern "/items?value=") queryResult

215+ of

216+ Just encodedPath, Just encodedQuery ->

217+ decodeURIComponent encodedPath == Just value

218+ && decodeURIComponent encodedQuery == Just value

219+ _, _ -> false

220+ pure $ property <?> "Unicode round-trip failed for " <> show value

221+

222+isWellFormed :: String -> Boolean

223+isWellFormed url =

224+ occurrences "?" url == 1

225+ && occurrences "#" url <= 1

226+ && not (String.contains (Pattern "??") url)

227+ && not (String.contains (Pattern "&&") url)

228+ && not (String.contains (Pattern "?#") url)

229+ && not (String.contains (Pattern "&#") url)

230+ && queryPrecedesFragment url

231+

232+queryPrecedesFragment :: String -> Boolean

233+queryPrecedesFragment url = case String.indexOf (Pattern "#") url of

234+ Nothing -> true

235+ Just fragmentIndex -> case String.indexOf (Pattern "?") url of

236+ Nothing -> false

237+ Just queryIndex -> queryIndex < fragmentIndex

238+

239+occurrences :: String -> String -> Int

240+occurrences needle = (_ - 1) <<< Array.length <<< String.split (Pattern needle)

241+

242+unicodeScalarString :: Gen String

243+unicodeScalarString =

244+ fromCodePointArray <<< NEA.toArray <$> arrayOf1 unicodeScalar

245+

246+unicodeScalar :: Gen CodePoint

247+unicodeScalar = do

248+ useBasicMultilingualPlane <- arbitrary

249+ value <- if useBasicMultilingualPlane then

250+ chooseInt 0x80 0xD7FF

251+ else

252+ chooseInt 0xE000 0x10FFFF

253+ pure $ unsafePartial $ fromJust $ toEnum value

254+

255+codeUnit :: Int -> String

256+codeUnit value = CodeUnits.singleton $ unsafePartial $ fromJust $ toEnum value

test/MakeRequest.Spec.purs+15−5

@@ -3,22 +3,32 @@ module MakeRequest.Spec where

33import Prelude

55import Data.HTTP.Method as HTTP

6+import Data.Maybe (Maybe(..))

67import Data.Tuple.Nested ((/\))

78import JS.Fetch.Headers as Headers

89import Prim.RowList as RL

910import Test.Spec (Spec, describe, it)

1011import Test.Spec.Assertions (shouldEqual, shouldSatisfy)

1112import Type.Proxy (Proxy(..))

12−import Yoga.Fetch.Om (toHeaders)

13−import Yoga.Fetch.Om.MakeRequest (httpMethod)

13+import Yoga.Fetch.Om (FormData, PlainText, QUERY, toHeaders)

14+import Yoga.Fetch.Om.MakeRequest (encodeBody, encodingContentType, httpMethod)

1415import Yoga.HTTP.API.Route (BearerToken(..))

15−import Yoga.HTTP.API.Route.Method as Route

1616

1717spec :: Spec Unit

1818spec = do

1919 describe "MakeRequest" do

20− it "maps a QUERY route method to the QUERY runtime method" do

21− httpMethod (Proxy :: Proxy Route.QUERY) `shouldEqual` HTTP.QUERY

20+ it "maps a QUERY route method imported from the public module" do

21+ httpMethod (Proxy :: Proxy QUERY) `shouldEqual` HTTP.QUERY

22+

23+ describe "BodyEncoding" do

24+ it "sends PlainText request bodies without JSON quoting" do

25+ encodingContentType (Proxy :: Proxy PlainText) `shouldEqual` "text/plain"

26+ encodeBody @PlainText "hello" `shouldEqual` Just "hello"

27+

28+ it "URL-encodes FormData request bodies" do

29+ encodingContentType (Proxy :: Proxy (FormData { username :: String })) `shouldEqual` "application/x-www-form-urlencoded"

30+ encodeBody @(FormData { username :: String }) { username: "Ada Lovelace" }

31+ `shouldEqual` Just "username=Ada+Lovelace"

2232

2333 describe "toHeaders" do

2434 it "empty headers produces no entries" do

test/PlainTextResponse.Spec.purs+49−8

@@ -1,42 +1,54 @@

11module PlainTextResponse.Spec where

33import Prelude

4+import Data.String as String

56import Effect.Aff (Aff, bracket)

67import Effect.Aff.Class (liftAff)

78import Effect.Class (liftEffect)

89import Effect.Ref (Ref)

10+import Effect.Exception as Exn

911import Effect.Ref as Ref

1012import Foreign (unsafeToForeign)

1113import Test.Spec (Spec, around, describe, it)

1214import Test.Spec.Assertions (shouldEqual)

1315import Yoga.Fastify.Fastify as F

1416import Yoga.Fastify.Fastify (Port(..), Host(..), RouteURL(..), StatusCode(..))

15−import Yoga.Fastify.Om (createOmFastify, postOm)

16−import Yoga.Fetch.Om (POST, Route, type (/), JSON, client)

17+import Yoga.Fastify.Om (createOmFastify, getOm, postOm)

18+import Yoga.Fetch.Om (GET, POST, Route, type (/), JSON, PlainText, Streaming, client)

19+import Yoga.Fetch.Om.Simple as Simple

1720import Yoga.Om (Om, runOm)

21+import Yoga.Om.Strom (Strom)

22+import Yoga.Om.Strom as Strom

1823

1924type Payload = { value :: Int }

20−type Result = { doubled :: Int }

25+type Result = { doubled :: Int }

2126

2227type TestAPI =

2328 { double ::

2429 Route POST

2530 ("plain-text-test" / "double")

2631 { body :: JSON Payload }

27− ( ok :: { body :: Result }

28− , badRequest :: { body :: String }

32+ ( ok :: { body :: Result }

33+ , badRequest :: { body :: PlainText }

2934 )

35+ , health :: Route GET ("plain-text-test" / "health") {} (ok :: { body :: PlainText })

36+ , stream :: Route GET ("plain-text-test" / "stream") {} (ok :: { body :: Streaming String })

3037 }

3138

32−api :: { double :: forall ctx err. Payload -> Om (Record ctx) (badRequest :: String | err) Result }

39+api

40+ :: forall ctx err

41+ . { double :: Payload -> Om (Record ctx) (badRequest :: String | err) Result

42+ , health :: Om (Record ctx) err String

43+ , stream :: Om (Record ctx) err (Strom {} () String)

44+ }

3345api = client @TestAPI "http://localhost:44933"

3446

3547spec :: Spec Unit

3648spec = around withServer $ describe "String body on error responses" do

3749 it "200 OK decodes the JSON response body" \_ -> do

3850 result <- runOm {}

39− { exception: \_ -> pure { doubled: -1 }

51+ { exception: \_ -> pure { doubled: -1 }

4052 , badRequest: \_ -> pure { doubled: -1 }

4153 }

4254 (api.double { value: 21 })

@@ -46,13 +58,35 @@ spec = around withServer $ describe "String body on error responses" do

4658 liftEffect $ Ref.write "badRequest" serverMode

4759 captured <- liftEffect $ Ref.new ""

4860 runOm {}

49− { exception: \_ -> pure unit

61+ { exception: \_ -> pure unit

5062 , badRequest: \b -> liftEffect $ Ref.write b captured

5163 }

5264 (void $ api.double { value: 0 })

5365 body <- liftEffect $ Ref.read captured

5466 liftAff $ body `shouldEqual` "invalid value"

5567

68+ it "Simple.get returns plain text for String responses" \_ -> do

69+ result <- runOm {}

70+ { exception: \e -> pure $ "exception: " <> Exn.message e

71+ , fetchError: \e -> pure $ "fetch error: " <> e.body

72+ }

73+ (Simple.get @String "http://localhost:44933/plain-text-test/health" {})

74+ liftAff $ result `shouldEqual` "healthy"

75+

76+ it "derived PlainText responses decode to String" \_ -> do

77+ result <- runOm {}

78+ { exception: \e -> pure $ "exception: " <> Exn.message e }

79+ api.health

80+ liftAff $ result `shouldEqual` "healthy"

81+

82+ it "derived Streaming responses decode to a usable Strom" \_ -> do

83+ chunks <- runOm {}

84+ { exception: \e -> pure [ "exception: " <> Exn.message e ] }

85+ do

86+ stream <- api.stream

87+ Strom.runCollect stream

88+ liftAff $ String.joinWith "" chunks `shouldEqual` "stream €"

89+

5690withServer :: forall a. (Ref String -> Aff a) -> Aff a

5791withServer test = bracket acquire release (\{ serverMode } -> test serverMode)

5892 where

@@ -62,12 +96,19 @@ withServer test = bracket acquire release (\{ serverMode } -> test serverMode)

6296 f <- F.fastify {}

6397 omApp <- createOmFastify {} f

6498 postOm (RouteURL "/plain-text-test/double") (handler serverMode) omApp

99+ getOm (RouteURL "/plain-text-test/health") (plainTextHandler "healthy") omApp

100+ getOm (RouteURL "/plain-text-test/stream") (plainTextHandler "stream €") omApp

65101 pure f

66102 void $ F.listen { port: Port 44933, host: Host "0.0.0.0" } fastify

67103 pure { fastify, serverMode }

68104

69105 release { fastify } = F.close fastify

70106

107+ plainTextHandler text reply = do

108+ void $ F.status (StatusCode 200) reply # liftEffect

109+ void $ F.header "content-type" "text/plain" reply # liftEffect

110+ F.send (unsafeToForeign text) reply # liftAff

111+

71112 handler serverMode reply = do

72113 mode <- liftEffect $ Ref.read serverMode

73114 case mode of

test/Roundtrip.Spec.purs+68−44

@@ -26,7 +26,6 @@ type ErrorMsg = { error :: String }

2626

2727-- Route definitions shared by server and client

2828

29−

3029type GetUserRoute = Route GET

3130 ("users" / "id" : Int)

3231 {}

@@ -72,6 +71,11 @@ type SearchRoute = Route GET

7271 {}

7372 (ok :: { body :: { active :: Boolean, minScore :: Number } })

7473

74+type FindByQueryRoute = Route GET

75+ ("find-by-query" :? { id :: Int })

76+ {}

77+ (ok :: { body :: { id :: Int } })

78+

7579type InjectedTenantRoute = Route GET

7680 ("tenant-users" / "id" : Int :? { tenant :: Required String })

7781 { headers :: { authorization :: BearerToken, requestid :: String } }

@@ -94,6 +98,7 @@ injectedApi tokenRef =

9498 , query: { tenant: ctx.tenant }

9599 }

96100 }

101+

97102type API =

98103 { getUser :: GetUserRoute

99104 , listUsers :: ListUsersRoute

@@ -102,59 +107,60 @@ type API =

102107 , deleteUser :: DeleteUserRoute

103108 , me :: AuthRoute

104109 , search :: SearchRoute

110+ , findByQuery :: FindByQueryRoute

105111 }

106112

107113api = client @API "http://localhost:44932"

108114

109115-- Handlers

110116

111−

112117getUserHandler :: Handler GetUserRoute ()

113118getUserHandler = handle do

114119 { path } <- ask

115− if path.id == 42

116− then respond @"ok" { id: 42, name: "Alice", email: "alice@test.com" }

117− else reject @"notFound" { error: "User " <> show path.id <> " not found" }

120+ if path.id == 42 then respond @"ok" { id: 42, name: "Alice", email: "alice@test.com" }

121+ else reject @"notFound" { error: "User " <> show path.id <> " not found" }

118122

119123listUsersHandler :: Handler ListUsersRoute ()

120124listUsersHandler = handle do

121125 { query } <- ask

122− let users = [ { id: 1, name: "Alice", email: "a@t.com" }

123− , { id: 2, name: "Bob", email: "b@t.com" }

124− , { id: 3, name: "Charlie", email: "c@t.com" }

125− ]

126− let limited = case query.limit of

127− Just l -> take l users

128− Nothing -> users

126+ let

127+ users =

128+ [ { id: 1, name: "Alice", email: "a@t.com" }

129+ , { id: 2, name: "Bob", email: "b@t.com" }

130+ , { id: 3, name: "Charlie", email: "c@t.com" }

131+ ]

132+ let

133+ limited = case query.limit of

134+ Just l -> take l users

135+ Nothing -> users

129136 respond @"ok" limited

130137 where

131− take n xs = if n <= 0 then [] else case xs of

132− [] -> []

133− [a] -> [a]

134− [a, _] | n == 1 -> [a]

135− [a, b] -> [a, b]

136− _ -> xs

138+ take n xs =

139+ if n <= 0 then []

140+ else case xs of

141+ [] -> []

142+ [ a ] -> [ a ]

143+ [ a, _ ] | n == 1 -> [ a ]

144+ [ a, b ] -> [ a, b ]

145+ _ -> xs

137146

138147createUserHandler :: Handler CreateUserRoute ()

139148createUserHandler = handle do

140149 { body } <- ask

141− if body.name == ""

142− then reject @"badRequest" { error: "Name required" }

143− else respond @"created" { id: 99, name: body.name, email: body.email }

150+ if body.name == "" then reject @"badRequest" { error: "Name required" }

151+ else respond @"created" { id: 99, name: body.name, email: body.email }

144152

145153updateUserHandler :: Handler UpdateUserRoute ()

146154updateUserHandler = handle do

147155 { path, body } <- ask

148− if path.id /= 42

149− then reject @"notFound" { error: "Not found" }

150− else respond @"ok" { id: path.id, name: body.name, email: body.email }

156+ if path.id /= 42 then reject @"notFound" { error: "Not found" }

157+ else respond @"ok" { id: path.id, name: body.name, email: body.email }

151158

152159deleteUserHandler :: Handler DeleteUserRoute ()

153160deleteUserHandler = handle do

154161 { path } <- ask

155− if path.id /= 42

156− then reject @"notFound" { error: "Not found" }

157− else respond @"ok" {}

162+ if path.id /= 42 then reject @"notFound" { error: "Not found" }

163+ else respond @"ok" {}

158164

159165meHandler :: Handler AuthRoute ()

160166meHandler = handle do

@@ -166,14 +172,25 @@ meHandler = handle do

166172searchHandler :: Handler SearchRoute ()

167173searchHandler = handle do

168174 { query } <- ask

169− let active = case query.active of

170− Just a -> a

171− Nothing -> false

172− let minScore = case query.minScore of

173− Just s -> s

174− Nothing -> 0.0

175+ let

176+ active = case query.active of

177+ Just a -> a

178+ Nothing -> false

179+ let

180+ minScore = case query.minScore of

181+ Just s -> s

182+ Nothing -> 0.0

175183 respond @"ok" { active, minScore }

176184

185+findByQueryHandler :: Handler FindByQueryRoute ()

186+findByQueryHandler = handle do

187+ { query } <- ask

188+ let

189+ id = case query.id of

190+ Just value -> value

191+ Nothing -> -1

192+ respond @"ok" { id }

193+

177194tenantUserHandler :: Handler InjectedTenantRoute ()

178195tenantUserHandler = handle do

179196 { path, query, headers } <- ask

@@ -186,7 +203,6 @@ tenantUserHandler = handle do

186203spec :: Spec Unit

187204spec = around withServer $ describe "server ↔ client roundtrip" do

188205

189−

190206 describe "GET with path params" do

191207 it "returns user for valid id" \_ ->

192208 runOm {} { exception: \_ -> pure unit } do

@@ -204,12 +220,17 @@ spec = around withServer $ describe "server ↔ client roundtrip" do

204220 it "passes query params correctly" \_ ->

205221 runOm {} { exception: \_ -> pure unit } do

206222 users <- api.listUsers (justifill { limit: 1 })

207− liftAff $ (map _.name users) `shouldEqual` ["Alice"]

223+ liftAff $ (map _.name users) `shouldEqual` [ "Alice" ]

224+

225+ it "serializes a single explicit Maybe query through the derived client" \_ ->

226+ runOm {} { exception: \_ -> pure unit } do

227+ result <- api.findByQuery { id: Just 42 }

228+ liftAff $ result.id `shouldEqual` 42

208229

209230 it "handles no query params" \_ ->

210231 runOm {} { exception: \_ -> pure unit } do

211232 users <- api.listUsers (justifill {})

212− liftAff $ (map _.name users) `shouldEqual` ["Alice", "Bob", "Charlie"]

233+ liftAff $ (map _.name users) `shouldEqual` [ "Alice", "Bob", "Charlie" ]

213234

214235 describe "POST with JSON body" do

215236 it "sends and receives JSON body" \_ ->

@@ -230,10 +251,11 @@ spec = around withServer $ describe "server ↔ client roundtrip" do

230251 describe "PUT with path params and JSON body" do

231252 it "sends path params and body together" \_ ->

232253 runOm {} { exception: \_ -> pure unit } do

233− user <- api.updateUser

234− { id: 42 }

235− { name: "Updated", email: "u@t.com" }

236− # handleErrors { notFound: \e -> pure { id: 0, name: e.error, email: "" } }

254+ user <-

255+ api.updateUser

256+ { id: 42 }

257+ { name: "Updated", email: "u@t.com" }

258+ # handleErrors { notFound: \e -> pure { id: 0, name: e.error, email: "" } }

237259 liftAff do

238260 user.id `shouldEqual` 42

239261 user.name `shouldEqual` "Updated"

@@ -292,17 +314,17 @@ spec = around withServer $ describe "server ↔ client roundtrip" do

292314 it "accepts a selected optional query parameter" \_ ->

293315 runOm {} { exception: \_ -> pure unit } do

294316 users <- api.listUsers (justifill { limit: 1 })

295− liftAff $ (map _.name users) `shouldEqual` ["Alice"]

317+ liftAff $ (map _.name users) `shouldEqual` [ "Alice" ]

296318

297319 it "accepts all optional query parameters" \_ ->

298320 runOm {} { exception: \_ -> pure unit } do

299321 users <- api.listUsers (justifill { limit: 2, offset: 0 })

300− liftAff $ (map _.name users) `shouldEqual` ["Alice", "Bob"]

322+ liftAff $ (map _.name users) `shouldEqual` [ "Alice", "Bob" ]

301323

302324 it "fills omitted optional query parameters with Nothing" \_ ->

303325 runOm {} { exception: \_ -> pure unit } do

304326 users <- api.listUsers (justifill {})

305− liftAff $ (map _.name users) `shouldEqual` ["Alice", "Bob", "Charlie"]

327+ liftAff $ (map _.name users) `shouldEqual` [ "Alice", "Bob", "Charlie" ]

306328

307329 it "passes selected Boolean query param" \_ ->

308330 runOm {} { exception: \_ -> pure unit } do

@@ -347,7 +369,9 @@ withServer test = bracket acquire release (\_ -> test unit)

347369 , deleteUser: deleteUserHandler

348370 , me: meHandler

349371 , search: searchHandler

350− } f

372+ , findByQuery: findByQueryHandler

373+ }

374+ f

351375 registerAPI @InjectedAPI { getTenantUser: tenantUserHandler } f

352376 pure f

353377 void $ F.listen { port: Port 44932, host: Host "0.0.0.0" } fastify

test/StreamDecode.Spec.jsnew file+1

@@ -0,0 +1 @@

1+export const uint8Array = (values) => new Uint8Array(values);

test/StreamDecode.Spec.pursnew file+32

@@ -0,0 +1,32 @@

1+module StreamDecode.Spec where

3+import Prelude

5+import Data.ArrayBuffer.Types (Uint8Array)

6+import Data.String as String

7+import Effect.Aff (Aff)

8+import Effect.Class (liftEffect)

9+import Effect.Exception (throwException)

10+import Test.Spec (Spec, describe, it)

11+import Test.Spec.Assertions (shouldEqual)

12+import Yoga.Fetch.Om.StreamDecode (decodeStream)

13+import Yoga.Om (Om)

14+import Yoga.Om as Om

15+import Yoga.Om.Strom as Strom

16+

17+foreign import uint8Array :: Array Int -> Uint8Array

18+

19+runOm :: forall a. Om {} () a -> Aff a

20+runOm om = Om.runOm {} { exception: \err -> liftEffect (throwException err) } om

21+

22+spec :: Spec Unit

23+spec = describe "StreamDecode" do

24+ it "preserves UTF-8 code points split across chunks" do

25+ chunks <- runOm $

26+ Strom.fromArray

27+ [ uint8Array [ 0xe2 ]

28+ , uint8Array [ 0x82, 0xac ]

29+ ]

30+ # decodeStream @String

31+ # Strom.runCollect

32+ String.joinWith "" chunks `shouldEqual` "€"