@reykjavik/webtools 0.1.19 → 0.1.20

package/CHANGELOG.md

@@ -4,22 +4,22 @@
 
 - ... <!-- Add new lines here. -->
 
-## 0.1.19
+## 0.1.20
 
 _2024-03-11_
 
-- fix: Incorrect alphabetization of accented characters as part of a word …
-  (not just a single character) This fix corrects the sorting of initial
-  letters, but characters inside the string stay mixed in with their
-  unaccented base character.
-- fix: Incorrect `Intl.ListFormat` format in narrow+unit mode
+- fix: Make all pached `Intl.*` methods bound to their instances
 
-## 0.1.18
+## 0.1.18 – 0.1.19
 
 _2024-03-11_
 
 - `@reykjavik/webtools/fixIcelandicLocale`:
   - feat: Patch `Intl.PluralRules` and `Intl.ListFormat`
+  - fix: Incorrect alphabetization of accented characters as part of a word …
+    (not just a single character) This fix corrects the sorting of initial
+    letters, but characters inside the string stay mixed in with their
+    unaccented base character.
 
 ## 0.1.16 – 0.1.17
 

package/esm/fixIcelandicLocale.privates.js

@@ -27,29 +27,24 @@ const PatchedCollator = function Collator(locales, options) {
         return new PatchedCollator(locales, options);
     }
     const mappedLocales = mapLocales(locales);
