Revert "fix(compiler-cli): consider the case of duplicate Angular decorators in local compilation diagnostics (#54139)" (#54264)

thePunderWoman · thePunderWoman · commit e46c08170f8c · 2024-02-05T18:18:47.000Z
This reverts commit 4b1d948. PR Close #54264
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -259,10 +259,9 @@ export class TraitCompiler implements ProgramTypeCheckAdapter {
     let record: ClassRecord|null = this.recordFor(clazz);
     let foundTraits: PendingTrait<unknown, unknown, SemanticSymbol|null, unknown>[] = [];
 
-    // A set to track the undetected decorators (= either non-Angular decorators or Angular
-    // duplicate decorators) in local compilation mode. An error will be issued if such decorators
-    // are found.
-    const undetectedDecorators =
+    // A set to track the non-Angular decorators in local compilation mode. An error will be issued
+    // if non-Angular decorators is found in local compilation mode.
+    const nonNgDecoratorsInLocalMode =
         this.compilationMode === CompilationMode.LOCAL ? new Set(decorators) : null;
 
     for (const handler of this.handlers) {
@@ -271,8 +270,8 @@ export class TraitCompiler implements ProgramTypeCheckAdapter {
         continue;
       }
 
-      if (undetectedDecorators !== null && result.decorator !== null) {
-        undetectedDecorators.delete(result.decorator);
+      if (nonNgDecoratorsInLocalMode !== null && result.decorator !== null) {
+        nonNgDecoratorsInLocalMode.delete(result.decorator);
       }
 
       const isPrimaryHandler = handler.precedence === HandlerPrecedence.PRIMARY;
@@ -342,19 +341,19 @@ export class TraitCompiler implements ProgramTypeCheckAdapter {
       }
     }
 
-    if (undetectedDecorators !== null && undetectedDecorators.size > 0 && record !== null &&
-        record.metaDiagnostics === null) {
+    if (nonNgDecoratorsInLocalMode !== null && nonNgDecoratorsInLocalMode.size > 0 &&
+        record !== null && record.metaDiagnostics === null) {
       // Custom decorators found in local compilation mode! In this mode we don't support custom
       // decorators yet. But will eventually do (b/320536434). For now a temporary error is thrown.
-      record.metaDiagnostics = [...undetectedDecorators].map(
+      record.metaDiagnostics = [...nonNgDecoratorsInLocalMode].map(
           decorator => ({
             category: ts.DiagnosticCategory.Error,
             code: Number('-99' + ErrorCode.DECORATOR_UNEXPECTED),
             file: getSourceFile(clazz),
             start: decorator.node.getStart(),
             length: decorator.node.getWidth(),
             messageText:
-                'In local compilation mode, Angular does not support custom decorators or duplicate Angular decorators. Ensure all class decorators are from Angular and each decorator is used at most once for each class.',
+                'In local compilation mode, Angular does not support custom decorators. Ensure all class decorators are from Angular.',
           }));
       record.traits = foundTraits = [];
     }
diff --git a/packages/compiler-cli/test/ngtsc/local_compilation_spec.ts b/packages/compiler-cli/test/ngtsc/local_compilation_spec.ts
@@ -1989,7 +1989,7 @@ runInEachFileSystem(
                  });
             });
 
-            describe('custom/duplicate decorator', () => {
+            describe('custom decorator', () => {
               it('should produce diagnostic for each custom decorator', () => {
                 env.write('test.ts', `
           import {Component} from '@angular/core';
@@ -2014,31 +2014,9 @@ runInEachFileSystem(
                 expect(errors[0].code).toBe(ngErrorCode(ErrorCode.DECORATOR_UNEXPECTED));
                 expect(errors[1].code).toBe(ngErrorCode(ErrorCode.DECORATOR_UNEXPECTED));
                 expect(text1).toContain(
-                    'In local compilation mode, Angular does not support custom decorators or duplicate Angular decorators');
+                    'In local compilation mode, Angular does not support custom decorators');
                 expect(text2).toContain(
-                    'In local compilation mode, Angular does not support custom decorators or duplicate Angular decorators');
-              });
-
-              it('should produce diagnostic for duplicate Component decorator', () => {
-                env.write('test.ts', `
-          import {Component} from '@angular/core';
-          import {SomeServiceImpl} from './some-where';
-
-          @Component({template: 'Hello!'})
-          @Component({template: 'Bye!'})
-          export class SomeComp {            
-          }
-          `);
-
-                const errors = env.driveDiagnostics();
-
-                expect(errors.length).toBe(1);
-
-                const text1 = ts.flattenDiagnosticMessageText(errors[0].messageText, '\n');
-
-                expect(errors[0].code).toBe(ngErrorCode(ErrorCode.DECORATOR_UNEXPECTED));
-                expect(text1).toContain(
-                    'In local compilation mode, Angular does not support custom decorators or duplicate Angular decorators');
+                    'In local compilation mode, Angular does not support custom decorators');
               });
             });
           });
