Fix types

Author: NullVoxPopuli

packages/@ember/-internals/glimmer/tests/integration/components/runtime-template-compiler-explicit-test.ts

@@ -342,19 +342,20 @@ moduleFor(
   class extends RenderingTestCase {
     async '@test Can render a private field value'() {
       await this.renderComponentModule(() => {
-        return class extends GlimmerishComponent {
+        class TestComponent extends GlimmerishComponent {
           // eslint-disable-next-line no-unused-private-class-members
           #greeting = 'Hello, world!';
 
           static {
             template('<p>{{this.#greeting}}</p>', {
               component: this,
-              scope: (instance: any) => ({
-                '#greeting': instance?.#greeting,
+              scope: (instance) => ({
+                '#greeting': instance ? instance.#greeting : undefined,
               }),
             });
           }
-        };
+        }
+        return TestComponent;
       });
 
       this.assertHTML('<p>Hello, world!</p>');
@@ -363,7 +364,7 @@ moduleFor(
 
     async '@test Can render multiple private fields'() {
       await this.renderComponentModule(() => {
-        return class extends GlimmerishComponent {
+        class TestComponent extends GlimmerishComponent {
           // eslint-disable-next-line no-unused-private-class-members
           #firstName = 'Jane';
           // eslint-disable-next-line no-unused-private-class-members
@@ -372,13 +373,14 @@ moduleFor(
           static {
             template('<p>{{this.#firstName}} {{this.#lastName}}</p>', {
               component: this,
-              scope: (instance: any) => ({
-                '#firstName': instance?.#firstName,
-                '#lastName': instance?.#lastName,
+              scope: (instance?: InstanceType<typeof TestComponent>) => ({
+                '#firstName': instance ? instance.#firstName : undefined,
+                '#lastName': instance ? instance.#lastName : undefined,
               }),
             });
           }
-        };
+        }
+        return TestComponent;
       });
 
       this.assertHTML('<p>Jane Doe</p>');
@@ -387,7 +389,7 @@ moduleFor(
 
     async '@test Can use private field method with on modifier'() {
       await this.renderComponentModule(() => {
-        return class extends GlimmerishComponent {
+        class TestComponent extends GlimmerishComponent {
           // eslint-disable-next-line no-unused-private-class-members
           #message = 'Hello';
 
@@ -399,13 +401,14 @@ moduleFor(
           static {
             template('<button type="button" {{on "click" this.#updateMessage}}>Click</button>', {
               component: this,
-              scope: (instance: any) => ({
+              scope: (instance?: InstanceType<typeof TestComponent>) => ({
                 on,
-                '#updateMessage': instance?.#updateMessage,
+                '#updateMessage': instance ? instance.#updateMessage : undefined,
               }),
             });
           }
-        };
+        }
+        return TestComponent;
       });
 
       this.assertHTML('<button type="button">Click</button>');
@@ -416,20 +419,21 @@ moduleFor(
       await this.renderComponentModule(() => {
         let Greeting = template('<span>{{yield}}</span>');
 
-        return class extends GlimmerishComponent {
+        class TestComponent extends GlimmerishComponent {
           // eslint-disable-next-line no-unused-private-class-members
           #name = 'Ember';
 
           static {
             template('<Greeting>Hello, {{this.#name}}!</Greeting>', {
               component: this,
-              scope: (instance: any) => ({
+              scope: (instance?: InstanceType<typeof TestComponent>) => ({
                 Greeting,
-                '#name': instance?.#name,
+                '#name': instance ? instance.#name : undefined,
               }),
             });
           }
-        };
+        }
+        return TestComponent;
       });
 
       this.assertHTML('<span>Hello, Ember!</span>');
@@ -444,7 +448,7 @@ moduleFor(
           assert.equal(value, 42);
         };
 
-        return class extends GlimmerishComponent {
+        class TestComponent extends GlimmerishComponent {
           // eslint-disable-next-line no-unused-private-class-members
           #secretValue = 42;
 
@@ -453,16 +457,17 @@ moduleFor(
               '<button {{on "click" (fn checkValue this.#secretValue)}}>Click</button>',
               {
                 component: this,
-                scope: (instance: any) => ({
+                scope: (instance?: InstanceType<typeof TestComponent>) => ({
                   on,
                   fn,
                   checkValue,
-                  '#secretValue': instance?.#secretValue,
+                  '#secretValue': instance ? instance.#secretValue : undefined,
                 }),
               }
             );
           }
-        };
+        }
+        return TestComponent;
       });
 
       this.click('button');

packages/@ember/template-compiler/lib/template.ts

@@ -87,7 +87,7 @@ export interface ExplicitTemplateOnlyOptions extends BaseTemplateOptions {
  *   static {
  *     template('{{this.#greeting}}, {{@place}}!',
  *       { component: this },
- *       scope: (instance) => ({ '#greeting': instance?.#greeting }),
+ *       scope: (instance) => ({ '#greeting': instance ? instance.#greeting : undefined }),
  *     );
  *   }
  * }
@@ -96,7 +96,7 @@ export interface ExplicitTemplateOnlyOptions extends BaseTemplateOptions {
 export interface ExplicitClassOptions<
   C extends ComponentClass,
 > extends BaseClassTemplateOptions<C> {
-  scope(instance?: InstanceType<C>): Record<string, unknown>;
+  scope: (instance: InstanceType<C>) => Record<string, unknown>;
 }
 
 /**
@@ -262,12 +262,17 @@ function extractPrivateFields(templateString: string): string[] {
 
 export function template(
   templateString: string,
-  options?: ExplicitTemplateOnlyOptions | ImplicitTemplateOnlyOptions
+  options?: (ExplicitTemplateOnlyOptions | ImplicitTemplateOnlyOptions) & { component?: never }
 ): TemplateOnlyComponent;
 
 export function template<C extends ComponentClass>(
   templateString: string,
-  options: ExplicitClassOptions<C> | ImplicitClassOptions<C> | BaseClassTemplateOptions<C>
+  options: ExplicitClassOptions<C>
+): C;
+
+export function template<C extends ComponentClass>(
+  templateString: string,
+  options: (ImplicitClassOptions<C> | BaseClassTemplateOptions<C> & { scope?: never })
 ): C;
 export function template(
   templateString: string,
@@ -295,12 +300,7 @@ export function template(
   // component class, which _getProp looks up when it encounters a `#` key.
   let originalScopeWithInstance: ((instance: any) => Record<string, unknown>) | undefined;
 
-  if (
-    privateFields.length > 0 &&
-    options.scope &&
-    !options.eval &&
-    options.component
-  ) {
+  if (privateFields.length > 0 && options.scope && !options.eval && options.component) {
     originalScopeWithInstance = options.scope as (instance: any) => Record<string, unknown>;
     const origScope = originalScopeWithInstance;