@distilled.cloud/cloudflare 0.19.0 → 0.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/cloudflare",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -63,7 +63,7 @@
     "specs:update": "git -C specs/cloudflare-typescript fetch && git -C specs/cloudflare-typescript checkout main && git -C specs/cloudflare-typescript pull"
   },
   "dependencies": {
-    "@distilled.cloud/core": "0.19.0"
+    "@distilled.cloud/core": "0.19.1"
   },
   "devDependencies": {
     "@effect/platform-node": ">=4.0.0-beta.60 || >=4.0.0",

package/src/schemas.ts

@@ -1,19 +1,35 @@
 /**
  * Common schemas for Cloudflare API types.
  *
- * Includes file upload schemas for multipart form-data operations.
+ * Cloudflare-specific schemas live here. The cloud-agnostic raw-binary HTTP
+ * body schemas (`BinaryBodySchema`, `BinaryStreamResponseSchema`,
+ * `Uint8ArraySchema`, etc.) live in `@distilled.cloud/core/schemas` and are
+ * re-exported below for convenience.
  */
 
 import * as Schema from "effect/Schema";
+import { BlobSchema } from "@distilled.cloud/core/schemas";
+
+export {
+  ArrayBufferSchema,
+  BinaryBodySchema,
+  BinaryStreamResponseSchema,
+  BlobSchema,
+  ReadableStreamSchema,
+  StreamSchema,
+  Uint8ArraySchema,
+  type BinaryBody,
+} from "@distilled.cloud/core/schemas";
 
 // =============================================================================
-// File Upload Schemas
+// File Upload Schemas (multipart form-data)
 // =============================================================================
 
 /**
  * Schema for File objects (browser File API).
  *
- * Used for multipart form-data file uploads.
+ * Used for multipart form-data file uploads (e.g. Workers script bundles,
+ * Pages assets, brand-protection submissions).
  */
 export const FileSchema = Schema.declare(
   (input): input is File =>
@@ -24,20 +40,6 @@ export const FileSchema = Schema.declare(
   },
 );
 
-/**
- * Schema for Blob objects.
- *
- * Used for binary data uploads.
- */
-export const BlobSchema = Schema.declare(
-  (input): input is Blob =>
-    typeof Blob !== "undefined" && input instanceof Blob,
-  {
-    identifier: "Blob",
-    description: "A Blob object for upload",
-  },
-);
-
 /**
  * Schema for uploadable content (File or Blob).
  *

package/src/services/custom-pages.ts

@@ -16,7 +16,22 @@ import { type DefaultErrors } from "../errors.ts";
 // CustomPage
 // =============================================================================
 
-export interface GetCustomPageRequest {
+const GetCustomPageBaseFields = {
+  identifier: Schema.Literals([
+    "1000_errors",
+    "500_errors",
+    "basic_challenge",
+    "country_challenge",
+    "ip_block",
+    "managed_challenge",
+    "ratelimit_block",
+    "under_attack",
+    "waf_block",
+    "waf_challenge",
+  ]).pipe(T.HttpPath("identifier")),
+} as const;
+
+interface GetCustomPageBaseRequest {
   identifier:
     | "1000_errors"
     | "500_errors"
@@ -30,25 +45,37 @@ export interface GetCustomPageRequest {
     | "waf_challenge";
 }
 
-export const GetCustomPageRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
-  identifier: Schema.Literals([
-    "1000_errors",
-    "500_errors",
-    "basic_challenge",
-    "country_challenge",
-    "ip_block",
-    "managed_challenge",
-    "ratelimit_block",
-    "under_attack",
-    "waf_block",
-    "waf_challenge",
-  ]).pipe(T.HttpPath("identifier")),
-}).pipe(
-  T.Http({
-    method: "GET",
-    path: "/{accountOrZone}/{accountOrZoneId}/custom_pages/{identifier}",
-  }),
-) as unknown as Schema.Schema<GetCustomPageRequest>;
+export interface GetCustomPageForAccountRequest extends GetCustomPageBaseRequest {
+  /** Path param: The Account ID to use for this endpoint. */
+  accountId: string;
+}
+
+export interface GetCustomPageForZoneRequest extends GetCustomPageBaseRequest {
+  /** Path param: The Zone ID to use for this endpoint. */
+  zoneId: string;
+}
+
+export const GetCustomPageForAccountRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    accountId: Schema.String.pipe(T.HttpPath("account_id")),
+    ...GetCustomPageBaseFields,
+  }).pipe(
+    T.Http({
+      method: "GET",
+      path: "/accounts/{account_id}/custom_pages/{identifier}",
+    }),
+  ) as unknown as Schema.Schema<GetCustomPageForAccountRequest>;
+
+export const GetCustomPageForZoneRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    zoneId: Schema.String.pipe(T.HttpPath("zone_id")),
+    ...GetCustomPageBaseFields,
+  }).pipe(
+    T.Http({
+      method: "GET",
+      path: "/zones/{zone_id}/custom_pages/{identifier}",
+    }),
+  ) as unknown as Schema.Schema<GetCustomPageForZoneRequest>;
 
 export interface GetCustomPageResponse {
   id?: string | null;
@@ -95,27 +122,57 @@ export const GetCustomPageResponse = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
 
 export type GetCustomPageError = DefaultErrors;
 
-export const getCustomPage: API.OperationMethod<
-  GetCustomPageRequest,
+export const getCustomPageForAccount: API.OperationMethod<
+  GetCustomPageForAccountRequest,
   GetCustomPageResponse,
   GetCustomPageError,
   Credentials | HttpClient.HttpClient
 > = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
-  input: GetCustomPageRequest,
+  input: GetCustomPageForAccountRequest,
   output: GetCustomPageResponse,
   errors: [],
 }));
 
