updates

MrRefactoring · MrRefactoring · commit 838a23b01f89 · 2025-04-20T23:22:49.000+03:00
diff --git a/rollup.config.ts b/rollup.config.ts
@@ -22,7 +22,7 @@ export default defineConfig([
     plugins: [
       alias({
         entries: [
-          { find: '@', replacement: resolve(__dirname, 'src') },
+          { find: '~', replacement: resolve(__dirname, 'src') },
         ]
       }),
       nodeResolve(),
diff --git a/src/api/boards.ts b/src/api/boards.ts
@@ -1,8 +1,14 @@
-import type { Client, Request } from '@/interfaces';
-import { boardSchema, Board, CreateBoard } from '@/schemas/api/boards';
+import type { Client, Request } from '~/interfaces';
+import { boardSchema, Board, CreateBoard } from '~/schemas/api/boards';
+import { TrelloId } from '~/schemas/common';
+import { Members } from './members';
 
 export class Boards {
-  constructor(private client: Client) {}
+  private membersClient: Members;
+
+  constructor(private client: Client) {
+    this.membersClient = new Members(this.client);
+  }
 
   /** Create a new board. */
   async create<T = Board>(board: CreateBoard): Promise<T> {
@@ -15,5 +21,38 @@ export class Boards {
     return this.client.sendRequest<T, never>(request, boardSchema);
   }
 
-  async delete(boardId) {}
+  // async list() {
+  //   const request: Request = {
+  //     url: '/members/me/'
+  //   };
+  //
+  //   return this.client.sendRequest(request);
+  // }
+
+  async getAll() {
+    const boardsId = await this.membersClient.getBoards('me');
+
+    const  boards: Board[] = [];
+
+    for (const { id } of boardsId) {
+      const board = await this.get(id);
+
+      boards.push(board);
+    }
+
+    return boards;
+  }
+
+  /** Request a single board. */
+  async get(boardId: TrelloId): Promise<Board> {
+    const request: Request = {
+      url: `/boards/${boardId}`,
+      method: 'GET',
+      // todo additional queries
+    };
+
+    return this.client.sendRequest(request, boardSchema);
+  }
+
+  // async delete(boardId) {}
 }
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -0,0 +1,2 @@
+export * from './boards';
+export * from './members';
diff --git a/src/api/members.ts b/src/api/members.ts
@@ -0,0 +1,18 @@
+import type { Client, Request } from '~/interfaces';
+import type { TrelloId } from '~/schemas/common';
+
+export class Members {
+  constructor(private client: Client) {}
+
+  getBoards<T = {id: string}[]>(memberId: TrelloId): Promise<T> {
+    const request: Request = {
+      url: `/members/${memberId}/boards`,
+      method: 'GET',
+      query: {
+        fields: 'id', // todo
+      }
+    }
+
+    return this.client.sendRequest(request);
+  }
+}
diff --git a/src/baseClient.ts b/src/baseClient.ts
@@ -1,5 +1,5 @@
-import { Config, configSchema } from '@/schemas';
-import type { Client, Request } from '@/interfaces';
+import { Config, configSchema } from '~/schemas';
+import type { Client, Request } from '~/interfaces';
 import { ZodSchema } from 'zod';
 
 export class BaseClient implements Client {
@@ -24,7 +24,7 @@ export class BaseClient implements Client {
     url.searchParams.set('token', this.config.token);
 
     const response = await fetch(url, {
-      method: 'POST',
+      method: request.method,
       headers,
     });
 
diff --git a/src/schemas/api/boards/boardSchema.ts b/src/schemas/api/boards/boardSchema.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
-import { prefsSchema } from '@/schemas/common/prefsSchema';
-import { colorSchema } from '@/schemas/common';
+import { prefsSchema } from '~/schemas/common/prefsSchema';
+import { colorSchema } from '~/schemas/common';
 
 export const boardSchema = z.object({
   id: z.string(),
@@ -15,7 +15,7 @@ export const boardSchema = z.object({
   shortUrl: z.string().url(),
   prefs: prefsSchema,
   labelNames: z.record(colorSchema, z.string()),
-  limits: z.object({}).strict(),
+  limits: z.object({}).strict().optional(),
 }).strict();
 
 export type Board = z.infer<typeof boardSchema>;
diff --git a/src/schemas/common/backgroundScaledImageSchema.ts b/src/schemas/common/backgroundScaledImageSchema.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+export const backgroundScaledImageSchema = z.object({
+  width: z.number().int().positive(),
+  height: z.number().int().positive(),
+  url: z.string().url()
+});
+
+export type BackgroundScaledImage = z.infer<typeof backgroundScaledImageSchema>;
diff --git a/src/schemas/common/colorSchema.ts b/src/schemas/common/colorSchema.ts
@@ -30,5 +30,5 @@ export const colorSchema = z.enum([
   'sky_light',
   'lime_light',
   'pink_light',
-  'black_light'
+  'black_light',
 ]);
diff --git a/src/schemas/common/index.ts b/src/schemas/common/index.ts
@@ -1,3 +1,5 @@
+export * from './backgroundScaledImageSchema';
 export * from './colorSchema';
 export * from './hexColorSchema';
 export * from './prefsSchema';
+export * from './trelloIdSchema';
diff --git a/src/schemas/common/prefsSchema.ts b/src/schemas/common/prefsSchema.ts
@@ -1,41 +1,49 @@
 import { z } from 'zod';
 import { colorSchema } from './colorSchema';
 import { hexColorSchema } from './hexColorSchema';
+import { backgroundScaledImageSchema } from '~/schemas/common/backgroundScaledImageSchema';
+import { trelloIdSchema } from '~/schemas/common/trelloIdSchema';
 
-export const prefsSchema = z.object({
-  permissionLevel: z.enum(['private']),
-  hideVotes: z.boolean(),
-  voting: z.enum(['disabled']),
-  comments: z.enum(['members']),
-  invitations: z.enum(['members']),
-  selfJoin: z.boolean(),
-  cardCovers: z.boolean(),
-  showCompleteStatus: z.boolean(),
-  cardCounts: z.boolean(),
-  isTemplate: z.boolean(),
-  cardAging: z.enum(['regular']),
-  calendarFeedEnabled: z.boolean(),
-  hiddenPluginBoardButtons: z.array(z.unknown()),
-  switcherViews: z.array(z.object({
-    viewType: z.enum(['Board', 'Table', 'Calendar', 'Dashboard', 'Timeline', 'Map']),
-    enabled: z.boolean(),
-  }).strict()),
-  background: colorSchema,
-  backgroundColor: hexColorSchema,
-  backgroundDarkColor: hexColorSchema.nullable(),
-  backgroundImage: z.unknown().nullable(),
-  backgroundDarkImage: z.unknown().nullable(),
-  backgroundImageScaled: z.unknown().nullable(),
-  backgroundTile: z.boolean(),
-  backgroundBrightness: z.enum(['dark']),
-  sharedSourceUrl: z.string().url().nullable(),
-  backgroundBottomColor: hexColorSchema,
-  backgroundTopColor: hexColorSchema,
-  canBePublic: z.boolean(),
-  canBeEnterprise: z.boolean(),
-  canBeOrg: z.boolean(),
-  canBePrivate: z.boolean(),
-  canInvite: z.boolean(),
-}).strict();
+export const prefsSchema = z
+  .object({
+    background: z.union([colorSchema, trelloIdSchema]), // todo use discriminatedUnion
+    backgroundBottomColor: hexColorSchema,
+    backgroundBrightness: z.enum(['light', 'dark']),
+    backgroundColor: hexColorSchema.nullable(),
+    backgroundDarkColor: hexColorSchema.nullable(),
+    backgroundDarkImage: z.unknown().nullable(),
+    backgroundImage: z.string().url().nullable(),
+    backgroundImageScaled: z.array(backgroundScaledImageSchema).nullable(),
+    backgroundTile: z.boolean(),
+    backgroundTopColor: hexColorSchema,
+    calendarFeedEnabled: z.boolean(),
+    canBeEnterprise: z.boolean(),
+    canBeOrg: z.boolean(),
+    canBePrivate: z.boolean(),
+    canBePublic: z.boolean(),
+    canInvite: z.boolean(),
+    cardAging: z.enum(['regular']),
+    cardCounts: z.boolean(),
+    cardCovers: z.boolean(),
+    comments: z.enum(['members']),
+    hiddenPluginBoardButtons: z.array(z.unknown()),
+    hideVotes: z.boolean(),
+    invitations: z.enum(['members']),
+    isTemplate: z.boolean(),
+    permissionLevel: z.enum(['private', 'org', 'board']),
+    selfJoin: z.boolean(),
+    sharedSourceUrl: z.string().url().nullable(),
+    showCompleteStatus: z.boolean(),
+    switcherViews: z.array(
+      z
+        .object({
+          viewType: z.enum(['Board', 'Table', 'Calendar', 'Dashboard', 'Timeline', 'Map']),
+          enabled: z.boolean(),
+        })
+        .strict(),
+    ),
+    voting: z.enum(['disabled', 'members']),
+  })
+  .strict();
 
 export type Prefs = z.infer<typeof prefsSchema>;
diff --git a/src/schemas/common/trelloIdSchema.ts b/src/schemas/common/trelloIdSchema.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+export const trelloIdSchema = z.string().regex(/^[0-9a-fA-F]{24}$/, {
+  message: 'Invalid Trello ID format. Must be a 24-character hex string'
+});
+
+export type TrelloId = z.infer<typeof trelloIdSchema>;
diff --git a/src/trelloClient.ts b/src/trelloClient.ts
@@ -1,6 +1,8 @@
-import { BaseClient } from '@/baseClient';
-import { Boards } from '@/api/boards';
+import { BaseClient } from '~/baseClient';
+import { Boards } from '~/api/boards';
+import { Members } from '~/api/members';
 
 export class TrelloClient extends BaseClient {
   boards = new Boards(this);
+  members = new Members(this);
 }
diff --git a/tests/integration/api/boards.test.ts b/tests/integration/api/boards.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
-import { Board, CreateBoard } from '@/schemas/api/boards';
-import { TrelloClient } from '@';
-import { config } from '@tests/integration/config';
+import { Board, CreateBoard } from '~/schemas/api/boards';
+import { TrelloClient } from '~';
+import { config } from '~tests/integration/config';
 
 // Mock data
 const mockBoardInput: CreateBoard = {
@@ -12,14 +12,20 @@ describe('Boards Service Integration Tests', () => {
   let board: Board | undefined;
   const trelloClient = new TrelloClient(config);
 
-  it('should successfully create a board with valid input', async () => {
-    board = await trelloClient.boards.createBoard<Board>(mockBoardInput); // todo remove generic use
+  it.skip('should successfully create a board with valid input', async () => {
+    board = await trelloClient.boards.create<Board>(mockBoardInput); // todo remove generic use
 
     expect(board).toBeDefined();
     expect(board.name).toBe(mockBoardInput.name);
   });
 
-  it('should successfully delete a board', async () => {
+  it('should successfully get all boards', async () => {
+    const boards = await trelloClient.boards.getAll();
+
+    console.log(boards);
+  });
+
+  it.skip('should successfully delete a board', async () => {
 
   })
 });
diff --git a/tests/integration/config.ts b/tests/integration/config.ts
@@ -1,5 +1,4 @@
-import type { Config } from '@/schemas';
-import * as process from 'node:process';
+import type { Config } from '~/schemas';
 
 export const config: Config = {
   key: process.env.TRELLO_API_KEY!,
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,14 +7,13 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "@": ["src"],
-      "@/*": ["src/*"],
-      "@tests/*": ["tests/*"]
+      "~": ["src"],
+      "~/*": ["src/*"],
+      "~tests/*": ["tests/*"]
     }
   },
   "exclude": [
     "node_modules",
-    "tests",
     "dist"
   ]
 }
diff --git a/vitest.config.ts b/vitest.config.ts
@@ -9,9 +9,10 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 
 export default defineConfig({
   test: {
+    testTimeout: 60000,
     alias: {
-      '@': resolve(__dirname, 'src'),
-      '@tests': resolve(__dirname, 'tests'),
+      '~': resolve(__dirname, 'src'),
+      '~tests': resolve(__dirname, 'tests'),
     }
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export default defineConfig([`
`22`	`22`	`plugins: [`
`23`	`23`	`alias({`
`24`	`24`	`entries: [`
`25`		`- { find: '@', replacement: resolve(__dirname, 'src') },`
	`25`	`+ { find: '~', replacement: resolve(__dirname, 'src') },`
`26`	`26`	`]`
`27`	`27`	`}),`
`28`	`28`	`nodeResolve(),`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './boards';`
	`2`	`+export * from './members';`