iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(ivy): re-use the `ForeignFunctionResolver` interface when appropriate (#27697) 

This makes the types (and intentions) more explicit and clear.

PR Close #27697
This commit is contained in:
George Kalpakas 2018-12-22 13:40:13 +02:00 committed by Alex Rickabaugh
parent 19a2b783cf
commit 2fc5f002e0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
View File

@ -188,11 +188,12 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
} }
/** /**
* Given a `FunctionDeclaration` or `MethodDeclaration`, check if it is typed as a * Given a `FunctionDeclaration`, `MethodDeclaration` or `FunctionExpression`, check if it is
* `ModuleWithProviders` and return an expression referencing the module if available. * typed as a `ModuleWithProviders` and return an expression referencing the module if available.
*/ */
private _extractModuleFromModuleWithProvidersFn(node: ts.FunctionDeclaration| private _extractModuleFromModuleWithProvidersFn(node: ts.FunctionDeclaration|
ts.MethodDeclaration): ts.Expression|null { ts.MethodDeclaration|
ts.FunctionExpression): ts.Expression|null {
const type = node.type || null; const type = node.type || null;
return type && return type &&
(this._reflectModuleFromTypeParam(type) || this._reflectModuleFromLiteralType(type)); (this._reflectModuleFromTypeParam(type) || this._reflectModuleFromLiteralType(type));

4
packages/compiler-cli/src/ngtsc/partial_evaluator/src/interface.ts
View File

@ -15,8 +15,8 @@ import {StaticInterpreter} from './interpreter';
import {ResolvedValue} from './result'; import {ResolvedValue} from './result';
export type ForeignFunctionResolver = export type ForeignFunctionResolver =
(node: Reference<ts.FunctionDeclaration|ts.MethodDeclaration>, args: ts.Expression[]) => (node: Reference<ts.FunctionDeclaration|ts.MethodDeclaration|ts.FunctionExpression>,
ts.Expression | null; args: ReadonlyArray<ts.Expression>) => ts.Expression | null;
export class PartialEvaluator { export class PartialEvaluator {
constructor( constructor(

7
packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
View File

@ -13,6 +13,7 @@ import {Declaration, ReflectionHost} from '../../reflection';
import {ArraySliceBuiltinFn} from './builtin'; import {ArraySliceBuiltinFn} from './builtin';
import {DynamicValue} from './dynamic'; import {DynamicValue} from './dynamic';
import {ForeignFunctionResolver} from './interface';
import {BuiltinFn, EnumValue, ResolvedValue, ResolvedValueArray, ResolvedValueMap} from './result'; import {BuiltinFn, EnumValue, ResolvedValue, ResolvedValueArray, ResolvedValueMap} from './result';
@ -73,9 +74,7 @@ interface Context {
*/ */
resolutionContext: string; resolutionContext: string;
scope: Scope; scope: Scope;
foreignFunctionResolver? foreignFunctionResolver?: ForeignFunctionResolver;
(ref: Reference<ts.FunctionDeclaration|ts.MethodDeclaration|ts.FunctionExpression>,
args: ReadonlyArray<ts.Expression>): ts.Expression|null;
} }
export class StaticInterpreter { export class StaticInterpreter {
@ -542,4 +541,4 @@ function joinModuleContext(existing: Context, node: ts.Node, decl: Declaration):
} else { } else {
return EMPTY; return EMPTY;
} }
} }