wrangler 0.0.0-e492c10 → 0.0.0-e4ca780f

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.
Files changed (360) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +25 -5
  3. package/bin/wrangler.js +174 -34
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +1590 -81
  6. package/package.json +198 -149
  7. package/src/__tests__/access.test.ts +25 -0
  8. package/src/__tests__/api-dev.test.ts +238 -0
  9. package/src/__tests__/api-devregistry.test.ts +121 -0
  10. package/src/__tests__/api.test.ts +102 -0
  11. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  12. package/src/__tests__/config-cache.test.ts +30 -24
  13. package/src/__tests__/configuration.test.ts +4498 -3114
  14. package/src/__tests__/d1/d1.test.ts +82 -0
  15. package/src/__tests__/d1/execute.test.ts +66 -0
  16. package/src/__tests__/d1/migrate.test.ts +157 -0
  17. package/src/__tests__/d1/splitter.test.ts +255 -0
  18. package/src/__tests__/delete.test.ts +272 -0
  19. package/src/__tests__/deployments.test.ts +369 -0
  20. package/src/__tests__/dev.test.tsx +1592 -802
  21. package/src/__tests__/generate.test.ts +237 -0
  22. package/src/__tests__/get-host-from-url.test.ts +16 -0
  23. package/src/__tests__/guess-worker-format.test.ts +103 -68
  24. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  25. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  26. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  27. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  28. package/src/__tests__/helpers/mock-bin.ts +20 -20
  29. package/src/__tests__/helpers/mock-console.ts +64 -39
  30. package/src/__tests__/helpers/mock-dialogs.ts +104 -55
  31. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  32. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  33. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  34. package/src/__tests__/helpers/mock-istty.ts +65 -18
  35. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  36. package/src/__tests__/helpers/mock-kv.ts +41 -28
  37. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  38. package/src/__tests__/helpers/mock-process.ts +34 -0
  39. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  40. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  41. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  42. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  43. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  44. package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
  45. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  46. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  47. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  48. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  49. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  50. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  51. package/src/__tests__/helpers/msw/index.ts +52 -0
  52. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  53. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  54. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  55. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  56. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  58. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
  60. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  61. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  62. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  63. package/src/__tests__/https-options.test.ts +142 -109
  64. package/src/__tests__/index.test.ts +262 -224
  65. package/src/__tests__/init.test.ts +3168 -1488
  66. package/src/__tests__/jest.setup.ts +152 -50
  67. package/src/__tests__/kv.test.ts +1789 -1432
  68. package/src/__tests__/logger.test.ts +167 -75
  69. package/src/__tests__/logout.test.ts +47 -0
  70. package/src/__tests__/metrics.test.ts +493 -0
  71. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  72. package/src/__tests__/middleware.test.ts +816 -0
  73. package/src/__tests__/mtls-certificates.test.ts +588 -0
  74. package/src/__tests__/package-manager.test.ts +312 -165
  75. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  76. package/src/__tests__/pages/functions-build.test.ts +452 -0
  77. package/src/__tests__/pages/pages.test.ts +81 -0
  78. package/src/__tests__/pages/project-create.test.ts +63 -0
  79. package/src/__tests__/pages/project-list.test.ts +110 -0
  80. package/src/__tests__/pages/project-upload.test.ts +500 -0
  81. package/src/__tests__/pages/publish.test.ts +2864 -0
  82. package/src/__tests__/pages-deployment-tail.test.ts +955 -0
  83. package/src/__tests__/parse.test.ts +358 -248
  84. package/src/__tests__/paths.test.ts +39 -0
  85. package/src/__tests__/publish.test.ts +8322 -4847
  86. package/src/__tests__/pubsub.test.ts +496 -0
  87. package/src/__tests__/queues.test.ts +532 -0
  88. package/src/__tests__/r2.test.ts +369 -205
  89. package/src/__tests__/route.test.ts +18 -18
  90. package/src/__tests__/secret.test.ts +683 -436
  91. package/src/__tests__/tail.test.ts +835 -567
  92. package/src/__tests__/test-old-node-version.js +31 -0
  93. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  94. package/src/__tests__/tsconfig-sanity.ts +12 -0
  95. package/src/__tests__/tsconfig.json +8 -0
  96. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  97. package/src/__tests__/type-generation.test.ts +234 -0
  98. package/src/__tests__/user.test.ts +107 -120
  99. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  100. package/src/__tests__/validate-dev-props.test.ts +56 -0
  101. package/src/__tests__/version.test.ts +35 -0
  102. package/src/__tests__/whoami.test.tsx +165 -98
  103. package/src/__tests__/worker-namespace.test.ts +340 -0
  104. package/src/abort.d.ts +3 -0
  105. package/src/api/dev.ts +316 -0
  106. package/src/api/index.ts +11 -0
  107. package/src/api/mtls-certificate.ts +148 -0
  108. package/src/api/pages/create-worker-bundle-contents.ts +76 -0
  109. package/src/api/pages/index.ts +5 -0
  110. package/src/api/pages/publish.tsx +355 -0
  111. package/src/bundle-reporter.ts +68 -0
  112. package/src/bundle.ts +874 -135
  113. package/src/cfetch/index.ts +123 -69
  114. package/src/cfetch/internal.ts +217 -96
  115. package/src/cli.ts +23 -8
  116. package/src/config/config.ts +244 -196
  117. package/src/config/diagnostics.ts +61 -61
  118. package/src/config/environment.ts +563 -339
  119. package/src/config/index.ts +381 -41
  120. package/src/config/validation-helpers.ts +379 -357
  121. package/src/config/validation.ts +2181 -1263
  122. package/src/config-cache.ts +81 -41
  123. package/src/create-worker-preview.ts +250 -132
  124. package/src/create-worker-upload-form.ts +343 -224
  125. package/src/d1/backups.tsx +219 -0
  126. package/src/d1/constants.ts +2 -0
  127. package/src/d1/create.tsx +68 -0
  128. package/src/d1/delete.ts +53 -0
  129. package/src/d1/execute.tsx +357 -0
  130. package/src/d1/formatTimeAgo.ts +14 -0
  131. package/src/d1/index.ts +100 -0
  132. package/src/d1/list.tsx +60 -0
  133. package/src/d1/migrations/apply.tsx +212 -0
  134. package/src/d1/migrations/create.tsx +79 -0
  135. package/src/d1/migrations/helpers.ts +172 -0
  136. package/src/d1/migrations/index.ts +3 -0
  137. package/src/d1/migrations/list.tsx +95 -0
  138. package/src/d1/migrations/options.ts +23 -0
  139. package/src/d1/options.ts +22 -0
  140. package/src/d1/splitter.ts +161 -0
  141. package/src/d1/types.ts +25 -0
  142. package/src/d1/utils.ts +49 -0
  143. package/src/delete.ts +100 -0
  144. package/src/deployments.ts +368 -0
  145. package/src/deprecated/index.ts +144 -0
  146. package/src/dev/dev-vars.ts +20 -17
  147. package/src/dev/dev.tsx +535 -353
  148. package/src/dev/get-local-persistence-path.ts +31 -0
  149. package/src/dev/local.tsx +900 -292
  150. package/src/dev/remote.tsx +620 -201
  151. package/src/dev/start-server.ts +534 -0
  152. package/src/dev/use-esbuild.ts +182 -97
  153. package/src/dev/validate-dev-props.ts +40 -0
  154. package/src/dev-registry.ts +202 -0
  155. package/src/dev.tsx +929 -0
  156. package/src/dialogs.ts +136 -0
  157. package/src/dispatch-namespace.ts +211 -0
  158. package/src/docs/index.ts +97 -0
  159. package/src/durable.ts +102 -0
  160. package/src/entry.ts +259 -189
  161. package/src/environment-variables/factory.ts +88 -0
  162. package/src/environment-variables/misc-variables.ts +30 -0
  163. package/src/errors.ts +6 -6
  164. package/src/generate/index.ts +298 -0
  165. package/src/git-client.ts +135 -0
  166. package/src/global-wrangler-config-path.ts +26 -0
  167. package/src/https-options.ts +84 -80
  168. package/src/index.ts +758 -0
  169. package/src/init.ts +1032 -0
  170. package/src/inspect.ts +721 -562
  171. package/src/intl-polyfill.d.ts +123 -123
  172. package/src/is-ci.ts +14 -0
  173. package/src/is-interactive.ts +16 -0
  174. package/src/jest.d.ts +4 -0
  175. package/src/kv/helpers.ts +430 -0
  176. package/src/kv/index.ts +594 -0
  177. package/src/logger.ts +96 -43
  178. package/src/metrics/index.ts +5 -0
  179. package/src/metrics/metrics-config.ts +239 -0
  180. package/src/metrics/metrics-dispatcher.ts +96 -0
  181. package/src/metrics/metrics-usage-headers.ts +24 -0
  182. package/src/metrics/send-event.ts +99 -0
  183. package/src/miniflare-cli/assets.ts +251 -0
  184. package/src/miniflare-cli/index.ts +202 -33
  185. package/src/miniflare-cli/request-context.ts +18 -18
  186. package/src/miniflare-cli/tsconfig.json +9 -0
  187. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  188. package/src/miniflare-cli/types.ts +11 -0
  189. package/src/module-collection.ts +290 -215
  190. package/src/mtls-certificate/cli.ts +155 -0
  191. package/src/open-in-browser.ts +5 -14
  192. package/src/package-manager.ts +182 -90
  193. package/src/pages/build.ts +410 -0
  194. package/src/pages/buildFunctions.ts +140 -0
  195. package/src/pages/constants.ts +18 -0
  196. package/src/pages/deployment-tails.ts +281 -0
  197. package/src/pages/deployments.tsx +84 -0
  198. package/src/pages/dev.ts +716 -0
  199. package/src/pages/errors.ts +67 -0
  200. package/src/pages/functions/buildPlugin.ts +113 -0
  201. package/src/pages/functions/buildWorker.ts +291 -0
  202. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  203. package/src/pages/functions/filepath-routing.ts +189 -0
  204. package/src/pages/functions/identifiers.ts +78 -0
  205. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  206. package/src/pages/functions/routes-consolidation.ts +73 -0
  207. package/src/pages/functions/routes-transformation.test.ts +282 -0
  208. package/src/pages/functions/routes-transformation.ts +115 -0
  209. package/src/pages/functions/routes-validation.test.ts +403 -0
  210. package/src/pages/functions/routes-validation.ts +202 -0
  211. package/src/pages/functions/routes.ts +151 -0
  212. package/src/pages/functions/tsconfig.json +8 -0
  213. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  214. package/src/pages/functions.ts +86 -0
  215. package/src/pages/hash.ts +13 -0
  216. package/src/pages/index.ts +102 -0
  217. package/src/pages/projects.tsx +159 -0
  218. package/src/pages/prompt-select-project.tsx +31 -0
  219. package/src/pages/publish.tsx +267 -0
  220. package/src/pages/types.ts +46 -0
  221. package/src/pages/upload.tsx +469 -0
  222. package/src/pages/utils.ts +23 -0
  223. package/src/parse.ts +246 -123
  224. package/src/paths.ts +53 -8
  225. package/src/proxy.ts +628 -383
  226. package/src/publish/index.ts +274 -0
  227. package/src/publish/publish.ts +1060 -0
  228. package/src/pubsub/index.ts +286 -0
  229. package/src/pubsub/pubsub-commands.ts +623 -0
  230. package/src/queues/cli/commands/consumer/add.ts +71 -0
  231. package/src/queues/cli/commands/consumer/index.ts +19 -0
  232. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  233. package/src/queues/cli/commands/create.ts +25 -0
  234. package/src/queues/cli/commands/delete.ts +26 -0
  235. package/src/queues/cli/commands/index.ts +35 -0
  236. package/src/queues/cli/commands/list.ts +25 -0
  237. package/src/queues/client.ts +136 -0
  238. package/src/queues/utils.ts +18 -0
  239. package/src/r2/constants.ts +4 -0
  240. package/src/r2/helpers.ts +132 -0
  241. package/src/r2/index.ts +289 -0
  242. package/src/routes.ts +140 -0
  243. package/src/secret/index.ts +376 -0
  244. package/src/selfsigned.d.ts +23 -23
  245. package/src/sites.ts +372 -0
  246. package/src/tail/createTail.ts +406 -0
  247. package/src/tail/filters.ts +109 -111
  248. package/src/tail/index.ts +208 -296
  249. package/src/tail/printing.ts +101 -46
  250. package/src/traverse-module-graph.ts +53 -0
  251. package/src/tsconfig-sanity.ts +16 -0
  252. package/src/type-generation.ts +181 -0
  253. package/src/update-check.ts +11 -11
  254. package/src/user/access.ts +68 -0
  255. package/src/user/auth-variables.ts +113 -0
  256. package/src/user/choose-account.tsx +39 -0
  257. package/src/user/generate-auth-url.ts +33 -0
  258. package/src/user/generate-random-state.ts +16 -0
  259. package/src/user/index.ts +2 -0
  260. package/src/user/user.ts +1233 -0
  261. package/src/utils/collectKeyValues.ts +14 -0
  262. package/src/utils/render.ts +93 -0
  263. package/src/whoami.ts +135 -0
  264. package/src/worker.ts +203 -101
  265. package/src/yargs-types.ts +37 -0
  266. package/src/zones.ts +191 -0
  267. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  268. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  269. package/templates/__tests__/tsconfig.json +8 -0
  270. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  271. package/templates/checked-fetch.js +23 -0
  272. package/templates/d1-beta-facade.js +244 -0
  273. package/templates/facade.d.ts +14 -0
  274. package/templates/first-party-worker-module-facade.ts +19 -0
  275. package/templates/format-dev-errors.ts +34 -0
  276. package/templates/gitignore +1 -0
  277. package/templates/init-tests/test-jest-new-worker.js +23 -0
  278. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  279. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  280. package/templates/middleware/common.ts +62 -0
  281. package/templates/middleware/loader-modules.ts +84 -0
  282. package/templates/middleware/loader-sw.ts +233 -0
  283. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  284. package/templates/middleware/middleware-pretty-error.ts +40 -0
  285. package/templates/middleware/middleware-scheduled.ts +15 -0
  286. package/templates/new-worker-scheduled.js +17 -0
  287. package/templates/new-worker-scheduled.ts +32 -0
  288. package/templates/new-worker.js +3 -3
  289. package/templates/new-worker.ts +21 -3
  290. package/templates/no-op-worker.js +10 -0
  291. package/templates/pages-dev-pipeline.ts +31 -0
  292. package/templates/pages-dev-util.ts +52 -0
  293. package/templates/pages-shim.ts +12 -0
  294. package/templates/pages-template-plugin.ts +180 -0
  295. package/templates/pages-template-worker.ts +189 -0
  296. package/templates/serve-static-assets.ts +66 -0
  297. package/templates/service-bindings-module-facade.js +55 -0
  298. package/templates/service-bindings-sw-facade.js +42 -0
  299. package/templates/tsconfig-sanity.ts +11 -0
  300. package/templates/tsconfig.init.json +105 -0
  301. package/templates/tsconfig.json +6 -103
  302. package/templates/tsconfig.tsbuildinfo +1 -0
  303. package/wrangler-dist/cli.d.ts +1641 -0
  304. package/wrangler-dist/cli.js +129145 -89350
  305. package/wrangler-dist/wasm-sync.wasm +0 -0
  306. package/pages/functions/buildPlugin.ts +0 -92
  307. package/pages/functions/buildWorker.ts +0 -138
  308. package/pages/functions/filepath-routing.ts +0 -189
  309. package/pages/functions/identifiers.ts +0 -78
  310. package/pages/functions/routes.ts +0 -156
  311. package/pages/functions/template-plugin.ts +0 -146
  312. package/pages/functions/template-worker.ts +0 -143
  313. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  314. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  315. package/src/__tests__/pages.test.ts +0 -327
  316. package/src/dialogs.tsx +0 -87
  317. package/src/environment-variables.ts +0 -35
  318. package/src/index.tsx +0 -2698
  319. package/src/kv.ts +0 -319
  320. package/src/miniflare-cli/enum-keys.ts +0 -17
  321. package/src/pages.tsx +0 -1875
  322. package/src/publish.ts +0 -469
  323. package/src/r2.ts +0 -50
  324. package/src/sites.tsx +0 -293
  325. package/src/user.tsx +0 -1203
  326. package/src/whoami.tsx +0 -70
  327. package/templates/static-asset-facade.js +0 -47
  328. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  329. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  330. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  331. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  332. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  333. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  334. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  335. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  336. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  337. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  338. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  339. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  340. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  341. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  342. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  343. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  344. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  345. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  346. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  347. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  348. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  349. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  350. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  351. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  352. package/vendor/wrangler-mime/LICENSE +0 -21
  353. package/vendor/wrangler-mime/Mime.js +0 -97
  354. package/vendor/wrangler-mime/README.md +0 -187
  355. package/vendor/wrangler-mime/cli.js +0 -46
  356. package/vendor/wrangler-mime/index.js +0 -4
  357. package/vendor/wrangler-mime/lite.js +0 -4
  358. package/vendor/wrangler-mime/package.json +0 -52
  359. package/vendor/wrangler-mime/types/other.js +0 -1
  360. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -7,52 +7,62 @@ import { logger } from "../../logger";
