@reykjavik/webtools 0.1.17 → 0.1.19

package/CHANGELOG.md

@@ -4,14 +4,24 @@
 
 - ... <!-- Add new lines here. -->
 
-## 0.1.17
+## 0.1.19
 
-_2024-03-09_
+_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
+
+## 0.1.18
+
+_2024-03-11_
 
 - `@reykjavik/webtools/fixIcelandicLocale`:
-  - feat: Add support for `DateTimeFormat`'s `dayPeriod` option
+  - feat: Patch `Intl.PluralRules` and `Intl.ListFormat`
 
-## 0.1.16
+## 0.1.16 – 0.1.17
 
 _2024-03-09_
 

package/README.md

@@ -439,6 +439,8 @@ to their return values.
 - `Intl.Collator` and `String.prototype.localeCompare`
 - `Intl.NumberFormat` and `Number.prototype.toLocaleString`
 - `Intl.DateTimeFormat` and `Date.prototype.toLocaleDateString`
+- `Intl.PluralRules`
+- `Intl.ListFormat`
 
 This provides usable (but not perfect) results, with some caveats listed
 below.
@@ -449,7 +451,7 @@ your app's entry point:
 ```ts
 import '@reykjavik/webtools/fixIcelandicLocale';
 
-// Then continue with your day and use `localeCompare` and Intl.Collator,
+// Then continue with your day and use `localeCompare` and other Intl.* methods
 // as you normally would. (See "limitations" below.)
 ```
 
@@ -460,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.js

@@ -1,4 +1,4 @@
-import { _PatchedCollator, _PatchedDateTimeFormat, _patchedLocaleCompare, _PatchedNumberFormat, _patchedToLocaleDateString, _patchedToLocaleString, } from './fixIcelandicLocale.privates.js';
+import { _PatchedCollator, _PatchedDateTimeFormat, _PatchedListFormat, _patchedLocaleCompare, _PatchedNumberFormat, _PatchedPluralRules, _patchedToLocaleDateString, _patchedToLocaleString, } from './fixIcelandicLocale.privates.js';
 /*
   Mantra: Partial Icelandic suppoort is better than none. Partial Icelandic
   suppoort is better than none. Partial Icelandic suppoort is better than
@@ -12,3 +12,11 @@ if (Intl.Collator.supportedLocalesOf(['is']).length < 1) {
     Intl.DateTimeFormat = _PatchedDateTimeFormat;
     Date.prototype.toLocaleDateString = _patchedToLocaleDateString;
 }
+/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion, @typescript-eslint/no-unnecessary-condition */
+if (Intl.ListFormat && Intl.ListFormat.supportedLocalesOf(['is']).length < 1) {
+    Intl.ListFormat = _PatchedListFormat;
+}
+if (Intl.PluralRules && Intl.PluralRules.supportedLocalesOf(['is']).length < 1) {
+    Intl.PluralRules = _PatchedPluralRules;
+}
+/* eslint-enable @typescript-eslint/no-unnecessary-type-assertion, @typescript-eslint/no-unnecessary-condition */

package/esm/fixIcelandicLocale.privates.d.ts

@@ -43,3 +43,19 @@ export declare const _patchedToLocaleDateString: {
         (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
     };
 };
