From 799e41bb1d406fbc8acb31a410c051e5ba000fe6 Mon Sep 17 00:00:00 2001
From: Kian Newman-Hazel <kian@cloudflare.com>
Date: Thu, 6 Mar 2025 13:00:07 +0000
Subject: [PATCH] [Docs Site] Support FormData in APIRequest

---
 src/components/APIRequest.astro               | 24 ++++++++++---------
 src/components/CURL.astro                     | 14 ++++++++++-
 .../style-guide/components/api-request.mdx    | 19 ++++++++++++++-
 .../docs/style-guide/components/curl.mdx      | 19 ++++++++++++++-
 4 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/src/components/APIRequest.astro b/src/components/APIRequest.astro
index 2979235f870135b..4506a3bff32387b 100644
--- a/src/components/APIRequest.astro
+++ b/src/components/APIRequest.astro
@@ -14,10 +14,15 @@ const props = z
 		method: z.enum(["GET", "HEAD", "POST", "PUT", "DELETE", "PATCH"]),
 		parameters: z.record(z.string(), z.any()).optional(),
 		json: z.record(z.string(), z.any()).optional(),
+		form: z.record(z.string(), z.any()).optional(),
 	})
 	.strict();
 
-let { path, method, parameters, json } = props.parse(Astro.props);
+let { path, method, parameters, json, form } = props.parse(Astro.props);
+
+if (json && form) {
+	throw new Error(`[APIRequest] Cannot use both "json" and "form" properties.`);
+}
 
 const schema = await getSchema();
 
@@ -52,7 +57,7 @@ const extraneousParameters = providedParameters.filter(
 
 if (extraneousParameters.length > 0) {
 	throw new Error(
-		`[APIRequest] Provided parameters ${extraneousParameters.join(", ")} not found in schema.`,
+		`[APIRequest] Provided parameters ${extraneousParameters.join(", ")} not found in ${method} ${path} schema.`,
 	);
 }
 
@@ -101,21 +106,17 @@ const jsonSchema = requestBody?.content?.["application/json"]?.schema as
 	| undefined;
 
 if (jsonSchema?.required) {
-	json ??= {};
-
-	const providedProperties = Object.keys(json);
+	const providedProperties = Object.keys(json ?? {});
 	const requiredProperties = jsonSchema.required;
 
 	const missingProperties = requiredProperties.filter(
 		(property) => !providedProperties.includes(property),
 	);
 
-	for (const property of missingProperties) {
-		const defaultValue =
-			(jsonSchema.properties?.[property] as OpenAPIV3.SchemaObject).default ??
-			property;
-
-		json[property] = defaultValue;
+	if (missingProperties.length > 0) {
+		throw new Error(
+			`[APIRequest] Missing the following required properties for ${method} ${path}: ${missingProperties.join(", ")}`,
+		);
 	}
 }
 
@@ -144,6 +145,7 @@ const tokenGroups = operation["x-api-token-group"];
 	method={method}
 	headers={headers}
 	json={json}
+	form={form}
 	code={{
 		title: operation.summary,
 	}}
diff --git a/src/components/CURL.astro b/src/components/CURL.astro
index 605d52044983ef9..80226dfec565bab 100644
--- a/src/components/CURL.astro
+++ b/src/components/CURL.astro
@@ -12,12 +12,17 @@ const props = z.object({
 	url: z.string().url(),
 	headers: z.record(z.string(), z.string()).default({}),
 	json: z.record(z.string(), z.any()).optional(),
+	form: z.record(z.string(), z.any()).optional(),
 	code: z
 		.custom<Omit<ComponentProps<typeof Code>, "code" | "lang">>()
 		.optional(),
 });
 
-const { method, url, headers, json, code } = props.parse(Astro.props);
+const { method, url, headers, json, form, code } = props.parse(Astro.props);
+
+if (json && form) {
+	throw new Error("[CURL] Cannot use both 'json' and 'form' properties.");
+}
 
 const lines = [`curl ${url}`, `\t--request ${method}`];
 
@@ -33,6 +38,13 @@ if (json) {
 
 	lines.push(`\t--json '${jsonLines.join("\n")}'`);
 }
+
+if (form) {
+	const formLines = Object.entries(form).map(
+		([key, value]) => `\t--form "${key}=${value}"`,
+	);
+	lines.push(...formLines);
+}
 ---
 
 <Code {...code} lang="bash" code={lines.join(" \\\n")} />
diff --git a/src/content/docs/style-guide/components/api-request.mdx b/src/content/docs/style-guide/components/api-request.mdx
index b484b1eef2de341..0ec248501cb9d9c 100644
--- a/src/content/docs/style-guide/components/api-request.mdx
+++ b/src/content/docs/style-guide/components/api-request.mdx
@@ -28,6 +28,15 @@ import { APIRequest } from "~/components";
 		setting_id: "ciphers",
 	}}
 />
+
+<APIRequest
+	path="/accounts/{account_id}/images/v2/direct_upload"
+	method="POST"
+	form={{
+		requireSignedURLs: true,
+		metadata: '{"key":"value"}'
+	}}
+/>
 ```
 
 ## `<APIRequest>` Props
@@ -64,4 +73,12 @@ If not provided, the component will default to an environment variable. For exam
 
 The JSON payload to send.
 
-Default values can be omitted, and the component will use default values for any missing fields.
+If required properties are missing, the component will throw an error.
+
+### `form`
+
+**type:** `Record<string, any>`
+
+The FormData payload to send.
+
+This field is not currently validated against the schema.
\ No newline at end of file
diff --git a/src/content/docs/style-guide/components/curl.mdx b/src/content/docs/style-guide/components/curl.mdx
index 75d9234baed239d..f21106307cee3ee 100644
--- a/src/content/docs/style-guide/components/curl.mdx
+++ b/src/content/docs/style-guide/components/curl.mdx
@@ -16,7 +16,7 @@ import { CURL } from "~/components";
 import { CURL } from "~/components";
 
 <CURL
-	url="https://example.com"
+	url="https://httpbin.org/anything"
 	method="POST"
 	json={{
 		key: "value",
@@ -25,6 +25,17 @@ import { CURL } from "~/components";
 		mark: "value"
 	}}
 />
+
+<CURL
+	url="https://httpbin.org/anything"
+	method="POST"
+	form={{
+		key: "value",
+	}}
+	code={{
+		mark: "value"
+	}}
+/>
 ```
 
 ## `<CURL>` Props
@@ -57,6 +68,12 @@ The headers to include in the request.
 
 JSON data to include in the request.
 
+### `form`
+
+**type:** `Record<string, any>`
+
+The FormData payload to send.
+
 ### `code`
 
 **type:** `object`