Refactor to ES6 modules

.babelrc

@@ -0,0 +1,9 @@
+{
+    "env": {
+        "test": {
+            "plugins": [
+                "@babel/plugin-transform-modules-commonjs"
+            ]
+        }
+    }
+}

.github/workflows/workflow.yml

@@ -0,0 +1,22 @@
+name: Node.js CI
+
+on:
+  pull_request:
+    branches:    
+      - master
+      - develop
+      - 'release/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '19.x'
+      - run: npm install
+      - run: npm test

.gitignore

@@ -2,4 +2,6 @@ node_modules/
 *.DS_Store
 .idea
 helper.js
-package-lock.json
+package-lock.json
+.vscode
+coverage

index.js

@@ -0,0 +1 @@
+export { search, film, types } from './src/index.js';

package.json

@@ -2,13 +2,30 @@
   "name": "faparser",
   "version": "1.1.1",
   "description": "Parser for Filmaffinity site",
-  "main": "src/faparser.js",
-  "scripts": {
-    "test": "\"\""
+  "main": "index.js",
+  "author": "Alberto Espinilla",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/aespinilla/faparser/issues"
   },
+  "homepage": "https://github.com/aespinilla/faparser#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/aespinilla/faparser.git"
+    "url": "https://github.com/aespinilla/faparser.git"
+  },
+  "type": "module",
+  "scripts": {
+    "test": "jest"
+  },
+  "jest": {
+    "collectCoverage": true,
+    "moduleFileExtensions": [
+      "js",
+      "jsx",
+      "json",
+      "ts",
+      "tsx"
+    ]
   },
   "keywords": [
     "filmaffinity",
@@ -23,14 +40,14 @@
     "series",
     "film"
   ],
-  "author": "Alberto Espinilla",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/aespinilla/faparser/issues"
-  },
-  "homepage": "https://github.com/aespinilla/faparser#readme",
   "dependencies": {
-    "cheerio": "1.0.0-rc.2",
-    "node-fetch": "^2.0"
+    "cheerio": "1.0.0-rc.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-transform-modules-commonjs": "^7.20.11",
+    "@babel/preset-env": "^7.20.2",
+    "jest": "^28.1.3",
+    "supertest": "^6.2.4"
   }
 }

src/config/config.js

@@ -0,0 +1,11 @@
+export const Config = {
+    "BASE_URL": "https://www.filmaffinity.com",
+    "paths": {
+        "GENRE": "/moviegenre.php?genre=",
+        "TOPIC": "/movietopic.php?topic=",
+        "IMAGES": "/filmimages.php?movie_id=",
+        "TRAILERS": "/evideos.php?movie_id=",
+        "PRO_REVIEWS": "/pro-reviews.php?movie-id=",
+        "SEARCH": "/search.php?stype="
+    }
+};

src/controller/filmController.js

@@ -0,0 +1,11 @@
+import { request } from "../request/request.js";
+import { filmUrlBuilder as urlBuilder } from "../urlBuilder/index.js";
+import { filmParser as parse } from "../parser/index.js";
+
+export const fetchFilm = async (data) => {
+    const url = urlBuilder(data);
+    const result = await request(url);
+    result.lang = data.lang;
+    const film = parse(result);
+    return { id: `${data.id}`, ...film }
+}

src/controller/imagesController.js

@@ -0,0 +1,11 @@
+import { request } from "../request/request.js";
+import { imagesUrlBuilder as urlBuilder } from "../urlBuilder/index.js";
+import { imagesParser as parse } from "../parser/index.js";
+
+export const fetchImages = async (data) => {
+    data.type = 'IMAGES'
+    const url = urlBuilder(data);
+    const response = await request(url);
+    const result = parse(response);
+    return result;
+}

src/controller/index.js

@@ -0,0 +1,5 @@
+export { fetchFilm as filmController } from './filmController.js';
+export { fetchImages as imagesController } from './imagesController.js';
+export { fetchProReviews as proReviewsController } from './proReviewsController.js';
+export { search as searchController } from './searchController.js';
+export { fetchTrailers as trailersController } from './trailersController.js';

src/controller/proReviewsController.js

@@ -0,0 +1,11 @@
+import { request } from "../request/request.js";
+import { proReviewsUrlBuilder as urlBuilder } from "../urlBuilder/index.js";
+import { proReviewsParser as parse } from "../parser/index.js";
+
+export const fetchProReviews = async (data) => {
+    data.type = 'PRO_REVIEWS';
+    const url = urlBuilder(data);
+    const response = await request(url);
+    const result = parse(response);
+    return result;
+}

src/controller/searchController.js

@@ -0,0 +1,81 @@
+import url from 'url';
+import { request } from "../request/request.js";
+import { searchUrlBuilder, genreUrlBuilder, topicUrlBuilder } from "../urlBuilder/index.js";
+import { filmParser, specialSearch, searchParser } from "../parser/index.js"; 
+
+export const search = async (data) => {
+    if (data.type === 'TOPIC') {
+        const result = await getTopics(data);
+        result.lang = data.lang;
+        return buildOutput(result, false);
+    }
+
+    if (data.type === 'GENRE') {
+        const result = await getGenres(data);
+        result.lang = data.lang;
+        return buildOutput(result, false);
+    }
+
+    const url = searchUrlBuilder(data);
+    const response = await request(url);
+    response.lang = data.lang;
+
+    if (isFilm(response.response.url)) {
+        const id = getId(response.response.url);
+        const film = filmParser(response);
+        const result = mapFilm(id, film);
+        return buildOutput([result], false);
+    }
+
+    const result = searchParser(response);
+    return buildOutput(result.result, result.hasMore);
+}
+
+const isFilm = (responseUrl) => {
+    const pathname = url.parse(responseUrl).pathname;
+    return pathname.includes('film');
+}
+
+const getId = (responseUrl) => {
+    const pathname = url.parse(responseUrl).pathname;
+    return pathname.substring(pathname.indexOf('film') + 'film'.length, pathname.indexOf('.'));
+}
+
+const getTopics = async (data) => {
+    const url = topicUrlBuilder(data);
+    return await getSpecialSearch(url);
+}
+
+const getGenres = async (data) => {
+    const url = genreUrlBuilder(data);
+    return await getSpecialSearch(url);
+}
+
+const getSpecialSearch = async (url) => {
+    const response = await request(url);
+    const result = specialSearch(response);
+    return result;
+}
+
+const mapFilm = (id, film) => {
+    return {
+        id: id,
+        url: film.url,
+        thumbnail: film.coverImages.imageUrlMed.replace("mmed", "msmall"),
+        year: film.year,
+        title: film.titles.title,
+        directors: film.directors,
+        cast: film.cast,
+        country: film.country,
+        rating: film.rating,
+        votes: film.votes
+    }
+}
+
+const buildOutput = (result, hasMore) => {
+    return {
+        more: hasMore || false,
+        count: result.length,
+        result: result
+    }
+}

src/controller/trailersController.js

@@ -0,0 +1,11 @@
+import { request } from "../request/request.js";
+import { trailersUrlBuilder as urlBuilder } from "../urlBuilder/index.js";
+import { trailersParser as parse } from "../parser/index.js";
+
+export const fetchTrailers = async (data) => {
+    data.type = 'TRAILERS';
+    const url = urlBuilder(data);
+    const response = await request(url);
+    const result = parse(response);
+    return result;
+}