jsonnull · jsonnull · Oct 23, 2022 · Oct 23, 2022 · Oct 23, 2022 · Oct 23, 2022
diff --git a/.changeset/sharp-crews-melt.md b/.changeset/sharp-crews-melt.md
@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Fix transformer path.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,6 +19,7 @@ jobs:
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
       - run: pnpm build
+      - run: pnpm --filter=examples/basic build
       - run: pnpm test:coverage
       - uses: codecov/codecov-action@v3
 

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 node_modules
-/dist
-/coverage
+examples/*/dist
+examples/*/coverage
+examples/*/*/dist
+examples/*/*/coverage
+packages/*/dist
+packages/*/coverage
diff --git a/examples/basic/main/api.ts b/examples/basic/main/api.ts
@@ -0,0 +1,16 @@
+import z from 'zod';
+import { initTRPC } from '@trpc/server';
+
+const t = initTRPC.create({ isServer: true });
+
+export const router = t.router({
+  greeting: t.procedure.input(z.object({ name: z.string() })).query((req) => {
+    const { input } = req;
+
+    return {
+      text: `Hello ${input.name}` as const,
+    };
+  }),
+});
+
+export type AppRouter = typeof router;
diff --git a/examples/basic/main/main.ts b/examples/basic/main/main.ts
@@ -0,0 +1,18 @@
+import path from 'path';
+import { app, ipcMain, BrowserWindow } from 'electron';
+import { createIPCHandler } from 'electron-trpc';
+import { router } from './api';
+
+app.on('ready', () => {
+  createIPCHandler({ ipcMain, router: router as any });
+
+  const win = new BrowserWindow({
+    webPreferences: {
+      preload: path.resolve(__dirname, 'preload.js'),
+    },
+  });
+
+  win.loadFile(path.resolve(__dirname, '../../renderer/dist/index.html'));
+
+  win.show();
+});
diff --git a/examples/basic/main/preload.ts b/examples/basic/main/preload.ts
@@ -0,0 +1,6 @@
+import { contextBridge, ipcRenderer } from 'electron';
+import { exposeElectronTRPC } from 'electron-trpc';
+
+process.once('loaded', async () => {
+  exposeElectronTRPC({ contextBridge, ipcRenderer });
+});
diff --git a/examples/basic/main/tsconfig.json b/examples/basic/main/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "alwaysStrict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "lib": ["dom", "es2017"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "strict": true,
+    "target": "esnext"
+  },
+  "include": ["./*.ts"],
+  "exclude": ["node_modules"]
+}
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "examples/basic",
+  "description": "Electron support for tRPC",
+  "version": "0.0.0",
+  "private": true,
+  "main": "main/dist/main.js",
+  "license": "MIT",
+  "scripts": {
+    "start": "electron .",
+    "build": "tsc -p main && tsc -p renderer && vite build renderer "
+  },
+  "dependencies": {
+    "@tanstack/react-query": "^4.8.0",
+    "@trpc/client": "10.0.0-proxy-beta.25",
+    "@trpc/react": "10.0.0-proxy-beta.11",
+    "@trpc/react-query": "10.0.0-proxy-beta.25",
+    "@trpc/server": "10.0.0-proxy-beta.25",
+    "electron": "^19.0.9",
+    "electron-trpc": "0.2.0-next.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "zod": "^3.19.1"
+  },
+  "devDependencies": {
+    "@types/node": "^17.0.10",
+    "@types/react": "^18.0.21",
+    "@types/react-dom": "^18.0.6",
+    "@vitejs/plugin-react": "^2.1.0",
+    "vite": "^3.0.3"
+  }
+}
diff --git a/examples/basic/renderer/index.html b/examples/basic/renderer/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'" />
+    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'" />
+    <title>Hello from Electron renderer!</title>
+  </head>
+  <body>
+    <div id="react-root"></div>
+  </body>
+  <script type="module" src="./index"></script>
+</html>
diff --git a/examples/basic/renderer/index.tsx b/examples/basic/renderer/index.tsx
@@ -0,0 +1,37 @@
+import React, { useState } from 'react';
+import ReactDom from 'react-dom';
+import { ipcLink } from 'electron-trpc';
+import { createTRPCReact } from '@trpc/react-query';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { AppRouter } from '../main/api';
+
+const trpcReact = createTRPCReact<AppRouter>();
+
+function App() {
+  const [queryClient] = useState(() => new QueryClient());
+  const [trpcClient] = useState(() =>
+    trpcReact.createClient({
+      links: [ipcLink()],
+    })
+  );
+
+  return (
+    <trpcReact.Provider client={trpcClient} queryClient={queryClient}>
+      <QueryClientProvider client={queryClient}>
+        <HelloElectron />
+      </QueryClientProvider>
+    </trpcReact.Provider>
+  );
+}
+
+function HelloElectron() {
+  const { data } = trpcReact.greeting.useQuery({ name: 'Electron' });
+
+  if (!data) {
+    return null;
+  }
+
+  return <div>{data.text}</div>;
+}
+
+ReactDom.render(<App />, document.getElementById('react-root'));
diff --git a/examples/basic/renderer/tsconfig.json b/examples/basic/renderer/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "alwaysStrict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "jsx": "react",
+    "lib": ["dom", "es2017"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmit": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "esnext"
+  },
+  "include": ["./*.ts", "./*.tsx"],
+  "exclude": ["node_modules"]
+}
diff --git a/examples/basic/renderer/vite.config.ts b/examples/basic/renderer/vite.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+  base: './',
+  define: {
+    'process.env': {},
+  },
+  plugins: [react()],
+});
diff --git a/package.json b/package.json
@@ -1,54 +1,17 @@
 {
-  "name": "electron-trpc",
-  "description": "Electron support for tRPC",
-  "version": "0.2.0-next.2",
-  "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.mjs"
-    }
-  },
-  "author": "Jason Nall <jsonnull@gmail.com>",
   "license": "MIT",
