@formatjs/intl-datetimeformat 7.1.0 → 7.1.2

package/polyfill.js

@@ -1,47 +1,31 @@
-import { DateTimeFormat } from './index.js';
-import { defineProperty } from '@formatjs/ecma402-abstract';
-import { shouldPolyfill } from './should-polyfill.js';
-import { toLocaleString as _toLocaleString, toLocaleDateString as _toLocaleDateString, toLocaleTimeString as _toLocaleTimeString, } from './src/to_locale_string.js';
+import { DateTimeFormat } from "./index.js";
+import { defineProperty } from "@formatjs/ecma402-abstract";
+import { shouldPolyfill } from "./should-polyfill.js";
+import { toLocaleString as _toLocaleString, toLocaleDateString as _toLocaleDateString, toLocaleTimeString as _toLocaleTimeString } from "./src/to_locale_string.js";
 if (shouldPolyfill()) {
-    defineProperty(Intl, 'DateTimeFormat', { value: DateTimeFormat });
-    defineProperty(Date.prototype, 'toLocaleString', {
-        value: function toLocaleString(locales, options) {
-            if (options === void 0) { options = {
-                dateStyle: 'short',
-                timeStyle: 'medium',
-            }; }
-            try {
-                return _toLocaleString(this, locales, options);
-            }
-            catch (_a) {
-                return 'Invalid Date';
-            }
-        },
-    });
-    defineProperty(Date.prototype, 'toLocaleDateString', {
-        value: function toLocaleDateString(locales, options) {
-            if (options === void 0) { options = {
-                dateStyle: 'short',
-            }; }
-            try {
-                return _toLocaleDateString(this, locales, options);
-            }
-            catch (_a) {
-                return 'Invalid Date';
-            }
-        },
-    });
-    defineProperty(Date.prototype, 'toLocaleTimeString', {
-        value: function toLocaleTimeString(locales, options) {
-            if (options === void 0) { options = {
-                timeStyle: 'medium',
-            }; }
-            try {
-                return _toLocaleTimeString(this, locales, options);
-            }
-            catch (_a) {
-                return 'Invalid Date';
-            }
-        },
-    });
+	defineProperty(Intl, "DateTimeFormat", { value: DateTimeFormat });
+	defineProperty(Date.prototype, "toLocaleString", { value: function toLocaleString(locales, options = {
+		dateStyle: "short",
+		timeStyle: "medium"
+	}) {
+		try {
+			return _toLocaleString(this, locales, options);
+		} catch {
+			return "Invalid Date";
+		}
+	} });
+	defineProperty(Date.prototype, "toLocaleDateString", { value: function toLocaleDateString(locales, options = { dateStyle: "short" }) {
+		try {
+			return _toLocaleDateString(this, locales, options);
+		} catch {
+			return "Invalid Date";
+		}
+	} });
+	defineProperty(Date.prototype, "toLocaleTimeString", { value: function toLocaleTimeString(locales, options = { timeStyle: "medium" }) {
+		try {
+			return _toLocaleTimeString(this, locales, options);
+		} catch {
+			return "Invalid Date";
+		}
+	} });
 }

package/should-polyfill.js

