refactor: move common files under common dir

client/common

@@ -0,0 +1 @@
+../server/common

client/features/tasks/TaskList.tsx

@@ -1,5 +1,5 @@
-import type { TaskDto } from 'api/@types/task';
-import { labelValidator } from 'api/@validators/task';
+import type { TaskDto } from 'common/types/task';
+import { labelValidator } from 'common/validators/task';
 import { Loading } from 'components/loading/Loading';
 import { usePickedLastMsg } from 'features/ws/AuthedWebSocket';
 import { useAlert } from 'hooks/useAlert';

client/features/ws/AuthedWebSocket.tsx

@@ -1,5 +1,5 @@
-import { IS_PROD, WS_PATH, WS_PING, WS_PONG } from 'api/@constants';
-import type { WebSocketData } from 'api/@types/websocket';
+import { IS_PROD, WS_PATH, WS_PING, WS_PONG } from 'common/constants';
+import type { WebSocketData } from 'common/types/websocket';
 import { atom, useAtom } from 'jotai';
 import { useEffect, useRef } from 'react';
 import useWebSocket from 'react-use-websocket';

client/hooks/useUser.ts

@@ -1,4 +1,4 @@
-import type { UserDto } from 'api/@types/user';
+import type { UserDto } from 'common/types/user';
 import { atom, useAtom } from 'jotai';
 import { useCallback } from 'react';
 

client/layouts/Layout.tsx

@@ -1,4 +1,4 @@
-import type { UserDto } from 'api/@types/user';
+import type { UserDto } from 'common/types/user';
 import { Loading } from 'components/loading/Loading';
 import { useLoading } from 'components/loading/useLoading';
 import { AuthedWebSocket } from 'features/ws/AuthedWebSocket';

client/layouts/basicHeader/BasicHeader.tsx

@@ -1,7 +1,7 @@
 import { AccountSettings } from '@aws-amplify/ui-react';
-import { APP_NAME } from 'api/@constants';
-import type { UserDto } from 'api/@types/user';
 import { signOut } from 'aws-amplify/auth';
+import { APP_NAME } from 'common/constants';
+import type { UserDto } from 'common/types/user';
 import { Spacer } from 'components/Spacer';
 import { HumanIcon } from 'components/icons/HumanIcon';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'components/modal/Modal';

client/pages/_app.page.tsx

@@ -1,8 +1,8 @@
 import { Authenticator, translations } from '@aws-amplify/ui-react';
 import '@aws-amplify/ui-react/styles.css';
-import { APP_NAME } from 'api/@constants';
 import { Amplify } from 'aws-amplify';
 import { I18n } from 'aws-amplify/utils';
+import { APP_NAME } from 'common/constants';
 import { AuthLoader } from 'features/auth/AuthLoader';
 import type { AppProps } from 'next/app';
 import dynamic from 'next/dynamic';

client/pages/_document.page.tsx

@@ -1,4 +1,4 @@
-import { APP_NAME } from 'api/@constants';
+import { APP_NAME } from 'common/constants';
 import { Head, Html, Main, NextScript } from 'next/document';
 import { staticPath } from 'utils/$path';
 

client/pages/login/index.page.tsx

@@ -1,6 +1,6 @@
 import { Authenticator } from '@aws-amplify/ui-react';
-import { APP_NAME } from 'api/@constants';
 import { signUp } from 'aws-amplify/auth';
+import { APP_NAME } from 'common/constants';
 import { Spacer } from 'components/Spacer';
 import { Loading } from 'components/loading/Loading';
 import { useUser } from 'hooks/useUser';

server/api/private/hooks.ts

@@ -1,4 +1,4 @@
-import type { UserDto } from 'api/@types/user';
+import type { UserDto } from 'common/types/user';
 import { userUseCase } from 'domain/user/useCase/userUseCase';
 import type { JwtUser } from 'service/types';
 import { defineHooks } from './$relay';

server/api/private/me/index.ts

@@ -1,5 +1,5 @@
-import type { UserDto } from 'api/@types/user';
 import type { DefineMethods } from 'aspida';
