
Reworks the compiler to output the factories for directives, components and pipes under a new static field called `ngFactoryFn`, instead of the usual `factory` property in their respective defs. This should eventually allow us to inject any kind of decorated class (e.g. a pipe). **Note:** these changes are the first part of the refactor and they don't include injectables. I decided to leave injectables for a follow-up PR, because there's some more cases we need to handle when it comes to their factories. Furthermore, directives, components and pipes make up most of the compiler output tests that need to be refactored and it'll make follow-up PRs easier to review if the tests are cleaned up now. This is part of the larger refactor for FW-1468. PR Close #31953
115 lines
3.8 KiB
TypeScript
115 lines
3.8 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
* found in the LICENSE file at https://angular.io/license
|
|
*/
|
|
|
|
import {InjectFlags} from './core';
|
|
import {Identifiers} from './identifiers';
|
|
import * as o from './output/output_ast';
|
|
import {R3DependencyMetadata, R3FactoryDelegateType, R3FactoryMetadata, compileFactoryFunction} from './render3/r3_factory';
|
|
import {mapToMapExpression, typeWithParameters} from './render3/util';
|
|
|
|
export interface InjectableDef {
|
|
expression: o.Expression;
|
|
type: o.Type;
|
|
statements: o.Statement[];
|
|
}
|
|
|
|
export interface R3InjectableMetadata {
|
|
name: string;
|
|
type: o.Expression;
|
|
typeArgumentCount: number;
|
|
ctorDeps: R3DependencyMetadata[]|'invalid'|null;
|
|
providedIn: o.Expression;
|
|
useClass?: o.Expression;
|
|
useFactory?: o.Expression;
|
|
useExisting?: o.Expression;
|
|
useValue?: o.Expression;
|
|
userDeps?: R3DependencyMetadata[];
|
|
}
|
|
|
|
export function compileInjectable(meta: R3InjectableMetadata): InjectableDef {
|
|
let result: {factory: o.Expression, statements: o.Statement[]}|null = null;
|
|
|
|
const factoryMeta = {
|
|
name: meta.name,
|
|
type: meta.type,
|
|
typeArgumentCount: meta.typeArgumentCount,
|
|
deps: meta.ctorDeps,
|
|
injectFn: Identifiers.inject,
|
|
};
|
|
|
|
if (meta.useClass !== undefined) {
|
|
// meta.useClass has two modes of operation. Either deps are specified, in which case `new` is
|
|
// used to instantiate the class with dependencies injected, or deps are not specified and
|
|
// the factory of the class is used to instantiate it.
|
|
//
|
|
// A special case exists for useClass: Type where Type is the injectable type itself and no
|
|
// deps are specified, in which case 'useClass' is effectively ignored.
|
|
|
|
const useClassOnSelf = meta.useClass.isEquivalent(meta.type);
|
|
let deps: R3DependencyMetadata[]|undefined = undefined;
|
|
if (meta.userDeps !== undefined) {
|
|
deps = meta.userDeps;
|
|
}
|
|
|
|
if (deps !== undefined) {
|
|
// factory: () => new meta.useClass(...deps)
|
|
result = compileFactoryFunction({
|
|
...factoryMeta,
|
|
delegate: meta.useClass,
|
|
delegateDeps: deps,
|
|
delegateType: R3FactoryDelegateType.Class,
|
|
});
|
|
} else if (useClassOnSelf) {
|
|
result = compileFactoryFunction(factoryMeta);
|
|
} else {
|
|
result = compileFactoryFunction({
|
|
...factoryMeta,
|
|
delegate: meta.useClass,
|
|
delegateType: R3FactoryDelegateType.Factory,
|
|
});
|
|
}
|
|
} else if (meta.useFactory !== undefined) {
|
|
result = compileFactoryFunction({
|
|
...factoryMeta,
|
|
delegate: meta.useFactory,
|
|
delegateDeps: meta.userDeps || [],
|
|
delegateType: R3FactoryDelegateType.Function,
|
|
});
|
|
} else if (meta.useValue !== undefined) {
|
|
// Note: it's safe to use `meta.useValue` instead of the `USE_VALUE in meta` check used for
|
|
// client code because meta.useValue is an Expression which will be defined even if the actual
|
|
// value is undefined.
|
|
result = compileFactoryFunction({
|
|
...factoryMeta,
|
|
expression: meta.useValue,
|
|
});
|
|
} else if (meta.useExisting !== undefined) {
|
|
// useExisting is an `inject` call on the existing token.
|
|
result = compileFactoryFunction({
|
|
...factoryMeta,
|
|
expression: o.importExpr(Identifiers.inject).callFn([meta.useExisting]),
|
|
});
|
|
} else {
|
|
result = compileFactoryFunction(factoryMeta);
|
|
}
|
|
|
|
const token = meta.type;
|
|
const providedIn = meta.providedIn;
|
|
|
|
const expression = o.importExpr(Identifiers.ɵɵdefineInjectable).callFn([mapToMapExpression(
|
|
{token, factory: result.factory, providedIn})]);
|
|
const type = new o.ExpressionType(o.importExpr(
|
|
Identifiers.InjectableDef, [typeWithParameters(meta.type, meta.typeArgumentCount)]));
|
|
|
|
return {
|
|
expression,
|
|
type,
|
|
statements: result.statements,
|
|
};
|
|
}
|