7
7
  */
8
8
 
9
9
  let debugSpy: jest.SpyInstance,
10
- logSpy: jest.SpyInstance,
11
- errorSpy: jest.SpyInstance,
12
- warnSpy: jest.SpyInstance;
10
+ logSpy: jest.SpyInstance,
11
+ infoSpy: jest.SpyInstance,
12
+ errorSpy: jest.SpyInstance,
13
+ warnSpy: jest.SpyInstance;
13
14
 
14
15
  const std = {
15
- get debug() {
16
- return normalizeOutput(debugSpy);
17
- },
18
- get out() {
19
- return normalizeOutput(logSpy);
20
- },
21
- get err() {
22
- return normalizeOutput(errorSpy);
23
- },
24
- get warn() {
25
- return normalizeOutput(warnSpy);
26
- },
16
+ get debug() {
17
+ return normalizeOutput(debugSpy);
18
+ },
19
+ get out() {
20
+ return normalizeOutput(logSpy);
21
+ },
22
+ get info() {
23
+ return normalizeOutput(infoSpy);
24
+ },
25
+ get err() {
26
+ return normalizeOutput(errorSpy);
27
+ },
28
+ get warn() {
29
+ return normalizeOutput(warnSpy);
30
+ },
27
31
  };
28
32
 
