node-csfd-api 3.0.0-next.16 → 3.0.0-next.18

package/README.md

@@ -3,14 +3,14 @@
 [![Build & Publish](https://github.com/bartholomej/node-csfd-api/workflows/Publish/badge.svg)](https://github.com/bartholomej/node-csfd-api/actions)
 [![codecov](https://codecov.io/gh/bartholomej/node-csfd-api/branch/master/graph/badge.svg?token=YQH9UoVrGP)](https://codecov.io/gh/bartholomej/node-csfd-api)
 
-# CSFD API 2023
+# CSFD API 🎥 2024
 
 > JavaScript NPM library for scraping **Czech Movie Database (csfd.cz)**
 >
 > - JavaScript / TypeScript
 > - Browser + Node.js (SSR)
 > - Tested (~100% Code coverage)
-> - ✅ Ready for new ČSFD 2021!
+> - ✅ Ready for new ČSFD 2024!
 > - You can use in:
 >   - Firebase function
 >   - AWS λ (lambda function)
@@ -19,14 +19,14 @@
 >   - React native app
 >   - Browsers (Pay attention to CORS)
 
-## Install
+## 🗜️ Install
 
 ```bash
-npm install node-csfd-api --save
+npm install node-csfd-api
 # yarn add node-csfd-api
 ```
 
-## Usage and examples
+## 🛠️ Usage and examples
 
 - [Movies and TV Series](#Movie)
 - [User Ratings](#User-Ratings)
@@ -35,7 +35,7 @@ npm install node-csfd-api --save
 
 ### Movie
 
-Get info about [this movie](https://www.csfd.cz/film/535121-na-spatne-strane/komentare/) _(id: 535121)_
+> Get info about [this movie](https://www.csfd.cz/film/535121-na-spatne-strane/komentare/) _(id: 535121)_
 
 ```javascript
 import { csfd } from 'node-csfd-api';
@@ -43,8 +43,9 @@ import { csfd } from 'node-csfd-api';
 csfd.movie(535121).then((movie) => console.log(movie));
 ```
 
-#### Results
-
+<details>
+  <summary>Click here to see full result example</summary>
+  
 ```javascript
 {
   id: 535121,
@@ -136,6 +137,7 @@ csfd.movie(535121).then((movie) => console.log(movie));
   ]
 }
 ```
+</details>
 
 ### Search
 
@@ -147,10 +149,11 @@ import { csfd } from 'node-csfd-api';
 csfd.search('bart').then((search) => console.log(search));
 ```
 
-#### Results
-
+<details>
+  <summary>Click here to see full result example</summary>
+  
 ```javascript
-movies: [
+[
   {
     id: 19653,
     title: 'Black Bart',
@@ -198,6 +201,8 @@ users: [
 ]
 ```
 
+</details>
+
 ### Creators
 
 > Get creator info + filmography
@@ -208,7 +213,8 @@ import { csfd } from 'node-csfd-api';
 csfd.creator(2120).then((creator) => console.log(creator));
 ```
 
-#### Results
+<details>
+  <summary>Click here to see full result example</summary>
 
 ```javascript
 {
@@ -285,6 +291,8 @@ csfd.creator(2120).then((creator) => console.log(creator));
 }
 ```
 
+</details>
+
 ### User Ratings
 
 #### Last ratings (last page)
@@ -314,7 +322,8 @@ csfd
   .then((ratings) => console.log(ratings));
 ```
 
-#### Results
+<details>
+  <summary>Click here to see full result example</summary>
 
 ```javascript
 [
@@ -339,7 +348,9 @@ csfd
 ];
 ```
 
-#### Options
+</details>
+
+#### Options for user ratings
 
 | Option            | Type                                                                                                                                       | Default | Description                                            |
 | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | ------- | ------------------------------------------------------ |
@@ -348,9 +359,9 @@ csfd
 | **allPages**      | boolean                                                                                                                                    | false   | Get all pages                                          |
 | **allPagesDelay** | number                                                                                                                                     | 0       | Delay on each page request. In milliseconds            |
 
-_Note: You can not use both parameters 'includesOnly' and 'excludes'. Parameter 'includesOnly' has a priority._
+_Note: You can not use both parameters `includesOnly` and `excludes`. Parameter `includesOnly` has a priority._
 
-## Used by
+## 🧑‍💻 Used by
 
 ### Web extensions
 
@@ -364,9 +375,9 @@ _Note: You can not use both parameters 'includesOnly' and 'excludes'. Parameter
 
 ### Mobile applications
 
-- KinoKlub – Mobile application for AeroFilms (React Native: Android + iOS application)
+- [KinoKlub](https://play.google.com/store/apps/details?id=com.aquasoup) – Mobile application for AeroFilms (React Native: Android + iOS application)
 
-## Roadmap
+## 🔮 Roadmap
 
 ### Scraping more pages
 
@@ -414,7 +425,7 @@ _Note: You can not use both parameters 'includesOnly' and 'excludes'. Parameter
   - [x] Last ratings
   - [x] All pages
 
-## Development
+## 🛠️ Development
 
 ### Developing and debugging library
 
@@ -430,22 +441,7 @@ You can find and modify it in [`./demo.ts`](https://github.com/bartholomej/node-
 yarn demo
 ```
 
-## Development (notes for me)
-
-### Publish Stable
-
-```shell
-yarn release:patch
-# yarn release:minor
-# yarn release:major
-```
-
-### Publish next channel
-
-1. Bump version `-beta.0` in `package.json`
-2. `yarn release:beta`
-
-## Contribution
+## 🤝 Contribution
 
 I welcome you to customize this according to your needs ;)
 
@@ -457,7 +453,7 @@ Give a ⭐️ if this project helped you!
 
 Or if you are brave enough consider [making a donation](https://github.com/sponsors/bartholomej) for some 🍺 or 🍵 ;)
 
-## Privacy Policy
+## 🕵️‍♀️ Privacy Policy
 
 I DO NOT STORE ANY DATA. PERIOD.
 
@@ -465,9 +461,9 @@ I physically can't. I have nowhere to store it. I don't even have a server datab
 
 That's why, with node-csfd-api, what happens on your device stays on your device till disappear.
 
-## License
+## 📝 License
 
-Copyright &copy; 2020 – 2023 [Lukas Bartak](http://bartweb.cz)
+Copyright &copy; 2020 – 2024 [Lukas Bartak](http://bartweb.cz)
 
 Proudly powered by nature 🗻, wind 💨, tea 🍵 and beer 🍺 ;)
 

package/cjs/fetchers/fetch.polyfill.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSafe = void 0;
+// Check if `fetch` is available in global scope (nodejs 18+) or in window (browser). If not, use cross-fetch polyfill.
+const cross_fetch_1 = require("cross-fetch");
+exports.fetchSafe = (typeof fetch === 'function' && fetch) || // ServiceWorker fetch (Cloud Functions + Chrome extension)
+    (typeof global === 'object' && global.fetch) || // Node.js 18+ fetch
+    (typeof window !== 'undefined' && window.fetch) || // Browser fetch
+    cross_fetch_1.fetch; // Polyfill fetch

package/cjs/fetchers/index.js

@@ -10,12 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPage = void 0;
-// Check if `fetch` is available in global scope (nodejs 18+) or in window (browser). If not, use cross-fetch polyfill.
-const cross_fetch_1 = require("cross-fetch");
-const fetchSafe = (typeof fetch === 'function' && fetch) || // ServiceWorker fetch (Cloud Functions + Chrome extension)
-    (typeof global === 'object' && global.fetch) || // Node.js 18+ fetch
-    (typeof window !== 'undefined' && window.fetch) || // Browser fetch
-    cross_fetch_1.fetch; // Polyfill fetch
+const fetch_polyfill_1 = require("./fetch.polyfill");
 const USER_AGENTS = [
     'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36',
     'Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/87.0.4280.77 Mobile/15E148 Safari/604.1',
@@ -27,7 +22,7 @@ const headers = {
 };
 const fetchPage = (url) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetchSafe(url, { headers });
+        const response = yield (0, fetch_polyfill_1.fetchSafe)(url, { headers });
         if (response.status >= 400 && response.status < 600) {
             throw new Error(`node-csfd-api: Bad response ${response.status} for url: ${url}`);
         }

package/cjs/helpers/cinema.helper.js

@@ -1,18 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMeta = exports.getFilms = exports.getGroupedFilmsByDate = exports.parseCinema = exports.getCinemaUrl = exports.getCoords = exports.getName = exports.getId = exports.getCinemaId = exports.getColorRating = void 0;
+exports.parseMeta = exports.getFilms = exports.getGroupedFilmsByDate = exports.parseCinema = exports.getCinemaUrl = exports.getCoords = exports.getName = exports.getId = exports.getColorRating = void 0;
 const global_helper_1 = require("./global.helper");
 const getColorRating = (el) => {
     return (0, global_helper_1.parseColor)(el === null || el === void 0 ? void 0 : el.classNames.split(' ').pop());
 };
 exports.getColorRating = getColorRating;
-const getCinemaId = (el) => {
-    var _a;
-    const id = (_a = el === null || el === void 0 ? void 0 : el.id) === null || _a === void 0 ? void 0 : _a.split('-')[1];
-    console.log('id', id);
-    return +id;
-};
-exports.getCinemaId = getCinemaId;
 const getId = (url) => {
     if (url) {
         return (0, global_helper_1.parseIdFromUrl)(url);

package/cjs/helpers/global.helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseISO8601Duration = exports.addProtocol = exports.parseColor = exports.getColor = exports.parseIdFromUrl = void 0;
+exports.parseISO8601Duration = exports.getDuration = exports.addProtocol = exports.parseColor = exports.getColor = exports.parseIdFromUrl = void 0;
 const parseIdFromUrl = (url) => {
     if (url) {
         const idSlug = url === null || url === void 0 ? void 0 : url.split('/')[2];
@@ -46,10 +46,8 @@ const addProtocol = (url) => {
     return url.startsWith('//') ? 'https:' + url : url;
 };
 exports.addProtocol = addProtocol;
-const parseISO8601Duration = (iso) => {
-    const iso8601DurationRegex = /(-)?P(?:([.,\d]+)Y)?(?:([.,\d]+)M)?(?:([.,\d]+)W)?(?:([.,\d]+)D)?T(?:([.,\d]+)H)?(?:([.,\d]+)M)?(?:([.,\d]+)S)?/;
-    const matches = iso.match(iso8601DurationRegex);
-    const duration = {
+const getDuration = (matches) => {
+    return {
         sign: matches[1] === undefined ? '+' : '-',
         years: matches[2] === undefined ? 0 : matches[2],
         months: matches[3] === undefined ? 0 : matches[3],
@@ -59,6 +57,12 @@ const parseISO8601Duration = (iso) => {
         minutes: matches[7] === undefined ? 0 : matches[7],
         seconds: matches[8] === undefined ? 0 : matches[8]
     };
+};
+exports.getDuration = getDuration;
+const parseISO8601Duration = (iso) => {
+    const iso8601DurationRegex = /(-)?P(?:([.,\d]+)Y)?(?:([.,\d]+)M)?(?:([.,\d]+)W)?(?:([.,\d]+)D)?T(?:([.,\d]+)H)?(?:([.,\d]+)M)?(?:([.,\d]+)S)?/;
+    const matches = iso.match(iso8601DurationRegex);
+    const duration = (0, exports.getDuration)(matches);
     return +duration.minutes;
 };
 exports.parseISO8601Duration = parseISO8601Duration;

package/cjs/services/cinema.service.js

@@ -15,9 +15,9 @@ const fetchers_1 = require("../fetchers");
 const vars_1 = require("../vars");
 const cinema_helper_1 = require("./../helpers/cinema.helper");
 class CinemaScraper {
-    cinemas(district = 1, period = 'today') {
+    cinemas(district) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = (0, vars_1.cinemasUrl)(district, period);
+            const url = (0, vars_1.cinemasUrl)(district, 'week');
             const response = yield (0, fetchers_1.fetchPage)(url);
             const cinemasHtml = (0, node_html_parser_1.parse)(response);
             const contentNode = cinemasHtml.querySelectorAll('#snippet--cinemas section.box');
@@ -30,7 +30,6 @@ class CinemaScraper {
         contentNode.map((x) => {
             var _a, _b;
             const cinema = {
-                id: (0, cinema_helper_1.getCinemaId)(x),
                 name: (_a = (0, cinema_helper_1.parseCinema)(x)) === null || _a === void 0 ? void 0 : _a.name,
                 city: (_b = (0, cinema_helper_1.parseCinema)(x)) === null || _b === void 0 ? void 0 : _b.city,
                 url: (0, cinema_helper_1.getCinemaUrl)(x),

package/cjs/vars.js

@@ -7,7 +7,7 @@ const movieUrl = (movie) => `https://www.csfd.cz/film/${encodeURIComponent(movie
 exports.movieUrl = movieUrl;
 const creatorUrl = (creator) => `https://www.csfd.cz/tvurce/${encodeURIComponent(creator)}`;
 exports.creatorUrl = creatorUrl;
-const cinemasUrl = (district, period) => {
+const cinemasUrl = (district = 1, period = 'today') => {
     return `https://www.csfd.cz/kino/?period=${period}&district=${district}`;
 };
 exports.cinemasUrl = cinemasUrl;

package/esm/fetchers/fetch.polyfill.js

@@ -0,0 +1,6 @@
+// Check if `fetch` is available in global scope (nodejs 18+) or in window (browser). If not, use cross-fetch polyfill.
+import { fetch as crossFetch } from 'cross-fetch';
+export const fetchSafe = (typeof fetch === 'function' && fetch) || // ServiceWorker fetch (Cloud Functions + Chrome extension)
+    (typeof global === 'object' && global.fetch) || // Node.js 18+ fetch
+    (typeof window !== 'undefined' && window.fetch) || // Browser fetch
+    crossFetch; // Polyfill fetch

package/esm/fetchers/index.js

@@ -7,12 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-// Check if `fetch` is available in global scope (nodejs 18+) or in window (browser). If not, use cross-fetch polyfill.
-import { fetch as crossFetch } from 'cross-fetch';
-const fetchSafe = (typeof fetch === 'function' && fetch) || // ServiceWorker fetch (Cloud Functions + Chrome extension)
-    (typeof global === 'object' && global.fetch) || // Node.js 18+ fetch
-    (typeof window !== 'undefined' && window.fetch) || // Browser fetch
-    crossFetch; // Polyfill fetch
+import { fetchSafe } from './fetch.polyfill';
 const USER_AGENTS = [
     'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36',
     'Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/87.0.4280.77 Mobile/15E148 Safari/604.1',

package/esm/helpers/cinema.helper.js

@@ -2,12 +2,6 @@ import { parseColor, parseIdFromUrl } from './global.helper';
 export const getColorRating = (el) => {
     return parseColor(el === null || el === void 0 ? void 0 : el.classNames.split(' ').pop());
 };
-export const getCinemaId = (el) => {
-    var _a;
-    const id = (_a = el === null || el === void 0 ? void 0 : el.id) === null || _a === void 0 ? void 0 : _a.split('-')[1];
-    console.log('id', id);
-    return +id;
-};
 export const getId = (url) => {
     if (url) {
         return parseIdFromUrl(url);

package/esm/helpers/global.helper.js

@@ -39,10 +39,8 @@ export const parseColor = (quality) => {
 export const addProtocol = (url) => {
     return url.startsWith('//') ? 'https:' + url : url;
 };
-export const parseISO8601Duration = (iso) => {
-    const iso8601DurationRegex = /(-)?P(?:([.,\d]+)Y)?(?:([.,\d]+)M)?(?:([.,\d]+)W)?(?:([.,\d]+)D)?T(?:([.,\d]+)H)?(?:([.,\d]+)M)?(?:([.,\d]+)S)?/;
-    const matches = iso.match(iso8601DurationRegex);
-    const duration = {
+export const getDuration = (matches) => {
+    return {
         sign: matches[1] === undefined ? '+' : '-',
         years: matches[2] === undefined ? 0 : matches[2],
         months: matches[3] === undefined ? 0 : matches[3],
@@ -52,5 +50,10 @@ export const parseISO8601Duration = (iso) => {
         minutes: matches[7] === undefined ? 0 : matches[7],
         seconds: matches[8] === undefined ? 0 : matches[8]
     };
+};
+export const parseISO8601Duration = (iso) => {
+    const iso8601DurationRegex = /(-)?P(?:([.,\d]+)Y)?(?:([.,\d]+)M)?(?:([.,\d]+)W)?(?:([.,\d]+)D)?T(?:([.,\d]+)H)?(?:([.,\d]+)M)?(?:([.,\d]+)S)?/;
+    const matches = iso.match(iso8601DurationRegex);
+    const duration = getDuration(matches);
     return +duration.minutes;
 };

package/esm/services/cinema.service.js

@@ -10,11 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { parse } from 'node-html-parser';
 import { fetchPage } from '../fetchers';
 import { cinemasUrl } from '../vars';
-import { getCinemaId, getCinemaUrl, getCoords, getGroupedFilmsByDate, parseCinema } from './../helpers/cinema.helper';
+import { getCinemaUrl, getCoords, getGroupedFilmsByDate, parseCinema } from './../helpers/cinema.helper';
 export class CinemaScraper {
-    cinemas(district = 1, period = 'today') {
+    cinemas(district) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = cinemasUrl(district, period);
+            const url = cinemasUrl(district, 'week');
             const response = yield fetchPage(url);
             const cinemasHtml = parse(response);
             const contentNode = cinemasHtml.querySelectorAll('#snippet--cinemas section.box');
@@ -27,7 +27,6 @@ export class CinemaScraper {
         contentNode.map((x) => {
             var _a, _b;
             const cinema = {
-                id: getCinemaId(x),
                 name: (_a = parseCinema(x)) === null || _a === void 0 ? void 0 : _a.name,
                 city: (_b = parseCinema(x)) === null || _b === void 0 ? void 0 : _b.city,
                 url: getCinemaUrl(x),

package/esm/vars.js

@@ -1,7 +1,7 @@
 export const userRatingsUrl = (user, page) => `https://www.csfd.cz/uzivatel/${encodeURIComponent(user)}/hodnoceni/${page ? '?page=' + page : ''}`;
 export const movieUrl = (movie) => `https://www.csfd.cz/film/${encodeURIComponent(movie)}/prehled/`;
 export const creatorUrl = (creator) => `https://www.csfd.cz/tvurce/${encodeURIComponent(creator)}`;
-export const cinemasUrl = (district, period) => {
+export const cinemasUrl = (district = 1, period = 'today') => {
     return `https://www.csfd.cz/kino/?period=${period}&district=${district}`;
 };
 export const searchUrl = (text) => `https://www.csfd.cz/hledat/?q=${encodeURIComponent(text)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-csfd-api",
-  "version": "3.0.0-next.16",
+  "version": "3.0.0-next.18",
   "description": "ČSFD API in JavaScript. Amazing NPM library for scrapping csfd.cz :)",
   "main": "./cjs/index.js",
   "author": "BART! <bart@bartweb.cz>",
@@ -11,11 +11,11 @@
     "barrels": "barrelsby --delete -c barrels.json",
     "postbuild": "npm-prepare-dist -s postinstall -s prepare && yarn fix-paths",
     "tsc": "tsc",
-    "demo": "ts-node demo",
+    "demo": "tsx demo",
     "lint": "eslint ./src/**/**/* --fix",
     "test": "vitest",
     "test:coverage": "yarn test run --coverage",
-    "fix-paths": "yarn json -I -f ./dist/package.json -e \"this.module='./esm/index.js';this.main='./cjs/index.js';this.types='./types/index.d.ts'\"",
+    "fix-paths": "yarn json -I -f ./dist/package.json -e \"this.module='./esm/index.js';this.main='./cjs/index.js';this.types='./cjs/index.d.ts'\"",
     "publish:next": "yarn && yarn build && yarn test:coverage && cd dist && npm publish --tag next",
     "postversion": "git push && git push --follow-tags",
     "release:beta": "npm version preminor --preid=beta -m \"chore(update): prelease %s β\"",
@@ -29,8 +29,8 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "cross-fetch": "^3.1.6",
-    "node-html-parser": "^6.1.5"
+    "cross-fetch": "^4.0.0",
+    "node-html-parser": "^6.1.12"
   },
   "repository": {
     "url": "git+https://github.com/bartholomej/node-csfd-api.git",
@@ -57,6 +57,9 @@
     "node": ">= 14"
   },
   "license": "MIT",
+  "lint-staged": {
+    "*.ts": "eslint --cache --fix"
+  },
   "module": "./esm/index.js",
-  "types": "./types/index.d.ts"
+  "types": "./cjs/index.d.ts"
 }

package/types/fetchers/fetch.polyfill.d.ts

@@ -0,0 +1 @@
+export declare const fetchSafe: typeof fetch;

package/types/helpers/cinema.helper.d.ts

@@ -1,8 +1,7 @@
-import { CSFDCinemaGroupedFilmsByDate, CSFDCinemaMeta, CSFDCinemaMovie } from 'interfaces/cinema.interface';
+import { CSFDCinemaMeta, CSFDCinemaMovie } from 'interfaces/cinema.interface';
 import { HTMLElement } from 'node-html-parser';
 import { CSFDColorRating } from '../interfaces/global';
 export declare const getColorRating: (el: HTMLElement) => CSFDColorRating;
-export declare const getCinemaId: (el: HTMLElement | null) => number;
 export declare const getId: (url: string) => number;
 export declare const getName: (el: HTMLElement | null) => string;
 export declare const getCoords: (el: HTMLElement | null) => {
@@ -14,6 +13,6 @@ export declare const parseCinema: (el: HTMLElement | null) => {
     city: string;
     name: string;
 };
-export declare const getGroupedFilmsByDate: (el: HTMLElement | null) => CSFDCinemaGroupedFilmsByDate[];
+export declare const getGroupedFilmsByDate: (el: HTMLElement | null) => any;
 export declare const getFilms: (date: string, el: HTMLElement | null) => CSFDCinemaMovie[];
 export declare const parseMeta: (meta: string[]) => CSFDCinemaMeta[];

package/types/helpers/global.helper.d.ts

@@ -4,4 +4,14 @@ export declare const parseIdFromUrl: (url: string) => number;
 export declare const getColor: (cls: string) => CSFDColorRating;
 export declare const parseColor: (quality: Colors) => CSFDColorRating;
 export declare const addProtocol: (url: string) => string;
+export declare const getDuration: (matches: any[]) => {
+    sign: string;
+    years: any;
+    months: any;
+    weeks: any;
+    days: any;
+    hours: any;
+    minutes: any;
+    seconds: any;
+};
 export declare const parseISO8601Duration: (iso: string) => number;

package/types/index.ts

@@ -4,6 +4,7 @@
 
 export * from "./index";
 export * from "./vars";
+export * from "./fetchers/fetch.polyfill";
 export * from "./fetchers/index";
 export * from "./helpers/cinema.helper";
 export * from "./helpers/creator.helper";

package/types/interfaces/cinema.interface.d.ts

@@ -1,6 +1,5 @@
 import { CSFDMovieListItem } from './movie.interface';
 export interface CSFDCinema {
-    id: number;
     name: string;
     city: string;
     url: string;
@@ -9,15 +8,10 @@ export interface CSFDCinema {
         lng: number;
     };
     region?: string;
-    screenings: CSFDCinemaGroupedFilmsByDate[];
-}
-export interface CSFDCinemaGroupedFilmsByDate {
-    date: string;
-    films: CSFDCinemaMovie[];
+    screenings: CSFDCinemaMovie[];
 }
 export interface CSFDCinemaMovie extends CSFDMovieListItem {
     meta: CSFDCinemaMeta[];
     showTimes: string[];
 }
 export type CSFDCinemaMeta = 'dubbing' | '3D' | 'subtitles' | string;
-export type CSFDCinemaPeriod = 'today' | 'weekend' | 'week' | 'tomorrow' | 'month';

package/types/services/cinema.service.d.ts

@@ -1,6 +1,6 @@
-import { CSFDCinema, CSFDCinemaPeriod } from '../interfaces/cinema.interface';
+import { CSFDCinema } from '../interfaces/cinema.interface';
 export declare class CinemaScraper {
     private cinema;
-    cinemas(district?: number, period?: CSFDCinemaPeriod): Promise<CSFDCinema[]>;
+    cinemas(district: number): Promise<CSFDCinema[]>;
     private buildCinemas;
 }

package/types/vars.d.ts

@@ -1,6 +1,5 @@
-import { CSFDCinemaPeriod } from 'interfaces/cinema.interface';
 export declare const userRatingsUrl: (user: string | number, page?: number) => string;
 export declare const movieUrl: (movie: number) => string;
 export declare const creatorUrl: (creator: number | string) => string;
-export declare const cinemasUrl: (district: number | string, period: CSFDCinemaPeriod) => string;
+export declare const cinemasUrl: (district?: number | string, period?: 'today' | 'weekend' | 'week' | 'tomorrow' | 'month') => string;
 export declare const searchUrl: (text: string) => string;