wrangler 2.2.3 → 2.2.4

package/package.json

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

package/src/__tests__/deployments.test.ts

@@ -57,15 +57,15 @@ describe("deployments", () => {
 		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
 
-		Deployment ID: Intrepid-Class
-		Created on: 2021-02-02T00:00:00.000000Z
-		Author: Kathryn-Janeway@federation.org
-		Source: Wrangler
-
 		Deployment ID: Galaxy-Class
 		Created on: 2021-01-01T00:00:00.000000Z
 		Author: Jean-Luc-Picard@federation.org
 		Source: Wrangler
+
+		Deployment ID: Intrepid-Class
+		Created on: 2021-02-02T00:00:00.000000Z
+		Author: Kathryn-Janeway@federation.org
+		Source: Wrangler
 		🟩 Active"
 	`);
 	});
@@ -76,15 +76,15 @@ describe("deployments", () => {
 		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
 
-		Deployment ID: Intrepid-Class
-		Created on: 2021-02-02T00:00:00.000000Z
-		Author: Kathryn-Janeway@federation.org
-		Source: Wrangler
-
 		Deployment ID: Galaxy-Class
 		Created on: 2021-01-01T00:00:00.000000Z
 		Author: Jean-Luc-Picard@federation.org
 		Source: Wrangler
+
+		Deployment ID: Intrepid-Class
+		Created on: 2021-02-02T00:00:00.000000Z
+		Author: Kathryn-Janeway@federation.org
+		Source: Wrangler
 		🟩 Active"
 	`);
 	});

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

@@ -4,7 +4,7 @@ import type { DeploymentListRes } from "../../../../deployments";
 
 export const mswSuccessDeployments = [
 	rest.get(
-		"*/accounts/:accountId/workers/versions/by-script/:scriptTag",
+		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 		(_, response, context) =>
 			response.once(
 				context.status(200),

package/src/__tests__/publish.test.ts

@@ -65,7 +65,7 @@ describe("publish", () => {
 			})
 		);
 		setMockResponse(
-			"/accounts/:accountId/workers/versions/by-script/:scriptTag",
+			"/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 			() => ({
 				latest: { number: "2" },
 			})
@@ -4363,7 +4363,7 @@ addEventListener('fetch', event => {});`
 					},
 				});
 				setMockResponse(
-					"/accounts/:accountId/workers/versions/by-script/:scriptTag",
+					"/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 					() => ({
 						latest: { number: "2" },
 					})
@@ -6861,7 +6861,7 @@ addEventListener('fetch', event => {});`
 		mockSubDomainRequest();
 		mockUploadWorkerRequest();
 		setMockResponse(
-			"/accounts/:accountId/workers/versions/by-script/:scriptTag",
+			"/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 			() => ({
 				latest: { number: "2" },
 			})
