GitHub/divkit
1
0
Fork 0
mirror of https://github.com/divkit/divkit.git synced 2026-05-07 20:02:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Datetime getters

Browse Source
This commit is contained in:
4eb0da
2023-03-07 13:39:56 +03:00
parent 41ea28141a
commit 43fa6aeed1
3 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/web/divkit/src/expressions/funcs/datetime.ts
+51 -10
View File
@@ -7,10 +7,10 @@ import { valToString } from '../utils';
function getMaxDate(date: Date): number {
const copy = new Date(date);
copy.setMonth(copy.getMonth() + 1);
copy.setDate(0);
copy.setUTCMonth(copy.getUTCMonth() + 1);
copy.setUTCDate(0);
return copy.getDate();
return copy.getUTCDate();
}
function parseUnixTime(_vars: VariablesMap, arg: IntegerValue): EvalValue {
@@ -37,7 +37,7 @@ function addMillis(_vars: VariablesMap, datetime: DatetimeValue, milliseconds: I
function setYear(_vars: VariablesMap, datetime: DatetimeValue, year: IntegerValue): EvalValue {
const copy = new Date(datetime.value);
copy.setFullYear(year.value);
copy.setUTCFullYear(year.value);
return {
type: DATETIME,
@@ -52,7 +52,7 @@ function setMonth(_vars: VariablesMap, datetime: DatetimeValue, month: IntegerVa
const copy = new Date(datetime.value);
copy.setMonth(month.value - 1);
copy.setUTCMonth(month.value - 1);
return {
type: DATETIME,
@@ -67,7 +67,7 @@ function setDay(_vars: VariablesMap, datetime: DatetimeValue, day: IntegerValue)
throw new Error(`Unable to set day ${day.value} for date ${valToString(datetime)}.`);
}
copy.setDate(day.value === -1 ? 0 : day.value);
copy.setUTCDate(day.value === -1 ? 0 : day.value);
return {
type: DATETIME,
@@ -82,7 +82,7 @@ function setHours(_vars: VariablesMap, datetime: DatetimeValue, hours: IntegerVa
const copy = new Date(datetime.value);
copy.setHours(hours.value - copy.getTimezoneOffset() / 60);
copy.setUTCHours(hours.value);
return {
type: DATETIME,
@@ -97,7 +97,7 @@ function setMinutes(_vars: VariablesMap, datetime: DatetimeValue, minutes: Integ
const copy = new Date(datetime.value);
copy.setMinutes(minutes.value);
copy.setUTCMinutes(minutes.value);
return {
type: DATETIME,
@@ -112,7 +112,7 @@ function setSeconds(_vars: VariablesMap, datetime: DatetimeValue, seconds: Integ
const copy = new Date(datetime.value);
copy.setSeconds(seconds.value);
copy.setUTCSeconds(seconds.value);
return {
type: DATETIME,
@@ -127,7 +127,7 @@ function setMillis(_vars: VariablesMap, datetime: DatetimeValue, millis: Integer
const copy = new Date(datetime.value);
copy.setMilliseconds(millis.value);
copy.setUTCMilliseconds(millis.value);
return {
type: DATETIME,
@@ -135,10 +135,42 @@ function setMillis(_vars: VariablesMap, datetime: DatetimeValue, millis: Integer
};
}
const getter = (
method: 'getUTCFullYear' | 'getUTCMonth' | 'getUTCDate' | 'getUTCDay' | 'getUTCHours' | 'getUTCMinutes' |
'getUTCSeconds' | 'getUTCMilliseconds'
) => {
return (_vars: VariablesMap, datetime: DatetimeValue): EvalValue => {
const copy = new Date(datetime.value.getTime());
let value: number = copy[method]();
if (method === 'getUTCMonth') {
++value;
} else if (method === 'getUTCDay' && value === 0) {
value = 7;
}
return {
type: INTEGER,
value
};
};
};
const getYear = getter('getUTCFullYear');
const getMonth = getter('getUTCMonth');
const getDay = getter('getUTCDate');
const getDayOfWeek = getter('getUTCDay');
const getHours = getter('getUTCHours');
const getMinutes = getter('getUTCMinutes');
const getSeconds = getter('getUTCSeconds');
const getMillis = getter('getUTCMilliseconds');
export function registerDatetime(): void {
registerFunc('parseUnixTime', [INTEGER], parseUnixTime);
registerFunc('nowLocal', [], nowLocal);
registerFunc('addMillis', [DATETIME, INTEGER], addMillis);
registerFunc('setYear', [DATETIME, INTEGER], setYear);
registerFunc('setMonth', [DATETIME, INTEGER], setMonth);
registerFunc('setDay', [DATETIME, INTEGER], setDay);
@@ -146,4 +178,13 @@ export function registerDatetime(): void {
registerFunc('setMinutes', [DATETIME, INTEGER], setMinutes);
registerFunc('setSeconds', [DATETIME, INTEGER], setSeconds);
registerFunc('setMillis', [DATETIME, INTEGER], setMillis);
registerFunc('getYear', [DATETIME], getYear);
registerFunc('getMonth', [DATETIME], getMonth);
registerFunc('getDay', [DATETIME], getDay);
registerFunc('getDayOfWeek', [DATETIME], getDayOfWeek);
registerFunc('getHours', [DATETIME], getHours);
registerFunc('getMinutes', [DATETIME], getMinutes);
registerFunc('getSeconds', [DATETIME], getSeconds);
registerFunc('getMillis', [DATETIME], getMillis);
}
test_data/expression_test_data/function_signatures_datetime.json
+16 -8
View File
@@ -210,7 +210,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -226,7 +227,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -242,7 +244,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -258,7 +261,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -274,7 +278,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -290,7 +295,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -306,7 +312,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -322,7 +329,8 @@
"result_type": "integer",
"platforms": [
"android",
"ios"
"ios",
"web"
]
}
]
test_data/expression_test_data/functions_datetime.json
+20 -10
View File
@@ -360,7 +360,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -372,7 +373,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -384,7 +386,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -396,7 +399,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -408,7 +412,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -420,7 +425,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -432,7 +438,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -444,7 +451,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -456,7 +464,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
},
{
@@ -468,7 +477,8 @@
},
"platforms": [
"android",
"ios"
"ios",
"web"
]
}
]