-    this.super = _Collator(mappedLocales || locales, options);
-    this.mapped = !!mappedLocales;
-};
-// This is all very hacky, but extending the class *AND* preseving the
-// ability to instantiate without `new` is a bit of a pain.
-// Eagerly interested in finding a better way to do this.
-const CollatorProto = {
-    constructor: PatchedCollator,
-    compare(a, b) {
-        const res1 = this.super.compare(a, b);
+    const parent = _Collator(mappedLocales || locales, options);
+    const mapped = !!mappedLocales;
+    this.compare = (a, b) => {
+        const res1 = parent.compare(a, b);
+        if (!mapped) {
+            return res1;
+        }
         const a0 = a.charAt(0);
         const b0 = b.charAt(0);
         if (/\d/.test(a0 + b0)) {
             return res1;
         }
-        const res2 = this.super.compare(a0, b0);
+        const res2 = parent.compare(a0, b0);
         return res2 !== 0 ? res2 : res1;
-    },
-    resolvedOptions() {
-        return this.super.resolvedOptions();
-    },
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-PatchedCollator.prototype = CollatorProto;
+PatchedCollator.prototype = { constructor: PatchedCollator };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
@@ -64,11 +59,8 @@ _patchedLocaleCompare.$original = _localeCompare;
 // NumberFormat
 // ===========================================================================
 const _NumberFormat = Intl.NumberFormat;
-const reformatNumberParts = function (parts) {
-    if (!this.mapped) {
-        return parts;
-    }
-    const options = this.super.resolvedOptions();
+const reformatNumberParts = function (parent, parts) {
+    const options = parent.resolvedOptions();
     if (options.style === 'currency' && options.currencyDisplay === 'symbol') {
         const currency = options.currency;
         if (currency === 'DKK' || currency === 'ISK') {
@@ -87,31 +79,21 @@ const PatchedNumberFormat = function NumberFormat(locales, options) {
         return new PatchedNumberFormat(locales, options);
     }
     const mappedLocales = mapLocales(locales);
-    this.super = _NumberFormat(mappedLocales || locales, options);
-    this.mapped = !!mappedLocales;
+    const parent = _NumberFormat(mappedLocales || locales, options);
+    const mapped = !!mappedLocales;
+    this.format = (value) => combineParts(this.formatToParts(value));
+    this.formatRange = (value1, value2) => combineParts(this.formatRangeToParts(value1, value2));
+    this.formatToParts = (value) => {
+        const parts = parent.formatToParts(value);
+        return mapped ? reformatNumberParts(parent, parts) : parts;
+    };
+    this.formatRangeToParts = (value1, value2) => {
+        const parts = parent.formatRangeToParts(value1, value2);
+        return mapped ? reformatNumberParts(parent, parts) : parts;
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-// This is all very hacky, but extending the class *AND* preseving the
-// ability to instantiate without `new` is a bit of a pain.
-// Eagerly interested in finding a better way to do this.
-const numberFormatProto = {
-    constructor: PatchedNumberFormat,
-    format(value) {
-        return combineParts(this.formatToParts(value));
-    },
-    formatRange(value1, value2) {
-        return combineParts(this.formatRangeToParts(value1, value2));
-    },
-    formatToParts(value) {
-        return reformatNumberParts.call(this, this.super.formatToParts(value));
-    },
-    formatRangeToParts(value1, value2) {
-        return reformatNumberParts.call(this, this.super.formatRangeToParts(value1, value2));
-    },
-    resolvedOptions() {
-        return this.super.resolvedOptions();
-    },
-};
-PatchedNumberFormat.prototype = numberFormatProto;
+PatchedNumberFormat.prototype = { constructor: PatchedNumberFormat };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedNumberFormat.supportedLocalesOf = _NumberFormat.supportedLocalesOf;
 PatchedNumberFormat.$original = _NumberFormat;
@@ -197,11 +179,8 @@ const partMappers = {
         }
     },
 };
-const reformatDateTimeParts = function (parts) {
-    if (!this.mapped) {
-        return parts;
-    }
-    const options = this.super.resolvedOptions();
+const reformatDateTimeParts = function (parent, parts) {
+    const options = parent.resolvedOptions();
     parts.forEach((part, idx) => {
         var _a;
         const mapper = partMappers[part.type];
@@ -226,31 +205,21 @@ const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
             hourCycle: 'h11',
         };
     }
-    this.super = _DateTimeFormat(mappedLocales || locales, options);
-    this.mapped = !!mappedLocales;
-};
-// This is all very hacky, but extending the class *AND* preseving the
-// ability to instantiate without `new` is a bit of a pain.
-// Eagerly interested in finding a better way to do this.
-const dateTimeFormatProto = {
-    constructor: PatchedDateTimeFormat,
-    format(value) {
-        return combineParts(this.formatToParts(value));
-    },
-    formatRange(value1, value2) {
-        return combineParts(this.formatRangeToParts(value1, value2));
-    },
-    formatToParts(value) {
-        return reformatDateTimeParts.call(this, this.super.formatToParts(value));
-    },
-    formatRangeToParts(value1, value2) {
-        return reformatDateTimeParts.call(this, this.super.formatRangeToParts(value1, value2));
-    },
-    resolvedOptions() {
-        return this.super.resolvedOptions();
-    },
+    const parent = _DateTimeFormat(mappedLocales || locales, options);
+    const mapped = !!mappedLocales;
+    this.format = (value) => combineParts(this.formatToParts(value));
+    this.formatRange = (value1, value2) => combineParts(this.formatRangeToParts(value1, value2));
+    this.formatToParts = (value) => {
+        const parts = parent.formatToParts(value);
+        return mapped ? reformatDateTimeParts(parent, parts) : parts;
+    };
+    this.formatRangeToParts = (value1, value2) => {
+        const parts = parent.formatRangeToParts(value1, value2);
+        return mapped ? reformatDateTimeParts(parent, parts) : parts;
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-PatchedDateTimeFormat.prototype = dateTimeFormatProto;
+PatchedDateTimeFormat.prototype = { constructor: PatchedDateTimeFormat };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedDateTimeFormat.supportedLocalesOf = _DateTimeFormat.supportedLocalesOf;
 PatchedDateTimeFormat.$original = _DateTimeFormat;
@@ -277,6 +246,8 @@ if (_PluralRules) {
                 super(mappedLocales || locales, options);
                 this.mapped = !!mappedLocales;
                 this.ord = (options === null || options === void 0 ? void 0 : options.type) === 'ordinal';
+                this.select = this.select.bind(this);
+                this.selectRange = this.selectRange.bind(this);
             }
             select(n) {
                 if (this.mapped) {
@@ -310,6 +281,8 @@ if (_ListFormat) {
                 const mappedLocales = mapLocales(locales);
                 super(mappedLocales || locales, options);
                 this.mapped = !!mappedLocales;
+                this.format = this.format.bind(this);
+                this.formatToParts = this.formatToParts.bind(this);
             }
             format(list) {
                 return this.mapped ? combineParts(this.formatToParts(list)) : super.format(list);

package/fixIcelandicLocale.privates.js

@@ -30,29 +30,24 @@ const PatchedCollator = function Collator(locales, options) {
         return new PatchedCollator(locales, options);
     }
     const mappedLocales = mapLocales(locales);
-    this.super = _Collator(mappedLocales || locales, options);
-    this.mapped = !!mappedLocales;
-};
-// This is all very hacky, but extending the class *AND* preseving the
-// ability to instantiate without `new` is a bit of a pain.
-// Eagerly interested in finding a better way to do this.
-const CollatorProto = {
-    constructor: PatchedCollator,
-    compare(a, b) {
-        const res1 = this.super.compare(a, b);
+    const parent = _Collator(mappedLocales || locales, options);
+    const mapped = !!mappedLocales;
+    this.compare = (a, b) => {
+        const res1 = parent.compare(a, b);
+        if (!mapped) {
+            return res1;
+        }
         const a0 = a.charAt(0);
         const b0 = b.charAt(0);
         if (/\d/.test(a0 + b0)) {
             return res1;
         }
-        const res2 = this.super.compare(a0, b0);
+        const res2 = parent.compare(a0, b0);
         return res2 !== 0 ? res2 : res1;
-    },
-    resolvedOptions() {
-        return this.super.resolvedOptions();
-    },
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-PatchedCollator.prototype = CollatorProto;
+PatchedCollator.prototype = { constructor: PatchedCollator };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
@@ -68,11 +63,8 @@ exports._patchedLocaleCompare.$original = _localeCompare;
 // NumberFormat
 // ===========================================================================
 const _NumberFormat = Intl.NumberFormat;
-const reformatNumberParts = function (parts) {
-    if (!this.mapped) {
-        return parts;
-    }
-    const options = this.super.resolvedOptions();
+const reformatNumberParts = function (parent, parts) {
+    const options = parent.resolvedOptions();
     if (options.style === 'currency' && options.currencyDisplay === 'symbol') {
         const currency = options.currency;
         if (currency === 'DKK' || currency === 'ISK') {
@@ -91,31 +83,21 @@ const PatchedNumberFormat = function NumberFormat(locales, options) {
         return new PatchedNumberFormat(locales, options);
     }
     const mappedLocales = mapLocales(locales);
-    this.super = _NumberFormat(mappedLocales || locales, options);
-    this.mapped = !!mappedLocales;
+    const parent = _NumberFormat(mappedLocales || locales, options);
+    const mapped = !!mappedLocales;
+    this.format = (value) => combineParts(this.formatToParts(value));
+    this.formatRange = (value1, value2) => combineParts(this.formatRangeToParts(value1, value2));
+    this.formatToParts = (value) => {
+        const parts = parent.formatToParts(value);
+        return mapped ? reformatNumberParts(parent, parts) : parts;
+    };
+    this.formatRangeToParts = (value1, value2) => {
+        const parts = parent.formatRangeToParts(value1, value2);
+        return mapped ? reformatNumberParts(parent, parts) : parts;
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-// This is all very hacky, but extending the class *AND* preseving the
-// ability to instantiate without `new` is a bit of a pain.
-// Eagerly interested in finding a better way to do this.
-const numberFormatProto = {
-    constructor: PatchedNumberFormat,
-    format(value) {
-        return combineParts(this.formatToParts(value));
-    },
-    formatRange(value1, value2) {
-        return combineParts(this.formatRangeToParts(value1, value2));
-    },
-    formatToParts(value) {
-        return reformatNumberParts.call(this, this.super.formatToParts(value));
-    },
-    formatRangeToParts(value1, value2) {
-        return reformatNumberParts.call(this, this.super.formatRangeToParts(value1, value2));
-    },
-    resolvedOptions() {
-        return this.super.resolvedOptions();
-    },
-};
-PatchedNumberFormat.prototype = numberFormatProto;
+PatchedNumberFormat.prototype = { constructor: PatchedNumberFormat };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedNumberFormat.supportedLocalesOf = _NumberFormat.supportedLocalesOf;
 PatchedNumberFormat.$original = _NumberFormat;
@@ -202,11 +184,8 @@ const partMappers = {
         }
     },
 };
-const reformatDateTimeParts = function (parts) {
-    if (!this.mapped) {
-        return parts;
-    }
-    const options = this.super.resolvedOptions();
+const reformatDateTimeParts = function (parent, parts) {
+    const options = parent.resolvedOptions();
     parts.forEach((part, idx) => {
         var _a;
         const mapper = partMappers[part.type];
@@ -231,31 +210,21 @@ const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
             hourCycle: 'h11',
         };
     }
-    this.super = _DateTimeFormat(mappedLocales || locales, options);
-    this.mapped = !!mappedLocales;
-};
-// This is all very hacky, but extending the class *AND* preseving the
-// ability to instantiate without `new` is a bit of a pain.
-// Eagerly interested in finding a better way to do this.
-const dateTimeFormatProto = {
-    constructor: PatchedDateTimeFormat,
-    format(value) {
-        return combineParts(this.formatToParts(value));
-    },
-    formatRange(value1, value2) {
-        return combineParts(this.formatRangeToParts(value1, value2));
-    },
-    formatToParts(value) {
-        return reformatDateTimeParts.call(this, this.super.formatToParts(value));
-    },
-    formatRangeToParts(value1, value2) {
-        return reformatDateTimeParts.call(this, this.super.formatRangeToParts(value1, value2));
-    },
-    resolvedOptions() {
-        return this.super.resolvedOptions();
-    },
+    const parent = _DateTimeFormat(mappedLocales || locales, options);
+    const mapped = !!mappedLocales;
+    this.format = (value) => combineParts(this.formatToParts(value));
+    this.formatRange = (value1, value2) => combineParts(this.formatRangeToParts(value1, value2));
+    this.formatToParts = (value) => {
+        const parts = parent.formatToParts(value);
+        return mapped ? reformatDateTimeParts(parent, parts) : parts;
+    };
+    this.formatRangeToParts = (value1, value2) => {
+        const parts = parent.formatRangeToParts(value1, value2);
+        return mapped ? reformatDateTimeParts(parent, parts) : parts;
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-PatchedDateTimeFormat.prototype = dateTimeFormatProto;
+PatchedDateTimeFormat.prototype = { constructor: PatchedDateTimeFormat };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedDateTimeFormat.supportedLocalesOf = _DateTimeFormat.supportedLocalesOf;
 PatchedDateTimeFormat.$original = _DateTimeFormat;
@@ -283,6 +252,8 @@ if (_PluralRules) {
                 super(mappedLocales || locales, options);
                 this.mapped = !!mappedLocales;
                 this.ord = (options === null || options === void 0 ? void 0 : options.type) === 'ordinal';
+                this.select = this.select.bind(this);
+                this.selectRange = this.selectRange.bind(this);
             }
             select(n) {
                 if (this.mapped) {
@@ -316,6 +287,8 @@ if (_ListFormat) {
                 const mappedLocales = mapLocales(locales);
                 super(mappedLocales || locales, options);
                 this.mapped = !!mappedLocales;
+                this.format = this.format.bind(this);
+                this.formatToParts = this.formatToParts.bind(this);
             }
             format(list) {
                 return this.mapped ? combineParts(this.formatToParts(list)) : super.format(list);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.1.19",
+	"version": "0.1.20",
 	"description": "Misc. JS/TS helpers used by Reykjavík City's web dev teams.",
 	"main": "index.js",
 	"repository": "ssh://git@github.com:reykjavikcity/webtools.git",