refactor(validation): drop types.ts barrels; add uploadMeta and use DTO names

Remove common/types.ts and song/types.ts (PageQueryDTOType and *DtoType aliases).
Add song/uploadMeta.ts for VisibilityType, CategoryType, LicenseType, TimespanType.
Export SongsFolder from SongPage.dto.ts next to SongPageDto.

Point SongPreview/SongView/UploadSongDto at uploadMeta; update package index exports.
Rename frontend imports from *DtoType to the real DTO types (via @nbw/database).

Author: tomast1337

apps/backend/src/auth/strategies/discord.strategy/Strategy.spec.ts

@@ -1,5 +1,7 @@
-import type { DiscordStrategyConfig } from '@nbw/validation';
 import { VerifyFunction } from 'passport-oauth2';
+
+import type { DiscordStrategyConfig } from '@nbw/validation';
+
 import DiscordStrategy from './Strategy';
 import { DiscordPermissionScope, Profile } from './types';
 

apps/frontend/src/app/(content)/song/[id]/page.tsx

@@ -1,7 +1,7 @@
 import type { Metadata } from 'next';
 import { cookies } from 'next/headers';
 
-import type { SongViewDtoType } from '@nbw/database';
+import type { SongViewDto } from '@nbw/database';
 import axios from '@web/lib/axios';
 import { SongPage } from '@web/modules/song/components/SongPage';
 