-export interface ListCustomPagesRequest {}
+export const getCustomPageForZone: API.OperationMethod<
+  GetCustomPageForZoneRequest,
+  GetCustomPageResponse,
+  GetCustomPageError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
+  input: GetCustomPageForZoneRequest,
+  output: GetCustomPageResponse,
+  errors: [],
+}));
 
-export const ListCustomPagesRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct(
-  {},
-).pipe(
-  T.Http({
-    method: "GET",
-    path: "/{accountOrZone}/{accountOrZoneId}/custom_pages",
-  }),
-) as unknown as Schema.Schema<ListCustomPagesRequest>;
+const ListCustomPagesBaseFields = {} as const;
+
+interface ListCustomPagesBaseRequest {}
+
+export interface ListCustomPagesForAccountRequest extends ListCustomPagesBaseRequest {
+  /** Path param: The Account ID to use for this endpoint. */
+  accountId: string;
+}
+
+export interface ListCustomPagesForZoneRequest extends ListCustomPagesBaseRequest {
+  /** Path param: The Zone ID to use for this endpoint. */
+  zoneId: string;
+}
+
+export const ListCustomPagesForAccountRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    accountId: Schema.String.pipe(T.HttpPath("account_id")),
+    ...ListCustomPagesBaseFields,
+  }).pipe(
+    T.Http({ method: "GET", path: "/accounts/{account_id}/custom_pages" }),
+  ) as unknown as Schema.Schema<ListCustomPagesForAccountRequest>;
+
+export const ListCustomPagesForZoneRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    zoneId: Schema.String.pipe(T.HttpPath("zone_id")),
+    ...ListCustomPagesBaseFields,
+  }).pipe(
+    T.Http({ method: "GET", path: "/zones/{zone_id}/custom_pages" }),
+  ) as unknown as Schema.Schema<ListCustomPagesForZoneRequest>;
 
 export interface ListCustomPagesResponse {
   result: {
@@ -170,13 +227,28 @@ export const ListCustomPagesResponse =
 
 export type ListCustomPagesError = DefaultErrors;
 
-export const listCustomPages: API.PaginatedOperationMethod<
-  ListCustomPagesRequest,
+export const listCustomPagesForAccount: API.PaginatedOperationMethod<
+  ListCustomPagesForAccountRequest,
+  ListCustomPagesResponse,
+  ListCustomPagesError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.makePaginated(() => ({
+  input: ListCustomPagesForAccountRequest,
+  output: ListCustomPagesResponse,
+  errors: [],
+  pagination: {
+    mode: "single",
+    items: "result",
+  } as const,
+}));
+
+export const listCustomPagesForZone: API.PaginatedOperationMethod<
+  ListCustomPagesForZoneRequest,
   ListCustomPagesResponse,
   ListCustomPagesError,
   Credentials | HttpClient.HttpClient
 > = /*@__PURE__*/ /*#__PURE__*/ API.makePaginated(() => ({
-  input: ListCustomPagesRequest,
+  input: ListCustomPagesForZoneRequest,
   output: ListCustomPagesResponse,
   errors: [],
   pagination: {
@@ -185,7 +257,24 @@ export const listCustomPages: API.PaginatedOperationMethod<
   } as const,
 }));
 
-export interface PutCustomPageRequest {
+const PutCustomPageBaseFields = {
+  identifier: Schema.Literals([
+    "1000_errors",
+    "500_errors",
+    "basic_challenge",
+    "country_challenge",
+    "ip_block",
+    "managed_challenge",
+    "ratelimit_block",
+    "under_attack",
+    "waf_block",
+    "waf_challenge",
+  ]).pipe(T.HttpPath("identifier")),
+  state: Schema.Literals(["default", "customized"]),
+  url: Schema.String,
+} as const;
+
+interface PutCustomPageBaseRequest {
   identifier:
     | "1000_errors"
     | "500_errors"
@@ -197,39 +286,43 @@ export interface PutCustomPageRequest {
     | "under_attack"
     | "waf_block"
     | "waf_challenge";
-  /** Path param: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID. */
-  accountId?: string;
-  /** Path param: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID. */
-  zoneId?: string;
   /** Body param: The custom page state. */
   state: "default" | "customized";
   /** Body param: The URL associated with the custom page. */
   url: string;
 }
 
-export const PutCustomPageRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
-  identifier: Schema.Literals([
-    "1000_errors",
-    "500_errors",
-    "basic_challenge",
-    "country_challenge",
-    "ip_block",
-    "managed_challenge",
-    "ratelimit_block",
-    "under_attack",
-    "waf_block",
-    "waf_challenge",
-  ]).pipe(T.HttpPath("identifier")),
-  accountId: Schema.String.pipe(T.HttpPath("account_id")),
-  zoneId: Schema.String.pipe(T.HttpPath("zone_id")),
-  state: Schema.Literals(["default", "customized"]),
-  url: Schema.String,
-}).pipe(
-  T.Http({
-    method: "PUT",
-    path: "/{accountOrZone}/{accountOrZoneId}/custom_pages/{identifier}",
-  }),
-) as unknown as Schema.Schema<PutCustomPageRequest>;
+export interface PutCustomPageForAccountRequest extends PutCustomPageBaseRequest {
+  /** Path param: The Account ID to use for this endpoint. */
+  accountId: string;
+}
+
+export interface PutCustomPageForZoneRequest extends PutCustomPageBaseRequest {
+  /** Path param: The Zone ID to use for this endpoint. */
+  zoneId: string;
+}
+
+export const PutCustomPageForAccountRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    accountId: Schema.String.pipe(T.HttpPath("account_id")),
+    ...PutCustomPageBaseFields,
+  }).pipe(
+    T.Http({
+      method: "PUT",
+      path: "/accounts/{account_id}/custom_pages/{identifier}",
+    }),
+  ) as unknown as Schema.Schema<PutCustomPageForAccountRequest>;
+
+export const PutCustomPageForZoneRequest =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+    zoneId: Schema.String.pipe(T.HttpPath("zone_id")),
+    ...PutCustomPageBaseFields,
+  }).pipe(
+    T.Http({
+      method: "PUT",
+      path: "/zones/{zone_id}/custom_pages/{identifier}",
+    }),
+  ) as unknown as Schema.Schema<PutCustomPageForZoneRequest>;
 
 export interface PutCustomPageResponse {
   id?: string | null;
@@ -276,13 +369,24 @@ export const PutCustomPageResponse = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
 
 export type PutCustomPageError = DefaultErrors;
 
-export const putCustomPage: API.OperationMethod<
-  PutCustomPageRequest,
+export const putCustomPageForAccount: API.OperationMethod<
+  PutCustomPageForAccountRequest,
+  PutCustomPageResponse,
+  PutCustomPageError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
+  input: PutCustomPageForAccountRequest,
+  output: PutCustomPageResponse,
+  errors: [],
+}));
+
+export const putCustomPageForZone: API.OperationMethod<
+  PutCustomPageForZoneRequest,
   PutCustomPageResponse,
   PutCustomPageError,
   Credentials | HttpClient.HttpClient
 > = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
-  input: PutCustomPageRequest,
+  input: PutCustomPageForZoneRequest,
   output: PutCustomPageResponse,
   errors: [],
 }));