From e678c1b2a635d78c910c9666cd41446f0773c51d Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 10:44:55 -0400
Subject: [PATCH 01/10] Add test for satisfies

---
 .../__tests__/transform/rewrite.test.ts       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 0dbe80f13..01d07579b 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -32,6 +32,30 @@ describe('Transform: rewriteModule', () => {
       `);
     });
 
+    test('handles satisfies', () => {
+      let script = {
+        filename: 'test.gts',
+        contents: [
+          `import type { TOC } from '@ember/component/template-only';`,
+          ``,
+          `const SmolComp = `,
+          `  <template>`,
+          `    Hello there, {{@name}}`,
+          `  <template> satisfies TOC<{ Args: { name: string }}>;`,
+          ``,
+          `<template>`,
+          `  <SmolComp @name="Ember" />`,
+          `</template>`,
+          ``,
+        ].join('\n'),
+      };
+
+      let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
+
+      expect(transformedModule?.errors).toEqual([]);
+      expect(transformedModule?.transformedContents).toMatchInlineSnapshot();
+    });
+
     test('handles the $ character', () => {
       let script = {
         filename: 'test.gts',

From 096aa7943ffad01ecccaab54318a7646b119936c Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:33:48 -0400
Subject: [PATCH 02/10] We don't want to add export default when we encounter
 satisfies

---
 .../-private/environment/transform.ts         |  2 +-
 .../__tests__/transform/rewrite.test.ts       | 52 ++++++++++---------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/packages/environment-ember-template-imports/-private/environment/transform.ts b/packages/environment-ember-template-imports/-private/environment/transform.ts
index 8b9c2604e..aca84dc48 100644
--- a/packages/environment-ember-template-imports/-private/environment/transform.ts
+++ b/packages/environment-ember-template-imports/-private/environment/transform.ts
@@ -121,7 +121,7 @@ type ETIDefaultTemplate =
 
 function isETIDefaultTemplate(ts: TSLib, node: ts.Node): node is ETIDefaultTemplate {
   return (
-    (ts.isExpressionStatement(node) || ts.isSatisfiesExpression(node)) &&
+    (ts.isExpressionStatement(node)) &&
     isETITemplateLiteral(ts, node.expression)
   );
 }
diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 01d07579b..27a4cd45d 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -32,30 +32,6 @@ describe('Transform: rewriteModule', () => {
       `);
     });
 
