wrangler 2.1.6 → 2.1.7

package/miniflare-dist/index.mjs

@@ -739,7 +739,6 @@ import {
 } from "@miniflare/durable-objects";
 import {
   Log,
-  LogLevel,
   Miniflare,
   Response as MiniflareResponse3,
   Request as MiniflareRequest3
@@ -6118,18 +6117,6 @@ var invalidAssetsFetch = () => {
   );
 };
 
-// src/miniflare-cli/enum-keys.ts
-var enumObject = (e) => {
-  const copy = { ...e };
-  Object.values(e).forEach(
-    (value) => typeof value === "number" && delete copy[value]
-  );
-  return copy;
-};
-var enumKeys = (e) => {
-  return Object.keys(enumObject(e));
-};
-
 // src/miniflare-cli/request-context.ts
 var getRequestContextCheckOptions = async () => {
   let hasAsyncLocalStorage = true;
@@ -6158,18 +6145,16 @@ var NoOpLog = class extends Log {
   }
 };
 async function main() {
-  const args = await yargs_default(hideBin(process.argv)).help(false).version(false).option("log", {
-    choices: enumKeys(LogLevel)
-  }).argv;
-  const logLevel = LogLevel[args.log ?? "INFO"];
+  const args = await yargs_default(hideBin(process.argv)).help(false).version(false).argv;
   const requestContextCheckOptions = await getRequestContextCheckOptions();
   const config = {
     ...JSON.parse(args._[0] ?? "{}"),
     ...requestContextCheckOptions
   };
-  config.log = config.disableLogs ? new NoOpLog() : new Log(logLevel, config.logOptions);
-  if (logLevel > LogLevel.INFO) {
-    console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
+  const logLevel = config.logLevel.toUpperCase();
+  config.log = config.logLevel === "none" ? new NoOpLog() : new Log(logLevel, config.logOptions);
+  if (logLevel === "DEBUG" || logLevel === "VERBOSE") {
+    console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
   }
   config.bindings = {
     ...config.bindings,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.1.6",
+	"version": "2.1.7",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -87,17 +87,20 @@
 			]
 		},
 		"transformIgnorePatterns": [
-			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
+			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|npx-import)"
 		]
 	},
 	"dependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
+		"@miniflare/core": "2.9.0",
+		"@miniflare/d1": "2.9.0",
+		"@miniflare/durable-objects": "2.9.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.14.51",
-		"miniflare": "^2.8.1",
+		"miniflare": "2.9.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -105,12 +108,16 @@
 		"xxhash-wasm": "^1.0.1"
 	},
 	"devDependencies": {
+		"@databases/split-sql-query": "^1.0.3",
+		"@databases/sql": "^3.2.0",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
+		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
 		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "0.4.1",
+		"@types/javascript-time-ago": "^2.0.3",
 		"@types/mime": "^2.0.3",
 		"@types/prompts": "^2.0.14",
 		"@types/react": "^17.0.37",
@@ -145,16 +152,19 @@
 		"ink-testing-library": "^2.1.0",
 		"ink-text-input": "^4.0.3",
 		"is-ci": "^3.0.1",
+		"javascript-time-ago": "^2.5.4",
 		"jest-fetch-mock": "^3.0.3",
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
 		"msw": "^0.47.1",
+		"npx-import": "^1.0.2",
 		"open": "^8.4.0",
 		"p-queue": "^7.2.0",
 		"pretty-bytes": "^6.0.0",
 		"prompts": "^2.4.2",
 		"react": "^17.0.2",
 		"react-error-boundary": "^3.1.4",
+		"remove-accents-esm": "^0.0.1",
 		"serve-static": "^1.15.0",
 		"signal-exit": "^3.0.7",
 		"supports-color": "^9.2.2",

package/src/__tests__/api-dev.test.ts

@@ -19,6 +19,26 @@ describe("unstable_dev", () => {
 		}
 		await worker.stop();
 	});