-  "files": [
-    "dist",
-    "src"
-  ],
   "scripts": {
-    "build": "tsc && vite build && dts-bundle-generator --config ./dts-bundle-generator.config.ts",
-    "test": "vitest",
-    "test:coverage": "vitest run --coverage",
+    "build": "pnpm --filter=electron-trpc build",
+    "test": "pnpm --filter=electron-trpc test",
+    "test:coverage": "pnpm --filter=electron-trpc test:coverage",
     "prepublish": "yarn build",
     "changeset": "changeset",
     "release": "changeset publish"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.6",
     "@changesets/cli": "^2.24.1",
-    "@tanstack/react-query": "^4.8.0",
-    "@trpc/client": "10.0.0-proxy-beta.11",
-    "@trpc/react": "10.0.0-proxy-beta.11",
-    "@trpc/server": "10.0.0-proxy-beta.11",
-    "@types/node": "^17.0.10",
-    "builtin-modules": "^3.3.0",
-    "c8": "^7.12.0",
-    "dts-bundle-generator": "^6.12.0",
-    "electron": "^19.0.9",
     "prettier": "^2.5.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "typescript": "^4.5.5",
-    "vite": "^3.0.3",
-    "vite-plugin-commonjs-externals": "^0.1.1",
-    "vitest": "^0.19.1",
-    "zod": "^3.19.1"
-  },
-  "peerDependencies": {
-    "@trpc/client": "10.0.0-proxy-beta.11",
-    "@trpc/server": "10.0.0-proxy-beta.11",
-    "electron": ">19.0.0"
+    "typescript": "^4.5.5"
   }
 }
