@fkui/i18next-translate 5.45.1 → 6.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.js +59 -44
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.js +59 -44
- package/dist/esm/index.js.map +1 -1
- package/dist/types/tsdoc-metadata.json +1 -1
- package/package.json +2 -2
package/dist/cjs/index.js
CHANGED
|
@@ -459,6 +459,7 @@ var postProcessor = {
|
|
|
459
459
|
};
|
|
460
460
|
|
|
461
461
|
const checkedLoadedFor = {};
|
|
462
|
+
const shouldHandleAsObject = res => !isString$1(res) && typeof res !== 'boolean' && typeof res !== 'number';
|
|
462
463
|
class Translator extends EventEmitter {
|
|
463
464
|
constructor(services) {
|
|
464
465
|
let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
@@ -557,17 +558,29 @@ class Translator extends EventEmitter {
|
|
|
557
558
|
let res = resolved?.res;
|
|
558
559
|
const resUsedKey = resolved?.usedKey || key;
|
|
559
560
|
const resExactUsedKey = resolved?.exactUsedKey || key;
|
|
560
|
-
const resType = Object.prototype.toString.apply(res);
|
|
561
561
|
const noObject = ['[object Number]', '[object Function]', '[object RegExp]'];
|
|
562
562
|
const joinArrays = options.joinArrays !== undefined ? options.joinArrays : this.options.joinArrays;
|
|
563
563
|
const handleAsObjectInI18nFormat = !this.i18nFormat || this.i18nFormat.handleAsObject;
|
|
564
|
-
const
|
|
565
|
-
|
|
564
|
+
const needsPluralHandling = options.count !== undefined && !isString$1(options.count);
|
|
565
|
+
const hasDefaultValue = Translator.hasDefaultValue(options);
|
|
566
|
+
const defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, options) : '';
|
|
567
|
+
const defaultValueSuffixOrdinalFallback = options.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, {
|
|
568
|
+
ordinal: false
|
|
569
|
+
}) : '';
|
|
570
|
+
const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0;
|
|
571
|
+
const defaultValue = needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] || options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
|
|
572
|
+
let resForObjHndl = res;
|
|
573
|
+
if (handleAsObjectInI18nFormat && !res && hasDefaultValue) {
|
|
574
|
+
resForObjHndl = defaultValue;
|
|
575
|
+
}
|
|
576
|
+
const handleAsObject = shouldHandleAsObject(resForObjHndl);
|
|
577
|
+
const resType = Object.prototype.toString.apply(resForObjHndl);
|
|
578
|
+
if (handleAsObjectInI18nFormat && resForObjHndl && handleAsObject && noObject.indexOf(resType) < 0 && !(isString$1(joinArrays) && Array.isArray(resForObjHndl))) {
|
|
566
579
|
if (!options.returnObjects && !this.options.returnObjects) {
|
|
567
580
|
if (!this.options.returnedObjectHandler) {
|
|
568
581
|
this.logger.warn('accessing an object - but returnObjects options is not enabled!');
|
|
569
582
|
}
|
|
570
|
-
const r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey,
|
|
583
|
+
const r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, resForObjHndl, {
|
|
571
584
|
...options,
|
|
572
585
|
ns: namespaces
|
|
573
586
|
}) : `key '${key} (${this.language})' returned an object instead of string.`;
|
|
@@ -579,20 +592,31 @@ class Translator extends EventEmitter {
|
|
|
579
592
|
return r;
|
|
580
593
|
}
|
|
581
594
|
if (keySeparator) {
|
|
582
|
-
const resTypeIsArray = Array.isArray(
|
|
595
|
+
const resTypeIsArray = Array.isArray(resForObjHndl);
|
|
583
596
|
const copy = resTypeIsArray ? [] : {};
|
|
584
597
|
const newKeyToUse = resTypeIsArray ? resExactUsedKey : resUsedKey;
|
|
585
|
-
for (const m in
|
|
586
|
-
if (Object.prototype.hasOwnProperty.call(
|
|
598
|
+
for (const m in resForObjHndl) {
|
|
599
|
+
if (Object.prototype.hasOwnProperty.call(resForObjHndl, m)) {
|
|
587
600
|
const deepKey = `${newKeyToUse}${keySeparator}${m}`;
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
601
|
+
if (hasDefaultValue && !res) {
|
|
602
|
+
copy[m] = this.translate(deepKey, {
|
|
603
|
+
...options,
|
|
604
|
+
defaultValue: shouldHandleAsObject(defaultValue) ? defaultValue[m] : undefined,
|
|
605
|
+
...{
|
|
606
|
+
joinArrays: false,
|
|
607
|
+
ns: namespaces
|
|
608
|
+
}
|
|
609
|
+
});
|
|
610
|
+
} else {
|
|
611
|
+
copy[m] = this.translate(deepKey, {
|
|
612
|
+
...options,
|
|
613
|
+
...{
|
|
614
|
+
joinArrays: false,
|
|
615
|
+
ns: namespaces
|
|
616
|
+
}
|
|
617
|
+
});
|
|
618
|
+
}
|
|
619
|
+
if (copy[m] === deepKey) copy[m] = resForObjHndl[m];
|
|
596
620
|
}
|
|
597
621
|
}
|
|
598
622
|
res = copy;
|
|
@@ -603,14 +627,6 @@ class Translator extends EventEmitter {
|
|
|
603
627
|
} else {
|
|
604
628
|
let usedDefault = false;
|
|
605
629
|
let usedKey = false;
|
|
606
|
-
const needsPluralHandling = options.count !== undefined && !isString$1(options.count);
|
|
607
|
-
const hasDefaultValue = Translator.hasDefaultValue(options);
|
|
608
|
-
const defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, options) : '';
|
|
609
|
-
const defaultValueSuffixOrdinalFallback = options.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, {
|
|
610
|
-
ordinal: false
|
|
611
|
-
}) : '';
|
|
612
|
-
const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0;
|
|
613
|
-
const defaultValue = needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] || options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
|
|
614
630
|
if (!this.isValidLookup(res) && hasDefaultValue) {
|
|
615
631
|
usedDefault = true;
|
|
616
632
|
res = defaultValue;
|
|
@@ -2249,10 +2265,6 @@ function isString(value) {
|
|
|
2249
2265
|
return typeof value === "string" || value instanceof String;
|
|
2250
2266
|
}
|
|
2251
2267
|
|
|
2252
|
-
/**
|
|
2253
|
-
* @public
|
|
2254
|
-
* @deprecated Use `FDate` instead.
|
|
2255
|
-
*/
|
|
2256
2268
|
const DATE_REGEXP_WITH_DASH = /^[0-9]{4}-[0-9]{2}-[0-9]{2}$/;
|
|
2257
2269
|
/**
|
|
2258
2270
|
* @public
|
|
@@ -4197,7 +4209,7 @@ function requireDayjs_min () {
|
|
|
4197
4209
|
if (hasRequiredDayjs_min) return dayjs_min$1.exports;
|
|
4198
4210
|
hasRequiredDayjs_min = 1;
|
|
4199
4211
|
(function (module, exports) {
|
|
4200
|
-
!function(t,e){module.exports=e();}(dayjs_min,(function(){var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return "["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return !r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return (e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return -t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return +(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return {M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return
|
|
4212
|
+
!function(t,e){module.exports=e();}(dayjs_min,(function(){var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return "["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return !r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return (e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return -t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return +(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return {M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return undefined===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else {var a=e.name;D[a]=e,i=a;}return !r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,true),this.parse(t),this.$x=this.$x||t.x||{},this[p]=true;}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init();},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds();},m.$utils=function(){return b},m.isValid=function(){return !(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,false)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d;}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case "YY":return String(e.$y).slice(-2);case "YYYY":return b.s(e.$y,4,"0");case "M":return a+1;case "MM":return b.s(a+1,2,"0");case "MMM":return h(n.monthsShort,a,c,3);case "MMMM":return h(c,a);case "D":return e.$D;case "DD":return b.s(e.$D,2,"0");case "d":return String(e.$W);case "dd":return h(n.weekdaysMin,e.$W,o,2);case "ddd":return h(n.weekdaysShort,e.$W,o,3);case "dddd":return o[e.$W];case "H":return String(s);case "HH":return b.s(s,2,"0");case "h":return d(1);case "hh":return d(2);case "a":return $(s,u,true);case "A":return $(s,u,false);case "m":return String(u);case "mm":return b.s(u,2,"0");case "s":return String(e.$s);case "ss":return b.s(e.$s,2,"0");case "SSS":return b.s(e.$ms,3,"0");case "Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g;}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,true);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])};})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=true),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
|
|
4201
4213
|
} (dayjs_min$1));
|
|
4202
4214
|
return dayjs_min$1.exports;
|
|
4203
4215
|
}
|
|
@@ -4215,7 +4227,7 @@ function requireSv () {
|
|
|
4215
4227
|
if (hasRequiredSv) return sv$1.exports;
|
|
4216
4228
|
hasRequiredSv = 1;
|
|
4217
4229
|
(function (module, exports) {
|
|
4218
|
-
!function(e,t){module.exports=t(requireDayjs_min());}(sv,(function(e){function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),d={name:"sv",weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekStart:1,yearStart:4,ordinal:function(e){var t=e%10;return "["+e+(1===t||2===t?"a":"e")+"]"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [kl.] HH:mm",LLLL:"dddd D MMMM YYYY [kl.] HH:mm",lll:"D MMM YYYY HH:mm",llll:"ddd D MMM YYYY HH:mm"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"}};return a.default.locale(d,null
|
|
4230
|
+
!function(e,t){module.exports=t(requireDayjs_min());}(sv,(function(e){function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),d={name:"sv",weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekStart:1,yearStart:4,ordinal:function(e){var t=e%10;return "["+e+(1===t||2===t?"a":"e")+"]"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [kl.] HH:mm",LLLL:"dddd D MMMM YYYY [kl.] HH:mm",lll:"D MMM YYYY HH:mm",llll:"ddd D MMM YYYY HH:mm"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"}};return a.default.locale(d,null,true),d}));
|
|
4219
4231
|
} (sv$1));
|
|
4220
4232
|
return sv$1.exports;
|
|
4221
4233
|
}
|
|
@@ -4232,7 +4244,7 @@ function requireWeekOfYear () {
|
|
|
4232
4244
|
if (hasRequiredWeekOfYear) return weekOfYear$2.exports;
|
|
4233
4245
|
hasRequiredWeekOfYear = 1;
|
|
4234
4246
|
(function (module, exports) {
|
|
4235
|
-
!function(e,t){module.exports=t();}(weekOfYear$1,(function(){var e="week",t="year";return function(i,n,r){var f=n.prototype;f.week=function(i){if(
|
|
4247
|
+
!function(e,t){module.exports=t();}(weekOfYear$1,(function(){var e="week",t="year";return function(i,n,r){var f=n.prototype;f.week=function(i){if(undefined===i&&(i=null),null!==i)return this.add(7*(i-this.week()),"day");var n=this.$locale().yearStart||1;if(11===this.month()&&this.date()>25){var f=r(this).startOf(t).add(1,t).date(n),s=r(this).endOf(e);if(f.isBefore(s))return 1}var a=r(this).startOf(t).date(n).startOf(e).subtract(1,"millisecond"),o=this.diff(a,e,true);return o<0?r(this).startOf("week").week():Math.ceil(o)},f.weeks=function(e){return undefined===e&&(e=null),this.week(e)};}}));
|
|
4236
4248
|
} (weekOfYear$2));
|
|
4237
4249
|
return weekOfYear$2.exports;
|
|
4238
4250
|
}
|
|
@@ -5058,7 +5070,7 @@ function parseOrganisationsnummer(value) {
|
|
|
5058
5070
|
/**
|
|
5059
5071
|
* Check if element is of type radiobutton or checkbox
|
|
5060
5072
|
*
|
|
5061
|
-
* @
|
|
5073
|
+
* @internal
|
|
5062
5074
|
*/
|
|
5063
5075
|
function isRadiobuttonOrCheckbox(element) {
|
|
5064
5076
|
return (element instanceof HTMLInputElement &&
|
|
@@ -5340,6 +5352,9 @@ function getElementType(element) {
|
|
|
5340
5352
|
* @param element - Element to test
|
|
5341
5353
|
*/
|
|
5342
5354
|
function isValidatableHTMLElement(element) {
|
|
5355
|
+
if (element.classList.contains("card")) {
|
|
5356
|
+
return true;
|
|
5357
|
+
}
|
|
5343
5358
|
return (element instanceof HTMLInputElement ||
|
|
5344
5359
|
element instanceof HTMLTextAreaElement ||
|
|
5345
5360
|
element instanceof HTMLSelectElement ||
|
|
@@ -5420,14 +5435,6 @@ class ValidationServiceImpl {
|
|
|
5420
5435
|
createFieldsetValidator(element, this);
|
|
5421
5436
|
}
|
|
5422
5437
|
this.setRequiredAttribute(element, validatorConfigs);
|
|
5423
|
-
// Deprecated: SFKUI-4412 personnummerValidator is deprecated. Replace with personnummerFormat and personnummerLuhn
|
|
5424
|
-
// Legacy compability tests cant be found here: @fkui/vue:src\components\FTextField\FTextField.cy.ts
|
|
5425
|
-
if (validatorConfigs["personnummer"] !== undefined) {
|
|
5426
|
-
const oldConfig = validatorConfigs["personnummer"];
|
|
5427
|
-
validatorConfigs["personnummerFormat"] = oldConfig;
|
|
5428
|
-
validatorConfigs["personnummerLuhn"] = oldConfig;
|
|
5429
|
-
delete validatorConfigs.personnummer;
|
|
5430
|
-
}
|
|
5431
5438
|
const foundValidators = this.getValidators(validatorConfigs);
|
|
5432
5439
|
// set data-validation attribute to indicate that validation is activated on the element
|
|
5433
5440
|
if (foundValidators.length > 0) {
|
|
@@ -5760,14 +5767,20 @@ class ValidationServiceImpl {
|
|
|
5760
5767
|
return this.hasValue(fieldsetInputElement);
|
|
5761
5768
|
});
|
|
5762
5769
|
}
|
|
5770
|
+
if (element instanceof HTMLDivElement) {
|
|
5771
|
+
return false;
|
|
5772
|
+
}
|
|
5763
5773
|
return Boolean(isRadiobuttonOrCheckbox(element)
|
|
5764
5774
|
? element.checked
|
|
5765
5775
|
: element.value);
|
|
5766
5776
|
}
|
|
5767
5777
|
getValue(element) {
|
|
5768
|
-
|
|
5769
|
-
|
|
5770
|
-
|
|
5778
|
+
if ("value" in element) {
|
|
5779
|
+
return element.value.trim();
|
|
5780
|
+
}
|
|
5781
|
+
else {
|
|
5782
|
+
return "";
|
|
5783
|
+
}
|
|
5771
5784
|
}
|
|
5772
5785
|
validateAll(element, validationState, validators, validatorConfigs) {
|
|
5773
5786
|
if (validationState.serverError) {
|
|
@@ -5777,7 +5790,7 @@ class ValidationServiceImpl {
|
|
|
5777
5790
|
};
|
|
5778
5791
|
}
|
|
5779
5792
|
/* if the element is disabled we always consider it to be valid */
|
|
5780
|
-
if (element.disabled) {
|
|
5793
|
+
if ("disabled" in element && element.disabled) {
|
|
5781
5794
|
return {
|
|
5782
5795
|
isValid: true,
|
|
5783
5796
|
validationMessage: "",
|
|
@@ -5838,7 +5851,9 @@ class ValidationServiceImpl {
|
|
|
5838
5851
|
detail: validityEvent,
|
|
5839
5852
|
});
|
|
5840
5853
|
for (const affectedElement of affectedElements) {
|
|
5841
|
-
affectedElement
|
|
5854
|
+
if ("setCustomValidity" in affectedElement) {
|
|
5855
|
+
affectedElement.setCustomValidity(validityEvent.validationMessage);
|
|
5856
|
+
}
|
|
5842
5857
|
affectedElement.setAttribute("aria-invalid", validField.toString());
|
|
5843
5858
|
}
|
|
5844
5859
|
element.dispatchEvent(event);
|