salat 3.2.0 → 3.3.1

package/dist/app.js

@@ -1,31 +1,26 @@
 #!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 // Project's dependencies
-const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("./utils");
+import { displayResult, getCityId, getCityName, getData, parsePrayerTimesFromResponse, } from "#utils";
+import chalk from "chalk";
 // Project's data
-const constants_1 = require("./constants");
-const cities_json_1 = __importDefault(require("./data/cities.json"));
+import { BANNER, LOCAL_STORAGE_PATH } from "#constants";
+import citiesData from "./data/cities.json" with { type: "json" };
 // Setting up localStorage
-const node_localstorage_1 = require("node-localstorage");
+import { LocalStorage } from "node-localstorage";
 const args = process.argv;
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 // Logging function
-const green = (msg) => console.log(chalk_1.default.green(msg));
+const green = (msg) => console.log(chalk.green(msg));
 // Cast citiesData to City[] properly
-const cities = cities_json_1.default;
-const localStorage = new node_localstorage_1.LocalStorage(constants_1.LOCAL_STORAGE_PATH);
+const cities = citiesData;
+const localStorage = new LocalStorage(LOCAL_STORAGE_PATH);
 const cityNameArg = args[2];
-const cityName = (0, utils_1.getCityName)(cityNameArg, cities);
+const cityName = getCityName(cityNameArg, cities);
 // Convert string ID to number since getCityId returns number and getData expects number
