wrangler 2.1.13 → 2.1.14

package/README.md

@@ -82,7 +82,3 @@ For more commands and options, refer to the [documentation](https://developers.c
 ## Documentation
 
 For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/).
-
-```
-
-```

package/miniflare-dist/index.mjs

@@ -746,10 +746,11 @@ import {
   DurableObjectStub
 } from "@miniflare/durable-objects";
 import {
-  Log,
+  Log as MiniflareLog,
+  LogLevel as MiniflareLogLevel,
   Miniflare,
-  Response as MiniflareResponse3,
-  Request as MiniflareRequest3
+  Request as MiniflareRequest3,
+  Response as MiniflareResponse3
 } from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
@@ -6145,7 +6146,7 @@ var getRequestContextCheckOptions = async () => {
 };
 
 // src/miniflare-cli/index.ts
-var NoOpLog = class extends Log {
+var MiniflareNoOpLog = class extends MiniflareLog {
   log() {
   }
   error(message) {
@@ -6159,9 +6160,12 @@ async function main() {
     ...JSON.parse(args._[0] ?? "{}"),
     ...requestContextCheckOptions
   };
-  const logLevel = config.logLevel.toUpperCase();
-  config.log = config.logLevel === "none" ? new NoOpLog() : new Log(logLevel, config.logOptions);
-  if (logLevel === "DEBUG" || logLevel === "VERBOSE") {
+  let logLevelString = config.logLevel.toUpperCase();
+  if (logLevelString === "LOG")
+    logLevelString = "INFO";
+  const logLevel = MiniflareLogLevel[logLevelString];
+  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel, config.logOptions);
+  if (logLevel === MiniflareLogLevel.DEBUG) {
     console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
   }
   config.bindings = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.1.13",
+	"version": "2.1.14",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/__tests__/delete.test.ts

@@ -5,6 +5,7 @@ import { mockConfirm } from "./helpers/mock-dialogs";
 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();
@@ -22,6 +23,7 @@ describe("delete", () => {
 			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");
 
@@ -41,6 +43,7 @@ describe("delete", () => {
 			result: true,
 		});
 		writeWranglerToml();
+		mockListKVNamespacesRequest();
 		mockDeleteWorkerRequest();
 		await runWrangler("delete");
 
@@ -84,6 +87,105 @@ describe("delete", () => {
 		}
 	`);
 	});
+
+	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
+		setMockResponse(
+			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
+			"DELETE",
+			([_url, accountId]) => {
+				expect(accountId).toEqual("some-account-id");
+				return 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
+
+		setMockResponse(
+			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
+			"DELETE",
+			([_url, accountId]) => {
+				expect(accountId).toEqual("some-account-id");
+				return null;
+			}
+		);
+
+		setMockResponse(
+			"/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
+			"DELETE",
+			([_url, accountId]) => {
+				expect(accountId).toEqual("some-account-id");
+				return 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\\"
+		🌀 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. */
@@ -114,3 +216,15 @@ function mockDeleteWorkerRequest(
 		}
 	);
 }
+
+/** Create a mock handler for the request to get a list of all KV namespaces. */
+function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
+	setMockResponse(
+		"/accounts/:accountId/storage/kv/namespaces",
+		"GET",
+		([_url, accountId]) => {
+			expect(accountId).toEqual("some-account-id");
+			return namespaces;
+		}
+	);
+}

package/src/__tests__/deployments.test.ts

@@ -0,0 +1,91 @@
+// import * as fs from "fs";
+// import * as TOML from "@iarna/toml";
+import { rest } from "msw";
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import {
+	msw,
+	mswSuccessOauthHandlers,
+	mswSuccessUserHandlers,
+} from "./helpers/msw";
+import { mswSuccessDeployments } from "./helpers/msw";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("deployments", () => {
+	const std = mockConsoleMethods();
+	runInTempDir();
+	mockAccountId();
+	mockApiToken();
+	runInTempDir();
+
+	beforeEach(() => {
+		msw.use(
+			...mswSuccessDeployments,
+			...mswSuccessOauthHandlers,
+			...mswSuccessUserHandlers,
+			rest.get(
+				"*/accounts/:accountId/workers/services/:scriptName",
+				(request, response, context) => {
+					expect(["undefined", "somethingElse"]).toContain(
+						request.params.scriptName
+					);
+
+					return response.once(
+						context.status(200),
+						context.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: {
+								default_environment: {
+									script: {
+										tag: "MOCK-TAG",
+									},
+								},
+							},
+						})
+					);
+				}
+			)
+		);
+	});
+
+	it("should log deployments", async () => {
+		await runWrangler("deployments");
+		expect(std.out).toMatchInlineSnapshot(`
+		"
+		Version ID: Galaxy-Class
+		Version number: 1701-E
+		Created on: 2021-01-01T00:00:00.000000Z
+		Author email: Jean-Luc-Picard@federation.org
+		Latest deploy: true
+
+		Version ID: Intrepid-Class
+		Version number: NCC-74656
+		Created on: 2021-02-02T00:00:00.000000Z
+		Author email: Kathryn-Janeway@federation.org
+		Latest deploy: false
+		"
+	`);
+	});
+
+	it("should log deployments for script with passed in name option", async () => {
+		await runWrangler("deployments --name somethingElse");
+		expect(std.out).toMatchInlineSnapshot(`
+		"
+		Version ID: Galaxy-Class
+		Version number: 1701-E
+		Created on: 2021-01-01T00:00:00.000000Z
+		Author email: Jean-Luc-Picard@federation.org
+		Latest deploy: true
+
+		Version ID: Intrepid-Class
+		Version number: NCC-74656
+		Created on: 2021-02-02T00:00:00.000000Z
+		Author email: Kathryn-Janeway@federation.org
+		Latest deploy: false
+		"
+	`);
+	});
+});

package/src/__tests__/helpers/msw/handlers/deployments.ts

@@ -0,0 +1,80 @@
+import { rest } from "msw";
+
+export type DeploymentListRes = {
+	versions: {
+		version_id: string;
+		version_number: string;
+		metadata: {
+			author_id: string;
+			author_email: string;
+			source: "api" | "dash" | "wrangler" | "terraform" | "other";
+			created_on: string;
+			modified_on: string;
+		};
+		preview: {
+			active: boolean;
+			url: string;
+		};
+		resources: {
+			script: string;
+			bindings: unknown[];
+		};
+	}[];
+};
+
+export const mswSuccessDeployments = [
+	rest.get(
+		"*/accounts/:accountId/workers/versions/by-script/:scriptTag",
+		(_, response, context) =>
+			response.once(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: {
+						versions: [
+							{
+								version_id: "Galaxy-Class",
+								version_number: "1701-E",
+								metadata: {
+									author_id: "Picard-Gamma-6-0-7-3",
+									author_email: "Jean-Luc-Picard@federation.org",
+									source: "wrangler",
+									created_on: "2021-01-01T00:00:00.000000Z",
+									modified_on: "2021-01-01T00:00:00.000000Z",
+								},
+								preview: {
+									active: true,
+									url: "https://example.com",
+								},
+								resources: {
+									script: "script.js",
+									bindings: [],
+								},
+							},
+							{
+								version_id: "Intrepid-Class",
+								version_number: "NCC-74656",
+								metadata: {
+									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
+									author_email: "Kathryn-Janeway@federation.org",
+									source: "wrangler",
+									created_on: "2021-02-02T00:00:00.000000Z",
+									modified_on: "2021-02-02T00:00:00.000000Z",
+								},
+								preview: {
+									active: true,
+									url: "https://example.com",
+								},
+								resources: {
+									script: "script.js",
+									bindings: [],
+								},
+							},
+						],
+					},
+				})
+			)
+	),
+];

package/src/__tests__/helpers/msw/index.ts

@@ -1,8 +1,9 @@
 import { setupServer } from "msw/node";
+import { mswSuccessDeployments } from "./handlers/deployments";
 import { mswSuccessNamespacesHandlers } from "./handlers/namespaces";
 import { mswSuccessOauthHandlers } from "./handlers/oauth";
 import { mswSuccessR2handlers } from "./handlers/r2";
-import { default as mswScriptHandlers } from "./handlers/script";
+import { default as mswSucessScriptHandlers } from "./handlers/script";
 import { mswSuccessUserHandlers } from "./handlers/user";
 export const msw = setupServer();
 
@@ -11,5 +12,6 @@ export {
 	mswSuccessR2handlers,
 	mswSuccessOauthHandlers,
 	mswSuccessNamespacesHandlers,
-	mswScriptHandlers,
+	mswSucessScriptHandlers,
+	mswSuccessDeployments,
 };

package/src/__tests__/index.test.ts

@@ -34,7 +34,7 @@ describe("wrangler", () => {
 			  wrangler init [name]         📥 Create a wrangler.toml configuration file
 			  wrangler dev [script]        👂 Start a local server for developing your worker
 			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
-			  wrangler delete [script]     🗑 Delete your Worker from Cloudflare.
+			  wrangler delete [script]     🗑  Delete your Worker from Cloudflare.
 			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
 			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
 			  wrangler secret:bulk <json>  🗄️  Bulk upload secrets for a Worker
@@ -49,6 +49,7 @@ describe("wrangler", () => {
 			  wrangler login               🔓 Login to Cloudflare
 			  wrangler logout              🚪 Logout from Cloudflare
 			  wrangler whoami              🕵️  Retrieve your user info and test your auth config
+			  wrangler types               📝 Generate types from bindings & module rules in config
 
 			Flags:
 			  -c, --config   Path to .toml configuration file  [string]
@@ -76,7 +77,7 @@ describe("wrangler", () => {
 			  wrangler init [name]         📥 Create a wrangler.toml configuration file
 			  wrangler dev [script]        👂 Start a local server for developing your worker
 			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
-			  wrangler delete [script]     🗑 Delete your Worker from Cloudflare.
+			  wrangler delete [script]     🗑  Delete your Worker from Cloudflare.
 			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
 			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
 			  wrangler secret:bulk <json>  🗄️  Bulk upload secrets for a Worker
@@ -91,6 +92,7 @@ describe("wrangler", () => {
 			  wrangler login               🔓 Login to Cloudflare
 			  wrangler logout              🚪 Logout from Cloudflare
 			  wrangler whoami              🕵️  Retrieve your user info and test your auth config
+			  wrangler types               📝 Generate types from bindings & module rules in config
 
 			Flags:
 			  -c, --config   Path to .toml configuration file  [string]

package/src/__tests__/init.test.ts

@@ -1306,7 +1306,7 @@ describe("init", () => {
 						contents: {
 							config: {
 								compilerOptions: expect.objectContaining({
-									types: ["@cloudflare/workers-types"],
+									types: ["@cloudflare/workers-types", "jest"],
 								}),
 							},
 							error: undefined,

package/src/__tests__/tail.test.ts

@@ -6,7 +6,7 @@ import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockGetZoneFromHostRequest } from "./helpers/mock-get-zone-from-host";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { mockCollectKnownRoutesRequest } from "./helpers/mock-known-routes";
-import { msw, mswScriptHandlers } from "./helpers/msw";
+import { msw, mswSucessScriptHandlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type {
@@ -18,7 +18,7 @@ import type {
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
 describe("tail", () => {
-	beforeEach(() => msw.use(...mswScriptHandlers));
+	beforeEach(() => msw.use(...mswSucessScriptHandlers));
 	runInTempDir();
 	mockAccountId();
 	mockApiToken();

package/src/__tests__/type-generation.test.ts

@@ -0,0 +1,217 @@
+import * as fs from "fs";
+import * as TOML from "@iarna/toml";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+import type { Config } from "../config";
+import type { CfWorkerInit } from "../worker";
+
+const bindingsConfigMock: CfWorkerInit["bindings"] & {
+	rules: Config["rules"];
+} = {
+	kv_namespaces: [{ binding: "TEST_KV_NAMESPACE", id: "1234" }],
+	vars: {
+		SOMETHING: "asdasdfasdf",
+		ANOTHER: "thing",
+		OBJECT_VAR: {
+			enterprise: "1701-D",
+			activeDuty: true,
+			captian: "Picard",
+		}, // We can assume the objects will be stringified
+	},
+	durable_objects: {
+		bindings: [
+			{ name: "DURABLE_TEST1", class_name: "Durability1" },
+			{ name: "DURABLE_TEST2", class_name: "Durability2" },
+		],
+	},
+	r2_buckets: [
+		{
+			binding: "R2_BUCKET_BINDING",
+			bucket_name: "R2BUCKET_NAME_TEST",
+		},
+	],
+	d1_databases: [
+		{
+			// @ts-expect-error This type is resolved in the function that handles creating BETA string
+			binding: "D1_TESTING_SOMETHING",
+			database_name: "D1_BINDING",
+			database_id: "1234",
+		},
+	],
+	services: [{ binding: "SERVICE_BINDING", service: "SERVICE_NAME" }],
+	dispatch_namespaces: [
+		{ binding: "NAMESPACE_BINDING", namespace: "NAMESPACE_ID" },
+	],
+	logfwdr: {
+		schema: "LOGFWDER_SCHEMA",
+		bindings: [{ name: "LOGFWDR_BINDING", destination: "LOGFWDR_DESTINATION" }],
+	},
+	data_blobs: {
+		SOME_DATA_BLOB1: "SOME_DATA_BLOB1.bin",
+		SOME_DATA_BLOB2: "SOME_DATA_BLOB2.bin",
+	},
+	text_blobs: {
+		SOME_TEXT_BLOB1: "SOME_TEXT_BLOB1.txt",
+		SOME_TEXT_BLOB2: "SOME_TEXT_BLOB2.txt",
+	},
+	wasm_modules: { MODULE1: "module1.wasm", MODULE2: "module2.wasm" },
+	unsafe: [
+		{
+			// @ts-expect-error Unsafe bindings type is somewhat different in different places
+			bindings: [{ name: "testing_unsafe", type: "plain_text" }],
+		},
+	],
+	rules: [
+		{
+			type: "Text",
+			globs: ["**/*.txt"],
+			fallthrough: true,
+		},
+		{
+			type: "Data",
+			globs: ["**/*.webp"],
+			fallthrough: true,
+		},
+		{ type: "CompiledWasm", globs: ["**/*.wasm"], fallthrough: true },
+	],
+};
+
+describe("generateTypes()", () => {
+	const std = mockConsoleMethods();
+	runInTempDir();
+
+	it("should log the interface type generated and declare modules", async () => {
+		fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
+		fs.writeFileSync(
+			"./wrangler.toml",
+			TOML.stringify({
+				compatibility_date: "2022-01-12",
+				name: "test-name",
+				main: "./index.ts",
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				...(bindingsConfigMock as any),
+				unsafe: bindingsConfigMock.unsafe?.at(0) ?? {},
+			}),
+			"utf-8"
+		);
+
+		await runWrangler("types");
+		expect(std.out).toMatchInlineSnapshot(`
+		"interface Env {
+			TEST_KV_NAMESPACE: KVNamespace;
+			SOMETHING: asdasdfasdf;
+			ANOTHER: thing;
+			OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
+			DURABLE_TEST1: DurableObjectNamespace;
+			DURABLE_TEST2: DurableObjectNamespace;
+			R2_BUCKET_BINDING: R2Bucket;
+			D1_TESTING_SOMETHING: D1Database;
+			SERVICE_BINDING: Fetcher;
+			NAMESPACE_BINDING: any;
+			LOGFWDR_SCHEMA: any;
+			SOME_DATA_BLOB1: ArrayBuffer;
+			SOME_DATA_BLOB2: ArrayBuffer;
+			SOME_TEXT_BLOB1: string;
+			SOME_TEXT_BLOB2: string;
+			testing_unsafe: any;
+		}
+		declare module \\"*.txt\\" {
+			const value: string;
+			export default value;
+		}
+		declare module \\"*.webp\\" {
+			const value: ArrayBuffer;
+			export default value;
+		}
+		declare module \\"*.wasm\\" {
+			const value: WebAssembly.Module;
+			export default value;
+		}"
+	`);
+	});
+
+	it("should create a DTS file at the location that the command is executed from", async () => {
+		fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
+		fs.writeFileSync(
+			"./wrangler.toml",
+			TOML.stringify({
+				compatibility_date: "2022-01-12",
+				name: "test-name",
+				main: "./index.ts",
+				// @ts-expect-error This type is out of sync with the actual bindingsConfig type
+				vars: bindingsConfigMock.vars,
+			}),
+			"utf-8"
+		);
+		await runWrangler("types");
+		expect(fs.existsSync("./worker-configuration.d.ts")).toBe(true);
+	});
+
+	it("should not create DTS file if there is nothing in the config to generate types from", async () => {
+		fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
+		fs.writeFileSync(
+			"./wrangler.toml",
+			TOML.stringify({
+				compatibility_date: "2022-01-12",
+				name: "test-name",
+				main: "./index.ts",
+			}),
+			"utf-8"
+		);
+		await runWrangler("types");
+		expect(fs.existsSync("./worker-configuration.d.ts")).toBe(false);
+		expect(std.out).toMatchInlineSnapshot(`""`);
+	});
+
+	it("should create a DTS file at the location that the command is executed from", async () => {
+		fs.writeFileSync(
+			"./worker-configuration.d.ts",
+			"NOT THE CONTENTS OF THE GENERATED FILE"
+		);
+		fs.writeFileSync("./index.ts", "export default { async fetch () {} };");
+		fs.writeFileSync(
+			"./wrangler.toml",
+			TOML.stringify({
+				compatibility_date: "2022-01-12",
+				name: "test-name",
+				main: "./index.ts",
+				// @ts-expect-error This type is out of sync with the actual bindingsConfig type
+				vars: bindingsConfigMock.vars,
+			}),
+			"utf-8"
+		);
+
+		await expect(runWrangler("types")).rejects.toMatchInlineSnapshot(
+			`[Error: A non-wrangler worker-configuration.d.ts already exists, please rename and try again.]`
+		);
+		expect(fs.existsSync("./worker-configuration.d.ts")).toBe(true);
+	});
+
+	it("should log the declare global type generated and declare modules", async () => {
+		fs.writeFileSync(
+			"./index.ts",
+			`addEventListener('fetch', event => {  event.respondWith(handleRequest(event.request));
+		}); async function handleRequest(request) {  return new Response('Hello worker!', {headers: { 'content-type': 'text/plain' },});}`
+		);
+		fs.writeFileSync(
+			"./wrangler.toml",
+			TOML.stringify({
+				compatibility_date: "2022-01-12",
+				name: "test-name",
+				main: "./index.ts",
+				// @ts-expect-error This type is out of sync with the actual bindingsConfig type
+				unsafe: bindingsConfigMock.unsafe?.at(0) ?? {},
+			}),
+			"utf-8"
+		);
+
+		await runWrangler("types");
+		expect(std.out).toMatchInlineSnapshot(`
+		"declare global {
+			testing_unsafe: any;
+		}
+		"
+	`);
+	});
+});