update glimmer

Author: patricklx

package.json

@@ -36,12 +36,12 @@
     "@types/node": "Locking to avoid conflicts between the declared version in packages/core and floating '*' versions when we run in CI without the lockfile"
   },
   "resolutions": {
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/interfaces": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/reference": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.88.0",
+    "@glimmer/interfaces": "0.88.0",
+    "@glimmer/runtime": "0.88.0",
+    "@glimmer/reference": "0.88.0",
+    "@glimmer/util": "0.88.0",
+    "@glimmer/validator": "0.88.0",
     "@types/yargs": "17.0.13",
     "@types/node": "^20.10.6",
     "ember-cli-htmlbars": "^6.0.1"

packages/core/__tests__/transform/template-to-typescript.test.ts

@@ -933,6 +933,8 @@ describe('Transform: rewriteTemplate', () => {
       expect(templateBody(template, { globals: [] })).toMatchInlineSnapshot(`
         "{
           const 𝛄 = χ.emitElement(\\"div\\");
+          χ.applyAttributes(𝛄.element, {
+          });
           χ.applyModifier(χ.resolve(modifier)(𝛄.element, { foo: \\"bar\\" , ...χ.NamedArgsMarker }));
         }"
       `);
@@ -944,6 +946,8 @@ describe('Transform: rewriteTemplate', () => {
       expect(templateBody(template, { globals: [] })).toMatchInlineSnapshot(`
         "{
           const 𝛄 = χ.emitComponent(χ.resolve(MyComponent)());
+          χ.applyAttributes(𝛄.element, {
+          });
           χ.applyModifier(χ.resolve(modifier)(𝛄.element, { foo: \\"bar\\" , ...χ.NamedArgsMarker }));
         }"
       `);
@@ -1085,6 +1089,8 @@ describe('Transform: rewriteTemplate', () => {
         "{
           const 𝛄 = χ.emitElement(\\"div\\");
           χ.applySplattributes(𝚪.element, 𝛄.element);
+          χ.applyAttributes(𝛄.element, {
+          });
         }"
       `);
     });
@@ -1129,6 +1135,8 @@ describe('Transform: rewriteTemplate', () => {
         "{
           const 𝛄 = χ.emitComponent(χ.resolve(Foo)());
           χ.applySplattributes(𝚪.element, 𝛄.element);
+          χ.applyAttributes(𝛄.element, {
+          });
         }"
       `);
     });

packages/core/package.json

@@ -32,7 +32,7 @@
     "typescript": ">=4.8.0"
   },
   "dependencies": {
-    "@glimmer/syntax": "^0.84.3",
+    "@glimmer/syntax": "^0.88.0",
     "escape-string-regexp": "^4.0.0",
     "semver": "^7.5.2",
     "silent-error": "^1.1.1",

packages/core/src/transform/template/template-to-typescript.ts

@@ -759,7 +759,9 @@ export function templateToTypescript(
         emit.indent();
 
         emit.text('const 𝛄 = χ.emitElement(');
-        emit.text(JSON.stringify(node.tag));
+        emit.forNode(node.nameNode, () => {
+          emit.text(JSON.stringify(node.tag));
+        });
         emit.text(');');
         emit.newline();
 
@@ -793,35 +795,35 @@ export function templateToTypescript(
         (attr) => !attr.name.startsWith('@') && attr.name !== SPLATTRIBUTES
       );
 
-      if (!attributes.length) return;
-
       emit.text('χ.applyAttributes(𝛄.element, {');
-      emit.newline();
-      emit.indent();
+      emit.forNode(node.startTag, () => {
+        emit.newline();
+        emit.indent();
 
-      let start = template.indexOf(node.tag, rangeForNode(node).start) + node.tag.length;
+        let start = template.indexOf(node.tag, rangeForNode(node).start) + node.tag.length;
 
-      for (let attr of attributes) {
-        emit.forNode(attr, () => {
-          start = template.indexOf(attr.name, start + 1);
+        for (let attr of attributes) {
+          emit.forNode(attr, () => {
+            start = template.indexOf(attr.name, start + 1);
 
-          emitHashKey(attr.name, start);
-          emit.text(': ');
+            emitHashKey(attr.name, start);
+            emit.text(': ');
 
-          if (attr.value.type === 'MustacheStatement') {
-            emitMustacheStatement(attr.value, 'attr');
-          } else if (attr.value.type === 'ConcatStatement') {
-            emitConcatStatement(attr.value);
-          } else {
-            emit.text(JSON.stringify(attr.value.chars));
-          }
+            if (attr.value.type === 'MustacheStatement') {
+              emitMustacheStatement(attr.value, 'attr');
+            } else if (attr.value.type === 'ConcatStatement') {
+              emitConcatStatement(attr.value);
+            } else {
+              emit.text(JSON.stringify(attr.value.chars));
+            }
 
-          emit.text(',');
-          emit.newline();
-        });
-      }
+            emit.text(',');
+            emit.newline();
+          });
+        }
 
-      emit.dedent();
+        emit.dedent();
+      });
       emit.text('});');
       emit.newline();
     }