@fkui/logic 5.39.0 → 5.41.0

package/lib/cjs/index.js

@@ -3066,6 +3066,18 @@ function formatPersonnummer(value) {
     }
     return value.substring(2);
 }
+/**
+ * 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) {
@@ -3739,6 +3751,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", "Ange ett av alternativen i listan.")
         .build();
 }
 
@@ -4397,6 +4410,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) {
@@ -4411,6 +4439,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) {
@@ -4418,6 +4466,13 @@ const clearingNumberValidator = {
     },
 };
 
+const currencyValidator = {
+    name: "currency",
+    validation(value) {
+        return isEmpty(value) || isSet(parseNumber(value));
+    },
+};
+
 const dateValidator = {
     name: "date",
     validation(value) {
@@ -4471,26 +4526,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) {
@@ -4500,6 +4535,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",
@@ -4557,35 +4621,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) {
@@ -4606,6 +4641,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) {
@@ -4636,22 +4687,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) {
@@ -4673,13 +4708,6 @@ const numberValidator = {
     },
 };
 
-const currencyValidator = {
-    name: "currency",
-    validation(value) {
-        return isEmpty(value) || isSet(parseNumber(value));
-    },
-};
-
 const organisationsnummerValidator = {
     name: "organisationsnummer",
     validation(value) {
@@ -4713,6 +4741,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",
@@ -4779,32 +4849,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);
@@ -5113,6 +5187,7 @@ exports.formatClearingNumberForBackend = formatClearingNumberForBackend;
 exports.formatNumber = formatNumber;
 exports.formatPercent = formatPercent;
 exports.formatPersonnummer = formatPersonnummer;
+exports.formatPersonnummerToDate = formatPersonnummerToDate;
 exports.formatPostalCode = formatPostalCode;
 exports.getErrorMessages = getErrorMessages;
 exports.handleTab = handleTab;

package/lib/esm/index.js

@@ -3064,6 +3064,18 @@ function formatPersonnummer(value) {
     }
     return value.substring(2);
 }
+/**
+ * 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) {
@@ -3737,6 +3749,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", "Ange ett av alternativen i listan.")
         .build();
 }
 
@@ -4395,6 +4408,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) {
@@ -4409,6 +4437,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) {
@@ -4416,6 +4464,13 @@ const clearingNumberValidator = {
     },
 };
 
+const currencyValidator = {
+    name: "currency",
+    validation(value) {
+        return isEmpty(value) || isSet(parseNumber(value));
+    },
+};
+
 const dateValidator = {
     name: "date",
     validation(value) {
@@ -4469,26 +4524,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) {
@@ -4498,6 +4533,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",
@@ -4555,35 +4619,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) {
@@ -4604,6 +4639,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) {
@@ -4634,22 +4685,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) {
@@ -4671,13 +4706,6 @@ const numberValidator = {
     },
 };
 
-const currencyValidator = {
-    name: "currency",
-    validation(value) {
-        return isEmpty(value) || isSet(parseNumber(value));
-    },
-};
-
 const organisationsnummerValidator = {
     name: "organisationsnummer",
     validation(value) {
@@ -4711,6 +4739,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",
@@ -4777,32 +4847,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);
@@ -5077,5 +5151,5 @@ if (typeof document !== "undefined") {
     createScreenReaderWrapper({ assertive: false });
 }
 
-export { DATE_REGEXP_WITH_DASH, DecoratedError, index as DomUtils, ElementIdService, FORMAT_3_DIGITS_GROUPS, MissingValueError, POSTAL_CODE_REGEXP, PersistenceService, Reference, SCREEN_READER_DELAY, SimplePersistenceService, TranslationService, ValidationErrorMessageBuilder, ValidationService, WHITESPACE_PATTERN, addFocusListener, alertScreenReader, applyValidationMessages, configLogic, debounce, deepClone, deleteCookie, documentOrderComparator, ensureSet, findCookie, findTabbableElements, flatten, focus, focusFirst, focusLast, formatClearingNumberForBackend, formatNumber, formatPercent, formatPersonnummer, formatPostalCode, getErrorMessages, handleTab, isEmpty, isFieldset, isFocusable, isInvalidDatesConfig, isInvalidWeekdaysConfig, isRadiobuttonOrCheckbox, isSet, isString, isTabbable, isValidDate, isValidatableFormElement, isValidatableHTMLElement, isVisible, isVisibleInViewport, normalizeDateFormat, parseBankAccountNumber, parseBankgiro, parseClearingNumber, parseDate, parseNumber, parseOrganisationsnummer, parsePercent, parsePersonnummer, parsePersonnummerLuhn, parsePlusgiro, parsePostalCode, popFocus, pushFocus, removeFocusListener, restoreFocus, saveFocus, scrollTo, setCookie, stripNull, stripWhitespace, testLuhnChecksum, validChecksum, validLimit, waitForScreenReader };
+export { DATE_REGEXP_WITH_DASH, DecoratedError, index as DomUtils, ElementIdService, FORMAT_3_DIGITS_GROUPS, MissingValueError, POSTAL_CODE_REGEXP, PersistenceService, Reference, SCREEN_READER_DELAY, SimplePersistenceService, TranslationService, ValidationErrorMessageBuilder, ValidationService, WHITESPACE_PATTERN, addFocusListener, alertScreenReader, applyValidationMessages, configLogic, debounce, deepClone, deleteCookie, documentOrderComparator, ensureSet, findCookie, findTabbableElements, flatten, focus, focusFirst, focusLast, formatClearingNumberForBackend, formatNumber, formatPercent, formatPersonnummer, formatPersonnummerToDate, formatPostalCode, getErrorMessages, handleTab, isEmpty, isFieldset, isFocusable, isInvalidDatesConfig, isInvalidWeekdaysConfig, isRadiobuttonOrCheckbox, isSet, isString, isTabbable, isValidDate, isValidatableFormElement, isValidatableHTMLElement, isVisible, isVisibleInViewport, normalizeDateFormat, parseBankAccountNumber, parseBankgiro, parseClearingNumber, parseDate, parseNumber, parseOrganisationsnummer, parsePercent, parsePersonnummer, parsePersonnummerLuhn, parsePlusgiro, parsePostalCode, popFocus, pushFocus, removeFocusListener, restoreFocus, saveFocus, scrollTo, setCookie, stripNull, stripWhitespace, testLuhnChecksum, validChecksum, validLimit, waitForScreenReader };
 //# sourceMappingURL=index.js.map