wrangler 0.0.0-e60dc909 → 0.0.0-e61dba50

package/src/__tests__/d1/d1.test.ts

@@ -1,123 +0,0 @@
-import { cwd } from "process";
-import { mockConsoleMethods } from "../helpers/mock-console";
-import { useMockIsTTY } from "../helpers/mock-istty";
-import { runInTempDir } from "../helpers/run-in-tmp";
-import { runWrangler } from "../helpers/run-wrangler";
-import writeWranglerToml from "../helpers/write-wrangler-toml";
-
-function endEventLoop() {
-	return new Promise((resolve) => setImmediate(resolve));
-}
-
-describe("d1", () => {
-	const std = mockConsoleMethods();
-	runInTempDir();
-	const { setIsTTY } = useMockIsTTY();
-
-	it("should show help when no argument is passed", async () => {
-		await runWrangler("d1");
-		await endEventLoop();
-
-		expect(std.out).toMatchInlineSnapshot(`
-		"wrangler d1
-
-		🗄  Interact with a D1 database
-
-		Commands:
-		  wrangler d1 list                List D1 databases
-		  wrangler d1 create <name>       Create D1 database
-		  wrangler d1 delete <name>       Delete D1 database
-		  wrangler d1 backup              Interact with D1 Backups
-		  wrangler d1 execute <database>  Executed command or SQL file
-		  wrangler d1 migrations          Interact with D1 Migrations
-
-		Flags:
-		  -c, --config   Path to .toml configuration file  [string]
-		  -e, --env      Environment to use for operations and .env files  [string]
-		  -h, --help     Show help  [boolean]
-		  -v, --version  Show version number  [boolean]
-
-		🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
-		Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
-		To request features, visit https://community.cloudflare.com/c/developers/d1.
-		To give feedback, visit https://discord.gg/cloudflaredev"
-	`);
-	});
-
-	it("should show help when an invalid argument is passed", async () => {
-		await expect(() => runWrangler("d1 asdf")).rejects.toThrow(
-			"Unknown argument: asdf"
-		);
-
-		expect(std.err).toMatchInlineSnapshot(`
-		"X [ERROR] Unknown argument: asdf
-
-		"
-	`);
-		expect(std.out).toMatchInlineSnapshot(`
-		"
-		wrangler d1
-
-		🗄  Interact with a D1 database
-
-		Commands:
-		  wrangler d1 list                List D1 databases
-		  wrangler d1 create <name>       Create D1 database
-		  wrangler d1 delete <name>       Delete D1 database
-		  wrangler d1 backup              Interact with D1 Backups
-		  wrangler d1 execute <database>  Executed command or SQL file
-		  wrangler d1 migrations          Interact with D1 Migrations
-
-		Flags:
-		  -c, --config   Path to .toml configuration file  [string]
-		  -e, --env      Environment to use for operations and .env files  [string]
-		  -h, --help     Show help  [boolean]
-		  -v, --version  Show version number  [boolean]
-
-		🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
-		Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
-		To request features, visit https://community.cloudflare.com/c/developers/d1.
-		To give feedback, visit https://discord.gg/cloudflaredev"
-	`);
-	});
-
-	describe("migrate", () => {
-		describe("apply", () => {
-			it("should not attempt to login in local mode", async () => {
-				setIsTTY(false);
-				writeWranglerToml({
-					d1_databases: [
-						{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
-					],
-				});
-				// If we get to the point where we are checking for migrations then we have not been asked to log in.
-				await expect(
-					runWrangler("d1 migrations apply --local DATABASE")
-				).rejects.toThrowError(
-					`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
-				);
-			});
-
-			it("should try to read D1 config from wrangler.toml", async () => {
-				setIsTTY(false);
-				writeWranglerToml();
-				await expect(
-					runWrangler("d1 migrations apply DATABASE")
-				).rejects.toThrowError(
-					"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
-				);
-			});
-
-			it("should not try to read wrangler.toml in local mode", async () => {
-				setIsTTY(false);
-				writeWranglerToml();
-				// If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
-				await expect(
-					runWrangler("d1 migrations apply --local DATABASE")
-				).rejects.toThrowError(
-					`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
-				);
-			});
-		});
-	});
-});

package/src/__tests__/d1/splitter.test.ts

@@ -1,255 +0,0 @@
-import splitSqlQuery, { mayContainMultipleStatements } from "../../d1/splitter";
-
-describe("mayContainMultipleStatements()", () => {
-	it("should return false if there is only a semi-colon at the end", () => {
-		expect(mayContainMultipleStatements(`SELECT * FROM my_table`)).toBe(false);
-		expect(
-			mayContainMultipleStatements(`SELECT * FROM my_table WHERE id = 42;`)
-		).toBe(false);
-		expect(
-			mayContainMultipleStatements(`SELECT * FROM my_table WHERE id = 42;   `)
-		).toBe(false);
-	});
-
-	it("should return true if there is a semi-colon before the end of the string", () => {
-		expect(
-			mayContainMultipleStatements(
-				`SELECT * FROM my_table WHERE val = "foo;bar";`
-			)
-		).toBe(true);
-	});
-
-	it("should return true if there is more than one statement", () => {
-		expect(
-			mayContainMultipleStatements(
-				`
-      INSERT INTO my_table (id, value) VALUES (42, 'foo');
-      SELECT * FROM my_table WHERE id = 42;
-    `
-			)
-		).toBe(true);
-	});
-});
-
-describe("splitSqlQuery()", () => {
-	it("should return original SQL if there are no real statements", () => {
-		expect(splitSqlQuery(`;;;`)).toMatchInlineSnapshot(`
-		Array [
-		  ";;;",
-		]
-	`);
-	});
-
-	it("should not split single statements", () => {
-		expect(splitSqlQuery(`SELECT * FROM my_table`)).toMatchInlineSnapshot(`
-		Array [
-		  "SELECT * FROM my_table",
-		]
-	`);
-		expect(splitSqlQuery(`SELECT * FROM my_table WHERE id = 42;`))
-			.toMatchInlineSnapshot(`
-		Array [
-		  "SELECT * FROM my_table WHERE id = 42;",
-		]
-	`);
-		expect(
-			splitSqlQuery(
-				`
-      SELECT * FROM my_table WHERE id = 42;
-    `
-			)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "
-		      SELECT * FROM my_table WHERE id = 42;
-		    ",
-		]
-	`);
-	});
-
-	it("should handle strings", () => {
-		expect(
-			splitSqlQuery(
-				`
-      SELECT * FROM my_table WHERE val = "foo;bar";
-    `
-			)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "SELECT * FROM my_table WHERE val = \\"foo;bar\\"",
-		]
-	`);
-	});
-
-	it("should handle inline comments", () => {
-		expect(
-			splitSqlQuery(
-				`SELECT * FROM my_table -- semicolons; in; comments; don't count;
-        WHERE val = 'foo;bar'
-        AND "col;name" = \`other;col\`; -- or identifiers (Postgres or MySQL style)`
-			)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "SELECT * FROM my_table -- semicolons; in; comments; don't count;
-		        WHERE val = 'foo;bar'
-		        AND \\"col;name\\" = \`other;col\`",
-		  "-- or identifiers (Postgres or MySQL style)",
-		]
-	`);
-	});
-
-	it("should handle block comments", () => {
-		expect(
-			splitSqlQuery(
-				`/****
-        * Block comments are ignored;
-        ****/
-			SELECT * FROM my_table /* semicolons; in; comments; don't count; */
-        WHERE val = 'foo;bar' AND count / 2 > 0`
-			)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "/****
-		        * Block comments are ignored;
-		        ****/
-					SELECT * FROM my_table /* semicolons; in; comments; don't count; */
-		        WHERE val = 'foo;bar' AND count / 2 > 0",
-		]
-	`);
-	});
-
-	it("should split multiple statements", () => {
-		expect(
-			splitSqlQuery(
-				`
-        INSERT INTO my_table (id, value) VALUES (42, 'foo');
-        SELECT * FROM my_table WHERE id = 42 - 10;
-      `
-			)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "INSERT INTO my_table (id, value) VALUES (42, 'foo')",
-		  "SELECT * FROM my_table WHERE id = 42 - 10",
-		]
-	`);
-	});
-
-	it("should handle whitespace between statements", () => {
-		expect(
-			splitSqlQuery(`
-        CREATE DOMAIN custom_types.email AS TEXT CHECK (VALUE ~ '^.+@.+$');
-        CREATE TYPE custom_types.currency AS ENUM('USD', 'GBP');
-
-        CREATE TYPE custom_types.money_with_currency AS (
-          value NUMERIC(1000, 2),
-          currency custom_types.currency,
-          description TEXT
-        );
-        CREATE TYPE custom_types.balance_pair AS (
-          income custom_types.money_with_currency,
-          expenditure custom_types.money_with_currency
-        );
-
-        CREATE TABLE custom_types.accounts (
-          email custom_types.email NOT NULL PRIMARY KEY,
-          balance custom_types.money_with_currency
-        );
-        CREATE TABLE custom_types.balance_pairs (
-          balance custom_types.balance_pair
-        );
-      `)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "CREATE DOMAIN custom_types.email AS TEXT CHECK (VALUE ~ '^.+@.+$')",
-		  "CREATE TYPE custom_types.currency AS ENUM('USD', 'GBP')",
-		  "CREATE TYPE custom_types.money_with_currency AS (
-		          value NUMERIC(1000, 2),
-		          currency custom_types.currency,
-		          description TEXT
-		        )",
-		  "CREATE TYPE custom_types.balance_pair AS (
-		          income custom_types.money_with_currency,
-		          expenditure custom_types.money_with_currency
-		        )",
-		  "CREATE TABLE custom_types.accounts (
-		          email custom_types.email NOT NULL PRIMARY KEY,
-		          balance custom_types.money_with_currency
-		        )",
-		  "CREATE TABLE custom_types.balance_pairs (
-		          balance custom_types.balance_pair
-		        )",
-		]
-	`);
-	});
-
-	it("should handle $...$ style string markers", () => {
-		expect(
-			splitSqlQuery(`
-          CREATE OR REPLACE FUNCTION update_updated_at_column()
-          RETURNS TRIGGER AS $$
-          BEGIN
-              NEW.updated_at = now();
-              RETURN NEW;
-          END;
-          $$ language 'plpgsql';
-          CREATE TRIGGER <trigger_name> BEFORE UPDATE ON <table_name> FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column();
-        `)
-		).toMatchInlineSnapshot(`
-		    Array [
-		      "CREATE OR REPLACE FUNCTION update_updated_at_column()
-		              RETURNS TRIGGER AS $$
-		              BEGIN
-		                  NEW.updated_at = now();
-		                  RETURN NEW;
-		              END;
-		              $$ language 'plpgsql'",
-		      "CREATE TRIGGER <trigger_name> BEFORE UPDATE ON <table_name> FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column()",
-		    ]
-	  `);
-		expect(
-			splitSqlQuery(
-				`$SomeTag$Dianne's$WrongTag$;$some non tag an$identifier;; horse$SomeTag$;$SomeTag$Dianne's horse$SomeTag$`
-			)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "$SomeTag$Dianne's$WrongTag$;$some non tag an$identifier;; horse$SomeTag$",
-		  "$SomeTag$Dianne's horse$SomeTag$",
-		]
-	`);
-	});
-
-	it("should handle compound statements", () => {
-		expect(
-			splitSqlQuery(`
-    CREATE TRIGGER IF NOT EXISTS update_trigger AFTER UPDATE ON items
-    BEGIN
-        DELETE FROM updates WHERE item_id=old.id;
-    END;
-    CREATE TRIGGER IF NOT EXISTS actors_search_fts_update AFTER UPDATE ON actors
-    BEGIN
-        DELETE FROM search_fts WHERE rowid=old.rowid;
-        INSERT INTO search_fts (rowid, type, name, preferredUsername)
-        VALUES (new.rowid,
-                new.type,
-                json_extract(new.properties, '$.name'),
-                json_extract(new.properties, '$.preferredUsername'));
-    END;`)
-		).toMatchInlineSnapshot(`
-		Array [
-		  "CREATE TRIGGER IF NOT EXISTS update_trigger AFTER UPDATE ON items
-		    BEGIN
-		        DELETE FROM updates WHERE item_id=old.id;
-		    END",
-		  "CREATE TRIGGER IF NOT EXISTS actors_search_fts_update AFTER UPDATE ON actors
-		    BEGIN
-		        DELETE FROM search_fts WHERE rowid=old.rowid;
-		        INSERT INTO search_fts (rowid, type, name, preferredUsername)
-		        VALUES (new.rowid,
-		                new.type,
-		                json_extract(new.properties, '$.name'),
-		                json_extract(new.properties, '$.preferredUsername'));
-		    END",
-		]
-	`);
-	});
-});

