2267

pending completion

Build # 2267

Build Type

Pull #550

travis-ci-com

Committed by

web-flow

Commit Message

<a href="https://github.com/js-joda/js-joda/commit/<a class=hub.com/js-joda/js-joda/commit/<a class="double-link" href="https://git"><a class=hub.com/js-joda/js-joda/commit/<a class="double-link" href="https://git"><a class=hub.com/js-joda/js-joda/commit/<a class="double-link" href="https://git"><a class=hub.com/js-joda/js-joda/commit/<a class="double-link" href="https://git"><a class=hub.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f52834b75803">cd90f1150">&lt;a href=&quot;https://github.com/js-joda/js-joda/commit/</a><a class="double-link" href="https://github.com/js-joda/js-joda/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/js-joda/js-joda/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/js-joda/js-joda/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f52834b75803">cd90f1150</a><a href="https://github.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f52834b75803">&lt;a href=&quot;https://github.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f52834b75803&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/js-joda/js-joda/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/js-joda/js-joda/commit/&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;https://git&amp;quot;&amp;gt;&amp;amp;lt;a class=&amp;lt;/a&amp;gt;hub.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f52834b75803&amp;quot;&amp;gt;cd90f1150&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f52834b75803&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/js-joda/js-joda/commit/cd90f115071e193af7d8d425fc83f528&amp;lt;/a&amp;gt;34b</a>75803&quot;&gt;&amp;quot;&amp;gt;Merge &amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/js-joda/js-joda/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/js-joda/js-joda/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/js-joda/js-joda/commit/8a593f452&quot;&gt;8a593f452&lt;/a&gt;&lt;a href=&quot;htt... (continued)

Pull Request Pull Request #550: Bug/#549/test case

Run Details

3275 of 3623 branches covered (90.39%)

16 of 16 new or added lines in 2 files covered. (100.0%)

6014 of 6419 relevant lines covered (93.69%)

7159.23 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

92.41

/packages/locale/src/format/cldr/CldrZoneTextPrinterParser.js

/*
 * @copyright (c) 2017, Philipp Thuerwaechter & Pattrick Hueper
 * @license BSD-3-Clause (see LICENSE.md in the root directory of this source tree)
 */

import {
    _ as jodaInternal,
    TextStyle,
    TemporalQueries,
    ZoneId,
    ZoneOffset,
    ZoneRulesProvider,
} from '@js-joda/core';

import {getOrCreateCldrInstance, getOrCreateMapZones, loadCldrData} from './CldrCache';

const { assert: { requireNonNull, requireInstance } } = jodaInternal;

//-----------------------------------------------------------------------
const LENGTH_COMPARATOR = (str1, str2) => {
    let cmp = str2.length - str1.length;
    if (cmp === 0) {
        cmp = str1.localeCompare(str2);
    }
    return cmp;
};

/**
 * Cache for `_cachedResolveZoneIdText`.
 *
 * Its basic structure is:
 * Obj { locale: zoneId }
 * Obj { zoneId: style}
 * Obj { style: type}
 * Obj { type: resolvedZoneIdText}
 */
const resolveZoneIdTextCache = {};

/**
 * Prints or parses a zone ID.
 */
export default class CldrZoneTextPrinterParser {
    /** The text style to output. */

    constructor(textStyle) {
        requireNonNull(textStyle, 'textStyle');
        requireInstance(textStyle, TextStyle, 'textStyle');
        this._textStyle = textStyle;
        this._zoneIdsLocales = {};
        loadCldrData('supplemental/likelySubtags.json');
        loadCldrData('supplemental/metaZones.json');
    }