29
33
  function normalizeOutput(spy: jest.SpyInstance): string {
30
- return normalizeErrorMarkers(
31
- stripTrailingWhitespace(normalizeSlashes(stripTimings(captureCalls(spy))))
32
- );
34
+ return normalizeErrorMarkers(
35
+ replaceByte(
36
+ stripTrailingWhitespace(
37
+ normalizeSlashes(normalizeTempDirs(stripTimings(captureCalls(spy))))
38
+ )
39
+ )
40
+ );
33
41
  }
34
42
 
35
43
  function captureCalls(spy: jest.SpyInstance): string {
36
- return spy.mock.calls
37
- .map((args: unknown[]) => util.format("%s", ...args))
38
- .join("\n");
44
+ return spy.mock.calls
45
+ .map((args: unknown[]) => util.format("%s", ...args))
46
+ .join("\n");
39
47
  }
40
48
 
41
49
  export function mockConsoleMethods() {
42
- beforeEach(() => {
43
- logger.columns = 100;
44
- debugSpy = jest.spyOn(console, "debug").mockImplementation();
45
- logSpy = jest.spyOn(console, "log").mockImplementation();
46
- errorSpy = jest.spyOn(console, "error").mockImplementation();
47
- warnSpy = jest.spyOn(console, "warn").mockImplementation();
48
- });
49
- afterEach(() => {
50
- debugSpy.mockRestore();
51
- logSpy.mockRestore();
52
- errorSpy.mockRestore();
53
- warnSpy.mockRestore();
54
- });
55
- return std;
50
+ beforeEach(() => {
51
+ logger.columns = 100;
52
+ debugSpy = jest.spyOn(console, "debug").mockImplementation();
53
+ logSpy = jest.spyOn(console, "log").mockImplementation();
54
+ infoSpy = jest.spyOn(console, "info").mockImplementation();
55
+ errorSpy = jest.spyOn(console, "error").mockImplementation();
56
+ warnSpy = jest.spyOn(console, "warn").mockImplementation();
57
+ });
58
+ afterEach(() => {
59
+ debugSpy.mockRestore();
60
+ logSpy.mockRestore();
61
+ infoSpy.mockRestore();
62
+ errorSpy.mockRestore();
63
+ warnSpy.mockRestore();
64
+ });
65
+ return std;
56
66
  }
