wrangler 0.0.0-e6c9c5c0 → 0.0.0-e6e1daba

package/src/__tests__/kv.test.ts

@@ -63,10 +63,11 @@ describe("wrangler", () => {
 			  namespace  The name of the new namespace  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --preview  Interact with a preview namespace  [boolean]"
@@ -94,10 +95,11 @@ describe("wrangler", () => {
 			  namespace  The name of the new namespace  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --preview  Interact with a preview namespace  [boolean]"
@@ -126,10 +128,11 @@ describe("wrangler", () => {
 			  namespace  The name of the new namespace  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --preview  Interact with a preview namespace  [boolean]"
@@ -552,10 +555,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -591,10 +595,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -630,10 +635,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -669,10 +675,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -708,10 +715,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -739,7 +747,7 @@ describe("wrangler", () => {
 
 				expect(std.out).toMatchInlineSnapshot(`
 			          "
-			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`
 			          "X [ERROR] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -761,7 +769,7 @@ describe("wrangler", () => {
 				);
 				expect(std.out).toMatchInlineSnapshot(`
 			          "
-			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`
 			          "X [ERROR] someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
@@ -932,7 +940,7 @@ describe("wrangler", () => {
 		        `);
 				expect(std.out).toMatchInlineSnapshot(`
 			          "
-			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		        `);
 			});
 		});
@@ -1083,10 +1091,11 @@ describe("wrangler", () => {
 			  key  The key value to get.  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The name of the namespace to get from  [string]
@@ -1117,10 +1126,11 @@ describe("wrangler", () => {
 			  key  The key value to get.  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The name of the namespace to get from  [string]
@@ -1152,10 +1162,11 @@ describe("wrangler", () => {
 			  key  The key value to get.  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The name of the namespace to get from  [string]
@@ -1179,7 +1190,7 @@ describe("wrangler", () => {
 				);
 				expect(std.out).toMatchInlineSnapshot(`
 			          "
-			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`
 			          "X [ERROR] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -1442,7 +1453,7 @@ describe("wrangler", () => {
 					              `);
 				expect(std.out).toMatchInlineSnapshot(`
 			          "
-			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -1504,7 +1515,7 @@ describe("wrangler", () => {
 
 				expect(std.out).toMatchInlineSnapshot(`
 			          "
-			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
@@ -1646,7 +1657,7 @@ describe("wrangler", () => {
 					              `);
 				expect(std.out).toMatchInlineSnapshot(`
 			"
-			If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -1671,7 +1682,7 @@ describe("wrangler", () => {
 					              `);
 				expect(std.out).toMatchInlineSnapshot(`
 			"
-			If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});

package/src/__tests__/middleware.test.ts

@@ -748,3 +748,68 @@ describe("unchanged functionality when wrapping with middleware", () => {
 		});
 	});
 });
+
+describe("multiple middleware", () => {
+	it("should respond correctly with D1 databases, scheduled testing, and formatted dev errors", async () => {
+		// Kitchen sink test to check interaction between multiple middlewares
+		const scriptContent = `
+			export default {
+				async fetch(request, env, ctx) {
+					const { pathname } = new URL(request.url);
+					if (pathname === "/setup") {
+						await env.DB.exec("CREATE TABLE IF NOT EXISTS test (id INTEGER PRIMARY KEY, value TEXT);");
+						return new Response(null, { status: 204 });
+					} else if (pathname === "/query") {
+      			const rows = await env.DB.prepare("SELECT * FROM test;").all();
+      			return Response.json(rows.results);
+					}
+					throw new Error("Not found!");
+			  },
+			  async scheduled(controller, env, ctx) {
+					const stmt = await env.DB.prepare("INSERT INTO test (id, value) VALUES (?, ?)");
+					await stmt.bind(1, "one").run();
+			  }
+			}	
+		`;
+		fs.writeFileSync("index.js", scriptContent);
+
+		const originalFormatErrors = process.env.FORMAT_WRANGLER_ERRORS;
+		process.env.FORMAT_WRANGLER_ERRORS = "true";
+
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+				testScheduled: true,
+				d1Databases: [
+					{
+						binding: "DB",
+						database_name: "db",
+						database_id: "00000000-0000-0000-0000-000000000000",
+					},
+				],
+			},
+		});
+
+		try {
+			let res = await worker.fetch("http://localhost/setup");
+			expect(res.status).toBe(204);
+
+			res = await worker.fetch("http://localhost/__scheduled");
+			expect(res.status).toBe(200);
+			expect(await res.text()).toBe("Ran scheduled event");
+
+			res = await worker.fetch("http://localhost/query");
+			expect(res.status).toBe(200);
+			expect(await res.json()).toEqual([{ id: 1, value: "one" }]);
+
+			res = await worker.fetch("http://localhost/bad");
+			expect(res.status).toBe(500);
+			expect(res.headers.get("Content-Type")).toBe("text/html");
+			expect(await res.text()).toContain("Error: Not found!");
+		} finally {
+			process.env.FORMAT_WRANGLER_ERRORS = originalFormatErrors;
+			await worker.stop();
+		}
+	});
+});