@reykjavik/webtools 0.1.18 → 0.1.20

package/CHANGELOG.md

@@ -4,12 +4,22 @@
 
 - ... <!-- Add new lines here. -->
 
-## 0.1.18
+## 0.1.20
+
+_2024-03-11_
+
+- fix: Make all pached `Intl.*` methods bound to their instances
+
+## 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/README.md

@@ -462,10 +462,11 @@ detection test.)
 
 **`Intl.Collator` and `localeCompare`:**
 
-- When the `sensitivty` option is set to `"base"` or `"accent"`, it will
-  incorrectly treat `ð` and `d` as the same letter, and the acute-accented
-  characters `á`, `é`, `í`, `ó`, `ú` and `ý` get lumped in with their
-  non-accented counterparts.
+- It incorrectly treats `ð` and `d` as the same letter (most of the time), and
+  the acute-accented characters `á`, `é`, `í`, `ó`, `ú` and `ý` get lumped in
+  with their non-accented counterparts (unless the compared).  
+  We fix this only for the first letter in the string, but not for the rest of
+  it.
 
 **`Intl.NumberFormat` and `toLocaleString`:**
 

package/esm/fixIcelandicLocale.privates.js

@@ -1,4 +1,4 @@
-var _a;
+var _a, _b;
 const _Collator = Intl.Collator;
 const mapLocales = (locales) => {
     locales = typeof locales === 'string' ? [locales] : locales || [];
@@ -11,6 +11,8 @@ const mapLocales = (locales) => {
             // or "accent" then `ð` is consiered a variant of `d` and the letters
             // á, é, í, ó, ú, and ý are not treated as separate letters but simply
             // variants of a, e, i, o, u, and y.
+            // Also when the accented characters are part of a word, they are treated
+            // as fully equal to the base letter.
             return ['da'];
         }
         if (_Collator.supportedLocalesOf(loc).length) {
@@ -19,17 +21,30 @@ const mapLocales = (locales) => {
     }
 };
 const combineParts = (parts) => parts.map(({ value }) => value).join('');
-// ===========================================================================
-// Collator
-// ===========================================================================
 const PatchedCollator = function Collator(locales, options) {
-    locales = mapLocales(locales) || locales;
-    const instance = new _Collator(locales, options);
-    Object.setPrototypeOf(instance, PatchedCollator.prototype);
-    return instance;
+    if (!(this instanceof PatchedCollator)) {
+        // @ts-expect-error  (YOLO! Can't be arsed)
+        return new PatchedCollator(locales, options);
+    }
+    const mappedLocales = mapLocales(locales);
+    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 = parent.compare(a0, b0);
+        return res2 !== 0 ? res2 : res1;
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-PatchedCollator.prototype = Object.create(_Collator.prototype);
-PatchedCollator.prototype.constructor = PatchedCollator;
+PatchedCollator.prototype = { constructor: PatchedCollator };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
@@ -44,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') {
@@ -67,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;
-};
-// 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();
-    },
+    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();
 };
-PatchedNumberFormat.prototype = numberFormatProto;
+PatchedNumberFormat.prototype = { constructor: PatchedNumberFormat };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedNumberFormat.supportedLocalesOf = _NumberFormat.supportedLocalesOf;
 PatchedNumberFormat.$original = _NumberFormat;
