ember-estree 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-estree",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "ESTree generator for gjs and gts file used by ember",
   "keywords": [
     "AST",
@@ -42,16 +42,16 @@
     "oxfmt": "^0.40.0",
     "oxlint": "^1.55.0",
     "publint": "^0.3.18",
-    "release-plan": "^0.17.4",
+    "release-plan": "^0.18.0",
     "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   },
   "scripts": {
-    "format": "oxfmt",
-    "format:check": "oxfmt --check",
     "bench": "node --expose-gc tests/parser.bench.mjs",
     "bench:compare": "node scripts/bench-compare.mjs",
     "bench:summary": "./scripts/local-bench-summary.sh",
+    "format": "oxfmt",
+    "format:check": "oxfmt --check",
     "lint": "oxlint && pnpm format:check && publint",
     "lint:fix": "oxlint --fix && oxfmt",
     "test": "vitest run"

package/src/parse.js

@@ -58,6 +58,9 @@ export function toTree(source, options = {}) {
     }
   } else {
     let filename = options.filePath || "input.ts";
+    if (filename.includes(".gts")) {
+      filename = filename.replace(/\.gts$/, ".ts");
+    }
     let oxcResult = parseSync(filename, js);
     result = {
       ast: {
@@ -81,7 +84,6 @@ export function toTree(source, options = {}) {
   }
 
   const codeLines = new DocumentLines(source);
-  const allComments = [];
   const templateInfos = [];
 
   // Build a map of template ranges for lookup
@@ -96,12 +98,7 @@ export function toTree(source, options = {}) {
     ];
     let fullRange = [parseResult.range.startUtf16Codepoint, parseResult.range.endUtf16Codepoint];
 
-    const { ast, comments } = processTemplate(
-      templateContent,
-      codeLines,
-      contentRange,
-      templateOpts,
-    );
+    const { ast } = processTemplate(templateContent, codeLines, contentRange, templateOpts);
 
     // Fix the Template root to cover the full <template>...</template> range
     ast.range = fullRange;
@@ -134,7 +131,6 @@ export function toTree(source, options = {}) {
       makeToken(closeTag, [closeStart, fullRange[1]]),
     ];
 
-    allComments.push(...comments);
     templateInfos.push({ utf16Range: fullRange, ast });
     return ast;
   }
@@ -276,12 +272,6 @@ export function toTree(source, options = {}) {
     }
   }
 
-  // Merge comments
-  if (allComments.length) {
-    if (!astRoot.comments) astRoot.comments = [];
-    astRoot.comments.push(...allComments);
-  }
-
   if (useCustomParser) {
     result.visitorKeys = { ...result.visitorKeys, ...glimmerVisitorKeys };
     result.templateInfos = templateInfos;

package/src/print.js

@@ -860,7 +860,7 @@ export function print(node) {
       return `<!--${node.value ?? ""}-->`;
 
     case "GlimmerMustacheCommentStatement":
-      return `{{! ${node.value ?? ""} }}`;
+      return node.longForm ? `{{!-- ${node.value ?? ""} --}}` : `{{! ${node.value ?? ""} }}`;
 
     case "GlimmerElementModifierStatement": {
       const path = print(node.path);

package/src/transforms.js

@@ -248,6 +248,10 @@ export function processTemplate(
     n.end = n.range[1];
     n.loc = toFileLoc(n.range);
 
+    if (n.type === "MustacheCommentStatement") {
+      n.longForm = templateContent.slice(n.start - offset, n.start - offset + 4) === "{{!-";
+    }
+
     // Create parts for ElementNode
     if (n.type === "ElementNode") {
       n.name = n.tag;
@@ -329,10 +333,6 @@ export function processTemplate(
   visit(ast, null);
 
   removeFromParent(emptyTextNodes);
-  removeFromParent(comments);
-  for (const comment of comments) {
-    comment.type = "Block";
-  }
 
   ast.tokens = buildTokenStream(tokenize(templateContent, codeLines, offset), comments, textNodes);
   ast.contents = templateContent;