@@ -6907,7 +6907,7 @@ addEventListener('fetch', event => {});`
 			}
 		);
 		setMockResponse(
-			"/accounts/:accountId/workers/versions/by-script/:scriptTag",
+			"/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 			() => ({
 				latest: { number: "2" },
 			})

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

@@ -4,11 +4,8 @@ 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"];
-} = {
+const bindingsConfigMock: Partial<Config> = {
 	kv_namespaces: [{ binding: "TEST_KV_NAMESPACE", id: "1234" }],
 	vars: {
 		SOMETHING: "asdasdfasdf",
@@ -19,6 +16,22 @@ const bindingsConfigMock: CfWorkerInit["bindings"] & {
 			captian: "Picard",
 		}, // We can assume the objects will be stringified
 	},
+	queues: {
+		producers: [
+			{
+				binding: "TEST_QUEUE_BINDING",
+				queue: "TEST_QUEUE",
+			},
+		],
+		consumers: [
+			{
+				queue: "my-queue",
+				max_batch_size: 10,
+				max_batch_timeout: 1,
+				max_retries: 3,
+			},
+		],
+	},
 	durable_objects: {
 		bindings: [
 			{ name: "DURABLE_TEST1", class_name: "Durability1" },
@@ -33,7 +46,6 @@ const bindingsConfigMock: CfWorkerInit["bindings"] & {
 	],
 	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",
@@ -56,12 +68,9 @@ const bindingsConfigMock: CfWorkerInit["bindings"] & {
 		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" }],
-		},
-	],
+	unsafe: {
+		bindings: [{ name: "testing_unsafe", type: "plain_text" }],
+	},
 	rules: [
 		{
 			type: "Text",
@@ -89,10 +98,9 @@ describe("generateTypes()", () => {
 				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) ?? {},
-			}),
+				...bindingsConfigMock,
+				unsafe: bindingsConfigMock.unsafe ?? {},
+			} as unknown as TOML.JsonMap),
 			"utf-8"
 		);
 
@@ -115,6 +123,7 @@ describe("generateTypes()", () => {
 			SOME_TEXT_BLOB1: string;
 			SOME_TEXT_BLOB2: string;
 			testing_unsafe: any;
+			TEST_QUEUE_BINDING: Queue;
 		}
 		declare module \\"*.txt\\" {
 			const value: string;
@@ -139,9 +148,9 @@ describe("generateTypes()", () => {
 				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,
-			}),
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			} as any),
 			"utf-8"
 		);
 		await runWrangler("types");
@@ -159,6 +168,7 @@ describe("generateTypes()", () => {
 			}),
 			"utf-8"
 		);
+
 		await runWrangler("types");
 		expect(fs.existsSync("./worker-configuration.d.ts")).toBe(false);
 		expect(std.out).toMatchInlineSnapshot(`""`);
@@ -176,9 +186,8 @@ describe("generateTypes()", () => {
 				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,
-			}),
+			} as TOML.JsonMap),
 			"utf-8"
 		);
 
@@ -200,9 +209,8 @@ describe("generateTypes()", () => {
 				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) ?? {},
-			}),
+				unsafe: bindingsConfigMock.unsafe ?? {},
+			} as TOML.JsonMap),
 			"utf-8"
 		);
 

package/src/deployments.ts

@@ -1,3 +1,4 @@
+import { URLSearchParams } from "url";
 import { fetchResult } from "./cfetch";
 import { logger } from "./logger";
 import type { ServiceMetadataRes } from "./init";
@@ -40,8 +41,11 @@ export async function deployments(
 	);
 
 	const scriptTag = scriptMetadata.default_environment.script.tag;
+	const params = new URLSearchParams({ order: "asc" });
 	const { items: deploys } = await fetchResult<DeploymentListRes>(
-		`/accounts/${accountId}/workers/versions/by-script/${scriptTag}`
+		`/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`,
+		undefined,
+		params
 	);
 
 	const versionMessages = deploys.map(
@@ -52,8 +56,8 @@ Author: ${versions.metadata.author_email}
 Source: ${sourceStr(versions.metadata.source)}\n`
 	);
 
-	versionMessages[0] += "🟩 Active";
-	logger.log(...versionMessages.reverse());
+	versionMessages[versionMessages.length - 1] += "🟩 Active";
+	logger.log(...versionMessages);
 }
 
 // TODO Include emoji/icon for each source

package/src/index.tsx