57
67
 
58
68
  /**
@@ -61,7 +71,7 @@ export function mockConsoleMethods() {
61
71
  * Windows gets a different character.
62
72
  */
63
73
  function normalizeErrorMarkers(str: string): string {
64
- return str.replaceAll("✘", "X");
74
+ return str.replaceAll("✘", "X");
65
75
  }
66
76
 
67
77
  /**
@@ -70,7 +80,7 @@ function normalizeErrorMarkers(str: string): string {
70
80
  * Use this in snapshot tests to be resilient to file-system differences.
71
81
  */
72
82
  export function normalizeSlashes(str: string): string {
73
- return str.replace(/\\/g, "/");
83
+ return str.replace(/\\/g, "/");
74
84
  }
75
85
 
76
86
  /**
@@ -79,9 +89,24 @@ export function normalizeSlashes(str: string): string {
79
89
  * Use this in snapshot tests to be resilient to slight changes in timing of processing.
80
90
  */
81
91
  export function stripTimings(stdout: string): string {
82
- return stdout.replace(/\(\d+\.\d+ sec\)/g, "(TIMINGS)");
92
+ return stdout.replace(/\(\d+\.\d+ sec\)/g, "(TIMINGS)");
83
93
  }
84
94
 
85
95
  export function stripTrailingWhitespace(str: string): string {
86
- return str.replace(/[^\S\n]+\n/g, "\n");
96
+ return str.replace(/[^\S\n]+\n/g, "\n");
97
+ }
98
+
99
+ /**
100
+ * Removing leading kilobit (tenth of a byte) from test output due to
101
+ * variation causing every few tests the value to change by ± .01
102
+ */
103
+ function replaceByte(stdout: string): string {
104
+ return stdout.replaceAll(/\d+\.\d+ KiB/g, "xx KiB");
105
+ }
106
+
107
+ /**
108
+ * Temp directories are created with random names, so we replace all comments temp dirs in them
109
+ */
110
+ export function normalizeTempDirs(stdout: string): string {
111
+ return stdout.replaceAll(/\/\/.+\/tmp.+/g, "//tmpdir");
87
112
  }
