my-timezone 1.5.3 → 1.5.5

package/dist/cjs/MyTimezone.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import axios from 'axios';
 import { NTPClient } from 'ntpclient';
 export var DIRECTION;
@@ -21,73 +12,68 @@ const defaultConfig = {
 const nominatimAPI = 'https://nominatim.openstreetmap.org';
 export class MyTimezone {
     constructor(config) {
-        this.config = Object.assign(Object.assign({}, defaultConfig), config);
+        this.config = {
+            ...defaultConfig,
+            ...config,
+        };
         this.ntpClient = new NTPClient(this.config.ntpServer);
     }
-    getLocation(location) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const coordinates = this.parseCoordinates(location);
-                return coordinates;
-            }
-            catch (error) {
-                if (error.message.includes('No coordinates parsed')) {
-                    return this.getLocationByName(location);
-                }
-                throw error;
+    async getLocation(location) {
+        try {
+            const coordinates = this.parseCoordinates(location);
+            return coordinates;
+        }
+        catch (error) {
+            if (error.message.includes('No coordinates parsed')) {
+                return this.getLocationByName(location);
             }
-        });
+            throw error;
+        }
     }
-    getLocationByName(address, radius) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestConfig = {
-                method: 'get',
-                params: {
-                    format: 'json',
-                    limit: 9,
-                    // eslint-disable-next-line id-length
-                    q: address,
-                },
-                url: `${nominatimAPI}/search`,
-            };
-            if (radius) {
-                requestConfig.params.radius = radius;
-            }
-            let results;
-            try {
-                const response = yield axios.request(requestConfig);
-                results = response.data;
-            }
-            catch (error) {
-                throw new Error(`Nominatim API Error: ${error.message}`);
-            }
-            if (!results.length) {
-                throw new Error('No place found.');
-            }
-            const { display_name, lon } = results[0];
-            const parsedLongitude = parseFloat(lon);
-            return {
-                formattedAddress: display_name,
-                longitude: parsedLongitude,
-            };
-        });
+    async getLocationByName(address, radius) {
+        const requestConfig = {
+            method: 'get',
+            params: {
+                format: 'json',
+                limit: 9,
+                // eslint-disable-next-line id-length
+                q: address,
+            },
+            url: `${nominatimAPI}/search`,
+        };
+        if (radius) {
+            requestConfig.params.radius = radius;
+        }
+        let results;
+        try {
+            const response = await axios.request(requestConfig);
+            results = response.data;
+        }
+        catch (error) {
+            throw new Error(`Nominatim API Error: ${error.message}`);
+        }
+        if (!results.length) {
+            throw new Error('No place found.');
+        }
+        const { display_name, lon } = results[0];
+        const parsedLongitude = parseFloat(lon);
+        return {
+            formattedAddress: display_name,
+            longitude: parsedLongitude,
+        };
     }
-    getDateByAddress(address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { longitude } = yield this.getLocationByName(address);
-            return this.getDateByLongitude(longitude);
-        });
+    async getDateByAddress(address) {
+        const { longitude } = await this.getLocationByName(address);
+        return this.getDateByLongitude(longitude);
     }
-    getDateByLongitude(longitude) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const direction = longitude < 0 ? DIRECTION.WEST : DIRECTION.EAST;
-            const utcDate = yield this.getUTCDate();
-            const offsetMillis = this.getOffsetMillis(longitude, direction);
-            const calculatedDate = direction === DIRECTION.EAST
-                ? new Date(utcDate.getTime() + offsetMillis)
-                : new Date(utcDate.getTime() - offsetMillis);
-            return calculatedDate;
-        });
+    async getDateByLongitude(longitude) {
+        const direction = longitude < 0 ? DIRECTION.WEST : DIRECTION.EAST;
+        const utcDate = await this.getUTCDate();
+        const offsetMillis = this.getOffsetMillis(longitude, direction);
+        const calculatedDate = direction === DIRECTION.EAST
+            ? new Date(utcDate.getTime() + offsetMillis)
+            : new Date(utcDate.getTime() - offsetMillis);
+        return calculatedDate;
     }
     parseCoordinates(coordinates) {
         var _a;
@@ -122,9 +108,7 @@ export class MyTimezone {
         const offsetHours = (dir * longitudeDegrees * dayInHours) / degreesOnEarth;
         return offsetHours * oneHourInMillis;
     }
-    getUTCDate() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.config.offline ? new Date() : this.ntpClient.getNetworkTime();
-        });
+    async getUTCDate() {
+        return this.config.offline ? new Date() : this.ntpClient.getNetworkTime();
     }
 }

package/dist/cjs/MyTimezone.test.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 /* eslint-disable no-magic-numbers */
 import { expect, describe, test, vi } from 'vitest';
 import nock from 'nock';
