fix

glimmerjs · Oct 19, 2024 · d02dedf · d02dedf
1 parent 01399dd
commit d02dedf
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/packages/@glimmer-workspace/integration-tests/lib/modifiers.ts b/packages/@glimmer-workspace/integration-tests/lib/modifiers.ts
@@ -44,8 +44,8 @@ export class TestModifierManager
     return tag;
   }
 
-  getDebugName(definition?: object) {
-    return (definition as any).instance.constructor.name || '<unknown>';
+  getDebugName({ Klass }: TestModifierDefinitionState) {
+    return Klass?.name || '<unknown>';
   }
 
   getDebugInstance({ instance }: TestModifier) {

diff --git a/packages/@glimmer/interfaces/lib/managers/internal/modifier.d.ts b/packages/@glimmer/interfaces/lib/managers/internal/modifier.d.ts
@@ -22,8 +22,8 @@ export interface InternalModifierManager<
   // the modifier's update hooks need to be called (if at all).
   getTag(modifier: TModifierInstanceState): UpdatableTag | null;
 
-  getDebugName(modifier: TModifierInstanceState): string;
-  getDebugInstance(modifier: TModifierInstanceState): unknown;
+  getDebugName(Modifier: TModifierDefinitionState): string;
+  getDebugInstance(Modifier: TModifierInstanceState): unknown;
 
   // At initial render, the modifier gets a chance to install itself on the
   // element it is managing. It can also return a bucket of state that

diff --git a/packages/@glimmer/interfaces/lib/managers/modifier.d.ts b/packages/@glimmer/interfaces/lib/managers/modifier.d.ts
@@ -19,6 +19,6 @@ export interface ModifierManager<ModifierStateBucket> {
   installModifier(instance: ModifierStateBucket, element: Element, args: Arguments): void;
   updateModifier(instance: ModifierStateBucket, args: Arguments): void;
   destroyModifier(instance: ModifierStateBucket, args: Arguments): void;
-  getDebugName?(definition?: object): string;
+  getDebugName?(factory?: unknown): string;
   getDebugInstance?(instance: ModifierStateBucket): any;
 }
diff --git a/packages/@glimmer/manager/lib/public/modifier.ts b/packages/@glimmer/manager/lib/public/modifier.ts
@@ -38,7 +38,6 @@ export interface CustomModifierState<ModifierStateBucket> {
   modifier: ModifierStateBucket;
   delegate: ModifierManager<ModifierStateBucket>;
   args: Arguments;
-  definition?: object;
 }
 
 /**
@@ -109,7 +108,6 @@ export class CustomModifierManager<O extends Owner, ModifierStateBucket>
       element,
       delegate,
       args,
-      definition,
       modifier,
     };
 
@@ -118,7 +116,8 @@ export class CustomModifierManager<O extends Owner, ModifierStateBucket>
     return state;
   }
 
-  getDebugName({ delegate, definition }: CustomModifierState<ModifierStateBucket>) {
+  getDebugName(definition: object) {
+    const delegate = this.factory.prototype;
     if (typeof delegate?.getDebugName === 'function') {
       return delegate.getDebugName(definition);
     }

diff --git a/packages/@glimmer/runtime/lib/compiled/opcodes/component.ts b/packages/@glimmer/runtime/lib/compiled/opcodes/component.ts
@@ -494,7 +494,7 @@ export class ComponentElementOperations implements ElementOperations {
     this.modifiers.push(modifier);
 
     if (vm.env.debugRenderTree !== undefined) {
-      const { manager, state } = modifier;
+      const { manager, definition, state } = modifier;
 
       // TODO: we need a stable object for the debugRenderTree as the key, add support for
       // the case where the state is a primitive, or if in practice we always have/require
@@ -504,7 +504,7 @@ export class ComponentElementOperations implements ElementOperations {
       }
 
       let { element, constructing } = vm.elements();
-      let name = manager.getDebugName(state);
+      let name = manager.getDebugName(definition.state);
       let instance = manager.getDebugInstance(state);
 
       assert(constructing, `Expected a constructing element in addModifier`);

diff --git a/packages/@glimmer/runtime/lib/environment.ts b/packages/@glimmer/runtime/lib/environment.ts
@@ -65,7 +65,7 @@ class TransactionImpl implements Transaction {
           () => manager.install(state),
           import.meta.env.DEV &&
             `- While rendering:\n  (instance of a \`${
-              definition.resolvedName || manager.getDebugName(state)
+              definition.resolvedName || manager.getDebugName(definition.state)
             }\` modifier)`
         );
         updateTag(modifierTag, tag);
@@ -82,7 +82,7 @@ class TransactionImpl implements Transaction {
           () => manager.update(state),
           import.meta.env.DEV &&
             `- While rendering:\n  (instance of a \`${
-              definition.resolvedName || manager.getDebugName(state)
+              definition.resolvedName || manager.getDebugName(definition.state)
             }\` modifier)`
         );
         updateTag(modifierTag, tag);