Revert "fix(compiler-cli): capture metadata for undecorated fields (#63904)" (#63952)

This reverts commit 4c091ab.

PR Close #63952

Author: thePunderWoman

packages/compiler-cli/src/ngtsc/annotations/common/src/metadata.ts

@@ -30,9 +30,6 @@ import {
 
 import {valueReferenceToExpression, wrapFunctionExpressionsInParens} from './util';
 
-/** Function that extracts metadata from an undercorated class member. */
-export type UndecoratedMetadataExtractor = (member: ClassMember) => LiteralArrayExpr | null;
-
 /**
  * Given a class declaration, generate a call to `setClassMetadata` with the Angular metadata
  * present on the class or its member fields. An ngDevMode guard is used to allow the call to be
@@ -47,7 +44,6 @@ export function extractClassMetadata(
   isCore: boolean,
   annotateForClosureCompiler?: boolean,
   angularDecoratorTransform: (dec: Decorator) => Decorator = (dec) => dec,
-  undecoratedMetadataExtractor: UndecoratedMetadataExtractor = () => null,
 ): R3ClassMetadata | null {
   if (!reflection.isClass(clazz)) {
     return null;
@@ -102,12 +98,10 @@ export function extractClassMetadata(
   let duplicateDecoratedMembers: ClassMember[] | null = null;
 
   for (const member of classMembers) {
-    const shouldQuoteName = member.nameNode !== null && ts.isStringLiteralLike(member.nameNode);
-
     if (member.decorators !== null && member.decorators.length > 0) {
       decoratedMembers.push({
         key: member.name,
-        quoted: shouldQuoteName,
+        quoted: false,
         value: decoratedClassMemberToMetadata(member.decorators!, isCore),
       });
 
@@ -117,16 +111,6 @@ export function extractClassMetadata(
       } else {
         seenMemberNames.add(member.name);
       }
-    } else {
-      const undecoratedMetadata = undecoratedMetadataExtractor(member);
-
-      if (undecoratedMetadata !== null) {
-        decoratedMembers.push({
-          key: member.name,
-          quoted: shouldQuoteName,
-          value: undecoratedMetadata,
-        });
-      }
     }
   }
 

packages/compiler-cli/src/ngtsc/annotations/common/test/metadata_spec.ts

@@ -108,7 +108,7 @@ runInEachFileSystem(() => {
         }
       `);
       expect(res).toContain(
-        `{ "has-dashes-in-name": [{ type: Input }], noDashesInName: [{ type: Input }] })`,
+        `{ 'has-dashes-in-name': [{ type: Input }], noDashesInName: [{ type: Input }] })`,
       );
     });
 

packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts

@@ -155,14 +155,12 @@ import {
   ResourceLoader,
   toFactoryMetadata,
   tryUnwrapForwardRef,
-  UndecoratedMetadataExtractor,
   validateHostDirectives,
   wrapFunctionExpressionsInParens,
 } from '../../common';
 import {
   extractDirectiveMetadata,
   extractHostBindingResources,
-  getDirectiveUndecoratedMetadataExtractor,
   parseDirectiveStyles,
 } from '../../directive';
 import {createModuleWithProvidersResolver, NgModuleSymbol} from '../../ng_module';
@@ -293,11 +291,6 @@ export class ComponentDecoratorHandler
       preserveSignificantWhitespace: this.i18nPreserveSignificantWhitespace,
     };
 
-    this.undecoratedMetadataExtractor = getDirectiveUndecoratedMetadataExtractor(
-      reflector,
-      importTracker,
-    );
-
     // Dependencies can't be deferred during HMR, because the HMR update module can't have
     // dynamic imports and its dependencies need to be passed in directly. If dependencies
     // are deferred, their imports will be deleted so we may lose the reference to them.
@@ -306,7 +299,6 @@ export class ComponentDecoratorHandler
 
   private literalCache = new Map<Decorator, ts.ObjectLiteralExpression>();
   private elementSchemaRegistry = new DomElementSchemaRegistry();
-  private readonly undecoratedMetadataExtractor: UndecoratedMetadataExtractor;
 
   /**
    * During the asynchronous preanalyze phase, it's necessary to parse the template to extract
@@ -979,7 +971,6 @@ export class ComponentDecoratorHandler
               this.isCore,
               this.annotateForClosureCompiler,
               (dec) => transformDecoratorResources(dec, component, styles, template),
-              this.undecoratedMetadataExtractor,
             )
           : null,
         classDebugInfo: extractClassDebugInfo(

packages/compiler-cli/src/ngtsc/annotations/directive/src/handler.ts

@@ -74,16 +74,10 @@ import {
   ReferencesRegistry,
   resolveProvidersRequiringFactory,
   toFactoryMetadata,
-  UndecoratedMetadataExtractor,
   validateHostDirectives,
 } from '../../common';
 
-import {
-  extractDirectiveMetadata,
-  extractHostBindingResources,
-  getDirectiveUndecoratedMetadataExtractor,
-  HostBindingNodes,
-} from './shared';
+import {extractDirectiveMetadata, extractHostBindingResources, HostBindingNodes} from './shared';
 import {DirectiveSymbol} from './symbol';
 import {JitDeclarationRegistry} from '../../common/src/jit_declaration_registry';
 import {
@@ -160,16 +154,10 @@ export class DirectiveDecoratorHandler
     private readonly usePoisonedData: boolean,
     private readonly typeCheckHostBindings: boolean,
     private readonly emitDeclarationOnly: boolean,
-  ) {
-    this.undecoratedMetadataExtractor = getDirectiveUndecoratedMetadataExtractor(
-      reflector,
-      importTracker,
-    );
-  }
+  ) {}
 
   readonly precedence = HandlerPrecedence.PRIMARY;
   readonly name = 'DirectiveDecoratorHandler';
-  private readonly undecoratedMetadataExtractor: UndecoratedMetadataExtractor;
 
   detect(
     node: ClassDeclaration,
@@ -252,14 +240,7 @@ export class DirectiveDecoratorHandler
         hostDirectives: directiveResult.hostDirectives,
         rawHostDirectives: directiveResult.rawHostDirectives,
         classMetadata: this.includeClassMetadata
-          ? extractClassMetadata(
-              node,
-              this.reflector,
-              this.isCore,
-              this.annotateForClosureCompiler,
-              undefined,
-              this.undecoratedMetadataExtractor,
-            )
+          ? extractClassMetadata(node, this.reflector, this.isCore, this.annotateForClosureCompiler)
           : null,
         baseClass: readBaseClass(node, this.reflector, this.evaluator),
         typeCheckMeta: extractDirectiveTypeCheckMeta(node, directiveResult.inputs, this.reflector),

packages/compiler-cli/src/ngtsc/annotations/directive/src/shared.ts

@@ -14,8 +14,6 @@ import {
   ExternalReference,
   ForwardRefHandling,
   getSafePropertyAccessString,
-  LiteralArrayExpr,
-  literalMap,
   MaybeForwardRefExpression,
   ParsedHostBindings,
   ParseError,
@@ -26,10 +24,7 @@ import {
   R3QueryMetadata,
   R3Reference,
   verifyHostBindings,
-  R3Identifiers,
-  ArrowFunctionExpr,
   WrappedNodeExpr,
-  literal,
 } from '@angular/compiler';
 import ts from 'typescript';
 
@@ -81,7 +76,6 @@ import {
   ReferencesRegistry,
   toR3Reference,
   tryUnwrapForwardRef,
-  UndecoratedMetadataExtractor,
   unwrapConstructorDependencies,
   unwrapExpression,
   validateConstructorDependencies,
@@ -861,140 +855,6 @@ export function parseFieldStringArrayValue(
   return value;
 }
 
-/**
- * Returns a function that can be used to extract data for the `setClassMetadata`
- * calls from undecorated directive class members.
- */
-export function getDirectiveUndecoratedMetadataExtractor(
-  reflector: ReflectionHost,
-  importTracker: ImportedSymbolsTracker,
-): UndecoratedMetadataExtractor {
-  return (member: ClassMember): LiteralArrayExpr | null => {
-    const input = tryParseSignalInputMapping(member, reflector, importTracker);
-    if (input !== null) {
-      return getDecoratorMetaArray([
-        [new ExternalExpr(R3Identifiers.inputDecorator), memberMetadataFromSignalInput(input)],
-      ]);
-    }
-
-    const output = tryParseInitializerBasedOutput(member, reflector, importTracker);
-    if (output !== null) {
-      return getDecoratorMetaArray([
-        [
-          new ExternalExpr(R3Identifiers.outputDecorator),
-          memberMetadataFromInitializerOutput(output.metadata),
-        ],
-      ]);
-    }
-
-    const model = tryParseSignalModelMapping(member, reflector, importTracker);
-    if (model !== null) {
-      return getDecoratorMetaArray([
-        [
-          new ExternalExpr(R3Identifiers.inputDecorator),
-          memberMetadataFromSignalInput(model.input),
-        ],
-        [
-          new ExternalExpr(R3Identifiers.outputDecorator),
-          memberMetadataFromInitializerOutput(model.output),
-        ],
-      ]);
-    }
-
-    const query = tryParseSignalQueryFromInitializer(member, reflector, importTracker);
-    if (query !== null) {
-      let identifier: ExternalReference;
-      if (query.name === 'viewChild') {
-        identifier = R3Identifiers.viewChildDecorator;
-      } else if (query.name === 'viewChildren') {
-        identifier = R3Identifiers.viewChildrenDecorator;
-      } else if (query.name === 'contentChild') {
-        identifier = R3Identifiers.contentChildDecorator;
-      } else if (query.name === 'contentChildren') {
-        identifier = R3Identifiers.contentChildrenDecorator;
-      } else {
-        return null;
-      }
-
-      return getDecoratorMetaArray([
-        [new ExternalExpr(identifier), memberMetadataFromSignalQuery(query.call)],
-      ]);
-    }
-
-    return null;
-  };
-}
-
-function getDecoratorMetaArray(
-  decorators: [type: ExternalExpr, args: LiteralArrayExpr][],
-): LiteralArrayExpr {
-  return new LiteralArrayExpr(
-    decorators.map(([type, args]) =>
-      literalMap([
-        {key: 'type', value: type, quoted: false},
-        {key: 'args', value: args, quoted: false},
-      ]),
-    ),
-  );
-}
-
-function memberMetadataFromSignalInput(input: InputMapping): LiteralArrayExpr {
-  // Note that for signal inputs the transform is captured in the signal
-  // initializer so we don't need to capture it here.
-  return new LiteralArrayExpr([
-    literalMap([
-      {
-        key: 'isSignal',
-        value: literal(true),
-        quoted: false,
-      },
-      {
-        key: 'alias',
-        value: literal(input.bindingPropertyName),
-        quoted: false,
-      },
-      {
-        key: 'required',
-        value: literal(input.required),
-        quoted: false,
-      },
-    ]),
-  ]);
-}
-
-function memberMetadataFromInitializerOutput(output: InputOrOutput): LiteralArrayExpr {
-  return new LiteralArrayExpr([literal(output.bindingPropertyName)]);
-}
-
-function memberMetadataFromSignalQuery(call: ts.CallExpression): LiteralArrayExpr {
-  const firstArg = call.arguments[0];
-  const firstArgMeta =
-    ts.isStringLiteralLike(firstArg) || ts.isCallExpression(firstArg)
-      ? new WrappedNodeExpr(firstArg)
-      : // If the first argument is a class reference, we need to wrap it in a `forwardRef`
-        // because the reference might occur after the current class. This wouldn't be flagged
-        // on the query initializer, because it executes after the class is initialized, whereas
-        // `setClassMetadata` runs immediately.
-        new ExternalExpr(R3Identifiers.forwardRef).callFn([
-          new ArrowFunctionExpr([], new WrappedNodeExpr(firstArg)),
-        ]);
-
-  const entries: Expression[] = [
-    // We use wrapped nodes here, because the output AST doesn't support spread assignments.
-    firstArgMeta,
-    new WrappedNodeExpr(
-      ts.factory.createObjectLiteralExpression([
-        ...(call.arguments.length > 1
-          ? [ts.factory.createSpreadAssignment(call.arguments[1])]
-          : []),
-        ts.factory.createPropertyAssignment('isSignal', ts.factory.createTrue()),
-      ]),
-    ),
-  ];
-
-  return new LiteralArrayExpr(entries);
-}
-
 function isStringArrayOrDie(value: any, name: string, node: ts.Expression): value is string[] {
   if (!Array.isArray(value)) {
     return false;

packages/compiler-cli/test/compliance/test_cases/model_inputs/GOLDEN_PARTIAL.js

@@ -14,7 +14,7 @@ TestDir.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "0.0.
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestDir, decorators: [{
             type: Directive,
             args: [{}]
-        }], propDecorators: { counter: [{ type: i0.Input, args: [{ isSignal: true, alias: "counter", required: false }] }, { type: i0.Output, args: ["counterChange"] }], name: [{ type: i0.Input, args: [{ isSignal: true, alias: "name", required: true }] }, { type: i0.Output, args: ["nameChange"] }] } });
+        }] });
 
 /****************************************************************************************************
  * PARTIAL FILE: model_directive_definition.d.ts
@@ -45,7 +45,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDE
             args: [{
                     template: 'Works',
                 }]
-        }], propDecorators: { counter: [{ type: i0.Input, args: [{ isSignal: true, alias: "counter", required: false }] }, { type: i0.Output, args: ["counterChange"] }], name: [{ type: i0.Input, args: [{ isSignal: true, alias: "name", required: true }] }, { type: i0.Output, args: ["nameChange"] }] } });
+        }] });
 
 /****************************************************************************************************
  * PARTIAL FILE: model_component_definition.d.ts
@@ -80,7 +80,7 @@ TestDir.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "0.0.
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestDir, decorators: [{
             type: Directive,
             args: [{}]
-        }], propDecorators: { counter: [{ type: i0.Input, args: [{ isSignal: true, alias: "counter", required: false }] }, { type: i0.Output, args: ["counterChange"] }], modelWithAlias: [{ type: i0.Input, args: [{ isSignal: true, alias: "alias", required: false }] }, { type: i0.Output, args: ["aliasChange"] }], decoratorInput: [{
+        }], propDecorators: { decoratorInput: [{
                 type: Input
             }], decoratorInputWithAlias: [{
                 type: Input,

packages/compiler-cli/test/compliance/test_cases/output_function/GOLDEN_PARTIAL.js

@@ -18,7 +18,7 @@ TestDir.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "0.0.
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestDir, decorators: [{
             type: Directive,
             args: [{}]
-        }], propDecorators: { a: [{ type: i0.Output, args: ["a"] }], b: [{ type: i0.Output, args: ["b"] }], c: [{ type: i0.Output, args: ["cPublic"] }], d: [{ type: i0.Output, args: ["d"] }], e: [{ type: i0.Output, args: ["e"] }] } });
+        }] });
 
 /****************************************************************************************************
  * PARTIAL FILE: output_in_directive.d.ts
@@ -56,7 +56,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDE
             args: [{
                     template: 'Works',
                 }]
-        }], propDecorators: { a: [{ type: i0.Output, args: ["a"] }], b: [{ type: i0.Output, args: ["b"] }], c: [{ type: i0.Output, args: ["cPublic"] }], d: [{ type: i0.Output, args: ["d"] }], e: [{ type: i0.Output, args: ["e"] }] } });
+        }] });
 
 /****************************************************************************************************
  * PARTIAL FILE: output_in_component.d.ts
@@ -97,7 +97,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDE
             args: [{
                     standalone: true,
                 }]
-        }], propDecorators: { click1: [{ type: i0.Output, args: ["click1"] }], click2: [{ type: i0.Output, args: ["click2"] }], click3: [{ type: i0.Output, args: ["click3"] }], _bla: [{ type: i0.Output, args: ["decoratorPublicName"] }], _bla2: [{ type: i0.Output, args: ["decoratorPublicName2"] }], clickDecorator1: [{
+        }], propDecorators: { clickDecorator1: [{
                 type: Output
             }], clickDecorator2: [{
                 type: Output

packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_bindings/host_bindings/GOLDEN_PARTIAL.js

@@ -795,13 +795,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDE
                     selector: '[hostBindingDir]',
                     standalone: false
                 }]
-        }], propDecorators: { "is-a": [{
+        }], propDecorators: { 'is-a': [{
                 type: HostBinding,
                 args: ['class.a']
-            }], "is-\"b\"": [{
+            }], 'is-"b"': [{
                 type: HostBinding,
                 args: ['class.b']
-            }], "\"is-c\"": [{
+            }], '"is-c"': [{
                 type: HostBinding,
                 args: ['class.c']
             }] } });