Prior to this change, the unary + and - operators would be parsed as `x - 0`
and `0 - x` respectively. The runtime semantics of these expressions are
equivalent, however they may introduce inaccurate template type checking
errors as the literal type is lost, for example:
```ts
@Component({
  template: `<button [disabled]="isAdjacent(-1)"></button>`
})
export class Example {
  isAdjacent(direction: -1 | 1): boolean { return false; }
}
```
would incorrectly report a type-check error:
> error TS2345: Argument of type 'number' is not assignable to parameter
  of type '-1 | 1'.
Additionally, the translated expression for the unary + operator would be
considered as arithmetic expression with an incompatible left-hand side:
> error TS2362: The left-hand side of an arithmetic operation must be of
  type 'any', 'number', 'bigint' or an enum type.
To resolve this issues, the implicit transformation should be avoided.
This commit adds a new unary AST node to represent these expressions,
allowing for more accurate type-checking.
Fixes #20845
Fixes #36178
PR Close #37918
		
	
			
		
			
				
	
	
		
			236 lines
		
	
	
		
			7.0 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
			
		
		
	
	
			236 lines
		
	
	
		
			7.0 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
/**
 | 
						|
 * @license
 | 
						|
 * Copyright Google LLC 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 {AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead, Unary} from '../../../src/expression_parser/ast';
 | 
						|
import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../../src/ml_parser/interpolation_config';
 | 
						|
 | 
						|
class Unparser implements AstVisitor {
 | 
						|
  private static _quoteRegExp = /"/g;
 | 
						|
  // TODO(issue/24571): remove '!'.
 | 
						|
  private _expression!: string;
 | 
						|
  // TODO(issue/24571): remove '!'.
 | 
						|
  private _interpolationConfig!: InterpolationConfig;
 | 
						|
 | 
						|
  unparse(ast: AST, interpolationConfig: InterpolationConfig) {
 | 
						|
    this._expression = '';
 | 
						|
    this._interpolationConfig = interpolationConfig;
 | 
						|
    this._visit(ast);
 | 
						|
    return this._expression;
 | 
						|
  }
 | 
						|
 | 
						|
  visitPropertyRead(ast: PropertyRead, context: any) {
 | 
						|
    this._visit(ast.receiver);
 | 
						|
    this._expression += ast.receiver instanceof ImplicitReceiver ? `${ast.name}` : `.${ast.name}`;
 | 
						|
  }
 | 
						|
 | 
						|
  visitPropertyWrite(ast: PropertyWrite, context: any) {
 | 
						|
    this._visit(ast.receiver);
 | 
						|
    this._expression +=
 | 
						|
        ast.receiver instanceof ImplicitReceiver ? `${ast.name} = ` : `.${ast.name} = `;
 | 
						|
    this._visit(ast.value);
 | 
						|
  }
 | 
						|
 | 
						|
  visitUnary(ast: Unary, context: any) {
 | 
						|
    this._expression += ast.operator;
 | 
						|
    this._visit(ast.expr);
 | 
						|
  }
 | 
						|
 | 
						|
  visitBinary(ast: Binary, context: any) {
 | 
						|
    this._visit(ast.left);
 | 
						|
    this._expression += ` ${ast.operation} `;
 | 
						|
    this._visit(ast.right);
 | 
						|
  }
 | 
						|
 | 
						|
  visitChain(ast: Chain, context: any) {
 | 
						|
    const len = ast.expressions.length;
 | 
						|
    for (let i = 0; i < len; i++) {
 | 
						|
      this._visit(ast.expressions[i]);
 | 
						|
      this._expression += i == len - 1 ? ';' : '; ';
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  visitConditional(ast: Conditional, context: any) {
 | 
						|
    this._visit(ast.condition);
 | 
						|
    this._expression += ' ? ';
 | 
						|
    this._visit(ast.trueExp);
 | 
						|
    this._expression += ' : ';
 | 
						|
    this._visit(ast.falseExp);
 | 
						|
  }
 | 
						|
 | 
						|
  visitPipe(ast: BindingPipe, context: any) {
 | 
						|
    this._expression += '(';
 | 
						|
    this._visit(ast.exp);
 | 
						|
    this._expression += ` | ${ast.name}`;
 | 
						|
    ast.args.forEach(arg => {
 | 
						|
      this._expression += ':';
 | 
						|
      this._visit(arg);
 | 
						|
    });
 | 
						|
    this._expression += ')';
 | 
						|
  }
 | 
						|
 | 
						|
  visitFunctionCall(ast: FunctionCall, context: any) {
 | 
						|
    this._visit(ast.target!);
 | 
						|
    this._expression += '(';
 | 
						|
    let isFirst = true;
 | 
						|
    ast.args.forEach(arg => {
 | 
						|
      if (!isFirst) this._expression += ', ';
 | 
						|
      isFirst = false;
 | 
						|
      this._visit(arg);
 | 
						|
    });
 | 
						|
    this._expression += ')';
 | 
						|
  }
 | 
						|
 | 
						|
  visitImplicitReceiver(ast: ImplicitReceiver, context: any) {}
 | 
						|
 | 
						|
  visitInterpolation(ast: Interpolation, context: any) {
 | 
						|
    for (let i = 0; i < ast.strings.length; i++) {
 | 
						|
      this._expression += ast.strings[i];
 | 
						|
      if (i < ast.expressions.length) {
 | 
						|
        this._expression += `${this._interpolationConfig.start} `;
 | 
						|
        this._visit(ast.expressions[i]);
 | 
						|
        this._expression += ` ${this._interpolationConfig.end}`;
 | 
						|
      }
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  visitKeyedRead(ast: KeyedRead, context: any) {
 | 
						|
    this._visit(ast.obj);
 | 
						|
    this._expression += '[';
 | 
						|
    this._visit(ast.key);
 | 
						|
    this._expression += ']';
 | 
						|
  }
 | 
						|
 | 
						|
  visitKeyedWrite(ast: KeyedWrite, context: any) {
 | 
						|
    this._visit(ast.obj);
 | 
						|
    this._expression += '[';
 | 
						|
    this._visit(ast.key);
 | 
						|
    this._expression += '] = ';
 | 
						|
    this._visit(ast.value);
 | 
						|
  }
 | 
						|
 | 
						|
  visitLiteralArray(ast: LiteralArray, context: any) {
 | 
						|
    this._expression += '[';
 | 
						|
    let isFirst = true;
 | 
						|
    ast.expressions.forEach(expression => {
 | 
						|
      if (!isFirst) this._expression += ', ';
 | 
						|
      isFirst = false;
 | 
						|
      this._visit(expression);
 | 
						|
    });
 | 
						|
 | 
						|
    this._expression += ']';
 | 
						|
  }
 | 
						|
 | 
						|
  visitLiteralMap(ast: LiteralMap, context: any) {
 | 
						|
    this._expression += '{';
 | 
						|
    let isFirst = true;
 | 
						|
    for (let i = 0; i < ast.keys.length; i++) {
 | 
						|
      if (!isFirst) this._expression += ', ';
 | 
						|
      isFirst = false;
 | 
						|
      const key = ast.keys[i];
 | 
						|
      this._expression += key.quoted ? JSON.stringify(key.key) : key.key;
 | 
						|
      this._expression += ': ';
 | 
						|
      this._visit(ast.values[i]);
 | 
						|
    }
 | 
						|
 | 
						|
    this._expression += '}';
 | 
						|
  }
 | 
						|
 | 
						|
  visitLiteralPrimitive(ast: LiteralPrimitive, context: any) {
 | 
						|
    if (typeof ast.value === 'string') {
 | 
						|
      this._expression += `"${ast.value.replace(Unparser._quoteRegExp, '\"')}"`;
 | 
						|
    } else {
 | 
						|
      this._expression += `${ast.value}`;
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  visitMethodCall(ast: MethodCall, context: any) {
 | 
						|
    this._visit(ast.receiver);
 | 
						|
    this._expression += ast.receiver instanceof ImplicitReceiver ? `${ast.name}(` : `.${ast.name}(`;
 | 
						|
    let isFirst = true;
 | 
						|
    ast.args.forEach(arg => {
 | 
						|
      if (!isFirst) this._expression += ', ';
 | 
						|
      isFirst = false;
 | 
						|
      this._visit(arg);
 | 
						|
    });
 | 
						|
    this._expression += ')';
 | 
						|
  }
 | 
						|
 | 
						|
  visitPrefixNot(ast: PrefixNot, context: any) {
 | 
						|
    this._expression += '!';
 | 
						|
    this._visit(ast.expression);
 | 
						|
  }
 | 
						|
 | 
						|
  visitNonNullAssert(ast: NonNullAssert, context: any) {
 | 
						|
    this._visit(ast.expression);
 | 
						|
    this._expression += '!';
 | 
						|
  }
 | 
						|
 | 
						|
  visitSafePropertyRead(ast: SafePropertyRead, context: any) {
 | 
						|
    this._visit(ast.receiver);
 | 
						|
    this._expression += `?.${ast.name}`;
 | 
						|
  }
 | 
						|
 | 
						|
  visitSafeMethodCall(ast: SafeMethodCall, context: any) {
 | 
						|
    this._visit(ast.receiver);
 | 
						|
    this._expression += `?.${ast.name}(`;
 | 
						|
    let isFirst = true;
 | 
						|
    ast.args.forEach(arg => {
 | 
						|
      if (!isFirst) this._expression += ', ';
 | 
						|
      isFirst = false;
 | 
						|
      this._visit(arg);
 | 
						|
    });
 | 
						|
    this._expression += ')';
 | 
						|
  }
 | 
						|
 | 
						|
  visitQuote(ast: Quote, context: any) {
 | 
						|
    this._expression += `${ast.prefix}:${ast.uninterpretedExpression}`;
 | 
						|
  }
 | 
						|
 | 
						|
  private _visit(ast: AST) {
 | 
						|
    ast.visit(this);
 | 
						|
  }
 | 
						|
}
 | 
						|
 | 
						|
const sharedUnparser = new Unparser();
 | 
						|
 | 
						|
export function unparse(
 | 
						|
    ast: AST, interpolationConfig: InterpolationConfig = DEFAULT_INTERPOLATION_CONFIG): string {
 | 
						|
  return sharedUnparser.unparse(ast, interpolationConfig);
 | 
						|
}
 | 
						|
 | 
						|
// [unparsed AST, original source code of AST]
 | 
						|
type UnparsedWithSpan = [string, string];
 | 
						|
 | 
						|
export function unparseWithSpan(
 | 
						|
    ast: ASTWithSource,
 | 
						|
    interpolationConfig: InterpolationConfig = DEFAULT_INTERPOLATION_CONFIG): UnparsedWithSpan[] {
 | 
						|
  const unparsed: UnparsedWithSpan[] = [];
 | 
						|
  const source = ast.source!;
 | 
						|
  const recursiveSpanUnparser = new class extends RecursiveAstVisitor {
 | 
						|
    private recordUnparsed(ast: any, spanKey: string, unparsedList: UnparsedWithSpan[]) {
 | 
						|
      const span = ast[spanKey];
 | 
						|
      const prefix = spanKey === 'span' ? '' : `[${spanKey}] `;
 | 
						|
      const src = source.substring(span.start, span.end);
 | 
						|
      unparsedList.push([
 | 
						|
        unparse(ast, interpolationConfig),
 | 
						|
        prefix + src,
 | 
						|
      ]);
 | 
						|
    }
 | 
						|
 | 
						|
    visit(ast: AST, unparsedList: UnparsedWithSpan[]) {
 | 
						|
      this.recordUnparsed(ast, 'span', unparsedList);
 | 
						|
      if (ast.hasOwnProperty('nameSpan')) {
 | 
						|
        this.recordUnparsed(ast, 'nameSpan', unparsedList);
 | 
						|
      }
 | 
						|
      ast.visit(this, unparsedList);
 | 
						|
    }
 | 
						|
  };
 | 
						|
  recursiveSpanUnparser.visitAll([ast.ast], unparsed);
 | 
						|
  return unparsed;
 | 
						|
}
 |