From 90110c69a24a8a80ad2642e34d59f9a0c85cb5ea Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Wed, 27 Aug 2025 13:55:47 +0300 Subject: [PATCH] Fix some es2panda complains Signed-off-by: Alexander Gorshenev --- arkoala-arkts/arkui/src/ArkUIEntry.ets | 3 +-- arkoala-arkts/arkui/src/resources.ets | 4 ++-- .../src/stateManagement/base/observeSingleton.ts | 10 ++++++---- .../decoratorImpl/decoratorComputed.ts | 2 +- .../stateManagement/decoratorImpl/decoratorMonitor.ts | 2 +- .../arkui/src/stateManagement/storage/storageBase.ts | 11 ++++++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/arkoala-arkts/arkui/src/ArkUIEntry.ets b/arkoala-arkts/arkui/src/ArkUIEntry.ets index 92dd1ec139..2ec37ce4ae 100644 --- a/arkoala-arkts/arkui/src/ArkUIEntry.ets +++ b/arkoala-arkts/arkui/src/ArkUIEntry.ets @@ -119,7 +119,6 @@ export function destroyUiDetachedRoot(node: PeerNode): void { function destroyUiDetachedRootInternal(ptr: KPointer): boolean { if (!detachedRoots.has(ptr)) { throw new Error(`Root with id ${ptr} is not registered`) - return false } const root = detachedRoots.get(ptr)! detachedRoots.delete(ptr) @@ -382,7 +381,7 @@ export class Application implements UserApplicationControl { handleMessage(ptr: KPointer, type: int32, param : string) : boolean { let result : boolean = false - switch (type as MessageType) { + switch (MessageType.fromValue(type)) { case MessageType.DELETE_DETACHED_ROOT: { result = destroyUiDetachedRootInternal(ptr); break diff --git a/arkoala-arkts/arkui/src/resources.ets b/arkoala-arkts/arkui/src/resources.ets index 586d916d89..d01580b069 100644 --- a/arkoala-arkts/arkui/src/resources.ets +++ b/arkoala-arkts/arkui/src/resources.ets @@ -110,7 +110,7 @@ export class ArkResource implements Resource { const retval = ArkUIGeneratedNativeModule._SystemOps_getResourceId(bundleNamea, moduleNamea, thisSerializer.asBuffer(), thisSerializer.length()); thisSerializer.release(); this._id = retval; - if (this.id > -1 && this.params!.length > 0) { + if (this._id > -1 && this.params!.length > 0) { this.params!.shift(); } } @@ -157,7 +157,7 @@ export function _r(id: number, type: number, bundleName: string, moduleName: str if (id === -1) { return new ArkResource(null, bundleName, moduleName, ...params); } - return new ArkResource(id as long, type as int32, bundleName, moduleName, ...params); + return new ArkResource(id.toLong(), type.toInt(), bundleName, moduleName, ...params); } export function _rawfile(id: number, type: number, bundleName: string, moduleName: string, ...params: Array): Resource { const name: string = params[0] as string; diff --git a/arkoala-arkts/arkui/src/stateManagement/base/observeSingleton.ts b/arkoala-arkts/arkui/src/stateManagement/base/observeSingleton.ts index 3ad78d85e9..2c3296cfa6 100644 --- a/arkoala-arkts/arkui/src/stateManagement/base/observeSingleton.ts +++ b/arkoala-arkts/arkui/src/stateManagement/base/observeSingleton.ts @@ -36,9 +36,7 @@ export class ObserveSingleton implements IObserve { public renderingComponentRef?: ITrackedDecoratorRef; private monitorPathRefsChanged_ = new Set>(); private computedPropRefsChanged_ = new Set>(); - private finalizationRegistry = new FinalizationRegistry>( - this.finalizeComputedAndMonitorPath - ); + private finalizationRegistry: FinalizationRegistry>; private reverseBindingRefsToSet_ = new Map, Set>>(); get renderingComponent(): number { @@ -58,7 +56,11 @@ export class ObserveSingleton implements IObserve { } public _renderingId: RenderIdType | undefined = ObserveSingleton.InvalidRenderId; - constructor() {} + constructor() { + this.finalizationRegistry = new FinalizationRegistry>( + this.finalizeComputedAndMonitorPath + ); + } public castToIObservedObject(obj: T): IObservedObject | undefined { return obj && typeof obj === 'object' && StateMgmtTool.isIObservedObject(obj as Object) diff --git a/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorComputed.ts b/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorComputed.ts index 328758e76b..d6507ebcbc 100644 --- a/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorComputed.ts +++ b/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorComputed.ts @@ -81,7 +81,7 @@ export class ComputedDecoratedVariable implements IComputedDecoratedVariable< let newValue: T; try { newValue = this.computedLambda_(); - } catch (e: Exception) { + } catch (e) { StateMgmtConsole.log(`@Computed Exception caught for ${this.varName}: ${e.toString()}.`); throw e; } finally { diff --git a/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorMonitor.ts b/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorMonitor.ts index e40f5dc0d5..36e4ce4ba8 100644 --- a/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorMonitor.ts +++ b/arkoala-arkts/arkui/src/stateManagement/decoratorImpl/decoratorMonitor.ts @@ -60,7 +60,7 @@ export class MonitorFunctionDecorator implements IMonitorDecoratedVariable, IMon } try { this.monitorFunction_(this); - } catch (e: Exception) { + } catch (e) { StateMgmtConsole.log(`Error caught while executing @Monitor function: '${e}'`); } finally { this.values_.forEach((monitorValue: MonitorValueInternal) => { diff --git a/arkoala-arkts/arkui/src/stateManagement/storage/storageBase.ts b/arkoala-arkts/arkui/src/stateManagement/storage/storageBase.ts index 2c212c4987..1dcd2df171 100644 --- a/arkoala-arkts/arkui/src/stateManagement/storage/storageBase.ts +++ b/arkoala-arkts/arkui/src/stateManagement/storage/storageBase.ts @@ -28,14 +28,15 @@ export interface IStorageProperty { export class StorageProperty extends StateDecoratedVariable implements IDecoratedV1Variable, IPropRefCounter { private refRegistrations_: Set = new Set(); - private finalizationRegistry_: FinalizationRegistry = new FinalizationRegistry( - (registrationId: WatchIdType) => { - this.__unregister(registrationId); - } - ); + private finalizationRegistry_: FinalizationRegistry; constructor(propName: string, initValue: T) { super(null, propName, initValue); + this.finalizationRegistry_= new FinalizationRegistry( + (registrationId: WatchIdType) => { + this.__unregister(registrationId); + } + ); } public mkRef(propertyNameInAppStorage: string, ttype: Type): SubscribedAbstractProperty { -- Gitee