wrangler 0.0.0-e4047cab → 0.0.0-e4104915

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 (276) hide show
  1. package/README.md +12 -14
  2. package/bin/wrangler.js +14 -67
  3. package/package.json +213 -192
  4. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  5. package/templates/__tests__/tsconfig.json +8 -0
  6. package/templates/checked-fetch.js +19 -6
  7. package/templates/facade.d.ts +17 -0
  8. package/templates/gitignore +1 -0
  9. package/templates/init-tests/test-jest-new-worker.js +3 -5
  10. package/templates/init-tests/test-vitest-new-worker.js +3 -5
  11. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  12. package/templates/middleware/common.ts +9 -4
  13. package/templates/middleware/loader-modules.ts +64 -11
  14. package/templates/middleware/loader-sw.ts +2 -1
  15. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  16. package/templates/middleware/middleware-miniflare3-json-error.ts +18 -5
  17. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  18. package/templates/middleware/middleware-multiworker-dev.ts +68 -0
  19. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  20. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  21. package/templates/modules-watch-stub.js +4 -0
  22. package/templates/new-worker-scheduled.ts +1 -1
  23. package/templates/new-worker.ts +4 -1
  24. package/templates/pages-dev-pipeline.ts +4 -1
  25. package/templates/pages-dev-util.ts +4 -1
  26. package/templates/pages-shim.ts +1 -1
  27. package/templates/pages-template-plugin.ts +31 -12
  28. package/templates/pages-template-worker.ts +11 -2
  29. package/templates/startDevWorker/InspectorProxyWorker.ts +652 -0
  30. package/templates/startDevWorker/ProxyWorker.ts +252 -0
  31. package/templates/tsconfig-sanity.ts +11 -0
  32. package/templates/tsconfig.init.json +105 -0
  33. package/templates/tsconfig.json +5 -103
  34. package/wrangler-dist/InspectorProxyWorker.js +460 -0
  35. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  36. package/wrangler-dist/ProxyWorker.js +186 -0
  37. package/wrangler-dist/ProxyWorker.js.map +6 -0
  38. package/wrangler-dist/cli.d.ts +23076 -462
  39. package/wrangler-dist/cli.js +134460 -136904
  40. package/wrangler-dist/wasm-sync.wasm +0 -0
  41. package/import_meta_url.js +0 -3
  42. package/miniflare-config-stubs/.env.empty +0 -0
  43. package/miniflare-config-stubs/package.empty.json +0 -1
  44. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  45. package/miniflare-dist/index.mjs +0 -6321
  46. package/src/__tests__/access.test.ts +0 -25
  47. package/src/__tests__/api-dev.test.ts +0 -209
  48. package/src/__tests__/api-devregistry.test.js +0 -56
  49. package/src/__tests__/api.test.ts +0 -80
  50. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  51. package/src/__tests__/config-cache.test.ts +0 -42
  52. package/src/__tests__/configuration.test.ts +0 -3981
  53. package/src/__tests__/d1.test.ts +0 -80
  54. package/src/__tests__/delete.test.ts +0 -263
  55. package/src/__tests__/deployments.test.ts +0 -91
  56. package/src/__tests__/dev.test.tsx +0 -1536
  57. package/src/__tests__/dialogs.test.tsx +0 -40
  58. package/src/__tests__/generate.test.ts +0 -235
  59. package/src/__tests__/get-host-from-url.test.ts +0 -16
  60. package/src/__tests__/guess-worker-format.test.ts +0 -85
  61. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  62. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  63. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  64. package/src/__tests__/helpers/mock-bin.ts +0 -36
  65. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  66. package/src/__tests__/helpers/mock-console.ts +0 -106
  67. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  68. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  69. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  70. package/src/__tests__/helpers/mock-istty.ts +0 -74
  71. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  72. package/src/__tests__/helpers/mock-kv.ts +0 -33
  73. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -256
  74. package/src/__tests__/helpers/mock-process.ts +0 -39
  75. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  76. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  77. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  78. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -59
  79. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  80. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  81. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  82. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  83. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  84. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -22
  85. package/src/__tests__/helpers/msw/index.ts +0 -21
  86. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  87. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  88. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  89. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  90. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  91. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  92. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  93. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  94. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  95. package/src/__tests__/https-options.test.ts +0 -163
  96. package/src/__tests__/index.test.ts +0 -264
  97. package/src/__tests__/init.test.ts +0 -2900
  98. package/src/__tests__/jest.setup.ts +0 -202
  99. package/src/__tests__/kv.test.ts +0 -1675
  100. package/src/__tests__/logger.test.ts +0 -141
  101. package/src/__tests__/logout.test.ts +0 -47
  102. package/src/__tests__/metrics.test.ts +0 -450
  103. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  104. package/src/__tests__/middleware.test.ts +0 -726
  105. package/src/__tests__/package-manager.test.ts +0 -353
  106. package/src/__tests__/pages-deployment-tail.test.ts +0 -820
  107. package/src/__tests__/pages.test.ts +0 -2442
  108. package/src/__tests__/parse.test.ts +0 -330
  109. package/src/__tests__/paths.test.ts +0 -39
  110. package/src/__tests__/publish.test.ts +0 -7633
  111. package/src/__tests__/pubsub.test.ts +0 -370
  112. package/src/__tests__/queues.test.ts +0 -522
  113. package/src/__tests__/r2.test.ts +0 -393
  114. package/src/__tests__/route.test.ts +0 -45
  115. package/src/__tests__/secret.test.ts +0 -644
  116. package/src/__tests__/tail.test.ts +0 -899
  117. package/src/__tests__/test-old-node-version.js +0 -31
  118. package/src/__tests__/type-generation.test.ts +0 -226
  119. package/src/__tests__/user.test.ts +0 -129
  120. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  121. package/src/__tests__/validate-dev-props.test.ts +0 -56
  122. package/src/__tests__/version.test.ts +0 -35
  123. package/src/__tests__/whoami.test.tsx +0 -278
  124. package/src/__tests__/worker-namespace.test.ts +0 -326
  125. package/src/abort.d.ts +0 -3
  126. package/src/api/dev.ts +0 -210
  127. package/src/api/index.ts +0 -2
  128. package/src/bundle-reporter.tsx +0 -68
  129. package/src/bundle.ts +0 -823
  130. package/src/cfetch/index.ts +0 -160
  131. package/src/cfetch/internal.ts +0 -263
  132. package/src/cli.ts +0 -28
  133. package/src/config/README.md +0 -107
  134. package/src/config/config.ts +0 -275
  135. package/src/config/diagnostics.ts +0 -80
  136. package/src/config/environment.ts +0 -561
  137. package/src/config/index.ts +0 -334
  138. package/src/config/validation-helpers.ts +0 -597
  139. package/src/config/validation.ts +0 -2103
  140. package/src/config-cache.ts +0 -85
  141. package/src/create-worker-preview.ts +0 -282
  142. package/src/create-worker-upload-form.ts +0 -316
  143. package/src/d1/backups.tsx +0 -223
  144. package/src/d1/constants.ts +0 -2
  145. package/src/d1/create.tsx +0 -63
  146. package/src/d1/delete.tsx +0 -56
  147. package/src/d1/execute.tsx +0 -352
  148. package/src/d1/formatTimeAgo.ts +0 -14
  149. package/src/d1/index.ts +0 -101
  150. package/src/d1/list.tsx +0 -48
  151. package/src/d1/migrations/apply.tsx +0 -184
  152. package/src/d1/migrations/create.tsx +0 -77
  153. package/src/d1/migrations/helpers.ts +0 -147
  154. package/src/d1/migrations/index.tsx +0 -3
  155. package/src/d1/migrations/list.tsx +0 -79
  156. package/src/d1/migrations/options.ts +0 -18
  157. package/src/d1/options.ts +0 -22
  158. package/src/d1/types.tsx +0 -24
  159. package/src/d1/utils.ts +0 -48
  160. package/src/delete.ts +0 -108
  161. package/src/deployments.ts +0 -77
  162. package/src/deprecated/index.ts +0 -438
  163. package/src/dev/dev-vars.ts +0 -39
  164. package/src/dev/dev.tsx +0 -614
  165. package/src/dev/get-local-persistence-path.tsx +0 -31
  166. package/src/dev/local.tsx +0 -890
  167. package/src/dev/remote.tsx +0 -603
  168. package/src/dev/start-server.ts +0 -539
  169. package/src/dev/use-esbuild.ts +0 -204
  170. package/src/dev/validate-dev-props.ts +0 -31
  171. package/src/dev-registry.tsx +0 -201
  172. package/src/dev.tsx +0 -904
  173. package/src/dialogs.tsx +0 -168
  174. package/src/dispatch-namespace.ts +0 -207
  175. package/src/durable.ts +0 -102
  176. package/src/entry.ts +0 -329
  177. package/src/environment-variables.ts +0 -50
  178. package/src/errors.ts +0 -11
  179. package/src/git-client.ts +0 -124
  180. package/src/global-wrangler-config-path.ts +0 -26
  181. package/src/https-options.ts +0 -127
  182. package/src/index.tsx +0 -687
  183. package/src/init.ts +0 -970
  184. package/src/inspect.ts +0 -767
  185. package/src/intl-polyfill.d.ts +0 -139
  186. package/src/is-ci.ts +0 -14
  187. package/src/is-interactive.ts +0 -16
  188. package/src/kv/helpers.ts +0 -430
  189. package/src/kv/index.ts +0 -596
  190. package/src/logger.ts +0 -92
  191. package/src/metrics/index.ts +0 -5
  192. package/src/metrics/metrics-config.ts +0 -239
  193. package/src/metrics/metrics-dispatcher.ts +0 -96
  194. package/src/metrics/metrics-usage-headers.ts +0 -24
  195. package/src/metrics/send-event.ts +0 -96
  196. package/src/miniflare-cli/README.md +0 -30
  197. package/src/miniflare-cli/assets.ts +0 -220
  198. package/src/miniflare-cli/index.ts +0 -213
  199. package/src/miniflare-cli/request-context.ts +0 -40
  200. package/src/module-collection.ts +0 -267
  201. package/src/open-in-browser.ts +0 -17
  202. package/src/package-manager.ts +0 -219
  203. package/src/pages/build.tsx +0 -270
  204. package/src/pages/constants.ts +0 -18
  205. package/src/pages/deployment-tails.tsx +0 -284
  206. package/src/pages/deployments.tsx +0 -84
  207. package/src/pages/dev.tsx +0 -706
  208. package/src/pages/errors.ts +0 -66
  209. package/src/pages/functions/buildPlugin.ts +0 -107
  210. package/src/pages/functions/buildWorker.ts +0 -166
  211. package/src/pages/functions/filepath-routing.test.ts +0 -234
  212. package/src/pages/functions/filepath-routing.ts +0 -189
  213. package/src/pages/functions/identifiers.ts +0 -78
  214. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  215. package/src/pages/functions/routes-consolidation.ts +0 -73
  216. package/src/pages/functions/routes-transformation.test.ts +0 -282
  217. package/src/pages/functions/routes-transformation.ts +0 -115
  218. package/src/pages/functions/routes-validation.test.ts +0 -403
  219. package/src/pages/functions/routes-validation.ts +0 -202
  220. package/src/pages/functions/routes.ts +0 -151
  221. package/src/pages/functions.tsx +0 -82
  222. package/src/pages/hash.tsx +0 -13
  223. package/src/pages/index.tsx +0 -102
  224. package/src/pages/projects.tsx +0 -169
  225. package/src/pages/prompt-select-project.tsx +0 -31
  226. package/src/pages/publish.tsx +0 -451
  227. package/src/pages/types.ts +0 -41
  228. package/src/pages/upload.tsx +0 -426
  229. package/src/pages/utils.ts +0 -23
  230. package/src/parse.ts +0 -286
  231. package/src/paths.ts +0 -71
  232. package/src/proxy.ts +0 -694
  233. package/src/publish/index.ts +0 -270
  234. package/src/publish/publish.ts +0 -1035
  235. package/src/pubsub/index.ts +0 -286
  236. package/src/pubsub/pubsub-commands.tsx +0 -624
  237. package/src/queues/cli/commands/consumer/add.ts +0 -71
  238. package/src/queues/cli/commands/consumer/index.ts +0 -22
  239. package/src/queues/cli/commands/consumer/remove.ts +0 -38
  240. package/src/queues/cli/commands/create.ts +0 -25
  241. package/src/queues/cli/commands/delete.ts +0 -26
  242. package/src/queues/cli/commands/index.ts +0 -36
  243. package/src/queues/cli/commands/list.ts +0 -25
  244. package/src/queues/client.ts +0 -135
  245. package/src/queues/utils.ts +0 -18
  246. package/src/r2/constants.ts +0 -4
  247. package/src/r2/helpers.ts +0 -131
  248. package/src/r2/index.ts +0 -289
  249. package/src/routes.ts +0 -140
  250. package/src/secret/index.ts +0 -378
  251. package/src/selfsigned.d.ts +0 -29
  252. package/src/sites.tsx +0 -372
  253. package/src/tail/createTail.ts +0 -379
  254. package/src/tail/filters.ts +0 -277
  255. package/src/tail/index.ts +0 -214
  256. package/src/tail/printing.ts +0 -107
  257. package/src/type-generation.ts +0 -173
  258. package/src/update-check.ts +0 -19
  259. package/src/user/access.ts +0 -69
  260. package/src/user/choose-account.tsx +0 -69
  261. package/src/user/env-vars.ts +0 -46
  262. package/src/user/generate-auth-url.ts +0 -33
  263. package/src/user/generate-random-state.ts +0 -16
  264. package/src/user/index.ts +0 -3
  265. package/src/user/user.tsx +0 -1198
  266. package/src/utils/collectKeyValues.ts +0 -14
  267. package/src/whoami.tsx +0 -169
  268. package/src/worker.ts +0 -245
  269. package/src/yargs-types.ts +0 -24
  270. package/src/zones.ts +0 -191
  271. package/templates/d1-beta-facade.js +0 -205
  272. package/templates/first-party-worker-module-facade.ts +0 -18
  273. package/templates/format-dev-errors.ts +0 -32
  274. package/templates/serve-static-assets.ts +0 -63
  275. package/templates/service-bindings-module-facade.js +0 -54
  276. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,223 +0,0 @@
