wrangler 0.0.0-e7cf0caa → 0.0.0-e87ad068

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

@@ -1,8 +1,13 @@
 import { cwd } from "process";
+import { rest } from "msw";
 import { reinitialiseAuthTokens } from "../../user";
 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 { mockGetMemberships, mockOAuthFlow } from "../helpers/mock-oauth-flow";
+import { mockSetTimeout } from "../helpers/mock-set-timeout";
+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";
@@ -10,6 +15,8 @@ import writeWranglerToml from "../helpers/write-wrangler-toml";
 describe("migrate", () => {
 	runInTempDir();
 	mockConsoleMethods();
+	mockSetTimeout();
+
 	const { setIsTTY } = useMockIsTTY();
 
 	describe("create", () => {
@@ -28,6 +35,9 @@ describe("migrate", () => {
 	});
 
 	describe("apply", () => {
+		mockAccountId({ accountId: null });
+		mockApiToken();
+		const { mockOAuthServerCallback } = mockOAuthFlow();
 		it("should not attempt to login in local mode", async () => {
 			setIsTTY(false);
 			writeWranglerToml({
@@ -77,6 +87,96 @@ describe("migrate", () => {
 				runWrangler("d1 migrations apply --local db --preview")
 			).rejects.toThrowError(`Error: can't use --preview with --local`);
 		});
+
+		it("multiple accounts: should throw when trying to apply migrations without an account_id in config", async () => {
+			setIsTTY(false);
+
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "/tmp/my-migrations-go-here",
+					},
+				],
+			});
+			mockOAuthServerCallback();
+			mockGetMemberships([
+				{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+				{ id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+			]);
+			mockConfirm({
+				text: `No migrations folder found.
+Ok to create /tmp/my-migrations-go-here?`,
+				result: true,
+			});
+			await runWrangler("d1 migrations create db test");
+			mockConfirm({
+				text: `About to apply 1 migration(s)
+Your database may not be available to serve requests during the migration, continue?`,
+				result: true,
+			});
+			await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
+				`More than one account available but unable to select one in non-interactive mode.`
+			);
+		});
+		it("multiple accounts: should let the user apply migrations with an account_id in config", async () => {
+			setIsTTY(false);
+			msw.use(
+				rest.post(
+					"*/accounts/:accountId/d1/database/:databaseId/query",
+					async (req, res, ctx) => {
+						return res(
+							ctx.status(200),
+							ctx.json({
+								result: [
+									{
+										results: [],
+										success: true,
+										meta: {},
+									},
+								],
+								success: true,
+								errors: [],
+								messages: [],
+							})
+						);
+					}
+				)
+			);
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "/tmp/my-migrations-go-here",
+					},
+				],
+				account_id: "nx01",
+			});
+			mockOAuthServerCallback();
+			mockGetMemberships([
+				{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+				{ id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+			]);
+			mockConfirm({
+				text: `No migrations folder found.
+Ok to create /tmp/my-migrations-go-here?`,
+				result: true,
+			});
+			await runWrangler("d1 migrations create db test");
+			mockConfirm({
+				text: `About to apply 1 migration(s)
+Your database may not be available to serve requests during the migration, continue?`,
+				result: true,
+			});
+			//if we get to this point, wrangler knows the account_id
+			await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
+				`request to https://api.cloudflare.com/client/v4/accounts/nx01/d1/database/xxxx/backup failed`
+			);
+		});
 	});
 
 	describe("list", () => {

package/src/__tests__/index.test.ts

@@ -32,7 +32,7 @@ describe("wrangler", () => {
 			"wrangler
 
 			Commands:
-			  wrangler docs [command]              📚 Open wrangler's docs in your browser
+			  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 			  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 			  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 			  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -49,6 +49,7 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
+			  wrangler constellation               🤖 Interact with Constellation models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
@@ -85,7 +86,7 @@ describe("wrangler", () => {
 			wrangler
 
 			Commands:
-			  wrangler docs [command]              📚 Open wrangler's docs in your browser
+			  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 			  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 			  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 			  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -102,6 +103,7 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
+			  wrangler constellation               🤖 Interact with Constellation models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare

package/src/__tests__/init.test.ts

@@ -4,6 +4,7 @@ import * as TOML from "@iarna/toml";
 import { execa, execaSync } from "execa";
 import { rest } from "msw";
 import { parseConfigFileTextToJson } from "typescript";
+import { FormData } from "undici";
 import { version as wranglerVersion } from "../../package.json";
 import { getPackageManager } from "../package-manager";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
@@ -2235,6 +2236,12 @@ describe("init", () => {
 			},
 		};
 		`;
+		afterEach(() => {
+			// some test has a side-effect which is overwriting the compatibility_date
+			mockServiceMetadata.default_environment.script.compatibility_date =
+				"1987-9-27";
+			mockConfigExpected.compatibility_date = "1987-9-27";
+		});
 		const mockServiceMetadata = {
 			id: "memory-crystal",
 			default_environment: {
@@ -2251,6 +2258,7 @@ describe("init", () => {
 					migration_tag: "some-migration-tag",
 					usage_model: "bundled",
 					compatibility_date: "1987-9-27",
+					tail_consumers: [{ service: "listener" }],
 				},
 			},
 			created_on: "1987-9-27",
@@ -2452,6 +2460,7 @@ describe("init", () => {
 					},
 				],
 			},
+			tail_consumers: [{ service: "listener" }],
 		};
 
 		function mockSupportingDashRequests({
@@ -2701,6 +2710,9 @@ describe("init", () => {
 			test = { }
 			staging = { }
 
+			[[tail_consumers]]
+			service = \\"listener\\"
+
 			[vars]
 			ANOTHER-NAME = \\"thing-TEXT\\"
 
@@ -2945,6 +2957,7 @@ describe("init", () => {
 						created_on: "1988-08-07",
 						usage_model: "bundled",
 						compatibility_date: "1988-08-07",
+						tail_consumers: [{ service: "listener" }],
 					},
 				},
 				environments: [],
@@ -3001,7 +3014,7 @@ describe("init", () => {
 								success: true,
 								errors: [],
 								messages: [],
-								result: mockServiceMetadata.default_environment,
+								result: mockData.default_environment,
 							})
 						);
 					}
@@ -3053,6 +3066,7 @@ describe("init", () => {
 						},
 						usage_model: "bundled",
 						name: "isolinear-optical-chip",
+						tail_consumers: [{ service: "listener" }],
 					}),
 				},
 			});
@@ -3074,6 +3088,72 @@ describe("init", () => {
 				},
 			});
 		});
+
+		it("should download multi-module source scripts from dashboard", async () => {
+			mockSupportingDashRequests({
+				expectedAccountId: "LCARS",
+				expectedScriptName: "isolinear-optical-chip",
+				expectedEnvironment: "test",
+				expectedCompatDate: "1987-9-27",
+			});
+			const indexjs = `
+        import handleRequest from './handleRequest.js';
+
+        export default {
+          async fetch(request, env, ctx) {
+            return handleRequest(request, env, ctx);
+          },
+        };
+      `;
+			const otherjs = `
+        export default function (request, env, ctx) {
+          return new Response("Hello World!");
+        }
+      `;
+			setMockFetchDashScript([
+				{ name: "index.js", contents: indexjs },
+				{ name: "nested/other.js", contents: otherjs },
+			]);
+			mockConfirm(
+				{
+					text: "Would you like to use git to manage this Worker?",
+					result: false,
+				},
+				{
+					text: "No package.json found. Would you like to create one?",
+					result: true,
+				},
+				{
+					text: "Would you like to use TypeScript?",
+					result: false,
+				}
+			);
+
+			await runWrangler("init --from-dash isolinear-optical-chip");
+
+			checkFiles({
+				items: {
+					"isolinear-optical-chip/src/index.js": {
+						contents: indexjs,
+					},
+					"isolinear-optical-chip/src/nested/other.js": {
+						contents: otherjs,
+					},
+					"isolinear-optical-chip/src/index.ts": false,
+					"isolinear-optical-chip/package.json": {
+						contents: expect.objectContaining({
+							name: "isolinear-optical-chip",
+						}),
+					},
+					"isolinear-optical-chip/tsconfig.json": false,
+					"isolinear-optical-chip/wrangler.toml": wranglerToml({
+						...mockConfigExpected,
+						name: "isolinear-optical-chip",
+						main: "src/index.js",
+					}),
+				},
+			});
+		});
 	});
 });
 
@@ -3095,12 +3175,38 @@ function getDefaultBranchName() {
 /**
  * Mock setter for usage within test blocks for dashboard script
  */
-export function setMockFetchDashScript(mockResponse: string) {
+export function setMockFetchDashScript(
+	mockResponse: string | { name: string; contents: string }[]
+) {
 	msw.use(
 		rest.get(
 			`*/accounts/:accountId/workers/services/:fromDashScriptName/environments/:environment/content`,
 			(_, res, ctx) => {
-				return res(ctx.text(mockResponse));
+				if (typeof mockResponse === "string") {
+					return res(ctx.text(mockResponse));
+				}
+
+				const fd = new FormData();
+
+				for (const { name, contents } of mockResponse) {
+					fd.set(name, contents);
+				}
+
+				const boundary = "--------boundary-12761293712";
+				const responseText =
+					`--${boundary}\r\n` +
+					mockResponse
+						.map(
+							({ name, contents }) =>
+								`Content-Disposition: form-data; name="${name}"\r\n\r\n${contents}`
+						)
+						.join(`\r\n--${boundary}\r\n`) +
+					`\r\n--${boundary}--`;
+
+				return res(
+					ctx.set("Content-Type", `multipart/form-data; boundary=${boundary}`),
+					ctx.body(responseText)
+				);
 			}
 		)
 	);

package/src/__tests__/mtls-certificates.test.ts

@@ -362,7 +362,7 @@ describe("wrangler", () => {
 				"wrangler
 
 				Commands:
-				  wrangler docs [command]              📚 Open wrangler's docs in your browser
+				  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 				  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 				  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 				  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -379,6 +379,7 @@ describe("wrangler", () => {
 				  wrangler r2                          📦 Interact with an R2 store
 				  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 				  wrangler d1                          🗄  Interact with a D1 database
+				  wrangler constellation               🤖 Interact with Constellation models
 				  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 				  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 				  wrangler login                       🔓 Login to Cloudflare

package/src/__tests__/pages/functions-build.test.ts

@@ -448,5 +448,82 @@ export default {
 		"Build failed with 1 error:
 		hello.js:2:36: ERROR: Could not resolve \\"node:async_hooks\\""
 	`);
+		expect(std.err).toContain(
+			'The package "node:async_hooks" wasn\'t found on the file system but is built into node.'
+		);
+		expect(std.err).toContain(
+			'Add the "nodejs_compat" compatibility flag to your Pages project to enable Node.js compatibility.'
+		);
+	});
+
+	it("should compile a _worker.js/ directory", async () => {
+		mkdirSync("public");
+		mkdirSync("public/_worker.js");
+		writeFileSync(
+			"public/_worker.js/index.js",
+			`
+import { cat } from "./cat.js";
+
+export default {
+  async fetch(request, env) {
+		return new Response("Hello from _worker.js/index.js" + cat);
+	},
+};`
+		);
+		writeFileSync(
+			"public/_worker.js/cat.js",
+			`
+export const cat = "cat";`
+		);
+
+		await runWrangler(`pages functions build --outfile=public/_worker.bundle`);
+
+		expect(existsSync("public/_worker.bundle")).toBe(true);
+		expect(std.out).toMatchInlineSnapshot(`
+		"🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		✨ Compiled Worker successfully"
+	`);
+
+		const workerBundleContents = readFileSync("public/_worker.bundle", "utf-8");
+		const workerBundleWithConstantData = replaceRandomWithConstantData(
+			workerBundleContents,
+			[
+				[/------formdata-undici-0.[0-9]*/g, "------formdata-undici-0.test"],
+				[/bundledWorker-0.[0-9]*.mjs/g, "bundledWorker-0.test.mjs"],
+				[/bundledWorker-0.[0-9]*.map/g, "bundledWorker-0.test.map"],
+			]
+		);
+
+		expect(workerBundleWithConstantData).toMatchInlineSnapshot(`
+		"------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"metadata\\"
+
+		{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+		------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+		Content-Type: application/javascript+module
+
+		// _worker.js/index.js
+		import { cat } from \\"./cat.js\\";
+		var worker_default = {
+		  async fetch(request, env) {
+		    return new Response(\\"Hello from _worker.js/index.js\\" + cat);
+		  }
+		};
+		export {
+		  worker_default as default
+		};
+		//# sourceMappingURL=bundledWorker-0.test.mjs.map
+
+		------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"cat.js\\"; filename=\\"cat.js\\"
+		Content-Type: application/javascript+module
+
+
+		export const cat = \\"cat\\";
+		------formdata-undici-0.test--"
+	`);
+
+		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 });

package/src/__tests__/pages-deployment-tail.test.ts

@@ -13,6 +13,7 @@ import type {
 	ScheduledEvent,
 	AlarmEvent,
 	EmailEvent,
+	TailInfo,
 } from "../tail/createTail";
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
@@ -655,6 +656,7 @@ function isRequest(
 		| RequestEvent
 		| AlarmEvent
 		| EmailEvent
+		| TailInfo
 		| undefined
 		| null
 ): event is RequestEvent {