    _cachedResolveZoneIdText(cldr, zoneId, style, type) {
        if (resolveZoneIdTextCache[cldr.locale] == null) {
            resolveZoneIdTextCache[cldr.locale] = {};
        }

        const zoneIdToStyle = resolveZoneIdTextCache[cldr.locale];
        if (zoneIdToStyle[zoneId] == null) {
            zoneIdToStyle[zoneId] = {};
        }

        const styleToType = zoneIdToStyle[zoneId];
        if (styleToType[style] == null) {
            styleToType[style] = {};
        }

        const typeToResolvedZoneIdText = styleToType[style];
        if (typeToResolvedZoneIdText[type] == null) {
            typeToResolvedZoneIdText[type] = this._resolveZoneIdText(cldr, zoneId, style, type);
        }

        return typeToResolvedZoneIdText[type];
    }

    _resolveZoneIdText(cldr, zoneId, style, type) {
        const zoneData = cldr.main(`dates/timeZoneNames/zone/${zoneId}/${style}/${type}`);
        if (zoneData) {
            return zoneData;
        } else {
            const metazoneInfo = cldr.get(`supplemental/metaZones/metazoneInfo/timezone/${zoneId}`);
            if (metazoneInfo) {
                // const zoneData = cldr.main(`dates/timeZoneNames/metazone/Acre`);
                // TODO: determine metaZone for current temporal, for now, we use the last one :/
                const metazone = metazoneInfo[metazoneInfo.length - 1]['usesMetazone']['_mzone'];
                let metaZoneData = cldr.main(`dates/timeZoneNames/metazone/${metazone}/${style}/${type}`);
                if (metaZoneData) {
                    return metaZoneData;
                } else {
                    // type fallback, first generic, then standard
                    metaZoneData = cldr.main(`dates/timeZoneNames/metazone/${metazone}/${style}/generic`);
                    if (!metaZoneData) {
                        metaZoneData = cldr.main(`dates/timeZoneNames/metazone/${metazone}/${style}/standard`);
                    }
                    if (metaZoneData) {
                        return metaZoneData;
                    } else {
                        const mapZones = getOrCreateMapZones(cldr);
                        // find preferred Zone and resolve again
                        const preferredZone = mapZones[metazone][cldr.attributes.territory];
                        if (preferredZone) {
                            if (preferredZone !== zoneId) {
                                return this._cachedResolveZoneIdText(cldr, preferredZone, style, type);
                            }
                        } else {
                            // find golden Zone and resolve again
                            const goldenZone = mapZones[metazone]['001'];
                            if (goldenZone !== zoneId) {
                                return this._cachedResolveZoneIdText(cldr, goldenZone, style, type);
                            }
                        }
                    }
                }
            }
        }
    }

    //-----------------------------------------------------------------------
    print(context, buf) {

        //see http://www.unicode.org/reports/tr35/tr35-dates.html#Time_Zone_Names

        const zone = context.getValueQuery(TemporalQueries.zoneId());
        /* istanbul ignore if */ // shouldn't happen... getValueQuery throws before returning null
        if (zone == null) {
            return false;
        }
        if (zone.normalized() instanceof ZoneOffset) {
            buf.append(zone.id());
            return true;
        }
        const daylight = false;
        const hasDaylightSupport = false;
        /* TODO: currently js-joda-timezone does not support ZoneRules.isDaylightSavings() ... uncomment if it does
         const temporal = context.temporal();
         if (temporal.isSupported(ChronoField.INSTANT_SECONDS)) {
            hasDaylightSupport = true;
            const instant = Instant.ofEpochSecond(temporal.getLong(ChronoField.INSTANT_SECONDS));
            daylight = zone.rules().isDaylightSavings(instant);
        }*/
        const tzType = hasDaylightSupport ? (daylight ? 'daylight' : 'standard') : 'generic';
        const tzstyle = (this._textStyle.asNormal() === TextStyle.FULL ? 'long' : 'short');
        loadCldrData(`main/${context.locale().localeString()}/timeZoneNames.json`);
        const cldr = getOrCreateCldrInstance(context.locale().localeString());

        const text = this._cachedResolveZoneIdText(cldr, zone.id(), tzstyle, tzType);
        if (text) {
            buf.append(text);
        } else {
            // fallback, print zoneId
            buf.append(zone.id());
        }
        return true;
    }