diff --git a/dts-bundle-generator.config.ts → ...ctron-trpc/dts-bundle-generator.config.ts b/dts-bundle-generator.config.ts → ...ctron-trpc/dts-bundle-generator.config.ts
diff --git a/packages/electron-trpc/package.json b/packages/electron-trpc/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "electron-trpc",
+  "description": "Electron support for tRPC",
+  "version": "0.2.0-next.2",
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs"
+    }
+  },
+  "author": "Jason Nall <jsonnull@gmail.com>",
+  "license": "MIT",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "build": "tsc && vite build && dts-bundle-generator --config ./dts-bundle-generator.config.ts",
+    "test": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "prepublish": "yarn build",
+    "changeset": "changeset",
+    "release": "changeset publish"
+  },
+  "devDependencies": {
+    "@tanstack/react-query": "^4.8.0",
+    "@trpc/client": "10.0.0-proxy-beta.25",
+    "@trpc/react": "10.0.0-proxy-beta.20",
+    "@trpc/server": "10.0.0-proxy-beta.25",
+    "@types/node": "^17.0.10",
+    "builtin-modules": "^3.3.0",
+    "c8": "^7.12.0",
+    "dts-bundle-generator": "^6.12.0",
+    "electron": "^19.0.9",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "vite": "^3.0.3",
+    "vite-plugin-commonjs-externals": "^0.1.1",
+    "vitest": "^0.19.1",
+    "zod": "^3.19.1"
+  },
+  "peerDependencies": {
+    "@trpc/client": "10.0.0-proxy-beta.11",
+    "@trpc/server": "10.0.0-proxy-beta.11",
+    "electron": ">19.0.0"
+  }
+}
diff --git a/src/index.ts → packages/electron-trpc/src/index.ts b/src/index.ts → packages/electron-trpc/src/index.ts
diff --git a/...main/__tests__/resolveIPCResponse.test.ts → ...main/__tests__/resolveIPCResponse.test.ts b/...main/__tests__/resolveIPCResponse.test.ts → ...main/__tests__/resolveIPCResponse.test.ts
diff --git a/src/main/createIPCHandler.ts → ...lectron-trpc/src/main/createIPCHandler.ts b/src/main/createIPCHandler.ts → ...lectron-trpc/src/main/createIPCHandler.ts
diff --git a/src/main/exposeElectronTRPC.ts → ...ctron-trpc/src/main/exposeElectronTRPC.ts b/src/main/exposeElectronTRPC.ts → ...ctron-trpc/src/main/exposeElectronTRPC.ts
diff --git a/src/main/index.ts → packages/electron-trpc/src/main/index.ts b/src/main/index.ts → packages/electron-trpc/src/main/index.ts
diff --git a/src/main/resolveIPCResponse.ts → ...ctron-trpc/src/main/resolveIPCResponse.ts b/src/main/resolveIPCResponse.ts → ...ctron-trpc/src/main/resolveIPCResponse.ts
@@ -15,7 +15,7 @@ export async function resolveIPCResponse<TRouter extends AnyRouter>({
   operation: Operation;
 }): Promise<IPCResponse> {
   const { type, input: serializedInput } = operation;
-  const { transformer } = router._def;
+  const { transformer } = router._def._config;
   const deserializedInput = transformer.input.deserialize(serializedInput) as unknown;
 
   type TRouterError = inferRouterError<TRouter>;

diff --git a/src/main/types.ts → packages/electron-trpc/src/main/types.ts b/src/main/types.ts → packages/electron-trpc/src/main/types.ts
diff --git a/src/main/utils.ts → packages/electron-trpc/src/main/utils.ts b/src/main/utils.ts → packages/electron-trpc/src/main/utils.ts
@@ -51,7 +51,7 @@ export function transformTRPCResponseItem<
   if ("error" in item) {
     return {
       ...item,
-      error: router._def.transformer.output.serialize(item.error) as unknown,
+      error: router._def._config.transformer.output.serialize(item.error) as unknown,
     };
   }
 
@@ -60,12 +60,12 @@ export function transformTRPCResponseItem<
       ...item,
       result: {
         ...item.result,
-        data: router._def.transformer.output.serialize(
+        data: router._def._config.transformer.output.serialize(
           item.result.data
         ) as unknown,
       },
     };
   }
 
   return item;
-}
+}
diff --git a/src/renderer/index.ts → packages/electron-trpc/src/renderer/index.ts b/src/renderer/index.ts → packages/electron-trpc/src/renderer/index.ts
diff --git a/src/renderer/ipcLink.ts → ...ges/electron-trpc/src/renderer/ipcLink.ts b/src/renderer/ipcLink.ts → ...ges/electron-trpc/src/renderer/ipcLink.ts
diff --git a/src/renderer/utils.ts → packages/electron-trpc/src/renderer/utils.ts b/src/renderer/utils.ts → packages/electron-trpc/src/renderer/utils.ts
diff --git a/tsconfig.json → packages/electron-trpc/tsconfig.json b/tsconfig.json → packages/electron-trpc/tsconfig.json
diff --git a/vite.config.ts → packages/electron-trpc/vite.config.ts b/vite.config.ts → packages/electron-trpc/vite.config.ts