+
+	it("should return the port that the server started on (1)", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{},
+			{ disableExperimentalWarning: true }
+		);
+		expect(worker.port).toBeGreaterThan(0);
+		await worker.stop();
+	});
+
+	it("should return the port that the server started on (2)", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{ port: 9191 },
+			{ disableExperimentalWarning: true }
+		);
+		expect(worker.port).toBe(9191);
+		await worker.stop();
+	});
 });
 
 describe("unstable dev fetch input protocol", () => {

package/src/__tests__/configuration.test.ts

@@ -25,6 +25,7 @@ describe("normalizeAndValidateConfig()", () => {
 			compatibility_date: undefined,
 			compatibility_flags: [],
 			configPath: undefined,
+			d1_databases: [],
 			dev: {
 				ip: "0.0.0.0",
 				local_protocol: "http",
@@ -1664,6 +1665,108 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[d1_databases]", () => {
+			it("should error if d1_databases is an object", () => {
+				const { config, diagnostics } = normalizeAndValidateConfig(
+					{ d1_databases: {} } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(config).toEqual(
+					expect.not.objectContaining({ d1_databases: expect.anything })
+				);
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"d1_databases\\" should be an array but got {}."
+		              `);
+			});
+
+			it("should error if d1_databases is a string", () => {
+				const { config, diagnostics } = normalizeAndValidateConfig(
+					{ d1_databases: "BAD" } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(config).toEqual(
+					expect.not.objectContaining({ d1_databases: expect.anything })
+				);
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"d1_databases\\" should be an array but got \\"BAD\\"."
+		              `);
+			});
+
+			it("should error if d1_databases is a number", () => {
+				const { config, diagnostics } = normalizeAndValidateConfig(
+					{ d1_databases: 999 } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(config).toEqual(
+					expect.not.objectContaining({ d1_databases: expect.anything })
+				);
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"d1_databases\\" should be an array but got 999."
+		              `);
+			});
+
+			it("should error if d1_databases is null", () => {
+				const { config, diagnostics } = normalizeAndValidateConfig(
+					{ d1_databases: null } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(config).toEqual(
+					expect.not.objectContaining({ d1_databases: expect.anything })
+				);
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"d1_databases\\" should be an array but got null."
+		              `);
+			});
+
+			it("should error if d1_databases.bindings are not valid", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						d1_databases: [
+							{},
+							{ binding: "VALID" },
+							{ binding: 2000, id: 2111 },
+							{
+								binding: "D1_BINDING_2",
+								id: "my-db",
+								preview_id: 2222,
+							},
+							{ binding: "VALID", id: "" },
+						],
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - \\"d1_databases[0]\\" bindings should have a string \\"binding\\" field but got {}.
+			  - \\"d1_databases[0]\\" bindings must have a \\"database_id\\" field but got {}.
+			  - \\"d1_databases[1]\\" bindings must have a \\"database_id\\" field but got {\\"binding\\":\\"VALID\\"}.
+			  - \\"d1_databases[2]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2000,\\"id\\":2111}.
+			  - \\"d1_databases[2]\\" bindings must have a \\"database_id\\" field but got {\\"binding\\":2000,\\"id\\":2111}.
+			  - \\"d1_databases[3]\\" bindings must have a \\"database_id\\" field but got {\\"binding\\":\\"D1_BINDING_2\\",\\"id\\":\\"my-db\\",\\"preview_id\\":2222}.
+			  - \\"d1_databases[4]\\" bindings must have a \\"database_id\\" field but got {\\"binding\\":\\"VALID\\",\\"id\\":\\"\\"}."
+		`);
+			});
+		});
+
 		describe("[r2_buckets]", () => {
 			it("should error if r2_buckets is an object", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
@@ -2664,28 +2767,28 @@ describe("normalizeAndValidateConfig()", () => {
 			);
 			expect(diagnostics.hasErrors()).toBe(false);
 			expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			        "Processing wrangler configuration:
-			          - \\"unsafe\\" fields are experimental and may change or break at any time.
-			          - \\"env.ENV1\\" environment configuration
-			            - \\"vars\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"vars\\" is not inherited by environments.
-			              Please add \\"vars\\" to \\"env.ENV1\\".
-			            - \\"define\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"define\\" is not inherited by environments.
-			              Please add \\"define\\" to \\"env.ENV1\\".
-			            - \\"durable_objects\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"durable_objects\\" is not inherited by environments.
-			              Please add \\"durable_objects\\" to \\"env.ENV1\\".
-			            - \\"kv_namespaces\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"kv_namespaces\\" is not inherited by environments.
-			              Please add \\"kv_namespaces\\" to \\"env.ENV1\\".
-			            - \\"r2_buckets\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"r2_buckets\\" is not inherited by environments.
-			              Please add \\"r2_buckets\\" to \\"env.ENV1\\".
-			            - \\"unsafe\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"unsafe\\" is not inherited by environments.
-			              Please add \\"unsafe\\" to \\"env.ENV1\\"."
-		      `);
+			"Processing wrangler configuration:
+			  - \\"unsafe\\" fields are experimental and may change or break at any time.
+			  - \\"env.ENV1\\" environment configuration
+			    - \\"vars\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"vars\\" is not inherited by environments.
+			      Please add \\"vars\\" to \\"env.ENV1\\".
+			    - \\"define\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"define\\" is not inherited by environments.
+			      Please add \\"define\\" to \\"env.ENV1\\".
+			    - \\"durable_objects\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"durable_objects\\" is not inherited by environments.
+			      Please add \\"durable_objects\\" to \\"env.ENV1\\".
+			    - \\"kv_namespaces\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"kv_namespaces\\" is not inherited by environments.
+			      Please add \\"kv_namespaces\\" to \\"env.ENV1\\".
+			    - \\"r2_buckets\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"r2_buckets\\" is not inherited by environments.
+			      Please add \\"r2_buckets\\" to \\"env.ENV1\\".
+			    - \\"unsafe\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"unsafe\\" is not inherited by environments.
+			      Please add \\"unsafe\\" to \\"env.ENV1\\"."
+		`);
 		});
 
 		it("should error on invalid environment values", () => {

package/src/__tests__/dev.test.tsx

@@ -183,7 +183,6 @@ describe("wrangler dev", () => {
 			);
 		});
 	});
-
 	describe("host", () => {
 		it("should resolve a host to its zone", async () => {
 			writeWranglerToml({
@@ -1108,7 +1107,6 @@ describe("wrangler dev", () => {
 			await runWrangler("dev --assets abc");
 			expect((Dev as jest.Mock).mock.calls[2][0].isWorkersSite).toEqual(false);
 		});
-
 		it("should warn if --assets is used", async () => {
 			writeWranglerToml({
 				main: "./index.js",

package/src/__tests__/helpers/mock-oauth-flow.ts

@@ -97,7 +97,8 @@ export const mockOAuthFlow = () => {
 		};
 
 		fetchMock.mockIf(outcome.expected.url, async (req) => {
-			outcome.actual = req;
+			// TODO: update Miniflare typings to match full undici Request
+			outcome.actual = req as unknown as Request;
 			return "";
 		});
 
@@ -117,7 +118,8 @@ export const mockOAuthFlow = () => {
 		};
 
 		fetchMock.mockOnceIf(outcome.expected.url, async (req) => {
-			outcome.actual = req;
+			// TODO: update Miniflare typings to match full undici Request
+			outcome.actual = req as unknown as Request;
 			return makeTokenResponse(respondWith);
 		});
 

package/src/__tests__/index.test.ts

@@ -43,6 +43,7 @@ describe("wrangler", () => {
 			  wrangler pages               ⚡️ Configure Cloudflare Pages
 			  wrangler r2                  📦 Interact with an R2 store
 			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
+			  wrangler d1                  🗄  Interact with a D1 database
 			  wrangler pubsub              📮 Interact and manage Pub/Sub Brokers
 			  wrangler login               🔓 Login to Cloudflare
 			  wrangler logout              🚪 Logout from Cloudflare
@@ -83,6 +84,7 @@ describe("wrangler", () => {
 			  wrangler pages               ⚡️ Configure Cloudflare Pages
 			  wrangler r2                  📦 Interact with an R2 store
 			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
+			  wrangler d1                  🗄  Interact with a D1 database
 			  wrangler pubsub              📮 Interact and manage Pub/Sub Brokers
 			  wrangler login               🔓 Login to Cloudflare
 			  wrangler logout              🚪 Logout from Cloudflare

package/src/__tests__/paths.test.ts

@@ -1,5 +1,5 @@
 import * as path from "node:path";
-import { getBasePath } from "../paths";
+import { getBasePath, readableRelative } from "../paths";
 
 describe("paths", () => {
 	describe("getBasePath()", () => {
@@ -15,3 +15,25 @@ describe("paths", () => {
 		});
 	});
 });
+
+describe("readableRelative", () => {
+	const base = process.cwd();
+
+	it("should leave paths to files in the current directory as-is", () => {
+		expect(readableRelative(path.join(base, "wrangler.toml"))).toBe(
+			`wrangler.toml`
+		);
+	});
+
+	it("should leave files in the parent directory as-is", () => {
+		expect(readableRelative(path.resolve(base, "../wrangler.toml"))).toMatch(
+			/^\..[/\\]wrangler.toml$/
+		);
+	});
+
+	it("should add ./ to nested paths", () => {
+		expect(
+			readableRelative(path.join(base, "subdir", "wrangler.toml"))
+		).toMatch(/^\.[/\\]subdir[/\\]wrangler\.toml$/);
+	});
+});

package/src/__tests__/publish.test.ts

@@ -123,14 +123,14 @@ describe("publish", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Attempting to login via OAuth...
-			        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
-			        Successfully logged in.
-			        Total Upload: xx KiB / gzip: xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          https://test-name.test-sub-domain.workers.dev"
-		      `);
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in.
+			Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev"
+		`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -559,7 +559,6 @@ describe("publish", () => {
 			}
 		`);
 		});
-
 		it("should publish to a route with a pattern/{zone_id|zone_name} combo", async () => {
 			writeWranglerToml({
 				routes: [
@@ -3669,7 +3668,6 @@ addEventListener('fetch', event => {});`
 			);
 		});
 	});
-
 	describe("custom builds", () => {
 		beforeEach(() => {
 			// @ts-expect-error disable the mock we'd setup earlier

package/src/__tests__/user.test.ts

@@ -52,10 +52,10 @@ describe("User", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "Attempting to login via OAuth...
-        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
-        Successfully logged in."
-      `);
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in."
+		`);
 
 			expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
 				api_token: undefined,

package/src/__tests__/whoami.test.tsx

@@ -83,7 +83,6 @@ describe("getUserInfo()", () => {
 		const userInfo = await getUserInfo();
 		expect(userInfo?.email).toBeUndefined();
 	});
-
 	it("should say it's using an API token when one is set", async () => {
 		process.env = {
 			CLOUDFLARE_API_TOKEN: "123456789",