fix: resolve TS2742 for tRPC protectedProcedure

koistya · koistya · commit 35c1dfc94ed3 · 2025-12-29T23:16:38.000+01:00
Derive procedure type from publicProcedure to avoid non-portable
inferred type error in declaration emit.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
     name: "Build"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # Configure Bun and install dependencies
       - uses: oven-sh/setup-bun@v2
         with:
@@ -74,7 +74,7 @@ jobs:
       - run: docker save api:${{ github.sha }} | gzip > api-image.tar.gz
 
       # Upload build artifacts
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: "build"
           path: "apps/web/dist\napps/app/dist\napps/api/dist\napi-image.tar.gz\n"
diff --git a/apps/api/lib/trpc.ts b/apps/api/lib/trpc.ts
@@ -1,4 +1,4 @@
-import { initTRPC, TRPCError } from "@trpc/server";
+import { initTRPC, TRPCError, type TRPCProcedureBuilder } from "@trpc/server";
 import { flattenError, ZodError } from "zod";
 import type { TRPCContext } from "./context.js";
 
@@ -18,18 +18,49 @@ const t = initTRPC.context<TRPCContext>().create({
 export const router = t.router;
 export const publicProcedure = t.procedure;
 
-export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
-  if (!ctx.session || !ctx.user) {
-    throw new TRPCError({
-      code: "UNAUTHORIZED",
-      message: "Authentication required",
+// Derive type from publicProcedure to stay in sync with initTRPC config.
+// Explicit annotation required to avoid TS2742 (non-portable inferred type).
+type ProtectedProcedure =
+  typeof publicProcedure extends TRPCProcedureBuilder<
+    infer TContext,
+    infer TMeta,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    infer TContextOverrides,
+    infer TInputIn,
+    infer TInputOut,
+    infer TOutputIn,
+    infer TOutputOut,
+    infer TCaller
+  >
+    ? TRPCProcedureBuilder<
+        TContext,
+        TMeta,
+        {
+          session: NonNullable<TRPCContext["session"]>;
+          user: NonNullable<TRPCContext["user"]>;
+        },
+        TInputIn,
+        TInputOut,
+        TOutputIn,
+        TOutputOut,
+        TCaller
+      >
+    : never;
+
+export const protectedProcedure: ProtectedProcedure = t.procedure.use(
+  ({ ctx, next }) => {
+    if (!ctx.session || !ctx.user) {
+      throw new TRPCError({
+        code: "UNAUTHORIZED",
+        message: "Authentication required",
+      });
+    }
+    return next({
+      ctx: {
+        ...ctx,
+        session: ctx.session,
+        user: ctx.user,
+      },
     });
-  }
-  return next({
-    ctx: {
-      ...ctx,
-      session: ctx.session,
-      user: ctx.user,
-    },
-  });
-});
+  },
+);
diff --git a/apps/api/lib/utils.ts b/apps/api/lib/utils.ts
diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
@@ -4,8 +4,9 @@
     "composite": true,
     "declaration": true,
     "declarationMap": true,
-    "noEmit": false,
+    "emitDeclarationOnly": true,
     "outDir": "./dist",
+    "tsBuildInfoFile": "../../.cache/tsconfig/api.tsbuildinfo",
     "types": ["@cloudflare/workers-types", "bun"]
   },
   "include": ["**/*.ts", "**/*.tsx"],
diff --git a/apps/app/tsconfig.json b/apps/app/tsconfig.json
@@ -6,8 +6,16 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["./*"],
+      "@repo/api": ["../api"],
+      "@repo/api/*": ["../api/*"],
+      "@repo/core": ["../../packages/core"],
+      "@repo/core/*": ["../../packages/core/*"],
+      "@repo/db": ["../../db"],
+      "@repo/db/*": ["../../db/*"],
       "@repo/ui": ["../../packages/ui"],
-      "@repo/ui/*": ["../../packages/ui/*"]
+      "@repo/ui/*": ["../../packages/ui/*"],
+      "@repo/ws-protocol": ["../../packages/ws-protocol"],
+      "@repo/ws-protocol/*": ["../../packages/ws-protocol/*"]
     }
   },
   "include": ["**/*.ts", "**/*.tsx", "**/*.json", "./global.d.ts"],
