wrangler 0.0.0-e7cf0caa → 0.0.0-e81b1611
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.
- package/README.md +10 -12
- package/bin/wrangler.js +9 -75
- package/package.json +209 -199
- package/templates/__tests__/tsconfig.json +1 -1
- package/templates/checked-fetch.js +10 -3
- package/templates/facade.d.ts +4 -1
- package/templates/middleware/common.ts +9 -4
- package/templates/middleware/loader-modules.ts +64 -11
- package/templates/middleware/loader-sw.ts +2 -7
- package/templates/middleware/middleware-d1-beta.d.ts +3 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +1 -0
- package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
- package/templates/middleware/middleware-multiworker-dev.ts +68 -0
- package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
- package/templates/middleware/middleware-serve-static-assets.ts +56 -0
- package/templates/modules-watch-stub.js +4 -0
- package/templates/new-worker-scheduled.ts +1 -1
- package/templates/new-worker.ts +1 -1
- package/templates/pages-dev-util.ts +4 -1
- package/templates/pages-shim.ts +0 -3
- package/templates/pages-template-plugin.ts +12 -2
- package/templates/pages-template-worker.ts +11 -2
- package/templates/tsconfig.json +1 -1
- package/wrangler-dist/cli.d.ts +277 -196
- package/wrangler-dist/cli.js +90924 -90740
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/import_meta_url.js +0 -3
- package/miniflare-config-stubs/.env.empty +0 -0
- package/miniflare-config-stubs/package.empty.json +0 -1
- package/miniflare-config-stubs/wrangler.empty.toml +0 -0
- package/miniflare-dist/index.mjs +0 -6368
- package/src/__tests__/access.test.ts +0 -25
- package/src/__tests__/api-dev.test.ts +0 -238
- package/src/__tests__/api-devregistry.test.ts +0 -121
- package/src/__tests__/api.test.ts +0 -102
- package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
- package/src/__tests__/config-cache.test.ts +0 -42
- package/src/__tests__/configuration.test.ts +0 -4509
- package/src/__tests__/d1/d1.test.ts +0 -82
- package/src/__tests__/d1/execute.test.ts +0 -66
- package/src/__tests__/d1/migrate.test.ts +0 -157
- package/src/__tests__/d1/splitter.test.ts +0 -255
- package/src/__tests__/delete.test.ts +0 -272
- package/src/__tests__/deployments.test.ts +0 -369
- package/src/__tests__/dev.test.tsx +0 -1617
- package/src/__tests__/generate.test.ts +0 -237
- package/src/__tests__/get-host-from-url.test.ts +0 -16
- package/src/__tests__/guess-worker-format.test.ts +0 -120
- package/src/__tests__/helpers/clipboardy-mock.js +0 -4
- package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
- package/src/__tests__/helpers/end-event-loop.ts +0 -6
- package/src/__tests__/helpers/mock-account-id.ts +0 -48
- package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
- package/src/__tests__/helpers/mock-bin.ts +0 -36
- package/src/__tests__/helpers/mock-console.ts +0 -112
- package/src/__tests__/helpers/mock-dialogs.ts +0 -139
- package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
- package/src/__tests__/helpers/mock-http-server.ts +0 -46
- package/src/__tests__/helpers/mock-istty.ts +0 -74
- package/src/__tests__/helpers/mock-known-routes.ts +0 -12
- package/src/__tests__/helpers/mock-kv.ts +0 -46
- package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
- package/src/__tests__/helpers/mock-process.ts +0 -34
- package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
- package/src/__tests__/helpers/mock-stdin.ts +0 -108
- package/src/__tests__/helpers/mock-web-socket.ts +0 -29
- package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
- package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
- package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -160
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
- package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
- package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
- package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
- package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
- package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
- package/src/__tests__/helpers/msw/index.ts +0 -52
- package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
- package/src/__tests__/helpers/run-in-tmp.ts +0 -38
- package/src/__tests__/helpers/run-wrangler.ts +0 -16
- package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
- package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
- package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
- package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -11
- package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
- package/src/__tests__/helpers/write-worker-source.ts +0 -31
- package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
- package/src/__tests__/https-options.test.ts +0 -163
- package/src/__tests__/index.test.ts +0 -280
- package/src/__tests__/init.test.ts +0 -3196
- package/src/__tests__/jest.setup.ts +0 -179
- package/src/__tests__/kv.test.ts +0 -1799
- package/src/__tests__/logger.test.ts +0 -207
- package/src/__tests__/logout.test.ts +0 -47
- package/src/__tests__/metrics.test.ts +0 -493
- package/src/__tests__/middleware.scheduled.test.ts +0 -145
- package/src/__tests__/middleware.test.ts +0 -816
- package/src/__tests__/mtls-certificates.test.ts +0 -588
- package/src/__tests__/package-manager.test.ts +0 -353
- package/src/__tests__/pages/deployment-list.test.ts +0 -80
- package/src/__tests__/pages/functions-build.test.ts +0 -452
- package/src/__tests__/pages/pages.test.ts +0 -81
- package/src/__tests__/pages/project-create.test.ts +0 -63
- package/src/__tests__/pages/project-list.test.ts +0 -110
- package/src/__tests__/pages/project-upload.test.ts +0 -500
- package/src/__tests__/pages/publish.test.ts +0 -2864
- package/src/__tests__/pages-deployment-tail.test.ts +0 -955
- package/src/__tests__/parse.test.ts +0 -436
- package/src/__tests__/paths.test.ts +0 -39
- package/src/__tests__/publish.test.ts +0 -8423
- package/src/__tests__/pubsub.test.ts +0 -496
- package/src/__tests__/queues.test.ts +0 -532
- package/src/__tests__/r2.test.ts +0 -374
- package/src/__tests__/route.test.ts +0 -45
- package/src/__tests__/secret.test.ts +0 -693
- package/src/__tests__/tail.test.ts +0 -958
- package/src/__tests__/test-old-node-version.js +0 -31
- package/src/__tests__/traverse-module-graph.test.ts +0 -220
- package/src/__tests__/tsconfig-sanity.ts +0 -12
- package/src/__tests__/tsconfig.json +0 -8
- package/src/__tests__/tsconfig.tsbuildinfo +0 -1
- package/src/__tests__/type-generation.test.ts +0 -234
- package/src/__tests__/user.test.ts +0 -118
- package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
- package/src/__tests__/validate-dev-props.test.ts +0 -56
- package/src/__tests__/version.test.ts +0 -35
- package/src/__tests__/whoami.test.tsx +0 -172
- package/src/__tests__/worker-namespace.test.ts +0 -340
- package/src/abort.d.ts +0 -3
- package/src/api/dev.ts +0 -316
- package/src/api/index.ts +0 -11
- package/src/api/mtls-certificate.ts +0 -148
- package/src/api/pages/create-worker-bundle-contents.ts +0 -76
- package/src/api/pages/index.ts +0 -5
- package/src/api/pages/publish.tsx +0 -355
- package/src/bundle-reporter.ts +0 -68
- package/src/bundle.ts +0 -908
- package/src/cfetch/index.ts +0 -158
- package/src/cfetch/internal.ts +0 -258
- package/src/cli.ts +0 -28
- package/src/config/README.md +0 -107
- package/src/config/config.ts +0 -282
- package/src/config/diagnostics.ts +0 -80
- package/src/config/environment.ts +0 -618
- package/src/config/index.ts +0 -403
- package/src/config/validation-helpers.ts +0 -597
- package/src/config/validation.ts +0 -2342
- package/src/config-cache.ts +0 -85
- package/src/create-worker-preview.ts +0 -293
- package/src/create-worker-upload-form.ts +0 -359
- package/src/d1/backups.tsx +0 -219
- package/src/d1/constants.ts +0 -2
- package/src/d1/create.tsx +0 -68
- package/src/d1/delete.ts +0 -53
- package/src/d1/execute.tsx +0 -357
- package/src/d1/formatTimeAgo.ts +0 -14
- package/src/d1/index.ts +0 -100
- package/src/d1/list.tsx +0 -60
- package/src/d1/migrations/apply.tsx +0 -212
- package/src/d1/migrations/create.tsx +0 -79
- package/src/d1/migrations/helpers.ts +0 -172
- package/src/d1/migrations/index.ts +0 -3
- package/src/d1/migrations/list.tsx +0 -95
- package/src/d1/migrations/options.ts +0 -23
- package/src/d1/options.ts +0 -22
- package/src/d1/splitter.ts +0 -161
- package/src/d1/types.ts +0 -25
- package/src/d1/utils.ts +0 -49
- package/src/delete.ts +0 -100
- package/src/deployments.ts +0 -368
- package/src/deprecated/index.ts +0 -144
- package/src/dev/dev-vars.ts +0 -39
- package/src/dev/dev.tsx +0 -600
- package/src/dev/get-local-persistence-path.ts +0 -31
- package/src/dev/local.tsx +0 -920
- package/src/dev/remote.tsx +0 -632
- package/src/dev/start-server.ts +0 -534
- package/src/dev/use-esbuild.ts +0 -203
- package/src/dev/validate-dev-props.ts +0 -40
- package/src/dev-registry.ts +0 -202
- package/src/dev.tsx +0 -929
- package/src/dialogs.ts +0 -136
- package/src/dispatch-namespace.ts +0 -211
- package/src/docs/index.ts +0 -97
- package/src/durable.ts +0 -102
- package/src/entry.ts +0 -337
- package/src/environment-variables/factory.ts +0 -88
- package/src/environment-variables/misc-variables.ts +0 -30
- package/src/errors.ts +0 -11
- package/src/generate/index.ts +0 -298
- package/src/git-client.ts +0 -135
- package/src/global-wrangler-config-path.ts +0 -26
- package/src/https-options.ts +0 -127
- package/src/index.ts +0 -758
- package/src/init.ts +0 -1032
- package/src/inspect.ts +0 -782
- package/src/intl-polyfill.d.ts +0 -139
- package/src/is-ci.ts +0 -14
- package/src/is-interactive.ts +0 -16
- package/src/jest.d.ts +0 -4
- package/src/kv/helpers.ts +0 -430
- package/src/kv/index.ts +0 -594
- package/src/logger.ts +0 -119
- package/src/metrics/index.ts +0 -5
- package/src/metrics/metrics-config.ts +0 -239
- package/src/metrics/metrics-dispatcher.ts +0 -96
- package/src/metrics/metrics-usage-headers.ts +0 -24
- package/src/metrics/send-event.ts +0 -99
- package/src/miniflare-cli/README.md +0 -30
- package/src/miniflare-cli/assets.ts +0 -251
- package/src/miniflare-cli/index.ts +0 -210
- package/src/miniflare-cli/request-context.ts +0 -40
- package/src/miniflare-cli/tsconfig.json +0 -9
- package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
- package/src/miniflare-cli/types.ts +0 -11
- package/src/module-collection.ts +0 -333
- package/src/mtls-certificate/cli.ts +0 -155
- package/src/open-in-browser.ts +0 -17
- package/src/package-manager.ts +0 -219
- package/src/pages/build.ts +0 -410
- package/src/pages/buildFunctions.ts +0 -140
- package/src/pages/constants.ts +0 -18
- package/src/pages/deployment-tails.ts +0 -281
- package/src/pages/deployments.tsx +0 -84
- package/src/pages/dev.ts +0 -716
- package/src/pages/errors.ts +0 -67
- package/src/pages/functions/buildPlugin.ts +0 -113
- package/src/pages/functions/buildWorker.ts +0 -291
- package/src/pages/functions/filepath-routing.test.ts +0 -234
- package/src/pages/functions/filepath-routing.ts +0 -189
- package/src/pages/functions/identifiers.ts +0 -78
- package/src/pages/functions/routes-consolidation.test.ts +0 -250
- package/src/pages/functions/routes-consolidation.ts +0 -73
- package/src/pages/functions/routes-transformation.test.ts +0 -282
- package/src/pages/functions/routes-transformation.ts +0 -115
- package/src/pages/functions/routes-validation.test.ts +0 -403
- package/src/pages/functions/routes-validation.ts +0 -202
- package/src/pages/functions/routes.ts +0 -151
- package/src/pages/functions/tsconfig.json +0 -8
- package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
- package/src/pages/functions.ts +0 -86
- package/src/pages/hash.ts +0 -13
- package/src/pages/index.ts +0 -102
- package/src/pages/projects.tsx +0 -159
- package/src/pages/prompt-select-project.tsx +0 -31
- package/src/pages/publish.tsx +0 -267
- package/src/pages/types.ts +0 -46
- package/src/pages/upload.tsx +0 -469
- package/src/pages/utils.ts +0 -23
- package/src/parse.ts +0 -308
- package/src/paths.ts +0 -71
- package/src/proxy.ts +0 -694
- package/src/publish/index.ts +0 -274
- package/src/publish/publish.ts +0 -1060
- package/src/pubsub/index.ts +0 -286
- package/src/pubsub/pubsub-commands.ts +0 -623
- package/src/queues/cli/commands/consumer/add.ts +0 -71
- package/src/queues/cli/commands/consumer/index.ts +0 -19
- package/src/queues/cli/commands/consumer/remove.ts +0 -31
- package/src/queues/cli/commands/create.ts +0 -25
- package/src/queues/cli/commands/delete.ts +0 -26
- package/src/queues/cli/commands/index.ts +0 -35
- package/src/queues/cli/commands/list.ts +0 -25
- package/src/queues/client.ts +0 -136
- package/src/queues/utils.ts +0 -18
- package/src/r2/constants.ts +0 -4
- package/src/r2/helpers.ts +0 -132
- package/src/r2/index.ts +0 -289
- package/src/routes.ts +0 -140
- package/src/secret/index.ts +0 -376
- package/src/selfsigned.d.ts +0 -29
- package/src/sites.ts +0 -372
- package/src/tail/createTail.ts +0 -406
- package/src/tail/filters.ts +0 -277
- package/src/tail/index.ts +0 -211
- package/src/tail/printing.ts +0 -122
- package/src/traverse-module-graph.ts +0 -53
- package/src/tsconfig-sanity.ts +0 -16
- package/src/type-generation.ts +0 -181
- package/src/update-check.ts +0 -19
- package/src/user/access.ts +0 -68
- package/src/user/auth-variables.ts +0 -113
- package/src/user/choose-account.tsx +0 -39
- package/src/user/generate-auth-url.ts +0 -33
- package/src/user/generate-random-state.ts +0 -16
- package/src/user/index.ts +0 -2
- package/src/user/user.ts +0 -1233
- package/src/utils/collectKeyValues.ts +0 -14
- package/src/utils/render.ts +0 -93
- package/src/whoami.ts +0 -135
- package/src/worker.ts +0 -274
- package/src/yargs-types.ts +0 -37
- package/src/zones.ts +0 -191
- package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
- package/templates/d1-beta-facade.js +0 -244
- package/templates/first-party-worker-module-facade.ts +0 -19
- package/templates/format-dev-errors.ts +0 -34
- package/templates/serve-static-assets.ts +0 -66
- package/templates/service-bindings-module-facade.js +0 -55
- package/templates/service-bindings-sw-facade.js +0 -42
- package/templates/tsconfig.tsbuildinfo +0 -1
|
@@ -1,82 +0,0 @@
|
|
|
1
|
-
import { endEventLoop } from "../helpers/end-event-loop";
|
|
2
|
-
import { mockConsoleMethods } from "../helpers/mock-console";
|
|
3
|
-
import { runInTempDir } from "../helpers/run-in-tmp";
|
|
4
|
-
import { runWrangler } from "../helpers/run-wrangler";
|
|
5
|
-
|
|
6
|
-
describe("d1", () => {
|
|
7
|
-
const std = mockConsoleMethods();
|
|
8
|
-
runInTempDir();
|
|
9
|
-
|
|
10
|
-
it("should show help when no argument is passed", async () => {
|
|
11
|
-
await runWrangler("d1");
|
|
12
|
-
await endEventLoop();
|
|
13
|
-
|
|
14
|
-
expect(std.out).toMatchInlineSnapshot(`
|
|
15
|
-
"wrangler d1
|
|
16
|
-
|
|
17
|
-
🗄 Interact with a D1 database
|
|
18
|
-
|
|
19
|
-
Commands:
|
|
20
|
-
wrangler d1 list List D1 databases
|
|
21
|
-
wrangler d1 create <name> Create D1 database
|
|
22
|
-
wrangler d1 delete <name> Delete D1 database
|
|
23
|
-
wrangler d1 backup Interact with D1 Backups
|
|
24
|
-
wrangler d1 execute <database> Executed command or SQL file
|
|
25
|
-
wrangler d1 migrations Interact with D1 Migrations
|
|
26
|
-
|
|
27
|
-
Flags:
|
|
28
|
-
-j, --experimental-json-config Experimental: Support wrangler.json [boolean]
|
|
29
|
-
-c, --config Path to .toml configuration file [string]
|
|
30
|
-
-e, --env Environment to use for operations and .env files [string]
|
|
31
|
-
-h, --help Show help [boolean]
|
|
32
|
-
-v, --version Show version number [boolean]
|
|
33
|
-
|
|
34
|
-
--------------------
|
|
35
|
-
🚧 D1 is currently in open alpha and is not recommended for production data and traffic
|
|
36
|
-
🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
|
|
37
|
-
🚧 To request features, visit https://community.cloudflare.com/c/developers/d1
|
|
38
|
-
🚧 To give feedback, visit https://discord.gg/cloudflaredev
|
|
39
|
-
--------------------"
|
|
40
|
-
`);
|
|
41
|
-
});
|
|
42
|
-
|
|
43
|
-
it("should show help when an invalid argument is passed", async () => {
|
|
44
|
-
await expect(() => runWrangler("d1 asdf")).rejects.toThrow(
|
|
45
|
-
"Unknown argument: asdf"
|
|
46
|
-
);
|
|
47
|
-
|
|
48
|
-
expect(std.err).toMatchInlineSnapshot(`
|
|
49
|
-
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mUnknown argument: asdf[0m
|
|
50
|
-
|
|
51
|
-
"
|
|
52
|
-
`);
|
|
53
|
-
expect(std.out).toMatchInlineSnapshot(`
|
|
54
|
-
"
|
|
55
|
-
wrangler d1
|
|
56
|
-
|
|
57
|
-
🗄 Interact with a D1 database
|
|
58
|
-
|
|
59
|
-
Commands:
|
|
60
|
-
wrangler d1 list List D1 databases
|
|
61
|
-
wrangler d1 create <name> Create D1 database
|
|
62
|
-
wrangler d1 delete <name> Delete D1 database
|
|
63
|
-
wrangler d1 backup Interact with D1 Backups
|
|
64
|
-
wrangler d1 execute <database> Executed command or SQL file
|
|
65
|
-
wrangler d1 migrations Interact with D1 Migrations
|
|
66
|
-
|
|
67
|
-
Flags:
|
|
68
|
-
-j, --experimental-json-config Experimental: Support wrangler.json [boolean]
|
|
69
|
-
-c, --config Path to .toml configuration file [string]
|
|
70
|
-
-e, --env Environment to use for operations and .env files [string]
|
|
71
|
-
-h, --help Show help [boolean]
|
|
72
|
-
-v, --version Show version number [boolean]
|
|
73
|
-
|
|
74
|
-
--------------------
|
|
75
|
-
🚧 D1 is currently in open alpha and is not recommended for production data and traffic
|
|
76
|
-
🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
|
|
77
|
-
🚧 To request features, visit https://community.cloudflare.com/c/developers/d1
|
|
78
|
-
🚧 To give feedback, visit https://discord.gg/cloudflaredev
|
|
79
|
-
--------------------"
|
|
80
|
-
`);
|
|
81
|
-
});
|
|
82
|
-
});
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
import { mockConsoleMethods } from "../helpers/mock-console";
|
|
2
|
-
import { useMockIsTTY } from "../helpers/mock-istty";
|
|
3
|
-
import { runInTempDir } from "../helpers/run-in-tmp";
|
|
4
|
-
import { runWrangler } from "../helpers/run-wrangler";
|
|
5
|
-
import writeWranglerToml from "../helpers/write-wrangler-toml";
|
|
6
|
-
|
|
7
|
-
describe("execute", () => {
|
|
8
|
-
mockConsoleMethods();
|
|
9
|
-
runInTempDir();
|
|
10
|
-
const { setIsTTY } = useMockIsTTY();
|
|
11
|
-
|
|
12
|
-
it("should require login when running against prod", async () => {
|
|
13
|
-
setIsTTY(false);
|
|
14
|
-
writeWranglerToml({
|
|
15
|
-
d1_databases: [
|
|
16
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
17
|
-
],
|
|
18
|
-
});
|
|
19
|
-
|
|
20
|
-
await expect(
|
|
21
|
-
runWrangler("d1 execute --command 'select 1;'")
|
|
22
|
-
).rejects.toThrowError(
|
|
23
|
-
`In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.`
|
|
24
|
-
);
|
|
25
|
-
});
|
|
26
|
-
|
|
27
|
-
it("should expect either --command or --file", async () => {
|
|
28
|
-
setIsTTY(false);
|
|
29
|
-
writeWranglerToml({
|
|
30
|
-
d1_databases: [
|
|
31
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
32
|
-
],
|
|
33
|
-
});
|
|
34
|
-
|
|
35
|
-
await expect(runWrangler("d1 execute db")).rejects.toThrowError(
|
|
36
|
-
`Error: must provide --command or --file`
|
|
37
|
-
);
|
|
38
|
-
});
|
|
39
|
-
|
|
40
|
-
it("should reject the use of --preview with --local", async () => {
|
|
41
|
-
setIsTTY(false);
|
|
42
|
-
writeWranglerToml({
|
|
43
|
-
d1_databases: [
|
|
44
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
45
|
-
],
|
|
46
|
-
});
|
|
47
|
-
|
|
48
|
-
await expect(
|
|
49
|
-
runWrangler(`d1 execute db --command "select;" --local --preview`)
|
|
50
|
-
).rejects.toThrowError(`Error: can't use --preview with --local`);
|
|
51
|
-
});
|
|
52
|
-
|
|
53
|
-
it("should expect --local when using --persist-to", async () => {
|
|
54
|
-
setIsTTY(false);
|
|
55
|
-
writeWranglerToml({
|
|
56
|
-
d1_databases: [
|
|
57
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
58
|
-
],
|
|
59
|
-
});
|
|
60
|
-
await runWrangler("d1 migrations create db test");
|
|
61
|
-
|
|
62
|
-
await expect(
|
|
63
|
-
runWrangler("d1 migrations apply --local db --preview")
|
|
64
|
-
).rejects.toThrowError(`Error: can't use --preview with --local`);
|
|
65
|
-
});
|
|
66
|
-
});
|
|
@@ -1,157 +0,0 @@
|
|
|
1
|
-
import { cwd } from "process";
|
|
2
|
-
import { reinitialiseAuthTokens } from "../../user";
|
|
3
|
-
import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
|
|
4
|
-
import { mockConsoleMethods } from "../helpers/mock-console";
|
|
5
|
-
import { useMockIsTTY } from "../helpers/mock-istty";
|
|
6
|
-
import { runInTempDir } from "../helpers/run-in-tmp";
|
|
7
|
-
import { runWrangler } from "../helpers/run-wrangler";
|
|
8
|
-
import writeWranglerToml from "../helpers/write-wrangler-toml";
|
|
9
|
-
|
|
10
|
-
describe("migrate", () => {
|
|
11
|
-
runInTempDir();
|
|
12
|
-
mockConsoleMethods();
|
|
13
|
-
const { setIsTTY } = useMockIsTTY();
|
|
14
|
-
|
|
15
|
-
describe("create", () => {
|
|
16
|
-
it("should reject the --local flag for create", async () => {
|
|
17
|
-
setIsTTY(false);
|
|
18
|
-
writeWranglerToml({
|
|
19
|
-
d1_databases: [
|
|
20
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
21
|
-
],
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
await expect(
|
|
25
|
-
runWrangler("d1 migrations create test some-message --local DATABASE")
|
|
26
|
-
).rejects.toThrowError(`Unknown argument: local`);
|
|
27
|
-
});
|
|
28
|
-
});
|
|
29
|
-
|
|
30
|
-
describe("apply", () => {
|
|
31
|
-
it("should not attempt to login in local mode", async () => {
|
|
32
|
-
setIsTTY(false);
|
|
33
|
-
writeWranglerToml({
|
|
34
|
-
d1_databases: [
|
|
35
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
36
|
-
],
|
|
37
|
-
});
|
|
38
|
-
// If we get to the point where we are checking for migrations then we have not been asked to log in.
|
|
39
|
-
await expect(
|
|
40
|
-
runWrangler("d1 migrations apply --local DATABASE")
|
|
41
|
-
).rejects.toThrowError(
|
|
42
|
-
`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
|
|
43
|
-
);
|
|
44
|
-
});
|
|
45
|
-
|
|
46
|
-
it("should try to read D1 config from wrangler.toml", async () => {
|
|
47
|
-
setIsTTY(false);
|
|
48
|
-
writeWranglerToml();
|
|
49
|
-
await expect(
|
|
50
|
-
runWrangler("d1 migrations apply DATABASE")
|
|
51
|
-
).rejects.toThrowError(
|
|
52
|
-
"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
|
|
53
|
-
);
|
|
54
|
-
});
|
|
55
|
-
|
|
56
|
-
it("should not try to read wrangler.toml in local mode", async () => {
|
|
57
|
-
setIsTTY(false);
|
|
58
|
-
writeWranglerToml();
|
|
59
|
-
// If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
|
|
60
|
-
await expect(
|
|
61
|
-
runWrangler("d1 migrations apply --local DATABASE")
|
|
62
|
-
).rejects.toThrowError(
|
|
63
|
-
`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
|
|
64
|
-
);
|
|
65
|
-
});
|
|
66
|
-
|
|
67
|
-
it("should reject the use of --preview with --local", async () => {
|
|
68
|
-
setIsTTY(false);
|
|
69
|
-
writeWranglerToml({
|
|
70
|
-
d1_databases: [
|
|
71
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
72
|
-
],
|
|
73
|
-
});
|
|
74
|
-
await runWrangler("d1 migrations create db test");
|
|
75
|
-
|
|
76
|
-
await expect(
|
|
77
|
-
runWrangler("d1 migrations apply --local db --preview")
|
|
78
|
-
).rejects.toThrowError(`Error: can't use --preview with --local`);
|
|
79
|
-
});
|
|
80
|
-
});
|
|
81
|
-
|
|
82
|
-
describe("list", () => {
|
|
83
|
-
mockAccountId();
|
|
84
|
-
mockApiToken({ apiToken: null });
|
|
85
|
-
|
|
86
|
-
it("should not attempt to login in local mode", async () => {
|
|
87
|
-
setIsTTY(false);
|
|
88
|
-
writeWranglerToml({
|
|
89
|
-
d1_databases: [
|
|
90
|
-
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
91
|
-
],
|
|
92
|
-
});
|
|
93
|
-
// If we get to the point where we are checking for migrations then we have not been asked to log in.
|
|
94
|
-
await expect(
|
|
95
|
-
runWrangler("d1 migrations list --local DATABASE")
|
|
96
|
-
).rejects.toThrowError(
|
|
97
|
-
`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
|
|
98
|
-
);
|
|
99
|
-
});
|
|
100
|
-
|
|
101
|
-
it("should use the custom migrations folder when provided", async () => {
|
|
102
|
-
setIsTTY(false);
|
|
103
|
-
writeWranglerToml({
|
|
104
|
-
d1_databases: [
|
|
105
|
-
{
|
|
106
|
-
binding: "DATABASE",
|
|
107
|
-
database_name: "db",
|
|
108
|
-
database_id: "xxxx",
|
|
109
|
-
migrations_dir: "my-migrations-go-here",
|
|
110
|
-
},
|
|
111
|
-
],
|
|
112
|
-
});
|
|
113
|
-
await expect(
|
|
114
|
-
runWrangler("d1 migrations list --local DATABASE")
|
|
115
|
-
).rejects.toThrowError(
|
|
116
|
-
`No migrations present at ${cwd().replaceAll(
|
|
117
|
-
"\\",
|
|
118
|
-
"/"
|
|
119
|
-
)}/my-migrations-go-here.`
|
|
120
|
-
);
|
|
121
|
-
});
|
|
122
|
-
|
|
123
|
-
it("should try to read D1 config from wrangler.toml when logged in", async () => {
|
|
124
|
-
// no need to clear this env var as it's implicitly cleared by mockApiToken in afterEach
|
|
125
|
-
process.env.CLOUDFLARE_API_TOKEN = "api-token";
|
|
126
|
-
reinitialiseAuthTokens();
|
|
127
|
-
setIsTTY(false);
|
|
128
|
-
writeWranglerToml();
|
|
129
|
-
await expect(
|
|
130
|
-
runWrangler("d1 migrations list DATABASE")
|
|
131
|
-
).rejects.toThrowError(
|
|
132
|
-
"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
|
|
133
|
-
);
|
|
134
|
-
});
|
|
135
|
-
|
|
136
|
-
it("should throw if user is not authenticated and not using --local", async () => {
|
|
137
|
-
setIsTTY(false);
|
|
138
|
-
|
|
139
|
-
await expect(
|
|
140
|
-
runWrangler("d1 migrations list DATABASE")
|
|
141
|
-
).rejects.toThrowError(
|
|
142
|
-
"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work"
|
|
143
|
-
);
|
|
144
|
-
});
|
|
145
|
-
|
|
146
|
-
it("should not try to read wrangler.toml in local mode", async () => {
|
|
147
|
-
setIsTTY(false);
|
|
148
|
-
writeWranglerToml();
|
|
149
|
-
// If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
|
|
150
|
-
await expect(
|
|
151
|
-
runWrangler("d1 migrations list --local DATABASE")
|
|
152
|
-
).rejects.toThrowError(
|
|
153
|
-
`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
|
|
154
|
-
);
|
|
155
|
-
});
|
|
156
|
-
});
|
|
157
|
-
});
|
|
@@ -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
|
-
});
|