wrangler 0.0.0-e61fba8 → 0.0.0-e665ccc3

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 (339) hide show
  1. package/README.md +24 -4
  2. package/bin/wrangler.js +170 -62
  3. package/miniflare-dist/index.mjs +1643 -83
  4. package/package.json +198 -154
  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.ts +121 -0
  8. package/src/__tests__/api.test.ts +102 -0
  9. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  10. package/src/__tests__/config-cache.test.ts +30 -24
  11. package/src/__tests__/configuration.test.ts +4506 -3476
  12. package/src/__tests__/constellation.test.ts +371 -0
  13. package/src/__tests__/d1/d1.test.ts +82 -0
  14. package/src/__tests__/d1/execute.test.ts +66 -0
  15. package/src/__tests__/d1/migrate.test.ts +257 -0
  16. package/src/__tests__/d1/splitter.test.ts +255 -0
  17. package/src/__tests__/delete.test.ts +272 -0
  18. package/src/__tests__/deployments.test.ts +369 -0
  19. package/src/__tests__/dev.test.tsx +1590 -983
  20. package/src/__tests__/generate.test.ts +237 -0
  21. package/src/__tests__/get-host-from-url.test.ts +16 -0
  22. package/src/__tests__/guess-worker-format.test.ts +103 -68
  23. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  24. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  25. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  26. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  27. package/src/__tests__/helpers/mock-bin.ts +20 -20
  28. package/src/__tests__/helpers/mock-console.ts +64 -39
  29. package/src/__tests__/helpers/mock-dialogs.ts +88 -79
  30. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  31. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  32. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  33. package/src/__tests__/helpers/mock-istty.ts +65 -18
  34. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  35. package/src/__tests__/helpers/mock-kv.ts +41 -28
  36. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  37. package/src/__tests__/helpers/mock-process.ts +34 -0
  38. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  39. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  40. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  41. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  42. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  43. package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
  44. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  45. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  46. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  47. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  48. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  49. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  50. package/src/__tests__/helpers/msw/index.ts +52 -0
  51. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  52. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  53. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  54. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  55. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  56. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  58. package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  60. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  61. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  62. package/src/__tests__/https-options.test.ts +142 -109
  63. package/src/__tests__/index.test.ts +262 -237
  64. package/src/__tests__/init.test.ts +3167 -1608
  65. package/src/__tests__/jest.setup.ts +152 -50
  66. package/src/__tests__/kv.test.ts +1789 -1492
  67. package/src/__tests__/logger.test.ts +167 -75
  68. package/src/__tests__/logout.test.ts +47 -0
  69. package/src/__tests__/metrics.test.ts +493 -0
  70. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  71. package/src/__tests__/middleware.test.ts +816 -0
  72. package/src/__tests__/mtls-certificates.test.ts +589 -0
  73. package/src/__tests__/package-manager.test.ts +303 -303
  74. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  75. package/src/__tests__/pages/functions-build.test.ts +528 -0
  76. package/src/__tests__/pages/pages.test.ts +81 -0
  77. package/src/__tests__/pages/project-create.test.ts +63 -0
  78. package/src/__tests__/pages/project-list.test.ts +110 -0
  79. package/src/__tests__/pages/project-upload.test.ts +500 -0
  80. package/src/__tests__/pages/publish.test.ts +2864 -0
  81. package/src/__tests__/pages-deployment-tail.test.ts +957 -0
  82. package/src/__tests__/parse.test.ts +358 -252
  83. package/src/__tests__/paths.test.ts +39 -0
  84. package/src/__tests__/publish.test.ts +8716 -5687
  85. package/src/__tests__/pubsub.test.ts +496 -0
  86. package/src/__tests__/queues.test.ts +532 -0
  87. package/src/__tests__/r2.test.ts +369 -228
  88. package/src/__tests__/route.test.ts +18 -18
  89. package/src/__tests__/secret.test.ts +681 -469
  90. package/src/__tests__/tail.test.ts +866 -567
  91. package/src/__tests__/test-old-node-version.js +31 -0
  92. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  93. package/src/__tests__/tsconfig-sanity.ts +12 -0
  94. package/src/__tests__/tsconfig.json +8 -0
  95. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  96. package/src/__tests__/type-generation.test.ts +234 -0
  97. package/src/__tests__/user.test.ts +107 -120
  98. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  99. package/src/__tests__/validate-dev-props.test.ts +56 -0
  100. package/src/__tests__/version.test.ts +35 -0
  101. package/src/__tests__/whoami.test.tsx +165 -132
  102. package/src/__tests__/worker-namespace.test.ts +340 -0
  103. package/src/abort.d.ts +1 -1
  104. package/src/api/dev.ts +321 -0
  105. package/src/api/index.ts +11 -0
  106. package/src/api/mtls-certificate.ts +148 -0
  107. package/src/api/pages/create-worker-bundle-contents.ts +77 -0
  108. package/src/api/pages/index.ts +5 -0
  109. package/src/api/pages/publish.tsx +371 -0
  110. package/src/bundle-reporter.ts +68 -0
  111. package/src/bundle.ts +890 -165
  112. package/src/cfetch/index.ts +120 -83
  113. package/src/cfetch/internal.ts +208 -92
  114. package/src/cli.ts +23 -8
  115. package/src/config/config.ts +244 -196
  116. package/src/config/diagnostics.ts +61 -61
  117. package/src/config/environment.ts +562 -357
  118. package/src/config/index.ts +374 -196
  119. package/src/config/validation-helpers.ts +379 -366
  120. package/src/config/validation.ts +2197 -1376
  121. package/src/config-cache.ts +81 -41
  122. package/src/constellation/createProject.tsx +51 -0
  123. package/src/constellation/deleteProject.ts +51 -0
  124. package/src/constellation/deleteProjectModel.ts +68 -0
  125. package/src/constellation/index.ts +75 -0
  126. package/src/constellation/listCatalog.tsx +35 -0
  127. package/src/constellation/listModel.tsx +41 -0
  128. package/src/constellation/listProject.tsx +28 -0
  129. package/src/constellation/listRuntime.tsx +28 -0
  130. package/src/constellation/options.ts +17 -0
  131. package/src/constellation/types.ts +17 -0
  132. package/src/constellation/uploadModel.tsx +64 -0
  133. package/src/constellation/utils.ts +90 -0
  134. package/src/create-worker-preview.ts +250 -142
  135. package/src/create-worker-upload-form.ts +347 -238
  136. package/src/d1/backups.tsx +219 -0
  137. package/src/d1/constants.ts +2 -0
  138. package/src/d1/create.tsx +70 -0
  139. package/src/d1/delete.ts +53 -0
  140. package/src/d1/execute.tsx +357 -0
  141. package/src/d1/formatTimeAgo.ts +14 -0
  142. package/src/d1/index.ts +100 -0
  143. package/src/d1/list.tsx +62 -0
  144. package/src/d1/migrations/apply.tsx +212 -0
  145. package/src/d1/migrations/create.tsx +79 -0
  146. package/src/d1/migrations/helpers.ts +169 -0
  147. package/src/d1/migrations/index.ts +3 -0
  148. package/src/d1/migrations/list.tsx +95 -0
  149. package/src/d1/migrations/options.ts +23 -0
  150. package/src/d1/options.ts +22 -0
  151. package/src/d1/splitter.ts +161 -0
  152. package/src/d1/types.ts +25 -0
  153. package/src/d1/utils.ts +49 -0
  154. package/src/delete.ts +100 -0
  155. package/src/deployments.ts +368 -0
  156. package/src/deprecated/index.ts +144 -0
  157. package/src/dev/dev-vars.ts +20 -17
  158. package/src/dev/dev.tsx +535 -325
  159. package/src/dev/get-local-persistence-path.ts +31 -0
  160. package/src/dev/local.tsx +932 -301
  161. package/src/dev/remote.tsx +623 -228
  162. package/src/dev/start-server.ts +545 -0
  163. package/src/dev/use-esbuild.ts +194 -94
  164. package/src/dev/validate-dev-props.ts +40 -0
  165. package/src/dev-registry.ts +202 -0
  166. package/src/dev.tsx +934 -0
  167. package/src/dialogs.ts +136 -0
  168. package/src/dispatch-namespace.ts +211 -0
  169. package/src/docs/helpers.ts +50 -0
  170. package/src/docs/index.ts +54 -0
  171. package/src/durable.ts +87 -87
  172. package/src/entry.ts +253 -231
  173. package/src/environment-variables/factory.ts +89 -0
  174. package/src/environment-variables/misc-variables.ts +30 -0
  175. package/src/errors.ts +6 -6
  176. package/src/generate/index.ts +298 -0
  177. package/src/git-client.ts +135 -0
  178. package/src/global-wrangler-config-path.ts +26 -0
  179. package/src/https-options.ts +84 -80
  180. package/src/index.ts +768 -0
  181. package/src/init.ts +1037 -0
  182. package/src/inspect.ts +816 -595
  183. package/src/intl-polyfill.d.ts +123 -123
  184. package/src/is-ci.ts +14 -0
  185. package/src/is-interactive.ts +16 -0
  186. package/src/jest.d.ts +4 -0
  187. package/src/kv/helpers.ts +433 -0
  188. package/src/kv/index.ts +594 -0
  189. package/src/logger.ts +100 -43
  190. package/src/metrics/index.ts +5 -0
  191. package/src/metrics/metrics-config.ts +239 -0
  192. package/src/metrics/metrics-dispatcher.ts +96 -0
  193. package/src/metrics/metrics-usage-headers.ts +24 -0
  194. package/src/metrics/send-event.ts +99 -0
  195. package/src/miniflare-cli/assets.ts +255 -0
  196. package/src/miniflare-cli/index.ts +202 -33
  197. package/src/miniflare-cli/request-context.ts +18 -18
  198. package/src/miniflare-cli/tsconfig.json +9 -0
  199. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  200. package/src/miniflare-cli/types.ts +11 -0
  201. package/src/module-collection.ts +290 -215
  202. package/src/mtls-certificate/cli.ts +155 -0
  203. package/src/open-in-browser.ts +4 -6
  204. package/src/package-manager.ts +173 -128
  205. package/src/pages/build.ts +423 -0
  206. package/src/pages/buildFunctions.ts +140 -0
  207. package/src/pages/constants.ts +18 -0
  208. package/src/pages/deployment-tails.ts +281 -0
  209. package/src/pages/deployments.tsx +84 -0
  210. package/src/pages/dev.ts +734 -0
  211. package/src/pages/errors.ts +67 -0
  212. package/src/pages/functions/buildPlugin.ts +114 -0
  213. package/src/pages/functions/buildWorker.ts +350 -0
  214. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  215. package/src/pages/functions/filepath-routing.ts +189 -0
  216. package/src/pages/functions/identifiers.ts +78 -0
  217. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  218. package/src/pages/functions/routes-consolidation.ts +73 -0
  219. package/src/pages/functions/routes-transformation.test.ts +282 -0
  220. package/src/pages/functions/routes-transformation.ts +115 -0
  221. package/src/pages/functions/routes-validation.test.ts +403 -0
  222. package/src/pages/functions/routes-validation.ts +202 -0
  223. package/src/pages/functions/routes.ts +151 -0
  224. package/src/pages/functions/tsconfig.json +8 -0
  225. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  226. package/src/pages/functions.ts +86 -0
  227. package/src/pages/hash.ts +13 -0
  228. package/src/pages/index.ts +102 -0
  229. package/src/pages/projects.tsx +159 -0
  230. package/src/pages/prompt-select-project.tsx +31 -0
  231. package/src/pages/publish.tsx +267 -0
  232. package/src/pages/types.ts +46 -0
  233. package/src/pages/upload.tsx +469 -0
  234. package/src/pages/utils.ts +23 -0
  235. package/src/parse.ts +225 -139
  236. package/src/paths.ts +53 -8
  237. package/src/proxy.ts +623 -407
  238. package/src/publish/index.ts +274 -0
  239. package/src/publish/publish.ts +1065 -0
  240. package/src/pubsub/index.ts +286 -0
  241. package/src/pubsub/pubsub-commands.ts +623 -0
  242. package/src/queues/cli/commands/consumer/add.ts +71 -0
  243. package/src/queues/cli/commands/consumer/index.ts +19 -0
  244. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  245. package/src/queues/cli/commands/create.ts +25 -0
  246. package/src/queues/cli/commands/delete.ts +26 -0
  247. package/src/queues/cli/commands/index.ts +35 -0
  248. package/src/queues/cli/commands/list.ts +25 -0
  249. package/src/queues/client.ts +136 -0
  250. package/src/queues/utils.ts +18 -0
  251. package/src/r2/constants.ts +4 -0
  252. package/src/r2/helpers.ts +132 -0
  253. package/src/r2/index.ts +289 -0
  254. package/src/routes.ts +140 -0
  255. package/src/secret/index.ts +377 -0
  256. package/src/selfsigned.d.ts +23 -23
  257. package/src/sites.ts +484 -0
  258. package/src/tail/createTail.ts +415 -0
  259. package/src/tail/filters.ts +109 -111
  260. package/src/tail/index.ts +208 -296
  261. package/src/tail/printing.ts +116 -51
  262. package/src/traverse-module-graph.ts +54 -0
  263. package/src/tsconfig-sanity.ts +16 -0
  264. package/src/type-generation.ts +181 -0
  265. package/src/update-check.ts +11 -11
  266. package/src/user/access.ts +68 -0
  267. package/src/user/auth-variables.ts +113 -0
  268. package/src/user/choose-account.tsx +39 -0
  269. package/src/user/generate-auth-url.ts +33 -0
  270. package/src/user/generate-random-state.ts +16 -0
  271. package/src/user/index.ts +2 -0
  272. package/src/user/user.ts +1234 -0
  273. package/src/utils/collectKeyValues.ts +14 -0
  274. package/src/utils/render.ts +93 -0
  275. package/src/whoami.ts +135 -0
  276. package/src/worker.ts +205 -107
  277. package/src/yargs-types.ts +37 -0
  278. package/src/zones.ts +158 -40
  279. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  280. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  281. package/templates/__tests__/tsconfig.json +8 -0
  282. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  283. package/templates/checked-fetch.js +23 -0
  284. package/templates/d1-beta-facade.js +244 -0
  285. package/templates/facade.d.ts +14 -0
  286. package/templates/first-party-worker-module-facade.ts +19 -0
  287. package/templates/format-dev-errors.ts +34 -0
  288. package/templates/gitignore +1 -0
  289. package/templates/init-tests/test-jest-new-worker.js +23 -0
  290. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  291. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  292. package/templates/middleware/common.ts +62 -0
  293. package/templates/middleware/loader-modules.ts +84 -0
  294. package/templates/middleware/loader-sw.ts +233 -0
  295. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  296. package/templates/middleware/middleware-pretty-error.ts +40 -0
  297. package/templates/middleware/middleware-scheduled.ts +15 -0
  298. package/templates/new-worker-scheduled.js +3 -3
  299. package/templates/new-worker-scheduled.ts +15 -15
  300. package/templates/new-worker.js +3 -3
  301. package/templates/new-worker.ts +18 -15
  302. package/templates/no-op-worker.js +10 -0
  303. package/templates/pages-dev-pipeline.ts +31 -0
  304. package/templates/pages-dev-util.ts +52 -0
  305. package/templates/pages-shim.ts +12 -0
  306. package/templates/pages-template-plugin.ts +180 -0
  307. package/templates/pages-template-worker.ts +189 -0
  308. package/templates/serve-static-assets.ts +66 -0
  309. package/templates/service-bindings-module-facade.js +55 -0
  310. package/templates/service-bindings-sw-facade.js +42 -0
  311. package/templates/tsconfig-sanity.ts +11 -0
  312. package/templates/tsconfig.init.json +105 -0
  313. package/templates/tsconfig.json +6 -103
  314. package/templates/tsconfig.tsbuildinfo +1 -0
  315. package/wrangler-dist/cli.d.ts +1652 -0
  316. package/wrangler-dist/cli.js +139094 -111923
  317. package/wrangler-dist/wasm-sync.wasm +0 -0
  318. package/pages/functions/buildPlugin.ts +0 -105
  319. package/pages/functions/buildWorker.ts +0 -151
  320. package/pages/functions/filepath-routing.ts +0 -189
  321. package/pages/functions/identifiers.ts +0 -78
  322. package/pages/functions/routes.ts +0 -156
  323. package/pages/functions/template-plugin.ts +0 -147
  324. package/pages/functions/template-worker.ts +0 -143
  325. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  326. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  327. package/src/__tests__/pages.test.ts +0 -754
  328. package/src/dialogs.tsx +0 -135
  329. package/src/environment-variables.ts +0 -35
  330. package/src/index.tsx +0 -2859
  331. package/src/kv.ts +0 -408
  332. package/src/miniflare-cli/enum-keys.ts +0 -17
  333. package/src/pages.tsx +0 -2093
  334. package/src/publish.ts +0 -721
  335. package/src/r2.ts +0 -50
  336. package/src/sites.tsx +0 -326
  337. package/src/user.tsx +0 -1214
  338. package/src/whoami.tsx +0 -71
  339. package/templates/static-asset-facade.js +0 -43
