wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

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 (239) hide show
  1. package/README.md +16 -2
  2. package/bin/wrangler.js +31 -11
  3. package/miniflare-dist/index.mjs +1340 -330
  4. package/package.json +40 -13
  5. package/src/__tests__/access.test.ts +25 -0
  6. package/src/__tests__/api-dev.test.ts +238 -0
  7. package/src/__tests__/api-devregistry.test.js +64 -0
  8. package/src/__tests__/api.test.ts +80 -0
  9. package/src/__tests__/configuration.test.ts +683 -470
  10. package/src/__tests__/d1.test.ts +123 -0
  11. package/src/__tests__/delete.test.ts +263 -0
  12. package/src/__tests__/deployments.test.ts +105 -0
  13. package/src/__tests__/dev.test.tsx +453 -70
  14. package/src/__tests__/dialogs.test.tsx +40 -0
  15. package/src/__tests__/generate.test.ts +235 -0
  16. package/src/__tests__/get-host-from-url.test.ts +16 -0
  17. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  18. package/src/__tests__/helpers/mock-cfetch.ts +92 -26
  19. package/src/__tests__/helpers/mock-console.ts +11 -2
  20. package/src/__tests__/helpers/mock-dialogs.ts +1 -1
  21. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  22. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  23. package/src/__tests__/helpers/mock-kv.ts +1 -1
  24. package/src/__tests__/helpers/mock-oauth-flow.ts +74 -53
  25. package/src/__tests__/helpers/mock-process.ts +8 -13
  26. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  27. package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
  28. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  29. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  30. package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
  31. package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
  32. package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
  33. package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
  34. package/src/__tests__/helpers/msw/index.ts +21 -0
  35. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  36. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  37. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  38. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  39. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  40. package/src/__tests__/index.test.ts +103 -97
  41. package/src/__tests__/init.test.ts +1484 -382
  42. package/src/__tests__/jest.setup.ts +88 -5
  43. package/src/__tests__/kv.test.ts +655 -540
  44. package/src/__tests__/logout.test.ts +47 -0
  45. package/src/__tests__/metrics.test.ts +95 -45
  46. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  47. package/src/__tests__/middleware.test.ts +750 -0
  48. package/src/__tests__/pages-deployment-tail.test.ts +884 -0
  49. package/src/__tests__/pages.test.ts +1301 -119
  50. package/src/__tests__/paths.test.ts +39 -0
  51. package/src/__tests__/publish.test.ts +2266 -1180
  52. package/src/__tests__/pubsub.test.ts +211 -88
  53. package/src/__tests__/queues.test.ts +522 -0
  54. package/src/__tests__/r2.test.ts +363 -203
  55. package/src/__tests__/secret.test.ts +261 -59
  56. package/src/__tests__/tail.test.ts +352 -151
  57. package/src/__tests__/test-old-node-version.js +3 -3
  58. package/src/__tests__/tsconfig-sanity.ts +12 -0
  59. package/src/__tests__/tsconfig.json +8 -0
  60. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  61. package/src/__tests__/type-generation.test.ts +233 -0
  62. package/src/__tests__/user.test.ts +59 -73
  63. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  64. package/src/__tests__/validate-dev-props.test.ts +56 -0
  65. package/src/__tests__/whoami.test.tsx +114 -66
  66. package/src/__tests__/worker-namespace.test.ts +154 -155
  67. package/src/api/dev.ts +170 -38
  68. package/src/api/index.ts +1 -0
  69. package/src/bundle-reporter.tsx +41 -2
  70. package/src/bundle.ts +668 -81
  71. package/src/cfetch/index.ts +40 -3
  72. package/src/cfetch/internal.ts +144 -32
  73. package/src/cli.ts +4 -3
  74. package/src/config/config.ts +27 -3
  75. package/src/config/environment.ts +131 -7
  76. package/src/config/index.ts +128 -8
  77. package/src/config/validation-helpers.ts +19 -6
  78. package/src/config/validation.ts +411 -14
  79. package/src/config-cache.ts +3 -2
  80. package/src/create-worker-preview.ts +31 -6
  81. package/src/create-worker-upload-form.ts +84 -22
  82. package/src/d1/backups.tsx +223 -0
  83. package/src/d1/constants.ts +2 -0
  84. package/src/d1/create.tsx +63 -0
  85. package/src/d1/delete.tsx +56 -0
  86. package/src/d1/execute.tsx +352 -0
  87. package/src/d1/formatTimeAgo.ts +14 -0
  88. package/src/d1/index.ts +101 -0
  89. package/src/d1/list.tsx +48 -0
  90. package/src/d1/migrations/apply.tsx +196 -0
  91. package/src/d1/migrations/create.tsx +77 -0
  92. package/src/d1/migrations/helpers.ts +147 -0
  93. package/src/d1/migrations/index.tsx +3 -0
  94. package/src/d1/migrations/list.tsx +79 -0
  95. package/src/d1/migrations/options.ts +18 -0
  96. package/src/d1/options.ts +22 -0
  97. package/src/d1/types.tsx +24 -0
  98. package/src/d1/utils.ts +48 -0
  99. package/src/delete.ts +108 -0
  100. package/src/deployments.ts +83 -0
  101. package/src/deprecated/index.ts +145 -0
  102. package/src/dev/dev-vars.ts +11 -8
  103. package/src/dev/dev.tsx +220 -58
  104. package/src/dev/get-local-persistence-path.tsx +31 -0
  105. package/src/dev/local.tsx +740 -181
  106. package/src/dev/remote.tsx +340 -123
  107. package/src/dev/start-server.ts +543 -0
  108. package/src/dev/use-esbuild.ts +61 -7
  109. package/src/dev/validate-dev-props.ts +31 -0
  110. package/src/dev-registry.tsx +201 -0
  111. package/src/dev.tsx +614 -258
  112. package/src/dialogs.tsx +41 -8
  113. package/src/{worker-namespace.ts → dispatch-namespace.ts} +23 -22
  114. package/src/docs/index.ts +97 -0
  115. package/src/entry.ts +3 -2
  116. package/src/environment-variables/factory.ts +88 -0
  117. package/src/environment-variables/misc-variables.ts +30 -0
  118. package/src/generate/index.ts +300 -0
  119. package/src/git-client.ts +100 -7
  120. package/src/index.tsx +249 -1560
  121. package/src/init.ts +626 -150
  122. package/src/inspect.ts +137 -32
  123. package/src/{metrics/is-ci.ts → is-ci.ts} +0 -0
  124. package/src/is-interactive.ts +4 -0
  125. package/src/jest.d.ts +4 -0
  126. package/src/{kv.ts → kv/helpers.ts} +3 -3
  127. package/src/kv/index.ts +596 -0
  128. package/src/logger.ts +27 -8
  129. package/src/metrics/index.ts +1 -0
  130. package/src/metrics/metrics-config.ts +4 -4
  131. package/src/metrics/metrics-dispatcher.ts +1 -0
  132. package/src/metrics/metrics-usage-headers.ts +24 -0
  133. package/src/metrics/send-event.ts +13 -8
  134. package/src/miniflare-cli/assets.ts +172 -465
  135. package/src/miniflare-cli/index.ts +149 -24
  136. package/src/miniflare-cli/tsconfig.json +9 -0
  137. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  138. package/src/miniflare-cli/types.ts +11 -0
  139. package/src/module-collection.ts +12 -3
  140. package/src/pages/build.tsx +108 -42
  141. package/src/pages/constants.ts +11 -0
  142. package/src/pages/deployment-tails.tsx +284 -0
  143. package/src/pages/deployments.tsx +9 -31
  144. package/src/pages/dev.tsx +417 -108
  145. package/src/pages/errors.ts +66 -0
  146. package/src/pages/functions/buildPlugin.ts +86 -84
  147. package/src/pages/functions/buildWorker.ts +121 -106
  148. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  149. package/src/pages/functions/routes-consolidation.ts +73 -0
  150. package/src/pages/functions/routes-transformation.test.ts +282 -0
  151. package/src/pages/functions/routes-transformation.ts +115 -0
  152. package/src/pages/functions/routes-validation.test.ts +403 -0
  153. package/src/pages/functions/routes-validation.ts +202 -0
  154. package/src/pages/functions/tsconfig.json +8 -0
  155. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  156. package/src/pages/functions.tsx +82 -0
  157. package/src/pages/hash.tsx +13 -0
  158. package/src/pages/index.tsx +73 -55
  159. package/src/pages/projects.tsx +9 -3
  160. package/src/pages/prompt-select-project.tsx +31 -0
  161. package/src/pages/publish.tsx +183 -60
  162. package/src/pages/types.ts +1 -0
  163. package/src/pages/upload.tsx +107 -56
  164. package/src/pages/utils.ts +13 -2
  165. package/src/paths.ts +49 -4
  166. package/src/proxy.ts +375 -157
  167. package/src/publish/index.ts +270 -0
  168. package/src/{publish.ts → publish/publish.ts} +431 -188
  169. package/src/pubsub/pubsub-commands.tsx +4 -3
  170. package/src/queues/cli/commands/consumer/add.ts +71 -0
  171. package/src/queues/cli/commands/consumer/index.ts +22 -0
  172. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  173. package/src/queues/cli/commands/create.ts +25 -0
  174. package/src/queues/cli/commands/delete.ts +26 -0
  175. package/src/queues/cli/commands/index.ts +36 -0
  176. package/src/queues/cli/commands/list.ts +25 -0
  177. package/src/queues/client.ts +135 -0
  178. package/src/queues/utils.ts +18 -0
  179. package/src/r2/constants.ts +4 -0
  180. package/src/r2/helpers.ts +131 -0
  181. package/src/r2/index.ts +289 -0
  182. package/src/routes.ts +140 -0
  183. package/src/secret/index.ts +379 -0
  184. package/src/sites.tsx +3 -3
  185. package/src/tail/createTail.ts +379 -0
  186. package/src/tail/filters.ts +4 -6
  187. package/src/tail/index.ts +199 -284
  188. package/src/tail/printing.ts +43 -3
  189. package/src/tsconfig-sanity.ts +16 -0
  190. package/src/type-generation.ts +181 -0
  191. package/src/user/access.ts +68 -0
  192. package/src/user/auth-variables.ts +113 -0
  193. package/src/user/choose-account.tsx +1 -1
  194. package/src/user/index.ts +0 -1
  195. package/src/user/user.tsx +116 -49
  196. package/src/utils/collectKeyValues.ts +14 -0
  197. package/src/whoami.tsx +80 -2
  198. package/src/worker.ts +69 -9
  199. package/src/yargs-types.ts +24 -0
  200. package/src/zones.ts +124 -9
  201. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  202. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  203. package/templates/__tests__/tsconfig.json +8 -0
  204. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  205. package/templates/d1-beta-facade.js +205 -0
  206. package/templates/facade.d.ts +14 -0
  207. package/templates/first-party-worker-module-facade.ts +19 -0
  208. package/templates/format-dev-errors.ts +33 -0
  209. package/templates/init-tests/test-jest-new-worker.js +23 -0
  210. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  211. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  212. package/templates/middleware/common.ts +62 -0
  213. package/templates/middleware/loader-modules.ts +82 -0
  214. package/templates/middleware/loader-sw.ts +233 -0
  215. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  216. package/templates/middleware/middleware-pretty-error.ts +40 -0
  217. package/templates/middleware/middleware-scheduled.ts +15 -0
  218. package/templates/new-worker.js +1 -1
  219. package/templates/pages-dev-pipeline.ts +31 -0
  220. package/templates/pages-dev-util.ts +52 -0
  221. package/templates/pages-shim.ts +4 -1
  222. package/templates/pages-template-plugin.ts +21 -5
  223. package/templates/pages-template-worker.ts +37 -9
  224. package/templates/{static-asset-facade.js → serve-static-assets.ts} +23 -7
  225. package/templates/service-bindings-module-facade.js +54 -0
  226. package/templates/service-bindings-sw-facade.js +42 -0
  227. package/templates/tsconfig-sanity.ts +11 -0
  228. package/templates/tsconfig.init.json +106 -0
  229. package/templates/tsconfig.json +5 -102
  230. package/templates/tsconfig.tsbuildinfo +1 -0
  231. package/wrangler-dist/cli.d.ts +621 -42
  232. package/wrangler-dist/cli.js +144441 -102606
  233. package/src/environment-variables.ts +0 -35
  234. package/src/faye-websocket.d.ts +0 -6
  235. package/src/generate.ts +0 -33
  236. package/src/miniflare-cli/enum-keys.ts +0 -17
  237. package/src/preview.ts +0 -31
  238. package/src/r2.ts +0 -50
  239. package/src/user/env-vars.ts +0 -46
