fixed issue with server and app

apps/app/tsconfig.json

@@ -1,7 +1,14 @@
 {
   "extends": "expo/tsconfig.base",
   "compilerOptions": {
-    "strict": true
+    "strict": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/trpc": ["../../packages/api/src/trpc.ts"],
+      "@/languages/*": ["../../packages/api/src/languages/*"],
+      "@/schemas/*": ["../../packages/api/src/schemas/*"],
+      "@/utils": ["../../packages/api/src/utils.ts"]
+    }
   },
   "exclude": ["node_modules", "dist", "babel.config.js", "tailwind.config.js", "metro.config.js"]
 }

apps/server/jest.config.ts

@@ -5,5 +5,11 @@ const config: Config.InitialOptions = {
     transform: {
         '^.+\\.tsx?$': 'ts-jest',
     },
+    moduleNameMapper: {
+        '^@/trpc$': '<rootDir>/../../../packages/api/src/trpc.ts',
+        '^@/utils$': '<rootDir>/../../../packages/api/src/utils.ts',
+        '^@/schemas$': '<rootDir>/../../../packages/api/src/schemas',
+        '^@/languages$': '<rootDir>/../../../packages/api/src/languages',
+    },
 };
 export default config;

apps/server/package.json

@@ -15,6 +15,7 @@
     "@repo/eslint-config": "^0.0.0",
     "@repo/typescript-config": "^0.0.0",
     "@types/express": "^4.17.21",
+    "@types/module-alias": "^2.0.4",
     "@types/node": "^20.11.24",
     "@types/ws": "^8.5.10",
     "eslint": "^8.57.0",
@@ -28,6 +29,7 @@
     "@types/jest": "^29.5.12",
     "dotenv": "^16.4.5",
     "jest": "^29.7.0",
+    "module-alias": "^2.2.3",
     "spawn-command-with-kill": "^1.0.2",
     "ts-jest": "^29.1.2",
     "ws": "^8.16.0"

apps/server/src/index.ts

@@ -1,3 +1,4 @@
+import './paths';
 import dotenv from 'dotenv';
 import { createHTTPServer } from '@trpc/server/adapters/standalone';
 import { AppRouter, appRouter, createContext } from '@repo/api';

apps/server/src/paths.ts

@@ -0,0 +1,9 @@
+import 'module-alias/register';
+import { addAliases } from 'module-alias';
+
+addAliases({
+    '@/trpc': __dirname + '/../../../packages/api/src/trpc.ts',
+    '@/utils': __dirname + '/../../../packages/api/src/utils.ts',
+    '@/schemas': __dirname + '/../../../packages/api/src/schemas',
+    '@/languages': __dirname + '/../../../packages/api/src/languages',
+});

apps/server/tests/trpc.test.ts

@@ -1,3 +1,4 @@
+import '../src/paths';
 /* eslint-disable no-undef */
 import { createTRPCClient, httpBatchLink } from '@trpc/client';
 import { AppRouter } from '@repo/api';