@@ -177,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];
@@ -206,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;
@@ -257,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) {
@@ -285,28 +276,31 @@ const _ListFormat = Intl.ListFormat;
 let PatchedListFormat;
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 if (_ListFormat) {
-    PatchedListFormat = class ListFormat extends _ListFormat {
-        constructor(locales, options) {
-            const mappedLocales = mapLocales(locales);
-            super(mappedLocales || locales, options);
-            this.$original = _ListFormat;
-            this.mapped = !!mappedLocales;
-        }
-        format(list) {
-            return this.mapped ? combineParts(this.formatToParts(list)) : super.format(list);
-        }
-        formatToParts(list) {
-            const parts = super.formatToParts(list);
-            if (this.mapped) {
-                for (const item of parts) {
-                    const { value } = item;
-                    if (item.type === 'literal' && (value === ', el.' || value === ', eller')) {
-                        item.value = ', eða';
+    PatchedListFormat = (_b = class ListFormat extends _ListFormat {
+            constructor(locales, options) {
+                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);
+            }
+            formatToParts(list) {
+                const parts = super.formatToParts(list);
+                if (this.mapped) {
+                    for (const item of parts) {
+                        const { value } = item;
+                        if (item.type === 'literal' && (value === ' el. ' || value === ' eller ')) {
+                            item.value = ' eða ';
+                        }
                     }
                 }
+                return parts;
             }
-            return parts;
-        }
-    };
+        },
+        _b.$original = _ListFormat,
+        _b);
 }
 export const _PatchedListFormat = PatchedListFormat;

package/fixIcelandicLocale.privates.js

@@ -1,5 +1,5 @@
 "use strict";
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._PatchedListFormat = exports._PatchedPluralRules = exports._patchedToLocaleDateString = exports._PatchedDateTimeFormat = exports._patchedToLocaleString = exports._PatchedNumberFormat = exports._patchedLocaleCompare = exports._PatchedCollator = void 0;
 const _Collator = Intl.Collator;
@@ -14,6 +14,8 @@ const mapLocales = (locales) => {
             // or "accent" then `ð` is consiered a variant of `d` and the letters
             // á, é, í, ó, ú, and ý are not treated as separate letters but simply
             // variants of a, e, i, o, u, and y.
+            // Also when the accented characters are part of a word, they are treated
+            // as fully equal to the base letter.
             return ['da'];
         }
         if (_Collator.supportedLocalesOf(loc).length) {
@@ -22,17 +24,30 @@ const mapLocales = (locales) => {
     }
 };
 const combineParts = (parts) => parts.map(({ value }) => value).join('');
-// ===========================================================================
-// Collator
-// ===========================================================================
 const PatchedCollator = function Collator(locales, options) {
-    locales = mapLocales(locales) || locales;
-    const instance = new _Collator(locales, options);
-    Object.setPrototypeOf(instance, PatchedCollator.prototype);
-    return instance;
+    if (!(this instanceof PatchedCollator)) {
+        // @ts-expect-error  (YOLO! Can't be arsed)
+        return new PatchedCollator(locales, options);
+    }
+    const mappedLocales = mapLocales(locales);
+    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 = parent.compare(a0, b0);
+        return res2 !== 0 ? res2 : res1;
+    };
+    this.resolvedOptions = () => parent.resolvedOptions();
 };
-PatchedCollator.prototype = Object.create(_Collator.prototype);
-PatchedCollator.prototype.constructor = PatchedCollator;
+PatchedCollator.prototype = { constructor: PatchedCollator };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
@@ -48,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') {
@@ -71,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;
-};
-// 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();
-    },
+    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();
 };
-PatchedNumberFormat.prototype = numberFormatProto;
+PatchedNumberFormat.prototype = { constructor: PatchedNumberFormat };
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedNumberFormat.supportedLocalesOf = _NumberFormat.supportedLocalesOf;
 PatchedNumberFormat.$original = _NumberFormat;
@@ -182,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];
@@ -211,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;
@@ -263,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) {
@@ -291,28 +282,31 @@ const _ListFormat = Intl.ListFormat;
 let PatchedListFormat;
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 if (_ListFormat) {
-    PatchedListFormat = class ListFormat extends _ListFormat {
-        constructor(locales, options) {
-            const mappedLocales = mapLocales(locales);
-            super(mappedLocales || locales, options);
-            this.$original = _ListFormat;
-            this.mapped = !!mappedLocales;
-        }
-        format(list) {
-            return this.mapped ? combineParts(this.formatToParts(list)) : super.format(list);
-        }
-        formatToParts(list) {
-            const parts = super.formatToParts(list);
-            if (this.mapped) {
-                for (const item of parts) {
-                    const { value } = item;
-                    if (item.type === 'literal' && (value === ', el.' || value === ', eller')) {
-                        item.value = ', eða';
+    PatchedListFormat = (_b = class ListFormat extends _ListFormat {
+            constructor(locales, options) {
+                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);
+            }
+            formatToParts(list) {
+                const parts = super.formatToParts(list);
+                if (this.mapped) {
+                    for (const item of parts) {
+                        const { value } = item;
+                        if (item.type === 'literal' && (value === ' el. ' || value === ' eller ')) {
+                            item.value = ' eða ';
+                        }
                     }
                 }
+                return parts;
             }
-            return parts;
-        }
-    };
+        },
+        _b.$original = _ListFormat,
+        _b);
 }
 exports._PatchedListFormat = PatchedListFormat;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.1.18",
+	"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",