still borked, migrating to monorepo

Author: cyanff

electron.vite.config.ts

@@ -2,6 +2,8 @@ import react from "@vitejs/plugin-react";
 import { defineConfig, externalizeDepsPlugin } from "electron-vite";
 import path, { resolve } from "path";
 
+const isLocal = false;
+
 export default defineConfig({
   main: {
     resolve: {
@@ -19,8 +21,10 @@ export default defineConfig({
     resolve: {
       alias: {
         "@": path.resolve(__dirname, "./src/renderer/src"),
-        "@renderer": resolve("src/renderer/src"),
-        "@shared": resolve("src/shared/")
+        "@shared": resolve("src/shared/"),
+        "@platform": isLocal
+          ? resolve("src/renderer/src/lib/platform/platform.ts")
+          : resolve("../test-vite/platform/platform.ts")
       }
     },
     plugins: [react()]

package-lock.json

@@ -89,6 +89,7 @@
     "@electron-toolkit/eslint-config-prettier": "^2.0.0",
     "@electron-toolkit/eslint-config-ts": "^1.0.1",
     "@electron-toolkit/tsconfig": "^1.0.1",
+    "@rollup/plugin-dynamic-import-vars": "^2.1.2",
     "@types/node": "^18.19.22",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",

package.json

@@ -3,13 +3,16 @@ import { BrowserWindow, Menu, Tray, app, dialog, nativeImage, net, protocol, she
 import { createIPCHandler } from "electron-trpc/main";
 import { autoUpdater } from "electron-updater";
 import path, { join } from "path";
+// @ts-ignore - Electron vite asset import type error
 import icon from "../../resources/icon.png?asset";
 import { blob } from "./lib/blob";
 import { sqlite } from "./lib/sqlite";
 import { cardsRootPath, personasRootPath } from "./lib/utils";
-import { router } from "./routers/router";
+import { router } from "./router";
 
-export let win: any;
+// TODO: Decompose and refactor this heap of noise
+
+let win: any;
 let isQuiting = false;
 
 // Prevent multiple app instances
@@ -158,7 +161,6 @@ app.whenReady().then(async () => {
 
   await blob.init();
   await sqlite.init();
-  createIPCHandler({ router, windows: [win] });
 
   // Open or close DevTools using F12 in development
   // Ignore Cmd/Ctrl + R in production.
@@ -201,6 +203,7 @@ app.whenReady().then(async () => {
   });
 
   createWindow();
+  createIPCHandler({ router, windows: [win] });
 });
 
 function createWindow(): void {

src/main/index.ts

@@ -9,85 +9,61 @@ import {
   UpdatePersonaBundleSchema,
   XFetchRequestSchema
 } from "@shared/schema/ipc";
+import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
 import { initTRPC } from "@trpc/server";
+import test from "node:test";
 import { z } from "zod";
 
-const t = initTRPC.create();
+const t = initTRPC.create({ isServer: true });
 
-// TODO: sqlite inputs should be declared as a schema
 const sqliteRouter = t.router({
-  run: t.procedure.input(SQLiteRunSchema).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  all: t.procedure.input(SQLiteAllSchema).query(({ input }) => {
-    // Implement your logic here
-  }),
-  get: t.procedure.input(SQLiteGetSchema).query(({ input }) => {
-    // Implement your logic here
-  }),
-  runAsTransaction: t.procedure.input(SQLiteRunAsTransactionSchema).mutation(({ input }) => {
-    // Implement your logic here
-  })
+  run: t.procedure.input(SQLiteRunSchema).mutation(({ input }) => {}),
+  all: t.procedure.input(SQLiteAllSchema).query(({ input }) => {}),
+  get: t.procedure.input(SQLiteGetSchema).query(({ input }) => {}),
+  runAsTransaction: t.procedure.input(SQLiteRunAsTransactionSchema).mutation(({ input }) => {})
 });
 
 const cardsRouter = t.router({
-  create: t.procedure.input(CreateCardBundleSchema).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  read: t.procedure.input(z.number()).query(({ input }) => {
-    // Implement your logic here
-  }),
-  update: t.procedure.input(UpdateCardBundleSchema).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  del: t.procedure.input(z.number()).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  export_: t.procedure.input(z.number()).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  import_: t.procedure.input(z.string()).mutation(({ input }) => {
-    // Implement your logic here
-  })
+  create: t.procedure.input(CreateCardBundleSchema).mutation(({ input }) => {}),
+  read: t.procedure.input(z.number()).query(({ input }) => {}),
+  update: t.procedure.input(UpdateCardBundleSchema).mutation(({ input }) => {}),
+  del: t.procedure.input(z.number()).mutation(({ input }) => {}),
+  export_: t.procedure.input(z.number()).mutation(({ input }) => {}),
+  import_: t.procedure.input(z.string()).mutation(({ input }) => {})
 });
 
 const personasRouter = t.router({
-  create: t.procedure.input(CreatePersonaBundleSchema).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  read: t.procedure.input(z.number()).query(({ input }) => {
-    // Implement your logic here
-  }),
-  update: t.procedure.input(UpdatePersonaBundleSchema).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  del: t.procedure.input(z.number()).mutation(({ input }) => {
-    // Implement your logic here
-  })
+  create: t.procedure.input(CreatePersonaBundleSchema).mutation(({ input }) => {}),
+  read: t.procedure.input(z.number()).query(({ input }) => {}),
+  update: t.procedure.input(UpdatePersonaBundleSchema).mutation(({ input }) => {}),
+  del: t.procedure.input(z.number()).mutation(({ input }) => {})
 });
 
 const xfetchRouter = t.router({
-  post: t.procedure.input(XFetchRequestSchema).mutation(({ input }) => {
-    // Implement your logic here
-  }),
-  get: t.procedure.input(XFetchRequestSchema).query(({ input }) => {
-    // Implement your logic here
-  }),
-  abort: t.procedure.input(z.string()).mutation(({ input }) => {
-    // Implement your logic here
-  })
+  post: t.procedure.input(XFetchRequestSchema).mutation(({ input }) => {}),
+  get: t.procedure.input(XFetchRequestSchema).query(({ input }) => {}),
+  abort: t.procedure.input(z.string()).mutation(({ input }) => {})
 });
 
 const utilsRouter = t.router({
-  openURL: t.procedure.input(z.string()).mutation(({ input }) => {
-    // Implement your logic here
-  })
+  openURL: t.procedure.input(z.string()).mutation(({ input }) => {})
 });
 
 export const router = t.router({
-  sqlite: sqliteRouter,
-  cards: cardsRouter,
-  personas: personasRouter,
-  xfetch: xfetchRouter,
-  utils: utilsRouter
+  // sqlite: sqliteRouter,
+  // cards: cardsRouter,
+  // personas: personasRouter,
+  // xfetch: xfetchRouter,
+  // utils: utilsRouter
+  test: t.procedure.query(() => {
+    return { kind: "ok", data: "Hello World!" };
+  }),
+  test2: t.procedure.query(() => {
+    return "Hello World!";
+  }),
+  test3: t.procedure.query(() => {
+    return Math.random() % 2 === 0 ? { kind: "ok", data: "Hello World!" } : { kind: "error", data: "Hello World!" };
+  })
 });
+
+export type AppRouter = typeof router;

src/main/routers/router.ts renamed to src/main/router.ts

@@ -1,4 +1,13 @@
-import { exposeElectronTRPC } from "electron-trpc/main";
+import { contextBridge, ipcRenderer } from "electron";
+
+export const ELECTRON_TRPC_CHANNEL = "electron-trpc";
+const exposeElectronTRPC = () => {
+  const electronTRPC: any = {
+    sendMessage: (operation) => ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
+    onMessage: (callback) => ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
+  };
+  contextBridge.exposeInMainWorld("electronTRPC", electronTRPC);
+};
 
 process.once("loaded", async () => {
   exposeElectronTRPC();

src/main/routers/cards.ts

@@ -210,7 +210,7 @@ export default function App() {
           </CommandDialog>
         )}
 
-        {/* <div className="flex h-full w-full overflow-hidden py-4">
+        <div className="flex h-full w-full overflow-hidden py-4">
           {page === "create" && <CreationPage setPage={setPage} />}
           {page === "chats" && !activeChatID && (
             <div className="flex items-center justify-center w-full h-full text-tx-tertiary">
@@ -224,7 +224,7 @@ export default function App() {
           {page === "chats" && activeChatID && <ChatsPage chatID={activeChatID} />}
           {page === "collections" && <CollectionsPage cardBundles={cardBundles} />}
           {page === "settings" && <SettingsPage />}
-        </div> */}
+        </div>
       </div>
     </AppContext.Provider>
   );

src/main/routers/personas.ts

@@ -0,0 +1,14 @@
+import { createTRPCProxyClient } from "@trpc/client";
+import { ipcLink } from "electron-trpc/renderer";
+import type { AppRouter } from "../../../main/router";
+
+interface SandboxProps {}
+export default function Sandbox({}: SandboxProps) {
+  return (
+    <div className="flex h-full w-full rounded-xl ">
+      <p></p>
+
+      <button onClick={() => {}}></button>
+    </div>
+  );
+}

src/main/routers/sqlite.ts

@@ -4,7 +4,7 @@
 
 import { Result } from "@shared/types";
 import { deepFreeze } from "@shared/utils";
-
+// TODO: move this to platform
 async function importFromFileList(files: FileList): Promise<Result<void, Error>[]> {
   const numFiles = files.length;
   if (numFiles === 0) {