+export declare const _PatchedPluralRules: {
+    (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
+    new (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
+    supportedLocalesOf(locales: string | string[], options?: {
+        localeMatcher?: "best fit" | "lookup" | undefined;
+    } | undefined): string[];
+} & {
+    $original: typeof Intl.PluralRules;
+};
+export declare const _PatchedListFormat: {
+    new (locales?: string | string[] | undefined, options?: Intl.ListFormatOptions | undefined): Intl.ListFormat;
+    prototype: Intl.ListFormat;
+    supportedLocalesOf(locales: string | string[], options?: Pick<Intl.ListFormatOptions, "localeMatcher"> | undefined): string[];
+} & {
+    $original: typeof Intl.ListFormat;
+};

package/esm/fixIcelandicLocale.privates.js

@@ -1,6 +1,5 @@
+var _a, _b;
 const _Collator = Intl.Collator;
-const _NumberFormat = Intl.NumberFormat;
-const _DateTimeFormat = Intl.DateTimeFormat;
 const mapLocales = (locales) => {
     locales = typeof locales === 'string' ? [locales] : locales || [];
     for (let i = 0, loc; (loc = locales[i]); i++) {
@@ -12,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) {
@@ -20,17 +21,35 @@ 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);
+    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 a0 = a.charAt(0);
+        const b0 = b.charAt(0);
+        if (/\d/.test(a0 + b0)) {
+            return res1;
+        }
+        const res2 = this.super.compare(a0, b0);
+        return res2 !== 0 ? res2 : res1;
+    },
+    resolvedOptions() {
+        return this.super.resolvedOptions();
+    },
 };
-PatchedCollator.prototype = Object.create(_Collator.prototype);
-PatchedCollator.prototype.constructor = PatchedCollator;
+PatchedCollator.prototype = CollatorProto;
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
@@ -44,6 +63,7 @@ _patchedLocaleCompare.$original = _localeCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
+const _NumberFormat = Intl.NumberFormat;
 const reformatNumberParts = function (parts) {
     if (!this.mapped) {
         return parts;
@@ -192,6 +212,7 @@ const reformatDateTimeParts = function (parts) {
     });
     return parts;
 };
+const _DateTimeFormat = Intl.DateTimeFormat;
 const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
     if (!(this instanceof PatchedDateTimeFormat)) {
         // @ts-expect-error  (YOLO! Can't be arsed)
@@ -240,3 +261,73 @@ export const _patchedToLocaleDateString = function toLocaleDateString(locales, o
     return _PatchedDateTimeFormat(locales, options).format(this);
 };
 _patchedToLocaleDateString.$original = _toLocaleDateString;
+// ===========================================================================
+// PluralRules
+// ===========================================================================
+const _PluralRules = Intl.PluralRules;
+let PatchedPluralRules;
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+if (_PluralRules) {
+    PatchedPluralRules = (_a = class PluralRules extends _PluralRules {
+            pluralIsl(n) {
+                return this.ord ? 'other' : n % 10 !== 1 || n % 100 === 11 ? 'other' : 'one';
+            }
+            constructor(locales, options) {
+                const mappedLocales = mapLocales(locales);
+                super(mappedLocales || locales, options);
+                this.mapped = !!mappedLocales;
+                this.ord = (options === null || options === void 0 ? void 0 : options.type) === 'ordinal';
+            }
+            select(n) {
+                if (this.mapped) {
+                    // Pluralization function for Icelandic
+                    // Copied over from https://www.npmjs.com/package/translate.js
+                    return this.pluralIsl(n);
+                }
+                return super.select(n);
+            }
+            selectRange(n, n2) {
+                if (this.mapped) {
+                    return this.pluralIsl(n2);
+                }
+                // @ts-expect-error  (TS doesn't know about the .selectRange() method ...yet?)
+                return super.selectRange(n, n2);
+            }
+        },
+        _a.$original = _PluralRules,
+        _a);
+}
+export const _PatchedPluralRules = PatchedPluralRules;
+// ===========================================================================
+// ListFormat
+// ===========================================================================
+const _ListFormat = Intl.ListFormat;
+let PatchedListFormat;
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+if (_ListFormat) {
+    PatchedListFormat = (_b = class ListFormat extends _ListFormat {
+            constructor(locales, options) {
+                const mappedLocales = mapLocales(locales);
+                super(mappedLocales || locales, options);
+                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 ';
+                        }
+                    }
+                }
+                return parts;
+            }
+        },
+        _b.$original = _ListFormat,
+        _b);
+}
+export const _PatchedListFormat = PatchedListFormat;

package/fixIcelandicLocale.js

@@ -14,3 +14,11 @@ if (Intl.Collator.supportedLocalesOf(['is']).length < 1) {
     Intl.DateTimeFormat = fixIcelandicLocale_privates_js_1._PatchedDateTimeFormat;
     Date.prototype.toLocaleDateString = fixIcelandicLocale_privates_js_1._patchedToLocaleDateString;
 }
+/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion, @typescript-eslint/no-unnecessary-condition */
+if (Intl.ListFormat && Intl.ListFormat.supportedLocalesOf(['is']).length < 1) {
+    Intl.ListFormat = fixIcelandicLocale_privates_js_1._PatchedListFormat;
+}
+if (Intl.PluralRules && Intl.PluralRules.supportedLocalesOf(['is']).length < 1) {
+    Intl.PluralRules = fixIcelandicLocale_privates_js_1._PatchedPluralRules;
+}
+/* eslint-enable @typescript-eslint/no-unnecessary-type-assertion, @typescript-eslint/no-unnecessary-condition */

package/fixIcelandicLocale.privates.d.ts

@@ -43,3 +43,19 @@ export declare const _patchedToLocaleDateString: {
         (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
     };
 };
