ember-eslint-parser 0.2.6 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.2.6",
+  "version": "0.3.1",
   "description": "",
   "keywords": [],
   "repository": {
@@ -30,7 +30,8 @@
     "eslint-plugin-promise": "^6.0.0",
     "execa": "^8.0.1",
     "fs-extra": "^11.2.0",
-    "jest": "^29.7.0",
+    "vite": "^5.0.12",
+    "vitest": "^1.2.2",
     "prettier": "^3.1.1",
     "publint": "^0.2.6",
     "release-plan": "^0.6.0",
@@ -38,7 +39,7 @@
   },
   "dependencies": {
     "@babel/eslint-parser": "^7.23.3",
-    "@glimmer/syntax": "^0.85.13",
+    "@glimmer/syntax": "^0.88.0",
     "@typescript-eslint/scope-manager": "^6.15.0",
     "content-tag": "^1.2.2",
     "eslint-scope": "^7.2.2",
@@ -53,6 +54,7 @@
     "typescript": "^5.3.3"
   },
   "scripts": {
+    "test": "vitest run",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
     "lint:js": "eslint .",
     "lint:package": "pnpm publint",

package/src/parser/gjs-gts-parser.js

@@ -52,6 +52,7 @@ module.exports = {
         return result;
       }
       const preprocessedResult = preprocessGlimmerTemplates(info, code);
+      preprocessedResult.code = code;
       const { templateVisitorKeys } = preprocessedResult;
       const visitorKeys = { ...result.visitorKeys, ...templateVisitorKeys };
       result.isTypescript = isTypescript;

package/src/parser/transforms.js

@@ -125,6 +125,16 @@ function traverse(visitorKeys, node, visitor) {
     if (!currentPath.node) continue;
 
     const visitorKeys = allVisitorKeys[currentPath.node.type];
+    if (currentPath.node.type === 'GlimmerElementNode') {
+      if (!visitorKeys.includes('blockParamNodes')) {
+        visitorKeys.push('blockParamNodes', 'parts');
+      }
+    }
+    if (currentPath.node.type === 'GlimmerProgram') {
+      if (!visitorKeys.includes('blockParamNodes')) {
+        visitorKeys.push('blockParamNodes');
+      }
+    }
     if (!visitorKeys) {
       continue;
     }
@@ -240,15 +250,13 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
   for (const tpl of templateInfos) {
     const currentComments = [];
     const textNodes = [];
-    const range = tpl.range;
-    const template = sliceByteRange(code, ...range);
+    const emptyTextNodes = [];
+    const range = tpl.utf16Range;
+    const offset = range[0];
+    const template = code.slice(...range);
     const docLines = new DocumentLines(template);
     const ast = glimmer.preprocess(template, { mode: 'codemod' });
-    ast.tokens = tokenize(
-      sliceByteRange(code, ...tpl.templateRange),
-      codeLines,
-      tpl.templateRange[0]
-    );
+    ast.tokens = tokenize(sliceByteRange(code, ...tpl.templateRange), codeLines, tpl.utf16Range[0]);
     const allNodes = [];
     glimmer.traverse(ast, {
       All(node, path) {
@@ -261,7 +269,13 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
         }
         if (node.type === 'TextNode') {
           n.value = node.chars;
-          textNodes.push(node);
+          // empty text nodes are not allowed, it's empty if its only whitespace or line terminators
+          // it's okay for AttrNodes
+          if (n.value.trim().length !== 0 || n.parent.type === 'AttrNode') {
+            textNodes.push(node);
+          } else {
+            emptyTextNodes.push(node);
+          }
         }
       },
     });
@@ -270,8 +284,8 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
     for (const n of allNodes) {
       if (n.type === 'PathExpression') {
         n.head.range = [
-          range[0] + docLines.positionToOffset(n.head.loc.start),
-          range[0] + docLines.positionToOffset(n.head.loc.end),
+          offset + docLines.positionToOffset(n.head.loc.start),
+          offset + docLines.positionToOffset(n.head.loc.end),
         ];
         n.head.loc = {
           start: codeLines.offsetToPosition(n.head.range[0]),
@@ -280,12 +294,11 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
       }
       n.range =
         n.type === 'Template'
-          ? [tpl.templateRange[0], tpl.templateRange[1]]
+          ? [...tpl.utf16Range]
           : [
-              range[0] + docLines.positionToOffset(n.loc.start),
-              range[0] + docLines.positionToOffset(n.loc.end),
+              offset + docLines.positionToOffset(n.loc.start),
+              offset + docLines.positionToOffset(n.loc.end),
             ];
-
       n.start = n.range[0];
       n.end = n.range[1];
       n.loc = {
@@ -293,70 +306,47 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
         end: codeLines.offsetToPosition(n.range[1]),
       };
       if (n.type === 'Template') {
-        n.loc.start = codeLines.offsetToPosition(tpl.templateRange[0]);
-        n.loc.end = codeLines.offsetToPosition(tpl.templateRange[1]);
+        n.loc.start = codeLines.offsetToPosition(tpl.utf16Range[0]);
+        n.loc.end = codeLines.offsetToPosition(tpl.utf16Range[1]);
       }
-      // split up element node into sub nodes to be able to reference tag name
-      // parts <Foo.Bar /> -> nodes for `Foo` and `Bar`
+
       if (n.type === 'ElementNode') {
         n.name = n.tag;
-        n.parts = [];
-        let start = n.range[0];
-        let codeSlice = sliceByteRange(code, ...n.range);
-        for (const part of n.tag.split('.')) {
-          const idx = codeSlice.indexOf(part);
-          const range = [start + idx, 0];
-          range[1] = range[0] + part.length;
-          codeSlice = sliceByteRange(code, range[1], n.range[1]);
-          start = range[1];
-          n.parts.push({
-            type: 'GlimmerElementNodePart',
-            name: part,
-            range,
-            parent: n,
-            loc: {
-              start: codeLines.offsetToPosition(range[0]),
-              end: codeLines.offsetToPosition(range[1]),
-            },
-          });
-        }
+        n.parts = n.parts.map((p) => ({
+          ...p,
+          parent: n,
+          type: 'GlimmerElementNodePart',
+          name: p.value,
+          range: [
+            offset + docLines.positionToOffset(p.loc.start),
+            offset + docLines.positionToOffset(p.loc.end),
+          ],
+        }));
       }
-      // block params do not have location information
-      // add our own nodes so we can reference them
+
       if ('blockParams' in n) {
-        n.params = [];
-      }
-      if ('blockParams' in n && n.parent) {
-        // for blocks {{x as |b|}} the block range does not contain the block params...
-        // for element tag it does <x as b />
-        const blockRange = n.type === 'Block' ? n.parent.range : n.range;
-        let part = sliceByteRange(code, ...blockRange);
-        let start = blockRange[0];
-        let idx = part.indexOf('|') + 1;
-        start += idx;
-        part = part.slice(idx, -1);
-        idx = part.indexOf('|');
-        part = part.slice(0, idx);
-        for (const param of n.blockParams) {
-          const regex = new RegExp(`\\b${param}\\b`);
-          const match = part.match(regex);
-          const range = [start + match.index, 0];
-          range[1] = range[0] + param.length;
-          n.params.push({
-            type: 'BlockParam',
-            name: param,
-            range,
-            parent: n,
-            loc: {
-              start: codeLines.offsetToPosition(range[0]),
-              end: codeLines.offsetToPosition(range[1]),
-            },
-          });
-        }
+        // program does have blockParams but not blockParamNodes
+        n.params = (n.blockParamNodes || []).map((p) => ({
+          ...p,
+          parent: n,
+          name: p.value,
+          range: [
+            offset + docLines.positionToOffset(p.loc.start),
+            offset + docLines.positionToOffset(p.loc.end),
+          ],
+        }));
       }
       n.type = `Glimmer${n.type}`;
       allNodeTypes.add(n.type);
     }
+
+    // ast should not contains empty text nodes
+    for (const node of emptyTextNodes) {
+      const children = node.parent.children || node.parent.body;
+      const idx = children.indexOf(node);
+      children.splice(idx, 1);
+    }
+
     // ast should not contain comment nodes
     for (const comment of currentComments) {
       const parentBody = comment.parent.body || comment.parent.children;
@@ -416,8 +406,8 @@ module.exports.convertAst = function convertAst(result, preprocessedResult, visi
   result.ast.comments.push(...preprocessedResult.comments);
 
   for (const ti of templateInfos) {
-    const firstIdx = result.ast.tokens.findIndex((t) => t.range[0] === ti.templateRange[0]);
-    const lastIdx = result.ast.tokens.findIndex((t) => t.range[1] === ti.templateRange[1]);
+    const firstIdx = result.ast.tokens.findIndex((t) => t.range[0] === ti.utf16Range[0]);
+    const lastIdx = result.ast.tokens.findIndex((t) => t.range[1] === ti.utf16Range[1]);
     result.ast.tokens.splice(firstIdx, lastIdx - firstIdx + 1, ...ti.ast.tokens);
   }
 
@@ -425,6 +415,7 @@ module.exports.convertAst = function convertAst(result, preprocessedResult, visi
   traverse(visitorKeys, result.ast, (path) => {
     const node = path.node;
     if (!node) return null;
+
     if (
       node.type === 'ExpressionStatement' ||
       node.type === 'StaticBlock' ||
@@ -504,6 +495,21 @@ module.exports.convertAst = function convertAst(result, preprocessedResult, visi
     return null;
   });
 
+  traverse(visitorKeys, result.ast, (path) => {
+    const node = path.node;
+    if (!node) return null;
+
+    if (
+      ['GlimmerMustacheStatement', 'GlimmerBlockStatement', 'GlimmerSubExpression'].includes(
+        node.type
+      )
+    ) {
+      if (node.hash && node.hash.pairs.length === 0) {
+        node.hash = null;
+      }
+    }
+  });
+
   if (counter !== templateInfos.length) {
     throw new Error('failed to process all templates');
   }
@@ -572,3 +578,6 @@ module.exports.transformForLint = function transformForLint(code) {
     output: jsCode,
   };
 };
+
+module.exports.traverse = traverse;
+module.exports.tokenize = tokenize;