+import type { UserDto } from 'common/types/user';
 
 export type Methods = DefineMethods<{
   get: {

server/api/private/tasks/_taskId@string/index.ts

@@ -1,5 +1,5 @@
-import type { TaskDto } from 'api/@types/task';
 import type { DefineMethods } from 'aspida';
+import type { TaskDto } from 'common/types/task';
 
 export type Methods = DefineMethods<{
   patch: {

server/api/private/tasks/di/index.ts

@@ -1,5 +1,5 @@
-import type { TaskDto } from 'api/@types/task';
 import type { DefineMethods } from 'aspida';
+import type { TaskDto } from 'common/types/task';
 
 export type Methods = DefineMethods<{
   get: {

server/api/private/tasks/index.ts

@@ -1,6 +1,6 @@
-import type { MaybeId } from 'api/@types/brandedId';
-import type { TaskCreateVal, TaskDto, TaskUpdateDoneDto } from 'api/@types/task';
 import type { DefineMethods } from 'aspida';
+import type { MaybeId } from 'common/types/brandedId';
+import type { TaskCreateVal, TaskDto, TaskUpdateDoneDto } from 'common/types/task';
 
 export type Methods = DefineMethods<{
   get: {

server/api/@types/brandedId.ts → server/common/types/brandedId.ts

@@ -1,4 +1,4 @@
-import type { BRANDED_ID_NAMES } from 'api/@constants';
+import type { BRANDED_ID_NAMES } from 'common/constants';
 import type { z } from 'zod';
 
 type IdName = (typeof BRANDED_ID_NAMES)[number];

server/api/@types/task.ts → server/common/types/task.ts

@@ -1,4 +1,4 @@
-import type { WS_TYPES } from 'api/@constants';
+import type { WS_TYPES } from 'common/constants';
 import type { DtoId, MaybeId } from './brandedId';
 
 export type TaskDto = {

server/domain/task/event/taskEvent.ts

@@ -1,11 +1,11 @@
-import { WS_TYPES } from 'api/@constants';
+import { WS_TYPES } from 'common/constants';
 import type {
   TaskCreatedEvent,
   TaskDeletedEvent,
   TaskDto,
   TaskUpdatedEvent,
-} from 'api/@types/task';
-import type { UserDto } from 'api/@types/user';
+} from 'common/types/task';
+import type { UserDto } from 'common/types/user';
 import { websocket } from 'service/websocket';
 
 export const taskEvent = {

server/domain/task/model/taskEntity.ts

@@ -1,5 +1,5 @@
 import type { MultipartFile } from '@fastify/multipart';
-import type { TaskDto } from 'api/@types/task';
+import type { TaskDto } from 'common/types/task';
 import type { EntityId } from 'service/brandedId';
 import type { S3PutParams } from 'service/s3Client';
 

server/domain/task/model/taskMethod.ts

@@ -1,7 +1,7 @@
-import type { TaskUpdateDoneDto } from 'api/@types/task';
-import type { UserDto } from 'api/@types/user';
-import { labelValidator } from 'api/@validators/task';
 import assert from 'assert';
+import type { TaskUpdateDoneDto } from 'common/types/task';
+import type { UserDto } from 'common/types/user';
+import { labelValidator } from 'common/validators/task';
 import { brandedId } from 'service/brandedId';
 import { s3 } from 'service/s3Client';
 import { ulid } from 'ulid';

server/domain/task/repository/taskQuery.ts

@@ -1,5 +1,5 @@
 import type { Prisma, Task, User } from '@prisma/client';
-import type { DtoId, MaybeId } from 'api/@types/brandedId';
+import type { DtoId, MaybeId } from 'common/types/brandedId';
 import { brandedId } from 'service/brandedId';
 import { s3 } from 'service/s3Client';
 import { depend } from 'velona';

server/domain/task/service/taskValidator.ts

@@ -1,5 +1,5 @@
 import { multipartFileValidator } from 'api/$relay';
-import type { TaskUpdateDoneDto } from 'api/@types/task';
+import type { TaskUpdateDoneDto } from 'common/types/task';
 import { brandedId } from 'service/brandedId';
 import { z } from 'zod';
 import type { TaskCreateServerVal } from '../model/taskEntity';

server/domain/task/service/toTaskDto.ts

@@ -1,4 +1,4 @@
-import type { TaskDto } from 'api/@types/task';
+import type { TaskDto } from 'common/types/task';
 import { brandedId } from 'service/brandedId';
 import type { TaskEntity } from '../model/taskEntity';
 

server/domain/task/useCase/taskUseCase.ts

@@ -1,6 +1,6 @@
-import type { MaybeId } from 'api/@types/brandedId';
-import type { TaskDto, TaskUpdateDoneDto } from 'api/@types/task';
-import type { UserDto } from 'api/@types/user';
+import type { MaybeId } from 'common/types/brandedId';
+import type { TaskDto, TaskUpdateDoneDto } from 'common/types/task';
+import type { UserDto } from 'common/types/user';
 import { transaction } from 'service/prismaClient';
 import { taskEvent } from '../event/taskEvent';
 import type { TaskCreateServerVal } from '../model/taskEntity';

server/domain/user/model/userEntity.ts

@@ -1,4 +1,4 @@
-import type { UserDto } from 'api/@types/user';
+import type { UserDto } from 'common/types/user';
 import type { EntityId } from 'service/brandedId';
 
 export type UserEntity = Omit<UserDto, 'id'> & { id: EntityId['user'] };

server/domain/user/service/toUserDto.ts

@@ -1,4 +1,4 @@
-import type { UserDto } from 'api/@types/user';
+import type { UserDto } from 'common/types/user';
 import { brandedId } from 'service/brandedId';
 import type { UserEntity } from '../model/userEntity';
 

server/domain/user/useCase/userUseCase.ts

@@ -1,4 +1,4 @@
-import type { UserDto } from 'api/@types/user';
+import type { UserDto } from 'common/types/user';
 import { prismaClient, transaction } from 'service/prismaClient';
 import type { JwtUser } from 'service/types';
 import { userMethod } from '../model/userMethod';

server/service/app.ts

@@ -5,8 +5,8 @@ import fastifyHttpProxy from '@fastify/http-proxy';
 import type { TokenOrHeader } from '@fastify/jwt';
 import fastifyJwt from '@fastify/jwt';
 import fastifyWebsocket from '@fastify/websocket';
-import { IS_PROD, WS_PATH } from 'api/@constants';
 import assert from 'assert';
+import { IS_PROD, WS_PATH } from 'common/constants';
 import type { FastifyInstance, FastifyRequest } from 'fastify';
 import Fastify from 'fastify';
 import buildGetJwks from 'get-jwks';

server/service/brandedId.ts

@@ -1,5 +1,5 @@
-import { BRANDED_ID_NAMES } from 'api/@constants';
-import type { DtoId, MaybeId } from 'api/@types/brandedId';
+import { BRANDED_ID_NAMES } from 'common/constants';
+import type { DtoId, MaybeId } from 'common/types/brandedId';
 import { z } from 'zod';
 
 type IdName = (typeof BRANDED_ID_NAMES)[number];

server/service/types.ts

@@ -1,3 +1,3 @@
-import type { DtoId } from 'api/@types/brandedId';
+import type { DtoId } from 'common/types/brandedId';
 
 export type JwtUser = { sub: DtoId['user']; 'cognito:username': string; email: string };

server/service/websocket.ts

@@ -1,6 +1,6 @@
-import { WS_PING, WS_PONG } from 'api/@constants';
-import type { DtoId } from 'api/@types/brandedId';
-import type { WebSocketData } from 'api/@types/websocket';
+import { WS_PING, WS_PONG } from 'common/constants';
+import type { DtoId } from 'common/types/brandedId';
+import type { WebSocketData } from 'common/types/websocket';
 import type { FastifyInstance } from 'fastify';
 import { WebSocket } from 'ws';
 

server/tests/api/apiClient.ts

@@ -4,8 +4,8 @@ import {
   AdminInitiateAuthCommand,
 } from '@aws-sdk/client-cognito-identity-provider';
 import api from 'api/$api';
-import { WS_PATH } from 'api/@constants';
 import axios from 'axios';
+import { WS_PATH } from 'common/constants';
 import { COOKIE_NAME } from 'service/constants';
 import {
   API_BASE_PATH,

server/tests/api/private/di.test.ts

@@ -1,7 +1,7 @@
 import type { Prisma } from '@prisma/client';
-import type { DtoId } from 'api/@types/brandedId';
-import type { UserDto } from 'api/@types/user';
 import controller from 'api/private/tasks/di/controller';
+import type { DtoId } from 'common/types/brandedId';
+import type { UserDto } from 'common/types/user';
 import type { TaskEntity } from 'domain/task/model/taskEntity';
 import fastify from 'fastify';
 import { brandedId } from 'service/brandedId';

server/tests/api/private/tasks.test.ts

@@ -1,5 +1,5 @@
-import { WS_TYPES } from 'api/@constants';
-import type { TaskCreatedEvent, TaskDeletedEvent, TaskUpdatedEvent } from 'api/@types/task';
+import { WS_TYPES } from 'common/constants';
+import type { TaskCreatedEvent, TaskDeletedEvent, TaskUpdatedEvent } from 'common/types/task';
 import { expect, test } from 'vitest';
 import { createSessionClients, noCookieClient } from '../apiClient';
 import { DELETE, GET, PATCH, POST, WS } from '../utils';

server/tests/api/utils.ts

@@ -1,4 +1,4 @@
-import type { WS_TYPES } from 'api/@constants';
+import type { WS_TYPES } from 'common/constants';
 import { SERVER_PORT } from 'service/envValues';
 
 export const TEST_PORT = SERVER_PORT - 1;

server/tsconfig.json

@@ -13,12 +13,5 @@
     "strictPropertyInitialization": false,
     "target": "es6",
     "incremental": true
-  },
-  "include": ["**/*.ts", "**/*.js"],
-  "exclude": [
-    "node_modules",
-    "api/@types/$relay.ts",
-    "api/@constants/$relay.ts",
-    "api/@validators/$relay.ts"
-  ]
+  }
 }

tsconfig.json

@@ -16,6 +16,5 @@
     "jsx": "preserve",
     "types": ["vitest/importMeta"],
     "incremental": true
-  },
-  "include": ["**/*.ts", "**/*.tsx"]
+  }
 }