Fix NullVoxPopuli/rollup-plugin-glimmer-template-tag#14

glimmerjs · Mar 27, 2023 · c873f21 · c873f21
1 parent 1441335
commit c873f21
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/packages/@glimmer/syntax/lib/get-template-locals.ts b/packages/@glimmer/syntax/lib/get-template-locals.ts
@@ -43,6 +43,19 @@ function tokensFromType(
       return;
     }
 
+    // the tag may be from a yielded object
+    // example:
+    //   <x.button>
+    // An ElementNode does not parse the "tag" in to a PathExpression
+    // so we have to split on `.`, just like how `this` presence is checked.
+    if (tag.indexOf('.') !== -1) {
+      let [potentialLocal] = tag.split('.');
+
+      if (scopedTokens.indexOf(potentialLocal) === -1) {
+        return;
+      }
+    }
+
     if (scopedTokens.indexOf(tag) !== -1) {
       return;
     }

diff --git a/packages/@glimmer/syntax/test/template-locals-test.ts b/packages/@glimmer/syntax/test/template-locals-test.ts
@@ -76,6 +76,18 @@ QUnit.test('it does not include locals', function (assert) {
   assert.deepEqual(locals, ['SomeComponent']);
 });
 
+QUnit.test('it can include object-locals', function (assert) {
+  let locals = getTemplateLocals(
+    `
+      <SomeComponent as |b|>
+        <b.button />
+      </SomeComponent>
+    `
+  );
+
+  assert.deepEqual(locals, ['SomeComponent']);
+});
+
 QUnit.test('it can include keywords', function (assert) {
   let locals = getTemplateLocals(
     `