feat: makePagesFunction helper

Author: yjl9903

packages/vite-plugin-cloudflare-functions/package.json

@@ -44,14 +44,18 @@
       "require": "./dist/client.cjs",
       "import": "./dist/client.mjs",
       "types": "./dist/client.d.ts"
+    },
+    "./types": {
+      "types": "./types.d.ts"
     }
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
-    "script"
+    "script",
+    "*.d.ts"
   ],
   "scripts": {
     "build": "unbuild",

packages/vite-plugin-cloudflare-functions/src/vite/template.ts

@@ -24,18 +24,8 @@ export function getDefaultTsconfig() {
 export function getDts() {
   return [
     '// Generated by vite-plugin-cloudflare-functions\n',
-    `/// <reference types="@cloudflare/workers-types" />\n`,
-    `declare global {`,
-    `  const CloudflareResponse: typeof import('vite-plugin-cloudflare-functions/worker')['CloudflareResponse'];`,
-    `  type CloudflarePagesFunction<
-    T = unknown,
-    Env = unknown,
-    Params extends string = any,
-    Data extends Record<string, unknown> = Record<string, unknown>
-  > = (
-    context: Parameters<PagesFunction<Env, Params, Data>>[0]
-  ) => CloudflareResponse<T> | Promise<CloudflareResponse<T>>;`,
-    `}\n`,
-    'export {}'
+    `/// <reference types="@cloudflare/workers-types" />`,
+    `/// <reference types="vite-plugin-cloudflare-functions/types" />\n`,
+    `export {}`
   ].join('\n');
 }

packages/vite-plugin-cloudflare-functions/src/worker/index.ts

@@ -2,6 +2,10 @@ import { CloudflareResponse, type CloudflarePagesFunction } from './types';
 
 export { CloudflareResponse, type CloudflarePagesFunction };
 
+export function makePagesFunction<T = any>(fn: CloudflarePagesFunction<T>) {
+  return fn;
+}
+
 export function makeResponse<T = any>(body: T, init: ResponseInit = {}): CloudflareResponse<T> {
   return new CloudflareResponse(JSON.stringify(body), {
     ...init,

packages/vite-plugin-cloudflare-functions/types.d.ts

@@ -0,0 +1,10 @@
+declare global {
+  import type {
+    CloudflareResponse as _CloudflareResponse,
+    CloudflarePagesFunction as _CloudflarePagesFunction
+  } from './dist/worker';
+
+  export type CloudflareResponse = _CloudflareResponse;
+
+  export type CloudflarePagesFunction = _CloudflarePagesFunction;
+}

playground/functions/api/[msg].ts

@@ -1,4 +1,3 @@
-import { makeResponse } from 'vite-plugin-cloudflare-functions/worker';
+import { makePagesFunction, makeResponse } from 'vite-plugin-cloudflare-functions/worker';
 
-export const onRequestGet: CloudflarePagesFunction = () =>
-  makeResponse({ status: 'OK', data: 'Hello' });
+export const onRequestGet = makePagesFunction(() => makeResponse({ status: 'OK', data: 'Hello' }));

playground/functions/tsconfig.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "paths": {
       "vite-plugin-cloudflare-functions": ["../../packages/vite-plugin-cloudflare-functions/src/index.ts"],
+      "vite-plugin-cloudflare-functions/types": ["../../packages/vite-plugin-cloudflare-functions/types.d.ts"],
       "vite-plugin-cloudflare-functions/worker": ["../../packages/vite-plugin-cloudflare-functions/src/worker.ts"],
       "vite-plugin-cloudflare-functions/client": ["../../packages/vite-plugin-cloudflare-functions/src/client.ts"]
     }

tsconfig.json

@@ -15,6 +15,7 @@
     "skipDefaultLibCheck": true,
     "paths": {
       "vite-plugin-cloudflare-functions": ["./packages/vite-plugin-cloudflare-functions/src/index.ts"],
+      "vite-plugin-cloudflare-functions/types": ["./packages/vite-plugin-cloudflare-functions/types.d.ts"],
       "vite-plugin-cloudflare-functions/worker": ["./packages/vite-plugin-cloudflare-functions/src/worker.ts"],
       "vite-plugin-cloudflare-functions/client": ["./packages/vite-plugin-cloudflare-functions/src/client.ts"]
     }