From a242282d52cbc34ed2291ce6b207c71ec3e8f38d Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Fri, 11 Jul 2025 17:16:54 +0300 Subject: [PATCH] Date api number to int Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICK4MT Testing: all pre-merge tests passed Signed-off-by: igorlegalov --- .../base/observeWrappedDate.ts | 97 ++++++---------- .../compat/src/arkts/observable.ts | 83 ++++++-------- .../base/observeWrappedDate.ts | 108 ++++++------------ .../compat/src/arkts/observable.ts | 83 ++++++-------- 4 files changed, 140 insertions(+), 231 deletions(-) diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedDate.ts b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedDate.ts index 252e41182b5..bee6a60e4b5 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedDate.ts +++ b/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts/arkui/src/stateManagement/base/observeWrappedDate.ts @@ -84,7 +84,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns The number of milliseconds between 1 January 1970 00:00:00 UTC and the given date. * @throws InvalidDate - Throws if Date object is invalid (@link{isDateValid} is `false`). */ - public override valueOf(): number { + public override valueOf(): long { this.conditionalAddRef(); return this.store_.valueOf(); } @@ -117,7 +117,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @see ECMA-262, 21.4.4.2 * @returns An integer number, between 1 and 31, representing the day of the month for the given date according to local time. */ - public override getDate(): number { + public override getDate(): int { this.conditionalAddRef(); return this.store_.getDate(); } @@ -138,7 +138,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new day. */ - public override setDate(value: number): number { + public override setDate(value: int): long { const result = this.store_.setDate(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setDate'); @@ -161,7 +161,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns An integer number, between 1 and 31, representing the day of the month for the given date according to local time. */ - public override getUTCDate(): number { + public override getUTCDate(): int { this.conditionalAddRef(); return this.store_.getUTCDate(); } @@ -182,7 +182,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new day. */ - public override setUTCDate(value: number): number { + public override setUTCDate(value: int): long { const result = this.store_.setUTCDate(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCDate'); @@ -205,7 +205,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new day. */ - public override setUTCDay(value: number): number { + public override setUTCDay(value: int): long { const result = this.store_.setUTCDay(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCDay'); @@ -220,7 +220,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns An integer number, between 0 and 6, corresponding to the day of the week * for the given date, according to local time: 0 for Sunday, 1 for Monday, 2 for Tuesday, and so on. */ - public override getDay(): number { + public override getDay(): byte { this.conditionalAddRef(); return this.store_.getDay(); } @@ -231,7 +231,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns An integer number, between 0 and 6, corresponding to the day of the week * for the given date, according to local time: 0 for Sunday, 1 for Monday, 2 for Tuesday, and so on. */ - public override getUTCDay(): number { + public override getUTCDay(): byte { this.conditionalAddRef(); return this.store_.getUTCDay(); } @@ -257,7 +257,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * for example, 1995. Use this function to make sure a year is compliant with years after 2000. * @returns year */ - public override getUTCFullYear(): number { + public override getUTCFullYear(): int { this.conditionalAddRef(); return this.store_.getUTCFullYear(); } @@ -276,7 +276,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const year = today.getYearFull(); * ``` */ - public override getFullYear(): number { + public override getFullYear(): int { this.conditionalAddRef(); return this.store_.getFullYear(); } @@ -286,7 +286,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new year */ - public override setUTCFullYear(value: number, month?: number, date?: number): number { + public override setUTCFullYear(value: int, month?: int, date?: int): long { const result = this.store_.setUTCFullYear(value, month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCFullYear'); @@ -304,17 +304,6 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped this.executeOnSubscribingWatches('setUTCFullYear'); } - /** - * This function is an alias to @link{setFullYear} and left for compatibility with ECMA-262. - * - * @param value new year - */ - public override setYear(value: number): void { - this.store_.setYear(value); - this.meta_.fireChange(); - this.executeOnSubscribingWatches('setYear'); - } - /** * This function is an alias to @link{setFullYear} and left for compatibility with ECMA-262. * @@ -331,7 +320,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new year */ - public override setFullYear(value: number, month?: Number, date?: Number): number { + public override setFullYear(value: int, month?: int, date?: int): long { const result = this.store_.setFullYear(value, month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setFullYear'); @@ -360,7 +349,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const hours = today.getHour(); * ``` */ - public override getHours(): number { + public override getHours(): byte { this.conditionalAddRef(); return this.store_.getHours(); } @@ -370,7 +359,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns An integer number, between 0 and 23, representing the hour for the given date according to UTC time. */ - public override getUTCHours(): number { + public override getUTCHours(): byte { this.conditionalAddRef(); return this.store_.getUTCHours(); } @@ -391,7 +380,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new hours */ - public override setHours(value: number, min?: number, sec?: number, ms?: number): number { + public override setHours(value: int, min?: int, sec?: int, ms?: int): long { const result = this.store_.setHours(value, min, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setHours'); @@ -414,7 +403,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new hours */ - public override setUTCHours(value: number, min?: number, sec?: number, ms?: number): number { + public override setUTCHours(value: int, min?: int, sec?: int, ms?: int): long { const result = this.store_.setUTCHours(value, min, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCHours'); @@ -432,7 +421,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const milliseconds = today.getMilliseconds(); * ``` */ - public override getMilliseconds(): number { + public override getMilliseconds(): short { this.conditionalAddRef(); return this.store_.getMilliseconds(); } @@ -442,7 +431,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns the milliseconds portion of the time object's value according to universal time. */ - public override getUTCMilliseconds(): number { + public override getUTCMilliseconds(): short { this.conditionalAddRef(); return this.store_.getUTCMilliseconds(); } @@ -463,7 +452,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new ms */ - public override setMilliseconds(value: number): number { + public override setMilliseconds(value: int): long { const result = this.store_.setMilliseconds(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setMilliseconds'); @@ -486,7 +475,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new ms */ - public override setUTCMilliseconds(value: number): number { + public override setUTCMilliseconds(value: int): long { const result = this.store_.setUTCMilliseconds(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMilliseconds'); @@ -504,7 +493,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const seconds = today.getSeconds(); * ``` */ - public override getSeconds(): number { + public override getSeconds(): byte { this.conditionalAddRef(); return this.store_.getSeconds(); } @@ -514,7 +503,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns the seconds in the specified date according to universal time. */ - public override getUTCSeconds(): number { + public override getUTCSeconds(): byte { this.conditionalAddRef(); return this.store_.getUTCSeconds(); } @@ -524,7 +513,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new seconds */ - public override setSeconds(value: number, ms?: number): number { + public override setSeconds(value: int, ms?: int): long { const result = this.store_.setSeconds(value, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setSeconds'); @@ -558,7 +547,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new seconds */ - public override setUTCSeconds(value: number, ms?: number): number { + public override setUTCSeconds(value: int, ms?: int): long { const result = this.store_.setUTCSeconds(value, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCSeconds'); @@ -576,7 +565,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const minutes = today.getMinutes(); * ``` */ - public override getMinutes(): number { + public override getMinutes(): byte { this.conditionalAddRef(); return this.store_.getMinutes(); } @@ -597,7 +586,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new minutes */ - public override setUTCMinutes(value: number, sec?: Number, ms?: Number): number { + public override setUTCMinutes(value: int, sec?: int, ms?: int): long { const result = this.store_.setUTCMinutes(value, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMinutes'); @@ -609,7 +598,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns the minutes in the specified date according to universal time. */ - public override getUTCMinutes(): number { + public override getUTCMinutes(): byte { this.conditionalAddRef(); return this.store_.getUTCMinutes(); } @@ -630,7 +619,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new minutes */ - public override setMinutes(value: number, sec?: number, ms?: number): number { + public override setMinutes(value: int, sec?: int, ms?: int): long { const result = this.store_.setMinutes(value, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMinutes'); @@ -650,7 +639,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const month = today.getMonth(); * ``` */ - public override getMonth(): number { + public override getMonth(): byte { this.conditionalAddRef(); return this.store_.getMonth(); } @@ -661,7 +650,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns An integer number, between 0 and 11, representing the month in the given date according to UTC time. * 0 corresponds to January, 1 to February, and so on. */ - public override getUTCMonth(): number { + public override getUTCMonth(): byte { this.conditionalAddRef(); return this.store_.getUTCMonth(); } @@ -671,7 +660,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param month new month */ - public override setMonth(month: number, date?: number): number { + public override setMonth(month: int, date?: int): long { const result = this.store_.setMonth(month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setMonth'); @@ -694,7 +683,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param month new month */ - public override setUTCMonth(month: number, date?: number): number { + public override setUTCMonth(month: int, date?: int): long { const result = this.store_.setUTCMonth(month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMonth'); @@ -719,7 +708,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @see ECMA-262, 21.4.4.10 * @returns A number representing the milliseconds elapsed between 1 January 1970 00:00:00 UTC and the given date. */ - public override getTime(): number { + public override getTime(): long { this.conditionalAddRef(); return this.store_.getTime(); } @@ -732,21 +721,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @see ECMA-262, 21.4.4.10 * @returns A number representing the milliseconds elapsed between 1 January 1970 00:00:00 UTC and the given date. */ - public override setTime(value: long): void { - this.store_.setTime(value); - this.meta_.fireChange(); - this.executeOnSubscribingWatches('setTime'); - } - - /** - * Sets the number of milliseconds since the epoch, - * which is defined as the midnight at the beginning of January 1, 1970, UTC. - * - * @param value new ms - * @see ECMA-262, 21.4.4.10 - * @returns A number representing the milliseconds elapsed between 1 January 1970 00:00:00 UTC and the given date. - */ - public override setTime(value: number): number { + public override setTime(value: long): long { const result = this.store_.setTime(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setTime'); @@ -760,7 +735,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns the difference, in minutes, between a date as * evaluated in the UTC time zone, and the same date as evaluated in the local time zone. */ - public override getTimezoneOffset(): number { + public override getTimezoneOffset(): long { this.conditionalAddRef(); return this.store_.getTimezoneOffset(); } @@ -771,7 +746,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new timezone offset */ - public override setTimezoneOffset(value: number): number { + public override setTimezoneOffset(value: int): long { const result = this.store_.setTimezoneOffset(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setTime'); diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/incremental/compat/src/arkts/observable.ts b/frameworks/bridge/arkts_frontend/koala_mirror/incremental/compat/src/arkts/observable.ts index 979520896cc..0f885bbfae0 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/incremental/compat/src/arkts/observable.ts +++ b/frameworks/bridge/arkts_frontend/koala_mirror/incremental/compat/src/arkts/observable.ts @@ -821,7 +821,7 @@ class ObservableDate extends Date { return super.isDateValid() } - override valueOf(): number { + override valueOf(): long { this.handler?.onAccess() return super.valueOf() } @@ -866,7 +866,7 @@ class ObservableDate extends Date { return super.toUTCString() } - override getDate(): number { + override getDate(): int { this.handler?.onAccess() return super.getDate() } @@ -876,12 +876,12 @@ class ObservableDate extends Date { super.setDate(value) } - override setDate(value: number): number { + override setDate(value: int): long { this.handler?.onModify() return super.setDate(value) } - override getUTCDate(): number { + override getUTCDate(): int { this.handler?.onAccess() return super.getUTCDate() } @@ -891,22 +891,17 @@ class ObservableDate extends Date { super.setUTCDate(value) } - override setUTCDate(value: number): number { + override setUTCDate(value: int): long { this.handler?.onModify() return super.setUTCDate(value) } - override getDay(): number { + override getDay(): byte { this.handler?.onAccess() return super.getDay() } - override setDay(value: byte) { - this.handler?.onModify() - super.setDay(value) - } - - override getUTCDay(): number { + override getUTCDay(): byte { this.handler?.onAccess() return super.getUTCDay() } @@ -916,12 +911,12 @@ class ObservableDate extends Date { super.setUTCDay(value) } - override setUTCDay(value: number): number { + override setUTCDay(value: int): long { this.handler?.onModify() return super.setUTCDay(value) } - override getMonth(): number { + override getMonth(): byte { this.handler?.onAccess() return super.getMonth() } @@ -931,12 +926,12 @@ class ObservableDate extends Date { super.setMonth(value) } - override setMonth(value: number, date?: number): number { + override setMonth(value: int, date?: int): long { this.handler?.onModify() return super.setMonth(value, date) } - override getUTCMonth(): number { + override getUTCMonth(): byte { this.handler?.onAccess() return super.getUTCMonth() } @@ -946,7 +941,7 @@ class ObservableDate extends Date { super.setUTCMonth(value) } - override setUTCMonth(value: number, date?: number): number { + override setUTCMonth(value: int, date?: int): long { this.handler?.onModify() return super.setUTCMonth(value, date) } @@ -961,17 +956,12 @@ class ObservableDate extends Date { super.setYear(value) } - override setYear(value: number) { - this.handler?.onModify() - super.setYear(value) - } - - override getFullYear(): number { + override getFullYear(): int { this.handler?.onAccess() return super.getFullYear() } - override setFullYear(value: number, month?: number, date?: number): number { + override setFullYear(value: int, month?: int, date?: int): long { this.handler?.onModify() return super.setFullYear(value, month, date) } @@ -981,12 +971,12 @@ class ObservableDate extends Date { super.setFullYear(value) } - override getUTCFullYear(): number { + override getUTCFullYear(): int { this.handler?.onAccess() return super.getUTCFullYear() } - override setUTCFullYear(value: number, month?: number, date?: number): number { + override setUTCFullYear(value: int, month?: int, date?: int): long { this.handler?.onModify() return super.setUTCFullYear(value, month, date) } @@ -996,27 +986,22 @@ class ObservableDate extends Date { super.setUTCFullYear(value) } - override getTime(): number { + override getTime(): long { this.handler?.onAccess() return super.getTime() } - override setTime(value: long) { - this.handler?.onModify() - super.setTime(value) - } - - override setTime(value: number): number { + override setTime(value: long): long { this.handler?.onModify() return super.setTime(value) } - override getHours(): number { + override getHours(): byte { this.handler?.onAccess() return super.getHours() } - override setHours(value: number, min?: number, sec?: number, ms?: number): number { + override setHours(value: int, min?: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setHours(value, min, sec, ms) } @@ -1026,12 +1011,12 @@ class ObservableDate extends Date { super.setHours(value) } - override getUTCHours(): number { + override getUTCHours(): byte { this.handler?.onAccess() return super.getUTCHours() } - override setUTCHours(value: number, min?: number, sec?: number, ms?: number): number { + override setUTCHours(value: int, min?: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setUTCHours(value, min, sec, ms) } @@ -1041,7 +1026,7 @@ class ObservableDate extends Date { super.setUTCHours(value) } - override getMilliseconds(): number { + override getMilliseconds(): short { this.handler?.onAccess() return super.getMilliseconds() } @@ -1051,12 +1036,12 @@ class ObservableDate extends Date { super.setMilliseconds(value) } - override setMilliseconds(value: number): number { + override setMilliseconds(value: int): long { this.handler?.onModify() return super.setMilliseconds(value) } - override getUTCMilliseconds(): number { + override getUTCMilliseconds(): short { this.handler?.onAccess() return super.getUTCMilliseconds() } @@ -1066,12 +1051,12 @@ class ObservableDate extends Date { super.setUTCMilliseconds(value) } - override setUTCMilliseconds(value: number): number { + override setUTCMilliseconds(value: int): long { this.handler?.onModify() return super.setUTCMilliseconds(value) } - override getSeconds(): number { + override getSeconds(): byte { this.handler?.onAccess() return super.getSeconds() } @@ -1081,12 +1066,12 @@ class ObservableDate extends Date { super.setSeconds(value) } - override setSeconds(value: number, ms?: number): number { + override setSeconds(value: int, ms?: int): long { this.handler?.onModify() return super.setSeconds(value, ms) } - override getUTCSeconds(): number { + override getUTCSeconds(): byte { this.handler?.onAccess() return super.getUTCSeconds() } @@ -1096,12 +1081,12 @@ class ObservableDate extends Date { super.setUTCSeconds(value) } - override setUTCSeconds(value: number, ms?: number): number { + override setUTCSeconds(value: int, ms?: int): long { this.handler?.onModify() return super.setUTCSeconds(value, ms) } - override getMinutes(): number { + override getMinutes(): byte { this.handler?.onAccess() return super.getMinutes() } @@ -1111,12 +1096,12 @@ class ObservableDate extends Date { super.setMinutes(value) } - override setMinutes(value: number, sec?: Number, ms?: number): number { + override setMinutes(value: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setMinutes(value, sec, ms) } - override getUTCMinutes(): number { + override getUTCMinutes(): byte { this.handler?.onAccess() return super.getUTCMinutes() } @@ -1126,7 +1111,7 @@ class ObservableDate extends Date { super.setUTCMinutes(value) } - override setUTCMinutes(value: number, sec?: Number, ms?: number): number { + override setUTCMinutes(value: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setUTCMinutes(value, sec, ms) } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedDate.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedDate.ts index 336c7f5afdc..8c4e28a4ae4 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedDate.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/stateManagement/base/observeWrappedDate.ts @@ -85,7 +85,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns The number of milliseconds between 1 January 1970 00:00:00 UTC and the given date. * @throws InvalidDate - Throws if Date object is invalid (@link{isDateValid} is `false`). */ - public override valueOf(): number { + public override valueOf(): long { this.conditionalAddRef(); return this.store_.valueOf(); } @@ -138,7 +138,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @see ECMA-262, 21.4.4.2 * @returns An integer number, between 1 and 31, representing the day of the month for the given date according to local time. */ - public override getDate(): number { + public override getDate(): int { this.conditionalAddRef(); return this.store_.getDate(); } @@ -159,30 +159,19 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new day. */ - public override setDate(value: number): number { + public override setDate(value: int): long { const result = this.store_.setDate(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setDate'); return result; } - /** - * Alias to @link{setDate} and left for compatibility with ECMA-262. - * - * @param value new day. - */ - public override setDay(value: byte): void { - this.store_.setDay(value); - this.meta_.fireChange(); - this.executeOnSubscribingWatches('setDate'); - } - /** * Returns the day of the month (from 1 to 31) in the specified date according to universal time. * * @returns An integer number, between 1 and 31, representing the day of the month for the given date according to local time. */ - public override getUTCDate(): number { + public override getUTCDate(): int { this.conditionalAddRef(); return this.store_.getUTCDate(); } @@ -203,7 +192,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new day. */ - public override setUTCDate(value: number): number { + public override setUTCDate(value: int): long { const result = this.store_.setUTCDate(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCDate'); @@ -226,7 +215,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new day. */ - public override setUTCDay(value: number): number { + public override setUTCDay(value: int): long { const result = this.store_.setUTCDay(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCDay'); @@ -241,7 +230,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns An integer number, between 0 and 6, corresponding to the day of the week * for the given date, according to local time: 0 for Sunday, 1 for Monday, 2 for Tuesday, and so on. */ - public override getDay(): number { + public override getDay(): byte { this.conditionalAddRef(); return this.store_.getDay(); } @@ -252,7 +241,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns An integer number, between 0 and 6, corresponding to the day of the week * for the given date, according to local time: 0 for Sunday, 1 for Monday, 2 for Tuesday, and so on. */ - public override getUTCDay(): number { + public override getUTCDay(): byte { this.conditionalAddRef(); return this.store_.getUTCDay(); } @@ -278,7 +267,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * for example, 1995. Use this function to make sure a year is compliant with years after 2000. * @returns year */ - public override getUTCFullYear(): number { + public override getUTCFullYear(): int { this.conditionalAddRef(); return this.store_.getUTCFullYear(); } @@ -297,7 +286,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const year = today.getYearFull(); * ``` */ - public override getFullYear(): number { + public override getFullYear(): int { this.conditionalAddRef(); return this.store_.getFullYear(); } @@ -307,7 +296,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new year */ - public override setUTCFullYear(value: number, month?: number, date?: number): number { + public override setUTCFullYear(value: int, month?: int, date?: int): long { const result = this.store_.setUTCFullYear(value, month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCFullYear'); @@ -325,17 +314,6 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped this.executeOnSubscribingWatches('setUTCFullYear'); } - /** - * This function is an alias to @link{setFullYear} and left for compatibility with ECMA-262. - * - * @param value new year - */ - public override setYear(value: number): void { - this.store_.setYear(value); - this.meta_.fireChange(); - this.executeOnSubscribingWatches('setYear'); - } - /** * This function is an alias to @link{setFullYear} and left for compatibility with ECMA-262. * @@ -352,7 +330,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new year */ - public override setFullYear(value: number, month?: Number, date?: Number): number { + public override setFullYear(value: int, month?: int, date?: int): long { const result = this.store_.setFullYear(value, month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setFullYear'); @@ -381,7 +359,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const hours = today.getHour(); * ``` */ - public override getHours(): number { + public override getHours(): byte { this.conditionalAddRef(); return this.store_.getHours(); } @@ -391,7 +369,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns An integer number, between 0 and 23, representing the hour for the given date according to UTC time. */ - public override getUTCHours(): number { + public override getUTCHours(): byte { this.conditionalAddRef(); return this.store_.getUTCHours(); } @@ -412,7 +390,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new hours */ - public override setHours(value: number, min?: number, sec?: number, ms?: number): number { + public override setHours(value: int, min?: int, sec?: int, ms?: int): long { const result = this.store_.setHours(value, min, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setHours'); @@ -435,7 +413,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new hours */ - public override setUTCHours(value: number, min?: number, sec?: number, ms?: number): number { + public override setUTCHours(value: int, min?: int, sec?: int, ms?: int): long { const result = this.store_.setUTCHours(value, min, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCHours'); @@ -453,7 +431,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const milliseconds = today.getMilliseconds(); * ``` */ - public override getMilliseconds(): number { + public override getMilliseconds(): short { this.conditionalAddRef(); return this.store_.getMilliseconds(); } @@ -463,7 +441,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns the milliseconds portion of the time object's value according to universal time. */ - public override getUTCMilliseconds(): number { + public override getUTCMilliseconds(): short { this.conditionalAddRef(); return this.store_.getUTCMilliseconds(); } @@ -484,7 +462,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new ms */ - public override setMilliseconds(value: number): number { + public override setMilliseconds(value: int): long { const result = this.store_.setMilliseconds(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setMilliseconds'); @@ -507,7 +485,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new ms */ - public override setUTCMilliseconds(value: number): number { + public override setUTCMilliseconds(value: int): long { const result = this.store_.setUTCMilliseconds(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMilliseconds'); @@ -525,7 +503,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const seconds = today.getSeconds(); * ``` */ - public override getSeconds(): number { + public override getSeconds(): byte { this.conditionalAddRef(); return this.store_.getSeconds(); } @@ -535,7 +513,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns the seconds in the specified date according to universal time. */ - public override getUTCSeconds(): number { + public override getUTCSeconds(): byte { this.conditionalAddRef(); return this.store_.getUTCSeconds(); } @@ -545,7 +523,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new seconds */ - public override setSeconds(value: number, ms?: number): number { + public override setSeconds(value: int, ms?: int): long { const result = this.store_.setSeconds(value, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setSeconds'); @@ -579,7 +557,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new seconds */ - public override setUTCSeconds(value: number, ms?: number): number { + public override setUTCSeconds(value: int, ms?: int): long { const result = this.store_.setUTCSeconds(value, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCSeconds'); @@ -597,7 +575,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const minutes = today.getMinutes(); * ``` */ - public override getMinutes(): number { + public override getMinutes(): byte { this.conditionalAddRef(); return this.store_.getMinutes(); } @@ -618,7 +596,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new minutes */ - public override setUTCMinutes(value: number, sec?: Number, ms?: Number): number { + public override setUTCMinutes(value: int, sec?: int, ms?: int): long { const result = this.store_.setUTCMinutes(value, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMinutes'); @@ -630,7 +608,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @returns the minutes in the specified date according to universal time. */ - public override getUTCMinutes(): number { + public override getUTCMinutes(): byte { this.conditionalAddRef(); return this.store_.getUTCMinutes(); } @@ -651,7 +629,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new minutes */ - public override setMinutes(value: number, sec?: number, ms?: number): number { + public override setMinutes(value: int, sec?: int, ms?: int): long { const result = this.store_.setMinutes(value, sec, ms); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMinutes'); @@ -671,7 +649,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * const month = today.getMonth(); * ``` */ - public override getMonth(): number { + public override getMonth(): byte { this.conditionalAddRef(); return this.store_.getMonth(); } @@ -682,7 +660,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns An integer number, between 0 and 11, representing the month in the given date according to UTC time. * 0 corresponds to January, 1 to February, and so on. */ - public override getUTCMonth(): number { + public override getUTCMonth(): byte { this.conditionalAddRef(); return this.store_.getUTCMonth(); } @@ -692,7 +670,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param month new month */ - public override setMonth(month: number, date?: number): number { + public override setMonth(month: int, date?: int): long { const result = this.store_.setMonth(month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setMonth'); @@ -715,7 +693,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param month new month */ - public override setUTCMonth(month: number, date?: number): number { + public override setUTCMonth(month: int, date?: int): long { const result = this.store_.setUTCMonth(month, date); this.meta_.fireChange(); this.executeOnSubscribingWatches('setUTCMonth'); @@ -740,7 +718,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @see ECMA-262, 21.4.4.10 * @returns A number representing the milliseconds elapsed between 1 January 1970 00:00:00 UTC and the given date. */ - public override getTime(): number { + public override getTime(): long { this.conditionalAddRef(); return this.store_.getTime(); } @@ -753,21 +731,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @see ECMA-262, 21.4.4.10 * @returns A number representing the milliseconds elapsed between 1 January 1970 00:00:00 UTC and the given date. */ - public override setTime(value: long): void { - this.store_.setTime(value); - this.meta_.fireChange(); - this.executeOnSubscribingWatches('setTime'); - } - - /** - * Sets the number of milliseconds since the epoch, - * which is defined as the midnight at the beginning of January 1, 1970, UTC. - * - * @param value new ms - * @see ECMA-262, 21.4.4.10 - * @returns A number representing the milliseconds elapsed between 1 January 1970 00:00:00 UTC and the given date. - */ - public override setTime(value: number): number { + public override setTime(value: long): long { const result = this.store_.setTime(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setTime'); @@ -781,7 +745,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * @returns the difference, in minutes, between a date as * evaluated in the UTC time zone, and the same date as evaluated in the local time zone. */ - public override getTimezoneOffset(): number { + public override getTimezoneOffset(): long { this.conditionalAddRef(); return this.store_.getTimezoneOffset(); } @@ -792,7 +756,7 @@ export class WrappedDate extends Date implements IObservedObject, ObserveWrapped * * @param value new timezone offset */ - public override setTimezoneOffset(value: number): number { + public override setTimezoneOffset(value: int): long { const result = this.store_.setTimezoneOffset(value); this.meta_.fireChange(); this.executeOnSubscribingWatches('setTime'); diff --git a/frameworks/bridge/arkts_frontend/koala_projects/incremental/compat/src/arkts/observable.ts b/frameworks/bridge/arkts_frontend/koala_projects/incremental/compat/src/arkts/observable.ts index a3da4e03c97..28482a69abc 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/incremental/compat/src/arkts/observable.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/incremental/compat/src/arkts/observable.ts @@ -809,7 +809,7 @@ class ObservableDate extends Date { return super.isDateValid() } - override valueOf(): number { + override valueOf(): long { this.handler?.onAccess() return super.valueOf() } @@ -854,7 +854,7 @@ class ObservableDate extends Date { return super.toUTCString() } - override getDate(): number { + override getDate(): int { this.handler?.onAccess() return super.getDate() } @@ -864,12 +864,12 @@ class ObservableDate extends Date { super.setDate(value) } - override setDate(value: number): number { + override setDate(value: int): long { this.handler?.onModify() return super.setDate(value) } - override getUTCDate(): number { + override getUTCDate(): int { this.handler?.onAccess() return super.getUTCDate() } @@ -879,22 +879,17 @@ class ObservableDate extends Date { super.setUTCDate(value) } - override setUTCDate(value: number): number { + override setUTCDate(value: int): long { this.handler?.onModify() return super.setUTCDate(value) } - override getDay(): number { + override getDay(): byte { this.handler?.onAccess() return super.getDay() } - override setDay(value: byte) { - this.handler?.onModify() - super.setDay(value) - } - - override getUTCDay(): number { + override getUTCDay(): byte { this.handler?.onAccess() return super.getUTCDay() } @@ -904,12 +899,12 @@ class ObservableDate extends Date { super.setUTCDay(value) } - override setUTCDay(value: number): number { + override setUTCDay(value: int): long { this.handler?.onModify() return super.setUTCDay(value) } - override getMonth(): number { + override getMonth(): byte { this.handler?.onAccess() return super.getMonth() } @@ -919,12 +914,12 @@ class ObservableDate extends Date { super.setMonth(value) } - override setMonth(value: number, date?: number): number { + override setMonth(value: int, date?: int): long { this.handler?.onModify() return super.setMonth(value, date) } - override getUTCMonth(): number { + override getUTCMonth(): byte { this.handler?.onAccess() return super.getUTCMonth() } @@ -934,7 +929,7 @@ class ObservableDate extends Date { super.setUTCMonth(value) } - override setUTCMonth(value: number, date?: number): number { + override setUTCMonth(value: int, date?: int): long { this.handler?.onModify() return super.setUTCMonth(value, date) } @@ -949,17 +944,12 @@ class ObservableDate extends Date { super.setYear(value) } - override setYear(value: number) { - this.handler?.onModify() - super.setYear(value) - } - - override getFullYear(): number { + override getFullYear(): int { this.handler?.onAccess() return super.getFullYear() } - override setFullYear(value: number, month?: number, date?: number): number { + override setFullYear(value: int, month?: int, date?: int): long { this.handler?.onModify() return super.setFullYear(value, month, date) } @@ -969,12 +959,12 @@ class ObservableDate extends Date { super.setFullYear(value) } - override getUTCFullYear(): number { + override getUTCFullYear(): int { this.handler?.onAccess() return super.getUTCFullYear() } - override setUTCFullYear(value: number, month?: number, date?: number): number { + override setUTCFullYear(value: int, month?: int, date?: int): long { this.handler?.onModify() return super.setUTCFullYear(value, month, date) } @@ -984,27 +974,22 @@ class ObservableDate extends Date { super.setUTCFullYear(value) } - override getTime(): number { + override getTime(): long { this.handler?.onAccess() return super.getTime() } - override setTime(value: long) { - this.handler?.onModify() - super.setTime(value) - } - - override setTime(value: number): number { + override setTime(value: long): long { this.handler?.onModify() return super.setTime(value) } - override getHours(): number { + override getHours(): byte { this.handler?.onAccess() return super.getHours() } - override setHours(value: number, min?: number, sec?: number, ms?: number): number { + override setHours(value: int, min?: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setHours(value, min, sec, ms) } @@ -1014,12 +999,12 @@ class ObservableDate extends Date { super.setHours(value) } - override getUTCHours(): number { + override getUTCHours(): byte { this.handler?.onAccess() return super.getUTCHours() } - override setUTCHours(value: number, min?: number, sec?: number, ms?: number): number { + override setUTCHours(value: int, min?: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setUTCHours(value, min, sec, ms) } @@ -1029,7 +1014,7 @@ class ObservableDate extends Date { super.setUTCHours(value) } - override getMilliseconds(): number { + override getMilliseconds(): short { this.handler?.onAccess() return super.getMilliseconds() } @@ -1039,12 +1024,12 @@ class ObservableDate extends Date { super.setMilliseconds(value) } - override setMilliseconds(value: number): number { + override setMilliseconds(value: int): long { this.handler?.onModify() return super.setMilliseconds(value) } - override getUTCMilliseconds(): number { + override getUTCMilliseconds(): short { this.handler?.onAccess() return super.getUTCMilliseconds() } @@ -1054,12 +1039,12 @@ class ObservableDate extends Date { super.setUTCMilliseconds(value) } - override setUTCMilliseconds(value: number): number { + override setUTCMilliseconds(value: int): long { this.handler?.onModify() return super.setUTCMilliseconds(value) } - override getSeconds(): number { + override getSeconds(): byte { this.handler?.onAccess() return super.getSeconds() } @@ -1069,12 +1054,12 @@ class ObservableDate extends Date { super.setSeconds(value) } - override setSeconds(value: number, ms?: number): number { + override setSeconds(value: int, ms?: int): long { this.handler?.onModify() return super.setSeconds(value, ms) } - override getUTCSeconds(): number { + override getUTCSeconds(): byte { this.handler?.onAccess() return super.getUTCSeconds() } @@ -1084,12 +1069,12 @@ class ObservableDate extends Date { super.setUTCSeconds(value) } - override setUTCSeconds(value: number, ms?: number): number { + override setUTCSeconds(value: int, ms?: int): long { this.handler?.onModify() return super.setUTCSeconds(value, ms) } - override getMinutes(): number { + override getMinutes(): byte { this.handler?.onAccess() return super.getMinutes() } @@ -1099,12 +1084,12 @@ class ObservableDate extends Date { super.setMinutes(value) } - override setMinutes(value: number, sec?: Number, ms?: number): number { + override setMinutes(value: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setMinutes(value, sec, ms) } - override getUTCMinutes(): number { + override getUTCMinutes(): byte { this.handler?.onAccess() return super.getUTCMinutes() } @@ -1114,7 +1099,7 @@ class ObservableDate extends Date { super.setUTCMinutes(value) } - override setUTCMinutes(value: number, sec?: Number, ms?: number): number { + override setUTCMinutes(value: int, sec?: int, ms?: int): long { this.handler?.onModify() return super.setUTCMinutes(value, sec, ms) } -- Gitee