switch library to use commonjs

waqi-dev-community · Sep 13, 2023 · 2dd4840 · 2dd4840
1 parent 3c20608
commit 2dd4840
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 49 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "waqi-js-client",
   "version": "1.0.0",
-  "type": "module",
   "description": "JS client library for the World Air Quality Index (WAQI) APIs. All available API modules are supported - City feed, Geolocalized feed, Search, and Map Queries.",
   "main": "index.js",
   "scripts": {

diff --git a/src/API.js b/src/API.js
@@ -1,8 +1,9 @@
-import MapStation  from './Entity/MapStation';
-import CityFeed from "./Entity/CityFeed";
-import Search from "./Entity/Search";
-import IPFeed from "./Entity/IPFeed";
-import GeoFeed from "./Entity/GeoField";
+const MapStation = require('./Entity/MapStation');
+const CityFeed= require('./Entity/CityFeed');
+const Search= require('./Entity/Search');
+const IPFeed= require('./Entity/IPFeed');
+const GeoFeed= require('./Entity/GeoField');
+
 
 class API {
     constructor(apiKey) {

diff --git a/src/Entity/CityFeed.js b/src/Entity/CityFeed.js
@@ -1,4 +1,4 @@
-import WaqiAPIEntity from './WaqiAPIEntity'
+const WaqiAPIEntity = require('./WaqiAPIEntity')
 
 class CityFeed extends WaqiAPIEntity {
     setCity(city) {

diff --git a/src/Entity/GeoField.js b/src/Entity/GeoField.js
@@ -1,4 +1,4 @@
-import WaqiAPIEntity from './WaqiAPIEntity'
+const WaqiAPIEntity = require('./WaqiAPIEntity')
 
 class GeoFeed extends WaqiAPIEntity {
     setCoordinates(latitude, longitude) {

diff --git a/src/Entity/IPFeed.js b/src/Entity/IPFeed.js
@@ -1,4 +1,4 @@
-import WaqiAPIEntity from './WaqiAPIEntity'
+const WaqiAPIEntity = require('./WaqiAPIEntity')
 
 class IPFeed extends WaqiAPIEntity {
     setIP(ipAddress) {

diff --git a/src/Entity/MapStation.js b/src/Entity/MapStation.js
@@ -1,4 +1,4 @@
-import WaqiAPIEntity from './WaqiAPIEntity'
+const WaqiAPIEntity = require('./WaqiAPIEntity')
 
 class MapStation extends WaqiAPIEntity {
     setMapBounds(latitudeNorth, longitudeWest, latitudeSouth, longitudeEast) {

diff --git a/src/Entity/Search.js b/src/Entity/Search.js
@@ -1,4 +1,4 @@
-import WaqiAPIEntity from './WaqiAPIEntity'
+const WaqiAPIEntity = require('./WaqiAPIEntity')
 
 class Search extends WaqiAPIEntity {
     setKeyword(keyword) {

diff --git a/src/Entity/WaqiAPIEntity.js b/src/Entity/WaqiAPIEntity.js
@@ -1,4 +1,4 @@
-import axios from 'axios';
+const axios = require('axios')
 
 class WaqiAPIEntity {
     constructor(apiKey) {
@@ -20,17 +20,24 @@ class WaqiAPIEntity {
         return '&' + queryParams.toString();
     }
 
-    async fetchItems(asArray = false) {
+    async fetchItems() {
         const url = this.url();
         const tokenParam = `token=${this.apiKey}`;
         const queryParams = this.buildQueryParams();
 
-        try {
-            const response = await axios.get(`${url}?${tokenParam}${queryParams}`);
-            return asArray ? response.data : JSON.parse(response.data);
-        } catch (error) {
-            throw new Error(`Error fetching data: ${error.message}`);
-        }
+        const options = {
+            method: 'GET',
+            url: `${url}?${tokenParam}${queryParams}`,
+            headers: {
+                'content-type': 'application/json',
+            },
+        };
+
+        return axios.request(options).then(response => {
+            return response.data
+        }).catch( error => {
+            throw error;
+        })
     }
 }
 

diff --git a/src/example/example.js → src/example.js b/src/example/example.js → src/example.js
@@ -1,11 +1,11 @@
-import API  from '../API';
+const API = require('./API')
 
 const apiKey = 'demo';
 const waqiAPI = new API(apiKey);
 
 const cityFeedEntity = waqiAPI.cityFeed();
-cityFeedEntity.setCity("Munich");
-cityFeedEntity.fetchItems(true).then(response => {
+cityFeedEntity.setCity("Shanghai");
+cityFeedEntity.fetchItems().then(response => {
     console.log(response);
 }).catch(error => {
     console.error(error);

diff --git a/src/index.js b/src/index.js
@@ -1,3 +1,3 @@
-import API from './API'
+const API = require('./API')
 
 module.exports = API
diff --git a/src/tests/APITest.test.js b/src/tests/APITest.test.js
@@ -1,6 +1,6 @@
 import {describe, test, expect, beforeAll} from '@jest/globals'
 import API  from '../API';
- const apiKey = 'demo'; // Replace with your actual API key
+const apiKey = 'demo'; // Replace with your actual API key
 
 describe('API Tests', () => {
     let waqiAPI;
@@ -11,31 +11,31 @@ describe('API Tests', () => {
 
     test('CityFeed API', async () => {
         const cityFeedEntity = waqiAPI.cityFeed();
-        const response = await cityFeedEntity.setCity('Lagos').fetchItems();
+        const response = await cityFeedEntity.setCity('Shanghai').fetchItems();
         expect(typeof response).toBe('object');
     }, 10000);
-    //
-    // test('Search API Returns Array', async () => {
-    //     const searchEntity = waqiAPI.search();
-    //     const response = await searchEntity.setKeyword('keyword').fetch(true);
-    //     expect(Array.isArray(response)).toBe(true);
-    // });
-    //
-    // test('GeoFeed API', async () => {
-    //     const geoFeedEntity = waqiAPI.geoFeed();
-    //     const response = await geoFeedEntity.setCoordinates(37.7749, -122.4194).fetch();
-    //     expect(typeof response).toBe('object');
-    // });
-    //
-    // test('IPFeed API', async () => {
-    //     const ipFeedEntity = waqiAPI.ipFeed();
-    //     const response = await ipFeedEntity.setIP('8.8.8.8').fetch();
-    //     expect(typeof response).toBe('object');
-    // });
-    //
-    // test('MapStations API', async () => {
-    //     const mapStationEntity = waqiAPI.mapStation();
-    //     const response = await mapStationEntity.setMapBounds(40.712, -74.006, 34.052, -118.243).fetch();
-    //     expect(typeof response).toBe('object');
-    // });
+
+    test('Search API Returns Array', async () => {
+        const searchEntity = waqiAPI.search();
+        const response = await searchEntity.setKeyword('keyword').fetchItems();
+        expect(Array.isArray(response?.data)).toBe(true);
+    });
+
+    test('GeoFeed API', async () => {
+        const geoFeedEntity = waqiAPI.geoFeed();
+        const response = await geoFeedEntity.setCoordinates(37.7749, -122.4194).fetchItems();
+        expect(typeof response).toBe('object');
+    });
+
+    test('IPFeed API', async () => {
+        const ipFeedEntity = waqiAPI.ipFeed();
+        const response = await ipFeedEntity.setIP('8.8.8.8').fetchItems();
+        expect(typeof response).toBe('object');
+    });
+
+    test('MapStations API', async () => {
+        const mapStationEntity = waqiAPI.mapStation();
+        const response = await mapStationEntity.setMapBounds(40.712, -74.006, 34.052, -118.243).fetchItems();
+        expect(typeof response).toBe('object');
+    });
 });