@@ -1,61 +1,49 @@
-import { match } from '@formatjs/intl-localematcher';
-import { supportedLocales } from './supported-locales.generated.js';
+import { match } from "@formatjs/intl-localematcher";
+import { supportedLocales } from "./supported-locales.generated.js";
 function supportsDateStyle() {
-    try {
-        return !!new Intl.DateTimeFormat(undefined, {
-            dateStyle: 'short',
-        }).resolvedOptions().dateStyle;
-    }
-    catch (_a) {
-        return false;
-    }
+	try {
+		return !!new Intl.DateTimeFormat(undefined, { dateStyle: "short" }).resolvedOptions().dateStyle;
+	} catch {
+		return false;
+	}
 }
 /**
- * https://bugs.chromium.org/p/chromium/issues/detail?id=865351
- */
+* https://bugs.chromium.org/p/chromium/issues/detail?id=865351
+*/
 function hasChromeLt71Bug() {
-    try {
-        return (new Intl.DateTimeFormat('en', {
-            hourCycle: 'h11',
-            hour: 'numeric',
-        }).formatToParts(0)[2].type !== 'dayPeriod');
-    }
-    catch (_a) {
-        return false;
-    }
+	try {
+		return new Intl.DateTimeFormat("en", {
+			hourCycle: "h11",
+			hour: "numeric"
+		}).formatToParts(0)[2].type !== "dayPeriod";
+	} catch {
+		return false;
+	}
 }
 /**
- * Node 14's version of Intl.DateTimeFormat does not throw
- * when dateStyle/timeStyle is used with other options.
- * This was fixed in newer V8 versions
- */
+* Node 14's version of Intl.DateTimeFormat does not throw
+* when dateStyle/timeStyle is used with other options.
+* This was fixed in newer V8 versions
+*/
 function hasUnthrownDateTimeStyleBug() {
-    try {
-        return !!new Intl.DateTimeFormat('en', {
-            dateStyle: 'short',
-            hour: 'numeric',
-        }).format(new Date(0));
-    }
-    catch (_a) {
-        return false;
-    }
+	try {
+		return !!new Intl.DateTimeFormat("en", {
+			dateStyle: "short",
+			hour: "numeric"
+		}).format(new Date(0));
+	} catch {
+		return false;
+	}
 }
 function supportedLocalesOf(locale) {
-    if (!locale) {
-        return true;
-    }
-    var locales = Array.isArray(locale) ? locale : [locale];
-    return (Intl.DateTimeFormat.supportedLocalesOf(locales).length === locales.length);
+	if (!locale) {
+		return true;
+	}
+	const locales = Array.isArray(locale) ? locale : [locale];
+	return Intl.DateTimeFormat.supportedLocalesOf(locales).length === locales.length;
 }
