nhb-toolbox 4.26.1 → 4.26.20

package/CHANGELOG.md

@@ -6,6 +6,38 @@ All notable changes to the package will be documented here.
 
 ---
 
+## [4.26.20] - 2025-11-10
+
+### 🕧 Updates in Chronos
+
+- **Moved** `duration` and `durationString` methods to `Chronos` *plugin system*, usable via `durationPlugin`.
+- **Optimized** related *plugins* where *internal private methods* are used.
+- **Updated** *tsdoc* for `relativeTimePlugin` methods.
+
+## [4.26.10] - 2025-11-09
+
+### 🕧 Updates in Chronos
+
+- **Fixed** *timezone conversion issues* by updating `TIME_ZONE_IDS`, and `TIME_ZONES` constants:
+  - Now both the constants have similar *type definitions* and used with `as const` in the codebase.
+
+    ```ts
+    // Example structure after unification
+    const TIME_ZONE_IDS: Record<string, { tzName: string; offset: UTCOffSet }> = {
+      'Asia/Dhaka': { tzName: 'Bangladesh Standard Time', offset: 'UTC+06:00' },
+      // ...
+    };
+
+    const TIME_ZONES: Record<string, { tzName: string; offset: UTCOffSet }> = {
+      BST: { tzName: 'Bangladesh Standard Time', offset: 'UTC+06:00' },
+      // ...
+    };
+    ```
+
+- **Added** new *protected property* `$tzTracker`. **Updated** `withOrigin` and `#withOrigin` methods.
+- **Added** *3 overload signatures* and *internal caching mechanism* for `timeZonePlugin` methods.
+- **Updated** *tsdoc* for some `Chronos` methods. **Created** new type `TimeZoneName` and *more*.
+
 ## [4.26.1] - 2025-11-08
 
 - **Updated** *tsdoc* for some `Chronos` *methods* and *public properties*.

package/README.md

@@ -45,9 +45,9 @@
   </a>
 </p>
 
-## TypeScript Utility Library
+## JavaScript/TypeScript Utility Library
 
-**NHB Toolbox** provides battle-tested utilities for professional TypeScript development. Carefully crafted to solve common challenges with elegant, production-ready solutions:
+**NHB Toolbox** provides battle-tested utilities for professional JavaScript/TypeScript development. Carefully crafted to solve common challenges with elegant, production-ready solutions:
 
 - **Helper Functions & Classes**: Reusable solutions for everyday tasks
 - **Type Guards & Predicates**: Runtime safety with perfect type inference

package/dist/cjs/date/Chronos.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Chronos = void 0;
+exports.chronos = exports.Chronos = void 0;
 const non_primitives_1 = require("../guards/non-primitives");
 const primitives_1 = require("../guards/primitives");
 const utilities_1 = require("../number/utilities");