@@ -50,7 +50,6 @@ import {
 import { whoami } from "./whoami";
 
 import type { Config } from "./config";
-import type { PartialConfigToDTS } from "./type-generation";
 import type { CommonYargsOptions } from "./yargs-types";
 import type { ArgumentsCamelCase } from "yargs";
 import type Yargs from "yargs";
@@ -527,7 +526,7 @@ export function createCLIParser(argv: string[]) {
 			await printWranglerBanner();
 			const config = readConfig(undefined, {});
 
-			const configBindings: PartialConfigToDTS = {
+			const configBindings: Partial<Config> = {
 				kv_namespaces: config.kv_namespaces ?? [],
 				vars: { ...config.vars },
 				wasm_modules: config.wasm_modules,
@@ -537,13 +536,13 @@ export function createCLIParser(argv: string[]) {
 				data_blobs: config.data_blobs,
 				durable_objects: config.durable_objects,
 				r2_buckets: config.r2_buckets,
-				// @ts-expect-error - We don't want the type generated to inlcude the Beta prefix
 				d1_databases: config.d1_databases,
 				services: config.services,
 				dispatch_namespaces: config.dispatch_namespaces,
 				logfwdr: config.logfwdr,
-				unsafe: config.unsafe?.bindings,
+				unsafe: { bindings: config.unsafe?.bindings },
 				rules: config.rules,
+				queues: config.queues,
 			};
 
 			await generateTypes(configBindings, config);

package/src/publish/publish.ts

@@ -821,13 +821,13 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 
 	try {
 		const deploymentsList = await fetchResult<DeploymentListRes>(
-			`/accounts/${accountId}/workers/versions/by-script/${scriptTag}`
+			`/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`
 		);
 
 		logger.log("Current Deployment ID:", deploymentsList.latest.id);
 	} catch (e) {
 		if ((e as { code: number }).code === 10023) {
-			// TODO: remove this try/catch once versions is completely rolled out
+			// TODO: remove this try/catch once deployments is completely rolled out
 		} else {
 			throw e;
 		}

package/src/type-generation.ts

@@ -3,14 +3,11 @@ import { findUpSync } from "find-up";
 import { getEntry } from "./entry";
 import { logger } from "./logger";
 import type { Config } from "./config";
-import type { CfWorkerInit } from "./worker";
 
 // Currently includes bindings & rules for declaring modules
-export type PartialConfigToDTS = CfWorkerInit["bindings"] & {
-	rules: Config["rules"];
-};
+
 export async function generateTypes(
-	configToDTS: PartialConfigToDTS,
+	configToDTS: Partial<Config>,
 	config: Config
 ) {
 	const entry = await getEntry({}, config, "types");
@@ -85,11 +82,19 @@ export async function generateTypes(
 	}
 
 	if (configToDTS.unsafe) {
-		for (const unsafe of configToDTS.unsafe) {
+		for (const unsafe of configToDTS.unsafe.bindings) {
 			envTypeStructure.push(`	${unsafe.name}: any;`);
 		}
 	}
 
+	if (configToDTS.queues) {
+		if (configToDTS.queues.producers) {
+			for (const queue of configToDTS.queues.producers) {
+				envTypeStructure.push(`	${queue.binding}: Queue;`);
+			}
+		}
+	}
+
 	const modulesTypeStructure: string[] = [];
 	if (configToDTS.rules) {
 		const moduleTypeMap = {
@@ -113,47 +118,56 @@ export async function generateTypes(
 		}
 	}
 
-	function writeDTSFile(
-		typesString: string[],
-		formatType: "modules" | "service-worker"
-	) {
-		const wranglerOverrideDTSPath = findUpSync("worker-configuration.d.ts");
-		try {
-			if (
-				wranglerOverrideDTSPath !== undefined &&
-				!fs
-					.readFileSync(wranglerOverrideDTSPath, "utf8")
-					.includes("***AUTO GENERATED BY WORKERS CLI WRANGLER***")
-			) {
-				throw new Error(
-					"A non-wrangler worker-configuration.d.ts already exists, please rename and try again."
-				);
-			}
-		} catch (error) {
-			if (error instanceof Error && !error.message.includes("not found")) {
-				throw error;
-			}
-		}
-
-		let combinedTypeStrings = "";
-		if (formatType === "modules") {
-			combinedTypeStrings = `interface Env {\n${typesString.join(
-				"\n"
-			)} \n}\n${modulesTypeStructure.join("\n")}`;
-		} else {
-			combinedTypeStrings = `declare global {\n${typesString.join(
-				"\n"
-			)} \n}\n${modulesTypeStructure.join("\n")}`;
-		}
+	writeDTSFile({
+		envTypeStructure,
+		modulesTypeStructure,
+		formatType: entry.format,
+	});
+}
 
-		if (envTypeStructure.length || modulesTypeStructure.length) {
-			fs.writeFileSync(
-				"worker-configuration.d.ts",
-				`// Generated by Wrangler on ${new Date()}` + "\n" + combinedTypeStrings
+function writeDTSFile({
+	envTypeStructure,
+	modulesTypeStructure,
+	formatType,
+}: {
+	envTypeStructure: string[];
+	modulesTypeStructure: string[];
+	formatType: "modules" | "service-worker";
+}) {
+	const wranglerOverrideDTSPath = findUpSync("worker-configuration.d.ts");
+	try {
+		if (
+			wranglerOverrideDTSPath !== undefined &&
+			!fs
+				.readFileSync(wranglerOverrideDTSPath, "utf8")
+				.includes("Generated by Wrangler")
+		) {
+			throw new Error(
+				"A non-wrangler worker-configuration.d.ts already exists, please rename and try again."
 			);
-			logger.log(combinedTypeStrings);
 		}
+	} catch (error) {
+		if (error instanceof Error && !error.message.includes("not found")) {
+			throw error;
+		}
+	}
+
+	let combinedTypeStrings = "";
+	if (formatType === "modules") {
+		combinedTypeStrings += `interface Env {\n${envTypeStructure.join(
+			"\n"
+		)} \n}\n${modulesTypeStructure.join("\n")}`;
+	} else {
+		combinedTypeStrings += `declare global {\n${envTypeStructure.join(
+			"\n"
+		)} \n}\n${modulesTypeStructure.join("\n")}`;
 	}
 
-	writeDTSFile(envTypeStructure, entry.format);
+	if (envTypeStructure.length || modulesTypeStructure.length) {
+		fs.writeFileSync(
+			"worker-configuration.d.ts",
+			`// Generated by Wrangler on ${new Date()}` + "\n" + combinedTypeStrings
+		);
+		logger.log(combinedTypeStrings);
+	}
 }

package/wrangler-dist/cli.js

@@ -141159,7 +141159,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.2.3";
+var version = "2.2.4";
 var package_default = {
   name: "wrangler",
   version,
@@ -147432,7 +147432,7 @@ async function getMetricsDispatcher(options6) {
     }
   };
   async function dispatch(event) {
-    if (false) {
+    if (!SPARROW_SOURCE_KEY) {
       logger.debug(
         "Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events.",
         event
@@ -147465,7 +147465,7 @@ async function getMetricsDispatcher(options6) {
       headers: {
         Accept: "*/*",
         "Content-Type": "application/json",
-        "Sparrow-Source-Key": "50598e014ed44c739ec8074fdc16057c"
+        "Sparrow-Source-Key": SPARROW_SOURCE_KEY
       },
       mode: "cors",
       keepalive: true,
@@ -154566,13 +154566,17 @@ async function deleteSiteNamespaceIfExisting(scriptName, accountId) {
 
 // src/deployments.ts
 init_import_meta_url();
+var import_url2 = require("url");
 async function deployments(accountId, scriptName) {
   const scriptMetadata = await fetchResult(
     `/accounts/${accountId}/workers/services/${scriptName}`
   );
   const scriptTag = scriptMetadata.default_environment.script.tag;
+  const params = new import_url2.URLSearchParams({ order: "asc" });
   const { items: deploys } = await fetchResult(
-    `/accounts/${accountId}/workers/versions/by-script/${scriptTag}`
+    `/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`,
+    void 0,
+    params
   );
   const versionMessages = deploys.map(
     (versions) => `
@@ -154582,8 +154586,8 @@ Author: ${versions.metadata.author_email}
 Source: ${sourceStr(versions.metadata.source)}
 `
   );
-  versionMessages[0] += "\u{1F7E9} Active";
-  logger.log(...versionMessages.reverse());
+  versionMessages[versionMessages.length - 1] += "\u{1F7E9} Active";
+  logger.log(...versionMessages);
 }
 function sourceStr(source) {
   switch (source) {
@@ -160177,7 +160181,7 @@ ${dashLink}`);
   }
   try {
     const deploymentsList = await fetchResult(
-      `/accounts/${accountId}/workers/versions/by-script/${scriptTag}`
+      `/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`
     );
     logger.log("Current Deployment ID:", deploymentsList.latest.id);
   } catch (e2) {
@@ -162273,10 +162277,17 @@ async function generateTypes(configToDTS, config) {
     }
   }
   if (configToDTS.unsafe) {
-    for (const unsafe of configToDTS.unsafe) {
+    for (const unsafe of configToDTS.unsafe.bindings) {
       envTypeStructure.push(`	${unsafe.name}: any;`);
     }
   }
+  if (configToDTS.queues) {
+    if (configToDTS.queues.producers) {
+      for (const queue of configToDTS.queues.producers) {
+        envTypeStructure.push(`	${queue.binding}: Queue;`);
+      }
+    }
+  }
   const modulesTypeStructure = [];
   if (configToDTS.rules) {
     const moduleTypeMap = {
@@ -162296,45 +162307,53 @@ async function generateTypes(configToDTS, config) {
       }
     }
   }
-  function writeDTSFile(typesString, formatType) {
-    const wranglerOverrideDTSPath = findUpSync("worker-configuration.d.ts");
-    try {
-      if (wranglerOverrideDTSPath !== void 0 && !fs15.readFileSync(wranglerOverrideDTSPath, "utf8").includes("***AUTO GENERATED BY WORKERS CLI WRANGLER***")) {
-        throw new Error(
-          "A non-wrangler worker-configuration.d.ts already exists, please rename and try again."
-        );
-      }
-    } catch (error) {
-      if (error instanceof Error && !error.message.includes("not found")) {
-        throw error;
-      }
+  writeDTSFile({
+    envTypeStructure,
+    modulesTypeStructure,
+    formatType: entry.format
+  });
+}
+function writeDTSFile({
+  envTypeStructure,
+  modulesTypeStructure,
+  formatType
+}) {
+  const wranglerOverrideDTSPath = findUpSync("worker-configuration.d.ts");
+  try {
+    if (wranglerOverrideDTSPath !== void 0 && !fs15.readFileSync(wranglerOverrideDTSPath, "utf8").includes("Generated by Wrangler")) {
+      throw new Error(
+        "A non-wrangler worker-configuration.d.ts already exists, please rename and try again."
+      );
     }
-    let combinedTypeStrings = "";
-    if (formatType === "modules") {
-      combinedTypeStrings = `interface Env {
-${typesString.join(
-        "\n"
-      )} 
+  } catch (error) {
+    if (error instanceof Error && !error.message.includes("not found")) {
+      throw error;
+    }
+  }
+  let combinedTypeStrings = "";
+  if (formatType === "modules") {
+    combinedTypeStrings += `interface Env {
+${envTypeStructure.join(
+      "\n"
+    )} 
 }
 ${modulesTypeStructure.join("\n")}`;
-    } else {
-      combinedTypeStrings = `declare global {
-${typesString.join(
-        "\n"
-      )} 
+  } else {
+    combinedTypeStrings += `declare global {
+${envTypeStructure.join(
+      "\n"
+    )} 
 }
 ${modulesTypeStructure.join("\n")}`;
-    }
-    if (envTypeStructure.length || modulesTypeStructure.length) {
-      fs15.writeFileSync(
-        "worker-configuration.d.ts",
-        `// Generated by Wrangler on ${new Date()}
+  }
+  if (envTypeStructure.length || modulesTypeStructure.length) {
+    fs15.writeFileSync(
+      "worker-configuration.d.ts",
+      `// Generated by Wrangler on ${new Date()}
 ` + combinedTypeStrings
-      );
-      logger.log(combinedTypeStrings);
-    }
+    );
+    logger.log(combinedTypeStrings);
   }
-  writeDTSFile(envTypeStructure, entry.format);
 }
 
 // src/update-check.ts
@@ -162772,8 +162791,9 @@ function createCLIParser(argv) {
         services: config.services,
         dispatch_namespaces: config.dispatch_namespaces,
         logfwdr: config.logfwdr,
-        unsafe: config.unsafe?.bindings,
-        rules: config.rules
+        unsafe: { bindings: config.unsafe?.bindings },
+        rules: config.rules,
+        queues: config.queues
       };
       await generateTypes(configBindings, config);
     }