-const cityId = (0, utils_1.getCityId)(cityName, cities);
+const cityId = getCityId(cityName, cities);
 const main = async () => {
     // Printing a banner ('cause I'm cool and I can do it XD)
-    green(constants_1.BANNER);
+    green(BANNER);
     const storageKey = `${cityName.toLowerCase()}_${new Date().toLocaleDateString()}`;
     let item = localStorage.getItem(storageKey);
     // Disable localStorage for local development
@@ -39,8 +34,8 @@ const main = async () => {
     }
     else {
         try {
-            const data = await (0, utils_1.getData)(cityId);
-            prayers = (0, utils_1.parsePrayerTimesFromResponse)(data);
+            const data = await getData(cityId);
+            prayers = parsePrayerTimesFromResponse(data);
             localStorage.setItem(storageKey, JSON.stringify(prayers));
         }
         catch (ex) {
@@ -51,7 +46,7 @@ const main = async () => {
         }
     }
     console.clear();
-    (0, utils_1.displayResult)(prayers, cityName);
+    displayResult(prayers, cityName);
 };
 (async () => {
     await main();

package/dist/constants.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCAL_STORAGE_PATH = exports.DEFAULT_CITY = exports.NOT_FOUND_ERROR = exports.BANNER = exports.API_URL = void 0;
-exports.API_URL = "https://www.habous.gov.ma/prieres/horaire-api.php";
-exports.BANNER = ``;
-exports.NOT_FOUND_ERROR = `
+export const API_URL = "https://www.habous.gov.ma/prieres/horaire-api.php";
+export const BANNER = ``;
+export const NOT_FOUND_ERROR = `
   Your city was not found in the list
   Using the default city
   ----------------------
   You may need to check the spelling
   `;
-exports.DEFAULT_CITY = "Marrakech";
-exports.LOCAL_STORAGE_PATH = "./storage";
+export const DEFAULT_CITY = "Marrakech";
+export const LOCAL_STORAGE_PATH = "./storage";

package/dist/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/utils.js

@@ -1,45 +1,36 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayResult = exports.parsePrayerTimesFromResponse = exports.getData = exports.getCityId = exports.getCityName = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const domino_1 = __importDefault(require("domino"));
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const constants_1 = require("./constants");
-const prayers_json_1 = __importDefault(require("./data/prayers.json"));
-const error = (msg) => console.log(chalk_1.default.red(msg));
-const getCityName = (arg, cities) => {
+import { API_URL, DEFAULT_CITY, NOT_FOUND_ERROR } from "#constants";
+import chalk from "chalk";
+import domino from "domino";
+import fetch from "node-fetch";
+import prayersData from "./data/prayers.json" with { type: "json" };
+const error = (msg) => console.error(chalk.red(msg));
+export const getCityName = (arg, cities) => {
     if (arg == null)
-        return constants_1.DEFAULT_CITY;
+        return DEFAULT_CITY;
     const index = getCityIndex(arg, cities);
     if (index === -1) {
-        error(constants_1.NOT_FOUND_ERROR);
-        return constants_1.DEFAULT_CITY;
+        error(NOT_FOUND_ERROR);
+        return DEFAULT_CITY;
     }
     return arg;
 };
-exports.getCityName = getCityName;
-const getCityId = (arg, cities) => {
+export const getCityId = (arg, cities) => {
     const parsed = parseInt(arg);
     if (parsed && cities.length >= parsed) {
         return parsed;
     }
     return getCityIndex(arg, cities) + 1;
 };
-exports.getCityId = getCityId;
 const getCityIndex = (city, cities) => cities.map((e) => e.name.toLowerCase()).indexOf(city.toLowerCase());
-const getData = async (cityId) => {
-    const response = await (0, node_fetch_1.default)(`${constants_1.API_URL}?ville=${cityId}`, {});
+export const getData = async (cityId) => {
+    const response = await fetch(`${API_URL}?ville=${cityId}`, {});
     return await response.text();
 };
-exports.getData = getData;
-const parsePrayerTimesFromResponse = (response) => {
-    const window = domino_1.default.createWindow(response);
+export const parsePrayerTimesFromResponse = (response) => {
+    const window = domino.createWindow(response);
     const document = window.document;
     const tds = document.getElementsByTagName("td");
-    const prayers = JSON.parse(JSON.stringify(prayers_json_1.default));
+    const prayers = JSON.parse(JSON.stringify(prayersData));
     let j = 0;
     for (let i = 1; i < tds.length && j < prayers.length; i += 2) {
         prayers[j].time = tds[i].textContent.trim();
@@ -53,7 +44,6 @@ const parsePrayerTimesFromResponse = (response) => {
         return acc;
     }, {});
 };
-exports.parsePrayerTimesFromResponse = parsePrayerTimesFromResponse;
 function tConv24(time24) {
     const [hours, minutes] = time24.split(":");
     const hour = Number(hours);
@@ -64,13 +54,12 @@ function tConv24(time24) {
     const ampm = hour < 12 ? "AM" : "PM";
     return `${formattedTime} ${ampm}`;
 }
-const displayResult = (prayers, city) => {
+export const displayResult = (prayers, city) => {
     if (!prayers)
         return;
     console.log(` 🧭 ${city}, Morocco\n\n 📆 ${new Date().toDateString()}\n`);
     Object.keys(prayers).forEach((key) => {
-        console.log(` ${chalk_1.default.cyan(key.padEnd(7, " "))} --> ${chalk_1.default.green(tConv24(prayers[key]))}`);
+        console.log(` ${chalk.cyan(key.padEnd(7, " "))} --> ${chalk.green(tConv24(prayers[key]))}`);
     });
     console.log("\n");
 };
-exports.displayResult = displayResult;

package/dist/utils.test.js

@@ -0,0 +1,75 @@
+import * as constants from '#constants';
+import { getCityId, getCityName, parsePrayerTimesFromResponse } from '#utils';
+import { describe, expect, it, vi } from 'vitest';
+// Mock cities data
+const mockCities = [
+    { id: 1, name: 'Casablanca' },
+    { id: 2, name: 'Rabat' },
+    { id: 3, name: 'Fes' },
+];
+describe('utils', () => {
+    describe('getCityName', () => {
+        it('should return the default city if no argument is provided', () => {
+            expect(getCityName(undefined, mockCities)).toBe(constants.DEFAULT_CITY);
+        });
+        it('should return the city name if it exists', () => {
+            expect(getCityName('Casablanca', mockCities)).toBe('Casablanca');
+        });
+        it('should return default city and log error if city does not exist', () => {
+            // Spy on console.error using vitest
+            const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+            expect(getCityName('UnknownCity', mockCities)).toBe(constants.DEFAULT_CITY);
+            // We expect some error message to be logged. 
+            // The actual implementation logs with chalk.red, so we just check it was called.
+            expect(consoleSpy).toHaveBeenCalled();
+            consoleSpy.mockRestore();
+        });
+        it('should be case insensitive', () => {
+            expect(getCityName('casablanca', mockCities)).toBe('casablanca');
+            expect(getCityName('RaBaT', mockCities)).toBe('RaBaT');
+        });
+    });
+    describe('getCityId', () => {
+        it('should return the ID if a number is provided as string', () => {
+            expect(getCityId('2', mockCities)).toBe(2);
+        });
+        it('should return the ID based on index + 1 if name is provided', () => {
+            // 'Casablanca' is at index 0, so ID should be 1
+            expect(getCityId('Casablanca', mockCities)).toBe(1);
+            // 'Rabat' is at index 1, so ID should be 2
+            expect(getCityId('Rabat', mockCities)).toBe(2);
+        });
+        it('should handle case insensitivity for city names', () => {
+            expect(getCityId('fes', mockCities)).toBe(3);
+        });
+    });
+    describe('parsePrayerTimesFromResponse', () => {
+        it('should parse prayer times correctly from HTML', () => {
+            const mockHtml = `
+            <html>
+                <body>
+                    <table>
+                        <tr><td>Fajr</td><td>05:30</td></tr>
+                        <tr><td>Chourouk</td><td>07:00</td></tr>
+                        <tr><td>Dhuhr</td><td>12:30</td></tr>
+                        <tr><td>Asr</td><td>15:45</td></tr>
+                        <tr><td>Maghrib</td><td>18:20</td></tr>
+                        <tr><td>Isha</td><td>19:50</td></tr>
+                    </table>
+                </body>
+            </html>
+            `;
+            // Note: The actual implementation expects td elements in a specific order (key, value, key, value...)
+            // And it relies on prayersData keys. 
+            // We need to match the structure expected by the function.
+            // The function iterates tds with i=1, i+=2. meaning it takes index 1, 3, 5... as times.
+            const results = parsePrayerTimesFromResponse(mockHtml);
+            // Based on default prayers.json keys, let's assume we expect those values.
+            // Since we mocked the HTML, if the code pushes to 'prayers' array from 'prayersData',
+            // and then updates .time property from tds.
+            // checking if it returns an object with times
+            expect(results).toHaveProperty('Fajr');
+            expect(results).toHaveProperty('Dhuhr');
+        });
+    });
+});

package/package.json

@@ -1,24 +1,29 @@
 {
   "name": "salat",
-  "version": "3.2.0",
+  "version": "3.3.1",
+  "imports": {
+    "#*": "./dist/*.js"
+  },
   "description": "Daily Moroccan prayers time, right in your console, at the tip of your fingers",
   "homepage": "https://kafiln.github.io/salat-cli/",
   "main": "dist/app.js",
   "bin": {
     "salat": "dist/app.js"
   },
+  "type": "module",
   "dependencies": {
-    "chalk": "^2.4.2",
+    "chalk": "^5.3.0",
     "domino": "^2.1.6",
-    "node-fetch": "^2.7.0",
-    "node-localstorage": "^1.3.1"
+    "node-fetch": "^3.3.2",
+    "node-localstorage": "^3.0.5"
   },
   "scripts": {
-    "dev": "ts-node src/app.ts",
+    "dev": "node --no-warnings --loader ts-node/esm src/app.ts",
     "build": "tsc",
     "start": "node dist/app.js",
     "prestart": "npm run build",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "test": "vitest run"
   },
   "keywords": [
     "prayers",
@@ -37,6 +42,7 @@
     "@types/node-localstorage": "^1.3.3",
     "nodemon": "^3.1.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   }
 }

package/src/app.ts

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 
 // Project's dependencies
-import chalk from "chalk";
 import {
   displayResult,
   getCityId,
   getCityName,
   getData,
   parsePrayerTimesFromResponse,
-} from "./utils";
+} from "#utils";
+import chalk from "chalk";
 
 // Project's data
-import { BANNER, LOCAL_STORAGE_PATH } from "./constants";
-import citiesData from "./data/cities.json";
-import { City, PrayerTimes } from "./types";
+import { BANNER, LOCAL_STORAGE_PATH } from "#constants";
+import { City, PrayerTimes } from "#types";
+import citiesData from "./data/cities.json" with { type: "json" };
 
 // Setting up localStorage
 import { LocalStorage } from "node-localstorage";

package/src/utils.test.ts

@@ -0,0 +1,92 @@
+
+import * as constants from '#constants';
+import { City } from '#types';
+import { getCityId, getCityName, parsePrayerTimesFromResponse } from '#utils';
+import { describe, expect, it, vi } from 'vitest';
+
+// Mock cities data
+const mockCities: City[] = [
+  { id: 1, name: 'Casablanca' },
+  { id: 2, name: 'Rabat' },
+  { id: 3, name: 'Fes' },
+];
+
+describe('utils', () => {
+    describe('getCityName', () => {
+        it('should return the default city if no argument is provided', () => {
+            expect(getCityName(undefined, mockCities)).toBe(constants.DEFAULT_CITY);
+        });
+
+        it('should return the city name if it exists', () => {
+            expect(getCityName('Casablanca', mockCities)).toBe('Casablanca');
+        });
+
+        it('should return default city and log error if city does not exist', () => {
+            // Spy on console.error using vitest
+            const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+            
+            expect(getCityName('UnknownCity', mockCities)).toBe(constants.DEFAULT_CITY);
+            
+            // We expect some error message to be logged. 
+            // The actual implementation logs with chalk.red, so we just check it was called.
+            expect(consoleSpy).toHaveBeenCalled();
+            consoleSpy.mockRestore();
+        });
+
+        it('should be case insensitive', () => {
+             expect(getCityName('casablanca', mockCities)).toBe('casablanca');
+             expect(getCityName('RaBaT', mockCities)).toBe('RaBaT');
+        });
+    });
+
+    describe('getCityId', () => {
+        it('should return the ID if a number is provided as string', () => {
+            expect(getCityId('2', mockCities)).toBe(2);
+        });
+
+        it('should return the ID based on index + 1 if name is provided', () => {
+             // 'Casablanca' is at index 0, so ID should be 1
+             expect(getCityId('Casablanca', mockCities)).toBe(1);
+             // 'Rabat' is at index 1, so ID should be 2
+             expect(getCityId('Rabat', mockCities)).toBe(2);
+        });
+
+        it('should handle case insensitivity for city names', () => {
+            expect(getCityId('fes', mockCities)).toBe(3);
+        });
+    });
+
+    describe('parsePrayerTimesFromResponse', () => {
+        it('should parse prayer times correctly from HTML', () => {
+            const mockHtml = `
+            <html>
+                <body>
+                    <table>
+                        <tr><td>Fajr</td><td>05:30</td></tr>
+                        <tr><td>Chourouk</td><td>07:00</td></tr>
+                        <tr><td>Dhuhr</td><td>12:30</td></tr>
+                        <tr><td>Asr</td><td>15:45</td></tr>
+                        <tr><td>Maghrib</td><td>18:20</td></tr>
+                        <tr><td>Isha</td><td>19:50</td></tr>
+                    </table>
+                </body>
+            </html>
+            `;
+            
+            // Note: The actual implementation expects td elements in a specific order (key, value, key, value...)
+            // And it relies on prayersData keys. 
+            // We need to match the structure expected by the function.
+            // The function iterates tds with i=1, i+=2. meaning it takes index 1, 3, 5... as times.
+            
+            const results = parsePrayerTimesFromResponse(mockHtml);
+
+            // Based on default prayers.json keys, let's assume we expect those values.
+            // Since we mocked the HTML, if the code pushes to 'prayers' array from 'prayersData',
+            // and then updates .time property from tds.
+            
+            // checking if it returns an object with times
+            expect(results).toHaveProperty('Fajr');
+            expect(results).toHaveProperty('Dhuhr');
+        });
+    });
+});

package/src/utils.ts

@@ -1,11 +1,11 @@
+import { API_URL, DEFAULT_CITY, NOT_FOUND_ERROR } from "#constants";
+import { City, PrayerDef, PrayerTimes } from "#types";
 import chalk from "chalk";
 import domino from "domino";
 import fetch from "node-fetch";
-import { API_URL, DEFAULT_CITY, NOT_FOUND_ERROR } from "./constants";
-import prayersData from "./data/prayers.json";
-import { City, PrayerDef, PrayerTimes } from "./types";
+import prayersData from "./data/prayers.json" with { type: "json" };
 
-const error = (msg: string) => console.log(chalk.red(msg));
+const error = (msg: string) => console.error(chalk.red(msg));
 
 export const getCityName = (arg: string | undefined, cities: City[]): string => {
   if (arg == null) return DEFAULT_CITY;

package/tests/cli.e2e.test.ts

@@ -0,0 +1,46 @@
+
+import { exec } from 'child_process';
+import path from 'path';
+import util from 'util';
+import { describe, expect, it } from 'vitest';
+
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const execPromise = util.promisify(exec);
+const appPath = path.join(__dirname, '../src/app.ts');
+
+describe('CLI E2E', () => {
+    it('should run and display prayer times for default city', async () => {
+        // Running via ts-node to avoid build step dependency in tests
+        // using npx ts-node might be slower but works without pre-build
+        const { stdout, stderr } = await execPromise(`node --no-warnings --loader ts-node/esm ${appPath}`);
+        
+        expect(stderr).toBe('');
+        expect(stdout).toContain('Marrakech'); // Default city
+        expect(stdout).toContain('Fajr');
+        expect(stdout).toContain('Isha');
+    }, 10000); // increase timeout for CLI execution
+
+    it('should run and display prayer times for a specific city', async () => {
+        const { stdout } = await execPromise(`node --no-warnings --loader ts-node/esm ${appPath} "Rabat"`);
+        
+        expect(stdout).toContain('Rabat');
+        expect(stdout).toContain('Fajr');
+    }, 10000);
+
+    it('should handle invalid city gracefully', async () => {
+        const { stdout } = await execPromise(`node --no-warnings --loader ts-node/esm ${appPath} "InvalidCity"`);
+        
+        // As per utils.ts, it returns default city (Casablanca) and logs error (NOT_FOUND_ERROR)
+        // Note: The error is logged to console.log, so it might appear in stdout or just be visible.
+        // utils.ts: error(NOT_FOUND_ERROR) -> console.log(chalk.red(msg))
+        
+        expect(stdout).toContain('Marrakech');
+        // We might want to check for the error message if it's printed to stdout
+        // BUT utils.ts uses console.log for error as well.
+    }, 10000);
+});

package/tsconfig.json

@@ -1,15 +1,23 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "CommonJS",
+    "target": "ES2022",
+    "module": "NodeNext",
     "rootDir": "./src",
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "moduleResolution": "NodeNext",
+    "resolveJsonModule": true,
+    "baseUrl": "./",
+    "paths": {
+      "#*": ["./src/*.ts"]
+    }
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
+  "ts-node": {
+    "esm": true
+  }
 }

package/vitest.config.ts

@@ -0,0 +1,9 @@
+
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}', 'tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    environment: 'node',
+  },
+})