@@ -1,14 +1,15 @@
1
- import { confirm, prompt } from "../../dialogs";
2
- import { normalizeSlashes } from "./mock-console";
1
+ import prompts from "prompts";
3
2
 
4
3
  /**
5
4
  * The expected values for a confirmation request.
6
5
  */
7
6
  export interface ConfirmExpectation {
8
- /** The text expected to be seen in the confirmation dialog. */
9
- text: string;
10
- /** The mock response send back from the confirmation dialog. */
11
- result: boolean;
7
+ /** The text expected to be seen in the confirmation dialog. */
8
+ text: string;
9
+
10
+ options?: { defaultValue: boolean };
11
+ /** The mock response send back from the confirmation dialog. */
12
+ result: boolean;
12
13
  }
13
14
 
14
15
  /**
@@ -19,38 +20,37 @@ export interface ConfirmExpectation {
19
20
  * then an error is thrown.
20
21
  */
21
22
  export function mockConfirm(...expectations: ConfirmExpectation[]) {
22
- (confirm as jest.Mock).mockImplementation((text: string) => {
23
- for (const { text: expectedText, result } of expectations) {
24
- if (normalizeSlashes(text) === normalizeSlashes(expectedText)) {
25
- return Promise.resolve(result);
26
- }
27
- }
28
- throw new Error(`Unexpected confirmation message: ${text}`);
29
- });
30
- }
23
+ for (const expectation of expectations) {
24
+ (prompts as unknown as jest.Mock).mockImplementationOnce(
25
+ ({ type, name, message, initial }) => {
26
+ expect({ type, name, message }).toStrictEqual({
27
+ type: "confirm",
28
+ name: "value",
29
+ message: expectation.text,
30
+ });
31
+ if (expectation.options) {
32
+ expect(initial).toStrictEqual(expectation.options?.defaultValue);
33
+ }
31
34
 
32
- export function clearConfirmMocks() {
33
- (confirm as jest.Mock).mockReset();
34
- // Because confirm was originally a spy, calling mockReset will simply reset
35
- // it as a function with no return value (!), so we need to accitionally reset
36
- // the mock implementation to the one that throws (from jest.setup.js).
37
- (confirm as jest.Mock).mockImplementation((text: string) => {
38
- throw new Error(
39
- `Unexpected call to \`confirm("${text}")\`.\nYou should use \`mockConfirm()\` to mock calls to \`confirm()\` with expectations. Search the codebase for \`mockConfirm\` to learn more.`
40
- );
41
- });
35
+ return Promise.resolve({ value: expectation.result });
36
+ }
37
+ );
38
+ }
42
39
  }
43
40
 
44
41
  /**
45
42
  * The expected values for a prompt request.
46
43
  */