@@ -1,233 +1,393 @@
1
+ import * as fs from "node:fs";
2
+ import { rest } from "msw";
3
+ import prettyBytes from "pretty-bytes";
4
+ import { MAX_UPLOAD_SIZE } from "../r2/constants";
1
5
  import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
2
- import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
3
6
  import { mockConsoleMethods } from "./helpers/mock-console";
7
+ import { msw, mswSuccessR2handlers } from "./helpers/msw";
4
8
  import { runInTempDir } from "./helpers/run-in-tmp";
5
9
  import { runWrangler } from "./helpers/run-wrangler";
6
- import type { R2BucketInfo } from "../r2";
10
+ import type { R2BucketInfo } from "../r2/helpers";
11
+
12
+ describe("r2", () => {
13
+ const std = mockConsoleMethods();
14
+ beforeEach(() => msw.use(...mswSuccessR2handlers));
7
15
 
8
- describe("wrangler", () => {
9
16
  mockAccountId();
10
17
  mockApiToken();
11
18
  runInTempDir();
12
- const std = mockConsoleMethods();
13
19
 
14
- afterEach(() => {
15
- unsetAllMocks();
16
- });
20
+ describe("bucket", () => {
21
+ it("should show the correct help when an invalid command is passed", async () => {
22
+ await expect(() =>
23
+ runWrangler("r2 bucket foo")
24
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"Unknown argument: foo"`);
25
+ expect(std.err).toMatchInlineSnapshot(`
26
+ "X [ERROR] Unknown argument: foo
27
+
28
+ "
29
+ `);
30
+ expect(std.out).toMatchInlineSnapshot(`
31
+ "
32
+ wrangler r2 bucket
33
+
34
+ Manage R2 buckets
35
+
36
+ Commands:
37
+ wrangler r2 bucket create <name> Create a new R2 bucket
38
+ wrangler r2 bucket list List R2 buckets
39
+ wrangler r2 bucket delete <name> Delete an R2 bucket
40
+
41
+ Flags:
42
+ -c, --config Path to .toml configuration file [string]
43
+ -e, --env Environment to use for operations and .env files [string]
44
+ -h, --help Show help [boolean]
45
+ -v, --version Show version number [boolean]"
46
+ `);
47
+ });
48
+
49
+ describe("list", () => {
50
+ it("should list buckets & check request inputs", async () => {
51
+ const expectedBuckets: R2BucketInfo[] = [
52
+ { name: "bucket-1-local-once", creation_date: "01-01-2001" },
53
+ { name: "bucket-2-local-once", creation_date: "01-01-2001" },
54
+ ];
55
+ msw.use(
56
+ rest.get(
57
+ "*/accounts/:accountId/r2/buckets",
58
+ async (request, response, context) => {
59
+ const { accountId } = request.params;
60
+ expect(accountId).toEqual("some-account-id");
61
+ expect(await request.text()).toEqual("");
62
+ return response.once(
63
+ context.status(200),
64
+ context.json({
65
+ success: true,
66
+ errors: [],
67
+ messages: [],
68
+ result: {
69
+ buckets: [
70
+ {
71
+ name: "bucket-1-local-once",
72
+ creation_date: "01-01-2001",
73
+ },
74
+ {
75
+ name: "bucket-2-local-once",
76
+ creation_date: "01-01-2001",
77
+ },
78
+ ],
79
+ },
80
+ })
81
+ );
82
+ }
83
+ )
84
+ );
85
+ await runWrangler("r2 bucket list");
86
+
87
+ expect(std.err).toMatchInlineSnapshot(`""`);
88
+ const buckets = JSON.parse(std.out);
89
+ expect(buckets).toEqual(expectedBuckets);
90
+ });
91
+ });
92
+
93
+ describe("create", () => {
94
+ it("should error if no bucket name is given", async () => {
95
+ await expect(
96
+ runWrangler("r2 bucket create")
97
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
98
+ `"Not enough non-option arguments: got 0, need at least 1"`
99
+ );
100
+ expect(std.out).toMatchInlineSnapshot(`
101
+ "
102
+ wrangler r2 bucket create <name>
103
+
104
+ Create a new R2 bucket
17
105
 
18
- describe("r2", () => {
19
- describe("bucket", () => {
20
- it("should show the correct help when an invalid command is passed", async () => {
21
- await expect(() =>
22
- runWrangler("r2 bucket foo")
23
- ).rejects.toThrowErrorMatchingInlineSnapshot(`"Unknown argument: foo"`);
106
+ Positionals:
107
+ name The name of the new bucket [string] [required]
108
+
109
+ Flags:
110
+ -c, --config Path to .toml configuration file [string]
111
+ -e, --env Environment to use for operations and .env files [string]
112
+ -h, --help Show help [boolean]
113
+ -v, --version Show version number [boolean]"
114
+ `);
24
115
  expect(std.err).toMatchInlineSnapshot(`
25
- "X [ERROR] Unknown argument: foo
116
+ "X [ERROR] Not enough non-option arguments: got 0, need at least 1
117
+
118
+ "
119
+ `);
120
+ });
26
121
 
27
- "
28
- `);
122
+ it("should error if the bucket to create contains spaces", async () => {
123
+ await expect(
124
+ runWrangler("r2 bucket create abc def ghi")
125
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
126
+ `"Unknown arguments: def, ghi"`
127
+ );
29
128
  expect(std.out).toMatchInlineSnapshot(`
30
- "
31
- wrangler r2 bucket
129
+ "
130
+ wrangler r2 bucket create <name>
32
131
 
33
- Manage R2 buckets
132
+ Create a new R2 bucket
34
133
 
35
- Commands:
36
- wrangler r2 bucket create <name> Create a new R2 bucket
37
- wrangler r2 bucket list List R2 buckets
38
- wrangler r2 bucket delete <name> Delete an R2 bucket
134
+ Positionals:
135
+ name The name of the new bucket [string] [required]
39
136
 
40
- Flags:
41
- -c, --config Path to .toml configuration file [string]
42
- -h, --help Show help [boolean]
43
- -v, --version Show version number [boolean]"
44
- `);
137
+ Flags:
138
+ -c, --config Path to .toml configuration file [string]
139
+ -e, --env Environment to use for operations and .env files [string]
140
+ -h, --help Show help [boolean]
141
+ -v, --version Show version number [boolean]"
142
+ `);
143
+ expect(std.err).toMatchInlineSnapshot(`
144
+ "X [ERROR] Unknown arguments: def, ghi
145
+
146
+ "
147
+ `);
45
148
  });
46
149
 
47
- describe("list", () => {
48
- function mockListRequest(buckets: R2BucketInfo[]) {
49
- const requests = { count: 0 };
50
- setMockResponse(
51
- "/accounts/:accountId/r2/buckets",
52
- ([_url, accountId], init) => {
53
- requests.count++;
150
+ it("should create a bucket & check request inputs", async () => {
151
+ msw.use(
152
+ rest.post(
153
+ "*/accounts/:accountId/r2/buckets",
154
+ async (request, response, context) => {
155
+ const { accountId } = request.params;
54
156
  expect(accountId).toEqual("some-account-id");
55
- expect(init).toEqual({});
56
- return { buckets };
157
+ expect(await request.json()).toEqual({ name: "testBucket" });
158
+ return response.once(
159
+ context.status(200),
160
+ context.json({
161
+ success: true,
162
+ errors: [],
163
+ messages: [],
164
+ result: {},
165
+ })
166
+ );
57
167
  }
58
- );
59
- return requests;
60
- }
61
-
62
- it("should list buckets", async () => {
63
- const expectedBuckets: R2BucketInfo[] = [
64
- { name: "bucket-1", creation_date: "01-01-2001" },
65
- { name: "bucket-2", creation_date: "01-01-2001" },
66
- ];
67
- mockListRequest(expectedBuckets);
68
- await runWrangler("r2 bucket list");
69
-
70
- expect(std.err).toMatchInlineSnapshot(`""`);
71
- const buckets = JSON.parse(std.out);
72
- expect(buckets).toEqual(expectedBuckets);
73
- });
168
+ )
169
+ );
170
+ await runWrangler("r2 bucket create testBucket");
171
+ expect(std.out).toMatchInlineSnapshot(`
172
+ "Creating bucket testBucket.
173
+ Created bucket testBucket."
174
+ `);
74
175
  });
176
+ });
75
177
 
76
- describe("create", () => {
77
- function mockCreateRequest(expectedBucketName: string) {
78
- const requests = { count: 0 };
79
- setMockResponse(
80
- "/accounts/:accountId/r2/buckets/:bucketName",
81
- "PUT",
82
- ([_url, accountId, bucketName]) => {
83
- expect(accountId).toEqual("some-account-id");
84
- expect(bucketName).toEqual(expectedBucketName);
85
- requests.count += 1;
86
- }
87
- );
88
- return requests;
89
- }
90
-
91
- it("should error if no bucket name is given", async () => {
92
- await expect(
93
- runWrangler("r2 bucket create")
94
- ).rejects.toThrowErrorMatchingInlineSnapshot(
95
- `"Not enough non-option arguments: got 0, need at least 1"`
96
- );
97
- expect(std.out).toMatchInlineSnapshot(`
98
- "
99
- wrangler r2 bucket create <name>
100
-
101
- Create a new R2 bucket
102
-
103
- Positionals:
104
- name The name of the new bucket [string] [required]
105
-
106
- Flags:
107
- -c, --config Path to .toml configuration file [string]
108
- -h, --help Show help [boolean]
109
- -v, --version Show version number [boolean]"
110
- `);
111
- expect(std.err).toMatchInlineSnapshot(`
112
- "X [ERROR] Not enough non-option arguments: got 0, need at least 1
113
-
114
- "
115
- `);
116
- });
117
-
118
- it("should error if the bucket to create contains spaces", async () => {
119
- await expect(
120
- runWrangler("r2 bucket create abc def ghi")
121
- ).rejects.toThrowErrorMatchingInlineSnapshot(
122
- `"Unknown arguments: def, ghi"`
123
- );
124
- expect(std.out).toMatchInlineSnapshot(`
125
- "
126
- wrangler r2 bucket create <name>
127
-
128
- Create a new R2 bucket
129
-
130
- Positionals:
131
- name The name of the new bucket [string] [required]
132
-
133
- Flags:
134
- -c, --config Path to .toml configuration file [string]
135
- -h, --help Show help [boolean]
136
- -v, --version Show version number [boolean]"
137
- `);
138
- expect(std.err).toMatchInlineSnapshot(`
139
- "X [ERROR] Unknown arguments: def, ghi
140
-
141
- "
142
- `);
143
- });
144
-
145
- it("should create a bucket", async () => {
146
- const requests = mockCreateRequest("testBucket");
147
- await runWrangler("r2 bucket create testBucket");
148
- expect(std.out).toMatchInlineSnapshot(`
149
- "Creating bucket testBucket.
150
- Created bucket testBucket."
151
- `);
152
- expect(requests.count).toEqual(1);
153
- });
178
+ describe("delete", () => {
179
+ it("should error if no bucket name is given", async () => {
180
+ await expect(
181
+ runWrangler("r2 bucket delete")
182
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
183
+ `"Not enough non-option arguments: got 0, need at least 1"`
184
+ );
185
+ expect(std.out).toMatchInlineSnapshot(`
186
+ "
187
+ wrangler r2 bucket delete <name>
188
+
189
+ Delete an R2 bucket
190
+
191
+ Positionals:
192
+ name The name of the bucket to delete [string] [required]
193
+
194
+ Flags:
195
+ -c, --config Path to .toml configuration file [string]
196
+ -e, --env Environment to use for operations and .env files [string]
197
+ -h, --help Show help [boolean]
198
+ -v, --version Show version number [boolean]"
199
+ `);
200
+ expect(std.err).toMatchInlineSnapshot(`
201
+ "X [ERROR] Not enough non-option arguments: got 0, need at least 1
202
+
203
+ "
204
+ `);
205
+ });
206
+
207
+ it("should error if the bucket name to delete contains spaces", async () => {
208
+ await expect(
209
+ runWrangler("r2 bucket delete abc def ghi")
210
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
211
+ `"Unknown arguments: def, ghi"`
212
+ );
213
+ expect(std.out).toMatchInlineSnapshot(`
214
+ "
215
+ wrangler r2 bucket delete <name>
216
+
217
+ Delete an R2 bucket
218
+
219
+ Positionals:
220
+ name The name of the bucket to delete [string] [required]
221
+
222
+ Flags:
223
+ -c, --config Path to .toml configuration file [string]
224
+ -e, --env Environment to use for operations and .env files [string]
225
+ -h, --help Show help [boolean]
226
+ -v, --version Show version number [boolean]"
227
+ `);
228
+ expect(std.err).toMatchInlineSnapshot(`
229
+ "X [ERROR] Unknown arguments: def, ghi
230
+
231
+ "
232
+ `);
154
233
  });
155
234
 
156
- describe("delete", () => {
157
- function mockDeleteRequest(expectedBucketName: string) {
158
- const requests = { count: 0 };
159
- setMockResponse(
160
- "/accounts/:accountId/r2/buckets/:bucketName",
161
- "DELETE",
162
- ([_url, accountId, bucketName]) => {
235
+ it("should delete a bucket specified by name & check requests inputs", async () => {
236
+ msw.use(
237
+ rest.delete(
238
+ "*/accounts/:accountId/r2/buckets/:bucketName",
239
+ async (request, response, context) => {
240
+ const { accountId, bucketName } = request.params;
163
241
  expect(accountId).toEqual("some-account-id");
164
- expect(bucketName).toEqual(expectedBucketName);
165
- requests.count += 1;
242
+ expect(bucketName).toEqual("some-bucket");
243
+ expect(await request.text()).toEqual("");
244
+ expect(request.headers.get("authorization")).toEqual(
245
+ "Bearer some-api-token"
246
+ );
247
+
248
+ return response.once(
249
+ context.status(200),
250
+ context.json({
251
+ success: true,
252
+ errors: [],
253
+ messages: [],
254
+ result: null,
255
+ })
256
+ );
166
257
  }
167
- );
168
- return requests;
169
- }
170
-
171
- it("should error if no bucket name is given", async () => {
172
- await expect(
173
- runWrangler("r2 bucket delete")
174
- ).rejects.toThrowErrorMatchingInlineSnapshot(
175
- `"Not enough non-option arguments: got 0, need at least 1"`
176
- );
177
- expect(std.out).toMatchInlineSnapshot(`
178
- "
179
- wrangler r2 bucket delete <name>
180
-
181
- Delete an R2 bucket
182
-
183
- Positionals:
184
- name The name of the bucket to delete [string] [required]
185
-
186
- Flags:
187
- -c, --config Path to .toml configuration file [string]
188
- -h, --help Show help [boolean]
189
- -v, --version Show version number [boolean]"
190
- `);
191
- expect(std.err).toMatchInlineSnapshot(`
192
- "X [ERROR] Not enough non-option arguments: got 0, need at least 1
193
-
194
- "
195
- `);
196
- });
197
-
198
- it("should error if the bucket name to delete contains spaces", async () => {
199
- await expect(
200
- runWrangler("r2 bucket delete abc def ghi")
201
- ).rejects.toThrowErrorMatchingInlineSnapshot(
202
- `"Unknown arguments: def, ghi"`
203
- );
204
- expect(std.out).toMatchInlineSnapshot(`
205
- "
206
- wrangler r2 bucket delete <name>
207
-
208
- Delete an R2 bucket
209
-
210
- Positionals:
211
- name The name of the bucket to delete [string] [required]
212
-
213
- Flags:
214
- -c, --config Path to .toml configuration file [string]
215
- -h, --help Show help [boolean]
216
- -v, --version Show version number [boolean]"
217
- `);
218
- expect(std.err).toMatchInlineSnapshot(`
219
- "X [ERROR] Unknown arguments: def, ghi
220
-
221
- "
222
- `);
223
- });
224
-
225
- it("should delete a bucket specified by name", async () => {
226
- const requests = mockDeleteRequest("some-bucket");
227
- await runWrangler(`r2 bucket delete some-bucket`);
228
- expect(requests.count).toEqual(1);
229
- });
258
+ )
259
+ );
260
+ await runWrangler(`r2 bucket delete some-bucket`);
261
+ expect(std.out).toMatchInlineSnapshot(`
262
+ "Deleting bucket some-bucket.
263
+ Deleted bucket some-bucket."
264
+ `);
230
265
  });
231
266
  });
232
267
  });
268
+
269
+ describe("r2 object", () => {
270
+ it("should download R2 object from bucket", async () => {
271
+ await runWrangler(
272
+ `r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
273
+ );
274
+
275
+ expect(std.out).toMatchInlineSnapshot(`
276
+ "Downloading \\"wormhole-img.png\\" from \\"bucketName-object-test\\".
277
+ Download complete."
278
+ `);
279
+ });
280
+
281
+ it("should upload R2 object to bucket", async () => {
282
+ fs.writeFileSync("wormhole-img.png", "passageway");
283
+ await runWrangler(
284
+ `r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
285
+ );
286
+
287
+ expect(std.out).toMatchInlineSnapshot(`
288
+ "Creating object \\"wormhole-img.png\\" in bucket \\"bucketName-object-test\\".
289
+ Upload complete."
290
+ `);
291
+ });
292
+
293
+ it("should fail to upload R2 object to bucket if too large", async () => {
294
+ const TOO_BIG_FILE_SIZE = MAX_UPLOAD_SIZE + 1024 * 1024;
295
+ fs.writeFileSync("wormhole-img.png", Buffer.alloc(TOO_BIG_FILE_SIZE));
296
+ await expect(
297
+ runWrangler(
298
+ `r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
299
+ )
300
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`
301
+ "Error: Wrangler only supports uploading files up to ${prettyBytes(
302
+ MAX_UPLOAD_SIZE
303
+ )} in size
304
+ wormhole-img.png is ${prettyBytes(TOO_BIG_FILE_SIZE)} in size"
305
+ `);
306
+ });
307
+
308
+ it("should pass all fetch option flags into requestInit & check request inputs", async () => {
309
+ msw.use(
310
+ rest.put(
311
+ "*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
312
+ (request, response, context) => {
313
+ const { accountId, bucketName, objectName } = request.params;
314
+ expect(accountId).toEqual("some-account-id");
315
+ expect(bucketName).toEqual("bucketName-object-test");
316
+ expect(objectName).toEqual("wormhole-img.png");
317
+ const headersObject = request.headers.all();
318
+ delete headersObject["user-agent"];
319
+ expect(headersObject).toMatchInlineSnapshot(`
320
+ Object {
321
+ "accept": "*/*",
322
+ "accept-encoding": "gzip,deflate",
323
+ "authorization": "Bearer some-api-token",
324
+ "cache-control": "cache-control-mock",
325
+ "connection": "close",
326
+ "content-disposition": "content-disposition-mock",
327
+ "content-encoding": "content-encoding-mock",
328
+ "content-language": "content-lang-mock",
329
+ "content-length": "10",
330
+ "content-type": "content-type-mock",
331
+ "expires": "expire-time-mock",
332
+ "host": "api.cloudflare.com",
333
+ }
334
+ `);
335
+ return response.once(
336
+ context.status(200),
337
+ context.json({
338
+ success: true,
339
+ errors: [],
340
+ messages: [],
341
+ result: {
342
+ accountId: "some-account-id",
343
+ bucketName: "bucketName-object-test",
344
+ objectName: "wormhole-img.png",
345
+ },
346
+ })
347
+ );
348
+ }
349
+ )
350
+ );
351
+ fs.writeFileSync("wormhole-img.png", "passageway");
352
+ const flags =
353
+ "--ct content-type-mock --cd content-disposition-mock --ce content-encoding-mock --cl content-lang-mock --cc cache-control-mock --e expire-time-mock";
354
+
355
+ await runWrangler(
356
+ `r2 object put bucketName-object-test/wormhole-img.png ${flags} --file wormhole-img.png`
357
+ );
358
+
359
+ expect(std.out).toMatchInlineSnapshot(`
360
+ "Creating object \\"wormhole-img.png\\" in bucket \\"bucketName-object-test\\".
361
+ Upload complete."
362
+ `);
363
+ });
364
+
365
+ it("should delete R2 object from bucket", async () => {
366
+ await runWrangler(
367
+ `r2 object delete bucketName-object-test/wormhole-img.png`
368
+ );
369
+
370
+ expect(std.out).toMatchInlineSnapshot(`
371
+ "Deleting object \\"wormhole-img.png\\" from bucket \\"bucketName-object-test\\".
372
+ Delete complete."
373
+ `);
374
+ });
375
+
376
+ it("should not allow `--pipe` & `--file` to run together", async () => {
377
+ fs.writeFileSync("wormhole-img.png", "passageway");
378
+ await expect(
379
+ runWrangler(
380
+ `r2 object put bucketName-object-test/wormhole-img.png --pipe --file wormhole-img.png`
381
+ )
382
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
383
+ `"Arguments pipe and file are mutually exclusive"`
384
+ );
385
+
386
+ expect(std.err).toMatchInlineSnapshot(`
387
+ "X [ERROR] Arguments pipe and file are mutually exclusive
388
+
389
+ "
390
+ `);
391
+ });
392
+ });
233
393
  });