@@ -0,0 +1,257 @@
1
+ import { cwd } from "process";
2
+ import { rest } from "msw";
3
+ import { reinitialiseAuthTokens } from "../../user";
4
+ import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
5
+ import { mockConsoleMethods } from "../helpers/mock-console";
6
+ import { mockConfirm } from "../helpers/mock-dialogs";
7
+ import { useMockIsTTY } from "../helpers/mock-istty";
8
+ import { mockGetMemberships, mockOAuthFlow } from "../helpers/mock-oauth-flow";
9
+ import { mockSetTimeout } from "../helpers/mock-set-timeout";
10
+ import { msw } from "../helpers/msw";
11
+ import { runInTempDir } from "../helpers/run-in-tmp";
12
+ import { runWrangler } from "../helpers/run-wrangler";
13
+ import writeWranglerToml from "../helpers/write-wrangler-toml";
14
+
15
+ describe("migrate", () => {
16
+ runInTempDir();
17
+ mockConsoleMethods();
18
+ mockSetTimeout();
19
+
20
+ const { setIsTTY } = useMockIsTTY();
21
+
22
+ describe("create", () => {
23
+ it("should reject the --local flag for create", async () => {
24
+ setIsTTY(false);
25
+ writeWranglerToml({
26
+ d1_databases: [
27
+ { binding: "DATABASE", database_name: "db", database_id: "xxxx" },
28
+ ],
29
+ });
30
+
31
+ await expect(
32
+ runWrangler("d1 migrations create test some-message --local DATABASE")
33
+ ).rejects.toThrowError(`Unknown argument: local`);
34
+ });
35
+ });
36
+
37
+ describe("apply", () => {
38
+ mockAccountId({ accountId: null });
39
+ mockApiToken();
40
+ const { mockOAuthServerCallback } = mockOAuthFlow();
41
+ it("should not attempt to login in local mode", async () => {
42
+ setIsTTY(false);
43
+ writeWranglerToml({
44
+ d1_databases: [
45
+ { binding: "DATABASE", database_name: "db", database_id: "xxxx" },
46
+ ],
47
+ });
48
+ // If we get to the point where we are checking for migrations then we have not been asked to log in.
49
+ await expect(
50
+ runWrangler("d1 migrations apply --local DATABASE")
51
+ ).rejects.toThrowError(
52
+ `No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
53
+ );
54
+ });
55
+
56
+ it("should try to read D1 config from wrangler.toml", async () => {
57
+ setIsTTY(false);
58
+ writeWranglerToml();
59
+ await expect(
60
+ runWrangler("d1 migrations apply DATABASE")
61
+ ).rejects.toThrowError(
62
+ "Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
63
+ );
64
+ });
65
+
66
+ it("should not try to read wrangler.toml in local mode", async () => {
67
+ setIsTTY(false);
68
+ writeWranglerToml();
69
+ // If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
70
+ await expect(
71
+ runWrangler("d1 migrations apply --local DATABASE")
72
+ ).rejects.toThrowError(
73
+ `No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
74
+ );
75
+ });
76
+
77
+ it("should reject the use of --preview with --local", async () => {
78
+ setIsTTY(false);
79
+ writeWranglerToml({
80
+ d1_databases: [
81
+ { binding: "DATABASE", database_name: "db", database_id: "xxxx" },
82
+ ],
83
+ });
84
+ await runWrangler("d1 migrations create db test");
85
+
86
+ await expect(
87
+ runWrangler("d1 migrations apply --local db --preview")
88
+ ).rejects.toThrowError(`Error: can't use --preview with --local`);
89
+ });
90
+
91
+ it("multiple accounts: should throw when trying to apply migrations without an account_id in config", async () => {
92
+ setIsTTY(false);
93
+
94
+ writeWranglerToml({
95
+ d1_databases: [
96
+ {
97
+ binding: "DATABASE",
98
+ database_name: "db",
99
+ database_id: "xxxx",
100
+ migrations_dir: "/tmp/my-migrations-go-here",
101
+ },
102
+ ],
103
+ });
104
+ mockOAuthServerCallback();
105
+ mockGetMemberships([
106
+ { id: "IG-88", account: { id: "1701", name: "enterprise" } },
107
+ { id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
108
+ ]);
109
+ mockConfirm({
110
+ text: `No migrations folder found.
111
+ Ok to create /tmp/my-migrations-go-here?`,
112
+ result: true,
113
+ });
114
+ await runWrangler("d1 migrations create db test");
115
+ mockConfirm({
116
+ text: `About to apply 1 migration(s)
117
+ Your database may not be available to serve requests during the migration, continue?`,
118
+ result: true,
119
+ });
120
+ await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
121
+ `More than one account available but unable to select one in non-interactive mode.`
122
+ );
123
+ });
124
+ it("multiple accounts: should let the user apply migrations with an account_id in config", async () => {
125
+ setIsTTY(false);
126
+ msw.use(
127
+ rest.post(
128
+ "*/accounts/:accountId/d1/database/:databaseId/query",
129
+ async (req, res, ctx) => {
130
+ return res(
131
+ ctx.status(200),
132
+ ctx.json({
133
+ result: [
134
+ {
135
+ results: [],
136
+ success: true,
137
+ meta: {},
138
+ },
139
+ ],
140
+ success: true,
141
+ errors: [],
142
+ messages: [],
143
+ })
144
+ );
145
+ }
146
+ )
147
+ );
148
+ writeWranglerToml({
149
+ d1_databases: [
150
+ {
151
+ binding: "DATABASE",
152
+ database_name: "db",
153
+ database_id: "xxxx",
154
+ migrations_dir: "/tmp/my-migrations-go-here",
155
+ },
156
+ ],
157
+ account_id: "nx01",
158
+ });
159
+ mockOAuthServerCallback();
160
+ mockGetMemberships([
161
+ { id: "IG-88", account: { id: "1701", name: "enterprise" } },
162
+ { id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
163
+ ]);
164
+ mockConfirm({
165
+ text: `No migrations folder found.
166
+ Ok to create /tmp/my-migrations-go-here?`,
167
+ result: true,
168
+ });
169
+ await runWrangler("d1 migrations create db test");
170
+ mockConfirm({
171
+ text: `About to apply 1 migration(s)
172
+ Your database may not be available to serve requests during the migration, continue?`,
173
+ result: true,
174
+ });
175
+ //if we get to this point, wrangler knows the account_id
176
+ await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
177
+ `request to https://api.cloudflare.com/client/v4/accounts/nx01/d1/database/xxxx/backup failed`
178
+ );
179
+ });
180
+ });
181
+
182
+ describe("list", () => {
183
+ mockAccountId();
184
+ mockApiToken({ apiToken: null });
185
+
186
+ it("should not attempt to login in local mode", async () => {
187
+ setIsTTY(false);
188
+ writeWranglerToml({
189
+ d1_databases: [
190
+ { binding: "DATABASE", database_name: "db", database_id: "xxxx" },
191
+ ],
192
+ });
193
+ // If we get to the point where we are checking for migrations then we have not been asked to log in.
194
+ await expect(
195
+ runWrangler("d1 migrations list --local DATABASE")
196
+ ).rejects.toThrowError(
197
+ `No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
198
+ );
199
+ });
200
+
201
+ it("should use the custom migrations folder when provided", async () => {
202
+ setIsTTY(false);
203
+ writeWranglerToml({
204
+ d1_databases: [
205
+ {
206
+ binding: "DATABASE",
207
+ database_name: "db",
208
+ database_id: "xxxx",
209
+ migrations_dir: "my-migrations-go-here",
210
+ },
211
+ ],
212
+ });
213
+ await expect(
214
+ runWrangler("d1 migrations list --local DATABASE")
215
+ ).rejects.toThrowError(
216
+ `No migrations present at ${cwd().replaceAll(
217
+ "\\",
218
+ "/"
219
+ )}/my-migrations-go-here.`
220
+ );
221
+ });
222
+
223
+ it("should try to read D1 config from wrangler.toml when logged in", async () => {
224
+ // no need to clear this env var as it's implicitly cleared by mockApiToken in afterEach
225
+ process.env.CLOUDFLARE_API_TOKEN = "api-token";
226
+ reinitialiseAuthTokens();
227
+ setIsTTY(false);
228
+ writeWranglerToml();
229
+ await expect(
230
+ runWrangler("d1 migrations list DATABASE")
231
+ ).rejects.toThrowError(
232
+ "Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
233
+ );
234
+ });
235
+
236
+ it("should throw if user is not authenticated and not using --local", async () => {
237
+ setIsTTY(false);
238
+
239
+ await expect(
240
+ runWrangler("d1 migrations list DATABASE")
241
+ ).rejects.toThrowError(
242
+ "In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work"
243
+ );
244
+ });
245
+
246
+ it("should not try to read wrangler.toml in local mode", async () => {
247
+ setIsTTY(false);
248
+ writeWranglerToml();
249
+ // If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
250
+ await expect(
251
+ runWrangler("d1 migrations list --local DATABASE")
252
+ ).rejects.toThrowError(
253
+ `No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
254
+ );
255
+ });
256
+ });
257
+ });
@@ -0,0 +1,255 @@
1
+ import splitSqlQuery, { mayContainMultipleStatements } from "../../d1/splitter";
2
+
3
+ describe("mayContainMultipleStatements()", () => {
4
+ it("should return false if there is only a semi-colon at the end", () => {
5
+ expect(mayContainMultipleStatements(`SELECT * FROM my_table`)).toBe(false);
6
+ expect(
7
+ mayContainMultipleStatements(`SELECT * FROM my_table WHERE id = 42;`)
8
+ ).toBe(false);
9
+ expect(
10
+ mayContainMultipleStatements(`SELECT * FROM my_table WHERE id = 42; `)
11
+ ).toBe(false);
12
+ });
13
+
14
+ it("should return true if there is a semi-colon before the end of the string", () => {
15
+ expect(
16
+ mayContainMultipleStatements(
17
+ `SELECT * FROM my_table WHERE val = "foo;bar";`
18
+ )
19
+ ).toBe(true);
20
+ });
21
+
22
+ it("should return true if there is more than one statement", () => {
23
+ expect(
24
+ mayContainMultipleStatements(
25
+ `
26
+ INSERT INTO my_table (id, value) VALUES (42, 'foo');
27
+ SELECT * FROM my_table WHERE id = 42;
28
+ `
29
+ )
30
+ ).toBe(true);
31
+ });
32
+ });
33
+
34
+ describe("splitSqlQuery()", () => {
35
+ it("should return original SQL if there are no real statements", () => {
36
+ expect(splitSqlQuery(`;;;`)).toMatchInlineSnapshot(`
37
+ Array [
38
+ ";;;",
39
+ ]
40
+ `);
41
+ });
42
+
43
+ it("should not split single statements", () => {
44
+ expect(splitSqlQuery(`SELECT * FROM my_table`)).toMatchInlineSnapshot(`
45
+ Array [
46
+ "SELECT * FROM my_table",
47
+ ]
48
+ `);
49
+ expect(splitSqlQuery(`SELECT * FROM my_table WHERE id = 42;`))
50
+ .toMatchInlineSnapshot(`
51
+ Array [
52
+ "SELECT * FROM my_table WHERE id = 42;",
53
+ ]
54
+ `);
55
+ expect(
56
+ splitSqlQuery(
57
+ `
58
+ SELECT * FROM my_table WHERE id = 42;
59
+ `
60
+ )
61
+ ).toMatchInlineSnapshot(`
62
+ Array [
63
+ "
64
+ SELECT * FROM my_table WHERE id = 42;
65
+ ",
66
+ ]
67
+ `);
68
+ });
69
+
70
+ it("should handle strings", () => {
71
+ expect(
72
+ splitSqlQuery(
73
+ `
74
+ SELECT * FROM my_table WHERE val = "foo;bar";
75
+ `
76
+ )
77
+ ).toMatchInlineSnapshot(`
78
+ Array [
79
+ "SELECT * FROM my_table WHERE val = \\"foo;bar\\"",
80
+ ]
81
+ `);
82
+ });
83
+
84
+ it("should handle inline comments", () => {
85
+ expect(
86
+ splitSqlQuery(
87
+ `SELECT * FROM my_table -- semicolons; in; comments; don't count;
88
+ WHERE val = 'foo;bar'
89
+ AND "col;name" = \`other;col\`; -- or identifiers (Postgres or MySQL style)`
90
+ )
91
+ ).toMatchInlineSnapshot(`
92
+ Array [
93
+ "SELECT * FROM my_table -- semicolons; in; comments; don't count;
94
+ WHERE val = 'foo;bar'
95
+ AND \\"col;name\\" = \`other;col\`",
96
+ "-- or identifiers (Postgres or MySQL style)",
97
+ ]
98
+ `);
99
+ });
100
+
101
+ it("should handle block comments", () => {
102
+ expect(
103
+ splitSqlQuery(
104
+ `/****
105
+ * Block comments are ignored;
106
+ ****/
107
+ SELECT * FROM my_table /* semicolons; in; comments; don't count; */
108
+ WHERE val = 'foo;bar' AND count / 2 > 0`
109
+ )
110
+ ).toMatchInlineSnapshot(`
111
+ Array [
112
+ "/****
113
+ * Block comments are ignored;
114
+ ****/
115
+ SELECT * FROM my_table /* semicolons; in; comments; don't count; */
116
+ WHERE val = 'foo;bar' AND count / 2 > 0",
117
+ ]
118
+ `);
119
+ });
120
+
121
+ it("should split multiple statements", () => {
122
+ expect(
123
+ splitSqlQuery(
124
+ `
125
+ INSERT INTO my_table (id, value) VALUES (42, 'foo');
126
+ SELECT * FROM my_table WHERE id = 42 - 10;
127
+ `
128
+ )
129
+ ).toMatchInlineSnapshot(`
130
+ Array [
131
+ "INSERT INTO my_table (id, value) VALUES (42, 'foo')",
132
+ "SELECT * FROM my_table WHERE id = 42 - 10",
133
+ ]
134
+ `);
135
+ });
136
+
137
+ it("should handle whitespace between statements", () => {
138
+ expect(
139
+ splitSqlQuery(`
140
+ CREATE DOMAIN custom_types.email AS TEXT CHECK (VALUE ~ '^.+@.+$');
141
+ CREATE TYPE custom_types.currency AS ENUM('USD', 'GBP');
142
+
143
+ CREATE TYPE custom_types.money_with_currency AS (
144
+ value NUMERIC(1000, 2),
145
+ currency custom_types.currency,
146
+ description TEXT
147
+ );
148
+ CREATE TYPE custom_types.balance_pair AS (
149
+ income custom_types.money_with_currency,
150
+ expenditure custom_types.money_with_currency
151
+ );
152
+
153
+ CREATE TABLE custom_types.accounts (
154
+ email custom_types.email NOT NULL PRIMARY KEY,
155
+ balance custom_types.money_with_currency
156
+ );
157
+ CREATE TABLE custom_types.balance_pairs (
158
+ balance custom_types.balance_pair
159
+ );
160
+ `)
161
+ ).toMatchInlineSnapshot(`
162
+ Array [
163
+ "CREATE DOMAIN custom_types.email AS TEXT CHECK (VALUE ~ '^.+@.+$')",
164
+ "CREATE TYPE custom_types.currency AS ENUM('USD', 'GBP')",
165
+ "CREATE TYPE custom_types.money_with_currency AS (
166
+ value NUMERIC(1000, 2),
167
+ currency custom_types.currency,
168
+ description TEXT
169
+ )",
170
+ "CREATE TYPE custom_types.balance_pair AS (
171
+ income custom_types.money_with_currency,
172
+ expenditure custom_types.money_with_currency
173
+ )",
174
+ "CREATE TABLE custom_types.accounts (
175
+ email custom_types.email NOT NULL PRIMARY KEY,
176
+ balance custom_types.money_with_currency
177
+ )",
178
+ "CREATE TABLE custom_types.balance_pairs (
179
+ balance custom_types.balance_pair
180
+ )",
181
+ ]
182
+ `);
183
+ });
184
+
185
+ it("should handle $...$ style string markers", () => {
186
+ expect(
187
+ splitSqlQuery(`
188
+ CREATE OR REPLACE FUNCTION update_updated_at_column()
189
+ RETURNS TRIGGER AS $$
190
+ BEGIN
191
+ NEW.updated_at = now();
192
+ RETURN NEW;
193
+ END;
194
+ $$ language 'plpgsql';
195
+ CREATE TRIGGER <trigger_name> BEFORE UPDATE ON <table_name> FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column();
196
+ `)
197
+ ).toMatchInlineSnapshot(`
198
+ Array [
199
+ "CREATE OR REPLACE FUNCTION update_updated_at_column()
200
+ RETURNS TRIGGER AS $$
201
+ BEGIN
202
+ NEW.updated_at = now();
203
+ RETURN NEW;
204
+ END;
205
+ $$ language 'plpgsql'",
206
+ "CREATE TRIGGER <trigger_name> BEFORE UPDATE ON <table_name> FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column()",
207
+ ]
208
+ `);
209
+ expect(
210
+ splitSqlQuery(
211
+ `$SomeTag$Dianne's$WrongTag$;$some non tag an$identifier;; horse$SomeTag$;$SomeTag$Dianne's horse$SomeTag$`
212
+ )
213
+ ).toMatchInlineSnapshot(`
214
+ Array [
215
+ "$SomeTag$Dianne's$WrongTag$;$some non tag an$identifier;; horse$SomeTag$",
216
+ "$SomeTag$Dianne's horse$SomeTag$",
217
+ ]
218
+ `);
219
+ });
220
+
221
+ it("should handle compound statements", () => {
222
+ expect(
223
+ splitSqlQuery(`
224
+ CREATE TRIGGER IF NOT EXISTS update_trigger AFTER UPDATE ON items
225
+ BEGIN
226
+ DELETE FROM updates WHERE item_id=old.id;
227
+ END;
228
+ CREATE TRIGGER IF NOT EXISTS actors_search_fts_update AFTER UPDATE ON actors
229
+ BEGIN
230
+ DELETE FROM search_fts WHERE rowid=old.rowid;
231
+ INSERT INTO search_fts (rowid, type, name, preferredUsername)
232
+ VALUES (new.rowid,
233
+ new.type,
234
+ json_extract(new.properties, '$.name'),
235
+ json_extract(new.properties, '$.preferredUsername'));
236
+ END;`)
237
+ ).toMatchInlineSnapshot(`
238
+ Array [
239
+ "CREATE TRIGGER IF NOT EXISTS update_trigger AFTER UPDATE ON items
240
+ BEGIN
241
+ DELETE FROM updates WHERE item_id=old.id;
242
+ END",
243
+ "CREATE TRIGGER IF NOT EXISTS actors_search_fts_update AFTER UPDATE ON actors
244
+ BEGIN
245
+ DELETE FROM search_fts WHERE rowid=old.rowid;
246
+ INSERT INTO search_fts (rowid, type, name, preferredUsername)
247
+ VALUES (new.rowid,
248
+ new.type,
249
+ json_extract(new.properties, '$.name'),
250
+ json_extract(new.properties, '$.preferredUsername'));
251
+ END",
252
+ ]
253
+ `);
254
+ });
255
+ });