fix

ember-cli · Nov 8, 2023 · 4682e9c · 4682e9c
1 parent d545258
commit 4682e9c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/lib/parsers/gjs-gts-parser.js b/lib/parsers/gjs-gts-parser.js
@@ -260,6 +260,30 @@ function preprocessGlimmerTemplates(info, code) {
         n.loc.start = codeLines.offsetToPosition(tpl.templateRange[0]);
         n.loc.end = codeLines.offsetToPosition(tpl.templateRange[1]);
       }
+      if (n.type === 'ElementNode') {
+        n.name = n.tag;
+        n.parts = [];
+        let start = n.range[0];
+        let codeSlice = code.slice(...n.range);
+        for (const part of n.tag.split('.')) {
+          const regex = new RegExp(`\\b${part}\\b`);
+          const match = codeSlice.match(regex);
+          const range = [start + match.index, 0];
+          range[1] = range[0] + part.length;
+          codeSlice = code.slice(range[1], n.range[1]);
+          start = range[1];
+          n.parts.push({
+            type: 'ElementNodePart',
+            name: part,
+            range,
+            parent: n,
+            loc: {
+              start: codeLines.offsetToPosition(range[0]),
+              end: codeLines.offsetToPosition(range[1]),
+            },
+          });
+        }
+      }
       if ('blockParams' in n) {
         n.params = [];
       }
@@ -389,10 +413,10 @@ function convertAst(result, preprocessedResult, visitorKeys) {
       }
     }
     if (node.type === 'GlimmerElementNode') {
-      node.name = node.tag;
-      const { scope, variable } = findVarInParentScopes(result.scopeManager, path, node.tag) || {};
-      if (scope && (variable || isUpperCase(node.tag[0]))) {
-        registerNodeInScope(node, scope, variable);
+      const n = node.parts.length > 1 ? node.parts[0] : node;
+      const { scope, variable } = findVarInParentScopes(result.scopeManager, path, n.name) || {};
+      if (scope && (variable || isUpperCase(n.name[0]) || node.name.includes('.'))) {
+        registerNodeInScope(n, scope, variable);
       }
     }
 

diff --git a/tests/lib/rules-preprocessor/gjs-gts-parser-test.js b/tests/lib/rules-preprocessor/gjs-gts-parser-test.js
@@ -257,6 +257,7 @@ const invalid = [
       {{#let 'x' as |noop notUsed usedEl|}}
         {{noop}}
         <usedEl />
+        <usedE2.x />
       {{/let}}
       </template>
     `,