Skip to content

fix(compiler-cli): Support resolve animation name from the DTS #45107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ivanwonder wants to merge 1 commit into from
Closed

fix(compiler-cli): Support resolve animation name from the DTS #45107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {ComponentAnalysisData, ComponentResolutionData} from './metadata';
import {_extractTemplateStyleUrls, extractComponentStyleUrls, extractStyleResources, extractTemplate, makeResourceNotFoundError, ParsedTemplateWithSource, parseTemplateDeclaration, preloadAndParseTemplate, ResourceTypeForDiagnostics, StyleUrlMeta, transformDecoratorToInlineResources} from './resources';
import {scopeTemplate} from './scope';
import {ComponentSymbol} from './symbol';
import {collectAnimationNames, validateAndFlattenComponentImports} from './util';
import {animationTriggerResolver, collectAnimationNames, validateAndFlattenComponentImports} from './util';

const EMPTY_MAP = new Map<string, Expression>();
const EMPTY_ARRAY: any[] = [];
Expand Down Expand Up @@ -210,8 +210,10 @@ export class ComponentDecoratorHandler implements
let animations: Expression|null = null;
let animationTriggerNames: AnimationTriggerNames|null = null;
if (component.has('animations')) {
animations = new WrappedNodeExpr(component.get('animations')!);
const animationsValue = this.evaluator.evaluate(component.get('animations')!);
const animationExpression = component.get('animations')!;
animations = new WrappedNodeExpr(animationExpression);
const animationsValue =
this.evaluator.evaluate(animationExpression, animationTriggerResolver);
animationTriggerNames = {includesDynamicAnimations: false, staticTriggerNames: []};
collectAnimationNames(animationsValue, animationTriggerNames);
}
Expand Down
24 changes: 23 additions & 1 deletion packages/compiler-cli/src/ngtsc/annotations/component/src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {AnimationTriggerNames} from '@angular/compiler';
import ts from 'typescript';

import {Reference} from '../../../imports';
import {ResolvedValue} from '../../../partial_evaluator';
import {ForeignFunctionResolver, ResolvedValue} from '../../../partial_evaluator';
import {ClassDeclaration, isNamedClassDeclaration} from '../../../reflection';
import {createValueHasWrongTypeError} from '../../common';

Expand Down Expand Up @@ -38,6 +38,28 @@ export function collectAnimationNames(
}
}

export function isAngularAnimationsReference(reference: Reference, symbolName: string): boolean {
return reference.ownedByModuleGuess === '@angular/animations' &&
reference.debugName === symbolName;
}

export const animationTriggerResolver: ForeignFunctionResolver = (ref, args) => {
const animationTriggerMethodName = 'trigger';
if (!isAngularAnimationsReference(ref, animationTriggerMethodName)) {
return null;
}
const triggerNameExpression = args[0];
if (!triggerNameExpression) {
return null;
}
const factory = ts.factory;
return factory.createObjectLiteralExpression(
[
factory.createPropertyAssignment(factory.createIdentifier('name'), triggerNameExpression),
],
true);
};

export function validateAndFlattenComponentImports(imports: ResolvedValue, expr: ts.Expression): {
imports: Reference<ClassDeclaration>[],
diagnostics: ts.Diagnostic[],
Expand Down
27 changes: 18 additions & 9 deletions packages/compiler-cli/src/ngtsc/annotations/component/test/component_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,16 @@ runInEachFileSystem(() => {
name: _('/node_modules/@angular/core/index.d.ts'),
contents: 'export const Component: any;',
},
{
name: _('/node_modules/@angular/animations/index.d.ts'),
contents: 'export declare function trigger(name: any): any',
},
{
name: _('/entry.ts'),
contents: `
import {Component} from '@angular/core';
function trigger(name) {
return {name};
}
import {trigger} from '@angular/animations';

@Component({
template: '',
animations: [
Expand Down Expand Up @@ -447,13 +450,16 @@ runInEachFileSystem(() => {
name: _('/node_modules/@angular/core/index.d.ts'),
contents: 'export const Component: any;',
},
{
name: _('/node_modules/@angular/animations/index.d.ts'),
contents: 'export declare function trigger(name: any): any',
},
{
name: _('/entry.ts'),
contents: `
import {Component} from '@angular/core';
function trigger(name) {
return {name};
}
import {trigger} from '@angular/animations';

function buildComplexAnimations() {
const name = 'complex';
return [trigger(name)];
Expand Down Expand Up @@ -488,13 +494,16 @@ runInEachFileSystem(() => {
name: _('/node_modules/@angular/core/index.d.ts'),
contents: 'export const Component: any;',
},
{
name: _('/node_modules/@angular/animations/index.d.ts'),
contents: 'export declare function trigger(name: any): any',
},
{
name: _('/entry.ts'),
contents: `
import {Component} from '@angular/core';
function trigger(name) {
return {name};
}
import {trigger} from '@angular/animations';

function buildComplexAnimations() {
const name = 'complex';
return [trigger(name)];
Expand Down