diff --git a/apps/email/package.json b/apps/email/package.json
@@ -26,10 +26,10 @@
     "react": "19.2.3"
   },
   "devDependencies": {
-    "react-email": "^5.1.1",
     "@react-email/preview-server": "^5.1.1",
     "@repo/typescript-config": "workspace:*",
     "@types/react": "^19.2.7",
+    "react-email": "^5.1.1",
     "typescript": "~5.9.3"
   }
 }
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -17,14 +17,15 @@
     "@repo/ui": "workspace:*",
     "astro": "^5.16.6",
     "hono": "^4.11.3",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3"
+    "react-dom": "^19.2.3",
+    "react": "^19.2.3"
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20251229.0",
     "@repo/typescript-config": "workspace:*",
     "@tailwindcss/postcss": "^4.1.18",
-    "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
+    "@types/react": "^19.2.7",
     "autoprefixer": "^10.4.23",
     "postcss": "^8.5.6",
     "tailwindcss": "^4.1.18",
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
@@ -16,5 +16,5 @@
   },
   "include": ["**/*.ts", "**/*.tsx", "**/*.json", "**/*.astro"],
   "exclude": ["**/dist/**/*", "**/node_modules/**/*"],
-  "references": [{ "path": "../api" }, { "path": "../../packages/ui" }]
+  "references": [{ "path": "../../packages/ui" }]
 }
diff --git a/bun.lock b/bun.lock
diff --git a/db/package.json b/db/package.json
@@ -39,6 +39,7 @@
   "devDependencies": {
     "@repo/typescript-config": "workspace:*",
     "@types/bun": "^1.3.5",
+    "@types/node": "^25.0.3",
     "dotenv": "^17.2.3",
     "drizzle-kit": "^0.31.8",
     "drizzle-orm": "^0.45.1",
diff --git a/db/tsconfig.json b/db/tsconfig.json
@@ -6,7 +6,7 @@
     "declaration": true,
     "emitDeclarationOnly": true,
     "outDir": "./dist",
-    "types": ["bun", "node", "vite/client"]
+    "types": ["bun", "node"]
   },
   "include": ["schema/**/*.ts", "*.ts", "*.json"],
   "exclude": ["**/dist/**/*", "**/node_modules/**/*", "scripts/**/*"]
diff --git a/package.json b/package.json
@@ -84,20 +84,21 @@
     "infra:prod:edge:destroy": "terraform -chdir=infra/envs/prod/edge destroy"
   },
   "devDependencies": {
+    "@ws-kit/zod": "^0.10.2",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/eslint-plugin": "^11.12.0",
     "@eslint-react/eslint-plugin": "^2.4.0",
     "@eslint/js": "^9.39.2",
     "@types/eslint": "^9.6.1",
     "@typescript-eslint/eslint-plugin": "^8.51.0",
     "@typescript-eslint/parser": "^8.51.0",
-    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint": "^9.39.2",
     "gh-pages": "^6.3.0",
     "globals": "^16.5.0",
     "graphql": "^16.12.0",
@@ -110,12 +111,12 @@
     "prettier": "^3.7.4",
     "react": "^19.2.3",
     "relay-config": "^12.0.1",
-    "typescript": "~5.9.3",
     "typescript-eslint": "^8.51.0",
     "typescript-language-server": "^5.1.3",
+    "typescript": "~5.9.3",
     "vite": "~7.3.0",
-    "vitepress": "2.0.0-alpha.15",
     "vitepress-plugin-mermaid": "^2.0.17",
+    "vitepress": "2.0.0-alpha.15",
     "vitest": "~4.0.16",
     "wrangler": "^4.54.0"
   },
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -50,8 +50,8 @@
     "tailwind-merge": "^3.4.0"
   },
   "devDependencies": {
-    "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
+    "@types/react": "^19.2.7",
     "tailwindcss": "^4.1.18",
     "typescript": "~5.9.3"
   },
diff --git a/packages/ws-protocol/messages.ts b/packages/ws-protocol/messages.ts
@@ -22,34 +22,24 @@ import { message, rpc, z } from "@ws-kit/zod";
 // Connection Health
 // ============================================================================
 
-/**
- * Ping message for connection health checks.
- * Server responds with Pong.
- */
+/** Ping message for connection health checks. Server responds with Pong. */
 export const Ping = message("PING", { timestamp: z.number().optional() });
 
