From ef826f620297a96ba2b5cf66e80a6f90f9c506f7 Mon Sep 17 00:00:00 2001 From: houhaoyu Date: Sun, 15 May 2022 16:03:29 +0800 Subject: [PATCH] houhaoyu@huawei.com fix type error Signed-off-by: houhaoyu Change-Id: Ic797b362ef23d75a11088979513cb739e055ea66 --- compiler/package-lock.json | 2 +- compiler/src/process_component_class.ts | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/compiler/package-lock.json b/compiler/package-lock.json index f697f01..a0ac1ae 100644 --- a/compiler/package-lock.json +++ b/compiler/package-lock.json @@ -4090,7 +4090,7 @@ }, "typescript": { "version": "file:deps/ohos-typescript-4.2.3-r2.tgz", - "integrity": "sha512-I4SAd9pjgQ/YuDnl+HPYgNlvlwb8FngFVgpPT6RBGPp0tS/CBT5a3ftL8hV/ZayxIjpIT65ix5tEfCd9V7k7Hw==" + "integrity": "sha512-cp0rKbEkKVVbYgVJJ2JXMVCDOEbHCIhSCRKI3YbSPbig/yIcLW7wlZ+wosyzr1UR6AGu2D8ykeT/I/d75/PzCQ==" }, "uglify-js": { "version": "3.14.5", diff --git a/compiler/src/process_component_class.ts b/compiler/src/process_component_class.ts index 316f670..5451d75 100644 --- a/compiler/src/process_component_class.ts +++ b/compiler/src/process_component_class.ts @@ -196,27 +196,32 @@ function addPropertyMember(item: ts.ClassElement, newMembers: ts.ClassElement[], case COMPONENT_STATE_DECORATOR: case COMPONENT_PROVIDE_DECORATOR: newType = ts.factory.createTypeReferenceNode(isSimpleType(type, program) ? - OBSERVED_PROPERTY_SIMPLE : OBSERVED_PROPERTY_OBJECT, [type]); + OBSERVED_PROPERTY_SIMPLE : OBSERVED_PROPERTY_OBJECT, [type || + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]); break; case COMPONENT_LINK_DECORATOR: case COMPONENT_CONSUME_DECORATOR: newType = ts.factory.createTypeReferenceNode(isSimpleType(type, program) ? - SYNCHED_PROPERTY_SIMPLE_TWO_WAY : SYNCHED_PROPERTY_SIMPLE_ONE_WAY, [type]); + SYNCHED_PROPERTY_SIMPLE_TWO_WAY : SYNCHED_PROPERTY_SIMPLE_ONE_WAY, [type || + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]); break; case COMPONENT_PROP_DECORATOR: - newType = ts.factory.createTypeReferenceNode(SYNCHED_PROPERTY_SIMPLE_ONE_WAY, [type]); + newType = ts.factory.createTypeReferenceNode(SYNCHED_PROPERTY_SIMPLE_ONE_WAY, [type || + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]); break; case COMPONENT_OBJECT_LINK_DECORATOR: - newType = ts.factory.createTypeReferenceNode(SYNCHED_PROPERTY_NESED_OBJECT, [type]); + newType = ts.factory.createTypeReferenceNode(SYNCHED_PROPERTY_NESED_OBJECT, [type || + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]); break; case COMPONENT_STORAGE_PROP_DECORATOR: case COMPONENT_STORAGE_LINK_DECORATOR: - newType = ts.factory.createTypeReferenceNode(OBSERVED_PROPERTY_ABSTRACT, [type]); + newType = ts.factory.createTypeReferenceNode(OBSERVED_PROPERTY_ABSTRACT, [type || + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]); break; case COMPONENT_LOCAL_STORAGE_LINK_DECORATOR: case COMPONENT_LOCAL_STORAGE_PROP_DECORATOR: newType = ts.factory.createTypeReferenceNode(OBSERVED_PROPERTY_ABSTRACT, [type || - ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword)]); + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]); isLocalStorage = true; break; }