+export declare const _PatchedPluralRules: {
+    (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
+    new (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
+    supportedLocalesOf(locales: string | string[], options?: {
+        localeMatcher?: "best fit" | "lookup" | undefined;
+    } | undefined): string[];
+} & {
+    $original: typeof Intl.PluralRules;
+};
+export declare const _PatchedListFormat: {
+    new (locales?: string | string[] | undefined, options?: Intl.ListFormatOptions | undefined): Intl.ListFormat;
+    prototype: Intl.ListFormat;
+    supportedLocalesOf(locales: string | string[], options?: Pick<Intl.ListFormatOptions, "localeMatcher"> | undefined): string[];
+} & {
+    $original: typeof Intl.ListFormat;
+};

package/fixIcelandicLocale.privates.js

@@ -1,9 +1,8 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._patchedToLocaleDateString = exports._PatchedDateTimeFormat = exports._patchedToLocaleString = exports._PatchedNumberFormat = exports._patchedLocaleCompare = exports._PatchedCollator = void 0;
+exports._PatchedListFormat = exports._PatchedPluralRules = exports._patchedToLocaleDateString = exports._PatchedDateTimeFormat = exports._patchedToLocaleString = exports._PatchedNumberFormat = exports._patchedLocaleCompare = exports._PatchedCollator = void 0;
 const _Collator = Intl.Collator;
-const _NumberFormat = Intl.NumberFormat;
-const _DateTimeFormat = Intl.DateTimeFormat;
 const mapLocales = (locales) => {
     locales = typeof locales === 'string' ? [locales] : locales || [];
     for (let i = 0, loc; (loc = locales[i]); i++) {
@@ -15,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) {
@@ -23,17 +24,35 @@ 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);
+    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 a0 = a.charAt(0);
+        const b0 = b.charAt(0);
+        if (/\d/.test(a0 + b0)) {
+            return res1;
+        }
+        const res2 = this.super.compare(a0, b0);
+        return res2 !== 0 ? res2 : res1;
+    },
+    resolvedOptions() {
+        return this.super.resolvedOptions();
+    },
 };
-PatchedCollator.prototype = Object.create(_Collator.prototype);
-PatchedCollator.prototype.constructor = PatchedCollator;
+PatchedCollator.prototype = CollatorProto;
 // Static methods (not patched since "is" is not ACTUALLY supported.)
 PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
@@ -48,6 +67,7 @@ exports._patchedLocaleCompare.$original = _localeCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
+const _NumberFormat = Intl.NumberFormat;
 const reformatNumberParts = function (parts) {
     if (!this.mapped) {
         return parts;
@@ -197,6 +217,7 @@ const reformatDateTimeParts = function (parts) {
     });
     return parts;
 };
+const _DateTimeFormat = Intl.DateTimeFormat;
 const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
     if (!(this instanceof PatchedDateTimeFormat)) {
         // @ts-expect-error  (YOLO! Can't be arsed)
@@ -246,3 +267,73 @@ const _patchedToLocaleDateString = function toLocaleDateString(locales, options)
 };
 exports._patchedToLocaleDateString = _patchedToLocaleDateString;
 exports._patchedToLocaleDateString.$original = _toLocaleDateString;
+// ===========================================================================
+// PluralRules
+// ===========================================================================
+const _PluralRules = Intl.PluralRules;
+let PatchedPluralRules;
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+if (_PluralRules) {
+    PatchedPluralRules = (_a = class PluralRules extends _PluralRules {
+            pluralIsl(n) {
+                return this.ord ? 'other' : n % 10 !== 1 || n % 100 === 11 ? 'other' : 'one';
+            }
+            constructor(locales, options) {
+                const mappedLocales = mapLocales(locales);
+                super(mappedLocales || locales, options);
+                this.mapped = !!mappedLocales;
+                this.ord = (options === null || options === void 0 ? void 0 : options.type) === 'ordinal';
+            }
+            select(n) {
+                if (this.mapped) {
+                    // Pluralization function for Icelandic
+                    // Copied over from https://www.npmjs.com/package/translate.js
+                    return this.pluralIsl(n);
+                }
+                return super.select(n);
+            }
+            selectRange(n, n2) {
+                if (this.mapped) {
+                    return this.pluralIsl(n2);
+                }
+                // @ts-expect-error  (TS doesn't know about the .selectRange() method ...yet?)
+                return super.selectRange(n, n2);
+            }
+        },
+        _a.$original = _PluralRules,
+        _a);
+}
+exports._PatchedPluralRules = PatchedPluralRules;
+// ===========================================================================
+// ListFormat
+// ===========================================================================
+const _ListFormat = Intl.ListFormat;
+let PatchedListFormat;
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+if (_ListFormat) {
+    PatchedListFormat = (_b = class ListFormat extends _ListFormat {
+            constructor(locales, options) {
+                const mappedLocales = mapLocales(locales);
+                super(mappedLocales || locales, options);
+                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 ';
+                        }
+                    }
+                }
+                return parts;
+            }
+        },
+        _b.$original = _ListFormat,
+        _b);
+}
+exports._PatchedListFormat = PatchedListFormat;

package/package.json

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