wrangler 0.0.0-e5a3814 → 0.0.0-e60dc909

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 (302) hide show
  1. package/README.md +23 -3
  2. package/bin/wrangler.js +170 -62
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +1499 -21
  5. package/package.json +193 -153
  6. package/src/__tests__/access.test.ts +25 -0
  7. package/src/__tests__/api-dev.test.ts +238 -0
  8. package/src/__tests__/api-devregistry.test.js +64 -0
  9. package/src/__tests__/api.test.ts +80 -0
  10. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  11. package/src/__tests__/config-cache.test.ts +30 -24
  12. package/src/__tests__/configuration.test.ts +4152 -3476
  13. package/src/__tests__/d1/d1.test.ts +123 -0
  14. package/src/__tests__/d1/splitter.test.ts +255 -0
  15. package/src/__tests__/delete.test.ts +266 -0
  16. package/src/__tests__/deployments.test.ts +105 -0
  17. package/src/__tests__/dev.test.tsx +1559 -956
  18. package/src/__tests__/generate.test.ts +238 -0
  19. package/src/__tests__/get-host-from-url.test.ts +16 -0
  20. package/src/__tests__/guess-worker-format.test.ts +68 -68
  21. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  22. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  23. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  24. package/src/__tests__/helpers/mock-bin.ts +20 -20
  25. package/src/__tests__/helpers/mock-cfetch.ts +167 -100
  26. package/src/__tests__/helpers/mock-console.ts +58 -39
  27. package/src/__tests__/helpers/mock-dialogs.ts +88 -81
  28. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  29. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  30. package/src/__tests__/helpers/mock-istty.ts +65 -18
  31. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  32. package/src/__tests__/helpers/mock-kv.ts +27 -27
  33. package/src/__tests__/helpers/mock-oauth-flow.ts +244 -228
  34. package/src/__tests__/helpers/mock-process.ts +34 -0
  35. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  36. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  37. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  38. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  39. package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
  40. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  41. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  42. package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
  43. package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
  44. package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
  45. package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
  46. package/src/__tests__/helpers/msw/index.ts +21 -0
  47. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  48. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  49. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  50. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  51. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  52. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  53. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  54. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  55. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  56. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  57. package/src/__tests__/https-options.test.ts +142 -109
  58. package/src/__tests__/index.test.ts +245 -234
  59. package/src/__tests__/init.test.ts +3146 -1608
  60. package/src/__tests__/jest.setup.ts +167 -46
  61. package/src/__tests__/kv.test.ts +1778 -1471
  62. package/src/__tests__/logger.test.ts +100 -74
  63. package/src/__tests__/logout.test.ts +47 -0
  64. package/src/__tests__/metrics.test.ts +493 -0
  65. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  66. package/src/__tests__/middleware.test.ts +750 -0
  67. package/src/__tests__/package-manager.test.ts +303 -303
  68. package/src/__tests__/pages-deployment-tail.test.ts +884 -0
  69. package/src/__tests__/pages.test.ts +2888 -743
  70. package/src/__tests__/parse.test.ts +252 -252
  71. package/src/__tests__/paths.test.ts +39 -0
  72. package/src/__tests__/publish.test.ts +7641 -5626
  73. package/src/__tests__/pubsub.test.ts +490 -0
  74. package/src/__tests__/queues.test.ts +522 -0
  75. package/src/__tests__/r2.test.ts +388 -228
  76. package/src/__tests__/route.test.ts +18 -18
  77. package/src/__tests__/secret.test.ts +689 -469
  78. package/src/__tests__/tail.test.ts +782 -567
  79. package/src/__tests__/test-old-node-version.js +31 -0
  80. package/src/__tests__/tsconfig-sanity.ts +12 -0
  81. package/src/__tests__/tsconfig.json +8 -0
  82. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  83. package/src/__tests__/type-generation.test.ts +233 -0
  84. package/src/__tests__/user.test.ts +117 -119
  85. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  86. package/src/__tests__/validate-dev-props.test.ts +56 -0
  87. package/src/__tests__/version.test.ts +35 -0
  88. package/src/__tests__/whoami.test.tsx +176 -132
  89. package/src/__tests__/worker-namespace.test.ts +326 -0
  90. package/src/abort.d.ts +1 -1
  91. package/src/api/dev.ts +247 -0
  92. package/src/api/index.ts +2 -0
  93. package/src/bundle-reporter.ts +68 -0
  94. package/src/bundle.ts +785 -159
  95. package/src/cfetch/index.ts +120 -83
  96. package/src/cfetch/internal.ts +211 -92
  97. package/src/cli.ts +23 -8
  98. package/src/config/config.ts +236 -195
  99. package/src/config/diagnostics.ts +61 -61
  100. package/src/config/environment.ts +514 -357
  101. package/src/config/index.ts +326 -193
  102. package/src/config/validation-helpers.ts +379 -366
  103. package/src/config/validation.ts +1979 -1380
  104. package/src/config-cache.ts +81 -41
  105. package/src/create-worker-preview.ts +239 -142
  106. package/src/create-worker-upload-form.ts +309 -238
  107. package/src/d1/backups.tsx +223 -0
  108. package/src/d1/constants.ts +2 -0
  109. package/src/d1/create.tsx +63 -0
  110. package/src/d1/delete.ts +56 -0
  111. package/src/d1/execute.tsx +323 -0
  112. package/src/d1/formatTimeAgo.ts +14 -0
  113. package/src/d1/index.ts +101 -0
  114. package/src/d1/list.tsx +48 -0
  115. package/src/d1/migrations/apply.tsx +197 -0
  116. package/src/d1/migrations/create.tsx +77 -0
  117. package/src/d1/migrations/helpers.ts +147 -0
  118. package/src/d1/migrations/index.ts +3 -0
  119. package/src/d1/migrations/list.tsx +79 -0
  120. package/src/d1/migrations/options.ts +18 -0
  121. package/src/d1/options.ts +22 -0
  122. package/src/d1/splitter.ts +161 -0
  123. package/src/d1/types.ts +24 -0
  124. package/src/d1/utils.ts +48 -0
  125. package/src/delete.ts +103 -0
  126. package/src/deployments.ts +83 -0
  127. package/src/deprecated/index.ts +145 -0
  128. package/src/dev/dev-vars.ts +20 -17
  129. package/src/dev/dev.tsx +546 -333
  130. package/src/dev/get-local-persistence-path.ts +31 -0
  131. package/src/dev/local.tsx +912 -302
  132. package/src/dev/remote.tsx +618 -225
  133. package/src/dev/start-server.ts +543 -0
  134. package/src/dev/use-esbuild.ts +183 -97
  135. package/src/dev/validate-dev-props.ts +31 -0
  136. package/src/dev-registry.ts +201 -0
  137. package/src/dev.tsx +949 -0
  138. package/src/dialogs.ts +136 -0
  139. package/src/dispatch-namespace.ts +207 -0
  140. package/src/docs/index.ts +97 -0
  141. package/src/durable.ts +87 -87
  142. package/src/entry.ts +235 -228
  143. package/src/environment-variables/factory.ts +88 -0
  144. package/src/environment-variables/misc-variables.ts +30 -0
  145. package/src/errors.ts +6 -6
  146. package/src/generate/index.ts +300 -0
  147. package/src/git-client.ts +135 -0
  148. package/src/global-wrangler-config-path.ts +26 -0
  149. package/src/https-options.ts +84 -80
  150. package/src/index.ts +694 -0
  151. package/src/init.ts +1024 -0
  152. package/src/inspect.ts +698 -593
  153. package/src/intl-polyfill.d.ts +123 -123
  154. package/src/is-ci.ts +14 -0
  155. package/src/is-interactive.ts +16 -0
  156. package/src/jest.d.ts +4 -0
  157. package/src/kv/helpers.ts +430 -0
  158. package/src/kv/index.ts +596 -0
  159. package/src/logger.ts +80 -42
  160. package/src/metrics/index.ts +5 -0
  161. package/src/metrics/metrics-config.ts +239 -0
  162. package/src/metrics/metrics-dispatcher.ts +96 -0
  163. package/src/metrics/metrics-usage-headers.ts +24 -0
  164. package/src/metrics/send-event.ts +97 -0
  165. package/src/miniflare-cli/assets.ts +250 -0
  166. package/src/miniflare-cli/index.ts +202 -33
  167. package/src/miniflare-cli/request-context.ts +18 -18
  168. package/src/miniflare-cli/tsconfig.json +9 -0
  169. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  170. package/src/miniflare-cli/types.ts +11 -0
  171. package/src/module-collection.ts +221 -212
  172. package/src/open-in-browser.ts +4 -6
  173. package/src/package-manager.ts +173 -128
  174. package/src/pages/build.ts +270 -0
  175. package/src/pages/constants.ts +18 -0
  176. package/src/pages/deployment-tails.ts +284 -0
  177. package/src/pages/deployments.tsx +84 -0
  178. package/src/pages/dev.ts +711 -0
  179. package/src/pages/errors.ts +66 -0
  180. package/src/pages/functions/buildPlugin.ts +107 -0
  181. package/src/pages/functions/buildWorker.ts +166 -0
  182. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  183. package/src/pages/functions/filepath-routing.ts +189 -0
  184. package/src/pages/functions/identifiers.ts +78 -0
  185. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  186. package/src/pages/functions/routes-consolidation.ts +73 -0
  187. package/src/pages/functions/routes-transformation.test.ts +282 -0
  188. package/src/pages/functions/routes-transformation.ts +115 -0
  189. package/src/pages/functions/routes-validation.test.ts +403 -0
  190. package/src/pages/functions/routes-validation.ts +202 -0
  191. package/src/pages/functions/routes.ts +151 -0
  192. package/src/pages/functions/tsconfig.json +8 -0
  193. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  194. package/src/pages/functions.ts +82 -0
  195. package/src/pages/hash.ts +13 -0
  196. package/src/pages/index.ts +102 -0
  197. package/src/pages/projects.tsx +167 -0
  198. package/src/pages/prompt-select-project.tsx +31 -0
  199. package/src/pages/publish.tsx +462 -0
  200. package/src/pages/types.ts +41 -0
  201. package/src/pages/upload.tsx +447 -0
  202. package/src/pages/utils.ts +23 -0
  203. package/src/parse.ts +208 -125
  204. package/src/paths.ts +53 -8
  205. package/src/proxy.ts +623 -407
  206. package/src/publish/index.ts +270 -0
  207. package/src/publish/publish.ts +1038 -0
  208. package/src/pubsub/index.ts +286 -0
  209. package/src/pubsub/pubsub-commands.ts +624 -0
  210. package/src/queues/cli/commands/consumer/add.ts +71 -0
  211. package/src/queues/cli/commands/consumer/index.ts +22 -0
  212. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  213. package/src/queues/cli/commands/create.ts +25 -0
  214. package/src/queues/cli/commands/delete.ts +26 -0
  215. package/src/queues/cli/commands/index.ts +36 -0
  216. package/src/queues/cli/commands/list.ts +25 -0
  217. package/src/queues/client.ts +135 -0
  218. package/src/queues/utils.ts +18 -0
  219. package/src/r2/constants.ts +4 -0
  220. package/src/r2/helpers.ts +131 -0
  221. package/src/r2/index.ts +289 -0
  222. package/src/routes.ts +140 -0
  223. package/src/secret/index.ts +379 -0
  224. package/src/selfsigned.d.ts +23 -23
  225. package/src/sites.ts +372 -0
  226. package/src/tail/createTail.ts +379 -0
  227. package/src/tail/filters.ts +108 -110
  228. package/src/tail/index.ts +210 -296
  229. package/src/tail/printing.ts +86 -46
  230. package/src/tsconfig-sanity.ts +16 -0
  231. package/src/type-generation.ts +181 -0
  232. package/src/update-check.ts +11 -11
  233. package/src/user/access.ts +68 -0
  234. package/src/user/auth-variables.ts +113 -0
  235. package/src/user/choose-account.tsx +39 -0
  236. package/src/user/generate-auth-url.ts +33 -0
  237. package/src/user/generate-random-state.ts +16 -0
  238. package/src/user/index.ts +2 -0
  239. package/src/user/user.ts +1232 -0
  240. package/src/utils/collectKeyValues.ts +14 -0
  241. package/src/whoami.ts +135 -0
  242. package/src/worker.ts +177 -107
  243. package/src/yargs-types.ts +24 -0
  244. package/src/zones.ts +158 -40
  245. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  246. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  247. package/templates/__tests__/tsconfig.json +8 -0
  248. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  249. package/templates/checked-fetch.js +17 -0
  250. package/templates/d1-beta-facade.js +241 -0
  251. package/templates/facade.d.ts +14 -0
  252. package/templates/first-party-worker-module-facade.ts +19 -0
  253. package/templates/format-dev-errors.ts +33 -0
  254. package/templates/init-tests/test-jest-new-worker.js +23 -0
  255. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  256. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  257. package/templates/middleware/common.ts +62 -0
  258. package/templates/middleware/loader-modules.ts +82 -0
  259. package/templates/middleware/loader-sw.ts +233 -0
  260. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  261. package/templates/middleware/middleware-pretty-error.ts +40 -0
  262. package/templates/middleware/middleware-scheduled.ts +15 -0
  263. package/templates/new-worker-scheduled.js +3 -3
  264. package/templates/new-worker-scheduled.ts +15 -15
  265. package/templates/new-worker.js +3 -3
  266. package/templates/new-worker.ts +15 -15
  267. package/templates/no-op-worker.js +10 -0
  268. package/templates/pages-dev-pipeline.ts +31 -0
  269. package/templates/pages-dev-util.ts +52 -0
  270. package/templates/pages-shim.ts +12 -0
  271. package/templates/pages-template-plugin.ts +176 -0
  272. package/templates/pages-template-worker.ts +189 -0
  273. package/templates/serve-static-assets.ts +65 -0
  274. package/templates/service-bindings-module-facade.js +54 -0
  275. package/templates/service-bindings-sw-facade.js +42 -0
  276. package/templates/tsconfig-sanity.ts +11 -0
  277. package/templates/tsconfig.init.json +106 -0
  278. package/templates/tsconfig.json +6 -103
  279. package/templates/tsconfig.tsbuildinfo +1 -0
  280. package/wrangler-dist/cli.d.ts +906 -0
  281. package/wrangler-dist/cli.js +128866 -110945
  282. package/wrangler-dist/wasm-sync.wasm +0 -0
  283. package/pages/functions/buildPlugin.ts +0 -105
  284. package/pages/functions/buildWorker.ts +0 -151
  285. package/pages/functions/filepath-routing.ts +0 -189
  286. package/pages/functions/identifiers.ts +0 -78
  287. package/pages/functions/routes.ts +0 -156
  288. package/pages/functions/template-plugin.ts +0 -147
  289. package/pages/functions/template-worker.ts +0 -143
  290. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  291. package/src/dialogs.tsx +0 -135
  292. package/src/environment-variables.ts +0 -35
  293. package/src/index.tsx +0 -2846
  294. package/src/kv.ts +0 -408
  295. package/src/miniflare-cli/enum-keys.ts +0 -17
  296. package/src/pages.tsx +0 -2093
  297. package/src/publish.ts +0 -716
  298. package/src/r2.ts +0 -50
  299. package/src/sites.tsx +0 -326
  300. package/src/user.tsx +0 -1214
  301. package/src/whoami.tsx +0 -71
  302. package/templates/static-asset-facade.js +0 -43
