From 6eb6ac7c12c020ad027baf6fec3405e07de6a165 Mon Sep 17 00:00:00 2001 From: Alex Rickabaugh Date: Wed, 11 Jul 2018 12:11:19 -0700 Subject: [PATCH] fix(ivy): fix a couple issues with Input/Output compilation (#24862) PR Close #24862 --- .../compiler-cli/src/ngtsc/annotations/src/directive.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts index 2d460d28dd..a28e72907f 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts @@ -80,17 +80,19 @@ export function extractDirectiveMetadata( const decoratedElements = members.filter(member => !member.isStatic && member.decorators !== null); + const coreModule = isCore ? undefined : '@angular/core'; + // Construct the map of inputs both from the @Directive/@Component // decorator, and the decorated // fields. const inputsFromMeta = parseFieldToPropertyMapping(directive, 'inputs', checker); const inputsFromFields = parseDecoratedFields( - filterToMembersWithDecorator(decoratedElements, 'Input', '@angular/core'), checker); + filterToMembersWithDecorator(decoratedElements, 'Input', coreModule), checker); // And outputs. const outputsFromMeta = parseFieldToPropertyMapping(directive, 'outputs', checker); const outputsFromFields = parseDecoratedFields( - filterToMembersWithDecorator(decoratedElements, '@angular/core', 'Output'), checker); + filterToMembersWithDecorator(decoratedElements, 'Output', coreModule), checker); // Parse the selector. let selector = '';