Merge pull request #4 from codenickycode/change-server-types-gen

Change server types gen

Author: codenickycode

.gitignore

@@ -8,3 +8,4 @@ repo.txt
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+*.tsbuildinfo

client/.eslintignore

@@ -1 +1,2 @@
-.eslintrc.cjs
+.eslintrc.cjs
+src/server-types.d.ts

client/package.json

@@ -3,7 +3,8 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "build": "tsc -b && vite build",
+    "build": "pnpm run build:server-types && tsc -b && vite build",
+    "build:server-types": "tsc -p ../server/tsconfig.shared.json --declaration --emitDeclarationOnly --outFile ./src/server-types.d.ts",
     "build:test": "tsc -b && E2E=true vite build",
     "deploy:stage": "pnpm wrangler pages deploy ./dist --project-name todo:rename --branch \"stage\" --commit-hash \"$GITHUB_SHA\" --commit-message \"stage deployment\"",
     "deploy:prod": "pnpm wrangler pages deploy ./dist --project-name todo:rename",

client/src/example.test.tsx

@@ -10,6 +10,7 @@ import { Example } from './example';
 
 // Mock only the react-query hook
 vi.mock('@tanstack/react-query', async (importOriginal) => {
+  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const mod = await importOriginal<typeof import('@tanstack/react-query')>();
   return {
     ...mod,

client/src/example.tsx

@@ -4,8 +4,8 @@ import { Modal } from './components/ui.modal';
 import { useQuery } from '@tanstack/react-query';
 import { getServerUrl } from './config';
 import { hc } from 'hono/client';
-import type { ServerApi } from '../../server/src/types';
 import { useMonitor } from './services/monitor.use-monitor';
+import type { ServerApi } from 'types.shared';
 
 const serverUrl = getServerUrl();
 

client/src/server-types.d.ts

@@ -0,0 +1,62 @@
+declare module "types" {
+    import type { KVNamespace } from '@cloudflare/workers-types';
+    import type { Context as HonoContext } from 'hono';
+    export interface Env {
+        ALLOWED_HOST: string;
+        DB: KVNamespace;
+        LOCAL_DB: KVNamespace;
+        TEST_DB: KVNamespace;
+        ENV: 'dev' | 'prod' | 'stage' | 'test';
+        GITHUB_REF_NAME: string;
+        GITHUB_SHA: string;
+    }
+    export type Context = HonoContext<{
+        Bindings: Env;
+    }>;
+}
+declare module "test" {
+    import type { Env } from "types";
+    export const testRoute: import("hono/hono-base").HonoBase<{
+        Bindings: Env;
+    }, {
+        "/reset": {
+            $post: {
+                input: {};
+                output: {};
+                outputFormat: string;
+                status: import("hono/utils/http-status").StatusCode;
+            };
+        };
+    }, "/">;
+}
+declare module "index" {
+    import type { Env } from "types";
+    const app: import("hono/hono-base").HonoBase<{
+        Bindings: Env;
+    }, ({
+        "*": {};
+    } & {
+        "/": {
+            $get: {
+                input: {};
+                output: "ok";
+                outputFormat: "text";
+                status: 200;
+            };
+        };
+    }) | import("hono/types").MergeSchemaPath<{
+        "/reset": {
+            $post: {
+                input: {};
+                output: {};
+                outputFormat: string;
+                status: import("hono/utils/http-status").StatusCode;
+            };
+        };
+    }, "/test">, "/">;
+    export default app;
+}
+declare module "types.shared" {
+    import type app from "index";
+    export type ServerApi = typeof app;
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-react-spa-cloudflare",
   "type": "module",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "Starter package for react spa with cloudflare pages, workers, and kv",
   "bin": "./bin/cli.js",
   "scripts": {

server/src/types.shared.ts

@@ -0,0 +1,3 @@
+import type app from './index';
+
+export type ServerApi = typeof app;

server/src/types.ts

@@ -1,6 +1,5 @@
 import type { KVNamespace } from '@cloudflare/workers-types';
 import type { Context as HonoContext } from 'hono';
-import type app from './index';
 
 export interface Env {
   ALLOWED_HOST: string;
@@ -15,5 +14,3 @@ export interface Env {
 export type Context = HonoContext<{
   Bindings: Env;
 }>;
-
-export type ServerApi = typeof app;

server/tsconfig.shared.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": false,
+    "types": [
+      "@cloudflare/workers-types",
+      "@cloudflare/workers-types/experimental",
+      "@cloudflare/vitest-pool-workers"
+    ],
+    "noUnusedLocals": true,
+    "noUnusedParameters": true
+  },
+  "include": ["src/types.shared.ts"]
+}