package/src/__tests__/delete.test.ts

@@ -1,266 +0,0 @@
-import { rest } from "msw";
-import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { mockConfirm } from "./helpers/mock-dialogs";
-import { useMockIsTTY } from "./helpers/mock-istty";
-import { msw } from "./helpers/msw";
-import { runInTempDir } from "./helpers/run-in-tmp";
-import { runWrangler } from "./helpers/run-wrangler";
-import writeWranglerToml from "./helpers/write-wrangler-toml";
-import type { KVNamespaceInfo } from "../kv/helpers";
-describe("delete", () => {
-	mockAccountId();
-	mockApiToken();
-	runInTempDir();
-	const { setIsTTY } = useMockIsTTY();
-	beforeEach(() => {
-		setIsTTY(true);
-	});
-	const std = mockConsoleMethods();
-
-	it("should delete an entire service by name", async () => {
-		mockConfirm({
-			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
-			result: true,
-		});
-		mockListKVNamespacesRequest();
-		mockDeleteWorkerRequest({ name: "my-script" });
-		await runWrangler("delete --name my-script");
-
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "Successfully deleted my-script",
-		  "warn": "",
-		}
-	`);
-	});
-
-	it("should delete a script by configuration", async () => {
-		mockConfirm({
-			text: `Are you sure you want to delete test-name? This action cannot be undone.`,
-			result: true,
-		});
-		writeWranglerToml();
-		mockListKVNamespacesRequest();
-		mockDeleteWorkerRequest();
-		await runWrangler("delete");
-
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "Successfully deleted test-name",
-		  "warn": "",
-		}
-	`);
-	});
-
-	it("shouldn't delete a service when doing a --dry-run", async () => {
-		await runWrangler("delete --name xyz --dry-run");
-
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "--dry-run: exiting now.",
-		  "warn": "",
-		}
-	`);
-	});
-
-	it('shouldn\'t delete when the user says "no"', async () => {
-		mockConfirm({
-			text: `Are you sure you want to delete xyz? This action cannot be undone.`,
-			result: false,
-		});
-
-		await runWrangler("delete --name xyz");
-
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "",
-		  "warn": "",
-		}
-	`);
-	});
-
-	it("should delete a site namespace associated with a worker", async () => {
-		const kvNamespaces = [
-			{
-				title: "__my-script-workers_sites_assets",
-				id: "id-for-my-script-site-ns",
-			},
-			// this one isn't associated with the worker
-			{
-				title: "__test-name-workers_sites_assets",
-				id: "id-for-another-site-ns",
-			},
-		];
-
-		mockConfirm({
-			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
-			result: true,
-		});
-		mockListKVNamespacesRequest(...kvNamespaces);
-		// it should only try to delete the site namespace associated with this worker
-		msw.use(
-			rest.delete(
-				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
-				(req, res, ctx) => {
-					expect(req.params.accountId).toEqual("some-account-id");
-					return res.once(
-						ctx.status(200),
-						ctx.json({ success: true, errors: [], messages: [], result: null })
-					);
-				}
-			)
-		);
-
-		mockDeleteWorkerRequest({ name: "my-script" });
-		await runWrangler("delete --name my-script");
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
-		Successfully deleted my-script",
-		  "warn": "",
-		}
-	`);
-	});
-
-	it("should delete a site namespace associated with a worker, including it's preview namespace", async () => {
-		// This is the same test as the previous one, but it includes a preview namespace
-		const kvNamespaces = [
-			{
-				title: "__my-script-workers_sites_assets",
-				id: "id-for-my-script-site-ns",
-			},
-			// this is the preview namespace
-			{
-				title: "__my-script-workers_sites_assets_preview",
-				id: "id-for-my-script-site-preview-ns",
-			},
-
-			// this one isn't associated with the worker
-			{
-				title: "__test-name-workers_sites_assets",
-				id: "id-for-another-site-ns",
-			},
-		];
-
-		mockConfirm({
-			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
-			result: true,
-		});
-		mockListKVNamespacesRequest(...kvNamespaces);
-		// it should only try to delete the site namespace associated with this worker
-
-		msw.use(
-			rest.delete(
-				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
-				(req, res, ctx) => {
-					expect(req.params.accountId).toEqual("some-account-id");
-					return res.once(
-						ctx.status(200),
-						ctx.json({
-							success: true,
-							errors: [],
-							messages: [],
-							result: {},
-						})
-					);
-				}
-			)
-		);
-
-		msw.use(
-			rest.delete(
-				"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
-				(req, res, ctx) => {
-					expect(req.params.accountId).toEqual("some-account-id");
-					return res.once(
-						ctx.status(200),
-						ctx.json({
-							success: true,
-							errors: [],
-							messages: [],
-							result: {},
-						})
-					);
-				}
-			)
-		);
-
-		mockDeleteWorkerRequest({ name: "my-script" });
-		await runWrangler("delete --name my-script");
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
-		🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets_preview\\"
-		Successfully deleted my-script",
-		  "warn": "",
-		}
-	`);
-	});
-});
-
-/** Create a mock handler for the request to upload a worker script. */
-function mockDeleteWorkerRequest(
-	options: {
-		name?: string;
-		env?: string;
-		legacyEnv?: boolean;
-	} = {}
-) {
-	const { env, legacyEnv, name } = options;
-	msw.use(
-		rest.delete(
-			"*/accounts/:accountId/workers/services/:scriptName",
-			(req, res, ctx) => {
-				expect(req.params.accountId).toEqual("some-account-id");
-				expect(req.params.scriptName).toEqual(
-					legacyEnv && env
-						? `${name ?? "test-name"}-${env}`
-						: `${name ?? "test-name"}`
-				);
-
-				expect(req.url.searchParams.get("force")).toEqual("true");
-
-				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: null,
-					})
-				);
-			}
-		)
-	);
-}
-
-/** Create a mock handler for the request to get a list of all KV namespaces. */
-function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
-	msw.use(
-		rest.get("*/accounts/:accountId/storage/kv/namespaces", (req, res, ctx) => {
-			expect(req.params.accountId).toEqual("some-account-id");
-			return res.once(
-				ctx.status(200),
-				ctx.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: namespaces,
-				})
-			);
-		})
-	);
-}