@@ -20,8 +20,8 @@ class Chronos {
         offset(instance) {
             return instance.#offset;
         },
-        withOrigin(instance, method, offset, tzName, tzId) {
-            return instance.#withOrigin(method, offset, tzName, tzId);
+        withOrigin(instance, method, offset, tzName, tzId, tzTracker) {
+            return instance.#withOrigin(method, offset, tzName, tzId, tzTracker);
         },
         toNewDate(instance, value) {
             return instance.#toNewDate(value);
@@ -32,6 +32,7 @@ class Chronos {
     utcOffset;
     timeZoneName;
     timeZoneId;
+    $tzTracker;
     constructor(valueOrYear, month, date, hours, minutes, seconds, ms) {
         if (typeof valueOrYear === 'number' && typeof month === 'number') {
             this.#date = new Date(valueOrYear, month - 1, date ?? 1, hours ?? 0, minutes ?? 0, seconds ?? 0, ms ?? 0);
@@ -80,9 +81,9 @@ class Chronos {
             case 'timeZone':
             case 'toUTC':
             case 'utc':
-                return string.replace(this.toISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, ''), replacement);
+                return string.replace(this.#isoTzRemoved(), replacement);
             default:
-                return string.replace(this.toLocalISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, ''), replacement);
+                return string.replace(this.#isoTzRemoved(true), replacement);
         }
     }
     [Symbol.search](string) {
@@ -90,9 +91,9 @@ class Chronos {
             case 'timeZone':
             case 'toUTC':
             case 'utc':
-                return string.indexOf(this.toISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, ''));
+                return string.indexOf(this.#isoTzRemoved());
             default:
-                return string.indexOf(this.toLocalISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, ''));
+                return string.indexOf(this.#isoTzRemoved(true));
         }
     }
     [Symbol.split](string) {
@@ -100,9 +101,9 @@ class Chronos {
             case 'timeZone':
             case 'toUTC':
             case 'utc':
-                return string.split(this.toISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, ''));
+                return string.split(this.#isoTzRemoved());
             default:
-                return string.split(this.toLocalISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, ''));
+                return string.split(this.#isoTzRemoved(true));
         }
     }
     [Symbol.match](string) {
@@ -144,7 +145,7 @@ class Chronos {
         }
         return date;
     }
-    #withOrigin(origin, offset, tzName, tzId) {
+    #withOrigin(origin, offset, tzName, tzId, tzTracker) {
         const instance = new _a(this.#date);
         instance.#ORIGIN = origin;
         instance.origin = origin;
@@ -152,12 +153,12 @@ class Chronos {
             instance.#offset = offset;
             instance.utcOffset = offset;
         }
-        if (tzName) {
+        if (tzName)
             instance.timeZoneName = tzName;
-        }
-        if (tzId) {
+        if (tzId)
             instance.timeZoneId = tzId;
-        }
+        if (tzTracker)
+            instance.$tzTracker = tzTracker;
         instance.native = instance.toDate();
         return instance;
     }
@@ -228,22 +229,10 @@ class Chronos {
         const pad = (n, p = 2) => String(n).padStart(p, '0');
         return `${this.year}-${pad(this.month + 1)}-${pad(this.date)}T${pad(this.hour)}:${pad(this.minute)}:${pad(this.second)}.${pad(this.millisecond, 3)}${this.getUTCOffset()}`;
     }
-    #normalizeDuration(result, absolute, isFuture) {
-        const entries = Object.entries(result);
-        const updated = { ...result };
-        if (!absolute && !isFuture) {
-            for (const [key, value] of entries) {
-                if (value !== 0) {
-                    updated[key] = value * -1;
-                }
-            }
-        }
-        else if (absolute) {
-            for (const [key, value] of entries) {
-                updated[key] = Math.abs(value);
-            }
-        }
-        return updated;
+    #isoTzRemoved(local = false) {
+        return local ?
+            this.toLocalISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, '')
+            : this.toISOString().replace(/\.\d+(Z|[+-]\d{2}:\d{2})?$/, '');
     }
     get year() {
         return this.#date.getFullYear();
@@ -754,86 +743,6 @@ class Chronos {
         const localTime = new Date(this.#date.getTime() - offset * 60 * 1000);
         return new _a(localTime).#withOrigin('toLocal');
     }
-    duration(toTime, absolute = true) {
-        const now = this.#date;
-        const target = this.#toNewDate(toTime);
-        const isFuture = target > now;
-        const from = isFuture ? now : target;
-        const to = isFuture ? target : now;
-        const _getDiff = (suffix) => {
-            const method = ('get' + suffix);
-            return to[method]() - from[method]();
-        };
-        let years = _getDiff('FullYear');
-        let months = _getDiff('Month');
-        let days = _getDiff('Date');
-        let hours = _getDiff('Hours');
-        let minutes = _getDiff('Minutes');
-        let seconds = _getDiff('Seconds');
-        let milliseconds = _getDiff('Milliseconds');
-        if (milliseconds < 0) {
-            milliseconds += 1000;
-            seconds--;
-        }
-        if (seconds < 0) {
-            seconds += 60;
-            minutes--;
-        }
-        if (minutes < 0) {
-            minutes += 60;
-            hours--;
-        }
-        if (hours < 0) {
-            hours += 24;
-            days--;
-        }
-        if (days < 0) {
-            const prevMonth = new Date(to.getFullYear(), to.getMonth(), 0);
-            days += prevMonth.getDate();
-            months--;
-        }
-        if (months < 0) {
-            months += 12;
-            years--;
-        }
-        const result = {
-            years,
-            months,
-            days,
-            hours,
-            minutes,
-            seconds,
-            milliseconds,
-        };
-        return this.#normalizeDuration(result, absolute, isFuture);
-    }
-    durationString(options) {
-        const { toTime, absolute = true, maxUnits = 7, separator = ', ', style = 'full', showZero = false, } = options ?? {};
-        const duration = this.duration(toTime, absolute);
-        const units = {
-            years: 'y',
-            months: 'mo',
-            days: 'd',
-            hours: 'h',
-            minutes: 'm',
-            seconds: 's',
-            milliseconds: 'ms',
-        };
-        const _formatUnit = (unit, value) => {
-            if (style === 'short') {
-                return `${value}${units[unit]}`;
-            }
-            const $unit = Math.abs(value) === 1 ? unit.slice(0, -1) : unit;
-            return `${value} ${$unit}`;
-        };
-        const parts = Object.entries(duration)
-            .filter(([_, value]) => showZero || Math.abs(value) > 0)
-            .slice(0, maxUnits)
-            .map(([unit, value]) => _formatUnit(unit, value));
-        return (parts.length ? parts.join(separator)
-            : style === 'short' ? '0s'
-                : '0 seconds');
-    }
     day(index) {
         return constants_1.DAYS[index ?? this.weekDay];
     }
@@ -1050,3 +959,5 @@ class Chronos {
 }
 exports.Chronos = Chronos;
 _a = Chronos;
+var chronos_fn_1 = require("./chronos-fn");
+Object.defineProperty(exports, "chronos", { enumerable: true, get: function () { return chronos_fn_1.chronos; } });

package/dist/cjs/date/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INTERNALS = exports.ZODIAC_PRESETS = exports.VEDIC_ZODIAC_SIGNS = exports.WESTERN_ZODIAC_SIGNS = exports.DEFAULT_RANGES = exports.SORTED_TIME_FORMATS = exports.TIME_FORMATS = exports.MILLISECOND_FORMATS = exports.ZONE_FORMATS = exports.SECOND_FORMATS = exports.MINUTE_FORMATS = exports.HOUR_FORMATS = exports.DAY_FORMATS = exports.DATE_FORMATS = exports.MONTH_FORMATS = exports.YEAR_FORMATS = exports.MONTHS = exports.DAYS = void 0;
+exports.INTERNALS = exports.ZODIAC_PRESETS = exports.VEDIC_ZODIAC_SIGNS = exports.WESTERN_ZODIAC_SIGNS = exports.DATE_PART_RANGES = exports.SORTED_TIME_FORMATS = exports.TIME_FORMATS = exports.MILLISECOND_FORMATS = exports.ZONE_FORMATS = exports.SECOND_FORMATS = exports.MINUTE_FORMATS = exports.HOUR_FORMATS = exports.DAY_FORMATS = exports.DATE_FORMATS = exports.MONTH_FORMATS = exports.YEAR_FORMATS = exports.MONTHS = exports.DAYS = void 0;
 exports.DAYS = Object.freeze([
     'Sunday',
     'Monday',
@@ -51,7 +51,7 @@ exports.SORTED_TIME_FORMATS = Object.freeze([
     ...exports.TIME_FORMATS,
     ...exports.ZONE_FORMATS,
 ].sort((a, b) => b.length - a.length));
-exports.DEFAULT_RANGES = Object.freeze({
+exports.DATE_PART_RANGES = Object.freeze({
     night: ['21', '23'],
     midnight: ['00', '01'],
     lateNight: ['02', '04'],

package/dist/cjs/date/guards.js

@@ -7,6 +7,7 @@ exports.isLeapYear = isLeapYear;
 exports.isDateLike = isDateLike;
 const primitives_1 = require("../guards/primitives");
 const specials_1 = require("../guards/specials");
+const utilities_1 = require("../number/utilities");
 const timezone_1 = require("./timezone");
 function isValidTime(value) {
     if (!(0, primitives_1.isString)(value))
@@ -25,7 +26,8 @@ function isValidTimeZoneId(value) {
     return (0, primitives_1.isString)(value) ? value in timezone_1.TIME_ZONE_IDS : false;
 }
 function isLeapYear(year) {
-    return (Number(year) % 4 === 0 && Number(year) % 100 !== 0) || Number(year) % 400 === 0;
+    const $year = (0, utilities_1.normalizeNumber)(year);
+    return $year ? ($year % 4 === 0 && $year % 100 !== 0) || $year % 400 === 0 : false;
 }
 function isDateLike(value) {
     if (value instanceof Date)

package/dist/cjs/date/plugins/businessPlugin.js

@@ -5,7 +5,7 @@ const non_primitives_1 = require("../../guards/non-primitives");
 const primitives_1 = require("../../guards/primitives");
 const constants_1 = require("../constants");
 const businessPlugin = (ChronosClass) => {
-    const internalDate = ChronosClass[constants_1.INTERNALS].internalDate;
+    const { internalDate } = ChronosClass[constants_1.INTERNALS];
     ChronosClass.prototype.isWeekend = function (determiner = 0, weekendLength = 2) {
         const day = internalDate(this).getDay();
         if ((0, non_primitives_1.isValidArray)(determiner)) {

package/dist/cjs/date/plugins/dayPartPlugin.js

@@ -6,7 +6,7 @@ const dayPartPlugin = (ChronosClass) => {
     ChronosClass.prototype.getPartOfDay = function (config) {
         const hour = this.hour;
         const ranges = {
-            ...constants_1.DEFAULT_RANGES,
+            ...constants_1.DATE_PART_RANGES,
             ...config,
         };
         for (const [part, [start, end]] of Object.entries(ranges)) {

package/dist/cjs/date/plugins/durationPlugin.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.durationPlugin = void 0;
+const constants_1 = require("../constants");
+const durationPlugin = (ChronosClass) => {
+    const { internalDate, toNewDate } = ChronosClass[constants_1.INTERNALS];
+    const _normalizeDuration = (result, absolute, isFuture) => {
+        const entries = Object.entries(result);
+        const updated = { ...result };
+        if (!absolute && !isFuture) {
+            for (const [key, value] of entries) {
+                if (value !== 0) {
+                    updated[key] = value * -1;
+                }
+            }
+        }
+        else if (absolute) {
+            for (const [key, value] of entries) {
+                updated[key] = Math.abs(value);
+            }
+        }
+        return updated;
+    };
+    ChronosClass.prototype.duration = function (toTime, absolute = true) {
+        const now = internalDate(this);
+        const target = toNewDate(this, toTime);
+        const isFuture = target > now;
+        const from = isFuture ? now : target;
+        const to = isFuture ? target : now;
+        const _getDiff = (suffix) => {
+            const method = ('get' + suffix);
+            return to[method]() - from[method]();
+        };
+        let years = _getDiff('FullYear');
+        let months = _getDiff('Month');
+        let days = _getDiff('Date');
+        let hours = _getDiff('Hours');
+        let minutes = _getDiff('Minutes');
+        let seconds = _getDiff('Seconds');
+        let milliseconds = _getDiff('Milliseconds');
+        if (milliseconds < 0) {
+            milliseconds += 1000;
+            seconds--;
+        }
+        if (seconds < 0) {
+            seconds += 60;
+            minutes--;
+        }
+        if (minutes < 0) {
+            minutes += 60;
+            hours--;
+        }
+        if (hours < 0) {
+            hours += 24;
+            days--;
+        }
+        if (days < 0) {
+            const prevMonth = new Date(to.getFullYear(), to.getMonth(), 0);
+            days += prevMonth.getDate();
+            months--;
+        }
+        if (months < 0) {
+            months += 12;
+            years--;
+        }
+        const result = {
+            years,
+            months,
+            days,
+            hours,
+            minutes,
+            seconds,
+            milliseconds,
+        };
+        return _normalizeDuration(result, absolute, isFuture);
+    };
+    ChronosClass.prototype.durationString = function (options) {
+        const { toTime, absolute = true, maxUnits = 7, separator = ', ', style = 'full', showZero = false, } = options ?? {};
+        const duration = this.duration(toTime, absolute);
+        const units = {
+            years: 'y',
+            months: 'mo',
+            days: 'd',
+            hours: 'h',
+            minutes: 'm',
+            seconds: 's',
+            milliseconds: 'ms',
+        };
+        const _formatUnit = (unit, value) => {
+            if (style === 'short') {
+                return `${value}${units[unit]}`;
+            }
+            const $unit = Math.abs(value) === 1 ? unit.slice(0, -1) : unit;
+            return `${value} ${$unit}`;
+        };
+        const parts = Object.entries(duration)
+            .filter(([_, value]) => showZero || Math.abs(value) > 0)
+            .slice(0, maxUnits)
+            .map(([unit, value]) => _formatUnit(unit, value));
+        return (parts.length ? parts.join(separator)
+            : style === 'short' ? '0s'
+                : '0 seconds');
+    };
+};
+exports.durationPlugin = durationPlugin;

package/dist/cjs/date/plugins/fromNowPlugin.js

@@ -4,10 +4,10 @@ exports.fromNowPlugin = void 0;
 const convert_1 = require("../../string/convert");
 const constants_1 = require("../constants");
 const fromNowPlugin = (ChronosClass) => {
-    const internal = ChronosClass[constants_1.INTERNALS];
+    const { internalDate, toNewDate } = ChronosClass[constants_1.INTERNALS];
     ChronosClass.prototype.fromNow = function (level = 'second', withSuffixPrefix = true, time) {
-        const now = internal.toNewDate(this, time);
-        const target = internal.internalDate(this);
+        const now = toNewDate(this, time);
+        const target = internalDate(this);
         const isFuture = target > now;
         const from = isFuture ? now : target;
         const to = isFuture ? target : now;

package/dist/cjs/date/plugins/relativeTimePlugin.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.relativeTimePlugin = void 0;
 const constants_1 = require("../constants");
 const relativeTimePlugin = (ChronosClass) => {
-    const internalDate = ChronosClass[constants_1.INTERNALS].internalDate;
-    const newDate = ChronosClass[constants_1.INTERNALS].toNewDate;
+    const { internalDate, toNewDate } = ChronosClass[constants_1.INTERNALS];
     ChronosClass.prototype.getRelativeYear = function (time) {
         const inputDate = internalDate(this);
-        const now = newDate(this, time);
+        const now = toNewDate(this, time);
         let years = inputDate.getFullYear() - now.getFullYear();
         const noYearMonthDay = now.getMonth() < inputDate.getMonth() ||
             (now.getMonth() === inputDate.getMonth() && now.getDate() < inputDate.getDate());
@@ -17,7 +16,7 @@ const relativeTimePlugin = (ChronosClass) => {
         return years;
     };
     ChronosClass.prototype.getRelativeMonth = function (time) {
-        const now = newDate(this, time);
+        const now = toNewDate(this, time);
         const inputDate = internalDate(this);
         let months = (inputDate.getFullYear() - now.getFullYear()) * 12 +
             (inputDate.getMonth() - now.getMonth());
@@ -32,7 +31,7 @@ const relativeTimePlugin = (ChronosClass) => {
         return Math.floor(relativeDays / 7);
     };
     ChronosClass.prototype.getRelativeDay = function (time) {
-        const today = newDate(this, time);
+        const today = toNewDate(this, time);
         today.setHours(0, 0, 0, 0);
         const inputDate = internalDate(this);
         inputDate.setHours(0, 0, 0, 0);
@@ -41,19 +40,19 @@ const relativeTimePlugin = (ChronosClass) => {
         return diffDays;
     };
     ChronosClass.prototype.getRelativeHour = function (time) {
-        const diff = internalDate(this).getTime() - newDate(this, time).getTime();
+        const diff = internalDate(this).getTime() - toNewDate(this, time).getTime();
         return Math.floor(diff / (1000 * 60 * 60));
     };
     ChronosClass.prototype.getRelativeMinute = function (time) {
-        const diff = internalDate(this).getTime() - newDate(this, time).getTime();
+        const diff = internalDate(this).getTime() - toNewDate(this, time).getTime();
         return Math.floor(diff / (1000 * 60));
     };
     ChronosClass.prototype.getRelativeSecond = function (time) {
-        const diff = internalDate(this).getTime() - newDate(this, time).getTime();
+        const diff = internalDate(this).getTime() - toNewDate(this, time).getTime();
         return Math.floor(diff / 1000);
     };
     ChronosClass.prototype.getRelativeMilliSecond = function (time) {
-        return internalDate(this).getTime() - newDate(this, time).getTime();
+        return internalDate(this).getTime() - toNewDate(this, time).getTime();
     };
     ChronosClass.prototype.compare = function (unit = 'minute', time) {
         switch (unit) {

package/dist/cjs/date/plugins/roundPlugin.js

@@ -4,9 +4,9 @@ exports.roundPlugin = void 0;
 const utilities_1 = require("../../number/utilities");
 const constants_1 = require("../constants");
 const roundPlugin = (ChronosClass) => {
-    const internal = ChronosClass[constants_1.INTERNALS];
+    const { internalDate, withOrigin } = ChronosClass[constants_1.INTERNALS];
     ChronosClass.prototype.round = function (unit, nearest = 1) {
-        const date = internal.internalDate(this);
+        const date = internalDate(this);
         switch (unit) {
             case 'millisecond': {
                 const rounded = (0, utilities_1.roundToNearest)(date.getMilliseconds(), nearest);
@@ -56,7 +56,7 @@ const roundPlugin = (ChronosClass) => {
                 const diffToStart = Math.abs(date.getTime() - startOfWeek.getTime());
                 const diffToEnd = Math.abs(endOfWeek.getTime() - date.getTime());
                 const rounded = diffToEnd < diffToStart ? endOfWeek : startOfWeek;
-                return internal.withOrigin(new ChronosClass(rounded), 'round');
+                return withOrigin(new ChronosClass(rounded), 'round');
             }
             case 'month': {
                 const fullMonth = date.getMonth() + date.getDate() / this.lastDateOfMonth;
@@ -78,7 +78,7 @@ const roundPlugin = (ChronosClass) => {
             default:
                 return this;
         }
-        return internal.withOrigin(new ChronosClass(date), 'round');
+        return withOrigin(new ChronosClass(date), 'round');
     };
 };
 exports.roundPlugin = roundPlugin;

package/dist/cjs/date/plugins/timeZonePlugin.js

@@ -6,68 +6,95 @@ const guards_1 = require("../guards");
 const timezone_1 = require("../timezone");
 const utils_1 = require("../utils");
 const timeZonePlugin = (ChronosClass) => {
-    const internal = ChronosClass[constants_1.INTERNALS];
-    const $Date = internal.internalDate;
-    const getTimeZoneId = (utc) => {
-        const obj = { ...timezone_1.TIME_ZONE_IDS };
-        const tzIds = Object.keys(obj).filter((key) => obj[key] === utc);
-        if (!tzIds || tzIds.length === 0)
+    const { internalDate: $Date, withOrigin } = ChronosClass[constants_1.INTERNALS];
+    const _isLabelKey = (offset) => {
+        return offset in timezone_1.TIME_ZONE_LABELS;
+    };
+    const _resolveTzName = (offset) => {
+        if (_isLabelKey(offset)) {
+            return timezone_1.TIME_ZONE_LABELS[offset];
+        }
+        return undefined;
+    };
+    const _getTimeZoneName = (zone) => {
+        if ((0, guards_1.isValidUTCOffSet)(zone)) {
+            return _resolveTzName(zone);
+        }
+        else if ((0, guards_1.isValidTimeZoneId)(zone)) {
+            const record = timezone_1.TIME_ZONE_IDS[zone];
+            return record?.tzName ?? _resolveTzName(record?.offset);
+        }
+        else {
+            return zone in timezone_1.TIME_ZONES ?
+                timezone_1.TIME_ZONES[zone].tzName
+                : _resolveTzName(timezone_1.TIME_ZONES[zone].offset);
+        }
+    };
+    const TZ_ID_CACHE = new Map(Object.entries(timezone_1.TIME_ZONE_IDS).reduce((acc, [id, { offset }]) => {
+        const arr = acc.get(offset) ?? [];
+        arr.push(id);
+        acc.set(offset, arr);
+        return acc;
+    }, new Map()));
+    const _getTimeZoneId = (utc) => {
+        const tzIds = TZ_ID_CACHE.get(utc);
+        if (!tzIds || tzIds?.length === 0)
             return undefined;
-        if (tzIds.length === 1)
+        if (tzIds?.length === 1)
             return tzIds[0];
         return tzIds;
     };
     ChronosClass.prototype.timeZone = function (zone) {
-        let targetOffset;
-        let stringOffset;
+        let offset;
         let tzId;
         if ((0, guards_1.isValidUTCOffSet)(zone)) {
-            targetOffset = (0, utils_1.extractMinutesFromUTC)(zone);
-            stringOffset = zone;
-            tzId = getTimeZoneId(stringOffset) || stringOffset;
+            offset = zone;
+            tzId = _getTimeZoneId(offset) || offset;
         }
         else if ((0, guards_1.isValidTimeZoneId)(zone)) {
-            stringOffset = timezone_1.TIME_ZONE_IDS[zone];
-            targetOffset = (0, utils_1.extractMinutesFromUTC)(stringOffset);
+            offset = timezone_1.TIME_ZONE_IDS[zone].offset;
             tzId = zone;
         }
         else {
-            targetOffset = timezone_1.TIME_ZONES?.[zone] ?? timezone_1.TIME_ZONES['UTC'];
-            stringOffset = (0, utils_1.formatUTCOffset)(targetOffset);
-            tzId = getTimeZoneId(stringOffset) || stringOffset;
+            offset = zone in timezone_1.TIME_ZONES ? timezone_1.TIME_ZONES[zone].offset : timezone_1.TIME_ZONES['UTC'].offset;
+            tzId = _getTimeZoneId(offset) || offset;
         }
+        const tzName = _getTimeZoneName(zone) ?? timezone_1.TIME_ZONES['UTC'].offset;
+        const targetOffset = (0, utils_1.extractMinutesFromUTC)(offset);
         const previousOffset = this.getTimeZoneOffsetMinutes();
         const relativeOffset = targetOffset - previousOffset;
         const adjustedTime = new Date($Date(this).getTime() + relativeOffset * 60 * 1000);
         const instance = new ChronosClass(adjustedTime);
-        return internal.withOrigin(instance, 'timeZone', stringOffset, this.getTimeZoneName(stringOffset), tzId);
+        return withOrigin(instance, `timeZone`, offset, tzName, tzId, zone);
     };
     ChronosClass.prototype.getTimeZoneName = function (utc) {
-        const UTC = utc ?? `UTC${this.getTimeZoneOffset()}`;
-        return timezone_1.TIME_ZONE_LABELS?.[UTC] ?? UTC;
+        const UTC = utc ?? this.utcOffset;
+        return _getTimeZoneName(this?.$tzTracker ?? UTC) ?? UTC;
     };
+    const TZ_SHORT_CACHE = new Map();
     ChronosClass.prototype.getTimeZoneNameShort = function (utc) {
-        const mins = utc ? (0, utils_1.extractMinutesFromUTC)(utc) : this.getTimeZoneOffsetMinutes();
-        const UTC = (0, utils_1.formatUTCOffset)(mins);
-        const timeZone = timezone_1.TIME_ZONE_LABELS?.[UTC];
-        let result = timeZone
-            ?.split(/\s+/)
-            ?.filter(Boolean)
-            ?.map((part) => part?.[0])
-            ?.join('')
-            ?.replace(/\W/g, '');
-        if (!result) {
-            const zones = Object.entries(timezone_1.TIME_ZONES);
-            result = zones.find((zone) => zone?.[1] === mins)?.[0];
-        }
-        return result ?? (0, utils_1.formatUTCOffset)(mins);
+        const tracker = this?.$tzTracker;
+        if (!utc && tracker && tracker in timezone_1.TIME_ZONES)
+            return tracker;
+        const zone = this.getTimeZoneName(utc);
+        if (TZ_SHORT_CACHE.has(zone))
+            return TZ_SHORT_CACHE.get(zone);
+        const customAbbr = (0, guards_1.isValidUTCOffSet)(zone) || (0, guards_1.isValidTimeZoneId)(zone) ?
+            zone
+            : zone
+                .split(/\s+/)
+                .map((w) => w?.[0])
+                .join('')
+                .replace(/\W/g, '');
+        TZ_SHORT_CACHE.set(zone, customAbbr);
+        return customAbbr;
     };
     ChronosClass.prototype.toString = function () {
-        const offset = internal.offset(this);
+        const offset = this.utcOffset;
         switch (this.origin) {
             case 'timeZone': {
                 const gmt = offset.replace('UTC', 'GMT').replace(':', '');
-                const label = timezone_1.TIME_ZONE_LABELS[offset] ?? offset;
+                const label = this.getTimeZoneName();
                 return $Date(this)
                     .toString()
                     .replace(/GMT[+-]\d{4}\s+\([^)]+\)/, `${gmt} (${label})`);