-export function shouldPolyfill(locale) {
-    if (locale === void 0) { locale = 'en'; }
-    if (!('DateTimeFormat' in Intl) ||
-        !('formatToParts' in Intl.DateTimeFormat.prototype) ||
-        !('formatRange' in Intl.DateTimeFormat.prototype) ||
-        hasChromeLt71Bug() ||
-        hasUnthrownDateTimeStyleBug() ||
-        !supportsDateStyle() ||
-        !supportedLocalesOf(locale)) {
-        return locale ? match([locale], supportedLocales, 'en') : undefined;
-    }
+export function shouldPolyfill(locale = "en") {
+	if (!("DateTimeFormat" in Intl) || !("formatToParts" in Intl.DateTimeFormat.prototype) || !("formatRange" in Intl.DateTimeFormat.prototype) || hasChromeLt71Bug() || hasUnthrownDateTimeStyleBug() || !supportsDateStyle() || !supportedLocalesOf(locale)) {
+		return locale ? match([locale], supportedLocales, "en") : undefined;
+	}
 }

package/src/abstract/BasicFormatMatcher.d.ts

@@ -1,7 +1,7 @@
-import { Formats } from '@formatjs/ecma402-abstract';
+import { type Formats } from "@formatjs/ecma402-abstract";
 /**
- * https://tc39.es/ecma402/#sec-basicformatmatcher
- * @param options
- * @param formats
- */
+* https://tc39.es/ecma402/#sec-basicformatmatcher
+* @param options
+* @param formats
+*/
 export declare function BasicFormatMatcher(options: Intl.DateTimeFormatOptions, formats: Formats[]): Formats;

package/src/abstract/BasicFormatMatcher.js

@@ -1,106 +1,90 @@
-import { __assign } from "tslib";
-import { invariant } from '@formatjs/ecma402-abstract';
-import { DATE_TIME_PROPS, additionPenalty, removalPenalty, longMorePenalty, shortMorePenalty, shortLessPenalty, longLessPenalty, offsetPenalty, } from './utils.js';
+import { invariant } from "@formatjs/ecma402-abstract";
+import { DATE_TIME_PROPS, additionPenalty, removalPenalty, longMorePenalty, shortMorePenalty, shortLessPenalty, longLessPenalty, offsetPenalty } from "./utils.js";
 /**
- * https://tc39.es/ecma402/#sec-basicformatmatcher
- * @param options
- * @param formats
- */
+* https://tc39.es/ecma402/#sec-basicformatmatcher
+* @param options
+* @param formats
+*/
 export function BasicFormatMatcher(options, formats) {
-    var bestScore = -Infinity;
-    var bestFormat = formats[0];
-    invariant(Array.isArray(formats), 'formats should be a list of things');
-    for (var _i = 0, formats_1 = formats; _i < formats_1.length; _i++) {
-        var format = formats_1[_i];
-        var score = 0;
-        for (var _a = 0, DATE_TIME_PROPS_1 = DATE_TIME_PROPS; _a < DATE_TIME_PROPS_1.length; _a++) {
-            var prop = DATE_TIME_PROPS_1[_a];
-            var optionsProp = options[prop];
-            var formatProp = format[prop];
-            if (optionsProp === undefined && formatProp !== undefined) {
-                score -= additionPenalty;
-            }
-            else if (optionsProp !== undefined && formatProp === undefined) {
-                score -= removalPenalty;
-            }
-            else if (prop === 'timeZoneName') {
-                if (optionsProp === 'short' || optionsProp === 'shortGeneric') {
-                    if (formatProp === 'shortOffset') {
-                        score -= offsetPenalty;
-                    }
-                    else if (formatProp === 'longOffset') {
-                        score -= offsetPenalty + shortMorePenalty;
-                    }
-                    else if (optionsProp === 'short' && formatProp === 'long') {
-                        score -= shortMorePenalty;
-                    }
-                    else if (optionsProp === 'shortGeneric' &&
-                        formatProp === 'longGeneric') {
-                        score -= shortMorePenalty;
-                    }
-                    else if (optionsProp !== formatProp) {
-                        score -= removalPenalty;
-                    }
-                }
-                else if (optionsProp === 'shortOffset' &&
-                    formatProp === 'longOffset') {
-                    score -= shortMorePenalty;
-                }
-                else if (optionsProp === 'long' || optionsProp === 'longGeneric') {
-                    if (formatProp === 'longOffset') {
-                        score -= offsetPenalty;
-                    }
-                    else if (formatProp === 'shortOffset') {
-                        score -= offsetPenalty + longLessPenalty;
-                    }
-                    else if (optionsProp === 'long' && formatProp === 'short') {
-                        score -= longLessPenalty;
-                    }
-                    else if (optionsProp === 'longGeneric' &&
-                        formatProp === 'shortGeneric') {
-                        score -= longLessPenalty;
-                    }
-                    else if (optionsProp !== formatProp) {
-                        score -= removalPenalty;
-                    }
-                }
-                else if (optionsProp === 'longOffset' &&
-                    formatProp === 'shortOffset') {
-                    score -= longLessPenalty;
-                }
-                else if (optionsProp !== formatProp) {
-                    score -= removalPenalty;
-                }
-            }
-            else if (optionsProp !== formatProp) {
-                var values = void 0;
-                if (prop === 'fractionalSecondDigits') {
-                    values = [1, 2, 3];
-                }
-                else {
-                    values = ['2-digit', 'numeric', 'narrow', 'short', 'long'];
-                }
-                var optionsPropIndex = values.indexOf(optionsProp);
-                var formatPropIndex = values.indexOf(formatProp);
-                var delta = Math.max(-2, Math.min(formatPropIndex - optionsPropIndex, 2));
-                if (delta === 2) {
-                    score -= longMorePenalty;
-                }
-                else if (delta === 1) {
-                    score -= shortMorePenalty;
-                }
-                else if (delta === -1) {
-                    score -= shortLessPenalty;
-                }
-                else if (delta === -2) {
-                    score -= longLessPenalty;
-                }
-            }
-        }
-        if (score > bestScore) {
-            bestScore = score;
-            bestFormat = format;
-        }
-    }
-    return __assign({}, bestFormat);
+	let bestScore = -Infinity;
+	let bestFormat = formats[0];
+	invariant(Array.isArray(formats), "formats should be a list of things");
+	for (const format of formats) {
+		let score = 0;
+		for (const prop of DATE_TIME_PROPS) {
+			const optionsProp = options[prop];
+			const formatProp = format[prop];
+			if (optionsProp === undefined && formatProp !== undefined) {
+				score -= additionPenalty;
+			} else if (optionsProp !== undefined && formatProp === undefined) {
+				score -= removalPenalty;
+			} else if (prop === "timeZoneName") {
+				if (optionsProp === "short" || optionsProp === "shortGeneric") {
+					if (formatProp === "shortOffset") {
+						score -= offsetPenalty;
+					} else if (formatProp === "longOffset") {
+						score -= offsetPenalty + shortMorePenalty;
+					} else if (optionsProp === "short" && formatProp === "long") {
+						score -= shortMorePenalty;
+					} else if (optionsProp === "shortGeneric" && formatProp === "longGeneric") {
+						score -= shortMorePenalty;
+					} else if (optionsProp !== formatProp) {
+						score -= removalPenalty;
+					}
+				} else if (optionsProp === "shortOffset" && formatProp === "longOffset") {
+					score -= shortMorePenalty;
+				} else if (optionsProp === "long" || optionsProp === "longGeneric") {
+					if (formatProp === "longOffset") {
+						score -= offsetPenalty;
+					} else if (formatProp === "shortOffset") {
+						score -= offsetPenalty + longLessPenalty;
+					} else if (optionsProp === "long" && formatProp === "short") {
+						score -= longLessPenalty;
+					} else if (optionsProp === "longGeneric" && formatProp === "shortGeneric") {
+						score -= longLessPenalty;
+					} else if (optionsProp !== formatProp) {
+						score -= removalPenalty;
+					}
+				} else if (optionsProp === "longOffset" && formatProp === "shortOffset") {
+					score -= longLessPenalty;
+				} else if (optionsProp !== formatProp) {
+					score -= removalPenalty;
+				}
+			} else if (optionsProp !== formatProp) {
+				let values;
+				if (prop === "fractionalSecondDigits") {
+					values = [
+						1,
+						2,
+						3
+					];
+				} else {
+					values = [
+						"2-digit",
+						"numeric",
+						"narrow",
+						"short",
+						"long"
+					];
+				}
+				const optionsPropIndex = values.indexOf(optionsProp);
+				const formatPropIndex = values.indexOf(formatProp);
+				const delta = Math.max(-2, Math.min(formatPropIndex - optionsPropIndex, 2));
+				if (delta === 2) {
+					score -= longMorePenalty;
+				} else if (delta === 1) {
+					score -= shortMorePenalty;
+				} else if (delta === -1) {
+					score -= shortLessPenalty;
+				} else if (delta === -2) {
+					score -= longLessPenalty;
+				}
+			}
+		}
+		if (score > bestScore) {
+			bestScore = score;
+			bestFormat = format;
+		}
+	}
+	return { ...bestFormat };
 }

package/src/abstract/BestFitFormatMatcher.d.ts

@@ -1,16 +1,16 @@
-import { Formats } from '@formatjs/ecma402-abstract';
+import { type Formats } from "@formatjs/ecma402-abstract";
 /**
- * Credit: https://github.com/andyearnshaw/Intl.js/blob/0958dc1ad8153f1056653ea22b8208f0df289a4e/src/12.datetimeformat.js#L611
- * with some modifications
- * @param options
- * @param format
- */
+* Credit: https://github.com/andyearnshaw/Intl.js/blob/0958dc1ad8153f1056653ea22b8208f0df289a4e/src/12.datetimeformat.js#L611
+* with some modifications
+* @param options
+* @param format
+*/
 export declare function bestFitFormatMatcherScore(options: Intl.DateTimeFormatOptions, format: Formats): number;
 /**
- * https://tc39.es/ecma402/#sec-bestfitformatmatcher
- * Just alias to basic for now
- * @param options
- * @param formats
- * @param implDetails Implementation details
- */
+* https://tc39.es/ecma402/#sec-bestfitformatmatcher
+* Just alias to basic for now
+* @param options
+* @param formats
+* @param implDetails Implementation details
+*/
 export declare function BestFitFormatMatcher(options: Intl.DateTimeFormatOptions, formats: Formats[]): Formats;

package/src/abstract/BestFitFormatMatcher.js

@@ -1,116 +1,110 @@
-import { __assign } from "tslib";
-import { invariant } from '@formatjs/ecma402-abstract';
-import { processDateTimePattern } from './skeleton.js';
-import { DATE_TIME_PROPS, additionPenalty, differentNumericTypePenalty, longLessPenalty, longMorePenalty, removalPenalty, shortLessPenalty, shortMorePenalty, } from './utils.js';
+import { invariant } from "@formatjs/ecma402-abstract";
+import { processDateTimePattern } from "./skeleton.js";
+import { DATE_TIME_PROPS, additionPenalty, differentNumericTypePenalty, longLessPenalty, longMorePenalty, removalPenalty, shortLessPenalty, shortMorePenalty } from "./utils.js";
 function isNumericType(t) {
-    return t === 'numeric' || t === '2-digit';
+	return t === "numeric" || t === "2-digit";
 }
 /**
- * Credit: https://github.com/andyearnshaw/Intl.js/blob/0958dc1ad8153f1056653ea22b8208f0df289a4e/src/12.datetimeformat.js#L611
- * with some modifications
- * @param options
- * @param format
- */
+* Credit: https://github.com/andyearnshaw/Intl.js/blob/0958dc1ad8153f1056653ea22b8208f0df289a4e/src/12.datetimeformat.js#L611
+* with some modifications
+* @param options
+* @param format
+*/
 export function bestFitFormatMatcherScore(options, format) {
-    var score = 0;
-    if (options.hour12 && !format.hour12) {
-        score -= removalPenalty;
-    }
-    else if (!options.hour12 && format.hour12) {
-        score -= additionPenalty;
-    }
-    for (var _i = 0, DATE_TIME_PROPS_1 = DATE_TIME_PROPS; _i < DATE_TIME_PROPS_1.length; _i++) {
-        var prop = DATE_TIME_PROPS_1[_i];
-        var optionsProp = options[prop];
-        var formatProp = format[prop];
-        if (optionsProp === undefined && formatProp !== undefined) {
-            score -= additionPenalty;
-        }
-        else if (optionsProp !== undefined && formatProp === undefined) {
-            score -= removalPenalty;
-        }
-        else if (optionsProp !== formatProp) {
-            // extra penalty for numeric vs non-numeric
-            if (isNumericType(optionsProp) !==
-                isNumericType(formatProp)) {
-                score -= differentNumericTypePenalty;
-            }
-            else {
-                var values = ['2-digit', 'numeric', 'narrow', 'short', 'long'];
-                var optionsPropIndex = values.indexOf(optionsProp);
-                var formatPropIndex = values.indexOf(formatProp);
-                var delta = Math.max(-2, Math.min(formatPropIndex - optionsPropIndex, 2));
-                if (delta === 2) {
-                    score -= longMorePenalty;
-                }
-                else if (delta === 1) {
-                    score -= shortMorePenalty;
-                }
-                else if (delta === -1) {
-                    score -= shortLessPenalty;
-                }
-                else if (delta === -2) {
-                    score -= longLessPenalty;
-                }
-            }
-        }
-    }
-    return score;
+	let score = 0;
+	if (options.hour12 && !format.hour12) {
+		score -= removalPenalty;
+	} else if (!options.hour12 && format.hour12) {
+		score -= additionPenalty;
+	}
+	for (const prop of DATE_TIME_PROPS) {
+		const optionsProp = options[prop];
+		const formatProp = format[prop];
+		if (optionsProp === undefined && formatProp !== undefined) {
+			score -= additionPenalty;
+		} else if (optionsProp !== undefined && formatProp === undefined) {
+			score -= removalPenalty;
+		} else if (optionsProp !== formatProp) {
+			// extra penalty for numeric vs non-numeric
+			if (isNumericType(optionsProp) !== isNumericType(formatProp)) {
+				score -= differentNumericTypePenalty;
+			} else {
+				const values = [
+					"2-digit",
+					"numeric",
+					"narrow",
+					"short",
+					"long"
+				];
+				const optionsPropIndex = values.indexOf(optionsProp);
+				const formatPropIndex = values.indexOf(formatProp);
+				const delta = Math.max(-2, Math.min(formatPropIndex - optionsPropIndex, 2));
+				if (delta === 2) {
+					score -= longMorePenalty;
+				} else if (delta === 1) {
+					score -= shortMorePenalty;
+				} else if (delta === -1) {
+					score -= shortLessPenalty;
+				} else if (delta === -2) {
+					score -= longLessPenalty;
+				}
+			}
+		}
+	}
+	return score;
 }
 /**
- * https://tc39.es/ecma402/#sec-bestfitformatmatcher
- * Just alias to basic for now
- * @param options
- * @param formats
- * @param implDetails Implementation details
- */
+* https://tc39.es/ecma402/#sec-bestfitformatmatcher
+* Just alias to basic for now
+* @param options
+* @param formats
+* @param implDetails Implementation details
+*/
 export function BestFitFormatMatcher(options, formats) {
-    var bestScore = -Infinity;
-    var bestFormat = formats[0];
-    invariant(Array.isArray(formats), 'formats should be a list of things');
-    for (var _i = 0, formats_1 = formats; _i < formats_1.length; _i++) {
-        var format = formats_1[_i];
-        var score = bestFitFormatMatcherScore(options, format);
-        if (score > bestScore) {
-            bestScore = score;
-            bestFormat = format;
-        }
-    }
-    var skeletonFormat = __assign({}, bestFormat);
-    var patternFormat = { rawPattern: bestFormat.rawPattern };
-    processDateTimePattern(bestFormat.rawPattern, patternFormat);
-    // Kinda following https://github.com/unicode-org/icu/blob/dd50e38f459d84e9bf1b0c618be8483d318458ad/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
-    // Method adjustFieldTypes
-    for (var prop in skeletonFormat) {
-        var skeletonValue = skeletonFormat[prop];
-        var patternValue = patternFormat[prop];
-        var requestedValue = options[prop];
-        // Don't mess with minute/second or we can get in the situation of
-        // 7:0:0 which is weird
-        if (prop === 'minute' || prop === 'second') {
-            continue;
-        }
-        // Nothing to do here
-        if (!requestedValue) {
-            continue;
-        }
-        // https://unicode.org/reports/tr35/tr35-dates.html#Matching_Skeletons
-        // Looks like we should not convert numeric to alphabetic but the other way
-        // around is ok
-        if (isNumericType(patternValue) &&
-            !isNumericType(requestedValue)) {
-            continue;
-        }
-        if (skeletonValue === requestedValue) {
-            continue;
-        }
-        patternFormat[prop] = requestedValue;
-    }
-    // Copy those over
-    patternFormat.pattern = skeletonFormat.pattern;
-    patternFormat.pattern12 = skeletonFormat.pattern12;
-    patternFormat.skeleton = skeletonFormat.skeleton;
-    patternFormat.rangePatterns = skeletonFormat.rangePatterns;
-    patternFormat.rangePatterns12 = skeletonFormat.rangePatterns12;
-    return patternFormat;
+	let bestScore = -Infinity;
+	let bestFormat = formats[0];
+	invariant(Array.isArray(formats), "formats should be a list of things");
+	for (const format of formats) {
+		const score = bestFitFormatMatcherScore(options, format);
+		if (score > bestScore) {
+			bestScore = score;
+			bestFormat = format;
+		}
+	}
+	const skeletonFormat = { ...bestFormat };
+	const patternFormat = { rawPattern: bestFormat.rawPattern };
+	processDateTimePattern(bestFormat.rawPattern, patternFormat);
+	// Kinda following https://github.com/unicode-org/icu/blob/dd50e38f459d84e9bf1b0c618be8483d318458ad/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
+	// Method adjustFieldTypes
+	for (const prop in skeletonFormat) {
+		const skeletonValue = skeletonFormat[prop];
+		const patternValue = patternFormat[prop];
+		const requestedValue = options[prop];
+		// Don't mess with minute/second or we can get in the situation of
+		// 7:0:0 which is weird
+		if (prop === "minute" || prop === "second") {
+			continue;
+		}
+		// Nothing to do here
+		if (!requestedValue) {
+			continue;
+		}
+		// https://unicode.org/reports/tr35/tr35-dates.html#Matching_Skeletons
+		// Looks like we should not convert numeric to alphabetic but the other way
+		// around is ok
+		if (isNumericType(patternValue) && !isNumericType(requestedValue)) {
+			continue;
+		}
+		if (skeletonValue === requestedValue) {
+			continue;
+		}
+		patternFormat[prop] = requestedValue;
+	}
+	// Copy those over
+	patternFormat.pattern = skeletonFormat.pattern;
+	patternFormat.pattern12 = skeletonFormat.pattern12;
+	patternFormat.skeleton = skeletonFormat.skeleton;
+	patternFormat.rangePatterns = skeletonFormat.rangePatterns;
+	patternFormat.rangePatterns12 = skeletonFormat.rangePatterns12;
+	return patternFormat;
 }