wrangler 0.0.0-e41c7e41 → 0.0.0-e44f496a8

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 (272) hide show
  1. package/README.md +17 -15
  2. package/bin/wrangler.js +24 -93
  3. package/config-schema.json +3126 -0
  4. package/package.json +198 -192
  5. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  6. package/templates/__tests__/tsconfig.json +8 -0
  7. package/templates/checked-fetch.js +19 -6
  8. package/templates/facade.d.ts +19 -0
  9. package/templates/gitignore +2 -3
  10. package/templates/init-tests/test-jest-new-worker.js +3 -5
  11. package/templates/init-tests/test-vitest-new-worker.js +4 -6
  12. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  13. package/templates/middleware/common.ts +9 -4
  14. package/templates/middleware/loader-modules.ts +94 -44
  15. package/templates/middleware/loader-sw.ts +6 -4
  16. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  17. package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
  18. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  19. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  20. package/templates/middleware/middleware-scheduled.ts +15 -1
  21. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  22. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  23. package/templates/modules-watch-stub.js +4 -0
  24. package/templates/new-worker-scheduled.ts +1 -1
  25. package/templates/new-worker.ts +4 -1
  26. package/templates/pages-dev-pipeline.ts +6 -2
  27. package/templates/pages-dev-util.ts +4 -1
  28. package/templates/pages-shim.ts +1 -1
  29. package/templates/pages-template-plugin.ts +33 -14
  30. package/templates/pages-template-worker.ts +12 -3
  31. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  32. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  33. package/templates/tsconfig-sanity.ts +11 -0
  34. package/templates/tsconfig.init.json +22 -0
  35. package/templates/tsconfig.json +5 -103
  36. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  37. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  38. package/wrangler-dist/ProxyWorker.js +241 -0
  39. package/wrangler-dist/ProxyWorker.js.map +6 -0
  40. package/wrangler-dist/cli.d.ts +26122 -519
  41. package/wrangler-dist/cli.js +174096 -118298
  42. package/wrangler-dist/wasm-sync.wasm +0 -0
  43. package/Cloudflare_CA.pem +0 -18
  44. package/import_meta_url.js +0 -3
  45. package/miniflare-config-stubs/.env.empty +0 -0
  46. package/miniflare-config-stubs/package.empty.json +0 -1
  47. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  48. package/miniflare-dist/index.mjs +0 -6316
  49. package/src/__tests__/access.test.ts +0 -25
  50. package/src/__tests__/api-dev.test.ts +0 -209
  51. package/src/__tests__/api-devregistry.test.js +0 -56
  52. package/src/__tests__/api.test.ts +0 -80
  53. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  54. package/src/__tests__/config-cache.test.ts +0 -42
  55. package/src/__tests__/configuration.test.ts +0 -3981
  56. package/src/__tests__/d1.test.ts +0 -80
  57. package/src/__tests__/delete.test.ts +0 -230
  58. package/src/__tests__/deployments.test.ts +0 -91
  59. package/src/__tests__/dev.test.tsx +0 -1536
  60. package/src/__tests__/dialogs.test.tsx +0 -40
  61. package/src/__tests__/generate.test.ts +0 -235
  62. package/src/__tests__/get-host-from-url.test.ts +0 -16
  63. package/src/__tests__/guess-worker-format.test.ts +0 -85
  64. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  65. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  66. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  67. package/src/__tests__/helpers/mock-bin.ts +0 -36
  68. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  69. package/src/__tests__/helpers/mock-console.ts +0 -106
  70. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  71. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  72. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  73. package/src/__tests__/helpers/mock-istty.ts +0 -74
  74. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  75. package/src/__tests__/helpers/mock-kv.ts +0 -33
  76. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -252
  77. package/src/__tests__/helpers/mock-process.ts +0 -39
  78. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  79. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  80. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  81. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -59
  82. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  83. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -36
  84. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  85. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  86. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  87. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -22
  88. package/src/__tests__/helpers/msw/index.ts +0 -21
  89. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  90. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  91. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  92. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  93. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  94. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  95. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  96. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  97. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  98. package/src/__tests__/https-options.test.ts +0 -163
  99. package/src/__tests__/index.test.ts +0 -264
  100. package/src/__tests__/init.test.ts +0 -2900
  101. package/src/__tests__/jest.setup.ts +0 -202
  102. package/src/__tests__/kv.test.ts +0 -1675
  103. package/src/__tests__/logger.test.ts +0 -141
  104. package/src/__tests__/metrics.test.ts +0 -450
  105. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  106. package/src/__tests__/middleware.test.ts +0 -726
  107. package/src/__tests__/package-manager.test.ts +0 -353
  108. package/src/__tests__/pages-deployment-tail.test.ts +0 -820
  109. package/src/__tests__/pages.test.ts +0 -2442
  110. package/src/__tests__/parse.test.ts +0 -330
  111. package/src/__tests__/paths.test.ts +0 -39
  112. package/src/__tests__/publish.test.ts +0 -7633
  113. package/src/__tests__/pubsub.test.ts +0 -370
  114. package/src/__tests__/queues.test.ts +0 -371
  115. package/src/__tests__/r2.test.ts +0 -393
  116. package/src/__tests__/route.test.ts +0 -45
  117. package/src/__tests__/secret.test.ts +0 -644
  118. package/src/__tests__/tail.test.ts +0 -800
  119. package/src/__tests__/test-old-node-version.js +0 -31
  120. package/src/__tests__/type-generation.test.ts +0 -226
  121. package/src/__tests__/user.test.ts +0 -155
  122. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  123. package/src/__tests__/validate-dev-props.test.ts +0 -56
  124. package/src/__tests__/version.test.ts +0 -35
  125. package/src/__tests__/whoami.test.tsx +0 -278
  126. package/src/__tests__/worker-namespace.test.ts +0 -326
  127. package/src/abort.d.ts +0 -3
  128. package/src/api/dev.ts +0 -210
  129. package/src/api/index.ts +0 -2
  130. package/src/bundle-reporter.tsx +0 -68
  131. package/src/bundle.ts +0 -823
  132. package/src/cfetch/index.ts +0 -160
  133. package/src/cfetch/internal.ts +0 -263
  134. package/src/cli.ts +0 -28
  135. package/src/config/README.md +0 -107
  136. package/src/config/config.ts +0 -275
  137. package/src/config/diagnostics.ts +0 -80
  138. package/src/config/environment.ts +0 -561
  139. package/src/config/index.ts +0 -334
  140. package/src/config/validation-helpers.ts +0 -597
  141. package/src/config/validation.ts +0 -2103
  142. package/src/config-cache.ts +0 -85
  143. package/src/create-worker-preview.ts +0 -282
  144. package/src/create-worker-upload-form.ts +0 -316
  145. package/src/d1/backups.tsx +0 -218
  146. package/src/d1/constants.ts +0 -2
  147. package/src/d1/create.tsx +0 -63
  148. package/src/d1/delete.tsx +0 -56
  149. package/src/d1/execute.tsx +0 -352
  150. package/src/d1/formatTimeAgo.ts +0 -14
  151. package/src/d1/index.ts +0 -99
  152. package/src/d1/list.tsx +0 -48
  153. package/src/d1/migrations.tsx +0 -446
  154. package/src/d1/options.ts +0 -22
  155. package/src/d1/types.tsx +0 -24
  156. package/src/d1/utils.ts +0 -48
  157. package/src/delete.ts +0 -108
  158. package/src/deployments.ts +0 -77
  159. package/src/deprecated/index.ts +0 -438
  160. package/src/dev/dev-vars.ts +0 -39
  161. package/src/dev/dev.tsx +0 -590
  162. package/src/dev/get-local-persistence-path.tsx +0 -31
  163. package/src/dev/local.tsx +0 -886
  164. package/src/dev/remote.tsx +0 -603
  165. package/src/dev/start-server.ts +0 -538
  166. package/src/dev/use-esbuild.ts +0 -204
  167. package/src/dev/validate-dev-props.ts +0 -31
  168. package/src/dev-registry.tsx +0 -201
  169. package/src/dev.tsx +0 -905
  170. package/src/dialogs.tsx +0 -168
  171. package/src/dispatch-namespace.ts +0 -207
  172. package/src/durable.ts +0 -102
  173. package/src/entry.ts +0 -329
  174. package/src/environment-variables.ts +0 -50
  175. package/src/errors.ts +0 -11
  176. package/src/git-client.ts +0 -124
  177. package/src/global-wrangler-config-path.ts +0 -26
  178. package/src/https-options.ts +0 -127
  179. package/src/index.tsx +0 -682
  180. package/src/init.ts +0 -970
  181. package/src/inspect.ts +0 -767
  182. package/src/intl-polyfill.d.ts +0 -139
  183. package/src/is-ci.ts +0 -14
  184. package/src/is-interactive.ts +0 -16
  185. package/src/kv/helpers.ts +0 -430
  186. package/src/kv/index.ts +0 -596
  187. package/src/logger.ts +0 -92
  188. package/src/metrics/index.ts +0 -5
  189. package/src/metrics/metrics-config.ts +0 -239
  190. package/src/metrics/metrics-dispatcher.ts +0 -96
  191. package/src/metrics/metrics-usage-headers.ts +0 -24
  192. package/src/metrics/send-event.ts +0 -96
  193. package/src/miniflare-cli/README.md +0 -30
  194. package/src/miniflare-cli/assets.ts +0 -215
  195. package/src/miniflare-cli/index.ts +0 -213
  196. package/src/miniflare-cli/request-context.ts +0 -40
  197. package/src/module-collection.ts +0 -267
  198. package/src/open-in-browser.ts +0 -17
  199. package/src/package-manager.ts +0 -219
  200. package/src/pages/build.tsx +0 -270
  201. package/src/pages/constants.ts +0 -18
  202. package/src/pages/deployment-tails.tsx +0 -284
  203. package/src/pages/deployments.tsx +0 -84
  204. package/src/pages/dev.tsx +0 -708
  205. package/src/pages/errors.ts +0 -66
  206. package/src/pages/functions/buildPlugin.ts +0 -107
  207. package/src/pages/functions/buildWorker.ts +0 -166
  208. package/src/pages/functions/filepath-routing.test.ts +0 -234
  209. package/src/pages/functions/filepath-routing.ts +0 -189
  210. package/src/pages/functions/identifiers.ts +0 -78
  211. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  212. package/src/pages/functions/routes-consolidation.ts +0 -73
  213. package/src/pages/functions/routes-transformation.test.ts +0 -282
  214. package/src/pages/functions/routes-transformation.ts +0 -115
  215. package/src/pages/functions/routes-validation.test.ts +0 -403
  216. package/src/pages/functions/routes-validation.ts +0 -202
  217. package/src/pages/functions/routes.ts +0 -151
  218. package/src/pages/functions.tsx +0 -82
  219. package/src/pages/hash.tsx +0 -13
  220. package/src/pages/index.tsx +0 -102
  221. package/src/pages/projects.tsx +0 -169
  222. package/src/pages/prompt-select-project.tsx +0 -31
  223. package/src/pages/publish.tsx +0 -451
  224. package/src/pages/types.ts +0 -41
  225. package/src/pages/upload.tsx +0 -426
  226. package/src/pages/utils.ts +0 -23
  227. package/src/parse.ts +0 -286
  228. package/src/paths.ts +0 -71
  229. package/src/proxy.ts +0 -689
  230. package/src/publish/index.ts +0 -270
  231. package/src/publish/publish.ts +0 -1035
  232. package/src/pubsub/index.ts +0 -286
  233. package/src/pubsub/pubsub-commands.tsx +0 -624
  234. package/src/queues/cli/commands/consumer/add.ts +0 -71
  235. package/src/queues/cli/commands/consumer/index.ts +0 -22
  236. package/src/queues/cli/commands/consumer/remove.ts +0 -38
  237. package/src/queues/cli/commands/create.ts +0 -25
  238. package/src/queues/cli/commands/delete.ts +0 -26
  239. package/src/queues/cli/commands/index.ts +0 -33
  240. package/src/queues/cli/commands/list.ts +0 -25
  241. package/src/queues/client.ts +0 -135
  242. package/src/r2/constants.ts +0 -4
  243. package/src/r2/helpers.ts +0 -131
  244. package/src/r2/index.ts +0 -289
  245. package/src/routes.ts +0 -140
  246. package/src/secret/index.ts +0 -378
  247. package/src/selfsigned.d.ts +0 -29
  248. package/src/sites.tsx +0 -372
  249. package/src/tail/createTail.ts +0 -379
  250. package/src/tail/filters.ts +0 -277
  251. package/src/tail/index.ts +0 -214
  252. package/src/tail/printing.ts +0 -107
  253. package/src/type-generation.ts +0 -173
  254. package/src/update-check.ts +0 -19
  255. package/src/user/access.ts +0 -69
  256. package/src/user/choose-account.tsx +0 -69
  257. package/src/user/env-vars.ts +0 -46
  258. package/src/user/generate-auth-url.ts +0 -33
  259. package/src/user/generate-random-state.ts +0 -16
  260. package/src/user/index.ts +0 -3
  261. package/src/user/user.tsx +0 -1192
  262. package/src/utils/collectKeyValues.ts +0 -14
  263. package/src/whoami.tsx +0 -169
  264. package/src/worker.ts +0 -245
  265. package/src/yargs-types.ts +0 -24
  266. package/src/zones.ts +0 -191
  267. package/templates/d1-beta-facade.js +0 -205
  268. package/templates/first-party-worker-module-facade.ts +0 -18
  269. package/templates/format-dev-errors.ts +0 -32
  270. package/templates/serve-static-assets.ts +0 -63
  271. package/templates/service-bindings-module-facade.js +0 -54
  272. package/templates/service-bindings-sw-facade.js +0 -42
