@reykjavik/webtools 0.1.15 → 0.1.16

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 - ... <!-- Add new lines here. -->
 
+## 0.1.16
+
+_2024-03-09_
+
+- `@reykjavik/webtools/fixIcelandicLocale`:
+  - fix: Add missing `DateTimeFormat.format*ToParts` methods, fix bugs
+  - refctor: Reduce code-size and simplify logic by dog-fooding `*ToParts`
+    methods internally
+
 ## 0.1.15
 
 _2024-03-08_

package/README.md

@@ -437,7 +437,7 @@ substituting the `is` locale with `da` (Danish) and apply a few post-hoc fixes
 to their return values.
 
 - `Intl.Collator` and `String.prototype.localeCompare`
-- `Intl.NumzberFormat` and `Number.prototype.toLocaleString`
+- `Intl.NumberFormat` and `Number.prototype.toLocaleString`
 - `Intl.DateTimeFormat` and `Date.prototype.toLocaleDateString`
 
 This provides usable (but not perfect) results, with some caveats listed
@@ -475,13 +475,11 @@ detection test.)
 **`Intl.DateTimeFormat` and `toLocaleDateString`:**
 
 - The `month: 'narrow'` and `weekday: 'narrow'` options are not supported, and
-  print the corresponding Danish initials
+  print the corresponding Danish initials.
 - For `timeZoneName` the values `"long"`, `"shortGeneric"` and `"longGeneric"`
   will appear in Danish.
-- The `timeStyle: 'full'` option prints timezone 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.
-- Custom formatted `DD.MM.YY` (2-digit year) dates turn into time-like
-  `DD:MM:YY` strings.
 
 ---
 

package/esm/fixIcelandicLocale.privates.js

@@ -19,6 +19,7 @@ const mapLocales = (locales) => {
         }
     }
 };
+const combineParts = (parts) => parts.map(({ value }) => value).join('');
 // ===========================================================================
 // Collator
 // ===========================================================================
@@ -43,21 +44,6 @@ _patchedLocaleCompare.$original = _localeCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
-const reformatNumber = function (result) {
-    if (!this.mapped) {
-        return result;
-    }
-    const options = this.super.resolvedOptions();
-    if (options.style === 'currency' && options.currencyDisplay === 'symbol') {
-        if (options.currency === 'DKK') {
-            return result.replace(/kr\./g, 'DKK');
-        }
-        if (options.currency === 'ISK') {
-            return result.replace(/ISK/g, 'kr.');
-        }
-    }
-    return result;
-};
 const reformatNumberParts = function (parts) {
     if (!this.mapped) {
         return parts;
@@ -90,10 +76,10 @@ const PatchedNumberFormat = function NumberFormat(locales, options) {
 const numberFormatProto = {
     constructor: PatchedNumberFormat,
     format(value) {
-        return reformatNumber.call(this, this.super.format(value));
+        return combineParts(this.formatToParts(value));
     },
     formatRange(value1, value2) {
-        return reformatNumber.call(this, this.super.formatRange(value1, value2));
+        return combineParts(this.formatRangeToParts(value1, value2));
     },
     formatToParts(value) {
         return reformatNumberParts.call(this, this.super.formatToParts(value));
@@ -119,83 +105,75 @@ _patchedToLocaleString.$original = _toLocaleString;
 // ===========================================================================
 // DateTimeFormat
 // ===========================================================================
-const months = [
-    ['januar', 'janúar', true],
-    ['februar', 'febrúar'],
-    ['marts', 'mars'],
-    ['april', 'apríl'],
-    ['maj', 'maí'],
-    ['juni', 'júní', true],
-    ['juli', 'júlí', true],
-    ['august', 'ágúst', true],
-    // ['september', 'september'],
-    ['oktober', 'október'],
-    ['november', 'nóvember', true],
-    ['december', 'desember', true],
-];
-const weekdays = [
-    ['mandag', 'mánudagur'],
-    ['tirsdag', 'þriðjudagur', 4],
-    ['onsdag', 'miðvikudagur'],
-    ['torsdag', 'fimmtudagur', 4],
-    ['fredag', 'föstudagur'],
-    ['lørdag', 'laugardagur'],
-    ['søndag', 'sunnudagur'],
-];
-const reformatDateTime = function (result) {
-    if (!this.mapped) {
-        return result;
-    }
-    const options = this.super.resolvedOptions();
-    let mappedResult = result;
-    let monthMatches = 0;
-    for (let i = 0, month; (month = months[i]); i++) {
-        const [da, is, checkShort] = month;
-        mappedResult = mappedResult.replace(da, is);
-        if (checkShort && mappedResult === result) {
-            mappedResult = mappedResult.replace(da.slice(0, 3), is.slice(0, 3));
+const months = {
+    jan: 'janúar',
+    feb: 'febrúar',
+    mar: 'mars',
+    apr: 'apríl',
+    maj: 'maí',
+    jun: 'júní',
+    jul: 'júlí',
+    aug: 'ágúst',
+    // sep: 'september', // is the same
+    okt: 'október',
+    nov: 'nóvember',
+    dec: 'desember',
+};
+const weekdays = {
+    man: 'mánudagur',
+    tir: 'þriðjudagur',
+    ons: 'miðvikudagur',
+    tor: 'fimmtudagur',
+    fre: 'föstudagur',
+    lør: 'laugardagur',
+    søn: 'sunnudagur',
+};
+const partMappers = {
+    month: (value) => {
+        const islMonth = months[value.slice(0, 3)];
+        if (islMonth) {
+            return value.endsWith('.') ? `${islMonth.slice(0, 3)}.` : islMonth;
         }
-        if (mappedResult !== result) {
-            monthMatches++;
-            if (monthMatches >= 2) {
-                break;
-            }
+    },
+    weekday: (value) => {
+        const isl = weekdays[value.slice(0, 3)];
+        if (isl) {
+            return value.endsWith('.') ? `${isl.slice(0, 3)}.` : isl;
         }
-    }
-    result = mappedResult; // reset result
-    let weekdayMatches = 0;
-    for (let i = 0, weekday; (weekday = weekdays[i]); i++) {
-        const [da, is, shortLength] = weekday;
-        mappedResult = mappedResult.replace(da, is);
-        if (mappedResult === result) {
-            mappedResult = mappedResult.replace(da.slice(0, shortLength || 3), is.slice(0, 3));
+    },
+    era: (value) => {
+        if (!value.endsWith('.')) {
+            return value.length === 3
+                ? `${value[0]}.k.`
+                : value[0] === 'f'
+                    ? 'fyrir Krist'
+                    : 'eftir Krist';
+        }
+    },
+    dayPeriod: (value) => {
+        return { AM: 'f.h.', PM: 'e.h.' }[value] || value;
+    },
+    literal: (value, lastType) => {
+        if (value === ' den ') {
+            return 'inn ';
         }
-        if (mappedResult !== result) {
-            weekdayMatches++;
-            if (weekdayMatches >= 2) {
-                break;
-            }
+        else if (value === '.' && (lastType === 'hour' || lastType === 'minute')) {
+            return ':';
         }
-    }
-    result = mappedResult;
-    if (/Kristus/.test(result)) {
-        result = result.replace(/før Kristus/g, 'fyrir Krist');
-        result = result.replace(/efter Kristus/g, 'eftir Krist');
-    }
-    result = result.replace(/(f|e)Kr/g, '$1.k.');
-    result = result.replace(/AM/g, 'f.h.');
-    result = result.replace(/PM/g, 'e.h.');
-    // convert timestamps from `00.00` to `00:00`
-    result = result.replace(/(?:^|\s)\d\d\.\d\d(?:\.\d\d)?(?:,|\s|$)/g, (match) => match.replace(/\./g, ':'));
-    result = result.replace(/ den/g, 'inn');
-    return result;
+    },
 };
 const reformatDateTimeParts = function (parts) {
     if (!this.mapped) {
         return parts;
     }
-    const options = this.super.resolvedOptions();
-    // reformat
+    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);
+        if (newValue != null) {
+            part.value = newValue;
+        }
+    });
     return parts;
 };
 const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
@@ -220,10 +198,10 @@ const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
 const dateTimeFormatProto = {
     constructor: PatchedDateTimeFormat,
     format(value) {
-        return reformatDateTime.call(this, this.super.format(value));
+        return combineParts(this.formatToParts(value));
     },
     formatRange(value1, value2) {
-        return reformatDateTime.call(this, this.super.formatRange(value1, value2));
+        return combineParts(this.formatRangeToParts(value1, value2));
     },
     formatToParts(value) {
         return reformatDateTimeParts.call(this, this.super.formatToParts(value));

package/fixIcelandicLocale.privates.js

@@ -22,6 +22,7 @@ const mapLocales = (locales) => {
         }
     }
 };
+const combineParts = (parts) => parts.map(({ value }) => value).join('');
 // ===========================================================================
 // Collator
 // ===========================================================================
@@ -47,21 +48,6 @@ exports._patchedLocaleCompare.$original = _localeCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
-const reformatNumber = function (result) {
-    if (!this.mapped) {
-        return result;
-    }
-    const options = this.super.resolvedOptions();
-    if (options.style === 'currency' && options.currencyDisplay === 'symbol') {
-        if (options.currency === 'DKK') {
-            return result.replace(/kr\./g, 'DKK');
-        }
-        if (options.currency === 'ISK') {
-            return result.replace(/ISK/g, 'kr.');
-        }
-    }
-    return result;
-};
 const reformatNumberParts = function (parts) {
     if (!this.mapped) {
         return parts;
@@ -94,10 +80,10 @@ const PatchedNumberFormat = function NumberFormat(locales, options) {
 const numberFormatProto = {
     constructor: PatchedNumberFormat,
     format(value) {
-        return reformatNumber.call(this, this.super.format(value));
+        return combineParts(this.formatToParts(value));
     },
     formatRange(value1, value2) {
-        return reformatNumber.call(this, this.super.formatRange(value1, value2));
+        return combineParts(this.formatRangeToParts(value1, value2));
     },
     formatToParts(value) {
         return reformatNumberParts.call(this, this.super.formatToParts(value));
@@ -124,83 +110,75 @@ exports._patchedToLocaleString.$original = _toLocaleString;
 // ===========================================================================
 // DateTimeFormat
 // ===========================================================================
-const months = [
-    ['januar', 'janúar', true],
-    ['februar', 'febrúar'],
-    ['marts', 'mars'],
-    ['april', 'apríl'],
-    ['maj', 'maí'],
-    ['juni', 'júní', true],
-    ['juli', 'júlí', true],
-    ['august', 'ágúst', true],
-    // ['september', 'september'],
-    ['oktober', 'október'],
-    ['november', 'nóvember', true],
-    ['december', 'desember', true],
-];
-const weekdays = [
-    ['mandag', 'mánudagur'],
-    ['tirsdag', 'þriðjudagur', 4],
-    ['onsdag', 'miðvikudagur'],
-    ['torsdag', 'fimmtudagur', 4],
-    ['fredag', 'föstudagur'],
-    ['lørdag', 'laugardagur'],
-    ['søndag', 'sunnudagur'],
-];
-const reformatDateTime = function (result) {
-    if (!this.mapped) {
-        return result;
-    }
-    const options = this.super.resolvedOptions();
-    let mappedResult = result;
-    let monthMatches = 0;
-    for (let i = 0, month; (month = months[i]); i++) {
-        const [da, is, checkShort] = month;
-        mappedResult = mappedResult.replace(da, is);
-        if (checkShort && mappedResult === result) {
-            mappedResult = mappedResult.replace(da.slice(0, 3), is.slice(0, 3));
+const months = {
+    jan: 'janúar',
+    feb: 'febrúar',
+    mar: 'mars',
+    apr: 'apríl',
+    maj: 'maí',
+    jun: 'júní',
+    jul: 'júlí',
+    aug: 'ágúst',
+    // sep: 'september', // is the same
+    okt: 'október',
+    nov: 'nóvember',
+    dec: 'desember',
+};
+const weekdays = {
+    man: 'mánudagur',
+    tir: 'þriðjudagur',
+    ons: 'miðvikudagur',
+    tor: 'fimmtudagur',
+    fre: 'föstudagur',
+    lør: 'laugardagur',
+    søn: 'sunnudagur',
+};
+const partMappers = {
+    month: (value) => {
+        const islMonth = months[value.slice(0, 3)];
+        if (islMonth) {
+            return value.endsWith('.') ? `${islMonth.slice(0, 3)}.` : islMonth;
         }
-        if (mappedResult !== result) {
-            monthMatches++;
-            if (monthMatches >= 2) {
-                break;
-            }
+    },
+    weekday: (value) => {
+        const isl = weekdays[value.slice(0, 3)];
+        if (isl) {
+            return value.endsWith('.') ? `${isl.slice(0, 3)}.` : isl;
         }
-    }
-    result = mappedResult; // reset result
-    let weekdayMatches = 0;
-    for (let i = 0, weekday; (weekday = weekdays[i]); i++) {
-        const [da, is, shortLength] = weekday;
-        mappedResult = mappedResult.replace(da, is);
-        if (mappedResult === result) {
-            mappedResult = mappedResult.replace(da.slice(0, shortLength || 3), is.slice(0, 3));
+    },
+    era: (value) => {
+        if (!value.endsWith('.')) {
+            return value.length === 3
+                ? `${value[0]}.k.`
+                : value[0] === 'f'
+                    ? 'fyrir Krist'
+                    : 'eftir Krist';
+        }
+    },
+    dayPeriod: (value) => {
+        return { AM: 'f.h.', PM: 'e.h.' }[value] || value;
+    },
+    literal: (value, lastType) => {
+        if (value === ' den ') {
+            return 'inn ';
         }
-        if (mappedResult !== result) {
-            weekdayMatches++;
-            if (weekdayMatches >= 2) {
-                break;
-            }
+        else if (value === '.' && (lastType === 'hour' || lastType === 'minute')) {
+            return ':';
         }
-    }
-    result = mappedResult;
-    if (/Kristus/.test(result)) {
-        result = result.replace(/før Kristus/g, 'fyrir Krist');
-        result = result.replace(/efter Kristus/g, 'eftir Krist');
-    }
-    result = result.replace(/(f|e)Kr/g, '$1.k.');
-    result = result.replace(/AM/g, 'f.h.');
-    result = result.replace(/PM/g, 'e.h.');
-    // convert timestamps from `00.00` to `00:00`
-    result = result.replace(/(?:^|\s)\d\d\.\d\d(?:\.\d\d)?(?:,|\s|$)/g, (match) => match.replace(/\./g, ':'));
-    result = result.replace(/ den/g, 'inn');
-    return result;
+    },
 };
 const reformatDateTimeParts = function (parts) {
     if (!this.mapped) {
         return parts;
     }
-    const options = this.super.resolvedOptions();
-    // reformat
+    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);
+        if (newValue != null) {
+            part.value = newValue;
+        }
+    });
     return parts;
 };
 const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
@@ -225,10 +203,10 @@ const PatchedDateTimeFormat = function DateTimeFormat(locales, options) {
 const dateTimeFormatProto = {
     constructor: PatchedDateTimeFormat,
     format(value) {
-        return reformatDateTime.call(this, this.super.format(value));
+        return combineParts(this.formatToParts(value));
     },
     formatRange(value1, value2) {
-        return reformatDateTime.call(this, this.super.formatRange(value1, value2));
+        return combineParts(this.formatRangeToParts(value1, value2));
     },
     formatToParts(value) {
         return reformatDateTimeParts.call(this, this.super.formatToParts(value));

package/package.json

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