-    test('handles satisfies', () => {
-      let script = {
-        filename: 'test.gts',
-        contents: [
-          `import type { TOC } from '@ember/component/template-only';`,
-          ``,
-          `const SmolComp = `,
-          `  <template>`,
-          `    Hello there, {{@name}}`,
-          `  <template> satisfies TOC<{ Args: { name: string }}>;`,
-          ``,
-          `<template>`,
-          `  <SmolComp @name="Ember" />`,
-          `</template>`,
-          ``,
-        ].join('\n'),
-      };
-
-      let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
-
-      expect(transformedModule?.errors).toEqual([]);
-      expect(transformedModule?.transformedContents).toMatchInlineSnapshot();
-    });
-
     test('handles the $ character', () => {
       let script = {
         filename: 'test.gts',
@@ -490,6 +466,34 @@ describe('Transform: rewriteModule', () => {
         }"
       `);
     });
+
+
+    test('handles satisfies', () => {
+      const emberTemplateImportsEnvironment = GlintEnvironment.load('ember-template-imports');
+
+      let script = {
+        filename: 'test.gts',
+        contents: [
+          `import type { TOC } from '@ember/component/template-only';`,
+          ``,
+          `const SmolComp = `,
+          `  <template>`,
+          `    Hello there, {{@name}}`,
+          `  <template> satisfies TOC<{ Args: { name: string }}>;`,
+          ``,
+          `<template>`,
+          `  <SmolComp @name="Ember" />`,
+          `</template> satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>`,
+          ``,
+        ].join('\n'),
+      };
+
+      let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
+
+      expect(transformedModule?.transformedContents).toMatchInlineSnapshot('two components');
+      expect(transformedModule?.errors).toEqual([]);
+    });
+
     test('embedded gts templates', () => {
       let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
       let script = {

From 7a435e5ebfa4be851e280570c59ae2df6b89edc6 Mon Sep 17 00:00:00 2001
From: Bjarne Mogstad <me@mogstad.co>
Date: Fri, 28 Mar 2025 16:33:28 +0100
Subject: [PATCH 03/10] Only transform expression satisfies templates

Previously all template tags with satisfies was transformed into an
export default statement.
---
 .../-private/environment/transform.ts         | 31 +++++++++++-----
 .../__tests__/transformation.test.ts          | 37 +++++++++++++++++++
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/packages/environment-ember-template-imports/-private/environment/transform.ts b/packages/environment-ember-template-imports/-private/environment/transform.ts
index 8b9c2604e..e825e88c7 100644
--- a/packages/environment-ember-template-imports/-private/environment/transform.ts
+++ b/packages/environment-ember-template-imports/-private/environment/transform.ts
@@ -25,7 +25,10 @@ export const transform: GlintExtensionTransform<PreprocessData> = (
     } else if (isETIDefaultTemplate(ts, node)) {
       // Annotate that this template is a default export
       setEmitMetadata(node.expression, { prepend: 'export default ' });
-
+      return node;
+    } else if (isETIDefaultSatisfiesTemplate(ts, node)) {
+      // Annotate that this template is a default export
+      setEmitMetadata(node.expression.expression, { prepend: 'export default ' });
       return node;
     } else if (isETITemplateExpression(ts, node)) {
       // Convert '[__T`foo`]' as an expression to just '__T`foo`'
@@ -111,18 +114,26 @@ type ETITemplateProperty = ts.PropertyDeclaration & {
   name: ts.ComputedPropertyName & { expression: ETITemplateLiteral };
 };
 
-type ETIDefaultTemplate =
-  | (ts.ExpressionStatement & {
-      expression: ETITemplateLiteral;
-    })
-  | (ts.SatisfiesExpression & {
-      expression: ETITemplateLiteral;
-    });
+type ETIDefaultTemplate = ts.ExpressionStatement & {
+  expression: ETITemplateLiteral;
+};
+
+type ETIDefaultSatisfiesTemplate = ts.ExpressionStatement & {
+  expression: ts.SatisfiesExpression & { expression: ETITemplateLiteral };
+};
 
 function isETIDefaultTemplate(ts: TSLib, node: ts.Node): node is ETIDefaultTemplate {
+  return ts.isExpressionStatement(node) && isETITemplateLiteral(ts, node.expression);
+}
+
+function isETIDefaultSatisfiesTemplate(
+  ts: TSLib,
+  node: ts.Node,
+): node is ETIDefaultSatisfiesTemplate {
   return (
-    (ts.isExpressionStatement(node) || ts.isSatisfiesExpression(node)) &&
-    isETITemplateLiteral(ts, node.expression)
+    ts.isExpressionStatement(node) &&
+    ts.isSatisfiesExpression(node.expression) &&
+    isETITemplateLiteral(ts, node.expression.expression)
   );
 }
 
diff --git a/packages/environment-ember-template-imports/__tests__/transformation.test.ts b/packages/environment-ember-template-imports/__tests__/transformation.test.ts
index 180b6d9fd..868761644 100644
--- a/packages/environment-ember-template-imports/__tests__/transformation.test.ts
+++ b/packages/environment-ember-template-imports/__tests__/transformation.test.ts
@@ -234,6 +234,43 @@ describe('Environment: ETI', () => {
       );
     });
 
+    test('single template, no export, with satisfies', () => {
+      let source = stripIndent`
+        import type { TOC } from '@ember/component/template-only';
+        const hello = <template>HelloWorld!</template> satisfies TOC<{
+          Blocks: { default: [] }
+        }>;
+      `;
+
+      let { meta, sourceFile } = applyTransform(source);
+
+      let declaration = sourceFile.statements[2] as ts.VariableStatement;
+      let satisfiesExpression = declaration.declarationList.declarations[0]
+        .initializer! as ts.SatisfiesExpression;
+      let templateNode = satisfiesExpression.expression;
+
+      let start = source.indexOf('<template>');
+      let contentStart = start + '<template>'.length;
+      let contentEnd = source.indexOf('</template>');
+      let end = contentEnd + '</template>'.length;
+
+      expect(meta).toEqual(
+        new Map([
+          [
+            templateNode,
+            {
+              templateLocation: {
+                start,
+                contentStart,
+                contentEnd,
+                end,
+              },
+            },
+          ],
+        ]),
+      );
+    });
+
     test('multiple templates', () => {
       let source = stripIndent`
         <template>

From e6db4d617c61fc9f8371f8e920a467902d97d51c Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 12:42:33 -0400
Subject: [PATCH 04/10] Hm

---
 .../-private/environment/transform.ts         | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/environment-ember-template-imports/-private/environment/transform.ts b/packages/environment-ember-template-imports/-private/environment/transform.ts
index aca84dc48..f8e42c8ba 100644
--- a/packages/environment-ember-template-imports/-private/environment/transform.ts
+++ b/packages/environment-ember-template-imports/-private/environment/transform.ts
@@ -119,9 +119,26 @@ type ETIDefaultTemplate =
       expression: ETITemplateLiteral;
     });
 
+/**
+ * Implicit default export:
+ * 
+ *   ( <template></template> )
+ *   ^ ExpressionStatement
+ * 
+ *   ( <template></template> satisfies ... )
+ *   ^ SatisfiesExpression
+ * 
+ * But!
+ * 
+ *   ( const X = <template></template> satisfies ... )
+ *   ^ VariableStatement
+ * 
+ * So when we check for a wrapping SatisfiesExpression, we need to also make sure 
+ * the parent node is not a variable Statement.
+ */
 function isETIDefaultTemplate(ts: TSLib, node: ts.Node): node is ETIDefaultTemplate {
   return (
-    (ts.isExpressionStatement(node)) &&
+    (ts.isExpressionStatement(node) || (ts.isSatisfiesExpression(node) && !ts.isPropertyDeclaration(node.parent))) &&
     isETITemplateLiteral(ts, node.expression)
   );
 }

From 6578855dba9519ff9a649723247ab519f69a24a4 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:31:05 -0400
Subject: [PATCH 05/10] Update test

---
 .../__tests__/transform/rewrite.test.ts       | 101 ++++--------------
 1 file changed, 22 insertions(+), 79 deletions(-)

diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 27a4cd45d..7ccb8eaa7 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -469,7 +469,7 @@ describe('Transform: rewriteModule', () => {
 
 
     test('handles satisfies', () => {
-      const emberTemplateImportsEnvironment = GlintEnvironment.load('ember-template-imports');
+      const emberTemplateImportsEnvironment = GlintEnvironment.load(['ember-template-imports']);
 
       let script = {
         filename: 'test.gts',
@@ -479,7 +479,7 @@ describe('Transform: rewriteModule', () => {
           `const SmolComp = `,
           `  <template>`,
           `    Hello there, {{@name}}`,
-          `  <template> satisfies TOC<{ Args: { name: string }}>;`,
+          `  </template> satisfies TOC<{ Args: { name: string }}>;`,
           ``,
           `<template>`,
           `  <SmolComp @name="Ember" />`,
@@ -490,83 +490,26 @@ describe('Transform: rewriteModule', () => {
 
       let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
 
-      expect(transformedModule?.transformedContents).toMatchInlineSnapshot('two components');
-      expect(transformedModule?.errors).toEqual([]);
-    });
-
-    test('embedded gts templates', () => {
-      let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
-      let script = {
-        filename: 'foo.gts',
-        contents: stripIndent`
-          class MyComponent {
-            <template>
-              Hello, {{this.target}}!
-            </template>
-
-            private target = 'World';
-          }
-        `,
-      };
-
-      let rewritten = rewriteModule(ts, { script }, customEnv);
-      let roundTripOffset = (offset: number): number | undefined =>
-        rewritten?.getOriginalOffset(rewritten.getTransformedOffset(script.filename, offset))
-          .offset;
-
-      let classOffset = script.contents.indexOf('MyComponent');
-      let accessOffset = script.contents.indexOf('this.target');
-      let fieldOffset = script.contents.indexOf('private target');
-
-      expect(roundTripOffset(classOffset)).toEqual(classOffset);
-      expect(roundTripOffset(accessOffset)).toEqual(accessOffset);
-      expect(roundTripOffset(fieldOffset)).toEqual(fieldOffset);
-
-      expect(rewritten?.toDebugString()).toMatchInlineSnapshot(`
-        "TransformedModule
-
-        | Mapping: TemplateEmbedding
-        |  hbs(22:74):   <template>\\n    Hello, {{this.target}}!\\n  </template>
-        |  ts(22:369):   static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)());\\n__glintRef__; __glintDSL__;\\n}) }
-        |
-        | | Mapping: Template
-        | |  hbs(32:63):   Hello, {{this.target}}!
-        | |  ts(253:337):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)());
-        | |
-        | | | Mapping: TextContent
-        | | |  hbs(37:43):   Hello,
-        | | |  ts(253:253):
-        | | |
-        | | | Mapping: MustacheStatement
-        | | |  hbs(44:59):   {{this.target}}
-        | | |  ts(253:335):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)())
-        | | |
-        | | | | Mapping: MustacheStatement
-        | | | |  hbs(44:59):   {{this.target}}
-        | | | |  ts(278:334):  __glintDSL__.resolveOrReturn(__glintRef__.this.target)()
-        | | | |
-        | | | | | Mapping: PathExpression
-        | | | | |  hbs(46:57):   this.target
-        | | | | |  ts(307:331):  __glintRef__.this.target
-        | | | | |
-        | | | | | | Mapping: Identifier
-        | | | | | |  hbs(46:50):   this
-        | | | | | |  ts(320:324):  this
-        | | | | | |
-        | | | | | | Mapping: Identifier
-        | | | | | |  hbs(51:57):   target
-        | | | | | |  ts(325:331):  target
-        | | | | | |
-        | | | | |
-        | | | |
-        | | |
-        | | | Mapping: TextContent
-        | | |  hbs(59:60):   !
-        | | |  ts(337:337):
-        | | |
-        | |
-        |"
-      `);
+      expect(transformedModule?.errors?.length).toBe(0);
+      expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
+"import type { TOC } from '@ember/component/template-only';
+
+const SmolComp = 
+  ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.name)());
+__glintRef__; __glintDSL__;
+}) satisfies TOC<{ Args: { name: string }}>;
+
+export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+{
+const __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(SmolComp)({ 
+name: "Ember", ...__glintDSL__.NamedArgsMarker }));
+__glintY__;
+}
+__glintRef__; __glintDSL__;
+}) satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>
+"
+`);
     });
 
     test('implicit default export', () => {

From 2b678c35e4b0dec78d89db1bad8ce59a14f95a76 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:31:43 -0400
Subject: [PATCH 06/10] Lint:fix

---
 .../-private/environment/transform.ts                | 12 ++++++------
 .../__tests__/transform/rewrite.test.ts              |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/environment-ember-template-imports/-private/environment/transform.ts b/packages/environment-ember-template-imports/-private/environment/transform.ts
index fb1e08b95..a32d38d42 100644
--- a/packages/environment-ember-template-imports/-private/environment/transform.ts
+++ b/packages/environment-ember-template-imports/-private/environment/transform.ts
@@ -124,19 +124,19 @@ type ETIDefaultSatisfiesTemplate = ts.ExpressionStatement & {
 
 /**
  * Implicit default export:
- * 
+ *
  *   ( <template></template> )
  *   ^ ExpressionStatement
- * 
+ *
  *   ( <template></template> satisfies ... )
  *   ^ SatisfiesExpression
- * 
+ *
  * But!
- * 
+ *
  *   ( const X = <template></template> satisfies ... )
  *   ^ VariableStatement
- * 
- * So when we check for a wrapping SatisfiesExpression, we need to also make sure 
+ *
+ * So when we check for a wrapping SatisfiesExpression, we need to also make sure
  * the parent node is not a variable Statement.
  */
 function isETIDefaultTemplate(ts: TSLib, node: ts.Node): node is ETIDefaultTemplate {
diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 7ccb8eaa7..96d7ae814 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -467,7 +467,6 @@ describe('Transform: rewriteModule', () => {
       `);
     });
 
-
     test('handles satisfies', () => {
       const emberTemplateImportsEnvironment = GlintEnvironment.load(['ember-template-imports']);
 

From 3c7431be2d6de466a88749fd0c83039e8a621dec Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:46:19 -0400
Subject: [PATCH 07/10] ope

---
 .../__tests__/transform/rewrite.test.ts       | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 96d7ae814..03467befc 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -467,50 +467,6 @@ describe('Transform: rewriteModule', () => {
       `);
     });
 
-    test('handles satisfies', () => {
-      const emberTemplateImportsEnvironment = GlintEnvironment.load(['ember-template-imports']);
-
-      let script = {
-        filename: 'test.gts',
-        contents: [
-          `import type { TOC } from '@ember/component/template-only';`,
-          ``,
-          `const SmolComp = `,
-          `  <template>`,
-          `    Hello there, {{@name}}`,
-          `  </template> satisfies TOC<{ Args: { name: string }}>;`,
-          ``,
-          `<template>`,
-          `  <SmolComp @name="Ember" />`,
-          `</template> satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>`,
-          ``,
-        ].join('\n'),
-      };
-
-      let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
-
-      expect(transformedModule?.errors?.length).toBe(0);
-      expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-"import type { TOC } from '@ember/component/template-only';
-
-const SmolComp = 
-  ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.name)());
-__glintRef__; __glintDSL__;
-}) satisfies TOC<{ Args: { name: string }}>;
-
-export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-{
-const __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(SmolComp)({ 
-name: "Ember", ...__glintDSL__.NamedArgsMarker }));
-__glintY__;
-}
-__glintRef__; __glintDSL__;
-}) satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>
-"
-`);
-    });
-
     test('implicit default export', () => {
       let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
       let script = {

From 955e4a4c6ca8497fccc7f3f5924afd65a774c239 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:47:23 -0400
Subject: [PATCH 08/10] lint:fix

---
 .../package-test-core/__tests__/transform/rewrite.test.ts       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 96ec70002..e59a14626 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -501,7 +501,6 @@ describe('Transform: rewriteModule', () => {
       `);
     });
 
-
     test('handles satisfies', () => {
       const emberTemplateImportsEnvironment = GlintEnvironment.load(['ember-template-imports']);
 
@@ -546,7 +545,6 @@ __glintRef__; __glintDSL__;
 `);
     });
 
-    
     test('embedded gts templates', () => {
       let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
       let script = {

From 4bdfc66d1e2e89faf740fabb981659d72a1501a8 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:53:09 -0400
Subject: [PATCH 09/10] Update snapshots

---
 .../__tests__/transform/rewrite.test.ts       | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index e59a14626..127a58cf7 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -501,50 +501,6 @@ describe('Transform: rewriteModule', () => {
       `);
     });
 
-    test('handles satisfies', () => {
-      const emberTemplateImportsEnvironment = GlintEnvironment.load(['ember-template-imports']);
-
-      let script = {
-        filename: 'test.gts',
-        contents: [
-          `import type { TOC } from '@ember/component/template-only';`,
-          ``,
-          `const SmolComp = `,
-          `  <template>`,
-          `    Hello there, {{@name}}`,
-          `  </template> satisfies TOC<{ Args: { name: string }}>;`,
-          ``,
-          `<template>`,
-          `  <SmolComp @name="Ember" />`,
-          `</template> satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>`,
-          ``,
-        ].join('\n'),
-      };
-
-      let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
-
-      expect(transformedModule?.errors?.length).toBe(0);
-      expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-"import type { TOC } from '@ember/component/template-only';
-
-const SmolComp = 
-  ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.name)());
-__glintRef__; __glintDSL__;
-}) satisfies TOC<{ Args: { name: string }}>;
-
-export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-{
-const __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(SmolComp)({ 
-name: "Ember", ...__glintDSL__.NamedArgsMarker }));
-__glintY__;
-}
-__glintRef__; __glintDSL__;
-}) satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>
-"
-`);
-    });
-
     test('embedded gts templates', () => {
       let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
       let script = {
@@ -935,31 +891,75 @@ __glintRef__; __glintDSL__;
       `);
     });
 
-    test('with implicit export default and satisfies', () => {
-      let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
-      let script = {
-        filename: 'test.gts',
-        contents: stripIndent`
-          import type { TOC } from '@ember/component/template-only';
-          <template>HelloWorld!</template> satisfies TOC<{
+    describe('satisfies', () => {
+      test('with implicit export default', () => {
+        let customEnv = GlintEnvironment.load(['ember-loose', 'ember-template-imports']);
+        let script = {
+          filename: 'test.gts',
+          contents: stripIndent`
+            import type { TOC } from '@ember/component/template-only';
+            <template>HelloWorld!</template> satisfies TOC<{
+              Blocks: { default: [] }
+            }>;
+          `,
+        };
+
+        let transformedModule = rewriteModule(ts, { script }, customEnv);
+
+        expect(transformedModule?.errors).toEqual([]);
+        expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
+          "import type { TOC } from '@ember/component/template-only';
+          export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+          __glintRef__; __glintDSL__;
+          }) satisfies TOC<{
             Blocks: { default: [] }
-          }>;
-        `,
-      };
-
-      let transformedModule = rewriteModule(ts, { script }, customEnv);
-
-      expect(transformedModule?.errors).toEqual([]);
-      expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "import __GLINT_GTS_EXTENSION_HACK__ from './__glint-non-existent.gts';
-         import __GLINT_GJS_EXTENSION_HACK__ from './__glint-non-existent.gjs';
-        import type { TOC } from '@ember/component/template-only';
-        export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-        __glintRef__; __glintDSL__;
-        }) satisfies TOC<{
-          Blocks: { default: [] }
-        }>;"
-      `);
+          }>;"
+        `);
+      });
+
+      test('with two template-only components', () => {
+        const emberTemplateImportsEnvironment = GlintEnvironment.load(['ember-template-imports']);
+
+        let script = {
+          filename: 'test.gts',
+          contents: [
+            `import type { TOC } from '@ember/component/template-only';`,
+            ``,
+            `const SmolComp = `,
+            `  <template>`,
+            `    Hello there, {{@name}}`,
+            `  </template> satisfies TOC<{ Args: { name: string }}>;`,
+            ``,
+            `<template>`,
+            `  <SmolComp @name="Ember" />`,
+            `</template> satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>`,
+            ``,
+          ].join('\n'),
+        };
+
+        let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
+
+        expect(transformedModule?.errors?.length).toBe(0);
+        expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
+  "import type { TOC } from '@ember/component/template-only';
+  
+  const SmolComp = 
+    ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.name)());
+  __glintRef__; __glintDSL__;
+  }) satisfies TOC<{ Args: { name: string }}>;
+  
+  export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+  {
+  const __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(SmolComp)({ 
+  name: "Ember", ...__glintDSL__.NamedArgsMarker }));
+  __glintY__;
+  }
+  __glintRef__; __glintDSL__;
+  }) satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>
+  "
+  `);
+      });
     });
   });
 });

From 1cd7e08947a9eeb05257426f6ceec7b6b73e0a16 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:58:47 -0400
Subject: [PATCH 10/10] Update snapshots

---
 .../__tests__/transform/rewrite.test.ts       | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index 127a58cf7..d7246ae7a 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -908,7 +908,9 @@ describe('Transform: rewriteModule', () => {
 
         expect(transformedModule?.errors).toEqual([]);
         expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-          "import type { TOC } from '@ember/component/template-only';
+          "import __GLINT_GTS_EXTENSION_HACK__ from './__glint-non-existent.gts';
+           import __GLINT_GJS_EXTENSION_HACK__ from './__glint-non-existent.gjs';
+          import type { TOC } from '@ember/component/template-only';
           export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
           __glintRef__; __glintDSL__;
           }) satisfies TOC<{
@@ -941,24 +943,26 @@ describe('Transform: rewriteModule', () => {
 
         expect(transformedModule?.errors?.length).toBe(0);
         expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-  "import type { TOC } from '@ember/component/template-only';
-  
-  const SmolComp = 
-    ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.name)());
-  __glintRef__; __glintDSL__;
-  }) satisfies TOC<{ Args: { name: string }}>;
-  
-  export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
-  {
-  const __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(SmolComp)({ 
-  name: "Ember", ...__glintDSL__.NamedArgsMarker }));
-  __glintY__;
-  }
-  __glintRef__; __glintDSL__;
-  }) satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>
-  "
-  `);
+          "import __GLINT_GTS_EXTENSION_HACK__ from './__glint-non-existent.gts';
+           import __GLINT_GJS_EXTENSION_HACK__ from './__glint-non-existent.gjs';
+          import type { TOC } from '@ember/component/template-only';
+
+          const SmolComp = 
+            ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+          __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.name)());
+          __glintRef__; __glintDSL__;
+          }) satisfies TOC<{ Args: { name: string }}>;
+
+          export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+          {
+          const __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(SmolComp)({ 
+          name: "Ember", ...__glintDSL__.NamedArgsMarker }));
+          __glintY__;
+          }
+          __glintRef__; __glintDSL__;
+          }) satisfies TOC<{ Args: {}, Blocks: {}, Element: null }>
+          "
+        `);
       });
     });
   });