    _resolveZoneIds(localString) {
        if(this._zoneIdsLocales[localString] != null) {
            return this._zoneIdsLocales[localString];
        }
        const ids = {};
        loadCldrData(`main/${localString}/timeZoneNames.json`);
        const cldr = getOrCreateCldrInstance(localString);

        for (const id of ZoneRulesProvider.getAvailableZoneIds()) {
            ids[id] = id;
            const tzstyle = (this._textStyle.asNormal() === TextStyle.FULL ? 'long' : 'short');

            const genericText = this._cachedResolveZoneIdText(cldr, id, tzstyle, 'generic');
            if (genericText) {
                ids[genericText] = id;
            }
            const standardText = this._cachedResolveZoneIdText(cldr, id, tzstyle, 'standard');
            if (standardText) {
                ids[standardText] = id;
            }
            const daylightText = this._cachedResolveZoneIdText(cldr, id, tzstyle, 'daylight');
            if (daylightText) {
                ids[daylightText] = id;
            }
        }
        // threeten is using a (sorted) TreeMap... so we need to sort the keys
        const sortedKeys = Object.keys(ids).sort(LENGTH_COMPARATOR);

        this._zoneIdsLocales[localString] = { ids, sortedKeys };
        return this._zoneIdsLocales[localString];
    }

    // That's a very poor implementation, there are missing bug fixes and functionality from threeten and jdk
    parse(context, text, position) {
        for (const name of ['UTC', 'GMT']) {
            if (context.subSequenceEquals(text, position, name, 0, name.length)) {
                context.setParsedZone(ZoneId.of(name));
                return position + name.length;
            }
        }
        const { ids, sortedKeys } = this._resolveZoneIds(context.locale().localeString());
        for (const name of sortedKeys) {
            if (context.subSequenceEquals(text, position, name, 0, name.length)) {
                context.setParsedZone(ZoneId.of(ids[name]));
                return position + name.length;
            }
        }
        return ~position;
    }

    toString() {
        return `ZoneText(${this._textStyle})`;
    }
}

