wrangler 0.0.0-e6e1daba → 0.0.0-e7cf0caa

package/src/__tests__/pubsub.test.ts

@@ -25,6 +25,7 @@ describe("wrangler", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "wrangler pubsub
 
 			📮 Interact and manage Pub/Sub Brokers
@@ -55,6 +56,7 @@ describe("wrangler", () => {
 				Object {
 				  "debug": "",
 				  "err": "",
+				  "info": "",
 				  "out": "wrangler pubsub namespace
 
 				Manage your Pub/Sub Namespaces
@@ -171,6 +173,7 @@ describe("wrangler", () => {
 				Object {
 				  "debug": "",
 				  "err": "",
+				  "info": "",
 				  "out": "wrangler pubsub broker
 
 				Interact with your Pub/Sub Brokers

package/src/__tests__/queues.test.ts

@@ -351,7 +351,8 @@ describe("wrangler", () => {
 				      --batch-size         Maximum number of messages per batch  [number]
 				      --batch-timeout      Maximum number of seconds to wait to fill a batch with messages  [number]
 				      --message-retries    Maximum number of retries for each message  [number]
-				      --dead-letter-queue  Queue to send messages that failed to be consumed  [string]"
+				      --dead-letter-queue  Queue to send messages that failed to be consumed  [string]
+				      --max-concurrency    The maximum number of concurrent consumer Worker invocations. Must be a positive integer  [number]"
 			`);
 				});
 
@@ -363,6 +364,7 @@ describe("wrangler", () => {
 							batch_size: undefined,
 							max_retries: undefined,
 							max_wait_time_ms: undefined,
+							max_concurrency: undefined,
 						},
 						dead_letter_queue: undefined,
 					};
@@ -382,13 +384,14 @@ describe("wrangler", () => {
 							batch_size: 20,
 							max_retries: 3,
 							max_wait_time_ms: 10 * 1000,
+							max_concurrency: 3,
 						},
 						dead_letter_queue: "myDLQ",
 					};
 					mockPostRequest("testQueue", expectedBody);
 
 					await runWrangler(
-						"queues consumer add testQueue testScript --env myEnv --batch-size 20 --batch-timeout 10 --message-retries 3 --dead-letter-queue myDLQ"
+						"queues consumer add testQueue testScript --env myEnv --batch-size 20 --batch-timeout 10 --message-retries 3 --max-concurrency 3 --dead-letter-queue myDLQ"
 					);
 					expect(std.out).toMatchInlineSnapshot(`
 						"Adding consumer to queue testQueue.

package/src/__tests__/test-old-node-version.js

@@ -1,4 +1,4 @@
-// this test has to be run with a version of node.js older than 16.13 to pass
+// this test has to be run with a version of Node.js older than 16.13 to pass
 
 const { spawn } = require("child_process");
 const path = require("path");
@@ -11,7 +11,7 @@ const wranglerProcess = spawn(
 	{ stdio: "pipe" }
 );
 
-const messageToMatch = "Wrangler requires at least node.js v16.13.0";
+const messageToMatch = "Wrangler requires at least Node.js v16.13.0";
 
 wranglerProcess.once("exit", (code) => {
 	try {
@@ -25,7 +25,7 @@ wranglerProcess.once("exit", (code) => {
 	} catch (err) {
 		console.error("Error:", err);
 		throw new Error(
-			"This test has to be run with a version of node.js under 16.13 to pass"
+			"This test has to be run with a version of Node.js under 16.13 to pass"
 		);
 	}
 });

package/src/__tests__/traverse-module-graph.test.ts

@@ -0,0 +1,220 @@
+import { mkdir, writeFile } from "fs/promises";
+import path from "path";
+import dedent from "ts-dedent";
+import traverseModuleGraph from "../traverse-module-graph";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import type { ConfigModuleRuleType } from "../config";
+
+/*
+ * This file contains inline comments with the word "javascript"
+ * This signals to a compatible editor extension that the template string
+ * contents should be syntax-highlighted as JavaScript. One such extension
+ * is zjcompt.es6-string-javascript, but there are others.
+ */
+
+describe("traverse module graph", () => {
+	runInTempDir();
+
+	it("should not detect JS without module rules", async () => {
+		await writeFile(
+			"./index.js",
+			dedent/* javascript */ `
+			import { HELLO } from "./other.js"
+			export default {
+				async fetch(request) {
+					return new Response(HELLO)
+				}
+			}
+			`
+		);
+		await writeFile(
+			"./other.js",
+			dedent/* javascript */ `
+			export const HELLO = "WORLD"
+			`
+		);
+
+		const bundle = await traverseModuleGraph(
+			{
+				file: path.join(process.cwd(), "./index.js"),
+				directory: process.cwd(),
+				format: "modules",
+				moduleRoot: process.cwd(),
+			},
+			[]
+		);
+
+		expect(bundle.modules).toStrictEqual([]);
+	});
+
+	it.each([
+		["ESModule", "esm"],
+		["CommonJS", "commonjs"],
+	])("should detect JS as %s", async (type, format) => {
+		await writeFile(
+			"./index.js",
+			dedent/* javascript */ `
+			import { HELLO } from "./other.js"
+			export default {
+				async fetch(request) {
+					return new Response(HELLO)
+				}
+			}
+			`
+		);
+		await writeFile(
+			"./other.js",
+			dedent/* javascript */ `
+			export const HELLO = "WORLD"
+			`
+		);
+
+		const bundle = await traverseModuleGraph(
+			{
+				file: path.join(process.cwd(), "./index.js"),
+				directory: process.cwd(),
+				format: "modules",
+				moduleRoot: process.cwd(),
+			},
+			[{ type: type as ConfigModuleRuleType, globs: ["**/*.js"] }]
+		);
+
+		expect(bundle.modules[0].type).toStrictEqual(format);
+	});
+
+	it("should not resolve JS outside the module root", async () => {
+		await mkdir("./src/nested", { recursive: true });
+		await writeFile(
+			"./src/nested/index.js",
+			dedent/* javascript */ `
+			import { HELLO } from "../other.js"
+			export default {
+				async fetch(request) {
+					return new Response(HELLO)
+				}
+			}
+			`
+		);
+		await writeFile(
+			"./src/other.js",
+			dedent/* javascript */ `
+			export const HELLO = "WORLD"
+			`
+		);
+
+		const bundle = await traverseModuleGraph(
+			{
+				file: path.join(process.cwd(), "./src/nested/index.js"),
+				directory: path.join(process.cwd(), "./src/nested"),
+				format: "modules",
+				// The default module root is dirname(file)
+				moduleRoot: path.join(process.cwd(), "./src/nested"),
+			},
+			[{ type: "ESModule", globs: ["**/*.js"] }]
+		);
+
+		expect(bundle.modules).toStrictEqual([]);
+	});
+
+	it("should resolve JS with module root", async () => {
+		await mkdir("./src/nested", { recursive: true });
+		await writeFile(
+			"./src/nested/index.js",
+			dedent/* javascript */ `
+			import { HELLO } from "../other.js"
+			export default {
+				async fetch(request) {
+					return new Response(HELLO)
+				}
+			}
+			`
+		);
+		await writeFile(
+			"./src/other.js",
+			dedent/* javascript */ `
+			export const HELLO = "WORLD"
+			`
+		);
+
+		const bundle = await traverseModuleGraph(
+			{
+				file: path.join(process.cwd(), "./src/nested/index.js"),
+				directory: path.join(process.cwd(), "./src/nested"),
+				format: "modules",
+				// The default module root is dirname(file)
+				moduleRoot: path.join(process.cwd(), "./src"),
+			},
+			[{ type: "ESModule", globs: ["**/*.js"] }]
+		);
+
+		expect(bundle.modules[0].name).toStrictEqual("other.js");
+	});
+
+	it("should ignore files not matched by glob", async () => {
+		await mkdir("./src/nested", { recursive: true });
+		await writeFile(
+			"./src/nested/index.js",
+			dedent/* javascript */ `
+			import { HELLO } from "../other.js"
+			export default {
+				async fetch(request) {
+					return new Response(HELLO)
+				}
+			}
+			`
+		);
+		await writeFile(
+			"./src/other.js",
+			dedent/* javascript */ `
+			export const HELLO = "WORLD"
+			`
+		);
+
+		const bundle = await traverseModuleGraph(
+			{
+				file: path.join(process.cwd(), "./src/nested/index.js"),
+				directory: path.join(process.cwd(), "./src/nested"),
+				format: "modules",
+				// The default module root is dirname(file)
+				moduleRoot: path.join(process.cwd(), "./src"),
+			},
+			[{ type: "ESModule", globs: ["**/*.mjs"] }]
+		);
+
+		expect(bundle.modules.length).toStrictEqual(0);
+	});
+
+	it("should resolve files that match the default rules", async () => {
+		await mkdir("./src", { recursive: true });
+		await writeFile(
+			"./src/index.js",
+			dedent/* javascript */ `
+			import HELLO from "../other.txt"
+			export default {
+				async fetch(request) {
+					return new Response(HELLO)
+				}
+			}
+			`
+		);
+		await writeFile(
+			"./src/other.txt",
+			dedent/* javascript */ `
+			export const HELLO = "WORLD"
+			`
+		);
+
+		const bundle = await traverseModuleGraph(
+			{
+				file: path.join(process.cwd(), "./src/index.js"),
+				directory: path.join(process.cwd(), "./src"),
+				format: "modules",
+				// The default module root is dirname(file)
+				moduleRoot: path.join(process.cwd(), "./src"),
+			},
+			[]
+		);
+
+		expect(bundle.modules[0].name).toStrictEqual("other.txt");
+	});
+});