@@ -99,7 +100,7 @@ describe('lsp capabilities', () => {
         await init(trpc, fileDir);
 
         // Open the file index.ts in the LSP session
-        await trpc.lsp.didOpen.query({
+        await trpc.lsp.textDocument.didOpen.query({
             language: 'typescript',
             options: {
                 textDocument: {
@@ -113,7 +114,7 @@ describe('lsp capabilities', () => {
     });
 
     it('should give info about hover', async () => {
-        const result = await trpc.lsp.hover.query({
+        const result = await trpc.lsp.textDocument.hover.query({
             language: 'typescript',
             options: {
                 textDocument: {
@@ -125,12 +126,12 @@ describe('lsp capabilities', () => {
                 },
             },
         });
-
-        expect(result.contents.value).toContain('console');
+        if (typeof result.contents === 'object' && 'value' in result.contents)
+            expect(result.contents.value).toContain('console');
     });
 
     it('should give info about semantic tokens', async () => {
-        const result = await trpc.lsp.semanticTokens.query({
+        const result = await trpc.lsp.textDocument.semanticTokens.query({
             language: 'typescript',
             options: {
                 textDocument: {

apps/server/tsconfig.json

@@ -1,7 +1,14 @@
 {
     "extends": "@repo/typescript-config/base.json",
     "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "@/trpc": ["../../packages/api/src/trpc.ts"],
+            "@/languages/*": ["../../packages/api/src/languages/*"],
+            "@/schemas/*": ["../../packages/api/src/schemas/*"],
+            "@/utils": ["../../packages/api/src/utils.ts"]
+        }
     },
-    "include": ["src/**/*.ts", "tests/**/*.ts"],
+    "include": ["src/**/*.ts", "tests/**/*.ts", ],
     "exclude": ["node_modules"]
 }

packages/api/src/routes/lsp/index.ts

@@ -1,14 +1,10 @@
 import { router } from '@/trpc';
-import { hoverRoute } from './hover';
-import { initializeRoute } from './initialize';
-import { semanticTokensRoute } from './semanticTokens';
-import { didOpenRoute } from './didOpenRoute';
+import { initializeRoute } from './initializeRoute';
 import { windowRouter } from './window/windowRouter';
+import { textDocumentRouter } from './textDocument/textDocumentRouter';
 
 export const lspRouter = router({
-    hover: hoverRoute,
     initialize: initializeRoute,
-    semanticTokens: semanticTokensRoute,
-    didOpen: didOpenRoute,
     window: windowRouter,
+    textDocument: textDocumentRouter,
 });

packages/api/src/routes/lsp/didOpenRoute.ts → packages/api/src/routes/lsp/textDocument/didOpenRoute.ts

@@ -1,5 +1,5 @@
 import { publicProcedure } from '@/trpc';
-import { getClient, lspRouterInputSchema } from './clients';
+import { getClient, lspRouterInputSchema } from '../clients';
 import { didOpenTextDocumentParamsSchema } from '@/schemas/zodSchemas';
 
 export const openInputSchema = lspRouterInputSchema.extend({

packages/api/src/routes/lsp/hover.ts → packages/api/src/routes/lsp/textDocument/hoverRoute.ts

@@ -1,6 +1,6 @@
 import { publicProcedure } from '@/trpc';
 import { hoverParamsSchema, hoverSchema } from '@/schemas/zodSchemas';
-import { getClient, lspRouterInputSchema } from './clients';
+import { getClient, lspRouterInputSchema } from '../clients';
 export const hoverInputSchema = lspRouterInputSchema.extend({
     options: hoverParamsSchema,
 });

packages/api/src/routes/lsp/semanticTokens.ts → packages/api/src/routes/lsp/textDocument/semanticTokensRoute.ts

@@ -1,5 +1,5 @@
 import { publicProcedure } from '@/trpc';
-import { getClient, lspRouterInputSchema } from './clients';
+import { getClient, lspRouterInputSchema } from '../clients';
 import { z } from 'zod';
 export const semanticTokensInputSchema = lspRouterInputSchema.extend({
     options: z.object({

packages/api/src/routes/lsp/textDocument/textDocumentRouter.ts

@@ -0,0 +1,10 @@
+import { router } from '@/trpc';
+import { didOpenRoute } from './didOpenRoute';
+import { hoverRoute } from './hoverRoute';
+import { semanticTokensRoute } from './semanticTokensRoute';
+
+export const textDocumentRouter = router({
+    didOpen: didOpenRoute,
+    hover: hoverRoute,
+    semanticTokens: semanticTokensRoute,
+});

packages/api/src/routes/lsp/window/windowRouter.ts

@@ -1,5 +1,5 @@
 import { router } from '@/trpc';
-import { showMessageRoute } from './showMessage';
+import { showMessageRoute } from './showMessageRoute';
 
 export const windowRouter = router({
     showMessage: showMessageRoute,

packages/api/tsconfig.json

@@ -2,7 +2,6 @@
   "extends": "@repo/typescript-config/react-library.json",
   "compilerOptions": {
     "outDir": "dist",
-    "baseUrl": "./",
     "paths": {
       "@/trpc": ["./src/trpc.ts"],
       "@/languages/*": ["./src/languages/*"],