47
44
  export interface PromptExpectation {
48
- /** The text expected to be seen in the prompt dialog. */
49
- text: string;
50
- /** The type of the prompt. */
51
- type: "text" | "password";
52
- /** The mock response send back from the prompt dialog. */
53
- result: string;
45
+ /** The text expected to be seen in the prompt dialog. */
46
+ text: string;
47
+ /** The type of the prompt. */
48
+ options?: {
49
+ defaultValue?: string;
50
+ isSecret?: boolean;
51
+ };
52
+ /** The mock response send back from the prompt dialog. */
53
+ result: string;
54
54
  }
55
55
 
56
56
  /**
@@ -61,30 +61,79 @@ export interface PromptExpectation {
61
61
  * then an error is thrown.
62
62
  */
63
63
  export function mockPrompt(...expectations: PromptExpectation[]) {
64
- (prompt as jest.Mock).mockImplementation(
65
- (text: string, type: "text" | "password") => {
66
- for (const {
67
- text: expectedText,
68
- type: expectedType,
69
- result,
70
- } of expectations) {
71
- if (text === expectedText && type == expectedType) {
72
- return Promise.resolve(result);
73
- }
74
- }
75
- throw new Error(`Unexpected confirmation message: ${text}`);
76
- }
77
- );
64
+ for (const expectation of expectations) {
65
+ (prompts as unknown as jest.Mock).mockImplementationOnce(
66
+ ({ type, name, message, initial, style }) => {
67
+ expect({ type, name, message }).toStrictEqual({
68
+ type: "text",
69
+ name: "value",
70
+ message: expectation.text,
71
+ });
72
+ if (expectation.options) {
73
+ expect(initial).toStrictEqual(expectation.options?.defaultValue);
74
+ expect(style).toStrictEqual(
75
+ expectation.options?.isSecret ? "password" : "default"
76
+ );
77
+ }
78
+ return Promise.resolve({ value: expectation.result });
79
+ }
80
+ );
81
+ }
82
+ }
83
+
84
+ interface SelectOptions<Values> {
85
+ choices: SelectOption<Values>[];
86
+ defaultOption?: number;
87
+ }
88
+
89
+ interface SelectOption<Values> {
90
+ title: string;
91
+ description?: string;
92
+ value: Values;
93
+ }
94
+ /**
95
+ * The expected values for a select request.
96
+ */
97
+ export interface SelectExpectation<Values> {
98
+ /** The text expected to be seen in the select dialog. */
99
+ text: string;
100
+
101
+ options?: SelectOptions<Values>;
102
+ /** The mock response send back from the select dialog. */
103
+ result: string;
104
+ }
105
+
106
+ /**
107
+ * Mock the implementation of `select()` that will respond with configured results
108
+ * for configured select text messages.
109
+ *
110
+ * If there is a call to `select()` that does not match any of the expectations
111
+ * then an error is thrown.
112
+ */
113
+ export function mockSelect<Values>(
114
+ ...expectations: SelectExpectation<Values>[]
115
+ ) {
116
+ for (const expectation of expectations) {
117
+ (prompts as unknown as jest.Mock).mockImplementationOnce(
118
+ ({ type, name, message, choices, initial }) => {
119
+ expect({ type, name, message }).toStrictEqual({
120
+ type: "select",
121
+ name: "value",
122
+ message: expectation.text,
123
+ });
124
+ if (expectation.options) {
125
+ expect(choices).toStrictEqual(expectation.options?.choices);
126
+ expect(initial).toStrictEqual(expectation.options?.defaultOption);
127
+ }
128
+ return Promise.resolve({ value: expectation.result });
129
+ }
130
+ );
131
+ }
78
132
  }
79
133
 
