acrylblends 0.6.2 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -1
- package/docs/framework/README.md +3 -2
- package/docs/framework/UPSTREAM.md +1 -1
- package/docs/framework/cordis/acryl-in-a-cordis-app.md +6 -0
- package/docs/framework/getting-started/basic.md +1 -0
- package/docs/framework/getting-started/desktop.md +41 -0
- package/docs/framework/guides/jsx-dom.md +0 -3
- package/docs/framework/guides/jsx.md +24 -3
- package/docs/framework/helpers/css.md +0 -3
- package/docs/framework/helpers/ssg.md +3 -6
- package/docs/framework/middleware/builtin/jsx-renderer.md +0 -3
- package/docs/framework/upstream.json +3 -3
- package/lib/accepts.d.ts +1 -1
- package/lib/acryl-base.d.ts +1 -1
- package/lib/adapter.d.ts +1 -1
- package/lib/{app-BdrVHBlJ.d.ts → app-D8riatvv.d.ts} +1 -1
- package/lib/base-BpQy2Rk7.d.ts +783 -0
- package/lib/base-ddiVmiE7.js +721 -0
- package/lib/basic-auth.d.ts +1 -1
- package/lib/bearer-auth.d.ts +1 -1
- package/lib/body-limit.d.ts +1 -1
- package/lib/cache.d.ts +1 -1
- package/lib/cache.js +4 -4
- package/lib/{client-BHTr318g.js → client-DDLXwhBo.js} +2 -125
- package/lib/client.d.ts +2 -2
- package/lib/client.js +2 -1
- package/lib/combine.d.ts +1 -1
- package/lib/common-D8Z4JRCw.d.ts +46 -0
- package/lib/components-0o0CBYNv.js +268 -0
- package/lib/components-DdI7-ns7.js +24 -0
- package/lib/compress.d.ts +1 -1
- package/lib/conninfo.d.ts +2 -2
- package/lib/constants-BR9jM9BC.js +9 -0
- package/lib/{context-B5Y1lLha.d.ts → context-DS3fYyG-.d.ts} +2 -2
- package/lib/context-DxFdY_un.d.ts +250 -0
- package/lib/context-storage.d.ts +1 -1
- package/lib/{cookie-D9_nQbsM.d.ts → cookie-CCelEqky.d.ts} +1 -1
- package/lib/cookie.d.ts +3 -3
- package/lib/cors.d.ts +1 -1
- package/lib/csrf.d.ts +1 -1
- package/lib/css-D2jb7X8b.js +320 -0
- package/lib/css.d.ts +82 -0
- package/lib/css.js +134 -0
- package/lib/dev.d.ts +2 -2
- package/lib/etag.d.ts +1 -1
- package/lib/factory.d.ts +2 -2
- package/lib/hooks-BMw6BAyP.js +762 -0
- package/lib/html-SllAe0YT.d.ts +46 -0
- package/lib/html.d.ts +1 -1
- package/lib/{index-m12zcmph.d.ts → index-Bb7YJKCq.d.ts} +3 -3
- package/lib/{index-Kqou8Fjh.d.ts → index-BvFh1Gfx.d.ts} +2 -2
- package/lib/index-C850MeBA.d.ts +94 -0
- package/lib/{index-DtEoak1i.d.ts → index-CTy4N7ng.d.ts} +2 -2
- package/lib/index.d.ts +4 -4
- package/lib/ip-restriction.d.ts +2 -2
- package/lib/jsx/dom/client.d.ts +30 -0
- package/lib/jsx/dom/client.js +49 -0
- package/lib/jsx/dom/css.d.ts +84 -0
- package/lib/jsx/dom/css.js +2 -0
- package/lib/jsx/dom/jsx-dev-runtime.d.ts +3 -0
- package/lib/jsx/dom/jsx-dev-runtime.js +2 -0
- package/lib/jsx/dom/jsx-runtime.d.ts +3 -0
- package/lib/jsx/dom/jsx-runtime.js +2 -0
- package/lib/jsx/dom/server.d.ts +105 -0
- package/lib/jsx/dom/server.js +37 -0
- package/lib/jsx/dom.d.ts +5 -0
- package/lib/jsx/dom.js +74 -0
- package/lib/jsx/jsx-dev-runtime.d.ts +6 -0
- package/lib/jsx/jsx-dev-runtime.js +14 -0
- package/lib/jsx/jsx-runtime.d.ts +10 -0
- package/lib/jsx/jsx-runtime.js +30 -0
- package/lib/jsx/streaming.d.ts +2 -0
- package/lib/jsx/streaming.js +2 -0
- package/lib/jsx-dev-runtime-B22O-Npk.d.ts +7 -0
- package/lib/jsx-dev-runtime-D18Y35TI.js +354 -0
- package/lib/jsx-renderer.d.ts +75 -0
- package/lib/jsx-renderer.js +99 -0
- package/lib/jsx-runtime-BVVgDSdq.d.ts +1 -0
- package/lib/jsx.d.ts +3 -0
- package/lib/jsx.js +47 -0
- package/lib/jwk.d.ts +4 -4
- package/lib/{jwt-BA65QhnJ.d.ts → jwt-BARhotDz.d.ts} +1 -1
- package/lib/jwt.d.ts +4 -4
- package/lib/language.d.ts +1 -1
- package/lib/logger.d.ts +1 -1
- package/lib/loopback-only.d.ts +1 -1
- package/lib/method-not-allowed.d.ts +2 -2
- package/lib/method-override.d.ts +2 -2
- package/lib/mount.d.ts +1 -1
- package/lib/node-server/conninfo.d.ts +1 -1
- package/lib/node-server/serve-static.d.ts +1 -1
- package/lib/node-server/serve-static.js +1 -1
- package/lib/node-server.d.ts +1 -1
- package/lib/node-server.js +1 -1
- package/lib/powered-by.d.ts +1 -1
- package/lib/pretty-json.d.ts +1 -1
- package/lib/proxy.d.ts +1 -1
- package/lib/quick.d.ts +1 -1
- package/lib/request-id.d.ts +1 -1
- package/lib/request.d.ts +1 -1
- package/lib/route.d.ts +1 -1
- package/lib/schema-validator.d.ts +1 -1
- package/lib/secure-headers.d.ts +1 -1
- package/lib/{serve-static-Dw_m6KxR.js → serve-static-B14MF1Va.js} +2 -0
- package/lib/serve-static.d.ts +1 -1
- package/lib/ssg-BwjcA-Ge.js +389 -0
- package/lib/ssg.d.ts +156 -0
- package/lib/ssg.js +2 -0
- package/lib/streaming.d.ts +1 -1
- package/lib/testing.d.ts +4 -4
- package/lib/testing.js +1 -1
- package/lib/timeout.d.ts +1 -1
- package/lib/timing.d.ts +1 -1
- package/lib/tiny.d.ts +1 -1
- package/lib/trailing-slash.d.ts +1 -1
- package/lib/{types-ZM9gIiKh.d.ts → types-Dv_nV2cv.d.ts} +1 -1
- package/lib/{types-D9DEXMjE.d.ts → types-Lqx5BxQF.d.ts} +8 -1
- package/lib/{types-Bd29gh2o.d.ts → types-zNxyEpG2.d.ts} +3 -3
- package/lib/types.d.ts +1 -1
- package/lib/utils/body.d.ts +1 -1
- package/lib/utils/cookie.d.ts +1 -1
- package/lib/utils/crypto.d.ts +1 -1
- package/lib/utils/html.d.ts +1 -45
- package/lib/utils/ipaddr.d.ts +1 -1
- package/lib/utils/jwt.d.ts +1 -1
- package/lib/utils/types.d.ts +2 -2
- package/lib/utils-Cx61GFMC.js +125 -0
- package/lib/validator.d.ts +2 -2
- package/lib/ws.d.ts +1 -1
- package/package.json +53 -1
- package/plugins/acryl-inspect/upstream.json +1 -1
- package/plugins/acryl-node-server/upstream.json +1 -1
- package/plugins/acryl-router/src/core/helper/css/common.ts +337 -0
- package/plugins/acryl-router/src/core/helper/css/index.ts +262 -0
- package/plugins/acryl-router/src/core/helper/ssg/index.ts +14 -0
- package/plugins/acryl-router/src/core/helper/ssg/middleware.ts +83 -0
- package/plugins/acryl-router/src/core/helper/ssg/plugins.ts +72 -0
- package/plugins/acryl-router/src/core/helper/ssg/ssg.ts +471 -0
- package/plugins/acryl-router/src/core/helper/ssg/utils.ts +118 -0
- package/plugins/acryl-router/src/core/jsx/base.ts +490 -0
- package/plugins/acryl-router/src/core/jsx/children.ts +20 -0
- package/plugins/acryl-router/src/core/jsx/components.ts +257 -0
- package/plugins/acryl-router/src/core/jsx/constants.ts +6 -0
- package/plugins/acryl-router/src/core/jsx/context.ts +266 -0
- package/plugins/acryl-router/src/core/jsx/dom/client.ts +89 -0
- package/plugins/acryl-router/src/core/jsx/dom/components.ts +39 -0
- package/plugins/acryl-router/src/core/jsx/dom/context.ts +52 -0
- package/plugins/acryl-router/src/core/jsx/dom/css.ts +263 -0
- package/plugins/acryl-router/src/core/jsx/dom/hooks/index.ts +91 -0
- package/plugins/acryl-router/src/core/jsx/dom/index.ts +170 -0
- package/plugins/acryl-router/src/core/jsx/dom/intrinsic-element/components.ts +438 -0
- package/plugins/acryl-router/src/core/jsx/dom/jsx-dev-runtime.ts +23 -0
- package/plugins/acryl-router/src/core/jsx/dom/jsx-runtime.ts +8 -0
- package/plugins/acryl-router/src/core/jsx/dom/render.ts +879 -0
- package/plugins/acryl-router/src/core/jsx/dom/server.ts +76 -0
- package/plugins/acryl-router/src/core/jsx/dom/utils.ts +7 -0
- package/plugins/acryl-router/src/core/jsx/hooks/index.ts +437 -0
- package/plugins/acryl-router/src/core/jsx/index.ts +115 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-element/common.ts +23 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-element/components.ts +210 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-elements.ts +938 -0
- package/plugins/acryl-router/src/core/jsx/jsx-dev-runtime.ts +26 -0
- package/plugins/acryl-router/src/core/jsx/jsx-runtime.ts +51 -0
- package/plugins/acryl-router/src/core/jsx/streaming.ts +231 -0
- package/plugins/acryl-router/src/core/jsx/types.ts +41 -0
- package/plugins/acryl-router/src/core/jsx/utils.ts +202 -0
- package/plugins/acryl-router/src/core/middleware/cache/index.ts +4 -4
- package/plugins/acryl-router/src/core/middleware/jsx-renderer/index.ts +162 -0
- package/plugins/acryl-router/src/core/utils/types.ts +6 -0
- package/plugins/acryl-router/src/helpers/index.ts +2 -0
- package/plugins/acryl-router/src/middleware/index.ts +1 -0
- package/plugins/acryl-router/upstream.json +3 -3
- package/plugins/acryl-router-http/upstream.json +1 -1
- package/plugins/acryl-state/upstream.json +1 -1
- package/plugins/desktop/upstream.json +1 -1
- package/plugins/desktop-web/upstream.json +1 -1
- package/plugins/extensions/resolve.ts +4 -0
- package/plugins/save/plugin.json +1 -1
- package/shared/AGENTS.core.md +4 -0
- package/templates/agent/tsconfig.json +7 -1
- package/templates/todo/upstream.json +1 -1
- package/plugins/acryl-inspect/tests/report.spec.ts +0 -69
- package/plugins/acryl-inspect/tests/service.spec.ts +0 -121
- package/plugins/acryl-node-server/tests/adapter/app.ts +0 -76
- package/plugins/acryl-node-server/tests/adapter/assets/.static/plain.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/favicon.ico +0 -0
- package/plugins/acryl-node-server/tests/adapter/assets/secret.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/acryl.html +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/admin/secret.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/data.json +0 -5
- package/plugins/acryl-node-server/tests/adapter/assets/static/extensionless +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/foo..bar.txt +0 -0
- package/plugins/acryl-node-server/tests/adapter/assets/static/index.html +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/plain.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-context-path/plain.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.bin +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.bin.br +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.txt.br +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.txt.zst +0 -1
- package/plugins/acryl-node-server/tests/adapter/conninfo.test.ts +0 -34
- package/plugins/acryl-node-server/tests/adapter/content-length.test.ts +0 -248
- package/plugins/acryl-node-server/tests/adapter/early-hints.test.ts +0 -457
- package/plugins/acryl-node-server/tests/adapter/fixtures/keys/agent1-cert.pem +0 -23
- package/plugins/acryl-node-server/tests/adapter/fixtures/keys/agent1-key.pem +0 -27
- package/plugins/acryl-node-server/tests/adapter/headers.test.ts +0 -252
- package/plugins/acryl-node-server/tests/adapter/helpers/request.ts +0 -190
- package/plugins/acryl-node-server/tests/adapter/listener.test.ts +0 -727
- package/plugins/acryl-node-server/tests/adapter/request-client-disconnect.test.ts +0 -189
- package/plugins/acryl-node-server/tests/adapter/request.test.ts +0 -1230
- package/plugins/acryl-node-server/tests/adapter/response.test.ts +0 -285
- package/plugins/acryl-node-server/tests/adapter/serve-static.test.ts +0 -849
- package/plugins/acryl-node-server/tests/adapter/server-socket.test.ts +0 -790
- package/plugins/acryl-node-server/tests/adapter/server.test.ts +0 -1312
- package/plugins/acryl-node-server/tests/adapter/setup.ts +0 -16
- package/plugins/acryl-node-server/tests/adapter/url.test.ts +0 -76
- package/plugins/acryl-node-server/tests/adapter/utils/response.test.ts +0 -23
- package/plugins/acryl-node-server/tests/adapter/utils/stream.test.ts +0 -75
- package/plugins/acryl-node-server/tests/adapter/utils.test.ts +0 -235
- package/plugins/acryl-node-server/tests/adapter/websocket.test.ts +0 -260
- package/plugins/acryl-node-server/tests/server.spec.ts +0 -141
- package/plugins/acryl-router/src/core/app.test.ts +0 -3833
- package/plugins/acryl-router/src/core/client/client.test.ts +0 -2313
- package/plugins/acryl-router/src/core/client/types.test.ts +0 -149
- package/plugins/acryl-router/src/core/client/utils.test.ts +0 -405
- package/plugins/acryl-router/src/core/compose.test.ts +0 -751
- package/plugins/acryl-router/src/core/context.test.ts +0 -629
- package/plugins/acryl-router/src/core/helper/accepts/accepts.test.ts +0 -344
- package/plugins/acryl-router/src/core/helper/adapter/index.test.ts +0 -55
- package/plugins/acryl-router/src/core/helper/cookie/index.test.ts +0 -510
- package/plugins/acryl-router/src/core/helper/dev/index.test.ts +0 -181
- package/plugins/acryl-router/src/core/helper/factory/index.test.ts +0 -434
- package/plugins/acryl-router/src/core/helper/html/index.test.ts +0 -78
- package/plugins/acryl-router/src/core/helper/proxy/index.test.ts +0 -356
- package/plugins/acryl-router/src/core/helper/route/index.test.ts +0 -259
- package/plugins/acryl-router/src/core/helper/streaming/stream.test.ts +0 -128
- package/plugins/acryl-router/src/core/helper/streaming/text.test.ts +0 -34
- package/plugins/acryl-router/src/core/helper/testing/index.test.ts +0 -42
- package/plugins/acryl-router/src/core/helper/websocket/index.test.ts +0 -124
- package/plugins/acryl-router/src/core/http-exception.test.ts +0 -45
- package/plugins/acryl-router/src/core/middleware/basic-auth/index.test.ts +0 -434
- package/plugins/acryl-router/src/core/middleware/bearer-auth/index.test.ts +0 -1018
- package/plugins/acryl-router/src/core/middleware/body-limit/index.test.ts +0 -273
- package/plugins/acryl-router/src/core/middleware/cache/index.test.ts +0 -1211
- package/plugins/acryl-router/src/core/middleware/combine/index.test.ts +0 -355
- package/plugins/acryl-router/src/core/middleware/compress/index.test.ts +0 -535
- package/plugins/acryl-router/src/core/middleware/context-storage/index.test.ts +0 -43
- package/plugins/acryl-router/src/core/middleware/cors/index.test.ts +0 -532
- package/plugins/acryl-router/src/core/middleware/csrf/index.test.ts +0 -534
- package/plugins/acryl-router/src/core/middleware/etag/digest.test.ts +0 -21
- package/plugins/acryl-router/src/core/middleware/etag/index.test.ts +0 -503
- package/plugins/acryl-router/src/core/middleware/ip-restriction/index.test.ts +0 -217
- package/plugins/acryl-router/src/core/middleware/jwk/index.test.ts +0 -1135
- package/plugins/acryl-router/src/core/middleware/jwk/keys.test.json +0 -48
- package/plugins/acryl-router/src/core/middleware/jwt/index.test.ts +0 -802
- package/plugins/acryl-router/src/core/middleware/language/index.test.ts +0 -552
- package/plugins/acryl-router/src/core/middleware/logger/index.test.ts +0 -204
- package/plugins/acryl-router/src/core/middleware/method-not-allowed/index.test.ts +0 -292
- package/plugins/acryl-router/src/core/middleware/method-override/index.test.ts +0 -221
- package/plugins/acryl-router/src/core/middleware/mount/index.test.ts +0 -334
- package/plugins/acryl-router/src/core/middleware/powered-by/index.test.ts +0 -37
- package/plugins/acryl-router/src/core/middleware/pretty-json/index.test.ts +0 -218
- package/plugins/acryl-router/src/core/middleware/request-id/index.test.ts +0 -168
- package/plugins/acryl-router/src/core/middleware/secure-headers/index.test.ts +0 -671
- package/plugins/acryl-router/src/core/middleware/serve-static/index.test.ts +0 -450
- package/plugins/acryl-router/src/core/middleware/serve-static/path.test.ts +0 -50
- package/plugins/acryl-router/src/core/middleware/timeout/index.test.ts +0 -70
- package/plugins/acryl-router/src/core/middleware/timing/index.test.ts +0 -310
- package/plugins/acryl-router/src/core/middleware/trailing-slash/index.test.ts +0 -381
- package/plugins/acryl-router/src/core/preset/quick.test.ts +0 -42
- package/plugins/acryl-router/src/core/preset/tiny.test.ts +0 -42
- package/plugins/acryl-router/src/core/request.test.ts +0 -751
- package/plugins/acryl-router/src/core/router/common.case.test.ts +0 -1132
- package/plugins/acryl-router/src/core/router/linear-router/router.test.ts +0 -80
- package/plugins/acryl-router/src/core/router/pattern-router/router.test.ts +0 -46
- package/plugins/acryl-router/src/core/router/reg-exp-router/prepared-router.test.ts +0 -154
- package/plugins/acryl-router/src/core/router/reg-exp-router/router.test.ts +0 -265
- package/plugins/acryl-router/src/core/router/smart-router/router.test.ts +0 -13
- package/plugins/acryl-router/src/core/router/trie-router/node.test.ts +0 -896
- package/plugins/acryl-router/src/core/router/trie-router/router.test.ts +0 -8
- package/plugins/acryl-router/src/core/types.test.ts +0 -4134
- package/plugins/acryl-router/src/core/utils/accept.test.ts +0 -299
- package/plugins/acryl-router/src/core/utils/basic-auth.test.ts +0 -56
- package/plugins/acryl-router/src/core/utils/body.test.ts +0 -496
- package/plugins/acryl-router/src/core/utils/buffer.test.ts +0 -147
- package/plugins/acryl-router/src/core/utils/color.test.ts +0 -23
- package/plugins/acryl-router/src/core/utils/concurrent.test.ts +0 -69
- package/plugins/acryl-router/src/core/utils/cookie.test.ts +0 -460
- package/plugins/acryl-router/src/core/utils/crypto.test.ts +0 -43
- package/plugins/acryl-router/src/core/utils/encode.test.ts +0 -61
- package/plugins/acryl-router/src/core/utils/filepath.test.ts +0 -78
- package/plugins/acryl-router/src/core/utils/html.test.ts +0 -16
- package/plugins/acryl-router/src/core/utils/ipaddr.test.ts +0 -149
- package/plugins/acryl-router/src/core/utils/jwt/jwa.test.ts +0 -86
- package/plugins/acryl-router/src/core/utils/jwt/jwt.test.ts +0 -1788
- package/plugins/acryl-router/src/core/utils/mime.test.ts +0 -64
- package/plugins/acryl-router/src/core/utils/stream.test.ts +0 -212
- package/plugins/acryl-router/src/core/utils/types.test.ts +0 -295
- package/plugins/acryl-router/src/core/utils/url.test.ts +0 -384
- package/plugins/acryl-router/src/core/validator/utils.test.ts +0 -82
- package/plugins/acryl-router/src/core/validator/validator.test.ts +0 -1488
- package/plugins/acryl-router/tests/docs-examples.spec.ts +0 -152
- package/plugins/acryl-router/tests/live-install.spec.ts +0 -64
- package/plugins/acryl-router/tests/loader.spec.ts +0 -72
- package/plugins/acryl-router/tests/loopback-only.spec.ts +0 -80
- package/plugins/acryl-router/tests/no-dom/consumer.ts +0 -11
- package/plugins/acryl-router/tests/no-dom/tsconfig.json +0 -13
- package/plugins/acryl-router/tests/service.spec.ts +0 -426
- package/plugins/acryl-router/tests/shadow-state.spec.ts +0 -79
- package/plugins/acryl-router-http/tests/adapter.spec.ts +0 -174
- package/plugins/acryl-router-http/tests/stream.spec.ts +0 -133
- package/plugins/acryl-router-http/tests/surfaces.spec.ts +0 -101
- package/plugins/acryl-state/src/react.ts +0 -11
- package/plugins/acryl-state/tests/cell.spec.ts +0 -71
- package/plugins/acryl-state/tests/react.spec.ts +0 -39
- package/plugins/acryl-state/tests/service.spec.ts +0 -132
|
@@ -1,434 +0,0 @@
|
|
|
1
|
-
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
2
|
-
import { expectTypeOf } from 'vitest'
|
|
3
|
-
import { hc } from '../../client/index.ts'
|
|
4
|
-
import type { ClientRequest } from '../../client/types.ts'
|
|
5
|
-
import { Acryl } from '../../index.ts'
|
|
6
|
-
import type { Env, ExtractSchema, H, MiddlewareHandler, ToSchema, TypedResponse } from '../../types.ts'
|
|
7
|
-
import type { ContentfulStatusCode } from '../../utils/http-status.ts'
|
|
8
|
-
import type { Equal, Expect } from '../../utils/types.ts'
|
|
9
|
-
import { validator } from '../../validator/index.ts'
|
|
10
|
-
import { createFactory, createMiddleware } from './index.ts'
|
|
11
|
-
|
|
12
|
-
describe('createMiddleware', () => {
|
|
13
|
-
type Env = { Variables: { foo: string } }
|
|
14
|
-
const app = new Acryl()
|
|
15
|
-
|
|
16
|
-
const mw = (message: string) =>
|
|
17
|
-
createMiddleware<Env>(async (c, next) => {
|
|
18
|
-
expectTypeOf(c.var.foo).toEqualTypeOf<string>()
|
|
19
|
-
c.set('foo', 'bar')
|
|
20
|
-
await next()
|
|
21
|
-
c.header('X-Message', message)
|
|
22
|
-
})
|
|
23
|
-
|
|
24
|
-
const route = app.get('/message', mw('Hello Middleware'), (c) => {
|
|
25
|
-
return c.text(`Hey, ${c.var.foo}`)
|
|
26
|
-
})
|
|
27
|
-
|
|
28
|
-
it('Should return the correct header and the content', async () => {
|
|
29
|
-
const res = await app.request('/message')
|
|
30
|
-
expect(res.status).toBe(200)
|
|
31
|
-
expect(res.headers.get('x-message')).toBe('Hello Middleware')
|
|
32
|
-
expect(await res.text()).toBe('Hey, bar')
|
|
33
|
-
})
|
|
34
|
-
|
|
35
|
-
it('Should provide the correct types', async () => {
|
|
36
|
-
const client = hc<typeof route>('http://localhost')
|
|
37
|
-
const url = client.message.$url()
|
|
38
|
-
expect(url.pathname).toBe('/message')
|
|
39
|
-
})
|
|
40
|
-
|
|
41
|
-
it('Should pass generics types to chained handlers', () => {
|
|
42
|
-
type Bindings = {
|
|
43
|
-
MY_VAR_IN_BINDINGS: string
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
type Variables = {
|
|
47
|
-
MY_VAR: string
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
const app = new Acryl<{ Bindings: Bindings }>()
|
|
51
|
-
|
|
52
|
-
app.get(
|
|
53
|
-
'/',
|
|
54
|
-
createMiddleware<{ Variables: Variables }>(async (c, next) => {
|
|
55
|
-
await next()
|
|
56
|
-
}),
|
|
57
|
-
createMiddleware(async (c, next) => {
|
|
58
|
-
await next()
|
|
59
|
-
}),
|
|
60
|
-
async (c) => {
|
|
61
|
-
const v = c.get('MY_VAR')
|
|
62
|
-
expectTypeOf(v).toEqualTypeOf<string>()
|
|
63
|
-
}
|
|
64
|
-
)
|
|
65
|
-
})
|
|
66
|
-
|
|
67
|
-
it('Should default to MiddlewareHandler<E, P, I, Response>', async () => {
|
|
68
|
-
const middleware = createMiddleware(async (c, next) => {
|
|
69
|
-
await next()
|
|
70
|
-
})
|
|
71
|
-
type Expected = MiddlewareHandler<any, string, {}, Response>
|
|
72
|
-
type _verify = Expect<Equal<Expected, typeof middleware>>
|
|
73
|
-
})
|
|
74
|
-
})
|
|
75
|
-
|
|
76
|
-
describe('createHandler', () => {
|
|
77
|
-
const mw = (message: string) =>
|
|
78
|
-
createMiddleware(async (c, next) => {
|
|
79
|
-
await next()
|
|
80
|
-
c.header('x-message', message)
|
|
81
|
-
})
|
|
82
|
-
|
|
83
|
-
describe('Basic', () => {
|
|
84
|
-
const factory = createFactory()
|
|
85
|
-
const app = new Acryl()
|
|
86
|
-
|
|
87
|
-
const handlersA = factory.createHandlers((c) => {
|
|
88
|
-
return c.text('A')
|
|
89
|
-
})
|
|
90
|
-
const routesA = app.get('/a', ...handlersA)
|
|
91
|
-
|
|
92
|
-
const handlersB = factory.createHandlers(mw('B'), (c) => {
|
|
93
|
-
return c.text('B')
|
|
94
|
-
})
|
|
95
|
-
app.get('/b', ...handlersB)
|
|
96
|
-
|
|
97
|
-
it('Should return 200 response - GET /a', async () => {
|
|
98
|
-
const res = await app.request('/a')
|
|
99
|
-
expect(res.status).toBe(200)
|
|
100
|
-
expect(await res.text()).toBe('A')
|
|
101
|
-
})
|
|
102
|
-
|
|
103
|
-
it('Should return 200 response with a custom header - GET /b', async () => {
|
|
104
|
-
const res = await app.request('/b')
|
|
105
|
-
expect(res.status).toBe(200)
|
|
106
|
-
expect(res.headers.get('x-message')).toBe('B')
|
|
107
|
-
expect(await res.text()).toBe('B')
|
|
108
|
-
})
|
|
109
|
-
|
|
110
|
-
it('Should return correct path types - /a', () => {
|
|
111
|
-
const client = hc<typeof routesA>('/')
|
|
112
|
-
expectTypeOf(client).toEqualTypeOf<{
|
|
113
|
-
a: ClientRequest<
|
|
114
|
-
string,
|
|
115
|
-
'/a',
|
|
116
|
-
{
|
|
117
|
-
$get: {
|
|
118
|
-
input: {}
|
|
119
|
-
output: 'A'
|
|
120
|
-
outputFormat: 'text'
|
|
121
|
-
status: ContentfulStatusCode
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
>
|
|
125
|
-
}>()
|
|
126
|
-
})
|
|
127
|
-
})
|
|
128
|
-
|
|
129
|
-
describe('Types', () => {
|
|
130
|
-
type Env = { Variables: { foo: string } }
|
|
131
|
-
|
|
132
|
-
const factory = createFactory<Env>()
|
|
133
|
-
const app = new Acryl<Env>()
|
|
134
|
-
|
|
135
|
-
const handlers = factory.createHandlers(
|
|
136
|
-
validator('query', () => {
|
|
137
|
-
return {
|
|
138
|
-
page: '1',
|
|
139
|
-
}
|
|
140
|
-
}),
|
|
141
|
-
(c) => {
|
|
142
|
-
const foo = c.var.foo
|
|
143
|
-
const { page } = c.req.valid('query')
|
|
144
|
-
return c.json({ page, foo })
|
|
145
|
-
}
|
|
146
|
-
)
|
|
147
|
-
const routes = app.get('/posts', ...handlers)
|
|
148
|
-
|
|
149
|
-
type Expected = Acryl<
|
|
150
|
-
Env,
|
|
151
|
-
ToSchema<
|
|
152
|
-
'get',
|
|
153
|
-
'/posts',
|
|
154
|
-
{
|
|
155
|
-
in: {
|
|
156
|
-
query: {
|
|
157
|
-
page: string
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
},
|
|
161
|
-
TypedResponse<{
|
|
162
|
-
page: string
|
|
163
|
-
foo: string
|
|
164
|
-
}>
|
|
165
|
-
>,
|
|
166
|
-
'/'
|
|
167
|
-
>
|
|
168
|
-
|
|
169
|
-
it('Should return correct types', () => {
|
|
170
|
-
expectTypeOf(routes).toEqualTypeOf<Expected>()
|
|
171
|
-
})
|
|
172
|
-
})
|
|
173
|
-
|
|
174
|
-
// It's difficult to cover all possible patterns,
|
|
175
|
-
// so these tests will only cover the minimal cases.
|
|
176
|
-
|
|
177
|
-
describe('Types - Complex', () => {
|
|
178
|
-
type Env = { Variables: { foo: string } }
|
|
179
|
-
|
|
180
|
-
const factory = createFactory<Env>()
|
|
181
|
-
const app = new Acryl<Env>()
|
|
182
|
-
|
|
183
|
-
const handlers = factory.createHandlers(
|
|
184
|
-
validator('header', () => {
|
|
185
|
-
return {
|
|
186
|
-
auth: 'token',
|
|
187
|
-
}
|
|
188
|
-
}),
|
|
189
|
-
validator('query', () => {
|
|
190
|
-
return {
|
|
191
|
-
page: '1',
|
|
192
|
-
}
|
|
193
|
-
}),
|
|
194
|
-
validator('json', () => {
|
|
195
|
-
return {
|
|
196
|
-
id: 123,
|
|
197
|
-
}
|
|
198
|
-
}),
|
|
199
|
-
(c) => {
|
|
200
|
-
const foo = c.var.foo
|
|
201
|
-
const { auth } = c.req.valid('header')
|
|
202
|
-
const { page } = c.req.valid('query')
|
|
203
|
-
const { id } = c.req.valid('json')
|
|
204
|
-
return c.json({ auth, page, foo, id })
|
|
205
|
-
}
|
|
206
|
-
)
|
|
207
|
-
const routes = app.get('/posts', ...handlers)
|
|
208
|
-
|
|
209
|
-
type Expected = Acryl<
|
|
210
|
-
Env,
|
|
211
|
-
ToSchema<
|
|
212
|
-
'get',
|
|
213
|
-
'/posts',
|
|
214
|
-
{
|
|
215
|
-
in: {
|
|
216
|
-
header: {
|
|
217
|
-
auth: string
|
|
218
|
-
}
|
|
219
|
-
} & {
|
|
220
|
-
query: {
|
|
221
|
-
page: string
|
|
222
|
-
}
|
|
223
|
-
} & {
|
|
224
|
-
json: {
|
|
225
|
-
id: number
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
},
|
|
229
|
-
TypedResponse<{
|
|
230
|
-
auth: string
|
|
231
|
-
page: string
|
|
232
|
-
foo: string
|
|
233
|
-
id: number
|
|
234
|
-
}>
|
|
235
|
-
>,
|
|
236
|
-
'/'
|
|
237
|
-
>
|
|
238
|
-
|
|
239
|
-
it('Should return correct types', () => {
|
|
240
|
-
expectTypeOf(routes).toEqualTypeOf<Expected>()
|
|
241
|
-
})
|
|
242
|
-
})
|
|
243
|
-
|
|
244
|
-
describe('Types - Context Env with Multiple Middlewares', () => {
|
|
245
|
-
const factory = createFactory()
|
|
246
|
-
|
|
247
|
-
const mw1 = createMiddleware<
|
|
248
|
-
{ Variables: { foo1: string } },
|
|
249
|
-
string,
|
|
250
|
-
{ out: { query: { bar1: number } } }
|
|
251
|
-
>(async () => {})
|
|
252
|
-
const mw2 = createMiddleware<
|
|
253
|
-
{ Variables: { foo2: string } },
|
|
254
|
-
string,
|
|
255
|
-
{ out: { query: { bar2: number } } }
|
|
256
|
-
>(async () => {})
|
|
257
|
-
const mw3 = createMiddleware<
|
|
258
|
-
{ Variables: { foo3: string } },
|
|
259
|
-
string,
|
|
260
|
-
{ out: { query: { bar3: number } } }
|
|
261
|
-
>(async () => {})
|
|
262
|
-
const mw4 = createMiddleware<
|
|
263
|
-
{ Variables: { foo4: string } },
|
|
264
|
-
string,
|
|
265
|
-
{ out: { query: { bar4: number } } }
|
|
266
|
-
>(async () => {})
|
|
267
|
-
const mw5 = createMiddleware<
|
|
268
|
-
{ Variables: { foo5: string } },
|
|
269
|
-
string,
|
|
270
|
-
{ out: { query: { bar5: number } } }
|
|
271
|
-
>(async () => {})
|
|
272
|
-
const mw6 = createMiddleware<
|
|
273
|
-
{ Variables: { foo6: string } },
|
|
274
|
-
string,
|
|
275
|
-
{ out: { query: { bar6: number } } }
|
|
276
|
-
>(async () => {})
|
|
277
|
-
const mw7 = createMiddleware<
|
|
278
|
-
{ Variables: { foo7: string } },
|
|
279
|
-
string,
|
|
280
|
-
{ out: { query: { bar7: number } } }
|
|
281
|
-
>(async () => {})
|
|
282
|
-
const mw8 = createMiddleware<
|
|
283
|
-
{ Variables: { foo8: string } },
|
|
284
|
-
string,
|
|
285
|
-
{ out: { query: { bar8: number } } }
|
|
286
|
-
>(async () => {})
|
|
287
|
-
const mw9 = createMiddleware<
|
|
288
|
-
{ Variables: { foo9: string } },
|
|
289
|
-
string,
|
|
290
|
-
{ out: { query: { bar9: number } } }
|
|
291
|
-
>(async () => {})
|
|
292
|
-
|
|
293
|
-
it('Should not throw type error', () => {
|
|
294
|
-
factory.createHandlers(
|
|
295
|
-
mw1,
|
|
296
|
-
mw2,
|
|
297
|
-
mw3,
|
|
298
|
-
mw4,
|
|
299
|
-
mw5,
|
|
300
|
-
mw6,
|
|
301
|
-
mw7,
|
|
302
|
-
mw8,
|
|
303
|
-
async (c) => {
|
|
304
|
-
expectTypeOf(c.var.foo1).toEqualTypeOf<string>()
|
|
305
|
-
expectTypeOf(c.var.foo2).toEqualTypeOf<string>()
|
|
306
|
-
expectTypeOf(c.var.foo3).toEqualTypeOf<string>()
|
|
307
|
-
expectTypeOf(c.var.foo4).toEqualTypeOf<string>()
|
|
308
|
-
expectTypeOf(c.var.foo5).toEqualTypeOf<string>()
|
|
309
|
-
expectTypeOf(c.var.foo6).toEqualTypeOf<string>()
|
|
310
|
-
expectTypeOf(c.var.foo7).toEqualTypeOf<string>()
|
|
311
|
-
expectTypeOf(c.var.foo8).toEqualTypeOf<string>()
|
|
312
|
-
},
|
|
313
|
-
(c) => c.json(0)
|
|
314
|
-
)
|
|
315
|
-
|
|
316
|
-
factory.createHandlers(mw1, mw2, mw3, mw4, mw5, mw6, mw7, mw8, mw9, (c) => {
|
|
317
|
-
expectTypeOf(c.var.foo1).toEqualTypeOf<string>()
|
|
318
|
-
expectTypeOf(c.var.foo2).toEqualTypeOf<string>()
|
|
319
|
-
expectTypeOf(c.var.foo3).toEqualTypeOf<string>()
|
|
320
|
-
expectTypeOf(c.var.foo4).toEqualTypeOf<string>()
|
|
321
|
-
expectTypeOf(c.var.foo5).toEqualTypeOf<string>()
|
|
322
|
-
expectTypeOf(c.var.foo6).toEqualTypeOf<string>()
|
|
323
|
-
expectTypeOf(c.var.foo7).toEqualTypeOf<string>()
|
|
324
|
-
expectTypeOf(c.var.foo8).toEqualTypeOf<string>()
|
|
325
|
-
expectTypeOf(c.var.foo9).toEqualTypeOf<string>()
|
|
326
|
-
|
|
327
|
-
return c.json({
|
|
328
|
-
foo1: c.get('foo1'),
|
|
329
|
-
foo2: c.get('foo2'),
|
|
330
|
-
foo3: c.get('foo3'),
|
|
331
|
-
foo4: c.get('foo4'),
|
|
332
|
-
foo5: c.get('foo5'),
|
|
333
|
-
foo6: c.get('foo6'),
|
|
334
|
-
foo7: c.get('foo7'),
|
|
335
|
-
foo8: c.get('foo8'),
|
|
336
|
-
foo9: c.get('foo9'),
|
|
337
|
-
})
|
|
338
|
-
})
|
|
339
|
-
})
|
|
340
|
-
})
|
|
341
|
-
|
|
342
|
-
describe('Types - Multiple Handlers', () => {
|
|
343
|
-
const factory = createFactory()
|
|
344
|
-
|
|
345
|
-
const [handler1, handler2] = factory.createHandlers(
|
|
346
|
-
(c) => c.json({ first: 1 }),
|
|
347
|
-
(c) => c.json({ second: 'second' as const })
|
|
348
|
-
)
|
|
349
|
-
|
|
350
|
-
type ExtractOutput<R> = R extends H<any, any, any, TypedResponse<infer Inner>> ? Inner : never
|
|
351
|
-
|
|
352
|
-
type Handler1Output = ExtractOutput<typeof handler1>
|
|
353
|
-
type Handler2Output = ExtractOutput<typeof handler2>
|
|
354
|
-
|
|
355
|
-
it('Should allow multiple handlers with independent return types', () => {
|
|
356
|
-
expectTypeOf<Handler1Output>().toEqualTypeOf<{ first: number }>()
|
|
357
|
-
expectTypeOf<Handler2Output>().toEqualTypeOf<{ second: 'second' }>()
|
|
358
|
-
})
|
|
359
|
-
})
|
|
360
|
-
})
|
|
361
|
-
|
|
362
|
-
describe('createFactory', () => {
|
|
363
|
-
describe('createApp', () => {
|
|
364
|
-
type Env = { Variables: { foo: string } }
|
|
365
|
-
const factory = createFactory<Env>({
|
|
366
|
-
initApp: (app) => {
|
|
367
|
-
app.use((c, next) => {
|
|
368
|
-
c.set('foo', 'bar')
|
|
369
|
-
return next()
|
|
370
|
-
})
|
|
371
|
-
},
|
|
372
|
-
})
|
|
373
|
-
const app = factory.createApp()
|
|
374
|
-
it('Should set the correct type and initialize the app', async () => {
|
|
375
|
-
app.get('/', (c) => {
|
|
376
|
-
expectTypeOf(c.var.foo).toEqualTypeOf<string>()
|
|
377
|
-
return c.text(c.var.foo)
|
|
378
|
-
})
|
|
379
|
-
const res = await app.request('/')
|
|
380
|
-
expect(res.status).toBe(200)
|
|
381
|
-
expect(await res.text()).toBe('bar')
|
|
382
|
-
})
|
|
383
|
-
})
|
|
384
|
-
|
|
385
|
-
describe('createMiddleware', () => {
|
|
386
|
-
it('Should omit the `*` wildcard from the generated schema', () => {
|
|
387
|
-
const factory = createFactory()
|
|
388
|
-
|
|
389
|
-
const middleware = factory.createMiddleware(async (_, next) => {
|
|
390
|
-
await next()
|
|
391
|
-
})
|
|
392
|
-
|
|
393
|
-
const routes = new Acryl().use('*', middleware)
|
|
394
|
-
type Actual = ExtractSchema<typeof routes>
|
|
395
|
-
type Expected = {}
|
|
396
|
-
type verify = Expect<Equal<Expected, Actual>>
|
|
397
|
-
})
|
|
398
|
-
|
|
399
|
-
it('Should default to MiddlewareHandler<E, P, I, Response>', async () => {
|
|
400
|
-
const factory = createFactory()
|
|
401
|
-
|
|
402
|
-
const middleware = factory.createMiddleware(async (c, next) => {
|
|
403
|
-
await next()
|
|
404
|
-
})
|
|
405
|
-
type Expected = MiddlewareHandler<Env, string, {}, Response>
|
|
406
|
-
type _verify = Expect<Equal<Expected, typeof middleware>>
|
|
407
|
-
})
|
|
408
|
-
})
|
|
409
|
-
|
|
410
|
-
it('Should use the default app options', async () => {
|
|
411
|
-
const app = createFactory({ defaultAppOptions: { strict: false } }).createApp()
|
|
412
|
-
app.get('/hello', (c) => c.text('hello'))
|
|
413
|
-
const res = await app.request('/hello/')
|
|
414
|
-
expect(res.status).toBe(200)
|
|
415
|
-
expect(await res.text()).toBe('hello')
|
|
416
|
-
})
|
|
417
|
-
|
|
418
|
-
it('Should override the default app options when creating', async () => {
|
|
419
|
-
const app = createFactory({ defaultAppOptions: { strict: true } }).createApp({ strict: false })
|
|
420
|
-
app.get('/hello', (c) => c.text('hello'))
|
|
421
|
-
const res = await app.request('/hello/')
|
|
422
|
-
expect(res.status).toBe(200)
|
|
423
|
-
expect(await res.text()).toBe('hello')
|
|
424
|
-
})
|
|
425
|
-
})
|
|
426
|
-
|
|
427
|
-
describe('Lint rules', () => {
|
|
428
|
-
it('Should not throw a eslint `unbound-method` error if destructed', () => {
|
|
429
|
-
const { createApp, createHandlers, createMiddleware } = createFactory()
|
|
430
|
-
expect(createApp).toBeDefined()
|
|
431
|
-
expect(createHandlers).toBeDefined()
|
|
432
|
-
expect(createMiddleware).toBeDefined()
|
|
433
|
-
})
|
|
434
|
-
})
|
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
import { html, raw } from './index.ts'
|
|
2
|
-
import { HtmlEscapedCallbackPhase, resolveCallback } from '../../utils/html.ts'
|
|
3
|
-
|
|
4
|
-
describe('Tagged Template Literals', () => {
|
|
5
|
-
it('Should escape special characters', () => {
|
|
6
|
-
const name = 'John "Johnny" Smith'
|
|
7
|
-
|
|
8
|
-
expect(html`<p>I'm ${name}.</p>`.toString()).toBe("<p>I'm John "Johnny" Smith.</p>")
|
|
9
|
-
})
|
|
10
|
-
|
|
11
|
-
describe('Booleans, Null, and Undefined Are Ignored', () => {
|
|
12
|
-
it.each([true, false, undefined, null])('%s', (item) => {
|
|
13
|
-
expect(html`${item}`.toString()).toBe('')
|
|
14
|
-
})
|
|
15
|
-
|
|
16
|
-
it('falsy value', () => {
|
|
17
|
-
expect(html`${0}`.toString()).toBe('0')
|
|
18
|
-
})
|
|
19
|
-
})
|
|
20
|
-
|
|
21
|
-
it('Should call $array.flat(Infinity)', () => {
|
|
22
|
-
const values = [
|
|
23
|
-
'Name:',
|
|
24
|
-
['John "Johnny" Smith', undefined, null],
|
|
25
|
-
' Contact:',
|
|
26
|
-
[html`<a href="http://example.com/">My Website</a>`],
|
|
27
|
-
]
|
|
28
|
-
expect(html`<p>${values}</p>`.toString()).toBe(
|
|
29
|
-
'<p>Name:John "Johnny" Smith Contact:<a href="http://example.com/">My Website</a></p>'
|
|
30
|
-
)
|
|
31
|
-
})
|
|
32
|
-
|
|
33
|
-
describe('Promise', () => {
|
|
34
|
-
it('Should return Promise<string> when some variables contains Promise<string> in variables', async () => {
|
|
35
|
-
const name = Promise.resolve('John "Johnny" Smith')
|
|
36
|
-
const res = html`<p>I'm ${name}.</p>`
|
|
37
|
-
expect(res).toBeInstanceOf(Promise)
|
|
38
|
-
|
|
39
|
-
expect((await res).toString()).toBe("<p>I'm John "Johnny" Smith.</p>")
|
|
40
|
-
})
|
|
41
|
-
|
|
42
|
-
it('Should return raw value when some variables contains Promise<HtmlEscapedString> in variables', async () => {
|
|
43
|
-
const name = Promise.resolve(raw('John "Johnny" Smith'))
|
|
44
|
-
const res = html`<p>I'm ${name}.</p>`
|
|
45
|
-
expect(res).toBeInstanceOf(Promise)
|
|
46
|
-
expect((await res).toString()).toBe('<p>I\'m John "Johnny" Smith.</p>')
|
|
47
|
-
})
|
|
48
|
-
})
|
|
49
|
-
|
|
50
|
-
describe('HtmlEscapedString', () => {
|
|
51
|
-
it('Should preserve callbacks', async () => {
|
|
52
|
-
const name = raw('Acryl', [
|
|
53
|
-
({ buffer }) => {
|
|
54
|
-
if (buffer) {
|
|
55
|
-
buffer[0] = buffer[0].replace('Acryl', 'Acryl!')
|
|
56
|
-
}
|
|
57
|
-
return undefined
|
|
58
|
-
},
|
|
59
|
-
])
|
|
60
|
-
const res = html`<p>I'm ${name}.</p>`
|
|
61
|
-
expect(res).toBeInstanceOf(Promise)
|
|
62
|
-
|
|
63
|
-
expect((await res).toString()).toBe("<p>I'm Acryl.</p>")
|
|
64
|
-
expect(await resolveCallback(await res, HtmlEscapedCallbackPhase.Stringify, false, {})).toBe(
|
|
65
|
-
"<p>I'm Acryl!.</p>"
|
|
66
|
-
)
|
|
67
|
-
})
|
|
68
|
-
})
|
|
69
|
-
})
|
|
70
|
-
|
|
71
|
-
describe('raw', () => {
|
|
72
|
-
it('Should be marked as escaped.', () => {
|
|
73
|
-
const name = 'John "Johnny" Smith'
|
|
74
|
-
expect(html`<p>I'm ${raw(name)}.</p>`.toString()).toBe(
|
|
75
|
-
"<p>I'm John "Johnny" Smith.</p>"
|
|
76
|
-
)
|
|
77
|
-
})
|
|
78
|
-
})
|