From de14c5f1a7bc87144d61981f2a64a178fe60fe19 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Thu, 28 Mar 2024 23:25:37 -0400 Subject: [PATCH] Cleanup some types, don't use BlockStatement for scope tracking --- .../lib/plugins/transform-wrap-mount-and-outlet.ts | 1 - packages/ember-template-compiler/lib/plugins/utils.ts | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts index 4af79dd54da..32482c8f404 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts @@ -45,7 +45,6 @@ export default function transformWrapMountAndOutlet(env: EmberASTPluginEnvironme visitor: { Template: node, ElementNode: node, - BlockStatement: node, Block: node, MustacheStatement(node: AST.MustacheStatement): AST.Node | void { diff --git a/packages/ember-template-compiler/lib/plugins/utils.ts b/packages/ember-template-compiler/lib/plugins/utils.ts index e4c4a679639..34565ecd47d 100644 --- a/packages/ember-template-compiler/lib/plugins/utils.ts +++ b/packages/ember-template-compiler/lib/plugins/utils.ts @@ -12,7 +12,7 @@ export function isStringLiteral(node: AST.Expression): node is AST.StringLiteral return node.type === 'StringLiteral'; } -function getLocalName(node: string | AST.Expression | AST.VarHead) { +function getLocalName(node: string | AST.VarHead) { if (typeof node === 'string') return node; if (node.type === 'VarHead') { @@ -28,7 +28,7 @@ export function trackLocals() { let locals = new Map(); let node = { - enter(node: AST.Template | AST.Block | AST.ElementNode | AST.BlockStatement) { + enter(node: AST.Template | AST.Block | AST.ElementNode) { let params = 'params' in node ? node.params : node.blockParams; for (let param of params) { let name = getLocalName(param); @@ -37,7 +37,7 @@ export function trackLocals() { } }, - exit(node: AST.Template | AST.Block | AST.ElementNode | AST.BlockStatement) { + exit(node: AST.Template | AST.Block | AST.ElementNode) { let params = 'params' in node ? node.params : node.blockParams; for (let param of params) { let name = getLocalName(param);