1	/*
2	* @copyright (c) 2017, Philipp Thuerwaechter & Pattrick Hueper
3	* @license BSD-3-Clause (see LICENSE.md in the root directory of this source tree)
4	*/
5
6	import {
7	_ as jodaInternal,
8	TextStyle,
9	TemporalQueries,
10	ZoneId,
11	ZoneOffset,
12	ZoneRulesProvider,
13	} from '@js-joda/core';
14
15	import {getOrCreateCldrInstance, getOrCreateMapZones, loadCldrData} from './CldrCache';
16
17	const { assert: { requireNonNull, requireInstance } } = jodaInternal;	1✔
18
19	//-----------------------------------------------------------------------
20	const LENGTH_COMPARATOR = (str1, str2) => {	1✔
21	let cmp = str2.length - str1.length;	100,750✔
22	if (cmp === 0) {	100,750✔
23	cmp = str1.localeCompare(str2);	47,989✔
24	}
25	return cmp;	100,750✔
26	};
27
28	/**
29	* Cache for `_cachedResolveZoneIdText`.
30	*
31	* Its basic structure is:
32	* Obj { locale: zoneId }
33	* Obj { zoneId: style}
34	* Obj { style: type}
35	* Obj { type: resolvedZoneIdText}
36	*/
37	const resolveZoneIdTextCache = {};	1✔
38
39	/**
40	* Prints or parses a zone ID.
41	*/
42	export default class CldrZoneTextPrinterParser {
43	/** The text style to output. */
44
45	constructor(textStyle) {
46	requireNonNull(textStyle, 'textStyle');	28✔
47	requireInstance(textStyle, TextStyle, 'textStyle');	27✔
48	this._textStyle = textStyle;	27✔
49	this._zoneIdsLocales = {};	27✔
50	loadCldrData('supplemental/likelySubtags.json');	27✔
51	loadCldrData('supplemental/metaZones.json');	27✔
52	}
53
54	_cachedResolveZoneIdText(cldr, zoneId, style, type) {
55	if (resolveZoneIdTextCache[cldr.locale] == null) {	32,562✔
56	resolveZoneIdTextCache[cldr.locale] = {};	2✔
57	}
58
59	const zoneIdToStyle = resolveZoneIdTextCache[cldr.locale];	32,562✔
60	if (zoneIdToStyle[zoneId] == null) {	32,562✔
61	zoneIdToStyle[zoneId] = {};	1,186✔
62	}
63
64	const styleToType = zoneIdToStyle[zoneId];	32,562✔
65	if (styleToType[style] == null) {	32,562✔
66	styleToType[style] = {};	2,372✔
67	}
68
69	const typeToResolvedZoneIdText = styleToType[style];	32,562✔
70	if (typeToResolvedZoneIdText[type] == null) {	32,562✔
71	typeToResolvedZoneIdText[type] = this._resolveZoneIdText(cldr, zoneId, style, type);	22,236✔
72	}
73
74	return typeToResolvedZoneIdText[type];	32,562✔
75	}
76
77	_resolveZoneIdText(cldr, zoneId, style, type) {
78	const zoneData = cldr.main(`dates/timeZoneNames/zone/${zoneId}/${style}/${type}`);	22,236✔
79	if (zoneData) {	22,236✔
80	return zoneData;	11✔
81	} else {
82	const metazoneInfo = cldr.get(`supplemental/metaZones/metazoneInfo/timezone/${zoneId}`);	22,225✔
83	if (metazoneInfo) {	22,225✔
84	// const zoneData = cldr.main(`dates/timeZoneNames/metazone/Acre`);
85	// TODO: determine metaZone for current temporal, for now, we use the last one :/
86	const metazone = metazoneInfo[metazoneInfo.length - 1]['usesMetazone']['_mzone'];	14,369✔
87	let metaZoneData = cldr.main(`dates/timeZoneNames/metazone/${metazone}/${style}/${type}`);	14,369✔
88	if (metaZoneData) {	14,369✔
89	return metaZoneData;	2,590✔
90	} else {
91	// type fallback, first generic, then standard
92	metaZoneData = cldr.main(`dates/timeZoneNames/metazone/${metazone}/${style}/generic`);	11,779✔
93	if (!metaZoneData) {	11,779!
94	metaZoneData = cldr.main(`dates/timeZoneNames/metazone/${metazone}/${style}/standard`);	11,779✔
95	}
96	if (metaZoneData) {	11,779✔
97	return metaZoneData;	538✔
98	} else {
99	const mapZones = getOrCreateMapZones(cldr);	11,241✔
100	// find preferred Zone and resolve again
101	const preferredZone = mapZones[metazone][cldr.attributes.territory];	11,241✔
102	if (preferredZone) {	11,241!
103	if (preferredZone !== zoneId) {	×
104	return this._cachedResolveZoneIdText(cldr, preferredZone, style, type);	×
105	}
106	} else {
107	// find golden Zone and resolve again
108	const goldenZone = mapZones[metazone]['001'];	11,241✔
109	if (goldenZone !== zoneId) {	11,241✔
110	return this._cachedResolveZoneIdText(cldr, goldenZone, style, type);	4,082✔
111	}
112	}
113	}
114	}
115	}
116	}
117	}
118
119	//-----------------------------------------------------------------------
120	print(context, buf) {
121
122	//see http://www.unicode.org/reports/tr35/tr35-dates.html#Time_Zone_Names
123
124	const zone = context.getValueQuery(TemporalQueries.zoneId());	21✔
125	/* istanbul ignore if */ // shouldn't happen... getValueQuery throws before returning null
126	if (zone == null) {	21✔
127	return false;
128	}
129	if (zone.normalized() instanceof ZoneOffset) {	21✔
130	buf.append(zone.id());	5✔
131	return true;	5✔
132	}
133	const daylight = false;	16✔
134	const hasDaylightSupport = false;	16✔
135	/* TODO: currently js-joda-timezone does not support ZoneRules.isDaylightSavings() ... uncomment if it does
136	const temporal = context.temporal();
137	if (temporal.isSupported(ChronoField.INSTANT_SECONDS)) {
138	hasDaylightSupport = true;
139	const instant = Instant.ofEpochSecond(temporal.getLong(ChronoField.INSTANT_SECONDS));
140	daylight = zone.rules().isDaylightSavings(instant);
141	}*/
142	const tzType = hasDaylightSupport ? (daylight ? 'daylight' : 'standard') : 'generic';	16!
143	const tzstyle = (this._textStyle.asNormal() === TextStyle.FULL ? 'long' : 'short');	16✔
144	loadCldrData(`main/${context.locale().localeString()}/timeZoneNames.json`);	16✔
145	const cldr = getOrCreateCldrInstance(context.locale().localeString());	16✔
146
147	const text = this._cachedResolveZoneIdText(cldr, zone.id(), tzstyle, tzType);	16✔
148	if (text) {	16✔
149	buf.append(text);	12✔
150	} else {
151	// fallback, print zoneId
152	buf.append(zone.id());	4✔
153	}
154	return true;	16✔
155	}
156
157	_resolveZoneIds(localString) {
158	if(this._zoneIdsLocales[localString] != null) {	16!
159	return this._zoneIdsLocales[localString];	×
160	}
161	const ids = {};	16✔
162	loadCldrData(`main/${localString}/timeZoneNames.json`);	16✔
163	const cldr = getOrCreateCldrInstance(localString);	16✔
164
165	for (const id of ZoneRulesProvider.getAvailableZoneIds()) {	16✔
166	ids[id] = id;	9,488✔
167	const tzstyle = (this._textStyle.asNormal() === TextStyle.FULL ? 'long' : 'short');	9,488✔
168
169	const genericText = this._cachedResolveZoneIdText(cldr, id, tzstyle, 'generic');	9,488✔
170	if (genericText) {	9,488✔
171	ids[genericText] = id;	4,479✔
172	}
173	const standardText = this._cachedResolveZoneIdText(cldr, id, tzstyle, 'standard');	9,488✔
174	if (standardText) {	9,488✔
175	ids[standardText] = id;	4,495✔
176	}
177	const daylightText = this._cachedResolveZoneIdText(cldr, id, tzstyle, 'daylight');	9,488✔
178	if (daylightText) {	9,488✔
179	ids[daylightText] = id;	4,479✔
180	}
181	}
182	// threeten is using a (sorted) TreeMap... so we need to sort the keys
183	const sortedKeys = Object.keys(ids).sort(LENGTH_COMPARATOR);	16✔
184
185	this._zoneIdsLocales[localString] = { ids, sortedKeys };	16✔
186	return this._zoneIdsLocales[localString];	16✔
187	}
188
189	// That's a very poor implementation, there are missing bug fixes and functionality from threeten and jdk
190	parse(context, text, position) {
191	for (const name of ['UTC', 'GMT']) {	22✔
192	if (context.subSequenceEquals(text, position, name, 0, name.length)) {	40✔
193	context.setParsedZone(ZoneId.of(name));	6✔
194	return position + name.length;	6✔
195	}
196	}
197	const { ids, sortedKeys } = this._resolveZoneIds(context.locale().localeString());	16✔
198	for (const name of sortedKeys) {	16✔
199	if (context.subSequenceEquals(text, position, name, 0, name.length)) {	5,788✔
200	context.setParsedZone(ZoneId.of(ids[name]));	15✔
201	return position + name.length;	15✔
202	}
203	}
204	return ~position;	1✔
205	}
206
207	toString() {
208	return `ZoneText(${this._textStyle})`;	5✔
209	}
210	}

js-joda / js-joda / 2267

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous