refactor(types): rename types

bartholomej · bartholomej · commit 5b8519ca4e01 · 2025-09-14T11:59:36.000+02:00
diff --git a/server.ts b/server.ts
@@ -3,7 +3,7 @@ import 'dotenv/config';
 import express, { NextFunction, Request, Response } from 'express';
 import packageJson from './package.json';
 import { csfd } from './src';
-import { CSFDFilmTypes } from './src/interfaces/global';
+import { CSFDFilmTypes } from './src/dto/global';
 
 type Severity = 'info' | 'warn' | 'error' | 'success';
 
diff --git a/src/dto/cinema.ts b/src/dto/cinema.ts
@@ -1,4 +1,4 @@
-import { CSFDMovieListItem } from './movie.interface';
+import { CSFDMovieListItem } from './movie';
 
 export interface CSFDCinema {
   id: number;
diff --git a/src/dto/creator.ts b/src/dto/creator.ts
diff --git a/src/dto/global.ts b/src/dto/global.ts
diff --git a/src/dto/movie.ts b/src/dto/movie.ts
diff --git a/src/dto/search.ts b/src/dto/search.ts
@@ -1,5 +1,5 @@
 import { CSFDScreening } from './global';
-import { CSFDMovieCreator } from './movie.interface';
+import { CSFDMovieCreator } from './movie';
 
 export interface CSFDSearch {
   movies: CSFDSearchMovie[];
diff --git a/src/dto/user-ratings.ts b/src/dto/user-ratings.ts
diff --git a/src/helpers/cinema.helper.ts b/src/helpers/cinema.helper.ts
@@ -1,11 +1,11 @@
 import { HTMLElement } from 'node-html-parser';
-import { CSFDColorRating } from '../interfaces/global';
-import { Colors } from '../interfaces/user-ratings.interface';
 import {
   CSFDCinemaGroupedFilmsByDate,
   CSFDCinemaMeta,
   CSFDCinemaMovie
-} from './../interfaces/cinema.interface';
+} from '../dto/cinema';
+import { CSFDColorRating } from '../dto/global';
+import { Colors } from '../dto/user-ratings';
 import { parseColor, parseIdFromUrl } from './global.helper';
 
 export const getCinemaColorRating = (el: HTMLElement): CSFDColorRating => {
diff --git a/src/helpers/creator.helper.ts b/src/helpers/creator.helper.ts
@@ -1,7 +1,7 @@
 import { HTMLElement } from 'node-html-parser';
-import { CSFDCreatorScreening } from '../interfaces/creator.interface';
-import { CSFDColorRating } from '../interfaces/global';
-import { Colors } from '../interfaces/user-ratings.interface';
+import { CSFDCreatorScreening } from '../dto/creator';
+import { CSFDColorRating } from '../dto/global';
+import { Colors } from '../dto/user-ratings';
 import { addProtocol, parseColor, parseIdFromUrl } from './global.helper';
 
 const getCreatorColorRating = (el: HTMLElement): CSFDColorRating => {
diff --git a/src/helpers/global.helper.ts b/src/helpers/global.helper.ts
@@ -1,5 +1,5 @@
-import { CSFDColorRating } from '../interfaces/global';
-import { Colors } from '../interfaces/user-ratings.interface';
+import { CSFDColorRating } from '../dto/global';
+import { Colors } from '../dto/user-ratings';
 
 export const parseIdFromUrl = (url: string): number => {
   if (url) {
diff --git a/src/helpers/movie.helper.ts b/src/helpers/movie.helper.ts
@@ -1,5 +1,5 @@
 import { HTMLElement } from 'node-html-parser';
-import { CSFDColorRating } from '../interfaces/global';
+import { CSFDColorRating } from '../dto/global';
 import {
   CSFDBoxContent,
   CSFDCreatorGroups,
@@ -10,7 +10,7 @@ import {
   CSFDTitlesOther,
   CSFDVod,
   CSFDVodService
-} from '../interfaces/movie.interface';
+} from '../dto/movie';
 import { addProtocol, getColor, parseISO8601Duration, parseIdFromUrl } from './global.helper';
 
 export const getMovieId = (el: HTMLElement): number => {
diff --git a/src/helpers/search.helper.ts b/src/helpers/search.helper.ts
@@ -1,7 +1,7 @@
 import { HTMLElement } from 'node-html-parser';
-import { CSFDColorRating, CSFDFilmTypes } from '../interfaces/global';
-import { CSFDMovieCreator } from '../interfaces/movie.interface';
-import { Colors } from '../interfaces/user-ratings.interface';
+import { CSFDColorRating, CSFDFilmTypes } from '../dto/global';
+import { CSFDMovieCreator } from '../dto/movie';
+import { Colors } from '../dto/user-ratings';
 import { addProtocol, parseColor, parseIdFromUrl } from './global.helper';
 
 type Creator = 'Režie:' | 'Hrají:';
diff --git a/src/helpers/user-ratings.helper.ts b/src/helpers/user-ratings.helper.ts
@@ -1,6 +1,6 @@
 import { HTMLElement } from 'node-html-parser';
-import { CSFDColorRating, CSFDFilmTypes, CSFDStars } from '../interfaces/global';
-import { Colors } from '../interfaces/user-ratings.interface';
+import { CSFDColorRating, CSFDFilmTypes, CSFDStars } from '../dto/global';
+import { Colors } from '../dto/user-ratings';
 import { parseIdFromUrl } from './global.helper';
 
 export const getUserRatingId = (el: HTMLElement): number => {
diff --git a/src/index.ts b/src/index.ts
@@ -1,8 +1,8 @@
-import { CSFDCinema, CSFDCinemaPeriod } from './interfaces/cinema.interface';
-import { CSFDCreator } from './interfaces/creator.interface';
-import { CSFDMovie } from './interfaces/movie.interface';
-import { CSFDSearch } from './interfaces/search.interface';
-import { CSFDUserRatingConfig, CSFDUserRatings } from './interfaces/user-ratings.interface';
+import { CSFDCinema, CSFDCinemaPeriod } from './dto/cinema';
+import { CSFDCreator } from './dto/creator';
+import { CSFDMovie } from './dto/movie';
+import { CSFDSearch } from './dto/search';
+import { CSFDUserRatingConfig, CSFDUserRatings } from './dto/user-ratings';
 import { CinemaScraper } from './services/cinema.service';
 import { CreatorScraper } from './services/creator.service';
 import { MovieScraper } from './services/movie.service';
diff --git a/src/services/cinema.service.ts b/src/services/cinema.service.ts
@@ -1,6 +1,6 @@
 import { HTMLElement, parse } from 'node-html-parser';
+import { CSFDCinema, CSFDCinemaPeriod } from '../dto/cinema';
 import { fetchPage } from '../fetchers';
-import { CSFDCinema, CSFDCinemaPeriod } from '../interfaces/cinema.interface';
 import { cinemasUrl } from '../vars';
 import {
   getCinemaCoords,
diff --git a/src/services/creator.service.ts b/src/services/creator.service.ts
@@ -1,7 +1,7 @@
 import { HTMLElement, parse } from 'node-html-parser';
+import { CSFDCreator } from '../dto/creator';
 import { fetchPage } from '../fetchers';
 import { getCreatorBio, getCreatorBirthdayInfo, getCreatorFilms, getCreatorName, getCreatorPhoto } from '../helpers/creator.helper';
-import { CSFDCreator } from '../interfaces/creator.interface';
 import { creatorUrl } from '../vars';
 
 export class CreatorScraper {
diff --git a/src/services/movie.service.ts b/src/services/movie.service.ts
@@ -1,4 +1,6 @@
 import { HTMLElement, parse } from 'node-html-parser';
+import { CSFDFilmTypes } from '../dto/global';
+import { CSFDMovie } from '../dto/movie';
 import { fetchPage } from '../fetchers';
 import {
   getMovieBoxMovies,
@@ -21,8 +23,6 @@ import {
   getMovieVods,
   getMovieYear
 } from '../helpers/movie.helper';
-import { CSFDFilmTypes } from '../interfaces/global';
-import { CSFDMovie } from '../interfaces/movie.interface';
 import { movieUrl } from '../vars';
 
 export class MovieScraper {
diff --git a/src/services/search.service.ts b/src/services/search.service.ts
@@ -1,4 +1,5 @@
 import { HTMLElement, parse } from 'node-html-parser';
+import { CSFDSearch, CSFDSearchMovie, CSFDSearchUser } from '../dto/search';
 import { fetchPage } from '../fetchers';
 import { parseIdFromUrl } from '../helpers/global.helper';
 import { getAvatar, getUser, getUserRealName, getUserUrl } from '../helpers/search-user.helper';
@@ -12,7 +13,6 @@ import {
   getSearchYear,
   parseSearchPeople
 } from '../helpers/search.helper';
-import { CSFDSearch, CSFDSearchMovie, CSFDSearchUser } from '../interfaces/search.interface';
 import { searchUrl } from '../vars';
 
 export class SearchScraper {
diff --git a/src/services/user-ratings.service.ts b/src/services/user-ratings.service.ts
@@ -1,4 +1,6 @@
 import { HTMLElement, parse } from 'node-html-parser';
+import { CSFDColorRating, CSFDStars } from '../dto/global';
+import { CSFDUserRatingConfig, CSFDUserRatings } from '../dto/user-ratings';
 import { fetchPage } from '../fetchers';
 import {
   getUserRating,
@@ -11,8 +13,6 @@ import {
   getUserRatingYear,
   sleep
 } from '../helpers/user-ratings.helper';
-import { CSFDColorRating, CSFDStars } from '../interfaces/global';
-import { CSFDUserRatingConfig, CSFDUserRatings } from '../interfaces/user-ratings.interface';
 import { userRatingsUrl } from '../vars';
 
 export class UserRatingsScraper {
diff --git a/src/types.ts b/src/types.ts
@@ -0,0 +1,7 @@
+export * from "./dto/cinema";
+export * from "./dto/creator";
+export * from "./dto/global";
+export * from "./dto/movie";
+export * from "./dto/search";
+export * from "./dto/user-ratings";
+
diff --git a/src/vars.ts b/src/vars.ts
@@ -1,4 +1,4 @@
-import { CSFDCinemaPeriod } from './interfaces/cinema.interface';
+import { CSFDCinemaPeriod } from './dto/cinema';
 
 export const userRatingsUrl = (user: string | number, page?: number): string =>
   `https://www.csfd.cz/uzivatel/${encodeURIComponent(user)}/hodnoceni/${page ? '?page=' + page : ''
diff --git a/tests/cinema.service.test.ts b/tests/cinema.service.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { CSFDCinema } from '../src/interfaces/cinema.interface';
+import { CSFDCinema } from '../src/dto/cinema.interface';
 import { CinemaScraper } from '../src/services/cinema.service';
 
 const DISTRICT = 1;
diff --git a/tests/creator.test.ts b/tests/creator.test.ts
@@ -1,13 +1,13 @@
 import { parse } from 'node-html-parser';
 import { describe, expect, test } from 'vitest';
+import { CSFDCreatorScreening } from '../src/dto/creator';
 import {
   getCreatorBio,
   getCreatorBirthdayInfo,
   getCreatorFilms,
   getCreatorName,
   getCreatorPhoto
 } from '../src/helpers/creator.helper';
-import { CSFDCreatorScreening } from '../src/interfaces/creator.interface';
 import { actorMock } from './mocks/creator-actor.html';
 import { composerMock } from './mocks/creator-composer-empty.html';
 import { directorMock } from './mocks/creator-director.html';
diff --git a/tests/fetchers.test.ts b/tests/fetchers.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, test } from 'vitest';
 import { csfd } from '../src';
+import { CSFDCreatorScreening } from '../src/dto/creator';
+import { CSFDColorRating, CSFDFilmTypes } from '../src/dto/global';
 import { fetchPage } from '../src/fetchers';
-import { CSFDCreatorScreening } from '../src/interfaces/creator.interface';
-import { CSFDColorRating, CSFDFilmTypes } from '../src/interfaces/global';
 import { movieUrl, userRatingsUrl } from '../src/vars';
 const badId = 999999999999999;
 
diff --git a/tests/movie.test.ts b/tests/movie.test.ts
@@ -1,5 +1,13 @@
 import { HTMLElement, parse } from 'node-html-parser';
 import { describe, expect, test } from 'vitest';
+import { CSFDColorRating } from '../src/dto/global';
+import {
+  CSFDMovieCreator,
+  CSFDMovieListItem,
+  CSFDPremiere,
+  CSFDTitlesOther,
+  CSFDVod
+} from '../src/dto/movie';
 import { getColor } from '../src/helpers/global.helper';
 import {
   getMovieBoxMovies,
@@ -22,14 +30,6 @@ import {
   getMovieVods,
   getMovieYear
 } from '../src/helpers/movie.helper';
-import { CSFDColorRating } from '../src/interfaces/global';
-import {
-  CSFDMovieCreator,
-  CSFDMovieListItem,
-  CSFDPremiere,
-  CSFDTitlesOther,
-  CSFDVod
-} from '../src/interfaces/movie.interface';
 import { movieMock } from './mocks/movie1.html';
 import { movieMockBlank } from './mocks/movie2.html';
 import { movieMockRich } from './mocks/movie3.html';
diff --git a/tests/search.test.ts b/tests/search.test.ts
@@ -1,5 +1,7 @@
 import { parse } from 'node-html-parser';
 import { describe, expect, test } from 'vitest';
+import { CSFDColorRating, CSFDFilmTypes } from '../src/dto/global';
+import { CSFDMovieCreator } from '../src/dto/movie';
 import { getAvatar, getUser, getUserRealName, getUserUrl } from '../src/helpers/search-user.helper';
 import {
   getSearchColorRating,
@@ -11,8 +13,6 @@ import {
   getSearchYear,
   parseSearchPeople
 } from '../src/helpers/search.helper';
-import { CSFDColorRating, CSFDFilmTypes } from '../src/interfaces/global';
-import { CSFDMovieCreator } from '../src/interfaces/movie.interface';
 import { searchMock } from './mocks/search.html';
 
 const html = parse(searchMock);
diff --git a/tests/services.test.ts b/tests/services.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { CSFDUserRatings } from '../src/interfaces/user-ratings.interface';
+import { CSFDUserRatings } from '../src/dto/user-ratings';
 import { UserRatingsScraper } from '../src/services/user-ratings.service';
 
 // Live API tests
diff --git a/tests/user-ratings.test.ts b/tests/user-ratings.test.ts
@@ -1,5 +1,6 @@
 import { HTMLElement, parse } from 'node-html-parser';
 import { describe, expect, test } from 'vitest';
+import { CSFDColorRating, CSFDFilmTypes, CSFDStars } from '../src/dto/global';
 import {
   getUserRating,
   getUserRatingColorRating,
@@ -10,7 +11,6 @@ import {
   getUserRatingUrl,
   getUserRatingYear
 } from '../src/helpers/user-ratings.helper';
-import { CSFDColorRating, CSFDFilmTypes, CSFDStars } from '../src/interfaces/global';
 import { userRatingsMock } from './mocks/userRatings.html';
 
 const items = parse(userRatingsMock);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CSFDMovieListItem } from './movie.interface';`
	`1`	`+import { CSFDMovieListItem } from './movie';`
`2`	`2`
`3`	`3`	`export interface CSFDCinema {`
`4`	`4`	`id: number;`