1
- import fs from "node:fs/promises";
2
- import * as path from "path";
3
- import { render } from "ink";
4
- import Table from "ink-table";
5
- import React from "react";
6
- import { fetchResult } from "../cfetch";
7
- import { performApiFetch } from "../cfetch/internal";
8
- import { withConfig } from "../config";
9
- import { logger } from "../logger";
10
- import { requireAuth } from "../user";
11
- import { formatBytes, formatTimeAgo } from "./formatTimeAgo";
12
- import { Name } from "./options";
13
- import { d1BetaWarning, getDatabaseByNameOrBinding } from "./utils";
14
- import type { Backup, Database } from "./types";
15
- import type { Response } from "undici";
16
- import type { Argv } from "yargs";
17
-
18
- type BackupListArgs = { config?: string; name: string };
19
-
20
- export function ListOptions(yargs: Argv): Argv<BackupListArgs> {
21
- return Name(yargs);
22
- }
23
-
24
- export const ListHandler = withConfig<BackupListArgs>(
25
- async ({ config, name }): Promise<void> => {
26
- const accountId = await requireAuth({});
27
- logger.log(d1BetaWarning);
28
- const db: Database = await getDatabaseByNameOrBinding(
29
- config,
30
- accountId,
31
- name
32
- );
33
-
34
- const backups: Backup[] = await listBackups(accountId, db.uuid);
35
- render(
36
- <Table
37
- data={backups}
38
- columns={["created_at", "id", "num_tables", "size"]}
39
- ></Table>
40
- );
41
- }
42
- );
43
-
44
- export const listBackups = async (
45
- accountId: string,
46
- uuid: string
47
- ): Promise<Array<Backup>> => {
48
- const json: Backup[] = await fetchResult(
49
- `/accounts/${accountId}/d1/database/${uuid}/backup`,
50
- {}
51
- );
52
- const results: Record<string, Backup> = {};
53
-
54
- json
55
- // First, convert created_at to a Date
56
- .map((backup) => ({
57
- ...backup,
58
- created_at: new Date(backup.created_at),
59
- }))
60
- // Then, sort descending based on created_at
61
- .sort((a, b) => +b.created_at - +a.created_at)
62
- // then group_by their human-readable timestamp i.e. "2 days ago"
63
- // (storing only the first of each group)
64
- // and replace the Date version with this new human-readable one
65
- .forEach((backup) => {
66
- const timeAgo = formatTimeAgo(backup.created_at);
67
- if (!results[timeAgo]) {
68
- results[timeAgo] = {
69
- ...backup,
70
- created_at: timeAgo,
71
- size: formatBytes(backup.file_size),
72
- };
73
- }
74
- });
75
-
76
- // Take advantage of JS objects' sorting to return the newest backup of a certain age
77
- return Object.values(results);
78
- };
79
-
80
- type BackupCreateArgs = BackupListArgs;
81
-
82
- export function CreateOptions(yargs: Argv): Argv<BackupCreateArgs> {
83
- return ListOptions(yargs);
84
- }
85
-
86
- export const CreateHandler = withConfig<BackupCreateArgs>(
87
- async ({ config, name }): Promise<void> => {
88
- const accountId = await requireAuth({});
89
- logger.log(d1BetaWarning);
90
- const db: Database = await getDatabaseByNameOrBinding(
91
- config,
92
- accountId,
93
- name
94
- );
95
-
96
- const backup: Backup = await createBackup(accountId, db.uuid);
97
- render(
98
- <Table
99
- data={[backup]}
100
- columns={["created_at", "id", "num_tables", "size", "state"]}
101
- ></Table>
102
- );
103
- }
104
- );
105
-
106
- export const createBackup = async (
107
- accountId: string,
108
- uuid: string
109
- ): Promise<Backup> => {
110
- const backup: Backup = await fetchResult(
111
- `/accounts/${accountId}/d1/database/${uuid}/backup`,
112
- {
113
- method: "POST",
114
- }
115
- );
116
- return {
117
- ...backup,
118
- size: formatBytes(backup.file_size),
119
- };
120
- };
121
-
122
- type BackupRestoreArgs = BackupListArgs & {
123
- "backup-id": string;
124
- };
125
-
126
- export function RestoreOptions(yargs: Argv): Argv<BackupRestoreArgs> {
127
- return ListOptions(yargs).positional("backup-id", {
128
- describe: "The Backup ID to restore",
129
- type: "string",
130
- demandOption: true,
131
- });
132
- }
133
-
134
- export const RestoreHandler = withConfig<BackupRestoreArgs>(
135
- async ({ config, name, backupId }): Promise<void> => {
136
- const accountId = await requireAuth({});
137
- logger.log(d1BetaWarning);
138
- const db: Database = await getDatabaseByNameOrBinding(
139
- config,
140
- accountId,
141
- name
142
- );
143
-
144
- logger.log(`Restoring ${name} from backup ${backupId}....`);
145
- await restoreBackup(accountId, db.uuid, backupId);
146
- logger.log(`Done!`);
147
- }
148
- );
149
-
150
- export const restoreBackup = async (
151
- accountId: string,
152
- uuid: string,
153
- backupId: string
154
- ): Promise<void> => {
155
- await fetchResult(
156
- `/accounts/${accountId}/d1/database/${uuid}/backup/${backupId}/restore`,
157
- {
158
- method: "POST",
159
- headers: {
160
- "Content-Type": "application/json",
161
- },
162
- }
163
- );
164
- };
165
-
166
- type BackupDownloadArgs = BackupRestoreArgs & {
167
- output?: string;
168
- };
169
-
170
- export function DownloadOptions(yargs: Argv): Argv<BackupDownloadArgs> {
171
- return ListOptions(yargs)
172
- .positional("backup-id", {
173
- describe: "The Backup ID to download",
174
- type: "string",
175
- demandOption: true,
176
- })
177
- .option("output", {
178
- describe:
179
- "The .sqlite3 file to write to (defaults to '<db-name>.<short-backup-id>.sqlite3'",
180
- type: "string",
181
- });
182
- }
183
-
184
- export const DownloadHandler = withConfig<BackupDownloadArgs>(
185
- async ({ name, backupId, output, config }): Promise<void> => {
186
- const accountId = await requireAuth({});
187
- logger.log(d1BetaWarning);
188
- const db: Database = await getDatabaseByNameOrBinding(
189
- config,
190
- accountId,
191
- name
192
- );
193
- const filename =
194
- output ||
195
- path.join(
196
- process.env.INIT_CWD as string,
197
- `${name}.${backupId.slice(0, 8)}.sqlite3`
198
- );
199
-
200
- logger.log(`šŸŒ€ Downloading backup ${backupId} from '${name}'`);
201
- const response = await getBackupResponse(accountId, db.uuid, backupId);
202
- if (!response.ok) {
203
- throw new Error(
204
- `Failed to download backup ${backupId} from '${name}' - got ${response.status} from the API`
205
- );
206
- }
207
- logger.log(`šŸŒ€ Saving to ${filename}`);
208
- // TODO: stream this once we upgrade to Node18 and can use Writable.fromWeb
209
- const buffer = await response.arrayBuffer();
210
- await fs.writeFile(filename, new Buffer(buffer));
211
- logger.log(`šŸŒ€ Done!`);
212
- }
213
- );
214
-
215
- export const getBackupResponse = async (
216
- accountId: string,
217
- uuid: string,
218
- backupId: string
219
- ): Promise<Response> => {
220
- return await performApiFetch(
221
- `/accounts/${accountId}/d1/database/${uuid}/backup/${backupId}/download`
222
- );
223
- };
@@ -1,2 +0,0 @@
1
- export const DEFAULT_MIGRATION_PATH = "./migrations";
2
- export const DEFAULT_MIGRATION_TABLE = "d1_migrations";
package/src/d1/create.tsx DELETED
@@ -1,63 +0,0 @@
1
- import { render, Text, Box } from "ink";
2
- import React from "react";
3
- import { fetchResult } from "../cfetch";
4
- import { logger } from "../logger";
5
- import { requireAuth } from "../user";
6
- import { d1BetaWarning } from "./utils";
7
- import type { Database } from "./types";
8
- import type { ArgumentsCamelCase, Argv } from "yargs";
9
-
10
- type CreateArgs = { name: string };
11
-
12
- export function Options(yargs: Argv): Argv<CreateArgs> {
13
- return yargs
14
- .positional("name", {
15
- describe: "The name of the new DB",
16
- type: "string",
17
- demandOption: true,
18
- })
19
- .epilogue(d1BetaWarning);
20
- }
21
-
22
- export async function Handler({
23
- name,
24
- }: ArgumentsCamelCase<CreateArgs>): Promise<void> {
25
- const accountId = await requireAuth({});
26
-
27
- logger.log(d1BetaWarning);
28
-
29
- let db: Database;
30
- try {
31
- db = await fetchResult(`/accounts/${accountId}/d1/database`, {
32
- method: "POST",
33
- headers: {
34
- "Content-Type": "application/json",
35
- },
36
- body: JSON.stringify({
37
- name,
38
- }),
39
- });
40
- } catch (e) {
41
- if ((e as { code: number }).code === 7502) {
42
- throw new Error("A database with that name already exists");
43
- }
44
- throw e;
45
- }
46
-
47
- render(
48
- <Box flexDirection="column">
49
- <Text>āœ… Successfully created DB &apos;{db.name}&apos;!</Text>
50
- <Text>&nbsp;</Text>
51
- <Text>
52
- Add the following to your wrangler.toml to connect to it from a Worker:
53
- </Text>
54
- <Text>&nbsp;</Text>
55
- <Text>[[ d1_databases ]]</Text>
56
- <Text>
57
- binding = &quot;DB&quot; # i.e. available in your Worker on env.DB
58
- </Text>
59
- <Text>database_name = &quot;{db.name}&quot;</Text>
60
- <Text>database_id = &quot;{db.uuid}&quot;</Text>
61
- </Box>
62
- );
63
- }
package/src/d1/delete.tsx DELETED
@@ -1,56 +0,0 @@
1
- import { fetchResult } from "../cfetch";
2
- import { withConfig } from "../config";
3
- import { confirm } from "../dialogs";
4
- import { logger } from "../logger";
5
- import { requireAuth } from "../user";
6
- import { Name } from "./options";
7
- import { d1BetaWarning, getDatabaseByNameOrBinding } from "./utils";
8
- import type { Database } from "./types";
9
- import type { Argv } from "yargs";
10
-
11
- type CreateArgs = {
12
- config?: string;
13
- name: string;
14
- "skip-confirmation": boolean;
15
- };
16
-
17
- export function Options(d1ListYargs: Argv): Argv<CreateArgs> {
18
- return Name(d1ListYargs)
19
- .option("skip-confirmation", {
20
- describe: "Skip confirmation",
21
- type: "boolean",
22
- alias: "y",
23
- default: false,
24
- })
25
- .epilogue(d1BetaWarning);
26
- }
27
-
28
- export const Handler = withConfig<CreateArgs>(
29
- async ({ name, skipConfirmation, config }): Promise<void> => {
30
- const accountId = await requireAuth({});
31
- logger.log(d1BetaWarning);
32
-
33
- const db: Database = await getDatabaseByNameOrBinding(
34
- config,
35
- accountId,
36
- name
37
- );
38
-
39
- logger.log(`About to delete DB '${name}' (${db.uuid}).`);
40
- if (!skipConfirmation) {
41
- const response = await confirm(`Ok to proceed?`);
42
- if (!response) {
43
- logger.log(`Not deleting.`);
44
- return;
45
- }
46
- }
47
-
48
- logger.log("Deleting...");
49
-
50
- await fetchResult(`/accounts/${accountId}/d1/database/${db.uuid}`, {
51
- method: "DELETE",
52
- });
53
-
54
- logger.log(`Deleted '${name}' successfully.`);
55
- }
56
- );
@@ -1,352 +0,0 @@
1
- import { existsSync } from "node:fs";
2
- import { mkdir } from "node:fs/promises";
3
- import path from "node:path";
4
- import chalk from "chalk";
5
- import { render, Static, Text } from "ink";
6
- import Table from "ink-table";
7
- import { npxImport } from "npx-import";
8
- import React from "react";
9
- import { fetchResult } from "../cfetch";
10
- import { withConfig } from "../config";
11
- import { getLocalPersistencePath } from "../dev/get-local-persistence-path";
12
- import { confirm, logDim } from "../dialogs";
13
- import { logger } from "../logger";
14
- import { readableRelative } from "../paths";
15
- import { requireAuth } from "../user";
16
- import * as options from "./options";
17
- import {
18
- d1BetaWarning,
19
- getDatabaseByNameOrBinding,
20
- getDatabaseInfoFromConfig,
21
- } from "./utils";
22
- import type { Config, ConfigFields, DevConfig, Environment } from "../config";
23
- import type { Database } from "./types";
24
- import type splitSqlQuery from "@databases/split-sql-query";
25
- import type { SQL, SQLQuery } from "@databases/sql";
26
- import type { Statement as StatementType } from "@miniflare/d1";
27
- import type { createSQLiteDB as createSQLiteDBType } from "@miniflare/shared";
28
- import type { Argv } from "yargs";
29
-
30
- type MiniflareNpxImportTypes = [
31
- {
32
- Statement: typeof StatementType;
33
- },
34
- {
35
- createSQLiteDB: typeof createSQLiteDBType;
36
- }
37
- ];
38
-
39
- export type BaseSqlExecuteArgs = {
40
- config?: string;
41
- database: string;
42
- local?: boolean;
43
- "persist-to"?: string;
44
- yes?: boolean;
45
- };
46
-
47
- type ExecuteArgs = BaseSqlExecuteArgs & {
48
- file?: string;
49
- command?: string;
50
- };
51
-
52
- export type QueryResult = {
53
- results: Record<string, string | number | boolean>[];
54
- success: boolean;
55
- meta?: {
56
- duration?: number;
57
- };
58
- query?: string;
59
- };
60
- // Max number of bytes to send in a single /execute call
61
- const QUERY_LIMIT = 10_000;
62
-
63
- export function Options(yargs: Argv): Argv<ExecuteArgs> {
64
- return options
65
- .Database(yargs)
66
- .option("yes", {
67
- describe: 'Answer "yes" to any prompts',
68
- type: "boolean",
69
- alias: "y",
70
- })
71
- .option("local", {
72
- describe:
73
- "Execute commands/files against a local DB for use with wrangler dev",
74
- type: "boolean",
75
- })
76
- .option("file", {
77
- describe: "A .sql file to injest",
78
- type: "string",
79
- })
80
- .option("command", {
81
- describe: "A single SQL statement to execute",
82
- type: "string",
83
- })
84
- .option("persist-to", {
85
- describe: "Specify directory to use for local persistence (for --local)",
86
- type: "string",
87
- requiresArg: true,
88
- });
89
- }
90
-
91
- function shorten(query: string | undefined, length: number) {
92
- return query && query.length > length
93
- ? query.slice(0, length) + "..."
94
- : query;
95
- }
96
-
97
- export async function executeSql(
98
- local: undefined | boolean,
99
- config: ConfigFields<DevConfig> & Environment,
100
- name: string,
101
- shouldPrompt: boolean | undefined,
102
- persistTo: undefined | string,
103
- file?: string,
104
- command?: string
105
- ) {
106
- const { parser, splitter } = await loadSqlUtils();
107
-
108
- const sql = file
109
- ? parser.file(file)
110
- : command
111
- ? parser.__dangerous__rawValue(command)
112
- : null;
113
-
114
- if (!sql) throw new Error(`Error: must provide --command or --file.`);
115
- if (persistTo && !local)
116
- throw new Error(`Error: can't use --persist-to without --local`);
117
-
118
- const queries = splitSql(splitter, sql);
119
- if (file && sql) {
120
- if (queries[0].startsWith("SQLite format 3")) {
121
- //TODO: update this error to recommend using `wrangler d1 restore` when it exists
122
- throw new Error(
123
- "Provided file is a binary SQLite database file instead of an SQL text file.\nThe execute command can only process SQL text files.\nPlease export an SQL file from your SQLite database and try again."
124
- );
125
- }
126
- }
127
-
128
- return local
129
- ? await executeLocally(config, name, shouldPrompt, queries, persistTo)
130
- : await executeRemotely(config, name, shouldPrompt, batchSplit(queries));
131
- }
132
-
133
- export const Handler = withConfig<ExecuteArgs>(
134
- async ({
135
- config,
136
- database,
137
- file,
138
- command,
139
- local,
140
- persistTo,
141
- yes,
142
- }): Promise<void> => {
143
- logger.log(d1BetaWarning);
144
- if (file && command)
145
- return logger.error(`Error: can't provide both --command and --file.`);
146
-
147
- const isInteractive = process.stdout.isTTY;
148
- const response: QueryResult[] | null = await executeSql(
149
- local,
150
- config,
151
- database,
152
- isInteractive && !yes,
153
- persistTo,
154
- file,
155
- command
156
- );
157
-
158
- // Early exit if prompt rejected
159
- if (!response) return;
160
-
161
- if (isInteractive) {
162
- // Render table if single result
163
- render(
164
- <Static items={response}>
165
- {(result) => {
166
- // batch results
167
- if (!Array.isArray(result)) {
168
- const { results, query } = result;
169
-
170
- if (Array.isArray(results) && results.length > 0) {
171
- const shortQuery = shorten(query, 48);
172
- return (
173
- <>
174
- {shortQuery ? <Text dimColor>{shortQuery}</Text> : null}
175
- <Table data={results}></Table>
176
- </>
177
- );
178
- }
179
- }
180
- }}
181
- </Static>
182
- );
183
- } else {
184
- logger.log(JSON.stringify(response, null, 2));
185
- }
186
- }
187
- );
188
-
189
- async function executeLocally(
190
- config: Config,
191
- name: string,
192
- shouldPrompt: boolean | undefined,
193
- queries: string[],
194
- persistTo: string | undefined
195
- ) {
196
- const localDB = getDatabaseInfoFromConfig(config, name);
197
- if (!localDB) {
198
- throw new Error(
199
- `Can't find a DB with name/binding '${name}' in local config. Check info in wrangler.toml...`
200
- );
201
- }
202
-
203
- const persistencePath = getLocalPersistencePath(
204
- persistTo,
205
- true,
206
- config.configPath
207
- );
208
-
209
- const dbDir = path.join(persistencePath, "d1");
210
- const dbPath = path.join(dbDir, `${localDB.binding}.sqlite3`);
211
- const [{ Statement }, { createSQLiteDB }] =
212
- await npxImport<MiniflareNpxImportTypes>(
213
- ["@miniflare/d1", "@miniflare/shared"],
214
- logDim
215
- );
216
-
217
- if (!existsSync(dbDir) && shouldPrompt) {
218
- const ok = await confirm(
219
- `About to create ${readableRelative(dbPath)}, ok?`
220
- );
221
- if (!ok) return null;
222
- await mkdir(dbDir, { recursive: true });
223
- }
224
-
225
- logger.log(`šŸŒ€ Loading DB at ${readableRelative(dbPath)}`);
226
- const db = await createSQLiteDB(dbPath);
227
-
228
- const results: QueryResult[] = [];
229
- for (const sql of queries) {
230
- const statement = new Statement(db, sql);
231
- results.push((await statement.all()) as QueryResult);
232
- }
233
-
234
- return results;
235
- }
236
-
237
- async function executeRemotely(
238
- config: Config,
239
- name: string,
240
- shouldPrompt: boolean | undefined,
241
- batches: string[]
242
- ) {
243
- const multiple_batches = batches.length > 1;
244
- if (multiple_batches) {
245
- const warning = `āš ļø Too much SQL to send at once, this execution will be sent as ${batches.length} batches.`;
246
-
247
- if (shouldPrompt) {
248
- const ok = await confirm(
249
- `${warning}\nā„¹ļø Each batch is sent individually and may leave your DB in an unexpected state if a later batch fails.\nāš ļø Make sure you have a recent backup. Ok to proceed?`
250
- );
251
- if (!ok) return null;
252
- logger.log(`šŸŒ€ Let's go`);
253
- } else {
254
- logger.error(warning);
255
- }
256
- }
257
-
258
- const accountId = await requireAuth({});
259
- const db: Database = await getDatabaseByNameOrBinding(
260
- config,
261
- accountId,
262
- name
263
- );
264
-
265
- if (shouldPrompt) {
266
- logger.log(`šŸŒ€ Executing on ${name} (${db.uuid}):`);
267
-
268
- // Don't output if shouldPrompt is undefined
269
- } else if (shouldPrompt !== undefined) {
270
- // Pipe to error so we don't break jq
271
- logger.error(`Executing on ${name} (${db.uuid}):`);
272
- }
273
-
274
- const results: QueryResult[] = [];
275
- for (const sql of batches) {
276
- if (multiple_batches)
277
- logger.log(
278
- chalk.gray(` ${sql.slice(0, 70)}${sql.length > 70 ? "..." : ""}`)
279
- );
280
-
281
- const result = await fetchResult<QueryResult[]>(
282
- `/accounts/${accountId}/d1/database/${db.uuid}/query`,
283
- {
284
- method: "POST",
285
- headers: {
286
- "Content-Type": "application/json",
287
- ...(db.internal_env ? { "x-d1-internal-env": db.internal_env } : {}),
288
- },
289
- body: JSON.stringify({ sql }),
290
- }
291
- );
292
- result.map(logResult);
293
- results.push(...result);
294
- }
295
- return results;
296
- }
297
-
298
- function logResult(r: QueryResult | QueryResult[]) {
299
- logger.log(
300
- `🚣 Executed ${
301
- Array.isArray(r) ? `${r.length} commands` : "1 command"
302
- } in ${
303
- Array.isArray(r)
304
- ? r
305
- .map((d: QueryResult) => d.meta?.duration || 0)
306
- .reduce((a: number, b: number) => a + b, 0)
307
- : r.meta?.duration
308
- }ms`
309
- );
310
- }
311
-
312
- function splitSql(splitter: (query: SQLQuery) => SQLQuery[], sql: SQLQuery) {
313
- // We have no interpolations, so convert everything to text
314
- logger.log(`šŸŒ€ Mapping SQL input into an array of statements`);
315
- return splitter(sql).map(
316
- (q) =>
317
- q.format({
318
- escapeIdentifier: (_) => "",
319
- formatValue: (_, __) => ({ placeholder: "", value: "" }),
320
- }).text
321
- );
322
- }
323
-
324
- function batchSplit(queries: string[]) {
325
- logger.log(`šŸŒ€ Parsing ${queries.length} statements`);
326
- const num_batches = Math.ceil(queries.length / QUERY_LIMIT);
327
- const batches: string[] = [];
328
- for (let i = 0; i < num_batches; i++) {
329
- batches.push(
330
- queries.slice(i * QUERY_LIMIT, (i + 1) * QUERY_LIMIT).join("; ")
331
- );
332
- }
333
- if (num_batches > 1) {
334
- logger.log(
335
- `šŸŒ€ We are sending ${num_batches} batch(es) to D1 (limited to ${QUERY_LIMIT} statements per batch)`
336
- );
337
- }
338
- return batches;
339
- }
340
-
341
- async function loadSqlUtils() {
342
- const [
343
- { default: parser },
344
- {
345
- // No idea why this is doubly-nested, see https://github.com/ForbesLindesay/atdatabases/issues/255
346
- default: { default: splitter },
347
- },
348
- ] = await npxImport<
349
- [{ default: SQL }, { default: { default: typeof splitSqlQuery } }]
350
- >(["@databases/sql@3.2.0", "@databases/split-sql-query@1.0.3"], logDim);
351
- return { parser, splitter };
352
- }
@@ -1,14 +0,0 @@
1
- import TimeAgo from "javascript-time-ago";
2
- import en from "javascript-time-ago/locale/en";
3
- import prettyBytes from "pretty-bytes";
4
- TimeAgo.addDefaultLocale(en);
5
- const timeAgo = new TimeAgo("en-US");
6
-
7
- export const formatTimeAgo = (date: Date): string => {
8
- const result = timeAgo.format(date);
9
- return Array.isArray(result) ? result[0] : result;
10
- };
11
-
12
- export const formatBytes = (bytes: number): string => {
13
- return prettyBytes(bytes);
14
- };