Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 18:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(@angular-devkit/build-optimizer): refactor scrub file to use typeguards

Browse Source
This commit is contained in:
Alan Agius 2020-08-26 11:15:50 +02:00 committed by Charles
parent 802d5ade78
commit e49c92660f
1 changed files with 57 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
View File

@ -17,7 +17,7 @@ export function testScrubFile(content: string) {
'ɵsetClassMetadata', 'ɵsetClassMetadata',
]; ];
return markers.some((marker) => content.indexOf(marker) !== -1); return markers.some((marker) => content.includes(marker));
} }
export function getScrubFileTransformer(program?: ts.Program): ts.TransformerFactory<ts.SourceFile> { export function getScrubFileTransformer(program?: ts.Program): ts.TransformerFactory<ts.SourceFile> {
@ -156,7 +156,7 @@ function isDecoratorAssignmentExpression(exprStmt: ts.ExpressionStatement): bool
return false; return false;
} }
const expr = exprStmt.expression as ts.BinaryExpression; const expr = exprStmt.expression as ts.BinaryExpression;
if (expr.right.kind !== ts.SyntaxKind.ArrayLiteralExpression) { if (!ts.isArrayLiteralExpression(expr.right)) {
return false; return false;
} }
@ -169,28 +169,26 @@ function isDecorateAssignmentExpression(
tslibImports: ts.NamespaceImport[], tslibImports: ts.NamespaceImport[],
checker: ts.TypeChecker, checker: ts.TypeChecker,
): boolean { ): boolean {
if (!ts.isBinaryExpression(exprStmt.expression)) {
if (exprStmt.expression.kind !== ts.SyntaxKind.BinaryExpression) {
return false; return false;
} }
const expr = exprStmt.expression as ts.BinaryExpression; const expr = exprStmt.expression;
if (expr.left.kind !== ts.SyntaxKind.Identifier) { if (!ts.isIdentifier(expr.left)) {
return false; return false;
} }
const classIdent = expr.left as ts.Identifier; const classIdent = expr.left;
let callExpr: ts.CallExpression; let callExpr: ts.CallExpression;
if (expr.right.kind === ts.SyntaxKind.CallExpression) { if (ts.isCallExpression(expr.right)) {
callExpr = expr.right as ts.CallExpression; callExpr = expr.right;
} else if (expr.right.kind === ts.SyntaxKind.BinaryExpression) { } else if (ts.isBinaryExpression(expr.right)) {
// `Clazz = Clazz_1 = __decorate([...], Clazz)` can be found when there are static property // `Clazz = Clazz_1 = __decorate([...], Clazz)` can be found when there are static property
// accesses. // accesses.
const innerExpr = expr.right as ts.BinaryExpression; const innerExpr = expr.right;
if (innerExpr.left.kind !== ts.SyntaxKind.Identifier if (!ts.isIdentifier(innerExpr.left) || !ts.isCallExpression(innerExpr.right)) {
|| innerExpr.right.kind !== ts.SyntaxKind.CallExpression) {
return false; return false;
} }
callExpr = innerExpr.right as ts.CallExpression; callExpr = innerExpr.right;
} else { } else {
return false; return false;
} }
@ -202,14 +200,16 @@ function isDecorateAssignmentExpression(
if (callExpr.arguments.length !== 2) { if (callExpr.arguments.length !== 2) {
return false; return false;
} }
if (callExpr.arguments[1].kind !== ts.SyntaxKind.Identifier) {
const classArg = callExpr.arguments[1];
if (!ts.isIdentifier(classArg)) {
return false; return false;
} }
const classArg = callExpr.arguments[1] as ts.Identifier;
if (classIdent.text !== classArg.text) { if (classIdent.text !== classArg.text) {
return false; return false;
} }
if (callExpr.arguments[0].kind !== ts.SyntaxKind.ArrayLiteralExpression) { if (!ts.isArrayLiteralExpression(callExpr.arguments[0])) {
return false; return false;
} }
@ -224,20 +224,20 @@ function isAngularDecoratorExpression(
checker: ts.TypeChecker, checker: ts.TypeChecker,
): boolean { ): boolean {
if (exprStmt.expression.kind !== ts.SyntaxKind.CallExpression) { if (!ts.isCallExpression(exprStmt.expression)) {
return false; return false;
} }
const callExpr = exprStmt.expression as ts.CallExpression; const callExpr = exprStmt.expression;
if (!isTslibHelper(callExpr, '__decorate', tslibImports, checker)) { if (!isTslibHelper(callExpr, '__decorate', tslibImports, checker)) {
return false; return false;
} }
if (callExpr.arguments.length !== 4) { if (callExpr.arguments.length !== 4) {
return false; return false;
} }
if (callExpr.arguments[0].kind !== ts.SyntaxKind.ArrayLiteralExpression) { const decorateArray = callExpr.arguments[0];
if (!ts.isArrayLiteralExpression(decorateArray)) {
return false; return false;
} }
const decorateArray = callExpr.arguments[0] as ts.ArrayLiteralExpression;
// Check first array entry for Angular decorators. // Check first array entry for Angular decorators.
if (decorateArray.elements.length === 0 || !ts.isCallExpression(decorateArray.elements[0])) { if (decorateArray.elements.length === 0 || !ts.isCallExpression(decorateArray.elements[0])) {
return false; return false;
@ -283,18 +283,18 @@ function isCtorParamsAssignmentExpression(exprStmt: ts.ExpressionStatement): boo
} }
function isAssignmentExpressionTo(exprStmt: ts.ExpressionStatement, name: string) { function isAssignmentExpressionTo(exprStmt: ts.ExpressionStatement, name: string) {
if (exprStmt.expression.kind !== ts.SyntaxKind.BinaryExpression) { if (!ts.isBinaryExpression(exprStmt.expression)) {
return false; return false;
} }
const expr = exprStmt.expression as ts.BinaryExpression; const expr = exprStmt.expression;
if (expr.left.kind !== ts.SyntaxKind.PropertyAccessExpression) { if (!ts.isPropertyAccessExpression(expr.left)) {
return false; return false;
} }
const propAccess = expr.left as ts.PropertyAccessExpression; const propAccess = expr.left;
if (propAccess.name.text !== name) { if (propAccess.name.text !== name) {
return false; return false;
} }
if (propAccess.expression.kind !== ts.SyntaxKind.Identifier) { if (!ts.isIdentifier(propAccess.expression)) {
return false; return false;
} }
if (expr.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) { if (expr.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
@ -342,7 +342,7 @@ function isIvyPrivateCallExpression(exprStmt: ts.ExpressionStatement) {
return false; return false;
} }
if (propAccExpr.name.text != 'ɵsetClassMetadata') { if (propAccExpr.name.text !== 'ɵsetClassMetadata') {
return false; return false;
} }
@ -396,29 +396,25 @@ function pickDecorateNodesToRemove(
const arrLiteral = expect<ts.ArrayLiteralExpression>(callExpr.arguments[0], const arrLiteral = expect<ts.ArrayLiteralExpression>(callExpr.arguments[0],
ts.SyntaxKind.ArrayLiteralExpression); ts.SyntaxKind.ArrayLiteralExpression);
if (!arrLiteral.elements.every((elem) => elem.kind === ts.SyntaxKind.CallExpression)) { if (!arrLiteral.elements.every((elem) => ts.isCallExpression(elem))) {
return []; return [];
} }
const elements = arrLiteral.elements as ts.NodeArray<ts.CallExpression>; const elements = arrLiteral.elements as ts.NodeArray<ts.CallExpression>;
const ngDecoratorCalls = elements.filter((el) => { const ngDecoratorCalls = elements.filter((el) => {
if (el.expression.kind !== ts.SyntaxKind.Identifier) { if (!ts.isIdentifier(el.expression)) {
return false; return false;
} }
const id = el.expression as ts.Identifier;
return identifierIsMetadata(id, ngMetadata, checker); return identifierIsMetadata(el.expression, ngMetadata, checker);
}); });
// Remove __metadata calls of type 'design:paramtypes'. // Remove __metadata calls of type 'design:paramtypes'.
const metadataCalls = elements.filter((el) => { const metadataCalls = elements.filter((el) => {
if (!isTslibHelper(el, '__metadata', tslibImports, checker)) { if (!isTslibHelper(el, '__metadata', tslibImports, checker)) {
return false; return false;
} }
if (el.arguments.length < 2) {
return false; if (el.arguments.length < 2 || !ts.isStringLiteral(el.arguments[0])) {
}
if (el.arguments[0].kind !== ts.SyntaxKind.StringLiteral) {
return false; return false;
} }
@ -429,10 +425,8 @@ function pickDecorateNodesToRemove(
if (!isTslibHelper(el, '__param', tslibImports, checker)) { if (!isTslibHelper(el, '__param', tslibImports, checker)) {
return false; return false;
} }
if (el.arguments.length != 2) {
return false; if (el.arguments.length !== 2 || !ts.isNumericLiteral(el.arguments[0])) {
}
if (el.arguments[0].kind !== ts.SyntaxKind.NumericLiteral) {
return false; return false;
} }
@ -469,7 +463,7 @@ function pickPropDecorationNodesToRemove(
const decorators = const decorators =
expect<ts.ArrayLiteralExpression>(assign.initializer, expect<ts.ArrayLiteralExpression>(assign.initializer,
ts.SyntaxKind.ArrayLiteralExpression).elements; ts.SyntaxKind.ArrayLiteralExpression).elements;
if (!decorators.every((el) => el.kind === ts.SyntaxKind.ObjectLiteralExpression)) { if (!decorators.every((el) => ts.isObjectLiteralExpression(el))) {
return []; return [];
} }
const decsToRemove = decorators.filter((expression) => { const decsToRemove = decorators.filter((expression) => {
@ -507,26 +501,25 @@ function isAngularDecorator(
return false; return false;
} }
const assign = expect<ts.PropertyAssignment>(types[0], ts.SyntaxKind.PropertyAssignment); const assign = expect<ts.PropertyAssignment>(types[0], ts.SyntaxKind.PropertyAssignment);
if (assign.initializer.kind !== ts.SyntaxKind.Identifier) { if (!ts.isIdentifier(assign.initializer)) {
return false; return false;
} }
const id = assign.initializer as ts.Identifier; const id = assign.initializer;
const res = identifierIsMetadata(id, ngMetadata, checker); const res = identifierIsMetadata(id, ngMetadata, checker);
return res; return res;
} }
function isTypeProperty(prop: ts.ObjectLiteralElement): boolean { function isTypeProperty(prop: ts.ObjectLiteralElement): boolean {
if (prop.kind !== ts.SyntaxKind.PropertyAssignment) { if (!ts.isPropertyAssignment(prop)) {
return false; return false;
} }
const assignment = prop as ts.PropertyAssignment;
if (assignment.name.kind !== ts.SyntaxKind.Identifier) {
return false;
}
const name = assignment.name as ts.Identifier;
return name.text === 'type'; if (!ts.isIdentifier(prop.name)) {
return false;
}
return prop.name.text === 'type';
} }
// Check if an identifier is part of the known Angular Metadata. // Check if an identifier is part of the known Angular Metadata.
@ -542,30 +535,23 @@ function identifierIsMetadata(
return symbol return symbol
.declarations .declarations
.some((spec) => metadata.indexOf(spec) !== -1); .some((spec) => metadata.includes(spec));
}
// Check if an import is a tslib helper import (`import * as tslib from "tslib";`)
function isTslibImport(node: ts.ImportDeclaration): boolean {
return !!(node.moduleSpecifier &&
node.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral &&
(node.moduleSpecifier as ts.StringLiteral).text === 'tslib' &&
node.importClause &&
node.importClause.namedBindings &&
node.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport);
} }
// Find all namespace imports for `tslib`. // Find all namespace imports for `tslib`.
function findTslibImports(node: ts.Node): ts.NamespaceImport[] { function findTslibImports(node: ts.Node): ts.NamespaceImport[] {
const imports: ts.NamespaceImport[] = []; const imports: ts.NamespaceImport[] = [];
ts.forEachChild(node, (child) => {
if (child.kind === ts.SyntaxKind.ImportDeclaration) { ts.forEachChild(node, child => {
const importDecl = child as ts.ImportDeclaration; if (
if (isTslibImport(importDecl)) { ts.isImportDeclaration(child) &&
const importClause = importDecl.importClause as ts.ImportClause; child.moduleSpecifier &&
const namespaceImport = importClause.namedBindings as ts.NamespaceImport; ts.isStringLiteral(child.moduleSpecifier) &&
imports.push(namespaceImport); child.moduleSpecifier.text === 'tslib' &&
} child.importClause?.namedBindings &&
ts.isNamespaceImport(child.importClause.namedBindings)
) {
imports.push(child.importClause.namedBindings);
} }
}); });
@ -585,7 +571,7 @@ function identifierIsTslib(
return symbol return symbol
.declarations .declarations
.some((spec) => tslibImports.indexOf(spec as ts.NamespaceImport) !== -1); .some((spec) => tslibImports.includes(spec as ts.NamespaceImport));
} }
// Check if a function call is a tslib helper. // Check if a function call is a tslib helper.
@ -595,7 +581,7 @@ function isTslibHelper(
tslibImports: ts.NamespaceImport[], tslibImports: ts.NamespaceImport[],
checker: ts.TypeChecker, checker: ts.TypeChecker,
) { ) {
let name; let name: string | undefined;
if (ts.isIdentifier(callExpr.expression)) { if (ts.isIdentifier(callExpr.expression)) {
name = callExpr.expression.text; name = callExpr.expression.text;