@reykjavik/webtools 0.1.16 → 0.1.18

package/CHANGELOG.md

@@ -4,7 +4,14 @@
 
 - ... <!-- Add new lines here. -->
 
-## 0.1.16
+## 0.1.18
+
+_2024-03-11_
+
+- `@reykjavik/webtools/fixIcelandicLocale`:
+  - feat: Patch `Intl.PluralRules` and `Intl.ListFormat`
+
+## 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.)
 ```
 
@@ -479,7 +481,8 @@ detection test.)
 - For `timeZoneName` the values `"long"`, `"shortGeneric"` and `"longGeneric"`
   will appear in Danish.
 - The `timeStyle: 'full'` option prints the timezone names in Danish
-- The `dayPeriod` option is not supported and prints the day-period in Danish.
+- The `dayPeriod` option has a couple of slight mismatches, at 5 am and 12
+  noon.
 
 ---
 

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;
 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++) {
@@ -44,6 +43,7 @@ _patchedLocaleCompare.$original = _localeCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
+const _NumberFormat = Intl.NumberFormat;
 const reformatNumberParts = function (parts) {
     if (!this.mapped) {
         return parts;
@@ -128,11 +128,22 @@ const weekdays = {
     lør: 'laugardagur',
     søn: 'sunnudagur',
 };
+const dayPeriods = {
+    AM: ['f.h.'],
+    PM: ['e.h.'],
+    'om natten': ['að nóttu', 'n.'],
+    // Mismatch at 05:00 — da: 'om morgenen', is: 'að nóttu'
+    'om morgenen': ['að morgni', 'mrg.'],
+    'om formiddagen': ['að morgni', 'mrg.'],
+    // Mismatch at 12:00 — da: 'om eftermiddagen', is: 'hádegi'
+    'om eftermiddagen': ['síðdegis', 'sd.'],
+    'om aftenen': ['að kvöldi', 'kv.'],
+};
 const partMappers = {
     month: (value) => {
-        const islMonth = months[value.slice(0, 3)];
-        if (islMonth) {
-            return value.endsWith('.') ? `${islMonth.slice(0, 3)}.` : islMonth;
+        const isl = months[value.slice(0, 3)];
+        if (isl) {
+            return value.endsWith('.') ? `${isl.slice(0, 3)}.` : isl;
         }
     },
     weekday: (value) => {
@@ -150,8 +161,12 @@ const partMappers = {
                     : 'eftir Krist';
         }
     },
-    dayPeriod: (value) => {
-        return { AM: 'f.h.', PM: 'e.h.' }[value] || value;
+    dayPeriod: (value, _, options) => {
+        const isl = dayPeriods[value];
+        if (isl) {
+            const [long, narrow] = isl;
+            return options.dayPeriod === 'narrow' ? narrow : long;
+        }
     },
     literal: (value, lastType) => {
         if (value === ' den ') {
@@ -166,16 +181,18 @@ const reformatDateTimeParts = function (parts) {
     if (!this.mapped) {
         return parts;
     }
+    const options = this.super.resolvedOptions();
     parts.forEach((part, idx) => {
         var _a;
         const mapper = partMappers[part.type];
-        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type);
+        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type, options);
         if (newValue != null) {
             part.value = newValue;
         }
     });
     return parts;
 };
+const _DateTimeFormat = Intl.DateTimeFormat;
 const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
     if (!(this instanceof PatchedDateTimeFormat)) {
         // @ts-expect-error  (YOLO! Can't be arsed)
@@ -224,3 +241,72 @@ 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 = 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';
+                    }
+                }
+            }
+            return parts;
+        }
+    };
+}
+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;
 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++) {
@@ -48,6 +47,7 @@ exports._patchedLocaleCompare.$original = _localeCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
+const _NumberFormat = Intl.NumberFormat;
 const reformatNumberParts = function (parts) {
     if (!this.mapped) {
         return parts;
@@ -133,11 +133,22 @@ const weekdays = {
     lør: 'laugardagur',
     søn: 'sunnudagur',
 };
+const dayPeriods = {
+    AM: ['f.h.'],
+    PM: ['e.h.'],
+    'om natten': ['að nóttu', 'n.'],
+    // Mismatch at 05:00 — da: 'om morgenen', is: 'að nóttu'
+    'om morgenen': ['að morgni', 'mrg.'],
+    'om formiddagen': ['að morgni', 'mrg.'],
+    // Mismatch at 12:00 — da: 'om eftermiddagen', is: 'hádegi'
+    'om eftermiddagen': ['síðdegis', 'sd.'],
+    'om aftenen': ['að kvöldi', 'kv.'],
+};
 const partMappers = {
     month: (value) => {
-        const islMonth = months[value.slice(0, 3)];
-        if (islMonth) {
-            return value.endsWith('.') ? `${islMonth.slice(0, 3)}.` : islMonth;
+        const isl = months[value.slice(0, 3)];
+        if (isl) {
+            return value.endsWith('.') ? `${isl.slice(0, 3)}.` : isl;
         }
     },
     weekday: (value) => {
@@ -155,8 +166,12 @@ const partMappers = {
                     : 'eftir Krist';
         }
     },
-    dayPeriod: (value) => {
-        return { AM: 'f.h.', PM: 'e.h.' }[value] || value;
+    dayPeriod: (value, _, options) => {
+        const isl = dayPeriods[value];
+        if (isl) {
+            const [long, narrow] = isl;
+            return options.dayPeriod === 'narrow' ? narrow : long;
+        }
     },
     literal: (value, lastType) => {
         if (value === ' den ') {
@@ -171,16 +186,18 @@ const reformatDateTimeParts = function (parts) {
     if (!this.mapped) {
         return parts;
     }
+    const options = this.super.resolvedOptions();
     parts.forEach((part, idx) => {
         var _a;
         const mapper = partMappers[part.type];
-        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type);
+        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type, options);
         if (newValue != null) {
             part.value = newValue;
         }
     });
     return parts;
 };
+const _DateTimeFormat = Intl.DateTimeFormat;
 const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
     if (!(this instanceof PatchedDateTimeFormat)) {
         // @ts-expect-error  (YOLO! Can't be arsed)
@@ -230,3 +247,72 @@ 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 = 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';
+                    }
+                }
+            }
+            return parts;
+        }
+    };
+}
+exports._PatchedListFormat = PatchedListFormat;

package/package.json

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