-/**
- * Pong message sent in response to Ping.
- */
+/** Pong message sent in response to Ping. */
 export const Pong = message("PONG", { timestamp: z.number().optional() });
 
 // ============================================================================
 // Echo (Simple Request/Response)
 // ============================================================================
 
-/**
- * Echo message - simple example demonstrating request/response pattern.
- * Server echoes back the same text.
- */
+/** Echo message - server echoes back the same text. */
 export const Echo = message("ECHO", { text: z.string() });
 
 // ============================================================================
 // Notifications
 // ============================================================================
 
-/**
- * Server notification broadcast to clients.
- */
+/** Server notification broadcast to clients. */
 export const Notification = message("NOTIFICATION", {
   level: z.enum(["info", "warning", "error"]),
   message: z.string(),
@@ -59,9 +49,7 @@ export const Notification = message("NOTIFICATION", {
 // Error Handling
 // ============================================================================
 
-/**
- * Error message for communicating protocol-level errors.
- */
+/** Error message for communicating protocol-level errors. */
 export const ErrorMessage = message("ERROR", {
   code: z.enum(["INVALID_MESSAGE", "UNAUTHORIZED", "SERVER_ERROR"]),
   message: z.string(),
diff --git a/packages/ws-protocol/package.json b/packages/ws-protocol/package.json
@@ -14,7 +14,7 @@
     "example": "bun run example.ts"
   },
   "peerDependencies": {
-    "@ws-kit/zod": "^0.10.1",
+    "@ws-kit/zod": "^0.10.2",
     "zod": "^4.2.1"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "@ws-kit/bun": "^0.10.0",
     "@ws-kit/memory": "^0.10.0",
     "@ws-kit/pubsub": "^0.10.1",
-    "@ws-kit/zod": "^0.10.1",
+    "@ws-kit/zod": "^0.10.2",
     "typescript": "~5.9.3",
     "zod": "^4.2.1"
   }
diff --git a/scripts/mcp.ts b/scripts/mcp.ts
@@ -23,14 +23,10 @@ const server = new McpServer({
 server.tool(
   "eslint",
   "Lint JavaScript and TypeScript files with ESLint",
-  {
-    filename: z.string(),
-  },
-  async function lint({ filename }) {
+  { filename: z.string() },
+  async ({ filename }) => {
     const cmd = await $`bun run eslint ${filename}`;
-    return {
-      content: [{ type: "text", text: cmd.stdout }],
-    };
+    return { content: [{ type: "text", text: cmd.stdout }] };
   },
 );
 
diff --git a/scripts/package.json b/scripts/package.json
@@ -10,10 +10,12 @@
     "@modelcontextprotocol/sdk": "^1.25.1",
     "execa": "^9.6.1",
     "got": "^14.6.5",
+    "zod": "^4.2.1",
     "zx": "^8.8.5"
   },
   "devDependencies": {
     "@repo/typescript-config": "workspace:*",
+    "@types/bun": "^1.3.5",
     "typescript": "~5.9.3"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "files": [],
   "references": [
-    { "path": "./apps/api" },
     { "path": "./apps/app" },
+    { "path": "./apps/api" },
     { "path": "./apps/email" },
     { "path": "./apps/web" },
     { "path": "./db" },

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@`
`26`	`26`	`"react": "19.2.3"`
`27`	`27`	`},`
`28`	`28`	`"devDependencies": {`
`29`		`- "react-email": "^5.1.1",`
`30`	`29`	`"@react-email/preview-server": "^5.1.1",`
`31`	`30`	`"@repo/typescript-config": "workspace:*",`
`32`	`31`	`"@types/react": "^19.2.7",`
	`32`	`+ "react-email": "^5.1.1",`
`33`	`33`	`"typescript": "~5.9.3"`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`},`
`17`	`17`	`"include": ["*/.ts", "*/.tsx", "*/.json", "*/.astro"],`
`18`	`18`	`"exclude": ["/dist//", "/node_modules//"],`
`19`		`- "references": [{ "path": "../api" }, { "path": "../../packages/ui" }]`
	`19`	`+ "references": [{ "path": "../../packages/ui" }]`
`20`	`20`	`}`