1277

pending completion

Build # 1277

Build Type

Pull #322

travis-ci-com

Committed by

web-flow

Commit Message

Merge 00b233f29 into be671b85f

Pull Request Pull Request #322: Implement WeekDayDate: turn weekday into actual date

Run Details

4321 of 6093 branches covered (70.92%)

Branch coverage included in aggregate %.

9 of 14 new or added lines in 1 file covered. (64.29%)

3 existing lines in 1 file now uncovered.

10019 of 12462 relevant lines covered (80.4%)

47923.74 hits per line

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

81.82

/lib/utils/date_utils.ts

// -*- mode: typescript; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of ThingTalk
//
// Copyright 2018-2020 The Board of Trustees of the Leland Stanford Junior University
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//    http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>

import assert from 'assert';

import { DateEdge, DatePiece, WeekDayDate, AbsoluteTime, WeekDay } from '../ast';

const TIME_UNITS = ['ms', 's', 'min', 'h', 'day', 'week', 'mon', 'year'];
const SET_ZERO : Array<(d : Date) => void> = [(d) => {},
    (d) => {
        d.setMilliseconds(0); // start of current second
    },
    (d) => {
        d.setSeconds(0, 0); // start of current minute
    },
    (d) => {
        d.setMinutes(0, 0, 0); // start of current hour
    },
    (d) => {
        d.setHours(0, 0, 0, 0); // start of current day
    },
    (d) => {
        d.setHours(0, 0, 0, 0);
        d.setDate(d.getDate()-d.getDay()); // start of current week (week starts Sunday)
    },
    (d) => {
        d.setHours(0, 0, 0, 0);
        d.setDate(1); // start of current month
    },
    (d) => {
        d.setHours(0, 0, 0, 0);
        d.setMonth(0, 1); // start of current year
    }
];
const ADD_ONE : Array<(d : Date) => void> = [
    (d) => {
        d.setMilliseconds(d.getMilliseconds()+1);
    },
    (d) => {
        d.setSeconds(d.getSeconds()+1);
    },
    (d) => {
        d.setMinutes(d.getMinutes()+1);
    },
    (d) => {
        d.setHours(d.getHours()+1);
    },
    (d) => {
        d.setDate(d.getDate()+1);
    },
    (d) => {
        d.setDate(d.getDate()+7);
    },
    (d) => {
        d.setMonth(d.getMonth()+1);
    },
    (d) => {
        d.setFullYear(d.getFullYear()+1);
    }
];
assert(SET_ZERO.length === TIME_UNITS.length);
assert(ADD_ONE.length === TIME_UNITS.length);


function createEdgeDate(edge : ('start_of'|'end_of'), unit : string) : Date {
    const index = TIME_UNITS.indexOf(unit);

    const date = new Date;
    SET_ZERO[index](date);
    if (edge === 'end_of')
        ADD_ONE[index](date);
    return date;
}

function createDatePiece(year : number|null, month : number|null, day : number|null, time : AbsoluteTime|null) : Date {
    // All non-supplied values to the left of the largest supplied
    // value are set to the present. All non-supplied values to the
    // right of the largest supplied value are set to the minimum.
    const date = new Date;
    if (year !== null && year > 0) {
        date.setFullYear(year);
        date.setMonth(0, 1); // 1st of Jan
        date.setHours(0, 0, 0, 0);
    }
    if (month !== null && month > 0) {
        date.setMonth(month - 1, 1);
        date.setHours(0, 0, 0, 0);
    }
    if (day !== null && day > 0) {
        date.setDate(day);
        date.setHours(0, 0, 0, 0);
    }
    if (time !== null)
        date.setHours(time.hour, time.minute, time.second);
    return date;
}

function weekdayToNumber(weekday : WeekDay) : number {
    switch (weekday) {
        case "monday": return 1;
        case "tuesday": return 2;
        case "wednesday": return 3;
        case "thursday": return 4;
        case "friday": return 5;
        case "saturday": return 6;
        case "sunday": return 7;
    }
    throw new Error(`Invalid weekday: ${weekday}`);
}

function createWeekDayDate(weekday : WeekDay, time : AbsoluteTime|null) {
    const date = new Date;
    // get the date of next specified weekday, today excluded
    date.setDate(date.getDate() + (7 - date.getDay()) % 7 + weekdayToNumber(weekday));
    if (time)
        date.setHours(time.hour, time.minute, time.second);
    return date;
}