@@ -0,0 +1,233 @@
1
+ import * as fs from "fs";
2
+ import * as TOML from "@iarna/toml";
3
+ import { mockConsoleMethods } from "./helpers/mock-console";
4
+ import { runInTempDir } from "./helpers/run-in-tmp";
5
+ import { runWrangler } from "./helpers/run-wrangler";
6
+ import type { Config } from "../config";
7
+
8
+ const bindingsConfigMock: Partial<Config> = {
9
+ kv_namespaces: [{ binding: "TEST_KV_NAMESPACE", id: "1234" }],
10
+ vars: {
11
+ SOMETHING: "asdasdfasdf",
12
+ ANOTHER: "thing",
13
+ OBJECT_VAR: {
14
+ enterprise: "1701-D",
15
+ activeDuty: true,
16
+ captian: "Picard",
17
+ }, // We can assume the objects will be stringified
18
+ },
19
+ queues: {
20
+ producers: [
21
+ {
22
+ binding: "TEST_QUEUE_BINDING",
23
+ queue: "TEST_QUEUE",
24
+ },
25
+ ],
26
+ consumers: [
27
+ {
28
+ queue: "my-queue",
29
+ max_batch_size: 10,
30
+ max_batch_timeout: 1,
31
+ max_retries: 3,
32
+ },
33
+ ],
34
+ },
35
+ durable_objects: {
36
+ bindings: [
37
+ { name: "DURABLE_TEST1", class_name: "Durability1" },
38
+ { name: "DURABLE_TEST2", class_name: "Durability2" },
39
+ ],
40
+ },
41
+ r2_buckets: [
42
+ {
43
+ binding: "R2_BUCKET_BINDING",
44
+ bucket_name: "R2BUCKET_NAME_TEST",
45
+ },
46
+ ],
47
+ d1_databases: [
48
+ {
49
+ binding: "D1_TESTING_SOMETHING",
50
+ database_name: "D1_BINDING",
51
+ database_id: "1234",
52
+ },
53
+ ],
54
+ services: [{ binding: "SERVICE_BINDING", service: "SERVICE_NAME" }],
55
+ analytics_engine_datasets: [
56
+ {
57
+ binding: "AE_DATASET_BINDING",
58
+ dataset: "AE_DATASET_TEST",
59
+ },
60
+ ],
61
+ dispatch_namespaces: [
62
+ { binding: "NAMESPACE_BINDING", namespace: "NAMESPACE_ID" },
63
+ ],
64
+ logfwdr: {
65
+ schema: "LOGFWDER_SCHEMA",
66
+ bindings: [{ name: "LOGFWDR_BINDING", destination: "LOGFWDR_DESTINATION" }],
67
+ },
68
+ data_blobs: {
69
+ SOME_DATA_BLOB1: "SOME_DATA_BLOB1.bin",
70
+ SOME_DATA_BLOB2: "SOME_DATA_BLOB2.bin",
71
+ },
72
+ text_blobs: {
73
+ SOME_TEXT_BLOB1: "SOME_TEXT_BLOB1.txt",
74
+ SOME_TEXT_BLOB2: "SOME_TEXT_BLOB2.txt",
75
+ },
76
+ wasm_modules: { MODULE1: "module1.wasm", MODULE2: "module2.wasm" },
77
+ unsafe: {
78
+ bindings: [{ name: "testing_unsafe", type: "plain_text" }],
79
+ },
80
+ rules: [
81
+ {
82
+ type: "Text",
83
+ globs: ["**/*.txt"],
84
+ fallthrough: true,
85
+ },
86
+ {
87
+ type: "Data",
88
+ globs: ["**/*.webp"],
89
+ fallthrough: true,
90
+ },
91
+ { type: "CompiledWasm", globs: ["**/*.wasm"], fallthrough: true },
92
+ ],
93
+ };
94
+
95
+ describe("generateTypes()", () => {
96
+ const std = mockConsoleMethods();
97
+ runInTempDir();
98
+
99
+ it("should log the interface type generated and declare modules", async () => {
100
+ fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
101
+ fs.writeFileSync(
102
+ "./wrangler.toml",
103
+ TOML.stringify({
104
+ compatibility_date: "2022-01-12",
105
+ name: "test-name",
106
+ main: "./index.ts",
107
+ ...bindingsConfigMock,
108
+ unsafe: bindingsConfigMock.unsafe ?? {},
109
+ } as unknown as TOML.JsonMap),
110
+ "utf-8"
111
+ );
112
+
113
+ await runWrangler("types");
114
+ expect(std.out).toMatchInlineSnapshot(`
115
+ "interface Env {
116
+ TEST_KV_NAMESPACE: KVNamespace;
117
+ SOMETHING: \\"asdasdfasdf\\";
118
+ ANOTHER: \\"thing\\";
119
+ OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
120
+ DURABLE_TEST1: DurableObjectNamespace;
121
+ DURABLE_TEST2: DurableObjectNamespace;
122
+ R2_BUCKET_BINDING: R2Bucket;
123
+ D1_TESTING_SOMETHING: D1Database;
124
+ SERVICE_BINDING: Fetcher;
125
+ AE_DATASET_BINDING: AnalyticsEngineDataset;
126
+ NAMESPACE_BINDING: any;
127
+ LOGFWDR_SCHEMA: any;
128
+ SOME_DATA_BLOB1: ArrayBuffer;
129
+ SOME_DATA_BLOB2: ArrayBuffer;
130
+ SOME_TEXT_BLOB1: string;
131
+ SOME_TEXT_BLOB2: string;
132
+ testing_unsafe: any;
133
+ TEST_QUEUE_BINDING: Queue;
134
+ }
135
+ declare module \\"*.txt\\" {
136
+ const value: string;
137
+ export default value;
138
+ }
139
+ declare module \\"*.webp\\" {
140
+ const value: ArrayBuffer;
141
+ export default value;
142
+ }
143
+ declare module \\"*.wasm\\" {
144
+ const value: WebAssembly.Module;
145
+ export default value;
146
+ }"
147
+ `);
148
+ });
149
+
150
+ it("should create a DTS file at the location that the command is executed from", async () => {
151
+ fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
152
+ fs.writeFileSync(
153
+ "./wrangler.toml",
154
+ TOML.stringify({
155
+ compatibility_date: "2022-01-12",
156
+ name: "test-name",
157
+ main: "./index.ts",
158
+ vars: bindingsConfigMock.vars,
159
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
160
+ } as any),
161
+ "utf-8"
162
+ );
163
+ await runWrangler("types");
164
+ expect(fs.existsSync("./worker-configuration.d.ts")).toBe(true);
165
+ });
166
+
167
+ it("should not create DTS file if there is nothing in the config to generate types from", async () => {
168
+ fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
169
+ fs.writeFileSync(
170
+ "./wrangler.toml",
171
+ TOML.stringify({
172
+ compatibility_date: "2022-01-12",
173
+ name: "test-name",
174
+ main: "./index.ts",
175
+ }),
176
+ "utf-8"
177
+ );
178
+
179
+ await runWrangler("types");
180
+ expect(fs.existsSync("./worker-configuration.d.ts")).toBe(false);
181
+ expect(std.out).toMatchInlineSnapshot(`""`);
182
+ });
183
+
184
+ it("should create a DTS file at the location that the command is executed from", async () => {
185
+ fs.writeFileSync(
186
+ "./worker-configuration.d.ts",
187
+ "NOT THE CONTENTS OF THE GENERATED FILE"
188
+ );
189
+ fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
190
+ fs.writeFileSync(
191
+ "./wrangler.toml",
192
+ TOML.stringify({
193
+ compatibility_date: "2022-01-12",
194
+ name: "test-name",
195
+ main: "./index.ts",
196
+ vars: bindingsConfigMock.vars,
197
+ } as TOML.JsonMap),
198
+ "utf-8"
199
+ );
200
+
201
+ await expect(runWrangler("types")).rejects.toMatchInlineSnapshot(
202
+ `[Error: A non-wrangler worker-configuration.d.ts already exists, please rename and try again.]`
203
+ );
204
+ expect(fs.existsSync("./worker-configuration.d.ts")).toBe(true);
205
+ });
206
+
207
+ it("should log the declare global type generated and declare modules", async () => {
208
+ fs.writeFileSync(
209
+ "./index.ts",
210
+ `addEventListener('fetch', event => { event.respondWith(handleRequest(event.request));
211
+ }); async function handleRequest(request) { return new Response('Hello worker!', {headers: { 'content-type': 'text/plain' },});}`
212
+ );
213
+ fs.writeFileSync(
214
+ "./wrangler.toml",
215
+ TOML.stringify({
216
+ compatibility_date: "2022-01-12",
217
+ name: "test-name",
218
+ main: "./index.ts",
219
+ unsafe: bindingsConfigMock.unsafe ?? {},
220
+ } as TOML.JsonMap),
221
+ "utf-8"
222
+ );
223
+
224
+ await runWrangler("types");
225
+ expect(std.out).toMatchInlineSnapshot(`
226
+ "export {};
227
+ declare global {
228
+ const testing_unsafe: any;
229
+ }
230
+ "
231
+ `);
232
+ });
233
+ });
@@ -1,131 +1,129 @@
1
- import fs from "node:fs";
2
- import os from "node:os";
3
- import path from "node:path";
4
- import fetchMock from "jest-fetch-mock";
1
+ import { rest } from "msw";
2
+ import { CI } from "../is-ci";
5
3
  import {
6
- readAuthConfigFile,
7
- requireAuth,
8
- USER_AUTH_CONFIG_FILE,
9
- writeAuthConfigFile,
4
+ loginOrRefreshIfRequired,
5
+ readAuthConfigFile,
6
+ requireAuth,
7
+ writeAuthConfigFile,
10
8
  } from "../user";
