From e730484d3e49ea9c40ddb497f422644d4c4ea633 Mon Sep 17 00:00:00 2001 From: Ika Date: Thu, 8 Nov 2018 13:44:37 +0800 Subject: [PATCH 1/2] test: add tests --- .../__snapshots__/jsfmt.spec.js.snap | 45 +++++++++++++++++++ tests/html_angular/attributes.component.html | 4 ++ 2 files changed, 49 insertions(+) diff --git a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap index 7ab4c3c1a7ce..f7f23b1db65a 100644 --- a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap +++ b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap @@ -81,6 +81,10 @@ exports[`attributes.component.html - angular-verify 1`] = ` [target]="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }" [error]="'We couldn\\\\\\'t find anything with that name.'" *ngIf="form.controls.details?.controls.amount?.errors.min" + [ngClass]=" + {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS, + 'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING, + 'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}" > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
`; @@ -270,6 +279,10 @@ exports[`attributes.component.html - angular-verify 2`] = ` [target]="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }" [error]="'We couldn\\\\\\'t find anything with that name.'" *ngIf="form.controls.details?.controls.amount?.errors.min" + [ngClass]=" + {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS, + 'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING, + 'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}" > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
`; @@ -459,6 +477,10 @@ exports[`attributes.component.html - angular-verify 3`] = ` [target]="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }" [error]="'We couldn\\\\\\'t find anything with that name.'" *ngIf="form.controls.details?.controls.amount?.errors.min" + [ngClass]=" + {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS, + 'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING, + 'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}" > ~
`; diff --git a/tests/html_angular/attributes.component.html b/tests/html_angular/attributes.component.html index 06e4b89b6bf8..a33b7c3003da 100644 --- a/tests/html_angular/attributes.component.html +++ b/tests/html_angular/attributes.component.html @@ -78,4 +78,8 @@ [target]="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }" [error]="'We couldn\\\'t find anything with that name.'" *ngIf="form.controls.details?.controls.amount?.errors.min" + [ngClass]=" + {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS, + 'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING, + 'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}" > From 6667d55a73cd2891dc0bc4a6b1d3534f0c415593 Mon Sep 17 00:00:00 2001 From: Ika Date: Thu, 8 Nov 2018 13:44:59 +0800 Subject: [PATCH 2/2] fix(angular): handle parens in ng expression correctly --- package.json | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 18 +++++++++--------- yarn.lock | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index ccc2223259fd..034e08f8f6bf 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@babel/parser": "7.1.5", "@glimmer/syntax": "0.30.3", "@iarna/toml": "2.0.0", - "angular-estree-parser": "1.1.3", + "angular-estree-parser": "1.1.4", "angular-html-parser": "1.0.0", "camelcase": "4.1.0", "chalk": "2.1.0", diff --git a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap index f7f23b1db65a..40ea17733b06 100644 --- a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap +++ b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap @@ -190,9 +190,9 @@ exports[`attributes.component.html - angular-verify 1`] = ` [error]="'We couldn\\\\\\'t find anything with that name.'" *ngIf="form.controls.details?.controls.amount?.errors.min" [ngClass]="{ - '-success\\': ': (dialog$ | async).level === dialogLevelEnum.SUCCESS, - '-warning\\': ': (dialog$ | async).level === dialogLevelEnum.WARNING, - '-svg\\': ': (dialog$ | async).level === dialogLevelEnum.DANGER + 'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS, + 'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING, + 'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER }" > @@ -388,9 +388,9 @@ exports[`attributes.component.html - angular-verify 2`] = ` [error]="'We couldn\\\\\\'t find anything with that name.'" *ngIf="form.controls.details?.controls.amount?.errors.min" [ngClass]="{ - '-success\\': ': (dialog$ | async).level === dialogLevelEnum.SUCCESS, - '-warning\\': ': (dialog$ | async).level === dialogLevelEnum.WARNING, - '-svg\\': ': (dialog$ | async).level === dialogLevelEnum.DANGER + 'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS, + 'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING, + 'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER }" > @@ -790,21 +790,21 @@ exports[`attributes.component.html - angular-verify 3`] = ` .min " [ngClass]="{ - '-success\\': ': + 'btn-success': ( dialog$ | async ) .level === dialogLevelEnum.SUCCESS, - '-warning\\': ': + 'btn-warning': ( dialog$ | async ) .level === dialogLevelEnum.WARNING, - '-svg\\': ': + 'btn-svg': ( dialog$ | async diff --git a/yarn.lock b/yarn.lock index dbb693376aad..5f5099aff67a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -704,9 +704,9 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" -angular-estree-parser@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/angular-estree-parser/-/angular-estree-parser-1.1.3.tgz#679b7a1ab57e56cd484b5c44e380bcec7633df58" +angular-estree-parser@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/angular-estree-parser/-/angular-estree-parser-1.1.4.tgz#173fd2a9a30ccd38864e879e66b83cbbbdfd45db" dependencies: lines-and-columns "^1.1.6" tslib "^1.9.3"