fixup! feat(compiler): add support for the typeof keyword in template expressions.

JeanMeche · JeanMeche · commit 992769fdead4 · 2024-10-14T09:19:06.000-06:00
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
@@ -25,7 +25,7 @@ import {
   LiteralPrimitive,
   NonNullAssert,
   PrefixNot,
-  PrefixTypeof,
+  TypeofExpression,
   PropertyRead,
   PropertyWrite,
   SafeCall,
@@ -276,7 +276,7 @@ class AstTranslator implements AstVisitor {
     return node;
   }
 
-  visitPrefixTypeof(ast: PrefixTypeof): ts.Expression {
+  visitTypeofExpresion(ast: TypeofExpression): ts.Expression {
     const expression = wrapForDiagnostics(this.translate(ast.expression));
     const node = ts.factory.createTypeOfExpression(expression);
     addParseSpanInfo(node, ast.sourceSpan);
@@ -549,7 +549,7 @@ class VeSafeLhsInferenceBugDetector implements AstVisitor {
   visitPrefixNot(ast: PrefixNot): boolean {
     return ast.expression.visit(this);
   }
-  visitPrefixTypeof(ast: PrefixNot): boolean {
+  visitTypeofExpresion(ast: PrefixNot): boolean {
     return ast.expression.visit(this);
   }
   visitNonNullAssert(ast: PrefixNot): boolean {
diff --git a/packages/compiler/src/expression_parser/ast.ts b/packages/compiler/src/expression_parser/ast.ts
@@ -373,7 +373,7 @@ export class PrefixNot extends AST {
   }
 }
 
-export class PrefixTypeof extends AST {
+export class TypeofExpression extends AST {
   constructor(
     span: ParseSpan,
     sourceSpan: AbsoluteSourceSpan,
@@ -382,7 +382,7 @@ export class PrefixTypeof extends AST {
     super(span, sourceSpan);
   }
   override visit(visitor: AstVisitor, context: any = null): any {
-    return visitor.visitPrefixTypeof(this, context);
+    return visitor.visitTypeofExpresion(this, context);
   }
 }
 
@@ -547,7 +547,7 @@ export interface AstVisitor {
   visitLiteralPrimitive(ast: LiteralPrimitive, context: any): any;
   visitPipe(ast: BindingPipe, context: any): any;
   visitPrefixNot(ast: PrefixNot, context: any): any;
-  visitPrefixTypeof(ast: PrefixTypeof, context: any): any;
+  visitTypeofExpresion(ast: TypeofExpression, context: any): any;
   visitNonNullAssert(ast: NonNullAssert, context: any): any;
   visitPropertyRead(ast: PropertyRead, context: any): any;
   visitPropertyWrite(ast: PropertyWrite, context: any): any;
@@ -615,7 +615,7 @@ export class RecursiveAstVisitor implements AstVisitor {
   visitPrefixNot(ast: PrefixNot, context: any): any {
     this.visit(ast.expression, context);
   }
-  visitPrefixTypeof(ast: PrefixTypeof, context: any) {
+  visitTypeofExpresion(ast: TypeofExpression, context: any) {
     this.visit(ast.expression, context);
   }
   visitNonNullAssert(ast: NonNullAssert, context: any): any {
@@ -732,8 +732,8 @@ export class AstTransformer implements AstVisitor {
     return new PrefixNot(ast.span, ast.sourceSpan, ast.expression.visit(this));
   }
 
-  visitPrefixTypeof(ast: PrefixNot, context: any): AST {
-    return new PrefixTypeof(ast.span, ast.sourceSpan, ast.expression.visit(this));
+  visitTypeofExpresion(ast: PrefixNot, context: any): AST {
+    return new TypeofExpression(ast.span, ast.sourceSpan, ast.expression.visit(this));
   }
 
   visitNonNullAssert(ast: NonNullAssert, context: any): AST {
@@ -912,10 +912,10 @@ export class AstMemoryEfficientTransformer implements AstVisitor {
     return ast;
   }
 
-  visitPrefixTypeof(ast: PrefixTypeof, context: any): AST {
+  visitTypeofExpresion(ast: TypeofExpression, context: any): AST {
     const expression = ast.expression.visit(this);
     if (expression !== ast.expression) {
-      return new PrefixTypeof(ast.span, ast.sourceSpan, expression);
+      return new TypeofExpression(ast.span, ast.sourceSpan, expression);
     }
     return ast;
   }
diff --git a/packages/compiler/src/expression_parser/lexer.ts b/packages/compiler/src/expression_parser/lexer.ts
@@ -112,7 +112,7 @@ export class Token {
   }
 
   isKeywordTypeof(): boolean {
-    return this.type == TokenType.Keyword && this.strValue == 'typeof';
+    return this.type === TokenType.Keyword && this.strValue === 'typeof';
   }
 
   isError(): boolean {
diff --git a/packages/compiler/src/expression_parser/parser.ts b/packages/compiler/src/expression_parser/parser.ts
@@ -37,7 +37,7 @@ import {
   ParserError,
   ParseSpan,
   PrefixNot,
-  PrefixTypeof,
+  TypeofExpression,
   PropertyRead,
   PropertyWrite,
   RecursiveAstVisitor,
@@ -965,7 +965,7 @@ class _ParseAST {
       this.advance();
       const start = this.inputIndex;
       let result = this.parsePrefix();
-      return new PrefixTypeof(this.span(start), this.sourceSpan(start), result);
+      return new TypeofExpression(this.span(start), this.sourceSpan(start), result);
     }
     return this.parseCallChain();
   }
diff --git a/packages/compiler/src/template/pipeline/src/ingest.ts b/packages/compiler/src/template/pipeline/src/ingest.ts
@@ -1150,7 +1150,7 @@ function convertAst(
       convertAst(ast.expression, job, baseSourceSpan),
       convertSourceSpan(ast.span, baseSourceSpan),
     );
-  } else if (ast instanceof e.PrefixTypeof) {
+  } else if (ast instanceof e.TypeofExpression) {
     return o.typeofExpr(convertAst(ast.expression, job, baseSourceSpan));
   } else {
     throw new Error(
diff --git a/packages/compiler/test/expression_parser/parser_spec.ts b/packages/compiler/test/expression_parser/parser_spec.ts
@@ -100,6 +100,7 @@ describe('parser', () => {
 
     it('should parse typeof expression', () => {
       checkAction(`typeof {} === "object"`);
+      checkAction('(!(typeof {} === "number"))', '!typeof {} === "number"');
     });
 
     it('should parse grouped expressions', () => {
diff --git a/packages/compiler/test/expression_parser/utils/unparser.ts b/packages/compiler/test/expression_parser/utils/unparser.ts
@@ -24,6 +24,7 @@ import {
   LiteralPrimitive,
   NonNullAssert,
   PrefixNot,
+  TypeofExpression,
   PropertyRead,
   PropertyWrite,
   RecursiveAstVisitor,
@@ -192,7 +193,7 @@ class Unparser implements AstVisitor {
     this._visit(ast.expression);
   }
 
-  visitPrefixTypeof(ast: PrefixNot, context: any) {
+  visitTypeofExpresion(ast: TypeofExpression, context: any) {
     this._expression += 'typeof ';
     this._visit(ast.expression);
   }
diff --git a/packages/compiler/test/expression_parser/utils/validator.ts b/packages/compiler/test/expression_parser/utils/validator.ts
@@ -22,7 +22,7 @@ import {
   LiteralPrimitive,
   ParseSpan,
   PrefixNot,
-  PrefixTypeof,
+  TypeofExpression,
   PropertyRead,
   PropertyWrite,
   RecursiveAstVisitor,
@@ -113,8 +113,8 @@ class ASTValidator extends RecursiveAstVisitor {
     this.validate(ast, () => super.visitPrefixNot(ast, context));
   }
 
-  override visitPrefixTypeof(ast: PrefixTypeof, context: any): any {
-    this.validate(ast, () => super.visitPrefixTypeof(ast, context));
+  override visitTypeofExpresion(ast: TypeofExpression, context: any): any {
+    this.validate(ast, () => super.visitTypeofExpresion(ast, context));
   }
 
   override visitPropertyRead(ast: PropertyRead, context: any): any {
diff --git a/packages/compiler/test/render3/util/expression.ts b/packages/compiler/test/render3/util/expression.ts
@@ -87,9 +87,9 @@ class ExpressionSourceHumanizer extends e.RecursiveAstVisitor implements t.Visit
     this.recordAst(ast);
     super.visitPrefixNot(ast, null);
   }
-  override visitPrefixTypeof(ast: e.PrefixTypeof) {
+  override visitTypeofExpresion(ast: e.TypeofExpression) {
     this.recordAst(ast);
-    super.visitPrefixTypeof(ast, null);
+    super.visitTypeofExpresion(ast, null);
   }
   override visitPropertyRead(ast: e.PropertyRead) {
     this.recordAst(ast);

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ export class PrefixNot extends AST {`
`373`	`373`	`}`
`374`	`374`	`}`
`375`	`375`
`376`		`-export class PrefixTypeof extends AST {`
	`376`	`+export class TypeofExpression extends AST {`
`377`	`377`	`constructor(`
`378`	`378`	`span: ParseSpan,`
`379`	`379`	`sourceSpan: AbsoluteSourceSpan,`
`@@ -382,7 +382,7 @@ export class PrefixTypeof extends AST {`
`382`	`382`	`super(span, sourceSpan);`
`383`	`383`	`}`
`384`	`384`	`override visit(visitor: AstVisitor, context: any = null): any {`
`385`		`- return visitor.visitPrefixTypeof(this, context);`
	`385`	`+ return visitor.visitTypeofExpresion(this, context);`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
`@@ -547,7 +547,7 @@ export interface AstVisitor {`
`547`	`547`	`visitLiteralPrimitive(ast: LiteralPrimitive, context: any): any;`
`548`	`548`	`visitPipe(ast: BindingPipe, context: any): any;`
`549`	`549`	`visitPrefixNot(ast: PrefixNot, context: any): any;`
`550`		`- visitPrefixTypeof(ast: PrefixTypeof, context: any): any;`
	`550`	`+ visitTypeofExpresion(ast: TypeofExpression, context: any): any;`
`551`	`551`	`visitNonNullAssert(ast: NonNullAssert, context: any): any;`
`552`	`552`	`visitPropertyRead(ast: PropertyRead, context: any): any;`
`553`	`553`	`visitPropertyWrite(ast: PropertyWrite, context: any): any;`
`@@ -615,7 +615,7 @@ export class RecursiveAstVisitor implements AstVisitor {`
`615`	`615`	`visitPrefixNot(ast: PrefixNot, context: any): any {`
`616`	`616`	`this.visit(ast.expression, context);`
`617`	`617`	`}`
`618`		`- visitPrefixTypeof(ast: PrefixTypeof, context: any) {`
	`618`	`+ visitTypeofExpresion(ast: TypeofExpression, context: any) {`
`619`	`619`	`this.visit(ast.expression, context);`
`620`	`620`	`}`
`621`	`621`	`visitNonNullAssert(ast: NonNullAssert, context: any): any {`
`@@ -732,8 +732,8 @@ export class AstTransformer implements AstVisitor {`
`732`	`732`	`return new PrefixNot(ast.span, ast.sourceSpan, ast.expression.visit(this));`
`733`	`733`	`}`
`734`	`734`
`735`		`- visitPrefixTypeof(ast: PrefixNot, context: any): AST {`
`736`		`- return new PrefixTypeof(ast.span, ast.sourceSpan, ast.expression.visit(this));`
	`735`	`+ visitTypeofExpresion(ast: PrefixNot, context: any): AST {`
	`736`	`+ return new TypeofExpression(ast.span, ast.sourceSpan, ast.expression.visit(this));`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`visitNonNullAssert(ast: NonNullAssert, context: any): AST {`
`@@ -912,10 +912,10 @@ export class AstMemoryEfficientTransformer implements AstVisitor {`
`912`	`912`	`return ast;`
`913`	`913`	`}`
`914`	`914`
`915`		`- visitPrefixTypeof(ast: PrefixTypeof, context: any): AST {`
	`915`	`+ visitTypeofExpresion(ast: TypeofExpression, context: any): AST {`
`916`	`916`	`const expression = ast.expression.visit(this);`
`917`	`917`	`if (expression !== ast.expression) {`
`918`		`- return new PrefixTypeof(ast.span, ast.sourceSpan, expression);`
	`918`	`+ return new TypeofExpression(ast.span, ast.sourceSpan, expression);`
`919`	`919`	`}`
`920`	`920`	`return ast;`
`921`	`921`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ export class Token {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`isKeywordTypeof(): boolean {`
`115`		`- return this.type == TokenType.Keyword && this.strValue == 'typeof';`
	`115`	`+ return this.type === TokenType.Keyword && this.strValue === 'typeof';`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`isError(): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ class ExpressionSourceHumanizer extends e.RecursiveAstVisitor implements t.Visit`
`87`	`87`	`this.recordAst(ast);`
`88`	`88`	`super.visitPrefixNot(ast, null);`
`89`	`89`	`}`
`90`		`- override visitPrefixTypeof(ast: e.PrefixTypeof) {`
	`90`	`+ override visitTypeofExpresion(ast: e.TypeofExpression) {`
`91`	`91`	`this.recordAst(ast);`
`92`		`- super.visitPrefixTypeof(ast, null);`
	`92`	`+ super.visitTypeofExpresion(ast, null);`
`93`	`93`	`}`
`94`	`94`	`override visitPropertyRead(ast: e.PropertyRead) {`
`95`	`95`	`this.recordAst(ast);`