@@ -46,24 +37,24 @@ describe('MyTimezone', () => {
         ],
     ])
         .persist();
-    test('returns an address from Nominatim', () => __awaiter(void 0, void 0, void 0, function* () {
+    test('returns an address from Nominatim', async () => {
         const location = 'Berlin, Germany';
-        const { formattedAddress } = yield tz.getLocationByName(location);
+        const { formattedAddress } = await tz.getLocationByName(location);
         expect(formattedAddress).toBe(location);
-    }));
-    test('returns the correct time for a location', () => __awaiter(void 0, void 0, void 0, function* () {
-        const berlinTime = yield tz.getDateByLongitude(13.40803);
+    });
+    test('returns the correct time for a location', async () => {
+        const berlinTime = await tz.getDateByLongitude(13.40803);
         //console.log('Timezone at 52.51848, 13.40803:', berlinTime.toString());
-        const frankfurtTime = yield tz.getDateByLongitude(8.67931);
+        const frankfurtTime = await tz.getDateByLongitude(8.67931);
         //console.log('Timezone at 50.11796, 8.67931:', frankfurtTime.toString());
         expect(frankfurtTime.getTime() < berlinTime.getTime()).toBe(true);
-    }));
-    test('returns the time for an address', () => __awaiter(void 0, void 0, void 0, function* () {
-        const dataBerlin = yield tz.getDateByAddress('Berlin, Germany');
+    });
+    test('returns the time for an address', async () => {
+        const dataBerlin = await tz.getDateByAddress('Berlin, Germany');
         expect(dataBerlin).toBeDefined();
         //console.log('Timezone Berlin:', dataBerlin.toString());
-        const dataMinsk = yield tz.getDateByAddress('Minsk, Belarus');
+        const dataMinsk = await tz.getDateByAddress('Minsk, Belarus');
         expect(dataMinsk).toBeDefined();
         //console.log('Timezone Minsk:', dataMinsk.toString());
-    }));
+    });
 });

package/dist/cjs/cli.js

@@ -1,13 +1,4 @@
 #!/usr/bin/env node
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { program as commander } from 'commander';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
@@ -30,10 +21,10 @@ const myTimezone = new MyTimezone({
     ntpServer: commander.opts().server,
     offline: !!commander.opts().offline,
 });
-void (() => __awaiter(void 0, void 0, void 0, function* () {
+void (async () => {
     try {
-        const { longitude } = yield myTimezone.getLocation(location);
-        const date = yield myTimezone.getDateByLongitude(longitude);
+        const { longitude } = await myTimezone.getLocation(location);
+        const date = await myTimezone.getDateByLongitude(longitude);
         const parsedDate = myTimezone.parseDate(date);
         const formattedDate = `${parsedDate.year}-${parsedDate.month}-${parsedDate.day}`;
         const formattedTime = `${parsedDate.hours}:${parsedDate.minutes}:${parsedDate.seconds}`;
@@ -44,4 +35,4 @@ void (() => __awaiter(void 0, void 0, void 0, function* () {
         console.error(error.message);
         process.exit(1);
     }
-}))();
+})();

package/dist/esm/MyTimezone.js

@@ -12,7 +12,10 @@ const defaultConfig = {
 const nominatimAPI = 'https://nominatim.openstreetmap.org';
 export class MyTimezone {
     constructor(config) {
-        this.config = Object.assign(Object.assign({}, defaultConfig), config);
+        this.config = {
+            ...defaultConfig,
+            ...config,
+        };
         this.ntpClient = new NTPClient(this.config.ntpServer);
     }
     async getLocation(location) {

package/package.json

@@ -2,16 +2,16 @@
   "author": "Florian Imdahl <git@ffflorian.de>",
   "bin": "dist/cjs/cli.js",
   "dependencies": {
-    "axios": "1.6.8",
-    "commander": "12.0.0",
-    "ntpclient": "1.6.3"
+    "axios": "1.7.2",
+    "commander": "12.1.0",
+    "ntpclient": "1.6.5"
   },
   "description": "Get the exact time based on your location.",
   "devDependencies": {
     "nock": "13.5.4",
-    "rimraf": "5.0.5",
-    "typescript": "5.4.4",
-    "vitest": "1.4.0"
+    "rimraf": "5.0.7",
+    "typescript": "5.5.2",
+    "vitest": "1.6.0"
   },
   "engines": {
     "node": ">= 18.0"
@@ -41,6 +41,6 @@
     "test": "vitest run"
   },
   "type": "module",
-  "version": "1.5.3",
-  "gitHead": "ca4256609abc0b2ce6b44c4d0691c250830e2993"
+  "version": "1.5.5",
+  "gitHead": "f7a6a79286e4eb85392b5f2d33942ab166142109"
 }