export function normalizeDate(value : Date|WeekDayDate|DateEdge|DatePiece|null) : Date {
    if (value === null)
        return new Date;
    else if (value instanceof Date)
        return value;
    else if (value instanceof WeekDayDate)
        return createWeekDayDate(value.weekday, value.time);
    else if (value instanceof DatePiece)
        return createDatePiece(value.year, value.month, value.day, value.time);
    else
        return createEdgeDate(value.edge, value.unit);
}

interface TokenizerDate {
    year : number|undefined;
    month : number|undefined;
    day : number|undefined;
    hour ?: number|undefined;
    minute ?: number|undefined;
    second ?: number|undefined;
}

export function parseDate(form : Date|TokenizerDate) : Date {
    if (form instanceof Date)
        return form;

    const now = new Date;
    now.setMilliseconds(0);

    let year = form.year;
    if (year === undefined || year < 0)
        year = now.getFullYear();
    let month = form.month;
    if (month === undefined || month < 0)
        month = now.getMonth() + 1;
    let day = form.day;
    if (day === undefined || day < 0)
        day = now.getDate();
    let hour = form.hour;
    if (hour === undefined || hour < 0)
        hour = 0;
    let minute = form.minute;
    if (minute === undefined || minute < 0)
        minute = 0;
    let second = form.second;
    if (second === undefined || second < 0)
        second = 0;
    const millisecond = (second - Math.floor(second))*1000;
    second = Math.floor(second);

    return new Date(year, month-1, day, hour, minute, second, millisecond);
}

