@fkui/i18next-translate 5.44.0 → 5.45.1

package/dist/cjs/index.js

@@ -80,6 +80,7 @@ const getPath = (object, path) => {
     k
   } = getLastOfPath(object, path);
   if (!obj) return undefined;
+  if (!Object.prototype.hasOwnProperty.call(obj, k)) return undefined;
   return obj[k];
 };
 const getPathWithDefaults = (data, defaultData, key) => {
@@ -160,7 +161,10 @@ const looksLikeObjectPath = (key, nsSeparator, keySeparator) => {
 const deepFind = function (obj, path) {
   let keySeparator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '.';
   if (!obj) return undefined;
-  if (obj[path]) return obj[path];
+  if (obj[path]) {
+    if (!Object.prototype.hasOwnProperty.call(obj, path)) return undefined;
+    return obj[path];
+  }
   const tokens = path.split(keySeparator);
   let current = obj;
   for (let i = 0; i < tokens.length;) {
@@ -473,7 +477,7 @@ class Translator extends EventEmitter {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
       interpolation: {}
     };
-    if (key === undefined || key === null) {
+    if (key == null) {
       return false;
     }
     const resolved = this.resolve(key, options);
@@ -511,7 +515,7 @@ class Translator extends EventEmitter {
       ...options
     };
     if (!options) options = {};
-    if (keys === undefined || keys === null) return '';
+    if (keys == null) return '';
     if (!Array.isArray(keys)) keys = [String(keys)];
     const returnDetails = options.returnDetails !== undefined ? options.returnDetails : this.options.returnDetails;
     const keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
@@ -727,7 +731,7 @@ class Translator extends EventEmitter {
     }
     const postProcess = options.postProcess || this.options.postProcess;
     const postProcessorNames = isString$1(postProcess) ? [postProcess] : postProcess;
-    if (res !== undefined && res !== null && postProcessorNames?.length && options.applyPostProcessor !== false) {
+    if (res != null && postProcessorNames?.length && options.applyPostProcessor !== false) {
       res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? {
         i18nResolved: {
           ...resolved,
@@ -1730,7 +1734,7 @@ class I18n extends EventEmitter {
       callback = options;
       options = {};
     }
-    if (!options.defaultNS && options.defaultNS !== false && options.ns) {
+    if (options.defaultNS == null && options.ns) {
       if (isString$1(options.ns)) {
         options.defaultNS = options.ns;
       } else if (options.ns.indexOf('translation') < 0) {
@@ -4413,7 +4417,7 @@ const formatter = {
 class FDate {
     value;
     constructor(value) {
-        this.value = dayjs(value, ISO8601_YYYY_MM_DD, true);
+        this.value = dayjs(value, ISO8601_YYYY_MM_DD, true).startOf("day");
     }
     /**
      * Create {@link FDate} with an invalid state.
@@ -4717,7 +4721,7 @@ class FDate {
         if (typeof rhs === "string") {
             rhs = FDate.fromIso(rhs);
         }
-        return this.value.isBefore(rhs.value);
+        return this.value.isBefore(rhs.value, "day");
     }
     /**
      * Returns true if this date is after given date.
@@ -4728,7 +4732,7 @@ class FDate {
         if (typeof rhs === "string") {
             rhs = FDate.fromIso(rhs);
         }
-        return this.value.isAfter(rhs.value);
+        return this.value.isAfter(rhs.value, "day");
     }
     /**
      * Compares two {@link FDate} objects. Returns and integer indicating whenever
@@ -4767,10 +4771,10 @@ class FDate {
                 return -1;
             }
         }
-        if (a.value.isSame(b.value)) {
+        if (a.equals(b)) {
             return 0;
         }
-        else if (a.value.isBefore(b.value)) {
+        else if (a.isBefore(b)) {
             return -1;
         }
         else {
@@ -4813,6 +4817,26 @@ class FDate {
     }
 }
 
+/**
+ * @public
+ */
+function parseDate(value) {
+    if (isEmpty(value)) {
+        return undefined;
+    }
+    const normalized = normalizeDateFormat(value);
+    if (!normalized) {
+        return undefined;
+    }
+    const date = FDate.fromIso(normalized);
+    if (date.isValid()) {
+        return date.toString();
+    }
+    else {
+        return undefined;
+    }
+}
+
 /**
  * Strips all whitespace from the text (not only leading and trailing)
  *
@@ -4939,6 +4963,18 @@ function parsePersonnummerLuhn(value) {
     }
     return parsed;
 }
+/**
+ * Formats personnummer to a 8-digit date.
+ *
+ * @public
+ */
+function formatPersonnummerToDate(value) {
+    const datePart = parseDate(parsePersonnummer(value)?.slice(0, 8) || "");
+    if (!datePart) {
+        return undefined;
+    }
+    return FDate.fromIso(datePart);
+}
 
 const PLUSGIRO_REGEXP = /^\d{1,7}[-]?\d{1}$/;
 function hyphenShouldBeAdded(value) {
@@ -5106,16 +5142,16 @@ function getErrorMessages() {
     return ValidationErrorMessageBuilder.create()
         .map("bankAccountNumber", "Kontonumret är inte rätt ifyllt. Kolla att det stämmer.")
         .mapCombined("required", "bankAccountNumber", "Fyll i ett kontonummer.")
-        .map("bankgiro", "Skriv bankgironumret med sju eller åtta siffror och bindestreck.")
+        .map("bankgiro", "Fyll i bankgironumret med sju eller åtta siffror och bindestreck.")
         .mapCombined("required", "bankgiro", "Fyll i bankgironumret.")
         .mapCombined("maxLength", "bankgiro", "Bankgironumret kan inte ha mer än 9 tecken.")
         .map("clearingNumber", "Clearingnumret är inte rätt ifyllt. Kolla att det stämmer.")
         .mapCombined("required", "clearingNumber", "Fyll i ett clearingnummer.")
         .map("currency", "Fyll i ett belopp.")
         .mapCombined("required", "currency", "Fyll i ett belopp.")
-        .map("date", "Du har skrivit ett felaktigt datum.")
+        .map("date", "Du har fyllt i ett felaktigt datum.")
         .mapCombined("required", "date", "Välj ett datum.")
-        .map("dateFormat", "Skriv datumet med åtta siffror.")
+        .map("dateFormat", "Fyll i datumet med åtta siffror.")
         .map("decimal", "Fyll i ett värde med rätt antal decimaler.")
         .map("email", "Mejladressen är inte korrekt ifylld.")
         .mapCombined("required", "email", "Fyll i en mejladress.")
@@ -5142,9 +5178,9 @@ function getErrorMessages() {
         .mapCombined("required", "percent", "Fyll i en siffra.")
         .mapCombined("minValue", "percent", "Fyll i en högre siffra.")
         .mapCombined("maxValue", "percent", "Fyll i en lägre siffra.")
-        .map("personnummerFormat", "Skriv personnumret med 10 siffror.")
-        .mapCombined("required", "personnummerFormat", "Skriv personnumret med 10 siffror.")
-        .mapCombined("maxLength", "personnummerFormat", "Skriv personnumret med 10 siffror.")
+        .map("personnummerFormat", "Fyll i personnumret med 10 siffror.")
+        .mapCombined("required", "personnummerFormat", "Fyll i personnumret med 10 siffror.")
+        .mapCombined("maxLength", "personnummerFormat", "Fyll i personnumret med 10 siffror.")
         .map("personnummerLuhn", "Kolla att personnumret stämmer.")
         .map("postalCode", "Fyll i postnumret med fem siffror.")
         .mapCombined("required", "postalCode", "Fyll i ett postnummer.")
@@ -5152,7 +5188,7 @@ function getErrorMessages() {
         .map("phoneNumber", "Telefonnumret är inte rätt ifyllt.")
         .mapCombined("required", "phoneNumber", "Fyll i ett telefonnummer.")
         .mapCombined("matches", "phoneNumber", "Kolla att telefonnumret stämmer.")
-        .map("plusgiro", "Skriv plusgironumret med siffror och bindestreck.")
+        .map("plusgiro", "Fyll i plusgironumret med siffror och bindestreck.")
         .mapCombined("required", "plusgiro", "Fyll i plusgironumret.")
         .mapCombined("maxLength", "plusgiro", "Plusgironumret kan inte ha mer än 11 tecken.")
         .map("matches", "Fälten stämmer inte överens.")
@@ -5163,6 +5199,7 @@ function getErrorMessages() {
         .map("invalidDates", "Du kan inte välja det här datumet.")
         .map("invalidWeekdays", "Du kan inte välja det här datumet.")
         .map("whitelist", 'Fältet innehåller otillåtna tecken. Exempel på ogiltiga tecken är /, % och ".')
+        .map("allowList", "Välj ett av alternativen i listan.")
         .build();
 }
 
@@ -5815,6 +5852,21 @@ class ValidationServiceImpl {
  */
 const ValidationService = new ValidationServiceImpl();
 
+/**
+ * @public
+ */
+const allowListValidator = {
+    name: "allowList",
+    validation(value, element, config) {
+        if (isEmpty(value) ||
+            config.list === undefined ||
+            config.list.length === 0) {
+            return true;
+        }
+        return config.list.includes(value);
+    },
+};
+
 const bankAccountNumberValidator = {
     name: "bankAccountNumber",
     validation(value) {
@@ -5829,6 +5881,26 @@ const bankgiroValidator = {
     },
 };
 
+function toArray(value) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+    else {
+        return [value];
+    }
+}
+const blacklistValidator = {
+    name: "blacklist",
+    validation(value, _element, config) {
+        if (!config.values) {
+            throw new Error("config.exclude must have values");
+        }
+        const values = toArray(config.values);
+        const found = values.some((it) => String(it) === value);
+        return !found;
+    },
+};
+
 const clearingNumberValidator = {
     name: "clearingNumber",
     validation(value) {
@@ -5836,6 +5908,13 @@ const clearingNumberValidator = {
     },
 };
 
+const currencyValidator = {
+    name: "currency",
+    validation(value) {
+        return isEmpty(value) || isSet(parseNumber(value));
+    },
+};
+
 const dateValidator = {
     name: "date",
     validation(value) {
@@ -5889,26 +5968,6 @@ const decimalValidator = {
     },
 };
 
-function toArray(value) {
-    if (Array.isArray(value)) {
-        return value;
-    }
-    else {
-        return [value];
-    }
-}
-const blacklistValidator = {
-    name: "blacklist",
-    validation(value, _element, config) {
-        if (!config.values) {
-            throw new Error("config.exclude must have values");
-        }
-        const values = toArray(config.values);
-        const found = values.some((it) => String(it) === value);
-        return !found;
-    },
-};
-
 const emailValidator = {
     name: "email",
     validation(value, _element, config) {
@@ -5918,6 +5977,35 @@ const emailValidator = {
     },
 };
 
+/**
+ * @internal
+ */
+function numberValidator$1(value, config, name, compare) {
+    if (value === "") {
+        return true;
+    }
+    const limit = config[name];
+    if (!isSet(limit)) {
+        return false;
+    }
+    const limitAsNumber = parseNumber(String(config[name]));
+    if (limitAsNumber === undefined) {
+        throw new Error(`config.${String(name)} must be a number`);
+    }
+    const valueAsNumber = parseNumber(value);
+    if (valueAsNumber === undefined) {
+        return false;
+    }
+    return compare(valueAsNumber, limitAsNumber);
+}
+
+const greaterThanValidator = {
+    name: "greaterThan",
+    validation(value, _element, config) {
+        return numberValidator$1(value, config, "limit", (value, limit) => value > limit);
+    },
+};
+
 const NUMBER_REGEXP = /^([-−]?[0-9]+)?$/;
 const integerValidator = {
     name: "integer",
@@ -5975,35 +6063,6 @@ const invalidWeekdaysValidator = {
     },
 };
 
-/**
- * @internal
- */
-function numberValidator$1(value, config, name, compare) {
-    if (value === "") {
-        return true;
-    }
-    const limit = config[name];
-    if (!isSet(limit)) {
-        return false;
-    }
-    const limitAsNumber = parseNumber(String(config[name]));
-    if (limitAsNumber === undefined) {
-        throw new Error(`config.${String(name)} must be a number`);
-    }
-    const valueAsNumber = parseNumber(value);
-    if (valueAsNumber === undefined) {
-        return false;
-    }
-    return compare(valueAsNumber, limitAsNumber);
-}
-
-const greaterThanValidator = {
-    name: "greaterThan",
-    validation(value, _element, config) {
-        return numberValidator$1(value, config, "limit", (value, limit) => value > limit);
-    },
-};
-
 const lessThanValidator = {
     name: "lessThan",
     validation(value, _element, config) {
@@ -6024,6 +6083,22 @@ const matchesValidator = {
     },
 };
 
+const maxDateValidator = {
+    name: "maxDate",
+    validation(value, _element, config) {
+        if (isEmpty(value)) {
+            return true;
+        }
+        const normalizedValue = normalizeDateFormat(value);
+        if (!normalizedValue) {
+            return false;
+        }
+        const parsed = FDate.fromIso(normalizedValue);
+        const limit = FDate.fromIso(validLimit(config.limit));
+        return parsed.equals(limit) || parsed.isBefore(limit);
+    },
+};
+
 const maxLengthValidator = {
     name: "maxLength",
     validation(value, _element, config) {
@@ -6054,22 +6129,6 @@ const minDateValidator = {
     },
 };
 
-const maxDateValidator = {
-    name: "maxDate",
-    validation(value, _element, config) {
-        if (isEmpty(value)) {
-            return true;
-        }
-        const normalizedValue = normalizeDateFormat(value);
-        if (!normalizedValue) {
-            return false;
-        }
-        const parsed = FDate.fromIso(normalizedValue);
-        const limit = FDate.fromIso(validLimit(config.limit));
-        return parsed.equals(limit) || parsed.isBefore(limit);
-    },
-};
-
 const minLengthValidator = {
     name: "minLength",
     validation(value, _element, config) {
@@ -6091,13 +6150,6 @@ const numberValidator = {
     },
 };
 
-const currencyValidator = {
-    name: "currency",
-    validation(value) {
-        return isEmpty(value) || isSet(parseNumber(value));
-    },
-};
-
 const organisationsnummerValidator = {
     name: "organisationsnummer",
     validation(value) {
@@ -6131,6 +6183,48 @@ const personnummerLuhnValidator = {
     },
 };
 
+const personnummerNotSame = {
+    name: "personnummerNotSame",
+    validation(value, _element, config) {
+        const valuePnr = parsePersonnummer(String(value));
+        if (!valuePnr) {
+            return true;
+        }
+        const otherFieldPnr = parsePersonnummer(String(config.otherField));
+        if (!otherFieldPnr) {
+            return true;
+        }
+        if (valuePnr === otherFieldPnr) {
+            return false;
+        }
+        return true;
+    },
+};
+
+const personnummerOlder = {
+    name: "personnummerOlder",
+    validation(value, _element, config) {
+        const valueAsDate = formatPersonnummerToDate(value);
+        const otherAsDate = formatPersonnummerToDate(String(config.otherField));
+        if (!valueAsDate || !otherAsDate) {
+            return true;
+        }
+        return FDate.compare(valueAsDate, otherAsDate) !== 1;
+    },
+};
+
+const personnummerYounger = {
+    name: "personnummerYounger",
+    validation(value, _element, config) {
+        const valueAsDate = formatPersonnummerToDate(value);
+        const otherAsDate = formatPersonnummerToDate(String(config.otherField));
+        if (!valueAsDate || !otherAsDate) {
+            return true;
+        }
+        return FDate.compare(valueAsDate, otherAsDate) !== -1;
+    },
+};
+
 const PHONE_NUMBER_REGEXP = /^(\+?[-_/() ]*(\d[-_/() ]*?){3,17})$/;
 const phoneNumberValidator = {
     name: "phoneNumber",
@@ -6197,32 +6291,36 @@ const whitelistValidator = {
     },
 };
 
+ValidationService.registerValidator(allowListValidator);
 ValidationService.registerValidator(bankAccountNumberValidator);
 ValidationService.registerValidator(bankgiroValidator);
+ValidationService.registerValidator(blacklistValidator);
 ValidationService.registerValidator(clearingNumberValidator);
+ValidationService.registerValidator(currencyValidator);
 ValidationService.registerValidator(dateFormatValidator);
 ValidationService.registerValidator(dateValidator);
 ValidationService.registerValidator(decimalValidator);
-ValidationService.registerValidator(blacklistValidator);
 ValidationService.registerValidator(emailValidator);
-ValidationService.registerValidator(integerValidator);
 ValidationService.registerValidator(greaterThanValidator);
+ValidationService.registerValidator(integerValidator);
 ValidationService.registerValidator(invalidDatesValidator);
 ValidationService.registerValidator(invalidWeekdaysValidator);
 ValidationService.registerValidator(lessThanValidator);
-ValidationService.registerValidator(minLengthValidator);
 ValidationService.registerValidator(matchesValidator);
+ValidationService.registerValidator(maxDateValidator);
 ValidationService.registerValidator(maxLengthValidator);
-ValidationService.registerValidator(minValueValidator);
 ValidationService.registerValidator(maxValueValidator);
 ValidationService.registerValidator(minDateValidator);
-ValidationService.registerValidator(maxDateValidator);
+ValidationService.registerValidator(minLengthValidator);
+ValidationService.registerValidator(minValueValidator);
 ValidationService.registerValidator(numberValidator);
-ValidationService.registerValidator(currencyValidator);
 ValidationService.registerValidator(organisationsnummerValidator);
 ValidationService.registerValidator(percentValidator);
 ValidationService.registerValidator(personnummerFormatValidator);
 ValidationService.registerValidator(personnummerLuhnValidator);
+ValidationService.registerValidator(personnummerNotSame);
+ValidationService.registerValidator(personnummerOlder);
+ValidationService.registerValidator(personnummerYounger);
 ValidationService.registerValidator(phoneNumberValidator);
 ValidationService.registerValidator(plusgiroValidator);
 ValidationService.registerValidator(postalCodeValidator);