80
- export function clearPromptMocks() {
81
- (prompt as jest.Mock).mockReset();
82
- // Because prompt was originally a spy, calling mockReset will simply reset
83
- // it as a function with no return value (!), so we need to accitionally reset
84
- // the mock implementation to the one that throws (from jest.setup.js).
85
- (prompt as jest.Mock).mockImplementation((text: string) => {
86
- throw new Error(
87
- `Unexpected call to \`prompt(${text}, ...)\`.\nYou should use \`mockPrompt()\` to mock calls to \`prompt()\` with expectations. Search the codebase for \`mockPrompt\` to learn more.`
88
- );
89
- });
134
+ export function clearDialogs() {
135
+ // No dialog mocks should be left after each test, and so calling the dialog methods should throw
136
+ expect(() => prompts({ type: "select", name: "unknown" })).toThrow(
137
+ "Unexpected call to "
138
+ );
90
139
  }
@@ -0,0 +1,25 @@
1
+ import { rest } from "msw";
2
+ import { msw } from "./msw";
3
+
4
+ /**
5
+ * Mocks the `/accounts/:accountId/pages/projects/:projectName/upload-token` GET request
6
+ */
7
+ export function mockGetUploadTokenRequest(
8
+ jwt: string,
9
+ accountId: string,
10
+ projectName: string
11
+ ) {
12
+ msw.use(
13
+ rest.get(
14
+ `*/accounts/:accountId/pages/projects/${projectName}/upload-token`,
15
+ (req, res, ctx) => {
16
+ expect(req.params.accountId).toEqual(accountId);
17
+
18
+ return res(
19
+ ctx.status(200),
20
+ ctx.json({ success: true, errors: [], messages: [], result: { jwt } })
21
+ );
22
+ }
23
+ )
24
+ );
25
+ }
@@ -0,0 +1,11 @@
1
+ import { rest } from "msw";
2
+ import { msw, createFetchResult } from "./msw";
3
+
4
+ export function mockGetZoneFromHostRequest(host: string, zone?: string) {
5
+ msw.use(
6
+ rest.get("*/zones", (req, res, ctx) => {
7
+ expect(req.url.searchParams.get("name")).toEqual(host);
8
+ return res(ctx.json(createFetchResult(zone ? [{ id: zone }] : [])));
9
+ })
10
+ );
11
+ }
@@ -7,40 +7,40 @@ import type { Request } from "undici";
7
7
  * @returns a `fetch`-like function that will trigger the mock server to handle the request.
8
8
  */
9
9
  export function mockHttpServer() {
10
- let listener: http.RequestListener;
10
+ let listener: http.RequestListener;
11
11
 
12
- beforeEach(() => {
13
- jest
14
- .spyOn(http, "createServer")
15
- .mockImplementation((...args: unknown[]) => {
16
- listener = args.pop() as http.RequestListener;
17
- return {
18
- listen: jest.fn(),
19
- close(callback?: (err?: Error) => void) {
20
- callback?.();
21
- return this;
22
- },
23
- } as unknown as http.Server;
24
- });
25
- });
12
+ beforeEach(() => {
13
+ jest
14
+ .spyOn(http, "createServer")
15
+ .mockImplementation((...args: unknown[]) => {
16
+ listener = args.pop() as http.RequestListener;
17
+ return {
18
+ listen: jest.fn(),
19
+ close(callback?: (err?: Error) => void) {
20
+ callback?.();
21
+ return this;
22
+ },
23
+ } as unknown as http.Server;
24
+ });
25
+ });
26
26
 
27
- return async (req: Request) => {
28
- const resp = new http.ServerResponse(
29
- // If you squint you can just about see that an `IncomingMessages` is like a `Request`!
30
- req as unknown as http.IncomingMessage
31
- );
27
+ return async (req: Request) => {
28
+ const resp = new http.ServerResponse(
29
+ // If you squint you can just about see that an `IncomingMessages` is like a `Request`!
30
+ req as unknown as http.IncomingMessage
31
+ );
32
32
 
33
- // The listener will attache a callback to the response by calling `resp.end(callback)`.
34
- // We want to capture that so that we can trigger it after the listener has completed its work.
35
- const endSpy = jest.spyOn(resp, "end");
33
+ // The listener will attache a callback to the response by calling `resp.end(callback)`.
34
+ // We want to capture that so that we can trigger it after the listener has completed its work.
35
+ const endSpy = jest.spyOn(resp, "end");
36
36
 
37
- // The `await` here is important to allow the listener to complete its async work before we end the response.
38
- await listener(req as unknown as http.IncomingMessage, resp);
37
+ // The `await` here is important to allow the listener to complete its async work before we end the response.
38
+ await listener(req as unknown as http.IncomingMessage, resp);
39
39
 
40
- // Now trigger the end callback.
41
- const endCallback = endSpy.mock.calls[0].pop();
42
- endCallback?.();
40
+ // Now trigger the end callback.
41
+ const endCallback = endSpy.mock.calls[0].pop();
42
+ endCallback?.();
43
43
 
44
- return resp;
45
- };
44
+ return resp;
45
+ };
46
46
  }
@@ -1,27 +1,74 @@
1
- const ORIGINAL_STDOUT_ISTTY = process.stdout.isTTY;
2
- const ORIGINAL_STDIN_ISTTY = process.stdin.isTTY;
1
+ const ORIGINAL_STDOUT = process.stdout;
2
+ const ORIGINAL_STDIN = process.stdin;
3
3
 
4
4
  /**
5
5
  * Mock `process.stdout.isTTY`
6
6
  */
7
7
  export function useMockIsTTY() {
8
- /**
9
- * Explicitly set `process.stdout.isTTY` to a given value
10
- */
11
- const setIsTTY = (isTTY: boolean) => {
12
- process.stdout.isTTY = isTTY;
13
- process.stdin.isTTY = isTTY;
14
- };
8
+ /**
9
+ * Explicitly set `process.stdout.isTTY` to a given value (or to a getter function).
10
+ */
11
+ const setIsTTY = (
12
+ isTTY:
13
+ | boolean
14
+ | { stdin: boolean | (() => boolean); stdout: boolean | (() => boolean) }
15
+ ) => {
16
+ mockStdStream("stdout", ORIGINAL_STDOUT, isTTY);
17
+ mockStdStream("stdin", ORIGINAL_STDIN, isTTY);
18
+ };
15
19
 
16
- beforeEach(() => {
17
- process.stdout.isTTY = ORIGINAL_STDOUT_ISTTY;
18
- process.stdin.isTTY = ORIGINAL_STDIN_ISTTY;
19
- });
20
+ beforeEach(() => {
21
+ Object.defineProperty(process, "stdout", { value: ORIGINAL_STDOUT });
22
+ Object.defineProperty(process, "stdin", { value: ORIGINAL_STDIN });
23
+ });
20
24
 
21
- afterEach(() => {
22
- process.stdout.isTTY = ORIGINAL_STDOUT_ISTTY;
23
- process.stdin.isTTY = ORIGINAL_STDIN_ISTTY;
24
- });
25
+ afterEach(() => {
26
+ Object.defineProperty(process, "stdout", { value: ORIGINAL_STDOUT });
27
+ Object.defineProperty(process, "stdin", { value: ORIGINAL_STDIN });
28
+ });
25
29
 
26
- return { setIsTTY };
30
+ return { setIsTTY };
31
+ }
32
+
33
+ /**
34
+ * Create a mock version of the specified stream which overrides `isTTY`
35
+ * with the given mock responses.
36
+ *
37
+ * @param streamName the property name on `process` for the stream to be mocked.
38
+ * @param originalStream the original stream object from the `process` object to be overridden.
39
+ * @param isTTY the mock behaviour for the `isTTY` property:
40
+ * - boolean or `{ [streamName]: boolean } - use this value for isTTY;
41
+ * - { [streamName]: () => boolean } - use this function as a getter for isTTY.
42
+ */
43
+ function mockStdStream<T extends object>(
44
+ streamName: "stdout" | "stdin",
45
+ originalStream: T,
46
+ isTTY:
47
+ | boolean
48
+ | { stdin: boolean | (() => boolean); stdout: boolean | (() => boolean) }
49
+ ) {
50
+ Object.defineProperty(process, streamName, {
51
+ value: createStdProxy(
52
+ originalStream,
53
+ typeof isTTY === "boolean" ? isTTY : isTTY[streamName]
54
+ ),
55
+ });
56
+ }
57
+
58
+ /**
59
+ * Create a proxy wrapper around the given `stream` object that overrides the `isTTY` property.
60
+ */
61
+ function createStdProxy<T extends object>(
62
+ stream: T,
63
+ isTTY: boolean | (() => boolean)
64
+ ): T {
65
+ return new Proxy(stream, {
66
+ get(target, prop) {
67
+ return prop === "isTTY"
68
+ ? typeof isTTY === "boolean"
69
+ ? isTTY
70
+ : isTTY()
71
+ : target[prop as keyof typeof target];
72
+ },
73
+ });
27
74
  }
@@ -0,0 +1,12 @@
1
+ import { rest } from "msw";
2
+ import { createFetchResult, msw } from "./msw";
3
+
4
+ export function mockCollectKnownRoutesRequest(
5
+ routes: { pattern: string; script: string }[]
6
+ ) {
7
+ msw.use(
8
+ rest.get(`*/zones/:zoneId/workers/routes`, (_, res, ctx) =>
9
+ res.once(ctx.json(createFetchResult(routes)))
10
+ )
11
+ );
12
+ }
@@ -1,33 +1,46 @@
1
- import { createFetchResult, setMockRawResponse } from "./mock-cfetch";
2
- import type { NamespaceKeyInfo } from "../../kv";
1
+ import { rest } from "msw";
2
+ import { createFetchResult, msw } from "./msw";
3
+ import type { NamespaceKeyInfo } from "../../kv/helpers";
3
4
 
4
5
  export function mockKeyListRequest(
5
- expectedNamespaceId: string,
6
- expectedKeys: NamespaceKeyInfo[],
7
- keysPerRequest = 1000,
8
- blankCursorValue: "" | undefined | null = undefined
6
+ expectedNamespaceId: string,
7
+ expectedKeys: NamespaceKeyInfo[],
8
+ keysPerRequest = 1000,
9
+ blankCursorValue: "" | undefined | null = undefined
9
10
  ) {
10
- const requests = { count: 0 };
11
- // See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
11
+ const requests = { count: 0 };
12
+ // See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
13
+ msw.use(
14
+ rest.get(
15
+ "*/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
16
+ (req, res, ctx) => {
17
+ requests.count++;
18
+ expect(req.params.accountId).toEqual("some-account-id");
19
+ expect(req.params.namespaceId).toEqual(expectedNamespaceId);
20
+ let response: undefined | NamespaceKeyInfo[];
21
+ if (expectedKeys.length <= keysPerRequest) {
22
+ response = expectedKeys;
23
+ }
12
24
 
13
- setMockRawResponse(
14
- "/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
15
- "GET",
16
- ([_url, accountId, namespaceId], _init, query) => {
17
- requests.count++;
18
- expect(accountId).toEqual("some-account-id");
19
- expect(namespaceId).toEqual(expectedNamespaceId);
20
- if (expectedKeys.length <= keysPerRequest) {
21
- return createFetchResult(expectedKeys);
22
- } else {
23
- const start = parseInt(query.get("cursor") ?? "0") || 0;
24
- const end = start + keysPerRequest;
25
- const cursor = end < expectedKeys.length ? end : blankCursorValue;
26
- return createFetchResult(expectedKeys.slice(start, end), true, [], [], {
27
- cursor,
28
- });
29
- }
30
- }
31
- );
32
- return requests;
25
+ const start = parseInt(req.url.searchParams.get("cursor") ?? "0") || 0;
26
+ const end = start + keysPerRequest;
27
+ const cursor = end < expectedKeys.length ? end : blankCursorValue;
28
+
29
+ return res(
30
+ ctx.json(
31
+ createFetchResult(
32
+ response ? response : expectedKeys.slice(start, end),
33
+ true,
34
+ [],
35
+ [],
36
+ {
37
+ cursor,
38
+ }
39
+ )
40
+ )
41
+ );
42
+ }
43
+ )
44
+ );
45
+ return requests;
33
46
  }