1	// -- mode: typescript; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of ThingTalk
4	//
5	// Copyright 2018-2020 The Board of Trustees of the Leland Stanford Junior University
6	//
7	// Licensed under the Apache License, Version 2.0 (the "License");
8	// you may not use this file except in compliance with the License.
9	// You may obtain a copy of the License at
10	//
11	// http://www.apache.org/licenses/LICENSE-2.0
12	//
13	// Unless required by applicable law or agreed to in writing, software
14	// distributed under the License is distributed on an "AS IS" BASIS,
15	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16	// See the License for the specific language governing permissions and
17	// limitations under the License.
18	//
19	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
20
21	import assert from 'assert';	2✔
22
23	import { DateEdge, DatePiece, WeekDayDate, AbsoluteTime, WeekDay } from '../ast';	2✔
24
25	const TIME_UNITS = ['ms', 's', 'min', 'h', 'day', 'week', 'mon', 'year'];	2✔
26	const SET_ZERO : Array<(d : Date) => void> = [(d) => {},	2✔
27	(d) => {
28	d.setMilliseconds(0); // start of current second	×
29	},
30	(d) => {
31	d.setSeconds(0, 0); // start of current minute	×
32	},
33	(d) => {
34	d.setMinutes(0, 0, 0); // start of current hour	×
35	},
36	(d) => {
37	d.setHours(0, 0, 0, 0); // start of current day	4✔
38	},
39	(d) => {
40	d.setHours(0, 0, 0, 0);	×
41	d.setDate(d.getDate()-d.getDay()); // start of current week (week starts Sunday)	×
42	},
43	(d) => {
44	d.setHours(0, 0, 0, 0);	4✔
45	d.setDate(1); // start of current month	4✔
46	},
47	(d) => {
48	d.setHours(0, 0, 0, 0);	×
49	d.setMonth(0, 1); // start of current year	×
50	}
51	];
52	const ADD_ONE : Array<(d : Date) => void> = [	2✔
53	(d) => {
54	d.setMilliseconds(d.getMilliseconds()+1);	×
55	},
56	(d) => {
57	d.setSeconds(d.getSeconds()+1);	×
58	},
59	(d) => {
60	d.setMinutes(d.getMinutes()+1);	×
61	},
62	(d) => {
63	d.setHours(d.getHours()+1);	×
64	},
65	(d) => {
66	d.setDate(d.getDate()+1);	2✔
67	},
68	(d) => {
69	d.setDate(d.getDate()+7);	×
70	},
71	(d) => {
72	d.setMonth(d.getMonth()+1);	2✔
73	},
74	(d) => {
75	d.setFullYear(d.getFullYear()+1);	×
76	}
77	];
78	assert(SET_ZERO.length === TIME_UNITS.length);	2✔
79	assert(ADD_ONE.length === TIME_UNITS.length);	2✔
80
81
82	function createEdgeDate(edge : ('start_of'\|'end_of'), unit : string) : Date {
83	const index = TIME_UNITS.indexOf(unit);	8✔
84
85	const date = new Date;	8✔
86	SET_ZERO[index](date);	8✔
87	if (edge === 'end_of')	8✔
88	ADD_ONE[index](date);	4✔
89	return date;	8✔
90	}
91
92	function createDatePiece(year : number\|null, month : number\|null, day : number\|null, time : AbsoluteTime\|null) : Date {
93	// All non-supplied values to the left of the largest supplied
94	// value are set to the present. All non-supplied values to the
95	// right of the largest supplied value are set to the minimum.
96	const date = new Date;	10✔
97	if (year !== null && year > 0) {	10✔
98	date.setFullYear(year);	4✔
99	date.setMonth(0, 1); // 1st of Jan	4✔
100	date.setHours(0, 0, 0, 0);	4✔
101	}
102	if (month !== null && month > 0) {	10✔
103	date.setMonth(month - 1, 1);	2✔
104	date.setHours(0, 0, 0, 0);	2✔
105	}
106	if (day !== null && day > 0) {	10✔
107	date.setDate(day);	4✔
108	date.setHours(0, 0, 0, 0);	4✔
109	}
110	if (time !== null)	10✔
111	date.setHours(time.hour, time.minute, time.second);	2✔
112	return date;	10✔
113	}
114
115	function weekdayToNumber(weekday : WeekDay) : number {
116	switch (weekday) {	8✔
117	case "monday": return 1;	2!
NEW 118	case "tuesday": return 2;	×
NEW 119	case "wednesday": return 3;	×
120	case "thursday": return 4;	2✔
NEW 121	case "friday": return 5;	×
NEW 122	case "saturday": return 6;	×
123	case "sunday": return 7;	4✔
124	}
NEW 125	throw new Error(`Invalid weekday: ${weekday}`);	×
126	}
127
128	function createWeekDayDate(weekday : WeekDay, time : AbsoluteTime\|null) {
129	const date = new Date;	8✔
130	// get the date of next specified weekday, today excluded
131	date.setDate(date.getDate() + (7 - date.getDay()) % 7 + weekdayToNumber(weekday));	8✔
132	if (time)	8✔
133	date.setHours(time.hour, time.minute, time.second);	2✔
134	return date;	8✔
135	}
136
137	export function normalizeDate(value : Date\|WeekDayDate\|DateEdge\|DatePiece\|null) : Date {	2✔
138	if (value === null)	84✔
139	return new Date;	36✔
140	else if (value instanceof Date)	48✔
141	return value;	22✔
142	else if (value instanceof WeekDayDate)	26✔
143	return createWeekDayDate(value.weekday, value.time);	8✔
144	else if (value instanceof DatePiece)	18✔
145	return createDatePiece(value.year, value.month, value.day, value.time);	10✔
146	else
147	return createEdgeDate(value.edge, value.unit);	8✔
148	}
149
150	interface TokenizerDate {
151	year : number\|undefined;
152	month : number\|undefined;
153	day : number\|undefined;
154	hour ?: number\|undefined;
155	minute ?: number\|undefined;
156	second ?: number\|undefined;
157	}
158
159	export function parseDate(form : Date\|TokenizerDate) : Date {	2✔
160	if (form instanceof Date)	78✔
161	return form;	32✔
162
163	const now = new Date;	46✔
164	now.setMilliseconds(0);	46✔
165
166	let year = form.year;	46✔
167	if (year === undefined \|\| year < 0)	46!
UNCOV 168	year = now.getFullYear();	×
169	let month = form.month;	46✔
170	if (month === undefined \|\| month < 0)	46!
UNCOV 171	month = now.getMonth() + 1;	×
172	let day = form.day;	46✔
173	if (day === undefined \|\| day < 0)	46!
UNCOV 174	day = now.getDate();	×
175	let hour = form.hour;	46✔
176	if (hour === undefined \|\| hour < 0)	46✔
177	hour = 0;	12✔
178	let minute = form.minute;	46✔
179	if (minute === undefined \|\| minute < 0)	46✔
180	minute = 0;	14✔
181	let second = form.second;	46✔
182	if (second === undefined \|\| second < 0)	46✔
183	second = 0;	26✔
184	const millisecond = (second - Math.floor(second))*1000;	46✔
185	second = Math.floor(second);	46✔
186
187	return new Date(year, month-1, day, hour, minute, second, millisecond);	46✔
188	}

stanford-oval / thingtalk / 1277

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