11
9
  import { mockConsoleMethods } from "./helpers/mock-console";
12
10
  import { useMockIsTTY } from "./helpers/mock-istty";
13
11
  import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
12
+ import {
13
+ msw,
14
+ mswSuccessOauthHandlers,
15
+ mswSuccessUserHandlers,
16
+ } from "./helpers/msw";
14
17
  import { runInTempDir } from "./helpers/run-in-tmp";
15
18
  import { runWrangler } from "./helpers/run-wrangler";
16
19
  import type { Config } from "../config";
17
20
  import type { UserAuthConfig } from "../user";
18
21
 
19
22
  describe("User", () => {
20
- runInTempDir({ homedir: "./home" });
21
- const std = mockConsoleMethods();
22
- const {
23
- mockOAuthServerCallback,
24
- mockGrantAccessToken,
25
- mockGrantAuthorization,
26
- mockRevokeAuthorization,
27
- mockExchangeRefreshTokenForAccessToken,
28
- } = mockOAuthFlow();
29
-
30
- const { setIsTTY } = useMockIsTTY();
31
-
32
- describe("login", () => {
33
- it("should login a user when `wrangler login` is run", async () => {
34
- mockOAuthServerCallback();
35
- const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
36
- mockGrantAuthorization({ respondWith: "success" });
37
-
38
- await runWrangler("login");
39
-
40
- expect(accessTokenRequest.actual.url).toEqual(
41
- accessTokenRequest.expected.url
42
- );
43
- expect(accessTokenRequest.actual.method).toEqual(
44
- accessTokenRequest.expected.method
45
- );
46
-
47
- expect(std.out).toMatchInlineSnapshot(`
48
- "Attempting to login via OAuth...
49
- Successfully logged in."
50
- `);
51
-
52
- expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
53
- api_token: undefined,
54
- oauth_token: "test-access-token",
55
- refresh_token: "test-refresh-token",
56
- expiration_time: expect.any(String),
57
- });
58
- });
59
- });
60
-
61
- describe("logout", () => {
62
- it("should exit with a message stating the user is not logged in", async () => {
63
- await runWrangler("logout");
64
- expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
65
- });
66
-
67
- it("should logout user that has been properly logged in", async () => {
68
- writeAuthConfigFile({
69
- oauth_token: "some-oauth-tok",
70
- refresh_token: "some-refresh-tok",
71
- });
72
- const outcome = mockRevokeAuthorization();
73
-
74
- await runWrangler("logout");
75
-
76
- expect(outcome.actual.url).toEqual(
77
- "https://dash.cloudflare.com/oauth2/revoke"
78
- );
79
- expect(outcome.actual.method).toEqual("POST");
80
-
81
- expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
82
-
83
- // Make sure that we made the request to logout.
84
- expect(fetchMock).toHaveBeenCalledTimes(1);
85
-
86
- // Make sure that logout removed the config file containing the auth tokens.
87
- const config = path.join(os.homedir(), USER_AUTH_CONFIG_FILE);
88
- expect(fs.existsSync(config)).toBeFalsy();
89
- });
90
- });
91
-
92
- // TODO: Improve OAuth mocking to handle `/token` endpoints from different calls
93
- it("should handle errors for failed token refresh", async () => {
94
- setIsTTY(false);
95
- mockOAuthServerCallback();
96
- writeAuthConfigFile({
97
- oauth_token: "hunter2",
98
- refresh_token: "Order 66",
99
- });
100
- mockGrantAuthorization({ respondWith: "success" });
101
-
102
- mockExchangeRefreshTokenForAccessToken({
103
- respondWith: "badResponse",
104
- });
105
-
106
- // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
107
- await expect(
108
- requireAuth({} as Config)
109
- ).rejects.toThrowErrorMatchingInlineSnapshot(
110
- `"Did not login, quitting..."`
111
- );
112
- });
113
-
114
- it("should confirm no error message when refresh is successful", async () => {
115
- setIsTTY(false);
116
- mockOAuthServerCallback();
117
- writeAuthConfigFile({
118
- oauth_token: "hunter2",
119
- refresh_token: "Order 66",
120
- });
121
- mockGrantAuthorization({ respondWith: "success" });
122
-
123
- mockExchangeRefreshTokenForAccessToken({
124
- respondWith: "refreshSuccess",
125
- });
126
-
127
- // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
128
- await expect(requireAuth({} as Config)).rejects.toThrowError();
129
- expect(std.err).toContain("");
130
- });
23
+ let isCISpy: jest.SpyInstance;
24
+ runInTempDir();
25
+ const std = mockConsoleMethods();
26
+ // TODO: Implement these two mocks with MSW
27
+ const { mockOAuthServerCallback } = mockOAuthFlow();
28
+ const { setIsTTY } = useMockIsTTY();
29
+
30
+ beforeEach(() => {
31
+ msw.use(...mswSuccessOauthHandlers, ...mswSuccessUserHandlers);
32
+ isCISpy = jest.spyOn(CI, "isCI").mockReturnValue(false);
33
+ });
34
+
35
+ describe("login", () => {
36
+ it("should login a user when `wrangler login` is run", async () => {
37
+ mockOAuthServerCallback("success");
38
+
39
+ let counter = 0;
40
+ msw.use(
41
+ rest.post("*/oauth2/token", async (_, response, context) => {
42
+ counter += 1;
43
+
44
+ return response.once(
45
+ context.status(200),
46
+ context.json({
47
+ access_token: "test-access-token",
48
+ expires_in: 100000,
49
+ refresh_token: "test-refresh-token",
50
+ scope: "account:read",
51
+ })
52
+ );
53
+ })
54
+ );
55
+
56
+ await runWrangler("login");
57
+
58
+ expect(counter).toBe(1);
59
+ expect(std.out).toMatchInlineSnapshot(`
60
+ "Attempting to login via OAuth...
61
+ Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
62
+ Successfully logged in."
63
+ `);
64
+ expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
65
+ api_token: undefined,
66
+ oauth_token: "test-access-token",
67
+ refresh_token: "test-refresh-token",
68
+ expiration_time: expect.any(String),
69
+ scopes: ["account:read"],
70
+ });
71
+ });
72
+ });
73
+
74
+ it("should handle errors for failed token refresh in a non-interactive environment", async () => {
75
+ setIsTTY(false);
76
+ writeAuthConfigFile({
77
+ oauth_token: "hunter2",
78
+ refresh_token: "Order 66",
79
+ });
80
+ // TODO: Use MSW to handle `/token` endpoints from different calls
81
+ let counter = 0;
82
+ msw.use(
83
+ rest.post("*/oauth2/token", async (request, response, context) => {
84
+ counter += 1;
85
+ return response.once(
86
+ context.status(400),
87
+ context.body(
88
+ `<html> <body> This shouldn't be sent, but should be handled </body> </html>`
89
+ )
90
+ );
91
+ })
92
+ );
93
+
94
+ // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
95
+ await expect(
96
+ requireAuth({} as Config)
97
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
98
+ `"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."`
99
+ );
100
+ expect(counter).toBe(0);
101
+ });
102
+
103
+ it("should confirm no error message when refresh is successful", async () => {
104
+ setIsTTY(false);
105
+ writeAuthConfigFile({
106
+ oauth_token: "hunter2",
107
+ refresh_token: "Order 66",
108
+ });
109
+
110
+ // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
111
+ await expect(requireAuth({} as Config)).rejects.toThrowError();
112
+ expect(std.err).toContain("");
113
+ });
114
+
115
+ it("should revert to non-interactive mode if in CI", async () => {
116
+ isCISpy.mockReturnValue(true);
117
+ await expect(loginOrRefreshIfRequired()).resolves.toEqual(false);
118
+ });
119
+
120
+ it("should revert to non-interactive mode if isTTY throws an error", async () => {
121
+ setIsTTY({
122
+ stdin() {
123
+ throw new Error("stdin is not tty");
124
+ },
125
+ stdout: true,
126
+ });
127
+ await expect(loginOrRefreshIfRequired()).resolves.toEqual(false);
128
+ });
131
129
  });
