add current element to in-element

glimmerjs · Apr 4, 2024 · e6ba8a7 · e6ba8a7
1 parent f036320
commit e6ba8a7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/packages/@glimmer-workspace/integration-tests/test/debug-render-tree-test.ts b/packages/@glimmer-workspace/integration-tests/test/debug-render-tree-test.ts
@@ -311,7 +311,7 @@ class DebugRenderTreeTest extends RenderTest {
             type: 'keyword',
             name: 'in-element',
             args: { positional: [this.element.firstChild], named: {} },
-            instance: (instance: GlimmerishComponent) => instance === null,
+            instance: (instance: any) => instance === null,
             template: null,
             bounds: this.elementBounds(this.element.firstChild! as unknown as Element),
             children: [

diff --git a/packages/@glimmer/interfaces/lib/runtime/debug-render-tree.d.ts b/packages/@glimmer/interfaces/lib/runtime/debug-render-tree.d.ts
@@ -17,6 +17,7 @@ export interface RenderNode {
   args: CapturedArguments;
   instance: unknown;
   template?: string | undefined;
+  meta?: Record<string, any>;
 }
 
 export interface CapturedRenderNode {
@@ -26,6 +27,7 @@ export interface CapturedRenderNode {
   args: Arguments;
   instance: unknown;
   template: string | null;
+  meta: Record<string, any> | null;
   bounds: null | {
     parentElement: SimpleElement;
     firstNode: SimpleNode;

diff --git a/packages/@glimmer/runtime/lib/compiled/opcodes/dom.ts b/packages/@glimmer/runtime/lib/compiled/opcodes/dom.ts
@@ -87,6 +87,9 @@ APPEND_OPCODES.add(Op.PushRemoteElement, (vm) => {
       name: 'in-element',
       args,
       instance: null,
+      meta: {
+        parentElement: vm.elements().element,
+      },
     });
 
     registerDestructor(block, () => {

diff --git a/packages/@glimmer/runtime/lib/debug-render-tree.ts b/packages/@glimmer/runtime/lib/debug-render-tree.ts
@@ -177,11 +177,21 @@ export default class DebugRenderTreeImpl<TBucket extends object>
 
   private captureNode(id: string, state: TBucket): CapturedRenderNode {
     let node = this.nodeFor(state);
-    let { type, name, args, instance, refs } = node;
+    let { type, name, args, instance, refs, meta = null } = node;
     let template = this.captureTemplate(node);
     let bounds = this.captureBounds(node);
     let children = this.captureRefs(refs);
-    return { id, type, name, args: reifyArgsDebug(args), instance, template, bounds, children };
+    return {
+      id,
+      type,
+      name,
+      args: reifyArgsDebug(args),
+      instance,
+      template,
+      bounds,
+      children,
+      meta,
+    };
   }
 
   private captureTemplate({ template }: InternalRenderNode<TBucket>): Nullable<string> {

diff --git a/packages/@glimmer/syntax/test/plugin-node-test.ts b/packages/@glimmer/syntax/test/plugin-node-test.ts
@@ -48,7 +48,6 @@ test('deprecated program visitor', (assert) => {
     return {
       name: 'plugin',
       visitor: {
-        // eslint-disable-next-line deprecation/deprecation
         Program(node: AST.Program) {
           assert.step(node.type);
         },