refactor(ngdart)!: migrate ViewEncapsulation to enum

angulardart-community · Mar 17, 2023 · 2e15858 · 2e15858
1 parent 3c5523a
commit 2e15858
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/_tests/test/compiler/ast_directive_normalizer_test.dart b/_tests/test/compiler/ast_directive_normalizer_test.dart
@@ -170,11 +170,11 @@ void main() {
       type: CompileTypeMetadata(name: 'A', moduleUrl: 'package:a/a.dart'),
       template: CompileTemplateMetadata(
         template: '',
-        encapsulation: ViewEncapsulation.Emulated,
+        encapsulation: ViewEncapsulation.emulated,
       ),
     );
     metadata = await normalizer.normalizeDirective(metadata);
-    expect(metadata.template.encapsulation, ViewEncapsulation.None);
+    expect(metadata.template.encapsulation, ViewEncapsulation.none);
   });
 
   test('should resolve inline stylesheets', () async {
@@ -205,7 +205,7 @@ void main() {
       ),
     );
     metadata = await normalizer.normalizeDirective(metadata);
-    expect(metadata.template.encapsulation, ViewEncapsulation.Emulated);
+    expect(metadata.template.encapsulation, ViewEncapsulation.emulated);
     expect(
       metadata.template.styles,
       [

diff --git a/_tests/test/core/view/projection_test.dart b/_tests/test/core/view/projection_test.dart
@@ -281,7 +281,7 @@ class ManualViewportDirective {
   selector: 'container-with-style-emu',
   template: '<div class="blueStyle"></div>',
   styles: ['.blueStyle { color: blue}'],
-  encapsulation: ViewEncapsulation.Emulated,
+  encapsulation: ViewEncapsulation.emulated,
   directives: [SimpleComponent],
 )
 class ContainerWithStyleEmulated {}
@@ -290,7 +290,7 @@ class ContainerWithStyleEmulated {}
   selector: 'container-with-style-not-emu',
   template: '<div class="redStyle"></div>',
   styles: ['.redStyle { color: red}'],
-  encapsulation: ViewEncapsulation.None,
+  encapsulation: ViewEncapsulation.none,
   directives: [SimpleComponent],
 )
 class ContainerWithStyleNotEmulated {}

diff --git a/ngcompiler/lib/v1/src/compiler/angular_compiler.dart b/ngcompiler/lib/v1/src/compiler/angular_compiler.dart
@@ -116,9 +116,9 @@ class AngularCompiler {
     NormalizedComponentWithViewDirectives componentWithDirs,
   ) {
     switch (componentWithDirs.component.template!.encapsulation) {
-      case ViewEncapsulation.Emulated:
+      case ViewEncapsulation.emulated:
         return ir.ViewEncapsulation.emulated;
-      case ViewEncapsulation.None:
+      case ViewEncapsulation.none:
         return ir.ViewEncapsulation.none;
       default:
         throw ArgumentError.value(

diff --git a/ngcompiler/lib/v1/src/compiler/ast_directive_normalizer.dart b/ngcompiler/lib/v1/src/compiler/ast_directive_normalizer.dart
@@ -153,10 +153,10 @@ class AstDirectiveNormalizer {
 
     // Optimization: Turn off encapsulation when there are no styles to apply.
     var encapsulation = templateMeta.encapsulation;
-    if (encapsulation == ViewEncapsulation.Emulated &&
+    if (encapsulation == ViewEncapsulation.emulated &&
         templateMeta.styles.isEmpty &&
         allExternalStyles.isEmpty) {
-      encapsulation = ViewEncapsulation.None;
+      encapsulation = ViewEncapsulation.none;
     }
 
     return CompileTemplateMetadata(

diff --git a/ngcompiler/lib/v1/src/compiler/compile_metadata.dart b/ngcompiler/lib/v1/src/compiler/compile_metadata.dart
@@ -419,7 +419,7 @@ class CompileTemplateMetadata {
   final List<String> styleUrls;
   final List<String> ngContentSelectors;
   CompileTemplateMetadata(
-      {this.encapsulation = ViewEncapsulation.Emulated,
+      {this.encapsulation = ViewEncapsulation.emulated,
       this.template,
       this.templateUrl,
       this.templateOffset = 0,

diff --git a/ngcompiler/lib/v1/src/compiler/view_compiler/compile_view.dart b/ngcompiler/lib/v1/src/compiler/view_compiler/compile_view.dart
@@ -1068,7 +1068,7 @@ class CompileView {
   void shimCssForNode(NodeReference nodeReference, int nodeIndex,
       CompileIdentifierMetadata nodeType) {
     if (isRootNodeOfHost(nodeIndex)) return;
-    if (component.template!.encapsulation == ViewEncapsulation.Emulated) {
+    if (component.template!.encapsulation == ViewEncapsulation.emulated) {
       // Set ng_content class for CSS shim.
       var shimMethod =
           nodeType != Identifiers.HTML_ELEMENT ? 'addShimC' : 'addShimE';

diff --git a/ngcompiler/lib/v1/src/compiler/view_compiler/view_style_linker.dart b/ngcompiler/lib/v1/src/compiler/view_compiler/view_style_linker.dart
@@ -26,7 +26,7 @@ class _ViewStyleLinker {
   const _ViewStyleLinker(this._view, this._class);
 
   bool get _hasScopedStyles =>
-      _view.component.template!.encapsulation == ViewEncapsulation.Emulated;
+      _view.component.template!.encapsulation == ViewEncapsulation.emulated;
 
   o.ExternalExpr get _styleType => o.importExpr(_hasScopedStyles
       ? StyleEncapsulation.componentStylesScoped

diff --git a/ngcompiler/lib/v1/src/source_gen/template_compiler/find_components.dart b/ngcompiler/lib/v1/src/source_gen/template_compiler/find_components.dart
@@ -816,7 +816,7 @@ class _ComponentVisitor
         value,
         'encapsulation',
         ViewEncapsulation.values,
-        defaultTo: ViewEncapsulation.Emulated,
+        defaultTo: ViewEncapsulation.emulated,
       );
 
   ChangeDetectionStrategy _changeDetection(

diff --git a/ngdart/lib/src/meta/directives.dart b/ngdart/lib/src/meta/directives.dart
@@ -246,7 +246,7 @@ class Component extends Directive {
     this.directives = const [],
     this.directiveTypes = const [],
     this.pipes = const [],
-    this.encapsulation = ViewEncapsulation.Emulated,
+    this.encapsulation = ViewEncapsulation.emulated,
   });
 }
 

diff --git a/ngdart/lib/src/meta/view.dart b/ngdart/lib/src/meta/view.dart
@@ -16,8 +16,8 @@ enum ViewEncapsulation {
   /// adding the new Host Element attribute to all selectors.
   ///
   /// This is the default option.
-  Emulated,
+  emulated,
 
   /// Don't provide any template or style encapsulation.
-  None
+  none
 }