From 9f2f4993cd77d1f3d4881228fc691b746e61603a Mon Sep 17 00:00:00 2001 From: jiangbo Date: Wed, 6 Jul 2022 15:03:36 +0800 Subject: [PATCH 1/3] jiangbo91@huawei.com fix the error when the statestyles attribute is empty Signed-off-by: jiangbo Change-Id: Ida7197f82dbe01ea5c6589fea426e1be1854f319 --- compiler/src/process_component_build.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/src/process_component_build.ts b/compiler/src/process_component_build.ts index 91738cf..2428094 100644 --- a/compiler/src/process_component_build.ts +++ b/compiler/src/process_component_build.ts @@ -1181,7 +1181,9 @@ function traverseStateStylesAttr(temp: any, statements: ts.Statement[], bindComponentAttr(ts.factory.createExpressionStatement( item.initializer.properties[0].initializer), identifierNode, statements, log, false, true); } else { - validateStateStyleSyntax(temp, log); + if (!(ts.isObjectLiteralExpression(item.initializer) && item.initializer.properties.length === 0)) { + validateStateStyleSyntax(temp, log); + } } if (item.name) { statements.push(createViewStackProcessor(item, false)); From 76e738fdca7cd9c314e53736cebaf0e0f6885fd7 Mon Sep 17 00:00:00 2001 From: jiangbo Date: Mon, 11 Jul 2022 20:55:57 +0800 Subject: [PATCH 2/3] jiangbo91@huawei.com Fix the error when the statestyles attribute is empty Signed-off-by: jiangbo Change-Id: I2b2b368df044d17436dada50c92e41cfc8c638fc --- compiler/src/process_component_build.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/src/process_component_build.ts b/compiler/src/process_component_build.ts index 2428094..2da586b 100644 --- a/compiler/src/process_component_build.ts +++ b/compiler/src/process_component_build.ts @@ -1181,9 +1181,7 @@ function traverseStateStylesAttr(temp: any, statements: ts.Statement[], bindComponentAttr(ts.factory.createExpressionStatement( item.initializer.properties[0].initializer), identifierNode, statements, log, false, true); } else { - if (!(ts.isObjectLiteralExpression(item.initializer) && item.initializer.properties.length === 0)) { - validateStateStyleSyntax(temp, log); - } + validateStateStyleSyntax(item, temp, log); } if (item.name) { statements.push(createViewStackProcessor(item, false)); @@ -1369,12 +1367,14 @@ function getComponentType(node: ts.ExpressionStatement, log: LogInfo[], return null; } -export function validateStateStyleSyntax(temp: any, log: LogInfo[]): void { - log.push({ - type: LogType.ERROR, - message: `.stateStyles doesn't conform standard.`, - pos: temp.getStart() - }); +export function validateStateStyleSyntax(item: ts.PropertyAssignment, temp: any, log: LogInfo[]): void { + if (!(ts.isObjectLiteralExpression(item.initializer) && item.initializer.properties.length === 0)) { + log.push({ + type: LogType.ERROR, + message: `.stateStyles doesn't conform standard.`, + pos: temp.getStart() + }); + } } function getEtsComponentExpression(node:ts.ExpressionStatement): ts.EtsComponentExpression { From dd67673be0b97b84d7c355d82776002d19c94e27 Mon Sep 17 00:00:00 2001 From: jiangbo Date: Mon, 11 Jul 2022 21:07:56 +0800 Subject: [PATCH 3/3] jiangbo91@huawei.com Fix the error when the statestyles attribute is empty Signed-off-by: jiangbo Change-Id: I84a9207cfec59f5a58c4154c20abc65d792ef6de --- compiler/src/process_component_build.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/src/process_component_build.ts b/compiler/src/process_component_build.ts index 2da586b..79e6a03 100644 --- a/compiler/src/process_component_build.ts +++ b/compiler/src/process_component_build.ts @@ -1181,7 +1181,9 @@ function traverseStateStylesAttr(temp: any, statements: ts.Statement[], bindComponentAttr(ts.factory.createExpressionStatement( item.initializer.properties[0].initializer), identifierNode, statements, log, false, true); } else { - validateStateStyleSyntax(item, temp, log); + if (!(ts.isObjectLiteralExpression(item.initializer) && item.initializer.properties.length === 0)) { + validateStateStyleSyntax(temp, log); + } } if (item.name) { statements.push(createViewStackProcessor(item, false)); @@ -1367,14 +1369,12 @@ function getComponentType(node: ts.ExpressionStatement, log: LogInfo[], return null; } -export function validateStateStyleSyntax(item: ts.PropertyAssignment, temp: any, log: LogInfo[]): void { - if (!(ts.isObjectLiteralExpression(item.initializer) && item.initializer.properties.length === 0)) { - log.push({ - type: LogType.ERROR, - message: `.stateStyles doesn't conform standard.`, - pos: temp.getStart() - }); - } +export function validateStateStyleSyntax(temp: any, log: LogInfo[]): void { + log.push({ + type: LogType.ERROR, + message: `.stateStyles doesn't conform standard.`, + pos: temp.getStart() + }); } function getEtsComponentExpression(node:ts.ExpressionStatement): ts.EtsComponentExpression {