@@ -28,7 +28,7 @@ export async function generateMetadata({
   }
 
   try {
-    const response = await axios.get<SongViewDtoType>(`/song/${id}`, {
+    const response = await axios.get<SongViewDto>(`/song/${id}`, {
       headers,
     });
 

apps/frontend/src/modules/browse/components/SongCard.tsx

@@ -5,12 +5,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import Link from 'next/link';
 import Skeleton from 'react-loading-skeleton';
 
-import type { SongPreviewDtoType } from '@nbw/database';
+import type { SongPreviewDto } from '@nbw/database';
 import { formatDuration, formatTimeAgo } from '@web/modules/shared/util/format';
 
 import SongThumbnail from '../../shared/components/layout/SongThumbnail';
 
-const SongDataDisplay = ({ song }: { song: SongPreviewDtoType | null }) => {
+const SongDataDisplay = ({ song }: { song: SongPreviewDto | null }) => {
   return (
     <div className='flex flex-col gap-2 pb-2 h-full'>
       {/* Song image */}
@@ -66,7 +66,7 @@ const SongDataDisplay = ({ song }: { song: SongPreviewDtoType | null }) => {
   );
 };
 
-const SongCard = ({ song }: { song: SongPreviewDtoType | null }) => {
+const SongCard = ({ song }: { song: SongPreviewDto | null }) => {
   return !song ? (
     <SongDataDisplay song={song} />
   ) : (

apps/frontend/src/modules/browse/components/client/context/HomePage.context.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import type { FeaturedSongsDtoType, SongPreviewDtoType } from '@nbw/database';
+import type { FeaturedSongsDto, SongPreviewDto } from '@nbw/database';
 
 import {
   FeaturedSongsProvider,
@@ -30,8 +30,8 @@ export function HomePageProvider({
   initialFeaturedSongs,
 }: {
   children: React.ReactNode;
-  initialRecentSongs: SongPreviewDtoType[];
-  initialFeaturedSongs: FeaturedSongsDtoType;
+  initialRecentSongs: SongPreviewDto[];
+  initialFeaturedSongs: FeaturedSongsDto;
 }) {
   return (
     <RecentSongsProvider initialRecentSongs={initialRecentSongs}>

apps/frontend/src/modules/browse/components/client/context/RecentSongs.context.tsx

@@ -3,11 +3,11 @@
 import { useEffect } from 'react';
 import { create } from 'zustand';
 
-import type { PageDto, SongPreviewDtoType } from '@nbw/database';
+import type { PageDto, SongPreviewDto } from '@nbw/database';
 import axiosInstance from '@web/lib/axios';
 
 interface RecentSongsState {
-  recentSongs: (SongPreviewDtoType | null | undefined)[];
+  recentSongs: (SongPreviewDto | null | undefined)[];
   recentError: string;
   isLoading: boolean;
   hasMore: boolean;
@@ -17,7 +17,7 @@ interface RecentSongsState {
 }
 
 interface RecentSongsActions {
-  initialize: (initialRecentSongs: SongPreviewDtoType[]) => void;
+  initialize: (initialRecentSongs: SongPreviewDto[]) => void;
   setSelectedCategory: (category: string) => void;
   increasePageRecent: () => Promise<void>;
   fetchRecentSongs: () => Promise<void>;
@@ -31,9 +31,9 @@ const pageSize = 12;
 const fetchCount = pageSize - adCount;
 
 function injectAdSlots(
-  songs: SongPreviewDtoType[],
-): Array<SongPreviewDtoType | undefined> {
-  const songsWithAds: Array<SongPreviewDtoType | undefined> = [...songs];
+  songs: SongPreviewDto[],
+): Array<SongPreviewDto | undefined> {
+  const songsWithAds: Array<SongPreviewDto | undefined> = [...songs];
 
   for (let i = 0; i < adCount; i++) {
     const adPosition = Math.floor(Math.random() * (songsWithAds.length + 1));
@@ -90,7 +90,7 @@ export const useRecentSongsStore = create<RecentSongsStore>((set, get) => ({
         params.category = selectedCategory;
       }
 
-      const response = await axiosInstance.get<PageDto<SongPreviewDtoType>>(
+      const response = await axiosInstance.get<PageDto<SongPreviewDto>>(
         '/song',
         { params },
       );
@@ -177,7 +177,7 @@ export const useRecentSongsProvider = () => {
 // Provider component for initialization (now just a wrapper)
 type RecentSongsProviderProps = {
   children: React.ReactNode;
-  initialRecentSongs: SongPreviewDtoType[];
+  initialRecentSongs: SongPreviewDto[];
 };
 
 export function RecentSongsProvider({

apps/frontend/src/modules/my-songs/components/MySongsPage.tsx

@@ -1,5 +1,5 @@
 import { MY_SONGS } from '@nbw/config';
-import type { SongPageDtoType, SongsFolder } from '@nbw/database';
+import type { SongPageDto, SongsFolder } from '@nbw/database';
 import axiosInstance from '@web/lib/axios';
 
 import { getTokenServer } from '../../auth/features/auth.utils';
@@ -11,7 +11,7 @@ async function fetchSongsPage(
   page: number,
   pageSize: number,
   token: string,
-): Promise<SongPageDtoType> {
+): Promise<SongPageDto> {
   const response = await axiosInstance
     .get('/my-songs', {
       headers: {

apps/frontend/src/modules/my-songs/components/client/MySongsTable.tsx

@@ -9,7 +9,7 @@ import Link from 'next/link';
 import Skeleton from 'react-loading-skeleton';
 
 import { MY_SONGS } from '@nbw/config';
-import type { SongPageDtoType, SongPreviewDtoType } from '@nbw/database';
+import type { SongPageDto, SongPreviewDto } from '@nbw/database';
 import { ErrorBox } from '@web/modules/shared/components/client/ErrorBox';
 
 import {
@@ -45,14 +45,14 @@ const SongRows = ({
   page,
   pageSize,
 }: {
-  page: SongPageDtoType | null;
+  page: SongPageDto | null;
   pageSize: number;
 }) => {
   const maxPage = MY_SONGS.PAGE_SIZE;
 
   const content = !page
     ? Array(pageSize).fill(null)
-    : (page.content as SongPreviewDtoType[]);
+    : (page.content as SongPreviewDto[]);
 
   return (
     <>

apps/frontend/src/modules/my-songs/components/client/SongRow.tsx

@@ -8,7 +8,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import Link from 'next/link';
 import Skeleton from 'react-loading-skeleton';
 
-import type { SongPreviewDtoType } from '@nbw/database';
+import type { SongPreviewDto } from '@nbw/database';
 import SongThumbnail from '@web/modules/shared/components/layout/SongThumbnail';
 import { formatDuration } from '@web/modules/shared/util/format';
 
@@ -20,7 +20,7 @@ import {
 
 import { useMySongsProvider } from './context/MySongs.context';
 
-export const SongRow = ({ song }: { song?: SongPreviewDtoType | null }) => {
+export const SongRow = ({ song }: { song?: SongPreviewDto | null }) => {
   const { setIsDeleteDialogOpen, setSongToDelete } = useMySongsProvider();
 
   const onDeleteClicked = () => {

apps/frontend/src/modules/my-songs/components/client/context/MySongs.context.tsx

@@ -5,25 +5,21 @@ import { toast } from 'react-hot-toast';
 import { create } from 'zustand';
 
 import { MY_SONGS } from '@nbw/config';
-import type {
-  SongPageDtoType,
-  SongPreviewDtoType,
-  SongsFolder,
-} from '@nbw/database';
+import type { SongPageDto, SongPreviewDto, SongsFolder } from '@nbw/database';
 import axiosInstance from '@web/lib/axios';
 import { getTokenLocal } from '@web/lib/axios/token.utils';
 
 interface MySongsState {
   loadedSongs: SongsFolder;
-  page: SongPageDtoType | null;
+  page: SongPageDto | null;
   totalSongs: number;
   totalPages: number;
   currentPage: number;
   pageSize: number;
   isLoading: boolean;
   error: string | null;
   isDeleteDialogOpen: boolean;
-  songToDelete: SongPreviewDtoType | null;
+  songToDelete: SongPreviewDto | null;
 }
 
 interface MySongsActions {
@@ -39,7 +35,7 @@ interface MySongsActions {
   nextpage: () => void;
   prevpage: () => void;
   setIsDeleteDialogOpen: (isOpen: boolean) => void;
-  setSongToDelete: (song: SongPreviewDtoType) => void;
+  setSongToDelete: (song: SongPreviewDto) => void;
   deleteSong: () => Promise<void>;
 }
 
@@ -95,7 +91,7 @@ export const useMySongsStore = create<MySongsStore>((set, get) => ({
         },
       });
 
-      const data = response.data as SongPageDtoType;
+      const data = response.data as SongPageDto;
 
       // TODO: total, page and pageSize are stored in every page, when it should be stored in the folder (what matters is 'content')
       set((state) => ({

apps/frontend/src/modules/song-edit/components/client/EditSongPage.tsx

@@ -1,4 +1,4 @@
-import type { UploadSongDtoType } from '@nbw/database';
+import type { UploadSongDto } from '@nbw/database';
 import axiosInstance from '@web/lib/axios';
 import {
   getTokenServer,
@@ -13,7 +13,7 @@ import {
 
 import { SongEditForm } from './SongEditForm';
 
-async function fetchSong({ id }: { id: string }): Promise<UploadSongDtoType> {
+async function fetchSong({ id }: { id: string }): Promise<UploadSongDto> {
   // get token from cookies
   const token = await getTokenServer();
   // if token is not null, redirect to home page
@@ -31,7 +31,7 @@ async function fetchSong({ id }: { id: string }): Promise<UploadSongDtoType> {
 
     const data = await response.data;
 
-    return data as UploadSongDtoType;
+    return data as UploadSongDto;
   } catch (error: unknown) {
     throw new Error('Failed to fetch song data');
   }