wrangler 0.0.0-e351afcf → 0.0.0-e3990bbf

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 (315) hide show
  1. package/README.md +10 -12
  2. package/bin/wrangler.js +9 -75
  3. package/package.json +199 -199
  4. package/templates/__tests__/tsconfig.json +1 -1
  5. package/templates/checked-fetch.js +10 -3
  6. package/templates/facade.d.ts +4 -1
  7. package/templates/middleware/common.ts +9 -4
  8. package/templates/middleware/loader-modules.ts +64 -11
  9. package/templates/middleware/loader-sw.ts +2 -7
  10. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  11. package/templates/middleware/middleware-miniflare3-json-error.ts +1 -0
  12. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  13. package/templates/middleware/middleware-multiworker-dev.ts +59 -0
  14. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  15. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  16. package/templates/new-worker-scheduled.ts +1 -1
  17. package/templates/new-worker.ts +1 -1
  18. package/templates/pages-dev-util.ts +4 -1
  19. package/templates/pages-shim.ts +0 -3
  20. package/templates/pages-template-plugin.ts +12 -2
  21. package/templates/pages-template-worker.ts +11 -2
  22. package/templates/tsconfig.json +1 -1
  23. package/wrangler-dist/cli.d.ts +218 -128
  24. package/wrangler-dist/cli.js +79057 -81728
  25. package/wrangler-dist/wasm-sync.wasm +0 -0
  26. package/import_meta_url.js +0 -3
  27. package/miniflare-config-stubs/.env.empty +0 -0
  28. package/miniflare-config-stubs/package.empty.json +0 -1
  29. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  30. package/miniflare-dist/index.mjs +0 -6442
  31. package/src/__tests__/access.test.ts +0 -25
  32. package/src/__tests__/api-dev.test.ts +0 -238
  33. package/src/__tests__/api-devregistry.test.ts +0 -121
  34. package/src/__tests__/api.test.ts +0 -102
  35. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  36. package/src/__tests__/config-cache.test.ts +0 -42
  37. package/src/__tests__/configuration.test.ts +0 -4509
  38. package/src/__tests__/constellation.test.ts +0 -371
  39. package/src/__tests__/d1/d1.test.ts +0 -82
  40. package/src/__tests__/d1/execute.test.ts +0 -66
  41. package/src/__tests__/d1/migrate.test.ts +0 -257
  42. package/src/__tests__/d1/splitter.test.ts +0 -255
  43. package/src/__tests__/delete.test.ts +0 -272
  44. package/src/__tests__/deployments.test.ts +0 -369
  45. package/src/__tests__/dev.test.tsx +0 -1617
  46. package/src/__tests__/generate.test.ts +0 -237
  47. package/src/__tests__/get-host-from-url.test.ts +0 -16
  48. package/src/__tests__/guess-worker-format.test.ts +0 -120
  49. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  50. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  51. package/src/__tests__/helpers/end-event-loop.ts +0 -6
  52. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  53. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  54. package/src/__tests__/helpers/mock-bin.ts +0 -36
  55. package/src/__tests__/helpers/mock-console.ts +0 -112
  56. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  57. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  58. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  59. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  60. package/src/__tests__/helpers/mock-istty.ts +0 -74
  61. package/src/__tests__/helpers/mock-known-routes.ts +0 -12
  62. package/src/__tests__/helpers/mock-kv.ts +0 -46
  63. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  64. package/src/__tests__/helpers/mock-process.ts +0 -34
  65. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  66. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  67. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  68. package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
  69. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  70. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -160
  71. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  72. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  73. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  74. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  75. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  76. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  77. package/src/__tests__/helpers/msw/index.ts +0 -52
  78. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  79. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  80. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  81. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  82. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  83. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  84. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  85. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -11
  86. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  87. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  88. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  89. package/src/__tests__/https-options.test.ts +0 -163
  90. package/src/__tests__/index.test.ts +0 -282
  91. package/src/__tests__/init.test.ts +0 -3196
  92. package/src/__tests__/jest.setup.ts +0 -179
  93. package/src/__tests__/kv.test.ts +0 -1799
  94. package/src/__tests__/logger.test.ts +0 -207
  95. package/src/__tests__/logout.test.ts +0 -47
  96. package/src/__tests__/metrics.test.ts +0 -493
  97. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  98. package/src/__tests__/middleware.test.ts +0 -816
  99. package/src/__tests__/mtls-certificates.test.ts +0 -589
  100. package/src/__tests__/package-manager.test.ts +0 -353
  101. package/src/__tests__/pages/deployment-list.test.ts +0 -80
  102. package/src/__tests__/pages/functions-build.test.ts +0 -522
  103. package/src/__tests__/pages/pages.test.ts +0 -81
  104. package/src/__tests__/pages/project-create.test.ts +0 -63
  105. package/src/__tests__/pages/project-list.test.ts +0 -110
  106. package/src/__tests__/pages/project-upload.test.ts +0 -500
  107. package/src/__tests__/pages/publish.test.ts +0 -2864
  108. package/src/__tests__/pages-deployment-tail.test.ts +0 -955
  109. package/src/__tests__/parse.test.ts +0 -436
  110. package/src/__tests__/paths.test.ts +0 -39
  111. package/src/__tests__/publish.test.ts +0 -8849
  112. package/src/__tests__/pubsub.test.ts +0 -496
  113. package/src/__tests__/queues.test.ts +0 -532
  114. package/src/__tests__/r2.test.ts +0 -374
  115. package/src/__tests__/route.test.ts +0 -45
  116. package/src/__tests__/secret.test.ts +0 -693
  117. package/src/__tests__/tail.test.ts +0 -958
  118. package/src/__tests__/test-old-node-version.js +0 -31
  119. package/src/__tests__/traverse-module-graph.test.ts +0 -220
  120. package/src/__tests__/tsconfig-sanity.ts +0 -12
  121. package/src/__tests__/tsconfig.json +0 -8
  122. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  123. package/src/__tests__/type-generation.test.ts +0 -234
  124. package/src/__tests__/user.test.ts +0 -118
  125. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  126. package/src/__tests__/validate-dev-props.test.ts +0 -56
  127. package/src/__tests__/version.test.ts +0 -35
  128. package/src/__tests__/whoami.test.tsx +0 -172
  129. package/src/__tests__/worker-namespace.test.ts +0 -340
  130. package/src/abort.d.ts +0 -3
  131. package/src/api/dev.ts +0 -321
  132. package/src/api/index.ts +0 -11
  133. package/src/api/mtls-certificate.ts +0 -148
  134. package/src/api/pages/create-worker-bundle-contents.ts +0 -76
  135. package/src/api/pages/index.ts +0 -5
  136. package/src/api/pages/publish.tsx +0 -371
  137. package/src/bundle-reporter.ts +0 -68
  138. package/src/bundle.ts +0 -911
  139. package/src/cfetch/index.ts +0 -158
  140. package/src/cfetch/internal.ts +0 -258
  141. package/src/cli.ts +0 -28
  142. package/src/config/README.md +0 -107
  143. package/src/config/config.ts +0 -282
  144. package/src/config/diagnostics.ts +0 -80
  145. package/src/config/environment.ts +0 -618
  146. package/src/config/index.ts +0 -403
  147. package/src/config/validation-helpers.ts +0 -597
  148. package/src/config/validation.ts +0 -2342
  149. package/src/config-cache.ts +0 -85
  150. package/src/constellation/createProject.tsx +0 -51
  151. package/src/constellation/deleteProject.ts +0 -51
  152. package/src/constellation/deleteProjectModel.ts +0 -68
  153. package/src/constellation/index.ts +0 -75
  154. package/src/constellation/listCatalog.tsx +0 -35
  155. package/src/constellation/listModel.tsx +0 -41
  156. package/src/constellation/listProject.tsx +0 -28
  157. package/src/constellation/listRuntime.tsx +0 -28
  158. package/src/constellation/options.ts +0 -17
  159. package/src/constellation/types.ts +0 -17
  160. package/src/constellation/uploadModel.tsx +0 -64
  161. package/src/constellation/utils.ts +0 -90
  162. package/src/create-worker-preview.ts +0 -293
  163. package/src/create-worker-upload-form.ts +0 -359
  164. package/src/d1/backups.tsx +0 -219
  165. package/src/d1/constants.ts +0 -2
  166. package/src/d1/create.tsx +0 -70
  167. package/src/d1/delete.ts +0 -53
  168. package/src/d1/execute.tsx +0 -357
  169. package/src/d1/formatTimeAgo.ts +0 -14
  170. package/src/d1/index.ts +0 -100
  171. package/src/d1/list.tsx +0 -62
  172. package/src/d1/migrations/apply.tsx +0 -212
  173. package/src/d1/migrations/create.tsx +0 -79
  174. package/src/d1/migrations/helpers.ts +0 -169
  175. package/src/d1/migrations/index.ts +0 -3
  176. package/src/d1/migrations/list.tsx +0 -95
  177. package/src/d1/migrations/options.ts +0 -23
  178. package/src/d1/options.ts +0 -22
  179. package/src/d1/splitter.ts +0 -161
  180. package/src/d1/types.ts +0 -25
  181. package/src/d1/utils.ts +0 -49
  182. package/src/delete.ts +0 -100
  183. package/src/deployments.ts +0 -368
  184. package/src/deprecated/index.ts +0 -144
  185. package/src/dev/dev-vars.ts +0 -39
  186. package/src/dev/dev.tsx +0 -602
  187. package/src/dev/get-local-persistence-path.ts +0 -31
  188. package/src/dev/local.tsx +0 -948
  189. package/src/dev/remote.tsx +0 -632
  190. package/src/dev/start-server.ts +0 -543
  191. package/src/dev/use-esbuild.ts +0 -212
  192. package/src/dev/validate-dev-props.ts +0 -40
  193. package/src/dev-registry.ts +0 -202
  194. package/src/dev.tsx +0 -934
  195. package/src/dialogs.ts +0 -136
  196. package/src/dispatch-namespace.ts +0 -211
  197. package/src/docs/helpers.ts +0 -50
  198. package/src/docs/index.ts +0 -54
  199. package/src/durable.ts +0 -102
  200. package/src/entry.ts +0 -338
  201. package/src/environment-variables/factory.ts +0 -89
  202. package/src/environment-variables/misc-variables.ts +0 -30
  203. package/src/errors.ts +0 -11
  204. package/src/generate/index.ts +0 -298
  205. package/src/git-client.ts +0 -135
  206. package/src/global-wrangler-config-path.ts +0 -26
  207. package/src/https-options.ts +0 -127
  208. package/src/index.ts +0 -768
  209. package/src/init.ts +0 -1032
  210. package/src/inspect.ts +0 -782
  211. package/src/intl-polyfill.d.ts +0 -139
  212. package/src/is-ci.ts +0 -14
  213. package/src/is-interactive.ts +0 -16
  214. package/src/jest.d.ts +0 -4
  215. package/src/kv/helpers.ts +0 -433
  216. package/src/kv/index.ts +0 -594
  217. package/src/logger.ts +0 -123
  218. package/src/metrics/index.ts +0 -5
  219. package/src/metrics/metrics-config.ts +0 -239
  220. package/src/metrics/metrics-dispatcher.ts +0 -96
  221. package/src/metrics/metrics-usage-headers.ts +0 -24
  222. package/src/metrics/send-event.ts +0 -99
  223. package/src/miniflare-cli/README.md +0 -30
  224. package/src/miniflare-cli/assets.ts +0 -251
  225. package/src/miniflare-cli/index.ts +0 -210
  226. package/src/miniflare-cli/request-context.ts +0 -40
  227. package/src/miniflare-cli/tsconfig.json +0 -9
  228. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  229. package/src/miniflare-cli/types.ts +0 -11
  230. package/src/module-collection.ts +0 -333
  231. package/src/mtls-certificate/cli.ts +0 -155
  232. package/src/open-in-browser.ts +0 -17
  233. package/src/package-manager.ts +0 -219
  234. package/src/pages/build.ts +0 -422
  235. package/src/pages/buildFunctions.ts +0 -140
  236. package/src/pages/constants.ts +0 -18
  237. package/src/pages/deployment-tails.ts +0 -281
  238. package/src/pages/deployments.tsx +0 -84
  239. package/src/pages/dev.ts +0 -734
  240. package/src/pages/errors.ts +0 -67
  241. package/src/pages/functions/buildPlugin.ts +0 -113
  242. package/src/pages/functions/buildWorker.ts +0 -348
  243. package/src/pages/functions/filepath-routing.test.ts +0 -234
  244. package/src/pages/functions/filepath-routing.ts +0 -189
  245. package/src/pages/functions/identifiers.ts +0 -78
  246. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  247. package/src/pages/functions/routes-consolidation.ts +0 -73
  248. package/src/pages/functions/routes-transformation.test.ts +0 -282
  249. package/src/pages/functions/routes-transformation.ts +0 -115
  250. package/src/pages/functions/routes-validation.test.ts +0 -403
  251. package/src/pages/functions/routes-validation.ts +0 -202
  252. package/src/pages/functions/routes.ts +0 -151
  253. package/src/pages/functions/tsconfig.json +0 -8
  254. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  255. package/src/pages/functions.ts +0 -86
  256. package/src/pages/hash.ts +0 -13
  257. package/src/pages/index.ts +0 -102
  258. package/src/pages/projects.tsx +0 -159
  259. package/src/pages/prompt-select-project.tsx +0 -31
  260. package/src/pages/publish.tsx +0 -267
  261. package/src/pages/types.ts +0 -46
  262. package/src/pages/upload.tsx +0 -469
  263. package/src/pages/utils.ts +0 -23
  264. package/src/parse.ts +0 -308
  265. package/src/paths.ts +0 -71
  266. package/src/proxy.ts +0 -694
  267. package/src/publish/index.ts +0 -274
  268. package/src/publish/publish.ts +0 -1060
  269. package/src/pubsub/index.ts +0 -286
  270. package/src/pubsub/pubsub-commands.ts +0 -623
  271. package/src/queues/cli/commands/consumer/add.ts +0 -71
  272. package/src/queues/cli/commands/consumer/index.ts +0 -19
  273. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  274. package/src/queues/cli/commands/create.ts +0 -25
  275. package/src/queues/cli/commands/delete.ts +0 -26
  276. package/src/queues/cli/commands/index.ts +0 -35
  277. package/src/queues/cli/commands/list.ts +0 -25
  278. package/src/queues/client.ts +0 -136
  279. package/src/queues/utils.ts +0 -18
  280. package/src/r2/constants.ts +0 -4
  281. package/src/r2/helpers.ts +0 -132
  282. package/src/r2/index.ts +0 -289
  283. package/src/routes.ts +0 -140
  284. package/src/secret/index.ts +0 -376
  285. package/src/selfsigned.d.ts +0 -29
  286. package/src/sites.ts +0 -484
  287. package/src/tail/createTail.ts +0 -406
  288. package/src/tail/filters.ts +0 -277
  289. package/src/tail/index.ts +0 -211
  290. package/src/tail/printing.ts +0 -122
  291. package/src/traverse-module-graph.ts +0 -53
  292. package/src/tsconfig-sanity.ts +0 -16
  293. package/src/type-generation.ts +0 -181
  294. package/src/update-check.ts +0 -19
  295. package/src/user/access.ts +0 -68
  296. package/src/user/auth-variables.ts +0 -113
  297. package/src/user/choose-account.tsx +0 -39
  298. package/src/user/generate-auth-url.ts +0 -33
  299. package/src/user/generate-random-state.ts +0 -16
  300. package/src/user/index.ts +0 -2
  301. package/src/user/user.ts +0 -1234
  302. package/src/utils/collectKeyValues.ts +0 -14
  303. package/src/utils/render.ts +0 -93
  304. package/src/whoami.ts +0 -135
  305. package/src/worker.ts +0 -274
  306. package/src/yargs-types.ts +0 -37
  307. package/src/zones.ts +0 -191
  308. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  309. package/templates/d1-beta-facade.js +0 -244
  310. package/templates/first-party-worker-module-facade.ts +0 -19
  311. package/templates/format-dev-errors.ts +0 -34
  312. package/templates/serve-static-assets.ts +0 -66
  313. package/templates/service-bindings-module-facade.js +0 -55
  314. package/templates/service-bindings-sw-facade.js +0 -42
  315. package/templates/tsconfig.tsbuildinfo +0 -1
@@ -1,257 +0,0 @@
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
- });
@@ -1,255 +0,0 @@
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
- });