@@ -0,0 +1,47 @@
1
+ import { collectKeyValues } from "../utils/collectKeyValues";
2
+
3
+ describe("collectKeyValues()", () => {
4
+ it("should return an empty object when passed undefined", () => {
5
+ expect(collectKeyValues(undefined)).toEqual({});
6
+ });
7
+
8
+ it("should return an empty object when passed an empty array", () => {
9
+ expect(collectKeyValues([])).toEqual({});
10
+ });
11
+
12
+ it("should parse a key:value string with no value by returning an empty string for the value", () => {
13
+ expect(collectKeyValues(["some-string-with-no-colon"])).toEqual({
14
+ "some-string-with-no-colon": "",
15
+ });
16
+ });
17
+
18
+ it("should return an object with a single key/value pair when passed an array with a single string", () => {
19
+ expect(collectKeyValues(["some-key:some-value"])).toEqual({
20
+ "some-key": "some-value",
21
+ });
22
+ });
23
+
24
+ it("should return an object with multiple key/value pairs when passed an array with multiple strings", () => {
25
+ expect(
26
+ collectKeyValues([
27
+ "some-key:some-value",
28
+ "some-other-key:some-other-value",
29
+ ])
30
+ ).toEqual({
31
+ "some-key": "some-value",
32
+ "some-other-key": "some-other-value",
33
+ });
34
+ });
35
+
36
+ it("should return an object with multiple key/value pairs when passed an array with multiple strings with multiple colons", () => {
37
+ expect(
38
+ collectKeyValues([
39
+ "some-key:https://some-value.com",
40
+ "some-other-key:https://some-other-value.com",
41
+ ])
42
+ ).toEqual({
43
+ "some-key": "https://some-value.com",
44
+ "some-other-key": "https://some-other-value.com",
45
+ });
46
+ });
47
+ });
@@ -0,0 +1,56 @@
1
+ import { validateDevProps } from "../dev/validate-dev-props";
2
+ import type { DevProps } from "../dev/dev";
3
+
4
+ describe("validateDevProps", () => {
5
+ it("should throw if the user tries to use the service-worker format with an `assets` directory", () => {
6
+ const props = {
7
+ isWorkersSite: false,
8
+ assetPaths: ["assets"],
9
+ entry: { format: "service-worker" },
10
+ bindings: {},
11
+ };
12
+
13
+ expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
14
+ "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
15
+ );
16
+ });
17
+
18
+ it("should throw if the user tries to configure [wasm_modules] with an ES module worker", () => {
19
+ const props = {
20
+ isWorkersSite: false,
21
+ assetPaths: [],
22
+ entry: { format: "modules" },
23
+ bindings: { wasm_modules: true },
24
+ };
25
+
26
+ expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
27
+ "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
28
+ );
29
+ });
30
+
31
+ it("should throw if the user tries to configure [text_blobs] with an ES module worker", () => {
32
+ const props = {
33
+ isWorkersSite: false,
34
+ assetPaths: [],
35
+ entry: { format: "modules" },
36
+ bindings: { text_blobs: true },
37
+ };
38
+
39
+ expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
40
+ "You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
41
+ );
42
+ });
43
+
44
+ it("should throw if the user tries to configure [data_blobs] with an ES module worker", () => {
45
+ const props = {
46
+ isWorkersSite: false,
47
+ assetPaths: [],
48
+ entry: { format: "modules" },
49
+ bindings: { data_blobs: true },
50
+ };
51
+
52
+ expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
53
+ "You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
54
+ );
55
+ });
56
+ });
@@ -0,0 +1,35 @@
1
+ import { version } from "./../../package.json";
2
+ import { mockConsoleMethods } from "./helpers/mock-console";
3
+ import { useMockIsTTY } from "./helpers/mock-istty";
4
+ import { runWrangler } from "./helpers/run-wrangler";
5
+
6
+ describe("version", () => {
7
+ const std = mockConsoleMethods();
8
+ const { setIsTTY } = useMockIsTTY();
9
+
10
+ // We cannot test output of version banner,
11
+ // as it is disabled in jest environments
12
+
13
+ // it("should output version banner", async () => {
14
+ // await runWrangler("-v");
15
+ // expect(std.out).toMatchInlineSnapshot(`
16
+ // " ⛅️ wrangler 2.0.22
17
+ // --------------------"
18
+ // `);
19
+ // });
20
+
21
+ it("should output current version if !isTTY calling -v", async () => {
22
+ setIsTTY(false);
23
+
24
+ await runWrangler("-v");
25
+ expect(std.out).toMatch(version);
26
+ });
27
+
28
+ // This run separately as command handling is different
29
+ it("should output current version if !isTTY calling --version", async () => {
30
+ setIsTTY(false);
31
+
32
+ await runWrangler("--version");
33
+ expect(std.out).toMatch(version);
34
+ });
35
+ });