package/src/d1/index.ts DELETED
@@ -1,99 +0,0 @@
1
- import * as Backups from "./backups";
2
- import * as Create from "./create";
3
- import * as Delete from "./delete";
4
- import * as Execute from "./execute";
5
- import * as List from "./list";
6
- import * as Migrations from "./migrations";
7
- import { d1BetaWarning } from "./utils";
8
- import type { CommonYargsOptions } from "../yargs-types";
9
- import type { Argv } from "yargs";
10
-
11
- export const d1 = (yargs: Argv<CommonYargsOptions>) => {
12
- return (
13
- yargs
14
- .command("list", "List D1 databases", List.Options, List.Handler)
15
- .command(
16
- "create <name>",
17
- "Create D1 database",
18
- Create.Options,
19
- Create.Handler
20
- )
21
- .command(
22
- "delete <name>",
23
- "Delete D1 database",
24
- Delete.Options,
25
- Delete.Handler
26
- )
27
- .command("backup", "Interact with D1 Backups", (yargs2) =>
28
- yargs2
29
- .command(
30
- "list <name>",
31
- "List your D1 backups",
32
- Backups.ListOptions,
33
- Backups.ListHandler
34
- )
35
- .command(
36
- "create <name>",
37
- "Create a new D1 backup",
38
- Backups.CreateOptions,
39
- Backups.CreateHandler
40
- )
41
- .command(
42
- "restore <name> <backup-id>",
43
- "Restore a DB backup",
44
- Backups.RestoreOptions,
45
- Backups.RestoreHandler
46
- )
47
- .command(
48
- "download <name> <backup-id>",
49
- "Download a DB backup",
50
- Backups.DownloadOptions,
51
- Backups.DownloadHandler
52
- )
53
- .epilogue(d1BetaWarning)
54
- )
55
- // .command(
56
- // "console <name>",
57
- // "Open a Console on a D1 database",
58
- // (d1CreateYargs) => {
59
- // return d1CreateYargs.positional("name", {
60
- // describe: "The name of the DB",
61
- // type: "string",
62
- // demandOption: true,
63
- // });
64
- // },
65
- // async (_) => {
66
- // // TODO
67
- // }
68
- // )
69
- .command(
70
- "execute <database>",
71
- "Executed command or SQL file",
72
- Execute.Options,
73
- Execute.Handler
74
- )
75
- .command("migrations", "Interact with D1 Migrations", (yargs2) =>
76
- yargs2
77
- .command(
78
- "list <database>",
79
- "List your D1 migrations",
80
- Migrations.ListOptions,
81
- Migrations.ListHandler
82
- )
83
- .command(
84
- "create <database> <message>",
85
- "Create a new Migration",
86
- Migrations.CreateOptions,
87
- Migrations.CreateHandler
88
- )
89
- .command(
90
- "apply <database>",
91
- "Apply D1 Migrations",
92
- Migrations.ApplyOptions,
93
- Migrations.ApplyHandler
94
- )
95
- .epilogue(d1BetaWarning)
96
- )
97
- .epilogue(d1BetaWarning)
98
- );
99
- };
package/src/d1/list.tsx DELETED
@@ -1,48 +0,0 @@
1
- import { render } from "ink";
2
- import Table from "ink-table";
3
- import React from "react";
4
- import { fetchResult } from "../cfetch";
5
- import { logger } from "../logger";
6
- import { requireAuth } from "../user";
7
- import { d1BetaWarning } from "./utils";
8
- import type { Database } from "./types";
9
- import type { ArgumentsCamelCase, Argv } from "yargs";
10
-
11
- type ListArgs = Record<string, never>;
12
-
13
- export function Options(d1ListYargs: Argv): Argv<ListArgs> {
14
- return d1ListYargs.epilogue(d1BetaWarning);
15
- }
16
-
17
- export async function Handler(_: ArgumentsCamelCase<ListArgs>): Promise<void> {
18
- const accountId = await requireAuth({});
19
- logger.log(d1BetaWarning);
20
-
21
- const dbs: Array<Database> = await listDatabases(accountId);
22
-
23
- render(<Table data={dbs}></Table>);
24
- }
25
-
26
- export const listDatabases = async (
27
- accountId: string
28
- ): Promise<Array<Database>> => {
29
- const pageSize = 10;
30
- let page = 1;
31
- const results = [];
32
- while (results.length % pageSize === 0) {
33
- const json: Array<Database> = await fetchResult(
34
- `/accounts/${accountId}/d1/database`,
35
- {},
36
- new URLSearchParams({
37
- per_page: pageSize.toString(),
38
- page: page.toString(),
39
- })
40
- );
41
- page++;
42
- results.push(...json);
43
- if (json.length < pageSize) {
44
- break;
45
- }
46
- }
47
- return results;
48
- };
@@ -1,446 +0,0 @@
1
- import fs from "node:fs";
2
- import path from "path";
3
- import { Box, render, Text } from "ink";
4
- import Table from "ink-table";
5
- import React from "react";
6
- import { withConfig } from "../config";
7
- import { confirm } from "../dialogs";
8
- import { logger } from "../logger";
9
- import { requireAuth } from "../user";
10
- import { createBackup } from "./backups";
11
- import { DEFAULT_MIGRATION_PATH } from "./constants";
12
- import { executeSql } from "./execute";
13
- import { Database } from "./options";
14
- import { d1BetaWarning, getDatabaseInfoFromConfig } from "./utils";
15
- import type { ConfigFields, DevConfig, Environment } from "../config";
16
- import type { ParseError } from "../parse";
17
- import type { BaseSqlExecuteArgs, QueryResult } from "./execute";
18
- import type { Migration } from "./types";
19
- import type { Argv } from "yargs";
20
-
21
- async function getMigrationsPath(
22
- projectPath: string,
23
- migrationsFolderPath: string,
24
- createIfMissing: boolean
25
- ): Promise<string> {
26
- const dir = path.resolve(projectPath, migrationsFolderPath);
27
- if (fs.existsSync(dir)) return dir;
28
-
29
- const warning = `No migrations folder found.${
30
- migrationsFolderPath === DEFAULT_MIGRATION_PATH
31
- ? " Set `migrations_dir` in wrangler.toml to choose a different path."
32
- : ""
33
- }`;
34
-
35
- if (createIfMissing && (await confirm(`${warning}\nOk to create ${dir}?`))) {
36
- fs.mkdirSync(dir, { recursive: true });
37
- return dir;
38
- } else {
39
- logger.warn(warning);
40
- }
41
-
42
- throw new Error(`No migrations present at ${dir}.`);
43
- }
44
-
45
- async function getUnappliedMigrations(
46
- migrationsTableName: string,
47
- migrationsPath: string,
48
- local: undefined | boolean,
49
- config: ConfigFields<DevConfig> & Environment,
50
- name: string,
51
- persistTo: undefined | string
52
- ): Promise<Array<string>> {
53
- const appliedMigrations = (
54
- await listAppliedMigrations(
55
- migrationsTableName,
56
- local,
57
- config,
58
- name,
59
- persistTo
60
- )
61
- ).map((migration) => {
62
- return migration.name;
63
- });
64
- const projectMigrations = getMigrationNames(migrationsPath);
65
-
66
- const unappliedMigrations: Array<string> = [];
67
-
68
- for (const migration of projectMigrations) {
69
- if (!appliedMigrations.includes(migration)) {
70
- unappliedMigrations.push(migration);
71
- }
72
- }
73
-
74
- return unappliedMigrations;
75
- }
76
-
77
- export function ListOptions(yargs: Argv): Argv<BaseSqlExecuteArgs> {
78
- return Database(yargs);
79
- }
80
-
81
- export const ListHandler = withConfig<BaseSqlExecuteArgs>(
82
- async ({ config, database, local, persistTo }): Promise<void> => {
83
- await requireAuth({});
84
- logger.log(d1BetaWarning);
85
-
86
- const databaseInfo = await getDatabaseInfoFromConfig(config, database);
87
- if (!databaseInfo) {
88
- throw new Error(
89
- `Can't find a DB with name/binding '${database}' in local config. Check info in wrangler.toml...`
90
- );
91
- }
92
-
93
- if (!config.configPath) {
94
- return;
95
- }
96
- const { migrationsTableName, migrationsFolderPath } = databaseInfo;
97
-
98
- const migrationsPath = await getMigrationsPath(
99
- path.dirname(config.configPath),
100
- migrationsFolderPath,
101
- false
102
- );
103
- await initMigrationsTable(
104
- migrationsTableName,
105
- local,
106
- config,
107
- database,
108
- persistTo
109
- );
110
-
111
- const unappliedMigrations = (
112
- await getUnappliedMigrations(
113
- migrationsTableName,
114
- migrationsPath,
115
- local,
116
- config,
117
- database,
118
- persistTo
119
- )
120
- ).map((migration) => {
121
- return {
122
- Name: migration,
123
- };
124
- });
125
-
126
- if (unappliedMigrations.length === 0) {
127
- render(<Text>✅ No migrations to apply!</Text>);
128
- return;
129
- }
130
-
131
- render(
132
- <Box flexDirection="column">
133
- <Text>Migrations to be applied:</Text>
134
- <Table data={unappliedMigrations} columns={["Name"]}></Table>
135
- </Box>
136
- );
137
- }
138
- );
139
-
140
- export function ApplyOptions(yargs: Argv): Argv<BaseSqlExecuteArgs> {
141
- return Database(yargs);
142
- }
143
-
144
- export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
145
- async ({ config, database, local, persistTo }): Promise<void> => {
146
- const accountId = await requireAuth({});
147
- logger.log(d1BetaWarning);
148
-
149
- const databaseInfo = await getDatabaseInfoFromConfig(config, database);
150
- if (!databaseInfo) {
151
- throw new Error(
152
- `Can't find a DB with name/binding '${database}' in local config. Check info in wrangler.toml...`
153
- );
154
- }
155
-
156
- if (!config.configPath) {
157
- return;
158
- }
159
-
160
- const migrationsPath = await getMigrationsPath(
161
- path.dirname(config.configPath),
162
- databaseInfo.migrationsFolderPath,
163
- false
164
- );
165
- await initMigrationsTable(
166
- databaseInfo.migrationsTableName,
167
- local,
168
- config,
169
- database,
170
- persistTo
171
- );
172
-
173
- const unappliedMigrations = (
174
- await getUnappliedMigrations(
175
- databaseInfo.migrationsTableName,
176
- migrationsPath,
177
- local,
178
- config,
179
- database,
180
- persistTo
181
- )
182
- )
183
- .map((migration) => {
184
- return {
185
- Name: migration,
186
- Status: "🕒️",
187
- };
188
- })
189
- .sort((a, b) => {
190
- const migrationNumberA = parseInt(a.Name.split("_")[0]);
191
- const migrationNumberB = parseInt(b.Name.split("_")[0]);
192
- if (migrationNumberA < migrationNumberB) {
193
- return -1;
194
- }
195
- if (migrationNumberA > migrationNumberB) {
196
- return 1;
197
- }
198
-
199
- // numbers must be equal
200
- return 0;
201
- });
202
-
203
- if (unappliedMigrations.length === 0) {
204
- render(<Text>✅ No migrations to apply!</Text>);
205
- return;
206
- }
207
-
208
- const isInteractive = process.stdout.isTTY;
209
- if (isInteractive) {
210
- const ok = await confirm(
211
- `About to apply ${unappliedMigrations.length} migration(s)\n` +
212
- "Your database may not be available to serve requests during the migration, continue?",
213
- <Box flexDirection="column">
214
- <Text>Migrations to be applied:</Text>
215
- <Table data={unappliedMigrations} columns={["Name"]}></Table>
216
- </Box>
217
- );
218
- if (!ok) return;
219
- }
220
-
221
- render(<Text>🕒 Creating backup...</Text>);
222
- await createBackup(accountId, databaseInfo.uuid);
223
-
224
- for (const migration of unappliedMigrations) {
225
- let query = fs.readFileSync(
226
- `${migrationsPath}/${migration.Name}`,
227
- "utf8"
228
- );
229
- query += `
230
- INSERT INTO ${databaseInfo.migrationsTableName} (name)
231
- values ('${migration.Name}');
232
- `;
233
-
234
- let success = true;
235
- let errorNotes: Array<string> = [];
236
- try {
237
- const response = await executeSql(
238
- local,
239
- config,
240
- database,
241
- undefined,
242
- persistTo,
243
- undefined,
244
- query
245
- );
246
-
247
- if (response === null) {
248
- // TODO: return error
249
- return;
250
- }
251
-
252
- for (const result of response) {
253
- // When executing more than 1 statement, response turns into an array of QueryResult
254
- if (Array.isArray(result)) {
255
- for (const subResult of result) {
256
- if (!subResult.success) {
257
- success = false;
258
- }
259
- }
260
- } else {
261
- if (!result.success) {
262
- success = false;
263
- }
264
- }
265
- }
266
- } catch (e) {
267
- const err = e as ParseError;
268
-
269
- success = false;
270
- errorNotes = err.notes.map((msg) => msg.text);
271
- }
272
-
273
- migration.Status = success ? "✅" : "❌";
274
-
275
- render(
276
- <Box flexDirection="column">
277
- <Table
278
- data={unappliedMigrations}
279
- columns={["Name", "Status"]}
280
- ></Table>
281
- {errorNotes.length > 0 && (
282
- <Box flexDirection="column">
283
- <Text>&nbsp;</Text>
284
- <Text>
285
- ❌ Migration {migration.Name} failed with following Errors
286
- </Text>
287
- <Table
288
- data={errorNotes.map((err) => {
289
- return { Error: err };
290
- })}
291
- ></Table>
292
- </Box>
293
- )}
294
- </Box>
295
- );
296
-
297
- if (errorNotes.length > 0) return;
298
- }
299
- }
300
- );
301
-
302
- export const listAppliedMigrations = async (
303
- migrationsTableName: string,
304
- local: undefined | boolean,
305
- config: ConfigFields<DevConfig> & Environment,
306
- name: string,
307
- persistTo: undefined | string
308
- ): Promise<Migration[]> => {
309
- const Query = `SELECT *
310
- FROM ${migrationsTableName}
311
- ORDER BY id`;
312
-
313
- const response: QueryResult[] | null = await executeSql(
314
- local,
315
- config,
316
- name,
317
- undefined,
318
- persistTo,
319
- undefined,
320
- Query
321
- );
322
-
323
- if (!response || response[0].results.length === 0) return [];
324
-
325
- return response[0].results as Migration[];
326
- };
327
-
328
- const initMigrationsTable = async (
329
- migrationsTableName: string,
330
- local: undefined | boolean,
331
- config: ConfigFields<DevConfig> & Environment,
332
- name: string,
333
- persistTo: undefined | string
334
- ) => {
335
- return executeSql(
336
- local,
337
- config,
338
- name,
339
- undefined,
340
- persistTo,
341
- undefined,
342
- `
343
- CREATE TABLE IF NOT EXISTS ${migrationsTableName}
344
- (
345
- id INTEGER PRIMARY KEY AUTOINCREMENT,
346
- name TEXT UNIQUE,
347
- applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
348
- );
349
- `
350
- );
351
- };
352
-
353
- function getMigrationNames(migrationsPath: string): Array<string> {
354
- const migrations = [];
355
-
356
- const dir = fs.opendirSync(migrationsPath);
357
-
358
- let dirent;
359
- while ((dirent = dir.readSync()) !== null) {
360
- if (dirent.name.endsWith(".sql")) migrations.push(dirent.name);
361
- }
362
-
363
- dir.closeSync();
364
-
365
- return migrations;
366
- }
367
-
368
- function getNextMigrationNumber(migrationsPath: string): number {
369
- let highestMigrationNumber = -1;
370
-
371
- for (const migration in getMigrationNames(migrationsPath)) {
372
- const migrationNumber = parseInt(migration.split("_")[0]);
373
-
374
- if (migrationNumber > highestMigrationNumber) {
375
- highestMigrationNumber = migrationNumber;
376
- }
377
- }
378
-
379
- return highestMigrationNumber + 1;
380
- }
381
-
382
- function pad(num: number, size: number): string {
383
- let newNum = num.toString();
384
- while (newNum.length < size) newNum = "0" + newNum;
385
- return newNum;
386
- }
387
-
388
- type MigrationsCreateArgs = {
389
- config?: string;
390
- database: string;
391
- message: string;
392
- };
393
-
394
- export function CreateOptions(yargs: Argv): Argv<MigrationsCreateArgs> {
395
- return Database(yargs).positional("message", {
396
- describe: "The Migration message",
397
- type: "string",
398
- demandOption: true,
399
- });
400
- }
401
-
402
- export const CreateHandler = withConfig<MigrationsCreateArgs>(
403
- async ({ config, database, message }): Promise<void> => {
404
- await requireAuth({});
405
- logger.log(d1BetaWarning);
406
-
407
- const databaseInfo = await getDatabaseInfoFromConfig(config, database);
408
- if (!databaseInfo) {
409
- throw new Error(
410
- `Can't find a DB with name/binding '${database}' in local config. Check info in wrangler.toml...`
411
- );
412
- }
413
-
414
- if (!config.configPath) {
415
- return;
416
- }
417
-
418
- const migrationsPath = await getMigrationsPath(
419
- path.dirname(config.configPath),
420
- databaseInfo.migrationsFolderPath,
421
- true
422
- );
423
- const nextMigrationNumber = pad(getNextMigrationNumber(migrationsPath), 4);
424
- const migrationName = message.replaceAll(" ", "_");
425
-
426
- const newMigrationName = `${nextMigrationNumber}_${migrationName}.sql`;
427
-
428
- fs.writeFileSync(
429
- `${migrationsPath}/${newMigrationName}`,
430
- `-- Migration number: ${nextMigrationNumber} \t ${new Date().toISOString()}\n`
431
- );
432
-
433
- render(
434
- <Box flexDirection="column">
435
- <Text>
436
- ✅ Successfully created Migration &apos;{newMigrationName}&apos;!
437
- </Text>
438
- <Text>&nbsp;</Text>
439
- <Text>The migration is available for editing here</Text>
440
- <Text>
441
- {migrationsPath}/{newMigrationName}
442
- </Text>
443
- </Box>
444
- );
445
- }
446
- );
package/src/d1/options.ts DELETED
@@ -1,22 +0,0 @@
1
- import { d1BetaWarning } from "./utils";
2
- import type { Argv } from "yargs";
3
-
4
- export function Name(yargs: Argv) {
5
- return yargs
6
- .positional("name", {
7
- describe: "The name or binding of the DB",
8
- type: "string",
9
- demandOption: true,
10
- })
11
- .epilogue(d1BetaWarning);
12
- }
13
-
14
- export function Database(yargs: Argv) {
15
- return yargs
16
- .positional("database", {
17
- describe: "The name or binding of the DB",
18
- type: "string",
19
- demandOption: true,
20
- })
21
- .epilogue(d1BetaWarning);
22
- }
package/src/d1/types.tsx DELETED
@@ -1,24 +0,0 @@
1
- export type Database = {
2
- uuid: string;
3
- name: string;
4
- binding: string;
5
- internal_env?: string;
6
- migrationsTableName: string;
7
- migrationsFolderPath: string;
8
- };
9
-
10
- export type Backup = {
11
- id: string;
12
- database_id: string;
13
- created_at: string;
14
- state: "progress" | "done";
15
- num_tables: number;
16
- file_size: number;
17
- size?: string;
18
- };
19
-
20
- export type Migration = {
21
- id: string;
22
- name: string;
23
- applied_at: string;
24
- };
package/src/d1/utils.ts DELETED
@@ -1,48 +0,0 @@
1
- import { DEFAULT_MIGRATION_PATH, DEFAULT_MIGRATION_TABLE } from "./constants";
2
- import { listDatabases } from "./list";
3
- import type { Config } from "../config";
4
- import type { Database } from "./types";
5
-
6
- export function getDatabaseInfoFromConfig(
7
- config: Config,
8
- name: string
9
- ): Database | null {
10
- for (const d1Database of config.d1_databases) {
11
- if (
12
- d1Database.database_id &&
13
- (name === d1Database.database_name || name === d1Database.binding)
14
- ) {
15
- return {
16
- uuid: d1Database.database_id,
17
- binding: d1Database.binding,
18
- name: d1Database.database_name,
19
- migrationsTableName:
20
- d1Database.migrations_table || DEFAULT_MIGRATION_TABLE,
21
- migrationsFolderPath:
22
- d1Database.migrations_dir || DEFAULT_MIGRATION_PATH,
23
- internal_env: d1Database.database_internal_env,
24
- };
25
- }
26
- }
27
- return null;
28
- }
29
-
30
- export const getDatabaseByNameOrBinding = async (
31
- config: Config,
32
- accountId: string,
33
- name: string
34
- ): Promise<Database> => {
35
- const dbFromConfig = getDatabaseInfoFromConfig(config, name);
36
- if (dbFromConfig) return dbFromConfig;
37
-
38
- const allDBs = await listDatabases(accountId);
39
- const matchingDB = allDBs.find((db) => db.name === name);
40
- if (!matchingDB) {
41
- throw new Error(`Couldn't find DB with name '${name}'`);
42
- }
43
- return matchingDB;
44
- };
45
-
46
- export const d1BetaWarning = process.env.NO_D1_WARNING
47
- ? ""
48
- : "🚧 D1 is currently in open alpha and is not recommended for production data and traffic.\nPlease report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.\nTo request features, visit https://community.cloudflare.com/c/developers/d1.\nTo give feedback, visit https://discord.gg/cloudflaredev";